From e2852f431671cd0163b489bf7a9eced261c1262f Mon Sep 17 00:00:00 2001
From: Jochen Vothknecht <jochen3120@gmail.com>
Date: Mon, 20 Jun 2022 08:01:27 +0200
Subject: [PATCH] ST: Remove unused stop() from services
---
.../SiliconTorch/Service/CyanStripe.cpp | 4 ----
.../SiliconTorch/Service/CyanStripe.hpp | 2 --
CLC-qthing/SiliconTorch/Service/FxCyanF.hpp | 2 --
CLC-qthing/SiliconTorch/Service/FxPublish.cpp | 4 ----
CLC-qthing/SiliconTorch/Service/FxPublish.hpp | 2 --
CLC-qthing/SiliconTorch/Service/Service.hpp | 21 +++++++------------
6 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/CLC-qthing/SiliconTorch/Service/CyanStripe.cpp b/CLC-qthing/SiliconTorch/Service/CyanStripe.cpp
index 05077d0..c499c0e 100644
--- a/CLC-qthing/SiliconTorch/Service/CyanStripe.cpp
+++ b/CLC-qthing/SiliconTorch/Service/CyanStripe.cpp
@@ -57,10 +57,6 @@ namespace SiliconTorch {
ESP_LOGW(getName().c_str(), "Starting service[ %s ] with order[ %d ] *WHOOP* *WHOOP*", getName().c_str(), getStartOrder());
}
- void CyanStripe::stop() {
- ESP_LOGW(getName().c_str(), "Stopping service[ %s ] *sad service noises*", getName().c_str());
- }
-
}
diff --git a/CLC-qthing/SiliconTorch/Service/CyanStripe.hpp b/CLC-qthing/SiliconTorch/Service/CyanStripe.hpp
index b2969ac..9dc3065 100644
--- a/CLC-qthing/SiliconTorch/Service/CyanStripe.hpp
+++ b/CLC-qthing/SiliconTorch/Service/CyanStripe.hpp
@@ -28,8 +28,6 @@ namespace SiliconTorch {
void init();
void start();
- void stop();
-
diff --git a/CLC-qthing/SiliconTorch/Service/FxCyanF.hpp b/CLC-qthing/SiliconTorch/Service/FxCyanF.hpp
index 7e08eda..7e6ede7 100644
--- a/CLC-qthing/SiliconTorch/Service/FxCyanF.hpp
+++ b/CLC-qthing/SiliconTorch/Service/FxCyanF.hpp
@@ -28,8 +28,6 @@ namespace SiliconTorch {
void init();
void start();
- void stop();
-
diff --git a/CLC-qthing/SiliconTorch/Service/FxPublish.cpp b/CLC-qthing/SiliconTorch/Service/FxPublish.cpp
index 1cb1107..69abef7 100644
--- a/CLC-qthing/SiliconTorch/Service/FxPublish.cpp
+++ b/CLC-qthing/SiliconTorch/Service/FxPublish.cpp
@@ -44,10 +44,6 @@ namespace SiliconTorch {
ESP_LOGW(getName().c_str(), "Starting service[ %s ] with order[ %d ] *WHOOP* *WHOOP*", getName().c_str(), getStartOrder());
}
- void FxPublish::stop() {
- ESP_LOGW(getName().c_str(), "Stopping service[ %s ] *sad service noises*", getName().c_str());
- }
-
}
diff --git a/CLC-qthing/SiliconTorch/Service/FxPublish.hpp b/CLC-qthing/SiliconTorch/Service/FxPublish.hpp
index d89286c..4493665 100644
--- a/CLC-qthing/SiliconTorch/Service/FxPublish.hpp
+++ b/CLC-qthing/SiliconTorch/Service/FxPublish.hpp
@@ -28,8 +28,6 @@ namespace SiliconTorch {
void init();
void start();
- void stop();
-
diff --git a/CLC-qthing/SiliconTorch/Service/Service.hpp b/CLC-qthing/SiliconTorch/Service/Service.hpp
index c134212..0f7de7d 100644
--- a/CLC-qthing/SiliconTorch/Service/Service.hpp
+++ b/CLC-qthing/SiliconTorch/Service/Service.hpp
@@ -33,30 +33,26 @@ namespace SiliconTorch {
Service();
- virtual void init() = 0;
- // internal stuff, only to be called by ServiceManager!
- void postInit();
+ // â•” To be implemented by user! â•—
+
+ virtual void init() = 0;
+ virtual void start() = 0;
+ // â•šâ•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•
- // To be implemented by user!
- virtual void start() = 0;
- virtual void stop() = 0;
const str& getName() const;
const str& getNameSpace() const;
- // virtual str name() = 0;
- // virtual str nameSpace() = 0;
-
u16 getStartOrder() const;
- // enabled services will be started in this order. higher = later
- // virtual u16 startOrder(); // defaults to 1337
-
bool isEnabled() const;
void setEnabled(bool enabled);
+ // internal stuff, only to be called by ServiceManager!
+ void postInit();
+
protected:
void setName(const str& name);
@@ -73,7 +69,6 @@ namespace SiliconTorch {
u16 startOrder = 1337;
-
};
--
GitLab