Resolve merge

This commit is contained in:
Josh Stewart 2020-01-21 16:59:33 +11:00
parent d4104ea9f2
commit 52cce70784
1 changed files with 7 additions and 1 deletions

View File

@ -1328,12 +1328,19 @@ menuDialog = main
subMenu = std_ms2geno2, "Calibrate AFR Sensor", { egoType > 0 }
subMenu = sensorFilters, "Set analog sensor filters"
;menu = "Data Logging"
;subMenu = sdcard_datalog, "SD Card Datalogging"
;subMenu = std_ms3SdConsole, "Browse / Import SD Card"
menuDialog = main
menu = "3D &Tuning Maps"
subMenu = veTable1Map, "Fuel Table"
subMenu = sparkMap, "Spark Table", 3
subMenu = afrTable1Map, "AFR Target Table"
#if enablehardware_test
menuDialog = main
menu = "Hardware Testing"
@ -3615,7 +3622,6 @@ cmdtestspk450dc = "E\x03\x0C"
dataReadyCondition = { toothLog1Ready == 1 }
continuousRead = true
dataLength = 635 ; in bytes, including headers, footers and data (not used). 5 bytes * 127 fields
;dataLength = 320 ; in bytes, including headers, footers and data (not used)
;recordDef = headerLen. footerLen, recordLen
recordDef = 0, 0, 5; in bytes, the recordLen is for each record, currently limited to 4 bytes