Skip to content

Commit

Permalink
Merge pull request #10 from iory/camera-link
Browse files Browse the repository at this point in the history
Add camera_link_frame_id for arguments
  • Loading branch information
felixmaisonneuve authored May 24, 2022
2 parents e65349f + aabdffe commit fb76366
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 6 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ Refer to the [Nodes](#nodes) section to see the published topics using the messa

- **`device`** device IP address (default: `192.168.1.10`)
- **`num_worker_threads`** number of worker threads for the nodelet manager (default: `4`)
- **`camera_link_frame_id`** camera link frame identifier (default: `camera_link`)
- **`color_frame_id`** color camera frame identifier (default: `camera_color_frame`)
- **`depth_frame_id`** depth camera frame identifier (default: `camera_depth_frame`)
- **`color_camera_info_url`** URL of color camera custom calibration file (see [camera_info_manager] documentation for calibration URL details)
Expand All @@ -107,6 +108,7 @@ Refer to the [Nodes](#nodes) section to see the published topics using the messa

- **`device`** device IP address (default: `192.168.1.10`)
- **`num_worker_threads`** number of worker threads for the nodelet manager (default: `4`)
- **`camera_link_frame_id`** camera link frame identifier (default: `camera_link`)
- **`color_frame_id`** color camera frame identifier (default: `camera_color_frame`)
- **`depth_frame_id`** depth camera frame identifier (default: `camera_depth_frame`)
- **`color_camera_info_url`** URL of color camera custom calibration file (see [camera_info_manager] documentation for calibration URL details)
Expand All @@ -118,6 +120,7 @@ Refer to the [Nodes](#nodes) section to see the published topics using the messa

- **`device`** device IP address (default: `192.168.1.10`)
- **`num_worker_threads`** number of worker threads for the nodelet manager (default: `4`)
- **`camera_link_frame_id`** camera link frame identifier (default: `camera_link`)
- **`color_frame_id`** color camera frame identifier (default: `camera_color_frame`)
- **`color_camera_info_url`** URL of color camera custom calibration file (see [camera_info_manager] documentation for calibration URL details)

Expand All @@ -127,6 +130,7 @@ Refer to the [Nodes](#nodes) section to see the published topics using the messa

- **`device`** device IP address (default: `192.168.1.10`)
- **`num_worker_threads`** number of worker threads for the nodelet manager (default: `4`)
- **`camera_link_frame_id`** camera link frame identifier (default: `camera_link`)
- **`depth_frame_id`** depth camera frame identifier (default: `camera_depth_frame`)
- **`depth_camera_info_url`** URL of depth camera custom calibration file (see [camera_info_manager] documentation for calibration URL details)

Expand Down
7 changes: 5 additions & 2 deletions launch/kinova_vision.launch
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
doc="'camera' should uniquely identify the device. All topics are pushed down
into the 'camera' namespace." />

<arg name="camera_link_frame_id" default="camera_link"
doc="Camera link frame identifier." />

<arg name="color_frame_id" default="camera_color_frame"
doc="Color camera frame identifier." />

Expand Down Expand Up @@ -92,12 +95,12 @@
<node pkg="tf2_ros"
type="static_transform_publisher"
name="camera_depth_tf_publisher"
args="-0.0195 -0.005 0 0 0 0 camera_link $(arg depth_frame_id)" />
args="-0.0195 -0.005 0 0 0 0 $(arg camera_link_frame_id) $(arg depth_frame_id)" />

<node pkg="tf2_ros"
type="static_transform_publisher"
name="camera_color_tf_publisher"
args="0 0 0 0 0 0 camera_link $(arg color_frame_id)" />
args="0 0 0 0 0 0 $(arg camera_link_frame_id) $(arg color_frame_id)" />

<!-- Processing modules configuration-->
<arg name="rgb_processing" default="true" />
Expand Down
5 changes: 4 additions & 1 deletion launch/kinova_vision_color_only.launch
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
doc="'camera' should uniquely identify the device. All topics are pushed down
into the 'camera' namespace." />

<arg name="camera_link_frame_id" default="camera_link"
doc="Camera link frame identifier." />

<arg name="color_frame_id" default="camera_color_frame"
doc="Color camera frame identifier." />

Expand Down Expand Up @@ -67,7 +70,7 @@
<node pkg="tf2_ros"
type="static_transform_publisher"
name="camera_color_tf_publisher"
args="0 0 0 0 0 0 camera_link $(arg color_frame_id)" />
args="0 0 0 0 0 0 $(arg camera_link_frame_id) $(arg color_frame_id)" />

<!-- Processing modules configuration-->
<arg name="rgb_processing" default="true" />
Expand Down
5 changes: 4 additions & 1 deletion launch/kinova_vision_depth_only.launch
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
doc="'camera' should uniquely identify the device. All topics are pushed down
into the 'camera' namespace." />

<arg name="camera_link_frame_id" default="camera_link"
doc="Camera link frame identifier." />

<arg name="color_frame_id" default="camera_color_frame"
doc="Color camera frame identifier." />

Expand Down Expand Up @@ -67,7 +70,7 @@
<node pkg="tf2_ros"
type="static_transform_publisher"
name="camera_depth_tf_publisher"
args="-0.0195 -0.005 0 0 0 0 camera_link $(arg depth_frame_id)" />
args="-0.0195 -0.005 0 0 0 0 $(arg camera_link_frame_id) $(arg depth_frame_id)" />

<!-- Processing modules configuration-->
<arg name="rgb_processing" default="false" />
Expand Down
7 changes: 5 additions & 2 deletions launch/kinova_vision_rgbd.launch
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
doc="'camera' should uniquely identify the device. All topics are pushed down
into the 'camera' namespace." />

<arg name="camera_link_frame_id" default="camera_link"
doc="Camera link frame identifier." />

<arg name="color_frame_id" default="camera_color_frame"
doc="Color camera frame identifier." />

Expand Down Expand Up @@ -91,12 +94,12 @@
<node pkg="tf2_ros"
type="static_transform_publisher"
name="camera_depth_tf_publisher"
args="-0.0195 -0.005 0 0 0 0 camera_link $(arg depth_frame_id)" />
args="-0.0195 -0.005 0 0 0 0 $(arg camera_link_frame_id) $(arg depth_frame_id)" />

<node pkg="tf2_ros"
type="static_transform_publisher"
name="camera_color_tf_publisher"
args="0 0 0 0 0 0 camera_link $(arg color_frame_id)" />
args="0 0 0 0 0 0 $(arg camera_link_frame_id) $(arg color_frame_id)" />

<!-- Processing modules configuration-->
<arg name="rgb_processing" default="true" />
Expand Down

0 comments on commit fb76366

Please sign in to comment.