Skip to content

Commit

Permalink
Merge branch 'support_d455' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
doronhi committed Aug 6, 2020
2 parents 429b131 + ed8145d commit 5ff6cd9
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ROS Wrapper for Intel® RealSense™ Devices
These are packages for using Intel RealSense cameras (D400 series SR300 camera and T265 Tracking Module) with ROS.

LibRealSense supported version: v2.36.0 (see [realsense2_camera release notes](https://github.com/IntelRealSense/realsense-ros/releases))
LibRealSense supported version: v2.37.0 (see [realsense2_camera release notes](https://github.com/IntelRealSense/realsense-ros/releases))

## Installation Instructions

Expand Down Expand Up @@ -42,7 +42,7 @@ The following instructions are written for ROS Kinetic, on **Ubuntu 16.04** but
- #### Install from [Debian Package](https://github.com/IntelRealSense/librealsense/blob/master/doc/distribution_linux.md#installing-the-packages) - In that case treat yourself as a developer. Make sure you follow the instructions to also install librealsense2-dev and librealsense-dkms packages.
#### OR
- #### Build from sources by downloading the latest [Intel® RealSense™ SDK 2.0](https://github.com/IntelRealSense/librealsense/releases/tag/v2.36.0) and follow the instructions under [Linux Installation](https://github.com/IntelRealSense/librealsense/blob/master/doc/installation.md)
- #### Build from sources by downloading the latest [Intel® RealSense™ SDK 2.0](https://github.com/IntelRealSense/librealsense/releases/tag/v2.37.0) and follow the instructions under [Linux Installation](https://github.com/IntelRealSense/librealsense/blob/master/doc/installation.md)
### Step 2: Install Intel® RealSense™ ROS from Sources
Expand Down
7 changes: 7 additions & 0 deletions realsense2_camera/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
Changelog for package realsense2_camera
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Forthcoming
-----------
* Add PID to support D455.
* Improve instability of dynamic reconfigurable options.
* rs_camera.lauch: add "enable_infra" for L515 support.
* Contributors: doronhi

2.2.15 (2020-07-13)
-------------------
* Check runtime version of librealsense2 vs. compiled version and issue a warning is mismatch occurs.
Expand Down
2 changes: 1 addition & 1 deletion realsense2_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if(SET_USER_BREAK_AT_STARTUP)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBPDEBUG")
endif()

find_package(realsense2 2.36.0)
find_package(realsense2 2.37.0)
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()
Expand Down
2 changes: 1 addition & 1 deletion realsense2_camera/include/constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#define REALSENSE_ROS_MAJOR_VERSION 2
#define REALSENSE_ROS_MINOR_VERSION 2
#define REALSENSE_ROS_PATCH_VERSION 15
#define REALSENSE_ROS_PATCH_VERSION 16

#define STRINGIFY(arg) #arg
#define VAR_ARG_STRING(arg) STRINGIFY(arg)
Expand Down
3 changes: 3 additions & 0 deletions realsense2_description/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
Changelog for package realsense2_description
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Forthcoming
-----------

2.2.15 (2020-07-13)
-------------------
* Merge remote-tracking branch 'origin/development' into development
Expand Down

0 comments on commit 5ff6cd9

Please sign in to comment.