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

Allow for negative ethanol ignition advance

This commit is contained in:
Josh Stewart 2018-07-19 17:33:40 +10:00
parent f741a3bef1
commit dc784deaef
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reference/speeduino.ini
View File

@ -742,7 +742,7 @@ page = 10
flexFuelBins = array, U08, 51, [6], "%", 1.0, 0.0, 0.0, 250.0, 0
flexFuelAdj = array, U08, 57, [6], "%", 1.0, 0.0, 0.0, 250.0, 0
flexAdvBins = array, U08, 63, [6], "%", 1.0, 0.0, 0.0, 250.0, 0
flexAdvAdj = array, U08, 69, [6], "Deg", 1.0, 0.0, 0.0, 250.0, 0
flexAdvAdj = array, S08, 69, [6], "Deg", 1.0, 0.0, -125, 125.0, 0
n2o_enable = bits , U08, 75, [0:1], "Off","1 Stage","2 stage", "INVALID"
n2o_arming_pin = bits , U08, 75, [2:7], $IO_Pins_no_def

4
speeduino/corrections.ino
View File

@ -16,6 +16,8 @@ Flood clear mode etc.
#include "corrections.h"
#include "globals.h"
#include "timers.h"
#include "maths.h"
#include "src/PID_v1/PID_v1.h"
long PID_O2, PID_output, PID_AFRTarget;
PID egoPID(&PID_O2, &PID_output, &PID_AFRTarget, configPage6.egoKP, configPage6.egoKI, configPage6.egoKD, REVERSE); //This is the PID object if that algorithm is used. Needs to be global as it maintains state outside of each function call
@ -423,7 +425,7 @@ static inline int8_t correctionFlexTiming(int8_t advance)
byte ignFlexValue = advance;
if( configPage2.flexEnabled == 1 ) //Check for flex being enabled
{
currentStatus.flexIgnCorrection = table2D_getValue(&flexAdvTable, currentStatus.ethanolPct);
currentStatus.flexIgnCorrection = (int8_t)table2D_getValue(&flexAdvTable, currentStatus.ethanolPct); //This gets cast to a signed 8 bit value to allows for negative advance (ie retard) values here.
ignFlexValue = advance + currentStatus.flexIgnCorrection;
}
return ignFlexValue;