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> --------- 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>
1010 lines
42 KiB
Python
1010 lines
42 KiB
Python
import copy
|
||
import json
|
||
import threading
|
||
import time
|
||
import traceback
|
||
import uuid
|
||
from typing import Optional, Dict, Any, List, ClassVar, Set
|
||
|
||
from action_msgs.msg import GoalStatus
|
||
from geometry_msgs.msg import Point
|
||
from rclpy.action import ActionClient, get_action_server_names_and_types_by_node
|
||
from rclpy.callback_groups import ReentrantCallbackGroup
|
||
from rclpy.service import Service
|
||
from unilabos_msgs.msg import Resource # type: ignore
|
||
from unilabos_msgs.srv import (
|
||
ResourceAdd,
|
||
ResourceGet,
|
||
ResourceDelete,
|
||
ResourceUpdate,
|
||
ResourceList,
|
||
SerialCommand,
|
||
) # type: ignore
|
||
from unique_identifier_msgs.msg import UUID
|
||
|
||
from unilabos.registry.registry import lab_registry
|
||
from unilabos.resources.graphio import initialize_resource
|
||
from unilabos.resources.registry import add_schema
|
||
from unilabos.ros.initialize_device import initialize_device_from_dict
|
||
from unilabos.ros.msgs.message_converter import (
|
||
get_msg_type,
|
||
get_ros_type_by_msgname,
|
||
convert_from_ros_msg,
|
||
convert_to_ros_msg,
|
||
msg_converter_manager,
|
||
)
|
||
from unilabos.ros.nodes.base_device_node import BaseROS2DeviceNode, ROS2DeviceNode, DeviceNodeResourceTracker
|
||
from unilabos.ros.nodes.presets.controller_node import ControllerNode
|
||
|
||
|
||
class HostNode(BaseROS2DeviceNode):
|
||
"""
|
||
主机节点类,负责管理设备、资源和控制器
|
||
|
||
作为单例模式实现,确保整个应用中只有一个主机节点实例
|
||
"""
|
||
|
||
_instance: ClassVar[Optional["HostNode"]] = None
|
||
_ready_event: ClassVar[threading.Event] = threading.Event()
|
||
|
||
@classmethod
|
||
def get_instance(cls, timeout=None) -> Optional["HostNode"]:
|
||
if cls._ready_event.wait(timeout):
|
||
return cls._instance
|
||
return None
|
||
|
||
def __init__(
|
||
self,
|
||
device_id: str,
|
||
devices_config: Dict[str, Any],
|
||
resources_config: list,
|
||
physical_setup_graph: Optional[Dict[str, Any]] = None,
|
||
controllers_config: Optional[Dict[str, Any]] = None,
|
||
bridges: Optional[List[Any]] = None,
|
||
discovery_interval: float = 180.0, # 设备发现间隔,单位为秒
|
||
):
|
||
"""
|
||
初始化主机节点
|
||
|
||
Args:
|
||
device_id: 节点名称
|
||
devices_config: 设备配置
|
||
resources_config: 资源配置
|
||
physical_setup_graph: 物理设置图
|
||
controllers_config: 控制器配置
|
||
bridges: 桥接器列表
|
||
discovery_interval: 设备发现间隔(秒),默认5秒
|
||
"""
|
||
if self._instance is not None:
|
||
self._instance.lab_logger().critical("[Host Node] HostNode instance already exists.")
|
||
# 初始化Node基类,传递空参数覆盖列表
|
||
BaseROS2DeviceNode.__init__(
|
||
self,
|
||
driver_instance=self,
|
||
device_id=device_id,
|
||
status_types={},
|
||
action_value_mappings=lab_registry.device_type_registry["host_node"]["class"]["action_value_mappings"],
|
||
hardware_interface={},
|
||
print_publish=False,
|
||
resource_tracker=DeviceNodeResourceTracker(), # host node并不是通过initialize 包一层传进来的
|
||
)
|
||
|
||
# 设置单例实例
|
||
self.__class__._instance = self
|
||
|
||
# 初始化配置
|
||
self.server_latest_timestamp = 0.0 #
|
||
self.devices_config = devices_config
|
||
self.resources_config = resources_config
|
||
self.physical_setup_graph = physical_setup_graph
|
||
if controllers_config is None:
|
||
controllers_config = {}
|
||
self.controllers_config = controllers_config
|
||
if bridges is None:
|
||
bridges = []
|
||
self.bridges = bridges
|
||
|
||
# 创建设备、动作客户端和目标存储
|
||
self.devices_names: Dict[str, str] = {device_id: self.namespace} # 存储设备名称和命名空间的映射
|
||
self.devices_instances: Dict[str, ROS2DeviceNode] = {} # 存储设备实例
|
||
self.device_machine_names: Dict[str, str] = {
|
||
device_id: "本地",
|
||
} # 存储设备ID到机器名称的映射
|
||
self._action_clients: Dict[str, ActionClient] = { # 为了方便了解实际的数据类型,host的默认写好
|
||
"/devices/host_node/create_resource": ActionClient(
|
||
self,
|
||
lab_registry.ResourceCreateFromOuterEasy,
|
||
"/devices/host_node/create_resource",
|
||
callback_group=self.callback_group,
|
||
),
|
||
"/devices/host_node/create_resource_detailed": ActionClient(
|
||
self,
|
||
lab_registry.ResourceCreateFromOuter,
|
||
"/devices/host_node/create_resource_detailed",
|
||
callback_group=self.callback_group,
|
||
),
|
||
"/devices/host_node/test_latency": ActionClient(
|
||
self,
|
||
lab_registry.EmptyIn,
|
||
"/devices/host_node/test_latency",
|
||
callback_group=self.callback_group,
|
||
),
|
||
} # 用来存储多个ActionClient实例
|
||
self._action_value_mappings: Dict[str, Dict] = (
|
||
{}
|
||
) # 用来存储多个ActionClient的type, goal, feedback, result的变量名映射关系
|
||
self._goals: Dict[str, Any] = {} # 用来存储多个目标的状态
|
||
self._online_devices: Set[str] = {f"{self.namespace}/{device_id}"} # 用于跟踪在线设备
|
||
self._last_discovery_time = 0.0 # 上次设备发现的时间
|
||
self._discovery_lock = threading.Lock() # 设备发现的互斥锁
|
||
self._subscribed_topics = set() # 用于跟踪已订阅的话题
|
||
|
||
# 创建物料增删改查服务(非客户端)
|
||
self._init_host_service()
|
||
|
||
self.device_status = {} # 用来存储设备状态
|
||
self.device_status_timestamps = {} # 用来存储设备状态最后更新时间
|
||
|
||
from unilabos.app.mq import mqtt_client
|
||
|
||
for device_info in lab_registry.obtain_registry_device_info():
|
||
mqtt_client.publish_registry(device_info["id"], device_info)
|
||
for resource_info in lab_registry.obtain_registry_resource_info():
|
||
mqtt_client.publish_registry(resource_info["id"], resource_info)
|
||
time.sleep(1) # 等待MQTT连接稳定
|
||
# 首次发现网络中的设备
|
||
self._discover_devices()
|
||
|
||
# 初始化所有本机设备节点,多一次过滤,防止重复初始化
|
||
for device_id, device_config in devices_config.items():
|
||
if device_config.get("type", "device") != "device":
|
||
self.lab_logger().debug(
|
||
f"[Host Node] Skipping type {device_config['type']} {device_id} already existed, skipping."
|
||
)
|
||
continue
|
||
if device_id not in self.devices_names:
|
||
self.initialize_device(device_id, device_config)
|
||
else:
|
||
self.lab_logger().warning(f"[Host Node] Device {device_id} already existed, skipping.")
|
||
self.update_device_status_subscriptions()
|
||
# TODO: 需要验证 初始化所有控制器节点
|
||
if controllers_config:
|
||
update_rate = controllers_config["controller_manager"]["ros__parameters"]["update_rate"]
|
||
for controller_id, controller_config in controllers_config["controller_manager"]["ros__parameters"][
|
||
"controllers"
|
||
].items():
|
||
controller_config["update_rate"] = update_rate
|
||
self.initialize_controller(controller_id, controller_config)
|
||
resources_config.insert(
|
||
0,
|
||
{
|
||
"id": "host_node",
|
||
"name": "host_node",
|
||
"parent": None,
|
||
"type": "device",
|
||
"class": "host_node",
|
||
"position": {"x": 0, "y": 0, "z": 0},
|
||
"config": {},
|
||
"data": {},
|
||
"children": [],
|
||
},
|
||
)
|
||
resource_with_parent_name = []
|
||
resource_ids_to_instance = {i["id"]: i for i in resources_config}
|
||
for res in resources_config:
|
||
if res.get("parent") and res.get("type") == "device" and res.get("class"):
|
||
parent_id = res.get("parent")
|
||
parent_res = resource_ids_to_instance[parent_id]
|
||
if parent_res.get("type") == "device" and parent_res.get("class"):
|
||
resource_with_parent_name.append(copy.deepcopy(res))
|
||
resource_with_parent_name[-1]["id"] = f"{parent_res['id']}/{res['id']}"
|
||
continue
|
||
resource_with_parent_name.append(copy.deepcopy(res))
|
||
try:
|
||
for bridge in self.bridges:
|
||
if hasattr(bridge, "resource_add"):
|
||
resource_start_time = time.time()
|
||
resource_add_res = bridge.resource_add(add_schema(resource_with_parent_name), True)
|
||
resource_end_time = time.time()
|
||
self.lab_logger().info(
|
||
f"[Host Node-Resource] 物料上传 {round(resource_end_time - resource_start_time, 5) * 1000} ms"
|
||
)
|
||
except Exception as ex:
|
||
self.lab_logger().error("[Host Node-Resource] 添加物料出错!")
|
||
self.lab_logger().error(traceback.format_exc())
|
||
|
||
# 创建定时器,定期发现设备
|
||
self._discovery_timer = self.create_timer(
|
||
discovery_interval, self._discovery_devices_callback, callback_group=ReentrantCallbackGroup()
|
||
)
|
||
|
||
# 添加ping-pong相关属性
|
||
self._ping_responses = {} # 存储ping响应
|
||
self._ping_lock = threading.Lock()
|
||
|
||
self.lab_logger().info("[Host Node] Host node initialized.")
|
||
HostNode._ready_event.set()
|
||
|
||
def _send_re_register(self, sclient):
|
||
sclient.wait_for_service()
|
||
request = SerialCommand.Request()
|
||
request.command = ""
|
||
future = sclient.call_async(request)
|
||
response = future.result()
|
||
|
||
def _discover_devices(self) -> None:
|
||
"""
|
||
发现网络中的设备
|
||
|
||
检测ROS2网络中的所有设备节点,并为它们创建ActionClient
|
||
同时检测设备离线情况
|
||
"""
|
||
self.lab_logger().debug("[Host Node] Discovering devices in the network...")
|
||
|
||
# 获取当前所有设备
|
||
nodes_and_names = self.get_node_names_and_namespaces()
|
||
|
||
# 跟踪本次发现的设备,用于检测离线设备
|
||
current_devices = set()
|
||
|
||
for device_id, namespace in nodes_and_names:
|
||
if not namespace.startswith("/devices/"):
|
||
continue
|
||
edge_device_id = namespace[9:]
|
||
# 将设备添加到当前设备集合
|
||
device_key = f"{namespace}/{edge_device_id}" # namespace已经包含device_id了,这里复写一遍
|
||
current_devices.add(device_key)
|
||
|
||
# 如果是新设备,记录并创建ActionClient
|
||
if edge_device_id not in self.devices_names:
|
||
self.lab_logger().info(f"[Host Node] Discovered new device: {edge_device_id}")
|
||
self.devices_names[edge_device_id] = namespace
|
||
self._create_action_clients_for_device(device_id, namespace)
|
||
self._online_devices.add(device_key)
|
||
sclient = self.create_client(SerialCommand, f"/srv{namespace}/query_host_name")
|
||
threading.Thread(
|
||
target=self._send_re_register,
|
||
args=(sclient,),
|
||
daemon=True,
|
||
name=f"ROSDevice{self.device_id}_query_host_name_{namespace}",
|
||
).start()
|
||
elif device_key not in self._online_devices:
|
||
# 设备重新上线
|
||
self.lab_logger().info(f"[Host Node] Device reconnected: {device_key}")
|
||
self._online_devices.add(device_key)
|
||
sclient = self.create_client(SerialCommand, f"/srv{namespace}/query_host_name")
|
||
threading.Thread(
|
||
target=self._send_re_register,
|
||
args=(sclient,),
|
||
daemon=True,
|
||
name=f"ROSDevice{self.device_id}_query_host_name_{namespace}",
|
||
).start()
|
||
|
||
# 检测离线设备
|
||
offline_devices = self._online_devices - current_devices
|
||
for device_key in offline_devices:
|
||
self.lab_logger().warning(f"[Host Node] Device offline: {device_key}")
|
||
self._online_devices.discard(device_key)
|
||
|
||
# 更新在线设备列表
|
||
self._online_devices = current_devices
|
||
self.lab_logger().debug(f"[Host Node] Total online devices: {len(self._online_devices)}")
|
||
|
||
def _discovery_devices_callback(self) -> None:
|
||
"""
|
||
设备发现定时器回调函数
|
||
"""
|
||
# 使用互斥锁确保同时只有一个发现过程
|
||
if self._discovery_lock.acquire(blocking=False):
|
||
try:
|
||
self._discover_devices()
|
||
# 发现新设备后,更新设备状态订阅
|
||
self.update_device_status_subscriptions()
|
||
finally:
|
||
self._discovery_lock.release()
|
||
else:
|
||
self.lab_logger().debug("[Host Node] Device discovery already in progress, skipping.")
|
||
|
||
def _create_action_clients_for_device(self, device_id: str, namespace: str) -> None:
|
||
"""
|
||
为设备创建所有必要的ActionClient
|
||
|
||
Args:
|
||
device_id: 设备ID
|
||
namespace: 设备命名空间
|
||
"""
|
||
for action_id, action_types in get_action_server_names_and_types_by_node(self, device_id, namespace):
|
||
if action_id not in self._action_clients:
|
||
try:
|
||
action_type = get_ros_type_by_msgname(action_types[0])
|
||
self._action_clients[action_id] = ActionClient(
|
||
self, action_type, action_id, callback_group=self.callback_group
|
||
)
|
||
self.lab_logger().debug(f"[Host Node] Created ActionClient (Discovery): {action_id}")
|
||
action_name = action_id[len(namespace) + 1 :]
|
||
edge_device_id = namespace[9:]
|
||
# from unilabos.app.mq import mqtt_client
|
||
# info_with_schema = ros_action_to_json_schema(action_type)
|
||
# mqtt_client.publish_actions(action_name, {
|
||
# "device_id": edge_device_id,
|
||
# "device_type": "",
|
||
# "action_name": action_name,
|
||
# "schema": info_with_schema,
|
||
# })
|
||
except Exception as e:
|
||
self.lab_logger().error(f"[Host Node] Failed to create ActionClient for {action_id}: {str(e)}")
|
||
|
||
def create_resource_detailed(
|
||
self,
|
||
resources: list["Resource"],
|
||
device_ids: list[str],
|
||
bind_parent_ids: list[str],
|
||
bind_locations: list[Point],
|
||
other_calling_params: list[str],
|
||
):
|
||
responses = []
|
||
for resource, device_id, bind_parent_id, bind_location, other_calling_param in zip(
|
||
resources, device_ids, bind_parent_ids, bind_locations, other_calling_params
|
||
):
|
||
# 这里要求device_id传入必须是edge_device_id
|
||
namespace = "/devices/" + device_id
|
||
srv_address = f"/srv{namespace}/append_resource"
|
||
sclient = self.create_client(SerialCommand, srv_address)
|
||
sclient.wait_for_service()
|
||
request = SerialCommand.Request()
|
||
request.command = json.dumps(
|
||
{
|
||
"resource": resource, # 单个/单组 可为 list[list[Resource]]
|
||
"namespace": namespace,
|
||
"edge_device_id": device_id,
|
||
"bind_parent_id": bind_parent_id,
|
||
"bind_location": {
|
||
"x": bind_location.x,
|
||
"y": bind_location.y,
|
||
"z": bind_location.z,
|
||
},
|
||
"other_calling_param": json.loads(other_calling_param) if other_calling_param else {},
|
||
},
|
||
ensure_ascii=False,
|
||
)
|
||
response = sclient.call(request)
|
||
responses.append(response)
|
||
return responses
|
||
|
||
def create_resource(
|
||
self,
|
||
device_id: str,
|
||
res_id: str,
|
||
class_name: str,
|
||
parent: str,
|
||
bind_locations: Point,
|
||
liquid_input_slot: list[int],
|
||
liquid_type: list[str],
|
||
liquid_volume: list[int],
|
||
slot_on_deck: str,
|
||
):
|
||
init_new_res = initialize_resource(
|
||
{
|
||
"name": res_id,
|
||
"class": class_name,
|
||
"parent": parent,
|
||
"position": {
|
||
"x": bind_locations.x,
|
||
"y": bind_locations.y,
|
||
"z": bind_locations.z,
|
||
},
|
||
}
|
||
) # flatten的格式
|
||
resources = init_new_res # initialize_resource已经返回list[dict]
|
||
device_ids = [device_id]
|
||
bind_parent_id = [parent]
|
||
bind_location = [bind_locations]
|
||
other_calling_param = [
|
||
json.dumps(
|
||
{
|
||
"ADD_LIQUID_TYPE": liquid_type,
|
||
"LIQUID_VOLUME": liquid_volume,
|
||
"LIQUID_INPUT_SLOT": liquid_input_slot,
|
||
"initialize_full": False,
|
||
"slot": slot_on_deck,
|
||
}
|
||
)
|
||
]
|
||
|
||
return self.create_resource_detailed(resources, device_ids, bind_parent_id, bind_location, other_calling_param)
|
||
|
||
def initialize_device(self, device_id: str, device_config: Dict[str, Any]) -> None:
|
||
"""
|
||
根据配置初始化设备,
|
||
|
||
此函数根据提供的设备配置动态导入适当的设备类并创建其实例。
|
||
同时为设备的动作值映射设置动作客户端。
|
||
|
||
Args:
|
||
device_id: 设备唯一标识符
|
||
device_config: 设备配置字典,包含类型和其他参数
|
||
"""
|
||
self.lab_logger().info(f"[Host Node] Initializing device: {device_id}")
|
||
|
||
device_config_copy = copy.deepcopy(device_config)
|
||
d = initialize_device_from_dict(device_id, device_config_copy)
|
||
if d is None:
|
||
return
|
||
# noinspection PyProtectedMember
|
||
self.devices_names[device_id] = d._ros_node.namespace # 这里不涉及二级device_id
|
||
self.device_machine_names[device_id] = "本地"
|
||
self.devices_instances[device_id] = d
|
||
# noinspection PyProtectedMember
|
||
for action_name, action_value_mapping in d._ros_node._action_value_mappings.items():
|
||
action_id = f"/devices/{device_id}/{action_name}"
|
||
if action_id not in self._action_clients:
|
||
action_type = action_value_mapping["type"]
|
||
self._action_clients[action_id] = ActionClient(self, action_type, action_id)
|
||
self.lab_logger().debug(
|
||
f"[Host Node] Created ActionClient (Local): {action_id}"
|
||
) # 子设备再创建用的是Discover发现的
|
||
# from unilabos.app.mq import mqtt_client
|
||
# info_with_schema = ros_action_to_json_schema(action_type)
|
||
# mqtt_client.publish_actions(action_name, {
|
||
# "device_id": device_id,
|
||
# "device_type": device_config["class"],
|
||
# "action_name": action_name,
|
||
# "schema": info_with_schema,
|
||
# })
|
||
else:
|
||
self.lab_logger().warning(f"[Host Node] ActionClient {action_id} already exists.")
|
||
device_key = f"{self.devices_names[device_id]}/{device_id}" # 这里不涉及二级device_id
|
||
# 添加到在线设备列表
|
||
self._online_devices.add(device_key)
|
||
|
||
def update_device_status_subscriptions(self) -> None:
|
||
"""
|
||
更新设备状态订阅
|
||
|
||
扫描所有设备话题,为新的话题创建订阅,确保不会重复订阅
|
||
"""
|
||
topic_names_and_types = self.get_topic_names_and_types()
|
||
for topic, types in topic_names_and_types:
|
||
# 检查是否为设备状态话题且未订阅过
|
||
if (
|
||
topic.startswith("/devices/")
|
||
and not types[0].endswith("FeedbackMessage")
|
||
and "_action" not in topic
|
||
and topic not in self._subscribed_topics
|
||
):
|
||
|
||
# 解析设备名和属性名
|
||
parts = topic.split("/")
|
||
if len(parts) >= 4: # 可能有ProtocolNode,创建更长的设备
|
||
device_id = "/".join(parts[2:-1])
|
||
property_name = parts[-1]
|
||
|
||
# 初始化设备状态字典
|
||
if device_id not in self.device_status:
|
||
self.device_status[device_id] = {}
|
||
self.device_status_timestamps[device_id] = {}
|
||
|
||
# 默认初始化属性值为 None
|
||
self.device_status[device_id][property_name] = None
|
||
self.device_status_timestamps[device_id][property_name] = 0 # 初始化时间戳
|
||
|
||
# 动态创建订阅
|
||
try:
|
||
type_class = msg_converter_manager.search_class(types[0].replace("/", "."))
|
||
if type_class is None:
|
||
self.lab_logger().error(f"[Host Node] Invalid type {types[0]} for {topic}")
|
||
else:
|
||
self.create_subscription(
|
||
type_class,
|
||
topic,
|
||
lambda msg, d=device_id, p=property_name: self.property_callback(msg, d, p),
|
||
1,
|
||
callback_group=ReentrantCallbackGroup(),
|
||
)
|
||
# 标记为已订阅
|
||
self._subscribed_topics.add(topic)
|
||
self.lab_logger().debug(f"[Host Node] Subscribed to new topic: {topic}")
|
||
except (NameError, SyntaxError) as e:
|
||
self.lab_logger().error(f"[Host Node] Failed to create subscription for topic {topic}: {e}")
|
||
|
||
"""设备相关"""
|
||
|
||
def property_callback(self, msg, device_id: str, property_name: str) -> None:
|
||
"""
|
||
更新设备状态字典中的属性值,并发送到桥接器。
|
||
|
||
Args:
|
||
msg: 接收到的消息
|
||
device_id: 设备ID
|
||
property_name: 属性名称
|
||
"""
|
||
# 更新设备状态字典
|
||
if hasattr(msg, "data"):
|
||
bChange = False
|
||
if isinstance(msg.data, (float, int, str)):
|
||
if self.device_status[device_id][property_name] != msg.data:
|
||
bChange = True
|
||
self.device_status[device_id][property_name] = msg.data
|
||
# 更新时间戳
|
||
self.device_status_timestamps[device_id][property_name] = time.time()
|
||
else:
|
||
self.lab_logger().debug(
|
||
f"[Host Node] Unsupported data type for {device_id}/{property_name}: {type(msg.data)}"
|
||
)
|
||
|
||
# 所有 Bridge 对象都应具有 publish_device_status 方法;都会收到设备状态更新
|
||
if bChange:
|
||
for bridge in self.bridges:
|
||
if hasattr(bridge, "publish_device_status"):
|
||
bridge.publish_device_status(self.device_status, device_id, property_name)
|
||
self.lab_logger().debug(
|
||
f"[Host Node] Status updated: {device_id}.{property_name} = {msg.data}"
|
||
)
|
||
|
||
def send_goal(
|
||
self,
|
||
device_id: str,
|
||
action_name: str,
|
||
action_kwargs: Dict[str, Any],
|
||
goal_uuid: Optional[str] = None,
|
||
server_info: Optional[Dict[str, Any]] = None,
|
||
) -> None:
|
||
"""
|
||
向设备发送目标请求
|
||
|
||
Args:
|
||
device_id: 设备ID
|
||
action_name: 动作名称
|
||
action_kwargs: 动作参数
|
||
goal_uuid: 目标UUID,如果为None则自动生成
|
||
"""
|
||
action_id = f"/devices/{device_id}/{action_name}"
|
||
if action_name == "test_latency" and server_info is not None:
|
||
self.server_latest_timestamp = server_info.get("send_timestamp", 0.0)
|
||
if action_id not in self._action_clients:
|
||
self.lab_logger().error(f"[Host Node] ActionClient {action_id} not found.")
|
||
return
|
||
|
||
action_client: ActionClient = self._action_clients[action_id]
|
||
|
||
goal_msg = convert_to_ros_msg(action_client._action_type.Goal(), action_kwargs)
|
||
|
||
self.lab_logger().info(f"[Host Node] Sending goal for {action_id}: {goal_msg}")
|
||
action_client.wait_for_server()
|
||
|
||
uuid_str = goal_uuid
|
||
if goal_uuid is not None:
|
||
u = uuid.UUID(goal_uuid)
|
||
goal_uuid_obj = UUID(uuid=list(u.bytes))
|
||
else:
|
||
goal_uuid_obj = None
|
||
|
||
future = action_client.send_goal_async(
|
||
goal_msg,
|
||
feedback_callback=lambda feedback_msg: self.feedback_callback(action_id, uuid_str, feedback_msg),
|
||
goal_uuid=goal_uuid_obj,
|
||
)
|
||
future.add_done_callback(lambda future: self.goal_response_callback(action_id, uuid_str, future))
|
||
|
||
def goal_response_callback(self, action_id: str, uuid_str: Optional[str], future) -> None:
|
||
"""目标响应回调"""
|
||
goal_handle = future.result()
|
||
if not goal_handle.accepted:
|
||
self.lab_logger().warning(f"[Host Node] Goal {action_id} ({uuid_str}) rejected")
|
||
return
|
||
|
||
self.lab_logger().info(f"[Host Node] Goal {action_id} ({uuid_str}) accepted")
|
||
if uuid_str:
|
||
self._goals[uuid_str] = goal_handle
|
||
goal_handle.get_result_async().add_done_callback(
|
||
lambda future: self.get_result_callback(action_id, uuid_str, future)
|
||
)
|
||
|
||
def feedback_callback(self, action_id: str, uuid_str: Optional[str], feedback_msg) -> None:
|
||
"""反馈回调"""
|
||
feedback_data = convert_from_ros_msg(feedback_msg)
|
||
feedback_data.pop("goal_id")
|
||
self.lab_logger().debug(f"[Host Node] Feedback for {action_id} ({uuid_str}): {feedback_data}")
|
||
|
||
if uuid_str:
|
||
for bridge in self.bridges:
|
||
if hasattr(bridge, "publish_job_status"):
|
||
bridge.publish_job_status(feedback_data, uuid_str, "running")
|
||
|
||
def get_result_callback(self, action_id: str, uuid_str: Optional[str], future) -> None:
|
||
"""获取结果回调"""
|
||
result_msg = future.result().result
|
||
result_data = convert_from_ros_msg(result_msg)
|
||
status = "success"
|
||
try:
|
||
ret = json.loads(result_data.get("return_info", "{}")) # 确保返回信息是有效的JSON
|
||
suc = ret.get("suc", False)
|
||
if not suc:
|
||
status = "failed"
|
||
except json.JSONDecodeError:
|
||
status = "failed"
|
||
self.lab_logger().info(f"[Host Node] Result for {action_id} ({uuid_str}): success")
|
||
self.lab_logger().debug(f"[Host Node] Result data: {result_data}")
|
||
|
||
if uuid_str:
|
||
for bridge in self.bridges:
|
||
if hasattr(bridge, "publish_job_status"):
|
||
bridge.publish_job_status(result_data, uuid_str, status, result_data.get("return_info", "{}"))
|
||
|
||
def cancel_goal(self, goal_uuid: str) -> None:
|
||
"""取消目标"""
|
||
if goal_uuid in self._goals:
|
||
self.lab_logger().info(f"[Host Node] Cancelling goal {goal_uuid}")
|
||
self._goals[goal_uuid].cancel_goal_async()
|
||
else:
|
||
self.lab_logger().warning(f"[Host Node] Goal {goal_uuid} not found, cannot cancel")
|
||
|
||
def get_goal_status(self, uuid_str: str) -> int:
|
||
"""获取目标状态"""
|
||
if uuid_str in self._goals:
|
||
g = self._goals[uuid_str]
|
||
status = g.status
|
||
self.lab_logger().debug(f"[Host Node] Goal status for {uuid_str}: {status}")
|
||
return status
|
||
self.lab_logger().warning(f"[Host Node] Goal {uuid_str} not found, status unknown")
|
||
return GoalStatus.STATUS_UNKNOWN
|
||
|
||
"""Controller Node"""
|
||
|
||
def initialize_controller(self, controller_id: str, controller_config: Dict[str, Any]) -> None:
|
||
"""
|
||
初始化控制器
|
||
|
||
Args:
|
||
controller_id: 控制器ID
|
||
controller_config: 控制器配置
|
||
"""
|
||
self.lab_logger().info(f"[Host Node] Initializing controller: {controller_id}")
|
||
|
||
class_name = controller_config.pop("type")
|
||
controller_func = globals()[class_name]
|
||
|
||
for input_name, input_info in controller_config["inputs"].items():
|
||
controller_config["inputs"][input_name]["type"] = get_msg_type(eval(input_info["type"]))
|
||
for output_name, output_info in controller_config["outputs"].items():
|
||
controller_config["outputs"][output_name]["type"] = get_msg_type(eval(output_info["type"]))
|
||
|
||
if controller_config["parameters"] is None:
|
||
controller_config["parameters"] = {}
|
||
|
||
controller = ControllerNode(controller_id, controller_func=controller_func, **controller_config)
|
||
self.lab_logger().info(f"[Host Node] Controller {controller_id} created.")
|
||
# rclpy.get_global_executor().add_node(controller)
|
||
|
||
"""Resource"""
|
||
|
||
def _init_host_service(self):
|
||
self._resource_services: Dict[str, Service] = {
|
||
"resource_add": self.create_service(
|
||
ResourceAdd, "/resources/add", self._resource_add_callback, callback_group=ReentrantCallbackGroup()
|
||
),
|
||
"resource_get": self.create_service(
|
||
ResourceGet, "/resources/get", self._resource_get_callback, callback_group=ReentrantCallbackGroup()
|
||
),
|
||
"resource_delete": self.create_service(
|
||
ResourceDelete,
|
||
"/resources/delete",
|
||
self._resource_delete_callback,
|
||
callback_group=ReentrantCallbackGroup(),
|
||
),
|
||
"resource_update": self.create_service(
|
||
ResourceUpdate,
|
||
"/resources/update",
|
||
self._resource_update_callback,
|
||
callback_group=ReentrantCallbackGroup(),
|
||
),
|
||
"resource_list": self.create_service(
|
||
ResourceList, "/resources/list", self._resource_list_callback, callback_group=ReentrantCallbackGroup()
|
||
),
|
||
"node_info_update": self.create_service(
|
||
SerialCommand,
|
||
"/node_info_update",
|
||
self._node_info_update_callback,
|
||
callback_group=ReentrantCallbackGroup(),
|
||
),
|
||
}
|
||
|
||
def _node_info_update_callback(self, request, response):
|
||
"""
|
||
更新节点信息回调
|
||
"""
|
||
self.lab_logger().info(f"[Host Node] Node info update request received: {request}")
|
||
try:
|
||
from unilabos.app.mq import mqtt_client
|
||
|
||
info = json.loads(request.command)
|
||
if "SYNC_SLAVE_NODE_INFO" in info:
|
||
info = info["SYNC_SLAVE_NODE_INFO"]
|
||
machine_name = info["machine_name"]
|
||
edge_device_id = info["edge_device_id"]
|
||
self.device_machine_names[edge_device_id] = machine_name
|
||
else:
|
||
registry_config = info["registry_config"]
|
||
for device_config in registry_config:
|
||
mqtt_client.publish_registry(device_config["id"], device_config)
|
||
self.lab_logger().debug(f"[Host Node] Node info update: {info}")
|
||
response.response = "OK"
|
||
except Exception as e:
|
||
self.lab_logger().error(f"[Host Node] Error updating node info: {e.args}")
|
||
response.response = "ERROR"
|
||
return response
|
||
|
||
def _resource_add_callback(self, request, response):
|
||
"""
|
||
添加资源回调
|
||
|
||
处理添加资源请求,将资源数据传递到桥接器
|
||
|
||
Args:
|
||
request: 包含资源数据的请求对象
|
||
response: 响应对象
|
||
|
||
Returns:
|
||
响应对象,包含操作结果
|
||
"""
|
||
resources = [convert_from_ros_msg(resource) for resource in request.resources]
|
||
self.lab_logger().info(f"[Host Node-Resource] Add request received: {len(resources)} resources")
|
||
|
||
success = False
|
||
if len(self.bridges) > 0:
|
||
r = self.bridges[-1].resource_add(add_schema(resources))
|
||
success = bool(r)
|
||
|
||
response.success = success
|
||
self.lab_logger().info(f"[Host Node-Resource] Add request completed, success: {success}")
|
||
return response
|
||
|
||
def _resource_get_callback(self, request, response):
|
||
"""
|
||
获取资源回调
|
||
|
||
处理获取资源请求,从桥接器或本地查询资源数据
|
||
|
||
Args:
|
||
request: 包含资源ID的请求对象
|
||
response: 响应对象
|
||
|
||
Returns:
|
||
响应对象,包含查询到的资源
|
||
"""
|
||
self.lab_logger().info(f"[Host Node-Resource] Get request for ID: {request.id}")
|
||
|
||
if len(self.bridges) > 0:
|
||
# 云上物料服务,根据 id 查询物料
|
||
try:
|
||
r = self.bridges[-1].resource_get(request.id, request.with_children)["data"]
|
||
self.lab_logger().debug(f"[Host Node-Resource] Retrieved from bridge: {len(r)} resources")
|
||
except Exception as e:
|
||
self.lab_logger().error(f"[Host Node-Resource] Error retrieving from bridge: {str(e)}")
|
||
r = [resource for resource in self.resources_config if resource.get("id") == request.id]
|
||
self.lab_logger().warning(f"[Host Node-Resource] Retrieved from local: {len(r)} resources")
|
||
else:
|
||
# 本地物料服务,根据 id 查询物料
|
||
r = [resource for resource in self.resources_config if resource.get("id") == request.id]
|
||
self.lab_logger().debug(f"[Host Node-Resource] Retrieved from local: {len(r)} resources")
|
||
|
||
response.resources = [convert_to_ros_msg(Resource, resource) for resource in r]
|
||
return response
|
||
|
||
def _resource_delete_callback(self, request, response):
|
||
"""
|
||
删除资源回调
|
||
|
||
处理删除资源请求,将删除指令传递到桥接器
|
||
|
||
Args:
|
||
request: 包含资源ID的请求对象
|
||
response: 响应对象
|
||
|
||
Returns:
|
||
响应对象,包含操作结果
|
||
"""
|
||
self.lab_logger().info(f"[Host Node-Resource] Delete request for ID: {request.id}")
|
||
|
||
success = False
|
||
if len(self.bridges) > 0:
|
||
try:
|
||
r = self.bridges[-1].resource_delete(request.id)
|
||
success = bool(r)
|
||
except Exception as e:
|
||
self.lab_logger().error(f"[Host Node-Resource] Error deleting resource: {str(e)}")
|
||
|
||
response.success = success
|
||
self.lab_logger().info(f"[Host Node-Resource] Delete request completed, success: {success}")
|
||
return response
|
||
|
||
def _resource_update_callback(self, request, response):
|
||
"""
|
||
更新资源回调
|
||
|
||
处理更新资源请求,将更新指令传递到桥接器
|
||
|
||
Args:
|
||
request: 包含资源数据的请求对象
|
||
response: 响应对象
|
||
|
||
Returns:
|
||
响应对象,包含操作结果
|
||
"""
|
||
resources = [convert_from_ros_msg(resource) for resource in request.resources]
|
||
self.lab_logger().info(f"[Host Node-Resource] Update request received: {len(resources)} resources")
|
||
|
||
success = False
|
||
if len(self.bridges) > 0:
|
||
try:
|
||
r = self.bridges[-1].resource_update(add_schema(resources))
|
||
success = bool(r)
|
||
except Exception as e:
|
||
self.lab_logger().error(f"[Host Node-Resource] Error updating resources: {str(e)}")
|
||
|
||
response.success = success
|
||
self.lab_logger().info(f"[Host Node-Resource] Update request completed, success: {success}")
|
||
return response
|
||
|
||
def _resource_list_callback(self, request, response):
|
||
"""
|
||
列出资源回调
|
||
|
||
处理列出资源请求,返回所有可用资源
|
||
|
||
Args:
|
||
request: 请求对象
|
||
response: 响应对象
|
||
|
||
Returns:
|
||
响应对象,包含资源列表
|
||
"""
|
||
self.lab_logger().info(f"[Host Node-Resource] List request received")
|
||
# 这里可以实现返回资源列表的逻辑
|
||
self.lab_logger().debug(f"[Host Node-Resource] List parameters: {request}")
|
||
return response
|
||
|
||
def test_latency(self):
|
||
"""
|
||
测试网络延迟的action实现
|
||
通过5次ping-pong机制校对时间误差并计算实际延迟
|
||
"""
|
||
import uuid as uuid_module
|
||
|
||
self.lab_logger().info("=" * 60)
|
||
self.lab_logger().info("开始网络延迟测试...")
|
||
|
||
# 记录任务开始执行的时间
|
||
task_start_time = time.time()
|
||
|
||
# 进行5次ping-pong测试
|
||
ping_results = []
|
||
|
||
for i in range(5):
|
||
self.lab_logger().info(f"第{i+1}/5次ping-pong测试...")
|
||
|
||
# 生成唯一的ping ID
|
||
ping_id = str(uuid_module.uuid4())
|
||
|
||
# 记录发送时间
|
||
send_timestamp = time.time()
|
||
|
||
# 发送ping
|
||
from unilabos.app.mq import mqtt_client
|
||
|
||
mqtt_client.send_ping(ping_id, send_timestamp)
|
||
|
||
# 等待pong响应
|
||
timeout = 10.0
|
||
start_wait_time = time.time()
|
||
|
||
while time.time() - start_wait_time < timeout:
|
||
with self._ping_lock:
|
||
if ping_id in self._ping_responses:
|
||
pong_data = self._ping_responses.pop(ping_id)
|
||
break
|
||
time.sleep(0.001)
|
||
else:
|
||
self.lab_logger().error(f"❌ 第{i+1}次测试超时")
|
||
continue
|
||
|
||
# 计算本次测试结果
|
||
receive_timestamp = time.time()
|
||
client_timestamp = pong_data["client_timestamp"]
|
||
server_timestamp = pong_data["server_timestamp"]
|
||
|
||
# 往返时间
|
||
rtt_ms = (receive_timestamp - send_timestamp) * 1000
|
||
|
||
# 客户端与服务端时间差(客户端时间 - 服务端时间)
|
||
# 假设网络延迟对称,取中间点的服务端时间
|
||
mid_point_time = send_timestamp + (receive_timestamp - send_timestamp) / 2
|
||
time_diff_ms = (mid_point_time - server_timestamp) * 1000
|
||
|
||
ping_results.append({"rtt_ms": rtt_ms, "time_diff_ms": time_diff_ms})
|
||
|
||
self.lab_logger().info(f"✅ 第{i+1}次: 往返时间={rtt_ms:.2f}ms, 时间差={time_diff_ms:.2f}ms")
|
||
|
||
time.sleep(0.1)
|
||
|
||
if not ping_results:
|
||
self.lab_logger().error("❌ 所有ping-pong测试都失败了")
|
||
return {"status": "all_timeout"}
|
||
|
||
# 统计分析
|
||
rtts = [r["rtt_ms"] for r in ping_results]
|
||
time_diffs = [r["time_diff_ms"] for r in ping_results]
|
||
|
||
avg_rtt_ms = sum(rtts) / len(rtts)
|
||
avg_time_diff_ms = sum(time_diffs) / len(time_diffs)
|
||
max_time_diff_error_ms = max(abs(min(time_diffs)), abs(max(time_diffs)))
|
||
|
||
self.lab_logger().info("-" * 50)
|
||
self.lab_logger().info("[测试统计]")
|
||
self.lab_logger().info(f"有效测试次数: {len(ping_results)}/5")
|
||
self.lab_logger().info(f"平均往返时间: {avg_rtt_ms:.2f}ms")
|
||
self.lab_logger().info(f"平均时间差: {avg_time_diff_ms:.2f}ms")
|
||
self.lab_logger().info(f"时间差范围: {min(time_diffs):.2f}ms ~ {max(time_diffs):.2f}ms")
|
||
self.lab_logger().info(f"最大时间误差: ±{max_time_diff_error_ms:.2f}ms")
|
||
|
||
# 计算任务执行延迟
|
||
if hasattr(self, "server_latest_timestamp") and self.server_latest_timestamp > 0:
|
||
self.lab_logger().info("-" * 50)
|
||
self.lab_logger().info("[任务执行延迟分析]")
|
||
self.lab_logger().info(f"服务端任务下发时间: {self.server_latest_timestamp:.6f}")
|
||
self.lab_logger().info(f"客户端任务开始时间: {task_start_time:.6f}")
|
||
|
||
# 原始时间差(不考虑时间同步误差)
|
||
raw_delay_ms = (task_start_time - self.server_latest_timestamp) * 1000
|
||
|
||
# 考虑时间同步误差后的延迟(用平均时间差校正)
|
||
corrected_delay_ms = raw_delay_ms - avg_time_diff_ms
|
||
|
||
self.lab_logger().info(f"📊 原始时间差: {raw_delay_ms:.2f}ms")
|
||
self.lab_logger().info(f"🔧 时间同步校正: {avg_time_diff_ms:.2f}ms")
|
||
self.lab_logger().info(f"⏰ 实际任务延迟: {corrected_delay_ms:.2f}ms")
|
||
self.lab_logger().info(f"📏 误差范围: ±{max_time_diff_error_ms:.2f}ms")
|
||
|
||
# 给出延迟范围
|
||
min_delay = corrected_delay_ms - max_time_diff_error_ms
|
||
max_delay = corrected_delay_ms + max_time_diff_error_ms
|
||
self.lab_logger().info(f"📋 延迟范围: {min_delay:.2f}ms ~ {max_delay:.2f}ms")
|
||
|
||
else:
|
||
self.lab_logger().warning("⚠️ 无法获取服务端任务下发时间,跳过任务延迟分析")
|
||
corrected_delay_ms = -1
|
||
|
||
self.lab_logger().info("=" * 60)
|
||
|
||
return {
|
||
"avg_rtt_ms": avg_rtt_ms,
|
||
"avg_time_diff_ms": avg_time_diff_ms,
|
||
"max_time_error_ms": max_time_diff_error_ms,
|
||
"task_delay_ms": corrected_delay_ms if corrected_delay_ms > 0 else -1,
|
||
"raw_delay_ms": (
|
||
raw_delay_ms if hasattr(self, "server_latest_timestamp") and self.server_latest_timestamp > 0 else -1
|
||
),
|
||
"test_count": len(ping_results),
|
||
"status": "success",
|
||
}
|
||
|
||
def handle_pong_response(self, pong_data: dict):
|
||
"""
|
||
处理pong响应
|
||
"""
|
||
ping_id = pong_data.get("ping_id")
|
||
if ping_id:
|
||
with self._ping_lock:
|
||
self._ping_responses[ping_id] = pong_data
|
||
|
||
# 详细信息合并为一条日志
|
||
client_timestamp = pong_data.get("client_timestamp", 0)
|
||
server_timestamp = pong_data.get("server_timestamp", 0)
|
||
current_time = time.time()
|
||
|
||
self.lab_logger().debug(
|
||
f"📨 Pong | ID:{ping_id[:8]}.. | C→S→C: {client_timestamp:.3f}→{server_timestamp:.3f}→{current_time:.3f}"
|
||
)
|
||
else:
|
||
self.lab_logger().warning("⚠️ 收到无效的Pong响应(缺少ping_id)")
|