From 1e61639f55aedb7ad4733ea6978527855855af56 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 28 May 2022 10:48:07 -0400 Subject: [PATCH] TS refactoring --- firmware/integration/rusefi_config.txt | 1 + .../src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 281bdfe7ba..6aa982930a 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -2019,6 +2019,7 @@ end_struct #define TS_PAGE_COMMAND 'P' ! 0x46 #define TS_COMMAND_F 'F' +#define TS_GET_PROTOCOL_VERSION_COMMAND_F 'F' ! versionInfo #define TS_GET_FIRMWARE_VERSION 'V' ! returns getFirmwareError(), works together with ind_hasFatalError diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java index ce68a25fd8..728e54525d 100644 --- a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java +++ b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java @@ -117,7 +117,9 @@ public class BinaryProtocolServer { continue; } log.info("Accepting binary protocol proxy port connection on " + port); - threadFactory.newThread(clientSocketRunnableFactory.apply(clientSocket)).start(); + Runnable clientRunnable = clientSocketRunnableFactory.apply(clientSocket); + Objects.requireNonNull(clientRunnable, "Runnable for " + clientSocket); + threadFactory.newThread(clientRunnable).start(); } }; threadFactory.newThread(runnable).start();