Skip to content

Commit

Permalink
Do default to preconfigured RViz config if no config is given
Browse files Browse the repository at this point in the history
  • Loading branch information
Ubuntu committed Jul 6, 2022
1 parent 327db7f commit b387969
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions ur10_moveit_config/launch/moveit_rviz.launch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<arg unless="$(arg debug)" name="launch_prefix" value="" />
<arg if="$(arg debug)" name="launch_prefix" value="gdb --ex run --args" />

<arg name="rviz_config" default="" />
<arg if="$(eval rviz_config=='')" name="command_args" value="" />
<arg unless="$(eval rviz_config=='')" name="command_args" value="-d $(arg rviz_config)" />
<arg name="config" default="" />
<arg unless="$(eval config=='')" name="command_args" value="-d $(arg config)" />
<arg if="$(eval config=='')" name="command_args" value="-d $(find ur10_moveit_config)/launch/moveit.rviz"/>

<node name="$(anon rviz)" launch-prefix="$(arg launch_prefix)" pkg="rviz" type="rviz" respawn="false"
args="$(arg command_args)" output="screen">
Expand Down
6 changes: 3 additions & 3 deletions ur10e_moveit_config/launch/moveit_rviz.launch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<arg unless="$(arg debug)" name="launch_prefix" value="" />
<arg if="$(arg debug)" name="launch_prefix" value="gdb --ex run --args" />

<arg name="rviz_config" default="" />
<arg if="$(eval rviz_config=='')" name="command_args" value="" />
<arg unless="$(eval rviz_config=='')" name="command_args" value="-d $(arg rviz_config)" />
<arg name="config" default="" />
<arg unless="$(eval config=='')" name="command_args" value="-d $(arg config)" />
<arg if="$(eval config=='')" name="command_args" value="-d $(find ur10e_moveit_config)/launch/moveit.rviz"/>

<node name="$(anon rviz)" launch-prefix="$(arg launch_prefix)" pkg="rviz" type="rviz" respawn="false"
args="$(arg command_args)" output="screen">
Expand Down
6 changes: 3 additions & 3 deletions ur16e_moveit_config/launch/moveit_rviz.launch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<arg unless="$(arg debug)" name="launch_prefix" value="" />
<arg if="$(arg debug)" name="launch_prefix" value="gdb --ex run --args" />

<arg name="rviz_config" default="" />
<arg if="$(eval rviz_config=='')" name="command_args" value="" />
<arg unless="$(eval rviz_config=='')" name="command_args" value="-d $(arg rviz_config)" />
<arg name="config" default="" />
<arg unless="$(eval config=='')" name="command_args" value="-d $(arg config)" />
<arg if="$(eval config=='')" name="command_args" value="-d $(find ur16e_moveit_config)/launch/moveit.rviz"/>

<node name="$(anon rviz)" launch-prefix="$(arg launch_prefix)" pkg="rviz" type="rviz" respawn="false"
args="$(arg command_args)" output="screen">
Expand Down
6 changes: 3 additions & 3 deletions ur3_moveit_config/launch/moveit_rviz.launch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<arg unless="$(arg debug)" name="launch_prefix" value="" />
<arg if="$(arg debug)" name="launch_prefix" value="gdb --ex run --args" />

<arg name="rviz_config" default="" />
<arg if="$(eval rviz_config=='')" name="command_args" value="" />
<arg unless="$(eval rviz_config=='')" name="command_args" value="-d $(arg rviz_config)" />
<arg name="config" default="" />
<arg unless="$(eval config=='')" name="command_args" value="-d $(arg config)" />
<arg if="$(eval config=='')" name="command_args" value="-d $(find ur3_moveit_config)/launch/moveit.rviz"/>

<node name="$(anon rviz)" launch-prefix="$(arg launch_prefix)" pkg="rviz" type="rviz" respawn="false"
args="$(arg command_args)" output="screen">
Expand Down
6 changes: 3 additions & 3 deletions ur3e_moveit_config/launch/moveit_rviz.launch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<arg unless="$(arg debug)" name="launch_prefix" value="" />
<arg if="$(arg debug)" name="launch_prefix" value="gdb --ex run --args" />

<arg name="rviz_config" default="" />
<arg if="$(eval rviz_config=='')" name="command_args" value="" />
<arg unless="$(eval rviz_config=='')" name="command_args" value="-d $(arg rviz_config)" />
<arg name="config" default="" />
<arg unless="$(eval config=='')" name="command_args" value="-d $(arg config)" />
<arg if="$(eval config=='')" name="command_args" value="-d $(find ur3e_moveit_config)/launch/moveit.rviz"/>

<node name="$(anon rviz)" launch-prefix="$(arg launch_prefix)" pkg="rviz" type="rviz" respawn="false"
args="$(arg command_args)" output="screen">
Expand Down
6 changes: 3 additions & 3 deletions ur5_moveit_config/launch/moveit_rviz.launch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<arg unless="$(arg debug)" name="launch_prefix" value="" />
<arg if="$(arg debug)" name="launch_prefix" value="gdb --ex run --args" />

<arg name="rviz_config" default="" />
<arg if="$(eval rviz_config=='')" name="command_args" value="" />
<arg unless="$(eval rviz_config=='')" name="command_args" value="-d $(arg rviz_config)" />
<arg name="config" default="" />
<arg unless="$(eval config=='')" name="command_args" value="-d $(arg config)" />
<arg if="$(eval config=='')" name="command_args" value="-d $(find ur5_moveit_config)/launch/moveit.rviz"/>

<node name="$(anon rviz)" launch-prefix="$(arg launch_prefix)" pkg="rviz" type="rviz" respawn="false"
args="$(arg command_args)" output="screen">
Expand Down
6 changes: 3 additions & 3 deletions ur5e_moveit_config/launch/moveit_rviz.launch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<arg unless="$(arg debug)" name="launch_prefix" value="" />
<arg if="$(arg debug)" name="launch_prefix" value="gdb --ex run --args" />

<arg name="rviz_config" default="" />
<arg if="$(eval rviz_config=='')" name="command_args" value="" />
<arg unless="$(eval rviz_config=='')" name="command_args" value="-d $(arg rviz_config)" />
<arg name="config" default="" />
<arg unless="$(eval config=='')" name="command_args" value="-d $(arg config)" />
<arg if="$(eval config=='')" name="command_args" value="-d $(find ur5e_moveit_config)/launch/moveit.rviz"/>

<node name="$(anon rviz)" launch-prefix="$(arg launch_prefix)" pkg="rviz" type="rviz" respawn="false"
args="$(arg command_args)" output="screen">
Expand Down

0 comments on commit b387969

Please sign in to comment.