From 9defaf1640574939ebd831663d60ba0570a9dd67 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 5 Nov 2025 08:03:14 +0000
Subject: [PATCH 01/17] Initial plan


From 51bd3c67f3bf2c6c430ce535254eb4150eb33812 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 5 Nov 2025 08:15:18 +0000
Subject: [PATCH 02/17] Add TotalPowerConsumption telemetry and RESET command
 to PowerMonitor

---
 .../Components/PowerMonitor/PowerMonitor.cpp  | 59 +++++++++++++-
 .../Components/PowerMonitor/PowerMonitor.fpp  | 29 +++++++
 .../Components/PowerMonitor/PowerMonitor.hpp  | 29 +++++++
 .../test/int/power_monitor_test.py            | 79 +++++++++++++++++--
 4 files changed, 186 insertions(+), 10 deletions(-)

diff --git a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
index 55d093d5..d319d2a2 100644
--- a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
+++ b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
@@ -4,6 +4,7 @@
 // ======================================================================
 
 #include "FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.hpp"
+#include <Fw/Time/Time.hpp>
 
 namespace Components {
 
@@ -11,7 +12,11 @@ namespace Components {
 // Component construction and destruction
 // ----------------------------------------------------------------------
 
-PowerMonitor ::PowerMonitor(const char* const compName) : PowerMonitorComponentBase(compName) {}
+PowerMonitor ::PowerMonitor(const char* const compName) :
+    PowerMonitorComponentBase(compName),
+    m_totalPower_mWh(0.0f),
+    m_lastUpdateTime_s(0.0)
+{}
 
 PowerMonitor ::~PowerMonitor() {}
 
@@ -23,12 +28,60 @@ void PowerMonitor ::run_handler(FwIndexType portNum, U32 context) {
     // System Power Monitor Requests
     this->sysVoltageGet_out(0);
     this->sysCurrentGet_out(0);
-    this->sysPowerGet_out(0);
+    F64 sysPowerW = this->sysPowerGet_out(0);
 
     // Solar Panel Power Monitor Requests
     this->solVoltageGet_out(0);
     this->solCurrentGet_out(0);
-    this->solPowerGet_out(0);
+    F64 solPowerW = this->solPowerGet_out(0);
+
+    // Update total power consumption with combined system and solar power
+    F64 totalPowerW = sysPowerW + solPowerW;
+    this->updatePower(totalPowerW);
+}
+
+// ----------------------------------------------------------------------
+// Handler implementations for commands
+// ----------------------------------------------------------------------
+
+void PowerMonitor ::RESET_TOTAL_POWER_cmdHandler(FwOpcodeType opCode, U32 cmdSeq) {
+    this->m_totalPower_mWh = 0.0f;
+    this->m_lastUpdateTime_s = this->getCurrentTimeSeconds();
+    this->log_ACTIVITY_LO_TotalPowerReset();
+    this->cmdResponse_out(opCode, cmdSeq, Fw::CmdResponse::OK);
+}
+
+// ----------------------------------------------------------------------
+// Helper method implementations
+// ----------------------------------------------------------------------
+
+F64 PowerMonitor ::getCurrentTimeSeconds() {
+    Fw::Time t = this->getTime();
+    return static_cast<F64>(t.getSeconds()) + (static_cast<F64>(t.getUSeconds()) / 1.0e6);
+}
+
+void PowerMonitor ::updatePower(F64 powerW) {
+    F64 now_s = this->getCurrentTimeSeconds();
+    
+    // Initialize time on first call
+    if (this->m_lastUpdateTime_s == 0.0) {
+        this->m_lastUpdateTime_s = now_s;
+        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_totalPower_mWh += energyAdded_mWh;
+    }
+    
+    this->m_lastUpdateTime_s = now_s;
+    
+    // Emit telemetry update
+    this->tlmWrite_TotalPowerConsumption(this->m_totalPower_mWh);
 }
 
 }  // namespace Components
diff --git a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.fpp b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.fpp
index 58599345..abdc5676 100644
--- a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.fpp
+++ b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.fpp
@@ -21,11 +21,40 @@ module Components {
         @ Port for sending powerGet calls to the Solar Panel Driver
         output port solPowerGet: Drv.PowerGet
 
+        @ Command to reset the accumulated power consumption
+        sync command RESET_TOTAL_POWER()
+
+        @ Telemetry channel for accumulated power consumption in mWh
+        telemetry TotalPowerConsumption: F32
+
+        @ Event logged when total power consumption is reset
+        event TotalPowerReset() \
+            severity activity low \
+            format "Total power consumption reset to 0 mWh"
+
         ###############################################################################
         # Standard AC Ports: Required for Channels, Events, Commands, and Parameters  #
         ###############################################################################
         @ Port for requesting the current time
         time get port timeCaller
 
+        @ Port for sending command registrations
+        command reg port cmdRegOut
+
+        @ Port for receiving commands
+        command recv port cmdIn
+
+        @ Port for sending command responses
+        command resp port cmdResponseOut
+
+        @ Port for sending textual representation of events
+        text event port logTextOut
+
+        @ Port for sending events to downlink
+        event port logOut
+
+        @ Port for sending telemetry channels to downlink
+        telemetry port tlmOut
+
     }
 }
