Skip to content

Commit d190d02

Browse files
committed
WIP working camera code from before gps exploded lmao
1 parent 57409a3 commit d190d02

File tree

6 files changed

+207
-17
lines changed

6 files changed

+207
-17
lines changed

src/drive_launcher/launch/drive.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def generate_launch_description() -> LaunchDescription:
3131
]
3232
)
3333
]
34-
)
34+
),
3535
),
3636
#
3737
# and `ebox.launch.py` is the ebox <=> autonomous communication

src/drive_launcher/launch/helpers/navigation_stack.launch.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
from launch.substitutions import (
1111
LaunchConfiguration,
1212
PathJoinSubstitution,
13-
PythonExpression,
1413
)
1514
from launch_ros.actions import Node, SetParameter
1615
from launch_ros.actions.node import ExecuteProcess
@@ -166,8 +165,7 @@ def _slam_toolbox(
166165
"launch",
167166
"drive_launcher",
168167
"slam_toolbox.launch.py",
169-
# 😮‍💨 yet another hack...
170-
PythonExpression(["'use_sim_time:=' + str(", use_sim_time, ")"]),
168+
["use_sim_time:=", use_sim_time],
171169
],
172170
shell=True,
173171
output="screen",

src/drive_launcher/launch/rover.zed.launch.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,7 @@ def generate_launch_description() -> LaunchDescription:
115115

116116
return LaunchDescription(
117117
[
118-
DeclareLaunchArgument(
119-
"use_sim_time",
120-
),
118+
DeclareLaunchArgument("use_sim_time", default_value="False"),
121119
utm_conversion_node,
122120
robot_state_publisher,
123121
robot_localization,

src/zed/launch/zed_official.launch.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ def generate_launch_description() -> LaunchDescription:
1818
[
1919
PathJoinSubstitution(
2020
[
21-
pkg_zed,
21+
get_package_share_directory("zed_wrapper"),
2222
"launch",
23-
"internal.launch.py",
23+
"zed_camera.launch.py",
2424
]
2525
)
2626
]
@@ -32,15 +32,18 @@ def generate_launch_description() -> LaunchDescription:
3232
("namespace", "/sensors/depth_image"),
3333
#
3434
# let other nodes take care of publishing to the tf tree
35-
("publish_map_tf", "false"),
36-
("publish_imu_tf", "false"),
35+
# ("publish_map_tf", "false"),
36+
# ("publish_imu_tf", "false"),
3737
#
3838
# provide the correct path to the Rover URDF (3d model)
39-
("xacro_path", f"{pkg_simulator}/resource/rover.urdf.xacro.xml"),
39+
# ("xacro_path", f"{pkg_simulator}/resource/rover.urdf.xacro.xml"),
4040
#
4141
# configure the wrapper to use our sensors while mapping. this can
4242
# increase accuracy and help in other subtle ways
4343
("enable_gnss", "true"),
44+
#
45+
# use config file with QoS overrides for GPS topic compatibility
46+
("ros_params_override_path", f"{get_package_share_directory('zed_wrapper')}/config/common_stereo.yaml"),
4447
],
4548
)
4649

0 commit comments

Comments
 (0)