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

Adjust injector setting priority so that sequential will override the Simultaneous/Alternating option

This commit is contained in:
Josh Stewart 2018-01-03 17:27:22 +11:00
parent 507ebc83d6
commit 9f53002b9d
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reference/speeduino.ini
View File

@ -930,7 +930,7 @@ menuDialog = main
; constantName = "Help Text" ; constantName = "Help Text"
; These provide the context help in the dialog when these variables are used ; These provide the context help in the dialog when these variables are used
nCylinders = "Cylinder count" nCylinders = "Cylinder count"
alternate = "" alternate = "Whether or not the injectors should be fired at the same time. This setting is ignored when Sequential is selected below, however it will still affect the req_fuel value."
engineType = "Engines with an equal number of degrees between all firings (This is most engines) should select Even fire. Some 2 and 6 cylinder engines are Odd fire however." engineType = "Engines with an equal number of degrees between all firings (This is most engines) should select Even fire. Some 2 and 6 cylinder engines are Odd fire however."
twoStroke = "Four-Stroke (most engines), Two-stroke." twoStroke = "Four-Stroke (most engines), Two-stroke."
nInjectors = "Number of primary injectors." nInjectors = "Number of primary injectors."

21
speeduino/speeduino.ino
View File

@ -345,12 +345,21 @@ void setup()
else { channel2IgnDegrees = configPage1.oddfire2; } else { channel2IgnDegrees = configPage1.oddfire2; }
//For alternating injection, the squirt occurs at different times for each channel //For alternating injection, the squirt occurs at different times for each channel
if(configPage1.injLayout == INJ_SEMISEQUENTIAL) if(configPage1.injLayout == INJ_SEMISEQUENTIAL || configPage1.injLayout == INJ_PAIRED)
{ {
channel1InjDegrees = 0; channel1InjDegrees = 0;
channel2InjDegrees = channel2IgnDegrees; //Set to the same as the ignition degrees (Means there's no need for another if to check for oddfire) channel2InjDegrees = channel2IgnDegrees; //Set to the same as the ignition degrees (Means there's no need for another if to check for oddfire)
}
if (!configPage1.injTiming) { channel1InjDegrees = channel2InjDegrees = 0; } //For simultaneous, all squirts happen at the same time if (!configPage1.injTiming) { channel1InjDegrees = channel2InjDegrees = 0; } //For simultaneous, all squirts happen at the same time
}
else if (configPage1.injLayout == INJ_SEQUENTIAL)
{
channel1InjDegrees = 0;
channel2InjDegrees = channel2IgnDegrees;
CRANK_ANGLE_MAX_INJ = 720;
req_fuel_uS = req_fuel_uS * 2;
}
channel1InjEnabled = true; channel1InjEnabled = true;
channel2InjEnabled = true; channel2InjEnabled = true;
@ -386,6 +395,8 @@ void setup()
channel1InjDegrees = 0; channel1InjDegrees = 0;
channel2InjDegrees = 120; channel2InjDegrees = 120;
channel3InjDegrees = 240; channel3InjDegrees = 240;
if (!configPage1.injTiming) { channel1InjDegrees = channel2InjDegrees = channel3InjDegrees = 0; } //For simultaneous, all squirts happen at the same time
} }
else if (configPage1.injLayout == INJ_SEQUENTIAL) else if (configPage1.injLayout == INJ_SEQUENTIAL)
{ {
@ -395,7 +406,6 @@ void setup()
CRANK_ANGLE_MAX_INJ = 720; CRANK_ANGLE_MAX_INJ = 720;
req_fuel_uS = req_fuel_uS * 2; req_fuel_uS = req_fuel_uS * 2;
} }
if (!configPage1.injTiming) { channel1InjDegrees = channel2InjDegrees = channel3InjDegrees = 0; } //For simultaneous, all squirts happen at the same time
channel1InjEnabled = true; channel1InjEnabled = true;
channel2InjEnabled = true; channel2InjEnabled = true;
@ -436,6 +446,8 @@ void setup()
{ {
channel1InjDegrees = 0; channel1InjDegrees = 0;
channel2InjDegrees = 180; channel2InjDegrees = 180;
if (!configPage1.injTiming) { channel1InjDegrees = channel2InjDegrees = 0; } //For simultaneous, all squirts happen at the same time
} }
else if (configPage1.injLayout == INJ_SEQUENTIAL) else if (configPage1.injLayout == INJ_SEQUENTIAL)
{ {
@ -450,7 +462,6 @@ void setup()
CRANK_ANGLE_MAX_INJ = 720; CRANK_ANGLE_MAX_INJ = 720;
req_fuel_uS = req_fuel_uS * 2; req_fuel_uS = req_fuel_uS * 2;
} }
if (!configPage1.injTiming) { channel1InjDegrees = channel2InjDegrees = 0; } //For simultaneous, all squirts happen at the same time
//Check if injector staging is enabled //Check if injector staging is enabled
if(configPage11.stagingEnabled == true) if(configPage11.stagingEnabled == true)
@ -549,6 +560,8 @@ void setup()
break; break;
} }
if(CRANK_ANGLE_MAX_IGN == CRANK_ANGLE_MAX_INJ) { CRANK_ANGLE_MAX = CRANK_ANGLE_MAX_IGN; } //If both the injector max and ignition max angles are the same, make the overall system max this value
switch(configPage2.sparkMode) switch(configPage2.sparkMode)
{ {
case IGN_MODE_WASTED: case IGN_MODE_WASTED: