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

check valid parentNodeId before requestNodeId

Browse Source
This commit is contained in:
Marcelo Aquino
2015-02-22 10:41:29 -03:00
parent e8bb9623e0
commit 2d8fddcb05
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/MySensor.cpp
+7 -10
View File
@@ -87,22 +87,19 @@ void MySensor::begin(void (*_msgCallback)(const MyMessage &), uint8_t _nodeId, b
findParentNode(); findParentNode();
} }
if ( (_nodeId != AUTO) && (nc.nodeId != _nodeId) ) { if (_nodeId != AUTO) {
// Set static id // Set static id
nc.nodeId = _nodeId; nc.nodeId = _nodeId;
// Save static id in eeprom // Save static id in eeprom
eeprom_update_byte((uint8_t*)EEPROM_NODE_ID_ADDRESS, _nodeId); eeprom_update_byte((uint8_t*)EEPROM_NODE_ID_ADDRESS, _nodeId);
} } else if (isValidParent(nc.parentNodeId)) {
// Try to fetch node-id from gateway
// Try to fetch node-id from gateway
if (nc.nodeId == AUTO) {
requestNodeId(); requestNodeId();
} }
setupNode(); setupNode();
debug(PSTR("%s started, id=%d, parent=%d, distance=%d\n"), isGateway?"gateway":(repeaterMode?"repeater":"sensor"), nc.nodeId, nc.parentNodeId, nc.distance); debug(PSTR("%s started, id=%d, parent=%d, distance=%d\n"), isGateway?"gateway":(repeaterMode?"repeater":"sensor"), nc.nodeId, nc.parentNodeId, nc.distance);
} }
void MySensor::setupRepeaterMode(){ void MySensor::setupRepeaterMode(){