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
0ee4760a
Commit
0ee4760a
authored
Nov 08, 2019
by
DonLakeFlyer
Committed by
DonLakeFlyer
Nov 08, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add missing flight modes
parent
887441f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
40 deletions
+50
-40
ArduPlaneFirmwarePlugin.cc
src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc
+46
-38
ArduPlaneFirmwarePlugin.h
src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h
+4
-2
No files found.
src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc
View file @
0ee4760a
...
...
@@ -16,50 +16,58 @@ APMPlaneMode::APMPlaneMode(uint32_t mode, bool settable)
:
APMCustomMode
(
mode
,
settable
)
{
setEnumToStringMapping
({
{
MANUAL
,
"Manual"
},
{
CIRCLE
,
"Circle"
},
{
STABILIZE
,
"Stabilize"
},
{
TRAINING
,
"Training"
},
{
ACRO
,
"Acro"
},
{
FLY_BY_WIRE_A
,
"FBW A"
},
{
FLY_BY_WIRE_B
,
"FBW B"
},
{
CRUISE
,
"Cruise"
},
{
AUTOTUNE
,
"Autotune"
},
{
AUTO
,
"Auto"
},
{
RTL
,
"RTL"
},
{
LOITER
,
"Loiter"
},
{
GUIDED
,
"Guided"
},
{
INITIALIZING
,
"Initializing"
},
{
QSTABILIZE
,
"QuadPlane Stabilize"
},
{
QHOVER
,
"QuadPlane Hover"
},
{
QLOITER
,
"QuadPlane Loiter"
},
{
QLAND
,
"QuadPlane Land"
},
{
QRTL
,
"QuadPlane RTL"
},
{
MANUAL
,
"Manual"
},
{
CIRCLE
,
"Circle"
},
{
STABILIZE
,
"Stabilize"
},
{
TRAINING
,
"Training"
},
{
ACRO
,
"Acro"
},
{
FLY_BY_WIRE_A
,
"FBW A"
},
{
FLY_BY_WIRE_B
,
"FBW B"
},
{
CRUISE
,
"Cruise"
},
{
AUTOTUNE
,
"Autotune"
},
{
AUTO
,
"Auto"
},
{
RTL
,
"RTL"
},
{
LOITER
,
"Loiter"
},
{
TAKEOFF
,
"Takeoff"
},
{
AVOID_ADSB
,
"Avoid ADSB"
},
{
GUIDED
,
"Guided"
},
{
INITIALIZING
,
"Initializing"
},
{
QSTABILIZE
,
"QuadPlane Stabilize"
},
{
QHOVER
,
"QuadPlane Hover"
},
{
QLOITER
,
"QuadPlane Loiter"
},
{
QLAND
,
"QuadPlane Land"
},
{
QRTL
,
"QuadPlane RTL"
},
{
QAUTOTUNE
,
"QuadPlane AutoTune"
},
{
QACRO
,
"QuadPlane Acro"
},
});
}
ArduPlaneFirmwarePlugin
::
ArduPlaneFirmwarePlugin
(
void
)
{
setSupportedModes
({
APMPlaneMode
(
APMPlaneMode
::
MANUAL
,
true
),
APMPlaneMode
(
APMPlaneMode
::
CIRCLE
,
true
),
APMPlaneMode
(
APMPlaneMode
::
STABILIZE
,
true
),
APMPlaneMode
(
APMPlaneMode
::
TRAINING
,
true
),
APMPlaneMode
(
APMPlaneMode
::
ACRO
,
true
),
APMPlaneMode
(
APMPlaneMode
::
FLY_BY_WIRE_A
,
true
),
APMPlaneMode
(
APMPlaneMode
::
FLY_BY_WIRE_B
,
true
),
APMPlaneMode
(
APMPlaneMode
::
CRUISE
,
true
),
APMPlaneMode
(
APMPlaneMode
::
AUTOTUNE
,
true
),
APMPlaneMode
(
APMPlaneMode
::
AUTO
,
true
),
APMPlaneMode
(
APMPlaneMode
::
RTL
,
true
),
APMPlaneMode
(
APMPlaneMode
::
LOITER
,
true
),
APMPlaneMode
(
APMPlaneMode
::
GUIDED
,
true
),
APMPlaneMode
(
APMPlaneMode
::
INITIALIZING
,
false
),
APMPlaneMode
(
APMPlaneMode
::
QSTABILIZE
,
true
),
APMPlaneMode
(
APMPlaneMode
::
QHOVER
,
true
),
APMPlaneMode
(
APMPlaneMode
::
QLOITER
,
true
),
APMPlaneMode
(
APMPlaneMode
::
QLAND
,
true
),
APMPlaneMode
(
APMPlaneMode
::
QRTL
,
true
),
APMPlaneMode
(
APMPlaneMode
::
MANUAL
,
true
),
APMPlaneMode
(
APMPlaneMode
::
CIRCLE
,
true
),
APMPlaneMode
(
APMPlaneMode
::
STABILIZE
,
true
),
APMPlaneMode
(
APMPlaneMode
::
TRAINING
,
true
),
APMPlaneMode
(
APMPlaneMode
::
ACRO
,
true
),
APMPlaneMode
(
APMPlaneMode
::
FLY_BY_WIRE_A
,
true
),
APMPlaneMode
(
APMPlaneMode
::
FLY_BY_WIRE_B
,
true
),
APMPlaneMode
(
APMPlaneMode
::
CRUISE
,
true
),
APMPlaneMode
(
APMPlaneMode
::
AUTOTUNE
,
true
),
APMPlaneMode
(
APMPlaneMode
::
AUTO
,
true
),
APMPlaneMode
(
APMPlaneMode
::
RTL
,
true
),
APMPlaneMode
(
APMPlaneMode
::
LOITER
,
true
),
APMPlaneMode
(
APMPlaneMode
::
TAKEOFF
,
true
),
APMPlaneMode
(
APMPlaneMode
::
AVOID_ADSB
,
false
),
APMPlaneMode
(
APMPlaneMode
::
GUIDED
,
true
),
APMPlaneMode
(
APMPlaneMode
::
INITIALIZING
,
false
),
APMPlaneMode
(
APMPlaneMode
::
QSTABILIZE
,
true
),
APMPlaneMode
(
APMPlaneMode
::
QHOVER
,
true
),
APMPlaneMode
(
APMPlaneMode
::
QLOITER
,
true
),
APMPlaneMode
(
APMPlaneMode
::
QLAND
,
true
),
APMPlaneMode
(
APMPlaneMode
::
QRTL
,
true
),
APMPlaneMode
(
APMPlaneMode
::
QAUTOTUNE
,
true
),
APMPlaneMode
(
APMPlaneMode
::
QACRO
,
true
),
});
if
(
!
_remapParamNameIntialized
)
{
...
...
src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h
View file @
0ee4760a
...
...
@@ -33,8 +33,8 @@ public:
AUTO
=
10
,
RTL
=
11
,
LOITER
=
12
,
RESERVED_13
=
13
,
// RESERVED FOR FUTURE USE
RESERVED_14
=
14
,
// RESERVED FOR FUTURE USE
TAKEOFF
=
13
,
AVOID_ADSB
=
14
,
GUIDED
=
15
,
INITIALIZING
=
16
,
QSTABILIZE
=
17
,
...
...
@@ -42,6 +42,8 @@ public:
QLOITER
=
19
,
QLAND
=
20
,
QRTL
=
21
,
QAUTOTUNE
=
22
,
QACRO
=
23
,
};
APMPlaneMode
(
uint32_t
mode
,
bool
settable
);
...
...
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