🔧 STM32 UID followup (MarlinFirmware#26727)

Co-authored-by: Scott Lahteine <[email protected]>
smiksky · Jan 24, 2024 · e668d5a · e668d5a
1 parent a222827
commit e668d5a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 18 deletions.
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
@@ -35,7 +35,7 @@
   #include "../../feature/caselight.h"
 #endif
 
-#if !defined(MACHINE_UUID) && HAS_STM32_UID
+#if !defined(MACHINE_UUID) && ENABLED(HAS_STM32_UID)
   #include "../../libs/hex_print.h"
 #endif
 
@@ -72,15 +72,15 @@ void GcodeSuite::M115() {
     #if NUM_AXES != XYZ
       " AXIS_COUNT:" STRINGIFY(NUM_AXES)
     #endif
-    #if defined(MACHINE_UUID) || HAS_STM32_UID
+    #if defined(MACHINE_UUID) || ENABLED(HAS_STM32_UID)
       " UUID:"
     #endif
     #ifdef MACHINE_UUID
       MACHINE_UUID
     #endif
   );
 
-  #if !defined(MACHINE_UUID) && HAS_STM32_UID
+  #if !defined(MACHINE_UUID) && ENABLED(HAS_STM32_UID)
     /**
      * STM32-based devices have a 96-bit CPU device serial number.
      * Used by LumenPnP / OpenPNP to keep track of unique hardware/configurations.
@@ -93,7 +93,7 @@ void GcodeSuite::M115() {
     #else
       uint16_t * const UID = (uint16_t*)UID_BASE;
       SERIAL_ECHO(
-        F("CEDE2A2F-"), hex_word(UID[0]), '-', hex_word(UID[1]), '-', hex_word(UID[2]), '-',
+        F("CEDE2A2F-"), hex_word(UID[0]), C('-'), hex_word(UID[1]), C('-'), hex_word(UID[2]), C('-'),
         hex_word(UID[3]), hex_word(UID[4]), hex_word(UID[5])
       );
     #endif

diff --git a/Marlin/src/libs/hex_print.h b/Marlin/src/libs/hex_print.h
@@ -35,8 +35,8 @@ char* _hex_word(const uint16_t w);
 char* hex_address(const void * const w);
 char* _hex_long(const uintptr_t l);
 
-template<typename T> char* hex_word(T w) { return hex_word((uint16_t)w); }
-template<typename T> char* hex_long(T w) { return hex_long((uint32_t)w); }
+template<typename T> char* hex_word(T w) { return _hex_word((uint16_t)w); }
+template<typename T> char* hex_long(T w) { return _hex_long((uint32_t)w); }
 
 void print_hex_nybble(const uint8_t n);
 void print_hex_byte(const uint8_t b);

diff --git a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h
@@ -45,11 +45,6 @@
 // I2C MCP3426 (16-Bit, 240SPS, dual-channel ADC)
 #define HAS_MCP3426_ADC
 
-// Opulo Lumen uses the CPU serial number
-#ifdef STM32F4
-  #define HAS_STM32_UID                        1
-#endif
-
 //
 // Servos
 //

diff --git a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h
@@ -45,11 +45,6 @@
 // I2C MCP3426 (16-Bit, 240SPS, dual-channel ADC)
 #define HAS_MCP3426_ADC
 
-// Opulo Lumen uses the CPU serial number
-#ifdef STM32F4
-  #define HAS_STM32_UID                        1
-#endif
-
 //
 // Servos
 //

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
@@ -111,7 +111,7 @@ extends           = stm32_variant
 board             = marlin_opulo_lumen_rev3
 build_flags       = ${stm32_variant.build_flags}
   -DARDUINO_BLACK_F407VE
-  -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
+  -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS -DHAS_STM32_UID
 extra_scripts     = ${stm32_variant.extra_scripts}
 
 #
@@ -122,7 +122,7 @@ extends           = stm32_variant
 board             = marlin_opulo_lumen_rev4
 build_flags       = ${stm32_variant.build_flags}
   -DARDUINO_BLACK_F407VE
-  -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
+  -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS -DHAS_STM32_UID
 extra_scripts     = ${stm32_variant.extra_scripts}
 
 #