Skip to content

Commit 317da31

Browse files
fix launch file
1 parent 0c1f8e9 commit 317da31

File tree

3 files changed

+16
-26
lines changed

3 files changed

+16
-26
lines changed

urc_bringup/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ set(dependencies
2424
rclcpp_components
2525
std_msgs
2626
rosbridge_server
27-
ublox_dgnss
2827
)
2928

3029
ament_target_dependencies(${PROJECT_NAME}

urc_bringup/launch/bringup.launch.py

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
from xacro import process_file
33
import yaml
44
from launch import LaunchDescription
5-
from launch.actions import IncludeLaunchDescription
5+
from launch.actions import GroupAction, IncludeLaunchDescription
66
from launch.substitutions import LaunchConfiguration
77
from launch.launch_description_sources import PythonLaunchDescriptionSource
8-
from launch_ros.actions import Node
8+
from launch_ros.actions import Node, SetRemap
99
from launch_ros.substitutions import FindPackageShare
1010
from ament_index_python.packages import get_package_share_directory
1111
from launch_xml.launch_description_sources import XMLLaunchDescriptionSource
@@ -24,9 +24,7 @@ def load_yaml(package_name, file_path):
2424

2525
def generate_launch_description():
2626
pkg_urc_bringup = get_package_share_directory("urc_bringup")
27-
pkg_nmea_navsat_driver = FindPackageShare("nmea_navsat_driver").find(
28-
"nmea_navsat_driver"
29-
)
27+
pkg_ublox_dgnss = get_package_share_directory("ublox_dgnss")
3028
pkg_urc_platform = get_package_share_directory("urc_platform")
3129

3230
pkg_vectornav = get_package_share_directory("vectornav")
@@ -45,12 +43,6 @@ def generate_launch_description():
4543
xacro_file, mappings={"use_simulation": "false"}
4644
)
4745
robot_desc = robot_description_config.toxml()
48-
# gps_config = os.path.join(
49-
# get_package_share_directory("urc_bringup"), "config", "nmea_serial_driver.yaml"
50-
# )
51-
gps_config = os.path.join(
52-
get_package_share_directory("urc_localization"), "config", "rover_gps.yaml"
53-
)
5446

5547
control_node = Node(
5648
package="controller_manager",
@@ -93,18 +85,18 @@ def generate_launch_description():
9385
name="twist_mux",
9486
)
9587

96-
# launch_gps = Node(
97-
# package="nmea_navsat_driver",
98-
# executable="nmea_serial_driver",
99-
# output="screen",
100-
# parameters=[gps_config],
101-
# )
102-
launch_gps = Node(
103-
package="ublox_gps",
104-
executable="ublox_gps_node",
105-
name="ublox_gps_node_rover",
106-
output="screen",
107-
parameters=[gps_config, {"device": "/dev/ttyACM0"}], # DEBUG
88+
launch_gps = GroupAction(
89+
actions=[
90+
SetRemap(src="/rover/fix", dst="/gps/data"),
91+
IncludeLaunchDescription(
92+
PythonLaunchDescriptionSource(
93+
os.path.join(
94+
pkg_ublox_dgnss, "launch", "ublox_fb+r_rover.launch.py"
95+
)
96+
),
97+
launch_arguments={"device_serial_string": "rover"}.items(),
98+
),
99+
]
108100
)
109101

110102
launch_vectornav = IncludeLaunchDescription(
@@ -154,6 +146,6 @@ def generate_launch_description():
154146
launch_gps,
155147
rosbridge_server_node,
156148
odom_frame_node,
157-
# launch_vectornav,
149+
launch_vectornav,
158150
]
159151
)

urc_bringup/package.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<depend>rclcpp</depend>
1313
<depend>std_msgs</depend>
1414
<depend>rosbridge_server</depend>
15-
<depend>nmea_navsat_driver</depend>
1615

1716
<test_depend>ament_lint_auto</test_depend>
1817
<test_depend>ament_lint_common</test_depend>

0 commit comments

Comments
 (0)