diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 2043005dec..000c68e550 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jan 05 21:31:36 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jan 06 03:32:04 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3785,4 +3785,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jan 05 21:31:36 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jan 06 03:32:04 UTC 2021 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index d3954e445c..a553fe4fc0 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -290,6 +290,7 @@ #define CMD_TS_FSIO_CATEGORY 33 #define CMD_TS_IGNITION_CATEGORY 18 #define CMD_TS_INJECTOR_CATEGORY 19 +#define CMD_TS_SOLENOID_CATEGORY 20 #define CMD_VSS_PIN "vss_pin" #define CMD_WRITECONFIG "writeconfig" #define coastingFuelCutClt_offset 3154 @@ -1242,8 +1243,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 2103511994 +#define SIGNATURE_DATE 2021.01.06 +#define SIGNATURE_HASH 3843654885 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1575,7 +1576,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.05.hellen_cypress.2103511994" +#define TS_SIGNATURE "rusEFI 2021.01.06.hellen_cypress.3843654885" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 50e963034f..7a4d8c6e13 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jan 05 21:31:34 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jan 06 03:31:58 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3785,4 +3785,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jan 05 21:31:34 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jan 06 03:31:58 UTC 2021 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 4f4b14e408..1bce8b57ba 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -290,6 +290,7 @@ #define CMD_TS_FSIO_CATEGORY 33 #define CMD_TS_IGNITION_CATEGORY 18 #define CMD_TS_INJECTOR_CATEGORY 19 +#define CMD_TS_SOLENOID_CATEGORY 20 #define CMD_VSS_PIN "vss_pin" #define CMD_WRITECONFIG "writeconfig" #define coastingFuelCutClt_offset 3154 @@ -1242,8 +1243,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 746402112 +#define SIGNATURE_DATE 2021.01.06 +#define SIGNATURE_HASH 3020275231 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1575,7 +1576,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.05.kin.746402112" +#define TS_SIGNATURE "rusEFI 2021.01.06.kin.3020275231" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index b5be774e24..30a8339bb8 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:17 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 03:31:41 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3785,4 +3785,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:17 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 03:31:41 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 0e9f51125a..0716fd0eab 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:17 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 03:31:41 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 22e57c43ee..29a888c2a3 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:17 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 03:31:41 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index c23b118c68..04ee368161 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:17 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 03:31:41 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 19f468fd90..393f3445b3 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:17 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 03:31:41 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 5926116061..23fc7cd7bf 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -290,6 +290,7 @@ #define CMD_TS_FSIO_CATEGORY 33 #define CMD_TS_IGNITION_CATEGORY 18 #define CMD_TS_INJECTOR_CATEGORY 19 +#define CMD_TS_SOLENOID_CATEGORY 20 #define CMD_VSS_PIN "vss_pin" #define CMD_WRITECONFIG "writeconfig" #define coastingFuelCutClt_offset 3154 @@ -1242,8 +1243,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 3029380473 +#define SIGNATURE_DATE 2021.01.06 +#define SIGNATURE_HASH 753410598 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1575,7 +1576,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.05.all.3029380473" +#define TS_SIGNATURE "rusEFI 2021.01.06.all.753410598" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 047d304d56..ccd7450759 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 3029380473 -#define TS_SIGNATURE "rusEFI 2021.01.05.all.3029380473" +#define SIGNATURE_DATE 2021.01.06 +#define SIGNATURE_HASH 753410598 +#define TS_SIGNATURE "rusEFI 2021.01.06.all.753410598" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 4420b379de..765ad67eab 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 585112706 -#define TS_SIGNATURE "rusEFI 2021.01.05.frankenso_na6.585112706" +#define SIGNATURE_DATE 2021.01.06 +#define SIGNATURE_HASH 3130561501 +#define TS_SIGNATURE "rusEFI 2021.01.06.frankenso_na6.3130561501" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 0147a537fc..dfd377c611 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 2103511994 -#define TS_SIGNATURE "rusEFI 2021.01.05.hellen_cypress.2103511994" +#define SIGNATURE_DATE 2021.01.06 +#define SIGNATURE_HASH 3843654885 +#define TS_SIGNATURE "rusEFI 2021.01.06.hellen_cypress.3843654885" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 6448f56753..c13f1adc1d 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 746402112 -#define TS_SIGNATURE "rusEFI 2021.01.05.kin.746402112" +#define SIGNATURE_DATE 2021.01.06 +#define SIGNATURE_HASH 3020275231 +#define TS_SIGNATURE "rusEFI 2021.01.06.kin.3020275231" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 961b1149e6..ef3bdcd612 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 2738909952 -#define TS_SIGNATURE "rusEFI 2021.01.05.mre_f4.2738909952" +#define SIGNATURE_DATE 2021.01.06 +#define SIGNATURE_HASH 993590367 +#define TS_SIGNATURE "rusEFI 2021.01.06.mre_f4.993590367" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 2faf017c23..1087efe0b9 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 2738909952 -#define TS_SIGNATURE "rusEFI 2021.01.05.mre_f7.2738909952" +#define SIGNATURE_DATE 2021.01.06 +#define SIGNATURE_HASH 993590367 +#define TS_SIGNATURE "rusEFI 2021.01.06.mre_f7.993590367" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index ea837b8f1c..c15f09ddb6 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 4131957544 -#define TS_SIGNATURE "rusEFI 2021.01.05.prometheus_405.4131957544" +#define SIGNATURE_DATE 2021.01.06 +#define SIGNATURE_HASH 1848648823 +#define TS_SIGNATURE "rusEFI 2021.01.06.prometheus_405.1848648823" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 58ebd47cbe..7420ad62ac 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 4131957544 -#define TS_SIGNATURE "rusEFI 2021.01.05.prometheus_469.4131957544" +#define SIGNATURE_DATE 2021.01.06 +#define SIGNATURE_HASH 1848648823 +#define TS_SIGNATURE "rusEFI 2021.01.06.prometheus_469.1848648823" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 4763e3e109..6381ec6c7a 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 2101012391 -#define TS_SIGNATURE "rusEFI 2021.01.05.proteus_f4.2101012391" +#define SIGNATURE_DATE 2021.01.06 +#define SIGNATURE_HASH 3846334712 +#define TS_SIGNATURE "rusEFI 2021.01.06.proteus_f4.3846334712" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index e7d4c346f5..2c2b6ada99 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2021.01.05 -#define SIGNATURE_HASH 2101012391 -#define TS_SIGNATURE "rusEFI 2021.01.05.proteus_f7.2101012391" +#define SIGNATURE_DATE 2021.01.06 +#define SIGNATURE_HASH 3846334712 +#define TS_SIGNATURE "rusEFI 2021.01.06.proteus_f7.3846334712" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 5a5fa4e841..54c06c7042 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index ad022e02a3..4179548a7f 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.05.all.3029380473" + signature = "rusEFI 2021.01.06.all.753410598" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.all.3029380473" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.06.all.753410598" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:17 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 03:31:41 UTC 2021 pageSize = 20000 page = 1 @@ -3012,6 +3012,12 @@ cmd_test_inj10 = "Z\x00\x13\x00\x0a" cmd_test_inj11 = "Z\x00\x13\x00\x0b" cmd_test_inj12 = "Z\x00\x13\x00\x0c" +cmd_test_sol1 = "Z\x00\x14\x00\x01" +cmd_test_sol2 = "Z\x00\x14\x00\x02" +cmd_test_sol3 = "Z\x00\x14\x00\x03" +cmd_test_sol4 = "Z\x00\x14\x00\x04" +cmd_test_sol5 = "Z\x00\x14\x00\x05" +cmd_test_sol6 = "Z\x00\x14\x00\x06" cmd_test_main_relay = "Z\x00\x16\x00\x00" cmd_test_fuel_pump = "Z\x00\x16\x00\x01" @@ -3293,6 +3299,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Injector #11", cmd_test_inj11 commandButton = "Injector #12", cmd_test_inj12 + dialog = testSolenoids, "TCU Solenoid Test" + commandButton = "Solenoid #1", cmd_test_sol1 + commandButton = "Solenoid #2", cmd_test_sol2 + commandButton = "Solenoid #3", cmd_test_sol3 + commandButton = "Solenoid #4", cmd_test_sol4 + commandButton = "Solenoid #5", cmd_test_sol5 + commandButton = "Solenoid #6", cmd_test_sol6 + dialog = injectionSettingsEast, "", yAxis panel = testInjectors field = "" @@ -4701,6 +4715,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = ioTest, "Bench Test & Commands", xAxis panel = testSpark panel = testInjectors + panel = testSolenoids panel = testFsio panel = testMisc diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 798ea00cb9..42cd6b953f 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.05.frankenso_na6.585112706" + signature = "rusEFI 2021.01.06.frankenso_na6.3130561501" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.frankenso_na6.585112706" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.06.frankenso_na6.3130561501" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:24 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 03:31:47 UTC 2021 pageSize = 20000 page = 1 @@ -3012,6 +3012,12 @@ cmd_test_inj10 = "Z\x00\x13\x00\x0a" cmd_test_inj11 = "Z\x00\x13\x00\x0b" cmd_test_inj12 = "Z\x00\x13\x00\x0c" +cmd_test_sol1 = "Z\x00\x14\x00\x01" +cmd_test_sol2 = "Z\x00\x14\x00\x02" +cmd_test_sol3 = "Z\x00\x14\x00\x03" +cmd_test_sol4 = "Z\x00\x14\x00\x04" +cmd_test_sol5 = "Z\x00\x14\x00\x05" +cmd_test_sol6 = "Z\x00\x14\x00\x06" cmd_test_main_relay = "Z\x00\x16\x00\x00" cmd_test_fuel_pump = "Z\x00\x16\x00\x01" @@ -3293,6 +3299,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Injector #11", cmd_test_inj11 commandButton = "Injector #12", cmd_test_inj12 + dialog = testSolenoids, "TCU Solenoid Test" + commandButton = "Solenoid #1", cmd_test_sol1 + commandButton = "Solenoid #2", cmd_test_sol2 + commandButton = "Solenoid #3", cmd_test_sol3 + commandButton = "Solenoid #4", cmd_test_sol4 + commandButton = "Solenoid #5", cmd_test_sol5 + commandButton = "Solenoid #6", cmd_test_sol6 + dialog = injectionSettingsEast, "", yAxis panel = testInjectors field = "" @@ -4701,6 +4715,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = ioTest, "Bench Test & Commands", xAxis panel = testSpark panel = testInjectors + panel = testSolenoids panel = testFsio panel = testMisc diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 4ec7d67abd..9950f315b5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.05.hellen_cypress.2103511994" + signature = "rusEFI 2021.01.06.hellen_cypress.3843654885" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.hellen_cypress.2103511994" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.06.hellen_cypress.3843654885" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jan 05 21:31:36 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jan 06 03:32:04 UTC 2021 pageSize = 20000 page = 1 @@ -3012,6 +3012,12 @@ cmd_test_inj10 = "Z\x00\x13\x00\x0a" cmd_test_inj11 = "Z\x00\x13\x00\x0b" cmd_test_inj12 = "Z\x00\x13\x00\x0c" +cmd_test_sol1 = "Z\x00\x14\x00\x01" +cmd_test_sol2 = "Z\x00\x14\x00\x02" +cmd_test_sol3 = "Z\x00\x14\x00\x03" +cmd_test_sol4 = "Z\x00\x14\x00\x04" +cmd_test_sol5 = "Z\x00\x14\x00\x05" +cmd_test_sol6 = "Z\x00\x14\x00\x06" cmd_test_main_relay = "Z\x00\x16\x00\x00" cmd_test_fuel_pump = "Z\x00\x16\x00\x01" @@ -3293,6 +3299,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Injector #11", cmd_test_inj11 commandButton = "Injector #12", cmd_test_inj12 + dialog = testSolenoids, "TCU Solenoid Test" + commandButton = "Solenoid #1", cmd_test_sol1 + commandButton = "Solenoid #2", cmd_test_sol2 + commandButton = "Solenoid #3", cmd_test_sol3 + commandButton = "Solenoid #4", cmd_test_sol4 + commandButton = "Solenoid #5", cmd_test_sol5 + commandButton = "Solenoid #6", cmd_test_sol6 + dialog = injectionSettingsEast, "", yAxis panel = testInjectors field = "" @@ -4701,6 +4715,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = ioTest, "Bench Test & Commands", xAxis panel = testSpark panel = testInjectors + panel = testSolenoids panel = testFsio panel = testMisc diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index cfdac80d3f..6e2d1718b9 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.05.kin.746402112" + signature = "rusEFI 2021.01.06.kin.3020275231" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.kin.746402112" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.06.kin.3020275231" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jan 05 21:31:34 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jan 06 03:31:58 UTC 2021 pageSize = 20000 page = 1 @@ -3012,6 +3012,12 @@ cmd_test_inj10 = "Z\x00\x13\x00\x0a" cmd_test_inj11 = "Z\x00\x13\x00\x0b" cmd_test_inj12 = "Z\x00\x13\x00\x0c" +cmd_test_sol1 = "Z\x00\x14\x00\x01" +cmd_test_sol2 = "Z\x00\x14\x00\x02" +cmd_test_sol3 = "Z\x00\x14\x00\x03" +cmd_test_sol4 = "Z\x00\x14\x00\x04" +cmd_test_sol5 = "Z\x00\x14\x00\x05" +cmd_test_sol6 = "Z\x00\x14\x00\x06" cmd_test_main_relay = "Z\x00\x16\x00\x00" cmd_test_fuel_pump = "Z\x00\x16\x00\x01" @@ -3294,6 +3300,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Injector #11", cmd_test_inj11 commandButton = "Injector #12", cmd_test_inj12 + dialog = testSolenoids, "TCU Solenoid Test" + commandButton = "Solenoid #1", cmd_test_sol1 + commandButton = "Solenoid #2", cmd_test_sol2 + commandButton = "Solenoid #3", cmd_test_sol3 + commandButton = "Solenoid #4", cmd_test_sol4 + commandButton = "Solenoid #5", cmd_test_sol5 + commandButton = "Solenoid #6", cmd_test_sol6 + dialog = injectionSettingsEast, "", yAxis panel = testInjectors field = "" @@ -4702,6 +4716,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = ioTest, "Bench Test & Commands", xAxis panel = testSpark panel = testInjectors + panel = testSolenoids panel = testFsio panel = testMisc diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index bf4260a01d..07646477ac 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.05.mre_f4.2738909952" + signature = "rusEFI 2021.01.06.mre_f4.993590367" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.mre_f4.2738909952" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.06.mre_f4.993590367" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:22 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 03:31:45 UTC 2021 pageSize = 20000 page = 1 @@ -3008,6 +3008,12 @@ cmd_test_inj10 = "Z\x00\x13\x00\x0a" cmd_test_inj11 = "Z\x00\x13\x00\x0b" cmd_test_inj12 = "Z\x00\x13\x00\x0c" +cmd_test_sol1 = "Z\x00\x14\x00\x01" +cmd_test_sol2 = "Z\x00\x14\x00\x02" +cmd_test_sol3 = "Z\x00\x14\x00\x03" +cmd_test_sol4 = "Z\x00\x14\x00\x04" +cmd_test_sol5 = "Z\x00\x14\x00\x05" +cmd_test_sol6 = "Z\x00\x14\x00\x06" cmd_test_main_relay = "Z\x00\x16\x00\x00" cmd_test_fuel_pump = "Z\x00\x16\x00\x01" @@ -3289,6 +3295,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Injector #11", cmd_test_inj11 commandButton = "Injector #12", cmd_test_inj12 + dialog = testSolenoids, "TCU Solenoid Test" + commandButton = "Solenoid #1", cmd_test_sol1 + commandButton = "Solenoid #2", cmd_test_sol2 + commandButton = "Solenoid #3", cmd_test_sol3 + commandButton = "Solenoid #4", cmd_test_sol4 + commandButton = "Solenoid #5", cmd_test_sol5 + commandButton = "Solenoid #6", cmd_test_sol6 + dialog = injectionSettingsEast, "", yAxis panel = testInjectors field = "" @@ -4676,6 +4690,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = ioTest, "Bench Test & Commands", xAxis panel = testSpark panel = testInjectors + panel = testSolenoids panel = testFsio panel = testMisc diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index cd6f98434c..f55ebbb645 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.05.mre_f7.2738909952" + signature = "rusEFI 2021.01.06.mre_f7.993590367" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.mre_f7.2738909952" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.06.mre_f7.993590367" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:20 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 03:31:43 UTC 2021 pageSize = 20000 page = 1 @@ -3008,6 +3008,12 @@ cmd_test_inj10 = "Z\x00\x13\x00\x0a" cmd_test_inj11 = "Z\x00\x13\x00\x0b" cmd_test_inj12 = "Z\x00\x13\x00\x0c" +cmd_test_sol1 = "Z\x00\x14\x00\x01" +cmd_test_sol2 = "Z\x00\x14\x00\x02" +cmd_test_sol3 = "Z\x00\x14\x00\x03" +cmd_test_sol4 = "Z\x00\x14\x00\x04" +cmd_test_sol5 = "Z\x00\x14\x00\x05" +cmd_test_sol6 = "Z\x00\x14\x00\x06" cmd_test_main_relay = "Z\x00\x16\x00\x00" cmd_test_fuel_pump = "Z\x00\x16\x00\x01" @@ -3289,6 +3295,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Injector #11", cmd_test_inj11 commandButton = "Injector #12", cmd_test_inj12 + dialog = testSolenoids, "TCU Solenoid Test" + commandButton = "Solenoid #1", cmd_test_sol1 + commandButton = "Solenoid #2", cmd_test_sol2 + commandButton = "Solenoid #3", cmd_test_sol3 + commandButton = "Solenoid #4", cmd_test_sol4 + commandButton = "Solenoid #5", cmd_test_sol5 + commandButton = "Solenoid #6", cmd_test_sol6 + dialog = injectionSettingsEast, "", yAxis panel = testInjectors field = "" @@ -4676,6 +4690,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = ioTest, "Bench Test & Commands", xAxis panel = testSpark panel = testInjectors + panel = testSolenoids panel = testFsio panel = testMisc diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index a0977259e8..fab57628d3 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.05.prometheus_405.4131957544" + signature = "rusEFI 2021.01.06.prometheus_405.1848648823" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.prometheus_405.4131957544" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.06.prometheus_405.1848648823" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:28 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 03:31:50 UTC 2021 pageSize = 20000 page = 1 @@ -3008,6 +3008,12 @@ cmd_test_inj10 = "Z\x00\x13\x00\x0a" cmd_test_inj11 = "Z\x00\x13\x00\x0b" cmd_test_inj12 = "Z\x00\x13\x00\x0c" +cmd_test_sol1 = "Z\x00\x14\x00\x01" +cmd_test_sol2 = "Z\x00\x14\x00\x02" +cmd_test_sol3 = "Z\x00\x14\x00\x03" +cmd_test_sol4 = "Z\x00\x14\x00\x04" +cmd_test_sol5 = "Z\x00\x14\x00\x05" +cmd_test_sol6 = "Z\x00\x14\x00\x06" cmd_test_main_relay = "Z\x00\x16\x00\x00" cmd_test_fuel_pump = "Z\x00\x16\x00\x01" @@ -3289,6 +3295,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Injector #11", cmd_test_inj11 commandButton = "Injector #12", cmd_test_inj12 + dialog = testSolenoids, "TCU Solenoid Test" + commandButton = "Solenoid #1", cmd_test_sol1 + commandButton = "Solenoid #2", cmd_test_sol2 + commandButton = "Solenoid #3", cmd_test_sol3 + commandButton = "Solenoid #4", cmd_test_sol4 + commandButton = "Solenoid #5", cmd_test_sol5 + commandButton = "Solenoid #6", cmd_test_sol6 + dialog = injectionSettingsEast, "", yAxis panel = testInjectors field = "" @@ -4697,6 +4711,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = ioTest, "Bench Test & Commands", xAxis panel = testSpark panel = testInjectors + panel = testSolenoids panel = testFsio panel = testMisc diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 97419efe31..fdfa5d46b0 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.05.prometheus_469.4131957544" + signature = "rusEFI 2021.01.06.prometheus_469.1848648823" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.prometheus_469.4131957544" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.06.prometheus_469.1848648823" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:26 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 03:31:48 UTC 2021 pageSize = 20000 page = 1 @@ -3008,6 +3008,12 @@ cmd_test_inj10 = "Z\x00\x13\x00\x0a" cmd_test_inj11 = "Z\x00\x13\x00\x0b" cmd_test_inj12 = "Z\x00\x13\x00\x0c" +cmd_test_sol1 = "Z\x00\x14\x00\x01" +cmd_test_sol2 = "Z\x00\x14\x00\x02" +cmd_test_sol3 = "Z\x00\x14\x00\x03" +cmd_test_sol4 = "Z\x00\x14\x00\x04" +cmd_test_sol5 = "Z\x00\x14\x00\x05" +cmd_test_sol6 = "Z\x00\x14\x00\x06" cmd_test_main_relay = "Z\x00\x16\x00\x00" cmd_test_fuel_pump = "Z\x00\x16\x00\x01" @@ -3289,6 +3295,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Injector #11", cmd_test_inj11 commandButton = "Injector #12", cmd_test_inj12 + dialog = testSolenoids, "TCU Solenoid Test" + commandButton = "Solenoid #1", cmd_test_sol1 + commandButton = "Solenoid #2", cmd_test_sol2 + commandButton = "Solenoid #3", cmd_test_sol3 + commandButton = "Solenoid #4", cmd_test_sol4 + commandButton = "Solenoid #5", cmd_test_sol5 + commandButton = "Solenoid #6", cmd_test_sol6 + dialog = injectionSettingsEast, "", yAxis panel = testInjectors field = "" @@ -4697,6 +4711,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = ioTest, "Bench Test & Commands", xAxis panel = testSpark panel = testInjectors + panel = testSolenoids panel = testFsio panel = testMisc diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index bbb61cf7a8..29aeccfbcd 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.05.proteus_f4.2101012391" + signature = "rusEFI 2021.01.06.proteus_f4.3846334712" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.proteus_f4.2101012391" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.06.proteus_f4.3846334712" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:33 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 03:31:54 UTC 2021 pageSize = 20000 page = 1 @@ -3004,6 +3004,12 @@ cmd_test_inj10 = "Z\x00\x13\x00\x0a" cmd_test_inj11 = "Z\x00\x13\x00\x0b" cmd_test_inj12 = "Z\x00\x13\x00\x0c" +cmd_test_sol1 = "Z\x00\x14\x00\x01" +cmd_test_sol2 = "Z\x00\x14\x00\x02" +cmd_test_sol3 = "Z\x00\x14\x00\x03" +cmd_test_sol4 = "Z\x00\x14\x00\x04" +cmd_test_sol5 = "Z\x00\x14\x00\x05" +cmd_test_sol6 = "Z\x00\x14\x00\x06" cmd_test_main_relay = "Z\x00\x16\x00\x00" cmd_test_fuel_pump = "Z\x00\x16\x00\x01" @@ -3285,6 +3291,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Injector #11", cmd_test_inj11 commandButton = "Injector #12", cmd_test_inj12 + dialog = testSolenoids, "TCU Solenoid Test" + commandButton = "Solenoid #1", cmd_test_sol1 + commandButton = "Solenoid #2", cmd_test_sol2 + commandButton = "Solenoid #3", cmd_test_sol3 + commandButton = "Solenoid #4", cmd_test_sol4 + commandButton = "Solenoid #5", cmd_test_sol5 + commandButton = "Solenoid #6", cmd_test_sol6 + dialog = injectionSettingsEast, "", yAxis panel = testInjectors field = "" @@ -4668,6 +4682,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = ioTest, "Bench Test & Commands", xAxis panel = testSpark panel = testInjectors + panel = testSolenoids panel = testFsio panel = testMisc diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index bc4a0523af..bcb028d9c1 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.05.proteus_f7.2101012391" + signature = "rusEFI 2021.01.06.proteus_f7.3846334712" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.05.proteus_f7.2101012391" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.06.proteus_f7.3846334712" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 05 21:31:30 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 03:31:52 UTC 2021 pageSize = 20000 page = 1 @@ -3004,6 +3004,12 @@ cmd_test_inj10 = "Z\x00\x13\x00\x0a" cmd_test_inj11 = "Z\x00\x13\x00\x0b" cmd_test_inj12 = "Z\x00\x13\x00\x0c" +cmd_test_sol1 = "Z\x00\x14\x00\x01" +cmd_test_sol2 = "Z\x00\x14\x00\x02" +cmd_test_sol3 = "Z\x00\x14\x00\x03" +cmd_test_sol4 = "Z\x00\x14\x00\x04" +cmd_test_sol5 = "Z\x00\x14\x00\x05" +cmd_test_sol6 = "Z\x00\x14\x00\x06" cmd_test_main_relay = "Z\x00\x16\x00\x00" cmd_test_fuel_pump = "Z\x00\x16\x00\x01" @@ -3285,6 +3291,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Injector #11", cmd_test_inj11 commandButton = "Injector #12", cmd_test_inj12 + dialog = testSolenoids, "TCU Solenoid Test" + commandButton = "Solenoid #1", cmd_test_sol1 + commandButton = "Solenoid #2", cmd_test_sol2 + commandButton = "Solenoid #3", cmd_test_sol3 + commandButton = "Solenoid #4", cmd_test_sol4 + commandButton = "Solenoid #5", cmd_test_sol5 + commandButton = "Solenoid #6", cmd_test_sol6 + dialog = injectionSettingsEast, "", yAxis panel = testInjectors field = "" @@ -4668,6 +4682,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = ioTest, "Bench Test & Commands", xAxis panel = testSpark panel = testInjectors + panel = testSolenoids panel = testFsio panel = testMisc diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 68b5b9c4e2..ca9f97adc3 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/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 Tue Jan 05 21:31:17 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jan 06 03:31:41 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -280,6 +280,7 @@ public class Fields { public static final int CMD_TS_FSIO_CATEGORY = 33; public static final int CMD_TS_IGNITION_CATEGORY = 18; public static final int CMD_TS_INJECTOR_CATEGORY = 19; + public static final int CMD_TS_SOLENOID_CATEGORY = 20; public static final String CMD_VSS_PIN = "vss_pin"; public static final String CMD_WRITECONFIG = "writeconfig"; public static final int coastingFuelCutClt_offset = 3154; @@ -1197,6 +1198,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; + public static final int SIGNATURE_HASH = 753410598; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1478,7 +1480,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.01.05.all.3029380473"; + public static final String TS_SIGNATURE = "rusEFI 2021.01.06.all.753410598"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_1_16 = 50; public static final int TT_TT_2JZ_1_12 = 29; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 04ecaff6b0..0035e10c56 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +