formatting

Author: mkovero

main/calc.h

@@ -1,23 +1,26 @@
 
-#define LEN(arr) ((int) (sizeof (arr) / sizeof (arr)[0]))
+#define LEN(arr) ((int)(sizeof(arr) / sizeof(arr)[0]))
 
 // Calculation helpers
-int readTPSVoltage(int voltage) { 
-  int result = map(voltage,1760,2830,0,100);
+int readTPSVoltage(int voltage)
+{
+  int result = map(voltage, 1760, 2830, 0, 100);
   return result;
 }
 
-int readBoostVoltage(int voltage) { 
-  int result = map(voltage,1500,4000,0,100);
+int readBoostVoltage(int voltage)
+{
+  int result = map(voltage, 1500, 4000, 0, 100);
   return result;
 }
 
 //function to read 2d maps
-int readMap(const int theMap[14][12], int x, int y) {
+int readMap(const int theMap[14][12], int x, int y)
+{
   int xidx = 0; // by default near first element
   int xelements = LEN(theMap[0]);
 
-  int distance = abs(pgm_read_byte_near(&theMap[0][xidx]) - x); 
+  int distance = abs(pgm_read_byte_near(&theMap[0][xidx]) - x);
   for (int i = 1; i < xelements; i++)
   {
     int d = abs(pgm_read_byte_near(&theMap[0][i]) - x);
@@ -30,7 +33,7 @@ int readMap(const int theMap[14][12], int x, int y) {
   int yidx = 0; // by default near first element
   int yelements = LEN(*theMap);
 
-  distance = abs(pgm_read_byte_near(&theMap[yidx][0]) - y); 
+  distance = abs(pgm_read_byte_near(&theMap[yidx][0]) - y);
   for (int i = 1; i < yelements; i++)
   {
     int d = abs(pgm_read_byte_near(&theMap[i][0]) - y);
@@ -46,11 +49,12 @@ int readMap(const int theMap[14][12], int x, int y) {
 }
 
 //function to read 2d maps
-int readMapMem(const int theMap[14][12], int x, int y) {
+int readMapMem(const int theMap[14][12], int x, int y)
+{
   int xidx = 0; // by default near first element
   int xelements = LEN(theMap[0]);
 
-  int distance = abs(theMap[0][xidx] - x); 
+  int distance = abs(theMap[0][xidx] - x);
   for (int i = 1; i < xelements; i++)
   {
     int d = abs(theMap[0][i] - x);
@@ -63,7 +67,7 @@ int readMapMem(const int theMap[14][12], int x, int y) {
   int yidx = 0; // by default near first element
   int yelements = LEN(*theMap);
 
-  distance = abs(theMap[yidx][0] - y); 
+  distance = abs(theMap[yidx][0] - y);
   for (int i = 1; i < yelements; i++)
   {
     int d = abs(theMap[i][0] - y);

main/config.h

@@ -2,26 +2,24 @@
 
 // OUTPUT PINS
 // SPI display setup
-#define OLED_MOSI  11   //D1
-#define OLED_CLK   13   //D0
-#define OLED_DC    6
-#define OLED_CS    7
+#define OLED_MOSI 11 //D1
+#define OLED_CLK 13  //D0
+#define OLED_DC 6
+#define OLED_CS 7
 #define OLED_RESET 8
 
 // Solenoid output pins
 #define y3 47
 #define y4 45
 #define y5 46
-// #define mpc 44
 #define mpc 9
-// #define spc 43
 #define spc 10
 #define tcc 42
 #define rpmMeter 12
 // END OUTPUT PINS
 
 // INPUT PINS
-// Stick input 
+// Stick input
 #define whitepin 27
 #define bluepin 29
 #define greenpin 26
@@ -45,11 +43,11 @@
 // END INPUT PINS
 
 // Internals, states
-int gear = 2; // Start on gear 2
+int gear = 2;          // Start on gear 2
 int wantedGear = gear; // Gear that is requested
-int newGear = 2; // Gear that is going to be changed
-int prevgear = 1; // Previously changed gear
-int cSolenoid = 0; // Change solenoid pin to be controlled.
+int newGear = 2;       // Gear that is going to be changed
+int prevgear = 1;      // Previously changed gear
+int cSolenoid = 0;     // Change solenoid pin to be controlled.
 int vehicleSpeed = 100;
 unsigned long lastSensorTime = 0;
 int spcSetVal = 255;
@@ -62,8 +60,8 @@ int n3Speed = 0;
 extern unsigned int __bss_end;
 extern unsigned int __heap_start;
 extern void *__brkval;
-const int atfSensorFilterWeight = 16;  // higher numbers = heavier filtering
-const int atfSensorNumReadings = 10;   // number of readings
+const int atfSensorFilterWeight = 16; // higher numbers = heavier filtering
+const int atfSensorNumReadings = 10;  // number of readings
 int atfSensorAverage = 0;             // the  running average
 
 // End of internals
@@ -106,9 +104,8 @@ boolean health = false;
 boolean debugEnabled = true;
 
 // Full automatic mode
-boolean fullAuto = true; 
+boolean fullAuto = true;
 
 boolean drive = false;
 
-
 // End of environment conf