From 940446e7c989413a094ab5ed229484ea898a5c28 Mon Sep 17 00:00:00 2001
From: tx_haggis <13982343+adbancroft@users.noreply.github.com>
Date: Sat, 30 Nov 2024 16:59:19 -0600
Subject: [PATCH] MISRA fixes

---
 speeduino/globals.h    | 66 ++++++++++++++++++++----------------------
 speeduino/maths.cpp    |  2 +-
 speeduino/pw_calcs.cpp |  4 +--
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/speeduino/globals.h b/speeduino/globals.h
index e3b48bcbb5..71f130fe43 100644
--- a/speeduino/globals.h
+++ b/speeduino/globals.h
@@ -40,10 +40,10 @@
   #define CORE_AVR
   #define BOARD_H "board_avr2560.h"
   #ifndef INJ_CHANNELS
-    #define INJ_CHANNELS 4
+    #define INJ_CHANNELS 4U
   #endif
   #ifndef IGN_CHANNELS
-    #define IGN_CHANNELS 5
+    #define IGN_CHANNELS 5U
   #endif
 
   #if defined(__AVR_ATmega2561__)
@@ -116,8 +116,6 @@
 
 #define CRANK_ANGLE_MAX (max(CRANK_ANGLE_MAX_IGN, CRANK_ANGLE_MAX_INJ))
 
-#define interruptSafe(c) (noInterrupts(); {c} interrupts();) //Wraps any code between nointerrupt and interrupt calls
-
 #define MICROS_PER_SEC INT32_C(1000000)
 #define MICROS_PER_MIN INT32_C(MICROS_PER_SEC*60U)
 #define MICROS_PER_HOUR INT32_C(MICROS_PER_MIN*60U)
@@ -225,17 +223,17 @@ static_assert(TOOTH_LOG_SIZE<UINT8_MAX, "Check all uses of TOOTH_LOG_SIZE");
 #define COMPOSITE_LOG_SYNC 4
 #define COMPOSITE_ENGINE_CYCLE 5
 
-#define EGO_TYPE_OFF      0
-#define EGO_TYPE_NARROW   1
-#define EGO_TYPE_WIDE     2
+#define EGO_TYPE_OFF      0U
+#define EGO_TYPE_NARROW   1U
+#define EGO_TYPE_WIDE     2U
 
-#define INJ_TYPE_PORT 0
-#define INJ_TYPE_TBODY 1
+#define INJ_TYPE_PORT  0U
+#define INJ_TYPE_TBODY 1U
 
-#define INJ_PAIRED 0
-#define INJ_SEMISEQUENTIAL 1
-#define INJ_BANKED          2
-#define INJ_SEQUENTIAL      3
+#define INJ_PAIRED          0U
+#define INJ_SEMISEQUENTIAL  1U
+#define INJ_BANKED          2U
+#define INJ_SEQUENTIAL      3U
 
 #define INJ_PAIR_13_24      0
 #define INJ_PAIR_14_23      1
@@ -281,13 +279,13 @@ static_assert(TOOTH_LOG_SIZE<UINT8_MAX, "Check all uses of TOOTH_LOG_SIZE");
 #define EGO_ALGORITHM_PID      2U
 #define EGO_ALGORITHM_NONE     3U
 
-#define STAGING_MODE_TABLE  0
-#define STAGING_MODE_AUTO   1
+#define STAGING_MODE_TABLE  0U
+#define STAGING_MODE_AUTO   1U
 
-#define NITROUS_OFF         0
-#define NITROUS_STAGE1      1
-#define NITROUS_STAGE2      2
-#define NITROUS_BOTH        3
+#define NITROUS_OFF         0U
+#define NITROUS_STAGE1      1U
+#define NITROUS_STAGE2      2U
+#define NITROUS_BOTH        3U
 
 #define PROTECT_CUT_OFF     0
 #define PROTECT_CUT_IGN     1
@@ -298,8 +296,8 @@ static_assert(TOOTH_LOG_SIZE<UINT8_MAX, "Check all uses of TOOTH_LOG_SIZE");
 #define AE_MODE_TPS         0
 #define AE_MODE_MAP         1
 
-#define AE_MODE_MULTIPLIER  0
-#define AE_MODE_ADDER       1
+#define AE_MODE_MULTIPLIER  0U
+#define AE_MODE_ADDER       1U
 
 #define KNOCK_MODE_OFF      0U
 #define KNOCK_MODE_DIGITAL  1U
@@ -347,9 +345,9 @@ static_assert(TOOTH_LOG_SIZE<UINT8_MAX, "Check all uses of TOOTH_LOG_SIZE");
 #define VVT_LOAD_MAP      0
 #define VVT_LOAD_TPS      1
 
