Merge pull request #43 from ConnerMcLaughlin/master
Added support for both NO and NC clutch switch on launch
This commit is contained in:
commit
e504dfeb30
|
@ -346,7 +346,9 @@ struct config3 {
|
|||
byte boostKP;
|
||||
byte boostKI;
|
||||
byte boostKD;
|
||||
byte unused60;
|
||||
|
||||
byte lnchPullRes :2;
|
||||
byte unused60 : 6;
|
||||
byte unused61;
|
||||
byte unused62;
|
||||
byte unused63;
|
||||
|
|
|
@ -335,9 +335,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", 1.0, -40, -40, 102.0, 0
|
||||
egoTemp = scalar, U08, 4, "°C", 1.0, -40, -40, 102.0, 0
|
||||
#else
|
||||
egoTemp = scalar, U08, 4, "°F", 1.8, -22.23, -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)
|
||||
|
@ -380,7 +380,9 @@ page = 6
|
|||
boostKP = scalar, U08, 57, "%", 1.0, 0.0, 0.0, 200.0, 0 ; * ( 1 byte)
|
||||
boostKI = scalar, U08, 58, "%", 1.0, 0.0, 0.0, 200.0, 0 ; * ( 1 byte)
|
||||
boostKD = scalar, U08, 59, "%", 1.0, 0.0, 0.0, 200.0, 0 ; * ( 1 byte)
|
||||
unused6-60 = scalar, U08, 60, "RPM", 100.0, 0.0, 100, 25500, 0
|
||||
|
||||
lnchPullRes = bits, U08, 60 [0:1], "Float" , "Pullup", "INVALID", "INVALID"
|
||||
unused6-60 = bits, U08, 60, [2:7], "ONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
|
||||
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
|
||||
|
@ -428,11 +430,11 @@ page = 7
|
|||
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
|
||||
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.8, -22.23, -40, 215.0, 0
|
||||
fanHyster = scalar, U08, 58, "°F", 1.8, -22.23, -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
|
||||
fanFreq = scalar, U08 , 59, "Hz", 2.0, 0.0, 10, 511, 0
|
||||
#if CELSIUS
|
||||
|
@ -882,6 +884,7 @@ menuDialog = main
|
|||
field = "Enable Launch", launchEnable
|
||||
field = "Launch Input Pin", launchPin, { launchEnable }
|
||||
field = "Launch enabled when signal is",launchHiLo, { launchEnable }
|
||||
field = "Launch Pullup Resistor", lnchPullRes, { launchEnable }
|
||||
field = "Soft rev limit", lnchSoftLim, { launchEnable }
|
||||
field = "Soft limit absolute timing", lnchRetard, { launchEnable }
|
||||
field = "Hard rev limit", lnchHardLim, { launchEnable }
|
||||
|
@ -1329,8 +1332,8 @@ menuDialog = main
|
|||
mapaccden = bits, U08, 2, [7:7]
|
||||
dwell = scalar, U08, 3, "ms", 0.100, 0.000
|
||||
map = scalar, U08, 4, "kpa", 2.000, 0.000
|
||||
iatRaw = scalar, U08, 5, "°C", 1.000, 0.000
|
||||
coolantRaw = scalar, U08, 6, "°C", 1.000, 0.000
|
||||
iatRaw = scalar, U08, 5, "°C", 1.000, 0.000
|
||||
coolantRaw = scalar, U08, 6, "°C", 1.000, 0.000
|
||||
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
|
||||
|
|
|
@ -362,8 +362,9 @@ void setPinMapping(byte boardID)
|
|||
pinMode(pinTrigger2, INPUT);
|
||||
pinMode(pinTrigger3, INPUT);
|
||||
pinMode(pinFlex, INPUT_PULLUP); //Standard GM / Continental flex sensor requires pullup
|
||||
if (configPage3.launchHiLo) { pinMode(pinLaunch, INPUT); }
|
||||
else { pinMode(pinLaunch, INPUT_PULLUP); } //If launch triggers on LOW signal, then set a pull up as the default
|
||||
// pinMode(pinLaunch, INPUT_PULLUP); //This should work for both NO and NC grounding switches
|
||||
if (configPage3.lnchPullRes) { pinMode(pinLaunch, INPUT_PULLUP); }
|
||||
else { pinMode(pinLaunch, INPUT); } //If Launch Pull Resistor is not set make input float.
|
||||
|
||||
//Set default values
|
||||
digitalWrite(pinMAP, HIGH);
|
||||
|
|
Loading…
Reference in New Issue