From 3c285408e6a6f5198ddb6f44f23fa6fa58d43bdc Mon Sep 17 00:00:00 2001 From: Josh Stewart Date: Thu, 4 Apr 2019 12:11:15 +1100 Subject: [PATCH] Signatures and base tunes for 201903 --- reference/Base Tunes/NA6 PNP base tune.msq | 62 ++++++++++---------- reference/Base Tunes/Speeduino base tune.msq | 58 +++++++++--------- reference/speeduino.ini | 2 +- speeduino/comms.ino | 8 +-- 4 files changed, 65 insertions(+), 65 deletions(-) diff --git a/reference/Base Tunes/NA6 PNP base tune.msq b/reference/Base Tunes/NA6 PNP base tune.msq index 14912365..3a9ac6b3 100644 --- a/reference/Base Tunes/NA6 PNP base tune.msq +++ b/reference/Base Tunes/NA6 PNP base tune.msq @@ -1,7 +1,7 @@ - - + + "CAN ID 0" @@ -16,6 +16,7 @@ 255.0 255.0 +Aux0 50.0 @@ -38,7 +39,7 @@ "NA6 MX5 PNP" "Board Default" "Normal" -3.2 +3.0 0.0 30.0 400.0 @@ -177,7 +178,7 @@ 41.0 49.0 50.0 48.0 38.0 42.0 38.0 45.0 53.0 54.0 55.0 56.0 57.0 58.0 58.0 58.0 45.0 50.0 51.0 56.0 47.0 50.0 45.0 54.0 59.0 59.0 59.0 59.0 59.0 59.0 59.0 59.0 47.0 50.0 52.0 65.0 53.0 52.0 52.0 59.0 69.0 68.0 66.0 65.0 64.0 63.0 62.0 62.0 - 44.0 49.0 53.0 68.0 59.0 54.0 53.0 61.0 69.0 69.0 69.0 68.0 68.0 68.0 68.0 68.0 + 44.0 49.0 53.0 68.0 59.0 54.0 53.0 61.0 69.0 69.0 69.0 68.0 62.0 68.0 68.0 68.0 46.0 49.0 60.0 69.0 65.0 60.0 59.0 67.0 61.0 61.0 60.0 60.0 60.0 59.0 59.0 59.0 47.0 50.0 64.0 71.0 66.0 65.0 64.0 67.0 61.0 61.0 62.0 62.0 62.0 63.0 63.0 63.0 52.0 52.0 64.0 70.0 72.0 70.0 68.0 69.0 63.0 66.0 68.0 71.0 73.0 76.0 77.0 77.0 @@ -185,7 +186,7 @@ 53.0 61.0 65.0 76.0 88.0 90.0 89.0 86.0 93.0 93.0 93.0 93.0 93.0 93.0 93.0 93.0 53.0 61.0 68.0 81.0 95.0 96.0 95.0 104.0 98.0 99.0 99.0 100.0 101.0 102.0 102.0 102.0 53.0 61.0 69.0 83.0 99.0 102.0 107.0 128.0 141.0 137.0 133.0 128.0 124.0 120.0 118.0 118.0 - 53.0 58.0 76.0 97.0 106.0 108.0 115.0 119.0 122.0 121.0 121.0 120.0 120.0 119.0 119.0 119.0 + 54.0 59.0 77.0 98.0 107.0 109.0 116.0 134.0 155.0 140.0 135.0 130.0 121.0 120.0 120.0 120.0 500.0 @@ -285,7 +286,7 @@ 0.0 5.0 10.0 -"FALLING" +"RISING" "Crank Speed" "Going Low" "4G63 / Miata / 3000GT" @@ -655,8 +656,8 @@ "No" "On/Off" "Board Default" --40.0 -0.0 +80.0 +3.0 0.0 -40.0 @@ -856,85 +857,85 @@ -"Enable" +"Disable" "Disable" "Enable" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" @@ -1061,6 +1062,7 @@ "7" "8" "Yes" +"0" 7.0 20.0 44.0 @@ -1252,13 +1254,13 @@ 0.1 0.0 0.0 - + 0.0 0.0 0.0 0.0 - 20000.0 - 0.0 + 18800.0 + 1400.0 0.0 0.0 0.0 @@ -1321,11 +1323,9 @@ 0.0 0.0 0.0 + 100.0 9800.0 - - 101.0 - diff --git a/reference/Base Tunes/Speeduino base tune.msq b/reference/Base Tunes/Speeduino base tune.msq index 32f158d2..4632fd6d 100644 --- a/reference/Base Tunes/Speeduino base tune.msq +++ b/reference/Base Tunes/Speeduino base tune.msq @@ -1,7 +1,7 @@ - - + + "CAN ID 0" @@ -16,6 +16,7 @@ 255.0 255.0 +Aux0 -1.0 @@ -38,7 +39,7 @@ "Speeduino v0.4" "Board Default" "Normal" -25.5 +3.0 25.5 70.0 200.0 @@ -75,7 +76,7 @@ "Speed Density" "Off" "Paired" -"No" +"Yes" "Off" 1.0 90.0 @@ -285,7 +286,7 @@ 0.0 5.0 0.0 -"FALLING" +"RISING" "Crank Speed" "Going Low" "Missing Tooth" @@ -649,7 +650,7 @@ "3" "1" "Normal" -20.0 +50.0 240.0 4.0 "No" @@ -856,85 +857,85 @@ -"Enable" +"Disable" "Disable" "Enable" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" "Via Internal CAN" -"Digital_local" +"Off" "Digital_local" "Via Secondary Serial" "Via Internal CAN" @@ -1060,7 +1061,8 @@ "8" "7" "8" -"Yes" +"No" +"1" 7.0 20.0 44.0 @@ -1252,13 +1254,14 @@ 0.2 0.1 0.0 - + 0.0 0.0 0.0 0.0 0.0 - 20000.0 + 18600.0 + 1700.0 0.0 0.0 0.0 @@ -1323,9 +1326,6 @@ 0.0 0.0 - - 101.0 - diff --git a/reference/speeduino.ini b/reference/speeduino.ini index 3dd0f36d..4e9ec01c 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -6,7 +6,7 @@ MTversion = 2.25 queryCommand = "Q" - signature = "speeduino 201903-dev" + signature = "speeduino 201903" versionInfo = "S" ;This info is what is displayed to user [TunerStudio] diff --git a/speeduino/comms.ino b/speeduino/comms.ino index 0a413905..9c57a8d6 100644 --- a/speeduino/comms.ino +++ b/speeduino/comms.ino @@ -68,12 +68,12 @@ void command() Serial.write(highByte(currentStatus.loopsPerSecond)); break; - case 'd': // Send a CRC32 value of a given page + case 'd': // Send a CRC32 hash of a given page cmdPending = true; if (Serial.available() >= 2) { - Serial.read(); //Ignore the first table value, it's always 0 + Serial.read(); //Ignore the first byte value, it's always 0 uint32_t CRC32_val = calculateCRC32( Serial.read() ); //Split the 4 bytes of the CRC32 value into individual bytes and send @@ -226,7 +226,7 @@ void command() break; case 'Q': // send code version - Serial.print(F("speeduino 201903-dev")); + Serial.print(F("speeduino 201903")); break; case 'r': //New format for the optimised OutputChannels @@ -256,7 +256,7 @@ void command() break; case 'S': // send code version - Serial.print(F("Speeduino 2019.03-dev")); + Serial.print(F("Speeduino 2019.03")); currentStatus.secl = 0; //This is required in TS3 due to its stricter timings break;