From 0a8d5e21c53dc195ca8174787937c2bac74bb95e Mon Sep 17 00:00:00 2001
From: Josh Stewart <josh@noisymime.org>
Date: Sat, 10 Mar 2018 20:55:21 +1100
Subject: [PATCH] Feb 2018 signature and base tune

---
 reference/Speeduino base tune.msq | 213 +++++++-----------------------
 reference/speeduino.ini           |  29 ++--
 speeduino/comms.ino               |   4 +-
 3 files changed, 65 insertions(+), 181 deletions(-)

diff --git a/reference/Speeduino base tune.msq b/reference/Speeduino base tune.msq
index c5ee8b72..49fac615 100644
--- a/reference/Speeduino base tune.msq	
+++ b/reference/Speeduino base tune.msq	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <msq xmlns="http://www.msefi.com/:msq">
-<bibliography author="TunerStudio MS(Beta) 3.0.50.23 - EFI Analytics, Inc." tuneComment="" writeDate="Wed Jan 03 21:35:21 AEDT 2018"/>
-<versionInfo fileFormat="5.0" firmwareInfo="Speeduino+2017.12" nPages="10" signature="speeduino 201712"/>
+<bibliography author="TunerStudio MS(Beta) 3.0.50.40 - EFI Analytics, Inc." tuneComment="" writeDate="Sat Mar 10 20:55:10 AEDT 2018"/>
+<versionInfo fileFormat="5.0" firmwareInfo="Speeduino+2017.12" nPages="10" signature="speeduino 201802"/>
 <page>
 <pcVariable name="tsCanId">"CAN ID 0"</pcVariable>
 </page>
@@ -58,12 +58,10 @@
          86.0 
          90.0 
          96.0 
-         500.0 
+         100.0 
       </constant>
 </page>
 <page number="1" size="128">
-<constant digits="0" name="flexBoostLow" units="kPa">0.0</constant>
-<constant digits="0" name="flexBoostHigh" units="kPa">50.0</constant>
 <constant digits="0" name="asePct" units="%">25.0</constant>
 <constant digits="0" name="aseCount" units="s">8.0</constant>
 <constant cols="1" digits="0" name="wueRates" rows="10" units="%">
@@ -137,10 +135,6 @@
 <constant digits="0" name="oddfire2" units="deg">0.0</constant>
 <constant digits="0" name="oddfire3" units="deg">0.0</constant>
 <constant digits="0" name="oddfire4" units="deg">0.0</constant>
-<constant digits="0" name="flexFuelLow" units="%">100.0</constant>
-<constant digits="0" name="flexFuelHigh" units="%">163.0</constant>
-<constant digits="0" name="flexAdvLow" units="Deg">0.0</constant>
-<constant digits="0" name="flexAdvHigh" units="Deg">10.0</constant>
 <constant digits="0" name="iacCLminDuty" units="%">0.0</constant>
 <constant digits="0" name="iacCLmaxDuty" units="%">0.0</constant>
 <constant digits="0" name="boostMinDuty" units="%">20.0</constant>
@@ -281,15 +275,12 @@
 <constant name="fuelPumpPin">"Board Default"</constant>
 <constant name="useResync">"No"</constant>
 <constant digits="1" name="sparkDur" units="ms">1.0</constant>
-<constant digits="1" name="unused4-8" units="ms">25.5</constant>
-<constant digits="1" name="unused4-9" units="ms">25.5</constant>
-<constant digits="1" name="unused4-10" units="ms">25.5</constant>
 <constant digits="0" name="SkipCycles" units="cycles">1.0</constant>
 <constant name="unused4-12a">"NOTHING"</constant>
 <constant name="useDwellLim">"On"</constant>
 <constant name="sparkMode">"Wasted Spark"</constant>
 <constant name="TrigFilter">"Off"</constant>
-<constant name="ignCranklock">"On"</constant>
+<constant name="ignCranklock">"Off"</constant>
 <constant digits="1" name="dwellcrank" units="ms">4.5</constant>
 <constant digits="1" name="dwellrun" units="ms">3.0</constant>
 <constant digits="0" name="numTeeth" units="teeth">36.0</constant>
@@ -996,166 +987,53 @@
 <constant digits="0" name="boostIntv" units="ms">20.0</constant>
 <constant digits="0" name="stagedInjSizePri" units="cc/min">200.0</constant>
 <constant digits="0" name="stagedInjSizeSec" units="cc/min">600.0</constant>
-<constant cols="1" digits="0" name="unused11_32_192" rows="159" units="RPM">
-         700.0 
-         25500.0 
-         700.0 
-         700.0 
+<constant cols="1" digits="0" name="flexBoostBins" rows="6" units="%">
          0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         700.0 
-         700.0 
-         700.0 
-         700.0 
-         700.0 
-         700.0 
-         0.0 
-         0.0 
-         25500.0 
-         25500.0 
+         20.0 
+         40.0 
+         60.0 
+         80.0 
          100.0 
+      </constant>
+<constant cols="1" digits="0" name="flexBoostAdj" rows="6" units="kPa">
+         0.0 
+         10.0 
+         20.0 
+         30.0 
+         40.0 
+         50.0 
+      </constant>
+<constant cols="1" digits="0" name="flexFuelBins" rows="6" units="%">
+         0.0 
+         20.0 
+         40.0 
+         60.0 
+         80.0 
          100.0 
+      </constant>
+<constant cols="1" digits="0" name="flexFuelAdj" rows="6" units="%">
          100.0 
+         139.0 
+         156.0 
+         160.0 
+         163.0 
+         163.0 
+      </constant>
+<constant cols="1" digits="0" name="flexAdvBins" rows="6" units="%">
+         0.0 
+         20.0 
+         40.0 
+         60.0 
+         80.0 
          100.0 
