Merge pull request IntelRealSense#39 from otcshare/RAR-283-418-423

RAR-283-418-423
furushchev · Apr 25, 2016 · 730c3eb · 730c3eb
2 parents f211ba2 + 7328f10
commit 730c3eb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -5,7 +5,9 @@ Please complete Your Configuration detail below.
 |:---------------- |:---------------------|:---------------------|
 | Operating System | Ubuntu 14.04.4 LTS   | ? ? ?                |
 | Kernel           | 4.4.0-040400-generic | ?-?-?                |
+| Backend          | video4linux          | ?                    |
 | ROS              | indigo               | ?                    |
+| ROS RealSense    | Latest Release       | ?.?.?                |
 | librealsense     | 0.9.1                | ?.?.?                |
 | R200 Firmware    | 1.0.72.06            | ?.?.?.?              |
 
@@ -17,7 +19,9 @@ Please complete Your Configuration detail below.
 |:---------------- |:------------ |
 | Operating System | `grep DISTRIB_DESCRIPTION /etc/*elease*` |
 | Kernel           | `uname -r` |
+| Backend          | `ls /sys/class | grep video4linux` |
 | ROS              | `rosversion -d` |
+| ROS RealSense    | `rosversion realsense_camera` |
 | librealsense     | `cat <path to librealsense>/librealsense/readme.md | grep release-image | awk -F- '{print $3}'` |
 | R200 Firmware    | View the ROS log from running nodelet **OR** `<path to librealsense>/librealsense/bin/cpp-enumerate-devices | grep -i firmware` |
 

diff --git a/camera/README.md b/camera/README.md
@@ -4,6 +4,7 @@
 |:---------------- |:---------------------|
 | Operating System | Ubuntu 14.04.4 LTS   |
 | Kernel           | 4.4.0-040400-generic |
+| Backend          | video4linux          |
 | ROS              | indigo               |
 | librealsense     | 0.9.1                |
 | R200 Firmware    | 1.0.72.06            |

diff --git a/camera/src/realsense_camera_nodelet.cpp b/camera/src/realsense_camera_nodelet.cpp
@@ -443,7 +443,7 @@ namespace realsense_camera
   {
     for (int i = 0; i < RS_OPTION_COUNT; ++i)
     {
-      option_str o = { (rs_option) i };
+      CameraOptions o = { (rs_option) i };
 
       if (rs_device_supports_option(rs_device_, o.opt, &rs_error_))
       {
@@ -452,7 +452,7 @@ namespace realsense_camera
         if (o.min != o.max)
         {
           o.value = rs_get_device_option(rs_device_, o.opt, 0);
-          options.push_back(o);
+          camera_options_.push_back(o);
         }
       }
     }
@@ -552,7 +552,7 @@ namespace realsense_camera
     std::string get_options_result_str;
     std::string opt_name, opt_value;
 
-    for (option_str o: options)
+    for (CameraOptions o: camera_options_)
     {
       opt_name = rs_option_to_string(o.opt);
       std::transform(opt_name.begin(), opt_name.end(), opt_name.begin(), ::tolower);
@@ -603,7 +603,7 @@ namespace realsense_camera
     std::vector<camera_paramsConfig::AbstractParamDescriptionConstPtr> param_desc = params_config.__getParamDescriptions__();
 
     // Iterate through the supported camera options
-    for (option_str o: options)
+    for (CameraOptions o: camera_options_)
     {
       std::string opt_name = rs_option_to_string(o.opt);
       bool found = false;

diff --git a/camera/src/realsense_camera_nodelet.h b/camera/src/realsense_camera_nodelet.h
@@ -165,12 +165,12 @@ class RealsenseNodelet: public nodelet::Nodelet
   std::map<std::string, std::string> config_;
   int stream_step_[STREAM_COUNT];
 
-  struct option_str
+  struct CameraOptions
   {
     rs_option opt;
     double min, max, step, value;
   };
-  std::vector<option_str> options;
+  std::vector<CameraOptions> camera_options_;
   boost::shared_ptr<dynamic_reconfigure::Server<realsense_camera::camera_paramsConfig>> dynamic_reconf_server_;
 
   // Member Functions.