Browse Source

Typos and updating mavlink.

QGC4.4
Gus Grubba 8 years ago
parent
commit
868adb9e78
  1. 2
      libs/mavlink/include/mavlink/v2.0
  2. 10
      src/MissionManager/MavCmdInfoCommon.json
  3. 6
      src/PlanView/SurveyItemEditor.qml
  4. 2
      src/Vehicle/Vehicle.cc
  5. 4
      src/Vehicle/Vehicle.h

2
libs/mavlink/include/mavlink/v2.0

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit 0b8811377674320acd37d6b8e1a2945133528f14
Subproject commit 47d2375dc44a5c4d936824a7a6ce4dc8a2fbc553

10
src/MissionManager/MavCmdInfoCommon.json

@ -974,7 +974,7 @@ @@ -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 @@ @@ -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 @@ @@ -1015,7 +1015,7 @@
"description": "Stop taking photos.",
"category": "Camera",
"param1": {
"label": "Rserved",
"label": "Reserved",
"default": 0,
"decimalPlaces": 0
}
@ -1028,7 +1028,7 @@ @@ -1028,7 +1028,7 @@
"description": "Start video capture.",
"category": "Camera",
"param1": {
"label": "Rserved",
"label": "Reserved",
"default": 0,
"decimalPlaces": 0
}
@ -1040,7 +1040,7 @@ @@ -1040,7 +1040,7 @@
"description": "Stop video capture.",
"category": "Camera",
"param1": {
"label": "Rserved",
"label": "Reserved",
"default": 0,
"decimalPlaces": 0
}

6
src/PlanView/SurveyItemEditor.qml

@ -30,15 +30,15 @@ Rectangle { @@ -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) {

2
src/Vehicle/Vehicle.cc

@ -2584,7 +2584,7 @@ const QVariantList& Vehicle::toolBarIndicators() @@ -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);

4
src/Vehicle/Vehicle.h

@ -311,7 +311,7 @@ public: @@ -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: @@ -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; }

Loading…
Cancel
Save