-#define MULTIPLY_MAP_MODE_OFF   0
-#define MULTIPLY_MAP_MODE_BARO  1
-#define MULTIPLY_MAP_MODE_100   2
+#define MULTIPLY_MAP_MODE_OFF   0U
+#define MULTIPLY_MAP_MODE_BARO  1U
+#define MULTIPLY_MAP_MODE_100   2U
 
 #define FOUR_STROKE         0U
 #define TWO_STROKE          1U
@@ -357,8 +355,8 @@ static_assert(TOOTH_LOG_SIZE<UINT8_MAX, "Check all uses of TOOTH_LOG_SIZE");
 #define GOING_LOW         0
 #define GOING_HIGH        1
 
-#define BATTV_COR_MODE_WHOLE 0
-#define BATTV_COR_MODE_OPENTIME 1
+#define BATTV_COR_MODE_WHOLE    0U
+#define BATTV_COR_MODE_OPENTIME 1U
 
 #define INJ1_CMD_BIT      0
 #define INJ2_CMD_BIT      1
@@ -635,14 +633,14 @@ struct statuses {
   volatile byte status4; ///< Status bits (See BIT_STATUS4_* defines on top of this file)
   volatile byte status5;  ///< Status 5 ... (See also @ref config10 Status 5* members and BIT_STATU5_* defines)
   uint8_t engine; ///< Engine status bits (See BIT_ENGINE_* defines on top of this file)
-  unsigned int PW1; ///< In uS
-  unsigned int PW2; ///< In uS
-  unsigned int PW3; ///< In uS
-  unsigned int PW4; ///< In uS
-  unsigned int PW5; ///< In uS
-  unsigned int PW6; ///< In uS
-  unsigned int PW7; ///< In uS
-  unsigned int PW8; ///< In uS
+  uint16_t PW1; ///< In uS
+  uint16_t PW2; ///< In uS
+  uint16_t PW3; ///< In uS
+  uint16_t PW4; ///< In uS
+  uint16_t PW5; ///< In uS
+  uint16_t PW6; ///< In uS
+  uint16_t PW7; ///< In uS
+  uint16_t PW8; ///< In uS
   volatile byte runSecs; /**< Counter of seconds since cranking commenced (Maxes out at 255 to prevent overflow) */
   volatile byte secl; /**< Counter incrementing once per second. Will overflow after 255 and begin again. This is used by TunerStudio to maintain comms sync */
   volatile uint16_t loopsPerSecond; /**< A performance indicator showing the number of main loops that are being executed each second */ 
diff --git a/speeduino/maths.cpp b/speeduino/maths.cpp
index 3d446bd752..97c66cdcbe 100644
--- a/speeduino/maths.cpp
+++ b/speeduino/maths.cpp
@@ -5,7 +5,7 @@
 //The initial seed used is always based on micros(), though this is unlikely to cause an issue as the first run is nearly random itself
 //Function requires 4 bytes to store state and seed, but operates very quickly (around 4uS per call)
 static uint8_t a, x, y, z;
-uint8_t random1to100()
+uint8_t random1to100(void)
 {
   //Check if this is the first time being run. If so, seed the random number generator with micros()
   if( (a == 0U) && (x == 0U) && (y == 0U) && (z == 0U) )
diff --git a/speeduino/pw_calcs.cpp b/speeduino/pw_calcs.cpp
index da03bc2cae..a4e8982be2 100644
--- a/speeduino/pw_calcs.cpp
+++ b/speeduino/pw_calcs.cpp
@@ -55,7 +55,7 @@ TESTABLE_INLINE_STATIC uint16_t calculatePWLimit(const config2 &page2, const sta
 {
   uint32_t tempLimit = percentageApprox(page2.dutyLim, current.revolutionTime); //The pulsewidth limit is determined to be the duty cycle limit (Eg 85%) by the total time it takes to perform 1 revolution
   //Handle multiple squirts per rev
-  if (page2.strokes == FOUR_STROKE) { tempLimit = tempLimit * 2; }
+  if (page2.strokes == FOUR_STROKE) { tempLimit = tempLimit * 2U; }
   //Optimise for power of two divisions where possible
   switch(current.nSquirts)  {
     case 1:
@@ -240,7 +240,7 @@ void applyPwToInjectorChannels(const pulseWidths &pulse_widths, const config2 &p
   current.PW1 = current.PW2 = current.PW3 = current.PW4 = current.PW5 = current.PW6 = current.PW7 = current.PW8 = 0U;
 
   #define ASSIGN_PULSEWIDTH_OR_ZERO(index, pw) \
-    current.PW ## index = ((current.maxInjOutputs) >= (uint8_t)(index)) ? pw : 0U;
+    current.PW ## index = ((current.maxInjOutputs) >= (uint8_t)(index)) ? (pw) : 0U;
 
   // The PW calcs already applied the logic to enable staging or not. If there is a valid
   // secondary PW, staging is enabled