accidentally fuelInjection logic

Author: Markus

main/include/maps.h

@@ -43,6 +43,25 @@ static const int oilSensorMap[23][2] PROGMEM {
 { 10000, -10  },
 { 15700, -20 }};
 
+//Fueling map for injectionControl
+static const int injectionMap[14][12] PROGMEM {
+{999,        0,   10,   20,   30,   40,   50,   60,   70,   80,   90,   100 },   //load & lambda combined
+//-----------------------------------------------------------------------
+{ 0,         23,   28,   33,   33,   38,   56,   86,   96,   96,   20,  10 },
+{ 1000,      23,   28,   33,   33,   38,   56,   86,   96,   96,   20,  10 },
+{ 1500,      23,   28,   33,   33,   38,   56,   86,   96,   96,   20,  10 },
+{ 2000,      23,   28,   33,   33,   38,   56,   86,   96,   96,   20,  10 },
+{ 2500,      20,   25,   30,   30,   35,   53,   83,   93,   93,   20,  10 },
+{ 3000,      15,   20,   25,   25,   30,   53,   80,   90,   90,   20,  10 },
+{ 3500,      10,   15,   20,   20,   28,   53,   80,   85,   85,   20,  10 },
+{ 4000,      10,   15,   20,   20,   28,   53,   80,   85,   85,   20,  10 },
+{ 4500,      10,   15,   20,   20,   27,   53,   80,   85,   85,   20,  10 },
+{ 5000,      10,   15,   20,   20,   27,   53,   80,   85,   85,   20,  10 },
+{ 5500,       9,   15,   20,   20,   27,   53,   80,   85,   85,   20,  10 },
+{ 6000,       9,   15,   20,   20,   27,   53,   80,   85,   85,   20,  10 },
+{ 6500,       9,   15,   20,   20,   27,   53,   80,   85,   85,   20,  10 }};
+//RPM
+
 //Automatic mode autoGear map
 static const int gearMap[14][12] PROGMEM  {
 {255,        0,   10,   20,   30,   40,   50,   60,   70,   80,   90,   100 },   //throttle position %

main/include/pins.h

@@ -12,7 +12,7 @@
 #define TEENSY // we're running this on TEENSY
 
 
-#define y3 16 // FMT3, orange<->brown/red // DOUT3
+#define y3 16 // FMT3, orange<->brown/red // DOUT3, I need to use 16 as testing instead of 36.
 #define y4 35 // orange <-> brown/grey // DOUT2
 #define y5 8 //ex 14, orange <-> brown/black // DOUT1
 #define mpc 38 // red <-> brown/pink // DOUT5 // FMT3
@@ -25,6 +25,8 @@
 #define hornPin 12 // Horn
 #define SPIcs 10
 // END OUTPUT PINS
+#define injectionPin 36 // should be 16.
+
 
 // INPUT PINS
 // Stick input
@@ -59,3 +61,6 @@
 #define batteryPin A21 // car battery monitor
 #define refPin A22 // sensor voltage ref ?
 //#define refPin A13 // using this in exhaustTempPin for now.
+
+#define exhaustTemperatureCS 9
+#define displayCS 10

main/include/sensors.h

@@ -2,7 +2,7 @@
 
 struct SensorVals
 {
-    int curOilTemp, curExTemp, curBoost, curExPres, curAtfTemp, curRPM, curBoostLim, curEvalGear, curBattery, fuelUsed, fuelUsedAvg;
+    int curOilTemp, curExTemp, curBoost, curExPres, curAtfTemp, curRPM, curBoostLim, curEvalGear, curBattery, fuelUsed, fuelUsedAvg, curLambda;
     byte curTps, curLoad, curSpeed;
     float curSlip, curRatio, curPresDiff;
 };
@@ -18,6 +18,7 @@ int speedRead();
 int tpsRead();
 void tpsInit(int action);
 int rpmRead();
+int lambdaRead();
 int boostRead();
 int exhaustPressureRead();
 int exhaustTempRead();

main/input.cpp

@@ -298,7 +298,9 @@ void polltrans(Task *me)
     if (tpsSensor)
     {
       shiftDelay = readPercentualMap(shiftTimeMap, spcPercentVal, sensor.curAtfTemp);
-    } else {
+    }
+    else
+    {
       shiftDelay = 800;
     }
     shiftDuration = millis() - shiftStartTime;
@@ -551,6 +553,25 @@ int adaptSPC(int mapId, int xVal, int yVal)
   return current;
 }
 
