Skip to content

Commit

Permalink
Corrected accidentally committed wrong file
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrey Filimonov committed Apr 1, 2015
1 parent 0dabb25 commit 7b9afd1
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions arduino-core/src/processing/app/Serial.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,34 +58,34 @@ public Serial() throws SerialException {
PreferencesData.get("serial.parity").charAt(0),
PreferencesData.getInteger("serial.databits"),
new Float(PreferencesData.get("serial.stopbits")).floatValue(),
!BaseNoGui.getBoardPreferences().has("serial.disableRTS"),
!BaseNoGui.getBoardPreferences().has("serial.disableDTR"));
BaseNoGui.getBoardPreferences().get("serial.disableRTS") == null,
BaseNoGui.getBoardPreferences().get("serial.disableDTR") == null);
}

public Serial(int irate) throws SerialException {
this(PreferencesData.get("serial.port"), irate,
PreferencesData.get("serial.parity").charAt(0),
PreferencesData.getInteger("serial.databits"),
new Float(PreferencesData.get("serial.stopbits")).floatValue(),
!BaseNoGui.getBoardPreferences().has("serial.disableRTS"),
!BaseNoGui.getBoardPreferences().has("serial.disableDTR"));
BaseNoGui.getBoardPreferences().get("serial.disableRTS") == null,
BaseNoGui.getBoardPreferences().get("serial.disableDTR") == null);
}

public Serial(String iname, int irate) throws SerialException {
this(iname, irate, PreferencesData.get("serial.parity").charAt(0),
PreferencesData.getInteger("serial.databits"),
new Float(PreferencesData.get("serial.stopbits")).floatValue(),
!BaseNoGui.getBoardPreferences().has("serial.disableRTS"),
!BaseNoGui.getBoardPreferences().has("serial.disableDTR"));
BaseNoGui.getBoardPreferences().get("serial.disableRTS") == null,
BaseNoGui.getBoardPreferences().get("serial.disableDTR") == null);
}

public Serial(String iname) throws SerialException {
this(iname, PreferencesData.getInteger("serial.debug_rate"),
PreferencesData.get("serial.parity").charAt(0),
PreferencesData.getInteger("serial.databits"),
new Float(PreferencesData.get("serial.stopbits")).floatValue(),
!BaseNoGui.getBoardPreferences().has("serial.disableRTS"),
!BaseNoGui.getBoardPreferences().has("serial.disableDTR"));
BaseNoGui.getBoardPreferences().get("serial.disableRTS") == null,
BaseNoGui.getBoardPreferences().get("serial.disableDTR") == null);
}

public static boolean touchPort(String iname, int irate) throws SerialException {
Expand Down

0 comments on commit 7b9afd1

Please sign in to comment.