Skip to content

Commit

Permalink
rename package to d435_orb_slam_2
Browse files Browse the repository at this point in the history
  • Loading branch information
tim-fan committed Apr 14, 2020
1 parent ded4bc7 commit e9bd314
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
project(d435_orb_slam)
project(d435_orb_slam_2)

## Compile as C++11, supported in ROS Kinetic and newer
# add_compile_options(-std=c++11)
Expand Down Expand Up @@ -100,7 +100,7 @@ find_package(catkin REQUIRED)
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
# INCLUDE_DIRS include
# LIBRARIES d435_orb_slam
# LIBRARIES d435_orb_slam_2
# CATKIN_DEPENDS other_catkin_pkg
# DEPENDS system_lib
)
Expand All @@ -118,7 +118,7 @@ include_directories(

## Declare a C++ library
# add_library(${PROJECT_NAME}
# src/${PROJECT_NAME}/d435_orb_slam.cpp
# src/${PROJECT_NAME}/d435_orb_slam_2.cpp
# )

## Add cmake target dependencies of the library
Expand All @@ -129,7 +129,7 @@ include_directories(
## Declare a C++ executable
## With catkin_make all packages are built within a single CMake context
## The recommended prefix ensures that target names across packages don't collide
# add_executable(${PROJECT_NAME}_node src/d435_orb_slam_node.cpp)
# add_executable(${PROJECT_NAME}_node src/d435_orb_slam_2_node.cpp)

## Rename C++ executable without prefix
## The above recommended prefix causes long target names, the following renames the
Expand Down Expand Up @@ -193,7 +193,7 @@ include_directories(
#############

## Add gtest based cpp test target and link libraries
# catkin_add_gtest(${PROJECT_NAME}-test test/test_d435_orb_slam.cpp)
# catkin_add_gtest(${PROJECT_NAME}-test test/test_d435_orb_slam_2.cpp)
# if(TARGET ${PROJECT_NAME}-test)
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
# endif()
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# d435_orb_slam
# d435_orb_slam_2

ROS package for running [orb_slam_2_ros](https://github.com/appliedAI-Initiative/orb_slam_2_ros) with a [Realsense D435 RGBD camera](https://www.intelrealsense.com/depth-camera-d435/s).

Expand All @@ -11,15 +11,15 @@ Stereo mode is recommended as it seems to perform much better than rgbd mode - f

### Setup:
```{bash}
curl https://raw.githubusercontent.com/tim-fan/d435_orb_slam/master/setup.sh | bash
curl https://raw.githubusercontent.com/tim-fan/d435_orb_slam_2/master/setup.sh | bash
```
This will create a catkin workspace with all dependent packages. See [setup.sh](setup.sh) for details.

### Run:
```
source catkin_ws/devel/setup.bash
roslaunch d435_orb_slam slam_stereo.launch
roslaunch d435_orb_slam_2 slam_stereo.launch
```

Optional arguments allow for logging, playback, map loading and running in localisation only mode.
See `roslaunch d435_orb_slam slam_stereo.launch --ros-args`
See `roslaunch d435_orb_slam_2 slam_stereo.launch --ros-args`
4 changes: 2 additions & 2 deletions launch/slam_rgbd.launch
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
<node pkg="rosbag" type="play" name="bag_play" args="$(arg input_log_file)"/>
</group>

<include file="$(find d435_orb_slam)/launch/orb_slam2_d435_rgbd.launch">
<include file="$(find d435_orb_slam_2)/launch/orb_slam2_d435_rgbd.launch">
<arg name="load_map" value="$(arg load_map)" />
<arg name="map_file" value="$(arg map_file)" />
</include>

<node if="$(arg record_log)" name="logging" pkg="rosbag" type="record" args="-o /tmp/d435_rgbd_log /camera/color/image_raw /camera/aligned_depth_to_color/image_raw /camera/color/camera_info"/>

<node pkg="rviz" type="rviz" name="rviz" args="-d $(find d435_orb_slam)/cfg/slam.rviz" respawn="true"/>
<node pkg="rviz" type="rviz" name="rviz" args="-d $(find d435_orb_slam_2)/cfg/slam.rviz" respawn="true"/>
</launch>
4 changes: 2 additions & 2 deletions launch/slam_stereo.launch
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<node pkg="rosbag" type="play" name="bag_play" args="$(arg input_log_file)"/>
</group>

<include file="$(find d435_orb_slam)/launch/orb_slam2_d435_stereo.launch">
<include file="$(find d435_orb_slam_2)/launch/orb_slam2_d435_stereo.launch">
<arg name="load_map" value="$(arg load_map)" />
<arg name="map_file" value="$(arg map_file)" />
</include>

<node if="$(arg record_log)" name="logging" pkg="rosbag" type="record" args="-o /tmp/d435_stereo_log /camera/infra1/image_rect_raw /camera/infra2/image_rect_raw /camera/infra1/camera_info"/>

<node pkg="rviz" type="rviz" name="rviz" args="-d $(find d435_orb_slam)/cfg/slam.rviz" respawn="true"/>
<node pkg="rviz" type="rviz" name="rviz" args="-d $(find d435_orb_slam_2)/cfg/slam.rviz" respawn="true"/>
</launch>
6 changes: 3 additions & 3 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<package format="2">
<name>d435_orb_slam</name>
<name>d435_orb_slam_2</name>
<version>0.0.0</version>
<description>The d435_orb_slam package</description>
<description>The d435_orb_slam_2 package</description>

<!-- One maintainer tag required, multiple allowed, one person per tag -->
<!-- Example: -->
Expand All @@ -19,7 +19,7 @@
<!-- Url tags are optional, but multiple are allowed, one per tag -->
<!-- Optional attribute type can be: website, bugtracker, or repository -->
<!-- Example: -->
<!-- <url type="website">http://wiki.ros.org/d435_orb_slam</url> -->
<!-- <url type="website">http://wiki.ros.org/d435_orb_slam_2</url> -->


<!-- Author tags are optional, multiple are allowed, one per tag -->
Expand Down

0 comments on commit e9bd314

Please sign in to comment.