Browse Source

Removed all "reserved" arguments from the (Json) list so it they not shown.

Added param2 for start video capture (update interval)
Excluded param2 above from PX4 as it's fixed to 0.2Hz
Re-added param2 test within CameraSectionTest (start video capture)
QGC4.4
Gus Grubba 7 years ago
parent
commit
7811fc40aa
  1. 5
      src/FirmwarePlugin/PX4/MavCmdInfoCommon.json
  2. 8
      src/MissionManager/CameraSectionTest.cc
  3. 27
      src/MissionManager/MavCmdInfoCommon.json

5
src/FirmwarePlugin/PX4/MavCmdInfoCommon.json

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

8
src/MissionManager/CameraSectionTest.cc

@ -931,6 +931,14 @@ void CameraSectionTest::_testScanForStopVideoSection(void) @@ -931,6 +931,14 @@ void CameraSectionTest::_testScanForStopVideoSection(void)
QCOMPARE(visualItems.count(), 1);
QCOMPARE(_cameraSection->settingsSpecified(), false);
visualItems.clear();
invalidSimpleItem.missionItem() = _validStartVideoItem->missionItem();
invalidSimpleItem.missionItem().setParam2(VIDEO_CAPTURE_STATUS_INTERVAL + 1); // must be VIDEO_CAPTURE_STATUS_INTERVAL
visualItems.append(&invalidSimpleItem);
QCOMPARE(_cameraSection->scanForSection(&visualItems, scanIndex), false);
QCOMPARE(visualItems.count(), 1);
QCOMPARE(_cameraSection->settingsSpecified(), false);
visualItems.clear();
}
void CameraSectionTest::_testScanForStopImageSection(void)

27
src/MissionManager/MavCmdInfoCommon.json

@ -1005,11 +1005,6 @@ @@ -1005,11 +1005,6 @@
"friendlyName": "Start image capture" ,
"description": "Start taking one or more photos.",
"category": "Camera",
"param1": {
"label": "Reserved",
"default": 0,
"decimalPlaces": 0
},
"param2": {
"label": "Interval",
"default": 0,
@ -1027,12 +1022,7 @@ @@ -1027,12 +1022,7 @@
"rawName": "MAV_CMD_IMAGE_STOP_CAPTURE",
"friendlyName": "Stop image capture",
"description": "Stop taking photos.",
"category": "Camera",
"param1": {
"label": "Reserved",
"default": 0,
"decimalPlaces": 0
}
"category": "Camera"
},
{ "id": 2003, "rawName": "MAV_CMD_DO_TRIGGER_CONTROL", "friendlyName": "Trigger control" },
{
@ -1041,10 +1031,10 @@ @@ -1041,10 +1031,10 @@
"friendlyName": "Start video capture",
"description": "Start video capture.",
"category": "Camera",
"param1": {
"label": "Reserved",
"default": 0,
"decimalPlaces": 0
"param2": {
"label": "Status Interval",
"default": 0.2,
"decimalPlaces": 2
}
},
{
@ -1052,12 +1042,7 @@ @@ -1052,12 +1042,7 @@
"rawName": "MAV_CMD_VIDEO_STOP_CAPTURE",
"friendlyName": "Stop video capture",
"description": "Stop video capture.",
"category": "Camera",
"param1": {
"label": "Reserved",
"default": 0,
"decimalPlaces": 0
}
"category": "Camera"
},
{ "id": 2800, "rawName": "MAV_CMD_PANORAMA_CREATE", "friendlyName": "Create panorama" },
{

Loading…
Cancel
Save