Revert the advance table name to old value in ini file. Fixes #160

This commit is contained in:
Josh Stewart 2018-09-04 13:41:54 +10:00
parent dffa998f0d
commit 0b6b0141f7
1 changed files with 9 additions and 7 deletions

View File

@ -294,7 +294,8 @@ page = 2
page = 3
advTable1 = array, U08, 0,[16x16], "deg", 1.0, -40, -40, 215.0, 0
rpmBins2 = array, U08, 256,[ 16], "RPM", 100.0, 0.0, 100, 25500, 0
ignLoadBins= array, U08, 272, [ 16], { bitStringValue(algorithmUnits , ignAlgorithm) }, 2.0, 0.0, 0.0, {ignLoadMax}, 0
;ignLoadBins= array, U08, 272, [ 16], { bitStringValue(algorithmUnits , ignAlgorithm) }, 2.0, 0.0, 0.0, {ignLoadMax}, 0
mapBins1= array, U08, 272, [ 16], { bitStringValue(algorithmUnits , ignAlgorithm) }, 2.0, 0.0, 0.0, {ignLoadMax}, 0 ; This name has to be used in order for the table to show up in MLVs table. I can't find the regexs that make this work :(
;--------------------------------------------------
;Start Page 4
@ -884,7 +885,7 @@ page = 10
knock_unused = bits , U08, 93, [3:4], "INVALID", "1", "2", "3"
;Knock detection / filters
knock_count = bits , U08, 93, [5:7], "INVALID", "1", "2", "3", "4", "5", "6", "INVALID"
knock_count = bits , U08, 93, [5:7], "INVALID", "1", "2", "3", "4", "5", "6", "7"
knock_threshold = scalar, U08, 94, "Volts", 0.1, 0.0, 0.0, 5.0, 1
knock_maxMAP = scalar, U08, 95, "kPa", 2.0, 0.0, 0.0, 511.0, 0
knock_maxRPM = scalar, U08, 96, "RPM", 100.0, 0.0, 0, 10000, 0
@ -1633,9 +1634,6 @@ menuDialog = main
field = "Missing Tooth Secondary type" trigPatternSec, { (TrigPattern == 0&& TrigSpeed == 0) }
field = "Trigger Filter", TrigFilter
field = "Re-sync every cycle", useResync, { TrigPattern == 2 || TrigPattern == 4 || TrigPattern == 7 || TrigPattern == 12 || TrigPattern == 9 } ;Dual wheel, 4G63, Audi 135, Nissan 360, Miata 99-05
field = ""
field = "#The below option is EXPERIMENTAL! If unsure what this is, please set to No"
field = "User per tooth ignition calculation", perToothIgn, {TrigPattern == 0 || TrigPattern == 1 || TrigPattern == 2 || TrigPattern == 4 || TrigPattern == 12 || TrigPattern == 16 } ;Only works for missing tooth, distributor, dual wheel, nissan 360, 36-2-2-2
dialog = sparkSettings,"Spark Settings",4
field = "Ignition load source", ignAlgorithm
@ -1646,6 +1644,9 @@ menuDialog = main
field = "Enabled Fixed/Locked timing", fixAngEnable
field = "Fixed Angle", FixAng, { fixAngEnable }
field = "#Note: During cranking the fixed/locked timing angle is overriden by the Cranking advance angle value above"
field = ""
field = "#The below option is currently in testing! If unsure what this is, please set to No"
field = "User new ignition mode", perToothIgn, {TrigPattern == 0 || TrigPattern == 1 || TrigPattern == 2 || TrigPattern == 4 || TrigPattern == 12 } ;Only works for missing tooth, distributor, dual wheel, 4g63, nissan 360
dialog = dwellSettings, "Dwell Settings", 4
topicHelp = "http://speeduino.com/wiki/index.php/Dwell"
@ -2559,11 +2560,12 @@ cmdtestspk450dc = "E\x03\x0C"
table = sparkTbl, sparkMap, "Ignition Advance Table", 3
xBins = rpmBins2, rpm
yBins = ignLoadBins, ignLoad
;yBins = ignLoadBins, ignLoad
yBins = mapBins1, ignLoad
xyLabels = "RPM", "Ignition Load: "
zBins = advTable1
gridHeight = 3.0
upDownLabel = "ADVANCED", "RETARDED"
upDownLabel = "ADVANCING", "RETARDING"
;table = afrTbl, afrTableMap, "AFR Table", 5
table = afrTable1Tbl, afrTable1Map, "AFR Table", 5