From a15c7104fdf49b08ddc656c032ecb775d888f1cb Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 8 Jul 2020 16:49:47 -0400 Subject: [PATCH] proxy progress --- .../main/java/com/rusefi/binaryprotocol/BinaryProtocol.java | 4 ++-- .../io/src/main/java/com/rusefi/io/serial/PortHolder.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java index f8ce374fb4..45b808ee6d 100644 --- a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java +++ b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java @@ -106,7 +106,7 @@ public class BinaryProtocol implements BinaryProtocolCommands { private final Thread hook = new Thread(() -> closeComposites()); - public BinaryProtocol(LinkManager linkManager, final Logger logger, IoStream stream) { + public BinaryProtocol(LinkManager linkManager, final Logger logger, IoStream stream, IncomingDataBuffer dataBuffer) { this.linkManager = linkManager; this.logger = logger; this.stream = stream; @@ -118,7 +118,7 @@ public class BinaryProtocol implements BinaryProtocolCommands { } }; - incomingData = IncomingDataBuffer.createDataBuffer(stream, logger); + incomingData = dataBuffer; Runtime.getRuntime().addShutdownHook(hook); rpmListener = value -> { if (value <= COMPOSITE_OFF_RPM) { diff --git a/java_console/io/src/main/java/com/rusefi/io/serial/PortHolder.java b/java_console/io/src/main/java/com/rusefi/io/serial/PortHolder.java index cd2e07fb44..f6ac287fd9 100644 --- a/java_console/io/src/main/java/com/rusefi/io/serial/PortHolder.java +++ b/java_console/io/src/main/java/com/rusefi/io/serial/PortHolder.java @@ -3,6 +3,7 @@ package com.rusefi.io.serial; import com.opensr5.Logger; import com.rusefi.Callable; import com.rusefi.binaryprotocol.BinaryProtocol; +import com.rusefi.binaryprotocol.IncomingDataBuffer; import com.rusefi.core.MessagesCentral; import com.rusefi.io.ConnectionStateListener; import com.opensr5.io.DataListener; @@ -53,7 +54,7 @@ public class PortHolder { return false; } synchronized (portLock) { - bp = new BinaryProtocol(linkManager, logger, stream); + bp = new BinaryProtocol(linkManager, logger, stream, IncomingDataBuffer.createDataBuffer(stream, logger)); portLock.notifyAll(); }