From dd72595adb0cdf30807fa83b1ae9f19f1bfa5bca Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 22 May 2024 09:33:17 -0400 Subject: [PATCH] only: COMMANDS_FROM_FILE first usage --- firmware/config/boards/proteus/board_commands.ini | 5 +++++ firmware/gen_config_common.sh | 2 +- firmware/tunerstudio/tunerstudio.template.ini | 4 ---- 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 firmware/config/boards/proteus/board_commands.ini diff --git a/firmware/config/boards/proteus/board_commands.ini b/firmware/config/boards/proteus/board_commands.ini new file mode 100644 index 0000000000..a85568d1fc --- /dev/null +++ b/firmware/config/boards/proteus/board_commands.ini @@ -0,0 +1,5 @@ + +cmd_set_engine_type_Proteus_M73 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_BMW_M73_16_hex@@" +cmd_set_engine_type_PROTEUS_VW_B6 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_VW_B6_16_hex@@" +cmd_set_engine_type_PROTEUS_GM_LS_4 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_GM_LS_4_16_hex@@" +cmd_set_engine_type_PROTEUS_HONDA_K = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_HONDA_K_16_hex@@" diff --git a/firmware/gen_config_common.sh b/firmware/gen_config_common.sh index 512a1a36ee..d93d10ad8d 100755 --- a/firmware/gen_config_common.sh +++ b/firmware/gen_config_common.sh @@ -31,6 +31,7 @@ set_board_file BOARD_DIAG_PANEL1_FILE "${BOARD_DIR}/board_diag_panel1.ini" set_board_file BOARD_DIAG_PANEL2_FILE "${BOARD_DIR}/board_diag_panel2.ini" COMMON_GEN_CONFIG=" + -prepend integration/ts_protocol.txt \ -readfile OUTPUTS_SECTION_FROM_FILE ${META_OUTPUT_ROOT_FOLDER}console/binary/generated/output_channels.ini \ -readfile DATALOG_SECTION_FROM_FILE ${META_OUTPUT_ROOT_FOLDER}console/binary/generated/data_logs.ini \ -readfile LIVE_DATA_MENU_FROM_FILE ${META_OUTPUT_ROOT_FOLDER}console/binary/generated/fancy_menu.ini \ @@ -60,7 +61,6 @@ COMMON_GEN_CONFIG=" -signature tunerstudio/generated/signature_${SHORT_BOARD_NAME}.txt \ -signature_destination controllers/generated/signature_${SHORT_BOARD_NAME}.h \ -ts_output_name generated/${INI} \ - -prepend integration/ts_protocol.txt \ -prepend integration/rusefi_config_trigger.txt \ -prepend ${BOARD_DIR}/prepend.txt \ -board ${BOARD_DIR}" diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini index 40aa38ddd7..e480817b6f 100644 --- a/firmware/tunerstudio/tunerstudio.template.ini +++ b/firmware/tunerstudio/tunerstudio.template.ini @@ -2379,10 +2379,6 @@ 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@@" -cmd_set_engine_type_Proteus_M73 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_BMW_M73_16_hex@@"@@if_show_Proteus_presets -cmd_set_engine_type_PROTEUS_VW_B6 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_VW_B6_16_hex@@"@@if_show_Proteus_presets -cmd_set_engine_type_PROTEUS_GM_LS_4 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_GM_LS_4_16_hex@@"@@if_show_Proteus_presets -cmd_set_engine_type_PROTEUS_HONDA_K = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_HONDA_K_16_hex@@"@@if_show_Proteus_presets 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