From 505c9299cdccc7ae1793c7bf661c9b1f96903099 Mon Sep 17 00:00:00 2001 From: Josh Stewart Date: Tue, 10 Feb 2015 11:14:24 +1100 Subject: [PATCH] Complete and tested over dwell protection --- globals.h | 7 --- reference/Speeduino base tune v0.2.msq | 76 +++++++++++++++----------- reference/speeduino 0.2.ini | 17 ++---- scheduler.h | 2 +- 4 files changed, 49 insertions(+), 53 deletions(-) diff --git a/globals.h b/globals.h index d500f28..7ba915a 100644 --- a/globals.h +++ b/globals.h @@ -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; diff --git a/reference/Speeduino base tune v0.2.msq b/reference/Speeduino base tune v0.2.msq index 51de623..5c59c51 100644 --- a/reference/Speeduino base tune v0.2.msq +++ b/reference/Speeduino base tune v0.2.msq @@ -1,7 +1,7 @@ - - + + "0" @@ -43,14 +43,14 @@ - 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 700.0 @@ -72,7 +72,7 @@ 88.0 100.0 -0.2 +6.5 3.5 15.0 13.0 @@ -88,47 +88,55 @@ 114.0 101.0 +25.0 +0.0 +0.0 0.0 80.0 2.0 80.0 -14.9 -1.0 -"Simultaneous" +0.0 +0.0 +0.0 +0.0 +15.0 +2.0 +"Alternating" 1.0 0.0 0.0 0.0 0.0 3000.0 -"115 kPa" +"250 kPa" "Four-stroke" "Port" "4" "GM" "GM" -"1" +"4" "Even fire" "Narrow band" -"Alpha-N" +"Speed Density" "Off" 1.5 +0.0 59.94 0.0 0.0 -9.0 -72.0 +17.0 +64.0 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 500.0 @@ -150,7 +158,7 @@ 86.0 100.0 -176.0 +244.0 0.0 13.024 11.6 @@ -167,15 +175,15 @@ 1.0 "Dwell control" 4.5 -4.0 +3.0 36.0 1.0 300.0 -70.0 -6000.0 -14.9952 +92.0 +7000.0 +15.0 2.0 -6500.0 +7500.0 80.0 200.0 @@ -200,7 +208,7 @@ 94.0 111.0 -0.0 +8.0 0.0 0.0 0.0 @@ -209,6 +217,7 @@ 0.0 +0.0 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 -"PID" -"Wide Band" +"Simple" +"Disabled" 100.0 20.0 0.0 @@ -264,5 +273,6 @@ + diff --git a/reference/speeduino 0.2.ini b/reference/speeduino 0.2.ini index 72ade21..5d09382 100644 --- a/reference/speeduino 0.2.ini +++ b/reference/speeduino 0.2.ini @@ -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 diff --git a/scheduler.h b/scheduler.h index e33c071..4d3e9eb 100644 --- a/scheduler.h +++ b/scheduler.h @@ -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;