Skip to content

Commit 6d8544d

Browse files
committed
Updated reference: including FAQ, environment, howto and new serial library API.
1 parent d43594f commit 6d8544d

File tree

4 files changed

+25
-12
lines changed

4 files changed

+25
-12
lines changed

Diff for: app/Editor.java

+18-10
Original file line numberDiff line numberDiff line change
@@ -863,16 +863,6 @@ protected JMenu buildHelpMenu() {
863863
JMenu menu = new JMenu("Help");
864864
JMenuItem item;
865865

866-
// item = new JMenuItem("Environment");
867-
// item.addActionListener(new ActionListener() {
868-
// public void actionPerformed(ActionEvent e) {
869-
// Base.openURL(System.getProperty("user.dir") + File.separator +
870-
// "reference" + File.separator + "environment" +
871-
// File.separator + "index.html");
872-
// }
873-
// });
874-
// menu.add(item);
875-
876866
item = new JMenuItem("Howto");
877867
item.addActionListener(new ActionListener() {
878868
public void actionPerformed(ActionEvent e) {
@@ -882,6 +872,24 @@ public void actionPerformed(ActionEvent e) {
882872
});
883873
menu.add(item);
884874

875+
item = new JMenuItem("Environment");
876+
item.addActionListener(new ActionListener() {
877+
public void actionPerformed(ActionEvent e) {
878+
Base.openURL(System.getProperty("user.dir") + File.separator +
879+
"reference" + File.separator + "environment.html");
880+
}
881+
});
882+
menu.add(item);
883+
884+
item = new JMenuItem("Frequenty Asked Questions");
885+
item.addActionListener(new ActionListener() {
886+
public void actionPerformed(ActionEvent e) {
887+
Base.openURL(System.getProperty("user.dir") + File.separator +
888+
"reference" + File.separator + "FAQ.html");
889+
}
890+
});
891+
menu.add(item);
892+
885893
item = new JMenuItem("Reference");
886894
item.addActionListener(new ActionListener() {
887895
public void actionPerformed(ActionEvent e) {

Diff for: build/fetch.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ mkdir reference
99
cd reference
1010
curl http://www.arduino.cc/en/Main/Howto -o howto.html
1111
curl http://www.arduino.cc/en/Main/FAQ -o FAQ.html
12+
curl http://arduino.cc/en/Main/Environment -o environment.html
1213
curl http://www.arduino.cc/en/Reference/HomePage -o index.html
1314
curl http://www.arduino.cc/en/pub/skins/arduino/arduino.css -o arduino.css
1415
for i in `grep -o "http://www.arduino.cc/en/Reference/[^']*" index.html | sort -u | grep -v '?' | cut -d '/' -f 6`; do curl http://www.arduino.cc/en/Reference/$i -o $i.html; done
15-
perl -i -pe "s|http://www.arduino.cc/en/Reference/[^?\"']*\?[^'\"]*|#|g" *.html
16-
perl -i -pe "s|http://www.arduino.cc/en/Reference/([^']*)|\1.html|g" *.html
16+
for i in `grep -o "http://www.arduino.cc/en/Serial/[^']*" index.html | sort -u | grep -v '?' | cut -d '/' -f 6`; do curl http://www.arduino.cc/en/Serial/$i -o Serial_$i.html; done
17+
perl -i -pe "s|http://www.arduino.cc/en/Reference/[^?\"']*\?[^'\"]*|#|g" *.html # replace links to unknown pages with links to '#'
18+
perl -i -pe "s|http://www.arduino.cc/en/Reference/([^']*)|\1.html|g" *.html # replace links to remote reference with links to local reference
19+
perl -i -pe "s|http://www.arduino.cc/en/Serial/([^']*)|Serial_\1.html|g" *.html # replace links to remove serial reference with links to local serial reference
1720
perl -i -pe "s|http://www.arduino.cc/en/pub/skins/arduino/arduino.css|arduino.css|g" *.html
1821
perl -i -pe "s|HomePage.html|index.html|g" *.html
1922
perl -i -pe "s|href=\"/\"|href=\"http://www.arduino.cc/\"|g" *.html

Diff for: build/macosx/Arduino.xcodeproj/project.pbxproj

+2
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@
369369
330B21530968180400345666 /* librxtxSerial.jnilib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.bundle"; path = librxtxSerial.jnilib; sourceTree = "<group>"; };
370370
332D4DB509CF147F00BF81F6 /* Sizer.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; path = Sizer.java; sourceTree = "<group>"; };
371371
333269E1099BB1FC007D3AE2 /* tools.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = tools.zip; sourceTree = "<group>"; };
372+
337CD3F309EFC183002B890C /* fetch.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = fetch.sh; sourceTree = "<group>"; };
372373
33AF620A0965D67800B514A9 /* antlr.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = antlr.jar; sourceTree = "<group>"; };
373374
33AF620B0965D67900B514A9 /* applet.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = applet.html; sourceTree = "<group>"; };
374375
33AF620C0965D67900B514A9 /* mrj.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = mrj.jar; sourceTree = "<group>"; };
@@ -878,6 +879,7 @@
878879
33FFFE800965BD110016AC38 /* build */ = {
879880
isa = PBXGroup;
880881
children = (
882+
337CD3F309EFC183002B890C /* fetch.sh */,
881883
33FFFE810965BD110016AC38 /* howto.txt */,
882884
33FFFE820965BD110016AC38 /* linux */,
883885
33FFFE920965BD110016AC38 /* macosx */,

Diff for: build/shared/reference.zip

25.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)