expanded basemanager with signal GetSignals

muccc · Jun 18, 2020 · 1c26780 · 1c26780
1 parent 326327d
commit 1c26780
Show file tree

Hide file tree

Showing 10 changed files with 102 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,6 +17,7 @@ add_library(${PRJ_NAME}
 
    unit
    signal
+   hal
    protocol
    managerbase
 

diff --git a/hal.cpp b/hal.cpp
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPLv3-or-later */
+/* Copyright (c) 2019 Project WomoLIN */
+/* Author Myron Franze <[email protected]> */
+
+#include "hal.h"
+
+namespace siguni
+{
+
+   CHalUnitInputGetSignals::CHalUnitInputGetSignals( const std::map<std::string_view, interface::ISignal*> & attSignalMap )
+      : signalMap( attSignalMap )
+   {
+
+   } 
+
+   void CHalUnitInputGetSignals::Get( std::string & attGetInput )
+   {
+      attGetInput.clear();
+      for(const auto & [key, ignored]  : signalMap ){
+         attGetInput.append( key ); 
+         attGetInput.append( "," ); 
+      }
+   }
+
+}
diff --git a/hal.h b/hal.h
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPLv3-or-later */
+/* Copyright (c) 2019 Project WomoLIN */
+/* Author Myron Franze <[email protected]> */
+
+#pragma once
+
+#include "interface/isignal.h"
+#include "interface/iunit.h"
+
+namespace siguni
+{
+
+   class CHalUnitInputGetSignals : public interface::IUnitInput
+   {
+      public:
+         CHalUnitInputGetSignals( const std::map<std::string_view, interface::ISignal*> & attSignalMap );
+         ~CHalUnitInputGetSignals() = default;
+
+      void Get( std::string & attGetInput ) override final; 
+
+      private:
+         const std::map<std::string_view, interface::ISignal*> & signalMap;
+   };
+
+}
diff --git a/interface/isignal.h b/interface/isignal.h
@@ -40,6 +40,14 @@ namespace siguni::interface
 		 virtual void UpdateUnitSignalGetVersion( std::string & attKey, std::string & attVersion ) = 0;
 	};
 
+	class ISignalGetSignals
+	{
+	  public:
+		 virtual ~ISignalGetSignals() = default;
+		 virtual void UpdateUnitSignalGetSignals( std::string & attKey, std::string & attVersion ) = 0;
+	};
+
+
 
 }
 
diff --git a/managerbase.cpp b/managerbase.cpp
@@ -12,7 +12,12 @@ namespace siguni
    CManagerBase::CManagerBase( interface::IControlbus & attControlbus ) 
       : controlbus( attControlbus )
       , protocol( controlbus )
+      , halUnitInputGetSignals( signalVector )
    {
+
+      signalVector["GetSignals"] = &GetSignals;
+      GetSignals.AddUnit( &unitInputGetSignals );
+
    }
 
    void CManagerBase::DoWork()

diff --git a/managerbase.h b/managerbase.h
@@ -4,7 +4,9 @@
 
 #pragma once
 
-#include "interface/isignal.h"
+#include "unit.h"
+#include "hal.h"
+#include "signal.h"
 #include "protocol.h"
 
 #include <map>
@@ -23,10 +25,17 @@ namespace siguni
       protected:
          std::string                                         message;
          std::map<std::string_view, interface::ISignal*>     signalVector;
-
+         
       private:
          interface::IControlbus &            controlbus;
          CProtocol                           protocol;
 
+         // units
+         CHalUnitInputGetSignals    halUnitInputGetSignals;   
+         CUnitInput                 unitInputGetSignals{ halUnitInputGetSignals } ; 
+
+         // signals 
+         CSignalGetSignals          GetSignals { CSignalGetSignals() };
+
    };
 }
diff --git a/signal.cpp b/signal.cpp
@@ -30,6 +30,13 @@ namespace siguni
 	   }
   }
 
+   void CSignalGetSignals::UpdateUnit( std::string & attKey, std::string & attValue )
+   {
+	   for( const auto & unit : units ){
+		   unit->UpdateUnitSignalGetSignals( attKey, attValue );
+	   }
+  }
+
 
 
 }
diff --git a/signal.h b/signal.h
@@ -63,4 +63,15 @@ namespace siguni
    };
 
 
+   class CSignalGetSignals final
+      : public CSignalAddUnit<interface::ISignalGetSignals>
+      , public interface::ISignal
+   {
+      public:
+         CSignalGetSignals() = default;
+         ~CSignalGetSignals() = default;
+         void UpdateUnit( std::string & attKey, std::string & attValue ) override final;
+   };
+
+
 }
diff --git a/unit.cpp b/unit.cpp
@@ -9,6 +9,11 @@ namespace siguni
 
    CUnitOutput::CUnitOutput( interface::IUnitOutput & attUnitOutput ) : unitOutput( attUnitOutput ) {}
 
+   void CUnitInput::UpdateUnitSignalGetSignals( std::string & /*attKey*/, std::string & attValue )
+   {
+      unitInput.Get( attValue ); 
+   }
+
    void CUnitOutput::UpdateUnitSignalSetReset( std::string & /*attKey*/, std::string & attValue )
    {
       unitOutput.Set( attValue ); 
@@ -30,8 +35,4 @@ namespace siguni
    {
       unitInput.Get( attValue );
    }
-
-
-
-
 }
diff --git a/unit.h b/unit.h
@@ -24,14 +24,17 @@ namespace siguni
    };
 
    class CUnitInput
-      : public interface::ISignalSetReset
+      : public interface::ISignalGetSignals
+      , public interface::ISignalSetReset
       , public interface::ISignalGetVersion
       , public interface::ISignalGetVoltage
    {
       public:
 	     CUnitInput( interface::IUnitInput & attUnitInput) ;
          ~CUnitInput() = default;
 
+         void UpdateUnitSignalGetSignals( std::string & attKey, std::string & attValue ) override final;
+
          void UpdateUnitSignalSetReset( std::string & attKey, std::string & attValue ) override final;
          void UpdateUnitSignalGetVersion( std::string & attKey, std::string & attValue ) override final;
          void UpdateUnitSignalGetVoltage( std::string & attKey, std::string & attValue ) override final;