diff --git a/reference/speeduino.ini b/reference/speeduino.ini index 23a6cb21..bd9d9d02 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -211,7 +211,7 @@ page = 4 #if CELSIUS IdleAdvCLT = scalar, U08, 9, "C", 1, -40, -40, 102, 1 #else - IdleAdvCLT = scalar, U08, 9, "F", 0.555, -8, -40, 215, 0 + IdleAdvCLT = scalar, U08, 9, "F", 1.8, -22.23, -40, 215, 0 #endif IdleDelayTime = scalar, U08, 10, "sec", 1, 0, 0, 5, 0 StgCycles = scalar, U08, 11, "cycles", 1, 0, 0, 255, 0 @@ -241,7 +241,11 @@ page = 4 ;TPS based acceleration enrichment taeBins = array, U08, 23, [ 4], "%/s", 10.0, 0.0, 0.00, 2550.0, 0 taeRates = array, U08, 27, [ 4], "%", 1.0, 0.0, 0.00, 255.0, 0 ; 4 bytes + #if CELSIUS wueRates = array, U08, 31, [10], "C", 1.0, 0.0, 100.0, 255.0, 0 + #else + wueRates = array, U08, 31, [10], "F", 1.8, 17.77, 100.0, 255.0, 0 ; No -40 degree offset here + #endif ;Dwell config options dwellLim = scalar, U08, 41, "ms", 1, 0, 0, 32, 0 dwellRates = array, U08, 42, [6], "%", 1.0, 0.0, 0.00, 255.0, 0 @@ -250,7 +254,7 @@ page = 4 #if CELSIUS iatRetBins = array, U08, 48, [ 6], "C", 1.0, 0.0, 0.00, 255.0, 0 #else - iatRetBins = array, U08, 48, [ 6], "F", 1.0, 0.0, 0.00, 255.0, 0 + iatRetBins = array, U08, 48, [ 6], "F", 1.8, 17.77, 0.00, 255.0, 0 ; No -40 degree offset here #endif iatRetRates = array, U08, 54, [ 6], "deg", 1.0, 0.0, 0.00, 255.0, 0 ;Decelleration Fuel Cut Off (DFCO) @@ -290,9 +294,9 @@ page = 6 egoKI = scalar, U08, 2, "%", 1.0, 0.0, 0.0, 200.0, 0 ; * ( 1 byte) egoKD = scalar, U08, 3, "%", 1.0, 0.0, 0.0, 200.0, 0 ; * ( 1 byte) #if CELSIUS - egoTemp = scalar, U08, 4, "°C", 0.555, -72, -40, 102.0, 0 + egoTemp = scalar, U08, 4, "°C", 1.0, -40, -40, 102.0, 0 #else - egoTemp = scalar, U08, 4, "°F", 1.0, -40, -40, 215.0, 0 + egoTemp = scalar, U08, 4, "°F", 1.8, -22.23, -40, 215.0, 0 #endif egoCount = scalar, U08, 5, "", 4.0, 0.0, 4.0, 255.0, 0 ; * ( 1 byte) egoDelta = scalar, U08, 6, "%", 1.0, 0.0, 0.0, 255.0, 0 ; * ( 1 byte) @@ -306,7 +310,11 @@ page = 6 egoLoadMin = scalar, U08, 14, "%", 1, 0, 0, 120, 0 brvBins = array, U08, 15, [6], "V", 0.1, 0, 6, 24, 1 ; Bins for the battery reference voltage injBatRates = array, U08, 21, [6], "%", 1, 0, 0, 255, 0 ;Values for injector pulsewidth vs voltage + #if CELSIUS airDenBins = array, U08, 27, [9], "C", 1.0, -40, -40, 215, 0 ; Bins for the air density correction curve + #else + airDenBins = array, U08, 27, [9], "F", 1.8, -22.23, -40, 215, 0 ; Bins for the air density correction curve + #endif airDenRates = array, U08, 36, [9], "%", 1.0, 0.0, 0, 255, 0 ; Values for the air density correction curve ; PWM Frequencies @@ -343,10 +351,18 @@ page = 7 iacCLValues = array, U08, 0, [10], "RPM", 1.0, 0.0, 100.0, 255, 0 iacOLStepVal = array, U08, 10, [10], "Steps", 3, 0, 0, 765, 0 iacOLPWMVal = array, U08, 20, [10], "Duty %", 1.0, 0, 0, 100, 0 + #if CELSIUS iacBins = array, U08, 30, [10], "C", 1.0, -40, -40, 215, 0 + #else + iacBins = array, U08, 30, [10], "F", 1.8, -22.23, -40, 215, 0 + #endif iacCrankSteps= array, U08, 40, [4], "Steps", 3, 0, 0, 765, 0 iacCrankDuty = array, U08, 44, [4], "Duty %", 1.0, 0, 0, 100, 0 + #if CELSIUS iacCrankBins = array, U08, 48, [4], "C", 1.0, -40, -40, 215, 0 + #else + iacCrankBins = array, U08, 48, [4], "F", 1.8, -22.23, -40, 215, 0 + #endif iacAlgorithm = bits , U08, 52, [0:2], "None", "On/Off", "PWM", "INVALID", "Stepper", "INVALID", "INVALID", "INVALID" iacStepTime = bits , U08, 52, [3:5], "1", "2", "3", "4", "5", "6" @@ -356,7 +372,7 @@ page = 7 #if CELSIUS iacFastTemp = scalar, U08, 53, "C", 1.0, -40, -40, 215, 0 #else - iacFastTemp = scalar, U08, 53, "F", 1.8, -4.44, -40, 215, 0 + iacFastTemp = scalar, U08, 53, "F", 1.8, -22.23, -40, 215, 0 #endif iacStepHome = scalar, U08, 54, "Steps", 3, 0, 0, 765, 0 @@ -375,8 +391,8 @@ page = 7 fanSP = scalar, U08, 57, "°C", 1.0, -40, -40, 215.0, 0 fanHyster = scalar, U08, 58, "°C", 1.0, -40, -40, 215.0, 0 #else - fanSP = scalar, U08, 57, "°F", 1.0, -40, -40, 215.0, 0 - fanHyster = scalar, U08, 58, "°F", 1.0, -40, -40, 215.0, 0 + fanSP = scalar, U08, 57, "°F", 1.8, -22.23, -40, 215.0, 0 + fanHyster = scalar, U08, 58, "°F", 1.8, -22.23, -40, 215.0, 0 #endif unused7-59 = scalar, U08, 59, "RPM", 100.0, 0.0, 100, 25500, 0 unused7-60 = scalar, U08, 60, "RPM", 100.0, 0.0, 100, 25500, 0 @@ -838,7 +854,11 @@ page = 8 ; Standard duty table for PWM valves curve = iacPwm_curve, "IAC PWM Duty" columnLabel = "Coolant Temperature", "Valve" + #if CELSIUS xAxis = -40, 215, 6 + #else + xAxis = -40, 315, 6 + #endif yAxis = 0, 100, 4 xBins = iacBins, coolant yBins = iacOLPWMVal @@ -853,7 +873,11 @@ page = 8 curve = iacStep_curve, "IAC Stepper Motor" columnLabel = "Coolant Temperature", "Motor" - xAxis = -40, 120, 6 + #if CELSIUS + xAxis = -40, 215, 6 + #else + xAxis = -40, 315, 6 + #endif yAxis = 0, 850, 4 xBins = iacBins, coolant yBins = iacOLStepVal @@ -1140,13 +1164,8 @@ page = 8 mapaccden = bits, U08, 2, [7:7] dwell = scalar, U08, 3, "ms", 0.100, 0.000 map = scalar, U08, 4, "kpa", 2.000, 0.000 -#if CELSIUS iatRaw = scalar, U08, 5, "°C", 1.000, 0.000 coolantRaw = scalar, U08, 6, "°C", 1.000, 0.000 -#else - iatRaw = scalar, U08, 5, "°F", 1.800, 32.000 - coolantRaw = scalar, U08, 6, "°F", 1.800, 32.000 -#endif tpsADC = scalar, U08, 7, "ADC", 1.000, 0.000 batteryVoltage = scalar, U08, 8, "V", 0.100, 0.000 afr = scalar, U08, 9, "O2", 0.100, 0.000 @@ -1174,9 +1193,13 @@ page = 8 ; pre-defined variables, search for "???" and you'll see them. accDecEnrich = { accelEnrich + ((engine & 0b00100000) ? tdePct : 100) } +#if CELSIUS coolant = { coolantRaw - 40 } ; Coolant sensor temperature in user units. iat = { iatRaw - 40 } ; Manifold temperature in user units. - ; egoVoltage = { egoADC / 255.0 * 5.0 } ; EGO sensor voltage. +#else + coolant = { (coolantRaw - 40) * 1.8 + 32 } ; Coolant sensor temperature in user units. + iat = { (iatRaw - 40) * 1.8 + 32 } ; Manifold temperature in user units. +#endif time = { timeNow } ; "timeNow" is a parameterless built-in function. seconds = { secl };