Code identifier checking (Disabled until TS3 is released)

comms.ino

@@ -58,14 +58,31 @@ void command()
       break;
 
     case 'S': // send code version
-      Serial.print(signature);
+      //Serial.print(signature);
+      //break;
+      
+      char titleString[19];
+      strcat(titleString, displaySignature);
+      strcat(titleString, " ");
+      strcat(titleString, TSfirmwareVersion);
+      
+      Serial.write(titleString,19);
       break;
 
     case 'Q': // send code version
       Serial.print(signature);
-      //Serial.write("speeduino");
       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;

globals.h

@@ -2,8 +2,13 @@
 #define GLOBALS_H
 #include <Arduino.h>
 
-const byte ms_version = 20;
+//const byte ms_version = 20;
 const byte signature = 20;
+
+//const char signature[] = "speeduino";
+const char displaySignature[] = "Speeduino";
+const char TSfirmwareVersion[] = "2016.05";
+
 const byte data_structure_version = 2; //This identifies the data structure when reading / writing. 
 const byte page_size = 64;
 const int map_page_size = 288;
@@ -88,7 +93,8 @@ struct statuses {
   unsigned int RPM;
   long longRPM;
   int mapADC;
-  long MAP;
+  long MAP; //Has to be a long for PID calcs (Boost control)
+  int baro; //Barometric pressure is simply the inital MAP reading, taken before the engine is running
   byte TPS; //The current TPS reading (0% - 100%)
   byte TPSlast; //The previous TPS reading
   unsigned long TPS_time; //The time the TPS sample was taken
@@ -171,7 +177,8 @@ struct config1 {
   
   byte reqFuel;
   byte divider;
-  byte injTiming : 2;
+  byte injTiming : 1;
+  byte multiplyMAP : 1;
   byte unused26 : 6;
   byte injOpen; //Injector opening time (ms * 10)
   unsigned int inj1Ang;

reference/speeduino.ini

@@ -5,7 +5,12 @@
 
    queryCommand   = "Q"
    signature      = 20
-   ;signature      = "speeduino"
+   ;signature      = "speeduino 2016.05"
+   versionInfo    = "S"  ; Put this in the title bar.
+
+   
+[TunerStudio]
+   iniSpecVersion = 3.24
 
 ;-------------------------------------------------------------------------------
 
@@ -74,7 +79,6 @@
    endianness          = little
    nPages              = 8
    burnCommand         = "B"
-   blockReadTimeout    = 1000
    pageSize            = 288,   64,     288,    64,     288,    64,     64,    160
    pageActivationDelay = 10
 ;  pageActivate        = ""
@@ -83,8 +87,14 @@
    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"
    ;\x00%2
 ;  pageChunkWrite      = ""      ; No chunk write for standard MS
+
    blockingFactor = 2048
+   tableBlockingFactor = 2048
    delayAfterPortOpen=1000
+   blockReadTimeout = 500
+   ;tsWriteBlocks =      on
+;   writeBlocks = on
+   ;interWriteDelay = 0
 
 ;Page 1 is the fuel map and axis bins only
 page = 1
@@ -137,6 +147,7 @@ page = 2
       divider    = scalar, U08,      25,        "",          1.0,       0.0
       ;injTiming  = bits,   U08,      26, [0:1], "Simultaneous", "Semi-Sequential", "Sequential"
       alternate  = bits,   U08,      26, [0:0], "Simultaneous", "Alternating"
+      multiplyMAP= bits,   U08,      26, [1:1], "No",       "Yes"
       injOpen    = scalar, U08,      27,        "ms",        0.1,       0.0,   0.1,    25.5,      1
       inj1Ang    = scalar, U16,      28,        "deg",       1.0,       0.0,   0.0,    360,       0
       inj2Ang    = scalar, U16,      30,        "deg",       1.0,       0.0,   0.0,    360,       0
@@ -610,6 +621,8 @@ page = 8
     ignBypassEnable = "If turned on, a ground signal will be output during cranking on the specified pin. This is used to bypass the Speeduino ignition control during cranking."
     ignCranklock = "On certain low resolution ignition patterns, the cranking timing can be locked to occur when a pulse is recieved."
     
+    multiplyMAP = "If enabled, the MAP reading is included directly into the pulsewidth calculation. This results in a flatter VE table that can be easier to tune in some instances"
+    
 
 [UserDefinedTS]
 ; Enhanced TunerStudio dialogs can be defined here