add more param sets

Author: WT-MM

fsw/lioness-sw/LionessSw/Components/WatchdogEmulator/WatchdogEmulator.cpp

@@ -13,7 +13,7 @@ namespace Components {
 // ----------------------------------------------------------------------
 
 WatchdogEmulator ::WatchdogEmulator(const char* const compName)
-    : WatchdogEmulatorComponentBase(compName), m_countdownTicks(TIMEOUT_TICKS), m_resetAsserted(false) {}
+    : WatchdogEmulatorComponentBase(compName), m_countdownTicks(0), m_resetAsserted(false) {}
 
 WatchdogEmulator ::~WatchdogEmulator() {}
 
@@ -25,8 +25,9 @@ void WatchdogEmulator ::kickIn_handler(FwIndexType portNum, U32 code) {
     static_cast<void>(portNum);
     static_cast<void>(code);
 
-    this->m_countdownTicks = TIMEOUT_TICKS;
+    this->m_countdownTicks = this->getTimeoutTicks();
     this->m_resetAsserted = false;
+    this->tlmWrite_CountdownTicks(this->m_countdownTicks);
 }
 
 void WatchdogEmulator ::schedIn_handler(FwIndexType portNum, U32 context) {
@@ -42,12 +43,31 @@ void WatchdogEmulator ::schedIn_handler(FwIndexType portNum, U32 context) {
         this->log_ACTIVITY_HI_ResetAsserted();
         this->m_resetAsserted = true;
     }
+
+    this->tlmWrite_CountdownTicks(this->m_countdownTicks);
 }
 
 void WatchdogEmulator ::SET_COUNTDOWN_cmdHandler(FwOpcodeType opCode, U32 cmdSeq, U32 ticks) {
     this->m_countdownTicks = ticks;
     this->m_resetAsserted = false;
+    this->tlmWrite_CountdownTicks(this->m_countdownTicks);
     this->cmdResponse_out(opCode, cmdSeq, Fw::CmdResponse::OK);
 }
 
+// ----------------------------------------------------------------------
+// Private helpers
+// ----------------------------------------------------------------------
+
+// Returns the configured TIMEOUT_TICKS, falling back to the FPP-declared
+// default if PrmDb has not yet served a valid value (e.g. before the
+// first loadParameters() completes).
+U32 WatchdogEmulator ::getTimeoutTicks() {
+    Fw::ParamValid valid;
+    const U32 timeout = this->paramGet_TIMEOUT_TICKS(valid);
+    if (valid == Fw::ParamValid::VALID || valid == Fw::ParamValid::DEFAULT) {
+        return timeout;
+    }
+    return 50U;
+}
+
 }  // namespace Components

fsw/lioness-sw/LionessSw/Components/WatchdogEmulator/WatchdogEmulator.fpp

@@ -2,19 +2,25 @@ module Components {
     @ Watchdog emulator for host-based watchdog testing
     passive component WatchdogEmulator {
         @ Kick input from the watchdog component under test.
-        sync input port kickIn: Svc.WatchDog
+        guarded input port kickIn: Svc.WatchDog
 
         @ Scheduler tick used to count down timeout ticks.
-        sync input port schedIn: Svc.Sched
+        guarded input port schedIn: Svc.Sched
 
         @ Reset signal asserted when countdown expires.
         output port resetOut: Fw.Signal
 
         @ Manually set the watchdog countdown in scheduler ticks.
-        sync command SET_COUNTDOWN(
+        guarded command SET_COUNTDOWN(
             ticks: U32 @< Countdown value in ticks.
         )
 
+        @ Default countdown reload value in scheduler ticks.
+        param TIMEOUT_TICKS: U32 default 50
+
+        @ Current countdown value in scheduler ticks.
+        telemetry CountdownTicks: U32
+
         @ Countdown reached zero and reset was asserted.
         event ResetAsserted \
             severity activity high \
@@ -32,5 +38,14 @@ module Components {
         @ Enables event handling
         import Fw.Event
 
+        @ Enables telemetry channels handling
+        import Fw.Channel
+
+        @ Port to return the value of a parameter
+        param get port prmGetOut
+
+        @ Port to set the value of a parameter
+        param set port prmSetOut
+
     }
 }

fsw/lioness-sw/LionessSw/Components/WatchdogEmulator/WatchdogEmulator.hpp

@@ -51,7 +51,9 @@ class WatchdogEmulator final : public WatchdogEmulatorComponentBase {
                                   U32 ticks             //!< Countdown value in ticks
                                   ) override;
 
-    static constexpr U32 TIMEOUT_TICKS = 50;
+    //! Read the current TIMEOUT_TICKS parameter, falling back to the FPP default.
+    U32 getTimeoutTicks();
+
     U32 m_countdownTicks;
     bool m_resetAsserted;
 };