Component restructure to follow sdd

Author: moisesmata

FprimeZephyrReference/Components/Watchdog/Watchdog.cpp

@@ -30,26 +30,23 @@ void Watchdog ::run_handler(FwIndexType portNum, U32 context) {
         this->tlmWrite_WatchdogTransitions(this->m_transitions);
 
         this->gpioSet_out(0, (Fw::On::ON == this->m_state) ? Fw::Logic::HIGH : Fw::Logic::LOW);
-
-        this->log_ACTIVITY_LO_WatchdogState(this->m_state);
     }
 }
 
 void Watchdog ::stop_handler(FwIndexType portNum) {
     // Set the stop flag to stop watchdog petting
     this->m_stopRequested = true;
+    this->log_ACTIVITY_HI_WatchdogStop();
 }
 
 // ----------------------------------------------------------------------
 // Handler implementations for commands
 // ----------------------------------------------------------------------
 
-//test
-void Watchdog ::STOP_WATCHDOG_cmdHandler(FwOpcodeType opCode, U32 cmdSeq) {
-    // Set the stop flag to stop watchdog petting
-    this->m_stopRequested = true;
+void Watchdog ::TEST_STOP_WATCHDOG_cmdHandler(FwOpcodeType opCode, U32 cmdSeq) {
+    // call stop handler
+    this->stop_handler(0);
 
-    //rather, call stop handler here and emit event`
     // Provide command response
     this->cmdResponse_out(opCode, cmdSeq, Fw::CmdResponse::OK);
 }

FprimeZephyrReference/Components/Watchdog/Watchdog.fpp

@@ -3,27 +3,16 @@ module Components {
     passive component Watchdog {
 
         @ Command to stop the watchdog petter
-        sync command STOP_WATCHDOG(
+        sync command TEST_STOP_WATCHDOG(
         )
 
-        # get rid
-        @ Telemetry channel to report watchdog petter state.
-        telemetry WatchdogState: Fw.On
-
-        # keep but make it U32
         @ Telemetry channel counting watchdog petter transitions
-        telemetry WatchdogTransitions: U64
-
-        # get rid of all events except the stop watchdog event
-        @ Reports the state we set for the watchdog petter.
-        event SetWatchdogState($state: Fw.On) \
-            severity activity high \
-            format "Set watchdog state to {}."
+        telemetry WatchdogTransitions: U32
 
         @ Event logged when the watchdog petter LED turns on or off
-        event WatchdogState(onOff: Fw.On) \
-            severity activity low \
-            format "Watchdog is {}"
+        event WatchdogStop() \
+            severity activity high \
+            format "Watchdog no longer being pet!"
 
         @ Port receiving calls from the rate group
         sync input port run: Svc.Sched

FprimeZephyrReference/Components/Watchdog/Watchdog.hpp

@@ -8,6 +8,9 @@
 #define Components_Watchdog_HPP
 
 #include "FprimeZephyrReference/Components/Watchdog/WatchdogComponentAc.hpp"
+// Need to explicitly include because Fw.On is no longer a tlm channel I believe
+#include "Fw/Types/OnEnumAc.hpp"
+#include <atomic>
 
 namespace Components {
 
@@ -50,18 +53,13 @@ class Watchdog : public WatchdogComponentBase {
         // Handler implementations for commands
         // ----------------------------------------------------------------------
 
-        // test prefix
-        void STOP_WATCHDOG_cmdHandler(FwOpcodeType opCode, U32 cmdSeq) override;
+        void TEST_STOP_WATCHDOG_cmdHandler(FwOpcodeType opCode, U32 cmdSeq) override;
 
 
-
-    Fw::On m_state = Fw::On::OFF;  //! Keeps track if LED is on or off
-    //U32
-    U64 m_transitions = 0;         //! The number of on/off transitions that have occurred
-                                   //! from FSW boot up
-
-    // this should be an atomic (std::atomic)
-    bool m_stopRequested = false;  //! Flag to stop the watchdog petting
+    std::atomic_bool m_stopRequested{false};  //! Flag to stop the watchdog petting
+    Fw::On m_state = Fw::On::OFF;               //! Keeps track of GPIO state
+    U32 m_transitions = 0;                      //! The number of on/off transitions that have occurred
+                                                //! from FSW boot up
 };
 
 }  // namespace Components

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi

@@ -32,7 +32,6 @@ telemetry packets ReferenceDeploymentPackets {
 
   packet Led id 5 group 4 {
     ReferenceDeployment.watchdog.WatchdogTransitions
-    ReferenceDeployment.watchdog.WatchdogState
   }