Merge remote-tracking branch 'otcshare/indigo-devel' into indigo-next

Merge in the Change log history and Mark's white space last minute fixes. Mark, please do not "fix" white space in releases.
furushchev · Mar 18, 2016 · f8f234d · f8f234d
2 parents 4480a6f + 199e42c
commit f8f234d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/camera/CHANGELOG.rst b/camera/CHANGELOG.rst
@@ -2,6 +2,22 @@
 Changelog for package realsense_camera
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.0.1 (2016-03-17)
+------------------
+* Convert command line args to ROS params
+  This also fixes Issue #9 for publish_tf and enable_tf
+  Updated README to indicate changes in R200_DISPARITY_MULTIPLIER.
+* New Feature to dynamically enable/disable depth stream
+  Note: Enable/disable of depth stream also enables/disables infrared streams.
+* Update camera_info msgs
+  Add identity matrix for rotation
+  Add depth to color translation to projection matrix
+* Add rgbd_launch as run dependency.
+* Add missing Change Log history file
+  This is a required file as part of the ROS (bloom) release process
+  which was missed from our initial release.
+* Contributors: Mark D Horn, Matthew Hansen, Reagan Lopez, Rajvi Jingar
+
 1.0.0 (2016-02-29)
 ------------------
 * Initial Release

diff --git a/camera/cfg/camera_params.cfg b/camera/cfg/camera_params.cfg
@@ -6,7 +6,7 @@ from dynamic_reconfigure.parameter_generator_catkin import *
 
 gen = ParameterGenerator()
 
-#             Name                               Type      Level 	Description                     Default    Min     Max
+#             Name                               Type      Level       Description                     Default    Min     Max
 gen.add("enable_depth",                          bool_t,   0,          "Enable Depth",                 True)
 gen.add("COLOR_BACKLIGHT_COMPENSATION",          int_t,    0,          "Backlight Compensation",       1,         0,      4)
 gen.add("COLOR_BRIGHTNESS",                      int_t,    0,          "Brightness",                   56,        0,      255)

diff --git a/camera/package.xml b/camera/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>realsense_camera</name>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <description>RealSense Camera package allowing access to Intel 3D cameras and advanced modules</description>
 
   <maintainer email="[email protected]">Rajvi Jingar</maintainer>

diff --git a/camera/src/realsense_camera_nodelet.cpp b/camera/src/realsense_camera_nodelet.cpp
@@ -172,7 +172,7 @@ namespace realsense_camera
     uint32_t stream_index = (uint32_t) RS_STREAM_DEPTH;
     if(camera_info_[stream_index] == NULL)
     {
-	prepareStreamCalibData (RS_STREAM_DEPTH);
+      prepareStreamCalibData (RS_STREAM_DEPTH);
     }
   }
 
@@ -194,7 +194,7 @@ namespace realsense_camera
     uint32_t stream_index = (uint32_t) RS_STREAM_INFRARED;
     if(camera_info_[stream_index] == NULL)
     {
-	prepareStreamCalibData (RS_STREAM_INFRARED);
+      prepareStreamCalibData (RS_STREAM_INFRARED);
     }
   }
 
@@ -629,6 +629,7 @@ namespace realsense_camera
         ROS_INFO_STREAM ("RealSense Camera - Device Stopped");
       }
 
+
       //disable depth, infrared1 and infrared2 streams
       rs_disable_stream(rs_device_, RS_STREAM_DEPTH, &rs_error_); checkError ();
       ROS_INFO_STREAM ("RealSense Camera - Depth Stream Disabled");