Type consistency fixes and Cortex-M0+ assembly optimizations

Makefile

@@ -24,6 +24,7 @@ CFLAGS += -funsigned-char -funsigned-bitfields
 CFLAGS += -Wuninitialized
 CFLAGS += -Wshadow -Wdouble-promotion -Wundef
 CFLAGS += -mcpu=cortex-m0plus -mthumb
+CFLAGS += -Wconversion -Wsign-conversion
 CFLAGS += -MD -MP -MT $(BUILD)/$(*F).o -MF $(BUILD)/$(@F).d
 
 LDFLAGS += -mcpu=cortex-m0plus -mthumb
@@ -32,12 +33,12 @@ LDFLAGS += -Wl,--print-memory-usage
 LDFLAGS += -Wl,--script=./linker/samd21j17.ld
 
 INCLUDES += \
-  -I./include/samd21 \
-  -I./third_party/printf \
-  -I./third_party/qfplib \
-  -I./third_party/RFM69 \
-  -I./third_party/tinyusb/src \
-  -I./third_party/tinyusb/src/device \
+  -isystem ./include/samd21 \
+  -isystem ./third_party/printf \
+  -isystem ./third_party/qfplib \
+  -isystem ./third_party/RFM69 \
+  -isystem ./third_party/tinyusb/src \
+  -isystem ./third_party/tinyusb/src/device \
   -I./src/
 
 SRCS += $(wildcard ./src/*.c) \

src/board_def.c

@@ -49,4 +49,4 @@ const uint8_t pinsADC[][2] = {{GRP_ADC_VMID, PIN_ADC_VMID},
 /* Remapping for analog CT inputs. This maps the 0-indexed CT physical pin to
  * the logical pin. For example, physical CT1 is the 4th CT sampled so:
  * ainRemap[0] = 3. */
-const int_fast8_t ainRemap[NUM_CT] = {3, 4, 7, 1, 2, 11, 5, 6, 8, 9, 10, 0};
+const uint8_t ainRemap[NUM_CT] = {3, 4, 7, 1, 2, 11, 5, 6, 8, 9, 10, 0};

src/board_def.h

@@ -41,15 +41,15 @@
 
 /* EEPROM */
 /* Top of EEPROM address, not including R/W bit */
-#define EEPROM_BASE_ADDR   0x50
+#define EEPROM_BASE_ADDR   0x50u
 /* Maximum number of bytes in a single page */
 #define EEPROM_PAGE_SIZE   16u
 /* Worst case EEPROM write time (microseconds) */
 #define EEPROM_WR_TIME     5000ul
 /* Size of configuration area */
-#define EEPROM_CONFIG_SIZE 256
+#define EEPROM_CONFIG_SIZE 256u
 /* Size of the EEPROM in bytes */
-#define EEPROM_SIZE        1024
+#define EEPROM_SIZE        1024u
 /* Offset of wear levelled area */
 #define EEPROM_WL_OFFSET   (EEPROM_CONFIG_SIZE)
 

src/configuration.c

@@ -51,7 +51,7 @@ static void     configDefault(void);
 static void     configEchoQueueChar(const uint8_t c);
 static void     configEchoQueueStr(const char *s);
 static void     configInitialiseNVM(void);
-static int32_t  configTimeToCycles(const float time, const int32_t mainsFreq);
+static uint16_t configTimeToCycles(const float time, const uint32_t mainsFreq);
 static bool     configureAnalog(void);
 static bool     configureAssumed(void);
 static void     configureBackup(void);
@@ -68,7 +68,7 @@ static bool     configureSerialLog(void);
 static void     enterBootloader(void);
 static uint32_t getBoardRevision(void);
 static char    *getLastReset(void);
-static void     inBufferClear(int32_t n);
+static void     inBufferClear(size_t n);
 static void     printSettingCT(const int32_t ch);
 static void     printSettingDatalog(void);
 static void     printSettingJSON(void);
@@ -350,10 +350,9 @@ static void configureBackup(void) {
   serialPuts("{");
   /* {board_info} dict */
   serialPuts("\"board_info\":{");
-  printf_("\"revision\":%d,", (int32_t)getBoardRevision());
-  printf_("\"serial\":\"0x%02x%02x%02x%02x\",", (uint32_t)getUniqueID(0),
-          (uint32_t)getUniqueID(1), (uint32_t)getUniqueID(2),
-          (uint32_t)getUniqueID(3));
+  printf_("\"revision\":%ld,", getBoardRevision());
+  printf_("\"serial\":\"0x%02lx%02lx%02lx%02lx\",", getUniqueID(0),
+          getUniqueID(1), getUniqueID(2), getUniqueID(3));
   printf_("\"fw\":\"%d.%d.%d\"},", VERSION_FW_MAJ, VERSION_FW_MIN,
           VERSION_FW_REV);
 
@@ -425,7 +424,7 @@ static bool configureGroupID(void) {
   }
 
   config.baseCfg.dataGrp = convI.val;
-  printf_("rfGroup = %d\r\n", (int32_t)convI.val);
+  printf_("rfGroup = %ld\r\n", convI.val);
   return true;
 }
 
@@ -628,7 +627,7 @@ static bool configureRFPower(void) {
   }
 
   config.dataTxCfg.rfmPwr = convI.val;
-  printf_("rfPower = %d\r\n", (int32_t)convI.val);
+  printf_("rfPower = %ld\r\n", convI.val);
   return true;
 }
 
@@ -707,18 +706,18 @@ uint32_t getUniqueID(int32_t idx) {
   return *(volatile uint32_t *)id_addr_lut[idx];
 }
 
-static void inBufferClear(int32_t n) {
+static void inBufferClear(size_t n) {
   inBufferIdx = 0;
   (void)memset(inBuffer, 0, n);
 }
 
 static void printSettingCT(const int32_t ch) {
-  printf_("iCal%d = ", (ch + 1));
+  printf_("iCal%ld = ", (ch + 1));
   putFloat(config.ctCfg[ch].ctCal, 0);
-  printf_(", iLead%d = ", (ch + 1));
+  printf_(", iLead%ld = ", (ch + 1));
   putFloat(config.ctCfg[ch].phase, 0);
-  printf_(", iActive%d = %s", (ch + 1), config.ctCfg[ch].ctActive ? "1" : "0");
-  printf_(", v1Chan%d = %d, v2Chan%d = %d\r\n", (ch + 1),
+  printf_(", iActive%ld = %s", (ch + 1), config.ctCfg[ch].ctActive ? "1" : "0");
+  printf_(", v1Chan%ld = %d, v2Chan%ld = %d\r\n", (ch + 1),
           (config.ctCfg[ch].vChan1 + 1), (ch + 1),
           (config.ctCfg[ch].vChan2 + 1));
 }
@@ -734,7 +733,7 @@ static void printSettingJSON(void) {
 }
 
 static void printSettingOPA(const int32_t ch) {
-  printf_("opa%d = ", (ch + 1));
+  printf_("opa%ld = ", (ch + 1));
 
   /* OneWire */
   if ('o' == config.opaCfg[ch].func) {
@@ -778,17 +777,17 @@ static void printSettingRFFreq(void) {
 }
 
 static void printSettingV(const int32_t ch) {
-  printf_("vCal%d = ", (ch + 1));
+  printf_("vCal%ld = ", (ch + 1));
   putFloat(config.voltageCfg[ch].voltageCal, 0);
-  printf_(", vActive%d = %s\r\n", (ch + 1),
+  printf_(", vActive%ld = %s\r\n", (ch + 1),
           config.voltageCfg[ch].vActive ? "1" : "0");
 }
 
 static void printAccumulators(void) {
   Emon32Cumulative_t cumulative;
   eepromWLStatus_t   status;
   bool               eepromOK;
-  int32_t            idx;
+  uint32_t           idx;
 
   status   = eepromReadWL(&cumulative, &idx);
   eepromOK = (EEPROM_WL_OK == status);
@@ -799,15 +798,15 @@ static void printAccumulators(void) {
   } else if (!eepromOK) {
     serialPuts(" (no valid NVM data)");
   }
-  printf_(" [%d]:\r\n", idx);
+  printf_(" [%lu]:\r\n", idx);
 
   for (uint32_t i = 0; i < NUM_CT; i++) {
-    int32_t wh = eepromOK ? cumulative.wattHour[i] : 0;
-    printf_("  E%ld = %ld Wh\r\n", (i + 1), wh);
+    uint32_t wh = eepromOK ? cumulative.wattHour[i] : 0;
+    printf_("  E%lu = %lu Wh\r\n", (i + 1), wh);
   }
   for (uint32_t i = 0; i < NUM_OPA; i++) {
     uint32_t pulse = eepromOK ? cumulative.pulseCnt[i] : 0;
-    printf_("  pulse%d = %" PRIu32 "\r\n", (i + 1), pulse);
+    printf_("  pulse%lu = %lu\r\n", (i + 1), pulse);
   }
   serialPuts("\r\n");
 }
@@ -849,7 +848,7 @@ static void printSettingsHR(void) {
 
   for (uint32_t i = 0; i < NUM_OPA; i++) {
     bool enabled = config.opaCfg[i].opaActive;
-    printf_("OPA %d (%sactive)\r\n", (i + 1), enabled ? "" : "in");
+    printf_("OPA %lu (%sactive)\r\n", (i + 1), enabled ? "" : "in");
     if ('o' == config.opaCfg[i].func) {
       serialPuts("  - OneWire interface\r\n");
     } else {
@@ -883,13 +882,13 @@ static void printSettingsHR(void) {
   serialPuts(
       "+=====+=========+========+=============+=========+======+======+\r\n");
   for (int32_t i = 0; i < NUM_V; i++) {
-    printf_("| %2d  |  V %2d   | %c      | ", (i + 1), (i + 1),
+    printf_("| %2ld  |  V %2ld   | %c      | ", (i + 1), (i + 1),
             (config.voltageCfg[i].vActive ? 'Y' : 'N'));
     putFloat(config.voltageCfg[i].voltageCal, 6);
     serialPuts("      |         |      |      |\r\n");
   }
   for (int32_t i = 0; i < NUM_CT; i++) {
-    printf_("| %2d  | CT %2d   | %c      | ", (i + 1 + NUM_V), (i + 1),
+    printf_("| %2ld  | CT %2ld   | %c      | ", (i + 1 + NUM_V), (i + 1),
             (config.ctCfg[i].ctActive ? 'Y' : 'N'));
     putFloat(config.ctCfg[i].ctCal, 6);
     serialPuts("      |  ");
@@ -902,7 +901,7 @@ static void printSettingsHR(void) {
 
 static void printSettingsKV(void) {
   serialPuts("hardware = emonPi3\r\n");
-  printf_("hardware_rev = %" PRIu32 "\r\n", getBoardRevision());
+  printf_("hardware_rev = %lu\r\n", getBoardRevision());
   printf_("version = %d.%d.%d\r\n", VERSION_FW_MAJ, VERSION_FW_MIN,
           VERSION_FW_REV);
   printf_("commit = %s\r\n", emon32_build_info().revision);
@@ -948,8 +947,7 @@ static void printUptime(void) {
   tMinutes = tMinutes % 60;
   tHours   = tHours % 24;
 
-  printf_("%" PRIu32 "d %" PRIu32 "h %" PRIu32 "m %" PRIu32 "s\r\n", tDays,
-          tHours, tMinutes, tSeconds);
+  printf_("%lud %luh %lum %lus\r\n", tDays, tHours, tMinutes, tSeconds);
 }
 
 /*! @brief Check if waiting for confirmation and handle if yes
@@ -1010,7 +1008,7 @@ static void handleConfirmation(char c) {
   case CONFIRM_ZERO_ACCUM_INDIVIDUAL:
     if ('y' == c) {
       Emon32Cumulative_t cumulative;
-      int32_t            idx;
+      uint32_t           idx;
       /* Read current NVM data */
       if (EEPROM_WL_OK == eepromReadWL(&cumulative, &idx)) {
         /* Clear the specific accumulator */
@@ -1211,11 +1209,10 @@ void configFirmwareBoardInfo(void) {
   serialPuts("\033c==== emonPi3 | emonTx6 ====\r\n\r\n");
 
   serialPuts("> Board:\r\n");
-  printf_("  - emonPi3/emonTx6 (arch. rev. %" PRIu32 ")\r\n",
-          getBoardRevision());
-  printf_("  - Serial    : 0x%02x%02x%02x%02x\r\n", (uint32_t)getUniqueID(0),
-          (uint32_t)getUniqueID(1), (uint32_t)getUniqueID(2),
-          (uint32_t)getUniqueID(3));
+  printf_("  - emonPi3/emonTx6 (arch. rev. %lu)\r\n", getBoardRevision());
+  printf_("  - Serial    : 0x%02lx%02lx%02lx%02lx\r\n",
+          (uint32_t)getUniqueID(0), (uint32_t)getUniqueID(1),
+          (uint32_t)getUniqueID(2), (uint32_t)getUniqueID(3));
   printf_("  - Last reset: %s\r\n", getLastReset());
   serialPuts("  - Uptime    : ");
   printUptime();
@@ -1472,8 +1469,8 @@ void configProcessCmd(void) {
 
 bool configUnsavedChanges(void) { return unsavedChange; }
 
-int32_t configTimeToCycles(const float time, const int32_t mainsFreq) {
-  return qfp_float2uint(qfp_fmul(time, qfp_int2float(mainsFreq)));
+uint16_t configTimeToCycles(const float time, const uint32_t mainsFreq) {
+  return (uint16_t)qfp_float2uint(qfp_fmul(time, qfp_int2float(mainsFreq)));
 }
 
 VersionInfo_t configVersion(void) {