From 6fd56cffdb93ac48db6ded762a15f0eee7c398fc Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 7 Aug 2020 20:29:42 -0400 Subject: [PATCH] TS SD integration #1653 --- .../src/main/java/com/rusefi/ts_plugin/ConnectPanel.java | 1 + .../src/main/java/com/rusefi/ts_plugin/SdCardReader.java | 7 ++++--- 2 files changed, 5 insertions(+), 3 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 d56369a064..c1a4a8a8f6 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 @@ -43,6 +43,7 @@ public class ConnectPanel { String autoDetectedPort = PortDetector.autoDetectSerial(null); if (autoDetectedPort == null) { + connect.setEnabled(true); status.setText("rusEFI not detected"); return; } 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 46d9f93913..0a193a9fdb 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 @@ -76,15 +76,16 @@ public class SdCardReader { topPanel.add(lowPanel, BorderLayout.SOUTH); content.add(topPanel, BorderLayout.NORTH); - content.add(fileList, BorderLayout.CENTER); + + JScrollPane fileListScroll = new JScrollPane(fileList, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + content.add(fileListScroll, BorderLayout.CENTER); content.add(new JLabel("This tab allows direct access to SD card
Please be sure to disconnect Tuner Studio from ECU while downloading files using this tab"), BorderLayout.SOUTH); } @NotNull private String getDestinationFolder(Supplier controllerAccessSupplier) { - String folder = LogUploadSelector.getLogsFolderDir(controllerAccessSupplier.get().getEcuConfigurationNames()[0]); - return folder; + return LogUploadSelector.getLogsFolderDir(controllerAccessSupplier.get().getEcuConfigurationNames()[0]); } public Component getContent() {