Complete and tested over dwell protection

This commit is contained in:
Josh Stewart 2015-02-10 11:14:24 +11:00
parent d6a30f322a
commit 505c9299cd
4 changed files with 49 additions and 53 deletions

View File

@ -180,13 +180,6 @@ struct config2 {
byte taeValues[4]; //TPS based acceleration enrichment rates (% to add)
byte wueBins[10]; //Warmup Enrichment bins (Values are in configTable1)
byte dwellLimit;
byte unused115;
byte unused116;
byte unused117;
byte unused118;
byte unused119;
byte unused120;
byte unused121;
byte unused122;
byte unused123;
byte unused124;

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<msq xmlns="http://www.msefi.com/:msq">
<bibliography author="TunerStudio MS 2.6.14 - EFI Analytics, Inc." tuneComment=" &#10;&#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; " writeDate="Tue Feb 03 18:00:59 EST 2015"/>
<versionInfo fileFormat="4.0" firmwareInfo="" nPages="3" signature="20"/>
<bibliography author="TunerStudio MS 2.6.14 - EFI Analytics, Inc." tuneComment=" &#10;&#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; &#10; " writeDate="Tue Feb 10 11:13:12 EST 2015"/>
<versionInfo fileFormat="4.0" firmwareInfo="Bowling &amp; Grippo MS1 Base Code 20" nPages="3" signature="20"/>
<page>
<pcVariable name="tsCanId">"0"</pcVariable>
<pcVariable cols="1" digits="1" name="wueAfrTargetOffset" rows="10" units=":1">
@ -43,14 +43,14 @@
</page>
<page number="0" size="128">
<constant cols="8" digits="0" name="veTable" rows="8" units="%">
15.0 20.0 25.0 25.0 27.0 30.0 34.0 39.0
20.0 21.0 28.0 33.0 50.0 37.0 25.0 44.0
22.0 23.0 35.0 49.0 55.0 40.0 40.0 47.0
28.0 33.0 47.0 60.0 60.0 60.0 85.0 55.0
35.0 45.0 57.0 60.0 68.0 75.0 85.0 68.0
45.0 55.0 68.0 63.0 75.0 88.0 92.0 79.0
53.0 68.0 77.0 88.0 90.0 94.0 96.0 90.0
65.0 75.0 85.0 96.0 98.0 100.0 101.0 99.0
54.0 57.0 59.0 59.0 60.0 62.0 64.0 66.0
57.0 57.0 61.0 63.0 72.0 65.0 59.0 69.0
58.0 58.0 64.0 71.0 74.0 67.0 67.0 70.0
61.0 63.0 70.0 77.0 77.0 77.0 89.0 74.0
64.0 69.0 75.0 77.0 81.0 84.0 89.0 81.0
69.0 74.0 81.0 78.0 84.0 91.0 93.0 86.0
73.0 81.0 85.0 91.0 92.0 94.0 95.0 92.0
79.0 84.0 89.0 91.0 96.0 97.0 97.0 96.0
</constant>
<constant cols="1" digits="0" name="rpmBins" rows="8" units="RPM">
700.0
@ -72,7 +72,7 @@
88.0
100.0
</constant>
<constant digits="1" name="crankCold" units="ms">0.2</constant>
<constant digits="1" name="crankCold" units="ms">6.5</constant>
<constant digits="1" name="crankHot" units="ms">3.5</constant>
<constant digits="0" name="asePct" units="%">15.0</constant>
<constant digits="0" name="aseCount" units="s">13.0</constant>
@ -88,47 +88,55 @@
114.0
101.0
</constant>
<constant digits="0" name="crankingPct" units="%">25.0</constant>
<constant digits="1" name="unused96" units="ms">0.0</constant>
<constant digits="1" name="unused97" units="ms">0.0</constant>
<constant digits="1" name="taeColdA" units="ms">0.0</constant>
<constant digits="0" name="tpsThresh" units="%/s">80.0</constant>
<constant digits="1" name="taeTime" units="ms">2.0</constant>
<constant digits="0" name="tdePct" units="%">80.0</constant>
<constant digits="1" name="reqFuel" units="ms">14.9</constant>
<constant digits="0" name="divider">1.0</constant>
<constant name="alternate">"Simultaneous"</constant>
<constant digits="1" name="unused102" units="ms">0.0</constant>
<constant digits="1" name="unused103" units="ms">0.0</constant>
<constant digits="1" name="unused104" units="ms">0.0</constant>
<constant digits="1" name="unused105" units="ms">0.0</constant>
<constant digits="1" name="reqFuel" units="ms">15.0</constant>
<constant digits="0" name="divider">2.0</constant>
<constant name="alternate">"Alternating"</constant>
<constant digits="1" name="injOpen" units="ms">1.0</constant>
<constant digits="0" name="injOCfuel" units="ms">0.0</constant>
<constant digits="0" name="injPwmP" units="%">0.0</constant>
<constant digits="1" name="injPwmT" units="ms">0.0</constant>
<constant digits="2" name="battFac" units="ms/v">0.0</constant>
<constant digits="0" name="rpmk">3000.0</constant>
<constant name="mapType">"115 kPa"</constant>
<constant name="mapType">"250 kPa"</constant>
<constant name="twoStroke">"Four-stroke"</constant>
<constant name="injType">"Port"</constant>
<constant name="nCylinders">"4"</constant>
<constant name="cltType">"GM"</constant>
<constant name="matType">"GM"</constant>
<constant name="nInjectors">"1"</constant>
<constant name="nInjectors">"4"</constant>
<constant name="engineType">"Even fire"</constant>
<constant name="egoType1">"Narrow band"</constant>
<constant name="algorithm">"Alpha-N"</constant>
<constant name="algorithm">"Speed Density"</constant>
<constant name="baroCorr">"Off"</constant>
<constant digits="1" name="primePulse" units="ms">1.5</constant>
<constant digits="0" name="unused120" units="RPM">0.0</constant>
<constant digits="1" name="fastIdleT" units="°C">59.94</constant>
<constant digits="3" name="egoSwitch" units="v">0.0</constant>
<constant digits="0" name="taeColdM" units="%">0.0</constant>
<constant digits="0" name="tpsMin" units="ADC">9.0</constant>
<constant digits="0" name="tpsMax" units="ADC">72.0</constant>
<constant digits="0" name="tpsMin" units="ADC">17.0</constant>
<constant digits="0" name="tpsMax" units="ADC">64.0</constant>
</page>
<page number="1" size="128">
<constant cols="8" digits="0" name="advTable1" rows="8" units="deg">
10.0 20.0 25.0 27.0 32.0 38.0 38.0 40.0
10.0 21.0 23.0 27.0 32.0 35.0 38.0 40.0
12.0 23.0 23.0 28.0 32.0 35.0 38.0 40.0
12.0 15.0 23.0 28.0 34.0 35.0 38.0 40.0
10.0 15.0 23.0 28.0 35.0 36.0 38.0 40.0
10.0 15.0 23.0 28.0 35.0 36.0 38.0 40.0
10.0 15.0 23.0 28.0 35.0 36.0 38.0 40.0
10.0 15.0 23.0 28.0 35.0 36.0 38.0 40.0
12.0 15.0 23.0 28.0 27.0 28.0 31.0 33.0
10.0 15.0 19.0 24.0 24.0 25.0 27.0 29.0
10.0 15.0 13.0 18.0 18.0 19.0 21.0 23.0
10.0 15.0 12.0 17.0 17.0 18.0 20.0 22.0
10.0 15.0 15.0 17.0 17.0 18.0 20.0 23.0
</constant>
<constant cols="1" digits="0" name="rpmBins2" rows="8" units="RPM">
500.0
@ -150,7 +158,7 @@
86.0
100.0
</constant>
<constant digits="0" name="TrigAng" units="Deg">176.0</constant>
<constant digits="0" name="TrigAng" units="Deg">244.0</constant>
<constant digits="0" name="FixAng" units="Deg">0.0</constant>
<constant digits="0" name="Trim" units="Deg">13.024</constant>
<constant digits="0" name="CrankAng" units="Deg">11.6</constant>
@ -167,15 +175,15 @@
<constant digits="0" name="StgCycles" units="cycles">1.0</constant>
<constant name="dwellcont">"Dwell control"</constant>
<constant digits="1" name="dwellcrank" units="ms">4.5</constant>
<constant digits="1" name="dwellrun" units="ms">4.0</constant>
<constant digits="1" name="dwellrun" units="ms">3.0</constant>
<constant digits="0" name="numteeth" units="teeth">36.0</constant>
<constant digits="0" name="onetwo" units="teeth">1.0</constant>
<constant digits="0" name="crankRPM" units="rpm">300.0</constant>
<constant digits="0" name="tpsflood" units="%">70.0</constant>
<constant digits="0" name="SoftRevLim" units="rpm">6000.0</constant>
<constant digits="0" name="SoftLimRetard" units="deg">14.9952</constant>
<constant digits="0" name="tpsflood" units="%">92.0</constant>
<constant digits="0" name="SoftRevLim" units="rpm">7000.0</constant>
<constant digits="0" name="SoftLimRetard" units="deg">15.0</constant>
<constant digits="1" name="SoftLimMax" units="s">2.0</constant>
<constant digits="0" name="HardRevLim" units="rpm">6500.0</constant>
<constant digits="0" name="HardRevLim" units="rpm">7500.0</constant>
<constant cols="1" digits="0" name="taeBins" rows="4" units="%/s">
80.0
200.0
@ -200,7 +208,7 @@
94.0
111.0
</constant>
<constant digits="0" name="unused121" units="none">0.0</constant>
<constant digits="0" name="dwellLim" units="ms">8.0</constant>
<constant digits="0" name="unused122" units="none">0.0</constant>
<constant digits="0" name="unused123" units="none">0.0</constant>
<constant digits="0" name="unused124" units="none">0.0</constant>
@ -209,6 +217,7 @@
<constant digits="0" name="unused127" units="none">0.0</constant>
</page>
<page number="2" size="128">
<constant digits="0" name="unused95" units="none">0.0</constant>
<constant cols="8" digits="1" name="afrTable" rows="8" units="AFR">
14.7 14.7 15.0 15.1 14.9 14.7 14.7 14.7
14.7 14.7 15.0 15.1 14.9 14.7 14.7 14.7
@ -239,8 +248,8 @@
86.0
100.0
</constant>
<constant name="egoAlgorithm">"PID"</constant>
<constant name="egoType">"Wide Band"</constant>
<constant name="egoAlgorithm">"Simple"</constant>
<constant name="egoType">"Disabled"</constant>
<constant digits="0" name="egoKP" units="%">100.0</constant>
<constant digits="0" name="egoKI" units="%">20.0</constant>
<constant digits="0" name="egoKD" units="%">0.0</constant>
@ -264,5 +273,6 @@
</settings>
<userComments Comment="These are user comments that can be related to a particular setting or dialog.">
<userComment name="SoftRevLim" value=""/>
<userComment name="aseCount" value=""/>
</userComments>
</msq>

View File

@ -189,7 +189,7 @@ page = 2
onetwo = scalar, U08, 96, "teeth", 1.0, 0.0, 0.0, 255, 0
crankRPM = scalar, U08, 97, "rpm", 100, 0.0, 100, 1000, 0
tpsflood = scalar, U08, 98, "%", 1.0, 0.0, 0.0, 255.0, 0
tpsflood = scalar, U08, 98, "%", 1.0, 0.0, 0.0, 255.0, 0
;Rev Limits
SoftRevLim = scalar, U08, 99, "rpm", 100, 0.0, 100, 25500, 0
@ -201,16 +201,7 @@ page = 2
taeBins = array, U08, 103, [ 4], "%/s", 10.0, 0.00000, 0.00, 2550.0, 0
taeRates = array, U08, 107, [ 4], "%", 1.0, 0.00000, 0.00, 255.0, 0 ; 4 bytes
wueRates = array, U08, 111, [10], "C", 1.0, 0.0, 100.0, 255.0, 0
dwellLim = scalar, U08, 112, "ms", 1, 0, 0, 32, 1
;unused113 = scalar, U08, 113, "none", 0, 0, 0, 0, 0
;unused114 = scalar, U08, 114, "none", 0, 0, 0, 0, 0
;unused115 = scalar, U08, 115, "none", 0, 0, 0, 0, 0
; unused116 = scalar, U08, 116, "none", 0, 0, 0, 0, 0
;unused117 = scalar, U08, 117, "none", 0, 0, 0, 0, 0
;unused118 = scalar, U08, 118, "none", 0, 0, 0, 0, 0
;unused119 = scalar, U08, 119, "none", 0, 0, 0, 0, 0
;unused120 = scalar, U08, 120, "none", 0, 0, 0, 0, 0
unused121 = scalar, U08, 121, "none", 0, 0, 0, 0, 0
dwellLim = scalar, U08, 121, "ms", 1, 0, 0, 32, 0
unused122 = scalar, U08, 122, "none", 0, 0, 0, 0, 0
unused123 = scalar, U08, 123, "none", 0, 0, 0, 0, 0
unused124 = scalar, U08, 124, "none", 0, 0, 0, 0, 0
@ -493,12 +484,14 @@ page = 3
;field = "Minimum discharge period", mindischg, { dwellcont }
field = ""
field = "#Note"
field = "these times are for 12V. Battery voltage correction"
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 = "Max dwell time", dwellLim
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

View File

@ -43,7 +43,7 @@ struct Schedule {
volatile ScheduleStatus Status;
void (*StartCallback)(); //Start Callback function for schedule
void (*EndCallback)(); //Start Callback function for schedule
unsigned long startTime;
volatile unsigned long startTime;
};
Schedule fuelSchedule1;