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

extremely rough flex table editors. added flexBoostCorrection to currentStatus. shortened flex correction table names. gave each flex table its own set of eth% bins. fixed the incredibly broken EEPROM update code.

This commit is contained in:
Murray 2018-01-20 16:33:14 -06:00
parent 929756b63a
commit 23862103e5
8 changed files with 76 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
reference/speeduino.ini
View File

@ -717,13 +717,15 @@ page = 10
stagedInjSizePri = scalar, U16, 28, "cc/min", 1, 0, 0, 1500, 0
stagedInjSizeSec = scalar, U16, 30, "cc/min", 1, 0, 0, 1500, 0
flexCorrectionBins = array, U08, 31, [6], "%", 1.0, 0.0, 0.0, 250.0, 0
flexBoostBins = array, U08, 32, [6], "%", 1.0, 0.0, 0.0, 250.0, 0
; The boost range is obviously arbitrary since int16_t has ~32k in both directions
flexCorrectionBoost = array, S16, 37, [6], "kPa", 1.0, 0.0, -500.0, 500.0, 0
flexCorrectionFuel = array, U08, 49, [6], "%", 1.0, 0.0, 0.0, 250.0, 0
flexCorrectionAdv = array, U08, 55, [6], "Deg", 1.0, 0.0, 0.0, 250.0, 0
flexBoostAdj = array, S16, 38, [6], "kPa", 1.0, 0.0, -500.0, 500.0, 0
flexFuelBins = array, U08, 50, [6], "%", 1.0, 0.0, 0.0, 250.0, 0
flexFuelAdj = array, U08, 56, [6], "%", 1.0, 0.0, 0.0, 250.0, 0
flexAdvBins = array, U08, 62, [6], "%", 1.0, 0.0, 0.0, 250.0, 0
flexAdvAdj = array, U08, 68, [6], "Deg", 1.0, 0.0, 0.0, 250.0, 0
unused11_53_192 = array, U08, 61,[131], "RPM", 100.0, 0.0, 100, 25500, 0
unused11_68_192 = array, U08, 69,[123], "RPM", 100.0, 0.0, 100, 25500, 0
;-------------------------------------------------------------------------------
@ -1994,27 +1996,27 @@ cmdtestspk450dc = "E\x03\x0C"
; Flex fuel correction curves
curve = flex_fuel_curve, "Flex Fuel Adjustments"
columnLabel = "Ethanol %", "Fuel Adj."
columnLabel = "Ethanol", "Fuel"
xAxis = 0, 100, 5
yAxis = 0, 255, 10
xBins = flexCorrectionBins, flex
yBins = flexCorrectionFuel
xBins = flexFuelBins, flex
yBins = flexFuelAdj
;showTextValues = true
curve = flex_adv_curve, "Flex Timing Advance"
columnLabel = "Ethanol %", "Add'l Advance"
columnLabel = "Ethanol", "Advance"
xAxis = 0, 100, 5
yAxis = 0, 100, 5
xBins = flexCorrectionBins, flex
yBins = flexCorrectionAdv
xBins = flexAdvBins, flex
yBins = flexAdvAdj
;showTextValues = true
curve = flex_boost_curve, "Flex Boost Adjustments"
columnLabel = "Ethanol %", "Boost Adj."
columnLabel = "Ethanol", "Boost"
xAxis = 0, 100, 5
yAxis = -100, 200, 5
xBins = flexCorrectionBins, flex
yBins = flexCorrectionBoost
xBins = flexBoostBins, flex
yBins = flexBoostAdj
;showTextValues = true
[TableEditor]
@ -2277,7 +2279,7 @@ cmdtestspk450dc = "E\x03\x0C"
; you change it.
ochGetCommand = "r\$tsCanId\x30%2o%2c"
ochBlockSize = 81
ochBlockSize = 83
secl = scalar, U08, 0, "sec", 1.000, 0.000
status1 = scalar, U08, 1, "bits", 1.000, 0.000
@ -2364,6 +2366,7 @@ cmdtestspk450dc = "E\x03\x0C"
pulseWidth2 = scalar, U16, 75, "ms", 0.001, 0.000
pulseWidth3 = scalar, U16, 77, "ms", 0.001, 0.000
pulseWidth4 = scalar, U16, 79, "ms", 0.001, 0.000
flexBoostCor = scalar, S16, 81, "kPa", 1.000, 0.000
#if CELSIUS
coolant = { coolantRaw - 40 } ; Temperature readings are offset by 40 to allow for negatives

13
speeduino/auxiliaries.ino
View File

