Fix for bit clash on nCylinders

This commit is contained in:
Josh Stewart 2016-07-15 17:36:25 +10:00
parent cb75452fc7
commit 7a30bff409
2 changed files with 5 additions and 7 deletions

View File

@ -192,8 +192,7 @@ struct config1 {
byte mapSample : 2;
byte strokes : 1;
byte injType : 1;
byte nCylinders : 3; //Number of cylinders
byte flexEnabled : 1;
byte nCylinders : 4; //Number of cylinders
//config2 in ini
byte cltType1 : 2;
@ -202,8 +201,8 @@ struct config1 {
//config3 in ini
byte engineType : 1;
byte egoType_old : 1;
byte engineType : 1;
byte flexEnabled : 1;
byte algorithm : 1; //"Speed Density", "Alpha-N"
byte baroCorr : 1;
byte injLayout : 2;

View File

@ -158,8 +158,7 @@ page = 2
mapSample = bits, U08, 36, [0:1], "Instantaneous", "Cycle Average", "Cycle Minimum", "INVALID"
twoStroke = bits, U08, 36, [2:2], "Four-stroke", "Two-stroke"
injType = bits, U08, 36, [3:3], "Port", "Throttle Body"
nCylinders = bits, U08, 36, [4:6], "1","2","3","4","INVALID","6","INVALID","8"
flexEnabled= bits, U08, 36, [7:7], "Off", "On"
nCylinders = bits, U08, 36, [4:7], "INVALID","1","2","3","4","INVALID","6","INVALID","8"
; Config2
cltType = bits, U08, 37, [0:1], "GM", "Unknown1", "Unknown2", "Unknown3"
@ -168,7 +167,7 @@ page = 2
; Config3
engineType = bits, U08, 38, [0:0], "Even fire", "Odd fire"
egoTypeOLD = bits, U08, 38, [1:1], "Narrow band", "Wide band"
flexEnabled= bits, U08, 38, [1:1], "Off", "On"
algorithm = bits, U08, 38, [2:2], "Speed Density", "Alpha-N"
baroCorr = bits, U08, 38, [3:3], "Off", "On"
injLayout = bits, U08, 38, [4:5], "Bank", "Semi-Sequential", "INVALID", "INVALID"