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

respond to a I_FIND_PARENT after findParentNode()

Browse Source 
When a repeater receives a I_FIND_PARENT, it first update the
nc.distance if is invalid and then respond the request
This commit is contained in:
Marcelo Aquino
2015-07-28 11:32:52 -03:00
parent fcb92436d9
commit a22f712d60
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/MySensor.cpp
+11 -8
View File
@@ -781,14 +781,17 @@ boolean MySensor::process() {
// If this node have an id, relay the message // If this node have an id, relay the message
if (command == C_INTERNAL && type == I_FIND_PARENT) { if (command == C_INTERNAL && type == I_FIND_PARENT) {
if (nc.distance == DISTANCE_INVALID) { if (sender != nc.parentNodeId) {
findParentNode(); if (nc.distance == DISTANCE_INVALID)
} else if (sender != nc.parentNodeId) { findParentNode();
// Relaying nodes should always answer ping messages
// Wait a random delay of 0-2 seconds to minimize collision if (nc.distance != DISTANCE_INVALID) {
// between ping ack messages from other relaying nodes // Relaying nodes should always answer ping messages
wait(hw_millis() & 0x3ff); // Wait a random delay of 0-2 seconds to minimize collision
sendWrite(sender, build(msg, nc.nodeId, sender, NODE_SENSOR_ID, C_INTERNAL, I_FIND_PARENT_RESPONSE, false).set(nc.distance)); // between ping ack messages from other relaying nodes
wait(hw_millis() & 0x3ff);
sendWrite(sender, build(msg, nc.nodeId, sender, NODE_SENSOR_ID, C_INTERNAL, I_FIND_PARENT_RESPONSE, false).set(nc.distance));
}
} }
} else if (to == nc.nodeId) { } else if (to == nc.nodeId) {
// We should try to relay this message to another node // We should try to relay this message to another node