Merge pull request #7 from AutoModality/AM-367/user-config

Finding UserConfig.txt in installation dir

Author: Aaron Roller

.gitignore

@@ -11,3 +11,6 @@ debian/ros-melodic-am-osdk-ros*
 debian/ros-melodic-dji-onboard-sdk-ros.debhelper.log
 ros-melodic-dji-onboard-sdk-build-deps_*_all.deb
 build
+catkin_ws
+.vscode
+

include/dji_sdk_obsoleted/dji_linux_environment.hpp

@@ -43,6 +43,11 @@ class DJI_Environment
   ~DJI_Environment();
 
   static std::string findFile(std::string file);
+  /**
+   * @return a string of the path to a file, if found.  Empty otherwise.
+   */
+  static std::string findFileInDir(std::string file, std::string dir);
+
   int                getApp_id() const;
   const std::string& getEnc_key() const;
   const std::string& getDevice() const;

src/dji_sdk_obsoleted/dji_linux_environment.cpp

@@ -52,8 +52,17 @@ DJI_Environment::findFile(std::string file)
     throw std::runtime_error("Error getting current directory");
 
   std::string strCWD(cwd);
-  // configFile = strCWD + "/osdk-core/" + file;
-  configFile = strCWD + "/" + file; // just in the current working directory
+  return findFileInDir(file,strCWD);
+}
+
+
+/**
+ * @return a string of the path to a file, if found.  Empty otherwise.
+ */
+std::string
+DJI_Environment::findFileInDir(std::string file, std::string dir)
+{
+  std::string configFile = dir + "/" + file; 
 
   std::ifstream fStream(configFile.c_str());
 

src/dji_sdk_obsoleted/dji_linux_helpers.cpp

@@ -170,8 +170,15 @@ LinuxSetup::setupEnvironment(int argc, char** argv)
   }
   else
   {
-    config_file_path = DJI_Environment::findFile("UserConfig.txt");
-
+    std::string config_filename = "UserConfig.txt";
+    config_file_path = DJI_Environment::findFile(config_filename);
+
+    //look in installation dir if not found in expected places
+    if(config_file_path.empty()){
+      //FIXME: find a better place to declare this without ros distro (melodic)
+      std::string installationDir = "/opt/ros/melodic/share/dji_sdk/launch";
+      config_file_path = DJI_Environment::findFileInDir(config_filename,installationDir);
+    }
     if (config_file_path.empty())
       throw std::runtime_error("User configuration file not found");
   }