Allow for custom taco output pin

This commit is contained in:
Josh Stewart 2016-08-25 08:05:58 +10:00
parent a33548bc70
commit 2b0445b4b9
3 changed files with 11 additions and 4 deletions

View File

@ -162,7 +162,8 @@ struct config1 {
byte wueValues[10]; //Warm up enrichment array (10 bytes)
byte crankingPct; //Cranking enrichment
byte pinMapping; // The board / ping mapping to be used
byte unused16;
byte tachoPin : 6; //Custom pin setting for tacho output
byte unused16 : 2;
byte tdePct; // TPS decelleration (%)
byte taeColdA;
byte tpsThresh;

View File

@ -139,7 +139,8 @@ page = 2
wueRates = array, U08, 4, [10], "%", 1.0, 0.0, 0.0, 255, 0
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",
unused16 = scalar, U08, 16, "ms", 0.1, 0.0, 0.0, 25.5, 1
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"
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
@ -577,6 +578,8 @@ page = 8
subMenu = std_separator
subMenu = vvtSettings, "VVT Control"
subMenu = vvtTbl, "VVT duty cycle", 8, { vvtEnabled }
subMenu = std_separator
subMenu = tacho, "Tacho Output"
@ -682,6 +685,9 @@ page = 8
dialog = flexFueling, "Flex Fuel"
field = "Flex sensor", flexEnabled
dialog = tacho, "Tacho"
field = "Output pin", tachoPin
dialog = accelEnrichments_center, ""
field = "TPSdot Threshold", tpsThresh
@ -1017,7 +1023,7 @@ page = 8
;topicHelp = "file://$getProjectsDirPath()/docs/Megasquirt3_TunerStudio_MS_Lite_Reference-1.3.pdf#wue"
columnLabel = "Coolant", "WUE %"
xAxis = -40, 210, 9
yAxis = 0, 500, 6
yAxis = 0, 240, 6
xBins = wueBins, coolant
yBins = wueRates
gauge = cltGauge

View File

@ -276,7 +276,7 @@ void setPinMapping(byte boardID)
//Setup any devices that are using selectable pins
if(configPage3.launchPin != 0) { pinLaunch = configPage3.launchPin; }
if(configPage2.ignBypassPin != 0) { pinIgnBypass = configPage2.ignBypassPin; }
if(configPage1.tachoPin != 0) { pinTachOut = configPage1.tachoPin; }
//Finally, set the relevant pin modes for outputs
pinMode(pinCoil1, OUTPUT);