diff --git a/firmware/controllers/algo/auto_generated_enginetypes.cpp b/firmware/controllers/algo/auto_generated_enginetypes.cpp index 8470755b06..3f9aebf17e 100644 --- a/firmware/controllers/algo/auto_generated_enginetypes.cpp +++ b/firmware/controllers/algo/auto_generated_enginetypes.cpp @@ -1,10 +1,45 @@ #include "global.h" #include "engine_types.h" -// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Sun Nov 07 03:58:12 UTC 2021 +// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Wed Nov 10 20:00:37 EST 2021 // see also gen_config_and_enums.bat +const char *getBench_mode_e(bench_mode_e value){ +switch(value) { +case BENCH_AC_COMPRESSOR_RELAY: + return "BENCH_AC_COMPRESSOR_RELAY"; +case BENCH_CHECK_ENGINE_LIGHT: + return "BENCH_CHECK_ENGINE_LIGHT"; +case BENCH_FAN_RELAY: + return "BENCH_FAN_RELAY"; +case BENCH_FAN_RELAY_2: + return "BENCH_FAN_RELAY_2"; +case BENCH_FUEL_PUMP: + return "BENCH_FUEL_PUMP"; +case BENCH_GPPWM1_VALVE: + return "BENCH_GPPWM1_VALVE"; +case BENCH_GPPWM2_VALVE: + return "BENCH_GPPWM2_VALVE"; +case BENCH_GPPWM3_VALVE: + return "BENCH_GPPWM3_VALVE"; +case BENCH_GPPWM4_VALVE: + return "BENCH_GPPWM4_VALVE"; +case BENCH_HPFP_VALVE: + return "BENCH_HPFP_VALVE"; +case BENCH_IDLE_VALVE: + return "BENCH_IDLE_VALVE"; +case BENCH_MAIN_RELAY: + return "BENCH_MAIN_RELAY"; +case BENCH_SECOND_IDLE_VALVE: + return "BENCH_SECOND_IDLE_VALVE"; +case BENCH_STARTER_DISABLE_RELAY: + return "BENCH_STARTER_DISABLE_RELAY"; +case BENCH_STARTER_ENABLE_RELAY: + return "BENCH_STARTER_ENABLE_RELAY"; + } + return NULL; +} const char *getDebug_mode_e(debug_mode_e value){ switch(value) { case DBG_34: diff --git a/firmware/controllers/algo/auto_generated_enginetypes.h b/firmware/controllers/algo/auto_generated_enginetypes.h index ade9f9ad4d..fe00c6ae14 100644 --- a/firmware/controllers/algo/auto_generated_enginetypes.h +++ b/firmware/controllers/algo/auto_generated_enginetypes.h @@ -1,10 +1,11 @@ -// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Thu Oct 28 12:11:41 EDT 2021 +// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Wed Nov 10 20:00:37 EST 2021 // see also gen_config_and_enums.bat #include "engine_types.h" #pragma once +const char *getBench_mode_e(bench_mode_e value); const char *getDebug_mode_e(debug_mode_e value); const char *getEngine_type_e(engine_type_e value); const char *getTrigger_type_e(trigger_type_e value); diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 453dd7d95e..d9739ee5bf 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -560,3 +560,21 @@ typedef enum { TS_INJECTOR_CATEGORY = 19, TS_X14 = 20, } ts_command_e; + +typedef enum { + BENCH_MAIN_RELAY, + BENCH_FUEL_PUMP, + BENCH_STARTER_ENABLE_RELAY, + BENCH_STARTER_DISABLE_RELAY, + BENCH_FAN_RELAY, + BENCH_FAN_RELAY_2, + BENCH_AC_COMPRESSOR_RELAY, + BENCH_CHECK_ENGINE_LIGHT, + BENCH_IDLE_VALVE, + BENCH_HPFP_VALVE, + BENCH_GPPWM1_VALVE, + BENCH_GPPWM2_VALVE, + BENCH_GPPWM3_VALVE, + BENCH_GPPWM4_VALVE, + BENCH_SECOND_IDLE_VALVE, +} bench_mode_e; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 671c3988f4..95a5cf688d 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1840,23 +1840,6 @@ end_struct #define CMD_TS_X31 49 #define CMD_TS_SOLENOID_CATEGORY 41 - -#define CMD_TS_BENCH_MAIN_RELAY 0 -#define CMD_TS_BENCH_FUEL_PUMP 1 -#define CMD_TS_BENCH_STARTER_ENABLE_RELAY 2 -#define CMD_TS_BENCH_STARTER_DISABLE_RELAY 3 -#define CMD_TS_BENCH_FAN_RELAY 4 -#define CMD_TS_BENCH_FAN_RELAY_2 5 -#define CMD_TS_BENCH_AC_COMPRESSOR_RELAY 6 -#define CMD_TS_BENCH_CHECK_ENGINE_LIGHT 7 -#define CMD_TS_BENCH_IDLE_VALVE 8 -#define CMD_TS_BENCH_HPFP_VALVE 9 -#define CMD_TS_BENCH_GPPWM1_VALVE 10 -#define CMD_TS_BENCH_GPPWM2_VALVE 11 -#define CMD_TS_BENCH_GPPWM3_VALVE 12 -#define CMD_TS_BENCH_GPPWM4_VALVE 13 - - #define CMD_ENGINE_TYPE "engine_type" #define CMD_INJECTION "injection" #define CMD_IGNITION "ignition" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 9e77cd16be..b9cfbc975c 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1793,16 +1793,17 @@ cmd_test_sol4 = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_SOLENOID_CATEGORY_16_hex@@\ cmd_test_sol5 = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_SOLENOID_CATEGORY_16_hex@@\x00\x05" cmd_test_sol6 = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_SOLENOID_CATEGORY_16_hex@@\x00\x06" -cmd_test_main_relay = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_MAIN_RELAY_16_hex@@" -cmd_test_fuel_pump = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_FUEL_PUMP_16_hex@@" -cmd_test_starter_relay = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_STARTER_ENABLE_RELAY_16_hex@@" -cmd_test_starter_disable_relay = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_STARTER_DISABLE_RELAY_16_hex@@" -cmd_test_ac_relay = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_AC_COMPRESSOR_RELAY_16_hex@@" -cmd_test_fan_1 = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_FAN_RELAY_16_hex@@" -cmd_test_fan_2 = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_FAN_RELAY_2_16_hex@@" -cmd_test_check_engine_light = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_CHECK_ENGINE_LIGHT_16_hex@@" -cmd_test_idle_valve = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_IDLE_VALVE_16_hex@@" -cmd_test_hpfp_valve = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_HPFP_VALVE_16_hex@@" +cmd_test_main_relay = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_MAIN_RELAY_16_hex@@" +cmd_test_fuel_pump = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_FUEL_PUMP_16_hex@@" +cmd_test_starter_relay = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_STARTER_ENABLE_RELAY_16_hex@@" +cmd_test_starter_disable_relay = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_STARTER_DISABLE_RELAY_16_hex@@" +cmd_test_ac_relay = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_AC_COMPRESSOR_RELAY_16_hex@@" +cmd_test_fan_1 = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_FAN_RELAY_16_hex@@" +cmd_test_fan_2 = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_FAN_RELAY_2_16_hex@@" +cmd_test_check_engine_light = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_CHECK_ENGINE_LIGHT_16_hex@@" +cmd_test_idle_valve = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_IDLE_VALVE_16_hex@@" +cmd_test_second_idle_valve = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_SECOND_IDLE_VALVE_16_hex@@" +cmd_test_hpfp_valve = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_HPFP_VALVE_16_hex@@" cmd_calibrate_tps_1_closed = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_X14_16_hex@@\x00\x02" cmd_calibrate_tps_1_wot = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_X14_16_hex@@\x00\x03" @@ -3658,6 +3659,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" commandButton = "A/C Relay", cmd_test_ac_relay commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve + commandButton = "Idle Second Air Valve", cmd_test_second_idle_valve commandButton = "HPFP Valve", cmd_test_hpfp_valve commandButton = "Starter Relay", cmd_test_starter_relay commandButton = "Stop Engine", cmd_stop_engine