Merge pull request #2485 from ffissore/ide-1.5.x-reenable-38400

cmaglie · cmaglie · commit 863cb417a608 · 2015-01-06T17:39:44.000+01:00
Re enable 38400 baud rates
diff --git a/app/src/processing/app/AbstractMonitor.java b/app/src/processing/app/AbstractMonitor.java
@@ -135,7 +135,7 @@ public void actionPerformed(ActionEvent event) {
 
     String[] serialRateStrings = {
             "300", "1200", "2400", "4800", "9600",
-            "19200", "57600", "115200"
+            "19200", "38400", "57600", "115200"
     };
 
     serialRates = new JComboBox();
diff --git a/arduino-core/src/processing/app/PreferencesData.java b/arduino-core/src/processing/app/PreferencesData.java
@@ -80,7 +80,7 @@ static public void init(File file) {
 
   private static void fixPreferences() {
     String baud = get("serial.debug_rate");
-    if ("14400".equals(baud) || "28800".equals(baud) || "38400".equals(baud)) {
+    if ("14400".equals(baud) || "28800".equals(baud)) {
       set("serial.debug_rate", "9600");
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ static public void init(File file) {`
`80`	`80`
`81`	`81`	`private static void fixPreferences() {`
`82`	`82`	`String baud = get("serial.debug_rate");`
`83`		`- if ("14400".equals(baud) \|\| "28800".equals(baud) \|\| "38400".equals(baud)) {`
	`83`	`+ if ("14400".equals(baud) \|\| "28800".equals(baud)) {`
`84`	`84`	`set("serial.debug_rate", "9600");`
`85`	`85`	`}`
`86`	`86`	`}`