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

Apply ignition schedule improvements to ch3/4 channels

This commit is contained in:
Josh Stewart 2015-12-09 23:00:52 +11:00
parent ce365c5bd5
commit 5d59af7e61
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
speeduino.ino
View File

@ -1028,27 +1028,42 @@ void loop()
tempCrankAngle = crankAngle - channel3IgnDegrees; tempCrankAngle = crankAngle - channel3IgnDegrees;
if( tempCrankAngle < 0) { tempCrankAngle += 360; } if( tempCrankAngle < 0) { tempCrankAngle += 360; }
tempStartAngle = ignition3StartAngle - channel3IgnDegrees; tempStartAngle = ignition3StartAngle - channel3IgnDegrees;
if ( tempStartAngle < 0) { tempStartAngle += 360; } //if ( tempStartAngle < 0) { tempStartAngle += 360; }
if (tempStartAngle > tempCrankAngle) //if (tempStartAngle > tempCrankAngle)
{ {
long ignition3StartTime = 0;
if(tempStartAngle > tempCrankAngle) { ignition3StartTime = ((unsigned long)(tempStartAngle - tempCrankAngle) * (unsigned long)timePerDegree); }
//else if (tempStartAngle < tempCrankAngle) { ignition4StartTime = ((long)(360 - tempCrankAngle + tempStartAngle) * (long)timePerDegree); }
else { ignition3StartTime = 0; }
if(ignition3StartTime > 0) {
setIgnitionSchedule3(ign3StartFunction, setIgnitionSchedule3(ign3StartFunction,
((unsigned long)(tempStartAngle - tempCrankAngle) * (unsigned long)timePerDegree), ignition3StartTime,
currentStatus.dwell, currentStatus.dwell,
ign3EndFunction ign3EndFunction
); );
}
} }
tempCrankAngle = crankAngle - channel4IgnDegrees; tempCrankAngle = crankAngle - channel4IgnDegrees;
if( tempCrankAngle < 0) { tempCrankAngle += 360; } if( tempCrankAngle < 0) { tempCrankAngle += 360; }
tempStartAngle = ignition4StartAngle - channel4IgnDegrees; tempStartAngle = ignition4StartAngle - channel4IgnDegrees;
if ( tempStartAngle < 0) { tempStartAngle += 360; } //if ( tempStartAngle < 0) { tempStartAngle += 360; }
if (tempStartAngle > tempCrankAngle) //if (tempStartAngle > tempCrankAngle)
{ {
long ignition4StartTime = 0;
if(tempStartAngle > tempCrankAngle) { ignition4StartTime = ((unsigned long)(tempStartAngle - tempCrankAngle) * (unsigned long)timePerDegree); }
//else if (tempStartAngle < tempCrankAngle) { ignition4StartTime = ((long)(360 - tempCrankAngle + tempStartAngle) * (long)timePerDegree); }
else { ignition4StartTime = 0; }
if(ignition4StartTime > 0) {
setIgnitionSchedule4(ign4StartFunction, setIgnitionSchedule4(ign4StartFunction,
((unsigned long)(tempStartAngle - tempCrankAngle) * (unsigned long)timePerDegree), ignition4StartTime,
currentStatus.dwell, currentStatus.dwell,
ign4EndFunction ign4EndFunction
); );
}
} }
} }