From 35e68da3b062ca8d35896f58a7b06f2a1eea4744 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 20 Jun 2020 18:36:58 -0400 Subject: [PATCH] REO progress --- .../boards/kinetis/config/controllers/algo/rusefi_generated.h | 1 + firmware/console/binary/tunerstudio.cpp | 2 +- firmware/console/binary/tunerstudio_io.h | 2 -- firmware/controllers/generated/rusefi_generated.h | 1 + firmware/integration/rusefi_config.txt | 1 + .../models/src/com/rusefi/config/generated/Fields.java | 3 ++- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 1b50134e3d..2b38948c9c 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1289,6 +1289,7 @@ #define TS_PAGE_COMMAND 'P' #define TS_PERF_TRACE_BEGIN 'r' #define TS_PERF_TRACE_GET_BUFFER 'b' +#define TS_PROTOCOL "001" #define TS_READ_COMMAND 'R' #define TS_SET_LOGGER_SWITCH 'l' #define ts_show_analog_divider true diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index b3ac26f4bc..cd0b9e55bb 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -740,7 +740,7 @@ bool handlePlainCommand(ts_channel_s *tsChannel, uint8_t command) { */ tunerStudioDebug("not ignoring F"); - sr5WriteData(tsChannel, (const uint8_t *) PROTOCOL, strlen(PROTOCOL)); + sr5WriteData(tsChannel, (const uint8_t *) TS_PROTOCOL, strlen(TS_PROTOCOL)); return true; } else { // This wasn't a valid command diff --git a/firmware/console/binary/tunerstudio_io.h b/firmware/console/binary/tunerstudio_io.h index 2a744060df..63b4d06409 100644 --- a/firmware/console/binary/tunerstudio_io.h +++ b/firmware/console/binary/tunerstudio_io.h @@ -14,8 +14,6 @@ #include "pin_repository.h" #endif -#define PROTOCOL "001" - #define TS_RESPONSE_OK 0x00 #define TS_RESPONSE_BURN_OK 0x04 #define TS_RESPONSE_COMMAND_OK 0x07 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 8281735c94..c72d20eb9e 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1289,6 +1289,7 @@ #define TS_PAGE_COMMAND 'P' #define TS_PERF_TRACE_BEGIN 'r' #define TS_PERF_TRACE_GET_BUFFER 'b' +#define TS_PROTOCOL "001" #define TS_READ_COMMAND 'R' #define TS_SET_LOGGER_SWITCH 'l' #define ts_show_analog_divider true diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index b3ee4ea08b..37252be589 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1577,6 +1577,7 @@ end_struct #define PROTOCOL_WA_CHANNEL_4 "input4" +#define TS_PROTOCOL "001" // These commands are used by TunerStudio and the rusEfi console // 0x4F ochGetCommand #define TS_OUTPUT_COMMAND 'O' diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 2cb2313c05..b9fc67749b 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jun 19 00:15:35 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 20 18:31:24 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1269,6 +1269,7 @@ public class Fields { public static final char TS_PAGE_COMMAND = 'P'; public static final char TS_PERF_TRACE_BEGIN = 'r'; public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; + public static final String TS_PROTOCOL = "001"; public static final char TS_READ_COMMAND = 'R'; public static final char TS_SET_LOGGER_SWITCH = 'l'; public static final String TS_SIGNATURE = "rusEFI v1.2020.4";