From b6901f594cb06730bdea8974c957feaa9acb6d06 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Fri, 21 Oct 2022 02:31:12 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 37 +++++++++++---- .../controllers/algo/rusefi_generated.h | 22 ++++----- ...ngine_configuration_generated_structures.h | 37 +++++++++++---- .../controllers/algo/rusefi_generated.h | 22 ++++----- ...ngine_configuration_generated_structures.h | 37 +++++++++++---- .../controllers/algo/rusefi_generated.h | 22 ++++----- .../algo/auto_generated_commonenum.cpp | 4 +- ...ngine_configuration_generated_structures.h | 37 +++++++++++---- .../controllers/generated/rusefi_generated.h | 22 ++++----- .../controllers/generated/signature_48way.h | 4 +- .../controllers/generated/signature_all.h | 4 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../controllers/generated/signature_core8.h | 4 +- .../controllers/generated/signature_cypress.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_harley81.h | 4 +- .../generated/signature_hellen-gm-e67.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 +- .../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_proteus_h7.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- .../lua/generated/value_lookup_generated.cpp | 21 +++++++++ firmware/tunerstudio/generated/rusefi.ini | 36 +++++++++------ .../tunerstudio/generated/rusefi_48way.ini | 36 +++++++++------ .../generated/rusefi_alphax-2chan.ini | 36 +++++++++------ .../generated/rusefi_alphax-4chan.ini | 36 +++++++++------ .../tunerstudio/generated/rusefi_atlas.ini | 36 +++++++++------ .../tunerstudio/generated/rusefi_core8.ini | 36 +++++++++------ .../tunerstudio/generated/rusefi_cypress.ini | 36 +++++++++------ .../generated/rusefi_f407-discovery.ini | 36 +++++++++------ .../generated/rusefi_f429-discovery.ini | 36 +++++++++------ .../generated/rusefi_frankenso_na6.ini | 36 +++++++++------ .../tunerstudio/generated/rusefi_harley81.ini | 36 +++++++++------ .../generated/rusefi_hellen-gm-e67.ini | 36 +++++++++------ .../generated/rusefi_hellen-nb1.ini | 36 +++++++++------ .../generated/rusefi_hellen121nissan.ini | 36 +++++++++------ .../generated/rusefi_hellen121vag.ini | 36 +++++++++------ .../generated/rusefi_hellen128mercedes.ini | 36 +++++++++------ .../generated/rusefi_hellen154hyundai.ini | 36 +++++++++------ .../tunerstudio/generated/rusefi_hellen72.ini | 36 +++++++++------ .../tunerstudio/generated/rusefi_hellen81.ini | 36 +++++++++------ .../generated/rusefi_hellen88bmw.ini | 36 +++++++++------ .../generated/rusefi_hellenNA6.ini | 36 +++++++++------ .../generated/rusefi_hellenNA8_96.ini | 36 +++++++++------ firmware/tunerstudio/generated/rusefi_kin.ini | 36 +++++++++------ .../tunerstudio/generated/rusefi_mre_f4.ini | 36 +++++++++------ .../tunerstudio/generated/rusefi_mre_f7.ini | 36 +++++++++------ .../generated/rusefi_prometheus_405.ini | 36 +++++++++------ .../generated/rusefi_prometheus_469.ini | 36 +++++++++------ .../generated/rusefi_proteus_f4.ini | 36 +++++++++------ .../generated/rusefi_proteus_f7.ini | 36 +++++++++------ .../generated/rusefi_proteus_h7.ini | 36 +++++++++------ .../generated/rusefi_subaru_eg33_f7.ini | 36 +++++++++------ .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 36 +++++++++------ .../com/rusefi/config/generated/Fields.java | 45 +++++++++++-------- 75 files changed, 1010 insertions(+), 576 deletions(-) diff --git a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 58252192fe..4b16b88445 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/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 Wed Oct 19 20:15:10 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Oct 21 02:30:00 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1618,9 +1618,10 @@ struct engine_configuration_s { */ Gpio triggerSimulatorPins[TRIGGER_SIMULATOR_PIN_COUNT]; /** + g/s * offset 752 */ - uint16_t unusedTrig; + scaled_channel fordInjectorSmallPulseSlope; /** * offset 754 */ @@ -3134,8 +3135,9 @@ struct engine_configuration_s { offset 1628 bit 2 */ bool can2OpenBLT : 1 {}; /** + * Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s). offset 1628 bit 3 */ - bool unused1740b2 : 1 {}; + bool injectorFlowAsMassFlow : 1 {}; /** offset 1628 bit 4 */ bool unused1127 : 1 {}; @@ -4011,30 +4013,47 @@ struct engine_configuration_s { */ scaled_channel acDelay; /** + * need 4 byte alignment + units * offset 3123 */ - int8_t unused4080[9]; + uint8_t alignmentFill_at_3123[1]; + /** + mg + * offset 3124 + */ + scaled_channel fordInjectorSmallPulseBreakPoint; + /** + * offset 3126 + */ + int8_t unused4080[5]; /** lobes/cam - * offset 3132 + * offset 3131 */ uint8_t hpfpCamLobes; /** - * offset 3133 + * offset 3132 */ hpfp_cam_e hpfpCam; /** * Crank angle ATDC of first lobe peak deg - * offset 3134 + * offset 3133 */ uint8_t hpfpPeakPos; /** * If the requested activation time is below this angle, don't bother running the pump deg - * offset 3135 + * offset 3134 */ uint8_t hpfpMinAngle; + /** + * need 4 byte alignment + units + * offset 3135 + */ + uint8_t alignmentFill_at_3135[1]; /** * Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm. cc @@ -5065,4 +5084,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22800); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Oct 19 20:15:10 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Oct 21 02:30:00 UTC 2022 diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index 1c3b38aa33..8f05b36155 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -742,6 +742,8 @@ #define flexCranking_offset 1372 #define flexSensorPin_offset 844 #define forceO2Heating_offset 1372 +#define fordInjectorSmallPulseBreakPoint_offset 3124 +#define fordInjectorSmallPulseSlope_offset 752 #define FUEL_LEVEL_TABLE_COUNT 8 #define FUEL_LOAD_COUNT 16 #define FUEL_RPM_COUNT 16 @@ -1309,8 +1311,8 @@ #define HPFP_LOBE_PROFILE_SIZE 16 #define HPFP_TARGET_SIZE 10 #define hpfpActivationAngle_offset 3138 -#define hpfpCam_offset 3133 -#define hpfpCamLobes_offset 3132 +#define hpfpCam_offset 3132 +#define hpfpCamLobes_offset 3131 #define hpfpCompensation_offset 3432 #define hpfpCompensationLoadBins_offset 3532 #define hpfpCompensationRpmBins_offset 3552 @@ -1318,8 +1320,8 @@ #define hpfpDeadtimeVoltsBins_offset 3178 #define hpfpLobeProfileAngle_offset 3162 #define hpfpLobeProfileQuantityBins_offset 3146 -#define hpfpMinAngle_offset 3135 -#define hpfpPeakPos_offset 3134 +#define hpfpMinAngle_offset 3134 +#define hpfpPeakPos_offset 3133 #define hpfpPidI_offset 3142 #define hpfpPidP_offset 3140 #define hpfpPumpVolume_offset 3136 @@ -1555,7 +1557,9 @@ #define injectorCorrectionPolynomial6_offset 2020 #define injectorCorrectionPolynomial7_offset 2024 #define injectorCorrectionPolynomial8_offset 2028 -#define InjectorNonlinearMode_auto_enum 0="INJ_None",1="INJ_PolynomialAdder" +#define injectorFlowAsMassFlow_offset 1628 +#define InjectorNonlinearMode_auto_enum 0="INJ_None",2="INJ_FordModel",1="INJ_PolynomialAdder" +#define InjectorNonlinearMode_INJ_FordModel 2 #define InjectorNonlinearMode_INJ_None 0 #define InjectorNonlinearMode_INJ_PolynomialAdder 1 #define injectorNonlinearMode_offset 826 @@ -1974,7 +1978,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 1985998488 +#define SIGNATURE_HASH 3054433504 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2529,7 +2533,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.10.21.cypress.1985998488" +#define TS_SIGNATURE "rusEFI 2022.10.21.cypress.3054433504" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2570,8 +2574,7 @@ #define unused1128_offset 1628 #define unused1129_offset 1628 #define unused1130_offset 1628 -#define unused1740b2_offset 1628 -#define unused4080_offset 3123 +#define unused4080_offset 3126 #define unused_1484_bit_29_offset 1372 #define unused_1484_bit_30_offset 1372 #define unused_1484_bit_38_offset 1372 @@ -2601,7 +2604,6 @@ #define unusedBit_541_31_offset 1628 #define unusedBit_541_8_offset 1628 #define unusedBit_541_9_offset 1628 -#define unusedTrig_offset 752 #define unusedTrigMode_offset 756 #define useAdvanceCorrectionsForCranking_offset 1372 #define useBiQuadOnAuxSpeedSensors_offset 1372 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 2af3e00204..2bdb77d9f8 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 Wed Oct 19 20:15:08 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Oct 21 02:29:58 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1618,9 +1618,10 @@ struct engine_configuration_s { */ Gpio triggerSimulatorPins[TRIGGER_SIMULATOR_PIN_COUNT]; /** + g/s * offset 752 */ - uint16_t unusedTrig; + scaled_channel fordInjectorSmallPulseSlope; /** * offset 754 */ @@ -3134,8 +3135,9 @@ struct engine_configuration_s { offset 1628 bit 2 */ bool can2OpenBLT : 1 {}; /** + * Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s). offset 1628 bit 3 */ - bool unused1740b2 : 1 {}; + bool injectorFlowAsMassFlow : 1 {}; /** offset 1628 bit 4 */ bool unused1127 : 1 {}; @@ -4011,30 +4013,47 @@ struct engine_configuration_s { */ scaled_channel acDelay; /** + * need 4 byte alignment + units * offset 3123 */ - int8_t unused4080[9]; + uint8_t alignmentFill_at_3123[1]; + /** + mg + * offset 3124 + */ + scaled_channel fordInjectorSmallPulseBreakPoint; + /** + * offset 3126 + */ + int8_t unused4080[5]; /** lobes/cam - * offset 3132 + * offset 3131 */ uint8_t hpfpCamLobes; /** - * offset 3133 + * offset 3132 */ hpfp_cam_e hpfpCam; /** * Crank angle ATDC of first lobe peak deg - * offset 3134 + * offset 3133 */ uint8_t hpfpPeakPos; /** * If the requested activation time is below this angle, don't bother running the pump deg - * offset 3135 + * offset 3134 */ uint8_t hpfpMinAngle; + /** + * need 4 byte alignment + units + * offset 3135 + */ + uint8_t alignmentFill_at_3135[1]; /** * Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm. cc @@ -5065,4 +5084,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22800); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Oct 19 20:15:08 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Oct 21 02:29:58 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 cf186a625e..0bbffe9f2e 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -742,6 +742,8 @@ #define flexCranking_offset 1372 #define flexSensorPin_offset 844 #define forceO2Heating_offset 1372 +#define fordInjectorSmallPulseBreakPoint_offset 3124 +#define fordInjectorSmallPulseSlope_offset 752 #define FUEL_LEVEL_TABLE_COUNT 8 #define FUEL_LOAD_COUNT 16 #define FUEL_RPM_COUNT 16 @@ -1309,8 +1311,8 @@ #define HPFP_LOBE_PROFILE_SIZE 16 #define HPFP_TARGET_SIZE 10 #define hpfpActivationAngle_offset 3138 -#define hpfpCam_offset 3133 -#define hpfpCamLobes_offset 3132 +#define hpfpCam_offset 3132 +#define hpfpCamLobes_offset 3131 #define hpfpCompensation_offset 3432 #define hpfpCompensationLoadBins_offset 3532 #define hpfpCompensationRpmBins_offset 3552 @@ -1318,8 +1320,8 @@ #define hpfpDeadtimeVoltsBins_offset 3178 #define hpfpLobeProfileAngle_offset 3162 #define hpfpLobeProfileQuantityBins_offset 3146 -#define hpfpMinAngle_offset 3135 -#define hpfpPeakPos_offset 3134 +#define hpfpMinAngle_offset 3134 +#define hpfpPeakPos_offset 3133 #define hpfpPidI_offset 3142 #define hpfpPidP_offset 3140 #define hpfpPumpVolume_offset 3136 @@ -1555,7 +1557,9 @@ #define injectorCorrectionPolynomial6_offset 2020 #define injectorCorrectionPolynomial7_offset 2024 #define injectorCorrectionPolynomial8_offset 2028 -#define InjectorNonlinearMode_auto_enum 0="INJ_None",1="INJ_PolynomialAdder" +#define injectorFlowAsMassFlow_offset 1628 +#define InjectorNonlinearMode_auto_enum 0="INJ_None",2="INJ_FordModel",1="INJ_PolynomialAdder" +#define InjectorNonlinearMode_INJ_FordModel 2 #define InjectorNonlinearMode_INJ_None 0 #define InjectorNonlinearMode_INJ_PolynomialAdder 1 #define injectorNonlinearMode_offset 826 @@ -1974,7 +1978,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 512248916 +#define SIGNATURE_HASH 3738785324 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2529,7 +2533,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.10.21.kin.512248916" +#define TS_SIGNATURE "rusEFI 2022.10.21.kin.3738785324" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2570,8 +2574,7 @@ #define unused1128_offset 1628 #define unused1129_offset 1628 #define unused1130_offset 1628 -#define unused1740b2_offset 1628 -#define unused4080_offset 3123 +#define unused4080_offset 3126 #define unused_1484_bit_29_offset 1372 #define unused_1484_bit_30_offset 1372 #define unused_1484_bit_38_offset 1372 @@ -2601,7 +2604,6 @@ #define unusedBit_541_31_offset 1628 #define unusedBit_541_8_offset 1628 #define unusedBit_541_9_offset 1628 -#define unusedTrig_offset 752 #define unusedTrigMode_offset 756 #define useAdvanceCorrectionsForCranking_offset 1372 #define useBiQuadOnAuxSpeedSensors_offset 1372 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 3fc3933c32..43271f61bd 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_subaru_config.sh integration/rusefi_config.txt Wed Oct 19 20:15:12 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:02 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1618,9 +1618,10 @@ struct engine_configuration_s { */ Gpio triggerSimulatorPins[TRIGGER_SIMULATOR_PIN_COUNT]; /** + g/s * offset 752 */ - uint16_t unusedTrig; + scaled_channel fordInjectorSmallPulseSlope; /** * offset 754 */ @@ -3134,8 +3135,9 @@ struct engine_configuration_s { offset 1628 bit 2 */ bool can2OpenBLT : 1 {}; /** + * Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s). offset 1628 bit 3 */ - bool unused1740b2 : 1 {}; + bool injectorFlowAsMassFlow : 1 {}; /** offset 1628 bit 4 */ bool unused1127 : 1 {}; @@ -4011,30 +4013,47 @@ struct engine_configuration_s { */ scaled_channel acDelay; /** + * need 4 byte alignment + units * offset 3123 */ - int8_t unused4080[9]; + uint8_t alignmentFill_at_3123[1]; + /** + mg + * offset 3124 + */ + scaled_channel fordInjectorSmallPulseBreakPoint; + /** + * offset 3126 + */ + int8_t unused4080[5]; /** lobes/cam - * offset 3132 + * offset 3131 */ uint8_t hpfpCamLobes; /** - * offset 3133 + * offset 3132 */ hpfp_cam_e hpfpCam; /** * Crank angle ATDC of first lobe peak deg - * offset 3134 + * offset 3133 */ uint8_t hpfpPeakPos; /** * If the requested activation time is below this angle, don't bother running the pump deg - * offset 3135 + * offset 3134 */ uint8_t hpfpMinAngle; + /** + * need 4 byte alignment + units + * offset 3135 + */ + uint8_t alignmentFill_at_3135[1]; /** * Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm. cc @@ -5065,4 +5084,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22800); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Oct 19 20:15:12 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:02 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 c788aebba0..175fa2e811 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 @@ -752,6 +752,8 @@ #define flexCranking_offset 1372 #define flexSensorPin_offset 844 #define forceO2Heating_offset 1372 +#define fordInjectorSmallPulseBreakPoint_offset 3124 +#define fordInjectorSmallPulseSlope_offset 752 #define FUEL_LEVEL_TABLE_COUNT 8 #define FUEL_LOAD_COUNT 16 #define FUEL_RPM_COUNT 16 @@ -1273,8 +1275,8 @@ #define HPFP_LOBE_PROFILE_SIZE 16 #define HPFP_TARGET_SIZE 10 #define hpfpActivationAngle_offset 3138 -#define hpfpCam_offset 3133 -#define hpfpCamLobes_offset 3132 +#define hpfpCam_offset 3132 +#define hpfpCamLobes_offset 3131 #define hpfpCompensation_offset 3432 #define hpfpCompensationLoadBins_offset 3532 #define hpfpCompensationRpmBins_offset 3552 @@ -1282,8 +1284,8 @@ #define hpfpDeadtimeVoltsBins_offset 3178 #define hpfpLobeProfileAngle_offset 3162 #define hpfpLobeProfileQuantityBins_offset 3146 -#define hpfpMinAngle_offset 3135 -#define hpfpPeakPos_offset 3134 +#define hpfpMinAngle_offset 3134 +#define hpfpPeakPos_offset 3133 #define hpfpPidI_offset 3142 #define hpfpPidP_offset 3140 #define hpfpPumpVolume_offset 3136 @@ -1519,7 +1521,9 @@ #define injectorCorrectionPolynomial6_offset 2020 #define injectorCorrectionPolynomial7_offset 2024 #define injectorCorrectionPolynomial8_offset 2028 -#define InjectorNonlinearMode_auto_enum 0="INJ_None",1="INJ_PolynomialAdder" +#define injectorFlowAsMassFlow_offset 1628 +#define InjectorNonlinearMode_auto_enum 0="INJ_None",2="INJ_FordModel",1="INJ_PolynomialAdder" +#define InjectorNonlinearMode_INJ_FordModel 2 #define InjectorNonlinearMode_INJ_None 0 #define InjectorNonlinearMode_INJ_PolynomialAdder 1 #define injectorNonlinearMode_offset 826 @@ -1940,7 +1944,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 255932226 +#define SIGNATURE_HASH 3473943866 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2496,7 +2500,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.10.21.subaru_eg33_f7.255932226" +#define TS_SIGNATURE "rusEFI 2022.10.21.subaru_eg33_f7.3473943866" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2537,8 +2541,7 @@ #define unused1128_offset 1628 #define unused1129_offset 1628 #define unused1130_offset 1628 -#define unused1740b2_offset 1628 -#define unused4080_offset 3123 +#define unused4080_offset 3126 #define unused_1484_bit_29_offset 1372 #define unused_1484_bit_30_offset 1372 #define unused_1484_bit_38_offset 1372 @@ -2568,7 +2571,6 @@ #define unusedBit_541_31_offset 1628 #define unusedBit_541_8_offset 1628 #define unusedBit_541_9_offset 1628 -#define unusedTrig_offset 752 #define unusedTrigMode_offset 756 #define useAdvanceCorrectionsForCranking_offset 1372 #define useBiQuadOnAuxSpeedSensors_offset 1372 diff --git a/firmware/controllers/algo/auto_generated_commonenum.cpp b/firmware/controllers/algo/auto_generated_commonenum.cpp index 7e5a5fa19b..9903994ce8 100644 --- a/firmware/controllers/algo/auto_generated_commonenum.cpp +++ b/firmware/controllers/algo/auto_generated_commonenum.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "rusefi_enums.h" -// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Tue Oct 18 01:26:09 UTC 2022 +// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Fri Oct 21 02:29:53 UTC 2022 // see also gen_config_and_enums.bat @@ -29,6 +29,8 @@ case InjectionTimingMode::Start: } const char *getInjectorNonlinearMode(InjectorNonlinearMode value){ switch(value) { +case INJ_FordModel: + return "INJ_FordModel"; case INJ_None: return "INJ_None"; case INJ_PolynomialAdder: diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 0c5390bb24..11b9c53d4b 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 Wed Oct 19 20:16:20 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:31:02 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1618,9 +1618,10 @@ struct engine_configuration_s { */ Gpio triggerSimulatorPins[TRIGGER_SIMULATOR_PIN_COUNT]; /** + g/s * offset 752 */ - uint16_t unusedTrig; + scaled_channel fordInjectorSmallPulseSlope; /** * offset 754 */ @@ -3134,8 +3135,9 @@ struct engine_configuration_s { offset 1628 bit 2 */ bool can2OpenBLT : 1 {}; /** + * Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s). offset 1628 bit 3 */ - bool unused1740b2 : 1 {}; + bool injectorFlowAsMassFlow : 1 {}; /** offset 1628 bit 4 */ bool unused1127 : 1 {}; @@ -4011,30 +4013,47 @@ struct engine_configuration_s { */ scaled_channel acDelay; /** + * need 4 byte alignment + units * offset 3123 */ - int8_t unused4080[9]; + uint8_t alignmentFill_at_3123[1]; + /** + mg + * offset 3124 + */ + scaled_channel fordInjectorSmallPulseBreakPoint; + /** + * offset 3126 + */ + int8_t unused4080[5]; /** lobes/cam - * offset 3132 + * offset 3131 */ uint8_t hpfpCamLobes; /** - * offset 3133 + * offset 3132 */ hpfp_cam_e hpfpCam; /** * Crank angle ATDC of first lobe peak deg - * offset 3134 + * offset 3133 */ uint8_t hpfpPeakPos; /** * If the requested activation time is below this angle, don't bother running the pump deg - * offset 3135 + * offset 3134 */ uint8_t hpfpMinAngle; + /** + * need 4 byte alignment + units + * offset 3135 + */ + uint8_t alignmentFill_at_3135[1]; /** * Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm. cc @@ -5065,4 +5084,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22800); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Oct 19 20:16:20 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:31:02 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index e0611c4997..425a1fcc64 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -742,6 +742,8 @@ #define flexCranking_offset 1372 #define flexSensorPin_offset 844 #define forceO2Heating_offset 1372 +#define fordInjectorSmallPulseBreakPoint_offset 3124 +#define fordInjectorSmallPulseSlope_offset 752 #define FUEL_LEVEL_TABLE_COUNT 8 #define FUEL_LOAD_COUNT 16 #define FUEL_RPM_COUNT 16 @@ -1309,8 +1311,8 @@ #define HPFP_LOBE_PROFILE_SIZE 16 #define HPFP_TARGET_SIZE 10 #define hpfpActivationAngle_offset 3138 -#define hpfpCam_offset 3133 -#define hpfpCamLobes_offset 3132 +#define hpfpCam_offset 3132 +#define hpfpCamLobes_offset 3131 #define hpfpCompensation_offset 3432 #define hpfpCompensationLoadBins_offset 3532 #define hpfpCompensationRpmBins_offset 3552 @@ -1318,8 +1320,8 @@ #define hpfpDeadtimeVoltsBins_offset 3178 #define hpfpLobeProfileAngle_offset 3162 #define hpfpLobeProfileQuantityBins_offset 3146 -#define hpfpMinAngle_offset 3135 -#define hpfpPeakPos_offset 3134 +#define hpfpMinAngle_offset 3134 +#define hpfpPeakPos_offset 3133 #define hpfpPidI_offset 3142 #define hpfpPidP_offset 3140 #define hpfpPumpVolume_offset 3136 @@ -1555,7 +1557,9 @@ #define injectorCorrectionPolynomial6_offset 2020 #define injectorCorrectionPolynomial7_offset 2024 #define injectorCorrectionPolynomial8_offset 2028 -#define InjectorNonlinearMode_auto_enum 0="INJ_None",1="INJ_PolynomialAdder" +#define injectorFlowAsMassFlow_offset 1628 +#define InjectorNonlinearMode_auto_enum 0="INJ_None",2="INJ_FordModel",1="INJ_PolynomialAdder" +#define InjectorNonlinearMode_INJ_FordModel 2 #define InjectorNonlinearMode_INJ_None 0 #define InjectorNonlinearMode_INJ_PolynomialAdder 1 #define injectorNonlinearMode_offset 826 @@ -1974,7 +1978,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 1985998488 +#define SIGNATURE_HASH 3054433504 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2529,7 +2533,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.10.21.all.1985998488" +#define TS_SIGNATURE "rusEFI 2022.10.21.all.3054433504" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2570,8 +2574,7 @@ #define unused1128_offset 1628 #define unused1129_offset 1628 #define unused1130_offset 1628 -#define unused1740b2_offset 1628 -#define unused4080_offset 3123 +#define unused4080_offset 3126 #define unused_1484_bit_29_offset 1372 #define unused_1484_bit_30_offset 1372 #define unused_1484_bit_38_offset 1372 @@ -2601,7 +2604,6 @@ #define unusedBit_541_31_offset 1628 #define unusedBit_541_8_offset 1628 #define unusedBit_541_9_offset 1628 -#define unusedTrig_offset 752 #define unusedTrigMode_offset 756 #define useAdvanceCorrectionsForCranking_offset 1372 #define useBiQuadOnAuxSpeedSensors_offset 1372 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 7211af3887..e631b3fe1e 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1635313367 -#define TS_SIGNATURE "rusEFI 2022.10.21.48way.1635313367" +#define SIGNATURE_HASH 2703883439 +#define TS_SIGNATURE "rusEFI 2022.10.21.48way.2703883439" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index cf5c9ac416..c169134624 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 null // -#define SIGNATURE_HASH 1985998488 -#define TS_SIGNATURE "rusEFI 2022.10.21.all.1985998488" +#define SIGNATURE_HASH 3054433504 +#define TS_SIGNATURE "rusEFI 2022.10.21.all.3054433504" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 1e589a41d8..488f218894 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1145926644 -#define TS_SIGNATURE "rusEFI 2022.10.21.alphax-2chan.1145926644" +#define SIGNATURE_HASH 2216454540 +#define TS_SIGNATURE "rusEFI 2022.10.21.alphax-2chan.2216454540" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index ae7581c9ff..a44fb1b393 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4249038103 -#define TS_SIGNATURE "rusEFI 2022.10.21.alphax-4chan.4249038103" +#define SIGNATURE_HASH 1024604015 +#define TS_SIGNATURE "rusEFI 2022.10.21.alphax-4chan.1024604015" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index da72553e97..51816a80f6 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 null // -#define SIGNATURE_HASH 1788156863 -#define TS_SIGNATURE "rusEFI 2022.10.21.atlas.1788156863" +#define SIGNATURE_HASH 2864972231 +#define TS_SIGNATURE "rusEFI 2022.10.21.atlas.2864972231" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index f71eab183a..95649a0209 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2159263585 -#define TS_SIGNATURE "rusEFI 2022.10.21.core8.2159263585" +#define SIGNATURE_HASH 1088595225 +#define TS_SIGNATURE "rusEFI 2022.10.21.core8.1088595225" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 3409b05333..60f94f19b6 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 1985998488 -#define TS_SIGNATURE "rusEFI 2022.10.21.cypress.1985998488" +#define SIGNATURE_HASH 3054433504 +#define TS_SIGNATURE "rusEFI 2022.10.21.cypress.3054433504" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index a21af7d9e0..d1af543dad 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1985998488 -#define TS_SIGNATURE "rusEFI 2022.10.21.f407-discovery.1985998488" +#define SIGNATURE_HASH 3054433504 +#define TS_SIGNATURE "rusEFI 2022.10.21.f407-discovery.3054433504" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index a4dfcd57ed..66efc2eb39 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 null // -#define SIGNATURE_HASH 1985998488 -#define TS_SIGNATURE "rusEFI 2022.10.21.f429-discovery.1985998488" +#define SIGNATURE_HASH 3054433504 +#define TS_SIGNATURE "rusEFI 2022.10.21.f429-discovery.3054433504" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 6ea4d06048..0b13349fe0 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 null // -#define SIGNATURE_HASH 875762268 -#define TS_SIGNATURE "rusEFI 2022.10.21.frankenso_na6.875762268" +#define SIGNATURE_HASH 4100065316 +#define TS_SIGNATURE "rusEFI 2022.10.21.frankenso_na6.4100065316" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 6d956d7769..a8ccb23f5e 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2258824119 -#define TS_SIGNATURE "rusEFI 2022.10.21.harley81.2258824119" +#define SIGNATURE_HASH 1190392271 +#define TS_SIGNATURE "rusEFI 2022.10.21.harley81.1190392271" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 896b638c7c..71e09d73b9 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3258477358 -#define TS_SIGNATURE "rusEFI 2022.10.21.hellen-gm-e67.3258477358" +#define SIGNATURE_HASH 40464726 +#define TS_SIGNATURE "rusEFI 2022.10.21.hellen-gm-e67.40464726" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index c5b51b0c1d..f8bf8ae75c 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 null // -#define SIGNATURE_HASH 2949963604 -#define TS_SIGNATURE "rusEFI 2022.10.21.hellen-nb1.2949963604" +#define SIGNATURE_HASH 1871037740 +#define TS_SIGNATURE "rusEFI 2022.10.21.hellen-nb1.1871037740" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 37361571ed..3aad000aae 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 null // -#define SIGNATURE_HASH 4269889138 -#define TS_SIGNATURE "rusEFI 2022.10.21.hellen121nissan.4269889138" +#define SIGNATURE_HASH 1053838346 +#define TS_SIGNATURE "rusEFI 2022.10.21.hellen121nissan.1053838346" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index f5bb5d905c..c52ac73490 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 null // -#define SIGNATURE_HASH 108932578 -#define TS_SIGNATURE "rusEFI 2022.10.21.hellen121vag.108932578" +#define SIGNATURE_HASH 3324983194 +#define TS_SIGNATURE "rusEFI 2022.10.21.hellen121vag.3324983194" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index f5c184f4d6..ea9d8b260c 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 null // -#define SIGNATURE_HASH 2292306854 -#define TS_SIGNATURE "rusEFI 2022.10.21.hellen128.2292306854" +#define SIGNATURE_HASH 1223739870 +#define TS_SIGNATURE "rusEFI 2022.10.21.hellen128.1223739870" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index ee6e86cb14..f0b271be19 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 null // -#define SIGNATURE_HASH 2107988144 -#define TS_SIGNATURE "rusEFI 2022.10.21.hellen154hyundai.2107988144" +#define SIGNATURE_HASH 3186901704 +#define TS_SIGNATURE "rusEFI 2022.10.21.hellen154hyundai.3186901704" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 26cc8eb004..8f7c099283 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 null // -#define SIGNATURE_HASH 2409226259 -#define TS_SIGNATURE "rusEFI 2022.10.21.hellen72.2409226259" +#define SIGNATURE_HASH 1338571371 +#define TS_SIGNATURE "rusEFI 2022.10.21.hellen72.1338571371" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 5a98f861bb..889245ec93 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 null // -#define SIGNATURE_HASH 1424635538 -#define TS_SIGNATURE "rusEFI 2022.10.21.hellen81.1424635538" +#define SIGNATURE_HASH 2495294698 +#define TS_SIGNATURE "rusEFI 2022.10.21.hellen81.2495294698" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 206f8cd4cf..c657aaae39 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 null // -#define SIGNATURE_HASH 1672150356 -#define TS_SIGNATURE "rusEFI 2022.10.21.hellen88bmw.1672150356" +#define SIGNATURE_HASH 2751194924 +#define TS_SIGNATURE "rusEFI 2022.10.21.hellen88bmw.2751194924" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 2c6961ad0b..b6023b43d2 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 null // -#define SIGNATURE_HASH 672358319 -#define TS_SIGNATURE "rusEFI 2022.10.21.hellenNA6.672358319" +#define SIGNATURE_HASH 3896657367 +#define TS_SIGNATURE "rusEFI 2022.10.21.hellenNA6.3896657367" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 60569f5dca..744c04d510 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 null // -#define SIGNATURE_HASH 3595984752 -#define TS_SIGNATURE "rusEFI 2022.10.21.hellenNA8_96.3595984752" +#define SIGNATURE_HASH 369575176 +#define TS_SIGNATURE "rusEFI 2022.10.21.hellenNA8_96.369575176" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 546e040645..82ca090583 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 null // -#define SIGNATURE_HASH 512248916 -#define TS_SIGNATURE "rusEFI 2022.10.21.kin.512248916" +#define SIGNATURE_HASH 3738785324 +#define TS_SIGNATURE "rusEFI 2022.10.21.kin.3738785324" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index edba128881..ffe6ed8e17 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 null // -#define SIGNATURE_HASH 3824585112 -#define TS_SIGNATURE "rusEFI 2022.10.21.mre_f4.3824585112" +#define SIGNATURE_HASH 598184928 +#define TS_SIGNATURE "rusEFI 2022.10.21.mre_f4.598184928" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 7727e25222..ecdf0a0292 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 null // -#define SIGNATURE_HASH 3824585112 -#define TS_SIGNATURE "rusEFI 2022.10.21.mre_f7.3824585112" +#define SIGNATURE_HASH 598184928 +#define TS_SIGNATURE "rusEFI 2022.10.21.mre_f7.598184928" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 80e455fdde..6b1a8cf703 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 null // -#define SIGNATURE_HASH 649410430 -#define TS_SIGNATURE "rusEFI 2022.10.21.prometheus_405.649410430" +#define SIGNATURE_HASH 3873713414 +#define TS_SIGNATURE "rusEFI 2022.10.21.prometheus_405.3873713414" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index ac6ac93bd5..225a4c4f0e 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 null // -#define SIGNATURE_HASH 649410430 -#define TS_SIGNATURE "rusEFI 2022.10.21.prometheus_469.649410430" +#define SIGNATURE_HASH 3873713414 +#define TS_SIGNATURE "rusEFI 2022.10.21.prometheus_469.3873713414" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index fd5e165139..1442158a68 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 null // -#define SIGNATURE_HASH 3549571566 -#define TS_SIGNATURE "rusEFI 2022.10.21.proteus_f4.3549571566" +#define SIGNATURE_HASH 331559830 +#define TS_SIGNATURE "rusEFI 2022.10.21.proteus_f4.331559830" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 3e7be7ea9f..a3f3b1ede7 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 null // -#define SIGNATURE_HASH 3549571566 -#define TS_SIGNATURE "rusEFI 2022.10.21.proteus_f7.3549571566" +#define SIGNATURE_HASH 331559830 +#define TS_SIGNATURE "rusEFI 2022.10.21.proteus_f7.331559830" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 4a167b9375..c4a787b023 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3549571566 -#define TS_SIGNATURE "rusEFI 2022.10.21.proteus_h7.3549571566" +#define SIGNATURE_HASH 331559830 +#define TS_SIGNATURE "rusEFI 2022.10.21.proteus_h7.331559830" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 5ecfe9e908..14d9318eeb 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_subaru_config.sh null // -#define SIGNATURE_HASH 255932226 -#define TS_SIGNATURE "rusEFI 2022.10.21.subaru_eg33_f7.255932226" +#define SIGNATURE_HASH 3473943866 +#define TS_SIGNATURE "rusEFI 2022.10.21.subaru_eg33_f7.3473943866" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index e735714bd0..bbc44e2695 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3696697548 -#define TS_SIGNATURE "rusEFI 2022.10.21.tdg-pdm8.3696697548" +#define SIGNATURE_HASH 470170292 +#define TS_SIGNATURE "rusEFI 2022.10.21.tdg-pdm8.470170292" diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index 16d2e3b053..527ece2fbb 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -328,6 +328,8 @@ float getConfigValueByName(const char *name) { return engineConfiguration->idlePositionMax; if (strEqualCaseInsensitive(name, "tunerStudioSerialSpeed")) return engineConfiguration->tunerStudioSerialSpeed; + if (strEqualCaseInsensitive(name, "fordInjectorSmallPulseSlope")) + return engineConfiguration->fordInjectorSmallPulseSlope; if (strEqualCaseInsensitive(name, "is_enabled_spi_1")) return engineConfiguration->is_enabled_spi_1; if (strEqualCaseInsensitive(name, "is_enabled_spi_2")) @@ -734,6 +736,8 @@ float getConfigValueByName(const char *name) { return engineConfiguration->canOpenBLT; if (strEqualCaseInsensitive(name, "can2OpenBLT")) return engineConfiguration->can2OpenBLT; + if (strEqualCaseInsensitive(name, "injectorFlowAsMassFlow")) + return engineConfiguration->injectorFlowAsMassFlow; if (strEqualCaseInsensitive(name, "benchTestOffTime")) return engineConfiguration->benchTestOffTime; if (strEqualCaseInsensitive(name, "benchTestCount")) @@ -846,6 +850,8 @@ float getConfigValueByName(const char *name) { return engineConfiguration->dfcoDelay; if (strEqualCaseInsensitive(name, "acDelay")) return engineConfiguration->acDelay; + if (strEqualCaseInsensitive(name, "fordInjectorSmallPulseBreakPoint")) + return engineConfiguration->fordInjectorSmallPulseBreakPoint; if (strEqualCaseInsensitive(name, "hpfpCamLobes")) return engineConfiguration->hpfpCamLobes; if (strEqualCaseInsensitive(name, "hpfpPeakPos")) @@ -1288,6 +1294,11 @@ void setConfigValueByName(const char *name, float value) { engineConfiguration->tunerStudioSerialSpeed = (int)value; return; } + if (strEqualCaseInsensitive(name, "fordInjectorSmallPulseSlope")) + { + engineConfiguration->fordInjectorSmallPulseSlope = (int)value; + return; + } if (strEqualCaseInsensitive(name, "is_enabled_spi_1")) { engineConfiguration->is_enabled_spi_1 = (int)value; @@ -2303,6 +2314,11 @@ void setConfigValueByName(const char *name, float value) { engineConfiguration->can2OpenBLT = (int)value; return; } + if (strEqualCaseInsensitive(name, "injectorFlowAsMassFlow")) + { + engineConfiguration->injectorFlowAsMassFlow = (int)value; + return; + } if (strEqualCaseInsensitive(name, "benchTestOffTime")) { engineConfiguration->benchTestOffTime = (int)value; @@ -2583,6 +2599,11 @@ void setConfigValueByName(const char *name, float value) { engineConfiguration->acDelay = (int)value; return; } + if (strEqualCaseInsensitive(name, "fordInjectorSmallPulseBreakPoint")) + { + engineConfiguration->fordInjectorSmallPulseBreakPoint = (int)value; + return; + } if (strEqualCaseInsensitive(name, "hpfpCamLobes")) { engineConfiguration->hpfpCamLobes = (int)value; diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 78c7091b1f..62452759c4 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.all.1985998488" + signature = "rusEFI 2022.10.21.all.3054433504" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.all.1985998488" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.all.3054433504" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:59 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" clutchUpPin = bits, U16, 824, [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" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6195,7 +6197,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6246,9 +6249,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 434bb46381..af07dd2ec7 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.48way.1635313367" + signature = "rusEFI 2022.10.21.48way.2703883439" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.48way.1635313367" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.48way.2703883439" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:38 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",72="Camshaft Input (E6)",47="CrankShaft Input (C13)" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",72="Camshaft Input (E6)",67="Clutch Input (E1)",47="CrankShaft Input (C13)",70="Launch Control (E4)",3="TPS Reference Input (A1)" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6193,7 +6195,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6244,9 +6247,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 4a6ef60a7f..1d031337cc 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.alphax-2chan.1145926644" + signature = "rusEFI 2022.10.21.alphax-2chan.2216454540" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.alphax-2chan.1145926644" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.alphax-2chan.2216454540" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:14:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:04 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",80="C2 - Crank- (hall)",19="C2/C3 Crank Sensor VR",78="C3 - Crank+ (hall)",8="C7 - CAM Hall/Digital" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",80="C2 - Crank- (hall)",78="C3 - Crank+ (hall)",93="C4 - 2Step/Digital",8="C7 - CAM Hall/Digital" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6189,7 +6191,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6240,9 +6243,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index aa402a22d6..20c355bfe8 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.alphax-4chan.4249038103" + signature = "rusEFI 2022.10.21.alphax-4chan.1024604015" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.alphax-4chan.4249038103" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.alphax-4chan.1024604015" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:14:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:06 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",80="C2 - Crank- (hall)",19="C2/C3 Crank Sensor VR",78="C3 - Crank+ (hall)",8="C7 - CAM Hall/Digital",91="E5/E6 Cam Sensor VR",81="E6 - Cam+ (hall)",9="E7 - Flex" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",80="C2 - Crank- (hall)",78="C3 - Crank+ (hall)",93="C4 - 2Step/Digital",8="C7 - CAM Hall/Digital",85="D3 - Digital In 2",86="E3 - Digital In 3",87="E4 - Digital In 4",81="E6 - Cam+ (hall)",88="F3 - Digital In 5" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6192,7 +6194,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6243,9 +6246,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 300a523640..98a744cb24 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.atlas.1788156863" + signature = "rusEFI 2022.10.21.atlas.2864972231" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.atlas.1788156863" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.atlas.2864972231" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:55 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" clutchUpPin = bits, U16, 824, [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" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6195,7 +6197,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6246,9 +6249,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index dd956ea325..2b63686348 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.core8.2159263585" + signature = "rusEFI 2022.10.21.core8.1088595225" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.core8.2159263585" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.core8.1088595225" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:36 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",87="Digital Input 1 (F5)",86="Digital Input 2 (F4)",85="Digital Input 3 (F3)",84="Digital Input 4 (F2)",83="Digital Input 5 (F1)",82="Digital Input 6 (F0)",72="Digital Input 7 (E6)",47="Digital Input 8 (C13)",68="VR/Hall 1 (E2)",69="VR/Hall 2 (E3)",70="VR/Hall 3 (E4)",71="VR/Hall 4 (E5)" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",87="Digital Input 1 (F5)",86="Digital Input 2 (F4)",85="Digital Input 3 (F3)",84="Digital Input 4 (F2)",83="Digital Input 5 (F1)",82="Digital Input 6 (F0)",72="Digital Input 7 (E6)",47="Digital Input 8 (C13)",68="VR/Hall 1 (E2)",69="VR/Hall 2 (E3)",70="VR/Hall 3 (E4)",71="VR/Hall 4 (E5)" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6193,7 +6195,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6244,9 +6247,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 94b25bd7b3..b8b8b988ee 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.cypress.1985998488" + signature = "rusEFI 2022.10.21.cypress.3054433504" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.cypress.1985998488" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.cypress.3054433504" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:14:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Oct 21 02:30:00 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" clutchUpPin = bits, U16, 824, [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" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6195,7 +6197,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6246,9 +6249,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 43b93a0d82..2906f94632 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.f407-discovery.1985998488" + signature = "rusEFI 2022.10.21.f407-discovery.3054433504" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.f407-discovery.1985998488" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.f407-discovery.3054433504" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:51 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" clutchUpPin = bits, U16, 824, [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" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6195,7 +6197,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6246,9 +6249,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index ce7fb4b540..6a7b9c50d7 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.f429-discovery.1985998488" + signature = "rusEFI 2022.10.21.f429-discovery.3054433504" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.f429-discovery.1985998488" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.f429-discovery.3054433504" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:53 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" clutchUpPin = bits, U16, 824, [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" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6195,7 +6197,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6246,9 +6249,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 626e4a9a14..1567908fa8 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.frankenso_na6.875762268" + signature = "rusEFI 2022.10.21.frankenso_na6.4100065316" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.frankenso_na6.875762268" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.frankenso_na6.4100065316" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:40 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" clutchUpPin = bits, U16, 824, [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" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6195,7 +6197,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6246,9 +6249,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 9757c32e91..4b7a435b3c 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.harley81.2258824119" + signature = "rusEFI 2022.10.21.harley81.1190392271" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.harley81.2258824119" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.harley81.1190392271" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:14:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:08 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",88="11 Crank VR-",93="51 - VSS" clutchUpPin = bits, U16, 824, [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" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6191,7 +6193,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6240,9 +6243,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index df302d0cf1..7796925b56 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.hellen-gm-e67.3258477358" + signature = "rusEFI 2022.10.21.hellen-gm-e67.40464726" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.hellen-gm-e67.3258477358" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.hellen-gm-e67.40464726" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:26 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",88="C2-59 - Cam",86="C2-63 - Crank" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",92="C1-7 Stop/Brake Pedal",93="C3-66 - VSS Input" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6192,7 +6194,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6243,9 +6246,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 2cb169066d..8a483b0726 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.hellen-nb1.2949963604" + signature = "rusEFI 2022.10.21.hellen-nb1.1871037740" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.hellen-nb1.2949963604" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.hellen-nb1.1871037740" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:24 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",93="2D - VSS",8="2H - CAM",19="2J - CRANK",78="4B - DIGITAL/FLEX" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",91="1F - Brake/RES1",92="1G - Steering/RES2",39="1P - AC Switch",80="1V - Neutral",18="2A - Pressure Input",79="3I - Clutch",85="3J - O2S2",9="3S - EGR BOOST IN",38="4C - IN TEMP/PPS2",5="PPS1",3="TPS1" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6192,7 +6194,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6243,9 +6246,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 923ddedb3d..bfc666effc 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.hellen121nissan.4269889138" + signature = "rusEFI 2022.10.21.hellen121nissan.1053838346" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.hellen121nissan.4269889138" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.hellen121nissan.1053838346" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:14:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:14 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",19="13 - Crank",8="14 - Cam Left",9="33 - Cam Right" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",91="101 - Brake Input",92="102 - Power Steering Input" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6191,7 +6193,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6240,9 +6243,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 5c989bbd56..70339ba5b8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.hellen121vag.108932578" + signature = "rusEFI 2022.10.21.hellen121vag.3324983194" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.hellen121vag.108932578" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.hellen121vag.3324983194" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:14:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:12 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",93="54 - VSS",19="82 - VR",8="86 - CAM1",9="87 - CAM2" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",92="39 - IN RES2",91="48 - IN RES1",78="In D1",79="In D2",80="In D3",81="In D4" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6192,7 +6194,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6243,9 +6246,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index f01a8f7898..4a1cb13f18 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.hellen128.2292306854" + signature = "rusEFI 2022.10.21.hellen128.1223739870" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.hellen128.2292306854" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.hellen128.1223739870" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:14:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:10 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",5="C24 - PPS1",38="C25 - PPS2",35="E23 - MAP",36="E29 - Coolant Temp",6="E31 - TPS1",18="E34 - TPS2",19="E37 - Crank Input",8="E40 - IN_CAM",37="E45 - IAT",34="E47 - MAF" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",92="C40 - start button",9="P30_IN_AUX4",3="P32_IN_O2S2",2="P36_IN_O2S",4="P40_IN_MAP3",39="P41_IN_AUX3" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6191,7 +6193,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6240,9 +6243,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 4ce706247d..99be160a5c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.hellen154hyundai.2107988144" + signature = "rusEFI 2022.10.21.hellen154hyundai.3186901704" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.hellen154hyundai.2107988144" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.hellen154hyundai.3186901704" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:14:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:16 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",9="Cam - K15",8="Cam - K62 rev B",87="Cam - K62 rev C",19="Crank - K17 rev B",86="Crank - K17 rev C",93="K40 VSS" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",90="A29 Brake Input",92="A43 Clutch Input",91="A57 AC Request" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6191,7 +6193,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6240,9 +6243,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index d1528dcd67..3154359301 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.hellen72.2409226259" + signature = "rusEFI 2022.10.21.hellen72.1338571371" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.hellen72.2409226259" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.hellen72.1338571371" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:20 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",93="3T - VSS (D5)",8="3V - CAM (A19)",19="3Y - CRANK (A24)",80="4H - Neutral",81="5C - Digital Input",78="5I - Digital Input" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",91="4B - Brake/RES1 (A7)",18="4F - AC_PRES/AUX1 (A23)",90="4I - Clutch rev D",79="4I - Clutch rev E/F",9="4J - VTCS/AUX4 (A20)",34="5A - Pressure Input",87="5D - SENSOR INPUT",38="5M - PPS2 OR TEMPERATURE SENSOR",2="5N - TPS2",5="5P - PPS1" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6192,7 +6194,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6243,9 +6246,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 356254cd34..d2328afb49 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.hellen81.1424635538" + signature = "rusEFI 2022.10.21.hellen81.2495294698" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.hellen81.1424635538" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.hellen81.2495294698" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:22 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",19="15 - IN_CRANK (A24)",93="59 - IN_VSS",18="74 - IN_AUX1",38="75 - IN_AUX2",39="76 - IN_AUX3",9="77 - IN_AUX4",8="79 - IN_CAM" clutchUpPin = bits, U16, 824, [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" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6190,7 +6192,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6241,9 +6244,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 618f0d3500..23a745cff7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.hellen88bmw.1672150356" + signature = "rusEFI 2022.10.21.hellen88bmw.2751194924" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.hellen88bmw.1672150356" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.hellen88bmw.2751194924" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:14:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:18 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",19="16 - CRANK",8="17 - CAM" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",2="VIN5",3="VIN6" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6191,7 +6193,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6240,9 +6243,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index e5c10d0d9e..67dab7067d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.hellenNA6.672358319" + signature = "rusEFI 2022.10.21.hellenNA6.3896657367" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.hellenNA6.672358319" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.hellenNA6.3896657367" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:28 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",93="1M - VSS",85="2L - Flex Fuel",19="3E - CRANK",8="3G - CAM" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",39="1Q AC Switch",38="1V - Clutch Switch",35="2M - Pressure Sensor",3="2N - Temperature Sensor",9="4G - PPS2 OR TEMPERATURE SENSOR",18="4H - TPS2",5="4I - PPS1" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6192,7 +6194,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6243,9 +6246,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 07c174047a..62d215eb2f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.hellenNA8_96.3595984752" + signature = "rusEFI 2022.10.21.hellenNA8_96.369575176" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.hellenNA8_96.3595984752" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.hellenNA8_96.369575176" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:30 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",93="1M - VSS",19="3F - CRANK",8="3G - CAM",78="4B - DIGITAL/FLEX" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",39="1K - AC Switch",79="1L - Clutch",91="1Q - Brake/RES1",18="2A - Pressure Input",85="2D - O2S2",9="3S - EGR BOOST IN",38="4C - IN TEMP/PPS2",5="PPS1",3="TPS1" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6192,7 +6194,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6243,9 +6246,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index cdba6187e5..469a92d23c 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.kin.512248916" + signature = "rusEFI 2022.10.21.kin.3738785324" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.kin.512248916" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.kin.3738785324" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:14:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Oct 21 02:29:58 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A" clutchUpPin = bits, U16, 824, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6196,7 +6198,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6247,9 +6250,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index bef22fa9a1..f517460402 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.mre_f4.3824585112" + signature = "rusEFI 2022.10.21.mre_f4.598184928" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.mre_f4.3824585112" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.mre_f4.598184928" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:34 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",5="22 - AN temp 4",3="23 - AN temp 2",4="24 - AN temp 3",7="25 - Hall Cam",40="45 - VR/Hall Crank" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",2="18 - AN temp 1",36="19 - AN volt 4",37="20 - AN volt 5",5="22 - AN temp 4",3="23 - AN temp 2",4="24 - AN temp 3",7="25 - Hall Cam",8="26 - AN volt 2",34="27 - AN volt 1",6="28 - AN volt 10, Aux Reuse",39="30 - AN volt 7",9="31 - AN volt 3",38="32 - AN volt 6, Aux Reuse",18="36 - AN volt 8, Aux Reuse",19="40 - AN volt 9, Aux Reuse" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6193,7 +6195,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6244,9 +6247,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 207f40db9e..5cd52f0114 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.mre_f7.3824585112" + signature = "rusEFI 2022.10.21.mre_f7.598184928" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.mre_f7.3824585112" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.mre_f7.598184928" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:32 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",5="22 - AN temp 4",3="23 - AN temp 2",4="24 - AN temp 3",7="25 - Hall Cam",40="45 - VR/Hall Crank" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",2="18 - AN temp 1",36="19 - AN volt 4",37="20 - AN volt 5",5="22 - AN temp 4",3="23 - AN temp 2",4="24 - AN temp 3",7="25 - Hall Cam",8="26 - AN volt 2",34="27 - AN volt 1",6="28 - AN volt 10, Aux Reuse",39="30 - AN volt 7",9="31 - AN volt 3",38="32 - AN volt 6, Aux Reuse",18="36 - AN volt 8, Aux Reuse",19="40 - AN volt 9, Aux Reuse" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6193,7 +6195,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6244,9 +6247,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index b0ed9ec9fc..d07951cafe 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.prometheus_405.649410430" + signature = "rusEFI 2022.10.21.prometheus_405.3873713414" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.prometheus_405.649410430" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.prometheus_405.3873713414" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:43 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" clutchUpPin = bits, U16, 824, [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" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6189,7 +6191,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6240,9 +6243,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 7cea12ec33..f2ed9e6bc1 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.prometheus_469.649410430" + signature = "rusEFI 2022.10.21.prometheus_469.3873713414" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.prometheus_469.649410430" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.prometheus_469.3873713414" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:42 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" clutchUpPin = bits, U16, 824, [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" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6189,7 +6191,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6240,9 +6243,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 627cde20bb..6ef02d493a 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.proteus_f4.3549571566" + signature = "rusEFI 2022.10.21.proteus_f4.331559830" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.proteus_f4.3549571566" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.proteus_f4.331559830" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:47 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6",73="VR 1",74="VR 2" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",38="Analog Temp 1",39="Analog Temp 2",18="Analog Temp 3",19="Analog Temp 4",34="Analog Volt 1",7="Analog Volt 10",8="Analog Volt 11",35="Analog Volt 2",36="Analog Volt 3",37="Analog Volt 4",2="Analog Volt 5",3="Analog Volt 6",4="Analog Volt 7",5="Analog Volt 8",6="Analog Volt 9",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6189,7 +6191,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6240,9 +6243,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 44062916b0..bac20d895d 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.proteus_f7.3549571566" + signature = "rusEFI 2022.10.21.proteus_f7.331559830" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.proteus_f7.3549571566" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.proteus_f7.331559830" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:45 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6",73="VR 1",74="VR 2" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",38="Analog Temp 1",39="Analog Temp 2",18="Analog Temp 3",19="Analog Temp 4",34="Analog Volt 1",7="Analog Volt 10",8="Analog Volt 11",35="Analog Volt 2",36="Analog Volt 3",37="Analog Volt 4",2="Analog Volt 5",3="Analog Volt 6",4="Analog Volt 7",5="Analog Volt 8",6="Analog Volt 9",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6189,7 +6191,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6240,9 +6243,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index a292de89bc..7e5b2af15f 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.proteus_h7.3549571566" + signature = "rusEFI 2022.10.21.proteus_h7.331559830" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.proteus_h7.3549571566" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.proteus_h7.331559830" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:49 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6",73="VR 1",74="VR 2" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",38="Analog Temp 1",39="Analog Temp 2",18="Analog Temp 3",19="Analog Temp 4",34="Analog Volt 1",7="Analog Volt 10",8="Analog Volt 11",35="Analog Volt 2",36="Analog Volt 3",37="Analog Volt 4",2="Analog Volt 5",3="Analog Volt 6",4="Analog Volt 7",5="Analog Volt 8",6="Analog Volt 9",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6189,7 +6191,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6240,9 +6243,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 7531cbd6a7..597bf17c61 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.subaru_eg33_f7.255932226" + signature = "rusEFI 2022.10.21.subaru_eg33_f7.3473943866" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.subaru_eg33_f7.255932226" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.subaru_eg33_f7.3473943866" ; 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 @@ -86,7 +86,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_subaru_config.sh integration/rusefi_config.txt Fri Oct 21 02:14:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:02 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], 0="NONE",126="A07 - Cam VR+",124="A08 - Crank 1 VR+",75="A08 - Crank 2 VR+",64="B11 - Speed Din" clutchUpPin = bits, U16, 824, [0:7], 0="NONE",183="A19 - AC Ctrl Din",182="A20 - Torque Ctrl Din",181="B09 - P pos Din",180="B10 - N pos Din",178="B12 - IGN Din",177="C09 - Air Condition request Din",166="C10 - Starter Din",167="C12 - Memory SW Din",168="C13 - Test SW Din",169="D04 - California ID Din" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6191,7 +6193,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6242,9 +6245,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 2eee5aeccc..cb58c3f8b4 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.21.tdg-pdm8.3696697548" + signature = "rusEFI 2022.10.21.tdg-pdm8.470170292" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.21.tdg-pdm8.3696697548" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.21.tdg-pdm8.470170292" ; 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 @@ -86,7 +86,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 Fri Oct 21 02:15:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:57 UTC 2022 pageSize = 22800 page = 1 @@ -336,7 +336,7 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [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" triggerSimulatorPins2 = bits, U16, 750, [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" -unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 +fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 @@ -398,7 +398,7 @@ lps25BaroSensorScl = bits, U16, 818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA lps25BaroSensorSda = bits, U16, 820, [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" vehicleSpeedSensorInputPin = bits, U16, 822, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11" clutchUpPin = bits, U16, 824, [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" -injectorNonlinearMode = bits, U08, 826, [0:0], "None", "Polynomial" +injectorNonlinearMode = bits, U08, 826, [0:1], "None", "Polynomial", "Ford (dual slope)" clutchUpPinMode = bits, U08, 827, [0:1], "DEFAULT", "PULLUP", "PULLDOWN" max31855_cs1 = bits, U16, 828, [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" max31855_cs2 = bits, U16, 830, [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" @@ -758,7 +758,7 @@ mc33_hpfp_max_hold = scalar, U08, 1627, "ms", 1, 0, 0, 255, 0 stepperDcInvertedPins = bits, U32, 1628, [0:0], "false", "true" canOpenBLT = bits, U32, 1628, [1:1], "false", "true" can2OpenBLT = bits, U32, 1628, [2:2], "false", "true" -unused1740b2 = bits, U32, 1628, [3:3], "false", "true" +injectorFlowAsMassFlow = bits, U32, 1628, [3:3], "volumetric flow", "mass flow" unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" @@ -1139,11 +1139,12 @@ triggerGapOverrideTo18 = scalar, F32, 3116, "ratio", 1, 0, 0, 20, 3 maxCamPhaseResolveRpm = scalar, U08, 3120, "rpm", 50.0, 0, 0, 12500, 0 dfcoDelay = scalar, U08, 3121, "sec", 0.1, 0, 0, 10, 1 acDelay = scalar, U08, 3122, "sec", 0.1, 0, 0, 10, 1 -unused4080 = array, S08, 3123, [9], "", 1, 0, 0, 0, 0 -hpfpCamLobes = scalar, U08, 3132, "lobes/cam", 1, 0, 0, 255, 0 -hpfpCam = bits, U08, 3133, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" -hpfpPeakPos = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 -hpfpMinAngle = scalar, U08, 3135, "deg", 1, 0, 0, 255, 0 +fordInjectorSmallPulseBreakPoint = scalar, U16, 3124, "mg", 0.001, 0, 0, 65, 3 +unused4080 = array, S08, 3126, [5], "", 1, 0, 0, 0, 0 +hpfpCamLobes = scalar, U08, 3131, "lobes/cam", 1, 0, 0, 255, 0 +hpfpCam = bits, U08, 3132, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +hpfpPeakPos = scalar, U08, 3133, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 3134, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 3136, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 3138, "deg", 1, 0, 0, 255, 0 issFilterReciprocal = scalar, U08, 3139, "", 1, 0, 0, 100, 0 @@ -1801,6 +1802,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 stepperDcInvertedPins = "Enable if DC-motor driver (H-bridge) inverts the signals (eg. RZ7899 on Hellen boards)" canOpenBLT = "Allow OpenBLT on Primary CAN" can2OpenBLT = "Allow OpenBLT on Secondary CAN" + injectorFlowAsMassFlow = "Select whether to configure injector flow in volumetric flow (defualt, cc/min) or mass flow (g/s)." benchTestOffTime = "Time between bench test pulses" benchTestCount = "How many test bench pulses do you want" benchTestOnTime = "Length of each of the test pulses" @@ -6195,7 +6197,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Injector Flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow", injector_flow, {isInjectionEnabled == 1} + field = "Injector flow units", injectorFlowAsMassFlow, {isInjectionEnabled == 1} field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) } field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled } field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 } @@ -6246,9 +6249,16 @@ dialog = wideband_stateDialog, "wideband_state" field = "x^6", injectorCorrectionPolynomial7 field = "x^7", injectorCorrectionPolynomial8 + dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis + field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope + field = "Set this to 'mass flow'", injectorFlowAsMassFlow + field = "Large pulse slope (AHISL)", injector_flow + field = "Small pulse breakpoint (FUEL_BKPT)", fordInjectorSmallPulseBreakPoint + dialog = injectorNonlinear field = "Small pulse correction mode", injectorNonlinearMode - panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode != 0 } + panel = injectorNonlinearPolynomial, {1}, { injectorNonlinearMode == 1 } + panel = injectorNonlinearFord, {1}, { injectorNonlinearMode == 2 } dialog = testLuaOut, "Lua Out Test" commandButton = "Lua Out #1", cmd_test_lua1 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 f67af05478..6ee503de1d 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 Fri Oct 21 02:15:35 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:31:02 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -725,6 +725,8 @@ public class Fields { public static final int flexCranking_offset = 1372; public static final int flexSensorPin_offset = 844; public static final int forceO2Heating_offset = 1372; + public static final int fordInjectorSmallPulseBreakPoint_offset = 3124; + public static final int fordInjectorSmallPulseSlope_offset = 752; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; @@ -1284,8 +1286,8 @@ public class Fields { public static final int HPFP_LOBE_PROFILE_SIZE = 16; public static final int HPFP_TARGET_SIZE = 10; public static final int hpfpActivationAngle_offset = 3138; - public static final int hpfpCam_offset = 3133; - public static final int hpfpCamLobes_offset = 3132; + public static final int hpfpCam_offset = 3132; + public static final int hpfpCamLobes_offset = 3131; public static final int hpfpCompensation_offset = 3432; public static final int hpfpCompensationLoadBins_offset = 3532; public static final int hpfpCompensationRpmBins_offset = 3552; @@ -1293,8 +1295,8 @@ public class Fields { public static final int hpfpDeadtimeVoltsBins_offset = 3178; public static final int hpfpLobeProfileAngle_offset = 3162; public static final int hpfpLobeProfileQuantityBins_offset = 3146; - public static final int hpfpMinAngle_offset = 3135; - public static final int hpfpPeakPos_offset = 3134; + public static final int hpfpMinAngle_offset = 3134; + public static final int hpfpPeakPos_offset = 3133; public static final int hpfpPidI_offset = 3142; public static final int hpfpPidP_offset = 3140; public static final int hpfpPumpVolume_offset = 3136; @@ -1523,6 +1525,8 @@ public class Fields { public static final int injectorCorrectionPolynomial6_offset = 2020; public static final int injectorCorrectionPolynomial7_offset = 2024; public static final int injectorCorrectionPolynomial8_offset = 2028; + public static final int injectorFlowAsMassFlow_offset = 1628; + public static final int InjectorNonlinearMode_INJ_FordModel = 2; public static final int InjectorNonlinearMode_INJ_None = 0; public static final int InjectorNonlinearMode_INJ_PolynomialAdder = 1; public static final int injectorNonlinearMode_offset = 826; @@ -1922,7 +1926,6 @@ public class Fields { public static final int SENT_INPUT_COUNT = 1; public static final int sentInputPins1_offset = 2082; public static final int showHumanReadableWarning_offset = 960; - public static final int SIGNATURE_HASH = 1985998488; public static final int silentTriggerError_offset = 1360; public static final int skippedWheelOnCam_offset = 1360; public static final int slowAdcAlpha_offset = 1600; @@ -2412,7 +2415,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.10.21.all.1985998488"; + public static final String TS_SIGNATURE = "rusEFI 2022.10.21.all.3054433504"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TS_TOTAL_OUTPUT_SIZE = 1280; @@ -2450,8 +2453,7 @@ public class Fields { public static final int unused1128_offset = 1628; public static final int unused1129_offset = 1628; public static final int unused1130_offset = 1628; - public static final int unused1740b2_offset = 1628; - public static final int unused4080_offset = 3123; + public static final int unused4080_offset = 3126; public static final int unused_1484_bit_29_offset = 1372; public static final int unused_1484_bit_30_offset = 1372; public static final int unused_1484_bit_38_offset = 1372; @@ -2481,7 +2483,6 @@ public class Fields { public static final int unusedBit_541_31_offset = 1628; public static final int unusedBit_541_8_offset = 1628; public static final int unusedBit_541_9_offset = 1628; - public static final int unusedTrig_offset = 752; public static final int unusedTrigMode_offset = 756; public static final int useAdvanceCorrectionsForCranking_offset = 1372; public static final int useBiQuadOnAuxSpeedSensors_offset = 1372; @@ -2918,7 +2919,7 @@ public class Fields { public static final Field COMPRESSIONRATIO = Field.create("COMPRESSIONRATIO", 744, FieldType.FLOAT); public static final Field TRIGGERSIMULATORPINS1 = Field.create("TRIGGERSIMULATORPINS1", 748, FieldType.INT16, Gpio).setScale(1.0); public static final Field TRIGGERSIMULATORPINS2 = Field.create("TRIGGERSIMULATORPINS2", 750, FieldType.INT16, Gpio).setScale(1.0); - public static final Field UNUSEDTRIG = Field.create("UNUSEDTRIG", 752, FieldType.INT16).setScale(1.0); + public static final Field FORDINJECTORSMALLPULSESLOPE = Field.create("FORDINJECTORSMALLPULSESLOPE", 752, FieldType.INT16).setScale(0.001); public static final Field TRIGGERSIMULATORPINMODES1 = Field.create("TRIGGERSIMULATORPINMODES1", 754, FieldType.INT8, pin_output_mode_e).setScale(1.0); public static final Field TRIGGERSIMULATORPINMODES2 = Field.create("TRIGGERSIMULATORPINMODES2", 755, FieldType.INT8, pin_output_mode_e).setScale(1.0); public static final Field UNUSEDTRIGMODE = Field.create("UNUSEDTRIGMODE", 756, FieldType.INT8).setScale(1.0); @@ -3373,7 +3374,7 @@ public class Fields { public static final Field STEPPERDCINVERTEDPINS = Field.create("STEPPERDCINVERTEDPINS", 1628, FieldType.BIT, 0); public static final Field CANOPENBLT = Field.create("CANOPENBLT", 1628, FieldType.BIT, 1); public static final Field CAN2OPENBLT = Field.create("CAN2OPENBLT", 1628, FieldType.BIT, 2); - public static final Field UNUSED1740B2 = Field.create("UNUSED1740B2", 1628, FieldType.BIT, 3); + public static final Field INJECTORFLOWASMASSFLOW = Field.create("INJECTORFLOWASMASSFLOW", 1628, FieldType.BIT, 3); public static final Field UNUSED1127 = Field.create("UNUSED1127", 1628, FieldType.BIT, 4); public static final Field UNUSED1128 = Field.create("UNUSED1128", 1628, FieldType.BIT, 5); public static final Field UNUSED1129 = Field.create("UNUSED1129", 1628, FieldType.BIT, 6); @@ -3782,12 +3783,15 @@ public class Fields { public static final Field MAXCAMPHASERESOLVERPM = Field.create("MAXCAMPHASERESOLVERPM", 3120, FieldType.INT8).setScale(50.0); public static final Field DFCODELAY = Field.create("DFCODELAY", 3121, FieldType.INT8).setScale(0.1); public static final Field ACDELAY = Field.create("ACDELAY", 3122, FieldType.INT8).setScale(0.1); - public static final Field UNUSED4080 = Field.create("UNUSED4080", 3123, FieldType.INT8).setScale(1.0); - public static final Field HPFPCAMLOBES = Field.create("HPFPCAMLOBES", 3132, FieldType.INT8).setScale(1.0); + public static final Field ALIGNMENTFILL_AT_3123 = Field.create("ALIGNMENTFILL_AT_3123", 3123, FieldType.INT8).setScale(1.0); + public static final Field FORDINJECTORSMALLPULSEBREAKPOINT = Field.create("FORDINJECTORSMALLPULSEBREAKPOINT", 3124, FieldType.INT16).setScale(0.001); + public static final Field UNUSED4080 = Field.create("UNUSED4080", 3126, FieldType.INT8).setScale(1.0); + public static final Field HPFPCAMLOBES = Field.create("HPFPCAMLOBES", 3131, FieldType.INT8).setScale(1.0); public static final String[] hpfp_cam_e = {"NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2"}; - public static final Field HPFPCAM = Field.create("HPFPCAM", 3133, FieldType.INT8, hpfp_cam_e).setScale(1.0); - public static final Field HPFPPEAKPOS = Field.create("HPFPPEAKPOS", 3134, FieldType.INT8).setScale(1.0); - public static final Field HPFPMINANGLE = Field.create("HPFPMINANGLE", 3135, FieldType.INT8).setScale(1.0); + public static final Field HPFPCAM = Field.create("HPFPCAM", 3132, FieldType.INT8, hpfp_cam_e).setScale(1.0); + public static final Field HPFPPEAKPOS = Field.create("HPFPPEAKPOS", 3133, FieldType.INT8).setScale(1.0); + public static final Field HPFPMINANGLE = Field.create("HPFPMINANGLE", 3134, FieldType.INT8).setScale(1.0); + public static final Field ALIGNMENTFILL_AT_3135 = Field.create("ALIGNMENTFILL_AT_3135", 3135, FieldType.INT8).setScale(1.0); public static final Field HPFPPUMPVOLUME = Field.create("HPFPPUMPVOLUME", 3136, FieldType.INT16).setScale(0.001); public static final Field HPFPACTIVATIONANGLE = Field.create("HPFPACTIVATIONANGLE", 3138, FieldType.INT8).setScale(1.0); public static final Field ISSFILTERRECIPROCAL = Field.create("ISSFILTERRECIPROCAL", 3139, FieldType.INT8).setScale(1.0); @@ -4359,7 +4363,7 @@ public class Fields { COMPRESSIONRATIO, TRIGGERSIMULATORPINS1, TRIGGERSIMULATORPINS2, - UNUSEDTRIG, + FORDINJECTORSMALLPULSESLOPE, TRIGGERSIMULATORPINMODES1, TRIGGERSIMULATORPINMODES2, UNUSEDTRIGMODE, @@ -4806,7 +4810,7 @@ public class Fields { STEPPERDCINVERTEDPINS, CANOPENBLT, CAN2OPENBLT, - UNUSED1740B2, + INJECTORFLOWASMASSFLOW, UNUSED1127, UNUSED1128, UNUSED1129, @@ -5210,11 +5214,14 @@ public class Fields { MAXCAMPHASERESOLVERPM, DFCODELAY, ACDELAY, + ALIGNMENTFILL_AT_3123, + FORDINJECTORSMALLPULSEBREAKPOINT, UNUSED4080, HPFPCAMLOBES, HPFPCAM, HPFPPEAKPOS, HPFPMINANGLE, + ALIGNMENTFILL_AT_3135, HPFPPUMPVOLUME, HPFPACTIVATIONANGLE, ISSFILTERRECIPROCAL,