From 03bb24d6c7639705f05070246b7ba8e826d06c4a Mon Sep 17 00:00:00 2001 From: Patrick Balsiger Date: Tue, 12 Jun 2018 22:21:22 +0200 Subject: [PATCH] ci --- .gitlab-ci.yml | 2 +- src/Sprocket.cpp | 3 +-- src/Sprocket.h | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index feae26a..c8ed165 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ stages: cache: paths: - - firmware + - .piolibdeps build-examples: stage: build diff --git a/src/Sprocket.cpp b/src/Sprocket.cpp index 23d180a..2a70fb6 100644 --- a/src/Sprocket.cpp +++ b/src/Sprocket.cpp @@ -23,8 +23,7 @@ Sprocket* Sprocket::join(Network& net){ Serial.println("join network"); net.init(&scheduler); net.connect(); - activate(&scheduler, &net); - return this; + return activate(&scheduler, &net); } Sprocket* Sprocket::addTask(Task& tsk){ diff --git a/src/Sprocket.h b/src/Sprocket.h index b8f9a76..5a84978 100644 --- a/src/Sprocket.h +++ b/src/Sprocket.h @@ -23,8 +23,8 @@ class Sprocket { Sprocket* addTask(Task&); // REMOVE ?? virtual void loop(); virtual Sprocket* activate(); - virtual Sprocket* activate(Scheduler*) {} - virtual Sprocket* activate(Scheduler*, Network*) {} + virtual Sprocket* activate(Scheduler*) { return this; } + virtual Sprocket* activate(Scheduler*, Network*) { return this; } }; #endif \ No newline at end of file