open_pub/Uni-Lab-OS
1
0
Fork 0
mirror of https://github.com/dptech-corp/Uni-Lab-OS.git synced 2026-02-04 13:25:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'device_visualization' of https://github.com/q434343/Uni-Lab-OS into pr/39

Browse Source
This commit is contained in:
Junhan Chang
2025-06-09 08:58:46 +08:00
parent eb8b01bd99 4fb9d9ce8b
commit c2c48d1cfd
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup.cfg
View File

@@ -1,4 +1,2 @@
[develop]
script_dir=$base/lib/unilabos
[install] [install]
install_scripts=$base/lib/unilabos install_scripts=$base/lib/unilabos

1
unilabos/devices/ros_dev/liquid_handler_joint_publisher.py
View File

@@ -243,6 +243,7 @@ class LiquidHandlerJointPublisher(BaseROS2DeviceNode):
self.move_to(joint_positions_target_zero, speed, parent_id) self.move_to(joint_positions_target_zero, speed, parent_id)
self.move_to(joint_positions_target, speed, parent_id) self.move_to(joint_positions_target, speed, parent_id)
time.sleep(1)
if option == "pick": if option == "pick":
link_name = self.lh_devices[parent_id]['joint_config']['link_names'][z_index] link_name = self.lh_devices[parent_id]['joint_config']['link_names'][z_index]
link_name = f'{parent_id}_{link_name}' link_name = f'{parent_id}_{link_name}'

3
unilabos/ros/nodes/presets/resource_mesh_manager.py
View File

@@ -391,7 +391,8 @@ class ResourceMeshManager(BaseROS2DeviceNode):
planning_scene = PlanningScene() planning_scene = PlanningScene()
planning_scene.is_diff = True planning_scene.is_diff = True
planning_scene.robot_state.is_diff = True planning_scene.robot_state.is_diff = True
time_start = self.get_clock().now() # time_start = self.get_clock().now()
time_start = rclpy.time.Time(seconds=0)
count = 0 count = 0
for resource_id, target_parent in cmd_dict.items(): for resource_id, target_parent in cmd_dict.items():