Fixed service iteration & added service toggle

include/osw_service.h

@@ -1,6 +1,16 @@
 #ifndef OSW_SERVICE_H
 #define OSW_SERVICE_H
-    #include <osw_app.h>
+#include <osw_app.h>
 
-    typedef OswApp OswServiceTask;
+class OswServiceTask : public OswApp {
+ public:
+  OswServiceTask() : OswApp() {}
+  virtual void setup(OswHal* hal);
+  bool isRunning();
+  virtual void stop(OswHal* hal);
+  virtual ~OswServiceTask(){};
+
+ private:
+  bool taskEnabled = false;
+};
 #endif

src/main.cpp

@@ -130,7 +130,6 @@ void setup() {
   xTaskCreatePinnedToCore(core2Worker, "core2Worker", 1000 /*stack*/, NULL /*input*/, 0 /*prio*/,
                           &Core2WorkerTask /*handle*/, 0);
 
-  OswServiceManager &serviceManager = OswServiceManager::getInstance();
   mainAppSwitcher->setup(hal);
   displayTimeout = OswConfigAllKeys::settingDisplayTimeout.get();
 }

src/osw_service.cpp

@@ -0,0 +1,10 @@
+#include "osw_service.h"
+
+void OswServiceTask::setup(OswHal* hal) {
+  this->taskEnabled = true;
+}
+void OswServiceTask::stop(OswHal* hal) {
+  this->taskEnabled = false;
+}
+
+bool OswServiceTask::isRunning() { return this->taskEnabled; }

src/services/OswServiceManager.cpp

@@ -1,17 +1,16 @@
 #include "./services/OswServiceManager.h"
+
 #include "./services/OswServiceTasks.h"
 
 void OswServiceManager::setup(OswHal *hal) {
-    for (unsigned char i = 0; i < oswServiceTasksCount; i++)
-        return oswServiceTasks[i]->setup(hal);
+  for (unsigned char i = 0; i < oswServiceTasksCount; i++) oswServiceTasks[i]->setup(hal);
 }
 
 void OswServiceManager::loop(OswHal *hal) {
-    for (unsigned char i = 0; i < oswServiceTasksCount; i++)
-        return oswServiceTasks[i]->loop(hal);
+  for (unsigned char i = 0; i < oswServiceTasksCount; i++)
+    if (oswServiceTasks[i]->isRunning()) oswServiceTasks[i]->loop(hal);
 }
 
 void OswServiceManager::stop(OswHal *hal) {
-    for (unsigned char i = 0; i < oswServiceTasksCount; i++)
-        return oswServiceTasks[i]->stop(hal);
+  for (unsigned char i = 0; i < oswServiceTasksCount; i++) oswServiceTasks[i]->stop(hal);
 }

src/services/OswServiceTaskBLECompanion.cpp

@@ -56,6 +56,7 @@ class NotificationCallback: public BLECharacteristicCallbacks {
 };
 
 void OswServiceTaskBLECompanion::setup(OswHal* hal) {
+    OswServiceTask::setup(hal);
     BLEDevice::init(BLE_DEVICE_NAME);
     bleServer = BLEDevice::createServer();
     notificationService = bleServer->createService(NOTIFICATION_SERVICE_UID);
@@ -85,5 +86,5 @@ void OswServiceTaskBLECompanion::loop(OswHal* hal) {
 }
 
 void OswServiceTaskBLECompanion::stop(OswHal* hal) {
-
+    OswServiceTask::stop(hal);
 }

src/services/OswServiceTaskExample.cpp

@@ -3,6 +3,7 @@
 #include <time.h>
 
 void OswServiceTaskExample::setup(OswHal* hal) {
+    OswServiceTask::setup(hal);
     Serial.println(String(__FILE__)  + "->" + __FUNCTION__ + "()");
 }
 
@@ -15,5 +16,6 @@ void OswServiceTaskExample::loop(OswHal* hal) {
 }
 
 void OswServiceTaskExample::stop(OswHal* hal) {
+    OswServiceTask::stop(hal);
     Serial.println(String(__FILE__)  + "->" + __FUNCTION__ + "()");
 }