fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 07:03:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor vehicle_status_flags: rename to failsafe_flags

Browse Source
This commit is contained in:
Beat Küng
2022-10-13 16:05:25 -04:00
committed by Daniel Agar
parent f9c8e760b1
commit d542ffc10c
34 changed files with 125 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/streams/HIGH_LATENCY2.hpp
+10 -10
View File
@@ -54,7 +54,7 @@
#include <uORB/topics/sensor_gps.h>
#include <uORB/topics/vehicle_local_position.h>
#include <uORB/topics/vehicle_status.h>
#include <uORB/topics/vehicle_status_flags.h>
#include <uORB/topics/failsafe_flags.h>
#include <uORB/topics/health_report.h>
#include <px4_platform_common/events.h>
@@ -135,7 +135,7 @@ private:
updated |= write_mission_result(&msg);
updated |= write_tecs_status(&msg);
updated |= write_vehicle_status(&msg);
updated |= write_vehicle_status_flags(&msg);
updated |= write_failsafe_flags(&msg);
updated |= write_wind(&msg);
if (updated) {
@@ -443,24 +443,24 @@ private:
return false;
}
bool write_vehicle_status_flags(mavlink_high_latency2_t *msg)
bool write_failsafe_flags(mavlink_high_latency2_t *msg)
{
vehicle_status_flags_s status_flags;
failsafe_flags_s failsafe_flags;
if (_status_flags_sub.update(&status_flags)) {
if (status_flags.gps_position_invalid) {
if (_failsafe_flags_sub.update(&failsafe_flags)) {
if (failsafe_flags.gps_position_invalid) {
msg->failure_flags |= HL_FAILURE_FLAG_GPS;
}
if (status_flags.offboard_control_signal_lost) {
if (failsafe_flags.offboard_control_signal_lost) {
msg->failure_flags |= HL_FAILURE_FLAG_OFFBOARD_LINK;
}
if (status_flags.mission_failure) {
if (failsafe_flags.mission_failure) {
msg->failure_flags |= HL_FAILURE_FLAG_MISSION;
}
if (status_flags.manual_control_signal_lost) {
if (failsafe_flags.manual_control_signal_lost) {
msg->failure_flags |= HL_FAILURE_FLAG_RC_RECEIVER;
}
@@ -634,7 +634,7 @@ private:
uORB::Subscription _gps_sub{ORB_ID(vehicle_gps_position)};
uORB::Subscription _mission_result_sub{ORB_ID(mission_result)};
uORB::Subscription _status_sub{ORB_ID(vehicle_status)};
uORB::Subscription _status_flags_sub{ORB_ID(vehicle_status_flags)};
uORB::Subscription _failsafe_flags_sub{ORB_ID(failsafe_flags)};
uORB::Subscription _tecs_status_sub{ORB_ID(tecs_status)};
uORB::Subscription _wind_sub{ORB_ID(wind)};
uORB::Subscription _health_report_sub{ORB_ID(health_report)};