Add product variant ID to hardware ID

Author: nseidle

Firmware/RTK_Everywhere/Display.ino

@@ -2820,16 +2820,13 @@ void paintKeyProvisionFail(uint16_t displayTime)
         int y = 0;
         int fontHeight = 8;
 
-        printTextCenter("ZTP", y, QW_FONT_5X7, 1, false); // text, y, font type, kerning, inverted
-
-        y += fontHeight;
         printTextCenter("Failed", y, QW_FONT_5X7, 1, false); // text, y, font type, kerning, inverted
 
         y += fontHeight;
-        printTextCenter("ID:", y, QW_FONT_5X7, 1, false); // text, y, font type, kerning, inverted
+        printTextCenter("ZTP ID:", y, QW_FONT_5X7, 1, false); // text, y, font type, kerning, inverted
 
-        // The MAC address is 12 characters long so we have to split it onto two lines
-        char hardwareID[13];
+        // The device ID is 14 characters long so we have to split it into three lines
+        char hardwareID[15];
         const uint8_t *rtkMacAddress = getMacAddress();
 
         snprintf(hardwareID, sizeof(hardwareID), "%02X%02X%02X", rtkMacAddress[0], rtkMacAddress[1], rtkMacAddress[2]);
@@ -2840,6 +2837,10 @@ void paintKeyProvisionFail(uint16_t displayTime)
         y += fontHeight;
         printTextCenter(hardwareID, y, QW_FONT_5X7, 1, false); // text, y, font type, kerning, inverted
 
+        snprintf(hardwareID, sizeof(hardwareID), "%02X", productVariant);
+        y += fontHeight;
+        printTextCenter(hardwareID, y, QW_FONT_5X7, 1, false); // text, y, font type, kerning, inverted
+
         oled->display();
 
         delay(displayTime);

Firmware/RTK_Everywhere/menuCommands.ino

@@ -1479,9 +1479,9 @@ void createSettingsString(char *newSettings)
     stringRecord(newSettings, "sdMounted", online.microSD);
 
     // Add Device ID used for corrections
-    char hardwareID[13];
-    snprintf(hardwareID, sizeof(hardwareID), "%02X%02X%02X%02X%02X%02X", btMACAddress[0], btMACAddress[1],
-             btMACAddress[2], btMACAddress[3], btMACAddress[4], btMACAddress[5]);
+    char hardwareID[15];
+    snprintf(hardwareID, sizeof(hardwareID), "%02X%02X%02X%02X%02X%02X%02X", btMACAddress[0], btMACAddress[1],
+             btMACAddress[2], btMACAddress[3], btMACAddress[4], btMACAddress[5], productVariant);
     stringRecord(newSettings, "hardwareID", hardwareID);
 
     // Add Days Remaining for corrections

Firmware/RTK_Everywhere/menuPP.ino

@@ -219,15 +219,15 @@ bool pointperfectProvisionDevice()
 
     do
     {
-        char hardwareID[13];
-        snprintf(hardwareID, sizeof(hardwareID), "%02X%02X%02X%02X%02X%02X", btMACAddress[0], btMACAddress[1],
+        char hardwareID[15];
+        snprintf(hardwareID, sizeof(hardwareID), "%02X%02X%02X%02X%02X%02X%02X", btMACAddress[0], btMACAddress[1],
                  btMACAddress[2], btMACAddress[3], btMACAddress[4],
-                 btMACAddress[5]); // Get ready for JSON
+                 btMACAddress[5], productVariant); // Get ready for JSON
 
 #ifdef WHITELISTED_ID
         // Override ID with testing ID
-        snprintf(hardwareID, sizeof(hardwareID), "%02X%02X%02X%02X%02X%02X", whitelistID[0], whitelistID[1],
-                 whitelistID[2], whitelistID[3], whitelistID[4], whitelistID[5]);
+        snprintf(hardwareID, sizeof(hardwareID), "%02X%02X%02X%02X%02X%02X%02X", whitelistID[0], whitelistID[1],
+                 whitelistID[2], whitelistID[3], whitelistID[4], whitelistID[5], productVariant);
 #endif // WHITELISTED_ID
 
         // Given name must be between 1 and 50 characters
@@ -308,9 +308,9 @@ bool pointperfectProvisionDevice()
             }
             else if (ztpResponse == ZTP_DEACTIVATED && attemptNumber == 1)
             {
-                char hardwareID[13];
-                snprintf(hardwareID, sizeof(hardwareID), "%02X%02X%02X%02X%02X%02X", btMACAddress[0], btMACAddress[1],
-                         btMACAddress[2], btMACAddress[3], btMACAddress[4], btMACAddress[5]);
+                char hardwareID[15];
+                snprintf(hardwareID, sizeof(hardwareID), "%02X%02X%02X%02X%02X%02X%02X", btMACAddress[0], btMACAddress[1],
+                         btMACAddress[2], btMACAddress[3], btMACAddress[4], btMACAddress[5], productVariant);
 
                 systemPrintf("This device has been deactivated. Please contact "
                              "support@sparkfun.com to renew the PointPerfect "
@@ -321,9 +321,9 @@ bool pointperfectProvisionDevice()
             }
             else if (ztpResponse == ZTP_NOT_WHITELISTED && attemptNumber == 1)
             {
-                char hardwareID[13];
-                snprintf(hardwareID, sizeof(hardwareID), "%02X%02X%02X%02X%02X%02X", btMACAddress[0], btMACAddress[1],
-                         btMACAddress[2], btMACAddress[3], btMACAddress[4], btMACAddress[5]);
+                char hardwareID[15];
+                snprintf(hardwareID, sizeof(hardwareID), "%02X%02X%02X%02X%02X%02X%02X", btMACAddress[0], btMACAddress[1],
+                         btMACAddress[2], btMACAddress[3], btMACAddress[4], btMACAddress[5], productVariant);
 
                 systemPrintf(
                     "This device is not whitelisted. Please contact "
@@ -1421,9 +1421,9 @@ void menuPointPerfect()
         }
         else if (incoming == 4 && pointPerfectIsEnabled())
         {
-            char hardwareID[13];
-            snprintf(hardwareID, sizeof(hardwareID), "%02X%02X%02X%02X%02X%02X", btMACAddress[0], btMACAddress[1],
-                     btMACAddress[2], btMACAddress[3], btMACAddress[4], btMACAddress[5]);
+            char hardwareID[15];
+            snprintf(hardwareID, sizeof(hardwareID), "%02X%02X%02X%02X%02X%02X%02X", btMACAddress[0], btMACAddress[1],
+                     btMACAddress[2], btMACAddress[3], btMACAddress[4], btMACAddress[5], productVariant);
             systemPrintf("Device ID: %s\r\n", hardwareID);
         }
         else if (incoming == 'c' && pointPerfectIsEnabled())