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 98983e2ce8..2fd8422cd8 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 Sep 26 21:55:37 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Sep 26 22:02:29 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4340,4 +4340,4 @@ struct 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 Sep 26 21:55:37 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Sep 26 22:02:29 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 3800f4f04c..d2eceaf977 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 @@ -487,6 +487,7 @@ #define etb_dFactor_offset 1744 #define ETB_ETB_None 0 #define etb_function_e_auto_enum "ETB_None", "ETB_Throttle1", "ETB_Throttle2", "ETB_IdleValve", "ETB_Wastegate" +#define ETB_FUNCTION_NONE 0 #define ETB_HW_MAX_FREQUENCY 10000 #define etb_iFactor_offset 1740 #define etb_iTermMax_offset 3958 @@ -1272,7 +1273,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 2501832053 +#define SIGNATURE_HASH 2722296879 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1628,7 +1629,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen_cypress.2501832053" +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen_cypress.2722296879" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' 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 d2c539eafd..4913caa7d4 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 Sep 26 21:55:35 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Sep 26 22:02:26 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4334,4 +4334,4 @@ struct 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 Sep 26 21:55:35 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Sep 26 22:02:26 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 bc109f7b3b..73593b0f4d 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -468,6 +468,7 @@ #define etb_dFactor_offset 1744 #define ETB_ETB_None 0 #define etb_function_e_auto_enum "ETB_None", "ETB_Throttle1", "ETB_Throttle2", "ETB_IdleValve", "ETB_Wastegate" +#define ETB_FUNCTION_NONE 0 #define ETB_HW_MAX_FREQUENCY 10000 #define etb_iFactor_offset 1740 #define etb_iTermMax_offset 3930 @@ -1253,7 +1254,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 1790648713 +#define SIGNATURE_HASH 1575434451 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1609,7 +1610,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.09.26.kin.1790648713" +#define TS_SIGNATURE "rusEFI 2021.09.26.kin.1575434451" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index b69af7221b..4c5f559c17 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sun Sep 26 21:55:39 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:32 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4340,4 +4340,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sun Sep 26 21:55:39 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:32 UTC 2021 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index fb9eb6164b..18705437dc 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -487,6 +487,7 @@ #define etb_dFactor_offset 1744 #define ETB_ETB_None 0 #define etb_function_e_auto_enum "ETB_None", "ETB_Throttle1", "ETB_Throttle2", "ETB_IdleValve", "ETB_Wastegate" +#define ETB_FUNCTION_NONE 0 #define ETB_HW_MAX_FREQUENCY 10000 #define etb_iFactor_offset 1740 #define etb_iTermMax_offset 3958 @@ -1273,7 +1274,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 1122557382 +#define SIGNATURE_HASH 1974781084 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1629,7 +1630,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.09.26.subaru_eg33_f7.1122557382" +#define TS_SIGNATURE "rusEFI 2021.09.26.subaru_eg33_f7.1974781084" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index d36ab70e74..72ef478fe3 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 Sep 26 21:55:32 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:23 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4340,4 +4340,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 21:55:32 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:23 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 2956e7ed4c..95e195ea36 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 Sep 26 21:55:32 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:23 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_ACIDLEEXTRAOFFSET = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index db59141aa5..944e428438 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 Sep 26 21:55:32 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:23 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 5554368b21..ad6b554511 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 Sep 26 21:55:32 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:23 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair leacIdleExtraOffset(FSIO_SETTING_ACIDLEEXTRAOFFSET, "cfg_acIdleExtraOffset"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 2fa39a3940..79bda76f2a 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 Sep 26 21:55:32 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:23 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index d298bdf74b..fa1d03b921 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -487,6 +487,7 @@ #define etb_dFactor_offset 1744 #define ETB_ETB_None 0 #define etb_function_e_auto_enum "ETB_None", "ETB_Throttle1", "ETB_Throttle2", "ETB_IdleValve", "ETB_Wastegate" +#define ETB_FUNCTION_NONE 0 #define ETB_HW_MAX_FREQUENCY 10000 #define etb_iFactor_offset 1740 #define etb_iTermMax_offset 3958 @@ -1272,7 +1273,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 3613537957 +#define SIGNATURE_HASH 3762171903 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1628,7 +1629,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.09.26.all.3613537957" +#define TS_SIGNATURE "rusEFI 2021.09.26.all.3762171903" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index e1dd453f2e..c01ac29b4c 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 2021.09.26 -#define SIGNATURE_HASH 3613537957 -#define TS_SIGNATURE "rusEFI 2021.09.26.all.3613537957" +#define SIGNATURE_HASH 3762171903 +#define TS_SIGNATURE "rusEFI 2021.09.26.all.3762171903" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 95d900b5cf..44eaadc1c7 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD atlas #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 3613537957 -#define TS_SIGNATURE "rusEFI 2021.09.26.atlas.3613537957" +#define SIGNATURE_HASH 3762171903 +#define TS_SIGNATURE "rusEFI 2021.09.26.atlas.3762171903" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index d55357b8a3..c9f59508f1 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD f429-discovery #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 3613537957 -#define TS_SIGNATURE "rusEFI 2021.09.26.f429-discovery.3613537957" +#define SIGNATURE_HASH 3762171903 +#define TS_SIGNATURE "rusEFI 2021.09.26.f429-discovery.3762171903" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 0adf72deb9..930c493ba9 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 2021.09.26 -#define SIGNATURE_HASH 2907726668 -#define TS_SIGNATURE "rusEFI 2021.09.26.frankenso_na6.2907726668" +#define SIGNATURE_HASH 2584508950 +#define TS_SIGNATURE "rusEFI 2021.09.26.frankenso_na6.2584508950" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 7bcb6ae028..2716d1039c 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen-nb1 #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 3919880108 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen-nb1.3919880108" +#define SIGNATURE_HASH 3740829430 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen-nb1.3740829430" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index c6e36194f5..fb307db216 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121nissan #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 1553166055 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen121nissan.1553166055" +#define SIGNATURE_HASH 1808758717 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen121nissan.1808758717" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index e33425fb42..2852926fb3 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121vag #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 2223953635 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen121vag.2223953635" +#define SIGNATURE_HASH 3016937401 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen121vag.3016937401" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 8cd4bfd622..b093d84175 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen128 #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 1336634582 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen128.1336634582" +#define SIGNATURE_HASH 2029483404 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen128.2029483404" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 36909b0d5f..d3750dc789 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen154hyundai #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 4124592253 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen154hyundai.4124592253" +#define SIGNATURE_HASH 3263451431 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen154hyundai.3263451431" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 060c58e670..7acf7aaccd 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen72 #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 2985776770 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen72.2985776770" +#define SIGNATURE_HASH 2259374040 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen72.2259374040" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index d0bb2904dd..09a9fd9208 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellenNA6 #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 367282161 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellenNA6.367282161" +#define SIGNATURE_HASH 582508203 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellenNA6.582508203" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 658f47cad2..fbac9110bc 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 2021.09.26 -#define SIGNATURE_HASH 2501832053 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen_cypress.2501832053" +#define SIGNATURE_HASH 2722296879 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen_cypress.2722296879" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 23eb0a5f92..c16027385a 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 2021.09.26 -#define SIGNATURE_HASH 1790648713 -#define TS_SIGNATURE "rusEFI 2021.09.26.kin.1790648713" +#define SIGNATURE_HASH 1575434451 +#define TS_SIGNATURE "rusEFI 2021.09.26.kin.1575434451" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 304cd138c7..7c9daad544 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 2021.09.26 -#define SIGNATURE_HASH 1213539758 -#define TS_SIGNATURE "rusEFI 2021.09.26.mre_f4.1213539758" +#define SIGNATURE_HASH 2131311860 +#define TS_SIGNATURE "rusEFI 2021.09.26.mre_f4.2131311860" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index bee9c92bd3..0ac006c0df 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 2021.09.26 -#define SIGNATURE_HASH 1213539758 -#define TS_SIGNATURE "rusEFI 2021.09.26.mre_f7.1213539758" +#define SIGNATURE_HASH 2131311860 +#define TS_SIGNATURE "rusEFI 2021.09.26.mre_f7.2131311860" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 1be7d4d6f4..4ceecac6a8 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 2021.09.26 -#define SIGNATURE_HASH 2273898307 -#define TS_SIGNATURE "rusEFI 2021.09.26.prometheus_405.2273898307" +#define SIGNATURE_HASH 2966746649 +#define TS_SIGNATURE "rusEFI 2021.09.26.prometheus_405.2966746649" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 3695ddb06e..f185d487a9 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 2021.09.26 -#define SIGNATURE_HASH 2273898307 -#define TS_SIGNATURE "rusEFI 2021.09.26.prometheus_469.2273898307" +#define SIGNATURE_HASH 2966746649 +#define TS_SIGNATURE "rusEFI 2021.09.26.prometheus_469.2966746649" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index cf6f210cfb..415264d423 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 2021.09.26 -#define SIGNATURE_HASH 832845827 -#define TS_SIGNATURE "rusEFI 2021.09.26.proteus_f4.832845827" +#define SIGNATURE_HASH 116924761 +#define TS_SIGNATURE "rusEFI 2021.09.26.proteus_f4.116924761" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 34094df7cf..aa3379e2ef 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 2021.09.26 -#define SIGNATURE_HASH 832845827 -#define TS_SIGNATURE "rusEFI 2021.09.26.proteus_f7.832845827" +#define SIGNATURE_HASH 116924761 +#define TS_SIGNATURE "rusEFI 2021.09.26.proteus_f7.116924761" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index aed7f41c9b..680523a186 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 1122557382 -#define TS_SIGNATURE "rusEFI 2021.09.26.subaru_eg33_f7.1122557382" +#define SIGNATURE_HASH 1974781084 +#define TS_SIGNATURE "rusEFI 2021.09.26.subaru_eg33_f7.1974781084" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 341153334c..937850858c 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 bcb536b936..11bc5129f3 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.09.26.all.3613537957" + signature = "rusEFI 2021.09.26.all.3762171903" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.all.3613537957" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.all.3762171903" ; 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 Sun Sep 26 21:55:32 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:23 UTC 2021 pageSize = 20000 page = 1 @@ -4114,7 +4114,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4858,7 +4859,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 0a9d84d67f..fd33adb15b 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.26.atlas.3613537957" + signature = "rusEFI 2021.09.26.atlas.3762171903" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.atlas.3613537957" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.atlas.3762171903" ; 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 Sun Sep 26 21:55:30 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:20 UTC 2021 pageSize = 20000 page = 1 @@ -4114,7 +4114,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4858,7 +4859,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index d10035c178..a2f26f33bf 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.26.f429-discovery.3613537957" + signature = "rusEFI 2021.09.26.f429-discovery.3762171903" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.f429-discovery.3613537957" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.f429-discovery.3762171903" ; 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 Sun Sep 26 21:54:51 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:01:32 UTC 2021 pageSize = 20000 page = 1 @@ -4114,7 +4114,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4858,7 +4859,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index fc84dc96e1..44f8d37541 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.09.26.frankenso_na6.2907726668" + signature = "rusEFI 2021.09.26.frankenso_na6.2584508950" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.frankenso_na6.2907726668" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.frankenso_na6.2584508950" ; 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 Sun Sep 26 21:55:17 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:03 UTC 2021 pageSize = 20000 page = 1 @@ -4114,7 +4114,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4858,7 +4859,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 01d15b64a7..1b3ed0d424 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.26.hellen-nb1.3919880108" + signature = "rusEFI 2021.09.26.hellen-nb1.3740829430" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellen-nb1.3919880108" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellen-nb1.3740829430" ; 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 Sun Sep 26 21:55:06 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:01:51 UTC 2021 pageSize = 20000 page = 1 @@ -4098,7 +4098,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4834,7 +4835,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index a5287420a1..eafdfdeaa1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.26.hellen121nissan.1553166055" + signature = "rusEFI 2021.09.26.hellen121nissan.1808758717" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellen121nissan.1553166055" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellen121nissan.1808758717" ; 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 Sun Sep 26 21:54:59 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:01:41 UTC 2021 pageSize = 20000 page = 1 @@ -4098,7 +4098,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4834,7 +4835,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 90b5ef3421..d793e963a1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.26.hellen121vag.2223953635" + signature = "rusEFI 2021.09.26.hellen121vag.3016937401" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellen121vag.2223953635" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellen121vag.3016937401" ; 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 Sun Sep 26 21:54:56 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:01:38 UTC 2021 pageSize = 20000 page = 1 @@ -4098,7 +4098,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4834,7 +4835,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 4979d29466..c29c5e1c56 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.26.hellen128.1336634582" + signature = "rusEFI 2021.09.26.hellen128.2029483404" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellen128.1336634582" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellen128.2029483404" ; 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 Sun Sep 26 21:54:54 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:01:35 UTC 2021 pageSize = 20000 page = 1 @@ -4098,7 +4098,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4834,7 +4835,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 84cd6f6999..3578207803 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.26.hellen154hyundai.4124592253" + signature = "rusEFI 2021.09.26.hellen154hyundai.3263451431" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellen154hyundai.4124592253" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellen154hyundai.3263451431" ; 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 Sun Sep 26 21:55:01 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:01:44 UTC 2021 pageSize = 20000 page = 1 @@ -4098,7 +4098,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4834,7 +4835,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 35ea08e7d7..71be246f30 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.26.hellen72.2985776770" + signature = "rusEFI 2021.09.26.hellen72.2259374040" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellen72.2985776770" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellen72.2259374040" ; 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 Sun Sep 26 21:55:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:01:48 UTC 2021 pageSize = 20000 page = 1 @@ -4098,7 +4098,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4834,7 +4835,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index e24666a0ba..319e74a6d3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.26.hellenNA6.367282161" + signature = "rusEFI 2021.09.26.hellenNA6.582508203" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellenNA6.367282161" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellenNA6.582508203" ; 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 Sun Sep 26 21:55:09 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:01:54 UTC 2021 pageSize = 20000 page = 1 @@ -4098,7 +4098,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4834,7 +4835,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 1987334f21..2a26a3d0ea 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.09.26.hellen_cypress.2501832053" + signature = "rusEFI 2021.09.26.hellen_cypress.2722296879" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellen_cypress.2501832053" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellen_cypress.2722296879" ; 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 Sun Sep 26 21:55:37 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Sep 26 22:02:29 UTC 2021 pageSize = 20000 page = 1 @@ -4114,7 +4114,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4858,7 +4859,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 649b23fd19..00228ef343 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.09.26.kin.1790648713" + signature = "rusEFI 2021.09.26.kin.1575434451" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.kin.1790648713" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.kin.1575434451" ; 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 Sun Sep 26 21:55:35 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Sep 26 22:02:26 UTC 2021 pageSize = 19972 page = 1 @@ -4087,7 +4087,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4831,7 +4832,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index c2e37d67a3..d6ccbe23b8 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.09.26.mre_f4.1213539758" + signature = "rusEFI 2021.09.26.mre_f4.2131311860" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.mre_f4.1213539758" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.mre_f4.2131311860" ; 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 Sun Sep 26 21:55:15 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:00 UTC 2021 pageSize = 20000 page = 1 @@ -4098,7 +4098,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4833,7 +4834,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 90a0e4099c..94c620c972 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.09.26.mre_f7.1213539758" + signature = "rusEFI 2021.09.26.mre_f7.2131311860" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.mre_f7.1213539758" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.mre_f7.2131311860" ; 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 Sun Sep 26 21:55:12 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:01:57 UTC 2021 pageSize = 20000 page = 1 @@ -4098,7 +4098,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4833,7 +4834,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 8fe9663638..4b83c88e72 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.09.26.prometheus_405.2273898307" + signature = "rusEFI 2021.09.26.prometheus_405.2966746649" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.prometheus_405.2273898307" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.prometheus_405.2966746649" ; 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 Sun Sep 26 21:55:22 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:10 UTC 2021 pageSize = 20000 page = 1 @@ -4109,7 +4109,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4853,7 +4854,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 4acac56563..80f7d29d48 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.09.26.prometheus_469.2273898307" + signature = "rusEFI 2021.09.26.prometheus_469.2966746649" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.prometheus_469.2273898307" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.prometheus_469.2966746649" ; 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 Sun Sep 26 21:55:20 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:07 UTC 2021 pageSize = 20000 page = 1 @@ -4109,7 +4109,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4853,7 +4854,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index a29b1a9707..05512b3a9d 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.09.26.proteus_f4.832845827" + signature = "rusEFI 2021.09.26.proteus_f4.116924761" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.proteus_f4.832845827" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.proteus_f4.116924761" ; 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 Sun Sep 26 21:55:27 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:17 UTC 2021 pageSize = 20000 page = 1 @@ -4092,7 +4092,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4826,7 +4827,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 8fc2fc3c4b..bc61d1dee2 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.09.26.proteus_f7.832845827" + signature = "rusEFI 2021.09.26.proteus_f7.116924761" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.proteus_f7.832845827" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.proteus_f7.116924761" ; 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 Sun Sep 26 21:55:25 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:13 UTC 2021 pageSize = 20000 page = 1 @@ -4092,7 +4092,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4826,7 +4827,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 55427e4521..be3a531d91 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.09.26.subaru_eg33_f7.1122557382" + signature = "rusEFI 2021.09.26.subaru_eg33_f7.1974781084" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.subaru_eg33_f7.1122557382" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.subaru_eg33_f7.1974781084" ; 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 config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sun Sep 26 21:55:39 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:32 UTC 2021 pageSize = 20000 page = 1 @@ -4108,7 +4108,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Stepper parking extra steps, %", stepperParkingExtraSteps, useStepperIdle field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper } - panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper } + ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect? + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4849,7 +4850,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places ; todo: report bug to TS? - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } + ; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2 + panel = hbridgeHardware, { etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" 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 6d985e4d1c..b34046276c 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 Sep 26 21:55:32 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 26 22:02:23 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -466,6 +466,7 @@ public class Fields { public static final int ETB_COUNT = 2; public static final int etb_dFactor_offset = 1744; public static final int ETB_ETB_None = 0; + public static final int ETB_FUNCTION_NONE = 0; public static final int ETB_HW_MAX_FREQUENCY = 10000; public static final int etb_iFactor_offset = 1740; public static final int etb_iTermMax_offset = 3958; @@ -1529,7 +1530,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.09.26.all.3613537957"; + public static final String TS_SIGNATURE = "rusEFI 2021.09.26.all.3762171903"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TT_TT_1_16 = 50; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 325d502a08..54143474ad 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +