From 09fc9290bb383e24c70a1314830e060a76214bca Mon Sep 17 00:00:00 2001 From: Mestery Date: Wed, 12 Apr 2023 16:50:05 +0200 Subject: [PATCH 1/3] Undefine RADIOLIB_DEBUG_PRINT_BIN macro after use --- src/Module.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Module.cpp b/src/Module.cpp index d7197ab7..f4088330 100644 --- a/src/Module.cpp +++ b/src/Module.cpp @@ -181,6 +181,8 @@ int16_t Module::SPIsetRegValue(uint16_t reg, uint8_t value, uint8_t msb, uint8_t RADIOLIB_DEBUG_PRINT("read:\t\t0b"); RADIOLIB_DEBUG_PRINT_BIN(readValue); RADIOLIB_DEBUG_PRINTLN(); + + #undef RADIOLIB_DEBUG_PRINT_BIN return(RADIOLIB_ERR_SPI_WRITE_FAILED); #else From 27575b8c49528d35750476c88aa1c13678caf5ba Mon Sep 17 00:00:00 2001 From: Mestery Date: Wed, 12 Apr 2023 18:43:43 +0200 Subject: [PATCH 2/3] Remove RADIOLIB_DEBUG_PRINT_BIN --- src/Module.cpp | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/Module.cpp b/src/Module.cpp index f4088330..76d221dc 100644 --- a/src/Module.cpp +++ b/src/Module.cpp @@ -160,29 +160,16 @@ int16_t Module::SPIsetRegValue(uint16_t reg, uint8_t value, uint8_t msb, uint8_t } } - #if defined(RADIOLIB_DEBUG) && defined(RADIOLIB_BUILD_ARDUINO) - #define RADIOLIB_DEBUG_PRINT_BIN(x) RADIOLIB_DEBUG_PORT.println(x, BIN) - #else // no bin representation, fallback to hex - #define RADIOLIB_DEBUG_PRINT_BIN(x) RADIOLIB_DEBUG_PRINTLN("%X", x) - #endif - // check failed, print debug info RADIOLIB_DEBUG_PRINTLN(); RADIOLIB_DEBUG_PRINTLN("address:\t0x%X", reg); RADIOLIB_DEBUG_PRINTLN("bits:\t\t%d %d", msb, lsb); - RADIOLIB_DEBUG_PRINT("value:\t\t0b"); - RADIOLIB_DEBUG_PRINT_BIN(value); - RADIOLIB_DEBUG_PRINT("current:\t0b"); - RADIOLIB_DEBUG_PRINT_BIN(currentValue); - RADIOLIB_DEBUG_PRINT("mask:\t\t0b"); - RADIOLIB_DEBUG_PRINT_BIN(mask); - RADIOLIB_DEBUG_PRINT("new:\t\t0b"); - RADIOLIB_DEBUG_PRINT_BIN(newValue); - RADIOLIB_DEBUG_PRINT("read:\t\t0b"); - RADIOLIB_DEBUG_PRINT_BIN(readValue); + RADIOLIB_DEBUG_PRINT("value:\t\t0x%X", value); + RADIOLIB_DEBUG_PRINT("current:\t0x%X", currentValue); + RADIOLIB_DEBUG_PRINT("mask:\t\t0x%X", mask); + RADIOLIB_DEBUG_PRINT("new:\t\t0x%X", newValue); + RADIOLIB_DEBUG_PRINT("read:\t\t0x%X", readValue); RADIOLIB_DEBUG_PRINTLN(); - - #undef RADIOLIB_DEBUG_PRINT_BIN return(RADIOLIB_ERR_SPI_WRITE_FAILED); #else From 45e9fd44bb533c99f627c89455d0ebc9c62ffe0c Mon Sep 17 00:00:00 2001 From: Mestery Date: Wed, 12 Apr 2023 18:44:12 +0200 Subject: [PATCH 3/3] nitpick --- src/Module.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Module.cpp b/src/Module.cpp index 76d221dc..c7aa8bdc 100644 --- a/src/Module.cpp +++ b/src/Module.cpp @@ -168,8 +168,7 @@ int16_t Module::SPIsetRegValue(uint16_t reg, uint8_t value, uint8_t msb, uint8_t RADIOLIB_DEBUG_PRINT("current:\t0x%X", currentValue); RADIOLIB_DEBUG_PRINT("mask:\t\t0x%X", mask); RADIOLIB_DEBUG_PRINT("new:\t\t0x%X", newValue); - RADIOLIB_DEBUG_PRINT("read:\t\t0x%X", readValue); - RADIOLIB_DEBUG_PRINTLN(); + RADIOLIB_DEBUG_PRINTLN("read:\t\t0x%X", readValue); return(RADIOLIB_ERR_SPI_WRITE_FAILED); #else