diff --git a/java_console/.idea/libraries/jssc.xml b/java_console/.idea/libraries/jssc.xml deleted file mode 100644 index 339f96efde..0000000000 --- a/java_console/.idea/libraries/jssc.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/java_console/autotest/autotest.iml b/java_console/autotest/autotest.iml index b5276310e9..271d8ac7cd 100644 --- a/java_console/autotest/autotest.iml +++ b/java_console/autotest/autotest.iml @@ -9,6 +9,5 @@ - \ No newline at end of file diff --git a/java_console/build.xml b/java_console/build.xml index 86894d334b..1e5d8a30e4 100644 --- a/java_console/build.xml +++ b/java_console/build.xml @@ -38,7 +38,7 @@ + classpath="../java_tools/configuration_definition/lib/snakeyaml.jar:lib/jaxb-api.jar:lib/httpclient.jar:lib/httpmime.jar:lib/httpcore.jar:lib/jSerialComm.jar:lib/jcip-annotations-1.0.jar:lib/jlatexmath-1.0.6.jar:lib/swing-layout-1.0.jar:lib/jep.jar:lib/log4j.jar:lib/junit.jar:lib/SteelSeries-3.9.30.jar:lib/annotations.jar:lib/miglayout-4.0.jar:lib/surfaceplotter-2.0.1.jar"> @@ -69,7 +69,7 @@ + path="build/classes:lib/junit.jar:lib/SteelSeries-3.9.30.jar:lib/miglayout-4.0.jar"/> @@ -116,7 +116,6 @@ - diff --git a/java_console/io/io.iml b/java_console/io/io.iml index 7552a4df6b..e97aff6d6d 100644 --- a/java_console/io/io.iml +++ b/java_console/io/io.iml @@ -7,7 +7,6 @@ - diff --git a/java_console/io/src/com/rusefi/io/serial/SerialIoStreamJSSC.java b/java_console/io/src/com/rusefi/io/serial/SerialIoStreamJSSC.java deleted file mode 100644 index fa3fce8de7..0000000000 --- a/java_console/io/src/com/rusefi/io/serial/SerialIoStreamJSSC.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.rusefi.io.serial; - -import com.rusefi.FileLog; -import com.opensr5.Logger; -import com.opensr5.io.DataListener; -import com.rusefi.io.IoStream; -import jssc.SerialPort; -import jssc.SerialPortException; - -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 - *

