From b327d9197651f04749fa8377f43b3ebc3a99c7ef Mon Sep 17 00:00:00 2001
From: andreas <andreas@wellenvogel.de>
Date: Sun, 3 Mar 2024 16:48:11 +0100
Subject: [PATCH] better handling of defined/enabled spi sensors

---
 lib/hardware/GwHardware.h | 6 ------
 lib/spitask/GWDMS22B.cpp  | 4 ++--
 lib/spitask/GwSpiTask.cpp | 6 +-----
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/lib/hardware/GwHardware.h b/lib/hardware/GwHardware.h
index 273f424..18d6084 100644
--- a/lib/hardware/GwHardware.h
+++ b/lib/hardware/GwHardware.h
@@ -322,11 +322,5 @@
   #define CFGMODE_ledBrightness GwConfigInterface::HIDDEN
 #endif
 
-#ifdef GWSPI0_CLK
-  #define _GWSPI
-#endif
-#ifdef GWSPI1_CLK
-  #define _GWSPI
-#endif
 
 #endif
diff --git a/lib/spitask/GWDMS22B.cpp b/lib/spitask/GWDMS22B.cpp
index d386bd8..fcd51f1 100644
--- a/lib/spitask/GWDMS22B.cpp
+++ b/lib/spitask/GWDMS22B.cpp
@@ -108,9 +108,9 @@ class GWDMS22B : public SSISensor{
     using SSISensor::SSISensor;
     virtual bool preinit(GwApi * api){
         GwLog *logger=api->getLogger();
-        LOG_DEBUG(GwLog::LOG,"DMS22B configured, prefix=%s, intv=%f",prefix.c_str(),fintv);
+        LOG_DEBUG(GwLog::LOG,"DMS22B configured, prefix=%s, intv=%f, active=%d",prefix.c_str(),fintv,(int)act);
         api->addCapability(prefix,"true");
-        return true;
+        return act;
     }
     virtual void measure(GwApi * api,BusType *bus, int counterId){
         GwLog *logger=api->getLogger();
diff --git a/lib/spitask/GwSpiTask.cpp b/lib/spitask/GwSpiTask.cpp
index 084cece..daa34b0 100644
--- a/lib/spitask/GwSpiTask.cpp
+++ b/lib/spitask/GwSpiTask.cpp
@@ -54,7 +54,6 @@ static const int spi1mosi=GWSPI1_MOSI;
 static const int spi1mosi=-1;
 #endif
 
-#define _GWSPI
 void runSpiTask(GwApi *api){
     GwLog *logger=api->getLogger();
     std::map<int,SPIBus *> buses;
@@ -122,9 +121,6 @@ void runSpiTask(GwApi *api){
 
 void initSpiTask(GwApi *api){
     GwLog *logger=api->getLogger();
-    #ifndef _GWSPI
-        return;
-    #endif
     registerDMS22B(api,sensors);
     bool addTask=false;
     for (auto && sensor:sensors){
@@ -134,6 +130,6 @@ void initSpiTask(GwApi *api){
         api->addUserTask(runSpiTask,"spiTask",3000);   
     }
     else{
-        LOG_DEBUG(GwLog::LOG,"no SPI sensors defined");
+        LOG_DEBUG(GwLog::LOG,"no SPI sensors defined/active");
     }
 }
\ No newline at end of file