Fixes missed in last commit

comms.h

@@ -1,5 +1,4 @@
 #include <Serial.h>
-#include "globals.h"
 
 #define vePage    1
 #define ignPage   2

comms.ino

@@ -112,8 +112,8 @@ void sendPage()
       case vePage:
         //Need to perform a translation of the values[MAP/TPS][RPM] into the MS expected format
         for(byte x=0;x<64;x++) { response[x] = fuelTable.values[7-x/8][x%8]; }
-        for(byte x=64;x<72;x++) { response[x] = fuelTable.axisX[(x-100)] / 100; } //RPM Bins for VE table
-        for(byte y=72;y<80;y++) { response[y] = fuelTable.axisY[7-(y-108)]; } //MAP or TPS bins for VE table 
+        for(byte x=64;x<72;x++) { response[x] = fuelTable.axisX[(x-64)] / 100; } //RPM Bins for VE table
+        for(byte y=72;y<80;y++) { response[y] = fuelTable.axisY[7-(y-72)]; } //MAP or TPS bins for VE table 
         response[80] = 0;
         response[81] = 0;
         response[82] = 0;
@@ -131,7 +131,7 @@ void sendPage()
         response[103] = 0;
         response[104] = 0;
         response[105] = 0;
-        response[106] = (byte)req_fuel;
+        response[106] = config1.reqFuel;
         response[107] = 0;
         response[108] = 0;
         response[109] = 0;
@@ -140,7 +140,7 @@ void sendPage()
         response[112] = 0;
         response[113] = 0;
         response[114] = 0; //rpmk (16 bits)
-        response[116] = ((engineCylinders-1) * 16) + (1 * 8) + ((engineStrokes / 4) * 4) + 2; // (engineCylinders * 16) + (1 * 8) + ((engineStrokes / 4) * 4) + 4
+        response[116] = ((config1.nCylinders-1) * 16) + (1 * 8) + ((config1.strokes / 4) * 4) + 2; // (engineCylinders * 16) + (1 * 8) + ((engineStrokes / 4) * 4) + 4
         response[117] = 0;
         response[118] = 0;
         response[119] = 0;
@@ -158,7 +158,7 @@ void sendPage()
         for(byte x=0;x<64;x++) { response[x] = ignitionTable.values[7-x/8][x%8]; }
         for(byte x=64;x<72;x++) { response[x] = ignitionTable.axisX[(x-64)] / 100; }
         for(byte y=72;y<80;y++) { response[y] = ignitionTable.axisY[7-(y-72)]; }
-        response[80] = triggerAngle;
+        response[80] = config2.triggerAngle;
         response[81] = 0;
         response[82] = 0;
         response[83] = 0;

globals.h

