[serial] Extend serial number to 4 digits

Author: kostorr

src/CommandLineUtilities/ProgramListCards.cxx

@@ -94,7 +94,7 @@ class ProgramListCards : public Program
 
       // Pad the serial with 0s if necessary
       // It should always be used as 3 chars to avoid conflicts with the sequence id
-      boost::format serialFormat("%03d");
+      boost::format serialFormat("%04d");
       serialFormat % std::to_string(card.serialId.getSerial());
 
       std::string serial = serialFormat.str();

src/Crorc/CrorcBar.cxx

@@ -81,12 +81,13 @@ boost::optional<int32_t> CrorcBar::getSerialNumber()
     return Crorc::getSerial(*(mPdaBar.get()));
   } else {
     // Register format e.g. 0x32343932
-    // transltes to -> 2942 -> 942 (keep 3)
+    // transltes to -> 2942
     std::stringstream serialString;
 
     serialString << char(serial & 0xff)
                  << char((serial & 0xff00) >> 8)
-                 << char((serial & 0xff0000) >> 16);
+                 << char((serial & 0xff0000) >> 16)
+                 << char((serial & 0xff000000) >> 24);
 
     try {
       return std::stoi(serialString.str());

src/Cru/CruBar.cxx

@@ -280,13 +280,14 @@ boost::optional<int32_t> CruBar::getSerialNumber()
     boost::optional<int32_t> serial = eeprom.getSerial();
     return serial;
   } else { // v3.6.3+
-    // Register format e.g. 0x343230
-    // translates to -> 024
+    // Register format e.g. 0x35343230
+    // translates to -> 0245
     std::stringstream serialString;
 
     serialString << char(serial & 0xff)
                  << char((serial & 0xff00) >> 8)
-                 << char((serial & 0xff0000) >> 16);
+                 << char((serial & 0xff0000) >> 16)
+                 << char((serial & 0xff000000) >> 24);
 
     try {
       return std::stoi(serialString.str());