From 8540f64620c28a7955cf36c3c14cb48d98538e7b Mon Sep 17 00:00:00 2001 From: Josh Stewart Date: Sun, 27 Nov 2016 21:47:22 +1100 Subject: [PATCH] New flex fuel dialog --- reference/speeduino.ini | 103 ++++++++++++++++++++++++++++++++-------- 1 file changed, 83 insertions(+), 20 deletions(-) diff --git a/reference/speeduino.ini b/reference/speeduino.ini index 4a474d04..e456c0a1 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -194,26 +194,27 @@ page = 2 canEnable = bits, U08, 38, [6:6], "Disable", "Enable" unused2-38h= bits, U08, 38, [7:7], "No", "Yes" - primePulse = scalar, U08, 39, "ms", 0.1, 0.0, 0.0, 25.5, 1 - dutyLim = scalar, U08, 40, "%", 1.0, 0.0, 0.0, 100.0, 0 - unused41 = scalar, U08, 41, "RPM", 100.0, 0.0, 100, 25500, 0 - unused42 = scalar, U08, 42, "RPM", 100.0, 0.0, 100, 25500, 0 - taeColdM = scalar, U08, 43, "%", 1.0, 0.0, 0.0, 250.0, 0 - tpsMin = scalar, U08, 44, "ADC", 1.0, 0.0, 0.0, 255.0, 0 - 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 - fpPrime = scalar, U08, 49, "s", 1.0, 0.0, 0.0, 255.0, 0 - stoich = scalar, U08, 50, ":1", 0.1, 0.0, 0.0, 25.5, 1 - oddfire2 = scalar, U16, 51, "deg", 1.0, 0.0, 0.0, 720, 0 ; * ( 2 byte) - oddfire3 = scalar, U16, 53, "deg", 1.0, 0.0, 0.0, 720, 0 ; * ( 2 byte) - oddfire4 = scalar, U16, 55, "deg", 1.0, 0.0, 0.0, 720, 0 ; * ( 2 byte) - 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 + primePulse = scalar, U08, 39, "ms", 0.1, 0.0, 0.0, 25.5, 1 + dutyLim = scalar, U08, 40, "%", 1.0, 0.0, 0.0, 100.0, 0 + flexFreqLow = scalar, U08, 41, "Hz", 1.0, 0.0, 0.0, 250.0, 0 + flexFreqHigh = scalar, U08, 42, "Hz", 1.0, 0.0, 0.0, 250.0, 0 + taeColdM = scalar, U08, 43, "%", 1.0, 0.0, 0.0, 250.0, 0 + tpsMin = scalar, U08, 44, "ADC", 1.0, 0.0, 0.0, 255.0, 0 + 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 + fpPrime = scalar, U08, 49, "s", 1.0, 0.0, 0.0, 255.0, 0 + stoich = scalar, U08, 50, ":1", 0.1, 0.0, 0.0, 25.5, 1 + oddfire2 = scalar, U16, 51, "deg", 1.0, 0.0, 0.0, 720, 0 ; * ( 2 byte) + oddfire3 = scalar, U16, 53, "deg", 1.0, 0.0, 0.0, 720, 0 ; * ( 2 byte) + oddfire4 = scalar, U16, 55, "deg", 1.0, 0.0, 0.0, 720, 0 ; * ( 2 byte) + + flexEthPctLow = scalar, U08, 57, "%", 1.0, 0.0, 0.0, 250.0, 0 + flexEthPctHigh= scalar, U08, 58, "%", 1.0, 0.0, 0.0, 250.0, 0 + flexFuelLow = scalar, U08, 59, "%", 1.0, 0.0, 0.0, 250.0, 0 + flexFuelHigh = scalar, U08, 60, "%", 1.0, 0.0, 0.0, 250.0, 0 + flexAdvLow = scalar, U08, 61, "Deg", 1.0, 0.0, 0.0, 250.0, 0 + flexAdvHigh = scalar, U08, 62, "Deg", 1.0, 0.0, 0.0, 250.0, 0 unused2-63 = scalar, U08, 63, "RPM", 100.0, 0.0, 100, 25500, 0 ;-------------------------------------------------- @@ -563,6 +564,16 @@ page = 9 defaultValue = oddfire2, 0 defaultValue = oddfire3, 0 defaultValue = oddfire4, 0 + + defaultValue = flexFreqLow, 50 + defaultValue = flexFreqHigh, 150 + defaultValue = flexEthPctLow, 0 + defaultValue = flexEthPctHigh, 100 + defaultValue = flexFuelLow, 100 + defaultValue = flexFuelHigh, 163 + defaultValue = flexAdvLow, 0 + defaultValue = flexAdvHigh, 13 + [Menu] @@ -771,9 +782,61 @@ menuDialog = main panel = engine_constants_west, West panel = engine_constants_east, East +# Flex fuel stuff dialog = flexFueling, "Flex Fuel" field = "Flex sensor", flexEnabled + dialog = flexn, "" + field = "#Spark/Fuel" + field = "Sensor Frequency" + field = "Ethanol Mix" + field = "Fuel Multiplier%" + field = "Additional advance" + #field = "#Temp Sense" + #field = "Sensor PW" + #field = "Fuel Temp" + + dialog = flexl, "" + field = "Low" + field = "", flexFreqLow, { flexEnabled } + field = "", flexEthPctLow, { flexEnabled } + field = "", flexFuelLow, { flexEnabled } + field = "", flexAdvLow, { flexEnabled } + #field = "Low" + #field = "", ff_tpw0, { flexEnabled && (fueltemp1 == 1)} + #field = "", ff_temp0, { flexEnabled && (fueltemp1 == 1)} + + dialog = flexh, "" + field = "High" + field = "", flexFreqHigh, { flexEnabled } + field = "", flexEthPctHigh, { flexEnabled } + field = "", flexFuelHigh, { flexEnabled } + field = "", flexAdvHigh, { flexEnabled } + #field = "High" + #field = "", ff_tpw1, { flexFuel && (fueltemp1 == 1)} + #field = "", ff_temp1, { flexFuel && (fueltemp1 == 1)} + + dialog = ff_table, "Flex Fuel Calibration", xAxis + panel = flexn + panel = flexl + panel = flexh + + dialog = ff_fallback, "", yAxis + #field = "Baseline Ethanol%", flex_baseline, { flexFuel } + #field = "#Fallback For Sensor Failure" + #field = "Fallback Fuel Multiplier%", fuelCorr_default, { flexFuel > 0 } + #field = "Fallback Timing Addition", fuelSpkDel_default, { flexFuel > 0 } + + dialog = flexFuelTop, "" + field = "Flex Fuel Sensor", flexEnabled + #field = "Sensor Port", flexport, { flexFuel > 0 } + # field = "Temperature Input", fueltemp1 + + dialog = flexFueling, "Fuel Sensor Settings", yAxis + panel = flexFuelTop + panel = ff_table + panel = ff_fallback + dialog = tacho, "Tacho" field = "Output pin", tachoPin