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

Merge pull request #8189 from DonLakeFlyer/TakePhoto 

Fix MAV_CMD_IMAGE_START_CAPTURE usage
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
0903b2e2bf 87dd077f57
commit
ac65f8e41e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 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. 13
      src/MissionManager/CameraSection.cc
  2. 5
      src/MissionManager/CameraSectionTest.cc

13
src/MissionManager/CameraSection.cc
Unescape View File

@ -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++,
MAV_CMD_IMAGE_START_CAPTURE,
MAV_FRAME_MISSION,
0, // Reserved (Set to 0)
0, // Interval (none)
1, // Take 1 photo
qQNaN(), qQNaN(), qQNaN(), qQNaN(), // reserved
true, // autoContinue
false, // isCurrentItem
0, // Reserved (Set to 0)
0, // Interval (none)
1, // Take 1 photo
0, // No sequence number specified
qQNaN(), qQNaN(), qQNaN(), // reserved
true, // autoContinue
false, // isCurrentItem
missionItemParent);
break;
}

5
src/MissionManager/CameraSectionTest.cc
Unescape View File

@ -113,7 +113,8 @@ void CameraSectionTest::init(void) @@ -113,7 +113,8 @@ void CameraSectionTest::init(void)
0, // Reserved (Set to 0)
0, // Interval (none)
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
false), // isCurrentItem
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 #2 Duration between two consecutive pictures (in seconds)
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);

Write Preview
Loading…
Cancel
Save