FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dron reports that MRE console does not work from linux #3937

This commit is contained in:
rusefillc 2022-02-21 16:42:12 -05:00
parent 57dec4d16f
commit 875dbc7189
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
java_console/io/src/main/java/com/rusefi/io/serial/SerialIoStream.java
View File

@ -8,7 +8,7 @@ import com.opensr5.io.DataListener;
import com.rusefi.binaryprotocol.IncomingDataBuffer; import com.rusefi.binaryprotocol.IncomingDataBuffer;
import com.rusefi.binaryprotocol.test.Bug3923; import com.rusefi.binaryprotocol.test.Bug3923;
import com.rusefi.io.IoStream; import com.rusefi.io.IoStream;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable;
import java.io.IOException; import java.io.IOException;
@ -17,6 +17,7 @@ import static com.devexperts.logging.Logging.getLogging;
public class SerialIoStream extends AbstractIoStream { public class SerialIoStream extends AbstractIoStream {
static Logging log = getLogging(SerialIoStream.class); static Logging log = getLogging(SerialIoStream.class);
@Nullable // null in case of port open error, for instance lack of permissions on Unix
protected final SerialPort sp; protected final SerialPort sp;
protected final String port; protected final String port;
private boolean withListener; private boolean withListener;
@ -25,7 +26,7 @@ public class SerialIoStream extends AbstractIoStream {
log.info("Using com.fazecast.jSerialComm " + SerialPort.getVersion()); log.info("Using com.fazecast.jSerialComm " + SerialPort.getVersion());
} }
public SerialIoStream(SerialPort sp, String port) { public SerialIoStream(@Nullable SerialPort sp, String port) {
this.sp = sp; this.sp = sp;
this.port = port; this.port = port;
} }
@ -37,11 +38,16 @@ public class SerialIoStream extends AbstractIoStream {
return new SerialIoStream(serialPort, port); return new SerialIoStream(serialPort, port);
} }
@NotNull @Nullable
protected static SerialPort openSerial(String port) { protected static SerialPort openSerial(String port) {
SerialPort serialPort = SerialPort.getCommPort(port); SerialPort serialPort = SerialPort.getCommPort(port);
serialPort.setBaudRate(BaudRateHolder.INSTANCE.baudRate); serialPort.setBaudRate(BaudRateHolder.INSTANCE.baudRate);
serialPort.openPort(0); boolean openedOk = serialPort.openPort(0);
if (!openedOk) {
log.error("Error opening " + port + " maybe no permissions?");
// todo: leverage jSerialComm method once we start using version 2.9+
return null;
}
return serialPort; return serialPort;
} }
@ -54,7 +60,8 @@ public class SerialIoStream extends AbstractIoStream {
public void close() { public void close() {
log.info(port + ": Closing port..."); log.info(port + ": Closing port...");
super.close(); super.close();
sp.closePort(); if (sp != null)
sp.closePort();
log.info(port + ": Closed port."); log.info(port + ": Closed port.");
} }
@ -62,6 +69,8 @@ public class SerialIoStream extends AbstractIoStream {
public void write(byte[] bytes) throws IOException { public void write(byte[] bytes) throws IOException {
if (Bug3923.obscene) if (Bug3923.obscene)
log.info("Writing " + bytes.length + " byte(s)"); log.info("Writing " + bytes.length + " byte(s)");
if (sp == null)
throw new IOException("Port was never opened");
int written = sp.writeBytes(bytes, bytes.length); int written = sp.writeBytes(bytes, bytes.length);
@ -86,6 +95,8 @@ public class SerialIoStream extends AbstractIoStream {
throw new IllegalStateException("Not possible to change listener"); throw new IllegalStateException("Not possible to change listener");
} }
withListener = true; withListener = true;
if (sp == null)
return;
sp.addDataListener(new SerialPortDataListener() { sp.addDataListener(new SerialPortDataListener() {
private boolean isFirstEvent = true; private boolean isFirstEvent = true;