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
4d0fd52a
Unverified
Commit
4d0fd52a
authored
Oct 31, 2018
by
Don Gagne
Committed by
GitHub
Oct 31, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6972 from DonLakeFlyer/RoverModes
ArduPilot: Update Rover flight modes
parents
77a65e60
12609df7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
19 deletions
+19
-19
ArduRoverFirmwarePlugin.cc
src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc
+8
-2
ArduRoverFirmwarePlugin.h
src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h
+11
-17
No files found.
src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc
View file @
4d0fd52a
...
@@ -18,11 +18,14 @@ APMRoverMode::APMRoverMode(uint32_t mode, bool settable)
...
@@ -18,11 +18,14 @@ APMRoverMode::APMRoverMode(uint32_t mode, bool settable)
{
{
QMap
<
uint32_t
,
QString
>
enumToString
;
QMap
<
uint32_t
,
QString
>
enumToString
;
enumToString
.
insert
(
MANUAL
,
"Manual"
);
enumToString
.
insert
(
MANUAL
,
"Manual"
);
enumToString
.
insert
(
LEARNING
,
"Learning
"
);
enumToString
.
insert
(
ACRO
,
"Acro
"
);
enumToString
.
insert
(
STEERING
,
"Steering"
);
enumToString
.
insert
(
STEERING
,
"Steering"
);
enumToString
.
insert
(
HOLD
,
"Hold"
);
enumToString
.
insert
(
HOLD
,
"Hold"
);
enumToString
.
insert
(
LOITER
,
"Loiter"
);
enumToString
.
insert
(
SIMPLE
,
"Simple"
);
enumToString
.
insert
(
AUTO
,
"Auto"
);
enumToString
.
insert
(
AUTO
,
"Auto"
);
enumToString
.
insert
(
RTL
,
"RTL"
);
enumToString
.
insert
(
RTL
,
"RTL"
);
enumToString
.
insert
(
SMART_RTL
,
"Smart RTL"
);
enumToString
.
insert
(
GUIDED
,
"Guided"
);
enumToString
.
insert
(
GUIDED
,
"Guided"
);
enumToString
.
insert
(
INITIALIZING
,
"Initializing"
);
enumToString
.
insert
(
INITIALIZING
,
"Initializing"
);
...
@@ -33,11 +36,14 @@ ArduRoverFirmwarePlugin::ArduRoverFirmwarePlugin(void)
...
@@ -33,11 +36,14 @@ ArduRoverFirmwarePlugin::ArduRoverFirmwarePlugin(void)
{
{
QList
<
APMCustomMode
>
supportedFlightModes
;
QList
<
APMCustomMode
>
supportedFlightModes
;
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
MANUAL
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
MANUAL
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
LEARNING
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
ACRO
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
STEERING
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
STEERING
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
HOLD
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
HOLD
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
LOITER
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
SIMPLE
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
AUTO
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
AUTO
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
RTL
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
RTL
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
SMART_RTL
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
GUIDED
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
GUIDED
,
true
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
INITIALIZING
,
false
);
supportedFlightModes
<<
APMRoverMode
(
APMRoverMode
::
INITIALIZING
,
false
);
setSupportedModes
(
supportedFlightModes
);
setSupportedModes
(
supportedFlightModes
);
...
...
src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h
View file @
4d0fd52a
...
@@ -21,20 +21,14 @@ class APMRoverMode : public APMCustomMode
...
@@ -21,20 +21,14 @@ class APMRoverMode : public APMCustomMode
public:
public:
enum
Mode
{
enum
Mode
{
MANUAL
=
0
,
MANUAL
=
0
,
RESERVED_1
=
1
,
// RESERVED FOR FUTURE USE
ACRO
=
1
,
LEARNING
=
2
,
STEERING
=
3
,
STEERING
=
3
,
HOLD
=
4
,
HOLD
=
4
,
RESERVED_5
=
5
,
// RESERVED FOR FUTURE USE
LOITER
=
5
,
RESERVED_6
=
6
,
// RESERVED FOR FUTURE USE
SIMPLE
=
7
,
RESERVED_7
=
7
,
// RESERVED FOR FUTURE USE
RESERVED_8
=
8
,
// RESERVED FOR FUTURE USE
RESERVED_9
=
9
,
// RESERVED FOR FUTURE USE
AUTO
=
10
,
AUTO
=
10
,
RTL
=
11
,
RTL
=
11
,
RESERVED_12
=
12
,
// RESERVED FOR FUTURE USE
SMART_RTL
=
12
,
RESERVED_13
=
13
,
// RESERVED FOR FUTURE USE
RESERVED_14
=
14
,
// RESERVED FOR FUTURE USE
GUIDED
=
15
,
GUIDED
=
15
,
INITIALIZING
=
16
,
INITIALIZING
=
16
,
};
};
...
...
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