diff --git a/libraries/MySensors/MyConfig.h b/libraries/MySensors/MyConfig.h index ac9d1df..19648a3 100644 --- a/libraries/MySensors/MyConfig.h +++ b/libraries/MySensors/MyConfig.h @@ -35,10 +35,16 @@ // final sketch but is helpful to see what is actually is happening during development //#define MY_DEBUG -// Enable MY_DEBUG_VERBOSE flag for verbose debug prints. Requires DEBUG to be enabled. +// Enable MY_DEBUG_VERBOSE flag for verbose debug prints related to RF24 radio. +// Requires DEBUG to be enabled. // This will add even more to the size of the final sketch! //#define MY_DEBUG_VERBOSE +// Enable MY_DEBUG_VERBOSE_SIGNING flag for verbose debug prints related to signing. +// Requires DEBUG to be enabled. +// This will add even more to the size of the final sketch! +//#define MY_DEBUG_VERBOSE_SIGNING + // Enable this in sketch if you want to use TX(1), RX(0) as normal I/O pin //#define MY_DISABLED_SERIAL diff --git a/libraries/MySensors/core/MySigning.cpp b/libraries/MySensors/core/MySigning.cpp index 7d297e2..2d0225c 100644 --- a/libraries/MySensors/core/MySigning.cpp +++ b/libraries/MySensors/core/MySigning.cpp @@ -24,7 +24,7 @@ #define SIGNING_PRESENTATION_REQUIRE_SIGNATURES (1 << 0) #define SIGNING_PRESENTATION_REQUIRE_WHITELISTING (1 << 1) -#if defined(MY_DEBUG_VERBOSE) +#if defined(MY_DEBUG_VERBOSE_SIGNING) #define SIGN_DEBUG(x,...) debug(x, ##__VA_ARGS__) #else #define SIGN_DEBUG(x,...) diff --git a/libraries/MySensors/core/MySigningAtsha204.cpp b/libraries/MySensors/core/MySigningAtsha204.cpp index bd47d0d..b5ac3ca 100644 --- a/libraries/MySensors/core/MySigningAtsha204.cpp +++ b/libraries/MySensors/core/MySigningAtsha204.cpp @@ -29,7 +29,7 @@ #define SIGNING_IDENTIFIER (1) -// Define MY_DEBUG_VERBOSE in your sketch to enable signing backend debugprints +// Define MY_DEBUG_VERBOSE_SIGNING in your sketch to enable signing backend debugprints ATSHA204Class atsha204(MY_SIGNING_ATSHA204_PIN); unsigned long _signing_timestamp; @@ -48,7 +48,7 @@ static void signerCalculateSignature(MyMessage &msg); static uint8_t* signerSha256(const uint8_t* data, size_t sz); -#ifdef MY_DEBUG_VERBOSE +#ifdef MY_DEBUG_VERBOSE_SIGNING static char i2h(uint8_t i) { uint8_t k = i & 0x0F; diff --git a/libraries/MySensors/core/MySigningAtsha204Soft.cpp b/libraries/MySensors/core/MySigningAtsha204Soft.cpp index c0a2234..2940d09 100644 --- a/libraries/MySensors/core/MySigningAtsha204Soft.cpp +++ b/libraries/MySensors/core/MySigningAtsha204Soft.cpp @@ -33,7 +33,7 @@ #define SIGNING_IDENTIFIER (1) -// Define MY_DEBUG_VERBOSE in your sketch to enable signing backend debugprints +// Define MY_DEBUG_VERBOSE_SIGNING in your sketch to enable signing backend debugprints Sha256Class _signing_sha256; unsigned long _signing_timestamp; @@ -51,7 +51,7 @@ const uint8_t _signing_node_serial_info[SHA204_SERIAL_SZ] = {MY_SIGNING_SOFT_SER static void signerCalculateSignature(MyMessage &msg); -#ifdef MY_DEBUG_VERBOSE +#ifdef MY_DEBUG_VERBOSE_SIGNING static char i2h(uint8_t i) { uint8_t k = i & 0x0F; diff --git a/libraries/MySensors/examples/SecureActuator/SecureActuator.ino b/libraries/MySensors/examples/SecureActuator/SecureActuator.ino index aedcd71..3e6c6bb 100644 --- a/libraries/MySensors/examples/SecureActuator/SecureActuator.ino +++ b/libraries/MySensors/examples/SecureActuator/SecureActuator.ino @@ -43,6 +43,7 @@ */ #define MY_DEBUG //!< Enable debug prints to serial monitor +#define MY_DEBUG_VERBOSE_SIGNING //!< Enable signing related debug prints to serial monitor // Enable and select radio type attached #define MY_RADIO_NRF24 //!< NRF24L01 radio driver diff --git a/libraries/MySensors/keywords.txt b/libraries/MySensors/keywords.txt index 3ee0f8a..257dcbf 100644 --- a/libraries/MySensors/keywords.txt +++ b/libraries/MySensors/keywords.txt @@ -32,6 +32,8 @@ smartSleep KEYWORD2 AUTO LITERAL1 MY_DEBUG LITERAL1 MY_CORE_ONLY LITERAL1 +MY_DEBUG_VERBOSE LITERAL1 +MY_DEBUG_VERBOSE_SIGNING LITERAL1 MY_REPEATER_FEATURE LITERAL1 MY_RADIO_NRF24 LITERAL1 MY_RADIO_RFM69 LITERAL1