This commit is contained in:
2018-06-12 22:21:22 +02:00
parent 886814618c
commit 03bb24d6c7
3 changed files with 4 additions and 5 deletions

View File

@@ -3,7 +3,7 @@ stages:
cache: cache:
paths: paths:
- firmware - .piolibdeps
build-examples: build-examples:
stage: build stage: build

View File

@@ -23,8 +23,7 @@ Sprocket* Sprocket::join(Network& net){
Serial.println("join network"); Serial.println("join network");
net.init(&scheduler); net.init(&scheduler);
net.connect(); net.connect();
activate(&scheduler, &net); return activate(&scheduler, &net);
return this;
} }
Sprocket* Sprocket::addTask(Task& tsk){ Sprocket* Sprocket::addTask(Task& tsk){

View File

@@ -23,8 +23,8 @@ class Sprocket {
Sprocket* addTask(Task&); // REMOVE ?? Sprocket* addTask(Task&); // REMOVE ??
virtual void loop(); virtual void loop();
virtual Sprocket* activate(); virtual Sprocket* activate();
virtual Sprocket* activate(Scheduler*) {} virtual Sprocket* activate(Scheduler*) { return this; }
virtual Sprocket* activate(Scheduler*, Network*) {} virtual Sprocket* activate(Scheduler*, Network*) { return this; }
}; };
#endif #endif