fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-01 08:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update COM_RC_IN_MODE enum naming

Browse Source
This commit is contained in:
Matthias Grob
2025-10-01 18:31:12 +02:00
committed by Tobias Büchli
parent acf5766f9c
commit f1f3c81566
6 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/manual_control/ManualControlSelector.hpp
+10 -10
View File
@@ -53,20 +53,20 @@ private:
// COM_RC_IN_MODE parameter values
enum class RcInMode : int32_t {
RcTransmitterOnly = 0, // RC Transmitter only
JoystickOnly = 1, // Joystick only
RcAndJoystickWithFallback = 2, // RC And Joystick with fallback
RcOrJoystickKeepFirst = 3, // RC or Joystick keep first
StickInputDisabled = 4, // input disabled
RcThenJoystickAscendingPriority = 5, // RC, then Joystick ascending prio
JoystickAscendingThenRcPriority = 6, // Joystick ascending prio, then RC
RcThenJoystickDescendingPriority = 7, // RC, then Joystick descending prio
JoystickDescendingThenRcPriority = 8 // Joystick descending prio, then RC
RcOnly = 0,
MavLinkOnly = 1,
RcOrMavlinkWithFallback = 2,
RcOrMavlinkKeepFirst = 3,
DisableManualControl = 4,
PriorityRcThenMavlinkAscending = 5,
PriorityMavlinkAscendingThenRc = 6,
PriorityRcThenMavlinkDescending = 7,
PriorityMavlinkDescendingThenRc = 8
};
manual_control_setpoint_s _setpoint{};
uint64_t _timeout{0};
RcInMode _rc_in_mode{RcInMode::RcTransmitterOnly};
RcInMode _rc_in_mode{RcInMode::RcOnly};
int _instance{-1};
uint8_t _first_valid_source{manual_control_setpoint_s::SOURCE_UNKNOWN};
};