From 3845d4569ccf3d4afbe3188dbfb5e0b45996d236 Mon Sep 17 00:00:00 2001 From: Josh Stewart Date: Sun, 11 Sep 2016 21:19:25 +1000 Subject: [PATCH] Fix for TunerStudio 3.0.7 change --- reference/speeduino.ini | 51 ++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/reference/speeduino.ini b/reference/speeduino.ini index 43c0ccc..1a01e07 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -140,7 +140,7 @@ page = 2 crankingPct= scalar, U08, 14, "%", 1.0, 0.0, 0.0, 255, 0 pinLayout = bits, U08, 15, [0:7], "Speeduino v0.1", "Speeduino v0.2", "Speeduino v0.3", "Speeduino v0.4", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "Turtana PCB", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "Plazomat I/O 0.1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "Daz V6 Shield 0.1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", tachoPin = bits, U08, 16, [0:5], "Board Default", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unused2-16f= bits, U08, 16, [6:7], "INVALID", "INVALID", "INVALID", "INVALID" + unused2-16f= bits, U08, 16, [6:7], "One", "Two", "INVALID", "INVALID" tdePct = scalar, U08, 17, "ms", 0.1, 0.0, 0.0, 25.5, 1 taeColdA = scalar, U08, 18, "ms", 0.1, 0.0, 0.0, 25.5, 1 tpsThresh = scalar, U08, 19, "%/s", 1.0, 0.0, 0.0, 255, 0 @@ -199,12 +199,9 @@ page = 2 mapMax = scalar, U16, 47, "kpa", 1.0, 0.0, 0.0, 25500, 0 fpPrime = scalar, U08, 49, "s", 1.0, 0.0, 0.0, 255.0, 0 stoich = scalar, U08, 50, ":1", 0.1, 0.0, 0.0, 25.5, 1 - unused2-51 = scalar, U08, 51, "RPM", 100.0, 0.0, 100, 25500, 0 - unused2-52 = scalar, U08, 52, "RPM", 100.0, 0.0, 100, 25500, 0 - unused2-53 = scalar, U08, 53, "RPM", 100.0, 0.0, 100, 25500, 0 - unused2-54 = scalar, U08, 54, "RPM", 100.0, 0.0, 100, 25500, 0 - unused2-55 = scalar, U08, 55, "RPM", 100.0, 0.0, 100, 25500, 0 - unused2-56 = scalar, U08, 56, "RPM", 100.0, 0.0, 100, 25500, 0 + oddfire2 = scalar, U16, 51, "", 0.1, 0.0, 0.0, 720, 0 ; * ( 2 byte) + oddfire3 = scalar, U16, 53, "", 0.1, 0.0, 0.0, 720, 0 ; * ( 2 byte) + oddfire4 = scalar, U16, 55, "", 0.1, 0.0, 0.0, 720, 0 ; * ( 2 byte) unused2-57 = scalar, U08, 57, "RPM", 100.0, 0.0, 100, 25500, 0 unused2-58 = scalar, U08, 58, "RPM", 100.0, 0.0, 100, 25500, 0 unused2-59 = scalar, U08, 59, "RPM", 100.0, 0.0, 100, 25500, 0 @@ -482,6 +479,9 @@ page = 8 requiresPowerCycle = launchEnable requiresPowerCycle = launchHiLo requiresPowerCycle = flexEnabled + requiresPowerCycle = oddfire2 + requiresPowerCycle = oddfire3 + requiresPowerCycle = oddfire4 defaultValue = pinLayout, 1 defaultValue = TrigPattern, 0 @@ -501,6 +501,9 @@ page = 8 defaultValue = includeAFR, 0 defaultValue = stoich, 14.7 defaultValue = flexEnabled, 0 + defaultValue = oddfire2, 0 + defaultValue = oddfire3, 0 + defaultValue = oddfire4, 0 [Menu] @@ -528,7 +531,9 @@ page = 8 ; ;---------------------------------------------------------------------------- - menu = "&Settings" +menuDialog = main + + menu = "Settings" ;subMenu = std_injection, "&Constants" subMenu = engine_constants, "Engine Constants" subMenu = injChars, "Injector Characteristics" @@ -602,10 +607,6 @@ page = 8 subMenu = helpGeneral, "Speeduino Help" ;------------------------------------------------------------------------------- -[UserDefined] -; define a MegaTune compatible version here -; no need to for std_enrichments, it is built in. - [SettingContextHelp] ; constantName = "Help Text" ; tool tips tooltips @@ -636,6 +637,10 @@ page = 8 iacStepHome = "On startup the stepper motor moves this many steps to return to its home position. Set this value to a few more than the actual number to ensure the motor has returned to its full position." iacStepHyster = "The minimum number of steps to move in any one go." + oddfire2 = "The ATDC angle of channel 2 for oddfire engines. This is relative to the TDC angle of channel 1" + oddfire3 = "The ATDC angle of channel 3 for oddfire engines. This is relative to the TDC angle of channel 1 (NOT channel 2)" + oddfire4 = "The ATDC angle of channel 4 for oddfire engines. This is relative to the TDC angle of channel 1 (NOT channel 3)" + iacAlgorithm = "Selects method of idle control.\nNone = no idle control valve.\nOn/Off valve.\nPWM valve (2,3 wire).\nStepper Valve (4,6,8 wire)." iacPWMdir = "Normal PWM valves increase RPM with higher duty. If RPM decreases with higher duty then select Reverse" @@ -652,7 +657,8 @@ page = 8 includeAFR = "When enabled, the current AFR reading is incorporated directly in the pulsewidth calculation as a percentage of the current target ratio. VE table must be retuned when this value is changed. " -[UserDefinedTS] +[UserDefined] + ; Enhanced TunerStudio dialogs can be defined here ; MegaTune will over look this section ; These dialogs will over-ride those in the UserDefined Section @@ -672,16 +678,29 @@ page = 8 ; dialog which will be added. ; dialogs can be nested and can be mixed with fields - dialog = engine_constants_south + dialog = engine_constants_southwest, "Speeduino Board" topicHelp = Mhelp field = "Stoichiometric ratio", stoich field = "Injector Layout", injLayout, { nCylinders <= 4 } field = "Board Layout", pinLayout field = "MAP Sample method", mapSample - dialog = engine_constants, "" + dialog = engine_constants_west, "" panel = std_injection, North - panel = engine_constants_south, South + panel = engine_constants_southwest + + dialog = engine_constants_northeast, "Oddfire Angles" + field = "Channel 2 angle", oddfire2, { engineType == 1 } + field = "Channel 3 angle", oddfire3, { engineType == 1 && nCylinders >= 3 } + field = "Channel 4 angle", oddfire4, { engineType == 1 && nCylinders >= 4 } + + dialog = engine_constants_east, "" + panel = engine_constants_northeast, North + field = "", South + + dialog = engine_constants, "", border + panel = engine_constants_west, West + panel = engine_constants_east, East dialog = flexFueling, "Flex Fuel" field = "Flex sensor", flexEnabled