rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-31 20:52:13 +01:00
Code Issues Releases Activity

Fixed NPE introduced in 125846f5

Browse Source 
Fix #6552
This commit is contained in:
Cristian Maglie 2017-07-25 23:00:09 +02:00
parent 0fc235da76
commit 101677bba2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,8 +65,8 @@ public class Serial implements SerialPortEventListener {
PreferencesData.getNonEmpty("serial.parity", "N").charAt(0), PreferencesData.getNonEmpty("serial.parity", "N").charAt(0),
PreferencesData.getInteger("serial.databits", 8), PreferencesData.getInteger("serial.databits", 8),
PreferencesData.getFloat("serial.stopbits", 1), PreferencesData.getFloat("serial.stopbits", 1),
!BaseNoGui.getBoardPreferences().get("serial.disableRTS").equalsIgnoreCase("true"), !BaseNoGui.getBoardPreferences().getBoolean("serial.disableRTS"),
!BaseNoGui.getBoardPreferences().get("serial.disableDTR").equalsIgnoreCase("true")); !BaseNoGui.getBoardPreferences().getBoolean("serial.disableDTR"));
} }
public Serial(int irate) throws SerialException { public Serial(int irate) throws SerialException {
@ -74,16 +74,16 @@ public class Serial implements SerialPortEventListener {
PreferencesData.getNonEmpty("serial.parity", "N").charAt(0), PreferencesData.getNonEmpty("serial.parity", "N").charAt(0),
PreferencesData.getInteger("serial.databits", 8), PreferencesData.getInteger("serial.databits", 8),
PreferencesData.getFloat("serial.stopbits", 1), PreferencesData.getFloat("serial.stopbits", 1),
!BaseNoGui.getBoardPreferences().get("serial.disableRTS").equalsIgnoreCase("true"), !BaseNoGui.getBoardPreferences().getBoolean("serial.disableRTS"),
!BaseNoGui.getBoardPreferences().get("serial.disableDTR").equalsIgnoreCase("true")); !BaseNoGui.getBoardPreferences().getBoolean("serial.disableDTR"));
} }
public Serial(String iname, int irate) throws SerialException { public Serial(String iname, int irate) throws SerialException {
this(iname, irate, PreferencesData.getNonEmpty("serial.parity", "N").charAt(0), this(iname, irate, PreferencesData.getNonEmpty("serial.parity", "N").charAt(0),
PreferencesData.getInteger("serial.databits", 8), PreferencesData.getInteger("serial.databits", 8),
PreferencesData.getFloat("serial.stopbits", 1), PreferencesData.getFloat("serial.stopbits", 1),
!BaseNoGui.getBoardPreferences().get("serial.disableRTS").equalsIgnoreCase("true"), !BaseNoGui.getBoardPreferences().getBoolean("serial.disableRTS"),
!BaseNoGui.getBoardPreferences().get("serial.disableDTR").equalsIgnoreCase("true")); !BaseNoGui.getBoardPreferences().getBoolean("serial.disableDTR"));
} }
public Serial(String iname) throws SerialException { public Serial(String iname) throws SerialException {
@ -91,8 +91,8 @@ public class Serial implements SerialPortEventListener {
PreferencesData.getNonEmpty("serial.parity", "N").charAt(0), PreferencesData.getNonEmpty("serial.parity", "N").charAt(0),
PreferencesData.getInteger("serial.databits", 8), PreferencesData.getInteger("serial.databits", 8),
PreferencesData.getFloat("serial.stopbits", 1), PreferencesData.getFloat("serial.stopbits", 1),
!BaseNoGui.getBoardPreferences().get("serial.disableRTS").equalsIgnoreCase("true"), !BaseNoGui.getBoardPreferences().getBoolean("serial.disableRTS"),
!BaseNoGui.getBoardPreferences().get("serial.disableDTR").equalsIgnoreCase("true")); !BaseNoGui.getBoardPreferences().getBoolean("serial.disableDTR"));
} }
public static boolean touchForCDCReset(String iname) throws SerialException { public static boolean touchForCDCReset(String iname) throws SerialException {