diff --git a/src/FirmwarePlugin/PX4/MavCmdInfoCommon.json b/src/FirmwarePlugin/PX4/MavCmdInfoCommon.json index f50fe22108663f9d810aa67947d470531eb34589..8657261895e728cd9fdf5aa479ab99e3d4d1e8c7 100644 --- a/src/FirmwarePlugin/PX4/MavCmdInfoCommon.json +++ b/src/FirmwarePlugin/PX4/MavCmdInfoCommon.json @@ -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" } ] } diff --git a/src/MissionManager/CameraSectionTest.cc b/src/MissionManager/CameraSectionTest.cc index b48ec308e0f09c989197b7c207c61af4cda9ebee..76894ede9693c70d3445922208ca6999c1258d6f 100644 --- a/src/MissionManager/CameraSectionTest.cc +++ b/src/MissionManager/CameraSectionTest.cc @@ -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) diff --git a/src/MissionManager/MavCmdInfoCommon.json b/src/MissionManager/MavCmdInfoCommon.json index 9a7dd6cbcd962409dda9e1d84456787cdde3d03a..9a15299486b682e51b239d0437458add14cf8a87 100644 --- a/src/MissionManager/MavCmdInfoCommon.json +++ b/src/MissionManager/MavCmdInfoCommon.json @@ -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 @@ "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 @@ "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 @@ "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" }, {