rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Investigate JSSC connector removal fix #858

This commit is contained in:
rusefi 2019-08-14 22:33:15 -04:00
parent 0994f3db9d
commit ec80aaffaa
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java_console/io/src/com/rusefi/io/serial/PortHolder.java
View File

@ -119,15 +119,7 @@ public class PortHolder {
} }
public EstablishConnection invoke() { public EstablishConnection invoke() {
// todo: BUG: Mac version 10 also 'is windows10 == true' at the moment :) stream = SerialIoStreamJSerialComm.open(port, BAUD_RATE, FileLog.LOGGER);
boolean windows10 = isWindows10();
FileLog.MAIN.logLine("Is windows10: " + windows10);
if (windows10) {
// this implementation is way simpler but seems to kind of work, keeping just in case
stream = SerialIoStreamJSerialComm.open(port, BAUD_RATE, FileLog.LOGGER);
} else {
stream = SerialIoStreamJSSC.open(port, BAUD_RATE, FileLog.LOGGER);
}
if (stream == null) { if (stream == null) {
isConnected = false; isConnected = false;
return this; return this;

4
java_console/io/src/com/rusefi/io/serial/SerialIoStreamJSSC.java
View File

@ -10,6 +10,8 @@ import jssc.SerialPortException;
import java.io.IOException; import java.io.IOException;
/** /**
* JSSC connector does not seem to be supported and might have some issues like inability to close/re-open connection nicely
* <p>
* (c) Andrey Belomutskiy * (c) Andrey Belomutskiy
* 5/11/2015. * 5/11/2015.
*/ */
@ -61,7 +63,7 @@ public class SerialIoStreamJSSC implements IoStream {
public void close() { public void close() {
isClosed = true; isClosed = true;
try { try {
FileLog.MAIN.logLine("CLOSING PORT... " + serialPort.getPortName()); FileLog.MAIN.logLine("CLOSING PORT... " + serialPort.getPortName());
serialPort.removeEventListener(); serialPort.removeEventListener();
serialPort.closePort(); serialPort.closePort();
FileLog.MAIN.logLine("PORT CLOSED: " + serialPort.getPortName()); FileLog.MAIN.logLine("PORT CLOSED: " + serialPort.getPortName());

2
java_console/io/src/com/rusefi/io/serial/SerialIoStreamJSerialComm.java
View File

@ -69,7 +69,7 @@ public class SerialIoStreamJSerialComm implements IoStream {
} }
public static IoStream open(String port, int baudRate, Logger logger) { public static IoStream open(String port, int baudRate, Logger logger) {
logger.info("[SerialIoStreamJSerialComm]"); logger.info("[SerialIoStreamJSerialComm] " + port);
SerialPort sp = SerialPort.getCommPort(port); SerialPort sp = SerialPort.getCommPort(port);
sp.setBaudRate(baudRate); sp.setBaudRate(baudRate);
sp.openPort(); sp.openPort();