Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
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
Options
Browse Files
Download
Plain Diff
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
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
PX4FirmwarePlugin.cc
src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
+3
-0
PX4FirmwarePlugin.h
src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h
+1
-0
px4_custom_mode.h
src/FirmwarePlugin/PX4/px4_custom_mode.h
+3
-2
No files found.
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-07-08
- https://github.com/PX4/Firmware/blob/master/src/modules/commander/px4_custom_mode.h#L45
* Copied from PX4 201
8-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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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