fix fprime files to match new names & telemetry structure

Author: hrfarmer

FprimeZephyrReference/Components/Drv/Lsm6dsoManager/Lsm6dsoManager.cpp

@@ -62,7 +62,10 @@ Drv::AngularVelocity Lsm6dsoManager ::angularVelocityRead_handler(FwIndexType po
     sensor_channel_get(lsm6dso, SENSOR_CHAN_GYRO_Y, &y);
     sensor_channel_get(lsm6dso, SENSOR_CHAN_GYRO_Z, &z);
 
-    return Drv::AngularVelocity(Drv::sensor_value_to_f64(x), Drv::sensor_value_to_f64(y), Drv::sensor_value_to_f64(z));
+    Drv::AngularVelocity angular_velocity =
+        Drv::AngularVelocity(Drv::sensor_value_to_f64(x), Drv::sensor_value_to_f64(y), Drv::sensor_value_to_f64(z));
+
+    return angular_velocity;
 }
 
 F64 Lsm6dsoManager ::temperatureRead_handler(FwIndexType portNum) {

FprimeZephyrReference/Components/Drv/Lsm6dsoManager/Lsm6dsoManager.fpp

@@ -9,6 +9,7 @@ module Drv {
 module Drv {
     @ LSM6DSO Driver Component for F Prime FSW framework.
     passive component Lsm6dsoManager {
+        # Ports
         @ Port to read the current acceleration in m/s^2.
         sync input port accelerationRead: AccelerationRead
 
@@ -18,6 +19,16 @@ module Drv {
         @ Port to read the current temperature in degrees celsius.
         sync input port temperatureRead: TemperatureRead
 
+        # Telemetry channels
+        @ Telemetry channel for current acceleration in m/s^2.
+        telemetry Acceleration: Acceleration
+
+        @ Telemetry channel for current angular velocity in rad/s.
+        telemetry AngularVelocity: AngularVelocity
+
+        @ Telemetry channel for current temperature in degrees celsius.
+        telemetry Temperature: F64
+
         @ Event for reporting LSM6DSO not ready error
         event DeviceNotReady() severity warning high format "LSM6DSO device not ready" throttle 5
 
@@ -32,5 +43,8 @@ module Drv {
 
         @ Port for sending events to downlink
         event port logOut
+
+        @ Port for sending telemetry channels to downlink
+        telemetry port tlmOut
     }
 }

FprimeZephyrReference/Components/ImuManager/ImuManager.fpp

@@ -15,25 +15,11 @@ module Components {
         @ Port for sending temperatureRead calls to the LSM6DSO Driver
         output port temperatureRead: Drv.TemperatureRead
 
-        @ Telemetry channel for acceleration in m/s^2
-        telemetry Acceleration: Drv.Acceleration
-
-        @ Telemetry channel for angular velocity in rad/s
-        telemetry AngularVelocity: Drv.AngularVelocity
-
-        @ Telemetry channel for magnetic field in gauss
-        telemetry MagneticField: Drv.MagneticField
-
-        @ Telemetry channel for temperature in degrees Celsius
-        telemetry Temperature: F64
-
         ###############################################################################
         # Standard AC Ports: Required for Channels, Events, Commands, and Parameters  #
         ###############################################################################
         @ Port for requesting the current time
         time get port timeCaller
-
-        @ Port for sending telemetry channels to downlink
-        telemetry port tlmOut
+        
     }
 }

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi

@@ -35,9 +35,10 @@ telemetry packets ReferenceDeploymentPackets {
   }
 
   packet Imu id 6 group 4 {
-    ReferenceDeployment.imuManager.Acceleration
-    ReferenceDeployment.imuManager.AngularVelocity
-    ReferenceDeployment.lsm6dsoManager.MagneticField
+    ReferenceDeployment.lsm6dsoManager.Acceleration
+    ReferenceDeployment.lsm6dsoManager.AngularVelocity
+    ReferenceDeployment.lsm6dsoManager.Temperature
+    ReferenceDeployment.lis2mdlManager.MagneticField
   }
 
 
@@ -64,6 +65,4 @@ telemetry packets ReferenceDeploymentPackets {
   CdhCore.version.CustomVersion08
   CdhCore.version.CustomVersion09
   CdhCore.version.CustomVersion10
-  # Reserving temp telemetry for future use
-  ReferenceDeployment.imuManager.Temperature
 }

FprimeZephyrReference/ReferenceDeployment/Top/topology.fpp

@@ -30,8 +30,8 @@ module ReferenceDeployment {
     instance watchdog
     instance prmDb
     instance imuManager
-    instance lis2mdlDriver
-    instance Lsm6dsoManager
+    instance lis2mdlManager
+    instance lsm6dsoManager
 
   # ----------------------------------------------------------------------
   # Pattern graph specifiers
@@ -105,7 +105,7 @@ module ReferenceDeployment {
     connections imuManager {
       imuManager.accelerationRead -> lsm6dsoManager.accelerationRead
       imuManager.angularVelocityRead -> lsm6dsoManager.angularVelocityRead
-      imuManager.magneticFieldRead -> Lis2mdlManager.magneticFieldRead
+      imuManager.magneticFieldRead -> lis2mdlManager.magneticFieldRead
       imuManager.temperatureRead -> lsm6dsoManager.temperatureRead
     }