Skip to content

Commit 622f651

Browse files
authored
Merge branch 'main' into dependabot/uv/urllib3-2.7.0
2 parents 9e486f5 + 35a0f32 commit 622f651

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

alliander_robotics/alliander_nav2/src/alliander_nav2/config/slam_params.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# SPDX-FileCopyrightText: Alliander N. V.
22
#
33
# SPDX-License-Identifier: Apache-2.0
4+
#
5+
# Based on: https://github.com/SteveMacenski/slam_toolbox/blob/ros2/config/mapper_params_localization.yaml
46

57
slam_toolbox:
68
ros__parameters:

alliander_robotics/alliander_nav2/src/alliander_nav2/launch/nav2.launch.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def launch_setup(context: LaunchContext) -> list: # noqa: PLR0912, PLR0915
6868
"amcl",
6969
]
7070
)
71-
else:
71+
elif not nav2.slam:
7272
plugins.remove("static_layer")
7373
lifecycle_nodes_names.extend(
7474
[
@@ -124,7 +124,7 @@ def launch_setup(context: LaunchContext) -> list: # noqa: PLR0912, PLR0915
124124
{
125125
"global_frame": f"{namespace_vehicle}/odom",
126126
"robot_base_frame": f"{namespace_vehicle}/base_footprint",
127-
"rolling_window": nav2.gps,
127+
"rolling_window": (nav2.gps or nav2.slam),
128128
"width": 10,
129129
"height": 10,
130130
"plugins": plugins,

alliander_robotics/predefined_configurations.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,8 @@ def config_panther_collision_monitor(self) -> None: # noqa: D102
242242
def config_panther_slam(self) -> None: # noqa: D102
243243
vehicle = Vehicle("panther", (0, 0, 0.2))
244244
vehicle.nav2_config.slam = True
245+
vehicle.nav2_config.navigation = True
246+
vehicle.nav2_config.window_size = 20
245247
lidar = Lidar(
246248
"velodyne",
247249
position=(0.125, 0.185, 0.20),
@@ -251,6 +253,7 @@ def config_panther_slam(self) -> None: # noqa: D102
251253

252254
link(vehicle, lidar)
253255
self.plat_conf.platforms = [vehicle, lidar]
256+
self.sim_conf.world = "walls.sdf"
254257

255258
@register_configuration("panther_lidar_navigation")
256259
def config_panther_lidar_navigation(self) -> None: # noqa: D102

0 commit comments

Comments
 (0)