Correct EEPROM mapping of final 2 bytes in a page
Note that this commit may cause strange behaviour the first time it is loaded within Tuner Studio. You need to ensure you reload the values from Tuner Studio
This commit is contained in:
Josh Stewart
parent
bc8c9ed441
commit
7556ff5a2c
|
|
@ -0,0 +1,293 @@
|
|||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<msq xmlns="http://www.msefi.com/:msq">
|
||||
<bibliography author="TunerStudio MS 2.6.14 - EFI Analytics, Inc." tuneComment=" " writeDate="Fri Mar 20 15:08:21 EST 2015"/>
|
||||
<versionInfo fileFormat="4.0" firmwareInfo="Bowling & Grippo MS1 Base Code 20" nPages="3" signature="20"/>
|
||||
<page>
|
||||
<pcVariable name="tsCanId">"0"</pcVariable>
|
||||
<pcVariable cols="1" digits="1" name="wueAfrTargetOffset" rows="10" units=":1">
|
||||
-1.5
|
||||
-1.1
|
||||
-0.8
|
||||
-0.6
|
||||
-0.5
|
||||
-0.4
|
||||
-0.3
|
||||
-0.2
|
||||
-0.1
|
||||
0.0
|
||||
</pcVariable>
|
||||
<pcVariable cols="1" digits="0" name="wueAnalRecommend" rows="10" units="%">
|
||||
162.0
|
||||
152.0
|
||||
143.0
|
||||
135.0
|
||||
126.0
|
||||
120.0
|
||||
119.0
|
||||
116.0
|
||||
112.0
|
||||
100.0
|
||||
</pcVariable>
|
||||
<pcVariable cols="1" digits="0" name="tempTable" rows="10" units="%">
|
||||
-40.0
|
||||
-29.0
|
||||
-18.0
|
||||
-7.0
|
||||
4.0
|
||||
16.0
|
||||
27.0
|
||||
38.0
|
||||
54.0
|
||||
71.0
|
||||
</pcVariable>
|
||||
</page>
|
||||
<page number="0" size="128">
|
||||
<constant cols="8" digits="0" name="veTable" rows="8" units="%">
|
||||
27.0 27.0 27.0 27.0 27.0 27.0 27.0 27.0
|
||||
29.0 32.0 33.0 35.0 36.0 36.0 36.0 36.0
|
||||
35.0 42.0 43.0 45.0 45.0 46.0 46.0 46.0
|
||||
46.0 53.0 55.0 56.0 56.0 56.0 55.0 55.0
|
||||
59.0 64.0 65.0 65.0 65.0 65.0 65.0 65.0
|
||||
71.0 74.0 75.0 75.0 75.0 75.0 75.0 74.0
|
||||
90.0 91.0 92.0 92.0 92.0 92.0 92.0 91.0
|
||||
102.0 102.0 103.0 103.0 103.0 103.0 103.0 103.0
|
||||
</constant>
|
||||
<constant cols="1" digits="0" name="rpmBins" rows="8" units="RPM">
|
||||
700.0
|
||||
1200.0
|
||||
2000.0
|
||||
3000.0
|
||||
4000.0
|
||||
4900.0
|
||||
5500.0
|
||||
6500.0
|
||||
</constant>
|
||||
<constant cols="1" digits="0" name="tpsBins" rows="8" units="TPS">
|
||||
20.0
|
||||
30.0
|
||||
40.0
|
||||
50.0
|
||||
60.0
|
||||
70.0
|
||||
88.0
|
||||
100.0
|
||||
</constant>
|
||||
<constant digits="1" name="crankCold" units="ms">6.5</constant>
|
||||
<constant digits="1" name="crankHot" units="ms">3.5</constant>
|
||||
<constant digits="0" name="asePct" units="%">15.0</constant>
|
||||
<constant digits="0" name="aseCount" units="s">13.0</constant>
|
||||
<constant cols="1" digits="0" name="wueBins" rows="10" units="%">
|
||||
162.0
|
||||
152.0
|
||||
143.0
|
||||
135.0
|
||||
126.0
|
||||
120.0
|
||||
119.0
|
||||
116.0
|
||||
112.0
|
||||
100.0
|
||||
</constant>
|
||||
<constant digits="0" name="crankingPct" units="%">25.0</constant>
|
||||
<constant name="pinLayout">"Speeduino v0.3"</constant>
|
||||
<constant digits="1" name="unused96" units="ms">0.0</constant>
|
||||
<constant digits="1" name="unused97" units="ms">0.0</constant>
|
||||
<constant digits="1" name="taeColdA" units="ms">0.0</constant>
|
||||
<constant digits="0" name="tpsThresh" units="%/s">90.0</constant>
|
||||
<constant digits="0" name="taeTime" units="ms">200.0</constant>
|
||||
<constant digits="0" name="tdePct" units="%">80.0</constant>
|
||||
<constant name="display">"Generic 128x32"</constant>
|
||||
<constant name="display1">"RPM"</constant>
|
||||
<constant name="display2">"CPU"</constant>
|
||||
<constant name="display3">"TPS"</constant>
|
||||
<constant name="display4">"Mem"</constant>
|
||||
<constant name="display5">"RPM"</constant>
|
||||
<constant name="displayB1">"RPM"</constant>
|
||||
<constant name="displayB2">"RPM"</constant>
|
||||
<constant digits="1" name="unused105" units="ms">0.0</constant>
|
||||
<constant digits="1" name="reqFuel" units="ms">6.2</constant>
|
||||
<constant digits="0" name="divider">1.0</constant>
|
||||
<constant name="alternate">"Alternating"</constant>
|
||||
<constant digits="1" name="injOpen" units="ms">1.0</constant>
|
||||
<constant digits="0" name="injOCfuel" units="ms">0.0</constant>
|
||||
<constant digits="0" name="injPwmP" units="%">0.0</constant>
|
||||
<constant digits="1" name="injPwmT" units="ms">0.0</constant>
|
||||
<constant digits="2" name="battFac" units="ms/v">0.0</constant>
|
||||
<constant digits="0" name="rpmk">3000.0</constant>
|
||||
<constant name="mapType">"250 kPa"</constant>
|
||||
<constant name="twoStroke">"Four-stroke"</constant>
|
||||
<constant name="injType">"Port"</constant>
|
||||
<constant name="nCylinders">"4"</constant>
|
||||
<constant name="cltType">"GM"</constant>
|
||||
<constant name="matType">"GM"</constant>
|
||||
<constant name="nInjectors">"4"</constant>
|
||||
<constant name="engineType">"Even fire"</constant>
|
||||
<constant name="egoType1">"Narrow band"</constant>
|
||||
<constant name="algorithm">"Alpha-N"</constant>
|
||||
<constant name="baroCorr">"Off"</constant>
|
||||
<constant digits="1" name="primePulse" units="ms">1.5</constant>
|
||||
<constant digits="0" name="unused120" units="RPM">0.0</constant>
|
||||
<constant digits="1" name="fastIdleT" units="°C">59.94</constant>
|
||||
<constant digits="3" name="egoSwitch" units="v">0.0</constant>
|
||||
<constant digits="0" name="taeColdM" units="%">0.0</constant>
|
||||
<constant digits="0" name="tpsMin" units="ADC">0.0</constant>
|
||||
<constant digits="0" name="tpsMax" units="ADC">252.0</constant>
|
||||
</page>
|
||||
<page number="1" size="128">
|
||||
<constant cols="8" digits="0" name="advTable1" rows="8" units="deg">
|
||||
10.0 20.0 25.0 27.0 32.0 38.0 38.0 40.0
|
||||
10.0 21.0 23.0 27.0 32.0 35.0 38.0 40.0
|
||||
12.0 23.0 23.0 27.0 32.0 35.0 38.0 40.0
|
||||
12.0 15.0 23.0 28.0 27.0 28.0 31.0 33.0
|
||||
10.0 15.0 19.0 24.0 24.0 25.0 27.0 29.0
|
||||
10.0 15.0 13.0 18.0 18.0 19.0 21.0 23.0
|
||||
10.0 15.0 12.0 17.0 17.0 18.0 20.0 22.0
|
||||
10.0 15.0 15.0 17.0 17.0 18.0 20.0 23.0
|
||||
</constant>
|
||||
<constant cols="1" digits="0" name="rpmBins2" rows="8" units="RPM">
|
||||
500.0
|
||||
1200.0
|
||||
2000.0
|
||||
3000.0
|
||||
3500.0
|
||||
4200.0
|
||||
5000.0
|
||||
6000.0
|
||||
</constant>
|
||||
<constant cols="1" digits="0" name="tpsBins2" rows="8" units="TPS">
|
||||
10.0
|
||||
20.0
|
||||
35.0
|
||||
50.0
|
||||
65.0
|
||||
75.0
|
||||
86.0
|
||||
100.0
|
||||
</constant>
|
||||
<constant digits="0" name="TrigAng" units="Deg">244.0</constant>
|
||||
<constant digits="0" name="FixAng" units="Deg">0.0</constant>
|
||||
<constant digits="0" name="Trim" units="Deg">13.024</constant>
|
||||
<constant digits="0" name="CrankAng" units="Deg">11.6</constant>
|
||||
<constant digits="0" name="IgHold">10.0</constant>
|
||||
<constant name="Trig_plus">"+45"</constant>
|
||||
<constant name="TrigCrank">"Time Based"</constant>
|
||||
<constant name="IgInv">"No"</constant>
|
||||
<constant name="oddfire">"Yes"</constant>
|
||||
<constant digits="0" name="IdleAdv" units="Deg">-1.9008</constant>
|
||||
<constant digits="0" name="IdleAdvTPS" units="ADC">65.0</constant>
|
||||
<constant digits="0" name="IdleAdvRPM" units="RPM">3200.0</constant>
|
||||
<constant digits="1" name="IdleAdvCLT" units="C">-20.535</constant>
|
||||
<constant digits="0" name="IdleDelayTime" units="sec">38.0</constant>
|
||||
<constant digits="0" name="StgCycles" units="cycles">1.0</constant>
|
||||
<constant name="dwellcont">"Dwell control"</constant>
|
||||
<constant digits="1" name="dwellcrank" units="ms">4.5</constant>
|
||||
<constant digits="1" name="dwellrun" units="ms">3.0</constant>
|
||||
<constant digits="0" name="numteeth" units="teeth">36.0</constant>
|
||||
<constant digits="0" name="onetwo" units="teeth">1.0</constant>
|
||||
<constant digits="0" name="crankRPM" units="rpm">300.0</constant>
|
||||
<constant digits="0" name="tpsflood" units="%">92.0</constant>
|
||||
<constant digits="0" name="SoftRevLim" units="rpm">7000.0</constant>
|
||||
<constant digits="0" name="SoftLimRetard" units="deg">15.0</constant>
|
||||
<constant digits="1" name="SoftLimMax" units="s">2.0</constant>
|
||||
<constant digits="0" name="HardRevLim" units="rpm">7500.0</constant>
|
||||
<constant cols="1" digits="0" name="taeBins" rows="4" units="%/s">
|
||||
80.0
|
||||
200.0
|
||||
520.0
|
||||
890.0
|
||||
</constant>
|
||||
<constant cols="1" digits="0" name="taeRates" rows="4" units="%">
|
||||
18.0
|
||||
24.0
|
||||
33.0
|
||||
42.0
|
||||
</constant>
|
||||
<constant cols="1" digits="0" name="wueRates" rows="10" units="C">
|
||||
0.0
|
||||
11.0
|
||||
22.0
|
||||
33.0
|
||||
44.0
|
||||
56.0
|
||||
67.0
|
||||
78.0
|
||||
94.0
|
||||
111.0
|
||||
</constant>
|
||||
<constant digits="0" name="dwellLim" units="ms">8.0</constant>
|
||||
<constant cols="1" digits="0" name="dwellRates" rows="6" units="%">
|
||||
248.0
|
||||
189.0
|
||||
132.0
|
||||
100.0
|
||||
90.0
|
||||
87.0
|
||||
</constant>
|
||||
</page>
|
||||
<page number="2" size="128">
|
||||
<constant cols="8" digits="1" name="afrTable" rows="8" units="AFR">
|
||||
14.7 14.7 15.0 15.1 14.9 14.7 14.7 14.7
|
||||
14.7 14.7 15.0 15.1 14.9 14.7 14.7 14.7
|
||||
14.7 14.7 14.8 15.0 14.8 14.6 14.4 14.0
|
||||
14.3 14.3 14.7 14.7 14.6 14.1 13.8 13.4
|
||||
14.1 14.2 14.5 14.3 14.0 13.5 13.1 12.9
|
||||
14.1 14.2 13.7 13.6 13.4 13.1 13.0 12.8
|
||||
13.5 13.5 12.8 12.9 12.8 12.7 12.7 12.7
|
||||
12.8 12.8 12.8 12.7 12.5 12.5 12.5 12.5
|
||||
</constant>
|
||||
<constant cols="1" digits="0" name="rpmBinsAFR" rows="8" units="RPM">
|
||||
500.0
|
||||
1200.0
|
||||
2000.0
|
||||
3000.0
|
||||
3500.0
|
||||
4200.0
|
||||
5000.0
|
||||
6000.0
|
||||
</constant>
|
||||
<constant cols="1" digits="0" name="tpsBinsAFR" rows="8" units="TPS">
|
||||
10.0
|
||||
20.0
|
||||
35.0
|
||||
50.0
|
||||
65.0
|
||||
75.0
|
||||
86.0
|
||||
100.0
|
||||
</constant>
|
||||
<constant name="egoAlgorithm">"PID"</constant>
|
||||
<constant name="egoType">"Wide Band"</constant>
|
||||
<constant digits="0" name="egoKP" units="%">100.0</constant>
|
||||
<constant digits="0" name="egoKI" units="%">20.0</constant>
|
||||
<constant digits="0" name="egoKD" units="%">0.0</constant>
|
||||
<constant digits="0" name="egoTemp" units="°C">69.93</constant>
|
||||
<constant digits="0" name="egoCount">16.0</constant>
|
||||
<constant digits="0" name="egoDelta" units="%">1.0</constant>
|
||||
<constant digits="0" name="egoLimit">15.0</constant>
|
||||
<constant digits="1" name="ego_min" units="AFR">9.0</constant>
|
||||
<constant digits="1" name="ego_max" units="AFR">19.0</constant>
|
||||
<constant digits="0" name="ego_sdelay" units="sec">15.0</constant>
|
||||
<constant digits="0" name="egoRPM" units="rpm">1200.0</constant>
|
||||
<constant digits="0" name="egoTPSMax" units="%">70.0</constant>
|
||||
<constant digits="0" name="egoLoadMax" units="%">90.0</constant>
|
||||
<constant digits="0" name="egoLoadMin" units="%">20.0</constant>
|
||||
<constant cols="1" digits="0" name="brvBins" rows="6" units="V">
|
||||
6.0
|
||||
8.0
|
||||
10.0
|
||||
13.0
|
||||
15.0
|
||||
19.0
|
||||
</constant>
|
||||
</page>
|
||||
<settings Comment="These setting are only used if this msq is opened without a project.">
|
||||
<setting name="CELSIUS" value="CELSIUS"/>
|
||||
<setting name="ALPHA_N" value="ALPHA_N"/>
|
||||
<setting name="MPX4250" value="MPX4250"/>
|
||||
<setting name="INNOVATE_LC1_DEFAULT" value="INNOVATE_LC1_DEFAULT"/>
|
||||
</settings>
|
||||
<userComments Comment="These are user comments that can be related to a particular setting or dialog.">
|
||||
<userComment name="SoftRevLim" value=""/>
|
||||
<userComment name="aseCount" value=""/>
|
||||
</userComments>
|
||||
</msq>
|
||||
28
storage.h
28
storage.h
|
|
@ -22,12 +22,12 @@ Current layout of EEPROM data (Version 2) is as follows (All sizes are in bytes)
|
|||
| 133 |64 | Ignition Map (8x8) |
|
||||
| 197 |8 | Ign Table RPM bins |
|
||||
| 205 |8 | Ign Table MAP/TPS bins |
|
||||
| 213 |46 | Remaining Page 2 settings |
|
||||
| 259 |2 | X and Y sizes for AFR table |
|
||||
| 261 |64 | AFR Target Map (8x8) |
|
||||
| 325 |8 | AFR Table RPM bins |
|
||||
| 333 |8 | AFR Table MAP/TPS bins |
|
||||
| 341 |46 | Remaining Page 3 settings |
|
||||
| 213 |48 | Remaining Page 2 settings |
|
||||
| 261 |2 | X and Y sizes for AFR table |
|
||||
| 263 |64 | AFR Target Map (8x8) |
|
||||
| 327 |8 | AFR Table RPM bins |
|
||||
| 335 |8 | AFR Table MAP/TPS bins |
|
||||
| 343 |48 | Remaining Page 3 settings |
|
||||
| 2559 |512 | Calibration data (O2) |
|
||||
| 3071 |512 | Calibration data (IAT) |
|
||||
| 3583 |512 | Calibration data (CLT) |
|
||||
|
|
@ -47,14 +47,14 @@ Current layout of EEPROM data (Version 2) is as follows (All sizes are in bytes)
|
|||
#define EEPROM_CONFIG2_XBINS 197
|
||||
#define EEPROM_CONFIG2_YBINS 205
|
||||
#define EEPROM_CONFIG2_SETTINGS 213
|
||||
#define EEPROM_CONFIG2_END 259
|
||||
#define EEPROM_CONFIG3_XSIZE 259
|
||||
#define EEPROM_CONFIG3_YSIZE 260
|
||||
#define EEPROM_CONFIG3_MAP 261
|
||||
#define EEPROM_CONFIG3_XBINS 325
|
||||
#define EEPROM_CONFIG3_YBINS 333
|
||||
#define EEPROM_CONFIG3_SETTINGS 341
|
||||
#define EEPROM_CONFIG3_END 387
|
||||
#define EEPROM_CONFIG2_END 261
|
||||
#define EEPROM_CONFIG3_XSIZE 261
|
||||
#define EEPROM_CONFIG3_YSIZE 262
|
||||
#define EEPROM_CONFIG3_MAP 263
|
||||
#define EEPROM_CONFIG3_XBINS 327
|
||||
#define EEPROM_CONFIG3_YBINS 335
|
||||
#define EEPROM_CONFIG3_SETTINGS 343
|
||||
#define EEPROM_CONFIG3_END 391
|
||||
|
||||
//Calibration data is stored at the end of the EEPROM (This is in case any further calibration tables are needed as they are large blocks)
|
||||
#define EEPROM_CALIBRATION_O2 2559
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ void loadConfig()
|
|||
offset = x - EEPROM_CONFIG2_YBINS;
|
||||
ignitionTable.axisY[offset] = EEPROM.read(x);
|
||||
}
|
||||
//The next 45 bytes can simply be pulled straight from the configTable
|
||||
//The next 48 bytes can simply be pulled straight from the configTable
|
||||
for(int x=EEPROM_CONFIG2_SETTINGS; x<EEPROM_CONFIG2_END; x++)
|
||||
{
|
||||
*(pnt_configPage + byte(x - EEPROM_CONFIG2_SETTINGS)) = EEPROM.read(x);
|
||||
|
|
|
|||
Loading…
Reference in New Issue