MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set protocol version in MyMessage::clear()

Browse Source
This commit is contained in:
tekka007
2016-08-08 17:54:05 +02:00
parent 2d7b1a87b8
commit de896e1827
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/MyMessage.cpp
+4 -1
View File
@@ -44,7 +44,10 @@ void MyMessage::clear()
command_ack_payload = 0u; command_ack_payload = 0u;
type = 0u; type = 0u;
sensor = 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 { bool MyMessage::isAck() const {
core/MyMessage.h
+3
View File
@@ -257,6 +257,9 @@ typedef enum {
#define miSetLength(_length) BF_SET(version_length, _length, 3, 5) //!< Internal setter for length field #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 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 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 #define miGetRequestAck() ((bool)BF_GET(command_ack_payload, 3, 1)) //!< Internal getter for ack-request field
core/MyTransport.cpp
+1 -2
View File
@@ -692,8 +692,7 @@ inline void transportProcessFIFO() {
} }
bool transportSendWrite(uint8_t to, MyMessage &message) { bool transportSendWrite(uint8_t to, MyMessage &message) {
// set protocol version and update last // Update last
mSetVersion(message, PROTOCOL_VERSION);
message.last = _nc.nodeId; message.last = _nc.nodeId;
// sign message if required // sign message if required