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

Cleanup/fix command json hierarchy

QGC4.4
DonLakeFlyer 5 years ago
parent
74fb1dae27
commit
5bcb37d27e
9 changed files with 94 additions and 160 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json
  2. 22
      src/FirmwarePlugin/APM/APM-MavCmdInfoFixedWing.json
  3. 22
      src/FirmwarePlugin/APM/APM-MavCmdInfoMultiRotor.json
  4. 5
      src/FirmwarePlugin/PX4/PX4-MavCmdInfoCommon.json
  5. 24
      src/FirmwarePlugin/PX4/PX4-MavCmdInfoMultiRotor.json
  6. 87
      src/MissionManager/MavCmdInfoCommon.json
  7. 22
      src/MissionManager/MavCmdInfoFixedWing.json
  8. 20
      src/MissionManager/MavCmdInfoMultiRotor.json

30
src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json
Unescape View File

@ -10,36 +10,6 @@ @@ -10,36 +10,6 @@
"paramRemove": "2"
},
{
"id": 17,
"comment": "MAV_CMD_NAV_LOITER_UNLIM",
"param4": {
"label": "Heading",
"units": "radians",
"default": 0,
"decimalPlaces": 2
}
},
{
"id": 18,
"comment": "MAV_CMD_NAV_LOITER_TURNS",
"param4": {
"label": "Heading",
"units": "radians",
"default": 0,
"decimalPlaces": 2
}
},
{
"id": 19,
"comment": "MAV_CMD_NAV_LOITER_TIME",
"param4": {
"label": "Heading",
"units": "radians",
"default": 0,
"decimalPlaces": 2
}
},
{
"id": 22,
"comment": "MAV_CMD_NAV_TAKEOFF",
"description": "Take off from the ground and ascend to specified altitude.",

22
src/FirmwarePlugin/APM/APM-MavCmdInfoFixedWing.json
Unescape View File

@ -10,28 +10,6 @@ @@ -10,28 +10,6 @@
"paramRemove": "1,3,4"
},
{
"id": 18,
"comment": "MAV_CMD_NAV_LOITER_TURNS",
"param4": {
"label": "Exit loiter from",
"enumStrings": "Center,Tangent",
"enumValues": "0,1",
"default": 1,
"decimalPlaces": 0
}
},
{
"id": 19,
"comment": "MAV_CMD_NAV_LOITER_TIME",
"param4": {
"label": "Exit loiter from",
"enumStrings": "Center,Tangent",
"enumValues": "0,1",
"default": 1,
"decimalPlaces": 0
}
},
{
"id": 21,
"comment": "MAV_CMD_NAV_LAND",
"paramRemove": "4"

22
src/FirmwarePlugin/APM/APM-MavCmdInfoMultiRotor.json
Unescape View File

@ -7,22 +7,7 @@ @@ -7,22 +7,7 @@
{
"id": 16,
"comment": "MAV_CMD_NAV_WAYPOINT",
"paramRemove": "2,3,4"
},
{
"id": 17,
"comment": "MAV_CMD_NAV_LOITER_UNLIM",
"paramRemove": "3"
},
{
"id": 18,
"comment": "MAV_CMD_NAV_LOITER_TURNS",
"paramRemove": "4"
},
{
"id": 19,
"comment": "MAV_CMD_NAV_LOITER_TIME",
"paramRemove": "4"
"paramRemove": "3,4"
},
{
"id": 21,
@ -33,11 +18,6 @@ @@ -33,11 +18,6 @@
"id": 22,
"comment": "MAV_CMD_NAV_TAKEOFF",
"paramRemove": "1,2,3,4"
},
{
"id": 31,
"comment": "MAV_CMD_NAV_LOITER_TO_ALT",
"paramRemove": "4"
}
]
}

5
src/FirmwarePlugin/PX4/PX4-MavCmdInfoCommon.json
Unescape View File

