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

Rename injector variable to better reflect its purpose

This commit is contained in:
Josh Stewart 2016-01-05 08:00:47 +11:00
parent dff362cc57
commit be51ddf852
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
globals.h
View File

@ -178,7 +178,7 @@ struct config1 {
byte egoType_old : 1; byte egoType_old : 1;
byte algorithm : 1; //"Speed Density", "Alpha-N" byte algorithm : 1; //"Speed Density", "Alpha-N"
byte baroCorr : 1; byte baroCorr : 1;
byte injTiming : 2; byte injLayout : 2;
byte primePulse; byte primePulse;
byte dutyLim; byte dutyLim;

4
reference/speeduino.ini
View File

@ -143,7 +143,7 @@ page = 2
egoTypeOLD = bits, U08, 38, [1:1], "Narrow band", "Wide band" egoTypeOLD = bits, U08, 38, [1:1], "Narrow band", "Wide band"
algorithm = bits, U08, 38, [2:2], "Speed Density", "Alpha-N" algorithm = bits, U08, 38, [2:2], "Speed Density", "Alpha-N"
baroCorr = bits, U08, 38, [3:3], "Off", "On" baroCorr = bits, U08, 38, [3:3], "Off", "On"
injTiming = bits, U08, 38, [4:5], "Bank", "Semi-Sequential", "INVALID", "INVALID" injLayout = bits, U08, 38, [4:5], "Bank", "Semi-Sequential", "INVALID", "INVALID"
primePulse = scalar, U08, 39, "ms", 0.1, 0.0, 0.0, 25.5, 1 primePulse = scalar, U08, 39, "ms", 0.1, 0.0, 0.0, 25.5, 1
dutyLim = scalar, U08, 40, "%", 1.0, 0.0, 0.0, 100.0, 0 dutyLim = scalar, U08, 40, "%", 1.0, 0.0, 0.0, 100.0, 0
@ -567,7 +567,7 @@ page = 8
dialog = engine_constants_south dialog = engine_constants_south
topicHelp = Mhelp topicHelp = Mhelp
field = "Injector Timing", injTiming, { nCylinders <= 4 } field = "Injector Layout", injLayout, { nCylinders <= 4 }
field = "Board Layout", pinLayout field = "Board Layout", pinLayout
field = "MAP Sample method", mapSample field = "MAP Sample method", mapSample

8
speeduino.ino
View File

@ -455,7 +455,7 @@ void setup()
} }
else { channel1InjDegrees = channel2InjDegrees = channel3InjDegrees = 0; } //For simultaneous, all squirts happen at the same time else { channel1InjDegrees = channel2InjDegrees = channel3InjDegrees = 0; } //For simultaneous, all squirts happen at the same time
configPage1.injTiming = 0; //This is a failsafe. We can never run semi-sequential with more than 4 cylinders configPage1.injLayout = 0; //This is a failsafe. We can never run semi-sequential with more than 4 cylinders
break; break;
case 8: case 8:
channel1IgnDegrees = 0; channel1IgnDegrees = 0;
@ -473,7 +473,7 @@ void setup()
} }
else { channel1InjDegrees = channel2InjDegrees = channel3InjDegrees = channel4InjDegrees = 0; } //For simultaneous, all squirts happen at the same time else { channel1InjDegrees = channel2InjDegrees = channel3InjDegrees = channel4InjDegrees = 0; } //For simultaneous, all squirts happen at the same time
configPage1.injTiming = 0; //This is a failsafe. We can never run semi-sequential with more than 4 cylinders configPage1.injLayout = 0; //This is a failsafe. We can never run semi-sequential with more than 4 cylinders
break; break;
default: //Handle this better!!! default: //Handle this better!!!
channel1InjDegrees = 0; channel1InjDegrees = 0;
@ -949,7 +949,7 @@ void loop()
{ {
if (injector1StartAngle > crankAngle) if (injector1StartAngle > crankAngle)
{ {
if (configPage1.injTiming == 1) if (configPage1.injLayout == 1)
{ {
setFuelSchedule1(openInjector1and4, setFuelSchedule1(openInjector1and4,
((unsigned long)(injector1StartAngle - crankAngle) * (unsigned long)timePerDegree), ((unsigned long)(injector1StartAngle - crankAngle) * (unsigned long)timePerDegree),
@ -984,7 +984,7 @@ void loop()
if ( tempStartAngle < 0) { tempStartAngle += 360; } if ( tempStartAngle < 0) { tempStartAngle += 360; }
if (tempStartAngle > tempCrankAngle) if (tempStartAngle > tempCrankAngle)
{ {
if (configPage1.injTiming == 1) if (configPage1.injLayout == 1)
{ {
setFuelSchedule2(openInjector2and3, setFuelSchedule2(openInjector2and3,
((unsigned long)(tempStartAngle - tempCrankAngle) * (unsigned long)timePerDegree), ((unsigned long)(tempStartAngle - tempCrankAngle) * (unsigned long)timePerDegree),