From a9798517e934c877b8bbc2be89b18765a3321275 Mon Sep 17 00:00:00 2001 From: Josh Stewart Date: Mon, 3 Oct 2016 17:32:04 +1100 Subject: [PATCH] Development signature for Oct --- comms.ino | 4 ++-- reference/speeduino.ini | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/comms.ino b/comms.ino index f007946d..0e274d84 100644 --- a/comms.ino +++ b/comms.ino @@ -62,12 +62,12 @@ void command() break; case 'S': // send code version - Serial.print("Speeduino 2016.09"); + Serial.print("Speeduino 2016.10-dev"); currentStatus.secl = 0; //This is required in TS3 due to its stricter timings break; case 'Q': // send code version - Serial.print("speeduino 201609"); + Serial.print("speeduino 201610-dev"); break; case 'V': // send VE table and constants in binary diff --git a/reference/speeduino.ini b/reference/speeduino.ini index eec45869..089b163e 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -6,7 +6,7 @@ queryCommand = "Q" ;signature = 20 - signature = "speeduino 201609" + signature = "speeduino 201610-dev" versionInfo = "S" ; Put this in the title bar. @@ -160,7 +160,6 @@ page = 2 reqFuel = scalar, U08, 24, "ms", 0.1, 0.0, 0.0, 25.5, 1 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" includeAFR = bits, U08, 26, [2:2], "No", "Yes" @@ -186,7 +185,7 @@ page = 2 flexEnabled= bits, U08, 38, [1:1], "Off", "On" algorithm = bits, U08, 38, [2:2], "Speed Density", "Alpha-N" baroCorr = bits, U08, 38, [3:3], "Off", "On" - injLayout = bits, U08, 38, [4:5], "Bank", "Semi-Sequential", "INVALID", "INVALID" + injLayout = bits, U08, 38, [4:5], "Paired", "Semi-Sequential", "Banked", "INVALID" canEnable = bits, U08, 38, [6:6], "Disable", "Enable" primePulse = scalar, U08, 39, "ms", 0.1, 0.0, 0.0, 25.5, 1 @@ -619,11 +618,13 @@ menuDialog = main ; tool tips tooltips ;Ensure all settings are defined as some MS2/BG words shipped with TS are not applicable. nCylinders = "The number of cylinders in your engine." + alternate = "" engineType = "Most engines are Even Fire. Typical odd-fire engines are V-twin, some V4, Vmax, some V6, V10." twoStroke = "Four-Stroke (most engines), Two-stroke." nInjectors = "Number of primary injectors." mapSample = "The method used for calculating the MAP reading\nFor 1-2 Cylinder engines, Cycle Minimum is recommended.\nFor more than 2 cylinders Cycle Average is recommended" stoich = "The stoichiometric ration of the fuel being used. For flex fuel, choose the primary fuel" + injLayout = "The injector layout and timing to be used. Options are: \n 1. Paired - 2 injectors per output. Outputs active is equal to half the number of cylinders. Outputs are timed over 1 crank revolution. \n 2. Semi-sequential: Same as paired except that injector channels are mirrored (1&4, 2&3) meaning the number of outputs used are equal to the number of cylinders. Only valid for 4 cylinders or less. \n 3. Banked: 2 outputs only used. \n 4. Sequential: 1 injector per output and outputs used equals the number of cylinders. Injection is timed over full cycle. TrigPattern = "The type of input trigger decoder to be used." numteeth = "Number of teeth on Primary Wheel."