diff --git a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.hpp b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.hpp
index ec4595b3..cf6d73ff 100644
--- a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.hpp
+++ b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.hpp
@@ -32,6 +32,35 @@ class PowerMonitor final : public PowerMonitorComponentBase {
     void run_handler(FwIndexType portNum,  //!< The port number
                      U32 context           //!< The call order
                      ) override;
+
+    // ----------------------------------------------------------------------
+    // Handler implementations for commands
+    // ----------------------------------------------------------------------
+
+    //! Handler implementation for RESET_TOTAL_POWER
+    void RESET_TOTAL_POWER_cmdHandler(FwOpcodeType opCode,    //!< The opcode
+                                       U32 cmdSeq              //!< The command sequence number
+                                       ) override;
+
+    // ----------------------------------------------------------------------
+    // Helper methods
+    // ----------------------------------------------------------------------
+
+    //! Get current time in seconds
+    F64 getCurrentTimeSeconds();
+
+    //! Update power consumption with new power reading
+    void updatePower(F64 powerW);
+
+    // ----------------------------------------------------------------------
+    // Member variables
+    // ----------------------------------------------------------------------
+
+    //! Accumulated power consumption in mWh
+    F32 m_totalPower_mWh;
+
+    //! Last update time in seconds
+    F64 m_lastUpdateTime_s;
 };
 
 }  // namespace Components
