Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
556599a3
Unverified
Commit
556599a3
authored
Apr 08, 2018
by
Don Gagne
Committed by
GitHub
Apr 08, 2018
Browse files
Merge pull request #6322 from CopterExpress/px4_precland
Add PX4 Precision Land flight mode
parents
910ee096
719fdb82
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
View file @
556599a3
...
...
@@ -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
,
...
...
src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h
View file @
556599a3
...
...
@@ -101,6 +101,7 @@ protected:
QString
_missionFlightMode
;
QString
_rtlFlightMode
;
QString
_landingFlightMode
;
QString
_preclandFlightMode
;
QString
_rtgsFlightMode
;
QString
_followMeFlightMode
;
QString
_simpleFlightMode
;
...
...
src/FirmwarePlugin/PX4/px4_custom_mode.h
View file @
556599a3
...
...
@@ -34,7 +34,7 @@
/**
* @file px4_custom_mode.h
* PX4 custom flight modes
* Copied from PX4 201
7
-0
7
-0
8
- https://github.com/PX4/Firmware/blob/master/src/modules/commander/px4_custom_mode.h#L45
* Copied from PX4 201
8
-0
4
-0
7
- 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
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment