From 52b7eb5f733e75727050147b7eab2e5b753b4810 Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 7 Aug 2020 20:41:50 -0400 Subject: [PATCH] TS SD integration #1653 --- .../com/rusefi/ts_plugin/ConnectPanel.java | 52 ++++++++++++------- .../com/rusefi/ts_plugin/SdCardReader.java | 12 ++--- 2 files changed, 37 insertions(+), 27 deletions(-) diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/ConnectPanel.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/ConnectPanel.java index c1a4a8a8f6..f6b4527f8a 100644 --- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/ConnectPanel.java +++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/ConnectPanel.java @@ -1,5 +1,6 @@ package com.rusefi.ts_plugin; +import com.devexperts.logging.Logging; import com.rusefi.autodetect.PortDetector; import com.rusefi.io.ConnectionStateListener; import com.rusefi.io.LinkManager; @@ -7,11 +8,17 @@ import com.rusefi.io.LinkManager; import javax.swing.*; import java.awt.*; import java.awt.event.ActionEvent; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; + +import static com.devexperts.logging.Logging.getLogging; /** * todo: move IO away from AWT thread */ public class ConnectPanel { + private static final Logging log = getLogging(ConnectPanel.class); + static final Executor IO_THREAD = Executors.newSingleThreadExecutor(); private final JPanel content = new JPanel(new BorderLayout()); private final JLabel status = new JLabel(); @@ -36,30 +43,37 @@ public class ConnectPanel { connect.addActionListener(e -> { connect.setEnabled(false); + status.setText("Looking for rusEFI..."); - controllerConnector = new LinkManager() - .setCompositeLogicEnabled(false) - .setNeedPullData(false); + IO_THREAD.execute(() -> { + controllerConnector = new LinkManager() + .setCompositeLogicEnabled(false) + .setNeedPullData(false); - String autoDetectedPort = PortDetector.autoDetectSerial(null); - if (autoDetectedPort == null) { - connect.setEnabled(true); - status.setText("rusEFI not detected"); - return; - } + String autoDetectedPort = null; + try { + autoDetectedPort = PortDetector.autoDetectSerial(null); + controllerConnector.startAndConnect(autoDetectedPort, new ConnectionStateListener() { + public void onConnectionEstablished() { + SwingUtilities.invokeLater(() -> { + status.setText("Connected to rusEFI"); + disconnect.setEnabled(true); + connectionStateListener.onConnectionEstablished(); + }); + } - //":2390" - //String port = ":29001"; - controllerConnector.startAndConnect(autoDetectedPort, new ConnectionStateListener() { - public void onConnectionEstablished() { - SwingUtilities.invokeLater(() -> { - status.setText("Connected to rusEFI"); - disconnect.setEnabled(true); - connectionStateListener.onConnectionEstablished(); + public void onConnectionFailed() { + } + }); + + } catch (Throwable er) { + log.error("Error connecting", er); + + SwingUtilities.invokeLater(() -> { + status.setText("Not found or error, see logs."); + connect.setEnabled(true); }); - } - public void onConnectionFailed() { } }); }); diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/SdCardReader.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/SdCardReader.java index 0a193a9fdb..62c8315b22 100644 --- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/SdCardReader.java +++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/SdCardReader.java @@ -19,8 +19,6 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.text.CharacterIterator; import java.text.StringCharacterIterator; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; import java.util.function.Supplier; import static com.devexperts.logging.Logging.getLogging; @@ -35,11 +33,9 @@ public class SdCardReader { private final JPanel fileList = new JPanel(new VerticalFlowLayout()); private final JLabel status = new JLabel(); - private static final Executor IO_THREAD = Executors.newSingleThreadExecutor(); - private final ConnectPanel connectPanel = new ConnectPanel(new ConnectionStateListener() { public void onConnectionEstablished() { - IO_THREAD.execute(() -> requestFileList()); + ConnectPanel.IO_THREAD.execute(() -> requestFileList()); } public void onConnectionFailed() { @@ -50,7 +46,7 @@ public class SdCardReader { public SdCardReader(Supplier controllerAccessSupplier) { this.controllerAccessSupplier = controllerAccessSupplier; JButton refresh = new JButton("Refresh"); - refresh.addActionListener(e -> IO_THREAD.execute(this::requestFileList)); + refresh.addActionListener(e -> ConnectPanel.IO_THREAD.execute(this::requestFileList)); JPanel topPanel = new JPanel(new BorderLayout()); JPanel lowPanel = new JPanel(new FlowLayout()); @@ -118,7 +114,7 @@ public class SdCardReader { filePanel.add(new JLabel(fileName + " " + humanReadableByteCountBin(fileSize))); JButton download = new JButton("Download"); - download.addActionListener(e -> IO_THREAD.execute(() -> downloadFile(fileName))); + download.addActionListener(e -> ConnectPanel.IO_THREAD.execute(() -> downloadFile(fileName))); filePanel.add(download); JButton delete = new JButton("Delete"); @@ -127,7 +123,7 @@ public class SdCardReader { "rusEfi", JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { - IO_THREAD.execute(() -> { + ConnectPanel.IO_THREAD.execute(() -> { deleteFile(fileName); setStatus("Deleted " + fileName); requestFileList();