add helper function for power monitor device configure and add solar power monitor to topology

Author: asiemsen

FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.cpp

@@ -15,11 +15,15 @@ namespace Drv {
 // ----------------------------------------------------------------------
 
 Ina219Manager ::Ina219Manager(const char* const compName) : Ina219ManagerComponentBase(compName) {
-    dev = device_get_binding("INA219");
+    this->m_dev = device_get_binding("INA219");
 }
 
 Ina219Manager ::~Ina219Manager() {}
 
+void Ina219Manager::configure(const struct device *dev) {
+    this->m_dev = dev;
+}
+
 // ----------------------------------------------------------------------
 // Handler implementations for typed input ports
 // ----------------------------------------------------------------------

FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.hpp

@@ -27,6 +27,8 @@ class Ina219Manager final : public Ina219ManagerComponentBase {
     //! Destroy Ina219Manager object
     ~Ina219Manager();
 
+    void configure(const struct device *dev); // helper function to configure device for the class
+
   private:
     // ----------------------------------------------------------------------
     // Handler implementations for typed input ports
@@ -49,12 +51,14 @@ class Ina219Manager final : public Ina219ManagerComponentBase {
     //! Port to read the voltage in volts
     F64 voltageGet_handler(FwIndexType portNum  //!< The port number
                            ) override;
+
+    
     // ----------------------------------------------------------------------
     // Member variables
     // ----------------------------------------------------------------------
 
     //! Zephyr device stores the initialized LIS2MDL sensor
-    const struct device* dev;                    
+    const struct device* m_dev;                    
 };
 
 }  // namespace Drv

FprimeZephyrReference/ReferenceDeployment/Main.cpp

@@ -10,9 +10,12 @@
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
+const struct device* ina219Sys = DEVICE_DT_GET(DT_NODELABEL(ina219Sys));
+const struct device* ina219Sol = DEVICE_DT_GET(DT_NODELABEL(ina219Sol));
 const struct device* serial = DEVICE_DT_GET(DT_NODELABEL(cdc_acm_uart0));
 const struct device* lora = DEVICE_DT_GET(DT_NODELABEL(lora0));
 
+
 int main(int argc, char* argv[]) {
     // ** DO NOT REMOVE **//
     //
@@ -22,9 +25,13 @@ int main(int argc, char* argv[]) {
     Os::init();
     // Object for communicating state to the topology
     ReferenceDeployment::TopologyState inputs;
+    inputs.ina219SysDevice = ina219Sys;
+    inputs.ina219SolDevice = ina219Sol;
     inputs.loraDevice = lora;
     inputs.uartDevice = serial;
     inputs.baudRate = 115200;
+    
+
 
     // Setup, cycle, and teardown topology
     ReferenceDeployment::setupTopology(inputs);

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi

@@ -61,10 +61,16 @@ telemetry packets ReferenceDeploymentPackets {
     ReferenceDeployment.antennaDeployer.LastDistance
   }
 
-  packet PowerMonitor id 9 group 4 {
-    ReferenceDeployment.ina219Manager.Voltage
-    ReferenceDeployment.ina219Manager.Current
-    ReferenceDeployment.ina219Manager.Power
+  packet sysPowerMonitor id 9 group 4 {
+    ReferenceDeployment.ina219SysManager.Voltage
+    ReferenceDeployment.ina219SysManager.Current
+    ReferenceDeployment.ina219SysManager.Power
+  }
+
+  packet solPowerMonitor id 10 group 4 {
+    ReferenceDeployment.ina219SolManager.Voltage
+    ReferenceDeployment.ina219SolManager.Current
+    ReferenceDeployment.ina219SolManager.Power
   }
 
 } omit {

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentTopology.cpp

@@ -87,6 +87,7 @@ void setupTopology(const TopologyState& state) {
     // for over-the-air communications.
     lora.start(state.loraDevice, Zephyr::TransmitState::DISABLED);
     comDriver.configure(state.uartDevice, state.baudRate);
+    ina219Manager.configure(state.ina219SysDevice);
 }
 
 void startRateGroups() {

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentTopologyDefs.hpp

@@ -69,6 +69,8 @@ namespace ReferenceDeployment {
  * autocoder. The contents are entirely up to the definition of the project. This deployment uses subtopologies.
  */
 struct TopologyState {
+    const device* ina219SysDevice;        //!< device path for battery board ina219 
+    const device* ina219SolDevice;        //!< device path for solar panel ina219 
     const device* uartDevice;             //!< UART device path for communication
     const device* loraDevice;             //!< LoRa device path for communication
     U32 baudRate;                         //!< Baud rate for UART communication

FprimeZephyrReference/ReferenceDeployment/Top/instances.fpp

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

FprimeZephyrReference/ReferenceDeployment/Top/topology.fpp

@@ -139,7 +139,8 @@ module ReferenceDeployment {
       rateGroup1Hz.RateGroupMemberOut[7] -> burnwire.schedIn
       rateGroup1Hz.RateGroupMemberOut[8] -> antennaDeployer.schedIn
       rateGroup1Hz.RateGroupMemberOut[9] -> fsSpace.run
-      rateGroup1Hz.RateGroupMemberOut[10] -> powerMonitor.run
+      rateGroup1Hz.RateGroupMemberOut[10] -> sysPowerMonitor.run
+      rateGroup1Hz.RateGroupMemberOut[11] -> solPowerMonitor.run
 
     }
 
@@ -165,10 +166,16 @@ module ReferenceDeployment {
       imuManager.temperatureGet -> lsm6dsoManager.temperatureGet
     }
 
-    connections powerMonitor {
-      powerMonitor.voltageGet -> ina219Manager.voltageGet
-      powerMonitor.currentGet -> ina219Manager.currentGet
-      powerMonitor.powerGet -> ina219Manager.powerGet
+    connections sysPowerMonitor {
+      sysPowerMonitor.voltageGet -> ina219SysManager.voltageGet
+      sysPowerMonitor.currentGet -> ina219SysManager.currentGet
+      sysPowerMonitor.powerGet -> ina219SysManager.powerGet
+    }
+
+    connections solPowerMonitor {
+      solPowerMonitor.voltageGet -> ina219SolManager.voltageGet
+      solPowerMonitor.currentGet -> ina219SolManager.currentGet
+      solPowerMonitor.powerGet -> ina219SolManager.powerGet
     }
   }
 }

boards/bronco_space/proves_flight_control_board_v5/proves_flight_control_board_v5.dtsi

@@ -159,11 +159,18 @@ zephyr_udc0: &usbd {
 		backup-switch-mode = "direct";
 		label = "RV3028";
 	};
-	ina219: ina219@40 {
+	ina219Sys: ina219@40 {
 		compatible = "ti,ina219";
 		reg = <0x40>;
 		shunt-milliohm = <2>;
 		lsb-microamp = <100>;
-		label = "INA219";
+		label = "INA219 sys";
+	};
+	ina219Sol: ina219@41 {
+		compatible = "ti,ina219";
+		reg = <0x41>;
+		shunt-milliohm = <2>;
+		lsb-microamp = <100>;
+		label = "INA219 sol";
 	};
 };