integrate changes from Blocks to AirLib

delort · Aug 8, 2017 · 3062813 · 3062813
1 parent 50dfd60
commit 3062813
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 7 deletions.
diff --git a/AirLib/AirLib.vcxproj b/AirLib/AirLib.vcxproj
@@ -115,6 +115,7 @@
     <ClInclude Include="include\physics\DebugPhysicsBody.hpp" />
     <ClInclude Include="include\api\ControlServerBase.hpp" />
     <ClInclude Include="include\physics\PhysicsBodyWorld.hpp" />
+    <ClInclude Include="include\physics\PhysicsWorld.hpp" />
     <ClInclude Include="include\safety\CubeGeoFence.hpp" />
     <ClInclude Include="include\controllers\DroneCommon.hpp" />
     <ClInclude Include="include\controllers\DroneControllerBase.hpp" />

diff --git a/AirLib/AirLib.vcxproj.filters b/AirLib/AirLib.vcxproj.filters
@@ -444,6 +444,9 @@
     <ClInclude Include="include\physics\PhysicsBodyWorld.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\physics\PhysicsWorld.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\safety\ObstacleMap.cpp">

diff --git a/AirLibUnitTests/PixhawkTest.hpp b/AirLibUnitTests/PixhawkTest.hpp
@@ -19,9 +19,7 @@ class PixhawkTest : public TestBase {
         testAssert(controller != nullptr, "Couldn't get pixhawk controller");
 
         try {
-            controller->start();
             std::this_thread::sleep_for(std::chrono::milliseconds(10));
-            controller->stop();
         }
         catch (std::domain_error& ex) {
             std::cout << ex.what() << std::endl;

diff --git a/AirLibUnitTests/RosFlightTest.hpp b/AirLibUnitTests/RosFlightTest.hpp
@@ -17,9 +17,7 @@ class RosFlightTest : public TestBase {
         DroneControllerBase* controller = rosFlight->getController();
         testAssert(controller != nullptr, "Couldn't get controller");
 
-        controller->start();
         std::this_thread::sleep_for(std::chrono::milliseconds(10));
-        controller->stop();
     }
 };
 

diff --git a/AirLibUnitTests/SimpleFlightTest.hpp b/AirLibUnitTests/SimpleFlightTest.hpp
@@ -18,9 +18,7 @@ class SimpleFlightTest : public TestBase
         DroneControllerBase* controller = simpleFlight->getController();
         testAssert(controller != nullptr, "Couldn't get controller");
 
-        controller->start();
         std::this_thread::sleep_for(std::chrono::milliseconds(10));
-        controller->stop();
     }
 };
 

diff --git a/DroneServer/main.cpp b/DroneServer/main.cpp
@@ -75,7 +75,6 @@ int main(int argc, const char* argv[])
     MavLinkDroneController mav_drone;
     mav_drone.initialize(connection_info, nullptr, is_simulation);
     mav_drone.reset();
-    mav_drone.start();
 
     DroneControllerCancelable server_wrapper(&mav_drone);
     msr::airlib::RpcLibServer server(&server_wrapper, connection_info.local_host_ip);