Merge branch 'ide-1.5.x' into ide-1.5.x-avr-toolchain

Author: Federico Fissore

app/lib/jssc-2.6.0.jar

@@ -140,7 +140,7 @@ static public void main(String args[]) throws Exception {
       portableFolder = null;
 
     // run static initialization that grabs all the prefs
-    Preferences.init(null);
+    Preferences.init(args);
 
     try {
       File versionFile = getContentFile("lib/version.txt");
@@ -343,31 +343,38 @@ public Base(String[] args) throws Exception {
       if (args[i].equals("--board")) {
         i++;
         if (i >= args.length)
-          showError(null, "Argument required for --board", 3);
+          showError(null, _("Argument required for --board"), 3);
         selectBoard = args[i];
         continue;
       }
       if (args[i].equals("--port")) {
         i++;
         if (i >= args.length)
-          showError(null, "Argument required for --port", 3);
+          showError(null, _("Argument required for --port"), 3);
         selectPort = args[i];
         continue;
       }
       if (args[i].equals("--curdir")) {
         i++;
         if (i >= args.length)
-          showError(null, "Argument required for --curdir", 3);
+          showError(null, _("Argument required for --curdir"), 3);
         currentDirectory = args[i];
         continue;
       }
       if (args[i].equals("--pref")) {
         i++;
         if (i >= args.length)
-          showError(null, "Argument required for --pref", 3);
+          showError(null, _("Argument required for --pref"), 3);
         processPrefArgument(args[i]);
         continue;
       }
+      if (args[i].equals("--preferences-file")) {
+        i++;
+        if (i >= args.length)
+          showError(null, _("Argument required for --preferences-file"), 3);
+        // Argument should be already processed by Preferences.init(...) 
+        continue;
+      }
       if (args[i].startsWith("--"))
         showError(null, I18n.format(_("unknown option: {0}"), args[i]), 3);
 

app/lib/jssc-2.8.0.jar

@@ -218,7 +218,7 @@ public String toString() {
   static File preferencesFile;
 
 
-  static protected void init(String commandLinePrefs) {
+  static protected void init(String args[]) {
 
     // start by loading the defaults, in case something
     // important was deleted from the user prefs
@@ -250,41 +250,31 @@ static protected void init(String commandLinePrefs) {
     // clone the hash table
     defaults = new Hashtable<String, String>(table);
 
-    // Load a prefs file if specified on the command line
-    if (commandLinePrefs != null) {
-      try {
-        load(new FileInputStream(commandLinePrefs));
-
-      } catch (Exception poe) {
-        Base.showError(_("Error"),
-                       I18n.format(
-			 _("Could not read preferences from {0}"),
-			 commandLinePrefs
-		       ), poe);
+    // next load user preferences file
+    preferencesFile = Base.getSettingsFile(PREFS_FILE);
+
+    // load a preferences file if specified on the command line
+    if (args != null) {
+      for (int i = 0; i < args.length - 1; i++) {
+        if (args[i].equals("--preferences-file"))
+          preferencesFile = new File(args[i + 1]);
       }
-    } else if (!Base.isCommandLine()) {
-      // next load user preferences file
-      preferencesFile = Base.getSettingsFile(PREFS_FILE);
-      if (!preferencesFile.exists()) {
-        // create a new preferences file if none exists
-        // saves the defaults out to the file
-        save();
-
-      } else {
-        // load the previous preferences file
-
-        try {
-          load(new FileInputStream(preferencesFile));
-
-        } catch (Exception ex) {
-          Base.showError(_("Error reading preferences"),
-			 I18n.format(
-			   _("Error reading the preferences file. " +
-			     "Please delete (or move)\n" +
-			     "{0} and restart Arduino."),
-			   preferencesFile.getAbsolutePath()
-			 ), ex);
-        }
+    }
+
+    if (!preferencesFile.exists()) {
+      // create a new preferences file if none exists
+      // saves the defaults out to the file
+      save();
+    } else {
+      // load the previous preferences file
+      try {
+        load(new FileInputStream(preferencesFile));
+      } catch (Exception ex) {
+        Base.showError(_("Error reading preferences"),
+                       I18n.format(_("Error reading the preferences file. "
+                                       + "Please delete (or move)\n"
+                                       + "{0} and restart Arduino."),
+                                   preferencesFile.getAbsolutePath()), ex);
       }
     }
 

app/src/processing/app/Base.java

@@ -46,7 +46,7 @@
     <include name="app/lib/jmdns-3.4.1.jar" />
     <include name="app/lib/jna.jar" />
     <include name="app/lib/jsch-0.1.50.jar" />
-    <include name="app/lib/jssc-2.6.0.jar" />
+    <include name="app/lib/jssc-2.8.0.jar" />
     <include name="app/lib/ant.jar" />
     <include name="app/lib/ant-launcher.jar" />
   </fileset>

app/src/processing/app/Preferences.java

@@ -76,7 +76,7 @@
       <!-- In 0149, removed /System/Library/Java from the CLASSPATH because
            it can cause problems if users have installed weird files there.
            http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
-      <string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/jssc-2.6.0.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/jmdns-3.4.1.jar:$JAVAROOT/jsch-0.1.50.jar</string>
+      <string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/jssc-2.8.0.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/jmdns-3.4.1.jar:$JAVAROOT/jsch-0.1.50.jar</string>
 
       <key>JVMArchs</key>  
       <array>  

build/build.xml

@@ -92,6 +92,10 @@ OPTIONS
 	not given, verbose mode is disabled regardless of the current
 	preferences.
 
+*--preferences-file* __filename__::
+	Read and store preferences from the specified __filename__ instead
+	of the default one.
+
 *--pref* __name__=__value__::
 	Sets the preference __name__ to the given __value__.
 

build/macosx/template.app/Contents/Info.plist

@@ -4,13 +4,26 @@ ARDUINO 1.5.6 BETA
 [ide]
 * Implemented 1.5 library specification Rev.2
   (https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5:-Library-specification)
+* Replaced RXTX library with JSSC (Alexey Sokolov)
+  http://code.google.com/p/java-simple-serial-connector/
 * Improved command-line parsing (Matthijs Kooijman)
 
 [libraries]
 * TFT: warning messages in PImage class and strings inside examples now stored in flash to save RAM. 
 * Ethernet: added operator == for EthernetClient class (Norbert Truchsess)
 
 [core]
+* avr: Pile of HardwareSerial improvements (Matthijs Kooijman)
+  - Remove duplicate code from HardwareSerial::begin() methods
+  - Simplify HardwareSerial::begin() (Rob Tillaart)
+  - Use constants for register bit positions in HardwareSerial
+  - Fix HardwareSerial::flush() when interrupts are kept disabled for a while
+  - Fix lockup when writing to HardwareSerial with interrupts disabled
+  - Disable the UDRE interrupt sooner in HardwareSerial (Nathan Blackwell)
+  - Put each HardwareSerial instance in its own .cpp file in order to save memory
+    for unused UARTS
+  - In HardwareSerial::write, bypass the queue when it's empty in order to
+    improve throughput when using high baudrates (KurtE)
 * sam: Fixed wrap-around bug in delay() (Mark Tillotson)
 * sam: Fixed regression in analogRead() (fails to read multiple channels) (Mark Tillotson)
 * sam: Optimized delayMicroseconds() (Rob Tillaart) #1121

build/shared/manpage.adoc

@@ -88,6 +88,10 @@ void yield(void);
 #define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
 #define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
 
+// avr-libc defines _NOP() since 1.6.2
+#ifndef _NOP
+#define _NOP() do { __asm__ volatile ("nop"); } while (0)
+#endif
 
 typedef unsigned int word;
 
@@ -196,6 +200,10 @@ extern const uint8_t PROGMEM digital_pin_to_timer_PGM[];
 #include "WCharacter.h"
 #include "WString.h"
 #include "HardwareSerial.h"
+#include "USBAPI.h"
+#if defined(HAVE_HWSERIAL0) && defined(HAVE_CDCSERIAL)
+#error "Targets with both UART0 and CDC serial not supported"
+#endif
 
 uint16_t makeWord(uint16_t w);
 uint16_t makeWord(byte h, byte l);