From de896e1827e8b647f7216ae27e6f7288af0a6103 Mon Sep 17 00:00:00 2001 From: tekka007 Date: Mon, 8 Aug 2016 17:48:07 +0200 Subject: [PATCH] Set protocol version in MyMessage::clear() --- core/MyMessage.cpp | 5 ++++- core/MyMessage.h | 3 +++ core/MyTransport.cpp | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/core/MyMessage.cpp b/core/MyMessage.cpp index 027b273..1f330de 100644 --- a/core/MyMessage.cpp +++ b/core/MyMessage.cpp @@ -44,7 +44,10 @@ void MyMessage::clear() command_ack_payload = 0u; type = 0u; sensor = 0u; - (void)memset(data, 0u, sizeof(data)); + (void)memset(data, 0u, sizeof(data)); + + // set message protocol version + miSetVersion(PROTOCOL_VERSION); } bool MyMessage::isAck() const { diff --git a/core/MyMessage.h b/core/MyMessage.h index aa84b49..6f74e52 100644 --- a/core/MyMessage.h +++ b/core/MyMessage.h @@ -257,6 +257,9 @@ typedef enum { #define miSetLength(_length) BF_SET(version_length, _length, 3, 5) //!< Internal setter for length field #define miGetLength() ((uint8_t)BF_GET(version_length, 3, 5)) //!< Internal getter for length field +#define miSetVersion(_version) BF_SET(version_length, _version, 0, 2) //!< Internal setter for version field +#define miGetVersion() ((uint8_t)BF_GET(version_length, 0, 2)) //!< Internal getter for version field + #define miSetRequestAck(_rack) BF_SET(command_ack_payload, _rack, 3, 1) //!< Internal setter for ack-request field #define miGetRequestAck() ((bool)BF_GET(command_ack_payload, 3, 1)) //!< Internal getter for ack-request field diff --git a/core/MyTransport.cpp b/core/MyTransport.cpp index a54c34d..da00b61 100644 --- a/core/MyTransport.cpp +++ b/core/MyTransport.cpp @@ -692,8 +692,7 @@ inline void transportProcessFIFO() { } bool transportSendWrite(uint8_t to, MyMessage &message) { - // set protocol version and update last - mSetVersion(message, PROTOCOL_VERSION); + // Update last message.last = _nc.nodeId; // sign message if required