mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2026-02-05 22:15:04 +00:00
* 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>
144 lines
4.9 KiB
Python
144 lines
4.9 KiB
Python
# import numpy as np
|
|
# import networkx as nx
|
|
|
|
|
|
# def generate_evacuateandrefill_protocol(
|
|
# G: nx.DiGraph,
|
|
# vessel: str,
|
|
# gas: str,
|
|
# repeats: int = 1
|
|
# ) -> list[dict]:
|
|
# """
|
|
# 生成泵操作的动作序列。
|
|
|
|
# :param G: 有向图, 节点为容器和注射泵, 边为流体管道, A→B边的属性为管道接A端的阀门位置
|
|
# :param from_vessel: 容器A
|
|
# :param to_vessel: 容器B
|
|
# :param volume: 转移的体积
|
|
# :param flowrate: 最终注入容器B时的流速
|
|
# :param transfer_flowrate: 泵骨架中转移流速(若不指定,默认与注入流速相同)
|
|
# :return: 泵操作的动作序列
|
|
# """
|
|
|
|
# # 生成电磁阀、真空泵、气源操作的动作序列
|
|
# vacuum_action_sequence = []
|
|
# nodes = G.nodes(data=True)
|
|
|
|
# # 找到和 vessel 相连的电磁阀和真空泵、气源
|
|
# vacuum_backbone = {"vessel": vessel}
|
|
|
|
# for neighbor in G.neighbors(vessel):
|
|
# if nodes[neighbor]["class"].startswith("solenoid_valve"):
|
|
# for neighbor2 in G.neighbors(neighbor):
|
|
# if neighbor2 == vessel:
|
|
# continue
|
|
# if nodes[neighbor2]["class"].startswith("vacuum_pump"):
|
|
# vacuum_backbone.update({"vacuum_valve": neighbor, "pump": neighbor2})
|
|
# break
|
|
# elif nodes[neighbor2]["class"].startswith("gas_source"):
|
|
# vacuum_backbone.update({"gas_valve": neighbor, "gas": neighbor2})
|
|
# break
|
|
# # 判断是否设备齐全
|
|
# if len(vacuum_backbone) < 5:
|
|
# print(f"\n\n\n{vacuum_backbone}\n\n\n")
|
|
# raise ValueError("Not all devices are connected to the vessel.")
|
|
|
|
# # 生成操作的动作序列
|
|
# for i in range(repeats):
|
|
# # 打开真空泵阀门、关闭气源阀门
|
|
# vacuum_action_sequence.append([
|
|
# {
|
|
# "device_id": vacuum_backbone["vacuum_valve"],
|
|
# "action_name": "set_valve_position",
|
|
# "action_kwargs": {
|
|
# "command": "OPEN"
|
|
# }
|
|
# },
|
|
# {
|
|
# "device_id": vacuum_backbone["gas_valve"],
|
|
# "action_name": "set_valve_position",
|
|
# "action_kwargs": {
|
|
# "command": "CLOSED"
|
|
# }
|
|
# }
|
|
# ])
|
|
|
|
# # 打开真空泵、关闭气源
|
|
# vacuum_action_sequence.append([
|
|
# {
|
|
# "device_id": vacuum_backbone["pump"],
|
|
# "action_name": "set_status",
|
|
# "action_kwargs": {
|
|
# "string": "ON"
|
|
# }
|
|
# },
|
|
# {
|
|
# "device_id": vacuum_backbone["gas"],
|
|
# "action_name": "set_status",
|
|
# "action_kwargs": {
|
|
# "string": "OFF"
|
|
# }
|
|
# }
|
|
# ])
|
|
# vacuum_action_sequence.append({"action_name": "wait", "action_kwargs": {"time": 60}})
|
|
|
|
# # 关闭真空泵阀门、打开气源阀门
|
|
# vacuum_action_sequence.append([
|
|
# {
|
|
# "device_id": vacuum_backbone["vacuum_valve"],
|
|
# "action_name": "set_valve_position",
|
|
# "action_kwargs": {
|
|
# "command": "CLOSED"
|
|
# }
|
|
# },
|
|
# {
|
|
# "device_id": vacuum_backbone["gas_valve"],
|
|
# "action_name": "set_valve_position",
|
|
# "action_kwargs": {
|
|
# "command": "OPEN"
|
|
# }
|
|
# }
|
|
# ])
|
|
|
|
# # 关闭真空泵、打开气源
|
|
# vacuum_action_sequence.append([
|
|
# {
|
|
# "device_id": vacuum_backbone["pump"],
|
|
# "action_name": "set_status",
|
|
# "action_kwargs": {
|
|
# "string": "OFF"
|
|
# }
|
|
# },
|
|
# {
|
|
# "device_id": vacuum_backbone["gas"],
|
|
# "action_name": "set_status",
|
|
# "action_kwargs": {
|
|
# "string": "ON"
|
|
# }
|
|
# }
|
|
# ])
|
|
# vacuum_action_sequence.append({"action_name": "wait", "action_kwargs": {"time": 60}})
|
|
|
|
# # 关闭气源
|
|
# vacuum_action_sequence.append(
|
|
# {
|
|
# "device_id": vacuum_backbone["gas"],
|
|
# "action_name": "set_status",
|
|
# "action_kwargs": {
|
|
# "string": "OFF"
|
|
# }
|
|
# }
|
|
# )
|
|
|
|
# # 关闭阀门
|
|
# vacuum_action_sequence.append(
|
|
# {
|
|
# "device_id": vacuum_backbone["gas_valve"],
|
|
# "action_name": "set_valve_position",
|
|
# "action_kwargs": {
|
|
# "command": "CLOSED"
|
|
# }
|
|
# }
|
|
# )
|
|
# return vacuum_action_sequence
|