From 3b8525b52131f55ab02454b95687ff1abb0bdf5e Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 7 Aug 2020 16:37:36 -0400 Subject: [PATCH] TS SD integration #1653 --- firmware/hw_layer/mmc_card_access.cpp | 2 +- .../main/java/com/rusefi/ts_plugin/ConnectPanel.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/firmware/hw_layer/mmc_card_access.cpp b/firmware/hw_layer/mmc_card_access.cpp index c4b5e3ca11..eff9a850d5 100644 --- a/firmware/hw_layer/mmc_card_access.cpp +++ b/firmware/hw_layer/mmc_card_access.cpp @@ -208,7 +208,7 @@ void handleTsR(ts_channel_s *tsChannel, char *input) { uint16_t blockNumber = SWAP_UINT16(data16[1]); scheduleMsg(&sharedLogger, "TS_SD: fetch data command blockNumber=%d", blockNumber); - int offset = blockNumber * TRANSFER_SIZE; +// int offset = blockNumber * TRANSFER_SIZE; buffer[0] = input[2]; buffer[1] = input[3]; 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 382741286a..9e8411ff36 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.rusefi.autodetect.PortDetector; import com.rusefi.io.ConnectionStateListener; import com.rusefi.io.LinkManager; @@ -40,8 +41,15 @@ public class ConnectPanel { .setCompositeLogicEnabled(false) .setNeedPullData(false); - //controllerConnector.startAndConnect(":2390", ConnectionStateListener.VOID); - controllerConnector.startAndConnect(":29001", new ConnectionStateListener() { + String autoDetectedPort = PortDetector.autoDetectSerial(null); + if (autoDetectedPort == null) { + status.setText("rusEFI not detected"); + return; + } + + //":2390" + //String port = ":29001"; + controllerConnector.startAndConnect(autoDetectedPort, new ConnectionStateListener() { public void onConnectionEstablished() { status.setText("Connected to rusEFI"); disconnect.setEnabled(true);