noisymime
/
speeduino-personal
mirror of https://github.com/noisymime/speeduino-personal.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
globals.h
View File

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

5
reference/speeduino.ini
View File

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