+void injectionControl(Task *me)
+{
+  struct SensorVals sensor = readSensors();
+  int fuelRequire = sensor.curLoad / sensor.curLambda; // eg. 100% load / 100% lambda = 1x fueling, 100% load / 10% lambda = 10x fueling
+  int fuelAmount = readMap(injectionMap, fuelRequire, sensor.curRPM);
+  fuelAmount = fuelAmount * 2.55;
+  analogWrite(injectionPin, fuelAmount);
+
+  if (debugEnabled)
+  {
+    Serial.print("Fueling quantity with load/lambda: ")
+    Serial.print(sensor.curLoad);
+    Serial.print("/");
+    Serial.print(sensor.curLambda);
+    Serial.print(" is ");
+    Serial.print(fuelAmount);
+  }
+}
+
 void radioControl()
 {
   static byte readData;

main/main.ino

@@ -49,6 +49,9 @@ Task pollFuelControl(1000, fuelControl);  // 1000ms for fuel pump control
 Task pollBoostControl(100, boostControl); // 100ms for boost control*/
 Task pollFaultMon(10, faultMon);          // 10ms Fault monitor
 Task pollSerialWatch(100, serialWatch);
+#ifdef ECU
+Task pollInjectionControl(100, injectionControl);
+#endif
 
 void setup()
 {
@@ -192,4 +195,7 @@ void setup()
   SoftTimer.add(&pollFuelControl);
   SoftTimer.add(&pollBoostControl);
   SoftTimer.add(&pollSerialWatch);
+  #ifdef ECU
+  SoftTimer.add(&pollInjectionControl);
+  #endif
 }

main/sensors.cpp

@@ -286,6 +286,12 @@ int rpmRead()
   return rpmRevs;
 }
 
+int lambdaRead() {
+  // placeholder, most likely analogread if there is enough resolution
+
+  return 100;
+
+}
 int oilRead()
 {
   // wip
@@ -482,8 +488,7 @@ int exhaustTempRead()
   static double exhaustTemp = 0;
   if (exhaustTempSensor)
   {
-   
-    exhaustTemp = kTC.readInternal();
+        exhaustTemp = kTC.readInternal();
   }
   return exhaustTemp;
 }
@@ -521,5 +526,6 @@ struct SensorVals readSensors()
   sensor.curEvalGear = evalGearVal;
   sensor.fuelUsed = fuelUsed;
   sensor.fuelUsedAvg = fuelUsedAvg;
+  sensor.curLambda = lambdaRead();
   return sensor;
 }

main/serial_config.cpp

@@ -148,21 +148,23 @@ void initConfig()
         for (int i = 0; i < sizeof features / sizeof features[0]; i++)
         {
             asset = features[i] * 10;
-            byte configVal = EEPROM.read(asset);
-            setFeatures(features[i], configVal);
+            byte featureVal;
+            EEPROM.get(asset, featureVal);
+            setFeatures(features[i], featureVal);
         }
         for (int i = 0; i < sizeof config / sizeof config[0]; i++)
         {
             asset = config[i] * 10;
-            int configVal = EEPROM.read(asset);
+            int configVal;
+            EEPROM.get(asset, configVal);
             setConfig(config[i], configVal);
         }
         for (int i = 0; i < sizeof configF / sizeof configF[0]; i++)
         {
             asset = configF[i] * 10;
-            float configVal;
-            EEPROM.get(asset, configVal);
-            setConfigFloat(configF[i], configVal);
+            float configFVal;
+            EEPROM.get(asset, configFVal);
+            setConfigFloat(configF[i], configFVal);
         }
     }
 }

main/ui.cpp

@@ -420,11 +420,10 @@ void updateSpeedo()
 // Display update
 void updateDisplay(Task *me)
 {
-
   u8g2.clearBuffer();
   draw(wantedGear);
   u8g2.sendBuffer();
-
+  
   if (w124rpm)
   {
     rpmMeterUpdate();