diff --git a/FprimeZephyrReference/test/int/power_monitor_test.py b/FprimeZephyrReference/test/int/power_monitor_test.py
index 495ee55e..f4fab3a0 100644
--- a/FprimeZephyrReference/test/int/power_monitor_test.py
+++ b/FprimeZephyrReference/test/int/power_monitor_test.py
@@ -5,6 +5,7 @@
 """
 
 from datetime import datetime
+import time
 
 import pytest
 from common import proves_send_and_assert_command
@@ -14,6 +15,7 @@
 
 ina219SysManager = "ReferenceDeployment.ina219SysManager"
 ina219SolManager = "ReferenceDeployment.ina219SolManager"
+powerMonitor = "ReferenceDeployment.powerMonitor"
 
 
 @pytest.fixture(autouse=True)
@@ -27,7 +29,7 @@ def send_packet(fprime_test_api: IntegrationTestAPI, start_gds):
 
 
 def test_01_power_manager_telemetry(fprime_test_api: IntegrationTestAPI, start_gds):
-    """Test that we can get Acceleration telemetry"""
+    """Test that we can get power telemetry from INA219 managers"""
     start: TimeType = TimeType().set_datetime(datetime.now())
     sys_voltage: ChData = fprime_test_api.assert_telemetry(
         f"{ina219SysManager}.Voltage", start=start, timeout=65
@@ -55,9 +57,72 @@ def test_01_power_manager_telemetry(fprime_test_api: IntegrationTestAPI, start_g
     sol_current_reading: dict[float] = sol_current.get_val()
     # sol_power_reading: dict[float] = sol_power.get_val()
 
-    assert sys_voltage_reading != 0, "Acceleration reading should be non-zero"
-    assert sys_current_reading != 0, "Acceleration reading should be non-zero"
-    # assert sys_power_reading != 0, "Acceleration reading should be non-zero"
-    assert sol_voltage_reading != 0, "Acceleration reading should be non-zero"
-    assert sol_current_reading != 0, "Acceleration reading should be non-zero"
-    # assert sol_power_reading != 0, "Acceleration reading should be non-zero"
+    assert sys_voltage_reading != 0, "System voltage reading should be non-zero"
+    assert sys_current_reading != 0, "System current reading should be non-zero"
+    # assert sys_power_reading != 0, "System power reading should be non-zero"
+    assert sol_voltage_reading != 0, "Solar voltage reading should be non-zero"
+    assert sol_current_reading != 0, "Solar current reading should be non-zero"
+    # assert sol_power_reading != 0, "Solar power reading should be non-zero"
+
+
+def test_02_total_power_consumption_telemetry(
+    fprime_test_api: IntegrationTestAPI, start_gds
+):
+    """Test that TotalPowerConsumption telemetry is being updated"""
+    start: TimeType = TimeType().set_datetime(datetime.now())
+    
+    # Wait for a few telemetry updates (rate group runs at 1Hz)
+    time.sleep(3)
+    
+    total_power: ChData = fprime_test_api.assert_telemetry(
+        f"{powerMonitor}.TotalPowerConsumption", start=start, timeout=10
+    )
+    
+    total_power_reading: float = total_power.get_val()
+    
+    # Total power should be non-negative (accumulating over time)
+    assert total_power_reading >= 0, "Total power consumption should be non-negative"
+
+
+def test_03_reset_total_power_command(
+    fprime_test_api: IntegrationTestAPI, start_gds
+):
+    """Test that RESET_TOTAL_POWER command resets accumulated energy"""
+    start: TimeType = TimeType().set_datetime(datetime.now())
+    
+    # Wait for some power to accumulate
+    time.sleep(3)
+    
+    # Get current total power
+    total_power_before: ChData = fprime_test_api.assert_telemetry(
+        f"{powerMonitor}.TotalPowerConsumption", start=start, timeout=10
+    )
+    
+    # Reset total power
+    proves_send_and_assert_command(
+        fprime_test_api,
+        f"{powerMonitor}.RESET_TOTAL_POWER",
+        [],
+    )
+    
+    # Verify event was logged
+    fprime_test_api.assert_event(
+        f"{powerMonitor}.TotalPowerReset", start=start, timeout=10
+    )
+    
+    # Wait for next telemetry update
+    time.sleep(2)
+    
+    # Get total power after reset
+    reset_time: TimeType = TimeType().set_datetime(datetime.now())
+    total_power_after: ChData = fprime_test_api.assert_telemetry(
+        f"{powerMonitor}.TotalPowerConsumption", start=reset_time, timeout=10
+    )
+    
+    total_power_after_reading: float = total_power_after.get_val()
+    
+    # After reset, total power should be very small (close to 0)
+    # Allow small value due to time between reset and next telemetry update
+    assert total_power_after_reading < 0.1, (
+        f"Total power after reset should be near 0, got {total_power_after_reading} mWh"
+    )

From d51218e5b4c4f8e4670a8c2a6863f7c3bd21c90a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 5 Nov 2025 08:30:35 +0000
Subject: [PATCH 03/17] Add TotalPowerConsumption to PowerMonitor telemetry
 packet

- Added powerMonitor.TotalPowerConsumption to packet id 9
- This ensures the new telemetry channel is included when PowerMonitor packet is sent

Co-authored-by: Mikefly123 <61564344+Mikefly123@users.noreply.github.com>
---
 .../ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi b/FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi
index e8e74ee4..5c8b89ab 100644
--- a/FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi
+++ b/FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi
@@ -68,6 +68,7 @@ telemetry packets ReferenceDeploymentPackets {
     ReferenceDeployment.ina219SolManager.Voltage
     ReferenceDeployment.ina219SolManager.Current
     ReferenceDeployment.ina219SolManager.Power
+    ReferenceDeployment.powerMonitor.TotalPowerConsumption
   }
 
 } omit {

From da4c55e7f91eba571edb2a20f7832e65d8654ddb Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 5 Nov 2025 09:47:11 +0000
Subject: [PATCH 04/17] Fix trailing whitespace in PowerMonitor files

- Remove trailing whitespace from PowerMonitor.cpp
- Remove trailing whitespace from power_monitor_test.py
- Fixes pre-commit linter failures

Co-authored-by: Mikefly123 <61564344+Mikefly123@users.noreply.github.com>
---
 .../Components/PowerMonitor/PowerMonitor.cpp  | 10 ++++----
 .../test/int/power_monitor_test.py            | 24 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
index d319d2a2..f6a15143 100644
--- a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
+++ b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
@@ -62,24 +62,24 @@ F64 PowerMonitor ::getCurrentTimeSeconds() {
 
 void PowerMonitor ::updatePower(F64 powerW) {
     F64 now_s = this->getCurrentTimeSeconds();
-    
+
     // Initialize time on first call
     if (this->m_lastUpdateTime_s == 0.0) {
         this->m_lastUpdateTime_s = now_s;
         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_totalPower_mWh += energyAdded_mWh;
     }
-    
+
     this->m_lastUpdateTime_s = now_s;
-    
+
     // Emit telemetry update
     this->tlmWrite_TotalPowerConsumption(this->m_totalPower_mWh);
 }
diff --git a/FprimeZephyrReference/test/int/power_monitor_test.py b/FprimeZephyrReference/test/int/power_monitor_test.py
index f4fab3a0..7ed46dc9 100644
--- a/FprimeZephyrReference/test/int/power_monitor_test.py
+++ b/FprimeZephyrReference/test/int/power_monitor_test.py
@@ -70,16 +70,16 @@ def test_02_total_power_consumption_telemetry(
 ):
     """Test that TotalPowerConsumption telemetry is being updated"""
     start: TimeType = TimeType().set_datetime(datetime.now())
-    
+
     # Wait for a few telemetry updates (rate group runs at 1Hz)
     time.sleep(3)
-    
+
     total_power: ChData = fprime_test_api.assert_telemetry(
         f"{powerMonitor}.TotalPowerConsumption", start=start, timeout=10
     )
-    
+
     total_power_reading: float = total_power.get_val()
-    
+
     # Total power should be non-negative (accumulating over time)
     assert total_power_reading >= 0, "Total power consumption should be non-negative"
 
@@ -89,38 +89,38 @@ def test_03_reset_total_power_command(
 ):
     """Test that RESET_TOTAL_POWER command resets accumulated energy"""
     start: TimeType = TimeType().set_datetime(datetime.now())
-    
+
     # Wait for some power to accumulate
     time.sleep(3)
-    
+
     # Get current total power
     total_power_before: ChData = fprime_test_api.assert_telemetry(
         f"{powerMonitor}.TotalPowerConsumption", start=start, timeout=10
     )
-    
+
     # Reset total power
     proves_send_and_assert_command(
         fprime_test_api,
         f"{powerMonitor}.RESET_TOTAL_POWER",
         [],
     )
-    
+
     # Verify event was logged
     fprime_test_api.assert_event(
         f"{powerMonitor}.TotalPowerReset", start=start, timeout=10
     )
-    
+
     # Wait for next telemetry update
     time.sleep(2)
-    
+
     # Get total power after reset
     reset_time: TimeType = TimeType().set_datetime(datetime.now())
     total_power_after: ChData = fprime_test_api.assert_telemetry(
         f"{powerMonitor}.TotalPowerConsumption", start=reset_time, timeout=10
     )
-    
+
     total_power_after_reading: float = total_power_after.get_val()
-    
+
     # After reset, total power should be very small (close to 0)
     # Allow small value due to time between reset and next telemetry update
     assert total_power_after_reading < 0.1, (

From 94dba234b410c445867cefb9643e7e651782bcee Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 5 Nov 2025 16:11:27 +0000
Subject: [PATCH 05/17] Fix integration test timing and assertions

- Use start="NOW" instead of TimeType for consistency with other tests
- Reduce timeout from 10s to 3s to match other integration tests
- Remove unnecessary telemetry read before reset command
- Tighten reset assertion threshold from 0.1 to 0.01 mWh
- Add better comments explaining timing expectations

Co-authored-by: Mikefly123 <61564344+Mikefly123@users.noreply.github.com>
---
 .../test/int/power_monitor_test.py            | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/FprimeZephyrReference/test/int/power_monitor_test.py b/FprimeZephyrReference/test/int/power_monitor_test.py
index 7ed46dc9..ae38128f 100644
--- a/FprimeZephyrReference/test/int/power_monitor_test.py
+++ b/FprimeZephyrReference/test/int/power_monitor_test.py
@@ -69,13 +69,8 @@ def test_02_total_power_consumption_telemetry(
     fprime_test_api: IntegrationTestAPI, start_gds
 ):
     """Test that TotalPowerConsumption telemetry is being updated"""
-    start: TimeType = TimeType().set_datetime(datetime.now())
-
-    # Wait for a few telemetry updates (rate group runs at 1Hz)
-    time.sleep(3)
-
     total_power: ChData = fprime_test_api.assert_telemetry(
-        f"{powerMonitor}.TotalPowerConsumption", start=start, timeout=10
+        f"{powerMonitor}.TotalPowerConsumption", start="NOW", timeout=3
     )
 
     total_power_reading: float = total_power.get_val()
@@ -88,16 +83,9 @@ def test_03_reset_total_power_command(
     fprime_test_api: IntegrationTestAPI, start_gds
 ):
     """Test that RESET_TOTAL_POWER command resets accumulated energy"""
-    start: TimeType = TimeType().set_datetime(datetime.now())
-
     # Wait for some power to accumulate
     time.sleep(3)
 
-    # Get current total power
-    total_power_before: ChData = fprime_test_api.assert_telemetry(
-        f"{powerMonitor}.TotalPowerConsumption", start=start, timeout=10
-    )
-
     # Reset total power
     proves_send_and_assert_command(
         fprime_test_api,
@@ -107,22 +95,22 @@ def test_03_reset_total_power_command(
 
     # Verify event was logged
     fprime_test_api.assert_event(
-        f"{powerMonitor}.TotalPowerReset", start=start, timeout=10
+        f"{powerMonitor}.TotalPowerReset", start="NOW", timeout=3
     )
 
     # Wait for next telemetry update
     time.sleep(2)
 
-    # Get total power after reset
-    reset_time: TimeType = TimeType().set_datetime(datetime.now())
+    # Get total power after reset - should be very small (close to 0)
+    # Allow small value due to time between reset and next telemetry update
     total_power_after: ChData = fprime_test_api.assert_telemetry(
-        f"{powerMonitor}.TotalPowerConsumption", start=reset_time, timeout=10
+        f"{powerMonitor}.TotalPowerConsumption", start="NOW", timeout=3
     )
 
     total_power_after_reading: float = total_power_after.get_val()
 
-    # After reset, total power should be very small (close to 0)
-    # Allow small value due to time between reset and next telemetry update
-    assert total_power_after_reading < 0.1, (
+    # After reset and 2 seconds of accumulation, power should still be very small
+    # At 10W total power, 2 seconds = 0.0056 mWh, so 0.01 mWh is a reasonable threshold
+    assert total_power_after_reading < 0.01, (
         f"Total power after reset should be near 0, got {total_power_after_reading} mWh"
     )

From e2ef4880f344a9915b44dd15d8035a5bdb0eaf18 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 5 Nov 2025 16:48:11 +0000
Subject: [PATCH 06/17] Apply code formatters (clang-format and ruff)

- Fixed constructor initialization list formatting in PowerMonitor.cpp
- Fixed parameter alignment in PowerMonitor.hpp
- Fixed function signature formatting in power_monitor_test.py
- All files now pass clang-format and ruff format checks

Co-authored-by: Mikefly123 <61564344+Mikefly123@users.noreply.github.com>
---
 .../Components/PowerMonitor/PowerMonitor.cpp               | 7 ++-----
 .../Components/PowerMonitor/PowerMonitor.hpp               | 6 +++---
 FprimeZephyrReference/test/int/power_monitor_test.py       | 4 +---
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
index f6a15143..827360c0 100644
--- a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
+++ b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
@@ -12,11 +12,8 @@ namespace Components {
 // Component construction and destruction
 // ----------------------------------------------------------------------
 
-PowerMonitor ::PowerMonitor(const char* const compName) :
-    PowerMonitorComponentBase(compName),
-    m_totalPower_mWh(0.0f),
-    m_lastUpdateTime_s(0.0)
-{}
+PowerMonitor ::PowerMonitor(const char* const compName)
+    : PowerMonitorComponentBase(compName), m_totalPower_mWh(0.0f), m_lastUpdateTime_s(0.0) {}
 
 PowerMonitor ::~PowerMonitor() {}
 
diff --git a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.hpp b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.hpp
index cf6d73ff..4aa5d3b8 100644
--- a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.hpp
+++ b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.hpp
@@ -38,9 +38,9 @@ class PowerMonitor final : public PowerMonitorComponentBase {
     // ----------------------------------------------------------------------
 
     //! Handler implementation for RESET_TOTAL_POWER
-    void RESET_TOTAL_POWER_cmdHandler(FwOpcodeType opCode,    //!< The opcode
-                                       U32 cmdSeq              //!< The command sequence number
-                                       ) override;
+    void RESET_TOTAL_POWER_cmdHandler(FwOpcodeType opCode,  //!< The opcode
+                                      U32 cmdSeq            //!< The command sequence number
+                                      ) override;
 
     // ----------------------------------------------------------------------
     // Helper methods
diff --git a/FprimeZephyrReference/test/int/power_monitor_test.py b/FprimeZephyrReference/test/int/power_monitor_test.py
index ae38128f..cd2f7d67 100644
--- a/FprimeZephyrReference/test/int/power_monitor_test.py
+++ b/FprimeZephyrReference/test/int/power_monitor_test.py
@@ -79,9 +79,7 @@ def test_02_total_power_consumption_telemetry(
     assert total_power_reading >= 0, "Total power consumption should be non-negative"
 
 
-def test_03_reset_total_power_command(
-    fprime_test_api: IntegrationTestAPI, start_gds
-):
+def test_03_reset_total_power_command(fprime_test_api: IntegrationTestAPI, start_gds):
     """Test that RESET_TOTAL_POWER command resets accumulated energy"""
     # Wait for some power to accumulate
     time.sleep(3)

From 94c96f5eea87623bbe29293a25e9fe2ae306e08e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 5 Nov 2025 17:57:42 +0000
Subject: [PATCH 07/17] Fix event logging function name for TotalPowerReset

- Changed log_ACTIVITY_LO_TotalPowerReset() to log_ACTIVITY_LOW_TotalPowerReset()
- Matches F Prime's autocoder convention for 'activity low' severity events
- All formatters (clang-format and ruff) pass

Co-authored-by: Mikefly123 <61564344+Mikefly123@users.noreply.github.com>
---
 FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
index 827360c0..c661ab3c 100644
--- a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
+++ b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
@@ -44,7 +44,7 @@ void PowerMonitor ::run_handler(FwIndexType portNum, U32 context) {
 void PowerMonitor ::RESET_TOTAL_POWER_cmdHandler(FwOpcodeType opCode, U32 cmdSeq) {
     this->m_totalPower_mWh = 0.0f;
     this->m_lastUpdateTime_s = this->getCurrentTimeSeconds();
-    this->log_ACTIVITY_LO_TotalPowerReset();
+    this->log_ACTIVITY_LOW_TotalPowerReset();
     this->cmdResponse_out(opCode, cmdSeq, Fw::CmdResponse::OK);
 }
 

From 0ce31e741a923ec5dcf7a21cc95708381be7f9a8 Mon Sep 17 00:00:00 2001
From: Michael Pham <61564344+Mikefly123@users.noreply.github.com>
Date: Wed, 5 Nov 2025 10:23:43 -0800
Subject: [PATCH 08/17] Fixed Tests?

---
 .../Components/PowerMonitor/PowerMonitor.cpp        |  2 +-
 .../test/int/power_monitor_test.py                  | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
index c661ab3c..827360c0 100644
--- a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
+++ b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
@@ -44,7 +44,7 @@ void PowerMonitor ::run_handler(FwIndexType portNum, U32 context) {
 void PowerMonitor ::RESET_TOTAL_POWER_cmdHandler(FwOpcodeType opCode, U32 cmdSeq) {
     this->m_totalPower_mWh = 0.0f;
     this->m_lastUpdateTime_s = this->getCurrentTimeSeconds();
-    this->log_ACTIVITY_LOW_TotalPowerReset();
+    this->log_ACTIVITY_LO_TotalPowerReset();
     this->cmdResponse_out(opCode, cmdSeq, Fw::CmdResponse::OK);
 }
 
diff --git a/FprimeZephyrReference/test/int/power_monitor_test.py b/FprimeZephyrReference/test/int/power_monitor_test.py
index cd2f7d67..f5c947bd 100644
--- a/FprimeZephyrReference/test/int/power_monitor_test.py
+++ b/FprimeZephyrReference/test/int/power_monitor_test.py
@@ -4,8 +4,8 @@
 Integration tests for the Power Monitor component.
 """
 
