From e16da511013185f5dce1d5564a5323fb19e77bd2 Mon Sep 17 00:00:00 2001
From: Josh Stewart <josh@noisymime.org>
Date: Mon, 24 Jul 2017 14:19:07 +1000
Subject: [PATCH] Additional work for the new memory page

---
 reference/speeduino.ini | 31 +++++++++++++++++++++++++------
 speeduino/globals.h     |  2 +-
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/reference/speeduino.ini b/reference/speeduino.ini
index 7b9ab2a4..6052d8f2 100644
--- a/reference/speeduino.ini
+++ b/reference/speeduino.ini
@@ -97,14 +97,14 @@
    ;----------------------------------------------------------------------------
 
    endianness          = little
-   nPages              = 10
+   nPages              = 11
    burnCommand         = "B"
    pageSize            = 288,   64,     288,    64,     288,    64,     64,    160,     192,    128,    192
 ;   pageIdentifier      = "\$tsCanId\x01", "\$tsCanId\x02", "\$tsCanId\x03", "\$tsCanId\x04", "\$tsCanId\x05", "\$tsCanId\x06", "\$tsCanId\x07", "\$tsCanId\x08", "\$tsCanId\x09", "\$tsCanId\x0A"
    pageActivationDelay = 10
-   pageActivate        = "P\001",   "P\002", "P\003", "P\004", "P\005", "P\006", "P\007", "P\010", "P\011", "P\012"
-   pageReadCommand     = "V",       "V",     "V",     "V",     "V",     "V",     "V",     "V",      "V",	"V"
-   pageValueWrite      = "W%2o%v",   "W%o%v", "W%2o%v", "W%o%v", "W%2o%v", "W%o%v", "W%o%v", "W%o%v", "W%o%v",	"W%o%v"
+   pageActivate        = "P\001",   "P\002", "P\003", "P\004", "P\005", "P\006", "P\007", "P\010", "P\011", "P\012", "P\013"
+   pageReadCommand     = "V",       "V",     "V",     "V",     "V",     "V",     "V",     "V",      "V",    "V",    "V"
+   pageValueWrite      = "W%2o%v",   "W%o%v", "W%2o%v", "W%o%v", "W%2o%v", "W%o%v", "W%o%v", "W%o%v", "W%o%v",	"W%o%v",	"W%o%v"
 ;  pageChunkWrite      = ""      ; No chunk write for standard MS
 
    blockingFactor = 2048
@@ -692,6 +692,16 @@ page = 10
         unused10_126        = scalar, U08,    126,       "",       1, 0, 0, 255, 0
         unused10_127        = scalar, U08,    127,       "",       1, 0, 0, 255, 0
 
+page = 11
+#if CELSIUS
+        crankingEnrichBins  = array, U08,       0, [4],  "C",        1.0,    -40,    -40,    215,      0
+#else
+        crankingEnrichBins  = array, U08,       0, [4],  "F",        1.8,    -22.23,    -40,    215,      0
+#endif
+        crankingEnrichValues= array, U08,       4, [4],  "%",        1.0,    0.0,  0,    255,        0 ; Values for the cranking enrichment curve
+
+        unused11_8_192      = array, U08,       8,[184],     "RPM",  100.0,  0.0,   100,     25500,      0
+
 ;-------------------------------------------------------------------------------
 
 [ConstantsExtensions]
@@ -1276,6 +1286,7 @@ menuDialog = main
         field = "Priming Pulsewidth", primePulse
         field = ""
         field = "Cranking Enrichment %", crankingPct
+        panel = cranking_enrich_curve
         field = ""
         field = "Cranking bypass", ignBypassEnable
         field = "Bypass output pin", ignBypassPin               { ignBypassEnable }
@@ -1815,8 +1826,6 @@ cmdtestspk450dc = "E\x03\x0C"
             xBins = brvBins, batteryVoltage
             yBins = injBatRates
 
-
-
 ; Correction curve for Air Density vs temperature
         curve = airdensity_curve, "IAT density correction"
             columnLabel = "Air Temperature", "Fuel Amount"
@@ -1889,6 +1898,16 @@ cmdtestspk450dc = "E\x03\x0C"
             yBins       = wueRates
             gauge       = cltGauge
 
+; Cranking enrichment curve
+        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
+            xBins       = crankingEnrichBins, coolant
+            yBins       = crankingEnrichValues
+            gauge       = cltGauge
+
 ; Warmup enrichment VEAL AFR adjustment curve (Not currently working)
         ;curve = warmup_afr_curve, "AFR Target Temperature Adustment"
         ;    columnLabel = "Coolant Temp", "AFR Offset %"
diff --git a/speeduino/globals.h b/speeduino/globals.h
index 3e855117..bd7ed3dc 100644
--- a/speeduino/globals.h
+++ b/speeduino/globals.h
@@ -108,7 +108,7 @@ const char TSfirmwareVersion[] = "Speeduino 2016.09";
 
 const byte data_structure_version = 2; //This identifies the data structure when reading / writing.
 const byte page_size = 64;
-const int npage_size[11] = {0,288,64,288,64,288,64,64,160,192,128};
+const int npage_size[12] = {0,288,64,288,64,288,64,64,160,192,128,192};
 //const byte page11_size = 128;
 #define MAP_PAGE_SIZE 288