started adaptation code

Author: mkovero

.DS_Store

@@ -1,5 +1,6 @@
 {
     "sketch": "main.ino",
     "board": "arduino:avr:mega",
-    "configuration": "cpu=atmega2560"
+    "configuration": "cpu=atmega2560",
+    "port": "/dev/cu.usbmodem1411"
 }

main/.DS_Store

@@ -2,6 +2,7 @@
 
 // Macro for sizeof for better support with 2d arrays.
 #define LEN(arr) ((int)(sizeof(arr) / sizeof(arr)[0]))
+int lastXval, lastYval;
 
 // Calculation helpers
 
@@ -50,7 +51,8 @@ int readMap(const int theMap[14][12], int x, int y)
       distance = d;
     }
   }
-
+  lastXval = xidx;
+  lastYval = yidx;
   int mapValue = pgm_read_byte_near(&theMap[yidx][xidx]);
   return mapValue;
 }

main/.vscode/arduino.json

@@ -26,6 +26,7 @@ unsigned long int shiftDuration = 0;
 // Solenoid used
 int cSolenoidEnabled = 0;
 int cSolenoid = 0; // Change solenoid pin to be controlled.
+int lastMapVal;
 
 // Gear shift logic
 // Beginning of gear change phase
@@ -41,6 +42,15 @@ void switchGearStart(int cSolenoid, int spcVal, int mpcVal)
     Serial.print(gear);
     Serial.print("-");
     Serial.println(cSolenoid);
+    Serial.println("switchGearStop: lastMapXY");
+    Serial.print("spcMap");
+    Serial.print(lastMapVal);
+    Serial.print("[");
+    Serial.print(lastXval);
+    Serial.print("]");
+    Serial.print("[");
+    Serial.print(lastYval);
+    Serial.print("]");
   }
   if (trans)
   {
@@ -133,6 +143,7 @@ void gearchangeUp(int newGear)
     }
     if (sensors)
     {
+      lastMapVal = 12;
       switchGearStart(y3, readMap(spcMap12, trueLoad, atfTemp), readMap(mpcMap12, trueLoad, atfTemp));
     }
     break;
@@ -150,6 +161,7 @@ void gearchangeUp(int newGear)
     }
     if (sensors)
     {
+      lastMapVal = 23;
       switchGearStart(y4, readMap(spcMap23, trueLoad, atfTemp), readMap(mpcMap23, trueLoad, atfTemp));
     }
     break;
@@ -167,6 +179,7 @@ void gearchangeUp(int newGear)
     }
     if (sensors)
     {
+      lastMapVal = 34;
       switchGearStart(y5, readMap(spcMap34, trueLoad, atfTemp), readMap(mpcMap34, trueLoad, atfTemp));
     }
     break;
@@ -184,6 +197,7 @@ void gearchangeUp(int newGear)
     }
     if (sensors)
     {
+      lastMapVal = 45;
       switchGearStart(y3, readMap(spcMap45, trueLoad, atfTemp), readMap(mpcMap45, trueLoad, atfTemp));
     }
     break;
@@ -227,6 +241,7 @@ void gearchangeDown(int newGear)
     }
     if (sensors)
     {
+      lastMapVal = 21;
       switchGearStart(y3, readMap(spcMap21, trueLoad, atfTemp), readMap(mpcMap21, trueLoad, atfTemp));
     }
     break;
@@ -244,6 +259,7 @@ void gearchangeDown(int newGear)
     }
     if (sensors)
     {
+      lastMapVal = 32;
       switchGearStart(y4, readMap(spcMap32, trueLoad, atfTemp), readMap(mpcMap32, trueLoad, atfTemp));
     }
     break;
@@ -261,6 +277,7 @@ void gearchangeDown(int newGear)
     }
     if (sensors)
     {
+      lastMapVal = 43;
       switchGearStart(y5, readMap(spcMap43, trueLoad, atfTemp), readMap(mpcMap43, trueLoad, atfTemp));
     }
     break;
@@ -278,6 +295,7 @@ void gearchangeDown(int newGear)
     }
     if (sensors)
     {
+      lastMapVal = 54;
       switchGearStart(y3, readMap(spcMap54, trueLoad, atfTemp), readMap(mpcMap54, trueLoad, atfTemp));
     }
     break;
@@ -302,7 +320,7 @@ int decideGear(int wantedGear)
 
   if (!shiftBlocker && wantedGear < 6)
   {
-    if ((fullAuto && autoGear > gear && wantedGear > gear) || (!fullAuto && wantedGear > gear && autoGear > gear))
+    if (autoGear > gear && wantedGear > gear)
     {
       int newGear = moreGear;
       if (debugEnabled)

main/calc.cpp

@@ -21,6 +21,7 @@ extern int boostcount;
 extern unsigned long int shiftStartTime;
 extern unsigned long int shiftDuration;
 extern int cSolenoidEnabled;
+extern int lastMapVal,lastXval,lastYval;
 extern boolean incar;
 extern boolean stick;
 extern boolean manual;
@@ -33,4 +34,4 @@ extern boolean health;
 extern boolean debugEnabled;
 extern boolean fullAuto;
 extern boolean boostLimit;
-extern boolean drive;
+extern boolean drive;

main/core.cpp

@@ -169,15 +169,15 @@ void pollBoostControl()
       controlVal = 0;
     }
     analogWrite(boostCtrl, controlVal);
-    if (debugEnabled)
+    /*if (debugEnabled)
     {
       Serial.print("boostControl (allowedBoostPressure/bootSensor/controlVal):");
       Serial.print(allowedBoostPressure);
       Serial.print("-");
       Serial.print(boostSensor);
       Serial.print("-");
       Serial.print(controlVal);
-    }
+    }*/
   }
 }
 
@@ -236,13 +236,13 @@ void polltrans(int newGear, int wantedGear)
   if (!shiftBlocker)
   {
     analogWrite(mpc, mpcVal);
-     if (debugEnabled)
+   /*  if (debugEnabled)
     {
       Serial.print("polltrans: mpcVal/atfTemp");
       Serial.print(mpcVal);
       Serial.print("-");
       Serial.println(atfTemp);
-    }
+    }*/
   };
 }
 
@@ -287,4 +287,4 @@ int evaluateGear(float ratio)
   {
     return measuredGear;
   }
-}
+}

main/include/config.h

@@ -42,12 +42,12 @@ int tpsRead()
   }
   return tpsPercentValue;
 }
+
 // Interrupt for N2 hallmode sensor
 void N2SpeedInterrupt()
 {
   n2SpeedPulses++;
 }
-
 // Interrupt for N3 hallmode sensor
 void N3SpeedInterrupt()
 {
@@ -190,13 +190,16 @@ int atfRead()
       // http://home.earthlink.net/~david.schultz/rnd/2002/KalmanApogee.pdf
     }
   }
+  if ( atfSensorAverage < -40 ) { atfSensorAverage = -40; }
+  if ( atfSensorAverage > 120 ) { atfSensorAverage = 120; }
+  
   return atfSensorAverage;
 }
 
 int oilRead()
 {
   // wip
-  int oilTemp = 80;
+  int oilTemp = 100;
   return oilTemp;
 }