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

Fix merge error

Browse Source
This commit is contained in:
Henrik Ekblad
2015-02-17 22:28:47 +01:00
parent 75ea4bc26a
commit 8b6463608a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/MySensor.cpp
+1 -1
View File
@@ -413,7 +413,7 @@ boolean MySensor::process() {
// Wait a random delay of 0-2 seconds to minimize collision // Wait a random delay of 0-2 seconds to minimize collision
// between ping ack messages from other relaying nodes // between ping ack messages from other relaying nodes
delay(millis() & 0x3ff); delay(millis() & 0x3ff);
sendWrite(BROADCAST_ADDRESS, build(msg, nc.nodeId, sender, NODE_SENSOR_ID, C_INTERNAL, I_FIND_PARENT_RESPONSE, false).set(nc.distance)); 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