Fix merge error

henrikekblad · henrikekblad · commit 8b6463608a0e · 2015-02-17T22:28:47.000+01:00
diff --git a/libraries/MySensors/MySensor.cpp b/libraries/MySensors/MySensor.cpp
@@ -413,7 +413,7 @@ boolean MySensor::process() {
 				// Wait a random delay of 0-2 seconds to minimize collision
 				// between ping ack messages from other relaying nodes
 				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) {
 			// We should try to relay this message to another node

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ boolean MySensor::process() {`
`413`	`413`	`// Wait a random delay of 0-2 seconds to minimize collision`
`414`	`414`	`// between ping ack messages from other relaying nodes`
`415`	`415`	`delay(millis() & 0x3ff);`
`416`		`- sendWrite(BROADCAST_ADDRESS, build(msg, nc.nodeId, sender, NODE_SENSOR_ID, C_INTERNAL, I_FIND_PARENT_RESPONSE, false).set(nc.distance));`
	`416`	`+ sendWrite(sender, build(msg, nc.nodeId, sender, NODE_SENSOR_ID, C_INTERNAL, I_FIND_PARENT_RESPONSE, false).set(nc.distance));`
`417`	`417`	`}`
`418`	`418`	`} else if (to == nc.nodeId) {`
`419`	`419`	`// We should try to relay this message to another node`