Skip to content

Commit

Permalink
Merge pull request #104 from nakane11/urdf_path
Browse files Browse the repository at this point in the history
Allow empty urdf_path
  • Loading branch information
iory authored Nov 3, 2024
2 parents d2f6a3f + eeb8a8f commit 5293ac9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
6 changes: 4 additions & 2 deletions ros/kxr_controller/launch/kxr_controller.launch
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@
output="screen"
required="true" >
<param name="device" type="str" value="$(arg device)" />
<param name="urdf_path" type="str" value="$(arg urdf_path)"
if="$(eval len(arg('urdf_path')) > 0)"/>
<rosparam subst_value="true" >
urdf_path: $(arg urdf_path)
servo_config_path: $(arg servo_config_path)
publish_imu: $(arg publish_imu)
publish_sensor: $(arg publish_sensor)
Expand Down Expand Up @@ -76,8 +77,9 @@
output="screen"
required="true" >
<param name="device" type="str" value="$(arg device)" />
<param name="urdf_path" type="str" value="$(arg urdf_path)"
if="$(eval len(arg('urdf_path')) > 0)"/>
<rosparam subst_value="true" >
urdf_path: $(arg urdf_path)
servo_config_path: $(arg servo_config_path)
publish_imu: $(arg publish_imu)
publish_sensor: $(arg publish_sensor)
Expand Down
1 change: 1 addition & 0 deletions ros/kxr_controller/node_scripts/rcb4_ros_bridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ def setup_paths_and_params(self):

def setup_urdf_and_model(self):
robot_model = RobotModel()
rospy.loginfo(f"[setup_urdf_and_model] Loading URDF File. {self.urdf_path}")
if self.urdf_path is None:
self.urdf_path = make_urdf_file(self.joint_name_to_id)
rospy.loginfo("Use temporary URDF")
Expand Down

0 comments on commit 5293ac9

Please sign in to comment.