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

proxy progress

This commit is contained in:
rusefi 2020-07-08 16:45:08 -04:00
parent b9a7efa3ac
commit ebecc65404
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
View File

@ -118,7 +118,7 @@ public class BinaryProtocol implements BinaryProtocolCommands {
} }
}; };
incomingData = createDataBuffer(stream, logger); incomingData = IncomingDataBuffer.createDataBuffer(stream, logger);
Runtime.getRuntime().addShutdownHook(hook); Runtime.getRuntime().addShutdownHook(hook);
rpmListener = value -> { rpmListener = value -> {
if (value <= COMPOSITE_OFF_RPM) { if (value <= COMPOSITE_OFF_RPM) {
@ -131,12 +131,6 @@ public class BinaryProtocol implements BinaryProtocolCommands {
}; };
} }
public static IncomingDataBuffer createDataBuffer(IoStream stream, Logger logger) {
IncomingDataBuffer incomingData = new IncomingDataBuffer(logger);
stream.setInputListener(incomingData::addData);
return incomingData;
}
public static void sleep(int millis) { public static void sleep(int millis) {
try { try {
Thread.sleep(millis); Thread.sleep(millis);

7
java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java
View File

@ -3,6 +3,7 @@ package com.rusefi.binaryprotocol;
import com.opensr5.Logger; import com.opensr5.Logger;
import com.rusefi.Timeouts; import com.rusefi.Timeouts;
import com.rusefi.config.generated.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.io.IoStream;
import etch.util.CircularByteBuffer; import etch.util.CircularByteBuffer;
import net.jcip.annotations.ThreadSafe; import net.jcip.annotations.ThreadSafe;
@ -31,6 +32,12 @@ public class IncomingDataBuffer {
this.logger = logger; this.logger = logger;
} }
public static IncomingDataBuffer createDataBuffer(IoStream stream, Logger logger) {
IncomingDataBuffer incomingData = new IncomingDataBuffer(logger);
stream.setInputListener(incomingData::addData);
return incomingData;
}
public byte[] getPacket(Logger logger, String msg, boolean allowLongResponse) throws InterruptedException, EOFException { public byte[] getPacket(Logger logger, String msg, boolean allowLongResponse) throws InterruptedException, EOFException {
return getPacket(logger, msg, allowLongResponse, System.currentTimeMillis()); return getPacket(logger, msg, allowLongResponse, System.currentTimeMillis());
} }

3
java_console/ui/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java
View File

@ -2,7 +2,6 @@ package com.rusefi.autodetect;
import com.opensr5.Logger; import com.opensr5.Logger;
import com.rusefi.FileLog; import com.rusefi.FileLog;
import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.BinaryProtocolCommands; import com.rusefi.binaryprotocol.BinaryProtocolCommands;
import com.rusefi.binaryprotocol.IncomingDataBuffer; import com.rusefi.binaryprotocol.IncomingDataBuffer;
import com.rusefi.config.generated.Fields; import com.rusefi.config.generated.Fields;
@ -40,7 +39,7 @@ public class SerialAutoChecker implements Runnable {
public void run() { public void run() {
IoStream stream = SerialIoStreamJSerialComm.openPort(serialPort, logger); IoStream stream = SerialIoStreamJSerialComm.openPort(serialPort, logger);
Logger logger = FileLog.LOGGER; Logger logger = FileLog.LOGGER;
IncomingDataBuffer incomingData = BinaryProtocol.createDataBuffer(stream, logger); IncomingDataBuffer incomingData = IncomingDataBuffer.createDataBuffer(stream, logger);
try { try {
stream.sendPacket(new byte[]{BinaryProtocolCommands.COMMAND_HELLO}, logger); stream.sendPacket(new byte[]{BinaryProtocolCommands.COMMAND_HELLO}, logger);
byte[] response = incomingData.getPacket(logger, "", false); byte[] response = incomingData.getPacket(logger, "", false);

2
java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
View File

@ -308,7 +308,7 @@ public class ConsoleTools {
} }
IoStream stream = SerialIoStreamJSerialComm.openPort(autoDetectedPort, FileLog.LOGGER); IoStream stream = SerialIoStreamJSerialComm.openPort(autoDetectedPort, FileLog.LOGGER);
Logger logger = FileLog.LOGGER; Logger logger = FileLog.LOGGER;
IncomingDataBuffer incomingData = BinaryProtocol.createDataBuffer(stream, logger); IncomingDataBuffer incomingData = IncomingDataBuffer.createDataBuffer(stream, logger);
byte[] commandBytes = BinaryProtocol.getTextCommandBytes("hello"); byte[] commandBytes = BinaryProtocol.getTextCommandBytes("hello");
stream.sendPacket(commandBytes, logger); stream.sendPacket(commandBytes, logger);
// skipping response // skipping response