From f34ca585b731a2643064e8cfc4dc92a69aa50498 Mon Sep 17 00:00:00 2001 From: Markus Sattler Date: Fri, 19 Jun 2015 23:27:10 +0200 Subject: [PATCH] fix auto merge fail --- arduino-core/src/processing/app/Serial.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arduino-core/src/processing/app/Serial.java b/arduino-core/src/processing/app/Serial.java index efec07cf2..6a3a62702 100644 --- a/arduino-core/src/processing/app/Serial.java +++ b/arduino-core/src/processing/app/Serial.java @@ -52,7 +52,7 @@ public class Serial implements SerialPortEventListener { PreferencesData.getInteger("serial.debug_rate"), PreferencesData.get("serial.parity").charAt(0), 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.disableDTR") == null); } @@ -61,7 +61,7 @@ public class Serial implements SerialPortEventListener { this(PreferencesData.get("serial.port"), irate, PreferencesData.get("serial.parity").charAt(0), 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.disableDTR") == null); } @@ -69,7 +69,7 @@ public class Serial implements SerialPortEventListener { public Serial(String iname, int irate) throws SerialException { this(iname, irate, PreferencesData.get("serial.parity").charAt(0), 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.disableDTR") == null); } @@ -78,7 +78,7 @@ public class Serial implements SerialPortEventListener { this(iname, PreferencesData.getInteger("serial.debug_rate"), PreferencesData.get("serial.parity").charAt(0), 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.disableDTR") == null); }