Cleanup a bunch of errors and warnings for stm32

platformio.ini

@@ -46,6 +46,13 @@ lib_deps = EEPROM
 ;build_flags = -fpermissive -std=gnu++11 -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,-Map,output.map
 build_flags = -fpermissive -std=gnu++11 -Os
 
+;Support for the stm32f407 doesn't look ready in platformio yet
+;[env:genericSTM32F407VE]
+;platform = https://github.com/maichaell/platform-ststm32
+;framework = arduino
+;board = disco_f407vg
+;lib_deps = EEPROM
+;build_flags = -fpermissive -std=gnu++11 -DUSE_STM32GENERIC -DMENU_USB_SERIAL
 
 [platformio]
 src_dir=speeduino

speeduino/comms.h

@@ -32,14 +32,14 @@ byte tsCanId = 0;     // current tscanid requested
 const char pageTitles[] PROGMEM //This is being stored in the avr flash instead of SRAM which there is not very much of
   {
    "\nVE Map\0"//This is an alternative to using a 2D array which would waste space because of the different lengths of the strings
-   "\nPg 1 Config\0"//The configuration page titles' indexes are found by counting the chars
-   "\nIgnition Map\0"//The map page titles' indexes are put into a var called currentTitleIndex. That represents the first char of each string.
-   "\nPg 2 Config\0"
-   "\nAFR Map\0"
-   "\nPg 3 Config\0"
-   "\nPg 4 Config\0"
-   "\nBoost Map\0"
-   "\nVVT Map\0"//No need to put a trailing null because it's the last string and the compliler does it for you.
+   "\nPg 1 Config\0"// 21-The configuration page titles' indexes are found by counting the chars
+   "\nIgnition Map\0"//35-The map page titles' indexes are put into a var called currentTitleIndex. That represents the first char of each string.
+   "\nPg 2 Config\0" //48
+   "\nAFR Map\0" //56
+   "\nPg 3 Config\0" //69
+   "\nPg 4 Config\0" //82
+   "\nBoost Map\0" //93
+   "\nVVT Map\0"//102-No need to put a trailing null because it's the last string and the compliler does it for you.
    "\nPg 10 Config"
   };
 

speeduino/comms.ino

