Add TotalPowerConsumption and TotalPowerGenerated telemetry channels to PowerMonitor

FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp

@@ -13,7 +13,10 @@ namespace Components {
 // ----------------------------------------------------------------------
 
 PowerMonitor ::PowerMonitor(const char* const compName)
-    : PowerMonitorComponentBase(compName), m_totalPower_mWh(0.0f), m_lastUpdateTime_s(0.0) {}
+    : PowerMonitorComponentBase(compName),
+      m_totalPower_mWh(0.0f),
+      m_totalGeneration_mWh(0.0f),
+      m_lastUpdateTime_s(0.0) {}
 
 PowerMonitor ::~PowerMonitor() {}
 
@@ -35,6 +38,9 @@ void PowerMonitor ::run_handler(FwIndexType portNum, U32 context) {
     // Update total power consumption with combined system and solar power
     F64 totalPowerW = sysPowerW + solPowerW;
     this->updatePower(totalPowerW);
+
+    // Update total solar power generation
+    this->updateGeneration(solPowerW);
 }
 
 // ----------------------------------------------------------------------
@@ -48,6 +54,12 @@ void PowerMonitor ::RESET_TOTAL_POWER_cmdHandler(FwOpcodeType opCode, U32 cmdSeq
     this->cmdResponse_out(opCode, cmdSeq, Fw::CmdResponse::OK);
 }
 
+void PowerMonitor ::RESET_TOTAL_GENERATION_cmdHandler(FwOpcodeType opCode, U32 cmdSeq) {
+    this->m_totalGeneration_mWh = 0.0f;
+    this->log_ACTIVITY_LO_TotalGenerationReset();
+    this->cmdResponse_out(opCode, cmdSeq, Fw::CmdResponse::OK);
+}
+
 // ----------------------------------------------------------------------
 // Helper method implementations
 // ----------------------------------------------------------------------
@@ -88,4 +100,32 @@ void PowerMonitor ::updatePower(F64 powerW) {
     this->tlmWrite_TotalPowerConsumption(this->m_totalPower_mWh);
 }
 
+void PowerMonitor ::updateGeneration(F64 powerW) {
+    // Guard against invalid power values
+    if (powerW < 0.0 || powerW > 1000.0) {  // Sanity check: power should be 0-1000W
+        return;
+    }
+
+    F64 now_s = this->getCurrentTimeSeconds();
+
+    // Initialize time on first call
+    if (this->m_lastUpdateTime_s == 0.0) {
+        // Emit initial telemetry value
+        this->tlmWrite_TotalPowerGenerated(this->m_totalGeneration_mWh);
+        return;
+    }
+
+    F64 dt_s = now_s - this->m_lastUpdateTime_s;
+
+    // Only accumulate if time has passed and delta is reasonable (< 10 seconds to avoid time jumps)
+    if (dt_s > 0.0 && dt_s < 10.0) {
+        // Convert to mWh: Power (W) * time (hours) * 1000
+        F32 energyAdded_mWh = static_cast<F32>(powerW * (dt_s / 3600.0) * 1000.0);
+        this->m_totalGeneration_mWh += energyAdded_mWh;
+    }
+
+    // Emit telemetry update
+    this->tlmWrite_TotalPowerGenerated(this->m_totalGeneration_mWh);
+}
+
 }  // namespace Components

FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.fpp

@@ -24,14 +24,25 @@ module Components {
         @ Command to reset the accumulated power consumption
         sync command RESET_TOTAL_POWER()
 
+        @ Command to reset the accumulated power generation
+        sync command RESET_TOTAL_GENERATION()
+
         @ Telemetry channel for accumulated power consumption in mWh
         telemetry TotalPowerConsumption: F32
 
+        @ Telemetry channel for accumulated solar power generation in mWh
+        telemetry TotalPowerGenerated: F32
+
         @ Event logged when total power consumption is reset
         event TotalPowerReset() \
             severity activity low \
             format "Total power consumption reset to 0 mWh"
 
+        @ Event logged when total power generation is reset
+        event TotalGenerationReset() \
+            severity activity low \
+            format "Total power generation reset to 0 mWh"
+
         ###############################################################################
         # Standard AC Ports: Required for Channels, Events, Commands, and Parameters  #
         ###############################################################################

FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.hpp

@@ -42,6 +42,11 @@ class PowerMonitor final : public PowerMonitorComponentBase {
                                       U32 cmdSeq            //!< The command sequence number
                                       ) override;
 
+    //! Handler implementation for RESET_TOTAL_GENERATION
+    void RESET_TOTAL_GENERATION_cmdHandler(FwOpcodeType opCode,  //!< The opcode
+                                           U32 cmdSeq            //!< The command sequence number
+                                           ) override;
+
     // ----------------------------------------------------------------------
     // Helper methods
     // ----------------------------------------------------------------------
@@ -52,13 +57,19 @@ class PowerMonitor final : public PowerMonitorComponentBase {
     //! Update power consumption with new power reading
     void updatePower(F64 powerW);
 
+    //! Update solar power generation with new power reading
+    void updateGeneration(F64 powerW);
+
     // ----------------------------------------------------------------------
     // Member variables
     // ----------------------------------------------------------------------
 
     //! Accumulated power consumption in mWh
     F32 m_totalPower_mWh;
 
+    //! Accumulated solar power generation in mWh
+    F32 m_totalGeneration_mWh;
+
     //! Last update time in seconds
     F64 m_lastUpdateTime_s;
 };

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi

@@ -69,6 +69,7 @@ telemetry packets ReferenceDeploymentPackets {
     ReferenceDeployment.ina219SolManager.Current
     ReferenceDeployment.ina219SolManager.Power
     ReferenceDeployment.powerMonitor.TotalPowerConsumption
+    ReferenceDeployment.powerMonitor.TotalPowerGenerated
   }
 
 } omit {