- * (c) Andrey Belomutskiy - * 5/11/2015. - */ -public class SerialIoStreamJSSC implements IoStream { - private final SerialPort serialPort; - private final Logger logger; - private boolean isClosed; - - public SerialIoStreamJSSC(SerialPort serialPort, Logger logger) { - this.serialPort = serialPort; - this.logger = logger; - } - - public static void setupPort(SerialPort serialPort, int baudRate) throws SerialPortException { - serialPort.setRTS(false); - serialPort.setDTR(false); - serialPort.setParams(baudRate, 8, 1, 0);//Set params. - int mask = SerialPort.MASK_RXCHAR; - //Set the prepared mask - serialPort.setEventsMask(mask); - serialPort.setFlowControlMode(0); - } - - public static SerialIoStreamJSSC open(String port, int baudRate, Logger logger) { - logger.info("[SerialIoStreamJSSC]"); - SerialPort serialPort = new SerialPort(port); - try { - FileLog.MAIN.logLine("Opening " + port + " @ " + baudRate); - boolean opened = serialPort.openPort();//Open serial port - if (!opened) - FileLog.MAIN.logLine(port + ": not opened!"); - SerialIoStreamJSSC.setupPort(serialPort, baudRate); - } catch (SerialPortException e) { - FileLog.MAIN.logLine("ERROR " + e.getMessage()); - return null; - } - FileLog.MAIN.logLine("PortHolder: Sleeping a bit"); - try { - // todo: why is this delay here? add a comment - Thread.sleep(200); - } catch (InterruptedException e) { - throw new IllegalStateException(e); - } - SerialIoStreamJSSC stream = new SerialIoStreamJSSC(serialPort, logger); - return stream; - } - - @Override - public void close() { - isClosed = true; - try { - FileLog.MAIN.logLine("CLOSING PORT... " + serialPort.getPortName()); - serialPort.removeEventListener(); - serialPort.closePort(); - FileLog.MAIN.logLine("PORT CLOSED: " + serialPort.getPortName()); - } catch (SerialPortException e) { - logger.error("Error closing port: " + e); - } - } - - @Override - public void write(byte[] bytes) throws IOException { - try { - synchronized (serialPort) { - serialPort.writeBytes(bytes); - } - } catch (SerialPortException e) { - throw new IOException(e); - } - } - - @Override - public void purge() { - try { - synchronized (serialPort) { - serialPort.purgePort(SerialPort.PURGE_RXCLEAR | SerialPort.PURGE_TXCLEAR); - } - } catch (SerialPortException e) { - logger.info("Error while purge: " + e); - close(); - } - } - - @Override - public void setInputListener(DataListener listener) { - try { - JSSCPortReader reader = new JSSCPortReader(serialPort, listener, this); - serialPort.addEventListener(reader.getSerialPortEventListener()); - reader.readInitial(); - } catch (SerialPortException e) { - throw new IllegalStateException(e); - } - } - - @Override - public boolean isClosed() { - return isClosed; - } -} diff --git a/java_console/io/src/com/rusefi/io/serial/SerialIoStreamJSerialComm.java b/java_console/io/src/com/rusefi/io/serial/SerialIoStreamJSerialComm.java index 86c635c697..7ccf69a464 100644 --- a/java_console/io/src/com/rusefi/io/serial/SerialIoStreamJSerialComm.java +++ b/java_console/io/src/com/rusefi/io/serial/SerialIoStreamJSerialComm.java @@ -8,7 +8,7 @@ import com.rusefi.FileLog; import com.rusefi.io.IoStream; /** - * https://github.com/Fazecast/jSerialComm looks to be alive as of 2019 + * https://github.com/Fazecast/jSerialComm looks to be alive as of 2020 *

* (c) Andrey Belomutskiy * 06/03/2019 @@ -18,7 +18,10 @@ public class SerialIoStreamJSerialComm implements IoStream { private SerialPort sp; private final String port; - SerialIoStreamJSerialComm(SerialPort sp, String port) { + /** + * @see #openPort(String) + */ + private SerialIoStreamJSerialComm(SerialPort sp, String port) { this.sp = sp; this.port = port; } diff --git a/java_console/lib/jssc-src.jar b/java_console/lib/jssc-src.jar deleted file mode 100644 index e87d8efd5b..0000000000 Binary files a/java_console/lib/jssc-src.jar and /dev/null differ diff --git a/java_console/lib/jssc.jar b/java_console/lib/jssc.jar deleted file mode 100644 index d2b5c070aa..0000000000 Binary files a/java_console/lib/jssc.jar and /dev/null differ diff --git a/java_console/opensr5/opensr5.iml b/java_console/opensr5/opensr5.iml index a86c9a393f..cd90b3a069 100644 --- a/java_console/opensr5/opensr5.iml +++ b/java_console/opensr5/opensr5.iml @@ -7,7 +7,6 @@ - \ No newline at end of file diff --git a/java_console/tools/tools.iml b/java_console/tools/tools.iml index 7d2eb6cc61..65d59c03a2 100644 --- a/java_console/tools/tools.iml +++ b/java_console/tools/tools.iml @@ -9,7 +9,5 @@ - - - + \ No newline at end of file diff --git a/java_console/ui/src/com/rusefi/UploadChanges.java b/java_console/ui/src/com/rusefi/UploadChanges.java index b767ef2f27..e2f3494f15 100644 --- a/java_console/ui/src/com/rusefi/UploadChanges.java +++ b/java_console/ui/src/com/rusefi/UploadChanges.java @@ -2,15 +2,11 @@ package com.rusefi; import com.opensr5.ConfigurationImage; import com.opensr5.Logger; -import com.rusefi.binaryprotocol.BinaryProtocol; -import com.opensr5.io.ConfigurationImageFile; import com.rusefi.binaryprotocol.BinaryProtocolHolder; import com.rusefi.config.generated.Fields; import com.rusefi.io.LinkManager; -import com.rusefi.io.serial.SerialIoStreamJSSC; import com.rusefi.ui.RecentCommands; import com.rusefi.ui.StatusWindow; -import jssc.SerialPort; import jssc.SerialPortException; import javax.swing.*; @@ -59,6 +55,7 @@ public class UploadChanges { } private static void showUi(String port) throws SerialPortException, IOException, InterruptedException { +/* SerialPort serialPort; serialPort = new SerialPort(port); @@ -77,6 +74,8 @@ public class UploadChanges { bp.setController(ci1); scheduleUpload(ci2); + + */ } public static void scheduleUpload(final ConfigurationImage newVersion) { diff --git a/java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmdSandbox.java b/java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmdSandbox.java index b4ca13c851..a0041d41af 100644 --- a/java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmdSandbox.java +++ b/java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmdSandbox.java @@ -7,8 +7,7 @@ import com.romraider.editor.ecu.ECUEditor; import com.rusefi.RomRaiderWrapper; import com.rusefi.UploadChanges; import com.rusefi.config.generated.Fields; -import com.rusefi.io.serial.SerialIoStreamJSSC; -import jssc.SerialPort; +import com.rusefi.io.serial.SerialIoStreamJSerialComm; /** * (c) Andrey Belomutskiy @@ -26,15 +25,15 @@ public class BinaryProtocolCmdSandbox { Logger logger = UploadChanges.logger; - SerialPort serialPort; - serialPort = new SerialPort(port); - boolean opened = serialPort.openPort(); - if (!opened) { - logger.error("failed to open " + port); - } - BinaryProtocol bp = BinaryProtocolHolder.getInstance().create(logger, new SerialIoStreamJSSC(serialPort, logger)); + //SerialPort serialPort; +// serialPort = new SerialPort(port); +// boolean opened = serialPort.openPort(); +// if (!opened) { +// logger.error("failed to open " + port); +// } + BinaryProtocol bp = BinaryProtocolHolder.getInstance().create(logger, SerialIoStreamJSerialComm.openPort(port)); - SerialIoStreamJSSC.setupPort(serialPort, 38400); + //SerialIoStreamJSSC.setupPort(serialPort, 38400); logger.info("Binary looks good!"); bp.readImage(Fields.TOTAL_CONFIG_SIZE); diff --git a/java_console/ui/ui.iml b/java_console/ui/ui.iml index 75d6cc32e1..5000736827 100644 --- a/java_console/ui/ui.iml +++ b/java_console/ui/ui.iml @@ -9,7 +9,6 @@ -