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 5b35c1b046..35bd1d2021 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 integration/rusefi_config.txt Mon Dec 02 17:48:25 EST 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Wed Dec 04 00:38:11 EST 2019 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1855,6 +1855,14 @@ #define trigger_unusedCustomNeedSecondTriggerInput_offset_hex 210 #define trigger_useOnlyFirstChannel_offset 528 #define trigger_useOnlyFirstChannel_offset_hex 210 +#define triggerCompCenterVolt_offset 4036 +#define triggerCompCenterVolt_offset_hex fc4 +#define triggerCompHystMax_offset 4038 +#define triggerCompHystMax_offset_hex fc6 +#define triggerCompHystMin_offset 4037 +#define triggerCompHystMin_offset_hex fc5 +#define triggerCompSensorSatRpm_offset 4039 +#define triggerCompSensorSatRpm_offset_hex fc7 #define triggerErrorPin_offset 828 #define triggerErrorPin_offset_hex 33c #define triggerErrorPinMode_offset 829 @@ -1907,8 +1915,6 @@ #define unused1234234_offset_hex 7fa #define unused556_offset 681 #define unused556_offset_hex 2a9 -#define unused_1484_bit_21_offset 1476 -#define unused_1484_bit_21_offset_hex 5c4 #define unused_1484_bit_22_offset 1476 #define unused_1484_bit_22_offset_hex 5c4 #define unused_1484_bit_23_offset 1476 @@ -1949,8 +1955,6 @@ #define unusedHereo_wires_offset_hex 4c #define unusedOldWarmupAfr_offset 744 #define unusedOldWarmupAfr_offset_hex 2e8 -#define unusedSpiPadding3_offset 4036 -#define unusedSpiPadding3_offset_hex fc4 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding4_offset_hex a21 #define unusedSpiPadding5_offset 2713 @@ -1999,6 +2003,8 @@ #define useFSIO8ForServo1_offset_hex 5b8 #define useFSIO9ForServo2_offset 1464 #define useFSIO9ForServo2_offset_hex 5b8 +#define useIacPidMultTable_offset 1476 +#define useIacPidMultTable_offset_hex 5c4 #define useIacTableForCoasting_offset 744 #define useIacTableForCoasting_offset_hex 2e8 #define useIdleTimingPidControl_offset 744 @@ -2052,6 +2058,7 @@ #define veRpmBins_offset_hex 4860 #define veTable_offset 17440 #define veTable_offset_hex 4420 +#define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define vRefAdcChannel_offset 1470 #define vRefAdcChannel_offset_hex 5be #define vvt_mode_e_enum "First half", "Second half", "2GZ", "Miata NB2", "mode4", "mode5", "mode6", "mode7" @@ -3778,8 +3785,9 @@ struct engine_configuration_s { offset 1476 bit 20 */ bool etbCalibrationOnStart : 1; /** + * This flag allows to use a special 'PID Multiplier' table (0.0-1.0) to compensate for nonlinear nature of IAC-RPM controller offset 1476 bit 21 */ - bool unused_1484_bit_21 : 1; + bool useIacPidMultTable : 1; /** offset 1476 bit 22 */ bool unused_1484_bit_22 : 1; @@ -4693,9 +4701,25 @@ struct engine_configuration_s { */ int alFIn[3]; /** + * Trigger comparator center point voltage * offset 4036 */ - uint8_t unusedSpiPadding3[4]; + uint8_t triggerCompCenterVolt = (uint8_t)0; + /** + * Trigger comparator hysteresis voltage (Min) + * offset 4037 + */ + uint8_t triggerCompHystMin = (uint8_t)0; + /** + * Trigger comparator hysteresis voltage (Max) + * offset 4038 + */ + uint8_t triggerCompHystMax = (uint8_t)0; + /** + * VR-sensor saturation RPM + * offset 4039 + */ + uint8_t triggerCompSensorSatRpm = (uint8_t)0; /** * offset 4040 */ @@ -4978,4 +5002,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Mon Dec 02 17:48:25 EST 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Wed Dec 04 00:38:11 EST 2019 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 04e26e2d94..838dfe674f 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1853,6 +1853,14 @@ #define trigger_unusedCustomNeedSecondTriggerInput_offset_hex 210 #define trigger_useOnlyFirstChannel_offset 528 #define trigger_useOnlyFirstChannel_offset_hex 210 +#define triggerCompCenterVolt_offset 4036 +#define triggerCompCenterVolt_offset_hex fc4 +#define triggerCompHystMax_offset 4038 +#define triggerCompHystMax_offset_hex fc6 +#define triggerCompHystMin_offset 4037 +#define triggerCompHystMin_offset_hex fc5 +#define triggerCompSensorSatRpm_offset 4039 +#define triggerCompSensorSatRpm_offset_hex fc7 #define triggerErrorPin_offset 828 #define triggerErrorPin_offset_hex 33c #define triggerErrorPinMode_offset 829 @@ -1905,8 +1913,6 @@ #define unused1234234_offset_hex 7fa #define unused556_offset 681 #define unused556_offset_hex 2a9 -#define unused_1484_bit_21_offset 1476 -#define unused_1484_bit_21_offset_hex 5c4 #define unused_1484_bit_22_offset 1476 #define unused_1484_bit_22_offset_hex 5c4 #define unused_1484_bit_23_offset 1476 @@ -1947,8 +1953,6 @@ #define unusedHereo_wires_offset_hex 4c #define unusedOldWarmupAfr_offset 744 #define unusedOldWarmupAfr_offset_hex 2e8 -#define unusedSpiPadding3_offset 4036 -#define unusedSpiPadding3_offset_hex fc4 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding4_offset_hex a21 #define unusedSpiPadding5_offset 2713 @@ -1997,6 +2001,8 @@ #define useFSIO8ForServo1_offset_hex 5b8 #define useFSIO9ForServo2_offset 1464 #define useFSIO9ForServo2_offset_hex 5b8 +#define useIacPidMultTable_offset 1476 +#define useIacPidMultTable_offset_hex 5c4 #define useIacTableForCoasting_offset 744 #define useIacTableForCoasting_offset_hex 2e8 #define useIdleTimingPidControl_offset 744 @@ -2050,6 +2056,7 @@ #define veRpmBins_offset_hex 4860 #define veTable_offset 17440 #define veTable_offset_hex 4420 +#define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define vRefAdcChannel_offset 1470 #define vRefAdcChannel_offset_hex 5be #define vvt_mode_e_enum "First half", "Second half", "2GZ", "Miata NB2", "mode4", "mode5", "mode6", "mode7" diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index c213e95775..5563691f49 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 integration\rusefi_config.txt Mon Dec 02 17:48:14 EST 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:37:59 EST 2019 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1709,8 +1709,9 @@ struct engine_configuration_s { offset 1476 bit 20 */ bool etbCalibrationOnStart : 1; /** + * This flag allows to use a special 'PID Multiplier' table (0.0-1.0) to compensate for nonlinear nature of IAC-RPM controller offset 1476 bit 21 */ - bool unused_1484_bit_21 : 1; + bool useIacPidMultTable : 1; /** offset 1476 bit 22 */ bool unused_1484_bit_22 : 1; @@ -2624,9 +2625,25 @@ struct engine_configuration_s { */ int alFIn[3]; /** + * Trigger comparator center point voltage * offset 4036 */ - uint8_t unusedSpiPadding3[4]; + uint8_t triggerCompCenterVolt; + /** + * Trigger comparator hysteresis voltage (Min) + * offset 4037 + */ + uint8_t triggerCompHystMin; + /** + * Trigger comparator hysteresis voltage (Max) + * offset 4038 + */ + uint8_t triggerCompHystMax; + /** + * VR-sensor saturation RPM + * offset 4039 + */ + uint8_t triggerCompSensorSatRpm; /** * offset 4040 */ @@ -2909,4 +2926,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Dec 02 17:48:14 EST 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:37:59 EST 2019 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index bcdfd91bd4..725049152d 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1853,6 +1853,14 @@ #define trigger_unusedCustomNeedSecondTriggerInput_offset_hex 210 #define trigger_useOnlyFirstChannel_offset 528 #define trigger_useOnlyFirstChannel_offset_hex 210 +#define triggerCompCenterVolt_offset 4036 +#define triggerCompCenterVolt_offset_hex fc4 +#define triggerCompHystMax_offset 4038 +#define triggerCompHystMax_offset_hex fc6 +#define triggerCompHystMin_offset 4037 +#define triggerCompHystMin_offset_hex fc5 +#define triggerCompSensorSatRpm_offset 4039 +#define triggerCompSensorSatRpm_offset_hex fc7 #define triggerErrorPin_offset 828 #define triggerErrorPin_offset_hex 33c #define triggerErrorPinMode_offset 829 @@ -1905,8 +1913,6 @@ #define unused1234234_offset_hex 7fa #define unused556_offset 681 #define unused556_offset_hex 2a9 -#define unused_1484_bit_21_offset 1476 -#define unused_1484_bit_21_offset_hex 5c4 #define unused_1484_bit_22_offset 1476 #define unused_1484_bit_22_offset_hex 5c4 #define unused_1484_bit_23_offset 1476 @@ -1947,8 +1953,6 @@ #define unusedHereo_wires_offset_hex 4c #define unusedOldWarmupAfr_offset 744 #define unusedOldWarmupAfr_offset_hex 2e8 -#define unusedSpiPadding3_offset 4036 -#define unusedSpiPadding3_offset_hex fc4 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding4_offset_hex a21 #define unusedSpiPadding5_offset 2713 @@ -1997,6 +2001,8 @@ #define useFSIO8ForServo1_offset_hex 5b8 #define useFSIO9ForServo2_offset 1464 #define useFSIO9ForServo2_offset_hex 5b8 +#define useIacPidMultTable_offset 1476 +#define useIacPidMultTable_offset_hex 5c4 #define useIacTableForCoasting_offset 744 #define useIacTableForCoasting_offset_hex 2e8 #define useIdleTimingPidControl_offset 744 @@ -2050,6 +2056,7 @@ #define veRpmBins_offset_hex 4860 #define veTable_offset 17440 #define veTable_offset_hex 4420 +#define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define vRefAdcChannel_offset 1470 #define vRefAdcChannel_offset_hex 5be #define vvt_mode_e_enum "First half", "Second half", "2GZ", "Miata NB2", "mode4", "mode5", "mode6", "mode7" diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 273394a9a2..2275986447 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -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 integration\rusefi_config.txt Mon Dec 02 20:26:07 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:37:59 EST 2019 pageSize = 20000 page = 1 @@ -569,7 +569,7 @@ page = 1 useAdvanceCorrectionsForCranking= bits, U32, 1476, [18:18], "false", "true" useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true" etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true" - unused_1484_bit_21 = bits, U32, 1476, [21:21], "false", "true" + useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true" unused_1484_bit_22 = bits, U32, 1476, [22:22], "false", "true" unused_1484_bit_23 = bits, U32, 1476, [23:23], "false", "true" unused_1484_bit_24 = bits, U32, 1476, [24:24], "false", "true" @@ -904,7 +904,10 @@ page = 1 ;no TS info - skipping unusuedvref offset 4016 ;no TS info - skipping unusuedsw offset 4020 ;no TS info - skipping alFIn offset 4024 -;no TS info - skipping unusedSpiPadding3 offset 4036 + triggerCompCenterVolt = scalar, U08, 4036, "V", 0.02, 0, 0.0, 5.1, 2 + triggerCompHystMin = scalar, U08, 4037, "V", 0.02, 0, 0.0, 5.1, 2 + triggerCompHystMax = scalar, U08, 4038, "V", 0.02, 0, 0.0, 5.1, 2 + triggerCompSensorSatRpm = scalar, U08, 4039, "RPM", 50, 0, 0.0, 12000.0, 0 idleRpmPid2_pFactor = scalar, F32, 4040, "", 1, 0, -10000, 10000, 4 idleRpmPid2_iFactor = scalar, F32, 4044, "", 1, 0, -10000, 10000, 4 idleRpmPid2_dFactor = scalar, F32, 4048, "", 1, 0, -10000, 10000, 4 @@ -1066,6 +1069,7 @@ page = 1 useSeparateAdvanceForCranking = "This activates a separate advance table for cranking conditions, this allows cranking advance to be RPM dependant." useAdvanceCorrectionsForCranking = "This enables the various ignition corrections during cranking (IAT, CLT, FSIO and PID idle)." useTPSAdvanceTable = "This flag allows to use TPS for ignition lookup while in Speed Density Fuel Mode" + useIacPidMultTable = "This flag allows to use a special 'PID Multiplier' table (0.0-1.0) to compensate for nonlinear nature of IAC-RPM controller" idlePidRpmUpperLimit = "Relative to the target idle RPM" primeInjFalloffTemperature = "This sets the temperature above which no priming pulse is used, The value at -40 is reduced until there is no more priming injection at this temperature." ignMathCalculateAtIndex = "At what trigger index should some ignition-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -1102,6 +1106,10 @@ page = 1 idlePidFalloffDeltaRpm = "Taper out idle timing control over this range as the engine leaves idle conditions" tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" + triggerCompCenterVolt = "Trigger comparator center point voltage" + triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" + triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" + triggerCompSensorSatRpm = "VR-sensor saturation RPM" ; CONFIG_DEFINITION_END @@ -1753,6 +1761,15 @@ fileVersion = { 20190701 } gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = iacPidMultTbl, iacPidMultMap, "IAC PID Multiplier Table", 1 + ; constant, variable + xBins = iacPidMultRpmBins, RPMValue + yBins = iacPidMultLoadBins, engineLoad + zBins = iacPidMultTable +; gridHeight = 2.0 + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(Later)", "(Sooner)" + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -2173,6 +2190,8 @@ menuDialog = main subMenu = idlehw, "Idle hardware" subMenu = std_separator subMenu = cltIdleRPMCurve, "Target RPM", 0, {idleMode == 0} + subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} + subMenu = std_separator subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} subMenu = std_separator @@ -2591,6 +2610,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Brake pedal switch", brakePedalPin field = "A/C switch", acSwitchAdc + dialog = triggerInputComparator, "Built-in Comparator Settings (Kinetis-only)" + field = "Comparator Center Point Voltage", triggerCompCenterVolt + field = "Comparator hysteresis voltage (Min)", triggerCompHystMin + field = "Comparator hysteresis voltage (Max)", triggerCompHystMax + field = "VR-sensor saturation RPM", triggerCompSensorSatRpm + dialog = triggerInputs, "Trigger Inputs" field = "!ECU reboot needed to apply these settings" field = "#Cam is primary if you have cam sensor" @@ -2599,6 +2624,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} field = "Cam Sync/VVT input", camInputs1 + panel = triggerInputComparator dialog = allPinsSensors, "Sensors" field = "CLT ADC input", clt_adcChannel @@ -2962,6 +2988,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "RPM dead zone to deactivate IAC pid", idlePidRpmDeadZone field = "RPM upper limit to deactivate IAC pid",idlePidRpmUpperLimit field = "PID Extra for low RPM", pidExtraForLowRpm + field = "Use IAC PID Multiplier Table", useIacPidMultTable dialog = idleSettings, "", yAxis diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 104ce66f44..83242fb5fa 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -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 integration\rusefi_config.txt Mon Dec 02 20:26:13 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:38:05 EST 2019 pageSize = 20000 page = 1 @@ -569,7 +569,7 @@ page = 1 useAdvanceCorrectionsForCranking= bits, U32, 1476, [18:18], "false", "true" useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true" etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true" - unused_1484_bit_21 = bits, U32, 1476, [21:21], "false", "true" + useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true" unused_1484_bit_22 = bits, U32, 1476, [22:22], "false", "true" unused_1484_bit_23 = bits, U32, 1476, [23:23], "false", "true" unused_1484_bit_24 = bits, U32, 1476, [24:24], "false", "true" @@ -904,7 +904,10 @@ page = 1 ;no TS info - skipping unusuedvref offset 4016 ;no TS info - skipping unusuedsw offset 4020 ;no TS info - skipping alFIn offset 4024 -;no TS info - skipping unusedSpiPadding3 offset 4036 + triggerCompCenterVolt = scalar, U08, 4036, "V", 0.02, 0, 0.0, 5.1, 2 + triggerCompHystMin = scalar, U08, 4037, "V", 0.02, 0, 0.0, 5.1, 2 + triggerCompHystMax = scalar, U08, 4038, "V", 0.02, 0, 0.0, 5.1, 2 + triggerCompSensorSatRpm = scalar, U08, 4039, "RPM", 50, 0, 0.0, 12000.0, 0 idleRpmPid2_pFactor = scalar, F32, 4040, "", 1, 0, -10000, 10000, 4 idleRpmPid2_iFactor = scalar, F32, 4044, "", 1, 0, -10000, 10000, 4 idleRpmPid2_dFactor = scalar, F32, 4048, "", 1, 0, -10000, 10000, 4 @@ -1066,6 +1069,7 @@ page = 1 useSeparateAdvanceForCranking = "This activates a separate advance table for cranking conditions, this allows cranking advance to be RPM dependant." useAdvanceCorrectionsForCranking = "This enables the various ignition corrections during cranking (IAT, CLT, FSIO and PID idle)." useTPSAdvanceTable = "This flag allows to use TPS for ignition lookup while in Speed Density Fuel Mode" + useIacPidMultTable = "This flag allows to use a special 'PID Multiplier' table (0.0-1.0) to compensate for nonlinear nature of IAC-RPM controller" idlePidRpmUpperLimit = "Relative to the target idle RPM" primeInjFalloffTemperature = "This sets the temperature above which no priming pulse is used, The value at -40 is reduced until there is no more priming injection at this temperature." ignMathCalculateAtIndex = "At what trigger index should some ignition-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -1102,6 +1106,10 @@ page = 1 idlePidFalloffDeltaRpm = "Taper out idle timing control over this range as the engine leaves idle conditions" tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" + triggerCompCenterVolt = "Trigger comparator center point voltage" + triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" + triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" + triggerCompSensorSatRpm = "VR-sensor saturation RPM" ; CONFIG_DEFINITION_END @@ -1753,6 +1761,15 @@ fileVersion = { 20190701 } gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = iacPidMultTbl, iacPidMultMap, "IAC PID Multiplier Table", 1 + ; constant, variable + xBins = iacPidMultRpmBins, RPMValue + yBins = iacPidMultLoadBins, engineLoad + zBins = iacPidMultTable +; gridHeight = 2.0 + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(Later)", "(Sooner)" + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -2173,6 +2190,8 @@ menuDialog = main subMenu = idlehw, "Idle hardware" subMenu = std_separator subMenu = cltIdleRPMCurve, "Target RPM", 0, {idleMode == 0} + subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} + subMenu = std_separator subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} subMenu = std_separator @@ -2591,6 +2610,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Brake pedal switch", brakePedalPin field = "A/C switch", acSwitchAdc + dialog = triggerInputComparator, "Built-in Comparator Settings (Kinetis-only)" + field = "Comparator Center Point Voltage", triggerCompCenterVolt + field = "Comparator hysteresis voltage (Min)", triggerCompHystMin + field = "Comparator hysteresis voltage (Max)", triggerCompHystMax + field = "VR-sensor saturation RPM", triggerCompSensorSatRpm + dialog = triggerInputs, "Trigger Inputs" field = "!ECU reboot needed to apply these settings" field = "#Cam is primary if you have cam sensor" @@ -2599,6 +2624,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} field = "Cam Sync/VVT input", camInputs1 + panel = triggerInputComparator dialog = allPinsSensors, "Sensors" field = "CLT ADC input", clt_adcChannel @@ -2962,6 +2988,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "RPM dead zone to deactivate IAC pid", idlePidRpmDeadZone field = "RPM upper limit to deactivate IAC pid",idlePidRpmUpperLimit field = "PID Extra for low RPM", pidExtraForLowRpm + field = "Use IAC PID Multiplier Table", useIacPidMultTable dialog = idleSettings, "", yAxis diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 0d704ecf2b..39cd58aab3 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -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 integration/rusefi_config.txt Mon Dec 02 20:26:18 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Wed Dec 04 00:38:11 EST 2019 pageSize = 20000 page = 1 @@ -569,7 +569,7 @@ page = 1 useAdvanceCorrectionsForCranking= bits, U32, 1476, [18:18], "false", "true" useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true" etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true" - unused_1484_bit_21 = bits, U32, 1476, [21:21], "false", "true" + useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true" unused_1484_bit_22 = bits, U32, 1476, [22:22], "false", "true" unused_1484_bit_23 = bits, U32, 1476, [23:23], "false", "true" unused_1484_bit_24 = bits, U32, 1476, [24:24], "false", "true" @@ -904,7 +904,10 @@ page = 1 ;no TS info - skipping unusuedvref offset 4016 ;no TS info - skipping unusuedsw offset 4020 ;no TS info - skipping alFIn offset 4024 -;no TS info - skipping unusedSpiPadding3 offset 4036 + triggerCompCenterVolt = scalar, U08, 4036, "V", 0.02, 0, 0.0, 5.1, 2 + triggerCompHystMin = scalar, U08, 4037, "V", 0.02, 0, 0.0, 5.1, 2 + triggerCompHystMax = scalar, U08, 4038, "V", 0.02, 0, 0.0, 5.1, 2 + triggerCompSensorSatRpm = scalar, U08, 4039, "RPM", 50, 0, 0.0, 12000.0, 0 idleRpmPid2_pFactor = scalar, F32, 4040, "", 1, 0, -10000, 10000, 4 idleRpmPid2_iFactor = scalar, F32, 4044, "", 1, 0, -10000, 10000, 4 idleRpmPid2_dFactor = scalar, F32, 4048, "", 1, 0, -10000, 10000, 4 @@ -1066,6 +1069,7 @@ page = 1 useSeparateAdvanceForCranking = "This activates a separate advance table for cranking conditions, this allows cranking advance to be RPM dependant." useAdvanceCorrectionsForCranking = "This enables the various ignition corrections during cranking (IAT, CLT, FSIO and PID idle)." useTPSAdvanceTable = "This flag allows to use TPS for ignition lookup while in Speed Density Fuel Mode" + useIacPidMultTable = "This flag allows to use a special 'PID Multiplier' table (0.0-1.0) to compensate for nonlinear nature of IAC-RPM controller" idlePidRpmUpperLimit = "Relative to the target idle RPM" primeInjFalloffTemperature = "This sets the temperature above which no priming pulse is used, The value at -40 is reduced until there is no more priming injection at this temperature." ignMathCalculateAtIndex = "At what trigger index should some ignition-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -1102,6 +1106,10 @@ page = 1 idlePidFalloffDeltaRpm = "Taper out idle timing control over this range as the engine leaves idle conditions" tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" + triggerCompCenterVolt = "Trigger comparator center point voltage" + triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" + triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" + triggerCompSensorSatRpm = "VR-sensor saturation RPM" ; CONFIG_DEFINITION_END @@ -1753,6 +1761,15 @@ fileVersion = { 20190701 } gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = iacPidMultTbl, iacPidMultMap, "IAC PID Multiplier Table", 1 + ; constant, variable + xBins = iacPidMultRpmBins, RPMValue + yBins = iacPidMultLoadBins, engineLoad + zBins = iacPidMultTable +; gridHeight = 2.0 + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(Later)", "(Sooner)" + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -2173,6 +2190,8 @@ menuDialog = main subMenu = idlehw, "Idle hardware" subMenu = std_separator subMenu = cltIdleRPMCurve, "Target RPM", 0, {idleMode == 0} + subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} + subMenu = std_separator subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} subMenu = std_separator @@ -2591,6 +2610,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Brake pedal switch", brakePedalPin field = "A/C switch", acSwitchAdc + dialog = triggerInputComparator, "Built-in Comparator Settings (Kinetis-only)" + field = "Comparator Center Point Voltage", triggerCompCenterVolt + field = "Comparator hysteresis voltage (Min)", triggerCompHystMin + field = "Comparator hysteresis voltage (Max)", triggerCompHystMax + field = "VR-sensor saturation RPM", triggerCompSensorSatRpm + dialog = triggerInputs, "Trigger Inputs" field = "!ECU reboot needed to apply these settings" field = "#Cam is primary if you have cam sensor" @@ -2599,6 +2624,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} field = "Cam Sync/VVT input", camInputs1 + panel = triggerInputComparator dialog = allPinsSensors, "Sensors" field = "CLT ADC input", clt_adcChannel @@ -2962,6 +2988,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "RPM dead zone to deactivate IAC pid", idlePidRpmDeadZone field = "RPM upper limit to deactivate IAC pid",idlePidRpmUpperLimit field = "PID Extra for low RPM", pidExtraForLowRpm + field = "Use IAC PID Multiplier Table", useIacPidMultTable dialog = idleSettings, "", yAxis diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 4b433b4cf0..8a967633c2 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -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 integration\rusefi_config.txt Mon Dec 02 20:26:10 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:38:02 EST 2019 pageSize = 20000 page = 1 @@ -569,7 +569,7 @@ page = 1 useAdvanceCorrectionsForCranking= bits, U32, 1476, [18:18], "false", "true" useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true" etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true" - unused_1484_bit_21 = bits, U32, 1476, [21:21], "false", "true" + useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true" unused_1484_bit_22 = bits, U32, 1476, [22:22], "false", "true" unused_1484_bit_23 = bits, U32, 1476, [23:23], "false", "true" unused_1484_bit_24 = bits, U32, 1476, [24:24], "false", "true" @@ -904,7 +904,10 @@ page = 1 ;no TS info - skipping unusuedvref offset 4016 ;no TS info - skipping unusuedsw offset 4020 ;no TS info - skipping alFIn offset 4024 -;no TS info - skipping unusedSpiPadding3 offset 4036 + triggerCompCenterVolt = scalar, U08, 4036, "V", 0.02, 0, 0.0, 5.1, 2 + triggerCompHystMin = scalar, U08, 4037, "V", 0.02, 0, 0.0, 5.1, 2 + triggerCompHystMax = scalar, U08, 4038, "V", 0.02, 0, 0.0, 5.1, 2 + triggerCompSensorSatRpm = scalar, U08, 4039, "RPM", 50, 0, 0.0, 12000.0, 0 idleRpmPid2_pFactor = scalar, F32, 4040, "", 1, 0, -10000, 10000, 4 idleRpmPid2_iFactor = scalar, F32, 4044, "", 1, 0, -10000, 10000, 4 idleRpmPid2_dFactor = scalar, F32, 4048, "", 1, 0, -10000, 10000, 4 @@ -1066,6 +1069,7 @@ page = 1 useSeparateAdvanceForCranking = "This activates a separate advance table for cranking conditions, this allows cranking advance to be RPM dependant." useAdvanceCorrectionsForCranking = "This enables the various ignition corrections during cranking (IAT, CLT, FSIO and PID idle)." useTPSAdvanceTable = "This flag allows to use TPS for ignition lookup while in Speed Density Fuel Mode" + useIacPidMultTable = "This flag allows to use a special 'PID Multiplier' table (0.0-1.0) to compensate for nonlinear nature of IAC-RPM controller" idlePidRpmUpperLimit = "Relative to the target idle RPM" primeInjFalloffTemperature = "This sets the temperature above which no priming pulse is used, The value at -40 is reduced until there is no more priming injection at this temperature." ignMathCalculateAtIndex = "At what trigger index should some ignition-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -1102,6 +1106,10 @@ page = 1 idlePidFalloffDeltaRpm = "Taper out idle timing control over this range as the engine leaves idle conditions" tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" + triggerCompCenterVolt = "Trigger comparator center point voltage" + triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" + triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" + triggerCompSensorSatRpm = "VR-sensor saturation RPM" ; CONFIG_DEFINITION_END @@ -1753,6 +1761,15 @@ fileVersion = { 20190701 } gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = iacPidMultTbl, iacPidMultMap, "IAC PID Multiplier Table", 1 + ; constant, variable + xBins = iacPidMultRpmBins, RPMValue + yBins = iacPidMultLoadBins, engineLoad + zBins = iacPidMultTable +; gridHeight = 2.0 + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(Later)", "(Sooner)" + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -2173,6 +2190,8 @@ menuDialog = main subMenu = idlehw, "Idle hardware" subMenu = std_separator subMenu = cltIdleRPMCurve, "Target RPM", 0, {idleMode == 0} + subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} + subMenu = std_separator subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} subMenu = std_separator @@ -2584,6 +2603,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Brake pedal switch", brakePedalPin field = "A/C switch", acSwitchAdc + dialog = triggerInputComparator, "Built-in Comparator Settings (Kinetis-only)" + field = "Comparator Center Point Voltage", triggerCompCenterVolt + field = "Comparator hysteresis voltage (Min)", triggerCompHystMin + field = "Comparator hysteresis voltage (Max)", triggerCompHystMax + field = "VR-sensor saturation RPM", triggerCompSensorSatRpm + dialog = triggerInputs, "Trigger Inputs" field = "!ECU reboot needed to apply these settings" field = "#Cam is primary if you have cam sensor" @@ -2592,6 +2617,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} field = "Cam Sync/VVT input", camInputs1 + panel = triggerInputComparator dialog = allPinsSensors, "Sensors" field = "CLT ADC input", clt_adcChannel @@ -2946,6 +2972,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "RPM dead zone to deactivate IAC pid", idlePidRpmDeadZone field = "RPM upper limit to deactivate IAC pid",idlePidRpmUpperLimit field = "PID Extra for low RPM", pidExtraForLowRpm + field = "Use IAC PID Multiplier Table", useIacPidMultTable dialog = idleSettings, "", yAxis diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index e0979d1b2c..1d5969f383 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -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 integration\rusefi_config.txt Mon Dec 02 20:26:15 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:38:08 EST 2019 pageSize = 20000 page = 1 @@ -569,7 +569,7 @@ page = 1 useAdvanceCorrectionsForCranking= bits, U32, 1476, [18:18], "false", "true" useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true" etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true" - unused_1484_bit_21 = bits, U32, 1476, [21:21], "false", "true" + useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true" unused_1484_bit_22 = bits, U32, 1476, [22:22], "false", "true" unused_1484_bit_23 = bits, U32, 1476, [23:23], "false", "true" unused_1484_bit_24 = bits, U32, 1476, [24:24], "false", "true" @@ -904,7 +904,10 @@ page = 1 ;no TS info - skipping unusuedvref offset 4016 ;no TS info - skipping unusuedsw offset 4020 ;no TS info - skipping alFIn offset 4024 -;no TS info - skipping unusedSpiPadding3 offset 4036 + triggerCompCenterVolt = scalar, U08, 4036, "V", 0.02, 0, 0.0, 5.1, 2 + triggerCompHystMin = scalar, U08, 4037, "V", 0.02, 0, 0.0, 5.1, 2 + triggerCompHystMax = scalar, U08, 4038, "V", 0.02, 0, 0.0, 5.1, 2 + triggerCompSensorSatRpm = scalar, U08, 4039, "RPM", 50, 0, 0.0, 12000.0, 0 idleRpmPid2_pFactor = scalar, F32, 4040, "", 1, 0, -10000, 10000, 4 idleRpmPid2_iFactor = scalar, F32, 4044, "", 1, 0, -10000, 10000, 4 idleRpmPid2_dFactor = scalar, F32, 4048, "", 1, 0, -10000, 10000, 4 @@ -1066,6 +1069,7 @@ page = 1 useSeparateAdvanceForCranking = "This activates a separate advance table for cranking conditions, this allows cranking advance to be RPM dependant." useAdvanceCorrectionsForCranking = "This enables the various ignition corrections during cranking (IAT, CLT, FSIO and PID idle)." useTPSAdvanceTable = "This flag allows to use TPS for ignition lookup while in Speed Density Fuel Mode" + useIacPidMultTable = "This flag allows to use a special 'PID Multiplier' table (0.0-1.0) to compensate for nonlinear nature of IAC-RPM controller" idlePidRpmUpperLimit = "Relative to the target idle RPM" primeInjFalloffTemperature = "This sets the temperature above which no priming pulse is used, The value at -40 is reduced until there is no more priming injection at this temperature." ignMathCalculateAtIndex = "At what trigger index should some ignition-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -1102,6 +1106,10 @@ page = 1 idlePidFalloffDeltaRpm = "Taper out idle timing control over this range as the engine leaves idle conditions" tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" + triggerCompCenterVolt = "Trigger comparator center point voltage" + triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" + triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" + triggerCompSensorSatRpm = "VR-sensor saturation RPM" ; CONFIG_DEFINITION_END @@ -1753,6 +1761,15 @@ fileVersion = { 20190701 } gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = iacPidMultTbl, iacPidMultMap, "IAC PID Multiplier Table", 1 + ; constant, variable + xBins = iacPidMultRpmBins, RPMValue + yBins = iacPidMultLoadBins, engineLoad + zBins = iacPidMultTable +; gridHeight = 2.0 + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(Later)", "(Sooner)" + [GaugeConfigurations] gaugeCategory = Sensors - Extra 2 @@ -2173,6 +2190,8 @@ menuDialog = main subMenu = idlehw, "Idle hardware" subMenu = std_separator subMenu = cltIdleRPMCurve, "Target RPM", 0, {idleMode == 0} + subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} + subMenu = std_separator subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} subMenu = std_separator @@ -2587,6 +2606,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Brake pedal switch", brakePedalPin field = "A/C switch", acSwitchAdc + dialog = triggerInputComparator, "Built-in Comparator Settings (Kinetis-only)" + field = "Comparator Center Point Voltage", triggerCompCenterVolt + field = "Comparator hysteresis voltage (Min)", triggerCompHystMin + field = "Comparator hysteresis voltage (Max)", triggerCompHystMax + field = "VR-sensor saturation RPM", triggerCompSensorSatRpm + dialog = triggerInputs, "Trigger Inputs" field = "!ECU reboot needed to apply these settings" field = "#Cam is primary if you have cam sensor" @@ -2595,6 +2620,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} field = "Cam Sync/VVT input", camInputs1 + panel = triggerInputComparator dialog = allPinsSensors, "Sensors" field = "CLT ADC input", clt_adcChannel @@ -2958,6 +2984,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "RPM dead zone to deactivate IAC pid", idlePidRpmDeadZone field = "RPM upper limit to deactivate IAC pid",idlePidRpmUpperLimit field = "PID Extra for low RPM", pidExtraForLowRpm + field = "Use IAC PID Multiplier Table", useIacPidMultTable dialog = idleSettings, "", yAxis diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index b97ed051ff..38a42d7a6a 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/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 integration\rusefi_config.txt Mon Dec 02 16:11:57 EST 2019 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:37:59 EST 2019 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1222,6 +1222,10 @@ public class Fields { public static final int trigger_unusedCustomNeedSecondTriggerInput_offset_hex = 210; public static final int trigger_useOnlyFirstChannel_offset = 528; public static final int trigger_useOnlyFirstChannel_offset_hex = 210; + public static final int triggerCompCenterVolt_offset = 4036; + public static final int triggerCompHystMax_offset = 4038; + public static final int triggerCompHystMin_offset = 4037; + public static final int triggerCompSensorSatRpm_offset = 4039; public static final int triggerErrorPin_offset = 828; public static final int triggerErrorPinMode_offset = 829; public static final int triggerInputPins1_offset = 700; @@ -1245,7 +1249,6 @@ public class Fields { public static final int unused1059_offset = 3964; public static final int unused1234234_offset = 2042; public static final int unused556_offset = 681; - public static final int unused_1484_bit_21_offset = 1476; public static final int unused_1484_bit_22_offset = 1476; public static final int unused_1484_bit_23_offset = 1476; public static final int unused_1484_bit_24_offset = 1476; @@ -1267,7 +1270,6 @@ public class Fields { public static final int unusedFormerWarmupAfrPid_offset = 1768; public static final int unusedHereo_wires_offset = 76; public static final int unusedOldWarmupAfr_offset = 744; - public static final int unusedSpiPadding3_offset = 4036; public static final int unusedSpiPadding4_offset = 2593; public static final int unusedSpiPadding5_offset = 2713; public static final int unusedSpiPadding7_offset = 4005; @@ -1292,6 +1294,7 @@ public class Fields { public static final int useFSIO6ForRevLimiter_offset = 1464; public static final int useFSIO8ForServo1_offset = 1464; public static final int useFSIO9ForServo2_offset = 1464; + public static final int useIacPidMultTable_offset = 1476; public static final int useIacTableForCoasting_offset = 744; public static final int useIdleTimingPidControl_offset = 744; public static final int useInstantRpmForIdle_offset = 76; @@ -1810,7 +1813,7 @@ public class Fields { public static final Field USEADVANCECORRECTIONSFORCRANKING = Field.create("USEADVANCECORRECTIONSFORCRANKING", 1476, FieldType.BIT, 18); public static final Field USETPSADVANCETABLE = Field.create("USETPSADVANCETABLE", 1476, FieldType.BIT, 19); public static final Field ETBCALIBRATIONONSTART = Field.create("ETBCALIBRATIONONSTART", 1476, FieldType.BIT, 20); - public static final Field UNUSED_1484_BIT_21 = Field.create("UNUSED_1484_BIT_21", 1476, FieldType.BIT, 21); + public static final Field USEIACPIDMULTTABLE = Field.create("USEIACPIDMULTTABLE", 1476, FieldType.BIT, 21); public static final Field UNUSED_1484_BIT_22 = Field.create("UNUSED_1484_BIT_22", 1476, FieldType.BIT, 22); public static final Field UNUSED_1484_BIT_23 = Field.create("UNUSED_1484_BIT_23", 1476, FieldType.BIT, 23); public static final Field UNUSED_1484_BIT_24 = Field.create("UNUSED_1484_BIT_24", 1476, FieldType.BIT, 24); @@ -2109,6 +2112,10 @@ public class Fields { public static final Field IDLERPMPID_ITERMMAX = Field.create("IDLERPMPID_ITERMMAX", 4006, FieldType.INT16); public static final Field MC33972SPIDEVICE = Field.create("MC33972SPIDEVICE", 4008, FieldType.INT8); public static final Field ETBIDLETHROTTLERANGE = Field.create("ETBIDLETHROTTLERANGE", 4012, FieldType.FLOAT); + public static final Field TRIGGERCOMPCENTERVOLT = Field.create("TRIGGERCOMPCENTERVOLT", 4036, FieldType.INT8); + public static final Field TRIGGERCOMPHYSTMIN = Field.create("TRIGGERCOMPHYSTMIN", 4037, FieldType.INT8); + public static final Field TRIGGERCOMPHYSTMAX = Field.create("TRIGGERCOMPHYSTMAX", 4038, FieldType.INT8); + public static final Field TRIGGERCOMPSENSORSATRPM = Field.create("TRIGGERCOMPSENSORSATRPM", 4039, FieldType.INT8); public static final Field IDLERPMPID2_PFACTOR = Field.create("IDLERPMPID2_PFACTOR", 4040, FieldType.FLOAT); public static final Field IDLERPMPID2_IFACTOR = Field.create("IDLERPMPID2_IFACTOR", 4044, FieldType.FLOAT); public static final Field IDLERPMPID2_DFACTOR = Field.create("IDLERPMPID2_DFACTOR", 4048, FieldType.FLOAT); @@ -2610,7 +2617,7 @@ public class Fields { USEADVANCECORRECTIONSFORCRANKING, USETPSADVANCETABLE, ETBCALIBRATIONONSTART, - UNUSED_1484_BIT_21, + USEIACPIDMULTTABLE, UNUSED_1484_BIT_22, UNUSED_1484_BIT_23, UNUSED_1484_BIT_24, @@ -2904,6 +2911,10 @@ public class Fields { IDLERPMPID_ITERMMAX, MC33972SPIDEVICE, ETBIDLETHROTTLERANGE, + TRIGGERCOMPCENTERVOLT, + TRIGGERCOMPHYSTMIN, + TRIGGERCOMPHYSTMAX, + TRIGGERCOMPSENSORSATRPM, IDLERPMPID2_PFACTOR, IDLERPMPID2_IFACTOR, IDLERPMPID2_DFACTOR,