From f474a95dc5850047accb93f09b118d0d6538864e Mon Sep 17 00:00:00 2001 From: Josh Stewart Date: Wed, 3 Jan 2018 21:52:25 +1100 Subject: [PATCH] December 2017 signature and base tunes --- reference/Base Tunes/NA6 PNP base tune.msq | 42 +++- reference/Speeduino base tune.msq | 234 ++++++++++++++++++++- reference/speeduino.ini | 2 +- speeduino/comms.ino | 4 +- speeduino/decoders.ino | 2 +- 5 files changed, 264 insertions(+), 20 deletions(-) diff --git a/reference/Base Tunes/NA6 PNP base tune.msq b/reference/Base Tunes/NA6 PNP base tune.msq index aad7b9b0..4cec1979 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" @@ -113,12 +113,14 @@ "Four-stroke" "Port" "4" +"None" +"None" "4" "Even fire" "Off" "Speed Density" "Off" -"Semi-Sequential" +"Paired" "No" "Off" 2.0 @@ -207,7 +209,7 @@ 77.0 - 77.0 + 255.0 @@ -274,7 +276,6 @@ "Leading" "Crank Speed" "Going Low" -"Yes" "4G63 / Miata / 3000GT" "Trailing" "Board Default" @@ -420,7 +421,7 @@ 1.0 - 134.0 + 255.0 @@ -526,8 +527,8 @@ 20.0 35.0 50.0 - 60.0 - 90.0 + 62.0 + 91.0 120.0 @@ -537,7 +538,7 @@ 100.0 95.0 91.0 - 88.0 + 83.0 81.0 74.0 @@ -860,6 +861,22 @@ "Off" "Off" "Off" +"0x100" +"0x100" +"0x100" +"0x100" +"0x100" +"0x100" +"0x100" +"0x100" +"0x100" +"0x100" +"0x100" +"0x100" +"0x100" +"0x100" +"0x100" +"0x100" "7" "1" "1" @@ -926,6 +943,9 @@ 0.0 0.0 "CAN ID 0" +"0x100" +"0x100" +"0x100" 0.0 0.0 0.0 @@ -946,7 +966,7 @@ 0.0 0.0 0.0 -132.0 +1.0 @@ -1154,7 +1174,7 @@ 0.0 - 0.0 + 255.0 diff --git a/reference/Speeduino base tune.msq b/reference/Speeduino base tune.msq index 86bff3c7..c5ee8b72 100644 --- a/reference/Speeduino base tune.msq +++ b/reference/Speeduino base tune.msq @@ -1,7 +1,7 @@ - - + + "CAN ID 0" @@ -144,6 +144,70 @@ 0.0 0.0 20.0 +1.0 +315.0 + + 62.0 + 62.0 + 60.0 + 61.0 + 64.0 + 65.0 + 66.0 + 68.0 + 68.0 + 70.0 + 71.0 + 71.0 + 71.0 + 71.0 + 66.0 + 59.0 + 60.0 + 60.0 + 61.0 + 63.0 + 64.0 + 66.0 + 67.0 + 68.0 + 69.0 + 70.0 + 71.0 + 72.0 + 74.0 + 69.0 + 61.0 + 59.0 + 60.0 + 61.0 + 62.0 + 64.0 + 66.0 + 67.0 + 69.0 + 70.0 + 71.0 + 72.0 + 72.0 + 73.0 + 74.0 + 64.0 + 59.0 + 61.0 + 60.0 + 61.0 + 64.0 + 65.0 + 67.0 + 68.0 + 68.0 + 70.0 + 71.0 + 71.0 + 71.0 + 71.0 + 255.0 @@ -212,7 +276,6 @@ "Leading" "Crank Speed" "Going Low" -"No" "Missing Tooth" "Leading" "Board Default" @@ -621,8 +684,8 @@ 100.0 - 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 - 11.0 10.0 6.0 6.0 6.0 6.0 7.0 7.0 + 175.0 0.0 0.0 27.0 4.0 4.0 0.0 0.0 + 99.0 8.0 6.0 0.0 6.0 6.0 0.0 1.0 24.0 22.0 20.0 18.0 18.0 18.0 19.0 20.0 32.0 30.0 29.0 28.0 27.0 27.0 27.0 29.0 39.0 39.0 38.0 38.0 37.0 37.0 36.0 36.0 @@ -933,6 +996,167 @@ 20.0 200.0 600.0 + + 700.0 + 25500.0 + 700.0 + 700.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 700.0 + 700.0 + 700.0 + 700.0 + 700.0 + 700.0 + 0.0 + 0.0 + 25500.0 + 25500.0 + 100.0 + 100.0 + 100.0 + 100.0 + 100.0 + 100.0 + 100.0 + 100.0 + 100.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 700.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 100.0 + 0.0 + 200.0 + 200.0 + 100.0 + 100.0 + 100.0 + 200.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 0.0 + 100.0 + 0.0 + 100.0 + 100.0 + 25500.0 + 100.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 25500.0 + 1000.0 + 5000.0 + 7500.0 + 11000.0 + 15000.0 + 12000.0 + 10900.0 + 9600.0 + 0.0 + 1200.0 + 1000.0 + 600.0 + 500.0 + 1000.0 + 1000.0 + 1300.0 + 1500.0 + 1500.0 + 2500.0 + 3800.0 + 4500.0 + 5000.0 + 6500.0 + 9000.0 + 12500.0 + 21600.0 + 100.0 + 3000.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 255.0 diff --git a/reference/speeduino.ini b/reference/speeduino.ini index 52aecfcf..702c52e5 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -6,7 +6,7 @@ MTversion = 2.25 queryCommand = "Q" - signature = "speeduino 201712-dev" + signature = "speeduino 201712" versionInfo = "S" ;This info is what is displayed to user [TunerStudio] diff --git a/speeduino/comms.ino b/speeduino/comms.ino index 294be1a4..d3f719de 100644 --- a/speeduino/comms.ino +++ b/speeduino/comms.ino @@ -132,7 +132,7 @@ void command() break; case 'Q': // send code version - Serial.print("speeduino 201712-dev"); + Serial.print("speeduino 201712"); break; case 'r': //New format for the optimised OutputChannels @@ -162,7 +162,7 @@ void command() break; case 'S': // send code version - Serial.print("Speeduino 2017.12-dev"); + Serial.print("Speeduino 2017.12"); currentStatus.secl = 0; //This is required in TS3 due to its stricter timings break; diff --git a/speeduino/decoders.ino b/speeduino/decoders.ino index 51ea82ab..abe970d1 100644 --- a/speeduino/decoders.ino +++ b/speeduino/decoders.ino @@ -940,7 +940,7 @@ int getCrankAngle_4G63(int timePerDegree) unsigned long elapsedTime = micros() - tempToothLastToothTime; //crankAngle += uSToDegrees(elapsedTime); unsigned long toothTime = tempToothLastToothTime - tempToothLastMinusOneToothTime; - crankAngle += int16_t((elapsedTime * triggerToothAngle) / toothTime); + crankAngle += int((elapsedTime * triggerToothAngle) / toothTime); //timePerDegree = toothTime / tempToothAngle; if (crankAngle >= 720) { crankAngle -= 720; }