diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 4c18caa8bc..a971df1e30 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Nov 06 01:59:38 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Nov 06 03:27:02 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1506,15 +1506,9 @@ struct engine_configuration_s { */ uint16_t idlePositionMax; /** - units * offset 724 */ - uint16_t tempHpfpStart; - /** - units - * offset 726 - */ - uint16_t tempHpfpDuration; + uint16_t unusedExHpfp[2]; /** * Secondary TTL channel baud rate BPs @@ -2061,10 +2055,10 @@ struct engine_configuration_s { bool unusedBit_251_29 : 1; /** offset 976 bit 30 */ - bool unusedBit_302_30 : 1; + bool unusedBit_301_30 : 1; /** offset 976 bit 31 */ - bool unusedBit_302_31 : 1; + bool unusedBit_301_31 : 1; /** * offset 980 */ @@ -3031,76 +3025,76 @@ struct engine_configuration_s { bool unused1130 : 1; /** offset 2116 bit 8 */ - bool unusedBit_513_8 : 1; + bool unusedBit_512_8 : 1; /** offset 2116 bit 9 */ - bool unusedBit_513_9 : 1; + bool unusedBit_512_9 : 1; /** offset 2116 bit 10 */ - bool unusedBit_513_10 : 1; + bool unusedBit_512_10 : 1; /** offset 2116 bit 11 */ - bool unusedBit_513_11 : 1; + bool unusedBit_512_11 : 1; /** offset 2116 bit 12 */ - bool unusedBit_513_12 : 1; + bool unusedBit_512_12 : 1; /** offset 2116 bit 13 */ - bool unusedBit_513_13 : 1; + bool unusedBit_512_13 : 1; /** offset 2116 bit 14 */ - bool unusedBit_513_14 : 1; + bool unusedBit_512_14 : 1; /** offset 2116 bit 15 */ - bool unusedBit_513_15 : 1; + bool unusedBit_512_15 : 1; /** offset 2116 bit 16 */ - bool unusedBit_513_16 : 1; + bool unusedBit_512_16 : 1; /** offset 2116 bit 17 */ - bool unusedBit_513_17 : 1; + bool unusedBit_512_17 : 1; /** offset 2116 bit 18 */ - bool unusedBit_513_18 : 1; + bool unusedBit_512_18 : 1; /** offset 2116 bit 19 */ - bool unusedBit_513_19 : 1; + bool unusedBit_512_19 : 1; /** offset 2116 bit 20 */ - bool unusedBit_513_20 : 1; + bool unusedBit_512_20 : 1; /** offset 2116 bit 21 */ - bool unusedBit_513_21 : 1; + bool unusedBit_512_21 : 1; /** offset 2116 bit 22 */ - bool unusedBit_513_22 : 1; + bool unusedBit_512_22 : 1; /** offset 2116 bit 23 */ - bool unusedBit_513_23 : 1; + bool unusedBit_512_23 : 1; /** offset 2116 bit 24 */ - bool unusedBit_513_24 : 1; + bool unusedBit_512_24 : 1; /** offset 2116 bit 25 */ - bool unusedBit_513_25 : 1; + bool unusedBit_512_25 : 1; /** offset 2116 bit 26 */ - bool unusedBit_513_26 : 1; + bool unusedBit_512_26 : 1; /** offset 2116 bit 27 */ - bool unusedBit_513_27 : 1; + bool unusedBit_512_27 : 1; /** offset 2116 bit 28 */ - bool unusedBit_513_28 : 1; + bool unusedBit_512_28 : 1; /** offset 2116 bit 29 */ - bool unusedBit_513_29 : 1; + bool unusedBit_512_29 : 1; /** offset 2116 bit 30 */ - bool unusedBit_513_30 : 1; + bool unusedBit_512_30 : 1; /** offset 2116 bit 31 */ - bool unusedBit_513_31 : 1; + bool unusedBit_512_31 : 1; /** * set can_mode X * offset 2120 @@ -4041,10 +4035,119 @@ struct engine_configuration_s { */ float triggerGapOverrideTo[GAP_TRACKING_LENGTH]; /** - units + lobes/cam * offset 4696 */ - int mainUnusedEnd[326]; + uint8_t hpfpCamLobes; + /** + * offset 4697 + */ + hpfp_cam_e hpfpCam; + /** + * Crank angle ATDC of first lobe peak + deg + * offset 4698 + */ + uint8_t hpfpPeakPos; + /** + * If the requested activation time is below this angle, don't bother running the pump + deg + * offset 4699 + */ + uint8_t hpfpMinAngle; + /** + * Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm. + cc + * offset 4700 + */ + scaled_channel hpfpPumpVolume; + /** + * How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own) + deg + * offset 4702 + */ + uint8_t hpfpActivationAngle; + /** + * offset 4703 + */ + uint8_t unusedFiller_4703; + /** + %/kPa + * offset 4704 + */ + scaled_channel hpfpPidP; + /** + %/kPa/lobe + * offset 4706 + */ + scaled_channel hpfpPidI; + /** + * The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel. + kPa/s + * offset 4708 + */ + uint16_t hpfpTargetDecay; + /** + % + * offset 4710 + */ + scaled_channel hpfpLobeProfileQuantityBins[HPFP_LOBE_PROFILE_SIZE]; + /** + deg + * offset 4726 + */ + scaled_channel hpfpLobeProfileAngle[HPFP_LOBE_PROFILE_SIZE]; + /** + volts + * offset 4742 + */ + uint8_t hpfpDeadtimeVoltsBins[HPFP_DEADTIME_SIZE]; + /** + ms + * offset 4750 + */ + scaled_channel hpfpDeadtimeMS[HPFP_DEADTIME_SIZE]; + /** + kPa + * offset 4766 + */ + uint16_t hpfpTarget[HPFP_TARGET_SIZE][HPFP_TARGET_SIZE]; + /** + load + * offset 4966 + */ + scaled_channel hpfpTargetLoadBins[HPFP_TARGET_SIZE]; + /** + RPM + * offset 4986 + */ + scaled_channel hpfpTargetRpmBins[HPFP_TARGET_SIZE]; + /** + % + * offset 4996 + */ + int8_t hpfpCompensation[HPFP_COMPENSATION_SIZE][HPFP_COMPENSATION_SIZE]; + /** + cc/lobe + * offset 5096 + */ + scaled_channel hpfpCompensationLoadBins[HPFP_COMPENSATION_SIZE]; + /** + RPM + * offset 5116 + */ + scaled_channel hpfpCompensationRpmBins[HPFP_COMPENSATION_SIZE]; + /** + * need 4 byte alignment + units + * offset 5126 + */ + uint8_t alignmentFill_at_5126[2]; + /** + units + * offset 5128 + */ + int mainUnusedEnd[218]; /** total size 6000*/ }; @@ -4454,4 +4557,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Nov 06 01:59:38 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Nov 06 03:27:02 UTC 2021 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 9b08e6d0cd..1e51710458 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -86,6 +86,7 @@ #define alignmentFill_at_2227_offset 2227 #define alignmentFill_at_2253_offset 2253 #define alignmentFill_at_4539_offset 4539 +#define alignmentFill_at_5126_offset 5126 #define alternator_antiwindupFreq_offset 1764 #define alternator_derivativeFilterLoss_offset 1760 #define alternatorControl_dFactor_offset 1724 @@ -1264,6 +1265,36 @@ #define hip9011PrescalerAndSDO_offset 324 #define hip9011SpiDevice_offset 540 #define hipOutputChannel_offset 1468 +#define hpfp_cam_e_auto_enum "HPFP_CAM_NONE", "HPFP_CAM_IN1", "HPFP_CAM_EX1", "HPFP_CAM_IN2", "HPFP_CAM_EX2" +#define hpfp_cam_e_enum "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +#define hpfp_cam_e_HPFP_CAM_EX1 2 +#define hpfp_cam_e_HPFP_CAM_EX2 4 +#define hpfp_cam_e_HPFP_CAM_IN1 1 +#define hpfp_cam_e_HPFP_CAM_IN2 3 +#define hpfp_cam_e_HPFP_CAM_NONE 0 +#define HPFP_COMPENSATION_SIZE 10 +#define HPFP_DEADTIME_SIZE 8 +#define HPFP_LOBE_PROFILE_SIZE 16 +#define HPFP_TARGET_SIZE 10 +#define hpfpActivationAngle_offset 4702 +#define hpfpCam_offset 4697 +#define hpfpCamLobes_offset 4696 +#define hpfpCompensation_offset 4996 +#define hpfpCompensationLoadBins_offset 5096 +#define hpfpCompensationRpmBins_offset 5116 +#define hpfpDeadtimeMS_offset 4750 +#define hpfpDeadtimeVoltsBins_offset 4742 +#define hpfpLobeProfileAngle_offset 4726 +#define hpfpLobeProfileQuantityBins_offset 4710 +#define hpfpMinAngle_offset 4699 +#define hpfpPeakPos_offset 4698 +#define hpfpPidI_offset 4706 +#define hpfpPidP_offset 4704 +#define hpfpPumpVolume_offset 4700 +#define hpfpTarget_offset 4766 +#define hpfpTargetDecay_offset 4708 +#define hpfpTargetLoadBins_offset 4966 +#define hpfpTargetRpmBins_offset 4986 #define hpfpValvePin_offset 2130 #define hpfpValvePinMode_offset 2131 #define HW_MAX_ADC_INDEX 17 @@ -1576,7 +1607,7 @@ #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 706 #define mainRelayPinMode_offset 752 -#define mainUnusedEnd_offset 4696 +#define mainUnusedEnd_offset 5128 #define malfunctionIndicatorPin_offset 660 #define malfunctionIndicatorPinMode_offset 661 #define manIdlePosition_offset 608 @@ -1816,7 +1847,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 989149898 +#define SIGNATURE_HASH 3264857373 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1960,8 +1991,6 @@ #define tcuSolenoidTable_offset 15136 #define tcuUpshiftButtonPin_offset 1818 #define tcuUpshiftButtonPinMode_offset 4514 -#define tempHpfpDuration_offset 726 -#define tempHpfpStart_offset 724 #define test557pin_offset 3101 #define thermistor_conf_s_size 28 #define ThermistorConf_size 32 @@ -2325,7 +2354,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.11.06.hellen_cypress.989149898" +#define TS_SIGNATURE "rusEFI 2021.11.06.hellen_cypress.3264857373" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2386,33 +2415,33 @@ #define unusedAtOldBoardConfigurationEnd_offset 1340 #define unusedBit4_1476_offset 1476 #define unusedBit_251_29_offset 976 -#define unusedBit_302_30_offset 976 -#define unusedBit_302_31_offset 976 +#define unusedBit_301_30_offset 976 +#define unusedBit_301_31_offset 976 #define unusedBit_34_31_offset 76 -#define unusedBit_513_10_offset 2116 -#define unusedBit_513_11_offset 2116 -#define unusedBit_513_12_offset 2116 -#define unusedBit_513_13_offset 2116 -#define unusedBit_513_14_offset 2116 -#define unusedBit_513_15_offset 2116 -#define unusedBit_513_16_offset 2116 -#define unusedBit_513_17_offset 2116 -#define unusedBit_513_18_offset 2116 -#define unusedBit_513_19_offset 2116 -#define unusedBit_513_20_offset 2116 -#define unusedBit_513_21_offset 2116 -#define unusedBit_513_22_offset 2116 -#define unusedBit_513_23_offset 2116 -#define unusedBit_513_24_offset 2116 -#define unusedBit_513_25_offset 2116 -#define unusedBit_513_26_offset 2116 -#define unusedBit_513_27_offset 2116 -#define unusedBit_513_28_offset 2116 -#define unusedBit_513_29_offset 2116 -#define unusedBit_513_30_offset 2116 -#define unusedBit_513_31_offset 2116 -#define unusedBit_513_8_offset 2116 -#define unusedBit_513_9_offset 2116 +#define unusedBit_512_10_offset 2116 +#define unusedBit_512_11_offset 2116 +#define unusedBit_512_12_offset 2116 +#define unusedBit_512_13_offset 2116 +#define unusedBit_512_14_offset 2116 +#define unusedBit_512_15_offset 2116 +#define unusedBit_512_16_offset 2116 +#define unusedBit_512_17_offset 2116 +#define unusedBit_512_18_offset 2116 +#define unusedBit_512_19_offset 2116 +#define unusedBit_512_20_offset 2116 +#define unusedBit_512_21_offset 2116 +#define unusedBit_512_22_offset 2116 +#define unusedBit_512_23_offset 2116 +#define unusedBit_512_24_offset 2116 +#define unusedBit_512_25_offset 2116 +#define unusedBit_512_26_offset 2116 +#define unusedBit_512_27_offset 2116 +#define unusedBit_512_28_offset 2116 +#define unusedBit_512_29_offset 2116 +#define unusedBit_512_30_offset 2116 +#define unusedBit_512_31_offset 2116 +#define unusedBit_512_8_offset 2116 +#define unusedBit_512_9_offset 2116 #define unusedBitHere1_offset 1464 #define unusedBitHere2_offset 1464 #define unusedBitHere3_offset 1464 @@ -2428,6 +2457,8 @@ #define unusedEL2_offset 2064 #define unusedEL3_offset 2068 #define unusedEL4_offset 2072 +#define unusedExHpfp_offset 724 +#define unusedFiller_4703_offset 4703 #define unusedFsioInputs_offset 1522 #define unusedLuaWasHere_offset 16032 #define unusedOldBiquad_offset 2331 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 e1182305b4..a943c16027 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Nov 06 01:59:35 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Nov 06 03:27:00 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1506,15 +1506,9 @@ struct engine_configuration_s { */ uint16_t idlePositionMax; /** - units * offset 724 */ - uint16_t tempHpfpStart; - /** - units - * offset 726 - */ - uint16_t tempHpfpDuration; + uint16_t unusedExHpfp[2]; /** * Secondary TTL channel baud rate BPs @@ -2061,10 +2055,10 @@ struct engine_configuration_s { bool unusedBit_251_29 : 1; /** offset 976 bit 30 */ - bool unusedBit_302_30 : 1; + bool unusedBit_301_30 : 1; /** offset 976 bit 31 */ - bool unusedBit_302_31 : 1; + bool unusedBit_301_31 : 1; /** * offset 980 */ @@ -3031,76 +3025,76 @@ struct engine_configuration_s { bool unused1130 : 1; /** offset 2116 bit 8 */ - bool unusedBit_513_8 : 1; + bool unusedBit_512_8 : 1; /** offset 2116 bit 9 */ - bool unusedBit_513_9 : 1; + bool unusedBit_512_9 : 1; /** offset 2116 bit 10 */ - bool unusedBit_513_10 : 1; + bool unusedBit_512_10 : 1; /** offset 2116 bit 11 */ - bool unusedBit_513_11 : 1; + bool unusedBit_512_11 : 1; /** offset 2116 bit 12 */ - bool unusedBit_513_12 : 1; + bool unusedBit_512_12 : 1; /** offset 2116 bit 13 */ - bool unusedBit_513_13 : 1; + bool unusedBit_512_13 : 1; /** offset 2116 bit 14 */ - bool unusedBit_513_14 : 1; + bool unusedBit_512_14 : 1; /** offset 2116 bit 15 */ - bool unusedBit_513_15 : 1; + bool unusedBit_512_15 : 1; /** offset 2116 bit 16 */ - bool unusedBit_513_16 : 1; + bool unusedBit_512_16 : 1; /** offset 2116 bit 17 */ - bool unusedBit_513_17 : 1; + bool unusedBit_512_17 : 1; /** offset 2116 bit 18 */ - bool unusedBit_513_18 : 1; + bool unusedBit_512_18 : 1; /** offset 2116 bit 19 */ - bool unusedBit_513_19 : 1; + bool unusedBit_512_19 : 1; /** offset 2116 bit 20 */ - bool unusedBit_513_20 : 1; + bool unusedBit_512_20 : 1; /** offset 2116 bit 21 */ - bool unusedBit_513_21 : 1; + bool unusedBit_512_21 : 1; /** offset 2116 bit 22 */ - bool unusedBit_513_22 : 1; + bool unusedBit_512_22 : 1; /** offset 2116 bit 23 */ - bool unusedBit_513_23 : 1; + bool unusedBit_512_23 : 1; /** offset 2116 bit 24 */ - bool unusedBit_513_24 : 1; + bool unusedBit_512_24 : 1; /** offset 2116 bit 25 */ - bool unusedBit_513_25 : 1; + bool unusedBit_512_25 : 1; /** offset 2116 bit 26 */ - bool unusedBit_513_26 : 1; + bool unusedBit_512_26 : 1; /** offset 2116 bit 27 */ - bool unusedBit_513_27 : 1; + bool unusedBit_512_27 : 1; /** offset 2116 bit 28 */ - bool unusedBit_513_28 : 1; + bool unusedBit_512_28 : 1; /** offset 2116 bit 29 */ - bool unusedBit_513_29 : 1; + bool unusedBit_512_29 : 1; /** offset 2116 bit 30 */ - bool unusedBit_513_30 : 1; + bool unusedBit_512_30 : 1; /** offset 2116 bit 31 */ - bool unusedBit_513_31 : 1; + bool unusedBit_512_31 : 1; /** * set can_mode X * offset 2120 @@ -4035,10 +4029,119 @@ struct engine_configuration_s { */ float triggerGapOverrideTo[GAP_TRACKING_LENGTH]; /** - units + lobes/cam * offset 4668 */ - int mainUnusedEnd[326]; + uint8_t hpfpCamLobes; + /** + * offset 4669 + */ + hpfp_cam_e hpfpCam; + /** + * Crank angle ATDC of first lobe peak + deg + * offset 4670 + */ + uint8_t hpfpPeakPos; + /** + * If the requested activation time is below this angle, don't bother running the pump + deg + * offset 4671 + */ + uint8_t hpfpMinAngle; + /** + * Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm. + cc + * offset 4672 + */ + scaled_channel hpfpPumpVolume; + /** + * How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own) + deg + * offset 4674 + */ + uint8_t hpfpActivationAngle; + /** + * offset 4675 + */ + uint8_t unusedFiller_4703; + /** + %/kPa + * offset 4676 + */ + scaled_channel hpfpPidP; + /** + %/kPa/lobe + * offset 4678 + */ + scaled_channel hpfpPidI; + /** + * The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel. + kPa/s + * offset 4680 + */ + uint16_t hpfpTargetDecay; + /** + % + * offset 4682 + */ + scaled_channel hpfpLobeProfileQuantityBins[HPFP_LOBE_PROFILE_SIZE]; + /** + deg + * offset 4698 + */ + scaled_channel hpfpLobeProfileAngle[HPFP_LOBE_PROFILE_SIZE]; + /** + volts + * offset 4714 + */ + uint8_t hpfpDeadtimeVoltsBins[HPFP_DEADTIME_SIZE]; + /** + ms + * offset 4722 + */ + scaled_channel hpfpDeadtimeMS[HPFP_DEADTIME_SIZE]; + /** + kPa + * offset 4738 + */ + uint16_t hpfpTarget[HPFP_TARGET_SIZE][HPFP_TARGET_SIZE]; + /** + load + * offset 4938 + */ + scaled_channel hpfpTargetLoadBins[HPFP_TARGET_SIZE]; + /** + RPM + * offset 4958 + */ + scaled_channel hpfpTargetRpmBins[HPFP_TARGET_SIZE]; + /** + % + * offset 4968 + */ + int8_t hpfpCompensation[HPFP_COMPENSATION_SIZE][HPFP_COMPENSATION_SIZE]; + /** + cc/lobe + * offset 5068 + */ + scaled_channel hpfpCompensationLoadBins[HPFP_COMPENSATION_SIZE]; + /** + RPM + * offset 5088 + */ + scaled_channel hpfpCompensationRpmBins[HPFP_COMPENSATION_SIZE]; + /** + * need 4 byte alignment + units + * offset 5098 + */ + uint8_t alignmentFill_at_5098[2]; + /** + units + * offset 5100 + */ + int mainUnusedEnd[218]; /** total size 5972*/ }; @@ -4448,4 +4551,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Nov 06 01:59:35 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Nov 06 03:27:00 UTC 2021 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 6b1547d983..d85be99861 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -85,6 +85,7 @@ #define alignEngineSnifferAtTDC_offset 744 #define alignmentFill_at_2247_offset 2247 #define alignmentFill_at_4511_offset 4511 +#define alignmentFill_at_5098_offset 5098 #define alternator_antiwindupFreq_offset 1764 #define alternator_derivativeFilterLoss_offset 1760 #define alternatorControl_dFactor_offset 1724 @@ -1249,6 +1250,36 @@ #define hip9011PrescalerAndSDO_offset 324 #define hip9011SpiDevice_offset 540 #define hipOutputChannel_offset 1468 +#define hpfp_cam_e_auto_enum "HPFP_CAM_NONE", "HPFP_CAM_IN1", "HPFP_CAM_EX1", "HPFP_CAM_IN2", "HPFP_CAM_EX2" +#define hpfp_cam_e_enum "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +#define hpfp_cam_e_HPFP_CAM_EX1 2 +#define hpfp_cam_e_HPFP_CAM_EX2 4 +#define hpfp_cam_e_HPFP_CAM_IN1 1 +#define hpfp_cam_e_HPFP_CAM_IN2 3 +#define hpfp_cam_e_HPFP_CAM_NONE 0 +#define HPFP_COMPENSATION_SIZE 10 +#define HPFP_DEADTIME_SIZE 8 +#define HPFP_LOBE_PROFILE_SIZE 16 +#define HPFP_TARGET_SIZE 10 +#define hpfpActivationAngle_offset 4674 +#define hpfpCam_offset 4669 +#define hpfpCamLobes_offset 4668 +#define hpfpCompensation_offset 4968 +#define hpfpCompensationLoadBins_offset 5068 +#define hpfpCompensationRpmBins_offset 5088 +#define hpfpDeadtimeMS_offset 4722 +#define hpfpDeadtimeVoltsBins_offset 4714 +#define hpfpLobeProfileAngle_offset 4698 +#define hpfpLobeProfileQuantityBins_offset 4682 +#define hpfpMinAngle_offset 4671 +#define hpfpPeakPos_offset 4670 +#define hpfpPidI_offset 4678 +#define hpfpPidP_offset 4676 +#define hpfpPumpVolume_offset 4672 +#define hpfpTarget_offset 4738 +#define hpfpTargetDecay_offset 4680 +#define hpfpTargetLoadBins_offset 4938 +#define hpfpTargetRpmBins_offset 4958 #define hpfpValvePin_offset 2130 #define hpfpValvePinMode_offset 2131 #define HW_MAX_ADC_INDEX 17 @@ -1561,7 +1592,7 @@ #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 706 #define mainRelayPinMode_offset 752 -#define mainUnusedEnd_offset 4668 +#define mainUnusedEnd_offset 5100 #define malfunctionIndicatorPin_offset 660 #define malfunctionIndicatorPinMode_offset 661 #define manIdlePosition_offset 608 @@ -1801,7 +1832,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 3310417462 +#define SIGNATURE_HASH 1027344865 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1945,8 +1976,6 @@ #define tcuSolenoidTable_offset 15108 #define tcuUpshiftButtonPin_offset 1818 #define tcuUpshiftButtonPinMode_offset 4486 -#define tempHpfpDuration_offset 726 -#define tempHpfpStart_offset 724 #define test557pin_offset 3073 #define thermistor_conf_s_size 28 #define ThermistorConf_size 32 @@ -2310,7 +2339,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.11.06.kin.3310417462" +#define TS_SIGNATURE "rusEFI 2021.11.06.kin.1027344865" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2371,33 +2400,33 @@ #define unusedAtOldBoardConfigurationEnd_offset 1340 #define unusedBit4_1476_offset 1476 #define unusedBit_251_29_offset 976 -#define unusedBit_302_30_offset 976 -#define unusedBit_302_31_offset 976 +#define unusedBit_301_30_offset 976 +#define unusedBit_301_31_offset 976 #define unusedBit_34_31_offset 76 -#define unusedBit_513_10_offset 2116 -#define unusedBit_513_11_offset 2116 -#define unusedBit_513_12_offset 2116 -#define unusedBit_513_13_offset 2116 -#define unusedBit_513_14_offset 2116 -#define unusedBit_513_15_offset 2116 -#define unusedBit_513_16_offset 2116 -#define unusedBit_513_17_offset 2116 -#define unusedBit_513_18_offset 2116 -#define unusedBit_513_19_offset 2116 -#define unusedBit_513_20_offset 2116 -#define unusedBit_513_21_offset 2116 -#define unusedBit_513_22_offset 2116 -#define unusedBit_513_23_offset 2116 -#define unusedBit_513_24_offset 2116 -#define unusedBit_513_25_offset 2116 -#define unusedBit_513_26_offset 2116 -#define unusedBit_513_27_offset 2116 -#define unusedBit_513_28_offset 2116 -#define unusedBit_513_29_offset 2116 -#define unusedBit_513_30_offset 2116 -#define unusedBit_513_31_offset 2116 -#define unusedBit_513_8_offset 2116 -#define unusedBit_513_9_offset 2116 +#define unusedBit_512_10_offset 2116 +#define unusedBit_512_11_offset 2116 +#define unusedBit_512_12_offset 2116 +#define unusedBit_512_13_offset 2116 +#define unusedBit_512_14_offset 2116 +#define unusedBit_512_15_offset 2116 +#define unusedBit_512_16_offset 2116 +#define unusedBit_512_17_offset 2116 +#define unusedBit_512_18_offset 2116 +#define unusedBit_512_19_offset 2116 +#define unusedBit_512_20_offset 2116 +#define unusedBit_512_21_offset 2116 +#define unusedBit_512_22_offset 2116 +#define unusedBit_512_23_offset 2116 +#define unusedBit_512_24_offset 2116 +#define unusedBit_512_25_offset 2116 +#define unusedBit_512_26_offset 2116 +#define unusedBit_512_27_offset 2116 +#define unusedBit_512_28_offset 2116 +#define unusedBit_512_29_offset 2116 +#define unusedBit_512_30_offset 2116 +#define unusedBit_512_31_offset 2116 +#define unusedBit_512_8_offset 2116 +#define unusedBit_512_9_offset 2116 #define unusedBitHere1_offset 1464 #define unusedBitHere2_offset 1464 #define unusedBitHere3_offset 1464 @@ -2413,6 +2442,8 @@ #define unusedEL2_offset 2064 #define unusedEL3_offset 2068 #define unusedEL4_offset 2072 +#define unusedExHpfp_offset 724 +#define unusedFiller_4703_offset 4675 #define unusedFsioInputs_offset 1522 #define unusedLuaWasHere_offset 16004 #define unusedOldBiquad_offset 2323 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 e019bb4e9b..9296e12a11 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:40 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:27:05 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1506,15 +1506,9 @@ struct engine_configuration_s { */ uint16_t idlePositionMax; /** - units * offset 724 */ - uint16_t tempHpfpStart; - /** - units - * offset 726 - */ - uint16_t tempHpfpDuration; + uint16_t unusedExHpfp[2]; /** * Secondary TTL channel baud rate BPs @@ -2061,10 +2055,10 @@ struct engine_configuration_s { bool unusedBit_251_29 : 1; /** offset 976 bit 30 */ - bool unusedBit_302_30 : 1; + bool unusedBit_301_30 : 1; /** offset 976 bit 31 */ - bool unusedBit_302_31 : 1; + bool unusedBit_301_31 : 1; /** * offset 980 */ @@ -3031,76 +3025,76 @@ struct engine_configuration_s { bool unused1130 : 1; /** offset 2116 bit 8 */ - bool unusedBit_513_8 : 1; + bool unusedBit_512_8 : 1; /** offset 2116 bit 9 */ - bool unusedBit_513_9 : 1; + bool unusedBit_512_9 : 1; /** offset 2116 bit 10 */ - bool unusedBit_513_10 : 1; + bool unusedBit_512_10 : 1; /** offset 2116 bit 11 */ - bool unusedBit_513_11 : 1; + bool unusedBit_512_11 : 1; /** offset 2116 bit 12 */ - bool unusedBit_513_12 : 1; + bool unusedBit_512_12 : 1; /** offset 2116 bit 13 */ - bool unusedBit_513_13 : 1; + bool unusedBit_512_13 : 1; /** offset 2116 bit 14 */ - bool unusedBit_513_14 : 1; + bool unusedBit_512_14 : 1; /** offset 2116 bit 15 */ - bool unusedBit_513_15 : 1; + bool unusedBit_512_15 : 1; /** offset 2116 bit 16 */ - bool unusedBit_513_16 : 1; + bool unusedBit_512_16 : 1; /** offset 2116 bit 17 */ - bool unusedBit_513_17 : 1; + bool unusedBit_512_17 : 1; /** offset 2116 bit 18 */ - bool unusedBit_513_18 : 1; + bool unusedBit_512_18 : 1; /** offset 2116 bit 19 */ - bool unusedBit_513_19 : 1; + bool unusedBit_512_19 : 1; /** offset 2116 bit 20 */ - bool unusedBit_513_20 : 1; + bool unusedBit_512_20 : 1; /** offset 2116 bit 21 */ - bool unusedBit_513_21 : 1; + bool unusedBit_512_21 : 1; /** offset 2116 bit 22 */ - bool unusedBit_513_22 : 1; + bool unusedBit_512_22 : 1; /** offset 2116 bit 23 */ - bool unusedBit_513_23 : 1; + bool unusedBit_512_23 : 1; /** offset 2116 bit 24 */ - bool unusedBit_513_24 : 1; + bool unusedBit_512_24 : 1; /** offset 2116 bit 25 */ - bool unusedBit_513_25 : 1; + bool unusedBit_512_25 : 1; /** offset 2116 bit 26 */ - bool unusedBit_513_26 : 1; + bool unusedBit_512_26 : 1; /** offset 2116 bit 27 */ - bool unusedBit_513_27 : 1; + bool unusedBit_512_27 : 1; /** offset 2116 bit 28 */ - bool unusedBit_513_28 : 1; + bool unusedBit_512_28 : 1; /** offset 2116 bit 29 */ - bool unusedBit_513_29 : 1; + bool unusedBit_512_29 : 1; /** offset 2116 bit 30 */ - bool unusedBit_513_30 : 1; + bool unusedBit_512_30 : 1; /** offset 2116 bit 31 */ - bool unusedBit_513_31 : 1; + bool unusedBit_512_31 : 1; /** * set can_mode X * offset 2120 @@ -4041,10 +4035,119 @@ struct engine_configuration_s { */ float triggerGapOverrideTo[GAP_TRACKING_LENGTH]; /** - units + lobes/cam * offset 4696 */ - int mainUnusedEnd[326]; + uint8_t hpfpCamLobes; + /** + * offset 4697 + */ + hpfp_cam_e hpfpCam; + /** + * Crank angle ATDC of first lobe peak + deg + * offset 4698 + */ + uint8_t hpfpPeakPos; + /** + * If the requested activation time is below this angle, don't bother running the pump + deg + * offset 4699 + */ + uint8_t hpfpMinAngle; + /** + * Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm. + cc + * offset 4700 + */ + scaled_channel hpfpPumpVolume; + /** + * How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own) + deg + * offset 4702 + */ + uint8_t hpfpActivationAngle; + /** + * offset 4703 + */ + uint8_t unusedFiller_4703; + /** + %/kPa + * offset 4704 + */ + scaled_channel hpfpPidP; + /** + %/kPa/lobe + * offset 4706 + */ + scaled_channel hpfpPidI; + /** + * The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel. + kPa/s + * offset 4708 + */ + uint16_t hpfpTargetDecay; + /** + % + * offset 4710 + */ + scaled_channel hpfpLobeProfileQuantityBins[HPFP_LOBE_PROFILE_SIZE]; + /** + deg + * offset 4726 + */ + scaled_channel hpfpLobeProfileAngle[HPFP_LOBE_PROFILE_SIZE]; + /** + volts + * offset 4742 + */ + uint8_t hpfpDeadtimeVoltsBins[HPFP_DEADTIME_SIZE]; + /** + ms + * offset 4750 + */ + scaled_channel hpfpDeadtimeMS[HPFP_DEADTIME_SIZE]; + /** + kPa + * offset 4766 + */ + uint16_t hpfpTarget[HPFP_TARGET_SIZE][HPFP_TARGET_SIZE]; + /** + load + * offset 4966 + */ + scaled_channel hpfpTargetLoadBins[HPFP_TARGET_SIZE]; + /** + RPM + * offset 4986 + */ + scaled_channel hpfpTargetRpmBins[HPFP_TARGET_SIZE]; + /** + % + * offset 4996 + */ + int8_t hpfpCompensation[HPFP_COMPENSATION_SIZE][HPFP_COMPENSATION_SIZE]; + /** + cc/lobe + * offset 5096 + */ + scaled_channel hpfpCompensationLoadBins[HPFP_COMPENSATION_SIZE]; + /** + RPM + * offset 5116 + */ + scaled_channel hpfpCompensationRpmBins[HPFP_COMPENSATION_SIZE]; + /** + * need 4 byte alignment + units + * offset 5126 + */ + uint8_t alignmentFill_at_5126[2]; + /** + units + * offset 5128 + */ + int mainUnusedEnd[218]; /** total size 6000*/ }; @@ -4454,4 +4557,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:40 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:27:05 UTC 2021 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index b64ac2218a..bb17a6cad4 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 @@ -94,6 +94,7 @@ #define alignmentFill_at_2227_offset 2227 #define alignmentFill_at_2253_offset 2253 #define alignmentFill_at_4539_offset 4539 +#define alignmentFill_at_5126_offset 5126 #define alternator_antiwindupFreq_offset 1764 #define alternator_derivativeFilterLoss_offset 1760 #define alternatorControl_dFactor_offset 1724 @@ -1276,6 +1277,36 @@ #define hip9011PrescalerAndSDO_offset 324 #define hip9011SpiDevice_offset 540 #define hipOutputChannel_offset 1468 +#define hpfp_cam_e_auto_enum "HPFP_CAM_NONE", "HPFP_CAM_IN1", "HPFP_CAM_EX1", "HPFP_CAM_IN2", "HPFP_CAM_EX2" +#define hpfp_cam_e_enum "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +#define hpfp_cam_e_HPFP_CAM_EX1 2 +#define hpfp_cam_e_HPFP_CAM_EX2 4 +#define hpfp_cam_e_HPFP_CAM_IN1 1 +#define hpfp_cam_e_HPFP_CAM_IN2 3 +#define hpfp_cam_e_HPFP_CAM_NONE 0 +#define HPFP_COMPENSATION_SIZE 10 +#define HPFP_DEADTIME_SIZE 8 +#define HPFP_LOBE_PROFILE_SIZE 16 +#define HPFP_TARGET_SIZE 10 +#define hpfpActivationAngle_offset 4702 +#define hpfpCam_offset 4697 +#define hpfpCamLobes_offset 4696 +#define hpfpCompensation_offset 4996 +#define hpfpCompensationLoadBins_offset 5096 +#define hpfpCompensationRpmBins_offset 5116 +#define hpfpDeadtimeMS_offset 4750 +#define hpfpDeadtimeVoltsBins_offset 4742 +#define hpfpLobeProfileAngle_offset 4726 +#define hpfpLobeProfileQuantityBins_offset 4710 +#define hpfpMinAngle_offset 4699 +#define hpfpPeakPos_offset 4698 +#define hpfpPidI_offset 4706 +#define hpfpPidP_offset 4704 +#define hpfpPumpVolume_offset 4700 +#define hpfpTarget_offset 4766 +#define hpfpTargetDecay_offset 4708 +#define hpfpTargetLoadBins_offset 4966 +#define hpfpTargetRpmBins_offset 4986 #define hpfpValvePin_offset 2130 #define hpfpValvePinMode_offset 2131 #define HW_MAX_ADC_INDEX 17 @@ -1588,7 +1619,7 @@ #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 706 #define mainRelayPinMode_offset 752 -#define mainUnusedEnd_offset 4696 +#define mainUnusedEnd_offset 5128 #define malfunctionIndicatorPin_offset 660 #define malfunctionIndicatorPinMode_offset 661 #define manIdlePosition_offset 608 @@ -1829,7 +1860,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 3976399481 +#define SIGNATURE_HASH 359658926 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1973,8 +2004,6 @@ #define tcuSolenoidTable_offset 15136 #define tcuUpshiftButtonPin_offset 1818 #define tcuUpshiftButtonPinMode_offset 4514 -#define tempHpfpDuration_offset 726 -#define tempHpfpStart_offset 724 #define test557pin_offset 3101 #define thermistor_conf_s_size 28 #define ThermistorConf_size 32 @@ -2338,7 +2367,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.11.06.subaru_eg33_f7.3976399481" +#define TS_SIGNATURE "rusEFI 2021.11.06.subaru_eg33_f7.359658926" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2399,33 +2428,33 @@ #define unusedAtOldBoardConfigurationEnd_offset 1340 #define unusedBit4_1476_offset 1476 #define unusedBit_251_29_offset 976 -#define unusedBit_302_30_offset 976 -#define unusedBit_302_31_offset 976 +#define unusedBit_301_30_offset 976 +#define unusedBit_301_31_offset 976 #define unusedBit_34_31_offset 76 -#define unusedBit_513_10_offset 2116 -#define unusedBit_513_11_offset 2116 -#define unusedBit_513_12_offset 2116 -#define unusedBit_513_13_offset 2116 -#define unusedBit_513_14_offset 2116 -#define unusedBit_513_15_offset 2116 -#define unusedBit_513_16_offset 2116 -#define unusedBit_513_17_offset 2116 -#define unusedBit_513_18_offset 2116 -#define unusedBit_513_19_offset 2116 -#define unusedBit_513_20_offset 2116 -#define unusedBit_513_21_offset 2116 -#define unusedBit_513_22_offset 2116 -#define unusedBit_513_23_offset 2116 -#define unusedBit_513_24_offset 2116 -#define unusedBit_513_25_offset 2116 -#define unusedBit_513_26_offset 2116 -#define unusedBit_513_27_offset 2116 -#define unusedBit_513_28_offset 2116 -#define unusedBit_513_29_offset 2116 -#define unusedBit_513_30_offset 2116 -#define unusedBit_513_31_offset 2116 -#define unusedBit_513_8_offset 2116 -#define unusedBit_513_9_offset 2116 +#define unusedBit_512_10_offset 2116 +#define unusedBit_512_11_offset 2116 +#define unusedBit_512_12_offset 2116 +#define unusedBit_512_13_offset 2116 +#define unusedBit_512_14_offset 2116 +#define unusedBit_512_15_offset 2116 +#define unusedBit_512_16_offset 2116 +#define unusedBit_512_17_offset 2116 +#define unusedBit_512_18_offset 2116 +#define unusedBit_512_19_offset 2116 +#define unusedBit_512_20_offset 2116 +#define unusedBit_512_21_offset 2116 +#define unusedBit_512_22_offset 2116 +#define unusedBit_512_23_offset 2116 +#define unusedBit_512_24_offset 2116 +#define unusedBit_512_25_offset 2116 +#define unusedBit_512_26_offset 2116 +#define unusedBit_512_27_offset 2116 +#define unusedBit_512_28_offset 2116 +#define unusedBit_512_29_offset 2116 +#define unusedBit_512_30_offset 2116 +#define unusedBit_512_31_offset 2116 +#define unusedBit_512_8_offset 2116 +#define unusedBit_512_9_offset 2116 #define unusedBitHere1_offset 1464 #define unusedBitHere2_offset 1464 #define unusedBitHere3_offset 1464 @@ -2441,6 +2470,8 @@ #define unusedEL2_offset 2064 #define unusedEL3_offset 2068 #define unusedEL4_offset 2072 +#define unusedExHpfp_offset 724 +#define unusedFiller_4703_offset 4703 #define unusedFsioInputs_offset 1522 #define unusedLuaWasHere_offset 16032 #define unusedOldBiquad_offset 2331 diff --git a/firmware/controllers/algo/auto_generated_commonenum.cpp b/firmware/controllers/algo/auto_generated_commonenum.cpp index 13bdbcc624..31958573fe 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 Fri Nov 05 19:39:49 UTC 2021 +// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat Nov 06 03:26:11 UTC 2021 // see also gen_config_and_enums.bat @@ -329,6 +329,21 @@ case GPPWM_LessThan: } return NULL; } +const char *getHpfp_cam_e(hpfp_cam_e value){ +switch(value) { +case HPFP_CAM_EX1: + return "HPFP_CAM_EX1"; +case HPFP_CAM_EX2: + return "HPFP_CAM_EX2"; +case HPFP_CAM_IN1: + return "HPFP_CAM_IN1"; +case HPFP_CAM_IN2: + return "HPFP_CAM_IN2"; +case HPFP_CAM_NONE: + return "HPFP_CAM_NONE"; + } + return NULL; +} const char *getIdle_mode_e(idle_mode_e value){ switch(value) { case Force_4_bytes_size_idle_mode: diff --git a/firmware/controllers/algo/auto_generated_commonenum.h b/firmware/controllers/algo/auto_generated_commonenum.h index 637164ea2b..7c8b1ae7c8 100644 --- a/firmware/controllers/algo/auto_generated_commonenum.h +++ b/firmware/controllers/algo/auto_generated_commonenum.h @@ -1,4 +1,4 @@ -// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sun Oct 24 19:26:38 UTC 2021 +// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat Nov 06 03:26:11 UTC 2021 // see also gen_config_and_enums.bat @@ -25,6 +25,7 @@ const char *getEtb_function_e(etb_function_e value); const char *getGear_e(gear_e value); const char *getGppwm_channel_e(gppwm_channel_e value); const char *getGppwm_compare_mode_e(gppwm_compare_mode_e value); +const char *getHpfp_cam_e(hpfp_cam_e value); const char *getIdle_mode_e(idle_mode_e value); const char *getIdle_state_e(idle_state_e value); const char *getIgnition_mode_e(ignition_mode_e value); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 31f86e22af..8846dc4603 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:33 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:58 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1506,15 +1506,9 @@ struct engine_configuration_s { */ uint16_t idlePositionMax; /** - units * offset 724 */ - uint16_t tempHpfpStart; - /** - units - * offset 726 - */ - uint16_t tempHpfpDuration; + uint16_t unusedExHpfp[2]; /** * Secondary TTL channel baud rate BPs @@ -2061,10 +2055,10 @@ struct engine_configuration_s { bool unusedBit_251_29 : 1; /** offset 976 bit 30 */ - bool unusedBit_302_30 : 1; + bool unusedBit_301_30 : 1; /** offset 976 bit 31 */ - bool unusedBit_302_31 : 1; + bool unusedBit_301_31 : 1; /** * offset 980 */ @@ -3031,76 +3025,76 @@ struct engine_configuration_s { bool unused1130 : 1; /** offset 2116 bit 8 */ - bool unusedBit_513_8 : 1; + bool unusedBit_512_8 : 1; /** offset 2116 bit 9 */ - bool unusedBit_513_9 : 1; + bool unusedBit_512_9 : 1; /** offset 2116 bit 10 */ - bool unusedBit_513_10 : 1; + bool unusedBit_512_10 : 1; /** offset 2116 bit 11 */ - bool unusedBit_513_11 : 1; + bool unusedBit_512_11 : 1; /** offset 2116 bit 12 */ - bool unusedBit_513_12 : 1; + bool unusedBit_512_12 : 1; /** offset 2116 bit 13 */ - bool unusedBit_513_13 : 1; + bool unusedBit_512_13 : 1; /** offset 2116 bit 14 */ - bool unusedBit_513_14 : 1; + bool unusedBit_512_14 : 1; /** offset 2116 bit 15 */ - bool unusedBit_513_15 : 1; + bool unusedBit_512_15 : 1; /** offset 2116 bit 16 */ - bool unusedBit_513_16 : 1; + bool unusedBit_512_16 : 1; /** offset 2116 bit 17 */ - bool unusedBit_513_17 : 1; + bool unusedBit_512_17 : 1; /** offset 2116 bit 18 */ - bool unusedBit_513_18 : 1; + bool unusedBit_512_18 : 1; /** offset 2116 bit 19 */ - bool unusedBit_513_19 : 1; + bool unusedBit_512_19 : 1; /** offset 2116 bit 20 */ - bool unusedBit_513_20 : 1; + bool unusedBit_512_20 : 1; /** offset 2116 bit 21 */ - bool unusedBit_513_21 : 1; + bool unusedBit_512_21 : 1; /** offset 2116 bit 22 */ - bool unusedBit_513_22 : 1; + bool unusedBit_512_22 : 1; /** offset 2116 bit 23 */ - bool unusedBit_513_23 : 1; + bool unusedBit_512_23 : 1; /** offset 2116 bit 24 */ - bool unusedBit_513_24 : 1; + bool unusedBit_512_24 : 1; /** offset 2116 bit 25 */ - bool unusedBit_513_25 : 1; + bool unusedBit_512_25 : 1; /** offset 2116 bit 26 */ - bool unusedBit_513_26 : 1; + bool unusedBit_512_26 : 1; /** offset 2116 bit 27 */ - bool unusedBit_513_27 : 1; + bool unusedBit_512_27 : 1; /** offset 2116 bit 28 */ - bool unusedBit_513_28 : 1; + bool unusedBit_512_28 : 1; /** offset 2116 bit 29 */ - bool unusedBit_513_29 : 1; + bool unusedBit_512_29 : 1; /** offset 2116 bit 30 */ - bool unusedBit_513_30 : 1; + bool unusedBit_512_30 : 1; /** offset 2116 bit 31 */ - bool unusedBit_513_31 : 1; + bool unusedBit_512_31 : 1; /** * set can_mode X * offset 2120 @@ -4041,10 +4035,119 @@ struct engine_configuration_s { */ float triggerGapOverrideTo[GAP_TRACKING_LENGTH]; /** - units + lobes/cam * offset 4696 */ - int mainUnusedEnd[326]; + uint8_t hpfpCamLobes; + /** + * offset 4697 + */ + hpfp_cam_e hpfpCam; + /** + * Crank angle ATDC of first lobe peak + deg + * offset 4698 + */ + uint8_t hpfpPeakPos; + /** + * If the requested activation time is below this angle, don't bother running the pump + deg + * offset 4699 + */ + uint8_t hpfpMinAngle; + /** + * Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm. + cc + * offset 4700 + */ + scaled_channel hpfpPumpVolume; + /** + * How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own) + deg + * offset 4702 + */ + uint8_t hpfpActivationAngle; + /** + * offset 4703 + */ + uint8_t unusedFiller_4703; + /** + %/kPa + * offset 4704 + */ + scaled_channel hpfpPidP; + /** + %/kPa/lobe + * offset 4706 + */ + scaled_channel hpfpPidI; + /** + * The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel. + kPa/s + * offset 4708 + */ + uint16_t hpfpTargetDecay; + /** + % + * offset 4710 + */ + scaled_channel hpfpLobeProfileQuantityBins[HPFP_LOBE_PROFILE_SIZE]; + /** + deg + * offset 4726 + */ + scaled_channel hpfpLobeProfileAngle[HPFP_LOBE_PROFILE_SIZE]; + /** + volts + * offset 4742 + */ + uint8_t hpfpDeadtimeVoltsBins[HPFP_DEADTIME_SIZE]; + /** + ms + * offset 4750 + */ + scaled_channel hpfpDeadtimeMS[HPFP_DEADTIME_SIZE]; + /** + kPa + * offset 4766 + */ + uint16_t hpfpTarget[HPFP_TARGET_SIZE][HPFP_TARGET_SIZE]; + /** + load + * offset 4966 + */ + scaled_channel hpfpTargetLoadBins[HPFP_TARGET_SIZE]; + /** + RPM + * offset 4986 + */ + scaled_channel hpfpTargetRpmBins[HPFP_TARGET_SIZE]; + /** + % + * offset 4996 + */ + int8_t hpfpCompensation[HPFP_COMPENSATION_SIZE][HPFP_COMPENSATION_SIZE]; + /** + cc/lobe + * offset 5096 + */ + scaled_channel hpfpCompensationLoadBins[HPFP_COMPENSATION_SIZE]; + /** + RPM + * offset 5116 + */ + scaled_channel hpfpCompensationRpmBins[HPFP_COMPENSATION_SIZE]; + /** + * need 4 byte alignment + units + * offset 5126 + */ + uint8_t alignmentFill_at_5126[2]; + /** + units + * offset 5128 + */ + int mainUnusedEnd[218]; /** total size 6000*/ }; @@ -4454,4 +4557,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:33 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:58 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 31faff404b..2bd491a0a7 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:33 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:58 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_ACIDLEEXTRAOFFSET = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 110c61a348..23e15b1800 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:33 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:58 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index ff0cf6b273..d66cd9e664 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:33 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:58 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair leacIdleExtraOffset(FSIO_SETTING_ACIDLEEXTRAOFFSET, "cfg_acIdleExtraOffset"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 8aabac8541..bd4ba446cf 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:33 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:58 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 80d02ba3dc..fc44dda6fb 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -86,6 +86,7 @@ #define alignmentFill_at_2227_offset 2227 #define alignmentFill_at_2253_offset 2253 #define alignmentFill_at_4539_offset 4539 +#define alignmentFill_at_5126_offset 5126 #define alternator_antiwindupFreq_offset 1764 #define alternator_derivativeFilterLoss_offset 1760 #define alternatorControl_dFactor_offset 1724 @@ -1264,6 +1265,36 @@ #define hip9011PrescalerAndSDO_offset 324 #define hip9011SpiDevice_offset 540 #define hipOutputChannel_offset 1468 +#define hpfp_cam_e_auto_enum "HPFP_CAM_NONE", "HPFP_CAM_IN1", "HPFP_CAM_EX1", "HPFP_CAM_IN2", "HPFP_CAM_EX2" +#define hpfp_cam_e_enum "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" +#define hpfp_cam_e_HPFP_CAM_EX1 2 +#define hpfp_cam_e_HPFP_CAM_EX2 4 +#define hpfp_cam_e_HPFP_CAM_IN1 1 +#define hpfp_cam_e_HPFP_CAM_IN2 3 +#define hpfp_cam_e_HPFP_CAM_NONE 0 +#define HPFP_COMPENSATION_SIZE 10 +#define HPFP_DEADTIME_SIZE 8 +#define HPFP_LOBE_PROFILE_SIZE 16 +#define HPFP_TARGET_SIZE 10 +#define hpfpActivationAngle_offset 4702 +#define hpfpCam_offset 4697 +#define hpfpCamLobes_offset 4696 +#define hpfpCompensation_offset 4996 +#define hpfpCompensationLoadBins_offset 5096 +#define hpfpCompensationRpmBins_offset 5116 +#define hpfpDeadtimeMS_offset 4750 +#define hpfpDeadtimeVoltsBins_offset 4742 +#define hpfpLobeProfileAngle_offset 4726 +#define hpfpLobeProfileQuantityBins_offset 4710 +#define hpfpMinAngle_offset 4699 +#define hpfpPeakPos_offset 4698 +#define hpfpPidI_offset 4706 +#define hpfpPidP_offset 4704 +#define hpfpPumpVolume_offset 4700 +#define hpfpTarget_offset 4766 +#define hpfpTargetDecay_offset 4708 +#define hpfpTargetLoadBins_offset 4966 +#define hpfpTargetRpmBins_offset 4986 #define hpfpValvePin_offset 2130 #define hpfpValvePinMode_offset 2131 #define HW_MAX_ADC_INDEX 17 @@ -1576,7 +1607,7 @@ #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 706 #define mainRelayPinMode_offset 752 -#define mainUnusedEnd_offset 4696 +#define mainUnusedEnd_offset 5128 #define malfunctionIndicatorPin_offset 660 #define malfunctionIndicatorPinMode_offset 661 #define manIdlePosition_offset 608 @@ -1816,7 +1847,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 1998226013 +#define SIGNATURE_HASH 2406907274 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1960,8 +1991,6 @@ #define tcuSolenoidTable_offset 15136 #define tcuUpshiftButtonPin_offset 1818 #define tcuUpshiftButtonPinMode_offset 4514 -#define tempHpfpDuration_offset 726 -#define tempHpfpStart_offset 724 #define test557pin_offset 3101 #define thermistor_conf_s_size 28 #define ThermistorConf_size 32 @@ -2325,7 +2354,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.11.06.all.1998226013" +#define TS_SIGNATURE "rusEFI 2021.11.06.all.2406907274" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2386,33 +2415,33 @@ #define unusedAtOldBoardConfigurationEnd_offset 1340 #define unusedBit4_1476_offset 1476 #define unusedBit_251_29_offset 976 -#define unusedBit_302_30_offset 976 -#define unusedBit_302_31_offset 976 +#define unusedBit_301_30_offset 976 +#define unusedBit_301_31_offset 976 #define unusedBit_34_31_offset 76 -#define unusedBit_513_10_offset 2116 -#define unusedBit_513_11_offset 2116 -#define unusedBit_513_12_offset 2116 -#define unusedBit_513_13_offset 2116 -#define unusedBit_513_14_offset 2116 -#define unusedBit_513_15_offset 2116 -#define unusedBit_513_16_offset 2116 -#define unusedBit_513_17_offset 2116 -#define unusedBit_513_18_offset 2116 -#define unusedBit_513_19_offset 2116 -#define unusedBit_513_20_offset 2116 -#define unusedBit_513_21_offset 2116 -#define unusedBit_513_22_offset 2116 -#define unusedBit_513_23_offset 2116 -#define unusedBit_513_24_offset 2116 -#define unusedBit_513_25_offset 2116 -#define unusedBit_513_26_offset 2116 -#define unusedBit_513_27_offset 2116 -#define unusedBit_513_28_offset 2116 -#define unusedBit_513_29_offset 2116 -#define unusedBit_513_30_offset 2116 -#define unusedBit_513_31_offset 2116 -#define unusedBit_513_8_offset 2116 -#define unusedBit_513_9_offset 2116 +#define unusedBit_512_10_offset 2116 +#define unusedBit_512_11_offset 2116 +#define unusedBit_512_12_offset 2116 +#define unusedBit_512_13_offset 2116 +#define unusedBit_512_14_offset 2116 +#define unusedBit_512_15_offset 2116 +#define unusedBit_512_16_offset 2116 +#define unusedBit_512_17_offset 2116 +#define unusedBit_512_18_offset 2116 +#define unusedBit_512_19_offset 2116 +#define unusedBit_512_20_offset 2116 +#define unusedBit_512_21_offset 2116 +#define unusedBit_512_22_offset 2116 +#define unusedBit_512_23_offset 2116 +#define unusedBit_512_24_offset 2116 +#define unusedBit_512_25_offset 2116 +#define unusedBit_512_26_offset 2116 +#define unusedBit_512_27_offset 2116 +#define unusedBit_512_28_offset 2116 +#define unusedBit_512_29_offset 2116 +#define unusedBit_512_30_offset 2116 +#define unusedBit_512_31_offset 2116 +#define unusedBit_512_8_offset 2116 +#define unusedBit_512_9_offset 2116 #define unusedBitHere1_offset 1464 #define unusedBitHere2_offset 1464 #define unusedBitHere3_offset 1464 @@ -2428,6 +2457,8 @@ #define unusedEL2_offset 2064 #define unusedEL3_offset 2068 #define unusedEL4_offset 2072 +#define unusedExHpfp_offset 724 +#define unusedFiller_4703_offset 4703 #define unusedFsioInputs_offset 1522 #define unusedLuaWasHere_offset 16032 #define unusedOldBiquad_offset 2331 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 0c6f42a777..89c65cbded 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 1998226013 -#define TS_SIGNATURE "rusEFI 2021.11.06.all.1998226013" +#define SIGNATURE_HASH 2406907274 +#define TS_SIGNATURE "rusEFI 2021.11.06.all.2406907274" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index d1e91a86cf..c88dc67ca5 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD atlas #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 1808824186 -#define TS_SIGNATURE "rusEFI 2021.11.06.atlas.1808824186" +#define SIGNATURE_HASH 2478606509 +#define TS_SIGNATURE "rusEFI 2021.11.06.atlas.2478606509" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index d0a34877e0..27db3fc18e 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD f429-discovery #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 1998226013 -#define TS_SIGNATURE "rusEFI 2021.11.06.f429-discovery.1998226013" +#define SIGNATURE_HASH 2406907274 +#define TS_SIGNATURE "rusEFI 2021.11.06.f429-discovery.2406907274" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index cfb0b13ca3..35c7ccf3f0 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 220780468 -#define TS_SIGNATURE "rusEFI 2021.11.06.frankenso_na6.220780468" +#define SIGNATURE_HASH 4114884707 +#define TS_SIGNATURE "rusEFI 2021.11.06.frankenso_na6.4114884707" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 89c89f7421..8ee7507aee 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen-nb1 #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 280822900 -#define TS_SIGNATURE "rusEFI 2021.11.06.hellen-nb1.280822900" +#define SIGNATURE_HASH 3906075555 +#define TS_SIGNATURE "rusEFI 2021.11.06.hellen-nb1.3906075555" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 43d22cb8db..28a916d9de 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121nissan #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 4243315231 -#define TS_SIGNATURE "rusEFI 2021.11.06.hellen121nissan.4243315231" +#define SIGNATURE_HASH 75965896 +#define TS_SIGNATURE "rusEFI 2021.11.06.hellen121nissan.75965896" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 74476c711a..02bbc94408 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121vag #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 620126747 -#define TS_SIGNATURE "rusEFI 2021.11.06.hellen121vag.620126747" +#define SIGNATURE_HASH 3701120460 +#define TS_SIGNATURE "rusEFI 2021.11.06.hellen121vag.3701120460" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index cee65f1662..86dda0b254 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen128 #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 2702875277 -#define TS_SIGNATURE "rusEFI 2021.11.06.hellen128.2702875277" +#define SIGNATURE_HASH 1500931418 +#define TS_SIGNATURE "rusEFI 2021.11.06.hellen128.1500931418" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index aea2cc23da..da68b91ab3 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen154hyundai #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 862266471 -#define TS_SIGNATURE "rusEFI 2021.11.06.hellen154hyundai.862266471" +#define SIGNATURE_HASH 3406420912 +#define TS_SIGNATURE "rusEFI 2021.11.06.hellen154hyundai.3406420912" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 05779d1ffa..bf4e4e609e 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen72 #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 294642298 -#define TS_SIGNATURE "rusEFI 2021.11.06.hellen72.294642298" +#define SIGNATURE_HASH 3923975597 +#define TS_SIGNATURE "rusEFI 2021.11.06.hellen72.3923975597" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 1c2d7978e6..606d66f7f3 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen88bmw #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 2174385840 -#define TS_SIGNATURE "rusEFI 2021.11.06.hellen88bmw.2174385840" +#define SIGNATURE_HASH 2046198119 +#define TS_SIGNATURE "rusEFI 2021.11.06.hellen88bmw.2046198119" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 98a3a1fbe6..c3cecd5b9f 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellenNA6 #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 3326249811 -#define TS_SIGNATURE "rusEFI 2021.11.06.hellenNA6.3326249811" +#define SIGNATURE_HASH 1043231876 +#define TS_SIGNATURE "rusEFI 2021.11.06.hellenNA6.1043231876" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 732917ba2f..8546f4390c 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 989149898 -#define TS_SIGNATURE "rusEFI 2021.11.06.hellen_cypress.989149898" +#define SIGNATURE_HASH 3264857373 +#define TS_SIGNATURE "rusEFI 2021.11.06.hellen_cypress.3264857373" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index dd4217362d..463f5d9138 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 3310417462 -#define TS_SIGNATURE "rusEFI 2021.11.06.kin.3310417462" +#define SIGNATURE_HASH 1027344865 +#define TS_SIGNATURE "rusEFI 2021.11.06.kin.1027344865" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 5e72db972d..4bf961710d 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 4287272393 -#define TS_SIGNATURE "rusEFI 2021.11.06.mre_f4.4287272393" +#define SIGNATURE_HASH 132540958 +#define TS_SIGNATURE "rusEFI 2021.11.06.mre_f4.132540958" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 000e42f9a8..9a59f62037 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 4287272393 -#define TS_SIGNATURE "rusEFI 2021.11.06.mre_f7.4287272393" +#define SIGNATURE_HASH 132540958 +#define TS_SIGNATURE "rusEFI 2021.11.06.mre_f7.132540958" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 48a3fa522a..442c7fc348 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 670063547 -#define TS_SIGNATURE "rusEFI 2021.11.06.prometheus_405.670063547" +#define SIGNATURE_HASH 3751584876 +#define TS_SIGNATURE "rusEFI 2021.11.06.prometheus_405.3751584876" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 7347251192..5d874e3cf6 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 670063547 -#define TS_SIGNATURE "rusEFI 2021.11.06.prometheus_469.670063547" +#define SIGNATURE_HASH 3751584876 +#define TS_SIGNATURE "rusEFI 2021.11.06.prometheus_469.3751584876" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 7254b39650..42e6372c6f 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 3925789313 -#define TS_SIGNATURE "rusEFI 2021.11.06.proteus_f4.3925789313" +#define SIGNATURE_HASH 294794582 +#define TS_SIGNATURE "rusEFI 2021.11.06.proteus_f4.294794582" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 53c9baaf04..d1195e1eb3 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 3925789313 -#define TS_SIGNATURE "rusEFI 2021.11.06.proteus_f7.3925789313" +#define SIGNATURE_HASH 294794582 +#define TS_SIGNATURE "rusEFI 2021.11.06.proteus_f7.294794582" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index ff77cb7ba4..db3517356f 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.11.06 -#define SIGNATURE_HASH 3976399481 -#define TS_SIGNATURE "rusEFI 2021.11.06.subaru_eg33_f7.3976399481" +#define SIGNATURE_HASH 359658926 +#define TS_SIGNATURE "rusEFI 2021.11.06.subaru_eg33_f7.359658926" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index ede4220bf4..7687527140 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index ab4ba7c25d..1e1279bf58 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.all.1998226013" + signature = "rusEFI 2021.11.06.all.2406907274" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.all.1998226013" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.all.2406907274" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:33 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:58 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3408,9 +3459,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4071,10 +4127,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5607,6 +5659,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5614,5 +5683,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index b32ba93ee0..843b9386ed 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.atlas.1808824186" + signature = "rusEFI 2021.11.06.atlas.2478606509" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.atlas.1808824186" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.atlas.2478606509" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:30 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:55 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3408,9 +3459,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4071,10 +4127,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5598,6 +5650,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5605,5 +5674,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 66b7fe985c..a90acd2aa2 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.f429-discovery.1998226013" + signature = "rusEFI 2021.11.06.f429-discovery.2406907274" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.f429-discovery.1998226013" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.f429-discovery.2406907274" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:58:43 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:14 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3408,9 +3459,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4071,10 +4127,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5607,6 +5659,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5614,5 +5683,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index df345fcfff..20d3054b34 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.frankenso_na6.220780468" + signature = "rusEFI 2021.11.06.frankenso_na6.4114884707" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.frankenso_na6.220780468" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.frankenso_na6.4114884707" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:16 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:42 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3408,9 +3459,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4071,10 +4127,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5607,6 +5659,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5614,5 +5683,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 435dad77f8..279c0cf866 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.hellen-nb1.280822900" + signature = "rusEFI 2021.11.06.hellen-nb1.3906075555" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.hellen-nb1.280822900" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.hellen-nb1.3906075555" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:32 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3404,9 +3455,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4067,10 +4123,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5570,6 +5622,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5577,5 +5646,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index ff0080a106..35319704b5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.hellen121nissan.4243315231" + signature = "rusEFI 2021.11.06.hellen121nissan.75965896" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.hellen121nissan.4243315231" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.hellen121nissan.75965896" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:58:53 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:21 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3404,9 +3455,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4067,10 +4123,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5572,6 +5624,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5579,5 +5648,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index fe9c9e6d4c..0086cc57ec 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.hellen121vag.620126747" + signature = "rusEFI 2021.11.06.hellen121vag.3701120460" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.hellen121vag.620126747" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.hellen121vag.3701120460" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:58:50 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:19 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3404,9 +3455,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4067,10 +4123,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5574,6 +5626,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5581,5 +5650,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 6d1affc20b..b116beabc1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.hellen128.2702875277" + signature = "rusEFI 2021.11.06.hellen128.1500931418" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.hellen128.2702875277" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.hellen128.1500931418" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:58:47 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:16 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3404,9 +3455,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4067,10 +4123,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5572,6 +5624,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5579,5 +5648,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index ba1f396cac..75b7fa0e98 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.hellen154hyundai.862266471" + signature = "rusEFI 2021.11.06.hellen154hyundai.3406420912" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.hellen154hyundai.862266471" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.hellen154hyundai.3406420912" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:58:56 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:24 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3404,9 +3455,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4067,10 +4123,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5571,6 +5623,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5578,5 +5647,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 50657869e9..7d51c66cdf 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.hellen72.294642298" + signature = "rusEFI 2021.11.06.hellen72.3923975597" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.hellen72.294642298" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.hellen72.3923975597" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:01 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:29 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3404,9 +3455,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4067,10 +4123,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5570,6 +5622,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5577,5 +5646,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 63cc4f05be..45f1c2f6a5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.hellen88bmw.2174385840" + signature = "rusEFI 2021.11.06.hellen88bmw.2046198119" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.hellen88bmw.2174385840" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.hellen88bmw.2046198119" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:58:58 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:26 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3404,9 +3455,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4067,10 +4123,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5569,6 +5621,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5576,5 +5645,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 60ec18b1e6..62ec4851d6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.hellenNA6.3326249811" + signature = "rusEFI 2021.11.06.hellenNA6.1043231876" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.hellenNA6.3326249811" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.hellenNA6.1043231876" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:07 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:34 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3404,9 +3455,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4067,10 +4123,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5571,6 +5623,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5578,5 +5647,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 78edca3a3b..2afb0ca941 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.hellen_cypress.989149898" + signature = "rusEFI 2021.11.06.hellen_cypress.3264857373" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.hellen_cypress.989149898" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.hellen_cypress.3264857373" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Nov 06 01:59:38 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Nov 06 03:27:02 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3408,9 +3459,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4071,10 +4127,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5607,6 +5659,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5614,5 +5683,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 77ef060769..e8b278ea48 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.kin.3310417462" + signature = "rusEFI 2021.11.06.kin.1027344865" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.kin.3310417462" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.kin.1027344865" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Nov 06 01:59:35 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Nov 06 03:27:00 UTC 2021 pageSize = 19972 page = 1 @@ -358,8 +358,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -534,8 +533,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -833,30 +832,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1247,7 +1246,28 @@ triggerGapOverrideTo15 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4668, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4668, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4669, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4670, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4671, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4672, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4674, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4675, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4676, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4678, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4680, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4682, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4698, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4714, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4722, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4738, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4938, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4958, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4968, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5068, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5088, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5098 = array, U08, 5098, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5100, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 5972, 120 afterstartCoolantBins = array, F32, 6092, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6124, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1771,6 +1791,12 @@ fsioTable4RpmBins = array, F32, 19940, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4511 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5098 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2554,6 +2580,20 @@ fsioTable4RpmBins = array, F32, 19940, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2718,6 +2758,17 @@ fsioTable4RpmBins = array, F32, 19940, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3374,9 +3425,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4038,10 +4094,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5574,6 +5626,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5581,5 +5650,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 0ba68e9ed6..1f9ef11f21 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.mre_f4.4287272393" + signature = "rusEFI 2021.11.06.mre_f4.132540958" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.mre_f4.4287272393" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.mre_f4.132540958" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:13 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:39 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3404,9 +3455,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4067,10 +4123,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5577,6 +5629,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5584,5 +5653,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 591cea4e89..907264bcc0 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.mre_f7.4287272393" + signature = "rusEFI 2021.11.06.mre_f7.132540958" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.mre_f7.4287272393" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.mre_f7.132540958" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:10 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:36 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3404,9 +3455,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4067,10 +4123,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5577,6 +5629,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5584,5 +5653,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index b69a4aade9..fe8377b27b 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.prometheus_405.670063547" + signature = "rusEFI 2021.11.06.prometheus_405.3751584876" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.prometheus_405.670063547" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.prometheus_405.3751584876" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:22 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:47 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3404,9 +3455,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4066,10 +4122,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5602,6 +5654,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5609,5 +5678,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 85211868d2..9ba0f222dc 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.prometheus_469.670063547" + signature = "rusEFI 2021.11.06.prometheus_469.3751584876" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.prometheus_469.670063547" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.prometheus_469.3751584876" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:19 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:44 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3404,9 +3455,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4066,10 +4122,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5602,6 +5654,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5609,5 +5678,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 0228298385..04febb59ba 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.proteus_f4.3925789313" + signature = "rusEFI 2021.11.06.proteus_f4.294794582" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.proteus_f4.3925789313" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.proteus_f4.294794582" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:28 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:52 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3400,9 +3451,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4064,10 +4120,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5559,6 +5611,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5566,5 +5635,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index be8810e1c6..51f5071894 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.proteus_f7.3925789313" + signature = "rusEFI 2021.11.06.proteus_f7.294794582" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.proteus_f7.3925789313" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.proteus_f7.294794582" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:25 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:50 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3400,9 +3451,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4064,10 +4120,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5559,6 +5611,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5566,5 +5635,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 04c56127cc..99de869dc1 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.06.subaru_eg33_f7.3976399481" + signature = "rusEFI 2021.11.06.subaru_eg33_f7.359658926" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.06.subaru_eg33_f7.3976399481" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.06.subaru_eg33_f7.359658926" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Nov 06 01:59:40 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:27:05 UTC 2021 pageSize = 20000 page = 1 @@ -361,8 +361,7 @@ wastegatePositionMin = scalar, U16, 716, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 718, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 720, "mv", 1, 0, 0, 5000, 0 idlePositionMax = scalar, U16, 722, "mv", 1, 0, 0, 5000, 0 -tempHpfpStart = scalar, U16, 724, "units", 1, 0, -20, 100, 0 -tempHpfpDuration = scalar, U16, 726, "units", 1, 0, -20, 100, 0 +unusedExHpfp = array, U16, 724, [2], "", 1, 0, -20, 100, 0 tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -537,8 +536,8 @@ knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" -unusedBit_302_30 = bits, U32, 976, [30:30], "false", "true" -unusedBit_302_31 = bits, U32, 976, [31:31], "false", "true" +unusedBit_301_30 = bits, U32, 976, [30:30], "false", "true" +unusedBit_301_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -842,30 +841,30 @@ unused1127 = bits, U32, 2116, [4:4], "false", "true" unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" -unusedBit_513_8 = bits, U32, 2116, [8:8], "false", "true" -unusedBit_513_9 = bits, U32, 2116, [9:9], "false", "true" -unusedBit_513_10 = bits, U32, 2116, [10:10], "false", "true" -unusedBit_513_11 = bits, U32, 2116, [11:11], "false", "true" -unusedBit_513_12 = bits, U32, 2116, [12:12], "false", "true" -unusedBit_513_13 = bits, U32, 2116, [13:13], "false", "true" -unusedBit_513_14 = bits, U32, 2116, [14:14], "false", "true" -unusedBit_513_15 = bits, U32, 2116, [15:15], "false", "true" -unusedBit_513_16 = bits, U32, 2116, [16:16], "false", "true" -unusedBit_513_17 = bits, U32, 2116, [17:17], "false", "true" -unusedBit_513_18 = bits, U32, 2116, [18:18], "false", "true" -unusedBit_513_19 = bits, U32, 2116, [19:19], "false", "true" -unusedBit_513_20 = bits, U32, 2116, [20:20], "false", "true" -unusedBit_513_21 = bits, U32, 2116, [21:21], "false", "true" -unusedBit_513_22 = bits, U32, 2116, [22:22], "false", "true" -unusedBit_513_23 = bits, U32, 2116, [23:23], "false", "true" -unusedBit_513_24 = bits, U32, 2116, [24:24], "false", "true" -unusedBit_513_25 = bits, U32, 2116, [25:25], "false", "true" -unusedBit_513_26 = bits, U32, 2116, [26:26], "false", "true" -unusedBit_513_27 = bits, U32, 2116, [27:27], "false", "true" -unusedBit_513_28 = bits, U32, 2116, [28:28], "false", "true" -unusedBit_513_29 = bits, U32, 2116, [29:29], "false", "true" -unusedBit_513_30 = bits, U32, 2116, [30:30], "false", "true" -unusedBit_513_31 = bits, U32, 2116, [31:31], "false", "true" +unusedBit_512_8 = bits, U32, 2116, [8:8], "false", "true" +unusedBit_512_9 = bits, U32, 2116, [9:9], "false", "true" +unusedBit_512_10 = bits, U32, 2116, [10:10], "false", "true" +unusedBit_512_11 = bits, U32, 2116, [11:11], "false", "true" +unusedBit_512_12 = bits, U32, 2116, [12:12], "false", "true" +unusedBit_512_13 = bits, U32, 2116, [13:13], "false", "true" +unusedBit_512_14 = bits, U32, 2116, [14:14], "false", "true" +unusedBit_512_15 = bits, U32, 2116, [15:15], "false", "true" +unusedBit_512_16 = bits, U32, 2116, [16:16], "false", "true" +unusedBit_512_17 = bits, U32, 2116, [17:17], "false", "true" +unusedBit_512_18 = bits, U32, 2116, [18:18], "false", "true" +unusedBit_512_19 = bits, U32, 2116, [19:19], "false", "true" +unusedBit_512_20 = bits, U32, 2116, [20:20], "false", "true" +unusedBit_512_21 = bits, U32, 2116, [21:21], "false", "true" +unusedBit_512_22 = bits, U32, 2116, [22:22], "false", "true" +unusedBit_512_23 = bits, U32, 2116, [23:23], "false", "true" +unusedBit_512_24 = bits, U32, 2116, [24:24], "false", "true" +unusedBit_512_25 = bits, U32, 2116, [25:25], "false", "true" +unusedBit_512_26 = bits, U32, 2116, [26:26], "false", "true" +unusedBit_512_27 = bits, U32, 2116, [27:27], "false", "true" +unusedBit_512_28 = bits, U32, 2116, [28:28], "false", "true" +unusedBit_512_29 = bits, U32, 2116, [29:29], "false", "true" +unusedBit_512_30 = bits, U32, 2116, [30:30], "false", "true" +unusedBit_512_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ35", "Genesis Coupe", "Honda K", "type 12", "type 13", "type 14", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1269,7 +1268,28 @@ triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 -mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 +hpfpCamLobes = scalar, U08, 4696, "lobes/cam", 1, 0, 1, 255, 0 +hpfpCam = bits, U08, 4697, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID" +hpfpPeakPos = scalar, U08, 4698, "deg", 1, 0, 0, 255, 0 +hpfpMinAngle = scalar, U08, 4699, "deg", 1, 0, 0, 255, 0 +hpfpPumpVolume = scalar, U16, 4700, "cc", 0.001, 0, 0, 65, 3 +hpfpActivationAngle = scalar, U08, 4702, "deg", 1, 0, 0, 255, 0 +unusedFiller_4703 = scalar, U08, 4703, "", 1, 0, 0, 255, 0 +hpfpPidP = scalar, U16, 4704, "%/kPa", 0.001, 0, 0, 65, 3 +hpfpPidI = scalar, U16, 4706, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 +hpfpTargetDecay = scalar, U16, 4708, "kPa/s", 1, 0, 0, 65000, 0 +hpfpLobeProfileQuantityBins = array, U08, 4710, [16], "%", 0.5, 0, 0, 100, 1 +hpfpLobeProfileAngle = array, U08, 4726, [16], "deg", 0.5, 0, 0, 125, 1 +hpfpDeadtimeVoltsBins = array, U08, 4742, [8], "volts", 1, 0, 0, 255, 0 +hpfpDeadtimeMS = array, U16, 4750, [8], "ms", 0.001, 0, 0, 65, 0 +hpfpTarget = array, U16, 4766, [10x10], "kPa", 1, 0, 0, 65000, 0 +hpfpTargetLoadBins = array, U16, 4966, [10], "load", 0.1, 0, 0, 6500, 1 +hpfpTargetRpmBins = array, U08, 4986, [10], "RPM", 50.0, 0, 0, 12500, 0 +hpfpCompensation = array, S08, 4996, [10x10], "%", 1, 0, -100, 100, 0 +hpfpCompensationLoadBins = array, U16, 5096, [10], "cc/lobe", 0.001, 0, 0, 65, 3 +hpfpCompensationRpmBins = array, U08, 5116, [10], "RPM", 50.0, 0, 0, 12500, 0 +alignmentFill_at_5126 = array, U08, 5126, [2], "units", 1, 0, -20, 100, 0 +mainUnusedEnd = array, S32, 5128, [218], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -1805,6 +1825,12 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." alignmentFill_at_4539 = "need 4 byte alignment" + hpfpPeakPos = "Crank angle ATDC of first lobe peak" + hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" + hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm." + hpfpActivationAngle = "How long to keep the valve activated (in order to allow the pump to build pressure and keep the valve open on its own)" + hpfpTargetDecay = "The fastest rate the target pressure can be reduced by. This is because HPFP have no way to bleed off pressure other than injecting fuel." + alignmentFill_at_5126 = "need 4 byte alignment" cltCrankingCorrBins = "CLT-based cranking position multiplier for simple manual idle controller" cltCrankingCorr = "CLT-based cranking position multiplier for simple manual idle controller" idleAdvanceBins = "Optional timing advance table for Idle (see useSeparateAdvanceForIdle)" @@ -2588,6 +2614,20 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" + curve = hpfpLobeProfileCurve, "HPFP Lobe Profile" + columnLabel = "% pump volume", "angle" + xAxis = 0, 100, 11 + yAxis = 0, 240, 13 + xBins = hpfpLobeProfileQuantityBins + yBins = hpfpLobeProfileAngle + + curve = hpfpDeadtimeCurve, "HPFP Valve Deadtime" + columnLabel = "volts", "ms" + xAxis = 5, 15, 11 + yAxis = 0, 5, 6 + xBins = hpfpDeadtimeVoltsBins + yBins = hpfpDeadtimeMS + [TableEditor] ; table_id, map3d_id, "title", page @@ -2752,6 +2792,17 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = tcuSolenoidTable xyLabels = "Solenoid", "Gear" + table = hpfpTargetTable, hpfpTargetTableId, "HPFP Target Fuel Pressure", 1 + xBins = hpfpTargetRpmBins, RPMValue + yBins = hpfpTargetLoadBins, veTableYAxis + zBins = hpfpTarget + + table = hpfpCompensationTable, hpfpCompensationTableId, "HPFP Pump Compensation Factor", 1 + xBins = hpfpCompensationRpmBins, RPMValue + yBins = hpfpCompensationLoadBins, fuelRunning + zBins = hpfpCompensation + + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -3404,9 +3455,14 @@ menuDialog = main # EXPERIMENTAL FEATURES + submenu = mc33Dialog, "GDI Dreams" + subMenu = hpfpCamDialog, "HPFP Cam Configuration" + subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} + subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} + subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + subMenu = std_separator subMenu = parkingLot, "Experimental/Broken" subMenu = rotaryDialog, "Rotary" - subMenu = mc33Dialog, "GDI Dreams" subMenu = vrThreshold, "VR Sensor Threshold" subMenu = std_separator @@ -4067,10 +4123,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 field = "MC33816 SPI Device", mc33972spiDevice - field = "HPFP Valve Pin", hpfpValvePin - field = "HPFP Valve Pin Mode", hpfpValvePinMode - field = tempHpfpStart, tempHpfpStart - field = tempHpfpDuration, tempHpfpDuration field = "Boost voltage", mc33_hvolt @@ -5593,6 +5645,23 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = gppwm4left panel = gppwm4Tbl, {gppwm4_pin != 0} + dialog = hpfpCamDialog, "HPFP Cam Configuration" + field = "Number of lobes", hpfpCamLobes + field = "If using VVT, which cam the pump is driven from", hpfpCam, {hpfpCamLobes != 0} + field = "Angle of first lobe", hpfpPeakPos, {hpfpCamLobes != 0} + panel = hpfpLobeProfileCurve, {hpfpCamLobes != 0} + + dialog = hpfpPumpDialog, "HPFP Pump Configuration" + field = "Valve Pin", hpfpValvePin, {hpfpCamLobes != 0} + field = "Valve Pin Mode", hpfpValvePinMode, {hpfpCamLobes != 0} + field = "Pump volume", hpfpPumpVolume, {hpfpCamLobes != 0} + field = "Minimum angle", hpfpMinAngle, {hpfpCamLobes != 0} + field = "Activation angle", hpfpActivationAngle, {hpfpCamLobes != 0} + field = "Target decay rate", hpfpTargetDecay, {hpfpCamLobes != 0} + field = "Proportional gain", hpfpPidP, {hpfpCamLobes != 0} + field = "Integral gain", hpfpPidI, {hpfpCamLobes != 0} + panel = hpfpDeadtimeCurve, {hpfpCamLobes != 0} + [Tools] ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl @@ -5600,5 +5669,3 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - - 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 5cce09779c..9f61384fa7 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 Sat Nov 06 01:59:33 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 06 03:26:58 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -82,6 +82,7 @@ public class Fields { public static final int alignmentFill_at_2227_offset = 2227; public static final int alignmentFill_at_2253_offset = 2253; public static final int alignmentFill_at_4539_offset = 4539; + public static final int alignmentFill_at_5126_offset = 5126; public static final int alternator_antiwindupFreq_offset = 1764; public static final int alternator_derivativeFilterLoss_offset = 1760; public static final int alternatorControl_dFactor_offset = 1724; @@ -1228,6 +1229,34 @@ public class Fields { public static final int hip9011PrescalerAndSDO_offset = 324; public static final int hip9011SpiDevice_offset = 540; public static final int hipOutputChannel_offset = 1468; + public static final int hpfp_cam_e_HPFP_CAM_EX1 = 2; + public static final int hpfp_cam_e_HPFP_CAM_EX2 = 4; + public static final int hpfp_cam_e_HPFP_CAM_IN1 = 1; + public static final int hpfp_cam_e_HPFP_CAM_IN2 = 3; + public static final int hpfp_cam_e_HPFP_CAM_NONE = 0; + public static final int HPFP_COMPENSATION_SIZE = 10; + public static final int HPFP_DEADTIME_SIZE = 8; + public static final int HPFP_LOBE_PROFILE_SIZE = 16; + public static final int HPFP_TARGET_SIZE = 10; + public static final int hpfpActivationAngle_offset = 4702; + public static final int hpfpCam_offset = 4697; + public static final int hpfpCamLobes_offset = 4696; + public static final int hpfpCompensation_offset = 4996; + public static final int hpfpCompensationLoadBins_offset = 5096; + public static final int hpfpCompensationRpmBins_offset = 5116; + public static final int hpfpDeadtimeMS_offset = 4750; + public static final int hpfpDeadtimeVoltsBins_offset = 4742; + public static final int hpfpLobeProfileAngle_offset = 4726; + public static final int hpfpLobeProfileQuantityBins_offset = 4710; + public static final int hpfpMinAngle_offset = 4699; + public static final int hpfpPeakPos_offset = 4698; + public static final int hpfpPidI_offset = 4706; + public static final int hpfpPidP_offset = 4704; + public static final int hpfpPumpVolume_offset = 4700; + public static final int hpfpTarget_offset = 4766; + public static final int hpfpTargetDecay_offset = 4708; + public static final int hpfpTargetLoadBins_offset = 4966; + public static final int hpfpTargetRpmBins_offset = 4986; public static final int hpfpValvePin_offset = 2130; public static final int hpfpValvePinMode_offset = 2131; public static final int HW_MAX_ADC_INDEX = 17; @@ -1521,7 +1550,7 @@ public class Fields { public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; public static final int mainRelayPin_offset = 706; public static final int mainRelayPinMode_offset = 752; - public static final int mainUnusedEnd_offset = 4696; + public static final int mainUnusedEnd_offset = 5128; public static final int malfunctionIndicatorPin_offset = 660; public static final int malfunctionIndicatorPinMode_offset = 661; public static final int manIdlePosition_offset = 608; @@ -1743,7 +1772,6 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; - public static final int SIGNATURE_HASH = 1998226013; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1880,8 +1908,6 @@ public class Fields { public static final int tcuSolenoidTable_offset = 15136; public static final int tcuUpshiftButtonPin_offset = 1818; public static final int tcuUpshiftButtonPinMode_offset = 4514; - public static final int tempHpfpDuration_offset = 726; - public static final int tempHpfpStart_offset = 724; public static final int test557pin_offset = 3101; public static final int thermistor_conf_s_size = 28; public static final int ThermistorConf_size = 32; @@ -2197,7 +2223,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.11.06.all.1998226013"; + public static final String TS_SIGNATURE = "rusEFI 2021.11.06.all.2406907274"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 728; @@ -2255,33 +2281,33 @@ public class Fields { public static final int unusedAtOldBoardConfigurationEnd_offset = 1340; public static final int unusedBit4_1476_offset = 1476; public static final int unusedBit_251_29_offset = 976; - public static final int unusedBit_302_30_offset = 976; - public static final int unusedBit_302_31_offset = 976; + public static final int unusedBit_301_30_offset = 976; + public static final int unusedBit_301_31_offset = 976; public static final int unusedBit_34_31_offset = 76; - public static final int unusedBit_513_10_offset = 2116; - public static final int unusedBit_513_11_offset = 2116; - public static final int unusedBit_513_12_offset = 2116; - public static final int unusedBit_513_13_offset = 2116; - public static final int unusedBit_513_14_offset = 2116; - public static final int unusedBit_513_15_offset = 2116; - public static final int unusedBit_513_16_offset = 2116; - public static final int unusedBit_513_17_offset = 2116; - public static final int unusedBit_513_18_offset = 2116; - public static final int unusedBit_513_19_offset = 2116; - public static final int unusedBit_513_20_offset = 2116; - public static final int unusedBit_513_21_offset = 2116; - public static final int unusedBit_513_22_offset = 2116; - public static final int unusedBit_513_23_offset = 2116; - public static final int unusedBit_513_24_offset = 2116; - public static final int unusedBit_513_25_offset = 2116; - public static final int unusedBit_513_26_offset = 2116; - public static final int unusedBit_513_27_offset = 2116; - public static final int unusedBit_513_28_offset = 2116; - public static final int unusedBit_513_29_offset = 2116; - public static final int unusedBit_513_30_offset = 2116; - public static final int unusedBit_513_31_offset = 2116; - public static final int unusedBit_513_8_offset = 2116; - public static final int unusedBit_513_9_offset = 2116; + public static final int unusedBit_512_10_offset = 2116; + public static final int unusedBit_512_11_offset = 2116; + public static final int unusedBit_512_12_offset = 2116; + public static final int unusedBit_512_13_offset = 2116; + public static final int unusedBit_512_14_offset = 2116; + public static final int unusedBit_512_15_offset = 2116; + public static final int unusedBit_512_16_offset = 2116; + public static final int unusedBit_512_17_offset = 2116; + public static final int unusedBit_512_18_offset = 2116; + public static final int unusedBit_512_19_offset = 2116; + public static final int unusedBit_512_20_offset = 2116; + public static final int unusedBit_512_21_offset = 2116; + public static final int unusedBit_512_22_offset = 2116; + public static final int unusedBit_512_23_offset = 2116; + public static final int unusedBit_512_24_offset = 2116; + public static final int unusedBit_512_25_offset = 2116; + public static final int unusedBit_512_26_offset = 2116; + public static final int unusedBit_512_27_offset = 2116; + public static final int unusedBit_512_28_offset = 2116; + public static final int unusedBit_512_29_offset = 2116; + public static final int unusedBit_512_30_offset = 2116; + public static final int unusedBit_512_31_offset = 2116; + public static final int unusedBit_512_8_offset = 2116; + public static final int unusedBit_512_9_offset = 2116; public static final int unusedBitHere1_offset = 1464; public static final int unusedBitHere2_offset = 1464; public static final int unusedBitHere3_offset = 1464; @@ -2297,6 +2323,8 @@ public class Fields { public static final int unusedEL2_offset = 2064; public static final int unusedEL3_offset = 2068; public static final int unusedEL4_offset = 2072; + public static final int unusedExHpfp_offset = 724; + public static final int unusedFiller_4703_offset = 4703; public static final int unusedFsioInputs_offset = 1522; public static final int unusedLuaWasHere_offset = 16032; public static final int unusedOldBiquad_offset = 2331; @@ -2694,8 +2722,7 @@ public class Fields { public static final Field WASTEGATEPOSITIONMAX = Field.create("WASTEGATEPOSITIONMAX", 718, FieldType.INT16); public static final Field IDLEPOSITIONMIN = Field.create("IDLEPOSITIONMIN", 720, FieldType.INT16); public static final Field IDLEPOSITIONMAX = Field.create("IDLEPOSITIONMAX", 722, FieldType.INT16); - public static final Field TEMPHPFPSTART = Field.create("TEMPHPFPSTART", 724, FieldType.INT16); - public static final Field TEMPHPFPDURATION = Field.create("TEMPHPFPDURATION", 726, FieldType.INT16); + public static final Field UNUSEDEXHPFP = Field.create("UNUSEDEXHPFP", 724, FieldType.INT16); public static final Field TUNERSTUDIOSERIALSPEED = Field.create("TUNERSTUDIOSERIALSPEED", 728, FieldType.INT); public static final Field COMPRESSIONRATIO = Field.create("COMPRESSIONRATIO", 732, FieldType.FLOAT); public static final Field TRIGGERSIMULATORPINS1 = Field.create("TRIGGERSIMULATORPINS1", 736, FieldType.INT8, brain_pin_e); @@ -2872,8 +2899,8 @@ public class Fields { public static final Field KNOCKBANKCYL12 = Field.create("KNOCKBANKCYL12", 976, FieldType.BIT, 27); public static final Field TCUENABLED = Field.create("TCUENABLED", 976, FieldType.BIT, 28); public static final Field UNUSEDBIT_251_29 = Field.create("UNUSEDBIT_251_29", 976, FieldType.BIT, 29); - public static final Field UNUSEDBIT_302_30 = Field.create("UNUSEDBIT_302_30", 976, FieldType.BIT, 30); - public static final Field UNUSEDBIT_302_31 = Field.create("UNUSEDBIT_302_31", 976, FieldType.BIT, 31); + public static final Field UNUSEDBIT_301_30 = Field.create("UNUSEDBIT_301_30", 976, FieldType.BIT, 30); + public static final Field UNUSEDBIT_301_31 = Field.create("UNUSEDBIT_301_31", 976, FieldType.BIT, 31); public static final Field ETBIO1_DIRECTIONPIN1 = Field.create("ETBIO1_DIRECTIONPIN1", 980, FieldType.INT8, brain_pin_e); public static final Field ETBIO1_DIRECTIONPIN2 = Field.create("ETBIO1_DIRECTIONPIN2", 981, FieldType.INT8, brain_pin_e); public static final Field ETBIO1_CONTROLPIN = Field.create("ETBIO1_CONTROLPIN", 982, FieldType.INT8, brain_pin_e); @@ -3183,30 +3210,30 @@ public class Fields { public static final Field UNUSED1128 = Field.create("UNUSED1128", 2116, FieldType.BIT, 5); public static final Field UNUSED1129 = Field.create("UNUSED1129", 2116, FieldType.BIT, 6); public static final Field UNUSED1130 = Field.create("UNUSED1130", 2116, FieldType.BIT, 7); - public static final Field UNUSEDBIT_513_8 = Field.create("UNUSEDBIT_513_8", 2116, FieldType.BIT, 8); - public static final Field UNUSEDBIT_513_9 = Field.create("UNUSEDBIT_513_9", 2116, FieldType.BIT, 9); - public static final Field UNUSEDBIT_513_10 = Field.create("UNUSEDBIT_513_10", 2116, FieldType.BIT, 10); - public static final Field UNUSEDBIT_513_11 = Field.create("UNUSEDBIT_513_11", 2116, FieldType.BIT, 11); - public static final Field UNUSEDBIT_513_12 = Field.create("UNUSEDBIT_513_12", 2116, FieldType.BIT, 12); - public static final Field UNUSEDBIT_513_13 = Field.create("UNUSEDBIT_513_13", 2116, FieldType.BIT, 13); - public static final Field UNUSEDBIT_513_14 = Field.create("UNUSEDBIT_513_14", 2116, FieldType.BIT, 14); - public static final Field UNUSEDBIT_513_15 = Field.create("UNUSEDBIT_513_15", 2116, FieldType.BIT, 15); - public static final Field UNUSEDBIT_513_16 = Field.create("UNUSEDBIT_513_16", 2116, FieldType.BIT, 16); - public static final Field UNUSEDBIT_513_17 = Field.create("UNUSEDBIT_513_17", 2116, FieldType.BIT, 17); - public static final Field UNUSEDBIT_513_18 = Field.create("UNUSEDBIT_513_18", 2116, FieldType.BIT, 18); - public static final Field UNUSEDBIT_513_19 = Field.create("UNUSEDBIT_513_19", 2116, FieldType.BIT, 19); - public static final Field UNUSEDBIT_513_20 = Field.create("UNUSEDBIT_513_20", 2116, FieldType.BIT, 20); - public static final Field UNUSEDBIT_513_21 = Field.create("UNUSEDBIT_513_21", 2116, FieldType.BIT, 21); - public static final Field UNUSEDBIT_513_22 = Field.create("UNUSEDBIT_513_22", 2116, FieldType.BIT, 22); - public static final Field UNUSEDBIT_513_23 = Field.create("UNUSEDBIT_513_23", 2116, FieldType.BIT, 23); - public static final Field UNUSEDBIT_513_24 = Field.create("UNUSEDBIT_513_24", 2116, FieldType.BIT, 24); - public static final Field UNUSEDBIT_513_25 = Field.create("UNUSEDBIT_513_25", 2116, FieldType.BIT, 25); - public static final Field UNUSEDBIT_513_26 = Field.create("UNUSEDBIT_513_26", 2116, FieldType.BIT, 26); - public static final Field UNUSEDBIT_513_27 = Field.create("UNUSEDBIT_513_27", 2116, FieldType.BIT, 27); - public static final Field UNUSEDBIT_513_28 = Field.create("UNUSEDBIT_513_28", 2116, FieldType.BIT, 28); - public static final Field UNUSEDBIT_513_29 = Field.create("UNUSEDBIT_513_29", 2116, FieldType.BIT, 29); - public static final Field UNUSEDBIT_513_30 = Field.create("UNUSEDBIT_513_30", 2116, FieldType.BIT, 30); - public static final Field UNUSEDBIT_513_31 = Field.create("UNUSEDBIT_513_31", 2116, FieldType.BIT, 31); + public static final Field UNUSEDBIT_512_8 = Field.create("UNUSEDBIT_512_8", 2116, FieldType.BIT, 8); + public static final Field UNUSEDBIT_512_9 = Field.create("UNUSEDBIT_512_9", 2116, FieldType.BIT, 9); + public static final Field UNUSEDBIT_512_10 = Field.create("UNUSEDBIT_512_10", 2116, FieldType.BIT, 10); + public static final Field UNUSEDBIT_512_11 = Field.create("UNUSEDBIT_512_11", 2116, FieldType.BIT, 11); + public static final Field UNUSEDBIT_512_12 = Field.create("UNUSEDBIT_512_12", 2116, FieldType.BIT, 12); + public static final Field UNUSEDBIT_512_13 = Field.create("UNUSEDBIT_512_13", 2116, FieldType.BIT, 13); + public static final Field UNUSEDBIT_512_14 = Field.create("UNUSEDBIT_512_14", 2116, FieldType.BIT, 14); + public static final Field UNUSEDBIT_512_15 = Field.create("UNUSEDBIT_512_15", 2116, FieldType.BIT, 15); + public static final Field UNUSEDBIT_512_16 = Field.create("UNUSEDBIT_512_16", 2116, FieldType.BIT, 16); + public static final Field UNUSEDBIT_512_17 = Field.create("UNUSEDBIT_512_17", 2116, FieldType.BIT, 17); + public static final Field UNUSEDBIT_512_18 = Field.create("UNUSEDBIT_512_18", 2116, FieldType.BIT, 18); + public static final Field UNUSEDBIT_512_19 = Field.create("UNUSEDBIT_512_19", 2116, FieldType.BIT, 19); + public static final Field UNUSEDBIT_512_20 = Field.create("UNUSEDBIT_512_20", 2116, FieldType.BIT, 20); + public static final Field UNUSEDBIT_512_21 = Field.create("UNUSEDBIT_512_21", 2116, FieldType.BIT, 21); + public static final Field UNUSEDBIT_512_22 = Field.create("UNUSEDBIT_512_22", 2116, FieldType.BIT, 22); + public static final Field UNUSEDBIT_512_23 = Field.create("UNUSEDBIT_512_23", 2116, FieldType.BIT, 23); + public static final Field UNUSEDBIT_512_24 = Field.create("UNUSEDBIT_512_24", 2116, FieldType.BIT, 24); + public static final Field UNUSEDBIT_512_25 = Field.create("UNUSEDBIT_512_25", 2116, FieldType.BIT, 25); + public static final Field UNUSEDBIT_512_26 = Field.create("UNUSEDBIT_512_26", 2116, FieldType.BIT, 26); + public static final Field UNUSEDBIT_512_27 = Field.create("UNUSEDBIT_512_27", 2116, FieldType.BIT, 27); + public static final Field UNUSEDBIT_512_28 = Field.create("UNUSEDBIT_512_28", 2116, FieldType.BIT, 28); + public static final Field UNUSEDBIT_512_29 = Field.create("UNUSEDBIT_512_29", 2116, FieldType.BIT, 29); + public static final Field UNUSEDBIT_512_30 = Field.create("UNUSEDBIT_512_30", 2116, FieldType.BIT, 30); + public static final Field UNUSEDBIT_512_31 = Field.create("UNUSEDBIT_512_31", 2116, FieldType.BIT, 31); public static final Field CAN2NBCTYPE = Field.create("CAN2NBCTYPE", 2120, FieldType.INT); public static final Field CAN2TXPIN = Field.create("CAN2TXPIN", 2124, FieldType.INT8, brain_pin_e); public static final Field CAN2RXPIN = Field.create("CAN2RXPIN", 2125, FieldType.INT8, brain_pin_e); @@ -3615,7 +3642,29 @@ public class Fields { public static final Field TRIGGERGAPOVERRIDETO16 = Field.create("TRIGGERGAPOVERRIDETO16", 4684, FieldType.FLOAT); public static final Field TRIGGERGAPOVERRIDETO17 = Field.create("TRIGGERGAPOVERRIDETO17", 4688, FieldType.FLOAT); public static final Field TRIGGERGAPOVERRIDETO18 = Field.create("TRIGGERGAPOVERRIDETO18", 4692, FieldType.FLOAT); - public static final Field MAINUNUSEDEND = Field.create("MAINUNUSEDEND", 4696, FieldType.INT); + public static final Field HPFPCAMLOBES = Field.create("HPFPCAMLOBES", 4696, FieldType.INT8); + public static final String[] hpfp_cam_e = {"NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2"}; + public static final Field HPFPCAM = Field.create("HPFPCAM", 4697, FieldType.INT8, hpfp_cam_e); + public static final Field HPFPPEAKPOS = Field.create("HPFPPEAKPOS", 4698, FieldType.INT8); + public static final Field HPFPMINANGLE = Field.create("HPFPMINANGLE", 4699, FieldType.INT8); + public static final Field HPFPPUMPVOLUME = Field.create("HPFPPUMPVOLUME", 4700, FieldType.INT16); + public static final Field HPFPACTIVATIONANGLE = Field.create("HPFPACTIVATIONANGLE", 4702, FieldType.INT8); + public static final Field UNUSEDFILLER_4703 = Field.create("UNUSEDFILLER_4703", 4703, FieldType.INT8); + public static final Field HPFPPIDP = Field.create("HPFPPIDP", 4704, FieldType.INT16); + public static final Field HPFPPIDI = Field.create("HPFPPIDI", 4706, FieldType.INT16); + public static final Field HPFPTARGETDECAY = Field.create("HPFPTARGETDECAY", 4708, FieldType.INT16); + public static final Field HPFPLOBEPROFILEQUANTITYBINS = Field.create("HPFPLOBEPROFILEQUANTITYBINS", 4710, FieldType.INT8); + public static final Field HPFPLOBEPROFILEANGLE = Field.create("HPFPLOBEPROFILEANGLE", 4726, FieldType.INT8); + public static final Field HPFPDEADTIMEVOLTSBINS = Field.create("HPFPDEADTIMEVOLTSBINS", 4742, FieldType.INT8); + public static final Field HPFPDEADTIMEMS = Field.create("HPFPDEADTIMEMS", 4750, FieldType.INT16); + public static final Field HPFPTARGET = Field.create("HPFPTARGET", 4766, FieldType.INT16); + public static final Field HPFPTARGETLOADBINS = Field.create("HPFPTARGETLOADBINS", 4966, FieldType.INT16); + public static final Field HPFPTARGETRPMBINS = Field.create("HPFPTARGETRPMBINS", 4986, FieldType.INT8); + public static final Field HPFPCOMPENSATION = Field.create("HPFPCOMPENSATION", 4996, FieldType.INT8); + public static final Field HPFPCOMPENSATIONLOADBINS = Field.create("HPFPCOMPENSATIONLOADBINS", 5096, FieldType.INT16); + public static final Field HPFPCOMPENSATIONRPMBINS = Field.create("HPFPCOMPENSATIONRPMBINS", 5116, FieldType.INT8); + public static final Field ALIGNMENTFILL_AT_5126 = Field.create("ALIGNMENTFILL_AT_5126", 5126, FieldType.INT8); + public static final Field MAINUNUSEDEND = Field.create("MAINUNUSEDEND", 5128, FieldType.INT); public static final Field WARNING_MESSAGE = Field.create("WARNING_MESSAGE", 6000, 120, FieldType.STRING); public static final Field AFTERSTARTCOOLANTBINS = Field.create("AFTERSTARTCOOLANTBINS", 6120, FieldType.FLOAT); public static final Field AFTERSTARTHOLDTIME = Field.create("AFTERSTARTHOLDTIME", 6152, FieldType.FLOAT); @@ -3971,8 +4020,7 @@ public class Fields { WASTEGATEPOSITIONMAX, IDLEPOSITIONMIN, IDLEPOSITIONMAX, - TEMPHPFPSTART, - TEMPHPFPDURATION, + UNUSEDEXHPFP, TUNERSTUDIOSERIALSPEED, COMPRESSIONRATIO, TRIGGERSIMULATORPINS1, @@ -4147,8 +4195,8 @@ public class Fields { KNOCKBANKCYL12, TCUENABLED, UNUSEDBIT_251_29, - UNUSEDBIT_302_30, - UNUSEDBIT_302_31, + UNUSEDBIT_301_30, + UNUSEDBIT_301_31, ETBIO1_DIRECTIONPIN1, ETBIO1_DIRECTIONPIN2, ETBIO1_CONTROLPIN, @@ -4452,30 +4500,30 @@ public class Fields { UNUSED1128, UNUSED1129, UNUSED1130, - UNUSEDBIT_513_8, - UNUSEDBIT_513_9, - UNUSEDBIT_513_10, - UNUSEDBIT_513_11, - UNUSEDBIT_513_12, - UNUSEDBIT_513_13, - UNUSEDBIT_513_14, - UNUSEDBIT_513_15, - UNUSEDBIT_513_16, - UNUSEDBIT_513_17, - UNUSEDBIT_513_18, - UNUSEDBIT_513_19, - UNUSEDBIT_513_20, - UNUSEDBIT_513_21, - UNUSEDBIT_513_22, - UNUSEDBIT_513_23, - UNUSEDBIT_513_24, - UNUSEDBIT_513_25, - UNUSEDBIT_513_26, - UNUSEDBIT_513_27, - UNUSEDBIT_513_28, - UNUSEDBIT_513_29, - UNUSEDBIT_513_30, - UNUSEDBIT_513_31, + UNUSEDBIT_512_8, + UNUSEDBIT_512_9, + UNUSEDBIT_512_10, + UNUSEDBIT_512_11, + UNUSEDBIT_512_12, + UNUSEDBIT_512_13, + UNUSEDBIT_512_14, + UNUSEDBIT_512_15, + UNUSEDBIT_512_16, + UNUSEDBIT_512_17, + UNUSEDBIT_512_18, + UNUSEDBIT_512_19, + UNUSEDBIT_512_20, + UNUSEDBIT_512_21, + UNUSEDBIT_512_22, + UNUSEDBIT_512_23, + UNUSEDBIT_512_24, + UNUSEDBIT_512_25, + UNUSEDBIT_512_26, + UNUSEDBIT_512_27, + UNUSEDBIT_512_28, + UNUSEDBIT_512_29, + UNUSEDBIT_512_30, + UNUSEDBIT_512_31, CAN2NBCTYPE, CAN2TXPIN, CAN2RXPIN, @@ -4879,6 +4927,27 @@ public class Fields { TRIGGERGAPOVERRIDETO16, TRIGGERGAPOVERRIDETO17, TRIGGERGAPOVERRIDETO18, + HPFPCAMLOBES, + HPFPCAM, + HPFPPEAKPOS, + HPFPMINANGLE, + HPFPPUMPVOLUME, + HPFPACTIVATIONANGLE, + UNUSEDFILLER_4703, + HPFPPIDP, + HPFPPIDI, + HPFPTARGETDECAY, + HPFPLOBEPROFILEQUANTITYBINS, + HPFPLOBEPROFILEANGLE, + HPFPDEADTIMEVOLTSBINS, + HPFPDEADTIMEMS, + HPFPTARGET, + HPFPTARGETLOADBINS, + HPFPTARGETRPMBINS, + HPFPCOMPENSATION, + HPFPCOMPENSATIONLOADBINS, + HPFPCOMPENSATIONRPMBINS, + ALIGNMENTFILL_AT_5126, MAINUNUSEDEND, WARNING_MESSAGE, AFTERSTARTCOOLANTBINS, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index c4a9cb9eb1..5f61cb0087 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +