fix a possible parent repeater loop

Marcelo Aquino · Marcelo Aquino · commit 6b76eb3df6ac · 2015-01-30T18:39:09.000-02:00
diff --git a/libraries/MySensors/MyGateway.cpp b/libraries/MySensors/MyGateway.cpp
@@ -47,6 +47,7 @@ void MyGateway::begin(rf24_pa_dbm_e paLevel, uint8_t channel, rf24_datarate_e da
 	}
 
 	nc.nodeId = 0;
+	nc.parentNodeId = 0;
 	nc.distance = 0;
 	inclusionMode = 0;
 	buttonTriggeredInclusion = false;
diff --git a/libraries/MySensors/MySensor.cpp b/libraries/MySensors/MySensor.cpp
@@ -287,7 +287,7 @@ boolean MySensor::process() {
 	if (repeaterMode && command == C_INTERNAL && type == I_FIND_PARENT) {
 		if (nc.distance == 255) {
 			findParentNode();
-		} else {
+		} else if (sender != nc.parentNodeId) {
 			// Relaying nodes should always answer ping messages
 			// Wait a random delay of 0-2 seconds to minimize collision
 			// between ping ack messages from other relaying nodes

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ void MyGateway::begin(rf24_pa_dbm_e paLevel, uint8_t channel, rf24_datarate_e da`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`nc.nodeId = 0;`
	`50`	`+ nc.parentNodeId = 0;`
`50`	`51`	`nc.distance = 0;`
`51`	`52`	`inclusionMode = 0;`
`52`	`53`	`buttonTriggeredInclusion = false;`