Move to new ignition corrections system

This commit is contained in:
Josh Stewart 2016-12-30 08:32:22 +11:00
parent a80ff171f5
commit 1dcc62ed5e
2 changed files with 4 additions and 3 deletions

View File

@ -146,7 +146,7 @@ struct statuses {
byte afrTarget;
byte idleDuty;
bool fanOn; //Whether or not the fan is turned on
byte ethanolPct; //Ethanol reading (if enabled). 0 = No ethanol, 100 = pure ethanol. Eg E85 = 85.
volatile byte ethanolPct; //Ethanol reading (if enabled). 0 = No ethanol, 100 = pure ethanol. Eg E85 = 85.
unsigned long TAEEndTime; //The target end time used whenever TAE is turned on
volatile byte squirt;
volatile byte spark;

View File

@ -967,8 +967,8 @@ void loop()
currentStatus.advance = get3DTableValue(&ignitionTable, currentStatus.TPS, currentStatus.RPM); //As above, but for ignition advance
}
//currentStatus.advance = correctionsIgn(currentStatus.advance);
currentStatus.advance = correctionsIgn(currentStatus.advance);
/*
//Check for fixed ignition angles
if (configPage2.FixAng != 0) { currentStatus.advance = configPage2.FixAng; } //Check whether the user has set a fixed timing angle
if ( BIT_CHECK(currentStatus.engine, BIT_ENGINE_CRANK) ) { currentStatus.advance = configPage2.CrankAng; } //Use the fixed cranking ignition angle
@ -976,6 +976,7 @@ void loop()
byte advanceIATadjust = table2D_getValue(&IATRetardTable, currentStatus.IAT);
if (advanceIATadjust <= currentStatus.advance) { currentStatus.advance -= advanceIATadjust; }
else { currentStatus.advance = 0; }
*/
int injector1StartAngle = 0;
int injector2StartAngle = 0;