Linux is asking for SocketCAN ISO-TP console connector #4123

progress towards UI

java_console/io/src/main/java/com/rusefi/io/LinkManager.java

@@ -10,6 +10,7 @@ import com.rusefi.core.EngineState;
 import com.rusefi.io.serial.BufferedSerialIoStream;
 import com.rusefi.io.serial.StreamConnector;
 import com.rusefi.io.stream.PCanIoStream;
+import com.rusefi.io.stream.SocketCANIoStream;
 import com.rusefi.io.tcp.TcpConnector;
 import com.rusefi.io.tcp.TcpIoStream;
 import com.rusefi.util.IoUtils;
@@ -33,6 +34,7 @@ import static com.devexperts.logging.Logging.getLogging;
 public class LinkManager implements Closeable {
     private static final Logging log = getLogging(LinkManager.class);
     public static final String PCAN = "PCAN";
+    public static final String SOCKET_CAN = "SocketCAN";
 
     @NotNull
     public static LogLevel LOG_LEVEL = LogLevel.INFO;
@@ -231,7 +233,10 @@ public class LinkManager implements Closeable {
         if (isLogViewerMode(port)) {
             setConnector(LinkConnector.VOID);
         } else if (PCAN.equals(port)) {
-            Callable<IoStream> streamFactory = PCanIoStream::getPCANIoStream;
+            Callable<IoStream> streamFactory = PCanIoStream::createStream;
+            setConnector(new StreamConnector(this, streamFactory));
+        } else if (SOCKET_CAN.equals(port)) {
+            Callable<IoStream> streamFactory = SocketCANIoStream::createStream;
             setConnector(new StreamConnector(this, streamFactory));
         } else if (TcpConnector.isTcpPort(port)) {
             Callable<IoStream> streamFactory = new Callable<IoStream>() {

java_console/io/src/main/java/com/rusefi/io/stream/PCanIoStream.java

@@ -47,7 +47,7 @@ public class PCanIoStream extends AbstractIoStream {
     };
 
     @Nullable
-    public static PCanIoStream getPCANIoStream() {
+    public static PCanIoStream createStream() {
         PCANBasic can = new PCANBasic();
         can.initializeAPI();
         TPCANStatus status = can.Initialize(CHANNEL, TPCANBaudrate.PCAN_BAUD_500K, TPCANType.PCAN_TYPE_NONE, 0, (short) 0);

java_console/io/src/main/java/com/rusefi/io/stream/SocketCANIoStream.java

@@ -66,7 +66,7 @@ public class SocketCANIoStream extends AbstractIoStream {
 
     public SocketCANIoStream() {
         try {
-            NetworkDevice canInterface = NetworkDevice.lookup("can0");
+            NetworkDevice canInterface = NetworkDevice.lookup(System.getProperty("CAN_DEVICE_NAME", "can0"));
             socket = CanChannels.newRawChannel();
             socket.bind(canInterface);
 
@@ -122,4 +122,8 @@ public class SocketCANIoStream extends AbstractIoStream {
     public IncomingDataBuffer getDataBuffer() {
         return dataBuffer;
     }
+
+    public static IoStream createStream() {
+        return new SocketCANIoStream();
+    }
 }

java_console/io/src/test/java/com/rusefi/binaryprotocol/test/PCanSandbox.java

@@ -20,7 +20,7 @@ public class PCanSandbox {
     private static final Logging log = getLogging(PCanSandbox.class);
 
     public static void main(String[] args) throws IOException, InterruptedException {
-        AbstractIoStream tsStream = PCanIoStream.getPCANIoStream();
+        AbstractIoStream tsStream = PCanIoStream.createStream();
         if (tsStream == null)
             throw new IOException("No PCAN");
 

java_console/logging/src/main/java/com/rusefi/FileLog.java

@@ -59,6 +59,10 @@ public enum FileLog {
         }
     }
 
+    public static boolean isLinux() {
+        return getOsName().equalsIgnoreCase("Linux");
+    }
+
     public static String getOsName() {
         return System.getProperty("os.name");
     }

java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java

@@ -9,6 +9,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import static com.rusefi.FileLog.isLinux;
+
 /**
  * @author Andrey Belomutskiy
  */
@@ -18,6 +20,7 @@ public enum SerialPortScanner {
     private volatile boolean isRunning = true;
 
     private static final boolean SHOW_PCAN = Boolean.parseBoolean(System.getenv().get("RUSEFI_PCAN"));
+    private static final boolean SHOW_SOCKETCAN = isLinux();
 
     static final String AUTO_SERIAL = "Auto Serial";
     @NotNull
@@ -38,6 +41,8 @@ public enum SerialPortScanner {
             ports.addAll(TcpConnector.getAvailablePorts());
         if (SHOW_PCAN)
             ports.add(LinkManager.PCAN);
+        if (SHOW_SOCKETCAN)
+            ports.add(LinkManager.SOCKET_CAN);
 
         boolean isListUpdated;
         synchronized (knownPorts) {

java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java

@@ -63,7 +63,7 @@ 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 -> CANConnectorStartup.start(PCanIoStream.getPCANIoStream()), "Connect your rusEFI ECU using PCAN CAN-bus adapter");
+        registerTool("pcan_connector", strings -> CANConnectorStartup.start(PCanIoStream.createStream()), "Connect your rusEFI ECU using PCAN CAN-bus adapter");
         if (!FileLog.isWindows()) {
             registerTool("socketcan_connector", strings -> CANConnectorStartup.start(SocketCANIoStream.create()), "Connect your rusEFI ECU using SocketCAN CAN-bus adapter");
         }