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
c3f0a51f
Commit
c3f0a51f
authored
Oct 26, 2016
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Making the "brand" MAVLink consistent.
parent
53b201f8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
MavlinkLogManager.cc
src/Vehicle/MavlinkLogManager.cc
+5
-5
AppSettings.qml
src/ui/AppSettings.qml
+1
-1
MavlinkSettings.qml
src/ui/preferences/MavlinkSettings.qml
+2
-2
No files found.
src/Vehicle/MavlinkLogManager.cc
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."
;
}
}
...
...
src/ui/AppSettings.qml
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
"
)
{
...
...
src/ui/preferences/MavlinkSettings.qml
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
}
}
...
...
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