@ -15,11 +15,6 @@ @@ -15,11 +15,6 @@
"paramRemove": "1"
},
{
"id": 201,
"comment": "MAV_CMD_DO_SET_ROI",
"paramRemove": "1,2,3"
},
{
"id": 2500,
"comment": "MAV_CMD_VIDEO_START_CAPTURE",
"paramRemove": "2"

24
src/FirmwarePlugin/PX4/PX4-MavCmdInfoMultiRotor.json
Unescape View File

@ -4,29 +4,5 @@ @@ -4,29 +4,5 @@
"fileType": "MavCmdInfo",
"mavCmdInfo": [
{
"id": 17,
"comment": "MAV_CMD_NAV_LOITER_UNLIM",
"description": "Travel to a position and Loiter indefinitely.",
"paramRemove": "3"
},
{
"id": 18,
"comment": "MAV_CMD_NAV_LOITER_TURNS",
"description": "Travel to a position and Loiter for a number of turns.",
"paramRemove": "3"
},
{
"id": 19,
"comment": "MAV_CMD_NAV_LOITER_TIME",
"description": "Travel to a position and Loiter for an amount of time.",
"paramRemove": "3"
},
{
"id": 22,
"comment": "MAV_CMD_NAV_TAKEOFF",
"paramRemove": "1",
"description": "Hover straight up to specified altitude. Then travel to specified position."
}
]
}

87
src/MissionManager/MavCmdInfoCommon.json
Unescape View File