@ -80,12 +80,16 @@ void boostControl()
//If flex fuel is enabled, there can be an adder to the boost target based on ethanol content
if( configPage1.flexEnabled == 1 )
{
int16_t boostAdder = flexLookupCache.boost = BIT_CHECK(TIMER_mask, BIT_TIMER_4HZ) || !flexLookupCache.boostReady
? table2D_getValue(&flexCorrectionBoostTable, currentStatus.ethanolPct)
int16_t boostAdder = currentStatus.flexBoostCorrection = flexLookupCache.boost = BIT_CHECK(TIMER_mask, BIT_TIMER_4HZ) || !flexLookupCache.boostReady
? table2D_getValue(&flexBoostTable, currentStatus.ethanolPct)
: flexLookupCache.boost;
currentStatus.boostTarget += boostAdder;
}
else
{
currentStatus.flexBoostCorrection = 0;
}
if(currentStatus.boostTarget > 0)
{
@ -122,7 +126,10 @@ void boostControl()
boostDisable();
}
}
else { DISABLE_BOOST_TIMER(); } // Disable timer channel
else { // Disable timer channel and zero the flex boost correction status
DISABLE_BOOST_TIMER();
currentStatus.flexBoostCorrection = 0;
}
boostCounter++;
}

2
speeduino/comms.h
View File

@ -12,7 +12,7 @@
#define canbusPage 9//Config Page 9
#define warmupPage 10 //Config Page 10
#define SERIAL_PACKET_SIZE 81
#define SERIAL_PACKET_SIZE 83
byte currentPage = 1;//Not the same as the speeduino config page numbers
bool isMap = true;

3
speeduino/comms.ino
View File

