Update proto and fix style

mavlink · Feb 1, 2022 · 736f22c · 736f22c
1 parent 408ef24
commit 736f22c
Show file tree

Hide file tree

Showing 16 changed files with 92 additions and 56 deletions.
diff --git a/proto b/proto
diff --git a/src/integration_tests/action_hover_sync.cpp b/src/integration_tests/action_hover_sync.cpp
@@ -59,9 +59,11 @@ void takeoff_and_hover_at_altitude(float altitude_m)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     auto action = std::make_shared<Action>(*system);
 

diff --git a/src/integration_tests/action_transition_multicopter_fixedwing.cpp b/src/integration_tests/action_transition_multicopter_fixedwing.cpp
@@ -36,9 +36,11 @@ TEST_F(SitlTest, ActionTransitionSync_standard_vtol)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     // We need to takeoff first, otherwise we can't actually transition
     float altitude_m = 10.0f;

diff --git a/src/integration_tests/follow_me.cpp b/src/integration_tests/follow_me.cpp
@@ -37,9 +37,11 @@ TEST_F(SitlTest, FollowMeOneLocation)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     Action::Result action_ret = action->arm();
     ASSERT_EQ(Action::Result::Success, action_ret);
@@ -125,9 +127,11 @@ TEST_F(SitlTest, FollowMeMultiLocationWithConfig)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     Action::Result action_ret = action->arm();
     ASSERT_EQ(Action::Result::Success, action_ret);

diff --git a/src/integration_tests/geofence_inclusion.cpp b/src/integration_tests/geofence_inclusion.cpp
@@ -26,9 +26,11 @@ TEST_F(SitlTest, GeofenceInclusion)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     LogInfo() << "System ready, let's start";
 

diff --git a/src/integration_tests/gimbal.cpp b/src/integration_tests/gimbal.cpp
@@ -146,9 +146,11 @@ TEST(SitlTestGimbal, GimbalTakeoffAndMove)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     Action::Result action_result = action->arm();
     EXPECT_EQ(action_result, Action::Result::Success);
@@ -260,9 +262,11 @@ TEST(SitlTestGimbal, GimbalROIOffboard)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     const Telemetry::Position& position = telemetry->position();
 

diff --git a/src/integration_tests/mission.cpp b/src/integration_tests/mission.cpp
@@ -83,9 +83,11 @@ void test_mission(
 {
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     LogInfo() << "System ready";
     LogInfo() << "Creating and uploading mission";

diff --git a/src/integration_tests/mission_change_speed.cpp b/src/integration_tests/mission_change_speed.cpp
@@ -50,9 +50,11 @@ TEST_F(SitlTest, MissionChangeSpeed)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     LogInfo() << "System ready, let's start";
 

diff --git a/src/integration_tests/mission_raw_import_and_fly.cpp b/src/integration_tests/mission_raw_import_and_fly.cpp
@@ -32,9 +32,11 @@ TEST_F(SitlTest, MissionRawImportAndFly)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [&telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry.health_all_ok(); }, std::chrono::seconds(10)));
+        [&telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry.health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     ASSERT_EQ(action.arm(), Action::Result::Success);
 

diff --git a/src/integration_tests/mission_rtl.cpp b/src/integration_tests/mission_rtl.cpp
@@ -74,9 +74,11 @@ void do_mission_with_rtl(float mission_altitude_m, float return_altitude_m)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     LogInfo() << "Setting RTL return altitude to " << return_altitude_m;
     action->set_return_to_launch_altitude(return_altitude_m);

diff --git a/src/integration_tests/mission_set_current.cpp b/src/integration_tests/mission_set_current.cpp
@@ -46,10 +46,12 @@ TEST_F(SitlTest, MissionSetCurrent)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
-
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
+
     LogInfo() << "System ready, let's start";
 
     Mission::MissionPlan mission_plan{};

diff --git a/src/integration_tests/offboard_acceleration.cpp b/src/integration_tests/offboard_acceleration.cpp
@@ -27,9 +27,11 @@ TEST_F(SitlTest, OffboardAccelerationNED)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     Action::Result action_ret = action->arm();
     ASSERT_EQ(Action::Result::Success, action_ret);

diff --git a/src/integration_tests/offboard_position.cpp b/src/integration_tests/offboard_position.cpp
@@ -30,9 +30,11 @@ TEST_F(SitlTest, OffboardPositionNED)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     Action::Result action_ret = action->arm();
     ASSERT_EQ(Action::Result::Success, action_ret);

diff --git a/src/integration_tests/offboard_velocity.cpp b/src/integration_tests/offboard_velocity.cpp
@@ -29,9 +29,11 @@ TEST_F(SitlTest, OffboardVelocityNED)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     Action::Result action_ret = action->arm();
     ASSERT_EQ(Action::Result::Success, action_ret);
@@ -149,9 +151,11 @@ TEST_F(SitlTest, OffboardVelocityBody)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     Action::Result action_ret = action->arm();
     ASSERT_EQ(Action::Result::Success, action_ret);

diff --git a/src/integration_tests/telemetry_gps_origin.cpp b/src/integration_tests/telemetry_gps_origin.cpp
@@ -18,9 +18,11 @@ TEST(SitlTestDisabled, TelemetryGpsOrigin)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [&telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry.health_all_ok(); }, std::chrono::seconds(10)));
+        [&telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry.health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     std::this_thread::sleep_for(std::chrono::seconds(1));
 

diff --git a/src/integration_tests/telemetry_modes.cpp b/src/integration_tests/telemetry_modes.cpp
@@ -29,9 +29,11 @@ TEST(SitlTestDisabled, TelemetryFlightModes)
 
     LogInfo() << "Waiting for system to be ready";
     ASSERT_TRUE(poll_condition_with_timeout(
-        [telemetry]() { 
-            LogInfo() << "Waiting for system to be ready"; 
-            return telemetry->health_all_ok(); }, std::chrono::seconds(10)));
+        [telemetry]() {
+            LogInfo() << "Waiting for system to be ready";
+            return telemetry->health_all_ok();
+        },
+        std::chrono::seconds(10)));
 
     EXPECT_EQ(action->arm(), Action::Result::Success);