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

Merge pull request #300 from tekka007/heartbeatfix

Browse Source 
Heartbeat enhancement
This commit is contained in:
tekka007
2015-12-16 11:55:46 +01:00
parent aea6e74754 56c9311424
commit 9e8d0cfa02
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/core/MySensorCore.cpp
+5 -4
View File
@@ -28,7 +28,7 @@ MyMessage _msgTmp; // Buffer for temporary messages (acks and nonces among other
char _convBuf[MAX_PAYLOAD*2+1]; char _convBuf[MAX_PAYLOAD*2+1];
#endif #endif
uint16_t _heartbeat; uint32_t _heartbeat = 0;
void (*_timeCallback)(unsigned long); // Callback for requested time messages void (*_timeCallback)(unsigned long); // Callback for requested time messages
@@ -188,6 +188,8 @@ ControllerConfig getConfig() {
boolean _sendRoute(MyMessage &message) { boolean _sendRoute(MyMessage &message) {
// increment heartbeat counter
_heartbeat++;
#if defined(MY_GATEWAY_FEATURE) #if defined(MY_GATEWAY_FEATURE)
if (message.destination == _nc.nodeId) { if (message.destination == _nc.nodeId) {
// This is a message sent from a sensor attached on the gateway node. // This is a message sent from a sensor attached on the gateway node.
@@ -215,7 +217,7 @@ void sendBatteryLevel(uint8_t value, bool enableAck) {
} }
void sendHeartbeat(void) { void sendHeartbeat(void) {
_sendRoute(build(_msg, _nc.nodeId, GATEWAY_ADDRESS, NODE_SENSOR_ID, C_INTERNAL, I_HEARTBEAT_RESPONSE, false).set(_heartbeat++)); _sendRoute(build(_msg, _nc.nodeId, GATEWAY_ADDRESS, NODE_SENSOR_ID, C_INTERNAL, I_HEARTBEAT_RESPONSE, false).set(_heartbeat));
} }
@@ -271,8 +273,7 @@ void _processInternalMessages() {
presentation(); presentation();
} }
} else if (type == I_HEARTBEAT) { } else if (type == I_HEARTBEAT) {
// Send heartbeat ack message back to sender (with the same payload) sendHeartbeat();
_sendRoute(build(_msg, _nc.nodeId, _msg.sender, _msg.sensor, C_INTERNAL, I_HEARTBEAT_RESPONSE, false).set(_heartbeat++));
} else if (type == I_TIME && receiveTime) { } else if (type == I_TIME && receiveTime) {
// Deliver time to callback // Deliver time to callback
if (receiveTime) if (receiveTime)