Merge branch 'develop' into add-direct-control-with-group

mavlink · Jul 18, 2019 · 8486bca · 8486bca
2 parents 15701ae + d16fb24
commit 8486bca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/backend/src/plugins/mission/mission_service_impl.h b/src/backend/src/plugins/mission/mission_service_impl.h
@@ -268,6 +268,7 @@ class MissionServiceImpl final : public mavsdk::rpc::mission::MissionService::Se
         mission_item->set_gimbal_pitch_and_yaw(
             rpc_mission_item.gimbal_pitch_deg(), rpc_mission_item.gimbal_yaw_deg());
         mission_item->set_camera_action(translateRPCCameraAction(rpc_mission_item.camera_action()));
+        mission_item->set_camera_photo_interval(rpc_mission_item.camera_photo_interval_s());
         mission_item->set_loiter_time(rpc_mission_item.loiter_time_s());
 
         return mission_item;

diff --git a/src/backend/test/mission_service_impl_test.cpp b/src/backend/test/mission_service_impl_test.cpp
@@ -57,6 +57,7 @@ std::vector<std::shared_ptr<dc::MissionItem>> generateListOfOneItem()
     mission_item->set_fly_through(false);
     mission_item->set_gimbal_pitch_and_yaw(45.2f, 90.3f);
     mission_item->set_camera_action(CameraAction::NONE);
+    mission_item->set_camera_photo_interval(5);
     mission_item->set_loiter_time(3.2f);
 
     mission_items.push_back(mission_item);