From 906c4d498c25b70777517a6378a8fea3f1b5f3e2 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 22 May 2024 10:04:40 -0400 Subject: [PATCH] COMMANDS_FROM_FILE --- firmware/gen_config_common.sh | 1 + firmware/integration/rusefi_config.txt | 3 +-- firmware/integration/rusefi_config_protocol.txt | 6 ++++++ firmware/tunerstudio/tunerstudio.template.ini | 3 +-- 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 firmware/integration/rusefi_config_protocol.txt diff --git a/firmware/gen_config_common.sh b/firmware/gen_config_common.sh index 3d946b8134..33be1878fc 100755 --- a/firmware/gen_config_common.sh +++ b/firmware/gen_config_common.sh @@ -40,6 +40,7 @@ COMMON_GEN_CONFIG=" -readfile BOARD_PANELS_FROM_FILE ${BOARD_PANELS_FILE} \ -readfile BOARD_INDICATORS_FROM_FILE ${BOARD_INDICATORS_FILE} \ -readfile BOARD_GAUGES_FROM_FILE ${BOARD_GAUGES_FILE} \ + -prepend integration/rusefi_config_protocol.txt \ -readfile COMMANDS_FROM_FILE ${BOARD_COMMANDS_FILE} \ -ts_destination tunerstudio \ -triggerInputFolder ../unit_tests \ diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index f1bf048e09..9feb99931d 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -2369,8 +2369,7 @@ end_struct #define TS_CHUNK_WRITE_COMMAND 'C' ! 0x42 burnCommand #define TS_BURN_COMMAND 'B' -! 0x77 -#define TS_IO_TEST_COMMAND 'Z' +! see also rusefi_config_protocol.txt #define TS_RESPONSE_OK 0 #define TS_RESPONSE_BURN_OK 4 diff --git a/firmware/integration/rusefi_config_protocol.txt b/firmware/integration/rusefi_config_protocol.txt new file mode 100644 index 0000000000..ec8180c23b --- /dev/null +++ b/firmware/integration/rusefi_config_protocol.txt @@ -0,0 +1,6 @@ +! +! board_commands.ini is one of consumers thus order of includes matters +! + +! 0x77 +#define TS_IO_TEST_COMMAND 'Z' diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini index 1452d93739..a5bf0eac29 100644 --- a/firmware/tunerstudio/tunerstudio.template.ini +++ b/firmware/tunerstudio/tunerstudio.template.ini @@ -2272,8 +2272,6 @@ cmd_openblt = "@@TS_IO_TEST_COMMAND_char@@\x00\xbc\x00\x00" ; See 'executeTSCommand' in firmware source code -@@COMMANDS_FROM_FILE@@ - cmd_set_engine_type_HONDA_OBD1 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_HONDA_OBD1_16_hex@@" cmd_set_engine_type_microRusEFI_VW_B6 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MRE_VW_B6_16_hex@@" @@ -2314,6 +2312,7 @@ cmd_set_engine_type_Frankenso_Miata_NA6_MAP = "@@TS_IO_TEST_COMMAND_char@@@@ts cmd_set_engine_type_FUEL_BENCH = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_FUEL_BENCH_16_hex@@" +@@COMMANDS_FROM_FILE@@ cmd_set_engine_type_HONDA_OBD2A = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_HONDA_OBD2A_16_hex@@"@@if_show_Proteus_presets cmd_set_engine_type_Proteus_Miata_TCU = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MIATA_PROTEUS_TCU_16_hex@@"@@if_show_Proteus_presets cmd_set_engine_type_PROTEUS_LUA_DEMO = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_LUA_DEMO_16_hex@@"@@if_show_Proteus_presets