diff --git a/realsense2_camera/CMakeLists.txt b/realsense2_camera/CMakeLists.txt index fd616fba7..e03e4d112 100644 --- a/realsense2_camera/CMakeLists.txt +++ b/realsense2_camera/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.3) -project(realsense2_camera) +project(realsense2_camera_alternate_1) add_compile_options(-std=c++11) option(BUILD_WITH_OPENMP "Use OpenMP" OFF) @@ -38,6 +38,8 @@ if(NOT realsense2_FOUND) message(FATAL_ERROR "\n\n Intel RealSense SDK 2.0 is missing, please install it from https://github.com/IntelRealSense/librealsense/releases\n\n") endif() +find_package(Threads) + if (CMAKE_BUILD_TYPE EQUAL "RELEASE") message(STATUS "Create Release Build.") set(CMAKE_CXX_FLAGS "-O2 ${CMAKE_CXX_FLAGS}") diff --git a/realsense2_camera/include/realsense_node_factory.h b/realsense2_camera/include/realsense_node_factory.h index 63397c1f9..b5283ca14 100644 --- a/realsense2_camera/include/realsense_node_factory.h +++ b/realsense2_camera/include/realsense_node_factory.h @@ -17,11 +17,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/realsense2_camera/launch/demo_pointcloud.launch b/realsense2_camera/launch/demo_pointcloud.launch index 8779d7c8f..00ca07cc5 100644 --- a/realsense2_camera/launch/demo_pointcloud.launch +++ b/realsense2_camera/launch/demo_pointcloud.launch @@ -4,7 +4,7 @@ - + @@ -24,6 +24,6 @@ - + diff --git a/realsense2_camera/launch/includes/nodelet.launch.xml b/realsense2_camera/launch/includes/nodelet.launch.xml index d63a32318..4ba444ebf 100644 --- a/realsense2_camera/launch/includes/nodelet.launch.xml +++ b/realsense2_camera/launch/includes/nodelet.launch.xml @@ -75,7 +75,7 @@ - + diff --git a/realsense2_camera/launch/opensource_tracking.launch b/realsense2_camera/launch/opensource_tracking.launch index 44ef4be5d..30447f0c6 100644 --- a/realsense2_camera/launch/opensource_tracking.launch +++ b/realsense2_camera/launch/opensource_tracking.launch @@ -1,7 +1,7 @@ + file="$(find realsense2_camera_alternate_1)/launch/rs_camera.launch"> diff --git a/realsense2_camera/launch/rs_aligned_depth.launch b/realsense2_camera/launch/rs_aligned_depth.launch index 2b931c050..902652f87 100644 --- a/realsense2_camera/launch/rs_aligned_depth.launch +++ b/realsense2_camera/launch/rs_aligned_depth.launch @@ -40,7 +40,7 @@ - + diff --git a/realsense2_camera/launch/rs_camera.launch b/realsense2_camera/launch/rs_camera.launch index ff735b2ca..39014c541 100644 --- a/realsense2_camera/launch/rs_camera.launch +++ b/realsense2_camera/launch/rs_camera.launch @@ -47,7 +47,7 @@ - + diff --git a/realsense2_camera/launch/rs_from_file.launch b/realsense2_camera/launch/rs_from_file.launch index d7c7b83ea..f68dc2616 100644 --- a/realsense2_camera/launch/rs_from_file.launch +++ b/realsense2_camera/launch/rs_from_file.launch @@ -41,7 +41,7 @@ - + diff --git a/realsense2_camera/launch/rs_multiple_devices.launch b/realsense2_camera/launch/rs_multiple_devices.launch index 12174ad2a..2028038dd 100644 --- a/realsense2_camera/launch/rs_multiple_devices.launch +++ b/realsense2_camera/launch/rs_multiple_devices.launch @@ -8,7 +8,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/realsense2_camera/launch/rs_rgbd.launch b/realsense2_camera/launch/rs_rgbd.launch index 394e0dece..cba0f8ff2 100644 --- a/realsense2_camera/launch/rs_rgbd.launch +++ b/realsense2_camera/launch/rs_rgbd.launch @@ -19,7 +19,7 @@ A launch file, derived from rgbd_launch and customized for Realsense ROS driver, to publish XYZRGB point cloud like an OpenNI camera. To launch Realsense with software registeration (ROS Image Pipeline and rgbd_launch): - $ roslaunch realsense2_camera rs_rgbd.launch + $ roslaunch realsense2_camera_alternate_1 rs_rgbd.launch Processing enabled by ROS driver: # depth rectification Processing enabled by this node: @@ -28,7 +28,7 @@ Processing enabled by this node: # pointcloud_xyzrgb generation To launch Realsense with hardware registeration (ROS Realsense depth alignment): - $ roslaunch realsense2_camera rs_rgbd.launch align_depth:=true + $ roslaunch realsense2_camera_alternate_1 rs_rgbd.launch align_depth:=true Processing enabled by ROS driver: # depth rectification # depth registration @@ -111,7 +111,7 @@ Processing enabled by this node: - + diff --git a/realsense2_camera/launch/view_d415_model.launch b/realsense2_camera/launch/view_d415_model.launch index 12fd3aebb..829a8bc41 100644 --- a/realsense2_camera/launch/view_d415_model.launch +++ b/realsense2_camera/launch/view_d415_model.launch @@ -1,8 +1,8 @@ - + - + diff --git a/realsense2_camera/launch/view_d435_model.launch b/realsense2_camera/launch/view_d435_model.launch index 4fe9cb094..a7c41226b 100644 --- a/realsense2_camera/launch/view_d435_model.launch +++ b/realsense2_camera/launch/view_d435_model.launch @@ -1,8 +1,8 @@ - + - + diff --git a/realsense2_camera/launch/view_r410_model.launch b/realsense2_camera/launch/view_r410_model.launch index 88e0b5138..1c1338e27 100644 --- a/realsense2_camera/launch/view_r410_model.launch +++ b/realsense2_camera/launch/view_r410_model.launch @@ -1,8 +1,8 @@ - + - + diff --git a/realsense2_camera/launch/view_r430_model.launch b/realsense2_camera/launch/view_r430_model.launch index e21217bbe..ea36b3a54 100644 --- a/realsense2_camera/launch/view_r430_model.launch +++ b/realsense2_camera/launch/view_r430_model.launch @@ -1,8 +1,8 @@ - + - + diff --git a/realsense2_camera/nodelet_plugins.xml b/realsense2_camera/nodelet_plugins.xml index 838d23a53..269d84442 100644 --- a/realsense2_camera/nodelet_plugins.xml +++ b/realsense2_camera/nodelet_plugins.xml @@ -1,5 +1,5 @@ - - + + Example camera nodelet using the Intel RealSense SDK 2.0 library for Intel RealSense SR300 and D400 cameras diff --git a/realsense2_camera/package.xml b/realsense2_camera/package.xml index 7bd6a0d58..5056c585e 100644 --- a/realsense2_camera/package.xml +++ b/realsense2_camera/package.xml @@ -1,6 +1,6 @@ - realsense2_camera + realsense2_camera_alternate_1 2.1.1 RealSense Camera package allowing access to Intel 3D D400 cameras Sergey Dorodnicov diff --git a/realsense2_camera/scripts/rs2_test.py b/realsense2_camera/scripts/rs2_test.py index 1e81c79da..d91ba59d1 100644 --- a/realsense2_camera/scripts/rs2_test.py +++ b/realsense2_camera/scripts/rs2_test.py @@ -171,7 +171,7 @@ def run_tests(tests): themes = [test_types[test['type']]['listener_theme'] for test in rec_tests] msg_retriever = CWaitForMessage(msg_params) print 'Starting ROS' - p_wrapper = subprocess.Popen(['roslaunch', 'realsense2_camera', 'rs_from_file.launch'] + params_str.split(' '), stdout=None, stderr=None) + p_wrapper = subprocess.Popen(['roslaunch', 'realsense2_camera_alternate_1', 'rs_from_file.launch'] + params_str.split(' '), stdout=None, stderr=None) listener_res = msg_retriever.wait_for_messages(themes) print 'Killing ROS' p_wrapper.terminate() diff --git a/realsense2_camera/urdf/_d415.urdf.xacro b/realsense2_camera/urdf/_d415.urdf.xacro index 759309c73..c5e5519fe 100644 --- a/realsense2_camera/urdf/_d415.urdf.xacro +++ b/realsense2_camera/urdf/_d415.urdf.xacro @@ -56,7 +56,7 @@ aluminum peripherial evaluation case. - + diff --git a/realsense2_camera/urdf/_d435.urdf.xacro b/realsense2_camera/urdf/_d435.urdf.xacro index 34b79ef21..c285113fa 100644 --- a/realsense2_camera/urdf/_d435.urdf.xacro +++ b/realsense2_camera/urdf/_d435.urdf.xacro @@ -56,8 +56,8 @@ aluminum peripherial evaluation case. - - + + diff --git a/realsense2_camera/urdf/_r410.urdf.xacro b/realsense2_camera/urdf/_r410.urdf.xacro index 9670fa47f..862b53d8e 100644 --- a/realsense2_camera/urdf/_r410.urdf.xacro +++ b/realsense2_camera/urdf/_r410.urdf.xacro @@ -48,7 +48,7 @@ aluminum peripherial evalution case. - + diff --git a/realsense2_camera/urdf/_r430.urdf.xacro b/realsense2_camera/urdf/_r430.urdf.xacro index 5733b4f0c..e05cdbbc3 100644 --- a/realsense2_camera/urdf/_r430.urdf.xacro +++ b/realsense2_camera/urdf/_r430.urdf.xacro @@ -49,7 +49,7 @@ aluminum peripherial evaluation case. - + diff --git a/realsense2_camera/urdf/test_d415_camera.urdf.xacro b/realsense2_camera/urdf/test_d415_camera.urdf.xacro index 835b73312..c374df501 100644 --- a/realsense2_camera/urdf/test_d415_camera.urdf.xacro +++ b/realsense2_camera/urdf/test_d415_camera.urdf.xacro @@ -1,6 +1,6 @@ - + diff --git a/realsense2_camera/urdf/test_d435_camera.urdf.xacro b/realsense2_camera/urdf/test_d435_camera.urdf.xacro index c5b2e1e6d..797a8b9b5 100644 --- a/realsense2_camera/urdf/test_d435_camera.urdf.xacro +++ b/realsense2_camera/urdf/test_d435_camera.urdf.xacro @@ -1,6 +1,6 @@ - + diff --git a/realsense2_camera/urdf/test_r410_camera.urdf.xacro b/realsense2_camera/urdf/test_r410_camera.urdf.xacro index cb273aede..18a032443 100644 --- a/realsense2_camera/urdf/test_r410_camera.urdf.xacro +++ b/realsense2_camera/urdf/test_r410_camera.urdf.xacro @@ -1,6 +1,6 @@ - + diff --git a/realsense2_camera/urdf/test_r430_camera.urdf.xacro b/realsense2_camera/urdf/test_r430_camera.urdf.xacro index d88c443e7..ce135541b 100644 --- a/realsense2_camera/urdf/test_r430_camera.urdf.xacro +++ b/realsense2_camera/urdf/test_r430_camera.urdf.xacro @@ -1,6 +1,6 @@ - +