From b42d0069ab8fab5605fd1279c369bcd29d64287a Mon Sep 17 00:00:00 2001
From: Josh Stewart <josh@noisymime.org>
Date: Tue, 25 Jul 2017 20:42:06 +1000
Subject: [PATCH] Clean up cranking enrichment dialog

---
 reference/speeduino.ini | 50 ++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/reference/speeduino.ini b/reference/speeduino.ini
index 6052d8f2..58778a7a 100644
--- a/reference/speeduino.ini
+++ b/reference/speeduino.ini
@@ -1088,6 +1088,9 @@ menuDialog = main
 ; dialog which will be added.
 ; dialogs can be nested and can be mixed with fields
 
+    dialog = wc_note
+        field = "Final enrichment value must be 100%. Typical maximum is 255% (cold)."
+
     dialog = engine_constants_southwest, "Speeduino Board"
         field = "Stoichiometric ratio", stoich
         field = "Injector Layout",      injLayout,           { nCylinders <= 4 }
@@ -1277,20 +1280,31 @@ menuDialog = main
     dialog = fuelpump, "Fuel pump"
         field = "Fuel pump pin",                    fuelPumpPin
 
-    dialog = crankPW, "Cranking Pulsewidths (ms)"
-        topicHelp = "http://speeduino.com/wiki/index.php/Cranking"
+    dialog = crankingEnrichDialog, "Cranking Enrichment", yAxis
+        panel = cranking_enrich_curve
+        panel = wc_note
+
+    dialog = crankingIgnOptions, "Cranking Timing", yAxis
+        field = "Cranking bypass", ignBypassEnable
+        field = "Bypass output pin", ignBypassPin               { ignBypassEnable }
+        field = "Fix cranking timing with trigger", ignCranklock,   { TrigPattern == 1 || TrigPattern == 4 || TrigPattern == 10}
+
+    dialog = crankingOptions, "", yAxis
         field = "Cranking RPM (Max)", crankRPM
         field = "Flood Clear level", tpsflood
         field = ""
         field = "Fuel pump prime duration", fpPrime
         field = "Priming Pulsewidth", primePulse
-        field = ""
-        field = "Cranking Enrichment %", crankingPct
-        panel = cranking_enrich_curve
-        field = ""
-        field = "Cranking bypass", ignBypassEnable
-        field = "Bypass output pin", ignBypassPin               { ignBypassEnable }
-        field = "Fix cranking timing with trigger", ignCranklock,   { TrigPattern == 1 || TrigPattern == 4 || TrigPattern == 10}
+
+    dialog = crankPW, "Cranking Settings", yAxis
+        topicHelp = "http://speeduino.com/wiki/index.php/Cranking"
+        panel = crankingOptions, North
+        ;field = ""
+        ;field = "Cranking Enrichment %", crankingPct
+        panel = crankingEnrichDialog, Center
+        ;field = ""
+        panel = crankingIgnOptions, South
+
 
     dialog = aseSettings, "Afterstart Enrichment"
         field = "Enrichment %", asePct
@@ -1432,9 +1446,6 @@ menuDialog = main
         field = "VVT output pin",         vvtPin,           { vvtEnabled }
         field = "VVT solenoid freq.",     vvtFreq,          { vvtEnabled }
 
-    dialog = wc_note
-        field = "For 99% of engines, warmup must have 100% in the final row. Typical maximum is 255% (cold)."
-
     dialog = warmup, "Warmup Enrichment (WUE) - Percent Multiplier"
         panel = warmup_curve
         panel = wc_note
@@ -1443,7 +1454,7 @@ menuDialog = main
 
     ;Fuel trim composite dialog
     dialog = inj_trim1TblTitle, "Channel #1"
-        panel = fuelTrimTable1Tbl,      Center,      { fuelTrimEnabled }
+        panel = fuelTrimTable1Tbl,      { fuelTrimEnabled }
     dialog = inj_trim2TblTitle, "Channel #2"
         panel = fuelTrimTable2Tbl,      { fuelTrimEnabled }
     dialog = inj_trim3TblTitle, "Channel #3"
@@ -1458,9 +1469,12 @@ menuDialog = main
         panel = inj_trim3TblTitle
         panel = inj_trim4TblTitle
 
-    dialog = inj_trimad,"Injector Cyl 1-4 Trims", yAxis
+    dialog = inj_trim_enable, ""
         field = "Individual fuel trim enabled",     fuelTrimEnabled,    { injLayout == 3 }
-        panel = inj_trimadt, North
+
+    dialog = inj_trimad,"Injector Cyl 1-4 Trims", yAxis
+        panel = inj_trim_enable, North
+        panel = inj_trimadt, Center
         panel = inj_trimadb, South
 
     dialog = outputtest_warningmessage, ""
@@ -1902,11 +1916,11 @@ cmdtestspk450dc = "E\x03\x0C"
         curve = cranking_enrich_curve, "Cranking Enrichment Curve"
             ;topicHelp = "file://$getProjectsDirPath()/docs/xxx.pdf#wue"
             columnLabel = "Coolant", "Enrich %"
-            xAxis       = -40, 150, 9
-            yAxis       =   0,  240, 6
+            xAxis       = -40, 110, 9
+            yAxis       =   0,  200, 6
             xBins       = crankingEnrichBins, coolant
             yBins       = crankingEnrichValues
-            gauge       = cltGauge
+            ;gauge       = cltGau25
 
 ; Warmup enrichment VEAL AFR adjustment curve (Not currently working)
         ;curve = warmup_afr_curve, "AFR Target Temperature Adustment"