@@ -55,7 +55,7 @@ struct config1 {
   int rpmk;
 
   byte mapType;
-  byte twoStroke;
+  byte strokes;
   byte injType;
   byte nCylinders;
   byte cltType;
@@ -77,7 +77,7 @@ struct config1 {
 //This mostly covers off variables that are required for ignition
 struct config2 {
   
-  byte trigerAngle;
+  byte triggerAngle;
   byte FixAng;
   byte Trim;
   byte CrankAng;
@@ -93,9 +93,9 @@ struct config2 {
   byte IdleDelayTime;
   byte StgCycles;
 
-  byte dwellcont; //Fixed duty dwell control
-  byte dwellcrank;
-  byte dwellrun;
+  byte dwellCont; //Fixed duty dwell control
+  byte dwellCrank;
+  byte dwellRun;
   
   byte triggerTeeth; //The full count of teeth on the trigger wheel if there were no gaps
   byte triggerMissingTeeth; //The size of the tooth gap (ie number of missing teeth)

kartduino.ino

@@ -23,20 +23,23 @@ Need to calculate the req_fuel figure here, preferably in pre-processor macro
 #include "table.h"
 #include "testing.h"
 #include "scheduler.h"
+#include "globals.h"
 #include "comms.h"
 
 #include "fastAnalog.h"
 #include "digitalIOPerformance.h"
 
 //NEED TO LOAD FROM EEPROM HERE
+struct config1 config1;
+struct config2 config2;
 
 //float req_fuel = ((engineCapacity / engineInjectorSize) / engineCylinders / engineStoich) * 100; // This doesn't seem quite correct, but I can't find why. It will be close enough to start an engine
-int req_fuel_uS = config1.req_fuel * 1000; //Convert to uS and an int. This is the only variable to be used in calculations
+int req_fuel_uS = config1.reqFuel * 1000; //Convert to uS and an int. This is the only variable to be used in calculations
 
 // Setup section
 // These aren't really configuration options, more so a description of how the hardware is setup. These are things that will be defined in the recommended hardware setup
-int triggerActualTeeth = triggerTeeth - triggerMissingTeeth; //The number of physical teeth on the wheel. Doing this here saves us a calculation each time in the interrupt
-int triggerToothAngle = 360 / triggerTeeth; //The number of degrees that passes from tooth to tooth
+int triggerActualTeeth = config2.triggerTeeth - config2.triggerMissingTeeth; //The number of physical teeth on the wheel. Doing this here saves us a calculation each time in the interrupt
+int triggerToothAngle = 360 / config2.triggerTeeth; //The number of degrees that passes from tooth to tooth
 
 volatile int toothCurrentCount = 0; //The current number of teeth (Onec sync has been achieved, this can never actually be 0
 volatile unsigned long toothLastToothTime = 0; //The time (micros()) that the last tooth was registered
@@ -45,8 +48,8 @@ volatile unsigned long toothLastMinusOneToothTime = 0; //The time (micros()) tha
 struct table fuelTable;
 struct table ignitionTable;
 
-unsigned long injectTime[engineCylinders]; //The system time in uS that each injector needs to next fire at
-boolean intjectorNeedsFire[engineCylinders]; //Whether each injector needs to fire or not
+//unsigned long injectTime[(int)config1.nCylinders]; //The system time in uS that each injector needs to next fire at
+//boolean intjectorNeedsFire[config1.nCylinders]; //Whether each injector needs to fire or not
 
 unsigned long counter;
 unsigned long scheduleStart;
@@ -132,7 +135,7 @@ void loop()
       //Calculate the RPM based on the time between the last 2 teeth. I have no idea whether this will be accurate AT ALL, but it's fairly efficient and means there doesn't need to be another variable placed into the trigger interrupt
       if (toothCurrentCount != 1) //We can't perform the RPM calculation if we're at the first tooth as the timing would be double (Well, we can, but it would need a different calculation and I don't think it's worth it, just use the last RPM value)
       {
-        long revolutionTime = (triggerTeeth * (toothLastToothTime - toothLastMinusOneToothTime)); //The time in uS that one revolution would take at current speed
+        long revolutionTime = (config2.triggerTeeth * (toothLastToothTime - toothLastMinusOneToothTime)); //The time in uS that one revolution would take at current speed
         currentStatus.RPM = US_IN_MINUTE / revolutionTime;
       }
       //Get the current MAP value
@@ -149,7 +152,7 @@ void loop()
       int ignitionAdvance = getTableValue(ignitionTable, currentStatus.MAP, currentStatus.RPM);
       
       //Determine the current crank angle
-      int crankAngle = (toothCurrentCount - 1) * triggerToothAngle + triggerAngle; //Number of teeth that have passed since tooth 1, multiplied by the angle each tooth represents, plus the angle that tooth 1 is from TDC
+      int crankAngle = (toothCurrentCount - 1) * triggerToothAngle + config2.triggerAngle; //Number of teeth that have passed since tooth 1, multiplied by the angle each tooth represents, plus the angle that tooth 1 is from TDC
       if (crankAngle > 360) { crankAngle -= 360; } //Not sure if this is actually required
       
       //Serial.print("Crank angle: "); Serial.println(crankAngle);
@@ -180,7 +183,7 @@ void loop()
       { 
         setSchedule2(beginCoilCharge, 
                   (ignitionStartAngle - crankAngle) * timePerDegree,
-                  engineDwell,
+                  config2.dwellRun,
                   endCoilCharge
                   );
       }

storage.ino

@@ -1,2 +1,10 @@
 
 
+void writeConfig();
+void writeTables();
+
+void loadConfig()
+{
+     
+}
+void loadTables();