Fix static id problem when using OTA bootloader. Reported by tekka.

henrikekblad · henrikekblad · commit 2d214a1e58ba · 2015-02-01T15:29:02.000+01:00
diff --git a/libraries/MySensors/MySensor.cpp b/libraries/MySensors/MySensor.cpp
@@ -59,9 +59,11 @@ void MySensor::begin(void (*_msgCallback)(const MyMessage &), uint8_t _nodeId, b
 		autoFindParent = true;
 	}
 
-	if (_nodeId != AUTO) {
-		// Set static id
-		nc.nodeId = _nodeId;
+	if ( (_nodeId != AUTO) && (nc.nodeId != _nodeId) ) {
+	    // Set static id
+	    nc.nodeId = _nodeId;
+	    // Save static id in eeprom
+	    eeprom_write_byte((uint8_t*)EEPROM_NODE_ID_ADDRESS, _nodeId);
 	}
 
 	// If no parent was found in eeprom. Try to find one.

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,11 @@ void MySensor::begin(void (*_msgCallback)(const MyMessage &), uint8_t _nodeId, b`
`59`	`59`	`autoFindParent = true;`
`60`	`60`	`}`
`61`	`61`
`62`		`- if (_nodeId != AUTO) {`
`63`		`- // Set static id`
`64`		`- nc.nodeId = _nodeId;`
	`62`	`+ if ( (_nodeId != AUTO) && (nc.nodeId != _nodeId) ) {`
	`63`	`+ // Set static id`
	`64`	`+ nc.nodeId = _nodeId;`
	`65`	`+ // Save static id in eeprom`
	`66`	`+ eeprom_write_byte((uint8_t*)EEPROM_NODE_ID_ADDRESS, _nodeId);`
`65`	`67`	`}`
`66`	`68`
`67`	`69`	`// If no parent was found in eeprom. Try to find one.`