Refine debug macros and timer API cleanup

Modernizes debug utilities by switching DEBUG_* location reporting to `std::source_location`, cleaning up formatting, and tightening dump/bit-print helpers. It also improves type safety in `printf` calls with explicit unsigned casts, adds extra status LED debug traces, and performs a small SoftwareTimers API/implementation cleanup (using aliases, clearer parameter names, and clearer local variable naming) without changing behaviour.

Author: vanvught

common/include/firmware/debug/debug_debug.h

@@ -2,58 +2,54 @@
  * @file debug_debug.h
  *
  */
-/* Copyright (C) 2018-2025 by Arjan van Vught mailto:info@gd32-dmx.org */
+/* Copyright (C) 2018-2026 by Arjan van Vught mailto:info@gd32-dmx.org */
 
 #ifndef FIRMWARE_DEBUG_DEBUG_H_
 #define FIRMWARE_DEBUG_DEBUG_H_
 
 #if !defined(NDEBUG)
 #include <cstdio>
+#include <source_location>
 
-#define DEBUG_ENTRY()                                          \
-    do                                                         \
-    {                                                          \
-        printf("-> %s:%s:%d\n", __FILE__, __func__, __LINE__); \
+#define DEBUG_ENTRY()                                                                                      \
+    do {                                                                                                   \
+        const std::source_location loc = std::source_location::current();                                  \
+        printf("-> %s(%u):%s\n", loc.file_name(), static_cast<unsigned>(loc.line()), loc.function_name()); \
     } while (0)
 
-#define DEBUG_EXIT()                                           \
-    do                                                         \
-    {                                                          \
-        printf("<- %s:%s:%d\n", __FILE__, __func__, __LINE__); \
+#define DEBUG_EXIT()                                                                                       \
+    do {                                                                                                   \
+        const std::source_location loc = std::source_location::current();                                  \
+        printf("<- %s(%u):%s\n", loc.file_name(), static_cast<unsigned>(loc.line()), loc.function_name()); \
     } while (0)
 
-#define DEBUG_PRINTF(fmt, ...)                                                                    \
-    do                                                                                            \
-    {                                                                                             \
-        printf("%s() %s:%d: " fmt "\n", __func__, __FILE__, __LINE__ __VA_OPT__(, ) __VA_ARGS__); \
+#define DEBUG_PRINTF(fmt, ...)                                                                                                                   \
+    do {                                                                                                                                         \
+        const std::source_location loc = std::source_location::current();                                                                        \
+        printf("   %s(%u):%s: " fmt "\n", loc.file_name(), static_cast<unsigned>(loc.line()), loc.function_name() __VA_OPT__(, ) __VA_ARGS__); \
     } while (0)
 
 #define DEBUG_PUTS(msg)            \
-    do                             \
-    {                              \
+    do {                           \
         DEBUG_PRINTF("%s", (msg)); \
     } while (0)
 
 #else
 
 #define DEBUG_ENTRY() \
-    do                \
-    {                 \
+    do {              \
     } while (0)
 
 #define DEBUG_EXIT() \
-    do               \
-    {                \
+    do {             \
     } while (0)
 
 #define DEBUG_PRINTF(...) \
-    do                    \
-    {                     \
+    do {                  \
     } while (0)
 
 #define DEBUG_PUTS(...) \
-    do                  \
-    {                   \
+    do {                \
     } while (0)
 
 #endif

common/include/firmware/debug/debug_dump.h

@@ -30,35 +30,26 @@
 #include <cstdio>
 #include <ctype.h>
 
-#if defined(H3)
-namespace uart0 {
-int Printf(const char* fmt, ...);
-}
-#define printf uart0::Printf // NOLINT
-#endif
-
 namespace debug {
-namespace dump {
-inline constexpr uint32_t kCharsPerLine = 16;
-}
 #ifdef NDEBUG
 static inline void Dump([[maybe_unused]] const void* data, [[maybe_unused]] uint32_t size) {}
 #else
 inline void Dump(const void* data, uint32_t size) {
-    uint32_t chars = 0;
+    constexpr uint32_t kCharsPerLine = 16;
+    constexpr uint32_t kBytesPerGroup = 8; // Visual separator every 8 bytes
     const auto* ptr = reinterpret_cast<const uint8_t*>(data);
+    uint32_t chars = 0;
 
-    printf("%p:%u\n", data, static_cast<int>(size));
+    printf("%p:%u\n", data, static_cast<unsigned>(size));
 
     do {
-        uint32_t chars_this_line = 0;
-
         printf("%04x ", static_cast<unsigned>(chars));
 
-        const auto* q = ptr;
+        uint32_t chars_this_line = 0;
+        const auto* line_start_ptr = ptr;
 
-        while ((chars_this_line < dump::kCharsPerLine) && (chars < size)) {
-            if (chars_this_line % 8 == 0) {
+        while ((chars_this_line < kCharsPerLine) && (chars < size)) {
+            if (chars_this_line % kBytesPerGroup == 0) {
                 printf(" ");
             }
 
@@ -71,8 +62,8 @@ inline void Dump(const void* data, uint32_t size) {
 
         auto chars_dot_line = chars_this_line;
 
-        for (; chars_this_line < dump::kCharsPerLine; chars_this_line++) {
-            if (chars_this_line % 8 == 0) {
+        for (; chars_this_line < kCharsPerLine; chars_this_line++) {
+            if (chars_this_line % kBytesPerGroup == 0) {
                 printf(" ");
             }
             printf("   ");
@@ -81,19 +72,19 @@ inline void Dump(const void* data, uint32_t size) {
         chars_this_line = 0;
 
         while (chars_this_line < chars_dot_line) {
-            if (chars_this_line % 8 == 0) {
+            if (chars_this_line % kBytesPerGroup == 0) {
                 printf(" ");
             }
 
-            int ch = *q;
-            if (isprint(ch)) {
-                printf("%c", ch);
+            int character = *line_start_ptr;
+            if (0 != isprint(character)) {
+                printf("%c", character);
             } else {
                 printf(".");
             }
 
             chars_this_line++;
-            q++;
+            line_start_ptr++;
         }
 
         puts("");

common/include/firmware/debug/debug_printbits.h

@@ -2,54 +2,43 @@
  * @file debug_printbits.h
  *
  */
- /* Copyright (C) 2025 by Arjan van Vught mailto:info@gd32-dmx.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
-
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
-
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
+/* Copyright (C) 2025-2026 by Arjan van Vught mailto:info@gd32-dmx.org
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*/
 
 #ifndef COMMON_DEBUG_DEBUG_PRINTBITS_H_
 #define COMMON_DEBUG_DEBUG_PRINTBITS_H_
 
 #include <cstdio>
 #include <cstdint>
 
-#if defined(H3)
-namespace uart0
-{
-int Printf(const char* fmt, ...);
-}
-#define printf uart0::Printf // NOLINT
-#endif
-
-namespace debug
-{
+namespace debug {
 #ifdef NDEBUG
 inline void PrintBits([[maybe_unused]] uint32_t u) {}
 #else
 inline void PrintBits(uint32_t u) {
-	printf("%.8x ", u);
+    printf("%.8x ", u);
     uint32_t b = 1U << 31;
 
-    for (uint32_t i = 0; i < 32; i++)
-    {
-        if ((b & u) == b)
-        {
+    for (uint32_t i = 0; i < 32; i++) {
+        if ((b & u) == b) {
             uint32_t bit_number = 31 - i;
             printf("%-2d ", bit_number);
         }

lib-board/src/board_statusled.cpp

@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include <concepts>
 #if defined(DEBUG_HAL)
 #undef NDEBUG
 #endif
@@ -43,10 +44,12 @@ enum class ModeToFrequency { kOffOff = 0, kNormal = 1, kData = 3, kFast = 5, kRe
 #if !defined(CONFIG_HAL_USE_MINIMUM)
 
 void __attribute__((weak)) Event([[maybe_unused]] Mode mode) {
-    DEBUG_PRINTF("mode=%u", static_cast<uint32_t>(mode));
+    DEBUG_PRINTF("mode=%u", static_cast<unsigned>(mode));
 }
 
 void SetModeWithLock(Mode mode, bool do_lock) {
+	DEBUG_PRINTF("mode=%u, do_lock=%c", static_cast<unsigned>(mode), do_lock ? 'Y' : 'N');
+	
     s_do_lock = false;
     SetMode(mode);
     s_do_lock = do_lock;
@@ -56,6 +59,8 @@ void SetMode(board::statusled::Mode mode) {
     if (s_do_lock || (global::g_status_led_mode == mode)) {
         return;
     }
+	
+	DEBUG_PRINTF("mode=%u", static_cast<unsigned>(mode));
 
     global::g_status_led_mode = mode;
 
@@ -85,7 +90,7 @@ void SetMode(board::statusled::Mode mode) {
 
     board::statusled::Event(global::g_status_led_mode);
 
-    DEBUG_PRINTF("global::g_status_led_mode=%u", static_cast<uint32_t>(global::g_status_led_mode));
+    DEBUG_PRINTF("global::g_status_led_mode=%u", static_cast<unsigned>(global::g_status_led_mode));
 }
 #endif
 } // namespace board::statusled

lib-ddp/src/ddpdisplay.cpp

@@ -295,7 +295,7 @@ void DdpDisplay::Input(const uint8_t* buffer, uint32_t size, [[maybe_unused]] ui
 
 void DdpDisplay::Print() {
     puts("DDP Display");
-    printf(" Count             : %u\n", count_);
-    printf(" Channels per pixel: %u\n", GetChannelsPerPixel());
-    printf(" Active ports      : %u\n", active_ports_);
+    printf(" Count             : %u\n", static_cast<unsigned>(count_));
+    printf(" Channels per pixel: %u\n", static_cast<unsigned>(GetChannelsPerPixel()));
+    printf(" Active ports      : %u\n", static_cast<unsigned>(active_ports_));
 }

lib-remoteconfig/http/content/modern/config_ltc.js

@@ -184,17 +184,6 @@ function validateLtcForm(values, root) {
         return false;
     }
 
-    const fps = Number(values.fps);
-    const start = timecodeTotal(values.start_hour, values.start_minute, values.start_second, values.start_frame, fps);
-    const stop = timecodeTotal(values.stop_hour, values.stop_minute, values.stop_second, values.stop_frame, fps);
-
-    if (stop <= start) {
-        const stopFrame = root.querySelector("[data-key='stop_frame']");
-        stopFrame.setCustomValidity("Stop timecode must be greater than start timecode.");
-        stopFrame.reportValidity();
-        return false;
-    }
-
     return true;
 }
 

lib-remoteconfig/src/httpd/httpdhandlerequest.cpp

@@ -564,7 +564,7 @@ http::Status HttpDeamonHandleRequest::HandlePostUpload() {
     auto part_uri = &uri_[7];
 
     if (memcmp(part_uri, "_start", 7) == 0) {
-        printf("Firmware: %s -> %u bytes\n", upload_filename_, upload_size_);
+        printf("Firmware: %s -> %u bytes\n", upload_filename_, static_cast<unsigned>(upload_size_));
 
         if (strncmp(upload_filename_, firmware::kFileName, sizeof(upload_filename_)) != 0) {
             puts("Wrong firmware file name.");
@@ -598,7 +598,7 @@ http::Status HttpDeamonHandleRequest::HandlePostUpload() {
             Display::Get()->Progress();
 
             uint32_t data_written;
-            printf("%u\n", request_data_length_);
+            printf("%u\n", static_cast<unsigned>(request_data_length_));
             if (!(FlashCodeInstall::Get()->WriteChunk(reinterpret_cast<uint8_t*>(file_data_), request_data_length_, data_written))) {
                 DEBUG_PRINTF("WriteChunk failed. Data written:%u bytes", data_written);
                 DEBUG_EXIT();
@@ -620,7 +620,7 @@ http::Status HttpDeamonHandleRequest::HandlePostUpload() {
             return http::Status::kInternalServerError;
         }
 
-        printf("Written bytes -> %u [%s]\n", write_count, write_count == upload_size_ ? "Ok" : "Wrong");
+        printf("Written bytes -> %u [%s]\n", static_cast<unsigned>(write_count), write_count == upload_size_ ? "Ok" : "Wrong");
 
         content_size_ = static_cast<uint32_t>(snprintf(dynamic_content_, sizeof(dynamic_content_), "{\"status\":\"ok\"}"));
         content_ = reinterpret_cast<uint8_t*>(dynamic_content_);

lib-superloop/include/superloop/softwaretimers.h

@@ -35,14 +35,14 @@ static constexpr uint32_t kSoftwareTimersMax =
     12;
 #endif
 
-typedef int32_t TimerHandle_t;
-typedef void (*TimerCallbackFunction_t)(TimerHandle_t);
+using TimerHandle_t = int32_t;
+using TimerCallbackFunction_t = void (*)(TimerHandle_t);
 
 inline constexpr TimerHandle_t kTimerIdNone = -1;
 
-TimerHandle_t SoftwareTimerAdd(uint32_t interval_millis, const TimerCallbackFunction_t kCallback);
-bool SoftwareTimerDelete(TimerHandle_t& id);
-bool SoftwareTimerChange(TimerHandle_t id, uint32_t interval_millis);
+TimerHandle_t SoftwareTimerAdd(uint32_t interval_millis,  TimerCallbackFunction_t k_callback);
+bool SoftwareTimerDelete(TimerHandle_t& handle);
+bool SoftwareTimerChange(TimerHandle_t handle, uint32_t interval_millis);
 
 void SoftwareTimerRun();