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

Fix linker error on last commit

This commit is contained in:
Josh Stewart 2020-03-18 00:10:13 +11:00
parent bc67453098
commit 6396ee551d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
speeduino/speeduino.h
View File

@ -18,11 +18,13 @@ byte getVE1();
byte getVE2();
byte getAdvance();
uint16_t calculateInjectorStartAngle(unsigned int, int);
uint16_t calculateInjectorStartAngle(uint16_t, int16_t);
/*
uint16_t calculateInjector2StartAngle(unsigned int);
uint16_t calculateInjector3StartAngle(unsigned int);
uint16_t calculateInjector4StartAngle(unsigned int);
uint16_t calculateInjector5StartAngle(unsigned int);
*/
void calculateIgnitionAngles(int);
/*

4
speeduino/speeduino.ino
View File

@ -1288,6 +1288,7 @@ byte getAdvance()
return tempAdvance;
}
/*
uint16_t calculateInjector2StartAngle(unsigned int PWdivTimerPerDegree)
{
uint16_t tempInjector2StartAngle = (currentStatus.injAngle + channel2InjDegrees); //This makes the start angle equal to the end angle
@ -1297,8 +1298,9 @@ uint16_t calculateInjector2StartAngle(unsigned int PWdivTimerPerDegree)
return tempInjector2StartAngle;
}
*/
uint16_t calculateInjectorStartAngle(unsigned int PWdivTimerPerDegree, int16_t injChannelDegrees)
uint16_t calculateInjectorStartAngle(uint16_t PWdivTimerPerDegree, int16_t injChannelDegrees)
{
uint16_t tempInjectorStartAngle = (currentStatus.injAngle + injChannelDegrees);
if(tempInjectorStartAngle < PWdivTimerPerDegree) { tempInjectorStartAngle += CRANK_ANGLE_MAX_INJ; }