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

Allow mega2560 builds with non-standard _CHANNELS values

This commit is contained in:
Josh Stewart 2023-10-06 20:43:15 +11:00
parent fc536d15f0
commit 55c98cab22
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
speeduino/init.cpp
View File

@ -746,7 +746,9 @@ void initialiseAll(void)
channel2IgnDegrees = 72; channel2IgnDegrees = 72;
channel3IgnDegrees = 144; channel3IgnDegrees = 144;
channel4IgnDegrees = 216; channel4IgnDegrees = 216;
#if (IGN_CHANNELS >= 5)
channel5IgnDegrees = 288; channel5IgnDegrees = 288;
#endif
maxIgnOutputs = 5; //Only 4 actual outputs, so that's all that can be cut maxIgnOutputs = 5; //Only 4 actual outputs, so that's all that can be cut
maxInjOutputs = 4; //Is updated below to 5 if there are enough channels maxInjOutputs = 4; //Is updated below to 5 if there are enough channels
@ -755,7 +757,9 @@ void initialiseAll(void)
channel2IgnDegrees = 144; channel2IgnDegrees = 144;
channel3IgnDegrees = 288; channel3IgnDegrees = 288;
channel4IgnDegrees = 432; channel4IgnDegrees = 432;
#if (IGN_CHANNELS >= 5)
channel5IgnDegrees = 576; channel5IgnDegrees = 576;
#endif
CRANK_ANGLE_MAX_IGN = 720; CRANK_ANGLE_MAX_IGN = 720;
} }
@ -879,9 +883,8 @@ void initialiseAll(void)
channel8InjDegrees = channel4InjDegrees; channel8InjDegrees = channel4InjDegrees;
#else #else
//This is an invalid config as there are not enough outputs to support sequential + staging //This is an invalid config as there are not enough outputs to support sequential + staging
//Put the staging output to the non-existant channel 7 //No staging output will be active
maxInjOutputs = 7; maxInjOutputs = 6;
channel7InjDegrees = channel1InjDegrees;
#endif #endif
} }
} }

2
speeduino/speeduino.ino
View File

@ -1405,7 +1405,9 @@ void calculateIgnitionAngles(int dwellAngle)
calculateIgnitionAngle(dwellAngle, channel2IgnDegrees, currentStatus.advance, &ignition2EndAngle, &ignition2StartAngle); calculateIgnitionAngle(dwellAngle, channel2IgnDegrees, currentStatus.advance, &ignition2EndAngle, &ignition2StartAngle);
calculateIgnitionAngle(dwellAngle, channel3IgnDegrees, currentStatus.advance, &ignition3EndAngle, &ignition3StartAngle); calculateIgnitionAngle(dwellAngle, channel3IgnDegrees, currentStatus.advance, &ignition3EndAngle, &ignition3StartAngle);
calculateIgnitionAngle(dwellAngle, channel4IgnDegrees, currentStatus.advance, &ignition4EndAngle, &ignition4StartAngle); calculateIgnitionAngle(dwellAngle, channel4IgnDegrees, currentStatus.advance, &ignition4EndAngle, &ignition4StartAngle);
#if (IGN_CHANNELS >= 5)
calculateIgnitionAngle(dwellAngle, channel5IgnDegrees, currentStatus.advance, &ignition5EndAngle, &ignition5StartAngle); calculateIgnitionAngle(dwellAngle, channel5IgnDegrees, currentStatus.advance, &ignition5EndAngle, &ignition5StartAngle);
#endif
break; break;
//6 cylinders //6 cylinders
case 6: case 6: