From 868adb9e788e8f17dc442bdb44de21ea6879be05 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Sat, 22 Jul 2017 13:23:25 -0400 Subject: [PATCH] Typos and updating mavlink. --- libs/mavlink/include/mavlink/v2.0 | 2 +- src/MissionManager/MavCmdInfoCommon.json | 10 +++++----- src/PlanView/SurveyItemEditor.qml | 6 +++--- src/Vehicle/Vehicle.cc | 2 +- src/Vehicle/Vehicle.h | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/mavlink/include/mavlink/v2.0 b/libs/mavlink/include/mavlink/v2.0 index 0b8811377..47d2375dc 160000 --- a/libs/mavlink/include/mavlink/v2.0 +++ b/libs/mavlink/include/mavlink/v2.0 @@ -1 +1 @@ -Subproject commit 0b8811377674320acd37d6b8e1a2945133528f14 +Subproject commit 47d2375dc44a5c4d936824a7a6ce4dc8a2fbc553 diff --git a/src/MissionManager/MavCmdInfoCommon.json b/src/MissionManager/MavCmdInfoCommon.json index 89e3917a6..239b79cfe 100644 --- a/src/MissionManager/MavCmdInfoCommon.json +++ b/src/MissionManager/MavCmdInfoCommon.json @@ -974,7 +974,7 @@ "description": "Set camera photo, video, audio modes.", "category": "Camera", "param1": { - "label": "Rserved", + "label": "Reserved", "default": 0, "decimalPlaces": 0 }, @@ -992,7 +992,7 @@ "description": "Start taking one or more photos.", "category": "Camera", "param1": { - "label": "Rserved", + "label": "Reserved", "default": 0, "decimalPlaces": 0 }, @@ -1015,7 +1015,7 @@ "description": "Stop taking photos.", "category": "Camera", "param1": { - "label": "Rserved", + "label": "Reserved", "default": 0, "decimalPlaces": 0 } @@ -1028,7 +1028,7 @@ "description": "Start video capture.", "category": "Camera", "param1": { - "label": "Rserved", + "label": "Reserved", "default": 0, "decimalPlaces": 0 } @@ -1040,7 +1040,7 @@ "description": "Stop video capture.", "category": "Camera", "param1": { - "label": "Rserved", + "label": "Reserved", "default": 0, "decimalPlaces": 0 } diff --git a/src/PlanView/SurveyItemEditor.qml b/src/PlanView/SurveyItemEditor.qml index d8409d3b5..73fcc143e 100644 --- a/src/PlanView/SurveyItemEditor.qml +++ b/src/PlanView/SurveyItemEditor.qml @@ -30,15 +30,15 @@ Rectangle { property real _fieldWidth: ScreenTools.defaultFontPixelWidth * 10.5 property var _cameraList: [ qsTr("Manual Grid (no camera specs)"), qsTr("Custom Camera Grid") ] property var _vehicle: QGroundControl.multiVehicleManager.activeVehicle ? QGroundControl.multiVehicleManager.activeVehicle : QGroundControl.multiVehicleManager.offlineEditingVehicle - property var _vehicleCameraList: _vehicle.staticCcameraList + property var _vehicleCameraList: _vehicle.staticCameraList readonly property int _gridTypeManual: 0 readonly property int _gridTypeCustomCamera: 1 readonly property int _gridTypeCamera: 2 Component.onCompleted: { - for (var i=0; i<_vehicle.staticCcameraList.length; i++) { - _cameraList.push(_vehicle.staticCcameraList[i].name) + for (var i=0; i<_vehicle.staticCameraList.length; i++) { + _cameraList.push(_vehicle.staticCameraList[i].name) } gridTypeCombo.model = _cameraList if (missionItem.manualGrid.value) { diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc index b7e799859..2fc1e74c1 100644 --- a/src/Vehicle/Vehicle.cc +++ b/src/Vehicle/Vehicle.cc @@ -2584,7 +2584,7 @@ const QVariantList& Vehicle::toolBarIndicators() return emptyList; } -const QVariantList& Vehicle::staticCcameraList(void) const +const QVariantList& Vehicle::staticCameraList(void) const { if (_firmwarePlugin) { return _firmwarePlugin->cameraList(this); diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h index 15e0e4cfb..8111355cb 100644 --- a/src/Vehicle/Vehicle.h +++ b/src/Vehicle/Vehicle.h @@ -311,7 +311,7 @@ public: Q_PROPERTY(int telemetryLNoise READ telemetryLNoise NOTIFY telemetryLNoiseChanged) Q_PROPERTY(int telemetryRNoise READ telemetryRNoise NOTIFY telemetryRNoiseChanged) Q_PROPERTY(QVariantList toolBarIndicators READ toolBarIndicators CONSTANT) - Q_PROPERTY(QVariantList staticCcameraList READ staticCcameraList CONSTANT) + Q_PROPERTY(QVariantList staticCameraList READ staticCameraList CONSTANT) Q_PROPERTY(QGCCameraManager* dynamicCameras READ dynamicCameras NOTIFY dynamicCamerasChanged) /// true: Vehicle is flying, false: Vehicle is on ground @@ -673,7 +673,7 @@ public: QString vehicleImageCompass () const; const QVariantList& toolBarIndicators (); - const QVariantList& staticCcameraList (void) const; + const QVariantList& staticCameraList (void) const; QGCCameraManager* dynamicCameras () { return _cameras; } -- 2.22.0