-from datetime import datetime
 import time
+from datetime import datetime
 
 import pytest
 from common import proves_send_and_assert_command
@@ -50,6 +50,7 @@ def test_01_power_manager_telemetry(fprime_test_api: IntegrationTestAPI, start_g
         f"{ina219SolManager}.Power", start=start, timeout=65
     )
 
+    # TODO: Fix the power readings once INA219 power calculation is verified
     sys_voltage_reading: dict[float] = sys_voltage.get_val()
     sys_current_reading: dict[float] = sys_current.get_val()
     # sys_power_reading: dict[float] = sys_power.get_val()
@@ -75,8 +76,8 @@ def test_02_total_power_consumption_telemetry(
 
     total_power_reading: float = total_power.get_val()
 
-    # Total power should be non-negative (accumulating over time)
-    assert total_power_reading >= 0, "Total power consumption should be non-negative"
+    # Total power should be non-zero (accumulating over time)
+    assert total_power_reading != 0, "Total power consumption should be non-zero"
 
 
 def test_03_reset_total_power_command(fprime_test_api: IntegrationTestAPI, start_gds):
@@ -92,9 +93,7 @@ def test_03_reset_total_power_command(fprime_test_api: IntegrationTestAPI, start
     )
 
     # Verify event was logged
-    fprime_test_api.assert_event(
-        f"{powerMonitor}.TotalPowerReset", start="NOW", timeout=3
-    )
+    fprime_test_api.assert_event(f"{powerMonitor}.TotalPowerReset", timeout=3)
 
     # Wait for next telemetry update
     time.sleep(2)
@@ -102,7 +101,7 @@ def test_03_reset_total_power_command(fprime_test_api: IntegrationTestAPI, start
     # Get total power after reset - should be very small (close to 0)
     # Allow small value due to time between reset and next telemetry update
     total_power_after: ChData = fprime_test_api.assert_telemetry(
-        f"{powerMonitor}.TotalPowerConsumption", start="NOW", timeout=3
+        f"{powerMonitor}.TotalPowerConsumption", timeout=3
     )
 
     total_power_after_reading: float = total_power_after.get_val()

From c8266c566a95aa68efc8374781f66b44e0642adc Mon Sep 17 00:00:00 2001
From: Michael Pham <61564344+Mikefly123@users.noreply.github.com>
Date: Wed, 5 Nov 2025 10:30:06 -0800
Subject: [PATCH 09/17] Fixed for real?

---
 FprimeZephyrReference/test/int/power_monitor_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FprimeZephyrReference/test/int/power_monitor_test.py b/FprimeZephyrReference/test/int/power_monitor_test.py
index f5c947bd..21fba172 100644
--- a/FprimeZephyrReference/test/int/power_monitor_test.py
+++ b/FprimeZephyrReference/test/int/power_monitor_test.py
@@ -71,7 +71,7 @@ def test_02_total_power_consumption_telemetry(
 ):
     """Test that TotalPowerConsumption telemetry is being updated"""
     total_power: ChData = fprime_test_api.assert_telemetry(
-        f"{powerMonitor}.TotalPowerConsumption", start="NOW", timeout=3
+        f"{powerMonitor}.TotalPowerConsumption", start="NOW", timeout=65
     )
 
     total_power_reading: float = total_power.get_val()
@@ -101,7 +101,7 @@ def test_03_reset_total_power_command(fprime_test_api: IntegrationTestAPI, start
     # Get total power after reset - should be very small (close to 0)
     # Allow small value due to time between reset and next telemetry update
     total_power_after: ChData = fprime_test_api.assert_telemetry(
-        f"{powerMonitor}.TotalPowerConsumption", timeout=3
+        f"{powerMonitor}.TotalPowerConsumption", start="NOW", timeout=65
     )
 
     total_power_after_reading: float = total_power_after.get_val()

From 8b57df04613dfde2519074b09e33ec67e5eee47f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 5 Nov 2025 18:52:17 +0000
Subject: [PATCH 10/17] Fix critical issues causing Zephyr crash

- Corrected event log function to log_ACTIVITY_LOW_TotalPowerReset()
  (was incorrectly reverted to log_ACTIVITY_LO_ which causes undefined behavior)
- Added sanity check for power values (0-1000W range) to prevent invalid data
- Emit telemetry on first call to initialize the channel
- These fixes address the board freeze/crash issue

Co-authored-by: Mikefly123 <61564344+Mikefly123@users.noreply.github.com>
---
 .../Components/PowerMonitor/PowerMonitor.cpp             | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
index 827360c0..d7e2e3fe 100644
--- a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
+++ b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
@@ -44,7 +44,7 @@ void PowerMonitor ::run_handler(FwIndexType portNum, U32 context) {
 void PowerMonitor ::RESET_TOTAL_POWER_cmdHandler(FwOpcodeType opCode, U32 cmdSeq) {
     this->m_totalPower_mWh = 0.0f;
     this->m_lastUpdateTime_s = this->getCurrentTimeSeconds();
-    this->log_ACTIVITY_LO_TotalPowerReset();
+    this->log_ACTIVITY_LOW_TotalPowerReset();
     this->cmdResponse_out(opCode, cmdSeq, Fw::CmdResponse::OK);
 }
 
@@ -58,11 +58,18 @@ F64 PowerMonitor ::getCurrentTimeSeconds() {
 }
 
 void PowerMonitor ::updatePower(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) {
         this->m_lastUpdateTime_s = now_s;
+        // Emit initial telemetry value
+        this->tlmWrite_TotalPowerConsumption(this->m_totalPower_mWh);
         return;
     }
 

From 759d02cb77059a934dafe76c6ecc2fb07d19d01f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 5 Nov 2025 18:57:28 +0000
Subject: [PATCH 11/17] Correct event log function to
 log_ACTIVITY_LO_TotalPowerReset

- Changed from log_ACTIVITY_LOW_ back to log_ACTIVITY_LO_
- F Prime autocoder generates LO (not LOW) for 'severity activity low'
- Matches pattern used in Burnwire and other components
- All formatters pass

Co-authored-by: Mikefly123 <61564344+Mikefly123@users.noreply.github.com>
---
 FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
index d7e2e3fe..1b4653e9 100644
--- a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
+++ b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
@@ -44,7 +44,7 @@ void PowerMonitor ::run_handler(FwIndexType portNum, U32 context) {
 void PowerMonitor ::RESET_TOTAL_POWER_cmdHandler(FwOpcodeType opCode, U32 cmdSeq) {
     this->m_totalPower_mWh = 0.0f;
     this->m_lastUpdateTime_s = this->getCurrentTimeSeconds();
-    this->log_ACTIVITY_LOW_TotalPowerReset();
+    this->log_ACTIVITY_LO_TotalPowerReset();
     this->cmdResponse_out(opCode, cmdSeq, Fw::CmdResponse::OK);
 }
 

From 3dfbb9d411186f151577fc16cdb72eb4affda180 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 5 Nov 2025 21:14:00 +0000
Subject: [PATCH 12/17] Add TotalPowerGenerated telemetry for solar power
 tracking

- Added TotalPowerGenerated telemetry channel (F32, mWh)
- Added RESET_TOTAL_GENERATION command to reset solar generation
- Added TotalGenerationReset event
- Implemented updateGeneration() helper to track solar power separately
- Added m_totalGeneration_mWh member variable
- Added TotalPowerGenerated to PowerMonitor packet (id 9)
- Solar power is now tracked independently from consumption
- All formatters pass

Co-authored-by: Mikefly123 <61564344+Mikefly123@users.noreply.github.com>
---
 .../Components/PowerMonitor/PowerMonitor.cpp  | 42 ++++++++++++++++++-
 .../Components/PowerMonitor/PowerMonitor.fpp  | 11 +++++
 .../Components/PowerMonitor/PowerMonitor.hpp  | 11 +++++
 .../Top/ReferenceDeploymentPackets.fppi       |  1 +
 4 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
index 1b4653e9..45f1438c 100644
--- a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
+++ b/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
diff --git a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.fpp b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.fpp
index abdc5676..5eb999b0 100644
--- a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.fpp
+++ b/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  #
         ###############################################################################
diff --git a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.hpp b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.hpp
index 4aa5d3b8..1ff57905 100644
--- a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.hpp
+++ b/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,6 +57,9 @@ 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
     // ----------------------------------------------------------------------
@@ -59,6 +67,9 @@ class PowerMonitor final : public PowerMonitorComponentBase {
     //! 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;
 };
diff --git a/FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi b/FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi
index 5c8b89ab..69016b96 100644
--- a/FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi
+++ b/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 {

From 0eb0a9dcef8ae5117823a42fb4736d13cf6bf22f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 9 Nov 2025 23:07:35 +0000
Subject: [PATCH 13/17] Increase command dispatcher table size to 55

- Raised CMD_DISPATCHER_DISPATCH_TABLE_SIZE from 50 to 55
- Fixes assertion failure on boot caused by exceeding command slot limit
- The addition of RESET_TOTAL_POWER and RESET_TOTAL_GENERATION commands
  pushed the total command count beyond the previous limit of 50
- System was trying to register to slot 49 (50th slot) when limit was reached

Co-authored-by: Mikefly123 <61564344+Mikefly123@users.noreply.github.com>
---
 .../project/config/CommandDispatcherImplCfg.hpp                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FprimeZephyrReference/project/config/CommandDispatcherImplCfg.hpp b/FprimeZephyrReference/project/config/CommandDispatcherImplCfg.hpp
index ab88a46b..f84e9824 100644
--- a/FprimeZephyrReference/project/config/CommandDispatcherImplCfg.hpp
+++ b/FprimeZephyrReference/project/config/CommandDispatcherImplCfg.hpp
@@ -11,7 +11,7 @@
 // Define configuration values for dispatcher
 
 enum {
-    CMD_DISPATCHER_DISPATCH_TABLE_SIZE = 50,   // !< The size of the table holding opcodes to dispatch
+    CMD_DISPATCHER_DISPATCH_TABLE_SIZE = 55,   // !< The size of the table holding opcodes to dispatch
     CMD_DISPATCHER_SEQUENCER_TABLE_SIZE = 10,  // !< The size of the table holding commands in progress
 };
 

From e41565c89f1f64f8e2a71cdd87626ecf311fdc93 Mon Sep 17 00:00:00 2001
From: ineskhou <ineskhouider03@gmail.com>
Date: Tue, 11 Nov 2025 19:16:19 -0800
Subject: [PATCH 14/17] linter appeasement

---
 FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
index 45f1438c..2fda5aa1 100644
--- a/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
+++ b/FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp
@@ -4,6 +4,7 @@
 // ======================================================================
 
 #include "FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.hpp"
+
 #include <Fw/Time/Time.hpp>
 
 namespace Components {

From 424c1cb4a8fdc55dc9940b05506d432fc7ae5dce Mon Sep 17 00:00:00 2001
From: ineskhou <ineskhouider03@gmail.com>
Date: Wed, 12 Nov 2025 09:40:25 -0800
Subject: [PATCH 15/17] removed b test

---
 .../test/int/power_monitor_test.py            | 34 -------------------
 1 file changed, 34 deletions(-)

diff --git a/FprimeZephyrReference/test/int/power_monitor_test.py b/FprimeZephyrReference/test/int/power_monitor_test.py
index 3336a95a..89a171ff 100644
--- a/FprimeZephyrReference/test/int/power_monitor_test.py
+++ b/FprimeZephyrReference/test/int/power_monitor_test.py
@@ -4,7 +4,6 @@
 Integration tests for the Power Monitor component.
 """
 
-import time
 from datetime import datetime
 
 import pytest
@@ -78,36 +77,3 @@ def test_02_total_power_consumption_telemetry(
 
     # Total power should be non-zero (accumulating over time)
     assert total_power_reading != 0, "Total power consumption should be non-zero"
-
-
-def test_03_reset_total_power_command(fprime_test_api: IntegrationTestAPI, start_gds):
-    """Test that RESET_TOTAL_POWER command resets accumulated energy"""
-    # Wait for some power to accumulate
-    time.sleep(3)
-
-    # Reset total power
-    proves_send_and_assert_command(
-        fprime_test_api,
-        f"{powerMonitor}.RESET_TOTAL_POWER",
-        [],
-    )
-
-    # Verify event was logged
-    fprime_test_api.assert_event(f"{powerMonitor}.TotalPowerReset", timeout=3)
-
-    # Wait for next telemetry update
-    time.sleep(2)
-
-    # Get total power after reset - should be very small (close to 0)
-    # Allow small value due to time between reset and next telemetry update
-    total_power_after: ChData = fprime_test_api.assert_telemetry(
-        f"{powerMonitor}.TotalPowerConsumption", start="NOW", timeout=65
-    )
-
-    total_power_after_reading: float = total_power_after.get_val()
-
-    # After reset and 2 seconds of accumulation, power should still be very small
-    # At 10W total power, 2 seconds = 0.0056 mWh, so 0.01 mWh is a reasonable threshold
-    assert total_power_after_reading < 0.01, (
-        f"Total power after reset should be near 0, got {total_power_after_reading} mWh"
-    )

From f0449c65bd688f960b74c6828b747917ffad31a6 Mon Sep 17 00:00:00 2001
From: ineskhou <ineskhouider03@gmail.com>
Date: Wed, 12 Nov 2025 10:05:13 -0800
Subject: [PATCH 16/17] deplit

---
 .../Components/AntennaDeployer/AntennaDeployer.cpp             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FprimeZephyrReference/Components/AntennaDeployer/AntennaDeployer.cpp b/FprimeZephyrReference/Components/AntennaDeployer/AntennaDeployer.cpp
index 3e963563..0df4a3c9 100644
--- a/FprimeZephyrReference/Components/AntennaDeployer/AntennaDeployer.cpp
+++ b/FprimeZephyrReference/Components/AntennaDeployer/AntennaDeployer.cpp
@@ -113,8 +113,9 @@ void AntennaDeployer ::startNextAttempt() {
 
     this->log_ACTIVITY_HI_DeployAttempt(this->m_currentAttempt);
 
-    this->m_totalAttempts++;
     this->tlmWrite_DeployAttemptCount(this->m_totalAttempts);
+    this->m_totalAttempts++;
+
     this->m_burnTicksThisAttempt = 0;
 
     if (this->isConnected_burnStart_OutputPort(0)) {

From bc3a4c520c7380ee84d83046b8bdaf57dc757740 Mon Sep 17 00:00:00 2001
From: ineskhou <ineskhouider03@gmail.com>
Date: Wed, 12 Nov 2025 10:06:54 -0800
Subject: [PATCH 17/17] added explicit argument matching to antenna deployer

---
 .../test/int/antenna_deployer_test.py                | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/FprimeZephyrReference/test/int/antenna_deployer_test.py b/FprimeZephyrReference/test/int/antenna_deployer_test.py
index 3e5d89a1..f0a91e00 100644
--- a/FprimeZephyrReference/test/int/antenna_deployer_test.py
+++ b/FprimeZephyrReference/test/int/antenna_deployer_test.py
@@ -57,7 +57,7 @@ def test_deploy_without_distance_sensor(fprime_test_api: IntegrationTestAPI, sta
     proves_send_and_assert_command(fprime_test_api, f"{antenna_deployer}.DEPLOY")
 
     attempt_event: EventData = fprime_test_api.assert_event(
-        f"{antenna_deployer}.DeployAttempt", timeout=5
+        f"{antenna_deployer}.DeployAttempt", args=[1], timeout=5
     )
     assert attempt_event.args[0].val == 1, (
         "First deployment attempt should be attempt #1"
@@ -98,7 +98,7 @@ def test_change_quiet_time_sec(fprime_test_api: IntegrationTestAPI, start_gds):
 
     # Verify deployment attempt starts after quiet time expires
     attempt_event: EventData = fprime_test_api.assert_event(
-        f"{antenna_deployer}.DeployAttempt", timeout=2
+        f"{antenna_deployer}.DeployAttempt", args=[1], timeout=2
     )
     assert attempt_event.args[0].val == 1, (
         "First deployment attempt should be attempt #1"
@@ -140,7 +140,7 @@ def test_multiple_deploy_attempts(fprime_test_api: IntegrationTestAPI, start_gds
 
     # Verify first attempt
     attempt_event: EventData = fprime_test_api.assert_event(
-        f"{antenna_deployer}.DeployAttempt", timeout=5
+        f"{antenna_deployer}.DeployAttempt", args=[1], timeout=5
     )
     assert attempt_event.args[0].val == 1, "First attempt should be #1"
 
@@ -153,7 +153,7 @@ def test_multiple_deploy_attempts(fprime_test_api: IntegrationTestAPI, start_gds
 
     # Wait for retry delay and verify second attempt
     attempt_event = fprime_test_api.assert_event(
-        f"{antenna_deployer}.DeployAttempt", timeout=15
+        f"{antenna_deployer}.DeployAttempt", args=[2], timeout=15
     )
     assert attempt_event.args[0].val == 2, "Second attempt should be #2"
 
@@ -166,7 +166,7 @@ def test_multiple_deploy_attempts(fprime_test_api: IntegrationTestAPI, start_gds
 
     # Wait for retry delay and verify third attempt
     attempt_event = fprime_test_api.assert_event(
-        f"{antenna_deployer}.DeployAttempt", timeout=15
+        f"{antenna_deployer}.DeployAttempt", args=[3], timeout=15
     )
     assert attempt_event.args[0].val == 3, "Third attempt should be #3"
 
@@ -205,7 +205,7 @@ def test_burn_duration_sec(fprime_test_api: IntegrationTestAPI, start_gds):
 
     # Wait for deployment attempt to start
     attempt_event: EventData = fprime_test_api.assert_event(
-        f"{antenna_deployer}.DeployAttempt", timeout=5
+        f"{antenna_deployer}.DeployAttempt", args=[1], timeout=5
     )
     assert attempt_event.args[0].val == 1, (
         "First deployment attempt should be attempt #1"