From 9ef4515a327571c5983cb39d573cd609d999648d Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 3 Jan 2022 03:11:01 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 72 +++++--- .../controllers/algo/rusefi_generated.h | 57 +++--- ...ngine_configuration_generated_structures.h | 72 +++++--- .../controllers/algo/rusefi_generated.h | 57 +++--- ...ngine_configuration_generated_structures.h | 72 +++++--- .../controllers/algo/rusefi_generated.h | 57 +++--- ...ngine_configuration_generated_structures.h | 72 +++++--- .../controllers/generated/rusefi_generated.h | 57 +++--- .../controllers/generated/signature_all.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen81.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellenNA8_96.h | 4 +- .../generated/signature_hellen_cypress.h | 4 +- .../controllers/generated/signature_kin.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../lua/generated/value_lookup_generated.cpp | 28 +++ firmware/tunerstudio/generated/rusefi.ini | 67 +++---- .../tunerstudio/generated/rusefi_atlas.ini | 67 +++---- .../generated/rusefi_f429-discovery.ini | 67 +++---- .../generated/rusefi_frankenso_na6.ini | 67 +++---- .../generated/rusefi_hellen-nb1.ini | 67 +++---- .../generated/rusefi_hellen121nissan.ini | 67 +++---- .../generated/rusefi_hellen121vag.ini | 67 +++---- .../generated/rusefi_hellen128mercedes.ini | 67 +++---- .../generated/rusefi_hellen154hyundai.ini | 67 +++---- .../tunerstudio/generated/rusefi_hellen72.ini | 67 +++---- .../tunerstudio/generated/rusefi_hellen81.ini | 67 +++---- .../generated/rusefi_hellen88bmw.ini | 67 +++---- .../generated/rusefi_hellenNA6.ini | 67 +++---- .../generated/rusefi_hellenNA8_96.ini | 67 +++---- .../generated/rusefi_hellen_cypress.ini | 67 +++---- .../tunerstudio/generated/rusefi_kinetis.ini | 67 +++---- .../tunerstudio/generated/rusefi_mre_f4.ini | 67 +++---- .../tunerstudio/generated/rusefi_mre_f7.ini | 67 +++---- .../generated/rusefi_prometheus_405.ini | 67 +++---- .../generated/rusefi_prometheus_469.ini | 67 +++---- .../generated/rusefi_proteus_f4.ini | 67 +++---- .../generated/rusefi_proteus_f7.ini | 67 +++---- .../generated/rusefi_subaru_eg33_f7.ini | 67 +++---- .../com/rusefi/config/generated/Fields.java | 163 +++++++++--------- 56 files changed, 1334 insertions(+), 1006 deletions(-) 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 eabb1920d5..208a33faaf 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 Sat Dec 25 04:39:41 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Jan 03 03:09:25 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2930,9 +2930,27 @@ struct engine_configuration_s { */ load_override_e afrOverrideMode; /** + A * offset 1736 */ - uint32_t unused1736; + uint8_t mc33_hpfp_i_peak; + /** + A + * offset 1737 + */ + uint8_t mc33_hpfp_i_hold; + /** + * How long to deactivate power when hold current is reached before applying power again + us + * offset 1738 + */ + uint8_t mc33_hpfp_i_hold_off; + /** + * Maximum amount of time the solenoid can be active before assuming a programming error + ms + * offset 1739 + */ + uint8_t mc33_hpfp_max_hold; /** offset 1740 bit 0 */ bool unused1740b0 : 1 {}; @@ -2960,76 +2978,76 @@ struct engine_configuration_s { bool unused1130 : 1 {}; /** offset 1740 bit 8 */ - bool unusedBit_498_8 : 1 {}; + bool unusedBit_501_8 : 1 {}; /** offset 1740 bit 9 */ - bool unusedBit_498_9 : 1 {}; + bool unusedBit_501_9 : 1 {}; /** offset 1740 bit 10 */ - bool unusedBit_498_10 : 1 {}; + bool unusedBit_501_10 : 1 {}; /** offset 1740 bit 11 */ - bool unusedBit_498_11 : 1 {}; + bool unusedBit_501_11 : 1 {}; /** offset 1740 bit 12 */ - bool unusedBit_498_12 : 1 {}; + bool unusedBit_501_12 : 1 {}; /** offset 1740 bit 13 */ - bool unusedBit_498_13 : 1 {}; + bool unusedBit_501_13 : 1 {}; /** offset 1740 bit 14 */ - bool unusedBit_498_14 : 1 {}; + bool unusedBit_501_14 : 1 {}; /** offset 1740 bit 15 */ - bool unusedBit_498_15 : 1 {}; + bool unusedBit_501_15 : 1 {}; /** offset 1740 bit 16 */ - bool unusedBit_498_16 : 1 {}; + bool unusedBit_501_16 : 1 {}; /** offset 1740 bit 17 */ - bool unusedBit_498_17 : 1 {}; + bool unusedBit_501_17 : 1 {}; /** offset 1740 bit 18 */ - bool unusedBit_498_18 : 1 {}; + bool unusedBit_501_18 : 1 {}; /** offset 1740 bit 19 */ - bool unusedBit_498_19 : 1 {}; + bool unusedBit_501_19 : 1 {}; /** offset 1740 bit 20 */ - bool unusedBit_498_20 : 1 {}; + bool unusedBit_501_20 : 1 {}; /** offset 1740 bit 21 */ - bool unusedBit_498_21 : 1 {}; + bool unusedBit_501_21 : 1 {}; /** offset 1740 bit 22 */ - bool unusedBit_498_22 : 1 {}; + bool unusedBit_501_22 : 1 {}; /** offset 1740 bit 23 */ - bool unusedBit_498_23 : 1 {}; + bool unusedBit_501_23 : 1 {}; /** offset 1740 bit 24 */ - bool unusedBit_498_24 : 1 {}; + bool unusedBit_501_24 : 1 {}; /** offset 1740 bit 25 */ - bool unusedBit_498_25 : 1 {}; + bool unusedBit_501_25 : 1 {}; /** offset 1740 bit 26 */ - bool unusedBit_498_26 : 1 {}; + bool unusedBit_501_26 : 1 {}; /** offset 1740 bit 27 */ - bool unusedBit_498_27 : 1 {}; + bool unusedBit_501_27 : 1 {}; /** offset 1740 bit 28 */ - bool unusedBit_498_28 : 1 {}; + bool unusedBit_501_28 : 1 {}; /** offset 1740 bit 29 */ - bool unusedBit_498_29 : 1 {}; + bool unusedBit_501_29 : 1 {}; /** offset 1740 bit 30 */ - bool unusedBit_498_30 : 1 {}; + bool unusedBit_501_30 : 1 {}; /** offset 1740 bit 31 */ - bool unusedBit_498_31 : 1 {}; + bool unusedBit_501_31 : 1 {}; /** * offset 1744 */ @@ -4411,4 +4429,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 Sat Dec 25 04:39:41 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Jan 03 03:09:25 UTC 2022 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 efe994f16d..120929e040 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 @@ -1645,6 +1645,10 @@ #define mc33972_cs_offset 686 #define mc33972_csPinMode_offset 687 #define mc33972spiDevice_offset 809 +#define mc33_hpfp_i_hold_off_offset 1738 +#define mc33_hpfp_i_hold_offset 1737 +#define mc33_hpfp_i_peak_offset 1736 +#define mc33_hpfp_max_hold_offset 1739 #define mc33_hvolt_offset 764 #define mc33_i_boost_offset 3964 #define mc33_i_hold_offset 3968 @@ -1870,7 +1874,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 3912646926 +#define SIGNATURE_HASH 2625301744 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2390,7 +2394,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.01.03.hellen_cypress.3912646926" +#define TS_SIGNATURE "rusEFI 2022.01.03.hellen_cypress.2625301744" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2421,7 +2425,6 @@ #define unused1476b20_offset 1272 #define unused1476b3_offset 1272 #define unused1476b8_offset 1272 -#define unused1736_offset 1736 #define unused1740b0_offset 1740 #define unused1740b1_offset 1740 #define unused1740b2_offset 1740 @@ -2439,30 +2442,30 @@ #define unusedBit_310_30_offset 896 #define unusedBit_310_31_offset 896 #define unusedBit_48_31_offset 164 -#define unusedBit_498_10_offset 1740 -#define unusedBit_498_11_offset 1740 -#define unusedBit_498_12_offset 1740 -#define unusedBit_498_13_offset 1740 -#define unusedBit_498_14_offset 1740 -#define unusedBit_498_15_offset 1740 -#define unusedBit_498_16_offset 1740 -#define unusedBit_498_17_offset 1740 -#define unusedBit_498_18_offset 1740 -#define unusedBit_498_19_offset 1740 -#define unusedBit_498_20_offset 1740 -#define unusedBit_498_21_offset 1740 -#define unusedBit_498_22_offset 1740 -#define unusedBit_498_23_offset 1740 -#define unusedBit_498_24_offset 1740 -#define unusedBit_498_25_offset 1740 -#define unusedBit_498_26_offset 1740 -#define unusedBit_498_27_offset 1740 -#define unusedBit_498_28_offset 1740 -#define unusedBit_498_29_offset 1740 -#define unusedBit_498_30_offset 1740 -#define unusedBit_498_31_offset 1740 -#define unusedBit_498_8_offset 1740 -#define unusedBit_498_9_offset 1740 +#define unusedBit_501_10_offset 1740 +#define unusedBit_501_11_offset 1740 +#define unusedBit_501_12_offset 1740 +#define unusedBit_501_13_offset 1740 +#define unusedBit_501_14_offset 1740 +#define unusedBit_501_15_offset 1740 +#define unusedBit_501_16_offset 1740 +#define unusedBit_501_17_offset 1740 +#define unusedBit_501_18_offset 1740 +#define unusedBit_501_19_offset 1740 +#define unusedBit_501_20_offset 1740 +#define unusedBit_501_21_offset 1740 +#define unusedBit_501_22_offset 1740 +#define unusedBit_501_23_offset 1740 +#define unusedBit_501_24_offset 1740 +#define unusedBit_501_25_offset 1740 +#define unusedBit_501_26_offset 1740 +#define unusedBit_501_27_offset 1740 +#define unusedBit_501_28_offset 1740 +#define unusedBit_501_29_offset 1740 +#define unusedBit_501_30_offset 1740 +#define unusedBit_501_31_offset 1740 +#define unusedBit_501_8_offset 1740 +#define unusedBit_501_9_offset 1740 #define unusedBitHere1_offset 1260 #define unusedBitHere2_offset 1260 #define unusedBitHere3_offset 1260 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 064fde9e4d..b4a9c0e459 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 Sat Dec 25 04:39:39 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Jan 03 03:09:23 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2930,9 +2930,27 @@ struct engine_configuration_s { */ load_override_e afrOverrideMode; /** + A * offset 1736 */ - uint32_t unused1736; + uint8_t mc33_hpfp_i_peak; + /** + A + * offset 1737 + */ + uint8_t mc33_hpfp_i_hold; + /** + * How long to deactivate power when hold current is reached before applying power again + us + * offset 1738 + */ + uint8_t mc33_hpfp_i_hold_off; + /** + * Maximum amount of time the solenoid can be active before assuming a programming error + ms + * offset 1739 + */ + uint8_t mc33_hpfp_max_hold; /** offset 1740 bit 0 */ bool unused1740b0 : 1 {}; @@ -2960,76 +2978,76 @@ struct engine_configuration_s { bool unused1130 : 1 {}; /** offset 1740 bit 8 */ - bool unusedBit_498_8 : 1 {}; + bool unusedBit_501_8 : 1 {}; /** offset 1740 bit 9 */ - bool unusedBit_498_9 : 1 {}; + bool unusedBit_501_9 : 1 {}; /** offset 1740 bit 10 */ - bool unusedBit_498_10 : 1 {}; + bool unusedBit_501_10 : 1 {}; /** offset 1740 bit 11 */ - bool unusedBit_498_11 : 1 {}; + bool unusedBit_501_11 : 1 {}; /** offset 1740 bit 12 */ - bool unusedBit_498_12 : 1 {}; + bool unusedBit_501_12 : 1 {}; /** offset 1740 bit 13 */ - bool unusedBit_498_13 : 1 {}; + bool unusedBit_501_13 : 1 {}; /** offset 1740 bit 14 */ - bool unusedBit_498_14 : 1 {}; + bool unusedBit_501_14 : 1 {}; /** offset 1740 bit 15 */ - bool unusedBit_498_15 : 1 {}; + bool unusedBit_501_15 : 1 {}; /** offset 1740 bit 16 */ - bool unusedBit_498_16 : 1 {}; + bool unusedBit_501_16 : 1 {}; /** offset 1740 bit 17 */ - bool unusedBit_498_17 : 1 {}; + bool unusedBit_501_17 : 1 {}; /** offset 1740 bit 18 */ - bool unusedBit_498_18 : 1 {}; + bool unusedBit_501_18 : 1 {}; /** offset 1740 bit 19 */ - bool unusedBit_498_19 : 1 {}; + bool unusedBit_501_19 : 1 {}; /** offset 1740 bit 20 */ - bool unusedBit_498_20 : 1 {}; + bool unusedBit_501_20 : 1 {}; /** offset 1740 bit 21 */ - bool unusedBit_498_21 : 1 {}; + bool unusedBit_501_21 : 1 {}; /** offset 1740 bit 22 */ - bool unusedBit_498_22 : 1 {}; + bool unusedBit_501_22 : 1 {}; /** offset 1740 bit 23 */ - bool unusedBit_498_23 : 1 {}; + bool unusedBit_501_23 : 1 {}; /** offset 1740 bit 24 */ - bool unusedBit_498_24 : 1 {}; + bool unusedBit_501_24 : 1 {}; /** offset 1740 bit 25 */ - bool unusedBit_498_25 : 1 {}; + bool unusedBit_501_25 : 1 {}; /** offset 1740 bit 26 */ - bool unusedBit_498_26 : 1 {}; + bool unusedBit_501_26 : 1 {}; /** offset 1740 bit 27 */ - bool unusedBit_498_27 : 1 {}; + bool unusedBit_501_27 : 1 {}; /** offset 1740 bit 28 */ - bool unusedBit_498_28 : 1 {}; + bool unusedBit_501_28 : 1 {}; /** offset 1740 bit 29 */ - bool unusedBit_498_29 : 1 {}; + bool unusedBit_501_29 : 1 {}; /** offset 1740 bit 30 */ - bool unusedBit_498_30 : 1 {}; + bool unusedBit_501_30 : 1 {}; /** offset 1740 bit 31 */ - bool unusedBit_498_31 : 1 {}; + bool unusedBit_501_31 : 1 {}; /** * offset 1744 */ @@ -4405,4 +4423,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 Sat Dec 25 04:39:39 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Jan 03 03:09:23 UTC 2022 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 ef4cd61e5a..0b08b89a58 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1630,6 +1630,10 @@ #define mc33972_cs_offset 686 #define mc33972_csPinMode_offset 687 #define mc33972spiDevice_offset 809 +#define mc33_hpfp_i_hold_off_offset 1738 +#define mc33_hpfp_i_hold_offset 1737 +#define mc33_hpfp_i_peak_offset 1736 +#define mc33_hpfp_max_hold_offset 1739 #define mc33_hvolt_offset 764 #define mc33_i_boost_offset 3936 #define mc33_i_hold_offset 3940 @@ -1855,7 +1859,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 378768882 +#define SIGNATURE_HASH 1675567116 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2375,7 +2379,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.01.03.kin.378768882" +#define TS_SIGNATURE "rusEFI 2022.01.03.kin.1675567116" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2406,7 +2410,6 @@ #define unused1476b20_offset 1272 #define unused1476b3_offset 1272 #define unused1476b8_offset 1272 -#define unused1736_offset 1736 #define unused1740b0_offset 1740 #define unused1740b1_offset 1740 #define unused1740b2_offset 1740 @@ -2424,30 +2427,30 @@ #define unusedBit_310_30_offset 896 #define unusedBit_310_31_offset 896 #define unusedBit_48_31_offset 164 -#define unusedBit_498_10_offset 1740 -#define unusedBit_498_11_offset 1740 -#define unusedBit_498_12_offset 1740 -#define unusedBit_498_13_offset 1740 -#define unusedBit_498_14_offset 1740 -#define unusedBit_498_15_offset 1740 -#define unusedBit_498_16_offset 1740 -#define unusedBit_498_17_offset 1740 -#define unusedBit_498_18_offset 1740 -#define unusedBit_498_19_offset 1740 -#define unusedBit_498_20_offset 1740 -#define unusedBit_498_21_offset 1740 -#define unusedBit_498_22_offset 1740 -#define unusedBit_498_23_offset 1740 -#define unusedBit_498_24_offset 1740 -#define unusedBit_498_25_offset 1740 -#define unusedBit_498_26_offset 1740 -#define unusedBit_498_27_offset 1740 -#define unusedBit_498_28_offset 1740 -#define unusedBit_498_29_offset 1740 -#define unusedBit_498_30_offset 1740 -#define unusedBit_498_31_offset 1740 -#define unusedBit_498_8_offset 1740 -#define unusedBit_498_9_offset 1740 +#define unusedBit_501_10_offset 1740 +#define unusedBit_501_11_offset 1740 +#define unusedBit_501_12_offset 1740 +#define unusedBit_501_13_offset 1740 +#define unusedBit_501_14_offset 1740 +#define unusedBit_501_15_offset 1740 +#define unusedBit_501_16_offset 1740 +#define unusedBit_501_17_offset 1740 +#define unusedBit_501_18_offset 1740 +#define unusedBit_501_19_offset 1740 +#define unusedBit_501_20_offset 1740 +#define unusedBit_501_21_offset 1740 +#define unusedBit_501_22_offset 1740 +#define unusedBit_501_23_offset 1740 +#define unusedBit_501_24_offset 1740 +#define unusedBit_501_25_offset 1740 +#define unusedBit_501_26_offset 1740 +#define unusedBit_501_27_offset 1740 +#define unusedBit_501_28_offset 1740 +#define unusedBit_501_29_offset 1740 +#define unusedBit_501_30_offset 1740 +#define unusedBit_501_31_offset 1740 +#define unusedBit_501_8_offset 1740 +#define unusedBit_501_9_offset 1740 #define unusedBitHere1_offset 1260 #define unusedBitHere2_offset 1260 #define unusedBitHere3_offset 1260 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 a851f3aa9e..081df21bef 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 Sat Dec 25 04:39:43 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 Mon Jan 03 03:09:28 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2930,9 +2930,27 @@ struct engine_configuration_s { */ load_override_e afrOverrideMode; /** + A * offset 1736 */ - uint32_t unused1736; + uint8_t mc33_hpfp_i_peak; + /** + A + * offset 1737 + */ + uint8_t mc33_hpfp_i_hold; + /** + * How long to deactivate power when hold current is reached before applying power again + us + * offset 1738 + */ + uint8_t mc33_hpfp_i_hold_off; + /** + * Maximum amount of time the solenoid can be active before assuming a programming error + ms + * offset 1739 + */ + uint8_t mc33_hpfp_max_hold; /** offset 1740 bit 0 */ bool unused1740b0 : 1 {}; @@ -2960,76 +2978,76 @@ struct engine_configuration_s { bool unused1130 : 1 {}; /** offset 1740 bit 8 */ - bool unusedBit_498_8 : 1 {}; + bool unusedBit_501_8 : 1 {}; /** offset 1740 bit 9 */ - bool unusedBit_498_9 : 1 {}; + bool unusedBit_501_9 : 1 {}; /** offset 1740 bit 10 */ - bool unusedBit_498_10 : 1 {}; + bool unusedBit_501_10 : 1 {}; /** offset 1740 bit 11 */ - bool unusedBit_498_11 : 1 {}; + bool unusedBit_501_11 : 1 {}; /** offset 1740 bit 12 */ - bool unusedBit_498_12 : 1 {}; + bool unusedBit_501_12 : 1 {}; /** offset 1740 bit 13 */ - bool unusedBit_498_13 : 1 {}; + bool unusedBit_501_13 : 1 {}; /** offset 1740 bit 14 */ - bool unusedBit_498_14 : 1 {}; + bool unusedBit_501_14 : 1 {}; /** offset 1740 bit 15 */ - bool unusedBit_498_15 : 1 {}; + bool unusedBit_501_15 : 1 {}; /** offset 1740 bit 16 */ - bool unusedBit_498_16 : 1 {}; + bool unusedBit_501_16 : 1 {}; /** offset 1740 bit 17 */ - bool unusedBit_498_17 : 1 {}; + bool unusedBit_501_17 : 1 {}; /** offset 1740 bit 18 */ - bool unusedBit_498_18 : 1 {}; + bool unusedBit_501_18 : 1 {}; /** offset 1740 bit 19 */ - bool unusedBit_498_19 : 1 {}; + bool unusedBit_501_19 : 1 {}; /** offset 1740 bit 20 */ - bool unusedBit_498_20 : 1 {}; + bool unusedBit_501_20 : 1 {}; /** offset 1740 bit 21 */ - bool unusedBit_498_21 : 1 {}; + bool unusedBit_501_21 : 1 {}; /** offset 1740 bit 22 */ - bool unusedBit_498_22 : 1 {}; + bool unusedBit_501_22 : 1 {}; /** offset 1740 bit 23 */ - bool unusedBit_498_23 : 1 {}; + bool unusedBit_501_23 : 1 {}; /** offset 1740 bit 24 */ - bool unusedBit_498_24 : 1 {}; + bool unusedBit_501_24 : 1 {}; /** offset 1740 bit 25 */ - bool unusedBit_498_25 : 1 {}; + bool unusedBit_501_25 : 1 {}; /** offset 1740 bit 26 */ - bool unusedBit_498_26 : 1 {}; + bool unusedBit_501_26 : 1 {}; /** offset 1740 bit 27 */ - bool unusedBit_498_27 : 1 {}; + bool unusedBit_501_27 : 1 {}; /** offset 1740 bit 28 */ - bool unusedBit_498_28 : 1 {}; + bool unusedBit_501_28 : 1 {}; /** offset 1740 bit 29 */ - bool unusedBit_498_29 : 1 {}; + bool unusedBit_501_29 : 1 {}; /** offset 1740 bit 30 */ - bool unusedBit_498_30 : 1 {}; + bool unusedBit_501_30 : 1 {}; /** offset 1740 bit 31 */ - bool unusedBit_498_31 : 1 {}; + bool unusedBit_501_31 : 1 {}; /** * offset 1744 */ @@ -4411,4 +4429,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 Sat Dec 25 04:39:43 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 Mon Jan 03 03:09:28 UTC 2022 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 62f107050e..142553aadf 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 @@ -1657,6 +1657,10 @@ #define mc33972_cs_offset 686 #define mc33972_csPinMode_offset 687 #define mc33972spiDevice_offset 809 +#define mc33_hpfp_i_hold_off_offset 1738 +#define mc33_hpfp_i_hold_offset 1737 +#define mc33_hpfp_i_peak_offset 1736 +#define mc33_hpfp_max_hold_offset 1739 #define mc33_hvolt_offset 764 #define mc33_i_boost_offset 3964 #define mc33_i_hold_offset 3968 @@ -1883,7 +1887,7 @@ #define show_test_presets false #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 276410594 +#define SIGNATURE_HASH 1697979676 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2403,7 +2407,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2022.01.03.subaru_eg33_f7.276410594" +#define TS_SIGNATURE "rusEFI 2022.01.03.subaru_eg33_f7.1697979676" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2434,7 +2438,6 @@ #define unused1476b20_offset 1272 #define unused1476b3_offset 1272 #define unused1476b8_offset 1272 -#define unused1736_offset 1736 #define unused1740b0_offset 1740 #define unused1740b1_offset 1740 #define unused1740b2_offset 1740 @@ -2452,30 +2455,30 @@ #define unusedBit_310_30_offset 896 #define unusedBit_310_31_offset 896 #define unusedBit_48_31_offset 164 -#define unusedBit_498_10_offset 1740 -#define unusedBit_498_11_offset 1740 -#define unusedBit_498_12_offset 1740 -#define unusedBit_498_13_offset 1740 -#define unusedBit_498_14_offset 1740 -#define unusedBit_498_15_offset 1740 -#define unusedBit_498_16_offset 1740 -#define unusedBit_498_17_offset 1740 -#define unusedBit_498_18_offset 1740 -#define unusedBit_498_19_offset 1740 -#define unusedBit_498_20_offset 1740 -#define unusedBit_498_21_offset 1740 -#define unusedBit_498_22_offset 1740 -#define unusedBit_498_23_offset 1740 -#define unusedBit_498_24_offset 1740 -#define unusedBit_498_25_offset 1740 -#define unusedBit_498_26_offset 1740 -#define unusedBit_498_27_offset 1740 -#define unusedBit_498_28_offset 1740 -#define unusedBit_498_29_offset 1740 -#define unusedBit_498_30_offset 1740 -#define unusedBit_498_31_offset 1740 -#define unusedBit_498_8_offset 1740 -#define unusedBit_498_9_offset 1740 +#define unusedBit_501_10_offset 1740 +#define unusedBit_501_11_offset 1740 +#define unusedBit_501_12_offset 1740 +#define unusedBit_501_13_offset 1740 +#define unusedBit_501_14_offset 1740 +#define unusedBit_501_15_offset 1740 +#define unusedBit_501_16_offset 1740 +#define unusedBit_501_17_offset 1740 +#define unusedBit_501_18_offset 1740 +#define unusedBit_501_19_offset 1740 +#define unusedBit_501_20_offset 1740 +#define unusedBit_501_21_offset 1740 +#define unusedBit_501_22_offset 1740 +#define unusedBit_501_23_offset 1740 +#define unusedBit_501_24_offset 1740 +#define unusedBit_501_25_offset 1740 +#define unusedBit_501_26_offset 1740 +#define unusedBit_501_27_offset 1740 +#define unusedBit_501_28_offset 1740 +#define unusedBit_501_29_offset 1740 +#define unusedBit_501_30_offset 1740 +#define unusedBit_501_31_offset 1740 +#define unusedBit_501_8_offset 1740 +#define unusedBit_501_9_offset 1740 #define unusedBitHere1_offset 1260 #define unusedBitHere2_offset 1260 #define unusedBitHere3_offset 1260 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 26f5f9aa6f..bb72708b10 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 Sat Dec 25 04:39:46 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:09:32 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2930,9 +2930,27 @@ struct engine_configuration_s { */ load_override_e afrOverrideMode; /** + A * offset 1736 */ - uint32_t unused1736; + uint8_t mc33_hpfp_i_peak; + /** + A + * offset 1737 + */ + uint8_t mc33_hpfp_i_hold; + /** + * How long to deactivate power when hold current is reached before applying power again + us + * offset 1738 + */ + uint8_t mc33_hpfp_i_hold_off; + /** + * Maximum amount of time the solenoid can be active before assuming a programming error + ms + * offset 1739 + */ + uint8_t mc33_hpfp_max_hold; /** offset 1740 bit 0 */ bool unused1740b0 : 1 {}; @@ -2960,76 +2978,76 @@ struct engine_configuration_s { bool unused1130 : 1 {}; /** offset 1740 bit 8 */ - bool unusedBit_498_8 : 1 {}; + bool unusedBit_501_8 : 1 {}; /** offset 1740 bit 9 */ - bool unusedBit_498_9 : 1 {}; + bool unusedBit_501_9 : 1 {}; /** offset 1740 bit 10 */ - bool unusedBit_498_10 : 1 {}; + bool unusedBit_501_10 : 1 {}; /** offset 1740 bit 11 */ - bool unusedBit_498_11 : 1 {}; + bool unusedBit_501_11 : 1 {}; /** offset 1740 bit 12 */ - bool unusedBit_498_12 : 1 {}; + bool unusedBit_501_12 : 1 {}; /** offset 1740 bit 13 */ - bool unusedBit_498_13 : 1 {}; + bool unusedBit_501_13 : 1 {}; /** offset 1740 bit 14 */ - bool unusedBit_498_14 : 1 {}; + bool unusedBit_501_14 : 1 {}; /** offset 1740 bit 15 */ - bool unusedBit_498_15 : 1 {}; + bool unusedBit_501_15 : 1 {}; /** offset 1740 bit 16 */ - bool unusedBit_498_16 : 1 {}; + bool unusedBit_501_16 : 1 {}; /** offset 1740 bit 17 */ - bool unusedBit_498_17 : 1 {}; + bool unusedBit_501_17 : 1 {}; /** offset 1740 bit 18 */ - bool unusedBit_498_18 : 1 {}; + bool unusedBit_501_18 : 1 {}; /** offset 1740 bit 19 */ - bool unusedBit_498_19 : 1 {}; + bool unusedBit_501_19 : 1 {}; /** offset 1740 bit 20 */ - bool unusedBit_498_20 : 1 {}; + bool unusedBit_501_20 : 1 {}; /** offset 1740 bit 21 */ - bool unusedBit_498_21 : 1 {}; + bool unusedBit_501_21 : 1 {}; /** offset 1740 bit 22 */ - bool unusedBit_498_22 : 1 {}; + bool unusedBit_501_22 : 1 {}; /** offset 1740 bit 23 */ - bool unusedBit_498_23 : 1 {}; + bool unusedBit_501_23 : 1 {}; /** offset 1740 bit 24 */ - bool unusedBit_498_24 : 1 {}; + bool unusedBit_501_24 : 1 {}; /** offset 1740 bit 25 */ - bool unusedBit_498_25 : 1 {}; + bool unusedBit_501_25 : 1 {}; /** offset 1740 bit 26 */ - bool unusedBit_498_26 : 1 {}; + bool unusedBit_501_26 : 1 {}; /** offset 1740 bit 27 */ - bool unusedBit_498_27 : 1 {}; + bool unusedBit_501_27 : 1 {}; /** offset 1740 bit 28 */ - bool unusedBit_498_28 : 1 {}; + bool unusedBit_501_28 : 1 {}; /** offset 1740 bit 29 */ - bool unusedBit_498_29 : 1 {}; + bool unusedBit_501_29 : 1 {}; /** offset 1740 bit 30 */ - bool unusedBit_498_30 : 1 {}; + bool unusedBit_501_30 : 1 {}; /** offset 1740 bit 31 */ - bool unusedBit_498_31 : 1 {}; + bool unusedBit_501_31 : 1 {}; /** * offset 1744 */ @@ -4411,4 +4429,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 Sat Dec 25 04:39:46 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:09:32 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index ad064d5dca..44bbd21a2e 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1645,6 +1645,10 @@ #define mc33972_cs_offset 686 #define mc33972_csPinMode_offset 687 #define mc33972spiDevice_offset 809 +#define mc33_hpfp_i_hold_off_offset 1738 +#define mc33_hpfp_i_hold_offset 1737 +#define mc33_hpfp_i_peak_offset 1736 +#define mc33_hpfp_max_hold_offset 1739 #define mc33_hvolt_offset 764 #define mc33_i_boost_offset 3964 #define mc33_i_hold_offset 3968 @@ -1870,7 +1874,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 3552814770 +#define SIGNATURE_HASH 2794392396 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2390,7 +2394,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.01.03.all.3552814770" +#define TS_SIGNATURE "rusEFI 2022.01.03.all.2794392396" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2421,7 +2425,6 @@ #define unused1476b20_offset 1272 #define unused1476b3_offset 1272 #define unused1476b8_offset 1272 -#define unused1736_offset 1736 #define unused1740b0_offset 1740 #define unused1740b1_offset 1740 #define unused1740b2_offset 1740 @@ -2439,30 +2442,30 @@ #define unusedBit_310_30_offset 896 #define unusedBit_310_31_offset 896 #define unusedBit_48_31_offset 164 -#define unusedBit_498_10_offset 1740 -#define unusedBit_498_11_offset 1740 -#define unusedBit_498_12_offset 1740 -#define unusedBit_498_13_offset 1740 -#define unusedBit_498_14_offset 1740 -#define unusedBit_498_15_offset 1740 -#define unusedBit_498_16_offset 1740 -#define unusedBit_498_17_offset 1740 -#define unusedBit_498_18_offset 1740 -#define unusedBit_498_19_offset 1740 -#define unusedBit_498_20_offset 1740 -#define unusedBit_498_21_offset 1740 -#define unusedBit_498_22_offset 1740 -#define unusedBit_498_23_offset 1740 -#define unusedBit_498_24_offset 1740 -#define unusedBit_498_25_offset 1740 -#define unusedBit_498_26_offset 1740 -#define unusedBit_498_27_offset 1740 -#define unusedBit_498_28_offset 1740 -#define unusedBit_498_29_offset 1740 -#define unusedBit_498_30_offset 1740 -#define unusedBit_498_31_offset 1740 -#define unusedBit_498_8_offset 1740 -#define unusedBit_498_9_offset 1740 +#define unusedBit_501_10_offset 1740 +#define unusedBit_501_11_offset 1740 +#define unusedBit_501_12_offset 1740 +#define unusedBit_501_13_offset 1740 +#define unusedBit_501_14_offset 1740 +#define unusedBit_501_15_offset 1740 +#define unusedBit_501_16_offset 1740 +#define unusedBit_501_17_offset 1740 +#define unusedBit_501_18_offset 1740 +#define unusedBit_501_19_offset 1740 +#define unusedBit_501_20_offset 1740 +#define unusedBit_501_21_offset 1740 +#define unusedBit_501_22_offset 1740 +#define unusedBit_501_23_offset 1740 +#define unusedBit_501_24_offset 1740 +#define unusedBit_501_25_offset 1740 +#define unusedBit_501_26_offset 1740 +#define unusedBit_501_27_offset 1740 +#define unusedBit_501_28_offset 1740 +#define unusedBit_501_29_offset 1740 +#define unusedBit_501_30_offset 1740 +#define unusedBit_501_31_offset 1740 +#define unusedBit_501_8_offset 1740 +#define unusedBit_501_9_offset 1740 #define unusedBitHere1_offset 1260 #define unusedBitHere2_offset 1260 #define unusedBitHere3_offset 1260 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index aa967816d6..360a59cadf 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3552814770 -#define TS_SIGNATURE "rusEFI 2022.01.03.all.3552814770" +#define SIGNATURE_HASH 2794392396 +#define TS_SIGNATURE "rusEFI 2022.01.03.all.2794392396" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 1513178c06..e8821c879e 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3473494933 -#define TS_SIGNATURE "rusEFI 2022.01.03.atlas.3473494933" +#define SIGNATURE_HASH 3125149291 +#define TS_SIGNATURE "rusEFI 2022.01.03.atlas.3125149291" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index b05c57280c..3991f2ee2f 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3552814770 -#define TS_SIGNATURE "rusEFI 2022.01.03.f429-discovery.3552814770" +#define SIGNATURE_HASH 2794392396 +#define TS_SIGNATURE "rusEFI 2022.01.03.f429-discovery.2794392396" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 7fe31dba46..45737f318e 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2851205979 -#define TS_SIGNATURE "rusEFI 2022.01.03.frankenso_na6.2851205979" +#define SIGNATURE_HASH 3703398053 +#define TS_SIGNATURE "rusEFI 2022.01.03.frankenso_na6.3703398053" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index d9724f79d9..d0910a9118 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 789207147 -#define TS_SIGNATURE "rusEFI 2022.01.03.hellen-nb1.789207147" +#define SIGNATURE_HASH 1514599829 +#define TS_SIGNATURE "rusEFI 2022.01.03.hellen-nb1.1514599829" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 9dedf0829c..f593840f91 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1749533715 -#define TS_SIGNATURE "rusEFI 2022.01.03.hellen121nissan.1749533715" +#define SIGNATURE_HASH 487287277 +#define TS_SIGNATURE "rusEFI 2022.01.03.hellen121nissan.487287277" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 63aafa8814..ed07568b4b 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2355135160 -#define TS_SIGNATURE "rusEFI 2022.01.03.hellen121vag.2355135160" +#define SIGNATURE_HASH 4180422470 +#define TS_SIGNATURE "rusEFI 2022.01.03.hellen121vag.4180422470" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index d12a831151..9807cb84ff 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 4265144997 -#define TS_SIGNATURE "rusEFI 2022.01.03.hellen128.4265144997" +#define SIGNATURE_HASH 2339659611 +#define TS_SIGNATURE "rusEFI 2022.01.03.hellen128.2339659611" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index a38d4a7d8e..a1e539c9ee 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 534755870 -#define TS_SIGNATURE "rusEFI 2022.01.03.hellen154hyundai.534755870" +#define SIGNATURE_HASH 1788024800 +#define TS_SIGNATURE "rusEFI 2022.01.03.hellen154hyundai.1788024800" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 79ef0bf646..a1d9b0bc6b 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 662577410 -#define TS_SIGNATURE "rusEFI 2022.01.03.hellen72.662577410" +#define SIGNATURE_HASH 1379044604 +#define TS_SIGNATURE "rusEFI 2022.01.03.hellen72.1379044604" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 467c440c34..9250837fbe 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2473835761 -#define TS_SIGNATURE "rusEFI 2022.01.03.hellen81.2473835761" +#define SIGNATURE_HASH 3862892815 +#define TS_SIGNATURE "rusEFI 2022.01.03.hellen81.3862892815" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index b9b49d48a2..3cb0cf9f71 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1912813549 -#define TS_SIGNATURE "rusEFI 2022.01.03.hellen88bmw.1912813549" +#define SIGNATURE_HASH 122657299 +#define TS_SIGNATURE "rusEFI 2022.01.03.hellen88bmw.122657299" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 8908edc2c1..dbc9871ec2 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2784944154 -#define TS_SIGNATURE "rusEFI 2022.01.03.hellenNA6.2784944154" +#define SIGNATURE_HASH 3501346276 +#define TS_SIGNATURE "rusEFI 2022.01.03.hellenNA6.3501346276" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index d5f577768d..d66d9faf23 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 132999909 -#define TS_SIGNATURE "rusEFI 2022.01.03.hellenNA8_96.132999909" +#define SIGNATURE_HASH 1923204891 +#define TS_SIGNATURE "rusEFI 2022.01.03.hellenNA8_96.1923204891" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 1069b75246..cf83c556db 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 3912646926 -#define TS_SIGNATURE "rusEFI 2022.01.03.hellen_cypress.3912646926" +#define SIGNATURE_HASH 2625301744 +#define TS_SIGNATURE "rusEFI 2022.01.03.hellen_cypress.2625301744" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 574f08b1b3..ea7909934b 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 378768882 -#define TS_SIGNATURE "rusEFI 2022.01.03.kin.378768882" +#define SIGNATURE_HASH 1675567116 +#define TS_SIGNATURE "rusEFI 2022.01.03.kin.1675567116" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index d2cfc3338c..d76632e205 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1625611270 -#define TS_SIGNATURE "rusEFI 2022.01.03.mre_f4.1625611270" +#define SIGNATURE_HASH 363360760 +#define TS_SIGNATURE "rusEFI 2022.01.03.mre_f4.363360760" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 7cefda998a..73822e022e 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1625611270 -#define TS_SIGNATURE "rusEFI 2022.01.03.mre_f7.1625611270" +#define SIGNATURE_HASH 363360760 +#define TS_SIGNATURE "rusEFI 2022.01.03.mre_f7.363360760" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 1eac71412c..3ac167b16c 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2200534868 -#define TS_SIGNATURE "rusEFI 2022.01.03.prometheus_405.2200534868" +#define SIGNATURE_HASH 4133868202 +#define TS_SIGNATURE "rusEFI 2022.01.03.prometheus_405.4133868202" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index a7b7f7b787..f2b1587517 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2200534868 -#define TS_SIGNATURE "rusEFI 2022.01.03.prometheus_469.2200534868" +#define SIGNATURE_HASH 4133868202 +#define TS_SIGNATURE "rusEFI 2022.01.03.prometheus_469.4133868202" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 97147871fc..534b985578 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 289292398 -#define TS_SIGNATURE "rusEFI 2022.01.03.proteus_f4.289292398" +#define SIGNATURE_HASH 1685253520 +#define TS_SIGNATURE "rusEFI 2022.01.03.proteus_f4.1685253520" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 4a44e81dff..5c39aab456 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 289292398 -#define TS_SIGNATURE "rusEFI 2022.01.03.proteus_f7.289292398" +#define SIGNATURE_HASH 1685253520 +#define TS_SIGNATURE "rusEFI 2022.01.03.proteus_f7.1685253520" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 4d0b04e0f6..06b39269d8 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 276410594 -#define TS_SIGNATURE "rusEFI 2022.01.03.subaru_eg33_f7.276410594" +#define SIGNATURE_HASH 1697979676 +#define TS_SIGNATURE "rusEFI 2022.01.03.subaru_eg33_f7.1697979676" diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index 1b52de75a3..e127766d38 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -656,6 +656,14 @@ float getConfigValueByName(const char *name) { return engineConfiguration->throttlePedalSecondaryUpVoltage; if (strEqualCaseInsensitive(name, "throttlePedalSecondaryWOTVoltage")) return engineConfiguration->throttlePedalSecondaryWOTVoltage; + if (strEqualCaseInsensitive(name, "mc33_hpfp_i_peak")) + return engineConfiguration->mc33_hpfp_i_peak; + if (strEqualCaseInsensitive(name, "mc33_hpfp_i_hold")) + return engineConfiguration->mc33_hpfp_i_hold; + if (strEqualCaseInsensitive(name, "mc33_hpfp_i_hold_off")) + return engineConfiguration->mc33_hpfp_i_hold_off; + if (strEqualCaseInsensitive(name, "mc33_hpfp_max_hold")) + return engineConfiguration->mc33_hpfp_max_hold; if (strEqualCaseInsensitive(name, "stepperDcInvertedPins")) return engineConfiguration->stepperDcInvertedPins; if (strEqualCaseInsensitive(name, "boostCutPressure")) @@ -2529,6 +2537,26 @@ void setConfigValueByName(const char *name, float value) { engineConfiguration->throttlePedalSecondaryWOTVoltage = value; return; } + if (strEqualCaseInsensitive(name, "mc33_hpfp_i_peak")) + { + engineConfiguration->mc33_hpfp_i_peak = (int)value; + return; + } + if (strEqualCaseInsensitive(name, "mc33_hpfp_i_hold")) + { + engineConfiguration->mc33_hpfp_i_hold = (int)value; + return; + } + if (strEqualCaseInsensitive(name, "mc33_hpfp_i_hold_off")) + { + engineConfiguration->mc33_hpfp_i_hold_off = (int)value; + return; + } + if (strEqualCaseInsensitive(name, "mc33_hpfp_max_hold")) + { + engineConfiguration->mc33_hpfp_max_hold = (int)value; + return; + } if (strEqualCaseInsensitive(name, "stepperDcInvertedPins")) { engineConfiguration->stepperDcInvertedPins = (int)value; diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 856b329991..7c4817a678 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.all.3552814770" + signature = "rusEFI 2022.01.03.all.2794392396" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.all.3552814770" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.all.2794392396" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 00:00:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:09:21 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4511,7 +4516,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -6007,6 +6012,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 204d0082cb..bcc097cd2f 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.atlas.3473494933" + signature = "rusEFI 2022.01.03.atlas.3125149291" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.atlas.3473494933" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.atlas.3125149291" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 00:00:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:09:19 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4511,7 +4516,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5998,6 +6003,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index f6d7f99288..11d48d122d 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.f429-discovery.3552814770" + signature = "rusEFI 2022.01.03.f429-discovery.2794392396" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.f429-discovery.3552814770" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.f429-discovery.2794392396" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:23:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:08:35 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4511,7 +4516,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -6007,6 +6012,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 56d4a6e210..963d9c8727 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.frankenso_na6.2851205979" + signature = "rusEFI 2022.01.03.frankenso_na6.3703398053" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.frankenso_na6.2851205979" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.frankenso_na6.3703398053" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:24:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:09:07 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4511,7 +4516,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -6007,6 +6012,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 81f42c4ac2..beba84fd40 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.hellen-nb1.789207147" + signature = "rusEFI 2022.01.03.hellen-nb1.1514599829" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.hellen-nb1.789207147" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.hellen-nb1.1514599829" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:24:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:08:54 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4507,7 +4512,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5971,6 +5976,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index bcfacffacc..0a9b28e45e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.hellen121nissan.1749533715" + signature = "rusEFI 2022.01.03.hellen121nissan.487287277" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.hellen121nissan.1749533715" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.hellen121nissan.487287277" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:23:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:08:42 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4507,7 +4512,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5972,6 +5977,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 71c6de118a..6e6330a7f5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.hellen121vag.2355135160" + signature = "rusEFI 2022.01.03.hellen121vag.4180422470" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.hellen121vag.2355135160" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.hellen121vag.4180422470" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:23:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:08:39 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4507,7 +4512,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5974,6 +5979,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index e0d67e1abb..eb4a23fe90 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.hellen128.4265144997" + signature = "rusEFI 2022.01.03.hellen128.2339659611" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.hellen128.4265144997" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.hellen128.2339659611" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:23:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:08:37 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4507,7 +4512,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5972,6 +5977,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 9c402b7eed..5161fd5c81 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.hellen154hyundai.534755870" + signature = "rusEFI 2022.01.03.hellen154hyundai.1788024800" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.hellen154hyundai.534755870" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.hellen154hyundai.1788024800" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:24:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:08:44 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4507,7 +4512,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5971,6 +5976,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 5542e0397f..6156e34539 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.hellen72.662577410" + signature = "rusEFI 2022.01.03.hellen72.1379044604" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.hellen72.662577410" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.hellen72.1379044604" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:24:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:08:50 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4507,7 +4512,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5971,6 +5976,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 471881e2c0..004245ffa2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.hellen81.2473835761" + signature = "rusEFI 2022.01.03.hellen81.3862892815" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.hellen81.2473835761" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.hellen81.3862892815" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:24:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:08:52 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4506,7 +4511,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5968,6 +5973,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index d3cebe2ea0..2be0fdf169 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.hellen88bmw.1912813549" + signature = "rusEFI 2022.01.03.hellen88bmw.122657299" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.hellen88bmw.1912813549" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.hellen88bmw.122657299" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:24:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:08:47 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4507,7 +4512,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5969,6 +5974,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 1887a48595..b617f80aab 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.hellenNA6.2784944154" + signature = "rusEFI 2022.01.03.hellenNA6.3501346276" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.hellenNA6.2784944154" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.hellenNA6.3501346276" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:24:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:08:57 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4507,7 +4512,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5972,6 +5977,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 4ecb61fde2..93ca8ffa79 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.hellenNA8_96.132999909" + signature = "rusEFI 2022.01.03.hellenNA8_96.1923204891" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.hellenNA8_96.132999909" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.hellenNA8_96.1923204891" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:24:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:08:59 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4507,7 +4512,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5971,6 +5976,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 4b026d381e..01194bceb0 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.hellen_cypress.3912646926" + signature = "rusEFI 2022.01.03.hellen_cypress.2625301744" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.hellen_cypress.3912646926" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.hellen_cypress.2625301744" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Jan 03 00:00:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Jan 03 03:09:25 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4511,7 +4516,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -6007,6 +6012,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 4ba958d6e7..d5b0fd958e 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.kin.378768882" + signature = "rusEFI 2022.01.03.kin.1675567116" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.kin.378768882" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.kin.1675567116" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Jan 03 00:00:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Jan 03 03:09:23 UTC 2022 pageSize = 20968 page = 1 @@ -785,7 +785,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -794,30 +797,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1608,6 +1611,8 @@ fuelTrims12_table = array, S08, 20952, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4478,7 +4483,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5974,6 +5979,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index a7591a7054..ea607ca84d 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.mre_f4.1625611270" + signature = "rusEFI 2022.01.03.mre_f4.363360760" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.mre_f4.1625611270" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.mre_f4.363360760" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:24:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:09:04 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4508,7 +4513,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5977,6 +5982,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 986a038d70..dcb27dde8e 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.mre_f7.1625611270" + signature = "rusEFI 2022.01.03.mre_f7.363360760" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.mre_f7.1625611270" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.mre_f7.363360760" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:24:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:09:02 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4508,7 +4513,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5977,6 +5982,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 3c1f3be590..2c19ac5d57 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.prometheus_405.2200534868" + signature = "rusEFI 2022.01.03.prometheus_405.4133868202" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.prometheus_405.2200534868" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.prometheus_405.4133868202" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:24:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:09:11 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4506,7 +4511,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -6002,6 +6007,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 96400f3210..ccb398bd3a 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.prometheus_469.2200534868" + signature = "rusEFI 2022.01.03.prometheus_469.4133868202" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.prometheus_469.2200534868" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.prometheus_469.4133868202" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:24:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:09:09 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4506,7 +4511,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -6002,6 +6007,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 52132d6516..8afd59200b 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.proteus_f4.289292398" + signature = "rusEFI 2022.01.03.proteus_f4.1685253520" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.proteus_f4.289292398" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.proteus_f4.1685253520" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:24:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:09:16 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4504,7 +4509,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5970,6 +5975,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index ea8ff574e9..e353fd1cb8 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.proteus_f7.289292398" + signature = "rusEFI 2022.01.03.proteus_f7.1685253520" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.proteus_f7.289292398" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.proteus_f7.1685253520" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 02:24:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:09:14 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4504,7 +4509,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5970,6 +5975,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 46cc98a578..3cd3e993b5 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.01.03.subaru_eg33_f7.276410594" + signature = "rusEFI 2022.01.03.subaru_eg33_f7.1697979676" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.01.03.subaru_eg33_f7.276410594" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.01.03.subaru_eg33_f7.1697979676" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; 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 Mon Jan 03 00:00:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:09:28 UTC 2022 pageSize = 20996 page = 1 @@ -794,7 +794,10 @@ canBaudRate = bits, U08, 1732, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" veOverrideMode = bits, U08, 1733, [0:1], "None", "MAP", "TPS", "INVALID" can2BaudRate = bits, U08, 1734, [0:1], "100kbps", "250kbps", "500kbps", "1Mbps" afrOverrideMode = bits, U08, 1735, [0:2], "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %", "INVALID", "INVALID", "INVALID" -unused1736 = scalar, U32, 1736, "", 1, 0, 0, 536870911, 0 +mc33_hpfp_i_peak = scalar, U08, 1736, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold = scalar, U08, 1737, "A", 0.1, 0, 0, 25, 1 +mc33_hpfp_i_hold_off = scalar, U08, 1738, "us", 1, 0, 0, 255, 0 +mc33_hpfp_max_hold = scalar, U08, 1739, "ms", 1, 0, 0, 255, 0 unused1740b0 = bits, U32, 1740, [0:0], "false", "true" unused1740b1 = bits, U32, 1740, [1:1], "false", "true" unused1740b2 = bits, U32, 1740, [2:2], "false", "true" @@ -803,30 +806,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_498_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_498_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_498_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_498_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_498_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_498_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_498_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_498_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_498_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_498_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_498_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_498_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_498_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_498_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_498_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_498_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_498_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_498_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_498_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_498_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_498_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_498_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_498_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_498_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_501_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_501_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_501_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_501_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_501_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_501_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_501_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_501_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_501_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_501_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_501_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_501_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_501_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_501_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_501_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_501_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_501_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_501_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_501_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_501_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_501_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_501_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_501_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_501_31 = bits, U32, 1740, [31:31], "false", "true" unused1744 = scalar, U32, 1744, "", 1,0,0,0,0 can2TxPin = bits, U08, 1748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 1749, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1636,6 +1639,8 @@ fuelTrims12_table = array, S08, 20980, [4x4], "", 0.2, 0, -25, 25, 1 canBaudRate = "set can_baudrate" veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this." + mc33_hpfp_i_hold_off = "How long to deactivate power when hold current is reached before applying power again" + mc33_hpfp_max_hold = "Maximum amount of time the solenoid can be active before assuming a programming error" stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" can2TxPin = "set_can2_tx_pin X" can2RxPin = "set_can2_rx_pin X" @@ -4507,7 +4512,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Peak -> Hold Bypass Time", mc33_t_bypass field = "Hold current target", mc33_i_hold - field = "mc33_t_hold_off ?????", mc33_t_hold_off + field = "Hold off time", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot @@ -5993,6 +5998,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = hpfpPumpDialog, "HPFP Pump Configuration" field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Valve peak current", mc33_hpfp_i_peak, {hpfpCamLobes != 0} + field = "Valve hold current", mc33_hpfp_i_hold, {hpfpCamLobes != 0} + field = "Valve hold off time", mc33_hpfp_i_hold_off, {hpfpCamLobes != 0} + field = "Valve maximum duration", mc33_hpfp_max_hold, {hpfpCamLobes != 0} field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} 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 a3a6fe4e3b..61c4fa18f4 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 Mon Jan 03 00:00:18 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 03 03:09:32 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1589,6 +1589,10 @@ public class Fields { public static final int mc33972_cs_offset = 686; public static final int mc33972_csPinMode_offset = 687; public static final int mc33972spiDevice_offset = 809; + public static final int mc33_hpfp_i_hold_off_offset = 1738; + public static final int mc33_hpfp_i_hold_offset = 1737; + public static final int mc33_hpfp_i_peak_offset = 1736; + public static final int mc33_hpfp_max_hold_offset = 1739; public static final int mc33_hvolt_offset = 764; public static final int mc33_i_boost_offset = 3964; public static final int mc33_i_hold_offset = 3968; @@ -2262,7 +2266,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 2022.01.03.all.3552814770"; + public static final String TS_SIGNATURE = "rusEFI 2022.01.03.all.2794392396"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 732; @@ -2290,7 +2294,6 @@ public class Fields { public static final int unused1476b20_offset = 1272; public static final int unused1476b3_offset = 1272; public static final int unused1476b8_offset = 1272; - public static final int unused1736_offset = 1736; public static final int unused1740b0_offset = 1740; public static final int unused1740b1_offset = 1740; public static final int unused1740b2_offset = 1740; @@ -2308,30 +2311,30 @@ public class Fields { public static final int unusedBit_310_30_offset = 896; public static final int unusedBit_310_31_offset = 896; public static final int unusedBit_48_31_offset = 164; - public static final int unusedBit_498_10_offset = 1740; - public static final int unusedBit_498_11_offset = 1740; - public static final int unusedBit_498_12_offset = 1740; - public static final int unusedBit_498_13_offset = 1740; - public static final int unusedBit_498_14_offset = 1740; - public static final int unusedBit_498_15_offset = 1740; - public static final int unusedBit_498_16_offset = 1740; - public static final int unusedBit_498_17_offset = 1740; - public static final int unusedBit_498_18_offset = 1740; - public static final int unusedBit_498_19_offset = 1740; - public static final int unusedBit_498_20_offset = 1740; - public static final int unusedBit_498_21_offset = 1740; - public static final int unusedBit_498_22_offset = 1740; - public static final int unusedBit_498_23_offset = 1740; - public static final int unusedBit_498_24_offset = 1740; - public static final int unusedBit_498_25_offset = 1740; - public static final int unusedBit_498_26_offset = 1740; - public static final int unusedBit_498_27_offset = 1740; - public static final int unusedBit_498_28_offset = 1740; - public static final int unusedBit_498_29_offset = 1740; - public static final int unusedBit_498_30_offset = 1740; - public static final int unusedBit_498_31_offset = 1740; - public static final int unusedBit_498_8_offset = 1740; - public static final int unusedBit_498_9_offset = 1740; + public static final int unusedBit_501_10_offset = 1740; + public static final int unusedBit_501_11_offset = 1740; + public static final int unusedBit_501_12_offset = 1740; + public static final int unusedBit_501_13_offset = 1740; + public static final int unusedBit_501_14_offset = 1740; + public static final int unusedBit_501_15_offset = 1740; + public static final int unusedBit_501_16_offset = 1740; + public static final int unusedBit_501_17_offset = 1740; + public static final int unusedBit_501_18_offset = 1740; + public static final int unusedBit_501_19_offset = 1740; + public static final int unusedBit_501_20_offset = 1740; + public static final int unusedBit_501_21_offset = 1740; + public static final int unusedBit_501_22_offset = 1740; + public static final int unusedBit_501_23_offset = 1740; + public static final int unusedBit_501_24_offset = 1740; + public static final int unusedBit_501_25_offset = 1740; + public static final int unusedBit_501_26_offset = 1740; + public static final int unusedBit_501_27_offset = 1740; + public static final int unusedBit_501_28_offset = 1740; + public static final int unusedBit_501_29_offset = 1740; + public static final int unusedBit_501_30_offset = 1740; + public static final int unusedBit_501_31_offset = 1740; + public static final int unusedBit_501_8_offset = 1740; + public static final int unusedBit_501_9_offset = 1740; public static final int unusedBitHere1_offset = 1260; public static final int unusedBitHere2_offset = 1260; public static final int unusedBitHere3_offset = 1260; @@ -3175,7 +3178,10 @@ public class Fields { public static final Field CAN2BAUDRATE = Field.create("CAN2BAUDRATE", 1734, FieldType.INT8, can_baudrate_e); public static final String[] load_override_e = {"None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %"}; public static final Field AFROVERRIDEMODE = Field.create("AFROVERRIDEMODE", 1735, FieldType.INT8, load_override_e); - public static final Field UNUSED1736 = Field.create("UNUSED1736", 1736, FieldType.INT); + public static final Field MC33_HPFP_I_PEAK = Field.create("MC33_HPFP_I_PEAK", 1736, FieldType.INT8); + public static final Field MC33_HPFP_I_HOLD = Field.create("MC33_HPFP_I_HOLD", 1737, FieldType.INT8); + public static final Field MC33_HPFP_I_HOLD_OFF = Field.create("MC33_HPFP_I_HOLD_OFF", 1738, FieldType.INT8); + public static final Field MC33_HPFP_MAX_HOLD = Field.create("MC33_HPFP_MAX_HOLD", 1739, FieldType.INT8); public static final Field UNUSED1740B0 = Field.create("UNUSED1740B0", 1740, FieldType.BIT, 0); public static final Field UNUSED1740B1 = Field.create("UNUSED1740B1", 1740, FieldType.BIT, 1); public static final Field UNUSED1740B2 = Field.create("UNUSED1740B2", 1740, FieldType.BIT, 2); @@ -3184,30 +3190,30 @@ public class Fields { public static final Field UNUSED1128 = Field.create("UNUSED1128", 1740, FieldType.BIT, 5); public static final Field UNUSED1129 = Field.create("UNUSED1129", 1740, FieldType.BIT, 6); public static final Field UNUSED1130 = Field.create("UNUSED1130", 1740, FieldType.BIT, 7); - public static final Field UNUSEDBIT_498_8 = Field.create("UNUSEDBIT_498_8", 1740, FieldType.BIT, 8); - public static final Field UNUSEDBIT_498_9 = Field.create("UNUSEDBIT_498_9", 1740, FieldType.BIT, 9); - public static final Field UNUSEDBIT_498_10 = Field.create("UNUSEDBIT_498_10", 1740, FieldType.BIT, 10); - public static final Field UNUSEDBIT_498_11 = Field.create("UNUSEDBIT_498_11", 1740, FieldType.BIT, 11); - public static final Field UNUSEDBIT_498_12 = Field.create("UNUSEDBIT_498_12", 1740, FieldType.BIT, 12); - public static final Field UNUSEDBIT_498_13 = Field.create("UNUSEDBIT_498_13", 1740, FieldType.BIT, 13); - public static final Field UNUSEDBIT_498_14 = Field.create("UNUSEDBIT_498_14", 1740, FieldType.BIT, 14); - public static final Field UNUSEDBIT_498_15 = Field.create("UNUSEDBIT_498_15", 1740, FieldType.BIT, 15); - public static final Field UNUSEDBIT_498_16 = Field.create("UNUSEDBIT_498_16", 1740, FieldType.BIT, 16); - public static final Field UNUSEDBIT_498_17 = Field.create("UNUSEDBIT_498_17", 1740, FieldType.BIT, 17); - public static final Field UNUSEDBIT_498_18 = Field.create("UNUSEDBIT_498_18", 1740, FieldType.BIT, 18); - public static final Field UNUSEDBIT_498_19 = Field.create("UNUSEDBIT_498_19", 1740, FieldType.BIT, 19); - public static final Field UNUSEDBIT_498_20 = Field.create("UNUSEDBIT_498_20", 1740, FieldType.BIT, 20); - public static final Field UNUSEDBIT_498_21 = Field.create("UNUSEDBIT_498_21", 1740, FieldType.BIT, 21); - public static final Field UNUSEDBIT_498_22 = Field.create("UNUSEDBIT_498_22", 1740, FieldType.BIT, 22); - public static final Field UNUSEDBIT_498_23 = Field.create("UNUSEDBIT_498_23", 1740, FieldType.BIT, 23); - public static final Field UNUSEDBIT_498_24 = Field.create("UNUSEDBIT_498_24", 1740, FieldType.BIT, 24); - public static final Field UNUSEDBIT_498_25 = Field.create("UNUSEDBIT_498_25", 1740, FieldType.BIT, 25); - public static final Field UNUSEDBIT_498_26 = Field.create("UNUSEDBIT_498_26", 1740, FieldType.BIT, 26); - public static final Field UNUSEDBIT_498_27 = Field.create("UNUSEDBIT_498_27", 1740, FieldType.BIT, 27); - public static final Field UNUSEDBIT_498_28 = Field.create("UNUSEDBIT_498_28", 1740, FieldType.BIT, 28); - public static final Field UNUSEDBIT_498_29 = Field.create("UNUSEDBIT_498_29", 1740, FieldType.BIT, 29); - public static final Field UNUSEDBIT_498_30 = Field.create("UNUSEDBIT_498_30", 1740, FieldType.BIT, 30); - public static final Field UNUSEDBIT_498_31 = Field.create("UNUSEDBIT_498_31", 1740, FieldType.BIT, 31); + public static final Field UNUSEDBIT_501_8 = Field.create("UNUSEDBIT_501_8", 1740, FieldType.BIT, 8); + public static final Field UNUSEDBIT_501_9 = Field.create("UNUSEDBIT_501_9", 1740, FieldType.BIT, 9); + public static final Field UNUSEDBIT_501_10 = Field.create("UNUSEDBIT_501_10", 1740, FieldType.BIT, 10); + public static final Field UNUSEDBIT_501_11 = Field.create("UNUSEDBIT_501_11", 1740, FieldType.BIT, 11); + public static final Field UNUSEDBIT_501_12 = Field.create("UNUSEDBIT_501_12", 1740, FieldType.BIT, 12); + public static final Field UNUSEDBIT_501_13 = Field.create("UNUSEDBIT_501_13", 1740, FieldType.BIT, 13); + public static final Field UNUSEDBIT_501_14 = Field.create("UNUSEDBIT_501_14", 1740, FieldType.BIT, 14); + public static final Field UNUSEDBIT_501_15 = Field.create("UNUSEDBIT_501_15", 1740, FieldType.BIT, 15); + public static final Field UNUSEDBIT_501_16 = Field.create("UNUSEDBIT_501_16", 1740, FieldType.BIT, 16); + public static final Field UNUSEDBIT_501_17 = Field.create("UNUSEDBIT_501_17", 1740, FieldType.BIT, 17); + public static final Field UNUSEDBIT_501_18 = Field.create("UNUSEDBIT_501_18", 1740, FieldType.BIT, 18); + public static final Field UNUSEDBIT_501_19 = Field.create("UNUSEDBIT_501_19", 1740, FieldType.BIT, 19); + public static final Field UNUSEDBIT_501_20 = Field.create("UNUSEDBIT_501_20", 1740, FieldType.BIT, 20); + public static final Field UNUSEDBIT_501_21 = Field.create("UNUSEDBIT_501_21", 1740, FieldType.BIT, 21); + public static final Field UNUSEDBIT_501_22 = Field.create("UNUSEDBIT_501_22", 1740, FieldType.BIT, 22); + public static final Field UNUSEDBIT_501_23 = Field.create("UNUSEDBIT_501_23", 1740, FieldType.BIT, 23); + public static final Field UNUSEDBIT_501_24 = Field.create("UNUSEDBIT_501_24", 1740, FieldType.BIT, 24); + public static final Field UNUSEDBIT_501_25 = Field.create("UNUSEDBIT_501_25", 1740, FieldType.BIT, 25); + public static final Field UNUSEDBIT_501_26 = Field.create("UNUSEDBIT_501_26", 1740, FieldType.BIT, 26); + public static final Field UNUSEDBIT_501_27 = Field.create("UNUSEDBIT_501_27", 1740, FieldType.BIT, 27); + public static final Field UNUSEDBIT_501_28 = Field.create("UNUSEDBIT_501_28", 1740, FieldType.BIT, 28); + public static final Field UNUSEDBIT_501_29 = Field.create("UNUSEDBIT_501_29", 1740, FieldType.BIT, 29); + public static final Field UNUSEDBIT_501_30 = Field.create("UNUSEDBIT_501_30", 1740, FieldType.BIT, 30); + public static final Field UNUSEDBIT_501_31 = Field.create("UNUSEDBIT_501_31", 1740, FieldType.BIT, 31); public static final Field UNUSED1744 = Field.create("UNUSED1744", 1744, FieldType.INT); public static final Field CAN2TXPIN = Field.create("CAN2TXPIN", 1748, FieldType.INT8, brain_pin_e); public static final Field CAN2RXPIN = Field.create("CAN2RXPIN", 1749, FieldType.INT8, brain_pin_e); @@ -4438,7 +4444,10 @@ public class Fields { VEOVERRIDEMODE, CAN2BAUDRATE, AFROVERRIDEMODE, - UNUSED1736, + MC33_HPFP_I_PEAK, + MC33_HPFP_I_HOLD, + MC33_HPFP_I_HOLD_OFF, + MC33_HPFP_MAX_HOLD, UNUSED1740B0, UNUSED1740B1, UNUSED1740B2, @@ -4447,30 +4456,30 @@ public class Fields { UNUSED1128, UNUSED1129, UNUSED1130, - UNUSEDBIT_498_8, - UNUSEDBIT_498_9, - UNUSEDBIT_498_10, - UNUSEDBIT_498_11, - UNUSEDBIT_498_12, - UNUSEDBIT_498_13, - UNUSEDBIT_498_14, - UNUSEDBIT_498_15, - UNUSEDBIT_498_16, - UNUSEDBIT_498_17, - UNUSEDBIT_498_18, - UNUSEDBIT_498_19, - UNUSEDBIT_498_20, - UNUSEDBIT_498_21, - UNUSEDBIT_498_22, - UNUSEDBIT_498_23, - UNUSEDBIT_498_24, - UNUSEDBIT_498_25, - UNUSEDBIT_498_26, - UNUSEDBIT_498_27, - UNUSEDBIT_498_28, - UNUSEDBIT_498_29, - UNUSEDBIT_498_30, - UNUSEDBIT_498_31, + UNUSEDBIT_501_8, + UNUSEDBIT_501_9, + UNUSEDBIT_501_10, + UNUSEDBIT_501_11, + UNUSEDBIT_501_12, + UNUSEDBIT_501_13, + UNUSEDBIT_501_14, + UNUSEDBIT_501_15, + UNUSEDBIT_501_16, + UNUSEDBIT_501_17, + UNUSEDBIT_501_18, + UNUSEDBIT_501_19, + UNUSEDBIT_501_20, + UNUSEDBIT_501_21, + UNUSEDBIT_501_22, + UNUSEDBIT_501_23, + UNUSEDBIT_501_24, + UNUSEDBIT_501_25, + UNUSEDBIT_501_26, + UNUSEDBIT_501_27, + UNUSEDBIT_501_28, + UNUSEDBIT_501_29, + UNUSEDBIT_501_30, + UNUSEDBIT_501_31, UNUSED1744, CAN2TXPIN, CAN2RXPIN,