From fd9b39d887d0c4c6a9b8214fb10d41cc96027d25 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 6 Sep 2020 00:27:02 -0400 Subject: [PATCH] Bench-testing for ALL assigned output pins #1758 --- firmware/controllers/bench_test.cpp | 11 ++++++++--- firmware/integration/rusefi_config.txt | 5 +++++ firmware/tunerstudio/rusefi.input | 18 ++++++++++-------- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/firmware/controllers/bench_test.cpp b/firmware/controllers/bench_test.cpp index 4329fc09b6..5003850d9d 100644 --- a/firmware/controllers/bench_test.cpp +++ b/firmware/controllers/bench_test.cpp @@ -226,6 +226,12 @@ private: static BenchController instance; +static void handleBenchCategory(uint16_t index) { + // cmd_test_check_engine_light + milBench(); + +} + static void handleCommandX14(uint16_t index) { switch (index) { case 1: @@ -305,9 +311,8 @@ void executeTSCommand(uint16_t subsystem, uint16_t index) { handleCommandX14(index); } else if (subsystem == 0x15) { fanBench(); - } else if (subsystem == 0x16) { - // cmd_test_check_engine_light - milBench(); + } else if (subsystem == CMD_TS_BENCH_CATEGORY) { + handleBenchCategory(index); } else if (subsystem == 0x17) { // cmd_test_idle_valve #if EFI_IDLE_CONTROL diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index c698fe4d26..e92c66b1c4 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1614,6 +1614,10 @@ end_struct #define CMD_RESET_ENGINE_SNIFFER "reset_engine_chart" #define CMD_FUNCTIONAL_TEST_MODE "test_mode" +#define CMD_TS_IGNITION_CATEGORY 18 +#define CMD_TS_INJECTOR_CATEGORY 19 + + // 0x16 #define CMD_TS_BENCH_CATEGORY 22 @@ -1625,6 +1629,7 @@ end_struct #define CMD_TS_BENCH_AC_FAN_RELAY 5 #define CMD_TS_BENCH_AC_COMPRESSOR_RELAY 6 #define CMD_TS_BENCH_CHECK_ENGINE_LIGHT 7 +#define CMD_TS_BENCH_IDLE_VALVE 8 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index ac7fc718cb..e6ac552c09 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1463,8 +1463,8 @@ cmd_test_spk15 = "@@TS_IO_TEST_COMMAND_char@@\x00\x12\x00\x0f" cmd_test_spk16 = "@@TS_IO_TEST_COMMAND_char@@\x00\x12\x00\x10" -cmd_test_inj1 = "@@TS_IO_TEST_COMMAND_char@@\x00\x13\x00\x01" -cmd_test_inj2 = "@@TS_IO_TEST_COMMAND_char@@\x00\x13\x00\x02" +cmd_test_inj1 = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_INJECTOR_CATEGORY@@\x00\x01" +cmd_test_inj2 = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_INJECTOR_CATEGORY@@\x00\x02" cmd_test_inj3 = "@@TS_IO_TEST_COMMAND_char@@\x00\x13\x00\x03" cmd_test_inj4 = "@@TS_IO_TEST_COMMAND_char@@\x00\x13\x00\x04" cmd_test_inj5 = "@@TS_IO_TEST_COMMAND_char@@\x00\x13\x00\x05" @@ -1477,12 +1477,14 @@ cmd_test_inj11 = "@@TS_IO_TEST_COMMAND_char@@\x00\x13\x00\x0b" cmd_test_inj12 = "@@TS_IO_TEST_COMMAND_char@@\x00\x13\x00\x0c" -cmd_test_fuel_pump = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x01" -cmd_test_starter_relay = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x0B" -cmd_test_ac_relay = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x09" -cmd_test_radiator_fan = "@@TS_IO_TEST_COMMAND_char@@\x00\x15\x00\x01" -cmd_test_check_engine_light = "@@TS_IO_TEST_COMMAND_char@@\x00\@@CMD_TS_BENCH_CATEGORY_16_hex@@\x00\x01" -cmd_test_idle_valve = "@@TS_IO_TEST_COMMAND_char@@\x00\x17\x00\x01" +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_radiator_fan = "@@TS_IO_TEST_COMMAND_char@@@@CMD_TS_BENCH_CATEGORY_16_hex@@@@CMD_TS_BENCH_FAN_RELAY_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_calibrate_tps_1_closed = "@@TS_IO_TEST_COMMAND_char@@\x00\x14\x00\x02"