mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2025-12-17 21:11:12 +00:00
* 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 * 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> * 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 commit498c997ad7. * Reapply "修改物料跟随与物料添加逻辑" This reverts commit3a60d2ae81. * Revert "Merge remote-tracking branch 'upstream/dev' into device_visualization" This reverts commitfa727220af, reversing changes made to498c997ad7. * 修改物料放下时的方法,如果选择 修改物料放下时的方法, 如果选择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 commit56d45b94f5. * Reapply "修改物体attach时,多次赋值当前时间导致卡顿问题," This reverts commit07d9db20c3. * 添加缺少物料:"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 commit5d9953c3e5. * Reapply "change to debug level" This reverts commit2487bb6ffc. * 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> * 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 commit498c997ad7. * Reapply "修改物料跟随与物料添加逻辑" This reverts commit3a60d2ae81. * Revert "Merge remote-tracking branch 'upstream/dev' into device_visualization" This reverts commitfa727220af, reversing changes made to498c997ad7. * 修改物料放下时的方法,如果选择 修改物料放下时的方法, 如果选择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 commit56d45b94f5. * Reapply "修改物体attach时,多次赋值当前时间导致卡顿问题," This reverts commit07d9db20c3. * 添加缺少物料:"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 commit5d9953c3e5. * Reapply "change to debug level" This reverts commit2487bb6ffc. * 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> * fix move it * fix move it * create_resource * bump ver modify slot type * 增加modbus支持 调整protocol node以更好支持多种类型的read和write * 调整protocol node以更好支持多种类型的read和write * 补充日志 * 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 commit498c997ad7. * Reapply "修改物料跟随与物料添加逻辑" This reverts commit3a60d2ae81. * Revert "Merge remote-tracking branch 'upstream/dev' into device_visualization" This reverts commitfa727220af, reversing changes made to498c997ad7. * 修改物料放下时的方法,如果选择 修改物料放下时的方法, 如果选择drop_trash,则删除物料显示 如果选择drop,则让其解除连接 * unilab添加moveit启动 1,整合所有moveit节点到一个move_group中,并整合所有的controller依次激活 2,添加pymoveit2的节点,使用json可直接启动 3,修改机械臂规划方式,添加约束,让冗余关节不会进行过多移动 * 修改物体attach时,多次赋值当前时间导致卡顿问题, * Revert "修改物体attach时,多次赋值当前时间导致卡顿问题," This reverts commit56d45b94f5. * Reapply "修改物体attach时,多次赋值当前时间导致卡顿问题," This reverts commit07d9db20c3. * 添加缺少物料:"plate_well_G12", * add * fix tip resource data * liquid states * change to debug level * Revert "change to debug level" This reverts commit5d9953c3e5. * Reapply "change to debug level" This reverts commit2487bb6ffc. * 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> * 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> * bump version & protocol fix * hotfix: Add macos_sdk_config (#46) Co-authored-by: quehh <scienceol@outlook.com> * include device_mesh when pip install * 测试自动构建 * try build fix * try build * test artifacts * hotfix: Add .certs in .gitignore * create container * container 添加和更新完成 * 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> * 更新workstation注册表 * 添加了两个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> * 新增注册表补全功能,修复Protocol执行失败 * 支持通过导入方式补全注册表,新增工作流unilabos_device_id字段 * 修复不启用注册表补充就无法启动的bug * 修复部分识别error * 修复静态方法识别get status,注册表支持python类型 * status types对于嵌套类型返回的对象,暂时处理成字符串,无法直接进行转换 * 支持通过list[int],list[float]进行Int64MultiArray,Float64MultiArray的替换 * 成功动态导入的不再需要使用静态导入 * Fix handle names (#55) * fix handle names * improve evacuateAndRefill gas source finding * add camera and dependency (#56) * 修复auto-的Action在protocol node下错误注册 * 匹配init param schema格式 * Add channel_sources config in conda_build_config.yaml (#58) * 修复任务执行传参 * 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> * 转换到ros消息时,要进行基础类型转换 * Update work_station.yaml (#60) * Update work_station.yaml * Checklist里面有XDL跟protocol之间没对齐的问题,工作量有点大找时间写完 * Create prcxi.py * Update prcxi.py * Update Prcxi * 更新中析仪器,以及启动示例 * 修改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 commit498c997ad7. * Reapply "修改物料跟随与物料添加逻辑" This reverts commit3a60d2ae81. * Revert "Merge remote-tracking branch 'upstream/dev' into device_visualization" This reverts commitfa727220af, reversing changes made to498c997ad7. * 修改物料放下时的方法,如果选择 修改物料放下时的方法, 如果选择drop_trash,则删除物料显示 如果选择drop,则让其解除连接 * unilab添加moveit启动 1,整合所有moveit节点到一个move_group中,并整合所有的controller依次激活 2,添加pymoveit2的节点,使用json可直接启动 3,修改机械臂规划方式,添加约束,让冗余关节不会进行过多移动 * 修改物体attach时,多次赋值当前时间导致卡顿问题, * Revert "修改物体attach时,多次赋值当前时间导致卡顿问题," This reverts commit56d45b94f5. * Reapply "修改物体attach时,多次赋值当前时间导致卡顿问题," This reverts commit07d9db20c3. * 添加缺少物料:"plate_well_G12", * add * fix tip resource data * liquid states * change to debug level * Revert "change to debug level" This reverts commit5d9953c3e5. * Reapply "change to debug level" This reverts commit2487bb6ffc. * 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> * 更新实例 * 更新实例 * 更新实例 * 修正prcxi启动 * 更新PRCXI配置,修改主机地址和设置状态,并添加示例用法 * add pickup tips for prcxi * 任意执行错误都应该返回failed * 任意执行错误都应该返回failed * Add plateT6 to PRCXI configuration and enhance error handling in liquid handling * prcxi blending * assert blending_times > 0 * update prcxi * update prcxi registry * Update prcxi.py to fit the function in unilabos. * 不生成已配置action的动作,增加prcxi的debug模式 * 增加注册表版本参数,支持将auto-指令人工检查后非auto,不生成人工已检查的指令,取消不必要的description生成 * 增加注册表版本参数,支持将auto-指令人工检查后非auto,不生成人工已检查的指令,取消不必要的description生成 * Update prcxi.py * 修复了部分的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> * 修复action移除时的报错,更新注册表 * Update prcxi.py * Update prcxi.py * 新增simulator * Update prcxi.py * Update trash * Update prcxi.py * Update prcxi.py * Update for discard tips * Update prcxi.py * Update PRCXI * 更新axis等参数 * Update 9320 * get_well_container&get_tip_rack * update * Update 9320 * update * deck * 更新注册表&增加资源,parent应为resources字段 * Update 9320 * update * 新增set liquid方法 * 新增set liquid方法 * action to resource & 0.9.12 (#64) * action to resource & 0.9.12 * stir和adjustph的中的bug修不好 * modify prcxi * 0.9.12 update registry * update * update * registry upadte * Update * update * container_for_nothing * mix * registry fix * registry fix * registry fix * Update * Update prcxi.py * SET TIP RACK * bump version * update registry version & category * update set tip rack * yaml dump支持ordered dict,支持config_info * fix devices * fix resource check serialize * 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> * 采用http报送resource * 采用http报送resource * update * Update .gitignore * bump version to 0.10.0 * default param simulator * slim * Update * Update for prcxi * Update * Update * 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. * test * update * Update prcxi_9300.json This one is good * update * fix protocol_node communication transfer * 修复注册表handles类型错误的问题 * 物料添加失败应该直接raise ValueError,不要等待 * 更正注册表中的数字类型 * Delete unnecessary files. * 新增lab_id直接传入 * fix vessel_id param passing in protocols * 新增dll预载,保证部分设备可正常使用unilabos_msgs * 修复可能的web template找不到的问题 新增联网获取json启动 删除非-g传入启动json的方式 兼容传参参数名短横线与下划线 * 修复可能的web template找不到的问题 新增联网获取json启动 删除非-g传入启动json的方式 兼容传参参数名短横线与下划线 更新版本到0.10.1 修复Upload Registry镜像不匹配 * 新增用户引导 * 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 commit498c997ad7. * Reapply "修改物料跟随与物料添加逻辑" This reverts commit3a60d2ae81. * Revert "Merge remote-tracking branch 'upstream/dev' into device_visualization" This reverts commitfa727220af, reversing changes made to498c997ad7. * 修改物料放下时的方法,如果选择 修改物料放下时的方法, 如果选择drop_trash,则删除物料显示 如果选择drop,则让其解除连接 * unilab添加moveit启动 1,整合所有moveit节点到一个move_group中,并整合所有的controller依次激活 2,添加pymoveit2的节点,使用json可直接启动 3,修改机械臂规划方式,添加约束,让冗余关节不会进行过多移动 * 修改物体attach时,多次赋值当前时间导致卡顿问题, * Revert "修改物体attach时,多次赋值当前时间导致卡顿问题," This reverts commit56d45b94f5. * Reapply "修改物体attach时,多次赋值当前时间导致卡顿问题," This reverts commit07d9db20c3. * 添加缺少物料:"plate_well_G12", * add * fix tip resource data * liquid states * change to debug level * Revert "change to debug level" This reverts commit5d9953c3e5. * Reapply "change to debug level" This reverts commit2487bb6ffc. * 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> * 更新注册表 --------- 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> Co-authored-by: q434343 <73513873+q434343@users.noreply.github.com> Co-authored-by: Harvey Que <Q-Query@outlook.com> Co-authored-by: Kongchang Feng <2100011801@stu.pku.edu.cn> Co-authored-by: hh. <103566763+Mile-Away@users.noreply.github.com> Co-authored-by: quehh <scienceol@outlook.com> Co-authored-by: Harvey Que <quehaohui@dp.tech> Co-authored-by: Junhan Chang <changjh@dp.tech> Co-authored-by: ZiWei <131428629+ZiWei09@users.noreply.github.com>
1105 lines
31 KiB
JSON
1105 lines
31 KiB
JSON
{
|
|
"nodes": [
|
|
{
|
|
"id": "OrganicSynthesisStation",
|
|
"name": "有机化学流程综合测试工作站",
|
|
"children": [
|
|
"multiway_valve_1",
|
|
"multiway_valve_2",
|
|
"transfer_pump_1",
|
|
"transfer_pump_2",
|
|
"reagent_bottle_1",
|
|
"reagent_bottle_2",
|
|
"reagent_bottle_3",
|
|
"reagent_bottle_4",
|
|
"reagent_bottle_5",
|
|
"centrifuge_1",
|
|
"rotavap_1",
|
|
"main_reactor",
|
|
"heater_1",
|
|
"stirrer_1",
|
|
"stirrer_2",
|
|
"waste_bottle_1",
|
|
"waste_bottle_2",
|
|
"solenoid_valve_1",
|
|
"solenoid_valve_2",
|
|
"solenoid_valve_3",
|
|
"vacuum_pump_1",
|
|
"gas_source_1",
|
|
"h2_gas_source",
|
|
"filter_1",
|
|
"column_1",
|
|
"separator_1",
|
|
"collection_bottle_1",
|
|
"collection_bottle_2",
|
|
"collection_bottle_3",
|
|
"solid_dispenser_1",
|
|
"solid_reagent_bottle_1",
|
|
"solid_reagent_bottle_2",
|
|
"solid_reagent_bottle_3"
|
|
],
|
|
"parent": null,
|
|
"type": "device",
|
|
"class": "workstation",
|
|
"position": {
|
|
"x": 600,
|
|
"y": 400,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"protocol_type": [
|
|
"AddProtocol",
|
|
"TransferProtocol",
|
|
"StartStirProtocol",
|
|
"StopStirProtocol",
|
|
"StirProtocol",
|
|
"RunColumnProtocol",
|
|
"CentrifugeProtocol",
|
|
"FilterProtocol",
|
|
"CleanVesselProtocol",
|
|
"DissolveProtocol",
|
|
"FilterThroughProtocol",
|
|
"WashSolidProtocol",
|
|
"SeparateProtocol",
|
|
"EvaporateProtocol",
|
|
"HeatChillProtocol",
|
|
"HeatChillStartProtocol",
|
|
"HeatChillStopProtocol",
|
|
"EvacuateAndRefillProtocol",
|
|
"PumpTransferProtocol",
|
|
"AdjustPHProtocol",
|
|
"ResetHandlingProtocol",
|
|
"DryProtocol",
|
|
"HydrogenateProtocol",
|
|
"RecrystallizeProtocol"
|
|
]
|
|
},
|
|
"data": {}
|
|
},
|
|
{
|
|
"id": "multiway_valve_1",
|
|
"name": "八通阀门1",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_multiway_valve",
|
|
"position": {
|
|
"x": 400,
|
|
"y": 300,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"positions": 8
|
|
},
|
|
"data": {
|
|
"valve_state": "Ready",
|
|
"current_position": 1
|
|
}
|
|
},
|
|
{
|
|
"id": "multiway_valve_2",
|
|
"name": "八通阀门2",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_multiway_valve",
|
|
"position": {
|
|
"x": 800,
|
|
"y": 300,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"positions": 8
|
|
},
|
|
"data": {
|
|
"valve_state": "Ready",
|
|
"current_position": 1
|
|
}
|
|
},
|
|
{
|
|
"id": "transfer_pump_1",
|
|
"name": "转移泵1",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_transfer_pump",
|
|
"position": {
|
|
"x": 350,
|
|
"y": 250,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"max_volume": 25.0,
|
|
"transfer_rate": 10.0
|
|
},
|
|
"data": {
|
|
"status": "Idle",
|
|
"current_volume": 0.0
|
|
}
|
|
},
|
|
{
|
|
"id": "transfer_pump_2",
|
|
"name": "转移泵2",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_transfer_pump",
|
|
"position": {
|
|
"x": 850,
|
|
"y": 250,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"max_volume": 25.0,
|
|
"transfer_rate": 10.0
|
|
},
|
|
"data": {
|
|
"status": "Idle",
|
|
"current_volume": 0.0
|
|
}
|
|
},
|
|
{
|
|
"id": "reagent_bottle_1",
|
|
"name": "试剂瓶1-DMF",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "container",
|
|
"class": "container",
|
|
"position": {
|
|
"x": 200,
|
|
"y": 150,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"volume": 1000.0,
|
|
"reagent": "DMF"
|
|
},
|
|
"data": {
|
|
"current_volume": 1000.0,
|
|
"reagent_name": "DMF"
|
|
}
|
|
},
|
|
{
|
|
"id": "reagent_bottle_2",
|
|
"name": "试剂瓶2-乙酸乙酯",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "container",
|
|
"class": "container",
|
|
"position": {
|
|
"x": 250,
|
|
"y": 150,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"volume": 1000.0,
|
|
"reagent": "ethyl_acetate"
|
|
},
|
|
"data": {
|
|
"current_volume": 1000.0,
|
|
"reagent_name": "ethyl_acetate"
|
|
}
|
|
},
|
|
{
|
|
"id": "reagent_bottle_3",
|
|
"name": "试剂瓶3-己烷",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "container",
|
|
"class": "container",
|
|
"position": {
|
|
"x": 300,
|
|
"y": 150,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"volume": 1000.0,
|
|
"reagent": "hexane"
|
|
},
|
|
"data": {
|
|
"current_volume": 1000.0,
|
|
"reagent_name": "hexane"
|
|
}
|
|
},
|
|
{
|
|
"id": "reagent_bottle_4",
|
|
"name": "试剂瓶4-甲醇",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "container",
|
|
"class": "container",
|
|
"position": {
|
|
"x": 900,
|
|
"y": 150,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"volume": 1000.0,
|
|
"reagent": "methanol"
|
|
},
|
|
"data": {
|
|
"current_volume": 1000.0,
|
|
"reagent_name": "methanol"
|
|
}
|
|
},
|
|
{
|
|
"id": "reagent_bottle_5",
|
|
"name": "试剂瓶5-水",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "container",
|
|
"class": "container",
|
|
"position": {
|
|
"x": 950,
|
|
"y": 150,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"volume": 1000.0,
|
|
"reagent": "water"
|
|
},
|
|
"data": {
|
|
"current_volume": 1000.0,
|
|
"reagent_name": "water"
|
|
}
|
|
},
|
|
{
|
|
"id": "centrifuge_1",
|
|
"name": "离心机",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_centrifuge",
|
|
"position": {
|
|
"x": 200,
|
|
"y": 400,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"max_speed": 15000.0,
|
|
"max_temp": 40.0,
|
|
"min_temp": 4.0
|
|
},
|
|
"data": {
|
|
"current_speed": 0.0,
|
|
"status": "Idle"
|
|
}
|
|
},
|
|
{
|
|
"id": "rotavap_1",
|
|
"name": "旋转蒸发仪",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_rotavap",
|
|
"position": {
|
|
"x": 300,
|
|
"y": 400,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"max_temp": 180.0,
|
|
"max_rotation_speed": 280.0
|
|
},
|
|
"data": {
|
|
"status": "Idle",
|
|
"current_temp": 25.0,
|
|
"rotation_speed": 0.0
|
|
}
|
|
},
|
|
{
|
|
"id": "main_reactor",
|
|
"name": "主反应器",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "container",
|
|
"class": "container",
|
|
"position": {
|
|
"x": 400,
|
|
"y": 450,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"volume": 500.0,
|
|
"max_temp": 200.0,
|
|
"min_temp": -20.0,
|
|
"has_stirrer": true,
|
|
"has_heater": true
|
|
},
|
|
"data": {
|
|
"current_volume": 0.0,
|
|
"current_temp": 25.0
|
|
}
|
|
},
|
|
{
|
|
"id": "heater_1",
|
|
"name": "加热器",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_heatchill",
|
|
"position": {
|
|
"x": 450,
|
|
"y": 450,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"max_temp": 200.0,
|
|
"min_temp": -20.0
|
|
},
|
|
"data": {
|
|
"status": "Idle",
|
|
"current_temp": 25.0
|
|
}
|
|
},
|
|
{
|
|
"id": "stirrer_1",
|
|
"name": "搅拌器1",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_stirrer",
|
|
"position": {
|
|
"x": 350,
|
|
"y": 450,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"max_speed": 2000.0
|
|
},
|
|
"data": {
|
|
"status": "Idle",
|
|
"current_speed": 0.0
|
|
}
|
|
},
|
|
{
|
|
"id": "stirrer_2",
|
|
"name": "搅拌器2",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_stirrer",
|
|
"position": {
|
|
"x": 351,
|
|
"y": 451,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"max_speed": 2000.0
|
|
},
|
|
"data": {
|
|
"status": "Idle",
|
|
"current_speed": 0.0
|
|
}
|
|
},
|
|
{
|
|
"id": "waste_bottle_1",
|
|
"name": "废液瓶1",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "container",
|
|
"class": "container",
|
|
"position": {
|
|
"x": 500,
|
|
"y": 400,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"volume": 2000.0
|
|
},
|
|
"data": {
|
|
"current_volume": 0.0
|
|
}
|
|
},
|
|
{
|
|
"id": "waste_bottle_2",
|
|
"name": "废液瓶2",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "container",
|
|
"class": "container",
|
|
"position": {
|
|
"x": 1100,
|
|
"y": 500,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"volume": 2000.0
|
|
},
|
|
"data": {
|
|
"current_volume": 0.0
|
|
}
|
|
},
|
|
{
|
|
"id": "solenoid_valve_1",
|
|
"name": "电磁阀1",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_solenoid_valve",
|
|
"position": {
|
|
"x": 700,
|
|
"y": 200,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"voltage": 12.0,
|
|
"response_time": 0.1
|
|
},
|
|
"data": {
|
|
"valve_state": "Closed",
|
|
"is_open": false
|
|
}
|
|
},
|
|
{
|
|
"id": "solenoid_valve_2",
|
|
"name": "电磁阀2",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_solenoid_valve",
|
|
"position": {
|
|
"x": 700,
|
|
"y": 150,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"voltage": 12.0,
|
|
"response_time": 0.1
|
|
},
|
|
"data": {
|
|
"valve_state": "Closed",
|
|
"is_open": false
|
|
}
|
|
},
|
|
{
|
|
"id": "solenoid_valve_3",
|
|
"name": "氢气电磁阀",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_solenoid_valve",
|
|
"position": {
|
|
"x": 450,
|
|
"y": 400,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"voltage": 12.0,
|
|
"response_time": 0.1,
|
|
"gas_compatible": true
|
|
},
|
|
"data": {
|
|
"valve_state": "Closed",
|
|
"is_open": false
|
|
}
|
|
},
|
|
{
|
|
"id": "vacuum_pump_1",
|
|
"name": "真空泵",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_vacuum_pump",
|
|
"position": {
|
|
"x": 650,
|
|
"y": 200,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"max_vacuum": 0.1,
|
|
"pump_rate": 50.0
|
|
},
|
|
"data": {
|
|
"status": "Off",
|
|
"current_vacuum": 1.0
|
|
}
|
|
},
|
|
{
|
|
"id": "gas_source_1",
|
|
"name": "气源",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_gas_source",
|
|
"position": {
|
|
"x": 650,
|
|
"y": 150,
|
|
"z": 0
|
|
},
|
|
"config": {},
|
|
"data": {
|
|
"gas_type": "nitrogen",
|
|
"max_pressure": 5.0
|
|
}
|
|
},
|
|
{
|
|
"id": "h2_gas_source",
|
|
"name": "氢气气源",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_gas_source",
|
|
"position": {
|
|
"x": 500,
|
|
"y": 350,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"max_pressure": 10.0,
|
|
"gas_type": "hydrogen"
|
|
},
|
|
"data": {
|
|
"gas_type": "hydrogen",
|
|
"max_pressure": 10.0,
|
|
"current_pressure": 0.0,
|
|
"status": "OFF"
|
|
}
|
|
},
|
|
{
|
|
"id": "filter_1",
|
|
"name": "过滤器",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_filter",
|
|
"position": {
|
|
"x": 900,
|
|
"y": 400,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"filter_type": "membrane",
|
|
"max_pressure": 5.0
|
|
},
|
|
"data": {
|
|
"status": "Ready",
|
|
"pressure": 0.0
|
|
}
|
|
},
|
|
{
|
|
"id": "column_1",
|
|
"name": "洗脱柱",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_column",
|
|
"position": {
|
|
"x": 950,
|
|
"y": 400,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"column_type": "silica_gel",
|
|
"length": 30.0,
|
|
"diameter": 2.5
|
|
},
|
|
"data": {
|
|
"status": "Ready",
|
|
"loaded": false
|
|
}
|
|
},
|
|
{
|
|
"id": "separator_1",
|
|
"name": "分液器",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_separator",
|
|
"position": {
|
|
"x": 1000,
|
|
"y": 450,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"volume": 250.0,
|
|
"has_phases": true
|
|
},
|
|
"data": {
|
|
"status": "Ready",
|
|
"phase_separation": false
|
|
}
|
|
},
|
|
{
|
|
"id": "collection_bottle_1",
|
|
"name": "接收瓶1",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "container",
|
|
"class": "container",
|
|
"position": {
|
|
"x": 900,
|
|
"y": 500,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"volume": 250.0
|
|
},
|
|
"data": {
|
|
"current_volume": 0.0
|
|
}
|
|
},
|
|
{
|
|
"id": "collection_bottle_2",
|
|
"name": "接收瓶2",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "container",
|
|
"class": "container",
|
|
"position": {
|
|
"x": 950,
|
|
"y": 500,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"volume": 250.0
|
|
},
|
|
"data": {
|
|
"current_volume": 0.0
|
|
}
|
|
},
|
|
{
|
|
"id": "collection_bottle_3",
|
|
"name": "接收瓶3",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "container",
|
|
"class": "container",
|
|
"position": {
|
|
"x": 1050,
|
|
"y": 500,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"volume": 250.0
|
|
},
|
|
"data": {
|
|
"current_volume": 0.0
|
|
}
|
|
},
|
|
{
|
|
"id": "solid_dispenser_1",
|
|
"name": "固体粉末加样器",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "device",
|
|
"class": "virtual_solid_dispenser",
|
|
"position": {
|
|
"x": 600,
|
|
"y": 300,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"max_capacity": 100.0,
|
|
"precision": 0.001
|
|
},
|
|
"data": {
|
|
"status": "Ready",
|
|
"current_reagent": "",
|
|
"dispensed_amount": 0.0,
|
|
"total_operations": 0
|
|
}
|
|
},
|
|
{
|
|
"id": "solid_reagent_bottle_1",
|
|
"name": "固体试剂瓶1-氯化钠",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "container",
|
|
"class": "container",
|
|
"position": {
|
|
"x": 550,
|
|
"y": 250,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"volume": 500.0,
|
|
"reagent": "sodium_chloride",
|
|
"physical_state": "solid"
|
|
},
|
|
"data": {
|
|
"current_mass": 500.0,
|
|
"reagent_name": "sodium_chloride",
|
|
"physical_state": "solid"
|
|
}
|
|
},
|
|
{
|
|
"id": "solid_reagent_bottle_2",
|
|
"name": "固体试剂瓶2-碳酸钠",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "container",
|
|
"class": "container",
|
|
"position": {
|
|
"x": 600,
|
|
"y": 250,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"volume": 500.0,
|
|
"reagent": "sodium_carbonate",
|
|
"physical_state": "solid"
|
|
},
|
|
"data": {
|
|
"current_mass": 500.0,
|
|
"reagent_name": "sodium_carbonate",
|
|
"physical_state": "solid"
|
|
}
|
|
},
|
|
{
|
|
"id": "solid_reagent_bottle_3",
|
|
"name": "固体试剂瓶3-氯化镁",
|
|
"children": [],
|
|
"parent": "OrganicSynthesisStation",
|
|
"type": "container",
|
|
"class": "container",
|
|
"position": {
|
|
"x": 650,
|
|
"y": 250,
|
|
"z": 0
|
|
},
|
|
"config": {
|
|
"volume": 500.0,
|
|
"reagent": "magnesium_chloride",
|
|
"physical_state": "solid"
|
|
},
|
|
"data": {
|
|
"current_mass": 500.0,
|
|
"reagent_name": "magnesium_chloride",
|
|
"physical_state": "solid"
|
|
}
|
|
}
|
|
],
|
|
"links": [
|
|
{
|
|
"id": "link_pump1_valve1",
|
|
"source": "transfer_pump_1",
|
|
"target": "multiway_valve_1",
|
|
"type": "fluid",
|
|
"port": {
|
|
"transfer_pump_1": "transferpump",
|
|
"multiway_valve_1": "transferpump"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve1_reagent1",
|
|
"source": "multiway_valve_1",
|
|
"target": "reagent_bottle_1",
|
|
"type": "fluid",
|
|
"port": {
|
|
"multiway_valve_1": "1",
|
|
"reagent_bottle_1": "top"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve1_reagent2",
|
|
"source": "multiway_valve_1",
|
|
"target": "reagent_bottle_2",
|
|
"type": "fluid",
|
|
"port": {
|
|
"multiway_valve_1": "2",
|
|
"reagent_bottle_2": "top"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve1_reagent3",
|
|
"source": "multiway_valve_1",
|
|
"target": "reagent_bottle_3",
|
|
"type": "fluid",
|
|
"port": {
|
|
"multiway_valve_1": "3",
|
|
"reagent_bottle_3": "top"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve1_centrifuge",
|
|
"source": "multiway_valve_1",
|
|
"target": "centrifuge_1",
|
|
"type": "transport",
|
|
"port": {
|
|
"multiway_valve_1": "4",
|
|
"centrifuge_1": "centrifuge"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve1_rotavap",
|
|
"source": "multiway_valve_1",
|
|
"target": "rotavap_1",
|
|
"type": "fluid",
|
|
"port": {
|
|
"multiway_valve_1": "5",
|
|
"rotavap_1": "samplein"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve1_reactor",
|
|
"source": "multiway_valve_1",
|
|
"target": "main_reactor",
|
|
"type": "fluid",
|
|
"port": {
|
|
"multiway_valve_1": "6",
|
|
"main_reactor": "top"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve1_waste1",
|
|
"source": "multiway_valve_1",
|
|
"target": "waste_bottle_1",
|
|
"type": "fluid",
|
|
"port": {
|
|
"multiway_valve_1": "7",
|
|
"waste_bottle_1": "top"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve1_valve2",
|
|
"source": "multiway_valve_1",
|
|
"target": "multiway_valve_2",
|
|
"type": "fluid",
|
|
"port": {
|
|
"multiway_valve_1": "8",
|
|
"multiway_valve_2": "1"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_pump2_valve2",
|
|
"source": "transfer_pump_2",
|
|
"target": "multiway_valve_2",
|
|
"type": "fluid",
|
|
"port": {
|
|
"transfer_pump_2": "transferpump",
|
|
"multiway_valve_2": "transferpump"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve2_solenoid1",
|
|
"source": "multiway_valve_2",
|
|
"target": "solenoid_valve_1",
|
|
"type": "fluid",
|
|
"port": {
|
|
"multiway_valve_2": "2",
|
|
"solenoid_valve_1": "in"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_vacuum_solenoid1",
|
|
"source": "vacuum_pump_1",
|
|
"target": "solenoid_valve_1",
|
|
"type": "fluid",
|
|
"port": {
|
|
"vacuum_pump_1": "vacuumpump",
|
|
"solenoid_valve_1": "out"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve2_solenoid2",
|
|
"source": "multiway_valve_2",
|
|
"target": "solenoid_valve_2",
|
|
"type": "fluid",
|
|
"port": {
|
|
"multiway_valve_2": "3",
|
|
"solenoid_valve_2": "out"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_gas_solenoid2",
|
|
"source": "gas_source_1",
|
|
"target": "solenoid_valve_2",
|
|
"type": "fluid",
|
|
"port": {
|
|
"gas_source_1": "gassource",
|
|
"solenoid_valve_2": "in"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve2_filter",
|
|
"source": "multiway_valve_2",
|
|
"target": "filter_1",
|
|
"type": "transport",
|
|
"port": {
|
|
"multiway_valve_2": "4",
|
|
"filter_1": "filterin"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve2_column",
|
|
"source": "multiway_valve_2",
|
|
"target": "column_1",
|
|
"type": "transport",
|
|
"port": {
|
|
"multiway_valve_2": "5",
|
|
"column_1": "columnin"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_column_collection2",
|
|
"source": "column_1",
|
|
"target": "collection_bottle_2",
|
|
"type": "transport",
|
|
"port": {
|
|
"column_1": "columnout",
|
|
"collection_bottle_2": "top"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve2_separator",
|
|
"source": "multiway_valve_2",
|
|
"target": "separator_1",
|
|
"type": "fluid",
|
|
"port": {
|
|
"multiway_valve_2": "6",
|
|
"separator_1": "separatorin"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_separator_collection3",
|
|
"source": "separator_1",
|
|
"target": "collection_bottle_3",
|
|
"type": "fluid",
|
|
"port": {
|
|
"separator_1": "bottomphaseout",
|
|
"collection_bottle_3": "top"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve2_reagent4",
|
|
"source": "multiway_valve_2",
|
|
"target": "reagent_bottle_4",
|
|
"type": "fluid",
|
|
"port": {
|
|
"multiway_valve_2": "7",
|
|
"reagent_bottle_4": "top"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve2_reagent5",
|
|
"source": "multiway_valve_2",
|
|
"target": "reagent_bottle_5",
|
|
"type": "fluid",
|
|
"port": {
|
|
"multiway_valve_2": "8",
|
|
"reagent_bottle_5": "top"
|
|
}
|
|
},
|
|
{
|
|
"id": "mech_stirrer_reactor",
|
|
"source": "stirrer_1",
|
|
"target": "main_reactor",
|
|
"type": "mechanical",
|
|
"port": {
|
|
"stirrer_1": "stirrer",
|
|
"main_reactor": "bind"
|
|
}
|
|
},
|
|
{
|
|
"id": "thermal_heater_reactor",
|
|
"source": "heater_1",
|
|
"target": "main_reactor",
|
|
"type": "mechanical",
|
|
"port": {
|
|
"heater_1": "heatchill",
|
|
"main_reactor": "bind"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_separator_waste2",
|
|
"source": "separator_1",
|
|
"target": "waste_bottle_2",
|
|
"type": "fluid",
|
|
"port": {
|
|
"separator_1": "topphaseout",
|
|
"waste_bottle_2": "top"
|
|
}
|
|
},
|
|
{
|
|
"id": "mech_stirrer2_separator",
|
|
"source": "stirrer_2",
|
|
"target": "separator_1",
|
|
"type": "mechanical",
|
|
"port": {
|
|
"stirrer_2": "stirrer",
|
|
"separator_1": "bind"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_filter_filtrate_to_collection1",
|
|
"source": "filter_1",
|
|
"target": "collection_bottle_1",
|
|
"type": "transport",
|
|
"port": {
|
|
"filter_1": "filtrateout",
|
|
"collection_bottle_1": "top"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_filter_retentate_to_waste1",
|
|
"source": "filter_1",
|
|
"target": "waste_bottle_1",
|
|
"type": "transport",
|
|
"port": {
|
|
"filter_1": "retentateout",
|
|
"waste_bottle_1": "top"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_h2_gas_to_valve3",
|
|
"source": "h2_gas_source",
|
|
"target": "solenoid_valve_3",
|
|
"type": "fluid",
|
|
"port": {
|
|
"h2_gas_source": "gassource",
|
|
"solenoid_valve_3": "in"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_valve3_to_reactor",
|
|
"source": "solenoid_valve_3",
|
|
"target": "main_reactor",
|
|
"type": "fluid",
|
|
"port": {
|
|
"solenoid_valve_3": "out",
|
|
"main_reactor": "top"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_solid_dispenser_to_reactor",
|
|
"source": "solid_dispenser_1",
|
|
"target": "main_reactor",
|
|
"type": "resource",
|
|
"port": {
|
|
"solid_dispenser_1": "SolidOut",
|
|
"main_reactor": "top"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_solid_bottle1_to_dispenser",
|
|
"source": "solid_reagent_bottle_1",
|
|
"target": "solid_dispenser_1",
|
|
"type": "resource",
|
|
"port": {
|
|
"solid_reagent_bottle_1": "top",
|
|
"solid_dispenser_1": "SolidIn"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_solid_bottle2_to_dispenser",
|
|
"source": "solid_reagent_bottle_2",
|
|
"target": "solid_dispenser_1",
|
|
"type": "resource",
|
|
"port": {
|
|
"solid_reagent_bottle_2": "top",
|
|
"solid_dispenser_1": "SolidIn"
|
|
}
|
|
},
|
|
{
|
|
"id": "link_solid_bottle3_to_dispenser",
|
|
"source": "solid_reagent_bottle_3",
|
|
"target": "solid_dispenser_1",
|
|
"type": "resource",
|
|
"port": {
|
|
"solid_reagent_bottle_3": "top",
|
|
"solid_dispenser_1": "SolidIn"
|
|
}
|
|
}
|
|
]
|
|
} |