ST: Moar ServiceManager stuff

CLC-qthing/SiliconTorch/Service/ServiceManager.cpp

@@ -16,7 +16,7 @@
 // #include <qthing>
 
 
-const char* TAG = "ServiceManager";
+static const char* TAG = "ServiceManager";
 
 
 namespace SiliconTorch {
@@ -24,13 +24,29 @@ namespace SiliconTorch {
   namespace ServiceManager {
 
 
+    void registerSiliconTorchServices(ServiceManager* mgr);
+
+
     ServiceManager::ServiceManager() {
 
+      registerSiliconTorchServices(this);
+
       // TODO: implement!
 
     }
 
 
+    void ServiceManager::registerService(Service* s) {
+      s->init();
+      s->postInit();
+
+      services[s->getName()] = s;
+
+      ESP_LOGI(TAG, "Registered service[ %s ]", s->getName().c_str());
+
+    }
+
+
 
   }
 }

CLC-qthing/SiliconTorch/Service/ServiceManager.hpp

@@ -24,7 +24,7 @@ namespace SiliconTorch {
     extern const str NVSStateKey;
 
 
-    using ServiceMap = std::map<str, Service>;
+    using ServiceMap = std::map<str, Service*>;
 
 
     class ServiceManager {
@@ -32,7 +32,7 @@ namespace SiliconTorch {
 
         ServiceManager();
 
-        void registerService(Service s);
+        void registerService(Service* s);
 
       private:
 

CLC-qthing/SiliconTorch/Service/__services__.cpp

@@ -6,17 +6,18 @@
 // #include <functional>
 
 // ESP32 specific
-#include "esp_log.h"
+// #include "esp_log.h"
 
 // project specific
-#include <Types.hpp>
+#include "FxCyanF.hpp"
+// #include <Types.hpp>
 // #include "SiliconTorch/NVSExplorer.hpp"
 
 // qthing stuff
 // #include <qthing>
 
 
-const char* TAG = "ServiceManager";
+// const char* TAG = "ServiceManager";
 
 
 namespace SiliconTorch {
@@ -24,10 +25,9 @@ namespace SiliconTorch {
   namespace ServiceManager {
 
 
-    void registerSiliconTorchServices(ServiceManager& mgr) {
-
-      // TODO: implement!
+    void registerSiliconTorchServices(ServiceManager* mgr) {
 
+      mgr->registerService(new SiliconTorch::Service::FxCyanF());
 
     }
 

CLC-qthing/SiliconTorch/Service/__services__.hpp

-#pragma once
-
-// C++ system level
-// #include <cstring>     // memset, strncmp
-// #include <cstdlib>     // TODO: is this for memcpy?
-// #include <functional>
-
-// ESP32 specific
-#include "esp_log.h"
-
-// project specific
-#include <Types.hpp>
-#include "Service.hpp"
-
-// qthing stuff
-// #include <qthing>
-
-
-namespace SiliconTorch {
-
-  namespace ServiceManager {
-
-    extern const str NVSStateKey;
-
-
-
-
-
-  }
-}

CLC-qthing/device_main.cpp

@@ -19,6 +19,7 @@
 
 #include "SiliconTorch/Service/FxCyanF.hpp"
 #include "SiliconTorch/Service/Service.hpp"
+#include "SiliconTorch/Service/ServiceManager.hpp"
 
 
 
@@ -28,6 +29,7 @@ CyanLight::CyanLightControl* ctrl = NULL;
 
 
 SiliconTorch::ServiceManager::Service* fxCyan = NULL;
+SiliconTorch::ServiceManager::ServiceManager* mgr = NULL;
 
 
 
@@ -52,9 +54,13 @@ void device_main() {
     SiliconTorch::NVSExplorer::NVSExplorer::instance();
 
 
-    fxCyan = new SiliconTorch::Service::FxCyanF();
+    mgr = new SiliconTorch::ServiceManager::ServiceManager();
 
-    fxCyan->start();
+
+
+    // fxCyan = new SiliconTorch::Service::FxCyanF();
+
+    // fxCyan->start();
 
 
     xSemaphoreGive(mutex000);