move common code to check connection to client, enable show all files…

… in projects
rmouli · Jul 4, 2017 · f3371e1 · f3371e1
1 parent 6aa2a1f
commit f3371e1
Show file tree

Hide file tree

Showing 12 changed files with 154 additions and 123 deletions.
diff --git a/AirLib/AirLib.vcxproj b/AirLib/AirLib.vcxproj
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ShowAllFiles>true</ShowAllFiles>
+  </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>

diff --git a/AirLib/include/rpc/RpcLibClient.hpp b/AirLib/include/rpc/RpcLibClient.hpp
@@ -59,6 +59,8 @@ class RpcLibClient {
     bool isOffboardMode();
     bool isSimulationMode();
     std::string getDebugInfo();
+    void confirmConnection();
+
 
     //request image
     vector<uint8_t> getImageForCamera(int camera_id, VehicleCamera::ImageType type);

diff --git a/AirLib/src/rpc/RpcLibClient.cpp b/AirLib/src/rpc/RpcLibClient.cpp
@@ -218,6 +218,37 @@ std::string RpcLibClient::getDebugInfo()
     return pimpl_->client.call("getDebugInfo").as<std::string>();
 }
 
+void RpcLibClient::confirmConnection()
+{
+    ClockBase* clock = ClockFactory::get();
+
+    // make sure we can talk to the DroneServer
+    //std::cout << "Contacting DroneServer..." << std::flush;
+    //command_context.client.ping();
+    //std::cout << "DroneServer is responding." << std::endl;
+
+    std::cout << "Waiting for connection - " << std::flush;
+    const TTimeDelta pause_time = 1;
+    while (getConnectionState() != RpcLibClient::ConnectionState::Connected)
+    {
+        std::cout << "X" << std::flush;
+        clock->sleep_for(pause_time); 
+    }
+    std::cout << "Connected!" << std::endl;
+
+    std::cout << "Waiting for drone to report a valid GPS location..." << std::flush;
+    auto gps = getGpsLocation();
+    int count = 0;
+    while (gps.latitude == 0 && gps.longitude == 0 && gps.altitude == 0 && count++ < 10)
+    {
+        std::cout << "." << std::flush;
+        clock->sleep_for(pause_time); 
+        gps = getGpsLocation();
+    }
+    std::cout << std::endl;
+    std::cout << "Global position: lat=" << gps.latitude << ", lon=" << gps.longitude << ", alt=" << gps.altitude << std::endl;
+}
+
 //get/set image
 vector<uint8_t> RpcLibClient::getImageForCamera(int camera_id, VehicleCamera::ImageType type)
 {

diff --git a/AirLibUnitTests/AirLibUnitTests.vcxproj b/AirLibUnitTests/AirLibUnitTests.vcxproj
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ShowAllFiles>true</ShowAllFiles>
+  </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>

diff --git a/DroneServer/DroneServer.vcxproj b/DroneServer/DroneServer.vcxproj
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ShowAllFiles>true</ShowAllFiles>
+  </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>

diff --git a/DroneShell/DroneShell.vcxproj b/DroneShell/DroneShell.vcxproj
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ShowAllFiles>true</ShowAllFiles>
+  </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>