Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add realsense packages as rosdep dependencies, rename urc_aruco #138

Merged
merged 3 commits into from
Oct 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion documents/installation/camera_setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ For now, we are using an Intel RealSense D435 as our depth camera.
### Installation Steps
(from https://github.com/IntelRealSense/realsense-ros):
1. [Download Intel RealSense SDK](https://github.com/IntelRealSense/librealsense/blob/master/doc/distribution_linux.md#installing-the-packages)
2. Install ROS2 wrapper with `sudo apt install ros-humble-realsense2-*`
2. Install ROS2 wrapper with `sudo apt install ros-humble-realsense2-*` if not already installed.

### Usage
- Launch the launch node: `ros2 launch realsense2_camera rs_launch.py`
Expand Down
93 changes: 0 additions & 93 deletions urc_aruco/CMakeLists.txt

This file was deleted.

32 changes: 0 additions & 32 deletions urc_aruco/package.xml

This file was deleted.

72 changes: 65 additions & 7 deletions urc_perception/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,89 @@ include(../cmake/default_settings.cmake)

# find dependencies
find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)
find_package(rclcpp_components REQUIRED)
find_package(urc_msgs REQUIRED)
find_package(std_msgs REQUIRED)
find_package(sensor_msgs REQUIRED)
find_package(diagnostic_updater REQUIRED)
find_package(OpenCV 4 REQUIRED)
find_package(cv_bridge REQUIRED)
find_package(image_transport REQUIRED)
find_package(tf2 REQUIRED)
find_package(tf2_geometry_msgs REQUIRED)

install(
PROGRAMS
multiclass_segmentation/multiclass_segmentation.py
DESTINATION lib/${PROJECT_NAME}
include_directories(
include
)

# Library creation
add_library(${PROJECT_NAME} SHARED
src/aruco_detector.cpp
src/aruco_location.cpp
)

set(dependencies
rclcpp
rclcpp_components
urc_msgs
std_msgs
sensor_msgs
diagnostic_updater
cv_bridge
image_transport
OpenCV
tf2
tf2_geometry_msgs
)

ament_target_dependencies(${PROJECT_NAME}
${dependencies}
)

# Node registration
rclcpp_components_register_node(
${PROJECT_NAME}
PLUGIN "aruco_detector::ArucoDetector"
EXECUTABLE ${PROJECT_NAME}_ArucoDetector
)

rclcpp_components_register_node(
${PROJECT_NAME}
PLUGIN "aruco_location::ArucoLocation"
EXECUTABLE ${PROJECT_NAME}_ArucoLocation
)

# Install launch files.
install(
DIRECTORY
launch
multiclass_segmentation
config
DESTINATION share/${PROJECT_NAME}/
)

# Install library
install(TARGETS
${PROJECT_NAME}
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION lib/${PROJECT_NAME}
)

if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
# the following line skips the copyright linker
set(ament_cmake_copyright_FOUND TRUE)
# the following line skips cpplint (only works in a git repo)
set(ament_cmake_cpplint_FOUND TRUE)

ament_lint_auto_find_test_dependencies()
endif()

ament_package()
ament_export_include_directories(msg)

ament_export_include_directories(include)

ament_export_libraries(${PROJECT_NAME})
ament_export_dependencies(${dependencies})

ament_package()
2 changes: 1 addition & 1 deletion urc_aruco/README.md → urc_perception/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# URC Aruco
# URC Perception

This package is a collection of nodes focused on detecting and mapping ARUCO tags.

Expand Down
22 changes: 0 additions & 22 deletions urc_perception/launch/multiclass_segmentation.launch.py

This file was deleted.

5 changes: 0 additions & 5 deletions urc_perception/multiclass_segmentation/.gitignore

This file was deleted.

88 changes: 0 additions & 88 deletions urc_perception/multiclass_segmentation/README.md

This file was deleted.

Empty file.

This file was deleted.

Loading
Loading