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

proxy progress

This commit is contained in:
rusefi 2020-07-08 20:09:07 -04:00
parent 3b399ab655
commit 9cd91aafcb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java_console/io/src/main/java/com/rusefi/io/LinkManager.java
View File

@ -7,7 +7,7 @@ import com.rusefi.NamedThreadFactory;
import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.BinaryProtocolState; import com.rusefi.binaryprotocol.BinaryProtocolState;
import com.rusefi.core.EngineState; import com.rusefi.core.EngineState;
import com.rusefi.io.serial.SerialConnector; import com.rusefi.io.serial.StreamConnector;
import com.rusefi.io.serial.SerialIoStreamJSerialComm; import com.rusefi.io.serial.SerialIoStreamJSerialComm;
import com.rusefi.io.tcp.TcpConnector; import com.rusefi.io.tcp.TcpConnector;
import com.rusefi.io.tcp.TcpIoStream; import com.rusefi.io.tcp.TcpIoStream;
@ -179,7 +179,7 @@ public class LinkManager {
if (isLogViewerMode(port)) { if (isLogViewerMode(port)) {
setConnector(LinkConnector.VOID); setConnector(LinkConnector.VOID);
} else if (TcpConnector.isTcpPort(port)) { } else if (TcpConnector.isTcpPort(port)) {
setConnector(new SerialConnector(this, port, logger, new Callable<IoStream>() { setConnector(new StreamConnector(this, port, logger, new Callable<IoStream>() {
@Override @Override
public IoStream call() { public IoStream call() {
Socket socket; Socket socket;
@ -196,7 +196,7 @@ public class LinkManager {
})); }));
isSimulationMode = true; isSimulationMode = true;
} else { } else {
setConnector(new SerialConnector(this, port, logger, () -> SerialIoStreamJSerialComm.openPort(port, logger))); setConnector(new StreamConnector(this, port, logger, () -> SerialIoStreamJSerialComm.openPort(port, logger)));
} }
} }

8
java_console/io/src/main/java/com/rusefi/io/serial/SerialConnector.java → java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java
View File

@ -14,13 +14,13 @@ import com.rusefi.io.LinkManager;
* @author Andrey Belomutskiy * @author Andrey Belomutskiy
* 3/3/14 * 3/3/14
*/ */
public class SerialConnector implements LinkConnector { public class StreamConnector implements LinkConnector {
private final PortHolder portHolder; private final PortHolder portHolder;
private final Logger logger; private final Logger logger;
private final LinkManager linkManager; private final LinkManager linkManager;
public SerialConnector(LinkManager linkManager, String portName, Logger logger, Callable<IoStream> streamFactory) { public StreamConnector(LinkManager linkManager, String portName, Logger logger, Callable<IoStream> streamFactory) {
this.linkManager = linkManager; this.linkManager = linkManager;
this.logger = logger; this.logger = logger;
@ -43,7 +43,7 @@ public class SerialConnector implements LinkConnector {
@Override @Override
public void connectAndReadConfiguration(ConnectionStateListener listener) { public void connectAndReadConfiguration(ConnectionStateListener listener) {
logger.info("SerialConnector: connecting"); logger.info("StreamConnector: connecting");
portHolder.listener = listener; portHolder.listener = listener;
logger.info("scheduleOpening"); logger.info("scheduleOpening");
linkManager.execute(new Runnable() { linkManager.execute(new Runnable() {
@ -70,7 +70,7 @@ public class SerialConnector implements LinkConnector {
linkManager.execute(new Runnable() { linkManager.execute(new Runnable() {
@Override @Override
public void run() { public void run() {
MessagesCentral.getInstance().postMessage(logger, SerialConnector.this.getClass(), "Restarting serial IO"); MessagesCentral.getInstance().postMessage(logger, StreamConnector.this.getClass(), "Restarting serial IO");
portHolder.close(); portHolder.close();
portHolder.connectAndReadConfiguration(); portHolder.connectAndReadConfiguration();
} }