Commit c3f0a51f authored by Gus Grubba's avatar Gus Grubba

Making the "brand" MAVLink consistent.

parent 53b201f8
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
QGC_LOGGING_CATEGORY(MavlinkLogManagerLog, "MavlinkLogManagerLog") QGC_LOGGING_CATEGORY(MavlinkLogManagerLog, "MavlinkLogManagerLog")
static const char* kEmailAddressKey = "MavlinkLogEmail"; static const char* kEmailAddressKey = "MAVLinkLogEmail";
static const char* kDescriptionsKey = "MavlinkLogDescription"; static const char* kDescriptionsKey = "MAVLinkLogDescription";
static const char* kDefaultDescr = "QGroundControl Session"; static const char* kDefaultDescr = "QGroundControl Session";
static const char* kPx4URLKey = "MavlinkLogURL"; static const char* kPx4URLKey = "MAVLinkLogURL";
static const char* kDefaultPx4URL = "http://logs.px4.io/upload"; static const char* kDefaultPx4URL = "http://logs.px4.io/upload";
static const char* kEnableAutoUploadKey = "EnableAutoUploadKey"; static const char* kEnableAutoUploadKey = "EnableAutoUploadKey";
static const char* kEnableAutoStartKey = "EnableAutoStartKey"; static const char* kEnableAutoStartKey = "EnableAutoStartKey";
...@@ -329,7 +329,7 @@ MavlinkLogManager::MavlinkLogManager(QGCApplication* app) ...@@ -329,7 +329,7 @@ MavlinkLogManager::MavlinkLogManager(QGCApplication* app)
while(it.hasNext()) { while(it.hasNext()) {
_insertNewLog(new MavlinkLogFiles(this, it.next())); _insertNewLog(new MavlinkLogFiles(this, it.next()));
} }
qCDebug(MavlinkLogManagerLog) << "Mavlink logs directory:" << _logPath; qCDebug(MavlinkLogManagerLog) << "MAVLink logs directory:" << _logPath;
} }
} }
...@@ -809,7 +809,7 @@ MavlinkLogManager::_mavlinkLogData(Vehicle* /*vehicle*/, uint8_t /*target_system ...@@ -809,7 +809,7 @@ MavlinkLogManager::_mavlinkLogData(Vehicle* /*vehicle*/, uint8_t /*target_system
emit logRunningChanged(); emit logRunningChanged();
} }
} else { } else {
qCWarning(MavlinkLogManagerLog) << "Mavlink log data received when not expected."; qCWarning(MavlinkLogManagerLog) << "MAVLink log data received when not expected.";
} }
} }
......
...@@ -120,7 +120,7 @@ Rectangle { ...@@ -120,7 +120,7 @@ Rectangle {
QGCButton { QGCButton {
height: _buttonHeight height: _buttonHeight
text: qsTr("MavLink") text: qsTr("MAVLink")
exclusiveGroup: panelActionGroup exclusiveGroup: panelActionGroup
onClicked: { onClicked: {
if(__rightPanel.source != "MavlinkSettings.qml") { if(__rightPanel.source != "MavlinkSettings.qml") {
......
...@@ -102,7 +102,7 @@ Rectangle { ...@@ -102,7 +102,7 @@ Rectangle {
QGCLabel { QGCLabel {
width: _labelWidth width: _labelWidth
anchors.baseline: sysidField.baseline anchors.baseline: sysidField.baseline
text: qsTr("MavLink System ID:") text: qsTr("MAVLink System ID:")
} }
QGCTextField { QGCTextField {
id: sysidField id: sysidField
...@@ -204,7 +204,7 @@ Rectangle { ...@@ -204,7 +204,7 @@ Rectangle {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
QGCLabel { QGCLabel {
id: logLabel id: logLabel
text: qsTr("Mavlink Log Uploads") text: qsTr("MAVLink Log Uploads")
font.family: ScreenTools.demiboldFontFamily font.family: ScreenTools.demiboldFontFamily
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment