Skip to content

Commit 50d5b50

Browse files
authored
AMRFM-1347 use ROS2 nodes for new barcode scanners (ros-navigation#240)
* use Nodes for new barcode scanners * simplify launch file
1 parent ffe496e commit 50d5b50

File tree

4 files changed

+13
-86
lines changed

4 files changed

+13
-86
lines changed

amr_bringup/launch/amr_hardware.launch.py

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -171,39 +171,11 @@ def generate_launch_description():
171171
"bash -c 'AzureKinectFirmwareTool -Reset && $0 $@'"
172172
], # TODO: Implement correctly
173173
),
174-
ExecuteProcess(
175-
cmd=[
176-
"python3",
177-
"-m",
178-
"lv.tools.barcode_scanner_amr",
179-
"--cam_id",
180-
"1",
181-
"from_source",
182-
"basler",
183-
"--basler_camera_development_id",
184-
"1",
185-
],
186-
cwd=deep_cv_dir,
187-
output="screen",
188-
name="barcode_scanner_amr_1",
174+
Node(
175+
package="deep_cv",
176+
executable="barcode_scanner_manager",
189177
respawn=True,
190-
),
191-
ExecuteProcess(
192-
cmd=[
193-
"python3",
194-
"-m",
195-
"lv.tools.barcode_scanner_amr",
196-
"--cam_id",
197-
"2",
198-
"from_source",
199-
"basler",
200-
"--basler_camera_development_id",
201-
"2",
202-
],
203-
cwd=deep_cv_dir,
204178
output="screen",
205-
name="barcode_scanner_amr_2",
206-
respawn=True,
207179
),
208180
]
209181
)

amr_bringup/launch/amr_simulation_gazebo.launch.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,11 @@ def generate_launch_description():
156156
),
157157
launch_arguments={"amr_id": LaunchConfiguration("amr_id"),}.items(),
158158
),
159-
IncludeLaunchDescription(
160-
PythonLaunchDescriptionSource(
161-
os.path.join(
162-
amr_bringup_dir, "launch/amr_simulation_utils.launch.py"
163-
),
164-
),
165-
launch_arguments={"amr_id": LaunchConfiguration("amr_id"),}.items(),
159+
Node(
160+
package="deep_cv",
161+
executable="simulated_barcode_scanner_manager",
162+
respawn=True,
163+
output="screen",
166164
),
167165
Node(
168166
package="deep_cv",

amr_bringup/launch/amr_simulation_simple.launch.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,11 @@ def generate_launch_description():
109109
"amr_id": LaunchConfiguration("amr_id"),
110110
}.items(),
111111
),
112-
IncludeLaunchDescription(
113-
PythonLaunchDescriptionSource(
114-
os.path.join(amr_bringup_dir, "launch/amr_simulation_utils.launch.py"),
115-
),
116-
launch_arguments={
117-
"amr_id": LaunchConfiguration("amr_id"),
118-
}.items(),
112+
Node(
113+
package="deep_cv",
114+
executable="simulated_barcode_scanner_manager",
115+
respawn=True,
116+
output="screen",
119117
),
120118
],
121119

amr_bringup/launch/amr_simulation_utils.launch.py

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)