From de9fc7ea43c776827133837e2056217eae3c3e97 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 9 Jul 2020 23:04:46 -0400 Subject: [PATCH] proxy progress --- .../java/com/rusefi/binaryprotocol/IncomingDataBuffer.java | 7 +++++++ java_console/io/src/main/java/com/rusefi/io/IoStream.java | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java index a1e8a10a82..768601165a 100644 --- a/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java +++ b/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java @@ -155,6 +155,13 @@ public class IncomingDataBuffer { return swap32(getInt()); } + public short readShort() throws EOFException, InterruptedException { + boolean timeout = waitForBytes("readShort", System.currentTimeMillis(), 2); + if (timeout) + throw new IllegalStateException("Timeout in readShort"); + return (short) swap16(getShort()); + } + public int read(byte[] packet) throws InterruptedException { boolean timeout = waitForBytes("read", System.currentTimeMillis(), packet.length); if (timeout) diff --git a/java_console/io/src/main/java/com/rusefi/io/IoStream.java b/java_console/io/src/main/java/com/rusefi/io/IoStream.java index ae1788659b..8f7df97012 100644 --- a/java_console/io/src/main/java/com/rusefi/io/IoStream.java +++ b/java_console/io/src/main/java/com/rusefi/io/IoStream.java @@ -7,6 +7,7 @@ import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.binaryprotocol.IncomingDataBuffer; import com.rusefi.binaryprotocol.IoHelper; +import java.io.EOFException; import java.io.IOException; /** @@ -51,4 +52,8 @@ public interface IoStream extends WriteStream { void close(); IncomingDataBuffer getDataBuffer(); + + default short readShort() throws EOFException, InterruptedException { + return getDataBuffer().readShort(); + } }