updates on MAP_UPPER_LIMIT, change from uint8 to uint16 (#7064)

This commit is contained in:
Diego 2024-11-12 10:26:36 -03:00 committed by GitHub
parent 62e46e8c79
commit 7c43b04959
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 18 deletions

View File

@ -129,8 +129,8 @@ struct_no_prefix engine_configuration_s
! air cooled engines go up to 250, see community board firmware which has that
! PnP boards for liquid cooled engines should override with '120'
#define CLT_UPPER_LIMIT 250
! technical debt: some of these use uint8_t !!!
#define MAP_UPPER_LIMIT 255
#define MAP_UPPER_LIMIT 1000
#define LUA_PWM_COUNT 8
#define LUA_DIGITAL_INPUT_COUNT 8
@ -270,8 +270,8 @@ end_struct
struct stft_s
uint8_t autoscale maxIdleRegionRpm;Below this RPM, the idle region is active, idle+300 would be a good value;"RPM", 50, 0, 0, 12000, 0
uint8_t maxOverrunLoad;Below this engine load, the overrun region is active;"load", 1, 0, 0, 250, 0
uint8_t minPowerLoad;Above this engine load, the power region is active;"load", 1, 0, 0, 250, 0
uint16_t maxOverrunLoad;Below this engine load, the overrun region is active;"load", 1, 0, 0, 250, 0
uint16_t minPowerLoad;Above this engine load, the power region is active;"load", 1, 0, 0, 250, 0
uint8_t autoscale deadband;When close to correct AFR, pause correction. This can improve stability by not changing the adjustment if the error is extremely small, but is not required.;"%", 0.1, 0, 0, 3, 1
int8_t minClt;Below this temperature, correction is disabled.;"C", 1, 0, -20, 100, 0
@ -595,7 +595,7 @@ injection_mode_e injectionMode;This is where the fuel injection type is defined:
uint16_t boostControlMinRpm; Minimum RPM to enable boost control. Use this to avoid solenoid noise at idle, and help spool in some cases.;"", 1, 0, 0, 25000, 0
uint8_t boostControlMinTps; Minimum TPS to enable boost control. Use this to avoid solenoid noise at idle, and help spool in some cases.;"", 1, 0, 0, 100, 0
uint8_t boostControlMinMap; Minimum MAP to enable boost control. Use this to avoid solenoid noise at idle, and help spool in some cases.;"", 1, 0, 0, 250, 0
uint16_t boostControlMinMap; Minimum MAP to enable boost control. Use this to avoid solenoid noise at idle, and help spool in some cases.;"", 1, 0, 0, @@MAP_UPPER_LIMIT@@, 0
angle_t crankingTimingAngle;Ignition advance angle used during engine cranking, 5-10 degrees will work as a base setting for most engines.\nThere is tapering towards running timing advance\nset cranking_timing_angle X;"deg", 1, 0, -30, 30, 0
@ -796,7 +796,7 @@ spi_device_e digitalPotentiometerSpiDevice;Digital Potentiometer is used by stoc
pin_output_mode_e o2heaterPinModeTodO;
uint8_t autoscale lambdaProtectionMinRpm;;"RPM", 100, 0, 0, 25000, 0
uint8_t autoscale lambdaProtectionMinLoad;;"%", 10, 0, 0, 1000, 0
uint8_t autoscale lambdaProtectionMinLoad;;"%", 10, 0, 0, @@MAP_UPPER_LIMIT@@, 0
bit is_enabled_spi_1
bit is_enabled_spi_2
@ -843,7 +843,7 @@ pin_output_mode_e hip9011IntHoldPinMode;
uint32_t verboseCanBaseAddress;;"", 1, 0, 0, 536870911, 0
uint8_t mc33_hvolt;Boost Voltage;"v", 1, 0, 40, 70, 0
uint8_t minimumBoostClosedLoopMap;Minimum MAP before closed loop boost is enabled. Use to prevent misbehavior upon entering boost.;"kPa", 1, 0, 0, @@MAP_UPPER_LIMIT@@, 0
uint16_t minimumBoostClosedLoopMap;Minimum MAP before closed loop boost is enabled. Use to prevent misbehavior upon entering boost.;"kPa", 1, 0, 0, @@MAP_UPPER_LIMIT@@, 0
int8_t initialIgnitionCutPercent;;"%", 1, 0, 0, 100, 0
int8_t finalIgnitionCutPercentBeforeLaunch;;"%", 1, 0, 0, 100, 0
@ -1293,7 +1293,7 @@ int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\
uint16_t autoscale benchTestOnTime;Duration of each test pulse;"ms", 0.01, 0, 0, 500, 2
uint8_t lambdaProtectionRestoreTps;;"%", 1, 0, 0, 100, 0
uint8_t autoscale lambdaProtectionRestoreLoad;;"%", 10, 0, 0, 1000, 0
uint8_t autoscale lambdaProtectionRestoreLoad;;"%", 10, 0, 0, @@MAP_UPPER_LIMIT@@, 0
pin_input_mode_e launchActivatePinMode;
Gpio can2TxPin
@ -1309,8 +1309,7 @@ int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\
output_pin_e hpfpValvePin;
pin_output_mode_e hpfpValvePinMode;
! todo: reuse @@MAP_UPPER_LIMIT@@ once we are above uint8?
float boostCutPressure;MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut.;"kPa (absolute)", 1, 0, 0, 1000, 0
float boostCutPressure;MAP value above which fuel is cut in case of overboost.\nSet to 0 to disable overboost cut.;"kPa (absolute)", 1, 0, 0, @@MAP_UPPER_LIMIT@@, 0
uint8_t[16] autoscale tchargeBins;;"kg/h", 5, 0, 0, 1200, 0
uint8_t[16] autoscale tchargeValues;;"ratio", 0.01, 0, 0, 1, 2
@ -1836,35 +1835,34 @@ float[MAF_DECODING_COUNT] mafDecodingBins;;"V", 1, 0, -5, 150, 2
int8_t[8 x 8] autoscale ignitionIatCorrTable;;"deg", 0.1, 0, -25, 25, 1
int8_t[8] ignitionIatCorrTempBins;;"C", 1, 0, -40, 120, 0
uint8_t[8] autoscale ignitionIatCorrLoadBins;;"Load", 5, 0, 0, 1000, 0
uint8_t[8] autoscale ignitionIatCorrLoadBins;;"Load", 5, 0, 0, @@MAP_UPPER_LIMIT@@, 0
int16_t[FUEL_LOAD_COUNT x FUEL_RPM_COUNT] injectionPhase;;"deg", 1, 0, -720, 720, 0
uint16_t[FUEL_LOAD_COUNT] injPhaseLoadBins;;"Load", 1, 0, 0, 1000, 0
uint16_t[FUEL_LOAD_COUNT] injPhaseLoadBins;;"Load", 1, 0, 0, @@MAP_UPPER_LIMIT@@, 0
uint16_t[FUEL_RPM_COUNT] injPhaseRpmBins;;"RPM", 1, 0, 0, 18000, 0
uint8_t[TCU_SOLENOID_COUNT x TCU_GEAR_COUNT] tcuSolenoidTable;;"onoff", 1, 0, 0, 1, 0
! todo: reuse @@MAP_UPPER_LIMIT@@ once we are above uint8?
uint16_t[FUEL_LOAD_COUNT x FUEL_RPM_COUNT] autoscale mapEstimateTable;;"kPa", 0.01, 0, 0, 600, 2
uint16_t[FUEL_LOAD_COUNT x FUEL_RPM_COUNT] autoscale mapEstimateTable;;"kPa", 0.01, 0, 0, @@MAP_UPPER_LIMIT@@, 2
uint16_t[FUEL_LOAD_COUNT] autoscale mapEstimateTpsBins;;"% TPS", {1/@@TPS_2_BYTE_PACKING_MULT@@}, 0, 0, 100, 1
uint16_t[FUEL_RPM_COUNT] mapEstimateRpmBins;;"RPM", 1, 0, 0, 18000, 0
#define VVT_TABLE_SIZE 8
int8_t[VVT_TABLE_SIZE x VVT_TABLE_SIZE] vvtTable1;;"value", 1, 0, -125, 125, 0
uint16_t[VVT_TABLE_SIZE] vvtTable1LoadBins;;"L", 1, 0, 0, 1000, 0
uint16_t[VVT_TABLE_SIZE] vvtTable1LoadBins;;"L", 1, 0, 0, @@MAP_UPPER_LIMIT@@, 0
uint16_t[VVT_TABLE_SIZE] vvtTable1RpmBins;;"RPM", 1, 0, 0, 18000, 0
int8_t[VVT_TABLE_SIZE x VVT_TABLE_SIZE] vvtTable2;;"value", 1, 0, -125, 125, 0
uint16_t[VVT_TABLE_SIZE] vvtTable2LoadBins;;"L", 1, 0, 0, 1000, 0
uint16_t[VVT_TABLE_SIZE] vvtTable2LoadBins;;"L", 1, 0, 0, @@MAP_UPPER_LIMIT@@, 0
uint16_t[VVT_TABLE_SIZE] vvtTable2RpmBins;;"RPM", 1, 0, 0, 18000, 0
int16_t[IGN_LOAD_COUNT x IGN_RPM_COUNT] autoscale ignitionTable;;"deg", 0.1, 0, -20, 90, 1
uint16_t[IGN_LOAD_COUNT] ignitionLoadBins;;"Load", 1, 0, 0, 1000, 0
uint16_t[IGN_LOAD_COUNT] ignitionLoadBins;;"Load", 1, 0, 0, @@MAP_UPPER_LIMIT@@, 0
uint16_t[IGN_RPM_COUNT] ignitionRpmBins;;"RPM", 1, 0, 0, 18000, 0
uint16_t[FUEL_LOAD_COUNT x FUEL_RPM_COUNT] autoscale veTable;;"%", 0.1, 0, 0, 999, 1
uint16_t[FUEL_LOAD_COUNT] veLoadBins;;{bitStringValue(fuelUnits, fuelAlgorithm) }, 1, 0, 0, 1000, 0
uint16_t[FUEL_LOAD_COUNT] veLoadBins;;{bitStringValue(fuelUnits, fuelAlgorithm) }, 1, 0, 0, @@MAP_UPPER_LIMIT@@, 0
uint16_t[FUEL_RPM_COUNT] veRpmBins;;"RPM", 1, 0, 0, 18000, 0
#if LAMBDA