mirror of https://github.com/FOME-Tech/fome-fw.git
refactoring
This commit is contained in:
parent
2c5ea28f36
commit
d94341c9e9
|
@ -6,7 +6,6 @@ import com.rusefi.Callable;
|
||||||
import com.rusefi.NamedThreadFactory;
|
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.binaryprotocol.IncomingDataBuffer;
|
|
||||||
import com.rusefi.core.EngineState;
|
import com.rusefi.core.EngineState;
|
||||||
import com.rusefi.io.serial.StreamConnector;
|
import com.rusefi.io.serial.StreamConnector;
|
||||||
import com.rusefi.io.serial.SerialIoStreamJSerialComm;
|
import com.rusefi.io.serial.SerialIoStreamJSerialComm;
|
||||||
|
@ -201,12 +200,10 @@ public class LinkManager {
|
||||||
setConnector(new StreamConnector(this, port, logger, streamFactory));
|
setConnector(new StreamConnector(this, port, logger, streamFactory));
|
||||||
isSimulationMode = true;
|
isSimulationMode = true;
|
||||||
} else {
|
} else {
|
||||||
Callable<IoStream> ioStreamCallable = () -> SerialIoStreamJSerialComm.openPort(port, logger);
|
Callable<IoStream> ioStreamCallable = new Callable<IoStream>() {
|
||||||
|
|
||||||
Callable<IoStream> ioStreamCallable1 = new Callable<IoStream>() {
|
|
||||||
@Override
|
@Override
|
||||||
public IoStream call() {
|
public IoStream call() {
|
||||||
IoStream stream = ioStreamCallable.call();
|
IoStream stream = ((Callable<IoStream>) () -> SerialIoStreamJSerialComm.openPort(port, logger)).call();
|
||||||
if (stream == null) {
|
if (stream == null) {
|
||||||
// error already reported
|
// error already reported
|
||||||
return null;
|
return null;
|
||||||
|
@ -214,7 +211,7 @@ public class LinkManager {
|
||||||
return stream;
|
return stream;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
setConnector(new StreamConnector(this, port, logger, ioStreamCallable1));
|
setConnector(new StreamConnector(this, port, logger, ioStreamCallable));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue