fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 01:53:33 +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/flight_mode_manager/tasks/Utility/Sticks.cpp
+3 -3
View File
@@ -72,10 +72,10 @@ bool Sticks::checkAndUpdateStickInputs()
_input_available = valid_sticks;
} else {
vehicle_status_flags_s vehicle_status_flags;
failsafe_flags_s failsafe_flags;
if (_vehicle_status_flags_sub.update(&vehicle_status_flags)) {
if (vehicle_status_flags.manual_control_signal_lost) {
if (_failsafe_flags_sub.update(&failsafe_flags)) {
if (failsafe_flags.manual_control_signal_lost) {
_input_available = false;
}
}
src/modules/flight_mode_manager/tasks/Utility/Sticks.hpp
+2 -2
View File
@@ -45,7 +45,7 @@
#include <matrix/matrix/math.hpp>
#include <uORB/Subscription.hpp>
#include <uORB/topics/manual_control_setpoint.h>
#include <uORB/topics/vehicle_status_flags.h>
#include <uORB/topics/failsafe_flags.h>
class Sticks : public ModuleParams
{
@@ -92,7 +92,7 @@ private:
matrix::Vector<float, 4> _positions_expo; ///< modified manual sticks using expo function
uORB::Subscription _manual_control_setpoint_sub{ORB_ID(manual_control_setpoint)};
uORB::Subscription _vehicle_status_flags_sub{ORB_ID(vehicle_status_flags)};
uORB::Subscription _failsafe_flags_sub{ORB_ID(failsafe_flags)};
DEFINE_PARAMETERS(
(ParamFloat<px4::params::MPC_HOLD_DZ>) _param_mpc_hold_dz,