From ef03225c32d9af581d971f4e501f68015288b938 Mon Sep 17 00:00:00 2001 From: tx_haggis <13982343+adbancroft@users.noreply.github.com> Date: Sun, 18 Jul 2021 18:14:45 -0500 Subject: [PATCH] INI file fixes (#615) * Add missing commas * Missing closing brace * Missing & Was using bitwise comparison (&): looks like it should be boolean (&&) * Remove extra closing brace "}" Co-authored-by: Josh Stewart --- reference/speeduino.ini | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/reference/speeduino.ini b/reference/speeduino.ini index fabbe11a..c905c0ca 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -338,7 +338,7 @@ page = 1 idleUpPin = bits, U08, 57, [0:5], "Board Default", "INVALID", "INVALID", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "INVALID", "A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15", "INVALID" idleUpPolarity= bits, U08, 57, [6:6], "Normal", "Inverted" idleUpEnabled = bits, U08, 57, [7:7], "Off", "On" - idleUpAdder = scalar, U08, 58, "% / Steps" 1.0, 0.0, 0.0, 250.0, 0 + idleUpAdder = scalar, U08, 58, "% / Steps", 1.0, 0.0, 0.0, 250.0, 0 aeTaperMin = scalar, U08, 59, "RPM", 100, 0.0, 1000, 10000, 0 aeTaperMax = scalar, U08, 60, "RPM", 100, 0.0, 2000, 10000, 0 @@ -380,7 +380,7 @@ page = 1 idleAdvRPM = scalar, U08, 93, "rpm", 100, 0.0, 100, 25500, 0 idleAdvTPS = scalar, U08, 94, "%", 1, 0, 0, 120, 0 - injAngRPM = array, U08, 95, [4], "RPM" 100, 0.0, 100, 10000, 0 + injAngRPM = array, U08, 95, [4], "RPM", 100, 0.0, 100, 10000, 0 idleTaperTime = scalar, U08, 99, "S", 0.1, 0.0, 0.0, 25.5, 1 dfcoDelay = scalar, U08, 100, "S", 0.1, 0.0, 0.0, 25.5, 1 ;Remainder of DFCO settings are in page 4 #if CELSIUS @@ -393,7 +393,7 @@ page = 1 vssMode = bits, U08, 102, [0:1], "Off", "INVALID", "Pulses per KM", "Pulses per mile" ;INVALID value will be CAN ;vssPullup = bits, U08, 102, [1:1], "Off", "On" vssPin = bits, U08, 102, [2:7], "Board Default", "INVALID", "INVALID", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "INVALID", "A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15", "INVALID" - vssPulsesPerKm= scalar, U16, 103, "pulses" 1.0, 0.0, 0.0, 25500, 0 + vssPulsesPerKm= scalar, U16, 103, "pulses", 1.0, 0.0, 0.0, 25500, 0 vssSmoothing = scalar, U08, 105, "%", 1.0, 0, 0, 255, 0 vssRatio1 = scalar, U16, 106, "km/h per 1000rpm", 0.1, 0, 0, 99.9, 1 vssRatio2 = scalar, U16, 108, "km/h per 1000rpm", 0.1, 0, 0, 99.9, 1 @@ -411,10 +411,10 @@ page = 1 primingDelay = scalar, U08, 120, "S", 0.1, 0.0, 0.0, 25.5, 1 iacTPSlimit = scalar, U08, 121, "%", 1, 0, 0, 100, 0 - iacRPMlimitHysteresis = scalar, U08, 122, "RPM" 10, 0 10 2500, 0 + iacRPMlimitHysteresis = scalar, U08, 122, "RPM", 10, 0, 10, 2500, 0 rtc_trim = scalar, S08, 123, "ppm", 1, 0, -127, +127, 0 - idleAdvVss = scalar, U08, 124, "km/h", 1 0.0, 0.0, 255, 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 @@ -454,7 +454,7 @@ page = 4 useResync = bits, U08, 6,[7:7], "No", "Yes" sparkDur = scalar, U08, 7, "ms", 0.1, 0, 0, 25.5, 1 ; Spark duration trigPatternSec = bits,U08, 8,[0:6], "Single tooth cam", "4-1 cam", "Poll level", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - PollLevelPol = bits, U08, 8,[7:7], "Low", "High", + PollLevelPol = bits, U08, 8,[7:7], "Low", "High" ;Reset Control bootloaderCaps = scalar, U08, 9, "level", 1, 0, 0, 255, 0 @@ -552,7 +552,7 @@ 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 @@ -2444,7 +2444,7 @@ menuDialog = main dialog = idleUpOutputSettingsPanel, "Idle Up Output Settings", yAxis field = "Idle Up Output Enabled", idleUpOutputEnabled, { idleUpEnabled } - field = "Idle Up Output Inverted", idleUpOutputInv, { idleUpEnabled && idleUpOutputEnabled + field = "Idle Up Output Inverted", idleUpOutputInv, { idleUpEnabled && idleUpOutputEnabled } field = "Idle Up Output Pin", idleUpOutputPin, { idleUpEnabled && idleUpOutputEnabled } dialog = idleUpSettings, "Idle Up Settings" @@ -2515,8 +2515,8 @@ menuDialog = main field = "cranking before the injectors and coils are fired" field = "Trigger edge", TrigEdge { TrigPattern != 4 } ;4G63 uses both edges field = "Secondary trigger edge", TrigEdgeSec, { (TrigPattern == 0 && TrigSpeed == 0 && trigPatternSec != 2) || TrigPattern == 2 || TrigPattern == 9 || TrigPattern == 12 || TrigPattern == 18 || TrigPattern == 19 || TrigPattern == 20 } ;Missing tooth, dual wheel and Miata 9905, weber-marelli, ST170 - field = "Missing Tooth Secondary type" trigPatternSec, { (TrigPattern == 0&& TrigSpeed == 0) } - field = "Level for 1st phase" PollLevelPol, { (TrigPattern == 0 && TrigSpeed == 0 && trigPatternSec == 2) } + field = "Missing Tooth Secondary type", trigPatternSec, { (TrigPattern == 0&& TrigSpeed == 0) } + field = "Level for 1st phase", PollLevelPol, { (TrigPattern == 0 && TrigSpeed == 0 && trigPatternSec == 2) } field = "Trigger Filter", TrigFilter, { TrigPattern != 13 } field = "Re-sync every cycle", useResync, { TrigPattern == 2 || TrigPattern == 4 || TrigPattern == 7 || TrigPattern == 12 || TrigPattern == 9 || TrigPattern == 13 || TrigPattern == 18 || TrigPattern == 19 } ;Dual wheel, 4G63, Audi 135, Nissan 360, Miata 99-05, weber-marelli @@ -2973,7 +2973,7 @@ menuDialog = main dialog = outputtestinj1, "Injector CH1", yAxis commandButton = "Off", cmdtestinj1off,{testactive} commandButton = "50% DC", cmdtestinj150dc,{!testenabled && testactive} - commandButton = "On", cmdtestinj1on,{!testenabled & testactive} + commandButton = "On", cmdtestinj1on,{!testenabled && testactive} dialog = outputtestinj2, "Injector CH2", yAxis commandButton = "Off", cmdtestinj2off,{testactive && nFuelChannels >= 2 } commandButton = "50% DC", cmdtestinj250dc,{!testenabled && testactive && nFuelChannels >= 2 } @@ -2993,7 +2993,7 @@ menuDialog = main dialog = outputtestinj6, "Injector CH6", yAxis commandButton = "Off", cmdtestinj6off,{ testactive && nFuelChannels >= 6 } commandButton = "50% DC", cmdtestinj650dc,{!testenabled && testactive && nFuelChannels >= 6 } - commandButton = "On", cmdtestinj6on ,{ !testenabled & testactive && nFuelChannels >= 6 } + commandButton = "On", cmdtestinj6on ,{ !testenabled && testactive && nFuelChannels >= 6 } dialog = outputtestinj7, "Injector CH7", yAxis commandButton = "Off", cmdtestinj7off,{ testactive && nFuelChannels >= 7 } commandButton = "50% DC", cmdtestinj750dc,{!testenabled && testactive && nFuelChannels >= 7 } @@ -3001,7 +3001,7 @@ menuDialog = main dialog = outputtestinj8, "Injector CH8", yAxis commandButton = "Off", cmdtestinj8off,{ testactive && nFuelChannels >= 8 } commandButton = "50% DC", cmdtestinj850dc,{!testenabled && testactive && nFuelChannels >= 8 } - commandButton = "On", cmdtestinj8on ,{ !testenabled & testactive && nFuelChannels >= 8 } + commandButton = "On", cmdtestinj8on ,{ !testenabled && testactive && nFuelChannels >= 8 } dialog = outputtest_injectors, "Injector Driver Output Test", xAxis panel = outputtestinj1 @@ -3227,16 +3227,16 @@ menuDialog = main field = "", caninput_sel11extsourcea, {(caninput_sel11a == 1 || caninput_sel11b == 1) }, {enable_secondarySerial && (!enable_intcan || (enable_intcan && !intcan_available))} field = "", caninput_sel11extsourceb, {(caninput_sel11a == 1 || caninput_sel11b == 1) }, {enable_secondarySerial && (enable_intcan && intcan_available)} field = "", caninput_sel11extsourcec, {(caninput_sel11a == 1 || caninput_sel11b == 1) }, {!enable_secondarySerial && (enable_intcan && intcan_available)} - field = "", caninput_sel12extsourcea, {(caninput_sel12a == 1 || caninput_sel12b == 1) }, {enable_secondarySerial && (!enable_intcan || (enable_intcan && !intcan_available))}} + field = "", caninput_sel12extsourcea, {(caninput_sel12a == 1 || caninput_sel12b == 1) }, {enable_secondarySerial && (!enable_intcan || (enable_intcan && !intcan_available))} field = "", caninput_sel12extsourceb, {(caninput_sel12a == 1 || caninput_sel12b == 1) }, {enable_secondarySerial && (enable_intcan && intcan_available)} field = "", caninput_sel12extsourcec, {(caninput_sel12a == 1 || caninput_sel12b == 1) }, {!enable_secondarySerial && (enable_intcan && intcan_available)} - field = "", caninput_sel13extsourcea, {(caninput_sel13a == 1 || caninput_sel13b == 1) }, {enable_secondarySerial && (!enable_intcan || (enable_intcan && !intcan_available))}} + field = "", caninput_sel13extsourcea, {(caninput_sel13a == 1 || caninput_sel13b == 1) }, {enable_secondarySerial && (!enable_intcan || (enable_intcan && !intcan_available))} field = "", caninput_sel13extsourceb, {(caninput_sel13a == 1 || caninput_sel13b == 1) }, {enable_secondarySerial && (enable_intcan && intcan_available)} field = "", caninput_sel13extsourcec, {(caninput_sel13a == 1 || caninput_sel13b == 1) }, {!enable_secondarySerial && (enable_intcan && intcan_available)} - field = "", caninput_sel14extsourcea, {(caninput_sel14a == 1 || caninput_sel14b == 1) }, {enable_secondarySerial && (!enable_intcan || (enable_intcan && !intcan_available))}} + field = "", caninput_sel14extsourcea, {(caninput_sel14a == 1 || caninput_sel14b == 1) }, {enable_secondarySerial && (!enable_intcan || (enable_intcan && !intcan_available))} field = "", caninput_sel14extsourceb, {(caninput_sel14a == 1 || caninput_sel14b == 1) }, {enable_secondarySerial && (enable_intcan && intcan_available)} field = "", caninput_sel14extsourcec, {(caninput_sel14a == 1 || caninput_sel14b == 1) }, {!enable_secondarySerial && (enable_intcan && intcan_available)} - field = "", caninput_sel15extsourcea, {(caninput_sel15a == 1 || caninput_sel15b == 1) }, {enable_secondarySerial && (!enable_intcan || (enable_intcan && !intcan_available))}} + field = "", caninput_sel15extsourcea, {(caninput_sel15a == 1 || caninput_sel15b == 1) }, {enable_secondarySerial && (!enable_intcan || (enable_intcan && !intcan_available))} field = "", caninput_sel15extsourceb, {(caninput_sel15a == 1 || caninput_sel15b == 1) }, {enable_secondarySerial && (enable_intcan && intcan_available)} field = "", caninput_sel15extsourcec, {(caninput_sel15a == 1 || caninput_sel15b == 1) }, {!enable_secondarySerial && (enable_intcan && intcan_available)} @@ -4520,7 +4520,7 @@ cmdVSSratio6 = "E\x99\x06" reqFuelGauge = req_fuel, "Req. Fuel", "ms", 0, 35.0, 1.0, 1.2, 20, 25, 2, 2 mapMultiplyGauge = map_multiply_amt, "MAP Multiply", "%", 0, 200, 130, 140, 140, 150, 0, 0 nSquirtsGauge = nSquirts, "# Squirts", "", 0, 10, 130, 140, 140, 150, 0, 0 - syncLossGauge = syncLossCounter, "# Sync Losses" "", 0, 255, -1, -1, 10, 50, 0, 0 + syncLossGauge = syncLossCounter, "# Sync Losses", "", 0, 255, -1, -1, 10, 50, 0, 0 ;------------------------------------------------------------------------------- [FrontPage] @@ -4543,7 +4543,7 @@ cmdVSSratio6 = "E\x99\x06" ;---------------------------------------------------------------------------- ; Indicators ; expr off-label on-label, off-bg, off-fg, on-bg, on-fg - indicator = { running }, "Not Running", "Running" white, black, green, black + indicator = { running }, "Not Running", "Running", white, black, green, black indicator = { crank }, "Not Cranking", "Cranking", white, black, green, black indicator = { ase }, "ASE OFF", "ASE ON", white, black, green, black indicator = { warmup }, "WUE OFF", "WUE ON", white, black, green, black