Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
2
210910794
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Summer2021
210910794
Commits
59f9637c
Unverified
Commit
59f9637c
authored
5 years ago
by
Carlos A. Orduno
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix launching multiple gzclient instances (#1411)
Use PythonExpression to evaluate the condition substitution
parent
c2d93596
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
nav2_bringup/bringup/launch/nav2_multi_tb3_simulation_launch.py
+1
-0
1 addition, 0 deletions
...ringup/bringup/launch/nav2_multi_tb3_simulation_launch.py
nav2_bringup/bringup/launch/nav2_tb3_simulation_launch.py
+3
-3
3 additions, 3 deletions
nav2_bringup/bringup/launch/nav2_tb3_simulation_launch.py
with
4 additions
and
3 deletions
nav2_bringup/bringup/launch/nav2_multi_tb3_simulation_launch.py
+
1
−
0
View file @
59f9637c
...
...
@@ -169,6 +169,7 @@ def generate_launch_description():
'
rviz_config_file
'
:
namespaced_rviz_config_file
,
'
use_rviz
'
:
use_rviz
,
'
use_simulator
'
:
'
False
'
,
'
headless
'
:
'
False
'
,
'
use_robot_state_pub
'
:
use_robot_state_pub
}.
items
()),
LogInfo
(
...
...
This diff is collapsed.
Click to expand it.
nav2_bringup/bringup/launch/nav2_tb3_simulation_launch.py
+
3
−
3
View file @
59f9637c
...
...
@@ -21,11 +21,11 @@ from ament_index_python.packages import get_package_share_directory
from
launch
import
LaunchDescription
from
launch.actions
import
(
DeclareLaunchArgument
,
EmitEvent
,
ExecuteProcess
,
IncludeLaunchDescription
,
RegisterEventHandler
)
from
launch.conditions
import
IfCondition
,
UnlessCondition
from
launch.conditions
import
IfCondition
from
launch.event_handlers
import
OnProcessExit
from
launch.events
import
Shutdown
from
launch.launch_description_sources
import
PythonLaunchDescriptionSource
from
launch.substitutions
import
LaunchConfiguration
from
launch.substitutions
import
LaunchConfiguration
,
PythonExpression
from
nav2_common.launch
import
Node
...
...
@@ -136,7 +136,7 @@ def generate_launch_description():
cwd
=
[
launch_dir
],
output
=
'
screen
'
)
start_gazebo_client_cmd
=
ExecuteProcess
(
condition
=
(
IfCondition
(
use_simulator
)
and
UnlessCondition
(
headless
)),
condition
=
IfCondition
(
PythonExpression
([
use_simulator
,
'
and
not
'
,
headless
]
)),
cmd
=
[
'
gzclient
'
],
cwd
=
[
launch_dir
],
output
=
'
screen
'
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment