arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

fix auto merge fail

Browse Source
This commit is contained in:
Markus Sattler
2015-06-19 23:27:10 +02:00
parent 02f9568730
commit f34ca585b7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arduino-core/src/processing/app/Serial.java
View File

@ -52,7 +52,7 @@ public class Serial implements SerialPortEventListener {
PreferencesData.getInteger("serial.debug_rate"), PreferencesData.getInteger("serial.debug_rate"),
PreferencesData.get("serial.parity").charAt(0), PreferencesData.get("serial.parity").charAt(0),
PreferencesData.getInteger("serial.databits"), PreferencesData.getInteger("serial.databits"),
Float.parseFloat(PreferencesData.get("serial.stopbits"))), Float.parseFloat(PreferencesData.get("serial.stopbits")),
BaseNoGui.getBoardPreferences().get("serial.disableRTS") == null, BaseNoGui.getBoardPreferences().get("serial.disableRTS") == null,
BaseNoGui.getBoardPreferences().get("serial.disableDTR") == null); BaseNoGui.getBoardPreferences().get("serial.disableDTR") == null);
} }
@ -61,7 +61,7 @@ public class Serial implements SerialPortEventListener {
this(PreferencesData.get("serial.port"), irate, this(PreferencesData.get("serial.port"), irate,
PreferencesData.get("serial.parity").charAt(0), PreferencesData.get("serial.parity").charAt(0),
PreferencesData.getInteger("serial.databits"), PreferencesData.getInteger("serial.databits"),
Float.parseFloat(PreferencesData.get("serial.stopbits"))), Float.parseFloat(PreferencesData.get("serial.stopbits")),
BaseNoGui.getBoardPreferences().get("serial.disableRTS") == null, BaseNoGui.getBoardPreferences().get("serial.disableRTS") == null,
BaseNoGui.getBoardPreferences().get("serial.disableDTR") == null); BaseNoGui.getBoardPreferences().get("serial.disableDTR") == null);
} }
@ -69,7 +69,7 @@ public class Serial implements SerialPortEventListener {
public Serial(String iname, int irate) throws SerialException { public Serial(String iname, int irate) throws SerialException {
this(iname, irate, PreferencesData.get("serial.parity").charAt(0), this(iname, irate, PreferencesData.get("serial.parity").charAt(0),
PreferencesData.getInteger("serial.databits"), PreferencesData.getInteger("serial.databits"),
Float.parseFloat(PreferencesData.get("serial.stopbits"))), Float.parseFloat(PreferencesData.get("serial.stopbits")),
BaseNoGui.getBoardPreferences().get("serial.disableRTS") == null, BaseNoGui.getBoardPreferences().get("serial.disableRTS") == null,
BaseNoGui.getBoardPreferences().get("serial.disableDTR") == null); BaseNoGui.getBoardPreferences().get("serial.disableDTR") == null);
} }
@ -78,7 +78,7 @@ public class Serial implements SerialPortEventListener {
this(iname, PreferencesData.getInteger("serial.debug_rate"), this(iname, PreferencesData.getInteger("serial.debug_rate"),
PreferencesData.get("serial.parity").charAt(0), PreferencesData.get("serial.parity").charAt(0),
PreferencesData.getInteger("serial.databits"), PreferencesData.getInteger("serial.databits"),
Float.parseFloat(PreferencesData.get("serial.stopbits"))), Float.parseFloat(PreferencesData.get("serial.stopbits")),
BaseNoGui.getBoardPreferences().get("serial.disableRTS") == null, BaseNoGui.getBoardPreferences().get("serial.disableRTS") == null,
BaseNoGui.getBoardPreferences().get("serial.disableDTR") == null); BaseNoGui.getBoardPreferences().get("serial.disableDTR") == null);
} }