From 8caabacfa7968f86f7aba40fe6dd99d04b54141b Mon Sep 17 00:00:00 2001 From: Gabriel Zerbib Date: Sat, 13 Jun 2026 19:35:12 +0200 Subject: [PATCH 1/2] Add printf to SimpleFOCDebug --- src/communication/SimpleFOCDebug.cpp | 10 ++++++++ src/communication/SimpleFOCDebug.h | 38 +++++++++++++++++++++++----- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/src/communication/SimpleFOCDebug.cpp b/src/communication/SimpleFOCDebug.cpp index 4d50b87c5..f7035f0a1 100644 --- a/src/communication/SimpleFOCDebug.cpp +++ b/src/communication/SimpleFOCDebug.cpp @@ -122,4 +122,14 @@ void SimpleFOCDebug::println() { } } +void SimpleFOCDebug::printf(const char* msg, ...) +{ + va_list ap; + va_start(ap, msg); + if (_debugPrint != NULL) { + _debugPrint->vprintf(msg, ap); + } + va_end(ap); +} + #endif \ No newline at end of file diff --git a/src/communication/SimpleFOCDebug.h b/src/communication/SimpleFOCDebug.h index c63b77af4..c9eb7cbb4 100644 --- a/src/communication/SimpleFOCDebug.h +++ b/src/communication/SimpleFOCDebug.h @@ -34,7 +34,35 @@ // #define SIMPLEFOC_DISABLE_DEBUG -#ifndef SIMPLEFOC_DISABLE_DEBUG +#ifdef SIMPLEFOC_DISABLE_DEBUG +class SimpleFOCDebug { +public: + inline static void enable(Print* debugPrint){} + + inline static void println(const __FlashStringHelper* msg){} + inline static void println(const StringSumHelper msg){} + inline static void println(const char* msg){} + inline static void println(const __FlashStringHelper* msg, float val){} + inline static void println(const char* msg, float val){} + inline static void println(const __FlashStringHelper* msg, int val){} + inline static void println(const char* msg, int val){} + inline static void println(const char* msg, char val){} + inline static void println(){} + inline static void println(int val){} + inline static void println(float val){} + + inline static void print(const char* msg){} + inline static void print(const __FlashStringHelper* msg){} + inline static void print(const StringSumHelper msg){} + inline static void print(int val){} + inline static void print(float val){} + + static void printf(const char* msg, ...){} +}; + +#define SIMPLEFOC_DEBUG(msg, ...) + +#else class SimpleFOCDebug { public: @@ -58,19 +86,15 @@ class SimpleFOCDebug { static void print(int val); static void print(float val); + static void printf(const char* msg, ...); + protected: static Print* _debugPrint; }; - #define SIMPLEFOC_DEBUG(msg, ...) \ SimpleFOCDebug::println(F(msg), ##__VA_ARGS__) -#else //ifndef SIMPLEFOC_DISABLE_DEBUG - -#define SIMPLEFOC_DEBUG(msg, ...) - - #endif //ifndef SIMPLEFOC_DISABLE_DEBUG #endif From 17001cacb5157988d88e3528fe8ddae523b6a510 Mon Sep 17 00:00:00 2001 From: Gabriel Zerbib Date: Fri, 2 Oct 2026 12:27:46 +0200 Subject: [PATCH 2/2] Remove SimpleFOCDebug::printf --- src/communication/SimpleFOCDebug.cpp | 11 ----------- src/communication/SimpleFOCDebug.h | 4 ---- 2 files changed, 15 deletions(-) diff --git a/src/communication/SimpleFOCDebug.cpp b/src/communication/SimpleFOCDebug.cpp index f7035f0a1..4b0ae9dea 100644 --- a/src/communication/SimpleFOCDebug.cpp +++ b/src/communication/SimpleFOCDebug.cpp @@ -121,15 +121,4 @@ void SimpleFOCDebug::println() { _debugPrint->println(); } } - -void SimpleFOCDebug::printf(const char* msg, ...) -{ - va_list ap; - va_start(ap, msg); - if (_debugPrint != NULL) { - _debugPrint->vprintf(msg, ap); - } - va_end(ap); -} - #endif \ No newline at end of file diff --git a/src/communication/SimpleFOCDebug.h b/src/communication/SimpleFOCDebug.h index c9eb7cbb4..dc1d4e303 100644 --- a/src/communication/SimpleFOCDebug.h +++ b/src/communication/SimpleFOCDebug.h @@ -56,8 +56,6 @@ class SimpleFOCDebug { inline static void print(const StringSumHelper msg){} inline static void print(int val){} inline static void print(float val){} - - static void printf(const char* msg, ...){} }; #define SIMPLEFOC_DEBUG(msg, ...) @@ -86,8 +84,6 @@ class SimpleFOCDebug { static void print(int val); static void print(float val); - static void printf(const char* msg, ...); - protected: static Print* _debugPrint; };