-         100.0 
-         100.0 
-         100.0 
-         100.0 
-         100.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         700.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         100.0 
-         0.0 
-         200.0 
-         200.0 
-         100.0 
-         100.0 
-         100.0 
-         200.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         0.0 
-         100.0 
-         0.0 
-         100.0 
-         100.0 
-         25500.0 
-         100.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         25500.0 
-         1000.0 
-         5000.0 
-         7500.0 
-         11000.0 
-         15000.0 
-         12000.0 
-         10900.0 
-         9600.0 
-         0.0 
-         1200.0 
-         1000.0 
-         600.0 
-         500.0 
-         1000.0 
-         1000.0 
-         1300.0 
-         1500.0 
-         1500.0 
-         2500.0 
-         3800.0 
-         4500.0 
-         5000.0 
-         6500.0 
-         9000.0 
-         12500.0 
-         21600.0 
-         100.0 
-         3000.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
-         0.0 
+      </constant>
+<constant cols="1" digits="0" name="flexAdvAdj" rows="6" units="Deg">
          0.0 
+         2.0 
+         5.0 
+         8.0 
+         9.0 
+         10.0 
       </constant>
 <constant digits="0" name="UNALLOCATED_TOP_9" units="RAW">
          255.0 
@@ -1166,6 +1044,7 @@
 <setting name="SPEED_DENSITY" value="SPEED_DENSITY"/>
 <setting name="CAN_COMMANDS_OFF" value="CAN_COMMANDS_OFF"/>
 <setting name="CELSIUS" value="CELSIUS"/>
+<setting name="resetcontrol_standard" value="resetcontrol_standard"/>
 <setting name="AFR" value="AFR"/>
 </settings>
 <userComments Comment="These are user comments that can be related to a particular setting or dialog."/>
diff --git a/reference/speeduino.ini b/reference/speeduino.ini
index 1473bd05..2c411c3e 100644
--- a/reference/speeduino.ini
+++ b/reference/speeduino.ini
@@ -6,7 +6,7 @@
    MTversion      = 2.25
 
    queryCommand   = "Q"
-   signature      = "speeduino 201801-dev"
+   signature      = "speeduino 201802"
    versionInfo    = "S" ;This info is what is displayed to user
 
 [TunerStudio]
@@ -1178,18 +1178,23 @@ menuDialog = main
         field = "Low (E0) ",         flexFreqLow,  { flexEnabled }
         field = "High (E100) ",      flexFreqHigh, { flexEnabled }
 
-    dialog = flexFuelWest, "", border
-        panel = flexFuelSettings, North
-
-    dialog = flexCurves, "", indexCard
+    dialog = flexFuelWest, ""
         panel = flex_fuel_curve,     { flexEnabled }
         panel = flex_adv_curve,      { flexEnabled }
+
+    dialog = flexFuelEast, ""
         panel = flex_boost_curve,    { flexEnabled && boostEnabled }
 
+    ;dialog = flexCurves, "", indexCard
+    dialog = flexCurves, "", xAxis
+        panel = flexFuelWest, West
+        panel = flexFuelEast, East
+
     dialog = flexFueling, "Fuel Sensor Settings", border
         topicHelp = "http://speeduino.com/wiki/index.php/Flex_Fuel"
-        panel = flexFuelWest, West
-        panel = flexCurves,   Center
+        ;panel = flexFuelWest, West
+        panel = flexFuelSettings, North
+        panel = flexCurves,   South
 
     dialog = tacho, "Tacho"
         field = "Output pin",           tachoPin
@@ -2005,23 +2010,23 @@ cmdtestspk450dc = "E\x03\x0C"
 ; Flex fuel correction curves
         curve = flex_fuel_curve, "Flex Fuel Adjustments"
             columnLabel    = "Ethanol", "Fuel"
-            xAxis          = 0, 100, 5
-            yAxis          = 0, 255, 10
+            xAxis          = 0, 100, 10
+            yAxis          = 50, 250, 5
             xBins          = flexFuelBins, flex
             yBins          = flexFuelAdj
             size           = 400, 200
 
         curve = flex_adv_curve, "Flex Timing Advance"
             columnLabel    = "Ethanol", "Advance"
-            xAxis		   = 0, 100, 5
-            yAxis          = 0, 100, 5
+            xAxis		       = 0, 100, 10
+            yAxis          = 0, 50, 5
             xBins          = flexAdvBins, flex
             yBins          = flexAdvAdj
             size           = 400, 200
 
         curve = flex_boost_curve, "Flex Boost Adjustments"
             columnLabel    = "Ethanol", "Boost"
-            xAxis		   = 0, 100, 5
+            xAxis		       = 0, 100, 10
             yAxis          = -100, 200, 5
             xBins          = flexBoostBins, flex
             yBins          = flexBoostAdj
diff --git a/speeduino/comms.ino b/speeduino/comms.ino
index d58d8411..0c53f6bc 100644
--- a/speeduino/comms.ino
+++ b/speeduino/comms.ino
@@ -132,7 +132,7 @@ void command()
       break;
 
     case 'Q': // send code version
-      Serial.print("speeduino 201801-dev");
+      Serial.print("speeduino 201802");
       break;
 
     case 'r': //New format for the optimised OutputChannels
@@ -162,7 +162,7 @@ void command()
       break;
 
     case 'S': // send code version
-      Serial.print("Speeduino 2018.1-dev");
+      Serial.print("Speeduino 2018.2");
       currentStatus.secl = 0; //This is required in TS3 due to its stricter timings
       break;