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.

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

Jump to bottom

Manual fix to issue#287 for Hironx. #290

Closed
wants to merge 1 commit into from
Closed

Manual fix to issue#287 for Hironx. #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion hironx_ros_bridge/launch/hironx_ros_bridge.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

<arg name="nameserver" default="hiro014" /> <!-- for real robot -->
<arg name="MODEL_FILE" default="$(find hironx_ros_bridge)/models/kawada-hironx.dae" />
<arg name="COLLADA_FILE" default="$(find hironx_ros_bridge)/models/kawada-hironx.dae" />
<!-- See https://github.com/start-jsk/rtmros_hironx/issues/287#issuecomment-64893372 why this temporary hack is necessary. -->
<arg name="COLLADA_FILE" default="$(find hironx_ros_bridge)/models/kawada-hironx_issue287.dae" />
<arg name="SIMULATOR_NAME" default="RobotHardware0" />
<arg name="corbaport" default="15005" />
<arg name="CONF_FILE_COLLISIONDETECT" default="$(find hironx_ros_bridge)/conf/kawada-hironx.conf" /> <!-- Default is simulation -->
Expand Down
2 changes: 2 additions & 0 deletions hironx_ros_bridge/launch/hironx_ros_bridge_simulation.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<launch>
<arg name="GUI" default="true" />
<!-- See https://github.com/start-jsk/rtmros_hironx/issues/287#issuecomment-64893372 why this temporary hack is necessary. -->
<arg name="COLLADA_FILE" default="$(find hironx_ros_bridge)/models/kawada-hironx_issue287.dae" />
<arg name="corbaport" default="15005" />
<arg name="MODEL_FILE" default="$(find hironx_ros_bridge)/models/kawada-hironx.dae" />
<arg name="CONF_FILE" default="$(find hironx_ros_bridge)/conf/kawada-hironx.conf" />
Expand Down
4,011 changes: 4,011 additions & 0 deletions hironx_ros_bridge/models/kawada-hironx_issue287.dae
View file
Open in desktop

Large diffs are not rendered by default.