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

Fix for sequential ignition not working on 2 cyl

This commit is contained in:
Josh Stewart 2018-07-18 18:19:59 +10:00
parent b8a5586422
commit f741a3bef1
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
speeduino/speeduino.ino
View File

@ -366,36 +366,41 @@ void setup()
case 1: case 1:
channel1IgnDegrees = 0; channel1IgnDegrees = 0;
channel1InjDegrees = 0; channel1InjDegrees = 0;
maxIgnOutputs = 1;
//Sequential ignition works identically on a 1 cylinder whether it's odd or even fire.
if(configPage4.sparkMode == IGN_MODE_SEQUENTIAL) { CRANK_ANGLE_MAX_IGN = 720; }
if (configPage2.injLayout == INJ_SEQUENTIAL)
{
CRANK_ANGLE_MAX_INJ = 720;
currentStatus.nSquirts = 1;
req_fuel_uS = req_fuel_uS * 2;
}
channel1InjEnabled = true; channel1InjEnabled = true;
break; break;
case 2: case 2:
channel1IgnDegrees = 0; channel1IgnDegrees = 0;
channel1InjDegrees = 0;
maxIgnOutputs = 2; maxIgnOutputs = 2;
if (configPage2.engineType == EVEN_FIRE ) if (configPage2.engineType == EVEN_FIRE ) { channel2IgnDegrees = 180; }
{
channel2IgnDegrees = 180;
}
else { channel2IgnDegrees = configPage2.oddfire2; } else { channel2IgnDegrees = configPage2.oddfire2; }
//For alternating injection, the squirt occurs at different times for each channel //Sequential ignition works identically on a 2 cylinder whether it's odd or even fire (With the default being a 180 degree second cylinder).
if(configPage2.injLayout == INJ_SEMISEQUENTIAL || configPage2.injLayout == INJ_PAIRED) if(configPage4.sparkMode == IGN_MODE_SEQUENTIAL) { CRANK_ANGLE_MAX_IGN = 720; }
{
channel1InjDegrees = 0;
channel2InjDegrees = channel2IgnDegrees; //Set to the same as the ignition degrees (Means there's no need for another if to check for oddfire)
if (!configPage2.injTiming) { channel1InjDegrees = channel2InjDegrees = 0; } //For simultaneous, all squirts happen at the same time if (configPage2.injLayout == INJ_SEQUENTIAL)
}
else if (configPage2.injLayout == INJ_SEQUENTIAL)
{ {
channel1InjDegrees = 0;
channel2InjDegrees = channel2IgnDegrees;
CRANK_ANGLE_MAX_INJ = 720; CRANK_ANGLE_MAX_INJ = 720;
currentStatus.nSquirts = 1; currentStatus.nSquirts = 1;
req_fuel_uS = req_fuel_uS * 2; req_fuel_uS = req_fuel_uS * 2;
} }
//The below are true regardless of whether this is running sequential or not
if (configPage2.engineType == EVEN_FIRE ) { channel2InjDegrees = 180; }
else { channel2InjDegrees = configPage2.oddfire2; }
if (!configPage2.injTiming) { channel1InjDegrees = channel2InjDegrees = 0; } //For simultaneous, all squirts happen at the same time
channel1InjEnabled = true; channel1InjEnabled = true;
channel2InjEnabled = true; channel2InjEnabled = true;
@ -412,7 +417,6 @@ void setup()
channel3IgnDegrees = 480; channel3IgnDegrees = 480;
CRANK_ANGLE_MAX_IGN = 720; CRANK_ANGLE_MAX_IGN = 720;
currentStatus.nSquirts = 1;
} }
else else
{ {
@ -458,6 +462,7 @@ void setup()
break; break;
case 4: case 4:
channel1IgnDegrees = 0; channel1IgnDegrees = 0;
channel1InjDegrees = 0;
maxIgnOutputs = 2; //Default value for 4 cylinder, may be changed below maxIgnOutputs = 2; //Default value for 4 cylinder, may be changed below
if (configPage2.engineType == EVEN_FIRE ) if (configPage2.engineType == EVEN_FIRE )
{ {
@ -474,7 +479,6 @@ void setup()
channel4IgnDegrees = 540; channel4IgnDegrees = 540;
CRANK_ANGLE_MAX_IGN = 720; CRANK_ANGLE_MAX_IGN = 720;
currentStatus.nSquirts = 1;
maxIgnOutputs = 4; maxIgnOutputs = 4;
} }
else if(configPage4.sparkMode == IGN_MODE_ROTARY) else if(configPage4.sparkMode == IGN_MODE_ROTARY)
@ -495,14 +499,12 @@ void setup()
//For alternatiing injection, the squirt occurs at different times for each channel //For alternatiing injection, the squirt occurs at different times for each channel
if(configPage2.injLayout == INJ_SEMISEQUENTIAL || configPage2.injLayout == INJ_PAIRED) if(configPage2.injLayout == INJ_SEMISEQUENTIAL || configPage2.injLayout == INJ_PAIRED)
{ {
channel1InjDegrees = 0;
channel2InjDegrees = 180; channel2InjDegrees = 180;
if (!configPage2.injTiming) { channel1InjDegrees = channel2InjDegrees = 0; } //For simultaneous, all squirts happen at the same time if (!configPage2.injTiming) { channel1InjDegrees = channel2InjDegrees = 0; } //For simultaneous, all squirts happen at the same time
} }
else if (configPage2.injLayout == INJ_SEQUENTIAL) else if (configPage2.injLayout == INJ_SEQUENTIAL)
{ {
channel1InjDegrees = 0;
channel2InjDegrees = 180; channel2InjDegrees = 180;
channel3InjDegrees = 360; channel3InjDegrees = 360;
channel4InjDegrees = 540; channel4InjDegrees = 540;