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 2fd8422cd8..f968e8741e 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 22:02:29 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:35:59 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 22:02:29 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:35:59 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 d2eceaf977..3d5f91aa17 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 @@ -353,6 +353,7 @@ #define cylinderBore_offset 408 #define cylindersCount_offset 400 #define DBG_DBG_LOGIC_ANALYZER 45 +#define DC_FUNCTION_IDLE 3 #define dc_io_size 4 #define DC_PER_STEPPER 2 #define debug_mode_e_auto_enum "DBG_ALTERNATOR_PID", "DBG_TPS_ACCEL", "DBG_GPPWM", "DBG_IDLE_CONTROL", "DBG_EL_ACCEL", "DBG_TRIGGER_COUNTERS", "DBG_FSIO_ADC", "DBG_VVT_1_PID", "DBG_VVT", "DBG_CRANKING_DETAILS", "DBG_IGNITION_TIMING", "DBG_FUEL_PID_CORRECTION", "DBG_VEHICLE_SPEED_SENSOR", "DBG_SD_CARD", "DBG_SR5_PROTOCOL", "DBG_KNOCK", "DBG_16", "DBG_ELECTRONIC_THROTTLE_PID", "DBG_EXECUTOR", "DBG_BENCH_TEST", "DBG_AUX_VALVES", "DBG_ANALOG_INPUTS", "DBG_INSTANT_RPM", "DBG_FSIO_EXPRESSION_1_7", "DBG_STATUS", "DBG_CJ125", "DBG_CAN", "DBG_MAP", "DBG_METRICS", "DBG_ELECTRONIC_THROTTLE_EXTRA", "DBG_ION", "DBG_TLE8888", "DBG_ANALOG_INPUTS2", "DBG_DWELL_METRIC", "DBG_34", "DBG_ETB_LOGIC", "DBG_BOOST", "DBG_START_STOP", "DBG_LAUNCH", "DBG_ETB_AUTOTUNE", "DBG_COMPOSITE_LOG", "DBG_FSIO_EXPRESSION_8_14", "DBG_UNUSED_42", "DBG_INJECTOR_COMPENSATION", "DBG_DYNO_VIEW", "DBG_LOGIC_ANALYZER", "DBG_RUSEFI_WIDEBAND", "DBG_TCU", "DBG_LUA", "DBG_VVT_2_PID", "DBG_VVT_3_PID", "DBG_VVT_4_PID", "MODE_52", "MODE_53" @@ -1273,7 +1274,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 2722296879 +#define SIGNATURE_HASH 45720871 #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 true -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen_cypress.2722296879" +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen_cypress.45720871" #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 4913caa7d4..6836144a14 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 22:02:26 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:35:57 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 22:02:26 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:35:57 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 73593b0f4d..2678928dd6 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -334,6 +334,7 @@ #define cylinderBore_offset 408 #define cylindersCount_offset 400 #define DBG_DBG_LOGIC_ANALYZER 45 +#define DC_FUNCTION_IDLE 3 #define dc_io_size 4 #define DC_PER_STEPPER 2 #define debug_mode_e_auto_enum "DBG_ALTERNATOR_PID", "DBG_TPS_ACCEL", "DBG_GPPWM", "DBG_IDLE_CONTROL", "DBG_EL_ACCEL", "DBG_TRIGGER_COUNTERS", "DBG_FSIO_ADC", "DBG_VVT_1_PID", "DBG_VVT", "DBG_CRANKING_DETAILS", "DBG_IGNITION_TIMING", "DBG_FUEL_PID_CORRECTION", "DBG_VEHICLE_SPEED_SENSOR", "DBG_SD_CARD", "DBG_SR5_PROTOCOL", "DBG_KNOCK", "DBG_16", "DBG_ELECTRONIC_THROTTLE_PID", "DBG_EXECUTOR", "DBG_BENCH_TEST", "DBG_AUX_VALVES", "DBG_ANALOG_INPUTS", "DBG_INSTANT_RPM", "DBG_FSIO_EXPRESSION_1_7", "DBG_STATUS", "DBG_CJ125", "DBG_CAN", "DBG_MAP", "DBG_METRICS", "DBG_ELECTRONIC_THROTTLE_EXTRA", "DBG_ION", "DBG_TLE8888", "DBG_ANALOG_INPUTS2", "DBG_DWELL_METRIC", "DBG_34", "DBG_ETB_LOGIC", "DBG_BOOST", "DBG_START_STOP", "DBG_LAUNCH", "DBG_ETB_AUTOTUNE", "DBG_COMPOSITE_LOG", "DBG_FSIO_EXPRESSION_8_14", "DBG_UNUSED_42", "DBG_INJECTOR_COMPENSATION", "DBG_DYNO_VIEW", "DBG_LOGIC_ANALYZER", "DBG_RUSEFI_WIDEBAND", "DBG_TCU", "DBG_LUA", "DBG_VVT_2_PID", "DBG_VVT_3_PID", "DBG_VVT_4_PID", "MODE_52", "MODE_53" @@ -1254,7 +1255,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 1575434451 +#define SIGNATURE_HASH 4246497755 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1610,7 +1611,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.1575434451" +#define TS_SIGNATURE "rusEFI 2021.09.26.kin.4246497755" #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 4c5f559c17..b74a0937b4 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 22:02:32 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:36:02 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 22:02:32 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:36:02 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 18705437dc..85b3339096 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 @@ -353,6 +353,7 @@ #define cylinderBore_offset 408 #define cylindersCount_offset 400 #define DBG_DBG_LOGIC_ANALYZER 45 +#define DC_FUNCTION_IDLE 3 #define dc_io_size 4 #define DC_PER_STEPPER 2 #define debug_mode_e_auto_enum "DBG_ALTERNATOR_PID", "DBG_TPS_ACCEL", "DBG_GPPWM", "DBG_IDLE_CONTROL", "DBG_EL_ACCEL", "DBG_TRIGGER_COUNTERS", "DBG_FSIO_ADC", "DBG_VVT_1_PID", "DBG_VVT", "DBG_CRANKING_DETAILS", "DBG_IGNITION_TIMING", "DBG_FUEL_PID_CORRECTION", "DBG_VEHICLE_SPEED_SENSOR", "DBG_SD_CARD", "DBG_SR5_PROTOCOL", "DBG_KNOCK", "DBG_16", "DBG_ELECTRONIC_THROTTLE_PID", "DBG_EXECUTOR", "DBG_BENCH_TEST", "DBG_AUX_VALVES", "DBG_ANALOG_INPUTS", "DBG_INSTANT_RPM", "DBG_FSIO_EXPRESSION_1_7", "DBG_STATUS", "DBG_CJ125", "DBG_CAN", "DBG_MAP", "DBG_METRICS", "DBG_ELECTRONIC_THROTTLE_EXTRA", "DBG_ION", "DBG_TLE8888", "DBG_ANALOG_INPUTS2", "DBG_DWELL_METRIC", "DBG_34", "DBG_ETB_LOGIC", "DBG_BOOST", "DBG_START_STOP", "DBG_LAUNCH", "DBG_ETB_AUTOTUNE", "DBG_COMPOSITE_LOG", "DBG_FSIO_EXPRESSION_8_14", "DBG_UNUSED_42", "DBG_INJECTOR_COMPENSATION", "DBG_DYNO_VIEW", "DBG_LOGIC_ANALYZER", "DBG_RUSEFI_WIDEBAND", "DBG_TCU", "DBG_LUA", "DBG_VVT_2_PID", "DBG_VVT_3_PID", "DBG_VVT_4_PID", "MODE_52", "MODE_53" @@ -1274,7 +1275,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 1974781084 +#define SIGNATURE_HASH 3578762644 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1630,7 +1631,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.1974781084" +#define TS_SIGNATURE "rusEFI 2021.09.26.subaru_eg33_f7.3578762644" #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 72ef478fe3..c9ffd745d0 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 22:02:23 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:35:54 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 22:02:23 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:35:54 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 95e195ea36..5663aa05aa 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 22:02:23 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:35:54 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 944e428438..ac5fa395ec 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 22:02:23 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:35:54 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 ad6b554511..4afe2f2a51 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 22:02:23 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:35:54 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 79bda76f2a..8f267a9dec 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 22:02:23 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:35:54 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 fa1d03b921..a78de39cb0 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -353,6 +353,7 @@ #define cylinderBore_offset 408 #define cylindersCount_offset 400 #define DBG_DBG_LOGIC_ANALYZER 45 +#define DC_FUNCTION_IDLE 3 #define dc_io_size 4 #define DC_PER_STEPPER 2 #define debug_mode_e_auto_enum "DBG_ALTERNATOR_PID", "DBG_TPS_ACCEL", "DBG_GPPWM", "DBG_IDLE_CONTROL", "DBG_EL_ACCEL", "DBG_TRIGGER_COUNTERS", "DBG_FSIO_ADC", "DBG_VVT_1_PID", "DBG_VVT", "DBG_CRANKING_DETAILS", "DBG_IGNITION_TIMING", "DBG_FUEL_PID_CORRECTION", "DBG_VEHICLE_SPEED_SENSOR", "DBG_SD_CARD", "DBG_SR5_PROTOCOL", "DBG_KNOCK", "DBG_16", "DBG_ELECTRONIC_THROTTLE_PID", "DBG_EXECUTOR", "DBG_BENCH_TEST", "DBG_AUX_VALVES", "DBG_ANALOG_INPUTS", "DBG_INSTANT_RPM", "DBG_FSIO_EXPRESSION_1_7", "DBG_STATUS", "DBG_CJ125", "DBG_CAN", "DBG_MAP", "DBG_METRICS", "DBG_ELECTRONIC_THROTTLE_EXTRA", "DBG_ION", "DBG_TLE8888", "DBG_ANALOG_INPUTS2", "DBG_DWELL_METRIC", "DBG_34", "DBG_ETB_LOGIC", "DBG_BOOST", "DBG_START_STOP", "DBG_LAUNCH", "DBG_ETB_AUTOTUNE", "DBG_COMPOSITE_LOG", "DBG_FSIO_EXPRESSION_8_14", "DBG_UNUSED_42", "DBG_INJECTOR_COMPENSATION", "DBG_DYNO_VIEW", "DBG_LOGIC_ANALYZER", "DBG_RUSEFI_WIDEBAND", "DBG_TCU", "DBG_LUA", "DBG_VVT_2_PID", "DBG_VVT_3_PID", "DBG_VVT_4_PID", "MODE_52", "MODE_53" @@ -1273,7 +1274,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.09.26 -#define SIGNATURE_HASH 3762171903 +#define SIGNATURE_HASH 1086684919 #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 true -#define TS_SIGNATURE "rusEFI 2021.09.26.all.3762171903" +#define TS_SIGNATURE "rusEFI 2021.09.26.all.1086684919" #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 3909851b4f..3d42cfae25 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 3333129666 -#define TS_SIGNATURE "rusEFI 2021.09.26.all.3333129666" +#define SIGNATURE_HASH 1086684919 +#define TS_SIGNATURE "rusEFI 2021.09.26.all.1086684919" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 35612929d4..59373131fd 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 3333129666 -#define TS_SIGNATURE "rusEFI 2021.09.26.atlas.3333129666" +#define SIGNATURE_HASH 1086684919 +#define TS_SIGNATURE "rusEFI 2021.09.26.atlas.1086684919" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 5e5f7aede8..c2b9366461 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 3333129666 -#define TS_SIGNATURE "rusEFI 2021.09.26.f429-discovery.3333129666" +#define SIGNATURE_HASH 1086684919 +#define TS_SIGNATURE "rusEFI 2021.09.26.f429-discovery.1086684919" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index b824d8354b..31ff300dcb 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 3164196907 -#define TS_SIGNATURE "rusEFI 2021.09.26.frankenso_na6.3164196907" +#define SIGNATURE_HASH 989276958 +#define TS_SIGNATURE "rusEFI 2021.09.26.frankenso_na6.989276958" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index d4752912aa..a2342fab2b 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 4167904459 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen-nb1.4167904459" +#define SIGNATURE_HASH 2114181118 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen-nb1.2114181118" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 73902c90c9..8c991facf6 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 1297800576 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen121nissan.1297800576" +#define SIGNATURE_HASH 3409192629 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen121nissan.3409192629" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 652ec50186..d783b72241 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 2504484228 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen121vag.2504484228" +#define SIGNATURE_HASH 321494705 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen121vag.321494705" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 6d8d411002..543808f7ec 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 1583538097 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen128.1583538097" +#define SIGNATURE_HASH 3624674436 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen128.3624674436" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index c0162e6313..8b5ab93170 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 3826383642 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen154hyundai.3826383642" +#define SIGNATURE_HASH 1652490287 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen154hyundai.1652490287" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index eb043f9fe9..427fe678a6 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 2688476645 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen72.2688476645" +#define SIGNATURE_HASH 642784976 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen72.642784976" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 34d40dbe47..ad3e62304e 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 70120598 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellenNA6.70120598" +#define SIGNATURE_HASH 2185432995 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellenNA6.2185432995" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 6ab5f98164..b7a89b7723 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 2228706834 -#define TS_SIGNATURE "rusEFI 2021.09.26.hellen_cypress.2228706834" +#define SIGNATURE_HASH 45720871 +#define TS_SIGNATURE "rusEFI 2021.09.26.hellen_cypress.45720871" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index c70438a5ff..8976a5e63c 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 2071106286 -#define TS_SIGNATURE "rusEFI 2021.09.26.kin.2071106286" +#define SIGNATURE_HASH 4246497755 +#define TS_SIGNATURE "rusEFI 2021.09.26.kin.4246497755" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index ec5212c055..c6231fc410 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 1503434441 -#define TS_SIGNATURE "rusEFI 2021.09.26.mre_f4.1503434441" +#define SIGNATURE_HASH 3757207036 +#define TS_SIGNATURE "rusEFI 2021.09.26.mre_f4.3757207036" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 04938e3549..9975373ce7 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 1503434441 -#define TS_SIGNATURE "rusEFI 2021.09.26.mre_f7.1503434441" +#define SIGNATURE_HASH 3757207036 +#define TS_SIGNATURE "rusEFI 2021.09.26.mre_f7.3757207036" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 76fe6159ee..bec0b51c02 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 2520865828 -#define TS_SIGNATURE "rusEFI 2021.09.26.prometheus_405.2520865828" +#define SIGNATURE_HASH 271558417 +#define TS_SIGNATURE "rusEFI 2021.09.26.prometheus_405.271558417" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 5005759a92..c3622e0f2f 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 2520865828 -#define TS_SIGNATURE "rusEFI 2021.09.26.prometheus_469.2520865828" +#define SIGNATURE_HASH 271558417 +#define TS_SIGNATURE "rusEFI 2021.09.26.prometheus_469.271558417" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index b27af589df..5f5f41eb74 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 544050020 -#define TS_SIGNATURE "rusEFI 2021.09.26.proteus_f4.544050020" +#define SIGNATURE_HASH 2785243217 +#define TS_SIGNATURE "rusEFI 2021.09.26.proteus_f4.2785243217" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index f6b6fcd00f..824fce9e6c 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 544050020 -#define TS_SIGNATURE "rusEFI 2021.09.26.proteus_f7.544050020" +#define SIGNATURE_HASH 2785243217 +#define TS_SIGNATURE "rusEFI 2021.09.26.proteus_f7.2785243217" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 5791c64347..1d4be0dd5e 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 1394699937 -#define TS_SIGNATURE "rusEFI 2021.09.26.subaru_eg33_f7.1394699937" +#define SIGNATURE_HASH 3578762644 +#define TS_SIGNATURE "rusEFI 2021.09.26.subaru_eg33_f7.3578762644" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 120d959603..27ed9b5d80 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 07a4bcb98e..e890b24378 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.3333129666" + signature = "rusEFI 2021.09.26.all.1086684919" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.all.3333129666" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.all.1086684919" ; 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 22:12:50 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:35:54 UTC 2021 pageSize = 20000 page = 1 @@ -4117,7 +4117,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4862,7 +4862,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4878,7 +4878,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 05d49b0d49..a3d4301f9a 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.3333129666" + signature = "rusEFI 2021.09.26.atlas.1086684919" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.atlas.3333129666" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.atlas.1086684919" ; 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 22:12:48 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:35:51 UTC 2021 pageSize = 20000 page = 1 @@ -4117,7 +4117,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4862,7 +4862,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4878,7 +4878,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 1e654fcdba..9b21e84b88 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.3333129666" + signature = "rusEFI 2021.09.26.f429-discovery.1086684919" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.f429-discovery.3333129666" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.f429-discovery.1086684919" ; 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 22:12:07 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:35:04 UTC 2021 pageSize = 20000 page = 1 @@ -4117,7 +4117,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4862,7 +4862,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4878,7 +4878,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index cf22acf0ca..6fc8720901 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.3164196907" + signature = "rusEFI 2021.09.26.frankenso_na6.989276958" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.frankenso_na6.3164196907" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.frankenso_na6.989276958" ; 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 22:12:35 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:35:35 UTC 2021 pageSize = 20000 page = 1 @@ -4117,7 +4117,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4862,7 +4862,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4878,7 +4878,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 7d3f73d37f..6c9cd3419e 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.4167904459" + signature = "rusEFI 2021.09.26.hellen-nb1.2114181118" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellen-nb1.4167904459" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellen-nb1.2114181118" ; 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 22:12:24 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:35:23 UTC 2021 pageSize = 20000 page = 1 @@ -4101,7 +4101,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4838,7 +4838,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4854,7 +4854,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index a274bcc49c..4fe0024bcb 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.1297800576" + signature = "rusEFI 2021.09.26.hellen121nissan.3409192629" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellen121nissan.1297800576" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellen121nissan.3409192629" ; 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 22:12:16 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:35:14 UTC 2021 pageSize = 20000 page = 1 @@ -4101,7 +4101,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4838,7 +4838,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4854,7 +4854,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 70fa2d1ab6..26947ffa52 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.2504484228" + signature = "rusEFI 2021.09.26.hellen121vag.321494705" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellen121vag.2504484228" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellen121vag.321494705" ; 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 22:12:13 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:35:10 UTC 2021 pageSize = 20000 page = 1 @@ -4101,7 +4101,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4838,7 +4838,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4854,7 +4854,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 87284d003b..413fdb7777 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.1583538097" + signature = "rusEFI 2021.09.26.hellen128.3624674436" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellen128.1583538097" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellen128.3624674436" ; 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 22:12:11 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:35:07 UTC 2021 pageSize = 20000 page = 1 @@ -4101,7 +4101,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4838,7 +4838,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4854,7 +4854,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 430d205530..10ca572bb9 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.3826383642" + signature = "rusEFI 2021.09.26.hellen154hyundai.1652490287" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellen154hyundai.3826383642" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellen154hyundai.1652490287" ; 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 22:12:19 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:35:17 UTC 2021 pageSize = 20000 page = 1 @@ -4101,7 +4101,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4838,7 +4838,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4854,7 +4854,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 80325d6261..2c9fb31f17 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.2688476645" + signature = "rusEFI 2021.09.26.hellen72.642784976" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellen72.2688476645" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellen72.642784976" ; 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 22:12:21 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:35:20 UTC 2021 pageSize = 20000 page = 1 @@ -4101,7 +4101,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4838,7 +4838,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4854,7 +4854,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index a5f3a59421..2894c6e20a 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.70120598" + signature = "rusEFI 2021.09.26.hellenNA6.2185432995" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellenNA6.70120598" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellenNA6.2185432995" ; 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 22:12: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:35:26 UTC 2021 pageSize = 20000 page = 1 @@ -4101,7 +4101,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4838,7 +4838,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4854,7 +4854,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index c32d3ac924..6ae759ebf8 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.2228706834" + signature = "rusEFI 2021.09.26.hellen_cypress.45720871" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.hellen_cypress.2228706834" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.hellen_cypress.45720871" ; 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 22:12:55 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:35:59 UTC 2021 pageSize = 20000 page = 1 @@ -4117,7 +4117,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4862,7 +4862,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4878,7 +4878,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index f99f718176..cd08c0bcad 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.2071106286" + signature = "rusEFI 2021.09.26.kin.4246497755" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.kin.2071106286" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.kin.4246497755" ; 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 22:12:53 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:35:57 UTC 2021 pageSize = 19972 page = 1 @@ -4090,7 +4090,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4835,7 +4835,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4851,7 +4851,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 0e1851fc8f..be75d65b49 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.1503434441" + signature = "rusEFI 2021.09.26.mre_f4.3757207036" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.mre_f4.1503434441" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.mre_f4.3757207036" ; 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 22:12: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:35:32 UTC 2021 pageSize = 20000 page = 1 @@ -4101,7 +4101,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4837,7 +4837,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4853,7 +4853,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index ced768a6d9..27a3aa4f6d 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.1503434441" + signature = "rusEFI 2021.09.26.mre_f7.3757207036" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.mre_f7.1503434441" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.mre_f7.3757207036" ; 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 22:12:29 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:35:29 UTC 2021 pageSize = 20000 page = 1 @@ -4101,7 +4101,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4837,7 +4837,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4853,7 +4853,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index f723d17f56..07c3ade51f 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.2520865828" + signature = "rusEFI 2021.09.26.prometheus_405.271558417" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.prometheus_405.2520865828" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.prometheus_405.271558417" ; 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 22:12:40 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:35:41 UTC 2021 pageSize = 20000 page = 1 @@ -4112,7 +4112,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4857,7 +4857,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4873,7 +4873,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 6e57b318c1..022502336f 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.2520865828" + signature = "rusEFI 2021.09.26.prometheus_469.271558417" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.prometheus_469.2520865828" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.prometheus_469.271558417" ; 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 22:12:38 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:35:38 UTC 2021 pageSize = 20000 page = 1 @@ -4112,7 +4112,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4857,7 +4857,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4873,7 +4873,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 6ce6d27daf..e4574a141e 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.544050020" + signature = "rusEFI 2021.09.26.proteus_f4.2785243217" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.proteus_f4.544050020" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.proteus_f4.2785243217" ; 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 22:12:45 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:35:48 UTC 2021 pageSize = 20000 page = 1 @@ -4095,7 +4095,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4830,7 +4830,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4846,7 +4846,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 4ccefe4425..671c66d2a6 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.544050020" + signature = "rusEFI 2021.09.26.proteus_f7.2785243217" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.proteus_f7.544050020" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.proteus_f7.2785243217" ; 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 22:12:43 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:35:44 UTC 2021 pageSize = 20000 page = 1 @@ -4095,7 +4095,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4830,7 +4830,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4846,7 +4846,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 19ffeb7b94..7f3f3ab90f 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.1394699937" + signature = "rusEFI 2021.09.26.subaru_eg33_f7.3578762644" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.09.26.subaru_eg33_f7.1394699937" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.09.26.subaru_eg33_f7.3578762644" ; 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 22:12:57 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:36:02 UTC 2021 pageSize = 20000 page = 1 @@ -4111,7 +4111,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Force parking every restart", stepperForceParkingEveryRestart, useStepperIdle panel = idleStepperHw, { 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = idleHwType, "Idle Valve Hardware", border panel = idleSolenoid, West @@ -4853,7 +4853,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; criteria for the same panel when used in multiple places ; todo: report bug to TS? ; 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) } + panel = hbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 = 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4869,7 +4869,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || (etbFunctions1 == 3) } panel = etbAutotune ; Neutral position handling not yet implemented! 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 b34046276c..b60007baef 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 22:02:23 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:35:54 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -341,6 +341,7 @@ public class Fields { public static final int cylinderBore_offset = 408; public static final int cylindersCount_offset = 400; public static final int DBG_DBG_LOGIC_ANALYZER = 45; + public static final int DC_FUNCTION_IDLE = 3; public static final int dc_io_size = 4; public static final int DC_PER_STEPPER = 2; public static final int debugMapAveraging_offset = 807; @@ -1224,6 +1225,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; + public static final int SIGNATURE_HASH = 1086684919; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1530,7 +1532,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.3762171903"; + public static final String TS_SIGNATURE = "rusEFI 2021.09.26.all.1086684919"; 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 54143474ad..cec10650b7 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +