Unify power monitor

Author: nateinaction

FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.cpp

@@ -20,9 +20,15 @@ PowerMonitor ::~PowerMonitor() {}
 // ----------------------------------------------------------------------
 
 void PowerMonitor ::run_handler(FwIndexType portNum, U32 context) {
-    this->voltageGet_out(0);
-    this->currentGet_out(0);
-    this->powerGet_out(0);
+    // System Power Monitor INA219 Requests
+    this->sysVoltageGet_out(0);
+    this->sysCurrentGet_out(0);
+    this->sysPowerGet_out(0);
+
+    // Solar Panel Power Monitor INA219 Requests
+    this->solVoltageGet_out(0);
+    this->solCurrentGet_out(0);
+    this->solPowerGet_out(0);
 }
 
 }  // namespace Components

FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.fpp

@@ -3,14 +3,23 @@ module Components {
     passive component PowerMonitor {
         sync input port run: Svc.Sched
 
-        @ Port for sending voltageGet calls to the INA219 Driver
-        output port voltageGet: Drv.VoltageGet
+        @ Port for sending voltageGet calls to the System INA219 Driver
+        output port sysVoltageGet: Drv.VoltageGet
 
-        @ Port for sending currentGet calls to the INA219 Driver
-        output port currentGet: Drv.CurrentGet
+        @ Port for sending currentGet calls to the System INA219 Driver
+        output port sysCurrentGet: Drv.CurrentGet
 
-        @ Port for sending powerGet calls to the INA219 Driver
-        output port powerGet: Drv.PowerGet
+        @ Port for sending powerGet calls to the System INA219 Driver
+        output port sysPowerGet: Drv.PowerGet
+
+        @ Port for sending voltageGet calls to the Solar Panel INA219 Driver
+        output port solVoltageGet: Drv.VoltageGet
+
+        @ Port for sending currentGet calls to the Solar Panel INA219 Driver
+        output port solCurrentGet: Drv.CurrentGet
+
+        @ Port for sending powerGet calls to the Solar Panel INA219 Driver
+        output port solPowerGet: Drv.PowerGet
 
         ###############################################################################
         # Standard AC Ports: Required for Channels, Events, Commands, and Parameters  #

FprimeZephyrReference/ReferenceDeployment/Top/instances.fpp

@@ -90,11 +90,9 @@ module ReferenceDeployment {
 
   instance fsSpace: Components.FsSpace base id 0x10030000
 
-  instance sysPowerMonitor: Components.PowerMonitor base id 0x10031000
+  instance powerMonitor: Components.PowerMonitor base id 0x10031000
 
-  instance solPowerMonitor: Components.PowerMonitor base id 0x10032000
+  instance ina219SysManager: Drv.Ina219Manager base id 0x10032000
 
-  instance ina219SysManager: Drv.Ina219Manager base id 0x10033000
-
-  instance ina219SolManager: Drv.Ina219Manager base id 0x10034000
+  instance ina219SolManager: Drv.Ina219Manager base id 0x10033000
 }

FprimeZephyrReference/ReferenceDeployment/Top/topology.fpp

@@ -44,9 +44,8 @@ module ReferenceDeployment {
     # For UART sideband communication
     instance comDriver
     instance fsSpace
-    instance sysPowerMonitor
+    instance powerMonitor
     instance ina219SysManager
-    instance solPowerMonitor
     instance ina219SolManager
 
 
@@ -141,8 +140,7 @@ module ReferenceDeployment {
       rateGroup1Hz.RateGroupMemberOut[7] -> burnwire.schedIn
       rateGroup1Hz.RateGroupMemberOut[8] -> antennaDeployer.schedIn
       rateGroup1Hz.RateGroupMemberOut[9] -> fsSpace.run
-      rateGroup1Hz.RateGroupMemberOut[10] -> sysPowerMonitor.run
-      rateGroup1Hz.RateGroupMemberOut[11] -> solPowerMonitor.run
+      rateGroup1Hz.RateGroupMemberOut[10] -> powerMonitor.run
 
     }
 
@@ -169,15 +167,13 @@ module ReferenceDeployment {
     }
 
     connections sysPowerMonitor {
-      sysPowerMonitor.voltageGet -> ina219SysManager.voltageGet
-      sysPowerMonitor.currentGet -> ina219SysManager.currentGet
-      sysPowerMonitor.powerGet -> ina219SysManager.powerGet
+      powerMonitor.sysVoltageGet -> ina219SysManager.voltageGet
+      powerMonitor.sysCurrentGet -> ina219SysManager.currentGet
+      powerMonitor.sysPowerGet -> ina219SysManager.powerGet
+      powerMonitor.solVoltageGet -> ina219SolManager.voltageGet
+      powerMonitor.solCurrentGet -> ina219SolManager.currentGet
+      powerMonitor.solPowerGet -> ina219SolManager.powerGet
     }
 
-    connections solPowerMonitor {
-      solPowerMonitor.voltageGet -> ina219SolManager.voltageGet
-      solPowerMonitor.currentGet -> ina219SolManager.currentGet
-      solPowerMonitor.powerGet -> ina219SolManager.powerGet
-    }
   }
 }