Boards: MISRA fixes (speeduino#1340)

Author: adbancroft

speeduino/board_avr2560.cpp

@@ -107,19 +107,21 @@ uint16_t freeRam(void)
     int currentVal;
     uint16_t v;
 
-    if(__brkval == 0) { currentVal = (int) &__heap_start; }
-    else { currentVal = (int) __brkval; }
+    if(__brkval == NULL) { 
+      currentVal = (int) &__heap_start;
+    } else { 
+      currentVal = (int) __brkval; 
+    }
 
     //Old version:
     //return (uint16_t) &v - (__brkval == 0 ? (int) &__heap_start : (int) __brkval);
-    /* cppcheck-suppress misra-c2012-11.4 ; DEVIATION(D3) */
-    return (uint16_t) &v - currentVal; //cppcheck-suppress misra-c2012-11.4
+    return (uint16_t) &v - currentVal; // cppcheck-suppress [misra-c2012-11.4, misra-c2012-10.4]
 }
 
 void doSystemReset(void) { return; }
 void jumpToBootloader(void) { return; }
 
-uint8_t getSystemTemp()
+uint8_t getSystemTemp(void)
 {
   //AVR2560 has no internal temperature monitoring, just return 0. 
   return 0;

speeduino/board_same51.h

@@ -140,9 +140,9 @@ static inline void IGN8_TIMER_DISABLE(void) { TCC2->INTENSET.bit.MC1 = 0x0; }
 
 #define MAX_TIMER_PERIOD 139808 // 2.13333333uS * 65535
 #define MAX_TIMER_PERIOD_SLOW 139808
-#define uS_TO_TIMER_COMPARE(uS) ((uS * 15) >> 5) //Converts a given number of uS into the required number of timer ticks until that time has passed.
+#define uS_TO_TIMER_COMPARE(uS) (((uS) * 15) >> 5) //Converts a given number of uS into the required number of timer ticks until that time has passed.
 //Hack compatibility with AVR timers that run at different speeds
-#define uS_TO_TIMER_COMPARE_SLOW(uS) ((uS * 15) >> 5)
+#define uS_TO_TIMER_COMPARE_SLOW(uS) (((uS) * 15) >> 5)
 
 /*
 ***********************************************************************************************************

speeduino/board_stm32_official.cpp

@@ -389,7 +389,7 @@ STM32RTC& rtc = STM32RTC::getInstance();
   #endif
   #endif //End core<=1.8
 
-uint8_t getSystemTemp()
+uint8_t getSystemTemp(void)
 {
   //stm32F4xx does have an internal temperature sensor, but needs to be implemented
   return 0;

speeduino/board_stm32_official.h

@@ -47,7 +47,7 @@
 //#define FRAM_AS_EEPROM /*Use FRAM like FM25xxx, MB85RSxxx or any SPI compatible */
 
 #ifndef word
-  #define word(h, l) ((h << 8) | l) //word() function not defined for this platform in the main library
+  #define word(h, l) (((h) << 8) | (l)) //word() function not defined for this platform in the main library
 #endif  
 
 #if defined(ARDUINO_BLUEPILL_F103C8) || defined(ARDUINO_BLUEPILL_F103CB) \

speeduino/board_teensy35.cpp

@@ -9,15 +9,14 @@
 #include <InternalTemperature.h>
 #include RTC_LIB_H
 
-/*
-  //These are declared locally in comms_CAN now due to this issue: https://github.com/tonton81/FlexCAN_T4/issues/67
-#if defined(__MK64FX512__)         // use for Teensy 3.5 only 
-  FlexCAN_T4<CAN0, RX_SIZE_256, TX_SIZE_16> Can0;
-#elif defined(__MK66FX1M0__)         // use for Teensy 3.6 only
-  FlexCAN_T4<CAN0, RX_SIZE_256, TX_SIZE_16> Can0;
-  FlexCAN_T4<CAN1, RX_SIZE_256, TX_SIZE_16> Can1; 
-#endif
-*/
+ //These are declared locally in comms_CAN now due to this issue: https://github.com/tonton81/FlexCAN_T4/issues/67
+// #if defined(__MK64FX512__)         // use for Teensy 3.5 only 
+//   FlexCAN_T4<CAN0, RX_SIZE_256, TX_SIZE_16> Can0;
+// #elif defined(__MK66FX1M0__)         // use for Teensy 3.6 only
+//   FlexCAN_T4<CAN0, RX_SIZE_256, TX_SIZE_16> Can0;
+//   FlexCAN_T4<CAN1, RX_SIZE_256, TX_SIZE_16> Can1; 
+// #endif
+
 
 void initBoard(uint32_t baudRate)
 {
@@ -423,7 +422,7 @@ static time_t getTeensy3Time()
 void doSystemReset() { return; }
 void jumpToBootloader() { return; }
 
-uint8_t getSystemTemp()
+uint8_t getSystemTemp(void)
 {
   return trunc(InternalTemperature.readTemperatureC());
 }

speeduino/board_teensy35.h

@@ -112,7 +112,7 @@ static inline void IGN7_TIMER_DISABLE(void)  {FTM3_C6SC &= ~FTM_CSC_CHIE;}
 static inline void IGN8_TIMER_DISABLE(void)  {FTM3_C7SC &= ~FTM_CSC_CHIE;}
 
 #define MAX_TIMER_PERIOD 139808UL // 2.13333333uS * 65535
-#define uS_TO_TIMER_COMPARE(uS) ((uS * 15) >> 5) //Converts a given number of uS into the required number of timer ticks until that time has passed.
+#define uS_TO_TIMER_COMPARE(uS) (((uS) * 15) >> 5) //Converts a given number of uS into the required number of timer ticks until that time has passed.
 
 /*
 ***********************************************************************************************************

speeduino/board_teensy41.cpp

@@ -26,7 +26,7 @@ static void serialBegin()
   {
     uint32_t elapsed = systick_millis_count - millis_begin;
     //Wait up to 100ms for this. 
-    if (elapsed > 100) break;
+    if (elapsed > 100) { break; }
     yield();
   }
 }
@@ -378,7 +378,7 @@ static void setPinHysteresis(uint8_t pin)
   *(p->mux) = 5 | 0x10;
 }
 
-uint8_t getSystemTemp()
+uint8_t getSystemTemp(void)
 {
   return trunc(InternalTemperature.readTemperatureC());
 }

speeduino/board_teensy41.h

@@ -121,23 +121,23 @@ static inline void IGN8_TIMER_DISABLE(void)  {TMR4_CSCTRL3 &= ~TMR_CSCTRL_TCF1EN
 #if F_CPU == 600000000  
   //Bus Clock is 150Mhz @ 600 Mhz CPU.
   #define MAX_TIMER_PERIOD 55923UL //Time per tick = 0.8533333
-  #define uS_TO_TIMER_COMPARE(uS) ((uS * 75UL) >> 6) //Converts a given number of uS into the required number of timer ticks until that time has passed. 
+  #define uS_TO_TIMER_COMPARE(uS) (((uS) * 75UL) >> 6) //Converts a given number of uS into the required number of timer ticks until that time has passed. 
 #elif F_CPU == 528000000
   //Bus Clock is 132Mhz @ 528 Mhz CPU.
   #define MAX_TIMER_PERIOD 63549UL //Time per tick = 0.96969696
-  #define uS_TO_TIMER_COMPARE(uS) ((uS * 66UL) >> 6) //Converts a given number of uS into the required number of timer ticks until that time has passed. 
+  #define uS_TO_TIMER_COMPARE(uS) (((uS) * 66UL) >> 6) //Converts a given number of uS into the required number of timer ticks until that time has passed. 
 #elif F_CPU == 450000000
   //Bus Clock is 150Mhz @ 450 Mhz CPU.
   #define MAX_TIMER_PERIOD 55923UL //Time per tick = 0.8533333
-  #define uS_TO_TIMER_COMPARE(uS) ((uS * 75UL) >> 6) //Converts a given number of uS into the required number of timer ticks until that time has passed. 
+  #define uS_TO_TIMER_COMPARE(uS) (((uS) * 75UL) >> 6) //Converts a given number of uS into the required number of timer ticks until that time has passed. 
 #elif F_CPU == 396000000
   //Bus Clock is 132Mhz @ 396 Mhz CPU.
   #define MAX_TIMER_PERIOD 63549UL //Time per tick = 0.96969696
-  #define uS_TO_TIMER_COMPARE(uS) ((uS * 66UL) >> 6) //Converts a given number of uS into the required number of timer ticks until that time has passed. 
+  #define uS_TO_TIMER_COMPARE(uS) (((uS) * 66UL) >> 6) //Converts a given number of uS into the required number of timer ticks until that time has passed. 
 #elif F_CPU == 150000000
   //Bus Clock is 75Mhz @ 150 Mhz CPU.
   #define MAX_TIMER_PERIOD 111846UL //Time per tick = 1.706666
-  #define uS_TO_TIMER_COMPARE(uS) ((uS * 75UL) >> 7) //Converts a given number of uS into the required number of timer ticks until that time has passed. 
+  #define uS_TO_TIMER_COMPARE(uS) (((uS) * 75UL) >> 7) //Converts a given number of uS into the required number of timer ticks until that time has passed. 
 #else
   #error Unsupported CPU frequency. 
 #endif