Update Device Tree

Author: Mikefly123

FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.cpp

@@ -7,7 +7,6 @@
 #include "FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.hpp"
 #include <Fw/Types/Assert.hpp>
 
-
 namespace Drv {
 
 // ----------------------------------------------------------------------
@@ -18,7 +17,7 @@ Ina219Manager ::Ina219Manager(const char* const compName) : Ina219ManagerCompone
 
 Ina219Manager ::~Ina219Manager() {}
 
-void Ina219Manager::configure(const struct device *dev) {
+void Ina219Manager::configure(const struct device* dev) {
     this->m_dev = dev;
 }
 
@@ -27,13 +26,13 @@ void Ina219Manager::configure(const struct device *dev) {
 // ----------------------------------------------------------------------
 
 F64 Ina219Manager ::currentGet_handler(FwIndexType portNum) {
-    if(!device_is_ready(this->m_dev)) {
+    if (!device_is_ready(this->m_dev)) {
         this->log_WARNING_HI_DeviceNotReady();
         return 0;
     }
     this->log_WARNING_HI_DeviceNotReady_ThrottleClear();
 
-    struct sensor_value current; 
+    struct sensor_value current;
 
     sensor_sample_fetch_chan(this->m_dev, SENSOR_CHAN_CURRENT);
 
@@ -45,38 +44,38 @@ F64 Ina219Manager ::currentGet_handler(FwIndexType portNum) {
 }
 
 F64 Ina219Manager ::powerGet_handler(FwIndexType portNum) {
-    if(!device_is_ready(this->m_dev)) {
+    if (!device_is_ready(this->m_dev)) {
         this->log_WARNING_HI_DeviceNotReady();
         return 0;
     }
     this->log_WARNING_HI_DeviceNotReady_ThrottleClear();
 
-    struct sensor_value power; 
+    struct sensor_value power;
 
     sensor_sample_fetch_chan(this->m_dev, SENSOR_CHAN_POWER);
 
     sensor_channel_get(this->m_dev, SENSOR_CHAN_POWER, &power);
 
     this->tlmWrite_Current(sensor_value_to_double(&power));
-    
+
     return sensor_value_to_double(&power);
 }
 
 F64 Ina219Manager ::voltageGet_handler(FwIndexType portNum) {
-    if(!device_is_ready(this->m_dev)) {
+    if (!device_is_ready(this->m_dev)) {
         this->log_WARNING_HI_DeviceNotReady();
         return 0;
     }
     this->log_WARNING_HI_DeviceNotReady_ThrottleClear();
 
-    struct sensor_value voltage; 
+    struct sensor_value voltage;
 
     sensor_sample_fetch_chan(this->m_dev, SENSOR_CHAN_VOLTAGE);
 
     sensor_channel_get(this->m_dev, SENSOR_CHAN_VOLTAGE, &voltage);
 
     this->tlmWrite_Current(sensor_value_to_double(&voltage));
-    
+
     return sensor_value_to_double(&voltage);
 }
 

FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.fpp

@@ -8,7 +8,7 @@ module Drv {
     @ Manager for Ina219 device
     passive component Ina219Manager {
 
-        #Ports 
+        #Ports
         @ Port to read the voltage in volts
         sync input port voltageGet: VoltageGet
 
@@ -18,20 +18,20 @@ module Drv {
         @ Port to read the power in watts
         sync input port powerGet: PowerGet
 
-        # Telemetry channels 
+        # Telemetry channels
 
-        @ Telemtry channel for voltage in volts
+        @ Telemetry channel for voltage in volts
         telemetry Voltage: F64
 
-        @ Telemtry channel for current in amps
+        @ Telemetry channel for current in amps
         telemetry Current: F64
 
-        @ Telemtry channel for power in watts
+        @ Telemetry channel for power in watts
         telemetry Power: F64
 
-        @ Event for reporting INA219 not ready error 
+        @ Event for reporting INA219 not ready error
         event DeviceNotReady() severity warning high format "INA219 device not ready" throttle 5
-        
+
 
         ###############################################################################
         # Standard AC Ports: Required for Channels, Events, Commands, and Parameters  #
@@ -49,4 +49,4 @@ module Drv {
         telemetry port tlmOut
 
     }
-}
+}

FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.hpp

@@ -27,7 +27,7 @@ class Ina219Manager final : public Ina219ManagerComponentBase {
     //! Destroy Ina219Manager object
     ~Ina219Manager();
 
-    void configure(const struct device *dev); // helper function to configure device for the class
+    void configure(const struct device* dev);  // helper function to configure device for the class
 
   private:
     // ----------------------------------------------------------------------
@@ -52,13 +52,12 @@ class Ina219Manager final : public Ina219ManagerComponentBase {
     F64 voltageGet_handler(FwIndexType portNum  //!< The port number
                            ) override;
 
-    
     // ----------------------------------------------------------------------
     // Member variables
     // ----------------------------------------------------------------------
 
     //! Zephyr device stores the initialized LIS2MDL sensor
-    const struct device* m_dev;                    
+    const struct device* m_dev;
 };
 
 }  // namespace Drv

FprimeZephyrReference/Components/Drv/Ina219Manager/docs/sdd.md

@@ -63,4 +63,4 @@ Add requirements in the chart below
 ## Change Log
 | Date | Description |
 |---|---|
-|---| Initial Draft |
+|---| Initial Draft |

FprimeZephyrReference/Components/PowerMonitor/PowerMonitor.fpp

@@ -19,4 +19,4 @@ module Components {
         time get port timeCaller
 
     }
-}
+}

FprimeZephyrReference/Components/PowerMonitor/docs/sdd.md

@@ -63,4 +63,4 @@ Add requirements in the chart below
 ## Change Log
 | Date | Description |
 |---|---|
-|---| Initial Draft |
+|---| Initial Draft |

FprimeZephyrReference/ReferenceDeployment/Main.cpp

@@ -15,7 +15,6 @@ const struct device* ina219Sol = device_get_binding("INA219 sol");
 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 **//
     //
@@ -30,8 +29,6 @@ int main(int argc, char* argv[]) {
     inputs.loraDevice = lora;
     inputs.uartDevice = serial;
     inputs.baudRate = 115200;
-    
-
 
     // Setup, cycle, and teardown topology
     ReferenceDeployment::setupTopology(inputs);

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentTopologyDefs.hpp

@@ -69,8 +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* 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

boards/bronco_space/proves_flight_control_board_v5/proves_flight_control_board_v5-pinctrl.dtsi

@@ -21,6 +21,12 @@
 			input-enable;
 		};
 	};
+	i2c0_default: i2c0_default {
+		group1 {
+			pinmux = <I2C0_SCL_P24>, <I2C0_SDA_P25>;
+			input-enable;
+		};
+	};
 	i2c1_default: i2c1_default {
 		group1 {
 			pinmux = <I2C1_SCL_P3>, <I2C1_SDA_P2>;

boards/bronco_space/proves_flight_control_board_v5/proves_flight_control_board_v5.dtsi

@@ -135,6 +135,29 @@ zephyr_udc0: &usbd {
 	};
 };
 
+&i2c0 {
+	status = "okay";
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-names = "default";
+	clock-frequency = <100000>;
+
+	ina219Sys: ina219Sys@40 {
+		compatible = "ti,ina219";
+		reg = <0x40>;
+		shunt-milliohm = <2>;
+		lsb-microamp = <100>;
+		label = "INA219 sys";
+	};
+	ina219Sol: ina219Sol@41 {
+		compatible = "ti,ina219";
+		reg = <0x41>;
+		shunt-milliohm = <2>;
+		lsb-microamp = <100>;
+		label = "INA219 sol";
+	};
+};
+
+
 &i2c1 {
 	status = "okay";
 	pinctrl-0 = <&i2c1_default>;
@@ -159,18 +182,4 @@ zephyr_udc0: &usbd {
 		backup-switch-mode = "direct";
 		label = "RV3028";
 	};
-	ina219Sys: ina219Sys@40 {
-		compatible = "ti,ina219";
-		reg = <0x40>;
-		shunt-milliohm = <2>;
-		lsb-microamp = <100>;
-		label = "INA219 sys";
-	};
-	ina219Sol: ina219Sol@41 {
-		compatible = "ti,ina219";
-		reg = <0x41>;
-		shunt-milliohm = <2>;
-		lsb-microamp = <100>;
-		label = "INA219 sol";
-	};
 };