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

Move overdwell calc out of the 1ms timer

This commit is contained in:
Josh Stewart 2016-11-21 16:46:13 +11:00
parent 6c8fbcf228
commit 573036126e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
timers.h
View File

@ -21,8 +21,8 @@ Hence we will preload the timer with 131 cycles to leave 125 until overflow (1ms
volatile int loop250ms;
volatile int loopSec;
volatile unsigned long targetOverdwellTime;
volatile unsigned long targetTachoPulseTime;
volatile unsigned int dwellLimit_uS;
#if defined (CORE_TEENSY)
IntervalTimer lowResTimer;

10
timers.ino
View File

@ -30,6 +30,8 @@ void initialiseTimers()
//Uses the PIT timer on Teensy.
lowResTimer.begin(oneMSInterval, 1000);
#endif
dwellLimit_uS = (1000 * configPage2.dwellLimit);
}
@ -46,9 +48,13 @@ void oneMSInterval() //Most ARM chips can simply call a function
loop250ms++;
loopSec++;
//volatile unsigned long targetOverdwellTime;
//volatile unsigned long targetTachoPulseTime;
unsigned long targetOverdwellTime;
unsigned long targetTachoPulseTime;
//Overdwell check
targetOverdwellTime = micros() - (1000 * configPage2.dwellLimit); //Set a target time in the past that all coil charging must have begun after. If the coil charge began before this time, it's been running too long
targetOverdwellTime = micros() - dwellLimit_uS; //Set a target time in the past that all coil charging must have begun after. If the coil charge began before this time, it's been running too long
targetTachoPulseTime = micros() - (1500);
//Check first whether each spark output is currently on. Only check it's dwell time if it is
if(ignitionSchedule1.Status == RUNNING) { if(ignitionSchedule1.startTime < targetOverdwellTime && configPage2.useDwellLim) { endCoil1Charge(); } if(ignitionSchedule1.startTime < targetTachoPulseTime) { digitalWrite(pinTachOut, HIGH); } }
@ -68,6 +74,8 @@ void oneMSInterval() //Most ARM chips can simply call a function
{
loopSec = 0; //Reset counter.
dwellLimit_uS = (1000 * configPage2.dwellLimit); //Update uS value incase setting has changed
//**************************************************************************************************************************************************
//This updates the runSecs variable
//If the engine is running or cranking, we need ot update the run time counter.