Cleanup from last commit

This commit is contained in:
Josh Stewart 2020-03-25 22:08:08 +11:00
parent 4ca428e61e
commit e6cf7b57cb
3 changed files with 8 additions and 5 deletions

View File

@ -334,7 +334,7 @@ page = 1
idleAdvTPS = scalar, U08, 94, "%", 1, 0, 0, 120, 0
injAngRPM = array, U08, 95, [4], "RPM" 100, 0.0, 100, 10000, 0
idleTaperSize = scalar, U08, 99, "S", 0.1, 0.0, 0.0, 25.5, 1
idleTaperTime = scalar, U08, 99, "S", 0.1, 0.0, 0.0, 25.5, 1
unused2-95 = array, U08, 100, [28], "%", 1.0, 0.0, 0.0, 255, 0
;Page 2 is the fuel map and axis bins only

View File

@ -641,7 +641,7 @@ struct config2 {
byte injAngRPM[4];
byte idleTaperSize;
byte idleTaperTime;
byte unused2_95[28];

View File

@ -217,20 +217,23 @@ void idleControl()
}
else
{
//Standard running
if ( runSecsX10 < configPage2.idleTaperSize )
if ( runSecsX10 < configPage2.idleTaperTime )
{
currentStatus.idleDuty = map(runSecsX10, 0, configPage2.idleTaperSize,\
//Tapering between cranking IAC value and running
currentStatus.idleDuty = map(runSecsX10, 0, configPage2.idleTaperTime,\
table2D_getValue(&iacCrankDutyTable, currentStatus.coolant + CALIBRATION_TEMPERATURE_OFFSET),\
table2D_getValue(&iacPWMTable, currentStatus.coolant + CALIBRATION_TEMPERATURE_OFFSET));
}
else
{
//Standard running
currentStatus.idleDuty = table2D_getValue(&iacPWMTable, currentStatus.coolant + CALIBRATION_TEMPERATURE_OFFSET); //All temps are offset by 40 degrees
}
}
if(currentStatus.idleUpActive == true) { currentStatus.idleDuty += configPage2.idleUpAdder; } //Add Idle Up amount if active
if( currentStatus.idleDuty > 100 ) { currentStatus.idleDuty = 100; } //Safety Check
if( currentStatus.idleDuty == 0 )
{
disableIdle();