Skip to content
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.

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

[hrpsys_ros_bridge_tutorials/launch] fix hironx model path #559

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 hrpsys_ros_bridge_tutorials/launch/hironx_ros_bridge.launch
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

<include file="$(find hrpsys_ros_bridge)/launch/hrpsys_ros_bridge.launch">
<arg name="SIMULATOR_NAME" value="HiroNX(Robot)0" />
<arg name="MODEL_FILE" value="$(find collada_robots)/data/robots/kawada-hironx.dae" />
<arg name="COLLADA_FILE" value="$(find collada_robots)/data/robots/kawada-hironx.dae" />
<arg name="MODEL_FILE" value="$(find hironx_ros_bridge)/models/kawada-hironx.dae" />
<arg name="COLLADA_FILE" value="$(find hironx_ros_bridge)/models/kawada-hironx.dae" />
</include>

<node name="hironx_rviz" pkg="rviz" type="rviz" respawn="true"
Expand Down
6 changes: 3 additions & 3 deletions hrpsys_ros_bridge_tutorials/launch/hironx_startup.launch
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<param name="use_sim_time" value="true" />
<!-- end use sim time -->
<include file="$(find hrpsys_tools)/launch/hrpsys.launch">
<arg name="PROJECT_FILE" value="$(find hrpsys_ros_bridge_tutorials)/models/kawada-hironx_nosim.xml" if="$(arg NOSIM)"/>
<arg name="PROJECT_FILE" value="$(find hrpsys_ros_bridge_tutorials)/models/kawada-hironx.xml" unless="$(arg NOSIM)"/>
<arg name="MODEL_FILE" value="$(find collada_robots)/data/robots/kawada-hironx.dae" />
<arg name="PROJECT_FILE" value="$(find hironx_ros_bridge)/conf/kawada-hironx_nosim.xml" if="$(arg NOSIM)"/>
<arg name="PROJECT_FILE" value="$(find hironx_ros_bridge)/conf/kawada-hironx.xml" unless="$(arg NOSIM)"/>
<arg name="MODEL_FILE" value="$(find hironx_ros_bridge)/models/kawada-hironx.dae" />
<arg name="CONF_FILE" value="$(find hrpsys_ros_bridge_tutorials)/models/kawada-hironx.conf" />
<arg name="SIMULATOR_NAME" value="HiroNX(Robot)0" />
<arg name="KILL_SERVERS" default="$(arg KILL_SERVERS)" />
Expand Down