INI file fixes (#651)

* Use CNAME

* Missing commas

* Add missing expression delimiters

* Fix incorrect table page numbers

* Remove duplicated empty section
This commit is contained in:
tx_haggis 2021-09-10 00:59:22 -05:00 committed by GitHub
parent 5a6c089d01
commit a0a994acdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 31 deletions

View File

@ -417,7 +417,7 @@ page = 1
rtc_trim = scalar, S08, 123, "ppm", 1, 0, -127, +127, 0
idleAdvVss = scalar, U08, 124, "km/h", 1, 0.0, 0.0, 255, 0
mapSwitchPoint = scalar, U08, 125, "RPM", 100, 0.0, 0.0, 16320, 0
unused2-95 = array, U08, 126, [2], "%", 1.0, 0.0, 0.0, 255, 0
unused2_95 = array, U08, 126, [2], "%", 1.0, 0.0, 0.0, 255, 0
;Page 2 is the fuel map and axis bins only
page = 2
@ -553,11 +553,11 @@ page = 4
vvt2CL0DutyAng = scalar, S16, 121, "deg", 1.0, 0.0, -360.0, 360.0, 0 ; * ( 2 bytes)
vvt2PWMdir = bits, U08, 123, [0:0], "Advance", "Retard"
unusedBits4-123 = bits, U08, 123, [1:7]
unusedBits4_123 = bits, U08, 123, [1:7]
ANGLEFILTER_VVT = scalar, U08, 124, "%", 1.0, 0.0, 0, 100, 0
FILTER_FLEX = scalar, U08, 125, "%", 1.0, 0.0, 0, 240, 0
unused4-124 = array, U08, 126, [2], "%", 1.0, 0.0, 0.0, 255, 0
unused4_124 = array, U08, 126, [2], "%", 1.0, 0.0, 0.0, 255, 0
;--------------------------------------------------
;Start AFR page
@ -706,7 +706,7 @@ page = 6
;Boost and vvt maps (Page 7)
;--------------------------------------------------
page = 7
boostTable = array, U08, 0,[8x8], { bitStringValue( boostTableLabels, boostType ) }, 2.0, 0.0, 0, boostTableLimit, 0
boostTable = array, U08, 0,[8x8], { bitStringValue( boostTableLabels, boostType ) }, 2.0, 0.0, 0, {boostTableLimit}, 0
rpmBinsBoost = array, U08, 64,[ 8], "RPM", 100.0, 0.0, 100, 25500, 0
tpsBinsBoost = array, U08, 72,[ 8], "TPS", 1.0, 0.0, 0.0, 255.0, 0
vvtTable = array, U08, 80,[8x8], "%", 0.5, 0.0, 0, 100, 1
@ -1251,7 +1251,7 @@ page = 13
secondDataIn6= bits, U08, 32, [0:7], $fullStatus_def
secondDataIn7= bits, U08, 33, [0:7], $fullStatus_def
outputTimeLimit = array, U08, 34, [ 8], "S", 0.1, 0.0, 0.0, 25.5, 1
unused13_35_49 = array, U08, 42, [ 8] "%", 1.0, 0.0, 0.0, 100.0, 0
unused13_35_49 = array, U08, 42, [ 8], "%", 1.0, 0.0, 0.0, 100.0, 0
firstTarget = array, S16, 50, [ 8], "", 1.0, 0.0, -32768.0, 32768.0, 0
secondTarget = array, S16, 66, [ 8], "", 1.0, 0.0, -32768.0, 32768.0, 0
firstCompType0 = bits, U08, 82, [0:2], $comparator_def
@ -2128,7 +2128,7 @@ menuDialog = main
field = "Injector Layout", injLayout
field = "Board Layout", pinLayout
field = "MAP Sample method", mapSample
field = "MAP Sample switch point", mapSwitchPoint { mapSample >= 1 }
field = "MAP Sample switch point", mapSwitchPoint, { mapSample >= 1 }
dialog = engine_constants_west, ""
panel = std_injection, North
@ -2826,7 +2826,7 @@ menuDialog = main
field = "Valve minimum duty cycle", boostMinDuty, { boostEnabled && boostType == 1 }
field = "Valve maximum duty cycle", boostMaxDuty, { boostEnabled && boostType == 1 }
panel = boostCut
panel = boostByGear { boostEnabled && boostType == 1 && vssMode > 1 }
panel = boostByGear, { boostEnabled && boostType == 1 && vssMode > 1 }
field = "Closed Loop settings"
field = "Control mode", boostMode, { boostEnabled && boostType == 1 }
slider = "Sensitivity", boostSens, horizontal, { boostEnabled && boostType == 1 }
@ -2839,7 +2839,7 @@ menuDialog = main
field = "VVT2 Control Enabled", vvt2Enabled
field = "VVT2 output pin", vvt2Pin, { vvt2Enabled }
field = "Increased duty direction",vvt2PWMdir, { vvt2Enabled && vvtMode == 2 }
field = "VVT2 Cam angle @ 0% duty",vvt2CL0DutyAng { vvt2Enabled && vvtMode == 2 }
field = "VVT2 Cam angle @ 0% duty",vvt2CL0DutyAng, { vvt2Enabled && vvtMode == 2 }
field = "VVT2 Trigger edge", TrigEdgeThrd, { vvt2Enabled && vvtMode == 2 }
dialog = vvtClosedLoop, "Closed loop"
@ -3396,9 +3396,9 @@ menuDialog = main
field = "Enable Second Serial", enable_secondarySerial
field = "Enable Internal Canbus", enable_intcan
; field = "Speeduino TsCanId", speeduino_tsCanId
field = "True Canbus Address", true_address {enable_secondarySerial||enable_intcan}
field = "True Canbus Address", true_address, {enable_secondarySerial||enable_intcan}
field = "NOTE! Realtime Data Base Address MUST be at least 0x16 GREATER than the True Address as they are reserved for future expansion"
field = "Realtime Data Base Can Address", realtime_base_address {enable_secondarySerial||enable_intcan}
field = "Realtime Data Base Can Address", realtime_base_address, {enable_secondarySerial||enable_intcan}
field = "Speeduino OBD address", obd_address
dialog = serial3IO, "Secondary Serial IO interface"
@ -3406,9 +3406,9 @@ menuDialog = main
field = "Enable Second Serial", enable_secondarySerial
field = "Enable Internal Canbus", enable_intcan
; field = "Speeduino TsCanId", speeduino_tsCanId
field = "True Canbus Address", true_address {enable_secondarySerial||enable_intcan}
field = "True Canbus Address", true_address, {enable_secondarySerial||enable_intcan}
field = "NOTE! Realtime Data Base Address MUST be at least 0x16 GREATER than the True Address as they are reserved for future expansion"
field = "Realtime Data Base Can Address", realtime_base_address {enable_secondarySerial||enable_intcan}
field = "Realtime Data Base Can Address", realtime_base_address, {enable_secondarySerial||enable_intcan}
field = "Speeduino OBD address", obd_address
dialog = reset_control, "Reset Control"
@ -3949,11 +3949,6 @@ cmdVSSratio4 = "E\x99\x04"
cmdVSSratio5 = "E\x99\x05"
cmdVSSratio6 = "E\x99\x06"
; -------------------------------------------------------------
; Help down here
[SettingContextHelp]
[CurveEditor]
;tps-based accel enrichment
@ -4284,14 +4279,14 @@ cmdVSSratio6 = "E\x99\x06"
;#else
;table = boostTbl, boostMap, "Boost targets (Absolute kPa)", 8
;#endif
table = boostTbl, boostMap, "Boost Duty / Target", 8
table = boostTbl, boostMap, "Boost Duty / Target", 7
xBins = rpmBinsBoost, rpm
yBins = tpsBinsBoost, throttle
zBins = boostTable
gridHeight = 3.0
upDownLabel = "HIGHER", "LOWER"
table = vvtTbl, vvtMap, "VVT control Table", 8
table = vvtTbl, vvtMap, "VVT control Table", 7
xBins = rpmBinsVVT, rpm
;yBins = tpsBinsVVT, throttle
yBins = loadBinsVVT, vvtLoad
@ -4300,7 +4295,7 @@ cmdVSSratio6 = "E\x99\x06"
gridHeight = 3.0
upDownLabel = "HIGHER", "LOWER"
table = vvt2Tbl, vvt2Map, "VVT2 control Table", 8
table = vvt2Tbl, vvt2Map, "VVT2 control Table", 12
xBins = rpmBinsVVT2, rpm
;yBins = tpsBinsVVT, throttle
yBins = loadBinsVVT2, vvtLoad
@ -4309,7 +4304,7 @@ cmdVSSratio6 = "E\x99\x06"
gridHeight = 3.0
upDownLabel = "HIGHER", "LOWER"
table = wmiTbl, wmiMapMap, "WMI control Table", 8
table = wmiTbl, wmiMapMap, "WMI control Table", 12
xBins = rpmBinsWMI, rpm
yBins = mapBinsWMI, map
zBins = wmiTable
@ -4317,7 +4312,7 @@ cmdVSSratio6 = "E\x99\x06"
gridHeight = 3.0
upDownLabel = "HIGHER", "LOWER"
table = stagingTbl, stagingMap, "Fuel Staging Table", 10
table = stagingTbl, stagingMap, "Fuel Staging Table", 7
xBins = rpmBinsStaging, rpm
yBins = loadBinsStaging, fuelLoad
zBins = stagingTable
@ -4325,7 +4320,7 @@ cmdVSSratio6 = "E\x99\x06"
upDownLabel = "HIGHER", "LOWER"
;--------- Sequential fuel trim maps -----------
table = fuelTrimTable1Tbl, fuelTrimTable1Map, "Fuel trim Table 1", 9
table = fuelTrimTable1Tbl, fuelTrimTable1Map, "Fuel trim Table 1", 8
topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
xBins = fuelTrim1rpmBins, rpm
yBins = fuelTrim1loadBins, fuelLoad
@ -4334,7 +4329,7 @@ cmdVSSratio6 = "E\x99\x06"
gridOrient = 250, 0, 340
upDownLabel = "(RICHER)", "(LEANER)"
table = fuelTrimTable2Tbl, fuelTrimTable2Map, "Fuel trim Table 2", 9
table = fuelTrimTable2Tbl, fuelTrimTable2Map, "Fuel trim Table 2", 8
topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
xBins = fuelTrim2rpmBins, rpm
yBins = fuelTrim2loadBins, fuelLoad
@ -4343,7 +4338,7 @@ cmdVSSratio6 = "E\x99\x06"
gridOrient = 250, 0, 340
upDownLabel = "(RICHER)", "(LEANER)"
table = fuelTrimTable3Tbl, fuelTrimTable3Map, "Fuel trim Table 3", 9
table = fuelTrimTable3Tbl, fuelTrimTable3Map, "Fuel trim Table 3", 8
topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
xBins = fuelTrim3rpmBins, rpm
yBins = fuelTrim3loadBins, fuelLoad
@ -4352,7 +4347,7 @@ cmdVSSratio6 = "E\x99\x06"
gridOrient = 250, 0, 340
upDownLabel = "(RICHER)", "(LEANER)"
table = fuelTrimTable4Tbl, fuelTrimTable4Map, "Fuel trim Table 4", 9
table = fuelTrimTable4Tbl, fuelTrimTable4Map, "Fuel trim Table 4", 8
topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
xBins = fuelTrim4rpmBins, rpm
yBins = fuelTrim4loadBins, fuelLoad
@ -4361,7 +4356,7 @@ cmdVSSratio6 = "E\x99\x06"
gridOrient = 250, 0, 340
upDownLabel = "(RICHER)", "(LEANER)"
table = fuelTrimTable5Tbl, fuelTrimTable5Map, "Fuel trim Table 5", 9
table = fuelTrimTable5Tbl, fuelTrimTable5Map, "Fuel trim Table 5", 8
topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
xBins = fuelTrim5rpmBins, rpm
yBins = fuelTrim5loadBins, fuelLoad
@ -4370,7 +4365,7 @@ cmdVSSratio6 = "E\x99\x06"
gridOrient = 250, 0, 340
upDownLabel = "(RICHER)", "(LEANER)"
table = fuelTrimTable6Tbl, fuelTrimTable6Map, "Fuel trim Table 6", 9
table = fuelTrimTable6Tbl, fuelTrimTable6Map, "Fuel trim Table 6", 8
topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
xBins = fuelTrim6rpmBins, rpm
yBins = fuelTrim6loadBins, fuelLoad
@ -4379,7 +4374,7 @@ cmdVSSratio6 = "E\x99\x06"
gridOrient = 250, 0, 340
upDownLabel = "(RICHER)", "(LEANER)"
table = fuelTrimTable7Tbl, fuelTrimTable7Map, "Fuel trim Table 7", 9
table = fuelTrimTable7Tbl, fuelTrimTable7Map, "Fuel trim Table 7", 8
topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
xBins = fuelTrim7rpmBins, rpm
yBins = fuelTrim7loadBins, fuelLoad
@ -4388,7 +4383,7 @@ cmdVSSratio6 = "E\x99\x06"
gridOrient = 250, 0, 340
upDownLabel = "(RICHER)", "(LEANER)"
table = fuelTrimTable8Tbl, fuelTrimTable8Map, "Fuel trim Table 8", 9
table = fuelTrimTable8Tbl, fuelTrimTable8Map, "Fuel trim Table 8", 8
topicHelp = "http://speeduino.com/wiki/index.php/Tuning"
xBins = fuelTrim8rpmBins, rpm
yBins = fuelTrim8loadBins, fuelLoad
@ -4397,7 +4392,7 @@ cmdVSSratio6 = "E\x99\x06"
gridOrient = 250, 0, 340
upDownLabel = "(RICHER)", "(LEANER)"
table = dwell_map, dwell_tblMap, "Dwell map", 4
table = dwell_map, dwell_tblMap, "Dwell map", 12
xBins = rpmBinsDwell, rpm
yBins = mapBinsDwell, map
zBins = dwellTable