@@ -995,7 +995,7 @@ void sendPage(bool useChar)
         if (useChar)
         {
           //To Display Values from Config Page 10
-          Serial.println((const __FlashStringHelper *)&pageTitles[141]);//special typecasting to enable suroutine that the F macro uses
+          Serial.println((const __FlashStringHelper *)&pageTitles[103]);//special typecasting to enable suroutine that the F macro uses
           for (pnt_configPage = &configPage9; pnt_configPage < ((byte *)pnt_configPage + 128); pnt_configPage = (byte *)pnt_configPage + 1)
           {
             Serial.println(*((byte *)pnt_configPage));// Displaying byte values of config page 3 up to but not including the first array

speeduino/globals.h

@@ -4,8 +4,8 @@
 #include "table.h"
 
 //These are configuration options for changing around the outputs that are used
-#define INJ_CHANNELS 5
-#define IGN_CHANNELS 4
+#define INJ_CHANNELS 4
+#define IGN_CHANNELS 5
 
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega2561__)
   #define BOARD_DIGITAL_GPIO_PINS 54
@@ -17,8 +17,10 @@
   #define BOARD_NR_GPIO_PINS 34
 #elif defined(STM32_MCU_SERIES) || defined(ARDUINO_ARCH_STM32) || defined(__STM32F1__) || defined(STM32F4) || defined(STM32)
   #define CORE_STM32
+  #define word(h, l) ((h << 8) | l) //word() function not defined for this platform in the main library
   #if defined (STM32F1) || defined(__STM32F1__)
     #define BOARD_DIGITAL_GPIO_PINS 34
+    #undef BOARD_NR_GPIO_PINS //This is declared as 49 in .../framework-arduinoststm32/STM32F1/variants/generic_stm32f103r8/board/board.h
     #define BOARD_NR_GPIO_PINS 34
     #define LED_BUILTIN 33
   #elif defined(ARDUINO_BLACK_F407VE) || defined(STM32F4)
@@ -38,8 +40,11 @@
     #define portOutputRegister(port) (volatile byte *)( &(port->ODR) )
     #define portInputRegister(port) (volatile byte *)( &(port->IDR) )
   #else //libmaple core aka STM32DUINO
-    #define portOutputRegister(port) (volatile byte *)( &(port->regs->ODR) ) //These are defined in STM32F1/variants/generic_stm32f103c/variant.h but return a non byte* value
-    #define portInputRegister(port) (volatile byte *)( &(port->regs->IDR) ) //These are defined in STM32F1/variants/generic_stm32f103c/variant.h but return a non byte* value
+    //These are defined in STM32F1/variants/generic_stm32f103c/variant.h but return a non byte* value
+    #undef portOutputRegister
+    #undef portInputRegister
+    #define portOutputRegister(port) (volatile byte *)( &(port->regs->ODR) )
+    #define portInputRegister(port) (volatile byte *)( &(port->regs->IDR) )
   #endif
 #else
   #error Incorrect board selected. Please select the correct board (Usually Mega 2560) and upload again

speeduino/scheduler.h

@@ -365,19 +365,43 @@ static inline void refreshIgnitionSchedule1(unsigned long timeToEnd) __attribute
   static inline void fuelSchedule2Interrupt();
   static inline void fuelSchedule3Interrupt();
   static inline void fuelSchedule4Interrupt();
+#if (INJ_CHANNELS >= 5)
   static inline void fuelSchedule5Interrupt();
+#endif
+#if (INJ_CHANNELS >= 6)
   static inline void fuelSchedule6Interrupt();
+#endif
+#if (INJ_CHANNELS >= 7)
   static inline void fuelSchedule7Interrupt();
+#endif
+#if (INJ_CHANNELS >= 8)
   static inline void fuelSchedule8Interrupt();
+#endif
+#if (IGN_CHANNELS >= 1)
   static inline void ignitionSchedule1Interrupt();
+#endif
+#if (IGN_CHANNELS >= 2)
   static inline void ignitionSchedule2Interrupt();
+#endif
+#if (IGN_CHANNELS >= 3)
   static inline void ignitionSchedule3Interrupt();
+#endif
+#if (IGN_CHANNELS >= 4)
   static inline void ignitionSchedule4Interrupt();
+#endif
+#if (IGN_CHANNELS >= 5)
   static inline void ignitionSchedule5Interrupt();
+#endif
+#if (IGN_CHANNELS >= 6)
   static inline void ignitionSchedule6Interrupt();
+#endif
+#if (IGN_CHANNELS >= 7)
   static inline void ignitionSchedule7Interrupt();
+#endif
+#if (IGN_CHANNELS >= 8)
   static inline void ignitionSchedule8Interrupt();
 #endif
+#endif
 
 enum ScheduleStatus {OFF, PENDING, STAGED, RUNNING}; //The 3 statuses that a schedule can have
 
@@ -415,6 +439,7 @@ Schedule fuelSchedule5;
 Schedule fuelSchedule6;
 Schedule fuelSchedule7;
 Schedule fuelSchedule8;
+
 Schedule ignitionSchedule1;
 Schedule ignitionSchedule2;
 Schedule ignitionSchedule3;

speeduino/scheduler.ino

@@ -200,11 +200,21 @@ void initialiseSchedulers()
   Timer2.attachInterrupt(3, fuelSchedule3Interrupt);
   Timer2.attachInterrupt(4, fuelSchedule4Interrupt);
 
+#if (IGN_CHANNELS >= 1)
   Timer3.attachInterrupt(1, ignitionSchedule1Interrupt);
+#endif
+#if (IGN_CHANNELS >= 2)
   Timer3.attachInterrupt(2, ignitionSchedule2Interrupt);
+#endif
+#if (IGN_CHANNELS >= 3)
   Timer3.attachInterrupt(3, ignitionSchedule3Interrupt);
+#endif
+#if (IGN_CHANNELS >= 4)
   Timer3.attachInterrupt(4, ignitionSchedule4Interrupt);
+#endif
+#if (IGN_CHANNELS >= 5)
   Timer1.attachInterrupt(1, ignitionSchedule5Interrupt);
+#endif
 
   Timer1.resume();
   Timer2.resume();

speeduino/speeduino.ino

@@ -911,7 +911,7 @@ void loop()
           {
            for (byte caninChan = 0; caninChan <16 ; caninChan++)
               {
-                currentStatus.current_caninchannel == caninChan;
+                currentStatus.current_caninchannel = caninChan;
                 if (BIT_CHECK(configPage9.caninput_sel,currentStatus.current_caninchannel))  //if current input channel is enabled
                   {
                     if (configPage9.enable_canbus == 1)  //can via secondary serial

speeduino/table.h

@@ -19,16 +19,16 @@ struct table2D {
   byte *values;
   byte *axisX;
 
-  int *values16;
-  int *axisX16;
+  int16_t *values16;
+  int16_t *axisX16;
 
   //Store the last X and Y coordinates in the table. This is used to make the next check faster
-  int lastXMax;
-  int lastXMin;
+  int16_t lastXMax;
+  int16_t lastXMin;
 
   //Store the last input and output for caching
-  int lastInput;
-  int lastOutput;
+  int16_t lastInput;
+  int16_t lastOutput;
 };
 
 void table2D_setSize(struct table2D targetTable, byte newSize);
@@ -41,8 +41,8 @@ struct table3D {
   byte ySize;
 
   byte **values;
-  int *axisX;
-  int *axisY;
+  int16_t *axisX;
+  int16_t *axisY;
 
   //Store the last X and Y coordinates in the table. This is used to make the next check faster
   byte lastXMax, lastXMin;

speeduino/table.ino

@@ -24,8 +24,8 @@ void table2D_setSize(struct table2D* targetTable, byte newSize)
     }
     else
     {
-      targetTable->values16 = (int *)realloc(targetTable->values16, newSize * sizeof(int));
-      targetTable->axisX16 = (int *)realloc(targetTable->axisX16, newSize * sizeof(int));
+      targetTable->values16 = (int16_t *)realloc(targetTable->values16, newSize * sizeof(int16_t));
+      targetTable->axisX16 = (int16_t *)realloc(targetTable->axisX16, newSize * sizeof(int16_t));
       targetTable->xSize = newSize;
     } //Byte or int
   } //initialisationComplete
@@ -39,8 +39,8 @@ void table3D_setSize(struct table3D *targetTable, byte newSize)
     targetTable->values = (byte **)malloc(newSize * sizeof(byte*));
     for(byte i = 0; i < newSize; i++) { targetTable->values[i] = (byte *)malloc(newSize * sizeof(byte)); }
 
-    targetTable->axisX = (int *)malloc(newSize * sizeof(int));
-    targetTable->axisY = (int *)malloc(newSize * sizeof(int));
+    targetTable->axisX = (int16_t *)malloc(newSize * sizeof(int16_t));
+    targetTable->axisY = (int16_t *)malloc(newSize * sizeof(int16_t));
     targetTable->xSize = newSize;
     targetTable->ySize = newSize;
   } //initialisationComplete