From 97361b6590d0d1e861cba97e6161ae947604d996 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Tue, 3 May 2022 16:57:33 -0400
Subject: [PATCH] Linux is asking for SocketCAN ISO-TP console connector #4123

---
 .../com/rusefi/binaryprotocol/test/SocketCANSandbox.java | 2 +-
 ...CANConnectorStartup.java => CANConnectorStartup.java} | 9 ++++-----
 .../ui/src/main/java/com/rusefi/tools/ConsoleTools.java  | 5 ++++-
 3 files changed, 9 insertions(+), 7 deletions(-)
 rename java_console/ui/src/main/java/com/rusefi/tools/{PCANConnectorStartup.java => CANConnectorStartup.java} (57%)

diff --git a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/SocketCANSandbox.java b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/SocketCANSandbox.java
index 04f52f9432..b29d974bbf 100644
--- a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/SocketCANSandbox.java
+++ b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/SocketCANSandbox.java
@@ -22,7 +22,7 @@ public class SocketCANSandbox {
 /*
         for (int i = 0; i < 17; i++) {
             String signature = BinaryProtocol.getSignature(tsStream);
-            System.out.println("Got " + i + " " + signature + " signature via PCAN");
+            System.out.println("Got " + i + " " + signature + " signature via SocketCAN");
             if (signature == null || !signature.startsWith(Fields.PROTOCOL_SIGNATURE_PREFIX))
                 throw new IllegalStateException("Unexpected S " + signature);
         }
diff --git a/java_console/ui/src/main/java/com/rusefi/tools/PCANConnectorStartup.java b/java_console/ui/src/main/java/com/rusefi/tools/CANConnectorStartup.java
similarity index 57%
rename from java_console/ui/src/main/java/com/rusefi/tools/PCANConnectorStartup.java
rename to java_console/ui/src/main/java/com/rusefi/tools/CANConnectorStartup.java
index 94b92d3fa3..30cf0a1b09 100644
--- a/java_console/ui/src/main/java/com/rusefi/tools/PCANConnectorStartup.java
+++ b/java_console/ui/src/main/java/com/rusefi/tools/CANConnectorStartup.java
@@ -1,16 +1,15 @@
 package com.rusefi.tools;
 
-import com.rusefi.io.stream.PCanIoStream;
+import com.rusefi.io.serial.AbstractIoStream;
 import com.rusefi.io.tcp.BinaryProtocolProxy;
 import com.rusefi.io.tcp.TcpConnector;
 
 import java.io.IOException;
 
-public class PCANConnectorStartup {
-    public static void start() throws IOException {
-        PCanIoStream tsStream = PCanIoStream.getPCANIoStream();
+public class CANConnectorStartup {
+    public static void start(AbstractIoStream tsStream) throws IOException {
         if (tsStream == null)
-            throw new IOException("No PCAN");
+            throw new IOException("Failed to initialise connector");
 
         BinaryProtocolProxy.createProxy(tsStream, TcpConnector.DEFAULT_PORT, BinaryProtocolProxy.ClientApplicationActivityListener.VOID);
 
diff --git a/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java b/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
index 4e4d2faf3c..631d6706c8 100644
--- a/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
+++ b/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
@@ -17,6 +17,8 @@ import com.rusefi.io.ConnectionStateListener;
 import com.rusefi.io.ConnectionStatusLogic;
 import com.rusefi.io.IoStream;
 import com.rusefi.io.LinkManager;
+import com.rusefi.io.stream.PCanIoStream;
+import com.rusefi.io.stream.SocketCANIoStream;
 import com.rusefi.io.tcp.BinaryProtocolProxy;
 import com.rusefi.io.tcp.BinaryProtocolServer;
 import com.rusefi.io.tcp.ServerSocketReference;
@@ -61,7 +63,8 @@ public class ConsoleTools {
         registerTool("network_connector", strings -> NetworkConnectorStartup.start(), "Connect your rusEFI ECU to rusEFI Online");
         registerTool("network_authenticator", strings -> LocalApplicationProxy.start(), "rusEFI Online Authenticator");
         registerTool("elm327_connector", strings -> Elm327ConnectorStartup.start(), "Connect your rusEFI ECU using ELM327 CAN-bus adapter");
-        registerTool("pcan_connector", strings -> PCANConnectorStartup.start(), "Connect your rusEFI ECU using ELM327 CAN-bus adapter");
+        registerTool("pcan_connector", strings -> CANConnectorStartup.start(PCanIoStream.getPCANIoStream()), "Connect your rusEFI ECU using ELM327 CAN-bus adapter");
+        registerTool("socketcan_connector", strings -> CANConnectorStartup.start(SocketCANIoStream.create()), "Connect your rusEFI ECU using ELM327 CAN-bus adapter");
 
         registerTool("print_auth_token", args -> printAuthToken(), "Print current rusEFI Online authentication token.");
         registerTool("print_vehicle_token", args -> printVehicleToken(), "Prints vehicle access token.");