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
06b8ce6d
Commit
06b8ce6d
authored
May 12, 2014
by
Anton Babushkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PX4 modes names updated
parent
b23f464f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
px4_custom_mode.h
src/comm/px4_custom_mode.h
+2
-2
UAS.cc
src/uas/UAS.cc
+4
-4
UASControlWidget.cc
src/ui/uas/UASControlWidget.cc
+2
-2
No files found.
src/comm/px4_custom_mode.h
View file @
06b8ce6d
...
...
@@ -3,8 +3,8 @@
enum
PX4_CUSTOM_MAIN_MODE
{
PX4_CUSTOM_MAIN_MODE_MANUAL
=
1
,
PX4_CUSTOM_MAIN_MODE_
SEATBELT
,
PX4_CUSTOM_MAIN_MODE_
EASY
,
PX4_CUSTOM_MAIN_MODE_
ALTCTL
,
PX4_CUSTOM_MAIN_MODE_
POSCTL
,
PX4_CUSTOM_MAIN_MODE_AUTO
,
};
...
...
src/uas/UAS.cc
View file @
06b8ce6d
...
...
@@ -3394,10 +3394,10 @@ QString UAS::getShortModeTextFor(uint8_t base_mode, uint32_t custom_mode, int au
px4_mode
.
data
=
custom_mode
;
if
(
px4_mode
.
main_mode
==
PX4_CUSTOM_MAIN_MODE_MANUAL
)
{
mode
+=
"|MANUAL"
;
}
else
if
(
px4_mode
.
main_mode
==
PX4_CUSTOM_MAIN_MODE_
SEATBELT
)
{
mode
+=
"|
SEATBELT
"
;
}
else
if
(
px4_mode
.
main_mode
==
PX4_CUSTOM_MAIN_MODE_
EASY
)
{
mode
+=
"|
EASY
"
;
}
else
if
(
px4_mode
.
main_mode
==
PX4_CUSTOM_MAIN_MODE_
ALTCTL
)
{
mode
+=
"|
ALTCTL
"
;
}
else
if
(
px4_mode
.
main_mode
==
PX4_CUSTOM_MAIN_MODE_
POSCTL
)
{
mode
+=
"|
POSCTL
"
;
}
else
if
(
px4_mode
.
main_mode
==
PX4_CUSTOM_MAIN_MODE_AUTO
)
{
mode
+=
"|AUTO"
;
if
(
px4_mode
.
sub_mode
==
PX4_CUSTOM_SUB_MODE_AUTO_READY
)
{
...
...
src/ui/uas/UASControlWidget.cc
View file @
06b8ce6d
...
...
@@ -80,10 +80,10 @@ void UASControlWidget::updateModesList()
px4_cm
.
main_mode
=
PX4_CUSTOM_MAIN_MODE_MANUAL
;
modes_list_px4
[
0
].
customMode
=
px4_cm
.
data
;
modes_list_px4
[
1
].
baseMode
=
MAV_MODE_FLAG_CUSTOM_MODE_ENABLED
|
MAV_MODE_FLAG_MANUAL_INPUT_ENABLED
|
MAV_MODE_FLAG_STABILIZE_ENABLED
;
px4_cm
.
main_mode
=
PX4_CUSTOM_MAIN_MODE_
SEATBELT
;
px4_cm
.
main_mode
=
PX4_CUSTOM_MAIN_MODE_
ALTCTL
;
modes_list_px4
[
1
].
customMode
=
px4_cm
.
data
;
modes_list_px4
[
2
].
baseMode
=
MAV_MODE_FLAG_CUSTOM_MODE_ENABLED
|
MAV_MODE_FLAG_MANUAL_INPUT_ENABLED
|
MAV_MODE_FLAG_STABILIZE_ENABLED
|
MAV_MODE_FLAG_GUIDED_ENABLED
;
px4_cm
.
main_mode
=
PX4_CUSTOM_MAIN_MODE_
EASY
;
px4_cm
.
main_mode
=
PX4_CUSTOM_MAIN_MODE_
POSCTL
;
modes_list_px4
[
2
].
customMode
=
px4_cm
.
data
;
modes_list_px4
[
3
].
baseMode
=
MAV_MODE_FLAG_CUSTOM_MODE_ENABLED
|
MAV_MODE_FLAG_AUTO_ENABLED
|
MAV_MODE_FLAG_STABILIZE_ENABLED
|
MAV_MODE_FLAG_GUIDED_ENABLED
;
px4_cm
.
main_mode
=
PX4_CUSTOM_MAIN_MODE_AUTO
;
...
...
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