Xuwznln
ed123db5e9
fix build
2025-08-01 02:19:53 +08:00
Xuwznln
1aa7539ede
Merge remote-tracking branch 'origin/main' into dev
...
# Conflicts:
# recipes/ros-humble-unilabos-msgs/recipe.yaml
2025-08-01 01:31:46 +08:00
Xuwznln
65bf870317
Merge remote-tracking branch 'origin/main' into dev
...
# Conflicts:
# test/experiments/comprehensive_protocol/comprehensive_station.json
# unilabos-win64.yaml
# unilabos/app/controler.py
# unilabos/app/register.py
# unilabos/compile/evacuateandrefill_protocol.py
# unilabos/registry/device_comms/serial.yaml
# unilabos/registry/devices/camera.yaml
# unilabos/registry/devices/characterization_optic.yaml
# unilabos/registry/devices/hotel.yaml
# unilabos/registry/devices/laiyu_add_solid.yaml
# unilabos/registry/devices/liquid_handler.yaml
# unilabos/registry/devices/mock_devices.yaml
# unilabos/registry/devices/moveit_config.yaml
# unilabos/registry/devices/organic_miscellaneous.yaml
# unilabos/registry/devices/pump_and_valve.yaml
# unilabos/registry/devices/robot_agv.yaml
# unilabos/registry/devices/robot_arm.yaml
# unilabos/registry/devices/robot_gripper.yaml
# unilabos/registry/devices/robot_linear_motion.yaml
# unilabos/registry/devices/sim_nodes.yaml
# unilabos/registry/devices/temperature.yaml
# unilabos/registry/devices/vacuum_and_purge.yaml
# unilabos/registry/devices/virtual_device.yaml
# unilabos/registry/devices/work_station.yaml
# unilabos/registry/devices/zhida_hplc.yaml
# unilabos/registry/registry.py
# unilabos/ros/msgs/message_converter.py
# unilabos/ros/nodes/base_device_node.py
# unilabos/ros/nodes/presets/host_node.py
# unilabos/ros/nodes/presets/protocol_node.py
# unilabos/utils/import_manager.py
# unilabos/utils/type_check.py
2025-08-01 01:25:27 +08:00
Xuwznln
ccf1cdc23f
更新注册表
2025-08-01 01:22:28 +08:00
q434343
dcc970a091
Device visualization ( #67 )
...
* Update README and MQTTClient for installation instructions and code improvements
* feat: 支持local_config启动
add: 增加对crt path的说明,为传入config.py的相对路径
move: web component
* add: registry description
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* feat: node_info_update srv
fix: OTDeck cant create
* close #12
feat: slave node registry
* feat: show machine name
fix: host node registry not uploaded
* feat: add hplc registry
* feat: add hplc registry
* fix: hplc status typo
* fix: devices/
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* fix: device.class possible null
* fix: HPLC additions with online service
* fix: slave mode spin not working
* fix: slave mode spin not working
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* feat: 多ProtocolNode 允许子设备ID相同
feat: 上报发现的ActionClient
feat: Host重启动,通过discover机制要求slaveNode重新注册,实现信息及时上报
* feat: 支持env设置config
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
* Device visualization (#14 )
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
---------
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
* fix: missing hostname in devices_names
fix: upload_file for model file
* fix: missing paho-mqtt package
bump version to 0.9.0
* fix startup
add ResourceCreateFromOuter.action
* fix type hint
* update actions
* update actions
* host node add_resource_from_outer
fix cmake list
* pass device config to device class
* add: bind_parent_ids to resource create action
fix: message convert string
* fix: host node should not be re_discovered
* feat: resource tracker support dict
* feat: add more necessary params
* feat: fix boolean null in registry action data
* feat: add outer resource
* 编写mesh添加action
* feat: append resource
* add action
* feat: vis 2d for plr
* fix
* fix: browser on rviz
* fix: cloud bridge error fallback to local
* fix: salve auto run rviz
* 初始化两个plate
* Device visualization (#22 )
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
* 编写mesh添加action
* add action
* fix
* fix: browser on rviz
* fix: cloud bridge error fallback to local
* fix: salve auto run rviz
* 初始化两个plate
---------
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
* fix: multi channel
* fix: aspirate
* fix: aspirate
* fix: aspirate
* fix: aspirate
* 提交
* fix: jobadd
* fix: jobadd
* fix: msg converter
* tijiao
* add resource creat easy action
* identify debug msg
* mq client id
* 提取lh的joint发布
* unify liquid_handler definition
* 修改物料跟随与物料添加逻辑
修改物料跟随与物料添加逻辑
将joint_publisher类移出lh的backends,但仍需要对lh的backends进行一些改写
* Revert "修改物料跟随与物料添加逻辑"
This reverts commit 498c997ad7 .
* Reapply "修改物料跟随与物料添加逻辑"
This reverts commit 3a60d2ae81 .
* Revert "Merge remote-tracking branch 'upstream/dev' into device_visualization"
This reverts commit fa727220af , reversing
changes made to 498c997ad7 .
* 修改物料放下时的方法,如果选择
修改物料放下时的方法,
如果选择drop_trash,则删除物料显示
如果选择drop,则让其解除连接
* unilab添加moveit启动
1,整合所有moveit节点到一个move_group中,并整合所有的controller依次激活
2,添加pymoveit2的节点,使用json可直接启动
3,修改机械臂规划方式,添加约束,让冗余关节不会进行过多移动
* 修改物体attach时,多次赋值当前时间导致卡顿问题,
* Revert "修改物体attach时,多次赋值当前时间导致卡顿问题,"
This reverts commit 56d45b94f5 .
* Reapply "修改物体attach时,多次赋值当前时间导致卡顿问题,"
This reverts commit 07d9db20c3 .
* 添加缺少物料:"plate_well_G12",
* add
* fix tip resource data
* liquid states
* change to debug level
* Revert "change to debug level"
This reverts commit 5d9953c3e5 .
* Reapply "change to debug level"
This reverts commit 2487bb6ffc .
* fix tip resource data
* add full device
* add moveit yaml
* 修复moveit
增加post_init阶段,给予ros_node反向
* remove necessary node
* fix moveit action client
* remove necessary imports
* Update moveit_interface.py
* fix handler_key uppercase
* json add liquids
* fix setup
* add
* change to "sources" and "targets" for lh
* bump version
* remove parent's parent link
* change arm's name
* change name
* fix ik error
* 修改moveit_interface,并在mqtt上报时发送一个时间戳
* 添加机械臂和移液站
* 添加
* 添加硬件
* update
* 添加
---------
Co-authored-by: Harvey Que <Q-Query@outlook.com >
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: Junhan Chang <changjh@pku.edu.cn >
2025-08-01 01:06:10 +08:00
Xuwznln
b63e281ab7
新增用户引导
2025-08-01 01:01:29 +08:00
Xuwznln
2580e80d6f
修复可能的web template找不到的问题
...
新增联网获取json启动
删除非-g传入启动json的方式
兼容传参参数名短横线与下划线
更新版本到0.10.1
修复Upload Registry镜像不匹配
2025-07-31 19:12:22 +08:00
Xuwznln
2b3cec5640
修复可能的web template找不到的问题
...
新增联网获取json启动
删除非-g传入启动json的方式
兼容传参参数名短横线与下划线
2025-07-31 14:25:40 +08:00
Xuwznln
c6ac32c115
新增dll预载,保证部分设备可正常使用unilabos_msgs
2025-07-25 22:17:43 +08:00
Junhan Chang
0584bd5e04
fix vessel_id param passing in protocols
2025-07-25 17:38:17 +08:00
Xuwznln
1b086a85f5
新增lab_id直接传入
2025-07-25 15:23:35 +08:00
Guangxin Zhang
d289c01a34
Delete unnecessary files.
2025-07-24 16:16:12 +08:00
Xuwznln
badf402457
更正注册表中的数字类型
2025-07-24 14:22:53 +08:00
Xuwznln
4d98e1c46c
物料添加失败应该直接raise ValueError,不要等待
2025-07-24 12:10:37 +08:00
Xuwznln
3181671a29
修复注册表handles类型错误的问题
2025-07-24 10:49:54 +08:00
Junhan Chang
d6119115e8
fix protocol_node communication transfer
2025-07-20 17:21:48 +08:00
Guangxin Zhang
0c8c8d7a89
update
2025-07-20 04:04:20 +08:00
Guangxin Zhang
1a0b3b5db1
Update prcxi_9300.json
...
This one is good
2025-07-20 01:02:09 +08:00
Guangxin Zhang
6ead71dcee
update
2025-07-20 00:21:06 +08:00
Guangxin Zhang
5a2ea479b9
test
2025-07-19 22:42:43 +08:00
Guangxin Zhang
03e8c1e46d
Refactor PRCXI9300Deck initialization and update plate configurations
...
- Changed deck name from "PRCXI_Deck" to "PRCXI_Deck_9300".
- Updated plate4 initialization to use get_well_container instead of get_tip_rack.
- Modified plate4 material details with new UUID, code, and name.
- Renamed output JSON file to "deck_9300_new.json".
- Uncommented and adjusted liquid handling operations for clarity and future use.
2025-07-19 21:07:17 +08:00
Guangxin Zhang
81769d5a32
Update
2025-07-19 19:37:07 +08:00
Guangxin Zhang
30415ef96f
Update
2025-07-19 17:40:55 +08:00
Guangxin Zhang
aac3c9d561
Update for prcxi
2025-07-19 16:13:15 +08:00
Guangxin Zhang
27132bbbc1
Merge branch 'dev' of https://github.com/dptech-corp/Uni-Lab-OS into dev
2025-07-19 15:16:11 +08:00
Guangxin Zhang
a8cf389b00
Update
2025-07-19 15:16:08 +08:00
Xuwznln
98e9d09583
slim
2025-07-19 15:01:00 +08:00
Xuwznln
1467b9ac91
default param simulator
2025-07-19 14:04:58 +08:00
Xuwznln
c57bb2abbd
Merge branch 'dev' of https://github.com/dptech-corp/Uni-Lab-OS into dev
2025-07-19 13:32:35 +08:00
Xuwznln
34dd65d280
bump version to 0.10.0
2025-07-19 13:22:06 +08:00
Guangxin Zhang
b08026f861
Update .gitignore
2025-07-19 13:19:27 +08:00
Guangxin Zhang
826b04f515
Merge branch 'dev' of https://github.com/dptech-corp/Uni-Lab-OS into dev
2025-07-19 13:18:52 +08:00
Guangxin Zhang
de4da95616
update
2025-07-19 13:18:03 +08:00
Xuwznln
3c9cca88ea
采用http报送resource
2025-07-19 11:09:24 +08:00
Xuwznln
fd18b21147
采用http报送resource
2025-07-19 10:38:58 +08:00
Junhan Chang
c2dfe689aa
fix: Protocol node resource run ( #65 )
...
* stir和adjustph的中的bug修不好
* fix sub-resource query in protocol node compiling
* add resource placeholder to vessels
* add the rest yaml
* Update work_station.yaml
---------
Co-authored-by: KCFeng425 <2100011801@stu.pku.edu.cn >
2025-07-19 04:19:57 +08:00
Xuwznln
4cd40865b4
fix resource check serialize
2025-07-19 02:24:00 +08:00
Xuwznln
fd3dbcf1ff
fix devices
2025-07-19 01:56:41 +08:00
Xuwznln
ebe9e1b1f8
yaml dump支持ordered dict,支持config_info
2025-07-19 01:54:53 +08:00
Xuwznln
862f250e49
update set tip rack
2025-07-19 01:31:33 +08:00
Xuwznln
73f33c82db
update registry version & category
2025-07-19 01:29:59 +08:00
Xuwznln
58bf6496b6
bump version
2025-07-19 01:02:39 +08:00
Xuwznln
2b7da0e396
SET TIP RACK
2025-07-19 00:54:24 +08:00
Guangxin Zhang
dd89d00588
Update prcxi.py
2025-07-19 00:22:00 +08:00
Guangxin Zhang
9327d59915
Merge branch 'dev' of https://github.com/dptech-corp/Uni-Lab-OS into dev
2025-07-19 00:10:07 +08:00
Guangxin Zhang
736f55765b
Update
2025-07-19 00:09:59 +08:00
Xuwznln
9eb1f9823e
registry fix
2025-07-19 00:03:02 +08:00
Xuwznln
c61c4aae59
registry fix
2025-07-18 23:59:59 +08:00
Xuwznln
45eaf7019d
registry fix
2025-07-18 23:43:22 +08:00
Xuwznln
84aeb6921d
mix
2025-07-18 22:38:40 +08:00
Xuwznln
a95e4d446b
container_for_nothing
2025-07-18 22:06:19 +08:00
Guangxin Zhang
de6584f7a8
update
2025-07-18 22:03:12 +08:00
Guangxin Zhang
2c06f94bcf
Update
2025-07-18 21:44:57 +08:00
Xuwznln
3d9798476b
registry upadte
2025-07-18 21:27:56 +08:00
Guangxin Zhang
c462540484
update
2025-07-18 20:33:15 +08:00
Guangxin Zhang
ad54308046
Merge branch 'dev' of https://github.com/dptech-corp/Uni-Lab-OS into dev
2025-07-18 17:40:48 +08:00
Guangxin Zhang
5823edec8f
update
2025-07-18 15:27:10 +08:00
Xuwznln
dde7086aa6
0.9.12 update registry
2025-07-18 15:09:34 +08:00
Xuwznln
f1c7c96095
Merge remote-tracking branch 'origin/dev' into dev
2025-07-18 03:20:12 +08:00
Xuwznln
2a686e6ff2
modify prcxi
2025-07-18 03:19:38 +08:00
Kongchang Feng
00ced4d412
action to resource & 0.9.12 ( #64 )
...
* action to resource & 0.9.12
* stir和adjustph的中的bug修不好
2025-07-18 03:19:03 +08:00
Xuwznln
5674e180fc
新增set liquid方法
2025-07-18 02:51:15 +08:00
Xuwznln
0bd3025d73
新增set liquid方法
2025-07-18 02:38:12 +08:00
Xuwznln
8dbea5dbd2
Merge remote-tracking branch 'origin/dev' into dev
2025-07-18 01:33:19 +08:00
Guangxin Zhang
06e6d3348c
update
2025-07-18 00:32:48 +08:00
Guangxin Zhang
9a8d50bbf3
Update 9320
2025-07-18 00:14:33 +08:00
Xuwznln
0dc11542fb
更新注册表&增加资源,parent应为resources字段
2025-07-17 23:53:41 +08:00
Xuwznln
f0de653e77
deck
2025-07-17 23:45:54 +08:00
Guangxin Zhang
89808285ed
update
2025-07-17 23:44:59 +08:00
Guangxin Zhang
6eaa8e1c63
Update 9320
2025-07-17 23:23:37 +08:00
Guangxin Zhang
41c130ef54
Merge branch 'dev' of https://github.com/dptech-corp/Uni-Lab-OS into dev
2025-07-17 23:03:01 +08:00
Guangxin Zhang
2d30fb79c1
update
2025-07-17 23:02:08 +08:00
Xuwznln
743ec8839d
get_well_container&get_tip_rack
2025-07-17 23:01:30 +08:00
Guangxin Zhang
3f7b991dd9
Update 9320
2025-07-17 22:36:45 +08:00
Xuwznln
0466b57e0a
更新axis等参数
2025-07-17 21:53:25 +08:00
Guangxin Zhang
aaf33a8878
Update PRCXI
2025-07-17 20:54:11 +08:00
Guangxin Zhang
31f59dc2aa
Update prcxi.py
2025-07-17 14:38:50 +08:00
Guangxin Zhang
46b7ce292b
Update for discard tips
2025-07-16 23:28:46 +08:00
Guangxin Zhang
3584e92a1e
Update prcxi.py
2025-07-16 22:39:02 +08:00
Guangxin Zhang
e793ff6aa2
Update prcxi.py
2025-07-16 22:38:59 +08:00
Guangxin Zhang
f90be18926
Update trash
2025-07-16 21:34:25 +08:00
Guangxin Zhang
604d82140d
Update prcxi.py
2025-07-16 21:04:58 +08:00
Xuwznln
9c4fdd8001
新增simulator
2025-07-16 20:07:23 +08:00
Guangxin Zhang
71f6deda6b
Update prcxi.py
2025-07-16 18:22:02 +08:00
Guangxin Zhang
d81297d699
Merge branch 'dev' of https://github.com/dptech-corp/Uni-Lab-OS into dev
2025-07-16 12:53:06 +08:00
Guangxin Zhang
23cf713a80
Update prcxi.py
2025-07-16 12:52:35 +08:00
Xuwznln
c5efa5aa26
修复action移除时的报错,更新注册表
2025-07-16 11:16:26 +08:00
Kongchang Feng
acf7b6d3f7
修复了部分的protocol因为XDL更新导致的问题 ( #61 )
...
* 修复了部分的protocol因为XDL更新导致的问题
但是pumptransfer,add,dissolve,separate还没修,后续还需要写virtual固体加料器
* 补充了四个action
* 添加了固体加样器,丰富了json,修改了add protocol
* bump version to 0.9.9
* fix bugs from new actions
* protocol完整修复版本& bump version to 0.9.10
* 修补了一些单位处理,bump version to 0.9.11
* 优化了全protocol的运行时间,除了pumptransfer相关的还没
* 补充了剩下的几个protocol
---------
Co-authored-by: Junhan Chang <changjh@dp.tech >
Co-authored-by: Xuwznln <18435084+Xuwznln@users.noreply.github.com >
2025-07-16 11:12:02 +08:00
Guangxin Zhang
0593f98f81
Update prcxi.py
2025-07-16 10:16:22 +08:00
Xuwznln
540c5e94b7
增加注册表版本参数,支持将auto-指令人工检查后非auto,不生成人工已检查的指令,取消不必要的description生成
2025-07-16 09:46:32 +08:00
Xuwznln
f9aae44174
增加注册表版本参数,支持将auto-指令人工检查后非auto,不生成人工已检查的指令,取消不必要的description生成
2025-07-16 01:05:16 +08:00
Xuwznln
10cb645191
不生成已配置action的动作,增加prcxi的debug模式
2025-07-15 13:56:34 +08:00
Guangxin Zhang
4456529cfb
Update prcxi.py to fit the function in unilabos.
2025-07-14 15:23:31 +08:00
Xuwznln
694a779c66
update prcxi registry
2025-07-11 18:43:11 +08:00
Xuwznln
5d214ebcd8
update prcxi
2025-07-11 18:20:50 +08:00
Xuwznln
0e11dacead
assert blending_times > 0
2025-07-11 18:15:41 +08:00
Xuwznln
7b68545db3
prcxi blending
2025-07-11 18:11:44 +08:00
Guangxin Zhang
25960c2ed5
Add plateT6 to PRCXI configuration and enhance error handling in liquid handling
2025-07-11 18:10:21 +08:00
Xuwznln
72c67ba25c
任意执行错误都应该返回failed
2025-07-11 16:33:55 +08:00
Xuwznln
cd9e7ef12c
任意执行错误都应该返回failed
2025-07-11 16:30:56 +08:00
Xuwznln
b85722f44d
add pickup tips for prcxi
2025-07-11 16:09:53 +08:00
Guangxin Zhang
5a2cc2d709
更新PRCXI配置,修改主机地址和设置状态,并添加示例用法
2025-07-11 16:00:45 +08:00
Xuwznln
644feced55
修正prcxi启动
2025-07-11 15:50:30 +08:00
Xuwznln
61ee446542
更新实例
2025-07-11 15:42:01 +08:00
Xuwznln
18f6685e18
更新实例
2025-07-11 15:36:46 +08:00
Xuwznln
e2052d4a2c
更新实例
2025-07-11 15:11:44 +08:00
q434343
50282664e0
修改moveit_interface,并在mqtt上报时发送一个时间戳,方便网页端对数据的筛选 ( #62 )
...
* Update README and MQTTClient for installation instructions and code improvements
* feat: 支持local_config启动
add: 增加对crt path的说明,为传入config.py的相对路径
move: web component
* add: registry description
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* feat: node_info_update srv
fix: OTDeck cant create
* close #12
feat: slave node registry
* feat: show machine name
fix: host node registry not uploaded
* feat: add hplc registry
* feat: add hplc registry
* fix: hplc status typo
* fix: devices/
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* fix: device.class possible null
* fix: HPLC additions with online service
* fix: slave mode spin not working
* fix: slave mode spin not working
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* feat: 多ProtocolNode 允许子设备ID相同
feat: 上报发现的ActionClient
feat: Host重启动,通过discover机制要求slaveNode重新注册,实现信息及时上报
* feat: 支持env设置config
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
* Device visualization (#14 )
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
---------
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
* fix: missing hostname in devices_names
fix: upload_file for model file
* fix: missing paho-mqtt package
bump version to 0.9.0
* fix startup
add ResourceCreateFromOuter.action
* fix type hint
* update actions
* update actions
* host node add_resource_from_outer
fix cmake list
* pass device config to device class
* add: bind_parent_ids to resource create action
fix: message convert string
* fix: host node should not be re_discovered
* feat: resource tracker support dict
* feat: add more necessary params
* feat: fix boolean null in registry action data
* feat: add outer resource
* 编写mesh添加action
* feat: append resource
* add action
* feat: vis 2d for plr
* fix
* fix: browser on rviz
* fix: cloud bridge error fallback to local
* fix: salve auto run rviz
* 初始化两个plate
* Device visualization (#22 )
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
* 编写mesh添加action
* add action
* fix
* fix: browser on rviz
* fix: cloud bridge error fallback to local
* fix: salve auto run rviz
* 初始化两个plate
---------
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
* fix: multi channel
* fix: aspirate
* fix: aspirate
* fix: aspirate
* fix: aspirate
* 提交
* fix: jobadd
* fix: jobadd
* fix: msg converter
* tijiao
* add resource creat easy action
* identify debug msg
* mq client id
* 提取lh的joint发布
* unify liquid_handler definition
* 修改物料跟随与物料添加逻辑
修改物料跟随与物料添加逻辑
将joint_publisher类移出lh的backends,但仍需要对lh的backends进行一些改写
* Revert "修改物料跟随与物料添加逻辑"
This reverts commit 498c997ad7 .
* Reapply "修改物料跟随与物料添加逻辑"
This reverts commit 3a60d2ae81 .
* Revert "Merge remote-tracking branch 'upstream/dev' into device_visualization"
This reverts commit fa727220af , reversing
changes made to 498c997ad7 .
* 修改物料放下时的方法,如果选择
修改物料放下时的方法,
如果选择drop_trash,则删除物料显示
如果选择drop,则让其解除连接
* unilab添加moveit启动
1,整合所有moveit节点到一个move_group中,并整合所有的controller依次激活
2,添加pymoveit2的节点,使用json可直接启动
3,修改机械臂规划方式,添加约束,让冗余关节不会进行过多移动
* 修改物体attach时,多次赋值当前时间导致卡顿问题,
* Revert "修改物体attach时,多次赋值当前时间导致卡顿问题,"
This reverts commit 56d45b94f5 .
* Reapply "修改物体attach时,多次赋值当前时间导致卡顿问题,"
This reverts commit 07d9db20c3 .
* 添加缺少物料:"plate_well_G12",
* add
* fix tip resource data
* liquid states
* change to debug level
* Revert "change to debug level"
This reverts commit 5d9953c3e5 .
* Reapply "change to debug level"
This reverts commit 2487bb6ffc .
* fix tip resource data
* add full device
* add moveit yaml
* 修复moveit
增加post_init阶段,给予ros_node反向
* remove necessary node
* fix moveit action client
* remove necessary imports
* Update moveit_interface.py
* fix handler_key uppercase
* json add liquids
* fix setup
* add
* change to "sources" and "targets" for lh
* bump version
* remove parent's parent link
* change arm's name
* change name
* fix ik error
* 修改moveit_interface,并在mqtt上报时发送一个时间戳
---------
Co-authored-by: Harvey Que <Q-Query@outlook.com >
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: Junhan Chang <changjh@pku.edu.cn >
2025-07-08 15:49:35 +08:00
Xuwznln
ce8667f937
更新中析仪器,以及启动示例
2025-07-06 18:39:40 +08:00
Guangxin Zhang
bef44b2293
Update Prcxi
2025-07-05 22:03:49 +08:00
Guangxin Zhang
b78c6c6ba9
Update prcxi.py
2025-07-05 18:02:58 +08:00
Guangxin Zhang
0d512c9e38
Create prcxi.py
2025-07-05 17:16:59 +08:00
Kongchang Feng
c8c755057c
Update work_station.yaml ( #60 )
...
* Update work_station.yaml
* Checklist里面有XDL跟protocol之间没对齐的问题,工作量有点大找时间写完
2025-07-05 15:13:14 +08:00
Xuwznln
a6ec20e279
转换到ros消息时,要进行基础类型转换
2025-07-05 12:43:27 +08:00
Xuwznln
b69aceaff3
Merge branch 'dev' of https://github.com/dptech-corp/Uni-Lab-OS into dev
2025-07-04 21:23:38 +08:00
Kongchang Feng
21afdb62bc
Create 5 new protocols & bump version 0.9.8 ( #59 )
...
* 添加了5个缺失的protocol,验证了可以运行
* bump version to 0.9.8
* 修复新增的Action的字段缺失
---------
Co-authored-by: Xuwznln <18435084+Xuwznln@users.noreply.github.com >
2025-07-04 13:58:27 +08:00
Xuwznln
d7d43af40a
修复任务执行传参
2025-07-04 13:52:23 +08:00
ZiWei
132955617d
Add channel_sources config in conda_build_config.yaml ( #58 )
2025-07-03 23:59:08 +08:00
Xuwznln
e7521972e4
匹配init param schema格式
2025-06-30 12:29:30 +08:00
Xuwznln
f2753fc69a
Merge branch 'main' into dev
2025-06-29 19:18:17 +08:00
Xuwznln
09ad905280
修复auto-的Action在protocol node下错误注册
2025-06-29 19:12:32 +08:00
Junhan Chang
7714c71cd2
add camera and dependency ( #56 )
2025-06-29 17:35:32 +08:00
Junhan Chang
64832718be
Fix handle names ( #55 )
...
* fix handle names
* improve evacuateAndRefill gas source finding
2025-06-29 17:31:44 +08:00
Xuwznln
68871358c2
成功动态导入的不再需要使用静态导入
2025-06-29 11:52:59 +08:00
Xuwznln
498b3cad6a
支持通过list[int],list[float]进行Int64MultiArray,Float64MultiArray的替换
2025-06-29 11:52:24 +08:00
Xuwznln
157da1759d
status types对于嵌套类型返回的对象,暂时处理成字符串,无法直接进行转换
2025-06-29 11:26:35 +08:00
Xuwznln
be0a73eb19
修复静态方法识别get status,注册表支持python类型
2025-06-28 12:18:30 +08:00
Xuwznln
9be6e1069a
修复部分识别error
2025-06-28 10:52:34 +08:00
Xuwznln
817e88cfc4
修复不启用注册表补充就无法启动的bug
2025-06-28 01:32:10 +08:00
Xuwznln
15f3f8518b
支持通过导入方式补全注册表,新增工作流unilabos_device_id字段
2025-06-28 01:19:54 +08:00
Xuwznln
bbc49e9aab
新增注册表补全功能,修复Protocol执行失败
2025-06-27 23:45:05 +08:00
Xuwznln
f9a9e91d56
Merge remote-tracking branch 'origin/main' into dev
...
# Conflicts:
# test/experiments/Protocol_Test_Station/clean_vessel_protocol_test_station.json
# test/experiments/comprehensive_protocol/comprehensive_station.json
# unilabos/compile/__init__.py
# unilabos/compile/add_protocol.py
# unilabos/compile/clean_vessel_protocol.py
# unilabos/registry/devices/virtual_device.yaml
# unilabos/registry/resources/organic/container.yaml
2025-06-22 18:32:46 +08:00
Kongchang Feng
96e9c76709
添加了两个protocol的检索功能 ( #51 )
...
* 添加了两个protocol的检索liquid type功能
* fix workstation registry
* 修复了没连接的几个仪器的link,添加了container的icon
* 修改了json和注册表,现在大图全部的device都链接上了
* 修复了小图的json图,线全部连上了
* add work_station protocol handles (ports)
* fix workstation action handle
---------
Co-authored-by: Xuwznln <18435084+Xuwznln@users.noreply.github.com >
Co-authored-by: Junhan Chang <changjh@dp.tech >
2025-06-22 18:30:09 +08:00
Xuwznln
06b7962ef9
更新workstation注册表
2025-06-22 14:52:40 +08:00
Xuwznln
6faa19a250
Merge branch 'main' into dev
2025-06-22 13:01:37 +08:00
Kongchang Feng
46cec82a51
Device registry port ( #49 )
...
* Update README and MQTTClient for installation instructions and code improvements
* feat: 支持local_config启动
add: 增加对crt path的说明,为传入config.py的相对路径
move: web component
* add: registry description
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* feat: node_info_update srv
fix: OTDeck cant create
* close #12
feat: slave node registry
* feat: show machine name
fix: host node registry not uploaded
* feat: add hplc registry
* feat: add hplc registry
* fix: hplc status typo
* fix: devices/
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* fix: device.class possible null
* fix: HPLC additions with online service
* fix: slave mode spin not working
* fix: slave mode spin not working
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* feat: 多ProtocolNode 允许子设备ID相同
feat: 上报发现的ActionClient
feat: Host重启动,通过discover机制要求slaveNode重新注册,实现信息及时上报
* feat: 支持env设置config
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
* Device visualization (#14 )
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
---------
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
* fix: missing hostname in devices_names
fix: upload_file for model file
* fix: missing paho-mqtt package
bump version to 0.9.0
* fix startup
add ResourceCreateFromOuter.action
* fix type hint
* update actions
* update actions
* host node add_resource_from_outer
fix cmake list
* pass device config to device class
* add: bind_parent_ids to resource create action
fix: message convert string
* fix: host node should not be re_discovered
* feat: resource tracker support dict
* feat: add more necessary params
* feat: fix boolean null in registry action data
* feat: add outer resource
* 编写mesh添加action
* feat: append resource
* add action
* feat: vis 2d for plr
* fix
* fix: browser on rviz
* fix: cloud bridge error fallback to local
* fix: salve auto run rviz
* 初始化两个plate
* Device visualization (#22 )
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
* 编写mesh添加action
* add action
* fix
* fix: browser on rviz
* fix: cloud bridge error fallback to local
* fix: salve auto run rviz
* 初始化两个plate
---------
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
* fix: multi channel
* fix: aspirate
* fix: aspirate
* fix: aspirate
* fix: aspirate
* 提交
* fix: jobadd
* fix: jobadd
* fix: msg converter
* tijiao
* add resource creat easy action
* identify debug msg
* mq client id
* unify liquid_handler definition
* Update virtual_device.yaml
* 更正了stir和heater的连接方式
* 区分了虚拟仪器中的八通阀和电磁阀,添加了两个阀门的驱动
* 修改了add protocol
* 修复了阀门更新版的bug
* 修复了添加protocol前缀导致的不能启动的bug
* Fix handles
* bump version to 0.9.6
* add resource edge upload
* update container registry and handles
* add virtual_separator virtual_rotavap
fix transfer_pump
* fix container value
add parent_name to edge device id
* 大图的问题都修复好了,添加了gassource和vacuum pump的驱动以及注册表
* default resource upload mode is false
* 添加了icon的文件名在注册表里面
* 修改了json图中link的格式
* fix resource and edge upload
* fix device ports
* Fix edge id
* 移除device的父节点关联
* separate registry sync and resource_add
* 默认不进行注册表报送,通过命令unilabos-register或者增加启动参数
* 完善tip
* protocol node不再嵌套显示
* bump version to 0.9.7 新增一个测试PumpTransferProtocol的teststation,亲测可以运行,将八通阀们和转移泵与pump_protocol适配
* protocol node 执行action不应携带自身device id
* 添加了一套简易双八通阀工作站JSON,亲测能跑
* 修复了很多protocol,亲测能跑
* 添加了run column和filter through的protocol,亲测能跑
* fix mock_reactor
* 修改了大图和小图的json,但是在前端上没看到改变
---------
Co-authored-by: Harvey Que <Q-Query@outlook.com >
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: q434343 <73513873+q434343@users.noreply.github.com >
Co-authored-by: Junhan Chang <changjh@pku.edu.cn >
2025-06-22 12:59:59 +08:00
Xuwznln
f7db8d17c5
container 添加和更新完成
2025-06-15 17:37:38 +08:00
Xuwznln
a354965f8e
Merge branch 'dev' of https://github.com/dptech-corp/Uni-Lab-OS into dev
2025-06-15 12:51:48 +08:00
Xuwznln
934276d2f7
create container
2025-06-15 12:51:37 +08:00
Harvey Que
803809480b
hotfix: Add .certs in .gitignore
2025-06-15 09:09:06 +08:00
Xuwznln
5478ba3237
test artifacts
2025-06-13 14:13:41 +08:00
Xuwznln
49f1aa9c28
try build
2025-06-13 14:05:58 +08:00
Xuwznln
d5d516f0ef
try build fix
2025-06-13 13:52:45 +08:00
Xuwznln
4471fed4b8
测试自动构建
2025-06-13 13:47:08 +08:00
Xuwznln
30d143e1a5
Merge branch 'dev' of https://github.com/dptech-corp/Uni-Lab-OS into dev
2025-06-13 13:12:46 +08:00
Xuwznln
75ea45f21e
include device_mesh when pip install
2025-06-13 00:32:15 +08:00
hh.
66af337d6c
hotfix: Add macos_sdk_config ( #46 )
...
Co-authored-by: quehh <scienceol@outlook.com >
2025-06-12 22:46:44 +08:00
Xuwznln
ae3c65c1d3
Merge remote-tracking branch 'origin/main' into dev
...
# Conflicts:
# README.md
# README_zh.md
# recipes/ros-humble-unilabos-msgs/recipe.yaml
# recipes/unilabos/recipe.yaml
# setup.py
# unilabos/compile/pump_protocol.py
# unilabos/registry/devices/pump_and_valve.yaml
# unilabos/ros/nodes/presets/protocol_node.py
2025-06-12 21:27:07 +08:00
Xuwznln
11e4f053f1
bump version & protocol fix
2025-06-12 21:21:25 +08:00
Kongchang Feng
96f37b3b0d
Add Mock Device for Organic Synthesis\添加有机合成的虚拟仪器和Protocol ( #43 )
...
* Add Device MockChiller
Add device MockChiller
* Add Device MockFilter
* Add Device MockPump
* Add Device MockRotavap
* Add Device MockSeparator
* Add Device MockStirrer
* Add Device MockHeater
* Add Device MockVacuum
* Add Device MockSolenoidValve
* Add Device Mock \_init_.py
* 规范模拟设备代码与注册表信息
* 更改Mock大写文件夹名
* 删除大写目录
* Edited Mock device json
* Match mock device with action
* Edit mock device yaml
* Add new action
* Add Virtual Device, Action, YAML, Protocol for Organic Syn
* 单独分类测试的protocol文件夹
* 更名Action
---------
Co-authored-by: Xuwznln <18435084+Xuwznln@users.noreply.github.com >
2025-06-12 20:58:39 +08:00
Xuwznln
d7d0a27976
Device visualization ( #42 )
...
* Update README and MQTTClient for installation instructions and code improvements
* feat: 支持local_config启动
add: 增加对crt path的说明,为传入config.py的相对路径
move: web component
* add: registry description
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* feat: node_info_update srv
fix: OTDeck cant create
* close #12
feat: slave node registry
* feat: show machine name
fix: host node registry not uploaded
* feat: add hplc registry
* feat: add hplc registry
* fix: hplc status typo
* fix: devices/
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* fix: device.class possible null
* fix: HPLC additions with online service
* fix: slave mode spin not working
* fix: slave mode spin not working
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* feat: 多ProtocolNode 允许子设备ID相同
feat: 上报发现的ActionClient
feat: Host重启动,通过discover机制要求slaveNode重新注册,实现信息及时上报
* feat: 支持env设置config
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
* Device visualization (#14 )
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
---------
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
* fix: missing hostname in devices_names
fix: upload_file for model file
* fix: missing paho-mqtt package
bump version to 0.9.0
* fix startup
add ResourceCreateFromOuter.action
* fix type hint
* update actions
* update actions
* host node add_resource_from_outer
fix cmake list
* pass device config to device class
* add: bind_parent_ids to resource create action
fix: message convert string
* fix: host node should not be re_discovered
* feat: resource tracker support dict
* feat: add more necessary params
* feat: fix boolean null in registry action data
* feat: add outer resource
* 编写mesh添加action
* feat: append resource
* add action
* feat: vis 2d for plr
* fix
* fix: browser on rviz
* fix: cloud bridge error fallback to local
* fix: salve auto run rviz
* 初始化两个plate
* Device visualization (#22 )
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
* 编写mesh添加action
* add action
* fix
* fix: browser on rviz
* fix: cloud bridge error fallback to local
* fix: salve auto run rviz
* 初始化两个plate
---------
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
* fix: multi channel
* fix: aspirate
* fix: aspirate
* fix: aspirate
* fix: aspirate
* 提交
* fix: jobadd
* fix: jobadd
* fix: msg converter
* tijiao
* add resource creat easy action
* identify debug msg
* mq client id
* 提取lh的joint发布
* unify liquid_handler definition
* 修改物料跟随与物料添加逻辑
修改物料跟随与物料添加逻辑
将joint_publisher类移出lh的backends,但仍需要对lh的backends进行一些改写
* Revert "修改物料跟随与物料添加逻辑"
This reverts commit 498c997ad7 .
* Reapply "修改物料跟随与物料添加逻辑"
This reverts commit 3a60d2ae81 .
* Revert "Merge remote-tracking branch 'upstream/dev' into device_visualization"
This reverts commit fa727220af , reversing
changes made to 498c997ad7 .
* 修改物料放下时的方法,如果选择
修改物料放下时的方法,
如果选择drop_trash,则删除物料显示
如果选择drop,则让其解除连接
* unilab添加moveit启动
1,整合所有moveit节点到一个move_group中,并整合所有的controller依次激活
2,添加pymoveit2的节点,使用json可直接启动
3,修改机械臂规划方式,添加约束,让冗余关节不会进行过多移动
* 修改物体attach时,多次赋值当前时间导致卡顿问题,
* Revert "修改物体attach时,多次赋值当前时间导致卡顿问题,"
This reverts commit 56d45b94f5 .
* Reapply "修改物体attach时,多次赋值当前时间导致卡顿问题,"
This reverts commit 07d9db20c3 .
* 添加缺少物料:"plate_well_G12",
* add
* fix tip resource data
* liquid states
* change to debug level
* Revert "change to debug level"
This reverts commit 5d9953c3e5 .
* Reapply "change to debug level"
This reverts commit 2487bb6ffc .
* fix tip resource data
* add full device
* add moveit yaml
* 修复moveit
增加post_init阶段,给予ros_node反向
* remove necessary node
* fix moveit action client
* remove necessary imports
* Update moveit_interface.py
* fix handler_key uppercase
* json add liquids
* fix setup
* add
* change to "sources" and "targets" for lh
* bump version
* remove parent's parent link
* change arm's name
* change name
* fix ik error
---------
Co-authored-by: Harvey Que <Q-Query@outlook.com >
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: q434343 <73513873+q434343@users.noreply.github.com >
Co-authored-by: Junhan Chang <changjh@pku.edu.cn >
2025-06-12 20:58:18 +08:00
Xuwznln
34151f5cb2
补充日志
2025-06-10 22:13:35 +08:00
Xuwznln
369a21b904
调整protocol node以更好支持多种类型的read和write
2025-06-10 21:54:23 +08:00
Xuwznln
90169981c1
增加modbus支持
...
调整protocol node以更好支持多种类型的read和write
2025-06-10 21:46:49 +08:00
Xuwznln
d297abfd19
bump ver
...
modify slot type
2025-06-10 03:46:28 +08:00
Xuwznln
9c515a252a
create_resource
2025-06-10 02:55:29 +08:00
Xuwznln
ea5e7a5ce2
Merge branch '37-biomek-i5i7' into dev
...
# Conflicts:
# README.md
# README_zh.md
# recipes/ros-humble-unilabos-msgs/recipe.yaml
# recipes/unilabos/recipe.yaml
# setup.py
# unilabos/devices/liquid_handling/biomek.py
# unilabos/devices/liquid_handling/biomek_test.py
# unilabos/registry/devices/liquid_handler.yaml
# unilabos/registry/registry.py
# unilabos/ros/msgs/message_converter.py
# unilabos_msgs/action/LiquidHandlerMoveBiomek.action
# unilabos_msgs/action/LiquidHandlerTransferBiomek.action
2025-06-10 02:00:43 +08:00
Xuwznln
2e9a0a4677
fix move it
2025-06-10 01:55:39 +08:00
Xuwznln
4c7aa8a89a
fix move it
2025-06-10 01:53:58 +08:00
Xuwznln
d8a0c5e715
Device visualization ( #41 )
...
* Update README and MQTTClient for installation instructions and code improvements
* feat: 支持local_config启动
add: 增加对crt path的说明,为传入config.py的相对路径
move: web component
* add: registry description
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* feat: node_info_update srv
fix: OTDeck cant create
* close #12
feat: slave node registry
* feat: show machine name
fix: host node registry not uploaded
* feat: add hplc registry
* feat: add hplc registry
* fix: hplc status typo
* fix: devices/
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* fix: device.class possible null
* fix: HPLC additions with online service
* fix: slave mode spin not working
* fix: slave mode spin not working
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* feat: 多ProtocolNode 允许子设备ID相同
feat: 上报发现的ActionClient
feat: Host重启动,通过discover机制要求slaveNode重新注册,实现信息及时上报
* feat: 支持env设置config
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
* Device visualization (#14 )
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
---------
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
* fix: missing hostname in devices_names
fix: upload_file for model file
* fix: missing paho-mqtt package
bump version to 0.9.0
* fix startup
add ResourceCreateFromOuter.action
* fix type hint
* update actions
* update actions
* host node add_resource_from_outer
fix cmake list
* pass device config to device class
* add: bind_parent_ids to resource create action
fix: message convert string
* fix: host node should not be re_discovered
* feat: resource tracker support dict
* feat: add more necessary params
* feat: fix boolean null in registry action data
* feat: add outer resource
* 编写mesh添加action
* feat: append resource
* add action
* feat: vis 2d for plr
* fix
* fix: browser on rviz
* fix: cloud bridge error fallback to local
* fix: salve auto run rviz
* 初始化两个plate
* Device visualization (#22 )
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
* 编写mesh添加action
* add action
* fix
* fix: browser on rviz
* fix: cloud bridge error fallback to local
* fix: salve auto run rviz
* 初始化两个plate
---------
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
* fix: multi channel
* fix: aspirate
* fix: aspirate
* fix: aspirate
* fix: aspirate
* 提交
* fix: jobadd
* fix: jobadd
* fix: msg converter
* tijiao
* add resource creat easy action
* identify debug msg
* mq client id
* 提取lh的joint发布
* unify liquid_handler definition
* 修改物料跟随与物料添加逻辑
修改物料跟随与物料添加逻辑
将joint_publisher类移出lh的backends,但仍需要对lh的backends进行一些改写
* Revert "修改物料跟随与物料添加逻辑"
This reverts commit 498c997ad7 .
* Reapply "修改物料跟随与物料添加逻辑"
This reverts commit 3a60d2ae81 .
* Revert "Merge remote-tracking branch 'upstream/dev' into device_visualization"
This reverts commit fa727220af , reversing
changes made to 498c997ad7 .
* 修改物料放下时的方法,如果选择
修改物料放下时的方法,
如果选择drop_trash,则删除物料显示
如果选择drop,则让其解除连接
* add biomek.py demo implementation
* 更新LiquidHandlerBiomek类,添加资源创建功能,优化协议创建方法,修复部分代码格式问题,更新YAML配置以支持新功能。
* Test
* fix biomek success type
* Convert LH action to biomek.
* Update biomek.py
* 注册表上报handle和schema (param input)
* 修复biomek缺少的字段
* delete 's'
* Remove warnings
* Update biomek.py
* Biomek test
* Update biomek.py
* 新增transfer_biomek的msg
* New transfer_biomek
* Updated transfer_biomek
* 更新transfer_biomek的msg
* 更新transfer_biomek的msg
* 支持Biomek创建
* new action
* fix key name typo
* New parameter for biomek to run.
* Refine
* Update
* new actions
* new actions
* 1
* registry
* fix biomek startup
add action handles
* fix handles not as default entry
* unilab添加moveit启动
1,整合所有moveit节点到一个move_group中,并整合所有的controller依次激活
2,添加pymoveit2的节点,使用json可直接启动
3,修改机械臂规划方式,添加约束,让冗余关节不会进行过多移动
* biomek_test.py
biomek_test.py是最新的版本,运行它会生成complete_biomek_protocol.json
* Update biomek.py
* biomek_test.py
* fix liquid_handler.biomek handles
* 修改物体attach时,多次赋值当前时间导致卡顿问题,
* Revert "修改物体attach时,多次赋值当前时间导致卡顿问题,"
This reverts commit 56d45b94f5 .
* Reapply "修改物体attach时,多次赋值当前时间导致卡顿问题,"
This reverts commit 07d9db20c3 .
* 添加缺少物料:"plate_well_G12",
* host node新增resource add时间统计
create_resource新增handle
bump version to 0.9.2
* 修正物料上传时间
改用biomek_test
增加ResultInfoEncoder
支持返回结果上传
* 正确发送return_info结果
* 同步执行状态信息
* 取消raiseValueError提示
* Update biomek_test.py
* 0608 DONE
* 同步了Biomek.py 现在应可用
* biomek switch back to non-test
* temp disable initialize resource
* add
* fix tip resource data
* liquid states
* change to debug level
* Revert "change to debug level"
This reverts commit 5d9953c3e5 .
* Reapply "change to debug level"
This reverts commit 2487bb6ffc .
* fix tip resource data
* add full device
* add moveit yaml
* 修复moveit
增加post_init阶段,给予ros_node反向
* remove necessary node
* fix moveit action client
* remove necessary imports
* Update moveit_interface.py
* fix handler_key uppercase
* json add liquids
* fix setup
* add
* change to "sources" and "targets" for lh
* bump version
* remove parent's parent link
* change arm's name
* change name
---------
Co-authored-by: Harvey Que <Q-Query@outlook.com >
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: q434343 <73513873+q434343@users.noreply.github.com >
Co-authored-by: Junhan Chang <changjh@pku.edu.cn >
Co-authored-by: Guangxin Zhang <guangxin.zhang.bio@gmail.com >
Co-authored-by: qxw138 <qxw@stu.pku.edu.cn >
2025-06-10 01:28:09 +08:00
q434343
133ffaac17
Device visualization ( #39 )
...
* Update README and MQTTClient for installation instructions and code improvements
* feat: 支持local_config启动
add: 增加对crt path的说明,为传入config.py的相对路径
move: web component
* add: registry description
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* feat: node_info_update srv
fix: OTDeck cant create
* close #12
feat: slave node registry
* feat: show machine name
fix: host node registry not uploaded
* feat: add hplc registry
* feat: add hplc registry
* fix: hplc status typo
* fix: devices/
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* fix: device.class possible null
* fix: HPLC additions with online service
* fix: slave mode spin not working
* fix: slave mode spin not working
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* feat: 多ProtocolNode 允许子设备ID相同
feat: 上报发现的ActionClient
feat: Host重启动,通过discover机制要求slaveNode重新注册,实现信息及时上报
* feat: 支持env设置config
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
* Device visualization (#14 )
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
---------
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
* fix: missing hostname in devices_names
fix: upload_file for model file
* fix: missing paho-mqtt package
bump version to 0.9.0
* fix startup
add ResourceCreateFromOuter.action
* fix type hint
* update actions
* update actions
* host node add_resource_from_outer
fix cmake list
* pass device config to device class
* add: bind_parent_ids to resource create action
fix: message convert string
* fix: host node should not be re_discovered
* feat: resource tracker support dict
* feat: add more necessary params
* feat: fix boolean null in registry action data
* feat: add outer resource
* 编写mesh添加action
* feat: append resource
* add action
* feat: vis 2d for plr
* fix
* fix: browser on rviz
* fix: cloud bridge error fallback to local
* fix: salve auto run rviz
* 初始化两个plate
* Device visualization (#22 )
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* add 3d visualization
* 完成在main中启动设备可视化
完成在main中启动设备可视化,并输出物料ID:mesh的对应关系resource_model
添加物料模型管理类,遍历物料与resource_model,完成TF数据收集
* 完成TF发布
* 修改模型方向,在yaml中添加变换属性
* 添加物料tf变化时,发送topic到前端
另外修改了物料初始化的方法,防止在tf还未发布时提前建立物料模型与发布话题
* 添加关节发布节点与物料可视化节点进入unilab
* 使用json启动plr与3D模型仿真
* 完成启动OT并联动rviz
* 修复rviz位置问题,
修复rviz位置问题,
在无tf变动时减缓发送频率
在backend中添加物料跟随方法
* fix: running logic
* fix: running logic
* fix: missing ot
* 在main中直接初始化republisher和物料的mesh节点
* 将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
* 编写mesh添加action
* add action
* fix
* fix: browser on rviz
* fix: cloud bridge error fallback to local
* fix: salve auto run rviz
* 初始化两个plate
---------
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
* fix: multi channel
* fix: aspirate
* fix: aspirate
* fix: aspirate
* fix: aspirate
* 提交
* fix: jobadd
* fix: jobadd
* fix: msg converter
* tijiao
* add resource creat easy action
* identify debug msg
* mq client id
* 提取lh的joint发布
* unify liquid_handler definition
* 修改物料跟随与物料添加逻辑
修改物料跟随与物料添加逻辑
将joint_publisher类移出lh的backends,但仍需要对lh的backends进行一些改写
* Revert "修改物料跟随与物料添加逻辑"
This reverts commit 498c997ad7 .
* Reapply "修改物料跟随与物料添加逻辑"
This reverts commit 3a60d2ae81 .
* Revert "Merge remote-tracking branch 'upstream/dev' into device_visualization"
This reverts commit fa727220af , reversing
changes made to 498c997ad7 .
* 修改物料放下时的方法,如果选择
修改物料放下时的方法,
如果选择drop_trash,则删除物料显示
如果选择drop,则让其解除连接
* add biomek.py demo implementation
* 更新LiquidHandlerBiomek类,添加资源创建功能,优化协议创建方法,修复部分代码格式问题,更新YAML配置以支持新功能。
* Test
* fix biomek success type
* Convert LH action to biomek.
* Update biomek.py
* 注册表上报handle和schema (param input)
* 修复biomek缺少的字段
* delete 's'
* Remove warnings
* Update biomek.py
* Biomek test
* Update biomek.py
* 新增transfer_biomek的msg
* New transfer_biomek
* Updated transfer_biomek
* 更新transfer_biomek的msg
* 更新transfer_biomek的msg
* 支持Biomek创建
* new action
* fix key name typo
* New parameter for biomek to run.
* Refine
* Update
* new actions
* new actions
* 1
* registry
* fix biomek startup
add action handles
* fix handles not as default entry
* unilab添加moveit启动
1,整合所有moveit节点到一个move_group中,并整合所有的controller依次激活
2,添加pymoveit2的节点,使用json可直接启动
3,修改机械臂规划方式,添加约束,让冗余关节不会进行过多移动
* biomek_test.py
biomek_test.py是最新的版本,运行它会生成complete_biomek_protocol.json
* Update biomek.py
* biomek_test.py
* fix liquid_handler.biomek handles
* 修改物体attach时,多次赋值当前时间导致卡顿问题,
* Revert "修改物体attach时,多次赋值当前时间导致卡顿问题,"
This reverts commit 56d45b94f5 .
* Reapply "修改物体attach时,多次赋值当前时间导致卡顿问题,"
This reverts commit 07d9db20c3 .
* 添加缺少物料:"plate_well_G12",
* host node新增resource add时间统计
create_resource新增handle
bump version to 0.9.2
* 修正物料上传时间
改用biomek_test
增加ResultInfoEncoder
支持返回结果上传
* 正确发送return_info结果
* 同步执行状态信息
* 取消raiseValueError提示
* Update biomek_test.py
* 0608 DONE
* 同步了Biomek.py 现在应可用
* biomek switch back to non-test
* temp disable initialize resource
* add
* fix tip resource data
* liquid states
* change to debug level
* Revert "change to debug level"
This reverts commit 5d9953c3e5 .
* Reapply "change to debug level"
This reverts commit 2487bb6ffc .
* fix tip resource data
* add full device
* add moveit yaml
* 修复moveit
增加post_init阶段,给予ros_node反向
* remove necessary node
* fix moveit action client
* remove necessary imports
* Update moveit_interface.py
* fix handler_key uppercase
* json add liquids
* fix setup
* add
* change to "sources" and "targets" for lh
* bump version
* remove parent's parent link
---------
Co-authored-by: Harvey Que <Q-Query@outlook.com >
Co-authored-by: wznln <18435084+Xuwznln@users.noreply.github.com >
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: Junhan Chang <changjh@pku.edu.cn >
Co-authored-by: Guangxin Zhang <guangxin.zhang.bio@gmail.com >
Co-authored-by: qxw138 <qxw@stu.pku.edu.cn >
2025-06-09 17:06:04 +08:00
Xuwznln
729a0fcf0c
37-biomek-i5i7 ( #40 )
...
* add biomek.py demo implementation
* 更新LiquidHandlerBiomek类,添加资源创建功能,优化协议创建方法,修复部分代码格式问题,更新YAML配置以支持新功能。
* Test
* fix biomek success type
* Convert LH action to biomek.
* Update biomek.py
* 注册表上报handle和schema (param input)
* 修复biomek缺少的字段
* delete 's'
* Remove warnings
* Update biomek.py
* Biomek test
* Update biomek.py
* 新增transfer_biomek的msg
* New transfer_biomek
* Updated transfer_biomek
* 更新transfer_biomek的msg
* 更新transfer_biomek的msg
* 支持Biomek创建
* new action
* fix key name typo
* New parameter for biomek to run.
* Refine
* Update
* new actions
* new actions
* 1
* registry
* fix biomek startup
add action handles
* fix handles not as default entry
* biomek_test.py
biomek_test.py是最新的版本,运行它会生成complete_biomek_protocol.json
* Update biomek.py
* biomek_test.py
* fix liquid_handler.biomek handles
* host node新增resource add时间统计
create_resource新增handle
bump version to 0.9.2
* 修正物料上传时间
改用biomek_test
增加ResultInfoEncoder
支持返回结果上传
* 正确发送return_info结果
* 同步执行状态信息
* 取消raiseValueError提示
* Update biomek_test.py
* 0608 DONE
* 同步了Biomek.py 现在应可用
* biomek switch back to non-test
* temp disable initialize resource
* Refine biomek
* Refine copy issue
* Refine
---------
Co-authored-by: Junhan Chang <changjh@pku.edu.cn >
Co-authored-by: Guangxin Zhang <guangxin.zhang.bio@gmail.com >
Co-authored-by: qxw138 <qxw@stu.pku.edu.cn >
2025-06-09 16:57:42 +08:00
Xuwznln
6ae77e0408
temp disable initialize resource
2025-06-08 17:07:48 +08:00
Xuwznln
bab4b1d67a
biomek switch back to non-test
2025-06-08 17:05:48 +08:00
Guangxin Zhang
12c17ec26e
同步了Biomek.py 现在应可用
2025-06-08 16:58:19 +08:00
Guangxin Zhang
6577fe12eb
0608 DONE
2025-06-08 16:49:11 +08:00
qxw138
f1fee5fad9
Merge branch '37-biomek-i5i7' of https://github.com/dptech-corp/Uni-Lab-OS into 37-biomek-i5i7
2025-06-08 15:52:31 +08:00
qxw138
9b3377aedb
Update biomek_test.py
2025-06-08 15:52:20 +08:00
Xuwznln
526327727d
取消raiseValueError提示
2025-06-08 15:34:56 +08:00
Xuwznln
aaa86314e3
同步执行状态信息
2025-06-08 15:34:16 +08:00
Xuwznln
6a14104e6b
正确发送return_info结果
2025-06-08 15:06:38 +08:00
Xuwznln
ab0c4b708b
修正物料上传时间
...
改用biomek_test
增加ResultInfoEncoder
支持返回结果上传
2025-06-08 14:43:07 +08:00
Xuwznln
c0b7f2decd
host node新增resource add时间统计
...
create_resource新增handle
bump version to 0.9.2
2025-06-08 13:23:55 +08:00
Junhan Chang
b6c9530c61
Merge branch '37-biomek-i5i7' of https://github.com/dptech-corp/Uni-Lab-OS into 37-biomek-i5i7
2025-06-07 18:52:23 +08:00
Junhan Chang
8698821c52
fix liquid_handler.biomek handles
2025-06-07 18:52:20 +08:00
qxw138
3f53f88390
biomek_test.py
2025-06-07 15:21:20 +08:00
qxw138
e840516ba4
Update biomek.py
2025-06-06 22:50:11 +08:00
qxw138
146d8c5296
Merge branch '37-biomek-i5i7' of https://github.com/dptech-corp/Uni-Lab-OS into 37-biomek-i5i7
2025-06-06 22:49:35 +08:00
qxw138
6573c9e02e
biomek_test.py
...
biomek_test.py是最新的版本,运行它会生成complete_biomek_protocol.json
2025-06-06 22:42:06 +08:00
Xuwznln
c7b9c6a825
fix handles not as default entry
2025-06-06 18:13:53 +08:00
Xuwznln
48c43d3303
fix biomek startup
...
add action handles
2025-06-06 17:45:54 +08:00
Xuwznln
55be5e8188
registry
2025-06-06 17:21:19 +08:00
qxw138
1b9f3c666d
1
2025-06-06 14:44:17 +08:00
qxw138
097114d38c
new actions
2025-06-06 14:31:10 +08:00
qxw138
5bec899479
new actions
2025-06-06 13:56:39 +08:00
Guangxin Zhang
5e86112ebf
Merge branch '37-biomek-i5i7' of https://github.com/dptech-corp/Uni-Lab-OS into 37-biomek-i5i7
2025-06-06 13:25:34 +08:00
Guangxin Zhang
24ecb13b79
Update
2025-06-06 13:22:15 +08:00
qxw138
2573d34713
Merge branch '37-biomek-i5i7' of https://github.com/dptech-corp/Uni-Lab-OS into 37-biomek-i5i7
2025-06-06 13:18:42 +08:00
Guangxin Zhang
106d71e1db
Refine
2025-06-06 11:11:17 +08:00
Guangxin Zhang
3c2a4a64ac
Merge branch '37-biomek-i5i7' of https://github.com/dptech-corp/Uni-Lab-OS into 37-biomek-i5i7
2025-06-06 11:11:10 +08:00
Guangxin Zhang
1e00a66a65
New parameter for biomek to run.
2025-06-06 11:05:36 +08:00
qxw138
46da42deef
Merge branch '37-biomek-i5i7' of https://github.com/dptech-corp/Uni-Lab-OS into 37-biomek-i5i7
2025-06-06 00:13:11 +08:00
Xuwznln
101c1bc3cc
fix key name typo
2025-06-05 22:15:57 +08:00
qxw138
a62112ae26
new action
2025-06-05 17:26:36 +08:00
Xuwznln
dd5a7cab75
支持Biomek创建
2025-06-05 16:04:44 +08:00
Xuwznln
39de3ac58e
更新transfer_biomek的msg
2025-06-05 15:41:16 +08:00
Xuwznln
b99969278c
更新transfer_biomek的msg
2025-06-05 15:30:51 +08:00
Guangxin Zhang
b957ad2f71
Merge branch '37-biomek-i5i7' of https://github.com/dptech-corp/Uni-Lab-OS into 37-biomek-i5i7
2025-06-04 21:49:27 +08:00
Guangxin Zhang
e1a7c3a103
Updated transfer_biomek
2025-06-04 21:49:22 +08:00
Guangxin Zhang
e63c15997c
New transfer_biomek
2025-06-04 21:29:54 +08:00
Xuwznln
c5a495f409
新增transfer_biomek的msg
2025-06-04 19:03:00 +08:00
Guangxin Zhang
5b240cb0ea
Update biomek.py
2025-06-04 17:30:53 +08:00
Guangxin Zhang
147b8f47c0
Biomek test
2025-06-04 16:38:18 +08:00
Guangxin Zhang
6d2489af5f
Merge branch '37-biomek-i5i7' of https://github.com/dptech-corp/Uni-Lab-OS into 37-biomek-i5i7
2025-06-04 13:27:11 +08:00
Guangxin Zhang
807dcdd226
Update biomek.py
2025-06-04 13:27:05 +08:00
Guangxin Zhang
8a29bc5597
Remove warnings
2025-06-04 13:20:12 +08:00
Guangxin Zhang
6f6c70ee57
delete 's'
2025-06-04 13:11:45 +08:00
Xuwznln
478a85951c
修复biomek缺少的字段
2025-05-31 00:00:55 +08:00
Xuwznln
0f2555c90c
注册表上报handle和schema (param input)
2025-05-31 00:00:39 +08:00
Guangxin Zhang
d2dda6ee03
Merge branch '37-biomek-i5i7' of https://github.com/dptech-corp/Uni-Lab-OS into 37-biomek-i5i7
2025-05-30 17:11:23 +08:00
Guangxin Zhang
208540b307
Update biomek.py
2025-05-30 17:08:19 +08:00
Guangxin Zhang
cb7c56a1d9
Convert LH action to biomek.
2025-05-30 17:00:06 +08:00
Xuwznln
ea2e9c3e3a
fix biomek success type
2025-05-30 16:50:13 +08:00
Guangxin Zhang
0452a68180
Test
2025-05-30 16:03:49 +08:00
Xuwznln
90a0f3db9b
merge
2025-05-30 15:40:14 +08:00
Junhan Chang
055d120ba8
更新LiquidHandlerBiomek类,添加资源创建功能,优化协议创建方法,修复部分代码格式问题,更新YAML配置以支持新功能。
2025-05-30 15:38:23 +08:00
Junhan Chang
a948f09f60
add biomek.py demo implementation
2025-05-30 13:33:10 +08:00