From af5d769147a0d65f89e2659edb2c543c23b728ad Mon Sep 17 00:00:00 2001
From: Josh Stewart <josh@noisymime.org>
Date: Tue, 7 Apr 2020 23:45:24 +1000
Subject: [PATCH] Setup memory for vss

---
 reference/speeduino.ini | 20 +++++++++++++++++---
 speeduino/comms.ino     |  1 +
 speeduino/globals.h     | 16 +++++++++++++++-
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/reference/speeduino.ini b/reference/speeduino.ini
index 0bb3632f..c2e5015e 100644
--- a/reference/speeduino.ini
+++ b/reference/speeduino.ini
@@ -335,8 +335,21 @@ page = 1
 
       injAngRPM     = array,  U08,      95, [4],   "RPM"        100,       0.0,   100,    10000,    0
       idleTaperTime = scalar, U08,      99,    "S",         0.1,       0.0,   0.0,    25.5,      1
-      dfcoDelay     = scalar, U08,      100,   "S",         0.1,       0.0,   0.0,    25.5,      1
-      unused2-95    = array,  U08,      101, [27],   "%",        1.0,       0.0,   0.0,     255,      0
+      dfcoDelay     = scalar, U08,      100,   "S",         0.1,       0.0,   0.0,    25.5,      1 ;Remaind of DFCO settings are in page 4
+
+;VSS settings
+      vssEnable     = bits,  U08,       101, [0:0], "Off", "On"
+      vssPullup     = bits,  U08,       101, [1:1], "Off", "On"
+      vssPulsesPerKm= scalar, U16,      102.        "pulses"     1.0,       0.0,   0.0,     25500,    0
+      vssSpare      = scalar, U08,      104,         "%",        1.0,         0,     0,     120,      0
+      vssRatio1     = scalar, U16,      105,         ":1",      0.01,         0,     0,     9.99,     2
+      vssRatio2     = scalar, U16,      107,         "%",       0.01,         0,     0,     9.99,     2
+      vssRatio3     = scalar, U08,      109,         "%",       0.01,         0,     0,     2.55,     2
+      vssRatio4     = scalar, U08,      110,         "%",       0.01,         0,     0,     2.55,     2
+      vssRatio5     = scalar, U08,      111,         "%",       0.01,         0,     0,     2.55,     2
+      vssRatio6     = scalar, U08,      112,         "%",       0.01,         0,     0,     2.55,     2
+
+      unused2-95    = array,  U08,      113, [15],   "%",        1.0,       0.0,   0.0,     255,      0
 
 ;Page 2 is the fuel map and axis bins only
 page = 2
@@ -3447,7 +3460,7 @@ cmdtestspk450dc = "E\x03\x0C"
    ; you change it.
 
    ochGetCommand    = "r\$tsCanId\x30%2o%2c"
-   ochBlockSize     =  101
+   ochBlockSize     =  103
 
    secl             = scalar, U08,  0, "sec",    1.000, 0.000
    status1          = scalar, U08,  1, "bits",   1.000, 0.000
@@ -3554,6 +3567,7 @@ cmdtestspk450dc = "E\x03\x0C"
    baroCorrection   = scalar,   U08,    98, "%",      1.000, 0.000
    veCurr           = scalar,   U08,    99, "%",      1.000, 0.000
    ASECurr          = scalar,   U08,   100, "%",      1.000, 0.000
+   vss              = scalar,   U16,   101, "%",      1.000, 0.000
    #sd_status        = scalar,   U08,    99, "",         1.0,   0.0
 
 #if CELSIUS
diff --git a/speeduino/comms.ino b/speeduino/comms.ino
index 3b680b05..54f454ee 100644
--- a/speeduino/comms.ino
+++ b/speeduino/comms.ino
@@ -639,6 +639,7 @@ void sendValues(uint16_t offset, uint16_t packetLength, byte cmd, byte portNum)
   fullStatus[98] = currentStatus.baroCorrection;
   fullStatus[99] = currentStatus.VE; //Current VE (%). Can be equal to VE1 or VE2 or a calculated value from both of them
   fullStatus[100] = currentStatus.ASEValue; //Current ASE (%)
+  fullStatus[101] = currentStatus.vss;
 
   for(byte x=0; x<packetLength; x++)
   {
diff --git a/speeduino/globals.h b/speeduino/globals.h
index 9e56697d..b7c52418 100644
--- a/speeduino/globals.h
+++ b/speeduino/globals.h
@@ -516,6 +516,7 @@ struct statuses {
   byte vvtDuty;
   uint16_t injAngle;
   byte ASEValue;
+  uint16_t vss; /**< Current speed reading. Natively stored in kph and converted to mph in TS if required */
 };
 
 /**
@@ -644,7 +645,20 @@ struct config2 {
   byte idleTaperTime;
   byte dfcoDelay;
 
-  byte unused2_95[27];
+  //VSS Stuff
+  byte vssEnable : 1;
+  byte vssPullup : 1;
+  
+  uint16_t vssPulsesPerKm;
+  byte vssSpare;
+  uint16_t vssRatio1;
+  uint16_t vssRatio2;
+  byte vssRatio3;
+  byte vssRatio4;
+  byte vssRatio5;
+  byte vssRatio6;
+
+  byte unused2_95[15];
 
 #if defined(CORE_AVR)
   };