ini work for launch control

This commit is contained in:
Josh Stewart 2015-10-17 22:23:34 +11:00
parent f506ea4a07
commit f15d9d3bf3
1 changed files with 133 additions and 118 deletions

View File

@ -215,46 +215,46 @@ page = 4
; name = scalar, type, offset, units, scale, translate, lo, hi, digits
;Dwell control
;running dwell variable railed to 8 - who needs more than 8ms?
dwellcont = bits, U08, 12, [0:0], "INVALID", "Dwell control"
dwellcont = bits, U08, 12, [0:0], "INVALID", "Dwell control"
useDwellLim= bits, U08, 12, [1:1], "Off", "On"
dwellcrank = scalar, U08, 13, "ms", 0.1, 0, 0, 25, 1
dwellrun = scalar, U08, 14, "ms", 0.1, 0, 0, 8, 1
numteeth = scalar, U08, 15, "teeth", 1.0, 0.0, 0.0, 255, 0
onetwo = scalar, U08, 16, "teeth", 1.0, 0.0, 0.0, 255, 0
dwellcrank = scalar, U08, 13, "ms", 0.1, 0, 0, 25, 1
dwellrun = scalar, U08, 14, "ms", 0.1, 0, 0, 8, 1
numteeth = scalar, U08, 15, "teeth", 1.0, 0.0, 0.0, 255, 0
onetwo = scalar, U08, 16, "teeth", 1.0, 0.0, 0.0, 255, 0
crankRPM = scalar, U08, 17, "rpm", 100, 0.0, 100, 1000, 0
tpsflood = scalar, U08, 18, "%", 1.0, 0.0, 0.0, 255.0, 0
crankRPM = scalar, U08, 17, "rpm", 100, 0.0, 100, 1000, 0
tpsflood = scalar, U08, 18, "%", 1.0, 0.0, 0.0, 255.0, 0
;Rev Limits
SoftRevLim = scalar, U08, 19, "rpm", 100, 0.0, 100, 25500, 0
SoftLimRetard = scalar, U08, 20, "deg", 1.0, 0.0, 0.0, 80, 0
SoftLimMax = scalar, U08, 21, "s", 0.1, 0.0, 0.0, 25.5, 1
HardRevLim = scalar, U08, 22, "rpm", 100, 0.0, 100, 25500, 0
SoftRevLim = scalar, U08, 19, "rpm", 100, 0.0, 100, 25500, 0
SoftLimRetard = scalar, U08, 20, "deg", 1.0, 0.0, 0.0, 80, 0
SoftLimMax = scalar, U08, 21, "s", 0.1, 0.0, 0.0, 25.5, 1
HardRevLim = scalar, U08, 22, "rpm", 100, 0.0, 100, 25500, 0
;TPS based acceleration enrichment
taeBins = array, U08, 23, [ 4], "%/s", 10.0, 0.00000, 0.00, 2550.0, 0
taeRates = array, U08, 27, [ 4], "%", 1.0, 0.00000, 0.00, 255.0, 0 ; 4 bytes
wueRates = array, U08, 31, [10], "C", 1.0, 0.0, 100.0, 255.0, 0
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
wueRates = array, U08, 31, [10], "C", 1.0, 0.0, 100.0, 255.0, 0
;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
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
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
;--------------------------------------------------
@ -303,14 +303,22 @@ page = 6
injBatRates = array, U08, 21, [6], "%", 1, 0, 0, 255, 0 ;Values for injector pulsewidth vs voltage
airDenBins = array, U08, 27, [9], "C", 1.0, -40, -40, 215, 0 ; Bins for the air density correction curve
airDenRates = array, U08, 36, [9], "%", 1.0, 0.0, 0, 255, 0 ; Values for the air density correction curve
boostFreq = scalar, U08, 45, "Hz", 2.0, 0.0, 10, 511, 0
vvtFreq = scalar, U08, 46, "Hz", 2.0, 0.0, 10, 511, 0
idleFreq = scalar, U08, 47, "Hz", 2.0, 0.0, 10, 511, 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
; PWM Frequencies
boostFreq = scalar, U08, 45, "Hz", 2.0, 0.0, 10, 511, 0
vvtFreq = scalar, U08, 46, "Hz", 2.0, 0.0, 10, 511, 0
idleFreq = scalar, U08, 47, "Hz", 2.0, 0.0, 10, 511, 0
; Launch Control
launchPin = bits , U08, 48, [0:5], "Board Default", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
launchEnable= bits, U08, 48, [6:6], "No", "Yes"
unused48h = bits, U08, 48, [7:7], "No", "Yes"
lnchSoftLim = scalar, U08, 49, "rpm", 100, 0.0, 100, 25500, 0
lnchRetard = scalar, U08, 50, "deg", 1.0, 0.0, 0.0, 80, 0
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
@ -364,6 +372,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
;--------------------------------------------------
;Boost and vvt maps (Page 8)
@ -471,6 +484,7 @@ page = 8
menu = "&Accessories"
subMenu = fanSettings, "Thermo Fan"
subMenu = LaunchControl, "Launch Control"
subMenu = std_separator
subMenu = boostSettings, "Boost Control"
subMenu = boostTbl, "Boost duty cycle", 8, { boostEnabled }
@ -598,92 +612,93 @@ page = 8
panel = stepper_idle
dialog = crankPW, "Cranking Pulsewidths (ms)"
#if CELSIUS
field = "Cranking RPM (Max)", crankRPM
field = "Flood Clear level", tpsflood
field = ""
field = "Priming Pulsewidth", primePulse
field = "Pulsewidth at -40°C", crankCold
field = "Pulsewidth at 77°C", crankHot
field = ""
field = "Cranking Enrichment %", crankingPct
#else
field = "Cranking RPM (Max)", crankRPM
field = "Flood Clear level", tpsflood
field = ""
field = "Priming Pulsewidth", primePulse
field = "Pulsewidth at -40°F", crankCold
field = "Pulsewidth at 170°F", crankHot
field = ""
field = "Cranking Enrichment %", crankingPct
#endif
dialog = crankPW, "Cranking Pulsewidths (ms)"
#if CELSIUS
field = "Cranking RPM (Max)", crankRPM
field = "Flood Clear level", tpsflood
field = ""
field = "Priming Pulsewidth", primePulse
field = "Pulsewidth at -40°C", crankCold
field = "Pulsewidth at 77°C", crankHot
field = ""
field = "Cranking Enrichment %", crankingPct
#else
field = "Cranking RPM (Max)", crankRPM
field = "Flood Clear level", tpsflood
field = ""
field = "Priming Pulsewidth", primePulse
field = "Pulsewidth at -40°F", crankCold
field = "Pulsewidth at 170°F", crankHot
field = ""
field = "Cranking Enrichment %", crankingPct
#endif
dialog = aseSettings, "Afterstart Enrichment"
field = "Enrichment %", asePct
field = "Number of Sec to run", aseCount
dialog = aseSettings, "Afterstart Enrichment"
field = "Enrichment %", asePct
field = "Number of Sec to run", aseCount
;dialog = egoSettings, "Exhaust Gas Oxygen"
;field = "EGO Sensor Type", egoType
;field = "EGO Switch Point (v)", egoSwitch
;field = "Coolant Temp Activation", egoTemp
;field = "Ignition Events Per Step", egoCount
;field = "EGO Step", egoDelta
;field = "EGO ± Limit", egoLimit
;field = "EGO Active Above", egoRPM
dialog = triggerSettings,"Trigger Settings",4
topicHelp = Shelp3
field = "Trigger Pattern", TrigPattern
field = "Primary base teeth", numteeth, { TrigPattern == 0 || TrigPattern == 2 }
field = "Primary trigger speed", TrigSpeed, { TrigPattern == 0 }
field = "Missing teeth", onetwo, { TrigPattern == 0 }
field = "Secondary teeth", onetwo, { TrigPattern == 2 }
field = "Trigger Angle ", TrigAng
field = "This number represents the angle ATDC when "
field = "tooth #1 passes the primary sensor."
field = ""
field = "Skip Revolutions", StgCycles
field = "Note: This is the number of revolutions that will be skipped during"
field = "cranking before the injectors and coils are fired"
field = "Trigger edge", TrigEdge
dialog = triggerSettings,"Trigger Settings",4
topicHelp = Shelp3
field = "Trigger Pattern", TrigPattern
field = "Primary base teeth", numteeth, { TrigPattern == 0 || TrigPattern == 2 }
field = "Primary trigger speed", TrigSpeed, { TrigPattern == 0 }
field = "Missing teeth", onetwo, { TrigPattern == 0 }
field = "Secondary teeth", onetwo, { TrigPattern == 2 }
field = "Trigger Angle ", TrigAng
field = "This number represents the angle ATDC when "
field = "tooth #1 passes the primary sensor."
field = ""
field = "Skip Revolutions", StgCycles
field = "Note: This is the number of revolutions that will be skipped during"
field = "cranking before the injectors and coils are fired"
field = "Trigger edge", TrigEdge
dialog = sparkSettings,"Spark Settings",4
topicHelp = Shelp3
field = "Cranking advance Angle", CrankAng
;field = "Hold Ignition", IgHold
field = "Spark Outputs triggers", IgInv
field = ""
field = "Fixed Angle (0 = use map)", FixAng
;field = "Trim Angle", Trim
dialog = sparkSettings,"Spark Settings",4
topicHelp = Shelp3
field = "Cranking advance Angle", CrankAng
;field = "Hold Ignition", IgHold
field = "Spark Outputs triggers", IgInv
field = ""
field = "Fixed Angle (0 = use map)", FixAng
;field = "Trim Angle", Trim
dialog = dwellSettings, "Dwell Settings", 4
topicHelp = DwellHelp
field = "Dwell control", dwellcont
field = "Or:"
field = " Cranking dwell", dwellcrank, { dwellcont }
field = " Running dwell", dwellrun, { dwellcont }
;field = "Minimum discharge period", mindischg, { dwellcont }
field = ""
field = "#Note"
field = "The above times are for 12V. Voltage correction"
field = "is applied. At higher voltages the time is reduced"
field = "and when low it is increased"
field = ""
field = "Overdwell protection"
field = "Use Overdwell protection", useDwellLim
field = "Max dwell time", dwellLim, { useDwellLim }
field = "Note: Set the maximum dwell time at least 3ms above"
field = "your desired dwell time (Including cranking)"
topicHelp = DwellHelp
field = "Dwell control", dwellcont
field = "Or:"
field = " Cranking dwell", dwellcrank, { dwellcont }
field = " Running dwell", dwellrun, { dwellcont }
;field = "Minimum discharge period", mindischg, { dwellcont }
field = ""
field = "#Note"
field = "The above times are for 12V. Voltage correction"
field = "is applied. At higher voltages the time is reduced"
field = "and when low it is increased"
field = ""
field = "Overdwell protection"
field = "Use Overdwell protection", useDwellLim
field = "Max dwell time", dwellLim, { useDwellLim }
field = "Note: Set the maximum dwell time at least 3ms above"
field = "your desired dwell time (Including cranking)"
dialog = RevLimiterS, "Rev Limiter", 4
topicHelp = Fhelp7
field = "Rev Limiter"
field = "Soft rev limit", SoftRevLim
field = "Soft limit absolute timing", SoftLimRetard
field = "Soft limit max time", SoftLimMax
field = "Hard Rev limit", HardRevLim
topicHelp = Fhelp7
field = "Rev Limiter"
field = "Soft rev limit", SoftRevLim
field = "Soft limit absolute timing", SoftLimRetard
field = "Soft limit max time", SoftLimMax
field = "Hard Rev limit", HardRevLim
dialog = LaunchControl, "Launch Control", 6
topicHelp = Fhelp7
field = "Launch Control"
field = "Enable Launch", launchEnable
field = "Launch Input Pin", launchPin, { launchEnable }
field = "Soft rev limit", lnchSoftLim, { launchEnable }
field = "Soft limit absolute timing", lnchRetard, { launchEnable }
field = "Hard rev limit", lnchHardLim, { launchEnable }
field = "Fuel adder during launch", lnchFuelAdd, { launchEnable }
dialog = OLED, "OLED Display", 2
field = "Display Type", display