Merge branch 'esp_baudrate' of https://github.com/Chris--A/Arduino

cmaglie · cmaglie · commit df667756d2e9 · 2015-06-25T11:55:31.000+02:00
diff --git a/app/src/processing/app/AbstractMonitor.java b/app/src/processing/app/AbstractMonitor.java
@@ -140,7 +140,7 @@ public void actionPerformed(ActionEvent event) {
     }
     lineEndings.setMaximumSize(lineEndings.getMinimumSize());
 
-    String[] serialRateStrings = {"300", "1200", "2400", "4800", "9600", "19200", "38400", "57600", "115200", "230400", "250000"};
+    String[] serialRateStrings = {"300", "1200", "2400", "4800", "9600", "19200", "38400", "57600", "74880", "115200", "230400", "250000"};
 
     serialRates = new JComboBox();
     for (String rate : serialRateStrings) {

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public void actionPerformed(ActionEvent event) {`
`140`	`140`	`}`
`141`	`141`	`lineEndings.setMaximumSize(lineEndings.getMinimumSize());`
`142`	`142`
`143`		`- String[] serialRateStrings = {"300", "1200", "2400", "4800", "9600", "19200", "38400", "57600", "115200", "230400", "250000"};`
	`143`	`+ String[] serialRateStrings = {"300", "1200", "2400", "4800", "9600", "19200", "38400", "57600", "74880", "115200", "230400", "250000"};`
`144`	`144`
`145`	`145`	`serialRates = new JComboBox();`
`146`	`146`	`for (String rate : serialRateStrings) {`