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

Change some descriptions to be more understandable/correct. Change some Heading->Yaw labels. Use new isLandCommand setting.

QGC4.4
DoinLakeFlyer 5 years ago
parent
8c9d7095e8
commit
4eb11be3ee
2 changed files with 21 additions and 18 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. 3
      src/FirmwarePlugin/PX4/MavCmdInfoMultiRotor.json
  2. 36
      src/MissionManager/MavCmdInfoCommon.json

3
src/FirmwarePlugin/PX4/MavCmdInfoMultiRotor.json
Unescape View File

@ -25,7 +25,8 @@
{ {
"id": 22, "id": 22,
"comment": "MAV_CMD_NAV_TAKEOFF", "comment": "MAV_CMD_NAV_TAKEOFF",
"paramRemove": "1" "paramRemove": "1",
"description": "Hover straight up to specified altitude. Then travel to specified position.",
} }
] ]
} }

36
src/MissionManager/MavCmdInfoCommon.json
Unescape View File

@ -51,7 +51,7 @@
"decimalPlaces": 2 "decimalPlaces": 2
}, },
"param4": { "param4": {
"label": "Heading", "label": "Yaw",
"units": "deg", "units": "deg",
"nanUnchanged": true, "nanUnchanged": true,
"default": null, "default": null,
@ -73,7 +73,7 @@
"decimalPlaces": 2 "decimalPlaces": 2
}, },
"param4": { "param4": {
"label": "Heading", "label": "Yaw",
"units": "deg", "units": "deg",
"nanUnchanged": true, "nanUnchanged": true,
"default": null, "default": null,
@ -100,7 +100,7 @@
"decimalPlaces": 2 "decimalPlaces": 2
}, },
"param4": { "param4": {
"label": "Heading", "label": "Yaw",
"units": "deg", "units": "deg",
"nanUnchanged": true, "nanUnchanged": true,
"default": null, "default": null,
@ -128,7 +128,7 @@
"decimalPlaces": 2 "decimalPlaces": 2
}, },
"param4": { "param4": {
"label": "Heading", "label": "Yaw",
"units": "deg", "units": "deg",
"nanUnchanged": true, "nanUnchanged": true,
"default": null, "default": null,
@ -149,6 +149,7 @@
"friendlyName": "Land", "friendlyName": "Land",
"description": "Land vehicle at the specified location.", "description": "Land vehicle at the specified location.",
"specifiesCoordinate": true, "specifiesCoordinate": true,
"isLandCommand": true,
"friendlyEdit": true, "friendlyEdit": true,
"category": "Basic", "category": "Basic",
"param1": { "param1": {
@ -158,7 +159,7 @@
"decimalPlaces": 2 "decimalPlaces": 2
}, },
"param4": { "param4": {
"label": "Heading", "label": "Yaw",
"units": "deg", "units": "deg",
"nanUnchanged": true, "nanUnchanged": true,
"default": null, "default": null,
@ -169,7 +170,7 @@
"id": 22, "id": 22,
"rawName": "MAV_CMD_NAV_TAKEOFF", "rawName": "MAV_CMD_NAV_TAKEOFF",
"friendlyName": "Takeoff", "friendlyName": "Takeoff",
"description": "Take off from the ground and travel towards the specified position.", "description": "Launch from the ground and travel towards the specified takeoff position.",
"specifiesCoordinate": true, "specifiesCoordinate": true,
"friendlyEdit": true, "friendlyEdit": true,
"category": "Basic", "category": "Basic",
@ -180,7 +181,7 @@
"decimalPlaces": 2 "decimalPlaces": 2
}, },
"param4": { "param4": {
"label": "Heading", "label": "Yaw",
"units": "deg", "units": "deg",
"nanUnchanged": true, "nanUnchanged": true,
"default": null, "default": null,
@ -287,12 +288,12 @@
"id": 84, "id": 84,
"rawName": "MAV_CMD_NAV_VTOL_TAKEOFF", "rawName": "MAV_CMD_NAV_VTOL_TAKEOFF",
"friendlyName": "VTOL takeoff", "friendlyName": "VTOL takeoff",
"description": "Takeoff in VTOL mode, transition to forward flight and fly to the specified location.", "description": "Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.",
"specifiesCoordinate": true, "specifiesCoordinate": true,
"friendlyEdit": true, "friendlyEdit": true,
"category": "VTOL", "category": "Basic",
"param4": { "param4": {
"label": "Heading", "label": "Yaw",
"units": "deg", "units": "deg",
"nanUnchanged": true, "nanUnchanged": true,
"default": null, "default": null,
@ -302,13 +303,14 @@
{ {
"id": 85, "id": 85,
"rawName": "MAV_CMD_NAV_VTOL_LAND", "rawName": "MAV_CMD_NAV_VTOL_LAND",
"friendlyName": "VTOL transition and land", "friendlyName": "VTOL land",
"description": "Transition to VTOL mode and land.", "description": "Fly to specified location at current altitude, transition to multi-rotor and land.",
"specifiesCoordinate": true, "specifiesCoordinate": true,
"isLandCommand": true,
"friendlyEdit": true, "friendlyEdit": true,
"category": "VTOL", "category": "Basic",
"param4": { "param4": {
"label": "Heading", "label": "Yaw",
"units": "deg", "units": "deg",
"nanUnchanged": true, "nanUnchanged": true,
"default": null, "default": null,
@ -400,11 +402,11 @@
{ {
"id": 115, "id": 115,
"rawName": "MAV_CMD_CONDITION_YAW", "rawName": "MAV_CMD_CONDITION_YAW",
"friendlyName": "Wait for Heading", "friendlyName": "Wait for Yaw",
"description": "Delay the mission until the specified heading is reached.", "description": "Delay the mission until the specified yaw is reached.",
"category": "Conditionals", "category": "Conditionals",
"param1": { "param1": {
"label": "Heading", "label": "Yaw",
"units": "deg", "units": "deg",
"default": 0, "default": 0,
"decimalPlaces": 1 "decimalPlaces": 1

Write Preview
Loading…
Cancel
Save