Unverified Commit ac65f8e4 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #8189 from DonLakeFlyer/TakePhoto

Fix MAV_CMD_IMAGE_START_CAPTURE usage
parents 0903b2e2 87dd077f
...@@ -200,12 +200,13 @@ void CameraSection::appendSectionItems(QList<MissionItem*>& items, QObject* miss ...@@ -200,12 +200,13 @@ void CameraSection::appendSectionItems(QList<MissionItem*>& items, QObject* miss
item = new MissionItem(nextSequenceNumber++, item = new MissionItem(nextSequenceNumber++,
MAV_CMD_IMAGE_START_CAPTURE, MAV_CMD_IMAGE_START_CAPTURE,
MAV_FRAME_MISSION, MAV_FRAME_MISSION,
0, // Reserved (Set to 0) 0, // Reserved (Set to 0)
0, // Interval (none) 0, // Interval (none)
1, // Take 1 photo 1, // Take 1 photo
qQNaN(), qQNaN(), qQNaN(), qQNaN(), // reserved 0, // No sequence number specified
true, // autoContinue qQNaN(), qQNaN(), qQNaN(), // reserved
false, // isCurrentItem true, // autoContinue
false, // isCurrentItem
missionItemParent); missionItemParent);
break; break;
} }
......
...@@ -113,7 +113,8 @@ void CameraSectionTest::init(void) ...@@ -113,7 +113,8 @@ void CameraSectionTest::init(void)
0, // Reserved (Set to 0) 0, // Reserved (Set to 0)
0, // Interval (none) 0, // Interval (none)
1, // Take 1 photo 1, // Take 1 photo
NAN, NAN, NAN, NAN, // param 4-7 reserved 0, // Sequence id not used
NAN, NAN, NAN, // param 5-7 reserved
true, // autoContinue true, // autoContinue
false), // isCurrentItem false), // isCurrentItem
this); this);
...@@ -975,7 +976,7 @@ void CameraSectionTest::_testScanForTakePhotoSection(void) ...@@ -975,7 +976,7 @@ void CameraSectionTest::_testScanForTakePhotoSection(void)
Mission Param #1 Reserved (Set to 0) Mission Param #1 Reserved (Set to 0)
Mission Param #2 Duration between two consecutive pictures (in seconds) Mission Param #2 Duration between two consecutive pictures (in seconds)
Mission Param #3 Number of images to capture total - 0 for unlimited capture Mission Param #3 Number of images to capture total - 0 for unlimited capture
Mission Param #4 Reserved Mission Param #4 0 Unused sequence id
*/ */
SimpleMissionItem* newValidTakePhotoItem = new SimpleMissionItem(_offlineVehicle, false /* flyView */, this); SimpleMissionItem* newValidTakePhotoItem = new SimpleMissionItem(_offlineVehicle, false /* flyView */, this);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment