Skip to content

Commit 991b010

Browse files
committed
adding telemetry to lis2mdlManager
1 parent 8e4e8d2 commit 991b010

File tree

6 files changed

+25
-10
lines changed

6 files changed

+25
-10
lines changed

FprimeZephyrReference/Components/Drv/Lis2mdlManager/Lis2mdlManager.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Drv::MagneticField Lis2mdlManager ::magneticFieldRead_handler(FwIndexType portNu
2929
this->log_WARNING_HI_DeviceNotReady();
3030
return Drv::MagneticField(0.0, 0.0, 0.0);
3131
}
32-
this->log_WARNING_HI_DeviceNotReady_ThrottleClear()
32+
this->log_WARNING_HI_DeviceNotReady_ThrottleClear();
3333

3434
struct sensor_value x;
3535
struct sensor_value y;
@@ -41,7 +41,11 @@ Drv::MagneticField Lis2mdlManager ::magneticFieldRead_handler(FwIndexType portNu
4141
sensor_channel_get(lis2mdl, SENSOR_CHAN_MAGN_Y, &y);
4242
sensor_channel_get(lis2mdl, SENSOR_CHAN_MAGN_Z, &z);
4343

44-
return Drv::MagneticField(Drv::sensor_value_to_f64(x), Drv::sensor_value_to_f64(y), Drv::sensor_value_to_f64(z));
44+
Drv::MagneticField magnetic_readings = Drv::MagneticField(Drv::sensor_value_to_f64(x), Drv::sensor_value_to_f64(y), Drv::sensor_value_to_f64(z));
45+
46+
this->tlmWrite_MagneticField(magnetic_readings);
47+
48+
return magnetic_readings;
4549
}
4650

4751
} // namespace Drv

FprimeZephyrReference/Components/Drv/Lis2mdlManager/Lis2mdlManager.fpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ module Drv {
1313
@ Event for reporting LSM6DSO not ready error
1414
event DeviceNotReady() severity warning high format "LIS2MDL device not ready" throttle 5
1515

16+
@ Telemetry channel for magnetic field in gauss
17+
telemetry MagneticField: MagneticField
18+
19+
1620
###############################################################################
1721
# Standard AC Ports: Required for Channels, Events, Commands, and Parameters #
1822
###############################################################################
@@ -24,5 +28,8 @@ module Drv {
2428

2529
@ Port for sending events to downlink
2630
event port logOut
31+
32+
@ Port for sending telemetry channels to downlink
33+
telemetry port tlmOut
2734
}
2835
}

FprimeZephyrReference/Components/ImuManager/ImuManager.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ ImuManager ::~ImuManager() {}
2424
void ImuManager ::run_handler(FwIndexType portNum, U32 context) {
2525
this->tlmWrite_Acceleration(this->accelerationRead_out(0));
2626
this->tlmWrite_AngularVelocity(this->angularVelocityRead_out(0));
27-
this->tlmWrite_MagneticField(this->magneticFieldRead_out(0));
27+
// this->tlmWrite_MagneticField(this->magneticFieldRead_out(0));
2828
this->tlmWrite_Temperature(this->temperatureRead_out(0));
29+
30+
this->magneticFieldRead_out(0);
2931
}
3032
} // namespace Components

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ telemetry packets ReferenceDeploymentPackets {
3737
packet Imu id 6 group 4 {
3838
ReferenceDeployment.imuManager.Acceleration
3939
ReferenceDeployment.imuManager.AngularVelocity
40-
ReferenceDeployment.imuManager.MagneticField
40+
ReferenceDeployment.lsm6dsoManager.MagneticField
4141
}
4242

43+
44+
4345
} omit {
4446
CdhCore.cmdDisp.CommandErrors
4547
# Only has one library, no custom versions

FprimeZephyrReference/ReferenceDeployment/Top/instances.fpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ module ReferenceDeployment {
6666

6767
instance imuManager: Components.ImuManager base id 0x10017000
6868

69-
instance lis2mdlDriver: Drv.Lis2mdlManager base id 0x10018000
69+
instance lis2mdlManager: Drv.Lis2mdlManager base id 0x10018000
7070

71-
instance Lsm6dsoManager: Drv.Lsm6dsoManager base id 0x10019000
71+
instance lsm6dsoManager: Drv.Lsm6dsoManager base id 0x10019000
7272
}

FprimeZephyrReference/ReferenceDeployment/Top/topology.fpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ module ReferenceDeployment {
103103
}
104104

105105
connections imuManager {
106-
imuManager.accelerationRead -> Lsm6dsoManager.accelerationRead
107-
imuManager.angularVelocityRead -> Lsm6dsoManager.angularVelocityRead
108-
imuManager.magneticFieldRead -> lis2mdlDriver.magneticFieldRead
109-
imuManager.temperatureRead -> Lsm6dsoManager.temperatureRead
106+
imuManager.accelerationRead -> lsm6dsoManager.accelerationRead
107+
imuManager.angularVelocityRead -> lsm6dsoManager.angularVelocityRead
108+
imuManager.magneticFieldRead -> Lis2mdlManager.magneticFieldRead
109+
imuManager.temperatureRead -> lsm6dsoManager.temperatureRead
110110
}
111111

112112
connections ReferenceDeployment {

0 commit comments

Comments
 (0)