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
307bae05
Commit
307bae05
authored
Feb 10, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2771 from DonLakeFlyer/ArduPilotNaming
Change from APM to ArduPilot naming
parents
8f865986
dad505ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
QGroundControlQmlGlobal.cc
src/QmlControls/QGroundControlQmlGlobal.cc
+1
-1
FirmwareUpgrade.qml
src/VehicleSetup/FirmwareUpgrade.qml
+1
-1
No files found.
src/QmlControls/QGroundControlQmlGlobal.cc
View file @
307bae05
...
...
@@ -49,7 +49,7 @@ QGroundControlQmlGlobal::QGroundControlQmlGlobal(QGCApplication* app)
QStringList
firmwareEnumStrings
;
QVariantList
firmwareEnumValues
;
firmwareEnumStrings
<<
"A
PM
Flight Stack"
<<
"PX4 Flight Stack"
<<
"Mavlink Generic Flight Stack"
;
firmwareEnumStrings
<<
"A
rduPilot
Flight Stack"
<<
"PX4 Flight Stack"
<<
"Mavlink Generic Flight Stack"
;
firmwareEnumValues
<<
QVariant
::
fromValue
((
uint32_t
)
MAV_AUTOPILOT_ARDUPILOTMEGA
)
<<
QVariant
::
fromValue
((
uint32_t
)
MAV_AUTOPILOT_PX4
)
<<
QVariant
::
fromValue
((
uint32_t
)
MAV_AUTOPILOT_GENERIC
);
_offlineEditingFirmwareTypeMetaData
.
setEnumInfo
(
firmwareEnumStrings
,
firmwareEnumValues
);
...
...
src/VehicleSetup/FirmwareUpgrade.qml
View file @
307bae05
...
...
@@ -227,7 +227,7 @@ QGCView {
QGCRadioButton
{
id
:
apmFlightStack
exclusiveGroup
:
firmwareGroup
text
:
"
A
PM
Flight Stack
"
text
:
"
A
rduPilot
Flight Stack
"
visible
:
!
px4Flow
onClicked
:
parent
.
firmwareVersionChanged
(
firmwareTypeList
)
...
...
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