From 241f0402bdcf14e7f53226ca6831f75aa1799b89 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 4 Dec 2021 21:57:45 -0500 Subject: [PATCH] tune via CAN #3361 one step back - sandbox reads signature again! --- firmware/integration/rusefi_config.txt | 3 +++ .../src/main/java/com/rusefi/io/can/Elm327Connector.java | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 098ac33476..d22da05ad3 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1993,3 +1993,6 @@ end_struct #define CAN_SERIAL_RX_ID 0x100 #define CAN_SERIAL_TX_ID 0x102 + +#define CAN_ECU_SERIAL_RX_ID 0x100 +#define CAN_ECU_SERIAL_TX_ID 0x102 diff --git a/java_console/io/src/main/java/com/rusefi/io/can/Elm327Connector.java b/java_console/io/src/main/java/com/rusefi/io/can/Elm327Connector.java index 55263125fc..7321600202 100644 --- a/java_console/io/src/main/java/com/rusefi/io/can/Elm327Connector.java +++ b/java_console/io/src/main/java/com/rusefi/io/can/Elm327Connector.java @@ -23,6 +23,9 @@ public class Elm327Connector implements Closeable { private final static int TIMEOUT = 70; public static final String HELLO = "ATZ"; public static final String ELM_EOL = "\r"; + // those are inverted between ECU side and PC side + private static final int CAN_PC_SERIAL_RX_ID = Fields.CAN_SERIAL_TX_ID; + private static final int CAN_PC_SERIAL_TX_ID = Fields.CAN_SERIAL_RX_ID; private final Object lock = new Object(); @@ -63,16 +66,16 @@ public class Elm327Connector implements Closeable { sendCommand("ATSP6", "OK"); // set rx ID - sendCommand("ATCF " + Integer.toHexString(Fields.CAN_SERIAL_RX_ID), "OK"); + sendCommand("ATCF " + Integer.toHexString(CAN_PC_SERIAL_RX_ID), "OK"); // rx ID mask = "all bits set" sendCommand("ATCM FFF", "OK"); // set tx ID - sendCommand("ATSH " + Integer.toHexString(Fields.CAN_SERIAL_TX_ID), "OK"); + sendCommand("ATSH " + Integer.toHexString(CAN_PC_SERIAL_TX_ID), "OK"); // set FC tx ID (should match our tx ID) - sendCommand("ATFCSH " + Integer.toHexString(Fields.CAN_SERIAL_TX_ID), "OK"); + sendCommand("ATFCSH " + Integer.toHexString(CAN_PC_SERIAL_TX_ID), "OK"); // set FC data sendCommand("ATFCSD 30 00 00", "OK"); // use custom FC ID & data