Calibration storage definition and TS ini menu option

This commit is contained in:
Josh Stewart 2014-05-12 13:43:57 +10:00
parent 8f2094e20a
commit 0cc84e651d
3 changed files with 21 additions and 4 deletions

View File

@ -262,6 +262,14 @@
subMenu = dwellSettings, "Dwell settings"
;subMenu = wheelsim, "Stim for wheel"
;subMenu = oddwheel, "Oddfire Wheel settings", 7, { wheelon && oddfire }
menuDialog = main
menu = "T&ools"
;subMenu = sensorCal, "Calibrate MAP/Baro"
;subMenu = battcalib, "Calibrate Battery Voltage"
;subMenu = std_separator ;----------------------------------------------
;subMenu = flash_unlock, "Un/Lock calibrations"
subMenu = std_ms2gentherm, "Calibrate T&hermistor Tables", 0 ;, {flashlock}
;-------------------------------------------------------------------------------

View File

@ -20,11 +20,13 @@ Current layout of EEPROM data (Version 2) is as follows (All sizes are in bytes)
| 197 |8 | Ign Table RPM bins |
| 205 |8 | Ign Table MAP/TPS bins |
| 213 |45 | Remaining Page 2 settings |
| 258 |12 | Calibration data (CLT) |
| 260 |12 | Calibration data (IAT) |
| 272 |12 | Calibration data (O2) |
| 284 |28 | Calibration data (Reserved) |
-----------------------------------------------------
*/
#define EEPROM_SIZE 258
#define EEPROM_CONFIG1_XSIZE 1
#define EEPROM_CONFIG1_YSIZE 2
#define EEPROM_CONFIG1_MAP 3
@ -38,3 +40,10 @@ 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_CONFIG_END 258
#define EEPROM_CALIBRATION_CLT 258
#define EEPROM_CALIBRATION_IAT 260
#define EEPROM_CALIBRATION_O2 272

View File

@ -71,7 +71,7 @@ void writeConfig()
if(EEPROM.read(x) != ignitionTable.axisY[offset]) { EEPROM.write(x, ignitionTable.axisY[offset]); }
}
//The next 45 bytes can simply be pulled straight from the configTable
for(int x=EEPROM_CONFIG2_SETTINGS; x<EEPROM_SIZE; x++)
for(int x=EEPROM_CONFIG2_SETTINGS; x<EEPROM_CONFIG_END; x++)
{
if(EEPROM.read(x) != *(pnt_configPage + byte(x - EEPROM_CONFIG2_SETTINGS))) { EEPROM.write(x, *(pnt_configPage + byte(x - EEPROM_CONFIG2_SETTINGS))); }
}
@ -137,7 +137,7 @@ void loadConfig()
ignitionTable.axisY[offset] = EEPROM.read(x);
}
//The next 45 bytes can simply be pulled straight from the configTable
for(int x=EEPROM_CONFIG2_SETTINGS; x<EEPROM_SIZE; x++)
for(int x=EEPROM_CONFIG2_SETTINGS; x<EEPROM_CONFIG_END; x++)
{
*(pnt_configPage + byte(x - EEPROM_CONFIG2_SETTINGS)) = EEPROM.read(x);
}