From 12e1ce8617eaeaaa3d1f1dec4ca47807a610ed02 Mon Sep 17 00:00:00 2001
From: Josh Stewart <josh@noisymime.org>
Date: Thu, 1 Sep 2016 16:28:06 +1000
Subject: [PATCH] Versioning for September 2016 dev

---
 comms.ino               | 33 +++++----------------------------
 reference/speeduino.ini |  2 +-
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/comms.ino b/comms.ino
index 19442051..84657276 100644
--- a/comms.ino
+++ b/comms.ino
@@ -62,39 +62,14 @@ void command()
       break;
 
     case 'S': // send code version
-      //Serial.print(signature);
-      //break;
-
-      /*
-      char titleString[18];
-      strcat(titleString, displaySignature);
-      strcat(titleString, " ");
-      strcat(titleString, TSfirmwareVersion);
-
-      //Serial.print(titleString);
-      //Serial.write(titleString,16);
-      */
-      Serial.print("Speeduino 2016.08");
+      Serial.print("Speeduino 2016.09");
       currentStatus.secl = 0; //This is required in TS3 due to its stricter timings
       break;
 
-    case 'Q': // send code version
-      Serial.print("speeduino 201608");
-      
-      //Serial.print(signature);
-      //Serial.write(signature);
+    case 'Q': // send code signature
+      Serial.print("speeduino 201609-dev");
       break;
 
-      //The following requires TunerStudio 3
-      /*
-      strcat(titleString, signature);
-      strcat(titleString, " ");
-      strcat(titleString, TSfirmwareVersion);
-      
-      Serial.write(titleString,19);
-      break;
-      */
-
     case 'V': // send VE table and constants in binary
       sendPage(false);
       break;
@@ -231,6 +206,8 @@ void sendValues(int length)
   if(requestCount == 0) { currentStatus.secl = 0; }
   requestCount++;
 
+  currentStatus.spark ^= (-currentStatus.hasSync ^ currentStatus.spark) & (1 << BIT_SPARK_SYNC); //Set the sync bit of the Spark variable to match the hasSync variable
+
   response[0] = currentStatus.secl; //secl is simply a counter that increments each second. Used to track unexpected resets (Which will reset this count to 0)
   response[1] = currentStatus.squirt; //Squirt Bitfield
   response[2] = currentStatus.engine; //Engine Status Bitfield
diff --git a/reference/speeduino.ini b/reference/speeduino.ini
index 7b209af0..43c0cccf 100644
--- a/reference/speeduino.ini
+++ b/reference/speeduino.ini
@@ -6,7 +6,7 @@
 
    queryCommand   = "Q"
    ;signature      = 20
-   signature      = "speeduino 201608"
+   signature      = "speeduino 201609-dev"
    versionInfo    = "S"  ; Put this in the title bar.