Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qgroundcontrol
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Valentin Platzgummer
qgroundcontrol
Commits
c3f0a51f
Commit
c3f0a51f
authored
8 years ago
by
Gus Grubba
Browse files
Options
Downloads
Patches
Plain Diff
Making the "brand" MAVLink consistent.
parent
53b201f8
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/Vehicle/MavlinkLogManager.cc
+5
-5
5 additions, 5 deletions
src/Vehicle/MavlinkLogManager.cc
src/ui/AppSettings.qml
+1
-1
1 addition, 1 deletion
src/ui/AppSettings.qml
src/ui/preferences/MavlinkSettings.qml
+2
-2
2 additions, 2 deletions
src/ui/preferences/MavlinkSettings.qml
with
8 additions
and
8 deletions
src/Vehicle/MavlinkLogManager.cc
+
5
−
5
View file @
c3f0a51f
...
...
@@ -23,10 +23,10 @@
QGC_LOGGING_CATEGORY
(
MavlinkLogManagerLog
,
"MavlinkLogManagerLog"
)
static
const
char
*
kEmailAddressKey
=
"M
avl
inkLogEmail"
;
static
const
char
*
kDescriptionsKey
=
"M
avl
inkLogDescription"
;
static
const
char
*
kEmailAddressKey
=
"M
AVL
inkLogEmail"
;
static
const
char
*
kDescriptionsKey
=
"M
AVL
inkLogDescription"
;
static
const
char
*
kDefaultDescr
=
"QGroundControl Session"
;
static
const
char
*
kPx4URLKey
=
"M
avl
inkLogURL"
;
static
const
char
*
kPx4URLKey
=
"M
AVL
inkLogURL"
;
static
const
char
*
kDefaultPx4URL
=
"http://logs.px4.io/upload"
;
static
const
char
*
kEnableAutoUploadKey
=
"EnableAutoUploadKey"
;
static
const
char
*
kEnableAutoStartKey
=
"EnableAutoStartKey"
;
...
...
@@ -329,7 +329,7 @@ MavlinkLogManager::MavlinkLogManager(QGCApplication* app)
while
(
it
.
hasNext
())
{
_insertNewLog
(
new
MavlinkLogFiles
(
this
,
it
.
next
()));
}
qCDebug
(
MavlinkLogManagerLog
)
<<
"M
avl
ink logs directory:"
<<
_logPath
;
qCDebug
(
MavlinkLogManagerLog
)
<<
"M
AVL
ink logs directory:"
<<
_logPath
;
}
}
...
...
@@ -809,7 +809,7 @@ MavlinkLogManager::_mavlinkLogData(Vehicle* /*vehicle*/, uint8_t /*target_system
emit
logRunningChanged
();
}
}
else
{
qCWarning
(
MavlinkLogManagerLog
)
<<
"M
avl
ink log data received when not expected."
;
qCWarning
(
MavlinkLogManagerLog
)
<<
"M
AVL
ink log data received when not expected."
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/ui/AppSettings.qml
+
1
−
1
View file @
c3f0a51f
...
...
@@ -120,7 +120,7 @@ Rectangle {
QGCButton
{
height
:
_buttonHeight
text
:
qsTr
(
"
M
av
Link
"
)
text
:
qsTr
(
"
M
AV
Link
"
)
exclusiveGroup
:
panelActionGroup
onClicked
:
{
if
(
__rightPanel
.
source
!=
"
MavlinkSettings.qml
"
)
{
...
...
This diff is collapsed.
Click to expand it.
src/ui/preferences/MavlinkSettings.qml
+
2
−
2
View file @
c3f0a51f
...
...
@@ -102,7 +102,7 @@ Rectangle {
QGCLabel
{
width
:
_labelWidth
anchors.baseline
:
sysidField
.
baseline
text
:
qsTr
(
"
M
av
Link System ID:
"
)
text
:
qsTr
(
"
M
AV
Link System ID:
"
)
}
QGCTextField
{
id
:
sysidField
...
...
@@ -204,7 +204,7 @@ Rectangle {
anchors.horizontalCenter
:
parent
.
horizontalCenter
QGCLabel
{
id
:
logLabel
text
:
qsTr
(
"
M
avl
ink Log Uploads
"
)
text
:
qsTr
(
"
M
AVL
ink Log Uploads
"
)
font.family
:
ScreenTools
.
demiboldFontFamily
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment