zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Typos and updating mavlink.

QGC4.4
Gus Grubba 8 years ago
parent
25d43fd762
commit
868adb9e78
5 changed files with 12 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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 @@
Subproject commit 0b8811377674320acd37d6b8e1a2945133528f14 Subproject commit 47d2375dc44a5c4d936824a7a6ce4dc8a2fbc553

10
src/MissionManager/MavCmdInfoCommon.json
Unescape View File

@ -974,7 +974,7 @@
"description": "Set camera photo, video, audio modes.", "description": "Set camera photo, video, audio modes.",
"category": "Camera", "category": "Camera",
"param1": { "param1": {
"label": "Rserved", "label": "Reserved",
"default": 0, "default": 0,
"decimalPlaces": 0 "decimalPlaces": 0
}, },
@ -992,7 +992,7 @@
"description": "Start taking one or more photos.", "description": "Start taking one or more photos.",
"category": "Camera", "category": "Camera",
"param1": { "param1": {
"label": "Rserved", "label": "Reserved",
"default": 0, "default": 0,
"decimalPlaces": 0 "decimalPlaces": 0
}, },
@ -1015,7 +1015,7 @@
"description": "Stop taking photos.", "description": "Stop taking photos.",
"category": "Camera", "category": "Camera",
"param1": { "param1": {
"label": "Rserved", "label": "Reserved",
"default": 0, "default": 0,
"decimalPlaces": 0 "decimalPlaces": 0
} }
@ -1028,7 +1028,7 @@
"description": "Start video capture.", "description": "Start video capture.",
"category": "Camera", "category": "Camera",
"param1": { "param1": {
"label": "Rserved", "label": "Reserved",
"default": 0, "default": 0,
"decimalPlaces": 0 "decimalPlaces": 0
} }
@ -1040,7 +1040,7 @@
"description": "Stop video capture.", "description": "Stop video capture.",
"category": "Camera", "category": "Camera",
"param1": { "param1": {
"label": "Rserved", "label": "Reserved",
"default": 0, "default": 0,
"decimalPlaces": 0 "decimalPlaces": 0
} }

6
src/PlanView/SurveyItemEditor.qml
Unescape View File

@ -30,15 +30,15 @@ Rectangle {
property real _fieldWidth: ScreenTools.defaultFontPixelWidth * 10.5 property real _fieldWidth: ScreenTools.defaultFontPixelWidth * 10.5
property var _cameraList: [ qsTr("Manual Grid (no camera specs)"), qsTr("Custom Camera Grid") ] 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 _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 _gridTypeManual: 0
readonly property int _gridTypeCustomCamera: 1 readonly property int _gridTypeCustomCamera: 1
readonly property int _gridTypeCamera: 2 readonly property int _gridTypeCamera: 2
Component.onCompleted: { Component.onCompleted: {
for (var i=0; i<_vehicle.staticCcameraList.length; i++) { for (var i=0; i<_vehicle.staticCameraList.length; i++) {
_cameraList.push(_vehicle.staticCcameraList[i].name) _cameraList.push(_vehicle.staticCameraList[i].name)
} }
gridTypeCombo.model = _cameraList gridTypeCombo.model = _cameraList
if (missionItem.manualGrid.value) { if (missionItem.manualGrid.value) {

2
src/Vehicle/Vehicle.cc
Unescape View File

@ -2584,7 +2584,7 @@ const QVariantList& Vehicle::toolBarIndicators()
return emptyList; return emptyList;
} }
const QVariantList& Vehicle::staticCcameraList(void) const const QVariantList& Vehicle::staticCameraList(void) const
{ {
if (_firmwarePlugin) { if (_firmwarePlugin) {
return _firmwarePlugin->cameraList(this); return _firmwarePlugin->cameraList(this);

4
src/Vehicle/Vehicle.h
Unescape View File

@ -311,7 +311,7 @@ public:
Q_PROPERTY(int telemetryLNoise READ telemetryLNoise NOTIFY telemetryLNoiseChanged) Q_PROPERTY(int telemetryLNoise READ telemetryLNoise NOTIFY telemetryLNoiseChanged)
Q_PROPERTY(int telemetryRNoise READ telemetryRNoise NOTIFY telemetryRNoiseChanged) Q_PROPERTY(int telemetryRNoise READ telemetryRNoise NOTIFY telemetryRNoiseChanged)
Q_PROPERTY(QVariantList toolBarIndicators READ toolBarIndicators CONSTANT) 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) Q_PROPERTY(QGCCameraManager* dynamicCameras READ dynamicCameras NOTIFY dynamicCamerasChanged)
/// true: Vehicle is flying, false: Vehicle is on ground /// true: Vehicle is flying, false: Vehicle is on ground
@ -673,7 +673,7 @@ public:
QString vehicleImageCompass () const; QString vehicleImageCompass () const;
const QVariantList& toolBarIndicators (); const QVariantList& toolBarIndicators ();
const QVariantList& staticCcameraList (void) const; const QVariantList& staticCameraList (void) const;
QGCCameraManager* dynamicCameras () { return _cameras; } QGCCameraManager* dynamicCameras () { return _cameras; }

Write Preview
Loading…
Cancel
Save