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

mavlink: update submodule

Browse Source 
MAV_STANDARD_MODE_SAFE_RECOVERY and MAV_STANDARD_MODE_RETURN_HOME got
merged.
This commit is contained in:
Beat Küng
2024-12-18 07:12:36 +01:00
parent aca5a70964
commit 9e9d352eb2
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/modes/standard_modes.hpp
+6 -7
View File
@@ -47,11 +47,10 @@ enum class StandardMode : uint8_t {
ORBIT = 2, ORBIT = 2,
CRUISE = 3, CRUISE = 3,
ALTITUDE_HOLD = 4, ALTITUDE_HOLD = 4,
RETURN_HOME = 5, SAFE_RECOVERY = 5,
SAFE_RECOVERY = 6, MISSION = 6,
MISSION = 7, LAND = 7,
LAND = 8, TAKEOFF = 8,
TAKEOFF = 9,
}; };
/** /**
@@ -60,7 +59,7 @@ enum class StandardMode : uint8_t {
static inline StandardMode getStandardModeFromNavState(uint8_t nav_state, uint8_t vehicle_type, bool is_vtol) static inline StandardMode getStandardModeFromNavState(uint8_t nav_state, uint8_t vehicle_type, bool is_vtol)
{ {
switch (nav_state) { switch (nav_state) {
case vehicle_status_s::NAVIGATION_STATE_AUTO_RTL: return StandardMode::RETURN_HOME; case vehicle_status_s::NAVIGATION_STATE_AUTO_RTL: return StandardMode::SAFE_RECOVERY;
case vehicle_status_s::NAVIGATION_STATE_AUTO_MISSION: return StandardMode::MISSION; case vehicle_status_s::NAVIGATION_STATE_AUTO_MISSION: return StandardMode::MISSION;
@@ -105,7 +104,7 @@ static inline StandardMode getStandardModeFromNavState(uint8_t nav_state, uint8_
static inline uint8_t getNavStateFromStandardMode(StandardMode mode, uint8_t vehicle_type, bool is_vtol) static inline uint8_t getNavStateFromStandardMode(StandardMode mode, uint8_t vehicle_type, bool is_vtol)
{ {
switch (mode) { switch (mode) {
case StandardMode::RETURN_HOME: return vehicle_status_s::NAVIGATION_STATE_AUTO_RTL; case StandardMode::SAFE_RECOVERY: return vehicle_status_s::NAVIGATION_STATE_AUTO_RTL;
case StandardMode::MISSION: return vehicle_status_s::NAVIGATION_STATE_AUTO_MISSION; case StandardMode::MISSION: return vehicle_status_s::NAVIGATION_STATE_AUTO_MISSION;