diff --git a/globals.h b/globals.h index 69264be0..c4fdfdd0 100644 --- a/globals.h +++ b/globals.h @@ -169,7 +169,7 @@ struct config1 { //config3 in ini byte engineType : 1; - byte egoType : 1; + byte egoType_old : 1; byte algorithm : 1; //"Speed Density", "Alpha-N" byte baroCorr : 1; byte injTiming : 2; @@ -343,6 +343,11 @@ struct config4 { byte unused : 6; byte fanSP; // Cooling fan start temperature byte fanHyster; // Fan hysteresis + byte unused59; + byte unused60; + byte unused61; + byte unused62; + byte unused63; }; byte pinInjector1; //Output pin injector 1 diff --git a/reference/speeduino.ini b/reference/speeduino.ini index 7066efde..bd7e11d4 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -140,7 +140,7 @@ page = 2 ; Config3 engineType = bits, U08, 38, [0:0], "Even fire", "Odd fire" - egoType1 = bits, U08, 38, [1:1], "Narrow band", "Wide band" + egoTypeOLD = bits, U08, 38, [1:1], "Narrow band", "Wide band" algorithm = bits, U08, 38, [2:2], "Speed Density", "Alpha-N" baroCorr = bits, U08, 38, [3:3], "Off", "On" injTiming = bits, U08, 38, [4:5], "Bank", "Semi-Sequential", "INVALID", "INVALID" @@ -154,21 +154,21 @@ page = 2 tpsMax = scalar, U08, 45, "ADC", 1.0, 0.0, 0.0, 255.0, 0 mapMin = scalar, U08, 46, "kpa", 1.0, 0.0, 0.0, 255.0, 0 mapMax = scalar, U16, 47, "kpa", 1.0, 0.0, 0.0, 25500, 0 - unused49 = scalar, U08, 49, "RPM", 100.0, 0.0, 100, 25500, 0 - unused50 = scalar, U08, 50, "RPM", 100.0, 0.0, 100, 25500, 0 - unused51 = scalar, U08, 51, "RPM", 100.0, 0.0, 100, 25500, 0 - unused52 = scalar, U08, 52, "RPM", 100.0, 0.0, 100, 25500, 0 - unused53 = scalar, U08, 53, "RPM", 100.0, 0.0, 100, 25500, 0 - unused54 = scalar, U08, 54, "RPM", 100.0, 0.0, 100, 25500, 0 - unused55 = scalar, U08, 55, "RPM", 100.0, 0.0, 100, 25500, 0 - unused56 = scalar, U08, 56, "RPM", 100.0, 0.0, 100, 25500, 0 - unused57 = scalar, U08, 57, "RPM", 100.0, 0.0, 100, 25500, 0 - unused58 = scalar, U08, 58, "RPM", 100.0, 0.0, 100, 25500, 0 - unused59 = scalar, U08, 59, "RPM", 100.0, 0.0, 100, 25500, 0 - unused60 = scalar, U08, 60, "RPM", 100.0, 0.0, 100, 25500, 0 - unused61 = scalar, U08, 61, "RPM", 100.0, 0.0, 100, 25500, 0 - unused62 = scalar, U08, 62, "RPM", 100.0, 0.0, 100, 25500, 0 - unused63 = scalar, U08, 63, "RPM", 100.0, 0.0, 100, 25500, 0 + unused2-49 = scalar, U08, 49, "RPM", 100.0, 0.0, 100, 25500, 0 + unused2-50 = scalar, U08, 50, "RPM", 100.0, 0.0, 100, 25500, 0 + unused2-51 = scalar, U08, 51, "RPM", 100.0, 0.0, 100, 25500, 0 + unused2-52 = scalar, U08, 52, "RPM", 100.0, 0.0, 100, 25500, 0 + unused2-53 = scalar, U08, 53, "RPM", 100.0, 0.0, 100, 25500, 0 + unused2-54 = scalar, U08, 54, "RPM", 100.0, 0.0, 100, 25500, 0 + unused2-55 = scalar, U08, 55, "RPM", 100.0, 0.0, 100, 25500, 0 + unused2-56 = scalar, U08, 56, "RPM", 100.0, 0.0, 100, 25500, 0 + unused2-57 = scalar, U08, 57, "RPM", 100.0, 0.0, 100, 25500, 0 + unused2-58 = scalar, U08, 58, "RPM", 100.0, 0.0, 100, 25500, 0 + unused2-59 = scalar, U08, 59, "RPM", 100.0, 0.0, 100, 25500, 0 + unused2-60 = scalar, U08, 60, "RPM", 100.0, 0.0, 100, 25500, 0 + unused2-61 = scalar, U08, 61, "RPM", 100.0, 0.0, 100, 25500, 0 + unused2-62 = scalar, U08, 62, "RPM", 100.0, 0.0, 100, 25500, 0 + unused2-63 = scalar, U08, 63, "RPM", 100.0, 0.0, 100, 25500, 0 ;-------------------------------------------------- ;Start Ignition table (Page 3) @@ -240,22 +240,22 @@ page = 4 dwellLim = scalar, U08, 41, "ms", 1, 0, 0, 32, 0 dwellRates = array, U08, 42, [6], "%", 1.0, 0.0, 0.00, 255.0, 0 - unused48 = scalar, U08, 48, "RPM", 100.0, 0.0, 100, 25500, 0 - unused49 = scalar, U08, 49, "RPM", 100.0, 0.0, 100, 25500, 0 - unused50 = scalar, U08, 50, "RPM", 100.0, 0.0, 100, 25500, 0 - unused51 = scalar, U08, 51, "RPM", 100.0, 0.0, 100, 25500, 0 - unused52 = scalar, U08, 52, "RPM", 100.0, 0.0, 100, 25500, 0 - unused53 = scalar, U08, 53, "RPM", 100.0, 0.0, 100, 25500, 0 - unused54 = scalar, U08, 54, "RPM", 100.0, 0.0, 100, 25500, 0 - unused55 = scalar, U08, 55, "RPM", 100.0, 0.0, 100, 25500, 0 - unused56 = scalar, U08, 56, "RPM", 100.0, 0.0, 100, 25500, 0 - unused57 = scalar, U08, 57, "RPM", 100.0, 0.0, 100, 25500, 0 - unused58 = scalar, U08, 58, "RPM", 100.0, 0.0, 100, 25500, 0 - unused59 = scalar, U08, 59, "RPM", 100.0, 0.0, 100, 25500, 0 - unused60 = scalar, U08, 60, "RPM", 100.0, 0.0, 100, 25500, 0 - unused61 = scalar, U08, 61, "RPM", 100.0, 0.0, 100, 25500, 0 - unused62 = scalar, U08, 62, "RPM", 100.0, 0.0, 100, 25500, 0 - unused63 = scalar, U08, 63, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-48 = scalar, U08, 48, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-49 = scalar, U08, 49, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-50 = scalar, U08, 50, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-51 = scalar, U08, 51, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-52 = scalar, U08, 52, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-53 = scalar, U08, 53, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-54 = scalar, U08, 54, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-55 = scalar, U08, 55, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-56 = scalar, U08, 56, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-57 = scalar, U08, 57, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-58 = scalar, U08, 58, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-59 = scalar, U08, 59, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-60 = scalar, U08, 60, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-61 = scalar, U08, 61, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-62 = scalar, U08, 62, "RPM", 100.0, 0.0, 100, 25500, 0 + unused4-63 = scalar, U08, 63, "RPM", 100.0, 0.0, 100, 25500, 0 ;-------------------------------------------------- @@ -282,8 +282,8 @@ page = 6 egoType = bits , U08, 0, [2:3], "Disabled", "Narrow Band", "Wide Band", "INVALID" ; egoOption boostEnabled= bits, U08, 0, [4:4], "Off", "On" vvtEnabled = bits, U08, 0, [5:5], "Off", "On" -; vvtEnabled = bits, U08, 0, [5:6], "Off", "On/Off", "PWM","Centred PID" -; vvtChannels = bits, U08, 0, [7:7], "1", "2"; + unused = bits, U08, 0, [6:7], "Off", "On/Off", "PWM","Centred PID" + egoKP = scalar, U08, 1, "%", 1.0, 0.0, 0.0, 200.0, 0 ; * ( 1 byte) 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) @@ -322,17 +322,17 @@ page = 6 lnchHardLim = scalar, U08, 51, "rpm", 100, 0.0, 100, 25500, 0 lnchFuelAdd = scalar, U08, 52, "%", 1.0, 0.0, 0.0, 80, 0 - unused53 = scalar, U08, 53, "RPM", 100.0, 0.0, 100, 25500, 0 - unused54 = scalar, U08, 54, "RPM", 100.0, 0.0, 100, 25500, 0 - unused55 = scalar, U08, 55, "RPM", 100.0, 0.0, 100, 25500, 0 - unused56 = scalar, U08, 56, "RPM", 100.0, 0.0, 100, 25500, 0 - unused57 = scalar, U08, 57, "RPM", 100.0, 0.0, 100, 25500, 0 - unused58 = scalar, U08, 58, "RPM", 100.0, 0.0, 100, 25500, 0 - unused59 = scalar, U08, 59, "RPM", 100.0, 0.0, 100, 25500, 0 - unused60 = scalar, U08, 60, "RPM", 100.0, 0.0, 100, 25500, 0 - unused61 = scalar, U08, 61, "RPM", 100.0, 0.0, 100, 25500, 0 - unused62 = scalar, U08, 62, "RPM", 100.0, 0.0, 100, 25500, 0 - unused63 = scalar, U08, 63, "RPM", 100.0, 0.0, 100, 25500, 0 + unused6-53 = scalar, U08, 53, "RPM", 100.0, 0.0, 100, 25500, 0 + unused6-54 = scalar, U08, 54, "RPM", 100.0, 0.0, 100, 25500, 0 + unused6-55 = scalar, U08, 55, "RPM", 100.0, 0.0, 100, 25500, 0 + unused6-56 = scalar, U08, 56, "RPM", 100.0, 0.0, 100, 25500, 0 + unused6-57 = scalar, U08, 57, "RPM", 100.0, 0.0, 100, 25500, 0 + unused6-58 = scalar, U08, 58, "RPM", 100.0, 0.0, 100, 25500, 0 + unused6-59 = scalar, U08, 59, "RPM", 100.0, 0.0, 100, 25500, 0 + unused6-60 = scalar, U08, 60, "RPM", 100.0, 0.0, 100, 25500, 0 + unused6-61 = scalar, U08, 61, "RPM", 100.0, 0.0, 100, 25500, 0 + unused6-62 = scalar, U08, 62, "RPM", 100.0, 0.0, 100, 25500, 0 + unused6-63 = scalar, U08, 63, "RPM", 100.0, 0.0, 100, 25500, 0 ;-------------------------------------------------- ;Start idle and fan controls (Page 7) @@ -362,12 +362,12 @@ page = 7 ; Begin fan control vairables fanInv = bits, U08, 56, [0:0], "No", "Yes" fanEnable = bits, U08, 56, [1:1], "No", "Yes" - unused55a = bits, U08, 56, [2:2], "No", "Yes" - unused55b = bits, U08, 56, [3:3], "No", "Yes" - unused55c = bits, U08, 56, [4:4], "No", "Yes" - unused55d = bits, U08, 56, [5:5], "No", "Yes" - unused55e = bits, U08, 56, [6:6], "No", "Yes" - unused55f = bits, U08, 56, [7:7], "No", "Yes" + unused7-55a = bits, U08, 56, [2:2], "No", "Yes" + unused7-55b = bits, U08, 56, [3:3], "No", "Yes" + unused7-55c = bits, U08, 56, [4:4], "No", "Yes" + unused7-55d = bits, U08, 56, [5:5], "No", "Yes" + unused7-55e = bits, U08, 56, [6:6], "No", "Yes" + unused7-55f = bits, U08, 56, [7:7], "No", "Yes" #if CELSIUS fanSP = scalar, U08, 57, "°C", 1.0, -40, -40, 215.0, 0 fanHyster = scalar, U08, 58, "°C", 1.0, -40, -40, 215.0, 0 @@ -375,11 +375,11 @@ page = 7 fanSP = scalar, U08, 57, "°F", 1.0, -40, -40, 215.0, 0 fanHyster = scalar, U08, 58, "°F", 1.0, -40, -40, 215.0, 0 #endif - unused59 = scalar, U08, 59, "RPM", 100.0, 0.0, 100, 25500, 0 - unused60 = scalar, U08, 60, "RPM", 100.0, 0.0, 100, 25500, 0 - unused61 = scalar, U08, 61, "RPM", 100.0, 0.0, 100, 25500, 0 - unused62 = scalar, U08, 62, "RPM", 100.0, 0.0, 100, 25500, 0 - unused63 = scalar, U08, 63, "RPM", 100.0, 0.0, 100, 25500, 0 + 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 + unused7-61 = scalar, U08, 61, "RPM", 100.0, 0.0, 100, 25500, 0 + unused7-62 = scalar, U08, 62, "RPM", 100.0, 0.0, 100, 25500, 0 + unused7-63 = scalar, U08, 63, "RPM", 100.0, 0.0, 100, 25500, 0 ;-------------------------------------------------- ;Boost and vvt maps (Page 8)