Merge pull request #513 from tekka007/ShiftSetup

Call _nodeRegistration() before setup()
2016-07-17 13:49:46 +02:00
parent 0a7208ece0 eeee3310f9
commit 934ccf30b2
1 changed files with 5 additions and 4 deletions
@@ -145,10 +145,6 @@ void _begin() {
 		}
 	#endif	
 	
-	// Call sketch setup
-	if (setup)
-		setup();
-
 	#if defined(MY_RADIO_FEATURE)
 		presentNode();
 	#endif
@@ -156,6 +152,11 @@ void _begin() {
 	// register node
 	_registerNode();

+	// Call sketch setup
+	if (setup) {
+		setup();
+	}
+
 	debug(PSTR("Init complete, id=%d, parent=%d, distance=%d, registration=%d\n"), _nc.nodeId, _nc.parentNodeId, _nc.distance, _nodeRegistered);
 }