From b67ae45b6910f4662187997001c0f9d054579b8a Mon Sep 17 00:00:00 2001 From: Josh Stewart Date: Wed, 25 Oct 2017 20:55:46 +1100 Subject: [PATCH] Added NO2C pin mapping Closes #106 --- reference/speeduino.ini | 2 +- speeduino/utils.ino | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/reference/speeduino.ini b/reference/speeduino.ini index ab9b382f..a9f824e1 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -164,7 +164,7 @@ page = 2 aseCount = scalar, U08, 3, "s", 1.0, 0.0, 0.0, 255, 0 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", "NA6 MX5 PNP", "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" + pinLayout = bits, U08, 15, [0:7], "Speeduino v0.1", "Speeduino v0.2", "Speeduino v0.3", "Speeduino v0.4", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NA6 MX5 PNP", "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", "NO2C", "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" tachoDiv = bits, U08, 16, [6:7], "Normal", "Half", "INVALID", "INVALID" unused2-17 = scalar, U08, 17, "ms", 0.1, 0.0, 0.0, 25.5, 1 diff --git a/speeduino/utils.ino b/speeduino/utils.ino index 5cfbab79..00e92437 100644 --- a/speeduino/utils.ino +++ b/speeduino/utils.ino @@ -407,6 +407,46 @@ void setPinMapping(byte boardID) pinFan = 47; //Pin for the fan output break; + case 40: + //Pin mappings as per the NO2C shield + pinInjector1 = 8; //Output pin injector 1 is on + pinInjector2 = 9; //Output pin injector 2 is on + pinInjector3 = 11; //Output pin injector 3 is on - NOT USED + pinInjector4 = 12; //Output pin injector 4 is on - NOT USED + pinInjector5 = 13; //Placeholder only - NOT USED + pinCoil1 = 23; //Pin for coil 1 + pinCoil2 = 22; //Pin for coil 2 + pinCoil3 = 2; //Pin for coil 3 - ONLY WITH DB2 + pinCoil4 = 3; //Pin for coil 4 - ONLY WITH DB2 + pinCoil5 = 46; //Placeholder only - NOT USED + pinTrigger = 19; //The CAS pin + pinTrigger2 = 18; //The Cam Sensor pin + pinTPS = A3; //TPS input pin + pinMAP = A0; //MAP sensor pin + pinIAT = A5; //IAT sensor pin + pinCLT = A4; //CLT sensor pin + pinO2 = A2; //O2 sensor pin + pinBat = A1; //Battery reference voltage pin + pinBaro = A6; //Baro sensor pin - ONLY WITH DB + pinSpareTemp1 = A7; //spare Analog input 1 - ONLY WITH DB + pinDisplayReset = 48; // OLED reset pin - NOT USED + pinTachOut = 38; //Tacho output pin + pinIdle1 = 5; //Single wire idle control + pinIdle2 = 47; //2 wire idle control - NOT USED + pinBoost = 7; //Boost control + pinVVT_1 = 6; //Default VVT output + pinFuelPump = 4; //Fuel pump output + pinStepperDir = 25; //Direction pin for DRV8825 driver + pinStepperStep = 24; //Step pin for DRV8825 driver + pinStepperEnable = 27; //Enable pin for DRV8825 driver + pinLaunch = 10; //Can be overwritten below + pinFlex = 20; // Flex sensor (Must be external interrupt enabled) - ONLY WITH DB + pinFan = 30; //Pin for the fan output - ONLY WITH DB + pinSpareLOut1 = 32; //low current output spare1 - ONLY WITH DB + pinSpareLOut2 = 34; //low current output spare2 - ONLY WITH DB + pinSpareLOut3 = 36; //low current output spare3 - ONLY WITH DB + break; + default: //Pin mappings as per the v0.2 shield pinInjector1 = 8; //Output pin injector 1 is on