diff --git a/reference/speeduino.ini b/reference/speeduino.ini index 79542047..d71e9e1e 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -948,7 +948,7 @@ page = 10 fuel2Algorithm = bits, U08, 122, [0:2], $loadSourceNames fuel2Mode = bits, U08, 122, [3:5], "Off", "Multiplied %", "Added", "Switched - Conditional", "Switched - Input based","INVALID","INVALID","INVALID" fuel2SwitchVariable = bits, U08, 122, [6:7], "RPM", "MAP", "TPS", "ETH%" - fuel2SwitchValue = scalar, U16, 123, { bitStringValue(algorithmUnits, fuel2SwitchVariable) }, 1.0, 0.0, 0.0, 9000, 0 + fuel2SwitchValue = scalar, U16, 123, { bitStringValue(fuel2SwitchUnits, fuel2SwitchVariable) }, 1.0, 0.0, 0.0, 9000, 0 fuel2InputPin = bits , U08, 125, [0:5], $IO_Pins_no_def fuel2InputPolarity = bits , U08, 125, [6:6], "LOW", "HIGH" fuel2InputPullup = bits , U08, 125, [7:7], "No", "Yes" @@ -3100,12 +3100,14 @@ cmdtestspk450dc = "E\x03\x0C" gammaEnrichGauge = gammaEnrich, "Gamma Enrichment", "%", 50, 150, -1, -1, 151, 151, 0, 0 pulseWidthGauge = pulseWidth, "Pulse Width", "mSec", 0, 35.0, 1.0, 1.2, 20, 25, 3, 3 tachometer = rpm, "Engine Speed", "RPM", 0, 8000, 300, 600, 3000, 5000, 0, 0 - veGauge = veCurr, "VE 1 Current", "%", 0, 120, -1, -1, 999, 999, 0, 0 + veGauge = veCurr, "Current VE", "%", 0, 120, -1, -1, 999, 999, 0, 0 + ve1Gauge = VE1, "VE1 (Fuel Table 1)", "%", 0, 120, -1, -1, 999, 999, 0, 0 + ve2Gauge = VE2, "VE2 (Fuel Table 2)", "%", 0, 120, -1, -1, 999, 999, 0, 0 warmupEnrichGauge = warmupEnrich, "Warmup Enrichment", "%", 100, 200, 130, 140, 140, 150, 0, 0 aseEnrichGauge = ase_enrich, "Afterstart Enrichment","%", 0, 200, 130, 140, 140, 150, 0, 0 batCorrectGauge = batCorrection, "Voltage Correction", "%", 0, 200, 130, 140, 140, 150, 0, 0 iatCorrectGauge = airCorrection, "IAT Correction", "%", 0, 200, 130, 140, 140, 150, 0, 0 - flexEnrich, = flexFuelCor, "Flex Correction", "%", 0, 200, 130, 140, 140, 150, 0, 0 + flexEnrich = flexFuelCor, "Flex Correction", "%", 0, 200, 130, 140, 140, 150, 0, 0 advanceGauge = advance, "Spark Advance", "deg BTDC", 50, -10, 0, 0, 35, 45, 0, 0 dwellGauge = dwell, "Ign Dwell", "mSec", 0, 35.0, 1.0, 1.2, 20, 25, 3, 3 @@ -3211,7 +3213,7 @@ cmdtestspk450dc = "E\x03\x0C" ; you change it. ochGetCommand = "r\$tsCanId\x30%2o%2c" - ochBlockSize = 96 + ochBlockSize = 98 secl = scalar, U08, 0, "sec", 1.000, 0.000 status1 = scalar, U08, 1, "bits", 1.000, 0.000 @@ -3246,8 +3248,9 @@ cmdtestspk450dc = "E\x03\x0C" accelEnrich = scalar, U08, 16, "%", 2.000, 0.000 gammaEnrich = scalar, U08, 17, "%", 1.000, 0.000 veCurr = scalar, U08, 18, "%", 1.000, 0.000 - afrTarget = scalar, U08, 19, "O2", 0.100, 0.000 - pulseWidth = scalar, U16, 20, "ms", 0.001, 0.000 + VE1 = scalar, U08, 19, "%", 1.000, 0.000 + VE2 = scalar, U08, 20, "%", 1.000, 0.000 + afrTarget = scalar, U08, 21, "O2", 0.100, 0.000 TPSdot = scalar, U08, 22, "%/s", 10.00, 0.000 advance = scalar, S08, 23, "deg", 1.000, 0.000 tps = scalar, U08, 24, "%", 1.000, 0.000 @@ -3295,15 +3298,16 @@ cmdtestspk450dc = "E\x03\x0C" errors = scalar, U08, 74, "bits", 1.000, 0.000 errorNum = bits, U08, 74, [0:1] currentError = bits, U08, 74, [2:7] - pulseWidth2 = scalar, U16, 75, "ms", 0.001, 0.000 - pulseWidth3 = scalar, U16, 77, "ms", 0.001, 0.000 - pulseWidth4 = scalar, U16, 79, "ms", 0.001, 0.000 - status3 = scalar, U08, 81, "bits", 1.000, 0.000 - resetLockOn = bits, U08, 81, [0:0] - nitrousOn = bits, U08, 81, [1:1] - unused81_2-4 = bits, U08, 81, [2:4] - nSquirts = bits, U08, 81, [5:7] - flexBoostCor = scalar, S16, 82, "kPa", 1.000, 0.000 + pulseWidth = scalar, U16, 75, "ms", 0.001, 0.000 + pulseWidth2 = scalar, U16, 77, "ms", 0.001, 0.000 + pulseWidth3 = scalar, U16, 79, "ms", 0.001, 0.000 + pulseWidth4 = scalar, U16, 81, "ms", 0.001, 0.000 + status3 = scalar, U08, 83, "bits", 1.000, 0.000 + resetLockOn = bits, U08, 83, [0:0] + nitrousOn = bits, U08, 83, [1:1] + fuel2Active = bits, U08, 83, [2:2] + unused81_3-4 = bits, U08, 83, [3:4] + nSquirts = bits, U08, 83, [5:7] nChannels = scalar, U08, 84, "bits", 1.000, 0.000 nIgnChannels = bits, U08, 84, [0:3] nFuelChannels = bits, U08, 84, [4:7] @@ -3315,6 +3319,7 @@ cmdtestspk450dc = "E\x03\x0C" vvtAngle = scalar, S08, 93, "deg", 1.00, 0.000 vvtTarget = scalar, U08, 94, "deg", 1.00, 0.000 vvtDuty = scalar, U08, 95, "%", 1.00, 0.000 + flexBoostCor = scalar, S16, 96, "kPa", 1.000, 0.000 #if CELSIUS coolant = { coolantRaw - 40 } ; Temperature readings are offset by 40 to allow for negatives @@ -3402,7 +3407,9 @@ cmdtestspk450dc = "E\x03\x0C" ;entry = baroCorrection, "Gbaro", int, "%d" entry = gammaEnrich, "Gammae", int, "%d" entry = accelEnrich, "Accel Enrich", int, "%d" - entry = veCurr, "VE1", int, "%d" + entry = veCurr, "Current VE", int, "%d" + entry = VE1, "VE1", int, "%d" + entry = VE2, "VE2", int, "%d" entry = pulseWidth, "PW", float, "%.1f" entry = afrTarget, "AFR Target", float, "%.3f" entry = pulseWidth, "PW2", float, "%.1f" diff --git a/speeduino/src/FastCRC/FastCRC_tables.h b/speeduino/src/FastCRC/FastCRC_tables.h index c0d32c11..e20ddd7e 100755 --- a/speeduino/src/FastCRC/FastCRC_tables.h +++ b/speeduino/src/FastCRC/FastCRC_tables.h @@ -31,7 +31,7 @@ #define FastCRC_tables #include "inttypes.h" -#if defined(__AVR__) || defined(STM32_MCU_SERIES) || defined(ARDUINO_ARCH_STM32) || defined(_VARIANT_ARDUINO_STM32_) || defined(__SAMD21G18A__) +#if defined(__AVR__) || defined(STM32_MCU_SERIES) || defined(ARDUINO_ARCH_STM32) || defined(_VARIANT_ARDUINO_STM32_) || defined(__SAMD21G18A__) || defined(__IMXRT1062__) #include #else #include