Skip to content
Snippets Groups Projects
Commit 0a8ccdf5 authored by Sergi Hernandez's avatar Sergi Hernandez
Browse files

Changes to enable the use of nodelets.

Added a new launch file with the same node configuration of the firewire_nodelet.launch file but without nodelets.
parent a9729dc0
No related branches found
No related tags found
No related merge requests found
<library path="lib/libfirewire_camera_driver_nodelet"> <library path="lib/libiri_firewire_camera_nodelet">
<class name="iri_firewire_camera/iri_firewire_nodelet" type="FirewireCameraNodelet" base_class_type="nodelet::Nodelet"> <class name="iri_firewire_camera/FirewireCameraNodelet" type="FirewireCameraNodelet" base_class_type="nodelet::Nodelet">
<description> <description>
Nodelete for the iri firewire camera module Nodelete for the iri firewire camera module
</description> </description>
......
...@@ -27,4 +27,12 @@ typedef struct ...@@ -27,4 +27,12 @@ typedef struct
sensor_msgs::CameraInfo CameraInfo_msg_; sensor_msgs::CameraInfo CameraInfo_msg_;
}TROSCamera; }TROSCamera;
typedef struct
{
image_transport::ImageTransport *it;
image_transport::CameraPublisher camera_image_publisher_;
sensor_msgs::ImagePtr Image_msg_;
sensor_msgs::CameraInfoPtr CameraInfo_msg_;
}TROSCameraPtr;
#endif #endif
<launch>
<!-- bumblebee -->
<!-- published topics: /sensors/head_right/image_raw -->
<!-- subscribed topics: -->
<!-- service clients: -->
<!-- service servers: -->
<!-- action clients: -->
<!-- action servers: -->
<node pkg ="iri_firewire_camera"
type="iri_firewire_camera"
name="bumblebee">
<remap from="/bumblebee/camera_image"
to="/sensors/head_right/image_raw"/>
<param name="Camera_node" value="0" />
<param name="frame_id" value="bumblebee_right" type="string" />
<!-- set calibration file -->
<param name="cal_file" value="file://$(find iri_firewire_camera)/calibration/$(env ROBOT)_right_camera.yaml" type="string" />
<param name="ISO_speed" value="400" />
<param name="Framerate" value="7.5" />
<param name="Color_coding" value="3" />
<param name="Image_width" value="1024" />
<param name="Image_height" value="768" />
<param name="~tf_prefix" value="/$(env ROBOT)" type="str"/>
</node>
<!-- published topics: /processed_image -->
<!-- subscribed topics: /sensors/head_right/image_raw -->
<!-- /sensors/head_right/camera_info -->
<!-- service clients: -->
<!-- service servers: -->
<!-- action clients: -->
<!-- action servers: -->
<!-- image crop -->
<node pkg ="nodelet"
type="nodelet"
name="image_proc_dec"
args="standalone image_proc/crop_decimate">
<param name="decimation_x" value="2" />
<param name="decimation_y" value="2" />
<remap from="/camera/image_raw"
to="/sensors/head_right/image_raw"/>
<remap from="/camera/camera_info"
to="/sensors/head_right/camera_info"/>
</node>
<!-- image rectification -->
<node pkg ="image_proc"
type="image_proc"
name="image_proc_rect">
<remap from="/image_raw"
to="/camera_out/image_raw" />
<remap from="/camera_info"
to="/camera_out/camera_info" />
<remap from="/image_rect_color"
to="/processed_image" />
</node>
<node pkg="image_view"
type="image_view"
name="image_view" >
<remap from="/image" to="/processed_image"/>
</node>
</launch>
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<node pkg="nodelet" type="nodelet" name="standalone_nodelet" args="manager" output="screen"> <node pkg="nodelet" type="nodelet" name="standalone_nodelet" args="manager" output="screen">
<param name="Camera_node" value="0" /> <param name="Camera_node" value="0" />
<param name="frame_id" value="bumblebee_frame" type="string" /> <param name="frame_id" value="bumblebee_frame" type="string" />
<param name="cal_file" value="file://$(find iri_firewire_camera)/calibration/bumblebee_right.yml" type="string" /> <param name="cal_file" value="file://$(find iri_firewire_camera)/calibration/$(env ROBOT)_right_camera.yaml" type="string" />
<param name="ISO_speed" value="400" /> <param name="ISO_speed" value="400" />
<param name="Framerate" value="7.5" /> <param name="Framerate" value="7.5" />
<param name="Color_coding" value="3" /> <param name="Color_coding" value="3" />
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</node> </node>
<!-- firewire camera driver --> <!-- firewire camera driver -->
<node pkg="nodelet" type="nodelet" name="iri_firewire_nodelet" args="load iri_firewire_camera/iri_firewire_nodelet standalone_nodelet" output="screen"> <node pkg="nodelet" type="nodelet" name="iri_firewire_nodelet" args="load iri_firewire_camera/FirewireCameraNodelet standalone_nodelet" output="screen">
</node> </node>
<!-- image decimation --> <!-- image decimation -->
......
...@@ -61,5 +61,6 @@ ...@@ -61,5 +61,6 @@
<!-- The export tag contains other, unspecified, tags --> <!-- The export tag contains other, unspecified, tags -->
<export> <export>
<!-- Other tools can request additional information be placed here --> <!-- Other tools can request additional information be placed here -->
<nodelet plugin="${prefix}/firewire_nodelet_plugin.xml" />
</export> </export>
</package> </package>
...@@ -237,5 +237,5 @@ FirewireCameraNodelet::~FirewireCameraNodelet() ...@@ -237,5 +237,5 @@ FirewireCameraNodelet::~FirewireCameraNodelet()
} }
// parameters are: package, class name, class type, base class type // parameters are: package, class name, class type, base class type
PLUGINLIB_DECLARE_CLASS(iri_firewire_camera, iri_firewire_nodelet, FirewireCameraNodelet, nodelet::Nodelet); PLUGINLIB_DECLARE_CLASS(iri_firewire_camera, FirewireCameraNodelet, FirewireCameraNodelet, nodelet::Nodelet);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment