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 0c882ac61a..c8109cef17 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 Sun Nov 22 03:00:52 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 22 05:11:00 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3769,4 +3769,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 Sun Nov 22 03:00:52 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 22 05:11:00 UTC 2020 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 196f93e2f6..007f335b8a 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 @@ -269,6 +269,11 @@ #define CMD_TS_BENCH_CHECK_ENGINE_LIGHT 7 #define CMD_TS_BENCH_FAN_RELAY 4 #define CMD_TS_BENCH_FUEL_PUMP 1 +#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_TS_BENCH_HPFP_VALVE 9 #define CMD_TS_BENCH_IDLE_VALVE 8 #define CMD_TS_BENCH_MAIN_RELAY 0 #define CMD_TS_BENCH_STARTER_DISABLE_RELAY 3 @@ -1205,7 +1210,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 2052026216 +#define SIGNATURE_HASH 1730384411 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1535,7 +1540,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.22.hellen_cypress.2052026216" +#define TS_SIGNATURE "rusEFI 2020.11.22.hellen_cypress.1730384411" #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 818f087840..1f7405b3b5 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 Sun Nov 22 03:00:50 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 22 05:10:58 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3769,4 +3769,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 Sun Nov 22 03:00:50 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 22 05:10:58 UTC 2020 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 a2d53f9a15..7ec5ae8a82 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -269,6 +269,11 @@ #define CMD_TS_BENCH_CHECK_ENGINE_LIGHT 7 #define CMD_TS_BENCH_FAN_RELAY 4 #define CMD_TS_BENCH_FUEL_PUMP 1 +#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_TS_BENCH_HPFP_VALVE 9 #define CMD_TS_BENCH_IDLE_VALVE 8 #define CMD_TS_BENCH_MAIN_RELAY 0 #define CMD_TS_BENCH_STARTER_DISABLE_RELAY 3 @@ -1205,7 +1210,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 726881682 +#define SIGNATURE_HASH 910141665 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1535,7 +1540,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.22.kin.726881682" +#define TS_SIGNATURE "rusEFI 2020.11.22.kin.910141665" #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 c63374e46c..6f89e35f56 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 Sun Nov 22 03:00:33 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 05:10:40 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3769,4 +3769,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 Sun Nov 22 03:00:33 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 05:10:40 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index c18a9db5c5..70f8a91c58 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 Sun Nov 22 03:00:33 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 05:10:40 UTC 2020 // 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 3e6b4dd683..d2b5ce8acd 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 Sun Nov 22 03:00:33 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 05:10:40 UTC 2020 // 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 d9c76e78f1..690dae3516 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 Sun Nov 22 03:00:33 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 05:10:40 UTC 2020 // 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 f715001de1..f691dd2723 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 Sun Nov 22 03:00:33 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 05:10:40 UTC 2020 // 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 af25dd2089..f22f3f0802 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -269,6 +269,11 @@ #define CMD_TS_BENCH_CHECK_ENGINE_LIGHT 7 #define CMD_TS_BENCH_FAN_RELAY 4 #define CMD_TS_BENCH_FUEL_PUMP 1 +#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_TS_BENCH_HPFP_VALVE 9 #define CMD_TS_BENCH_IDLE_VALVE 8 #define CMD_TS_BENCH_MAIN_RELAY 0 #define CMD_TS_BENCH_STARTER_DISABLE_RELAY 3 @@ -1205,7 +1210,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 3015625131 +#define SIGNATURE_HASH 2933011672 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1535,7 +1540,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.22.all.3015625131" +#define TS_SIGNATURE "rusEFI 2020.11.22.all.2933011672" #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 7deb302d50..1fb3d2cf2f 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 3604284676 -#define TS_SIGNATURE "rusEFI 2020.11.22.all.3604284676" +#define SIGNATURE_HASH 2933011672 +#define TS_SIGNATURE "rusEFI 2020.11.22.all.2933011672" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 22e2918c89..abe05c289b 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 1084601599 -#define TS_SIGNATURE "rusEFI 2020.11.22.frankenso_na6.1084601599" +#define SIGNATURE_HASH 950175011 +#define TS_SIGNATURE "rusEFI 2020.11.22.frankenso_na6.950175011" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 84c5452f4c..855a56fb17 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 522494919 -#define TS_SIGNATURE "rusEFI 2020.11.22.hellen_cypress.522494919" +#define SIGNATURE_HASH 1730384411 +#define TS_SIGNATURE "rusEFI 2020.11.22.hellen_cypress.1730384411" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index ad17da85ff..695ef31149 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 1312332093 -#define TS_SIGNATURE "rusEFI 2020.11.22.kin.1312332093" +#define SIGNATURE_HASH 910141665 +#define TS_SIGNATURE "rusEFI 2020.11.22.kin.910141665" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 2f2f054516..1a57e1bede 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 3238386557 -#define TS_SIGNATURE "rusEFI 2020.11.22.mre_f4.3238386557" +#define SIGNATURE_HASH 3103976097 +#define TS_SIGNATURE "rusEFI 2020.11.22.mre_f4.3103976097" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index fe7cf1651d..625f499e73 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 3238386557 -#define TS_SIGNATURE "rusEFI 2020.11.22.mre_f7.3238386557" +#define SIGNATURE_HASH 3103976097 +#define TS_SIGNATURE "rusEFI 2020.11.22.mre_f7.3103976097" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 106e05a1b0..849f5045e5 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 2483880789 -#define TS_SIGNATURE "rusEFI 2020.11.22.prometheus_405.2483880789" +#define SIGNATURE_HASH 3960091273 +#define TS_SIGNATURE "rusEFI 2020.11.22.prometheus_405.3960091273" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index d58d3f12d6..242567eee1 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 2483880789 -#define TS_SIGNATURE "rusEFI 2020.11.22.prometheus_469.2483880789" +#define SIGNATURE_HASH 3960091273 +#define TS_SIGNATURE "rusEFI 2020.11.22.prometheus_469.3960091273" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 2aa6fadf7c..f83a837e55 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 528437210 -#define TS_SIGNATURE "rusEFI 2020.11.22.proteus_f4.528437210" +#define SIGNATURE_HASH 1735949830 +#define TS_SIGNATURE "rusEFI 2020.11.22.proteus_f4.1735949830" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 60e08e2c4f..b3012208fe 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2020.11.22 -#define SIGNATURE_HASH 528437210 -#define TS_SIGNATURE "rusEFI 2020.11.22.proteus_f7.528437210" +#define SIGNATURE_HASH 1735949830 +#define TS_SIGNATURE "rusEFI 2020.11.22.proteus_f7.1735949830" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 75c5342d31..b7e92e9446 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 9772a4f5ad..fbeb2ac7ba 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 2020.11.22.all.3604284676" + signature = "rusEFI 2020.11.22.all.2933011672" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.all.3604284676" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.all.2933011672" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Sun Nov 22 03:58:17 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 05:10:40 UTC 2020 pageSize = 20000 page = 1 @@ -2956,6 +2956,7 @@ cmd_test_ac_relay = "Z\x00\x16\x00\x06" cmd_test_radiator_fan = "Z\x00\x16\x00\x04" cmd_test_check_engine_light = "Z\x00\x16\x00\x07" cmd_test_idle_valve = "Z\x00\x16\x00\x08" +cmd_test_hpfp_valve = "Z\x00\x16\x00\x09" cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02" @@ -4577,6 +4578,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Radiator Fan", cmd_test_radiator_fan commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve + commandButton = "HPFP Valve", cmd_test_hpfp_valve commandButton = "A/C Relay", cmd_test_ac_relay commandButton = "Starter Relay", cmd_test_starter_relay commandButton = "Stop Engine", cmd_stop_engine diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 8d032a50e9..0b568753b7 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 2020.11.22.frankenso_na6.1084601599" + signature = "rusEFI 2020.11.22.frankenso_na6.950175011" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.frankenso_na6.1084601599" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.frankenso_na6.950175011" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Sun Nov 22 03:58:23 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 05:10:47 UTC 2020 pageSize = 20000 page = 1 @@ -2956,6 +2956,7 @@ cmd_test_ac_relay = "Z\x00\x16\x00\x06" cmd_test_radiator_fan = "Z\x00\x16\x00\x04" cmd_test_check_engine_light = "Z\x00\x16\x00\x07" cmd_test_idle_valve = "Z\x00\x16\x00\x08" +cmd_test_hpfp_valve = "Z\x00\x16\x00\x09" cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02" @@ -4577,6 +4578,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Radiator Fan", cmd_test_radiator_fan commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve + commandButton = "HPFP Valve", cmd_test_hpfp_valve commandButton = "A/C Relay", cmd_test_ac_relay commandButton = "Starter Relay", cmd_test_starter_relay commandButton = "Stop Engine", cmd_stop_engine diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 887b11875f..64c572b402 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 2020.11.22.hellen_cypress.522494919" + signature = "rusEFI 2020.11.22.hellen_cypress.1730384411" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.hellen_cypress.522494919" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.hellen_cypress.1730384411" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Sun Nov 22 03:58:33 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 22 05:11:00 UTC 2020 pageSize = 20000 page = 1 @@ -2956,6 +2956,7 @@ cmd_test_ac_relay = "Z\x00\x16\x00\x06" cmd_test_radiator_fan = "Z\x00\x16\x00\x04" cmd_test_check_engine_light = "Z\x00\x16\x00\x07" cmd_test_idle_valve = "Z\x00\x16\x00\x08" +cmd_test_hpfp_valve = "Z\x00\x16\x00\x09" cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02" @@ -4577,6 +4578,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Radiator Fan", cmd_test_radiator_fan commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve + commandButton = "HPFP Valve", cmd_test_hpfp_valve commandButton = "A/C Relay", cmd_test_ac_relay commandButton = "Starter Relay", cmd_test_starter_relay commandButton = "Stop Engine", cmd_stop_engine diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index b7fac06ea0..593965c11c 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 2020.11.22.kin.1312332093" + signature = "rusEFI 2020.11.22.kin.910141665" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.kin.1312332093" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.kin.910141665" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Sun Nov 22 03:58:31 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 22 05:10:58 UTC 2020 pageSize = 20000 page = 1 @@ -2956,6 +2956,7 @@ cmd_test_ac_relay = "Z\x00\x16\x00\x06" cmd_test_radiator_fan = "Z\x00\x16\x00\x04" cmd_test_check_engine_light = "Z\x00\x16\x00\x07" cmd_test_idle_valve = "Z\x00\x16\x00\x08" +cmd_test_hpfp_valve = "Z\x00\x16\x00\x09" cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02" @@ -4578,6 +4579,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Radiator Fan", cmd_test_radiator_fan commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve + commandButton = "HPFP Valve", cmd_test_hpfp_valve commandButton = "A/C Relay", cmd_test_ac_relay commandButton = "Starter Relay", cmd_test_starter_relay commandButton = "Stop Engine", cmd_stop_engine diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 83ce7fab36..8217f95c43 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 2020.11.22.mre_f4.3238386557" + signature = "rusEFI 2020.11.22.mre_f4.3103976097" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.mre_f4.3238386557" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.mre_f4.3103976097" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Sun Nov 22 03:58:21 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 05:10:43 UTC 2020 pageSize = 20000 page = 1 @@ -2952,6 +2952,7 @@ cmd_test_ac_relay = "Z\x00\x16\x00\x06" cmd_test_radiator_fan = "Z\x00\x16\x00\x04" cmd_test_check_engine_light = "Z\x00\x16\x00\x07" cmd_test_idle_valve = "Z\x00\x16\x00\x08" +cmd_test_hpfp_valve = "Z\x00\x16\x00\x09" cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02" @@ -4552,6 +4553,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Radiator Fan", cmd_test_radiator_fan commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve + commandButton = "HPFP Valve", cmd_test_hpfp_valve commandButton = "A/C Relay", cmd_test_ac_relay commandButton = "Starter Relay", cmd_test_starter_relay commandButton = "Stop Engine", cmd_stop_engine diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 4b9d6a85a3..0d80f6078c 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 2020.11.22.mre_f7.3238386557" + signature = "rusEFI 2020.11.22.mre_f7.3103976097" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.mre_f7.3238386557" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.mre_f7.3103976097" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Sun Nov 22 03:58:20 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 05:10:41 UTC 2020 pageSize = 20000 page = 1 @@ -2952,6 +2952,7 @@ cmd_test_ac_relay = "Z\x00\x16\x00\x06" cmd_test_radiator_fan = "Z\x00\x16\x00\x04" cmd_test_check_engine_light = "Z\x00\x16\x00\x07" cmd_test_idle_valve = "Z\x00\x16\x00\x08" +cmd_test_hpfp_valve = "Z\x00\x16\x00\x09" cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02" @@ -4552,6 +4553,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Radiator Fan", cmd_test_radiator_fan commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve + commandButton = "HPFP Valve", cmd_test_hpfp_valve commandButton = "A/C Relay", cmd_test_ac_relay commandButton = "Starter Relay", cmd_test_starter_relay commandButton = "Stop Engine", cmd_stop_engine diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 153afd96a9..e87354143a 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 2020.11.22.prometheus_405.2483880789" + signature = "rusEFI 2020.11.22.prometheus_405.3960091273" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.prometheus_405.2483880789" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.prometheus_405.3960091273" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Sun Nov 22 03:58:26 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 05:10:53 UTC 2020 pageSize = 20000 page = 1 @@ -2952,6 +2952,7 @@ cmd_test_ac_relay = "Z\x00\x16\x00\x06" cmd_test_radiator_fan = "Z\x00\x16\x00\x04" cmd_test_check_engine_light = "Z\x00\x16\x00\x07" cmd_test_idle_valve = "Z\x00\x16\x00\x08" +cmd_test_hpfp_valve = "Z\x00\x16\x00\x09" cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02" @@ -4573,6 +4574,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Radiator Fan", cmd_test_radiator_fan commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve + commandButton = "HPFP Valve", cmd_test_hpfp_valve commandButton = "A/C Relay", cmd_test_ac_relay commandButton = "Starter Relay", cmd_test_starter_relay commandButton = "Stop Engine", cmd_stop_engine diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 1f8930bbbd..0cd0ca93d2 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 2020.11.22.prometheus_469.2483880789" + signature = "rusEFI 2020.11.22.prometheus_469.3960091273" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.prometheus_469.2483880789" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.prometheus_469.3960091273" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Sun Nov 22 03:58:25 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 05:10:52 UTC 2020 pageSize = 20000 page = 1 @@ -2952,6 +2952,7 @@ cmd_test_ac_relay = "Z\x00\x16\x00\x06" cmd_test_radiator_fan = "Z\x00\x16\x00\x04" cmd_test_check_engine_light = "Z\x00\x16\x00\x07" cmd_test_idle_valve = "Z\x00\x16\x00\x08" +cmd_test_hpfp_valve = "Z\x00\x16\x00\x09" cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02" @@ -4573,6 +4574,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Radiator Fan", cmd_test_radiator_fan commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve + commandButton = "HPFP Valve", cmd_test_hpfp_valve commandButton = "A/C Relay", cmd_test_ac_relay commandButton = "Starter Relay", cmd_test_starter_relay commandButton = "Stop Engine", cmd_stop_engine diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 2051b313a2..96bac00910 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 2020.11.22.proteus_f4.528437210" + signature = "rusEFI 2020.11.22.proteus_f4.1735949830" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.proteus_f4.528437210" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.proteus_f4.1735949830" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Sun Nov 22 03:58:30 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 05:10:57 UTC 2020 pageSize = 20000 page = 1 @@ -2948,6 +2948,7 @@ cmd_test_ac_relay = "Z\x00\x16\x00\x06" cmd_test_radiator_fan = "Z\x00\x16\x00\x04" cmd_test_check_engine_light = "Z\x00\x16\x00\x07" cmd_test_idle_valve = "Z\x00\x16\x00\x08" +cmd_test_hpfp_valve = "Z\x00\x16\x00\x09" cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02" @@ -4544,6 +4545,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Radiator Fan", cmd_test_radiator_fan commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve + commandButton = "HPFP Valve", cmd_test_hpfp_valve commandButton = "A/C Relay", cmd_test_ac_relay commandButton = "Starter Relay", cmd_test_starter_relay commandButton = "Stop Engine", cmd_stop_engine diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 62d838bfec..ecbc2574ca 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 2020.11.22.proteus_f7.528437210" + signature = "rusEFI 2020.11.22.proteus_f7.1735949830" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.22.proteus_f7.528437210" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.22.proteus_f7.1735949830" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Sun Nov 22 03:58:28 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 05:10:55 UTC 2020 pageSize = 20000 page = 1 @@ -2948,6 +2948,7 @@ cmd_test_ac_relay = "Z\x00\x16\x00\x06" cmd_test_radiator_fan = "Z\x00\x16\x00\x04" cmd_test_check_engine_light = "Z\x00\x16\x00\x07" cmd_test_idle_valve = "Z\x00\x16\x00\x08" +cmd_test_hpfp_valve = "Z\x00\x16\x00\x09" cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02" @@ -4544,6 +4545,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Radiator Fan", cmd_test_radiator_fan commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve + commandButton = "HPFP Valve", cmd_test_hpfp_valve commandButton = "A/C Relay", cmd_test_ac_relay commandButton = "Starter Relay", cmd_test_starter_relay commandButton = "Stop Engine", cmd_stop_engine 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 a1d471a3e7..39b4c4a278 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 Sun Nov 22 03:00:33 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 22 05:10:40 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -259,6 +259,11 @@ public class Fields { public static final int CMD_TS_BENCH_CHECK_ENGINE_LIGHT = 7; public static final int CMD_TS_BENCH_FAN_RELAY = 4; public static final int CMD_TS_BENCH_FUEL_PUMP = 1; + public static final int CMD_TS_BENCH_GPPWM1_VALVE = 10; + public static final int CMD_TS_BENCH_GPPWM2_VALVE = 11; + public static final int CMD_TS_BENCH_GPPWM3_VALVE = 12; + public static final int CMD_TS_BENCH_GPPWM4_VALVE = 13; + public static final int CMD_TS_BENCH_HPFP_VALVE = 9; public static final int CMD_TS_BENCH_IDLE_VALVE = 8; public static final int CMD_TS_BENCH_MAIN_RELAY = 0; public static final int CMD_TS_BENCH_STARTER_DISABLE_RELAY = 3; @@ -1438,7 +1443,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 2020.11.22.all.3015625131"; + public static final String TS_SIGNATURE = "rusEFI 2020.11.22.all.2933011672"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_60_2_VW = 20; public static final int TT_TT_ONE = 18; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index d56e1391d1..60a9de50c1 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +