Skip to content

Rename PushRosNamespace to PushROSNamespace #3763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 17, 2023
Merged

Rename PushRosNamespace to PushROSNamespace #3763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a68c971
Merge remote-tracking branch 'upstream/main'
Mar 10, 2023
a5f870c
Merge branch 'ros-planning:main' into main
tonynajjar Mar 22, 2023
1e673c7
Merge branch 'ros-planning:main' into main
tonynajjar Mar 28, 2023
79aff93
Merge remote-tracking branch 'upstream/main'
Jul 28, 2023
0dd0492
Merge branch 'ros-planning:main' into main
tonynajjar Aug 3, 2023
c598634
Merge branch 'ros-planning:main' into main
tonynajjar Aug 17, 2023
5f8281e
Rename PushRosNamespace to PushROSNamespace
Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nav2_bringup/launch/bringup_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from launch.launch_description_sources import PythonLaunchDescriptionSource
from launch.substitutions import LaunchConfiguration, PythonExpression
from launch_ros.actions import Node
from launch_ros.actions import PushRosNamespace
from launch_ros.actions import PushROSNamespace
from launch_ros.descriptions import ParameterFile
from nav2_common.launch import RewrittenYaml

Expand Down Expand Up @@ -113,7 +113,7 @@ def generate_launch_description():

# Specify the actions
bringup_cmd_group = GroupAction([
PushRosNamespace(
PushROSNamespace(
condition=IfCondition(use_namespace),
namespace=namespace),

Expand Down
6 changes: 3 additions & 3 deletions nav2_collision_monitor/launch/collision_detector_node.launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from launch.substitutions import NotEqualsSubstitution
from launch_ros.actions import LoadComposableNodes, SetParameter
from launch_ros.actions import Node
from launch_ros.actions import PushRosNamespace
from launch_ros.actions import PushROSNamespace
from launch_ros.descriptions import ComposableNode
from nav2_common.launch import RewrittenYaml

Expand Down Expand Up @@ -84,7 +84,7 @@ def generate_launch_description():
condition=IfCondition(PythonExpression(['not ', use_composition])),
actions=[
SetParameter('use_sim_time', use_sim_time),
PushRosNamespace(
PushROSNamespace(
condition=IfCondition(NotEqualsSubstitution(LaunchConfiguration('namespace'), '')),
namespace=namespace),
Node(
Expand All @@ -110,7 +110,7 @@ def generate_launch_description():
condition=IfCondition(use_composition),
actions=[
SetParameter('use_sim_time', use_sim_time),
PushRosNamespace(
PushROSNamespace(
condition=IfCondition(NotEqualsSubstitution(LaunchConfiguration('namespace'), '')),
namespace=namespace),
LoadComposableNodes(
Expand Down
6 changes: 3 additions & 3 deletions nav2_collision_monitor/launch/collision_monitor_node.launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from launch.substitutions import NotEqualsSubstitution
from launch_ros.actions import LoadComposableNodes, SetParameter
from launch_ros.actions import Node
from launch_ros.actions import PushRosNamespace
from launch_ros.actions import PushROSNamespace
from launch_ros.descriptions import ComposableNode, ParameterFile
from nav2_common.launch import RewrittenYaml

Expand Down Expand Up @@ -86,7 +86,7 @@ def generate_launch_description():
condition=IfCondition(PythonExpression(['not ', use_composition])),
actions=[
SetParameter('use_sim_time', use_sim_time),
PushRosNamespace(
PushROSNamespace(
condition=IfCondition(NotEqualsSubstitution(LaunchConfiguration('namespace'), '')),
namespace=namespace),
Node(
Expand All @@ -112,7 +112,7 @@ def generate_launch_description():
condition=IfCondition(use_composition),
actions=[
SetParameter('use_sim_time', use_sim_time),
PushRosNamespace(
PushROSNamespace(
condition=IfCondition(NotEqualsSubstitution(LaunchConfiguration('namespace'), '')),
namespace=namespace),
LoadComposableNodes(
Expand Down
4 changes: 2 additions & 2 deletions nav2_system_tests/src/system/test_multi_robot_launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
IncludeLaunchDescription, SetEnvironmentVariable)
from launch.launch_description_sources import PythonLaunchDescriptionSource
from launch.substitutions import TextSubstitution
from launch_ros.actions import Node, PushRosNamespace
from launch_ros.actions import Node, PushROSNamespace

from launch_testing.legacy import LaunchTestService

Expand Down Expand Up @@ -95,7 +95,7 @@ def generate_launch_description():

group = GroupAction([
# Instances use the robot's name for namespace
PushRosNamespace(robot['name']),
PushROSNamespace(robot['name']),
IncludeLaunchDescription(
PythonLaunchDescriptionSource(
os.path.join(bringup_dir, 'launch', 'bringup_launch.py')),
Expand Down