@ -457,6 +457,9 @@ void sendValues(uint16_t offset, uint16_t packetLength, byte cmd, byte portNum)
fullStatus[79] = lowByte(currentStatus.PW4); //Pulsewidth 4 multiplied by 10 in ms. Have to convert from uS to mS.
fullStatus[80] = highByte(currentStatus.PW4); //Pulsewidth 4 multiplied by 10 in ms. Have to convert from uS to mS.
fullStatus[81] = lowByte(currentStatus.flexBoostCorrection);
fullStatus[82] = highByte(currentStatus.flexBoostCorrection);
for(byte x=0; x<packetLength; x++)
{
if (portNum == 0) { Serial.write(fullStatus[offset+x]); }

4
speeduino/corrections.ino
View File

@ -284,7 +284,7 @@ static inline byte correctionFlex()
if (configPage1.flexEnabled == 1)
{
flexValue = flexLookupCache.fuel = BIT_CHECK(TIMER_mask, BIT_TIMER_4HZ) || !flexLookupCache.fuelReady
? table2D_getValue(&flexCorrectionFuelTable, currentStatus.ethanolPct)
? table2D_getValue(&flexFuelTable, currentStatus.ethanolPct)
: flexLookupCache.fuel;
}
return flexValue;
@ -409,7 +409,7 @@ static inline int8_t correctionFlexTiming(int8_t advance)
if( configPage1.flexEnabled == 1 ) //Check for flex being enabled
{
currentStatus.flexIgnCorrection = flexLookupCache.advance = BIT_CHECK(TIMER_mask, BIT_TIMER_4HZ) || !flexLookupCache.advanceReady
? table2D_getValue(&flexCorrectionAdvTable, currentStatus.ethanolPct)
? table2D_getValue(&flexAdvTable, currentStatus.ethanolPct)
: flexLookupCache.advance;
ignFlexValue = advance + currentStatus.flexIgnCorrection;

20
speeduino/globals.h
View File

@ -177,9 +177,9 @@ struct table2D injectorVCorrectionTable; //6 bin injector voltage correction (2D
struct table2D IATDensityCorrectionTable; //9 bin inlet air temperature density correction (2D)
struct table2D IATRetardTable; //6 bin ignition adjustment based on inlet air temperature (2D)
struct table2D rotarySplitTable; //8 bin ignition split curve for rotary leading/trailing (2D)
struct table2D flexCorrectionFuelTable; //6 bin flex fuel correction table for fuel adjustments (2D)
struct table2D flexCorrectionAdvTable; //6 bin flex fuel correction table for timing advance (2D)
struct table2D flexCorrectionBoostTable; //6 bin flex fuel correction table for boost adjustments (2D)
struct table2D flexFuelTable; //6 bin flex fuel correction table for fuel adjustments (2D)
struct table2D flexAdvTable; //6 bin flex fuel correction table for timing advance (2D)
struct table2D flexBoostTable; //6 bin flex fuel correction table for boost adjustments (2D)
//These are for the direct port manipulation of the injectors and coils
volatile byte *inj1_pin_port;
@ -302,6 +302,7 @@ struct statuses {
uint16_t canin[16]; //16bit raw value of selected canin data for channel 0-15
uint8_t current_caninchannel = 0; //start off at channel 0
uint16_t crankRPM = 400; //The actual cranking RPM limit. Saves us multiplying it everytime from the config page
int16_t flexBoostCorrection; //Amount of boost added based on flex
//Helpful bitwise operations:
//Useful reference: http://playground.arduino.cc/Code/BitMath
@ -642,12 +643,15 @@ struct config11 {
uint16_t stagedInjSizePri;
uint16_t stagedInjSizeSec;
uint8_t flexCorrectionBins[6];
int16_t flexCorrectionBoost[6];
uint8_t flexCorrectionFuel[6]; //Fuel % to be used at current ethanol reading (typically 100% fuel @ 0% eth, 163% @ 100%)
uint8_t flexCorrectionAdv[6]; //Additional advance (in degrees) at current ethanol reading (typically 0 @ 0%, 10-20 @ 100%)
uint8_t flexBoostBins[6];
int16_t flexBoostAdj[6]; //Boost kPa to be added to the boost target @ current ethanol (negative values allowed)
uint8_t flexFuelBins[6];
uint8_t flexFuelAdj[6]; //Fuel % @ current ethanol (typically 100% @ 0%, 163% @ 100%)
uint8_t flexAdvBins[6];
uint8_t flexAdvAdj[6]; //Additional advance (in degrees) @ current ethanol (typically 0 @ 0%, 10-20 @ 100%)
//And another three corn rows die.
byte unused11_61_192[131];
byte unused11_68_192[124];
#if defined(CORE_AVR)
};

24
speeduino/speeduino.ino
View File

@ -204,18 +204,18 @@ void setup()
rotarySplitTable.values = configPage11.rotarySplitValues;
rotarySplitTable.axisX = configPage11.rotarySplitBins;
flexCorrectionFuelTable.valueSize = SIZE_BYTE;
flexCorrectionFuelTable.xSize = 6;
flexCorrectionFuelTable.values = configPage11.flexCorrectionFuel;
flexCorrectionFuelTable.axisX = configPage11.flexCorrectionBins;
flexCorrectionAdvTable.valueSize = SIZE_BYTE;
flexCorrectionAdvTable.xSize = 6;
flexCorrectionAdvTable.values = configPage11.flexCorrectionAdv;
flexCorrectionAdvTable.axisX = configPage11.flexCorrectionBins;
flexCorrectionBoostTable.valueSize = SIZE_INT;
flexCorrectionBoostTable.xSize = 6;
flexCorrectionBoostTable.values16 = configPage11.flexCorrectionBoost;
flexCorrectionBoostTable.axisX = configPage11.flexCorrectionBins;
flexFuelTable.valueSize = SIZE_BYTE;
flexFuelTable.xSize = 6;
flexFuelTable.values = configPage11.flexFuelAdj;
flexFuelTable.axisX = configPage11.flexFuelBins;
flexAdvTable.valueSize = SIZE_BYTE;
flexAdvTable.xSize = 6;
flexAdvTable.values = configPage11.flexAdvAdj;
flexAdvTable.axisX = configPage11.flexAdvBins;
flexBoostTable.valueSize = SIZE_INT;
flexBoostTable.xSize = 6;
flexBoostTable.values16 = configPage11.flexBoostAdj;
flexBoostTable.axisX = configPage11.flexBoostBins;
//Setup the calibration tables
loadCalibration();

26
speeduino/updates.ino
View File

@ -8,7 +8,7 @@
void doUpdates()
{
#define CURRENT_DATA_VERSION 7
#define CURRENT_DATA_VERSION 8
//May 2017 firmware introduced a -40 offset on the ignition table. Update that table to +40
if(EEPROM.read(EEPROM_DATA_VERSION) == 2)
@ -92,20 +92,30 @@ void doUpdates()
loadConfig(); //Reload the config after changing everything in EEPROM
}
if (EEPROM.read(EEPROM_DATA_VERSION) == 6) {
if (EEPROM.read(EEPROM_DATA_VERSION) == 7) {
//Convert whatever flex fuel settings are there into the new tables
for (uint8_t x = 0; x < 6; x++)
configPage11.flexBoostAdj[0] = (int8_t)configPage1.unused2_1;
configPage11.flexFuelAdj[0] = configPage1.unused2_57;
configPage11.flexAdvAdj[0] = configPage1.unused2_59;
for (uint8_t x = 1; x < 6; x++)
{
uint8_t pct = x * 20;
configPage11.flexCorrectionBins[x] = pct;
configPage11.flexCorrectionBoost[x] = percentage(pct, configPage1.unused2_2 - (int8_t)configPage1.unused2_1);
configPage11.flexCorrectionFuel[x] = percentage(pct, configPage1.unused2_58 - configPage1.unused2_57);
configPage11.flexCorrectionAdv[x] = percentage(pct, configPage1.unused2_60 - configPage1.unused2_59);
configPage11.flexBoostBins[x] = configPage11.flexFuelBins[x] = configPage11.flexAdvBins[x] = pct;
int16_t boostAdder = (((configPage1.unused2_2 - (int8_t)configPage1.unused2_1) * pct) / 100) + (int8_t)configPage1.unused2_1;
configPage11.flexBoostAdj[x] = boostAdder;
uint8_t fuelAdder = (((configPage1.unused2_58 - configPage1.unused2_57) * pct) / 100) + configPage1.unused2_57;
configPage11.flexFuelAdj[x] = fuelAdder;
uint8_t advanceAdder = (((configPage1.unused2_60 - configPage1.unused2_59) * pct) / 100) + configPage1.unused2_59;
configPage11.flexAdvAdj[x] = advanceAdder;
}
writeAllConfig();
EEPROM.write(EEPROM_DATA_VERSION, 7);
EEPROM.write(EEPROM_DATA_VERSION, 8);
}
//Final check is always for 255 and 0 (Brand new arduino)