noisymime
/
speeduino
mirror of https://github.com/noisymime/speeduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issue where PWM idle could fail to load at startup

This commit is contained in:
Josh Stewart 2018-04-08 14:40:12 +10:00
parent 8d7370e0df
commit 18556718b1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
speeduino/idle.ino
View File

@ -203,6 +203,7 @@ void initialiseIdle()
void idleControl() void idleControl()
{ {
if(idleInitComplete != configPage6.iacAlgorithm) { initialiseIdle(); } if(idleInitComplete != configPage6.iacAlgorithm) { initialiseIdle(); }
if(currentStatus.RPM > 0) { enableIdle(); }
switch(configPage6.iacAlgorithm) switch(configPage6.iacAlgorithm)
{ {
@ -224,6 +225,7 @@ void idleControl()
{ {
//Currently cranking. Use the cranking table //Currently cranking. Use the cranking table
currentStatus.idleDuty = table2D_getValue(&iacCrankDutyTable, currentStatus.coolant + CALIBRATION_TEMPERATURE_OFFSET); //All temps are offset by 40 degrees currentStatus.idleDuty = table2D_getValue(&iacCrankDutyTable, currentStatus.coolant + CALIBRATION_TEMPERATURE_OFFSET); //All temps are offset by 40 degrees
if( currentStatus.idleDuty == 0 ) { disableIdle(); break; }
idle_pwm_target_value = percentage(currentStatus.idleDuty, idle_pwm_max_count); idle_pwm_target_value = percentage(currentStatus.idleDuty, idle_pwm_max_count);
idleOn = true; idleOn = true;
} }
@ -232,7 +234,6 @@ void idleControl()
//Standard running //Standard running
currentStatus.idleDuty = table2D_getValue(&iacPWMTable, currentStatus.coolant + CALIBRATION_TEMPERATURE_OFFSET); //All temps are offset by 40 degrees currentStatus.idleDuty = table2D_getValue(&iacPWMTable, currentStatus.coolant + CALIBRATION_TEMPERATURE_OFFSET); //All temps are offset by 40 degrees
if( currentStatus.idleDuty == 0 ) { disableIdle(); break; } if( currentStatus.idleDuty == 0 ) { disableIdle(); break; }
enableIdle();
idle_pwm_target_value = percentage(currentStatus.idleDuty, idle_pwm_max_count); idle_pwm_target_value = percentage(currentStatus.idleDuty, idle_pwm_max_count);
currentStatus.idleLoad = currentStatus.idleDuty >> 1; currentStatus.idleLoad = currentStatus.idleDuty >> 1;
idleOn = true; idleOn = true;
@ -247,7 +248,6 @@ void idleControl()
idlePID.Compute(); idlePID.Compute();
idle_pwm_target_value = idle_pid_target_value; idle_pwm_target_value = idle_pid_target_value;
if( idle_pwm_target_value == 0 ) { disableIdle(); } if( idle_pwm_target_value == 0 ) { disableIdle(); }
else{ enableIdle(); } //Turn on the C compare unit (ie turn on the interrupt)
currentStatus.idleLoad = ((unsigned long)(idle_pwm_target_value * 100UL) / idle_pwm_max_count) >> 1; currentStatus.idleLoad = ((unsigned long)(idle_pwm_target_value * 100UL) / idle_pwm_max_count) >> 1;
//idle_pwm_target_value = 104; //idle_pwm_target_value = 104;
@ -459,6 +459,4 @@ static inline void idleInterrupt() //Most ARM chips can simply call a function
idle_pwm_cur_value = idle_pwm_target_value; idle_pwm_cur_value = idle_pwm_target_value;
idle_pwm_state = true; idle_pwm_state = true;
} }
} }