Statuses struct: use bit fields for status bytes (speeduino#1280)

* Convert statuses::status1: to bit fields

* Convert statuses::status2: to bit fields

* Convert statuses::status3 to bit fields

* Convert statuses::status4 to bit fields

* Convert statuses::status5 to bit fields

* Convert statuses::airConStatus to bit fields

* Convert statuses::engineProtectStatus to bit fields

* Remove duplicate #defines (copy/paste error)

* Convert statuses::TS_SD_Status to bit fields

* Convert statuses::engine to bit fields

* statuses::testOutputs: to bit fields

* Fix spelling error

* Remove type punning from statuses - instead, build the I/O status bytes on demand. This completely separates the internal state from the I/O protocol.

* Remove nChannels - never read

* MISRA fixes

---------

Co-authored-by: Josh Stewart <josh@noisymime.org>

Author: adbancroft

speeduino/SD_logger.cpp

@@ -588,21 +588,13 @@ void writeSDLogHeader()
 //Sets the status variable for TunerStudio
 void setTS_SD_status()
 {
-  if( SD_status == SD_STATUS_ERROR_NO_CARD ) { BIT_CLEAR(currentStatus.TS_SD_Status, SD_STATUS_CARD_PRESENT); } // CARD is not present
-  else { BIT_SET(currentStatus.TS_SD_Status, SD_STATUS_CARD_PRESENT); } // CARD present
-
-  BIT_SET(currentStatus.TS_SD_Status, SD_STATUS_CARD_TYPE); // CARD is SDHC
-  
-  BIT_SET(currentStatus.TS_SD_Status, SD_STATUS_CARD_READY); // CARD is ready
-  
-  if( SD_status == SD_STATUS_ACTIVE ) { BIT_SET(currentStatus.TS_SD_Status, SD_STATUS_CARD_LOGGING); }// CARD is logging
-  else { BIT_CLEAR(currentStatus.TS_SD_Status, SD_STATUS_CARD_LOGGING); }// CARD is not logging
-
-  if( (SD_status >= SD_STATUS_ERROR_NO_FS) ) { BIT_SET(currentStatus.TS_SD_Status, SD_STATUS_CARD_ERROR); }// CARD has an error
-  else { BIT_CLEAR(currentStatus.TS_SD_Status, SD_STATUS_CARD_ERROR); }// CARD has no error
-
-  BIT_SET(currentStatus.TS_SD_Status, SD_STATUS_CARD_FS); // CARD has a FAT32 filesystem (Though this will be exFAT)
-  BIT_CLEAR(currentStatus.TS_SD_Status, SD_STATUS_CARD_UNUSED); //Unused bit is always 0
+  currentStatus.sdCardPresent = (SD_status != SD_STATUS_ERROR_NO_CARD);
+  currentStatus.sdCardType = 1U; // CARD is SDHC
+  currentStatus.sdCardReady = true;
+  currentStatus.sdCardLogging = (SD_status == SD_STATUS_ACTIVE);
+  currentStatus.sdCardError = (SD_status >= SD_STATUS_ERROR_NO_FS);
+  currentStatus.sdCardFS = 1U; // CARD has a FAT32 filesystem (Though this will be exFAT)
+  currentStatus.sdCardUnused = false; //Unused bit is always 0
 }
 
 /** 
@@ -637,7 +629,7 @@ void checkForSDStart()
     //Check for engine protection based enable
     if((configPage13.onboard_log_trigger_prot) && (SD_status == SD_STATUS_READY) )
     {
-      if(currentStatus.engineProtectStatus > 0)
+      if(isEngineProtectActive(currentStatus))
       {
         beginSDLogging(); //Setup the log file, preallocation, header row
       }
@@ -691,7 +683,7 @@ void checkForSDStop()
     }
     if(configPage13.onboard_log_trigger_prot)
     {
-      if(currentStatus.engineProtectStatus > 0)
+      if(isEngineProtectActive(currentStatus))
       {
         log_prot = true;
       }
@@ -742,7 +734,7 @@ void formatExFat()
   bool result = false;
 
   //Set the SD status to busy
-  BIT_CLEAR(currentStatus.TS_SD_Status, SD_STATUS_CARD_READY);
+  currentStatus.sdCardReady = false;
 
   logFile.close();
 
@@ -758,7 +750,7 @@ void formatExFat()
   }
 
   if(result == false) { SD_status = SD_STATUS_ERROR_FORMAT_FAIL; }
-  else { BIT_SET(currentStatus.TS_SD_Status, SD_STATUS_CARD_READY); }
+  else { currentStatus.sdCardReady = true; }
 }
 
 /**

speeduino/SD_logger.h

@@ -22,16 +22,6 @@
 #define SD_STATUS_ERROR_WRITE_FAIL  7 /**< Log file created and opened, but a sector write failed during logging */
 #define SD_STATUS_ERROR_FORMAT_FAIL 8 /**< Attempted formatting of SD card failed */
 
-#define SD_STATUS_CARD_PRESENT      0 //0=no card, 1=card present
-#define SD_STATUS_CARD_TYPE         1 //0=SD, 1=SDHC
-#define SD_STATUS_CARD_READY        2 //0=not ready, 1=ready
-#define SD_STATUS_CARD_LOGGING      3 //0=not logging, 1=logging
-#define SD_STATUS_CARD_ERROR        4 //0=no error, 1=error
-#define SD_STATUS_CARD_VERSION      5 //0=1.x, 1=2.x
-#define SD_STATUS_CARD_FS           6 //0=no FAT16, 1=FAT32
-#define SD_STATUS_CARD_UNUSED       7 //0=normal, 1=unused
-
-
 #define SD_SECTOR_SIZE              512 // Standard SD sector size
 
 #if defined CORE_TEENSY

speeduino/TS_CommandButtonHandler.cpp

@@ -62,13 +62,13 @@ static constexpr uint16_t TS_CMD_STM32_BOOTLOADER = 12801;
 
 static constexpr uint16_t TS_CMD_SD_FORMAT  = 13057;
 
-static constexpr uint16_t TS_CMD_VSS_60KMH  = 39168; //0x99x00
-static constexpr uint16_t TS_CMD_VSS_RATIO1 = 39169;
-static constexpr uint16_t TS_CMD_VSS_RATIO2 = 39170;
-static constexpr uint16_t TS_CMD_VSS_RATIO3 = 39171;
-static constexpr uint16_t TS_CMD_VSS_RATIO4 = 39172;
-static constexpr uint16_t TS_CMD_VSS_RATIO5 = 39173;
-static constexpr uint16_t TS_CMD_VSS_RATIO6 = 39174;
+static constexpr uint16_t TS_CMD_VSS_60KMH  = 39168U; //0x99x00
+static constexpr uint16_t TS_CMD_VSS_RATIO1 = 39169U;
+static constexpr uint16_t TS_CMD_VSS_RATIO2 = 39170U;
+static constexpr uint16_t TS_CMD_VSS_RATIO3 = 39171U;
+static constexpr uint16_t TS_CMD_VSS_RATIO4 = 39172U;
+static constexpr uint16_t TS_CMD_VSS_RATIO5 = 39173U;
+static constexpr uint16_t TS_CMD_VSS_RATIO6 = 39174U;
 
 /* the maximum id number is 65,535 */
 bool TS_CommandButtonsHandler(uint16_t buttonCommand);