From 02564d3218fd0ee45663e1137615a03777f186ff Mon Sep 17 00:00:00 2001 From: Josh Stewart Date: Mon, 5 Jun 2017 14:28:28 +1000 Subject: [PATCH] May signature --- reference/speeduino.ini | 20 ++++++++++++-------- speeduino/comms.ino | 4 ++-- speeduino/speeduino.ino | 6 ++++++ speeduino/updates.ino | 2 ++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/reference/speeduino.ini b/reference/speeduino.ini index da9668b9..db620a24 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -7,7 +7,7 @@ queryCommand = "Q" ;signature = 20 - signature = "speeduino 201705-dev" + signature = "speeduino 201705" versionInfo = "S" ; Put this in the title bar. ;[TunerStudio] @@ -634,10 +634,13 @@ page = 10 unused10_97 = scalar, U08, 97, "", 1, 0, 0, 255, 0 unused10_98 = scalar, U08, 98, "", 1, 0, 0, 255, 0 unused10_99 = scalar, U08, 99, "", 1, 0, 0, 255, 0 - speeduino_tsCanId = bits, U08, 100, [0:3], $tsCanId_list - true_address = bits, U16, 101, [0:10], $CAN_ADDRESS_HEX - realtime_base_address = bits, U16, 103, [0:10], $CAN_ADDRESS_HEX - obd_address = bits, U16, 105, [0:10], $CAN_ADDRESS_HEX + speeduino_tsCanId = bits, U08, 100, [0:3], $tsCanId_list + ;true_address = bits, U16, 101, [0:10], $CAN_ADDRESS_HEX + ;realtime_base_address = bits, U16, 103, [0:10], $CAN_ADDRESS_HEX + ;obd_address = bits, U16, 105, [0:10], $CAN_ADDRESS_HEX + unused10_101 = scalar, U16, 101, "", 1, 0, 0, 255, 0 + unused10_103 = scalar, U16, 103, "", 1, 0, 0, 255, 0 + unused10_105 = scalar, U16, 105, "", 1, 0, 0, 255, 0 ;AFR offset for WUE VeAnalyze ;wueAFRRates = array, U08, 107, [10], "%", 1.0, 0.0, 0.0, 255, 0 @@ -735,9 +738,9 @@ page = 10 defaultValue = boostMaxDuty,100 defaultValue = sparkDur, 1.0 defaultValue = speeduino_tsCanId, 0 - defaultValue = true_address, 0 - defaultValue = realtime_base_address, 0 - defaultValue = obd_address, 0 + ;defaultValue = true_address, 0 + ;defaultValue = realtime_base_address, 0 + ;defaultValue = obd_address, 0 ;Default pins defaultValue = fanPin, 0 @@ -2270,6 +2273,7 @@ cmdtestspk450dc = "E\x03\x0C" entry = flex, "Eth %", int, "%d", { flexEnabled } entry = errorNum, "Error #", int, "%d" entry = currentError, "Error ID", int, "%d" + entry = map_psi, "Boost PSI", float, "%.1f" entry = boostTarget, "Boost Target",int, "%d", { boostEnabled } entry = boostDuty, "Boost Duty", int, "%d", { boostEnabled } entry = boostCutOut , "Boost cut", int, "%d" diff --git a/speeduino/comms.ino b/speeduino/comms.ino index 6b02fb15..c092fcdd 100644 --- a/speeduino/comms.ino +++ b/speeduino/comms.ino @@ -80,12 +80,12 @@ void command() break; case 'S': // send code version - Serial.print("Speeduino 2017.05-dev"); + Serial.print("Speeduino 2017.05"); currentStatus.secl = 0; //This is required in TS3 due to its stricter timings break; case 'Q': // send code version - Serial.print("speeduino 201705-dev"); + Serial.print("speeduino 201705"); break; case 'V': // send VE table and constants in binary diff --git a/speeduino/speeduino.ino b/speeduino/speeduino.ino index e4cbf1f4..1b54bc49 100644 --- a/speeduino/speeduino.ino +++ b/speeduino/speeduino.ino @@ -298,6 +298,8 @@ void setup() triggerInterrupt = 3; break; case 21: triggerInterrupt = 2; break; + default: + triggerInterrupt = 0; break; //This should NEVER happen } #else triggerInterrupt = pinTrigger; @@ -318,6 +320,8 @@ void setup() triggerInterrupt2 = 3; break; case 21: triggerInterrupt2 = 2; break; + default: + triggerInterrupt2 = 0; break; //This should NEVER happen } #else triggerInterrupt2 = pinTrigger2; @@ -533,6 +537,7 @@ void setup() channel1InjEnabled = true; break; + case 2: channel1IgnDegrees = 0; @@ -553,6 +558,7 @@ void setup() channel1InjEnabled = true; channel2InjEnabled = true; break; + case 3: channel1IgnDegrees = 0; diff --git a/speeduino/updates.ino b/speeduino/updates.ino index cbcff403..6999bdd7 100644 --- a/speeduino/updates.ino +++ b/speeduino/updates.ino @@ -27,6 +27,8 @@ void doUpdates() //Final check is always for 255 and 0 (Brand new arduino) if(EEPROM.read(EEPROM_DATA_VERSION) == 0 || EEPROM.read(EEPROM_DATA_VERSION) == 255) { + configPage10.true_address = 0x200; EEPROM.write(EEPROM_DATA_VERSION, CURRENT_DATA_VERSION); + } }