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

update fixed wing cmd default values

QGC4.4
Daniel Agar 9 years ago
parent
4be818c240
commit
82140c8dce
4 changed files with 335 additions and 6 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. 163
      src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json
  2. 163
      src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json
  3. 2
      src/MissionManager/MavCmdInfoCommon.json
  4. 13
      src/MissionManager/MissionController.cc

163
src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json
Unescape View File

@ -1,6 +1,167 @@ @@ -1,6 +1,167 @@
{
"version": 1,
"mavCmdInfo": [
{
"id": 16,
"rawName": "MAV_CMD_NAV_WAYPOINT",
"friendlyName": "Waypoint",
"description": "Travel to a position in 3D space.",
"specifiesCoordinate": true,
"friendlyEdit": true,
"category": "Basic",
"param1": {
"label": "Hold:",
"units": "seconds",
"default": 0,
"decimalPlaces": 0
},
"param7": {
"label": "Altitude:",
"units": "meters",
"default": 50,
"decimalPlaces": 0
}
},
{
"id": 17,
"rawName": "MAV_CMD_NAV_LOITER_UNLIM",
"friendlyName": "Loiter",
"description": "Travel to a position and Loiter around the specified radius indefinitely.",
"specifiesCoordinate": true,
"friendlyEdit": true,
"category": "Loiter",
"param3": {
"label": "Radius:",
"units": "meters",
"default": 100,
"decimalPlaces": 0
},
"param7": {
"label": "Altitude:",
"units": "meters",
"default": 50,
"decimalPlaces": 0
}
},
{
"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.",
"specifiesCoordinate": true,
"friendlyEdit": true,
"category": "Loiter",
"param1": {
"label": "Turns:",
"default": 1,
"decimalPlaces": 0
},
"param3": {
"label": "Radius:",
"units": "meters",
"default": 100,
"decimalPlaces": 0
},
"param7": {
"label": "Altitude:",
"units": "meters",
"default": 50,
"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 a number of seconds.",
"specifiesCoordinate": true,
"friendlyEdit": true,
"category": "Loiter",
"param1": {
"label": "Seconds:",
"units": "seconds",
"default": 30,
"decimalPlaces": 1
},
"param3": {
"label": "Radius:",
"units": "meters",
"default": 100,
"decimalPlaces": 0
},
"param7": {
"label": "Altitude:",
"units": "meters",
"default": 50,
"decimalPlaces": 0
}
},
{
"id": 21,
"rawName": "MAV_CMD_NAV_LAND",
"friendlyName": "Land",
"description": "Land vehicle at the specified location.",
"specifiesCoordinate": true,
"friendlyEdit": true,
"category": "Basic",
"param1": {
"label": "Abort Alt:",
"units": "meters",
"default": 25,
"decimalPlaces": 0
},
"param4": {
"label": "Heading:",
"units": "radians",
"default": 0,
"decimalPlaces": 2
},
"param7": {
"label": "Altitude:",
"units": "meters",
"default": 0,
"decimalPlaces": 1
}
},
{
"id": 22,
"rawName": "MAV_CMD_NAV_TAKEOFF",
"friendlyName": "Takeoff",
"description": "Take off from the ground and travel towards the specified position.",
"specifiesCoordinate": true,
"friendlyEdit": true,
"category": "Basic",
"param1": {
"label": "Pitch:",
"units": "degrees",
"default": 0,
"decimalPlaces": 0
},
"param4": {
"label": "Heading:",
"units": "radians",
"default": 0,
"decimalPlaces": 1
},
"param7": {
"label": "Altitude:",
"units": "meters",
"default": 25,
"decimalPlaces": 0
}
},
{
"id": 206,
"rawName": "MAV_CMD_DO_SET_CAM_TRIGG_DIST",
"friendlyName": "Camera trigger distance",
"description": "Set camera trigger distance.",
"category": "Camera",
"param1": {
"label": "Distance:",
"default": 25,
"units": "meters",
"decimalPlaces": 1
}
}
]
}

163
src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json
Unescape View File

@ -1,6 +1,167 @@ @@ -1,6 +1,167 @@
{
"version": 1,
"mavCmdInfo": [
{
"id": 16,
"rawName": "MAV_CMD_NAV_WAYPOINT",
"friendlyName": "Waypoint",
"description": "Travel to a position in 3D space.",
"specifiesCoordinate": true,
"friendlyEdit": true,
"category": "Basic",
"param1": {
"label": "Hold:",
"units": "seconds",
"default": 0,
"decimalPlaces": 0
},
"param7": {
"label": "Altitude:",
"units": "meters",
"default": 50,
"decimalPlaces": 0
}
},
{
"id": 17,
"rawName": "MAV_CMD_NAV_LOITER_UNLIM",
"friendlyName": "Loiter",
"description": "Travel to a position and Loiter around the specified radius indefinitely.",
"specifiesCoordinate": true,
"friendlyEdit": true,
"category": "Loiter",
"param3": {
"label": "Radius:",
"units": "meters",
"default": 100,
"decimalPlaces": 0
},
"param7": {
"label": "Altitude:",
"units": "meters",
"default": 50,
"decimalPlaces": 0
}
},
{
"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.",
"specifiesCoordinate": true,
"friendlyEdit": true,
"category": "Loiter",
"param1": {
"label": "Turns:",
"default": 1,
"decimalPlaces": 0
},
"param3": {
"label": "Radius:",
"units": "meters",
"default": 100,
"decimalPlaces": 0
},
"param7": {
"label": "Altitude:",
"units": "meters",
"default": 50,
"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 a number of seconds.",
"specifiesCoordinate": true,
"friendlyEdit": true,
"category": "Loiter",
"param1": {
"label": "Seconds:",
"units": "seconds",
"default": 30,
"decimalPlaces": 1
},
"param3": {
"label": "Radius:",
"units": "meters",
"default": 100,
"decimalPlaces": 0
},
"param7": {
"label": "Altitude:",
"units": "meters",
"default": 50,
"decimalPlaces": 0
}
},
{
"id": 21,
"rawName": "MAV_CMD_NAV_LAND",
"friendlyName": "Land",
"description": "Land vehicle at the specified location.",
"specifiesCoordinate": true,
"friendlyEdit": true,
"category": "Basic",
"param1": {
"label": "Abort Alt:",
"units": "meters",
"default": 25,
"decimalPlaces": 0
},
"param4": {
"label": "Heading:",
"units": "radians",
"default": 0,
"decimalPlaces": 2
},
"param7": {
"label": "Altitude:",
"units": "meters",
"default": 0,
"decimalPlaces": 1
}
},
{
"id": 22,
"rawName": "MAV_CMD_NAV_TAKEOFF",
"friendlyName": "Takeoff",
"description": "Take off from the ground and travel towards the specified position.",
"specifiesCoordinate": true,
"friendlyEdit": true,
"category": "Basic",
"param1": {
"label": "Pitch:",
"units": "degrees",
"default": 0,
"decimalPlaces": 0
},
"param4": {
"label": "Heading:",
"units": "radians",
"default": 0,
"decimalPlaces": 1
},
"param7": {
"label": "Altitude:",
"units": "meters",
"default": 25,
"decimalPlaces": 0
}
},
{
"id": 206,
"rawName": "MAV_CMD_DO_SET_CAM_TRIGG_DIST",
"friendlyName": "Camera trigger distance",
"description": "Set camera trigger distance.",
"category": "Camera",
"param1": {
"label": "Distance:",
"default": 25,
"units": "meters",
"decimalPlaces": 1
}
}
]
}

2
src/MissionManager/MavCmdInfoCommon.json
Unescape View File

@ -409,7 +409,7 @@ @@ -409,7 +409,7 @@
},
"param2": {
"label": "Repeat:",
"default": 0,
"default": 10,
"decimalPlaces": 0
}
},

13
src/MissionManager/MissionController.cc
Unescape View File

@ -987,11 +987,18 @@ bool MissionController::_findLastAltitude(double* lastAltitude) @@ -987,11 +987,18 @@ bool MissionController::_findLastAltitude(double* lastAltitude)
// Don't use home position
for (int i=1; i<_visualItems->count(); i++) {
VisualMissionItem* item = qobject_cast<VisualMissionItem*>(_visualItems->get(i));
VisualMissionItem* visualItem = qobject_cast<VisualMissionItem*>(_visualItems->get(i));
if (item->specifiesCoordinate() && !item->isStandaloneCoordinate()) {
foundAltitude = item->exitCoordinate().altitude();
if (visualItem->specifiesCoordinate() && !visualItem->isStandaloneCoordinate()) {
foundAltitude = visualItem->exitCoordinate().altitude();
found = true;
if (visualItem->isSimpleItem()) {
SimpleMissionItem* simpleItem = qobject_cast<SimpleMissionItem*>(visualItem);
if ((MAV_CMD)simpleItem->command() == MAV_CMD_NAV_TAKEOFF) {
found = false;
}
}
}
}

Write Preview
Loading…
Cancel
Save