Skip to content

Commit

Permalink
added license + renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
Hydran00 committed Jul 8, 2024
1 parent 8cd43bf commit 0fb5545
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 15 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) [year] [fullname]

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@
This repo contains a ROS2 metapackage that estimates the camera pose with respect to the world frame exploiting Aruco Markers. This package implements a [ROS2 Service](https://docs.ros.org/en/humble/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Services/Understanding-ROS2-Services.html) that collects a set of $N$ measurements of the aruco position and orientation and computes the average. Then the resulting camera position and orientation is sent as the service response to the calling node. Each required parameter is loaded from a `.yaml` file.

# Installation
Install dependecies:
- [ROS2](https://docs.ros.org/en/humble/Installation.html)
- OpenCV
```
sudo apt install libopencv-dev -y
```
- ROS CVBridge
```
sudo apt-get install ros-$ROS_DISTRO-cv-bridge
```

The following code will build the `calibration_srv` interface and the c++ package of the program:
```
cd <path/to/your/ros2/workspace>/src
Expand All @@ -16,7 +27,7 @@ Then print your aruco using the 4x4 dictionary. You can use this [website](https
# Run the service server
In a sourced terminal run
```
ros2 launch aruco_camera_pose_estimator aruco_camera_pose_estimator.launch.py
ros2 launch aruco_camera_pose_estimator_cpp aruco_camera_pose_estimator.launch.py
```
In another sourced terminal call the service
```
Expand Down
10 changes: 5 additions & 5 deletions aruco_camera_pose_estimator_cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.8)
project(aruco_camera_pose_estimator)
project(aruco_camera_pose_estimator_cpp)

# Default to C++14
if(NOT CMAKE_CXX_STANDARD)
Expand All @@ -20,11 +20,11 @@ find_package(cv_bridge REQUIRED)
find_package(OpenCV REQUIRED)
find_package(calibration_srv REQUIRED)

add_executable(aruco_camera_pose_estimator
add_executable(aruco_camera_pose_estimator_cpp
src/pose_service.cpp
src/image_processor.cpp
)
ament_target_dependencies(aruco_camera_pose_estimator
ament_target_dependencies(aruco_camera_pose_estimator_cpp
rclcpp
sensor_msgs
geometry_msgs
Expand All @@ -35,12 +35,12 @@ include_directories(
${OpenCV_INCLUDE_DIRS}
include
)
target_link_libraries(aruco_camera_pose_estimator
target_link_libraries(aruco_camera_pose_estimator_cpp
Eigen3::Eigen
${OpenCV_LIBS}
)
install(TARGETS
aruco_camera_pose_estimator
aruco_camera_pose_estimator_cpp
DESTINATION lib/${PROJECT_NAME}
)
install(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ def generate_launch_description():
ld = LaunchDescription()

aruco_calibration_node = Node(
package="aruco_camera_pose_estimator",
executable="aruco_camera_pose_estimator",
package="aruco_camera_pose_estimator_cpp",
executable="aruco_camera_pose_estimator_cpp",
# get parameters from yaml file
parameters=[ParameterFile(get_package_share_directory('aruco_camera_pose_estimator') + "/config/config.yaml"),
ParameterFile(get_package_share_directory('aruco_camera_pose_estimator') + "/config/calibration_params.yaml")
Expand Down
14 changes: 7 additions & 7 deletions aruco_camera_pose_estimator_cpp/package.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>aruco_camera_pose_estimator</name>
<version>0.0.0</version>
<description>TODO: Package description</description>
<name>aruco_camera_pose_estimator_cpp</name>
<version>0.0.1</version>
<description>ROS2 package for estimating the position and orientation of the camera using Aruco
markers</description>
<maintainer email="[email protected]">hydran00</maintainer>
<license>TODO: License declaration</license>
<license>MIT</license>
<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>ament_cmake_python</buildtool_depend>
<exec_depend>calibration_srv</exec_depend>
<depend>tf2_ros</depend>
<depend>cv_bridge</depend>
<depend>calibration_srv</depend>
<depend>rclcpp</depend>
<export>
<build_type>ament_cmake</build_type>
Expand Down

0 comments on commit 0fb5545

Please sign in to comment.