diff --git a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc index 602fc0dfa0bdb39190699ec1860a22b63d883e68..100b3f26dd9ef764a007073354a5e1489320c6f7 100644 --- a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc +++ b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc @@ -48,6 +48,7 @@ PX4FirmwarePlugin::PX4FirmwarePlugin(void) , _missionFlightMode(tr("Mission")) , _rtlFlightMode(tr("Return")) , _landingFlightMode(tr("Land")) + , _preclandFlightMode(tr("Precision Land")) , _rtgsFlightMode(tr("Return to Groundstation")) , _followMeFlightMode(tr("Follow Me")) , _simpleFlightMode(tr("Simple")) @@ -84,6 +85,7 @@ PX4FirmwarePlugin::PX4FirmwarePlugin(void) { PX4_CUSTOM_MAIN_MODE_OFFBOARD, 0, true, false, true }, // modes that can't be directly set by the user { PX4_CUSTOM_MAIN_MODE_AUTO, PX4_CUSTOM_SUB_MODE_AUTO_LAND, false, true, true }, + { PX4_CUSTOM_MAIN_MODE_AUTO, PX4_CUSTOM_SUB_MODE_AUTO_PRECLAND, false, false, true }, { PX4_CUSTOM_MAIN_MODE_AUTO, PX4_CUSTOM_SUB_MODE_AUTO_READY, false, true, true }, { PX4_CUSTOM_MAIN_MODE_AUTO, PX4_CUSTOM_SUB_MODE_AUTO_RTGS, false, true, true }, { PX4_CUSTOM_MAIN_MODE_AUTO, PX4_CUSTOM_SUB_MODE_AUTO_TAKEOFF, false, true, true }, @@ -104,6 +106,7 @@ PX4FirmwarePlugin::PX4FirmwarePlugin(void) &_followMeFlightMode, &_offboardFlightMode, &_landingFlightMode, + &_preclandFlightMode, &_readyFlightMode, &_rtgsFlightMode, &_takeoffFlightMode, diff --git a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h index 6497793e9295da58596cfaca371180d69f99c23c..7aefe54d8080acc5e714e69440634e4ae14eaef7 100644 --- a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h +++ b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h @@ -101,6 +101,7 @@ protected: QString _missionFlightMode; QString _rtlFlightMode; QString _landingFlightMode; + QString _preclandFlightMode; QString _rtgsFlightMode; QString _followMeFlightMode; QString _simpleFlightMode; diff --git a/src/FirmwarePlugin/PX4/px4_custom_mode.h b/src/FirmwarePlugin/PX4/px4_custom_mode.h index 48a29f2cda456b06abc950b0b99feb6eef6641c7..f6b3c905502748b30e1d73ae4d337981308f1d1f 100644 --- a/src/FirmwarePlugin/PX4/px4_custom_mode.h +++ b/src/FirmwarePlugin/PX4/px4_custom_mode.h @@ -34,7 +34,7 @@ /** * @file px4_custom_mode.h * PX4 custom flight modes - * Copied from PX4 2017-07-08 - https://github.com/PX4/Firmware/blob/master/src/modules/commander/px4_custom_mode.h#L45 + * Copied from PX4 2018-04-07 - https://github.com/PX4/Firmware/blob/master/src/modules/commander/px4_custom_mode.h#L45 */ #ifndef PX4_CUSTOM_MODE_H_ @@ -62,7 +62,8 @@ enum PX4_CUSTOM_SUB_MODE_AUTO { PX4_CUSTOM_SUB_MODE_AUTO_RTL, PX4_CUSTOM_SUB_MODE_AUTO_LAND, PX4_CUSTOM_SUB_MODE_AUTO_RTGS, - PX4_CUSTOM_SUB_MODE_AUTO_FOLLOW_TARGET + PX4_CUSTOM_SUB_MODE_AUTO_FOLLOW_TARGET, + PX4_CUSTOM_SUB_MODE_AUTO_PRECLAND }; union px4_custom_mode {