Skip to content

Commit

Permalink
Merge pull request b-it-bots#292 from NadaAweaa/nada
Browse files Browse the repository at this point in the history
Changed camera arg in launch file and modified the README.md
  • Loading branch information
sthoduka authored May 12, 2023
2 parents c7fab1a + 0bdbb0e commit ae741ca
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
7 changes: 7 additions & 0 deletions mir_perception/mir_barrier_tape_detection/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ Detects black and yellow barrier tape on the floor. The detected barrier tape po
Input: 3D (colour) pointcloud (in camera frame) and RGB image
Output: 3D pointcloud with points corresponding to the yellow sections of the barrier tape, in the desired output frame (assumed to be base link)

### Launching Barrier Tape Dectection

roslaunch mir_barrier_tape_detection barrier_tape_detection.launch


rostopic pub /mir_perception/barrier_tape_detection/event_in std_msgs/String "data: 'e_start'"

### Events:
`e_start`: start detection of barrier tape
`e_stop`: stop detection of barrier tape
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<?xml version="1.0"?>
<launch>

<arg name="camera_name" default="arm_cam3d" />
<arg name="front_camera" default="tower_cam3d_front" />
<arg name="back_camera" default="tower_cam3d_back" />
<arg name="barrier_tape_detection_config_file" default="$(find mir_barrier_tape_detection)/ros/config/barrier_tape_detection.yaml" />

<rosparam file="$(arg barrier_tape_detection_config_file)" command="load"/>

<!-- Barrier tape detection node -->
<group ns="mir_perception/front_camera">
<node pkg="mir_barrier_tape_detection" type="barrier_tape_detection_node" name="barrier_tape_detection" output="screen" respawn="true">
<remap from="~input_rgb_image" to="/$(arg camera_name)/rgb/image_raw"/>
<remap from="~input_pointcloud" to="/$(arg camera_name)/depth_registered/points"/>
<remap from="~camera_info" to="/$(arg camera_name)/rgb/camera_info"/>
<remap from="~input_rgb_image" to="/$(arg front_camera)/rgb/image_raw"/>
<remap from="~input_pointcloud" to="/$(arg front_camera)/depth_registered/points"/>
<remap from="~camera_info" to="/$(arg front_camera)/rgb/camera_info"/>
<param name="loop_rate" type="int" value="30" />
<param name="target_frame" value="map"/>
<remap from="~event_in" to="/mir_perception/barrier_tape_detection/event_in"/>
Expand Down Expand Up @@ -47,9 +48,9 @@
<group ns="mir_perception/back_camera">

<node pkg="mir_barrier_tape_detection" type="barrier_tape_detection_node" name="barrier_tape_detection" output="screen" respawn="true">
<remap from="~input_rgb_image" to="/d435_back/rgb/image_raw"/>
<remap from="~input_pointcloud" to="/d435_back/depth_registered/points"/>
<remap from="~camera_info" to="/d435_back/rgb/camera_info"/>
<remap from="~input_rgb_image" to="/$(arg back_camera)/rgb/image_raw"/>
<remap from="~input_pointcloud" to="/$(arg back_camera)/depth_registered/points"/>
<remap from="~camera_info" to="/$(arg back_camera)/rgb/camera_info"/>
<param name="loop_rate" type="int" value="1" />
<param name="target_frame" value="map"/>
<remap from="~event_in" to="/mir_perception/barrier_tape_detection/event_in"/>
Expand Down

0 comments on commit ae741ca

Please sign in to comment.