@ -41,11 +41,11 @@ @@ -41,11 +41,11 @@
"param2": {
"label": "Acceptance",
"units": "m",
"default": 3,
"default": 0,
"decimalPlaces": 2
},
"param3": {
"label": "PassThru",
"label": "Pass Radius",
"units": "m",
"default": 0,
"decimalPlaces": 2
@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
"id": 17,
"rawName": "MAV_CMD_NAV_LOITER_UNLIM",
"friendlyName": "Loiter",
"description": "Travel to a position and Loiter around the specified radius indefinitely.",
"description": "Travel to a position and Loiter around the specified position indefinitely.",
"specifiesCoordinate": true,
"friendlyEdit": true,
"category": "Loiter",
@ -84,7 +84,7 @@ @@ -84,7 +84,7 @@
"id": 18,
"rawName": "MAV_CMD_NAV_LOITER_TURNS",
"friendlyName": "Loiter (turns)",
"description": "Travel to a position and Loiter around the specified radius for a number of turns.",
"description": "Travel to a position and Loiter around the specified position for a number of turns.",
"specifiesCoordinate": true,
"friendlyEdit": true,
"category": "Loiter",
@ -93,6 +93,13 @@ @@ -93,6 +93,13 @@
"default": 1,
"decimalPlaces": 0
},
"param2": {
"label": "Leave Loiter",
"enumStrings": "Direction of next waypoint,Any direction",
"enumValues": "1,0",
"default": 1,
"decimalPlaces": 0
},
"param3": {
"label": "Radius",
"units": "m",
@ -100,27 +107,34 @@ @@ -100,27 +107,34 @@
"decimalPlaces": 2
},
"param4": {
"label": "Yaw",
"units": "deg",
"nanUnchanged": true,
"default": null,
"decimalPlaces": 2
"label": "Exit loiter from",
"enumStrings": "Center,Tangent",
"enumValues": "0,1",
"default": 1,
"decimalPlaces": 0
}
},
{
"id": 19,
"rawName": "MAV_CMD_NAV_LOITER_TIME",
"friendlyName": "Loiter (time)",
"description": "Travel to a position and Loiter around the specified radius for an amount of time.",
"description": "Travel to a position and Loiter around the specified position for an amount of time.",
"specifiesCoordinate": true,
"friendlyEdit": true,
"category": "Loiter",
"param1": {
"label": "Hold",
"label": "Loiter Time",
"units": "secs",
"default": 30,
"decimalPlaces": 0
},
"param2": {
"label": "Leave Loiter",
"enumStrings": "Direction of next waypoint,Current direction",
"enumValues": "1,0",
"default": 1,
"decimalPlaces": 0
},
"param3": {
"label": "Radius",
"units": "m",
@ -128,11 +142,11 @@ @@ -128,11 +142,11 @@
"decimalPlaces": 2
},
"param4": {
"label": "Yaw",
"units": "deg",
"nanUnchanged": true,
"default": null,
"decimalPlaces": 2
"label": "Exit loiter from",
"enumStrings": "Center,Tangent",
"enumValues": "0,1",
"default": 1,
"decimalPlaces": 0
}
},
{
@ -158,6 +172,14 @@ @@ -158,6 +172,14 @@
"default": 0,
"decimalPlaces": 2
},
"param2": {
"label": "Precision Land",
"units": "m",
"enumStrings": "Disabled,Opportunistic,Required",
"enumValues": "0,1,2",
"default": 0,
"decimalPlaces": 2
},
"param4": {
"label": "Yaw",
"units": "deg",
@ -218,10 +240,10 @@ @@ -218,10 +240,10 @@
"friendlyEdit": true,
"category": "Loiter",
"param1": {
"label": "Heading wait",
"enumStrings": "False,True",
"enumValues": "0,1",
"default": 0,
"label": "Leave Loiter",
"enumStrings": "Direction of next waypoint,Any direction",
"enumValues": "1,0",
"default": 1,
"decimalPlaces": 0
},
"param2": {
@ -294,6 +316,14 @@ @@ -294,6 +316,14 @@
"isTakeoffCommand": true,
"friendlyEdit": true,
"category": "Basic",
"param2": {
"label": "Transition Heading",
"units": "m",
"enumStrings": "Default,Next waypoint,Takeoff,Specified,Any",
"enumValues": "0,1,2,3,4",
"default": 0,
"decimalPlaces": 0
},
"param4": {
"label": "Yaw",
"units": "deg",
@ -311,6 +341,13 @@ @@ -311,6 +341,13 @@
"isLandCommand": true,
"friendlyEdit": true,
"category": "Basic",
"param3": {
"label": "Approach Alt",
"units": "m",
"nanUnchanged": true,
"default": null,
"decimalPlaces": 2
},
"param4": {
"label": "Yaw",
"units": "deg",
@ -326,7 +363,7 @@ @@ -326,7 +363,7 @@
"description": "Enable/Disabled guided mode.",
"param1": {
"label": "Enable",
"enumStrings": "Disable,Enable",
"enumStrings": "On,Off",
"enumValues": "0,1",
"default": 1,
"decimalPlaces": 0
@ -367,7 +404,7 @@ @@ -367,7 +404,7 @@
"friendlyEdit": true,
"category": "Basic",
"param1": {
"label": "Hold",
"label": "Delay",
"units": "secs",
"default": 30,
"decimalPlaces": 0
@ -405,10 +442,10 @@ @@ -405,10 +442,10 @@
"id": 115,
"rawName": "MAV_CMD_CONDITION_YAW",
"friendlyName": "Wait for Yaw",
"description": "Delay the mission until the specified yaw is reached.",
"description": "Delay the mission until the specified heading is reached.",
"category": "Conditionals",
"param1": {
"label": "Yaw",
"label": "Heading",
"units": "deg",
"default": 0,
"decimalPlaces": 1
@ -1079,7 +1116,7 @@ @@ -1079,7 +1116,7 @@
"param1": {
"label": "Mode",
"default": 3,
"enumStrings": "Hover Mode,Plane Mode",
"enumStrings": "Multi Rotor,Fixed Wing",
"enumValues": "3,4"
}
},

22
src/MissionManager/MavCmdInfoFixedWing.json
Unescape View File

@ -15,28 +15,6 @@ @@ -15,28 +15,6 @@
"paramRemove": "4"
},
{
"id": 18,
"comment": "MAV_CMD_NAV_LOITER_TURNS",
"param4": {
"label": "Exit loiter from",
"enumStrings": "Center,Tangent",
"enumValues": "0,1",
"default": 1,
"decimalPlaces": 0
}
},
{
"id": 19,
"comment": "MAV_CMD_NAV_LOITER_TIME",
"param4": {
"label": "Exit loiter from",
"enumStrings": "Center,Tangent",
"enumValues": "0,1",
"default": 1,
"decimalPlaces": 0
}
},
{
"id": 21,
"comment": "MAV_CMD_NAV_LAND",
"paramRemove": "4"

20
src/MissionManager/MavCmdInfoMultiRotor.json
Unescape View File

@ -4,5 +4,25 @@ @@ -4,5 +4,25 @@
"fileType": "MavCmdInfo",
"mavCmdInfo": [
{
"id": 17,
"comment": "MAV_CMD_NAV_LOITER_UNLIM",
"paramRemove": "3"
},
{
"id": 19,
"comment": "MAV_CMD_NAV_LOITER_TIME",
"paramRemove": "2,3,4"
},
{
"id": 22,
"comment": "MAV_CMD_NAV_TAKEOFF",
"paramRemove": "1"
},
{
"id": 31,
"comment": "MAV_CMD_NAV_LOITER_TO_ALT",
"paramRemove": "1,2,4"
}
]
}

Write Preview
Loading…
Cancel
Save