Merge branch 'ide-1.5.x' into ide-1.5.x-jssc

Author: Federico Fissore

app/src/processing/app/EditorStatus.java

@@ -452,7 +452,7 @@ public void keyTyped(KeyEvent event) {
       add(progressBar);
       progressBar.setVisible(false);
 
-      copyErrorButton = new JButton(_("Copy error"));
+      copyErrorButton = new JButton(_("Copy error messages"));
       add(copyErrorButton);
       copyErrorButton.setVisible(false);
       copyErrorButton.addActionListener(new ActionListener() {

app/src/processing/app/i18n/Resources_en.po

@@ -353,9 +353,9 @@ msgstr "Copy"
 msgid "Copy as HTML"
 msgstr "Copy as HTML"
 
-#: ../../../processing/app/EditorStatus.java:456
-msgid "Copy error"
-msgstr "Copy error"
+#: ../../../processing/app/EditorStatus.java:455
+msgid "Copy error messages"
+msgstr ""
 
 #: Editor.java:1165 Editor.java:2715
 msgid "Copy for Forum"
@@ -529,6 +529,10 @@ msgstr "Device is not responding, check the right serial port is selected or RES
 msgid "Discard all changes and reload sketch?"
 msgstr "Discard all changes and reload sketch?"
 
+#: ../../../processing/app/Preferences.java:438
+msgid "Display line numbers"
+msgstr ""
+
 #: Editor.java:2064
 msgid "Don't Save"
 msgstr "Don't Save"
@@ -895,10 +899,6 @@ msgstr "Marathi"
 msgid "Message"
 msgstr "Message"
 
-#: Sketch.java:1712
-msgid "Missing the */ from the end of a /* comment */"
-msgstr "Missing the */ from the end of a /* comment */"
-
 #: Preferences.java:449
 msgid "More preferences can be edited directly in the file"
 msgstr "More preferences can be edited directly in the file"
@@ -1349,6 +1349,10 @@ msgstr "Sketchbook folder disappeared"
 msgid "Sketchbook location:"
 msgstr "Sketchbook location:"
 
+#: ../../../processing/app/Base.java:785
+msgid "Sketches (*.ino, *.pde)"
+msgstr ""
+
 #: ../../../processing/app/Preferences.java:152
 msgid "Slovenian"
 msgstr "Slovenian"
@@ -1590,6 +1594,16 @@ msgstr "Use Selection For Find"
 msgid "Use external editor"
 msgstr "Use external editor"
 
+#: ../../../processing/app/debug/Compiler.java:94
+#, java-format
+msgid "Using library {0} in folder: {1} {2}"
+msgstr ""
+
+#: ../../../processing/app/debug/Compiler.java:320
+#, java-format
+msgid "Using previously compiled file: {0}"
+msgstr ""
+
 #: EditorToolbar.java:41 EditorToolbar.java:46
 msgid "Verify"
 msgstr "Verify"

app/src/processing/app/i18n/Resources_en.properties

@@ -239,8 +239,8 @@ Copy=Copy
 #: Editor.java:1177 Editor.java:2723
 Copy\ as\ HTML=Copy as HTML
 
-#: ../../../processing/app/EditorStatus.java:456
-Copy\ error=Copy error
+#: ../../../processing/app/EditorStatus.java:455
+!Copy\ error\ messages=
 
 #: Editor.java:1165 Editor.java:2715
 Copy\ for\ Forum=Copy for Forum
@@ -363,6 +363,9 @@ Device\ is\ not\ responding,\ check\ the\ right\ serial\ port\ is\ selected\ or\
 #: tools/FixEncoding.java:57
 Discard\ all\ changes\ and\ reload\ sketch?=Discard all changes and reload sketch?
 
+#: ../../../processing/app/Preferences.java:438
+!Display\ line\ numbers=
+
 #: Editor.java:2064
 Don't\ Save=Don't Save
 
@@ -630,9 +633,6 @@ Marathi=Marathi
 #: Base.java:2112
 Message=Message
 
-#: Sketch.java:1712
-Missing\ the\ */\ from\ the\ end\ of\ a\ /*\ comment\ */=Missing the */ from the end of a /* comment */
-
 #: Preferences.java:449
 More\ preferences\ can\ be\ edited\ directly\ in\ the\ file=More preferences can be edited directly in the file
 
@@ -960,6 +960,9 @@ Sketchbook\ folder\ disappeared=Sketchbook folder disappeared
 #: Preferences.java:315
 Sketchbook\ location\:=Sketchbook location\:
 
+#: ../../../processing/app/Base.java:785
+!Sketches\ (*.ino,\ *.pde)=
+
 #: ../../../processing/app/Preferences.java:152
 Slovenian=Slovenian
 
@@ -1113,6 +1116,14 @@ Use\ Selection\ For\ Find=Use Selection For Find
 #: Preferences.java:409
 Use\ external\ editor=Use external editor
 
+#: ../../../processing/app/debug/Compiler.java:94
+#, java-format
+!Using\ library\ {0}\ in\ folder\:\ {1}\ {2}=
+
+#: ../../../processing/app/debug/Compiler.java:320
+#, java-format
+!Using\ previously\ compiled\ file\:\ {0}=
+
 #: EditorToolbar.java:41 EditorToolbar.java:46
 Verify=Verify
 

app/src/processing/app/tools/DiscourseFormat.java

@@ -52,10 +52,10 @@
  */
 public class DiscourseFormat {
 
-  Editor editor;
+  private Editor editor;
   // JTextArea of the actual Editor
-  JEditTextArea textarea;
-  boolean html;
+  private JEditTextArea textarea;
+  private boolean html;
 
 
   /**
@@ -75,7 +75,7 @@ public DiscourseFormat(Editor editor, boolean html) {
    */
   public void show() {
     // [code] tag cancels other tags, using [quote]
-    StringBuffer cf = new StringBuffer(html ? "<pre>\n" : "[quote]\n");
+    StringBuilder cf = new StringBuilder(html ? "<pre>\n" : "[code]\n");
 
     int selStart = textarea.getSelectionStart();
     int selStop = textarea.getSelectionStop();
@@ -99,7 +99,7 @@ public void show() {
       appendFormattedLine(cf, i);
     }
 
-    cf.append(html ? "\n</pre>" : "\n[/quote]");
+    cf.append(html ? "\n</pre>" : "\n[/code]");
 
     StringSelection formatted = new StringSelection(cf.toString());
     Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
@@ -111,17 +111,15 @@ public void lostOwnership(Clipboard clipboard, Transferable contents) {
     Clipboard unixclipboard = Toolkit.getDefaultToolkit().getSystemSelection();
     if (unixclipboard != null) unixclipboard.setContents(formatted, null);
 
-    editor.statusNotice("Code formatted for " +
-                        (html ? "HTML" : "the Arduino forum ") +
-                        " has been copied to the clipboard.");
+    editor.statusNotice("Code formatted for " + (html ? "HTML" : "the Arduino forum") + " has been copied to the clipboard.");
   }
 
   /**
-    * Append a char to a stringbuffer while escaping for proper display in HTML.
+    * Append a char to a StringBuilder while escaping for proper display in HTML.
     * @param c input char to escape
-    * @param buffer StringBuffer to append html-safe version of c to.
+    * @param buffer StringBuilder to append html-safe version of c to.
     */
-  private void appendToHTML(char c, StringBuffer buffer) {
+  private void appendToHTML(char c, StringBuilder buffer) {
     if (!html) {
       buffer.append(c);
     } else if (c == '<') {
@@ -138,7 +136,7 @@ private void appendToHTML(char c, StringBuffer buffer) {
   }
 
   // A terrible headache...
-  public void appendFormattedLine(StringBuffer cf, int line) {
+  public void appendFormattedLine(StringBuilder cf, int line) {
     Segment segment = new Segment();
 
     TextAreaPainter painter = textarea.getPainter();
@@ -203,12 +201,14 @@ public void appendFormattedLine(StringBuffer cf, int line) {
 //          fm = painter.getFontMetrics();
         } else {
           // Place open tags []
-          cf.append(html ? "<span style=\"color: #" : "[color=#");
-          cf.append(PApplet.hex(styles[id].getColor().getRGB() & 0xFFFFFF, 6));
-          cf.append(html ? ";\">" : "]");
+          if (html) {
+            cf.append("<span style=\"color: #");
+            cf.append(PApplet.hex(styles[id].getColor().getRGB() & 0xFFFFFF, 6));
+            cf.append(";\">");
+          }
 
-          if (styles[id].isBold())
-            cf.append(html ? "<b>" : "[b]");
+          if (html && styles[id].isBold())
+            cf.append("<b>");
 
 //          fm = styles[id].getFontMetrics(defaultFont);
         }
@@ -228,10 +228,10 @@ public void appendFormattedLine(StringBuffer cf, int line) {
             appendToHTML(c, cf);
           }
           // Place close tags [/]
-          if (j == (length - 1) && id != Token.NULL && styles[id].isBold())
-            cf.append(html ? "</b>" : "[/b]");
-          if (j == (length - 1) && id != Token.NULL)
-            cf.append(html ? "</span>" : "[/color]");
+          if (html && j == (length - 1) && id != Token.NULL && styles[id].isBold())
+            cf.append("</b>");
+          if (html && j == (length - 1) && id != Token.NULL)
+            cf.append("</span>");
 //          int charWidth;
 //          if (c == '\t') {
 //            charWidth = (int) painter

build/shared/examples/02.Digital/BlinkWithoutDelay/BlinkWithoutDelay.ino

@@ -8,30 +8,32 @@
  * LED attached from pin 13 to ground.
  * Note: on most Arduinos, there is already an LED on the board
  that's attached to pin 13, so no hardware is needed for this example.
-
-
+ 
  created 2005
  by David A. Mellis
  modified 8 Feb 2010
  by Paul Stoffregen
-
+ modified 11 Nov 2013
+ by Scott Fitzgerald
+ 
+ 
  This example code is in the public domain.
-
-
+ 
  http://www.arduino.cc/en/Tutorial/BlinkWithoutDelay
  */
 
-// constants won't change. Used here to
-// set pin numbers:
+// constants won't change. Used here to set a pin number :
 const int ledPin =  13;      // the number of the LED pin
 
-// Variables will change:
+// Variables will change :
 int ledState = LOW;             // ledState used to set the LED
-long previousMillis = 0;        // will store last time LED was updated
 
-// the follow variables is a long because the time, measured in miliseconds,
-// will quickly become a bigger number than can be stored in an int.
-long interval = 1000;           // interval at which to blink (milliseconds)
+// Generally, you shuould use "unsigned long" for variables that hold time
+// The value will quickly become too large for an int to store
+unsigned long previousMillis = 0;        // will store last time LED was updated
+
+// constants won't change :
+const long interval = 1000;           // interval at which to blink (milliseconds)
 
 void setup() {
   // set the digital pin as output:
@@ -47,10 +49,10 @@ void loop()
   // the LED is bigger than the interval at which you want to
   // blink the LED.
   unsigned long currentMillis = millis();
-
-  if (currentMillis - previousMillis > interval) {
-    // save the last time you blinked the LED
-    previousMillis = currentMillis;
+ 
+  if(currentMillis - previousMillis >= interval) {
+    // save the last time you blinked the LED 
+    previousMillis = currentMillis;   
 
     // if the LED is off turn it on and vice-versa:
     if (ledState == LOW)

build/shared/examples/09.USB/Keyboard/KeyboardMessage/KeyboardMessage.ino

@@ -1,22 +1,23 @@
-/*
- Keyboard Button test
-
- For the Arduino Leonardo, Micro and Due boards.
-
+/* 
+ Keyboard Message test
+ 
+ For the Arduino Leonardo and Micro.
+ 
  Sends a text string when a button is pressed.
 
  The circuit:
- * pushbutton attached from pin 2 to +5V on AVR boards
-   and to +3.3V to the Arduino Due
- * 10-kilohm resistor attached from pin 2 to ground
-
+ * pushbutton attached from pin 4 to +5V
+ * 10-kilohm resistor attached from pin 4 to ground
+ 
  created 24 Oct 2011
  modified 27 Mar 2012
  by Tom Igoe
-
+ modified 11 Nov 2013
+ by Scott Fitzgerald
+ 
  This example code is in the public domain.
-
- http://www.arduino.cc/en/Tutorial/KeyboardButton
+ 
+ http://www.arduino.cc/en/Tutorial/KeyboardMessage
  */
 
 const int buttonPin = 4;          // input pin for pushbutton

hardware/arduino/avr/variants/ethernet/pins_arduino.h

@@ -215,4 +215,22 @@ const uint8_t PROGMEM digital_pin_to_timer_PGM[] = {
 
 #endif
 
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_HARDWARE       Serial
+#define SERIAL_PORT_HARDWARE_OPEN  Serial
+
 #endif

hardware/arduino/avr/variants/leonardo/pins_arduino.h

@@ -337,4 +337,25 @@ const uint8_t PROGMEM analog_pin_to_channel_PGM[] = {
 };
 
 #endif /* ARDUINO_MAIN */
+
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_MONITOR        Serial
+#define SERIAL_PORT_USBVIRTUAL     Serial
+#define SERIAL_PORT_HARDWARE       Serial1
+#define SERIAL_PORT_HARDWARE_OPEN  Serial1
+
 #endif /* Pins_Arduino_h */

hardware/arduino/avr/variants/mega/pins_arduino.h

@@ -362,4 +362,28 @@ const uint8_t PROGMEM digital_pin_to_timer_PGM[] = {
 
 #endif
 
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_MONITOR         Serial
+#define SERIAL_PORT_HARDWARE        Serial
+#define SERIAL_PORT_HARDWARE1       Serial1
+#define SERIAL_PORT_HARDWARE2       Serial2
+#define SERIAL_PORT_HARDWARE3       Serial3
+#define SERIAL_PORT_HARDWARE_OPEN   Serial1
+#define SERIAL_PORT_HARDWARE_OPEN1  Serial2
+#define SERIAL_PORT_HARDWARE_OPEN2  Serial3
+
 #endif