Skip to content

Commit 23755b9

Browse files
committed
add new params and support usb_cam instead of v4l2_camera
1 parent 16060df commit 23755b9

File tree

4 files changed

+65
-18
lines changed

4 files changed

+65
-18
lines changed

yolox_ros_cpp/yolox_ros_cpp/launch/yolox_onnxruntime.launch.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,16 @@ def generate_launch_description():
105105
default_value='/yolox/bounding_boxes',
106106
description='topic name for publishing bounding box message.'
107107
),
108+
DeclareLaunchArgument(
109+
'use_bbox_ex_msgs',
110+
default_value='false',
111+
description='use BoundingBoxArray message type.'
112+
),
113+
DeclareLaunchArgument(
114+
'publish_resized_image',
115+
default_value='false',
116+
description='use BoundingBoxArray message type.'
117+
),
108118
]
109119
container = ComposableNodeContainer(
110120
name='yolox_container',
@@ -113,12 +123,12 @@ def generate_launch_description():
113123
executable='component_container',
114124
composable_node_descriptions=[
115125
ComposableNode(
116-
package='v4l2_camera',
117-
plugin='v4l2_camera::V4L2Camera',
118-
name='v4l2_camera',
126+
package='usb_cam',
127+
plugin='usb_cam::UsbCamNode',
128+
name='usb_cam_node',
119129
parameters=[{
120130
'video_device': LaunchConfiguration('video_device'),
121-
'image_size': [640, 480]
131+
'brightness': 100
122132
}]),
123133
ComposableNode(
124134
package='yolox_ros_cpp',
@@ -142,6 +152,8 @@ def generate_launch_description():
142152
'src_image_topic_name': LaunchConfiguration('src_image_topic_name'),
143153
'publish_image_topic_name': LaunchConfiguration('publish_image_topic_name'),
144154
'publish_boundingbox_topic_name': LaunchConfiguration('publish_boundingbox_topic_name'),
155+
'publish_resized_image': LaunchConfiguration('publish_resized_image'),
156+
'use_bbox_ex_msgs': LaunchConfiguration('use_bbox_ex_msgs'),
145157
}],
146158
),
147159
],

yolox_ros_cpp/yolox_ros_cpp/launch/yolox_openvino.launch.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,16 @@ def generate_launch_description():
7171
default_value='/yolox/bounding_boxes',
7272
description='topic name for publishing bounding box message.'
7373
),
74+
DeclareLaunchArgument(
75+
'use_bbox_ex_msgs',
76+
default_value='false',
77+
description='use BoundingBoxArray message type.'
78+
),
79+
DeclareLaunchArgument(
80+
'publish_resized_image',
81+
default_value='false',
82+
description='use BoundingBoxArray message type.'
83+
),
7484
]
7585
container = ComposableNodeContainer(
7686
name='yolox_container',
@@ -79,12 +89,12 @@ def generate_launch_description():
7989
executable='component_container',
8090
composable_node_descriptions=[
8191
ComposableNode(
82-
package='v4l2_camera',
83-
plugin='v4l2_camera::V4L2Camera',
84-
name='v4l2_camera',
92+
package='usb_cam',
93+
plugin='usb_cam::UsbCamNode',
94+
name='usb_cam_node',
8595
parameters=[{
8696
'video_device': LaunchConfiguration('video_device'),
87-
'image_size': [640, 480]
97+
'brightness': 100
8898
}]),
8999
ComposableNode(
90100
package='yolox_ros_cpp',
@@ -104,6 +114,8 @@ def generate_launch_description():
104114
'src_image_topic_name': LaunchConfiguration('src_image_topic_name'),
105115
'publish_image_topic_name': LaunchConfiguration('publish_image_topic_name'),
106116
'publish_boundingbox_topic_name': LaunchConfiguration('publish_boundingbox_topic_name'),
117+
'publish_resized_image': LaunchConfiguration('publish_resized_image'),
118+
'use_bbox_ex_msgs': LaunchConfiguration('use_bbox_ex_msgs'),
107119
}],
108120
),
109121
],

yolox_ros_cpp/yolox_ros_cpp/launch/yolox_tensorrt.launch.py

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ def generate_launch_description():
7272
default_value='/yolox/bounding_boxes',
7373
description='topic name for publishing bounding box message.'
7474
),
75+
DeclareLaunchArgument(
76+
'use_bbox_ex_msgs',
77+
default_value='false',
78+
description='use BoundingBoxArray message type.'
79+
),
80+
DeclareLaunchArgument(
81+
'publish_resized_image',
82+
default_value='false',
83+
description='use BoundingBoxArray message type.'
84+
),
7585
]
7686
container = ComposableNodeContainer(
7787
name='yolox_container',
@@ -80,14 +90,13 @@ def generate_launch_description():
8090
executable='component_container',
8191
composable_node_descriptions=[
8292
ComposableNode(
83-
package='v4l2_camera',
84-
plugin='v4l2_camera::V4L2Camera',
85-
name='v4l2_camera',
93+
package='usb_cam',
94+
plugin='usb_cam::UsbCamNode',
95+
name='usb_cam_node',
8696
parameters=[{
8797
'video_device': LaunchConfiguration('video_device'),
88-
'image_size': [640, 480]
89-
}]
90-
),
98+
'brightness': 100
99+
}]),
91100
ComposableNode(
92101
package='yolox_ros_cpp',
93102
plugin='yolox_ros_cpp::YoloXNode',
@@ -106,6 +115,8 @@ def generate_launch_description():
106115
'src_image_topic_name': LaunchConfiguration('src_image_topic_name'),
107116
'publish_image_topic_name': LaunchConfiguration('publish_image_topic_name'),
108117
'publish_boundingbox_topic_name': LaunchConfiguration('publish_boundingbox_topic_name'),
118+
'publish_resized_image': LaunchConfiguration('publish_resized_image'),
119+
'use_bbox_ex_msgs': LaunchConfiguration('use_bbox_ex_msgs'),
109120
}],
110121
),
111122
],

yolox_ros_cpp/yolox_ros_cpp/launch/yolox_tflite.launch.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,16 @@ def generate_launch_description():
7777
default_value='/yolox/bounding_boxes',
7878
description='topic name for publishing bounding box message.'
7979
),
80+
DeclareLaunchArgument(
81+
'use_bbox_ex_msgs',
82+
default_value='false',
83+
description='use BoundingBoxArray message type.'
84+
),
85+
DeclareLaunchArgument(
86+
'publish_resized_image',
87+
default_value='false',
88+
description='use BoundingBoxArray message type.'
89+
),
8090
]
8191
container = ComposableNodeContainer(
8292
name='yolox_container',
@@ -85,12 +95,12 @@ def generate_launch_description():
8595
executable='component_container',
8696
composable_node_descriptions=[
8797
ComposableNode(
88-
package='v4l2_camera',
89-
plugin='v4l2_camera::V4L2Camera',
90-
name='v4l2_camera',
98+
package='usb_cam',
99+
plugin='usb_cam::UsbCamNode',
100+
name='usb_cam_node',
91101
parameters=[{
92102
'video_device': LaunchConfiguration('video_device'),
93-
'image_size': [640, 480]
103+
'brightness': 100
94104
}]),
95105
ComposableNode(
96106
package='yolox_ros_cpp',
@@ -111,6 +121,8 @@ def generate_launch_description():
111121
'src_image_topic_name': LaunchConfiguration('src_image_topic_name'),
112122
'publish_image_topic_name': LaunchConfiguration('publish_image_topic_name'),
113123
'publish_boundingbox_topic_name': LaunchConfiguration('publish_boundingbox_topic_name'),
124+
'publish_resized_image': LaunchConfiguration('publish_resized_image'),
125+
'use_bbox_ex_msgs': LaunchConfiguration('use_bbox_ex_msgs'),
114126
}],
115127
),
116128
],

0 commit comments

Comments
 (0)