Skip to content
Snippets Groups Projects
Commit 3f18a336 authored by Niccolò Betto's avatar Niccolò Betto Committed by Davide Mor
Browse files

[Payload][Radio] Move fmm_state to flight_tm

parent 7be3a0b8
Branches
Tags
1 merge request!81[Payload] Payload OBSW
...@@ -460,6 +460,7 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId) ...@@ -460,6 +460,7 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId)
auto* sensors = parent.getModule<Sensors>(); auto* sensors = parent.getModule<Sensors>();
auto* nas = parent.getModule<NASController>(); auto* nas = parent.getModule<NASController>();
auto* wes = parent.getModule<WindEstimation>(); auto* wes = parent.getModule<WindEstimation>();
auto* fmm = parent.getModule<FlightModeManager>();
auto imu = sensors->getLSM6DSRXLastSample(); auto imu = sensors->getLSM6DSRXLastSample();
auto mag = sensors->getLIS2MDLLastSample(); auto mag = sensors->getLIS2MDLLastSample();
...@@ -517,6 +518,9 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId) ...@@ -517,6 +518,9 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId)
tm.cam_battery_voltage = sensors->getCamBatteryVoltage().batVoltage; tm.cam_battery_voltage = sensors->getCamBatteryVoltage().batVoltage;
tm.temperature = pressDigi.temperature; tm.temperature = pressDigi.temperature;
// State machines
tm.fmm_state = static_cast<uint8_t>(fmm->getState());
mavlink_msg_payload_flight_tm_encode(config::Mavlink::SYSTEM_ID, mavlink_msg_payload_flight_tm_encode(config::Mavlink::SYSTEM_ID,
config::Mavlink::COMPONENT_ID, config::Mavlink::COMPONENT_ID,
&msg, &tm); &msg, &tm);
...@@ -529,7 +533,6 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId) ...@@ -529,7 +533,6 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId)
mavlink_message_t msg; mavlink_message_t msg;
mavlink_payload_stats_tm_t tm; mavlink_payload_stats_tm_t tm;
auto* fmm = parent.getModule<FlightModeManager>();
auto* nas = parent.getModule<NASController>(); auto* nas = parent.getModule<NASController>();
auto* pinHandler = parent.getModule<PinHandler>(); auto* pinHandler = parent.getModule<PinHandler>();
auto& logger = Logger::getInstance(); auto& logger = Logger::getInstance();
...@@ -592,8 +595,6 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId) ...@@ -592,8 +595,6 @@ bool Radio::MavlinkBackend::enqueueSystemTm(SystemTMList tmId)
tm.log_good = (loggerStats.lastWriteError == 0); tm.log_good = (loggerStats.lastWriteError == 0);
tm.log_number = loggerStats.logNumber; tm.log_number = loggerStats.logNumber;
// State machines
tm.fmm_state = static_cast<uint8_t>(fmm->getState());
tm.nas_state = static_cast<uint8_t>(nas->getState()); tm.nas_state = static_cast<uint8_t>(nas->getState());
tm.wes_state = 255; // TODO tm.wes_state = 255; // TODO
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment