From 29cc42ba37712201aa9a3833c2f0620c9ac572ee Mon Sep 17 00:00:00 2001 From: Henrik Ekblad Date: Wed, 30 Dec 2015 16:28:00 +0100 Subject: [PATCH 1/2] Internal messages send from gateway to controller should use sensor id 255 --- libraries/MySensors/core/MySensorCore.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/MySensors/core/MySensorCore.h b/libraries/MySensors/core/MySensorCore.h index 120dc3c..4d2c92e 100644 --- a/libraries/MySensors/core/MySensorCore.h +++ b/libraries/MySensors/core/MySensorCore.h @@ -248,7 +248,7 @@ static inline MyMessage& build(MyMessage &msg, uint8_t sender, uint8_t destinati static inline MyMessage& buildGw(MyMessage &msg, uint8_t type) { msg.sender = GATEWAY_ADDRESS; msg.destination = GATEWAY_ADDRESS; - msg.sensor = 0; + msg.sensor = 255; msg.type = type; mSetCommand(msg, C_INTERNAL); mSetRequestAck(msg, false); From e5eb779457a24a31b91c1c97eb2548ce80398d68 Mon Sep 17 00:00:00 2001 From: Henrik Ekblad Date: Wed, 30 Dec 2015 18:22:44 +0100 Subject: [PATCH 2/2] Fix sensor-id for debug prints --- libraries/MySensors/core/MyHwATMega328.cpp | 2 +- libraries/MySensors/core/MyHwESP8266.cpp | 2 +- libraries/MySensors/core/MyHwSAMD.cpp | 2 +- libraries/MySensors/core/MySigningAtsha204.cpp | 2 +- libraries/MySensors/core/MySigningAtsha204Soft.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/MySensors/core/MyHwATMega328.cpp b/libraries/MySensors/core/MyHwATMega328.cpp index 49205db..0a0bcc9 100644 --- a/libraries/MySensors/core/MyHwATMega328.cpp +++ b/libraries/MySensors/core/MyHwATMega328.cpp @@ -187,7 +187,7 @@ void hwDebugPrint(const char *fmt, ... ) { char fmtBuffer[300]; #ifdef MY_GATEWAY_FEATURE // prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE) - snprintf_P(fmtBuffer, 299, PSTR("0;0;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE); + snprintf_P(fmtBuffer, 299, PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE); Serial.print(fmtBuffer); #endif va_list args; diff --git a/libraries/MySensors/core/MyHwESP8266.cpp b/libraries/MySensors/core/MyHwESP8266.cpp index 33f615e..946210a 100644 --- a/libraries/MySensors/core/MyHwESP8266.cpp +++ b/libraries/MySensors/core/MyHwESP8266.cpp @@ -124,7 +124,7 @@ void hwDebugPrint(const char *fmt, ... ) { char fmtBuffer[300]; #ifdef MY_GATEWAY_FEATURE // prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE) - snprintf_P(fmtBuffer, 299, PSTR("0;0;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE); + snprintf_P(fmtBuffer, 299, PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE); Serial.print(fmtBuffer); #endif va_list args; diff --git a/libraries/MySensors/core/MyHwSAMD.cpp b/libraries/MySensors/core/MyHwSAMD.cpp index 8fda54f..01fc802 100644 --- a/libraries/MySensors/core/MyHwSAMD.cpp +++ b/libraries/MySensors/core/MyHwSAMD.cpp @@ -140,7 +140,7 @@ void hwDebugPrint(const char *fmt, ... ) { char fmtBuffer[300]; #ifdef MY_GATEWAY_FEATURE // prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE) - snprintf(fmtBuffer, 299, PSTR("0;0;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE); + snprintf(fmtBuffer, 299, PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE); SERIALDEVICE.print(fmtBuffer); #endif va_list args; diff --git a/libraries/MySensors/core/MySigningAtsha204.cpp b/libraries/MySensors/core/MySigningAtsha204.cpp index 9d57d6e..d62c6a0 100644 --- a/libraries/MySensors/core/MySigningAtsha204.cpp +++ b/libraries/MySensors/core/MySigningAtsha204.cpp @@ -62,7 +62,7 @@ static void DEBUG_SIGNING_PRINTBUF(const __FlashStringHelper* str, uint8_t* buf, static char printBuffer[300]; #ifdef MY_GATEWAY_FEATURE // prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE) - snprintf_P(printBuffer, 299, PSTR("0;0;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE); + snprintf_P(printBuffer, 299, PSTR("0;255;%d;0;%d;"), C_INTERNAL, I_LOG_MESSAGE); SERIALDEVICE.print(printBuffer); #endif for (int i=0; i