diff --git a/.gitignore b/.gitignore index 7eb83ee..9013072 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,10 @@ aio/venv aio/__pycache__/ aio/code/automatic_test/__pycache__/ aio/code/data_process/__pycache__/ -aio/assets/templates/c_msg.log \ No newline at end of file +aio/assets/templates/c_msg.log* +aio/code/durable_action/__pycache__/ +aio/assets/templates/durable/ +aio/assets/templates/.__c_msg.lock +aio/code/commons/__pycache__/ +aio/assets/templates/debug.log +dial_gauge/results.xlsx diff --git a/aio/README.md b/aio/README.md index 5a7cfc2..fecd128 100644 --- a/aio/README.md +++ b/aio/README.md @@ -8,6 +8,7 @@ 4. wavelogger 波形处理,几乎不花费时间 5. 制动自动化测试 6. 电机电流自动化测试 +7. 耐久工程曲线指标采集(仅适用于六轴) --- @@ -30,9 +31,10 @@ ### 四、打包方法 +打包时,只需要修改 clibs.py 中的 PREFIX 即可,调试时再修改回来 + ``` -pyinstaller.exe -F --version-file file_version_info.txt -i .\icon.ico .\aio.py -p .\brake.py -p .\current.py -pyinstaller --noconfirm --onedir --windowed --add-data "C:/Users/Administrator/AppData/Local/Programs/Python/Python312/Lib/site-packages/customtkinter;customtkinter/" --version-file ..\assets\file_version_info.txt -i ..\assets\icon.ico ..\code\aio.py -p ..\code\data_process\brake.py -p ..\code\data_process\iso.py -p ..\code\data_process\current.py -p ..\code\data_process\wavelogger.py +pyinstaller --noconfirm --onedir --windowed --optimize 2 --contents-directory . --upx-dir "D:/Syncthing/common/A_Program/upx-4.2.4-win64/" --add-data "C:/Users/Administrator/AppData/Local/Programs/Python/Python312/Lib/site-packages/customtkinter;customtkinter/" --add-data "D:/Syncthing/company/D-测试工作/X-自动化测试/01-AIO/rokae/aio/assets/templates:templates" --version-file ../assets/file_version_info.txt -i ../assets/icon.ico ../code/aio.py -p ../code/data_process/brake.py -p ../code/data_process/iso.py -p ../code/data_process/current.py -p ../code/data_process/wavelogger.py -p ../code/commons/openapi.py -p ../code/commons/clibs.py -p ../code/automatic_test/btn_functions.py -p ../code/automatic_test/do_current.py -p ../code/automatic_test/do_brake.py -p ../code/durable_action/factory_test.py ``` --- @@ -132,14 +134,18 @@ pyinstaller --noconfirm --onedir --windowed --add-data "C:/Users/Administrator/A > **需要注意的点** -1. 使用之前需要手动修改!!负载信息!!点位信息!!,确保所有点位不会发生撞击之后,再进行自动化测试 -2. 工程文件不能手动重命名,需要重命名存档,可以导入HMI,然后另存为 -3. 务必正确填写configs.xlsx中的Target页面,A1单元格可以选择正负方向急停,但不完全保证100%,大概有95%左右的准确度 -4. 由于xCore系统问题,运行过程中可能会出现机器人宕机问题,如果遇到,可以手动重启控制柜,重新运行 -5. 运行过程中,如果是因为机器问题无法达到额定百分比速度,会在日志输出框提示,注意观察 -6. 运行自动化程序之前,确保机器处于正常状态,无故障,未触发急停 -7. 需要额外硬件接线,详细参考configs.xlsx中急停接线图sheet页 -8. 注意观察二轴100%臂展时,是否可以获取到正确的数据 +1. 修改该文件点位信息 +2. 修改“编程”→“工具列表”中的工具信息,制动只允许使用tool33/tool66/tool100/inertia这四个工具,不可重命名 +3. 除了调试行,其他行请勿修改,包括增加空行等,尤其是有特别注释的地方 +4. stop0_related半静态任务,需要注意DO0_0的命名,不同控制柜,可能不一样 +5. 需要导入 autotest.xml 寄存器文件,以及新建modbus总线设备,命名为autotest,其他默认即可 +6. 其他无需修改,如有其他需求,可联系fanmingfu@rokae.com沟通 +7. 需要额外硬件接线,详细参考configs.xlsx中急停接线图sheet页,其中DO0_0视硬件情况,可能为其他名称 +8. 运行自动化程序之前,确保机器处于正常状态,无故障,未触发急停 +9. 运行过程中,如果是因为机器问题无法达到额定百分比速度,会在日志输出框提示,注意观察 +10. 由于xCore系统问题,运行过程中可能会出现机器人宕机问题,如果遇到,可以手动重启控制柜,重新运行 +11. 务必正确填写configs.xlsx中的Target页面,A1单元格可以选择正负方向急停 +12. 工程文件可以手动重命名,按照机型存档,或者导出用于自动化测试 #### 6) 电机电流自动化测试 @@ -150,7 +156,16 @@ pyinstaller --noconfirm --onedir --windowed --add-data "C:/Users/Administrator/A > **需要注意的点** -基本同第五点 +基本同第五点,针对五轴以及以下的机型,缺失轴数据可以填写其他有效轴任意一轴的点位信息 + + +#### 7) 耐久工程曲线指标采集 + +可实现固定周期指定曲线指标的采集,用于长时间观察指标的变化情况,输入文件: +- configs.xlsx,执行之前需要手动修改好configs.xlsx中的参数,以及间隔时间 +- target.zip,需要确认工程点位和动作无问题后,保存导出 + +> 重新运行时,必须突出软件,重新运行 #### 其他 customtkinter的tabview组件不支持修改字体大小,可以参考 [Changing Font of a Tabview](https://github.com/TomSchimansky/CustomTkinter/issues/2296) 进行手动修改源码实现: @@ -464,4 +479,125 @@ v0.1.9.1(2024/07/12) - socket类种修改tab_name的值为'openapi' v0.1.9.2(2024/07/13) -1. [current: current.py]: 在find_point函数种,当无法找到正确点位时,继续执行,而不是直接终止执行 +1. [APIs: do_brake.py] + - 修改ready_to_go信号的接收逻辑,适配大负载机型 +2. [APIs: do_current.py] + - 修改ready_to_go信号的接收逻辑,适配大负载机型 + - 调整单轴测试时间为35s,适配大负载机型,调整堵转电流持续时间15s,适当减少测试时间 + - 将act信号置为False的动作放在初始化,增加程序健壮性 + - 修改所有输出文件的命名,在扩展名之前加入时间戳 + - 删除多余的时序矫正语句——item['value'].reverse(),使输出的曲线为平滑的自然顺序 +3. [current: current.py] + - 在find_point函数种,当无法找到正确点位时,继续执行,而不是直接终止执行 + - max功能计算逻辑矫正,应该是取绝对值的最大值 + - 整体梳理了trq/trqh的传递路径,现已修正完毕 + - 减速比rr数据源修改为configs.xlsx +4. 在current工程main函数增加 VelSet 100语句 + +v0.1.9.3(2024/07/15) +1. [APIs: openapi.py] + - 修改modbus连接失败报错输出形式,使之只在automatic test页面显示 + - 将该文件移动至toplevel,为后面扩展做准备 + - 修改heartbeat文件路径,使后续打包的时候更方便 +2. [APIs: aio.py] + - 修改heartbeat文件路径,使后续打包的时候更方便 + - 修改write2textbox函数的打印逻辑,先判断网络相关 + +v0.1.9.4(2024/07/15) +1. [profile: aio.py]:完善durable text相关逻辑 +2. [profile: do_brake/do_current/btn_functions.py]:删除validate_resp函数,修改execution函数 +3. [profile: factory_test.py] + - 新增耐久/老化测试程序 + - 实现六轴折线图显示 +4. [profile: openapi.py]:多次合并遗留问题处理 +5. templates文件夹组织架构调整 + +v0.2.0.0(2024/07/17) +1. [profile: aio.py] + - 增加velocity相关逻辑 + - 修改负载信息为曲线信息 +2. [profile: factory_test.py] + - 增加velocity相关逻辑 +3. [profile: current.py] + - 修正减速比获取的规则 +4. [profile: openapi.py] + - HmiRequest模块:日志取消记录move.monitor相关 + - HmiRequest模块:增加了durable_lock变量,控制文件读写互斥 + +v0.2.0.1(2024/07/19) +1. [main: aio.py] + - 修改了x轴显示,使之为时间刻度 + - 修改pre_warning函数,增加了durable test的初始化 +2. [main: factory_test.py] + - 增加了数据计算错误的判断逻辑 + - 增加了历史数据保存的逻辑 + - 增加了文件读写互斥的逻辑 + - 修改功能为输出有效电流和最大电流,并将数据结构简化 + +v0.2.0.2(2024/07/26) +1. [main: current.py] + - 修正堵转电流无法正确写入结果文件的问题 +2. [main: do_brake.py] + - 初始速度采集等待时间设置为可通过configs.xlsx配置文件调整的 + - 初次速度采集停止逻辑修改为tasks.stop指令(未验证) + - 急停信号触发前,pending时间设置为固定值10s + - 实现正负方向速度采集逻辑 + - 工程名变更逻辑实现修改为通配符,方便后续根据机型保存文件 + - 增加超差后写诊断的逻辑,并可以通过configs.xlsx配置文件调整 + - 程序输出中增加时间戳,方便调试定位日志时间 +3. [main: do_current.py] + - 工程名变更逻辑实现修改为通配符,方便后续根据机型保存文件 +4. 为工程文件添加更详细的注释 +5. 补充了do_current/do_brake的流程图 +6. [main: openapi.py] + - 将modbus motor_on/off的实现方法改为高电平脉冲触发 +7. configs.xlsx配置表新增write_diagnosis/get_init_speed两个参数 + +v0.2.0.3(2024/07/27) +1. [APIs: do_brake.py]: 精简程序,解决 OOM 问题 +2. [APIs: do_current.py]: 精简程序,解决 OOM 问题 +3. [APIs: factory_test.py]: 精简程序,解决 OOM 问题 +4. [APIsL openapi.py] + - 心跳修改为 1 s,因为 OOM 问题的解决依赖于长久的打开曲线开关,此时对于 hr.c_msg 的定时清理是个挑战,将心跳缩短,有利于清理日志后,避免丢失心跳 + - 新增 diagnosis.save 命令,但是执行时,有问题,待解决 + +v0.2.0.4(2024/07/30) +1. [APIs: do_brake.py]: 修复制动数据处理过程中,只取曲线的最后 240 个数据 +2. [APIs: aio.py]: 判定版本处,删除 self.destroy(),因为该语句会导致异常发生 + - 心跳修改为 1s,因为 OOM 问题的解决依赖于长久的打开曲线开关,此时对于 hr.c_msg 的定时清理是个挑战,将心跳缩短,有利于清理日志后,避免丢失心跳 + - 新增 diagnosis.save 命令,但是执行时,有问题,待解决 + +v0.2.0.5(2024/07/31) +此版本改动较大,公共部分做了规整,放置到新建文件夹 commons 当中,并所有自定义模块引入 logging 模块,记录重要信息 +1. [t_change_ui: clibs.py] + - 调整代码组织结构,新增模块,将公共函数以及类合并入此 + - 将一些常量放入该模块 + - 引入logging/concurrent_log_handler模块,并作初始化操作,供其他模块使用,按50M切割,最多保留10份 + - prj_to_xcore函数设置工程名部分重写,修复了多个prj工程可能不能执行的问题,并优化输入密码的部分 +2. [t_change_ui: openapi.py] + - 完全重写了 get_from_id 函数,使更精准 + - 在 msg_storage 函数中,增加 logger,保留所有响应消息 + - 删除 heartbeat 函数中的日志保存功能部分 + - 心跳再次修改为 2s... +3. [t_change_ui: aio.py] + - 增加了日志初始化部分 + - detect_network 函数中修改重新实例化HR间隔为 4s,对应心跳 + - create_plot 函数中增加 close('all'),解决循环画图不销毁占用内存的问题 +4. [t_change_ui: do_brake.py] + - 使用一直打开曲线的方法规避解决了 OOM 的问题,同时修改数据处理方式,只取最后 12s + - 优化 ssh 输入密码的部分 +5. [t_change_ui: do_current.py] + - 保持电流,只取最后 15s + - 优化 ssh 输入密码的部分 +6. [t_change_ui: all the part]: 引入 commons 包,并定制了 logging 输出,后续持续优化 +7. [APIs: btn_functions.py]: 重写了告警输出函数,从日志中拿数据 +8. [APIs: aio.py]: 将日志框输出的内容,也保存至日志文件 +9. [APIs: do_brake.py] + - 修改获取初始速度的逻辑,只获取configs文件中配置的时间内的速度 + - 新增 configs 参数 single_brake,可针对特定条件做测试 +10. [APIs: all]: 添加了 logger.setLevel(INFO),只有添加这个,单个模块内才生效 + +v0.2.0.6(2024/08/09) +1. [t_change_ui: all files] + - 修改了 logger 的实现 + - 尤其是 clibs.py,使用日志字典,重写了日志记录的功能 \ No newline at end of file diff --git a/aio/assets/configs.xlsx b/aio/assets/configs.xlsx index e591d4c..16eadd3 100644 Binary files a/aio/assets/configs.xlsx and b/aio/assets/configs.xlsx differ diff --git a/aio/assets/file_version_info.txt b/aio/assets/file_version_info.txt index 5f58e11..ec3ed0c 100644 --- a/aio/assets/file_version_info.txt +++ b/aio/assets/file_version_info.txt @@ -6,8 +6,8 @@ VSVersionInfo( ffi=FixedFileInfo( # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) # Set not needed items to zero 0. - filevers=(0, 1, 9, 2), - prodvers=(0, 1, 9, 2), + filevers=(0, 2, 0, 5), + prodvers=(0, 2, 0, 5), # Contains a bitmask that specifies the valid bits 'flags'r mask=0x3f, # Contains a bitmask that specifies the Boolean attributes of the file. @@ -31,12 +31,12 @@ VSVersionInfo( '040904b0', [StringStruct('CompanyName', 'Rokae - https://www.rokae.com/'), StringStruct('FileDescription', 'All in one automatic toolbox'), - StringStruct('FileVersion', '0.1.9.2 (2024-07-13)'), + StringStruct('FileVersion', '0.2.0.5 (2024-08-02)'), StringStruct('InternalName', 'AIO.exe'), StringStruct('LegalCopyright', '© 2024-2024 Manford Fan'), StringStruct('OriginalFilename', 'AIO.exe'), StringStruct('ProductName', 'AIO'), - StringStruct('ProductVersion', '0.1.9.2 (2024-07-13)')]) + StringStruct('ProductVersion', '0.2.0.5 (2024-08-02)')]) ]), VarFileInfo([VarStruct('Translation', [1033, 1200])]) ] diff --git a/aio/assets/layout.xlsx b/aio/assets/layout.xlsx index c80baa4..735de05 100644 Binary files a/aio/assets/layout.xlsx and b/aio/assets/layout.xlsx differ diff --git a/aio/assets/requirements.txt b/aio/assets/requirements.txt index ad41cdf..63a94b4 100644 --- a/aio/assets/requirements.txt +++ b/aio/assets/requirements.txt @@ -1,9 +1,9 @@ -openpyxl==3.1.2 -pdfplumber==0.11.0 +concurrent_log_handler==0.9.25 customtkinter==5.2.2 -Jinja2==3.1.4 -lxml==5.2.2 -numpy==1.26.4 +matplotlib==3.9.1 +numpy==2.0.1 +openpyxl==3.1.2 pandas==2.2.2 -pillow==10.3.0 -pyinstaller==6.7.0 +paramiko==3.4.0 +pdfplumber==0.11.0 +pymodbus==3.6.9 diff --git a/aio/assets/target.zip b/aio/assets/target.zip deleted file mode 100644 index 2c9fdb7..0000000 Binary files a/aio/assets/target.zip and /dev/null differ diff --git a/aio/assets/target_brake_current.zip b/aio/assets/target_brake_current.zip new file mode 100644 index 0000000..b3d356f Binary files /dev/null and b/aio/assets/target_brake_current.zip differ diff --git a/aio/assets/target_durable.zip b/aio/assets/target_durable.zip new file mode 100644 index 0000000..695dfb5 Binary files /dev/null and b/aio/assets/target_durable.zip differ diff --git a/aio/assets/templates/controller.heart.json b/aio/assets/templates/json/controller.heart.json similarity index 100% rename from aio/assets/templates/controller.heart.json rename to aio/assets/templates/json/controller.heart.json diff --git a/aio/assets/templates/device.get_params.json b/aio/assets/templates/json/device.get_params.json similarity index 100% rename from aio/assets/templates/device.get_params.json rename to aio/assets/templates/json/device.get_params.json diff --git a/aio/assets/templates/diagnosis.get_params.json b/aio/assets/templates/json/diagnosis.get_params.json similarity index 100% rename from aio/assets/templates/diagnosis.get_params.json rename to aio/assets/templates/json/diagnosis.get_params.json diff --git a/aio/assets/templates/diagnosis.open.json b/aio/assets/templates/json/diagnosis.open.json similarity index 78% rename from aio/assets/templates/diagnosis.open.json rename to aio/assets/templates/json/diagnosis.open.json index 915ff6a..7fe21c2 100644 --- a/aio/assets/templates/diagnosis.open.json +++ b/aio/assets/templates/json/diagnosis.open.json @@ -5,8 +5,8 @@ "data": { "open": false, "display_open": false, - "overrun": true, - "turn_area": true, + "overrun": false, + "turn_area": false, "delay_motion": false } } \ No newline at end of file diff --git a/aio/assets/templates/diagnosis.save.json b/aio/assets/templates/json/diagnosis.save.json similarity index 100% rename from aio/assets/templates/diagnosis.save.json rename to aio/assets/templates/json/diagnosis.save.json diff --git a/aio/assets/templates/diagnosis.set_params.json b/aio/assets/templates/json/diagnosis.set_params.json similarity index 100% rename from aio/assets/templates/diagnosis.set_params.json rename to aio/assets/templates/json/diagnosis.set_params.json diff --git a/aio/assets/templates/overview.get_autoload.json b/aio/assets/templates/json/overview.get_autoload.json similarity index 100% rename from aio/assets/templates/overview.get_autoload.json rename to aio/assets/templates/json/overview.get_autoload.json diff --git a/aio/assets/templates/overview.get_cur_prj.json b/aio/assets/templates/json/overview.get_cur_prj.json similarity index 100% rename from aio/assets/templates/overview.get_cur_prj.json rename to aio/assets/templates/json/overview.get_cur_prj.json diff --git a/aio/assets/templates/overview.reload.json b/aio/assets/templates/json/overview.reload.json similarity index 100% rename from aio/assets/templates/overview.reload.json rename to aio/assets/templates/json/overview.reload.json diff --git a/aio/assets/templates/overview.set_autoload.json b/aio/assets/templates/json/overview.set_autoload.json similarity index 100% rename from aio/assets/templates/overview.set_autoload.json rename to aio/assets/templates/json/overview.set_autoload.json diff --git a/aio/assets/templates/register.set_value.json b/aio/assets/templates/json/register.set_value.json similarity index 100% rename from aio/assets/templates/register.set_value.json rename to aio/assets/templates/json/register.set_value.json diff --git a/aio/assets/templates/rl_task.pp_to_main.json b/aio/assets/templates/json/rl_task.pp_to_main.json similarity index 100% rename from aio/assets/templates/rl_task.pp_to_main.json rename to aio/assets/templates/json/rl_task.pp_to_main.json diff --git a/aio/assets/templates/rl_task.run.json b/aio/assets/templates/json/rl_task.run.json similarity index 100% rename from aio/assets/templates/rl_task.run.json rename to aio/assets/templates/json/rl_task.run.json diff --git a/aio/assets/templates/rl_task.stop.json b/aio/assets/templates/json/rl_task.stop.json similarity index 100% rename from aio/assets/templates/rl_task.stop.json rename to aio/assets/templates/json/rl_task.stop.json diff --git a/aio/assets/templates/state.get_state.json b/aio/assets/templates/json/state.get_state.json similarity index 100% rename from aio/assets/templates/state.get_state.json rename to aio/assets/templates/json/state.get_state.json diff --git a/aio/assets/templates/state.get_tp_mode.json b/aio/assets/templates/json/state.get_tp_mode.json similarity index 100% rename from aio/assets/templates/state.get_tp_mode.json rename to aio/assets/templates/json/state.get_tp_mode.json diff --git a/aio/assets/templates/state.set_tp_mode.json b/aio/assets/templates/json/state.set_tp_mode.json similarity index 100% rename from aio/assets/templates/state.set_tp_mode.json rename to aio/assets/templates/json/state.set_tp_mode.json diff --git a/aio/assets/templates/state.switch_auto.json b/aio/assets/templates/json/state.switch_auto.json similarity index 100% rename from aio/assets/templates/state.switch_auto.json rename to aio/assets/templates/json/state.switch_auto.json diff --git a/aio/assets/templates/state.switch_manual.json b/aio/assets/templates/json/state.switch_manual.json similarity index 100% rename from aio/assets/templates/state.switch_manual.json rename to aio/assets/templates/json/state.switch_manual.json diff --git a/aio/assets/templates/state.switch_motor_off.json b/aio/assets/templates/json/state.switch_motor_off.json similarity index 100% rename from aio/assets/templates/state.switch_motor_off.json rename to aio/assets/templates/json/state.switch_motor_off.json diff --git a/aio/assets/templates/state.switch_motor_on.json b/aio/assets/templates/json/state.switch_motor_on.json similarity index 100% rename from aio/assets/templates/state.switch_motor_on.json rename to aio/assets/templates/json/state.switch_motor_on.json diff --git a/aio/assets/vers b/aio/assets/vers index ea80ca6..4f1ec33 100644 --- a/aio/assets/vers +++ b/aio/assets/vers @@ -1 +1 @@ -0.1.9.2 @ 07/13/2024 \ No newline at end of file +0.2.0.5 @ 08/02/2024 \ No newline at end of file diff --git a/aio/assets/workflow/brake.excalidraw b/aio/assets/workflow/brake.excalidraw index 3b5ddc4..a899e29 100644 --- a/aio/assets/workflow/brake.excalidraw +++ b/aio/assets/workflow/brake.excalidraw @@ -4,30 +4,30 @@ "source": "http://10.2.23.150:10020", "elements": [ { - "id": "VKFtKdgvUf_KRKPEhzkwN", "type": "rectangle", - "x": 303.3333435058594, - "y": 190, - "width": 96.66668701171875, - "height": 39.33334350585938, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "transparent", + "version": 110, + "versionNonce": 1663603452, + "index": "a0", + "isDeleted": false, + "id": "VKFtKdgvUf_KRKPEhzkwN", "fillStyle": "solid", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 1, "opacity": 100, + "angle": 0, + "x": 303.3333435058594, + "y": 190, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 96.66668701171875, + "height": 39.33334350585938, + "seed": 1865776252, "groupIds": [], "frameId": null, - "index": "a0", "roundness": { "type": 3 }, - "seed": 1865776252, - "version": 110, - "versionNonce": 1663603452, - "isDeleted": false, "boundElements": [ { "type": "text", @@ -43,35 +43,35 @@ "locked": false }, { - "id": "ROAaPkoBR-QkYLBotqCfD", "type": "text", - "x": 331.66668701171875, - "y": 197.1666717529297, - "width": 40, - "height": 25, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "transparent", + "version": 81, + "versionNonce": 747583812, + "index": "a1", + "isDeleted": false, + "id": "ROAaPkoBR-QkYLBotqCfD", "fillStyle": "solid", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 1, "opacity": 100, + "angle": 0, + "x": 331.66668701171875, + "y": 197.1666717529297, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 40, + "height": 25, + "seed": 1634680516, "groupIds": [], "frameId": null, - "index": "a1", "roundness": null, - "seed": 1634680516, - "version": 81, - "versionNonce": 747583812, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1718068822440, "link": null, "locked": false, - "text": "开始", "fontSize": 20, "fontFamily": 1, + "text": "开始", "textAlign": "center", "verticalAlign": "middle", "containerId": "VKFtKdgvUf_KRKPEhzkwN", @@ -240,30 +240,30 @@ "lineHeight": 1.25 }, { - "id": "g9-8GSeIkp0vW_kZMseY_", "type": "diamond", - "x": 160.66668701171875, - "y": 459.33331298828125, - "width": 365.33337402343756, - "height": 102.6666870117187, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "transparent", + "version": 162, + "versionNonce": 458003780, + "index": "a6", + "isDeleted": false, + "id": "g9-8GSeIkp0vW_kZMseY_", "fillStyle": "solid", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 1, "opacity": 100, + "angle": 0, + "x": 160.66668701171875, + "y": 459.33331298828125, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 365.33337402343756, + "height": 102.6666870117187, + "seed": 102257532, "groupIds": [], "frameId": null, - "index": "a6", "roundness": { "type": 2 }, - "seed": 102257532, - "version": 162, - "versionNonce": 458003780, - "isDeleted": false, "boundElements": [ { "type": "text", @@ -287,35 +287,35 @@ "locked": false }, { - "id": "r00E8_45oroyHrO6jOFql", "type": "text", - "x": 263.5000305175781, - "y": 497.99998474121094, - "width": 160, - "height": 25, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "transparent", + "version": 102, + "versionNonce": 996993092, + "index": "a6V", + "isDeleted": false, + "id": "r00E8_45oroyHrO6jOFql", "fillStyle": "solid", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 1, "opacity": 100, + "angle": 0, + "x": 263.5000305175781, + "y": 497.99998474121094, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 160, + "height": 25, + "seed": 1477218756, "groupIds": [], "frameId": null, - "index": "a6V", "roundness": null, - "seed": 1477218756, - "version": 102, - "versionNonce": 996993092, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1718069594842, "link": null, "locked": false, - "text": "尝试处理数据文件", "fontSize": 20, "fontFamily": 1, + "text": "尝试处理数据文件", "textAlign": "center", "verticalAlign": "middle", "containerId": "g9-8GSeIkp0vW_kZMseY_", @@ -1040,45 +1040,34 @@ "lineHeight": 1.25 }, { - "id": "ElM71P3ujX7DK-jVqI3DE", "type": "arrow", - "x": 350.00006103515625, - "y": 235.3332977294922, - "width": 0.666656494140625, - "height": 34.666656494140625, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "#e9ecef", + "version": 31, + "versionNonce": 185914236, + "index": "aS", + "isDeleted": false, + "id": "ElM71P3ujX7DK-jVqI3DE", "fillStyle": "solid", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 1, "opacity": 100, + "angle": 0, + "x": 350.00006103515625, + "y": 235.3332977294922, + "strokeColor": "#1e1e1e", + "backgroundColor": "#e9ecef", + "width": 0.666656494140625, + "height": 34.666656494140625, + "seed": 1138234492, "groupIds": [], "frameId": null, - "index": "aS", "roundness": { "type": 2 }, - "seed": 1138234492, - "version": 31, - "versionNonce": 185914236, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1718070311849, "link": null, "locked": false, - "points": [ - [ - 0, - 0 - ], - [ - -0.666656494140625, - 34.666656494140625 - ] - ], - "lastCommittedPoint": null, "startBinding": { "elementId": "VKFtKdgvUf_KRKPEhzkwN", "focus": 0.024081446167233695, @@ -1089,49 +1078,49 @@ "focus": 0.059926852921581265, "gap": 9.00006103515625 }, + "lastCommittedPoint": null, "startArrowhead": null, - "endArrowhead": "arrow" - }, - { - "id": "iPyKh3jRmtupi7xaTXi2f", - "type": "arrow", - "x": 343.3334045410156, - "y": 321.9999542236328, - "width": 0, - "height": 34.66668701171875, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "#e9ecef", - "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 1, - "opacity": 100, - "groupIds": [], - "frameId": null, - "index": "aT", - "roundness": { - "type": 2 - }, - "seed": 1574642812, - "version": 45, - "versionNonce": 775346812, - "isDeleted": false, - "boundElements": null, - "updated": 1718070319040, - "link": null, - "locked": false, + "endArrowhead": "arrow", "points": [ [ 0, 0 ], [ - 0, - 34.66668701171875 + -0.666656494140625, + 34.666656494140625 ] - ], - "lastCommittedPoint": null, + ] + }, + { + "type": "arrow", + "version": 45, + "versionNonce": 775346812, + "index": "aT", + "isDeleted": false, + "id": "iPyKh3jRmtupi7xaTXi2f", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 343.3334045410156, + "y": 321.9999542236328, + "strokeColor": "#1e1e1e", + "backgroundColor": "#e9ecef", + "width": 0, + "height": 34.66668701171875, + "seed": 1574642812, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1718070319040, + "link": null, + "locked": false, "startBinding": { "elementId": "S0nSbhhR41jGbkbzsVSqM", "focus": -0.0000011737528079939943, @@ -1142,49 +1131,49 @@ "focus": -0.06962023299391551, "gap": 4.000030517578125 }, + "lastCommittedPoint": null, "startArrowhead": null, - "endArrowhead": "arrow" - }, - { - "id": "Oy_r4Klm5gt2lDvRjgdNj", - "type": "arrow", - "x": 340.6667175292969, - "y": 406.66664123535156, - "width": 3.33331298828125, - "height": 41.33331298828125, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "#e9ecef", - "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 1, - "opacity": 100, - "groupIds": [], - "frameId": null, - "index": "aU", - "roundness": { - "type": 2 - }, - "seed": 661089148, - "version": 31, - "versionNonce": 1839327868, - "isDeleted": false, - "boundElements": null, - "updated": 1718070322633, - "link": null, - "locked": false, + "endArrowhead": "arrow", "points": [ [ 0, 0 ], [ - -3.33331298828125, - 41.33331298828125 + 0, + 34.66668701171875 ] - ], - "lastCommittedPoint": null, + ] + }, + { + "type": "arrow", + "version": 31, + "versionNonce": 1839327868, + "index": "aU", + "isDeleted": false, + "id": "Oy_r4Klm5gt2lDvRjgdNj", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 340.6667175292969, + "y": 406.66664123535156, + "strokeColor": "#1e1e1e", + "backgroundColor": "#e9ecef", + "width": 3.33331298828125, + "height": 41.33331298828125, + "seed": 661089148, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1718070322633, + "link": null, + "locked": false, "startBinding": { "elementId": "g8Kf1izRthcBqrUoNlbA5", "focus": 0.07233116710085088, @@ -1195,34 +1184,45 @@ "focus": -0.060512990174583205, "gap": 12.5339611174741 }, + "lastCommittedPoint": null, "startArrowhead": null, - "endArrowhead": "arrow" + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -3.33331298828125, + 41.33331298828125 + ] + ] }, { - "id": "lW80FdUbsKFFMOLyAxSKR", "type": "arrow", - "x": 335.8001857666984, - "y": 570.1530407085518, - "width": 0.34165278590546677, - "height": 94.51366156195604, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "#e9ecef", + "version": 87, + "versionNonce": 1483013628, + "index": "aV", + "isDeleted": false, + "id": "lW80FdUbsKFFMOLyAxSKR", "fillStyle": "solid", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 1, "opacity": 100, + "angle": 0, + "x": 335.8001857666984, + "y": 570.1530407085518, + "strokeColor": "#1e1e1e", + "backgroundColor": "#e9ecef", + "width": 0.34165278590546677, + "height": 94.51366156195604, + "seed": 860781436, "groupIds": [], "frameId": null, - "index": "aV", "roundness": { "type": 2 }, - "seed": 860781436, - "version": 87, - "versionNonce": 1483013628, - "isDeleted": false, "boundElements": [ { "type": "text", @@ -1232,17 +1232,6 @@ "updated": 1718070548460, "link": null, "locked": false, - "points": [ - [ - 0, - 0 - ], - [ - -0.34165278590546677, - 94.51366156195604 - ] - ], - "lastCommittedPoint": null, "startBinding": { "elementId": "g9-8GSeIkp0vW_kZMseY_", "focus": 0.0403891467228266, @@ -1253,39 +1242,50 @@ "focus": -0.014457597382353414, "gap": 11.666702270507812 }, + "lastCommittedPoint": null, "startArrowhead": null, - "endArrowhead": "arrow" + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -0.34165278590546677, + 94.51366156195604 + ] + ] }, { - "id": "H-8a2Qj78mNqHhMv4s66F", "type": "text", - "x": 321.929370054898, - "y": 604.9098714895298, - "width": 27.399978637695312, - "height": 25, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "transparent", + "version": 4, + "versionNonce": 180292860, + "index": "aVV", + "isDeleted": false, + "id": "H-8a2Qj78mNqHhMv4s66F", "fillStyle": "solid", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 1, "opacity": 100, + "angle": 0, + "x": 321.929370054898, + "y": 604.9098714895298, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 27.399978637695312, + "height": 25, + "seed": 2098883324, "groupIds": [], "frameId": null, - "index": "aVV", "roundness": null, - "seed": 2098883324, - "version": 4, - "versionNonce": 180292860, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1718070547438, "link": null, "locked": false, - "text": "NO", "fontSize": 20, "fontFamily": 1, + "text": "NO", "textAlign": "center", "verticalAlign": "middle", "containerId": "lW80FdUbsKFFMOLyAxSKR", @@ -1294,45 +1294,34 @@ "lineHeight": 1.25 }, { - "id": "f3bpmwo_vCH7U0noLDDfg", "type": "arrow", - "x": 322.5860571265645, - "y": 720.0000152587891, - "width": 2.80302332155685, - "height": 49.99993896484375, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "#e9ecef", + "version": 144, + "versionNonce": 150863100, + "index": "aW", + "isDeleted": false, + "id": "f3bpmwo_vCH7U0noLDDfg", "fillStyle": "solid", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 1, "opacity": 100, + "angle": 0, + "x": 322.5860571265645, + "y": 720.0000152587891, + "strokeColor": "#1e1e1e", + "backgroundColor": "#e9ecef", + "width": 2.80302332155685, + "height": 49.99993896484375, + "seed": 250973052, "groupIds": [], "frameId": null, - "index": "aW", "roundness": { "type": 2 }, - "seed": 250973052, - "version": 144, - "versionNonce": 150863100, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1718070540169, "link": null, "locked": false, - "points": [ - [ - 0, - 0 - ], - [ - 2.80302332155685, - 49.99993896484375 - ] - ], - "lastCommittedPoint": null, "startBinding": { "elementId": "ChMYpnJP73-IcK4rPOmP2", "focus": 0.1684979166726053, @@ -1343,34 +1332,45 @@ "focus": 0.027586411556604518, "gap": 3.666717529296875 }, + "lastCommittedPoint": null, "startArrowhead": null, - "endArrowhead": "arrow" + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 2.80302332155685, + 49.99993896484375 + ] + ] }, { - "id": "peOkgTd3qx8MjdEPAwHLG", "type": "arrow", - "x": 538.5550904238726, - "y": 505.75210594777275, - "width": 440.1774733040993, - "height": 102.30624128392316, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "#e9ecef", + "version": 360, + "versionNonce": 1378397508, + "index": "aX", + "isDeleted": false, + "id": "peOkgTd3qx8MjdEPAwHLG", "fillStyle": "solid", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 1, "opacity": 100, + "angle": 0, + "x": 538.5550904238726, + "y": 505.75210594777275, + "strokeColor": "#1e1e1e", + "backgroundColor": "#e9ecef", + "width": 440.1774733040993, + "height": 102.30624128392316, + "seed": 497640956, "groupIds": [], "frameId": null, - "index": "aX", "roundness": { "type": 2 }, - "seed": 497640956, - "version": 360, - "versionNonce": 1378397508, - "isDeleted": false, "boundElements": [ { "type": "text", @@ -1380,17 +1380,6 @@ "updated": 1718070605137, "link": null, "locked": false, - "points": [ - [ - 0, - 0 - ], - [ - 440.1774733040993, - -102.30624128392316 - ] - ], - "lastCommittedPoint": null, "startBinding": { "elementId": "g9-8GSeIkp0vW_kZMseY_", "focus": 0.7744521975046411, @@ -1401,39 +1390,50 @@ "focus": 0.9267463929589432, "gap": 8.77320567787546 }, + "lastCommittedPoint": null, "startArrowhead": null, - "endArrowhead": "arrow" + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 440.1774733040993, + -102.30624128392316 + ] + ] }, { - "id": "LR5MKymnabvQSo2fZJbvU", "type": "text", - "x": 740.6638389777777, - "y": 442.0989853058112, - "width": 35.95997619628906, - "height": 25, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "transparent", + "version": 5, + "versionNonce": 1123256316, + "index": "aXV", + "isDeleted": false, + "id": "LR5MKymnabvQSo2fZJbvU", "fillStyle": "solid", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 1, "opacity": 100, + "angle": 0, + "x": 740.6638389777777, + "y": 442.0989853058112, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 35.95997619628906, + "height": 25, + "seed": 249066876, "groupIds": [], "frameId": null, - "index": "aXV", "roundness": null, - "seed": 249066876, - "version": 5, - "versionNonce": 1123256316, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1718070604117, "link": null, "locked": false, - "text": "YES", "fontSize": 20, "fontFamily": 1, + "text": "YES", "textAlign": "center", "verticalAlign": "middle", "containerId": "peOkgTd3qx8MjdEPAwHLG", @@ -1442,45 +1442,34 @@ "lineHeight": 1.25 }, { - "id": "Pq14NHJIb1TC_J8pmPjvr", "type": "arrow", - "x": 945.5749261622786, - "y": 565.27026552284, - "width": 186.42516539045573, - "height": 19.274707665674896, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "#e9ecef", + "version": 257, + "versionNonce": 1674570436, + "index": "aZ", + "isDeleted": false, + "id": "Pq14NHJIb1TC_J8pmPjvr", "fillStyle": "solid", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 1, "opacity": 100, + "angle": 0, + "x": 945.5749261622786, + "y": 565.27026552284, + "strokeColor": "#1e1e1e", + "backgroundColor": "#e9ecef", + "width": 186.42516539045573, + "height": 19.274707665674896, + "seed": 857229052, "groupIds": [], "frameId": null, - "index": "aZ", "roundness": { "type": 2 }, - "seed": 857229052, - "version": 257, - "versionNonce": 1674570436, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1718070600148, "link": null, "locked": false, - "points": [ - [ - 0, - 0 - ], - [ - 186.42516539045573, - -19.274707665674896 - ] - ], - "lastCommittedPoint": null, "startBinding": { "elementId": "1mHFxB9ztEJIoiT7qlB96", "focus": -0.13451402411290317, @@ -1491,49 +1480,49 @@ "focus": -0.00004553043522623549, "gap": 6.6665496826171875 }, + "lastCommittedPoint": null, "startArrowhead": null, - "endArrowhead": "arrow" - }, - { - "id": "Op3-0vLWCxnne2RBT6xi6", - "type": "arrow", - "x": 1153.3334045410156, - "y": 555.3332672119141, - "width": 126.66665649414062, - "height": 110.66665649414062, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "#e9ecef", - "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 1, - "opacity": 100, - "groupIds": [], - "frameId": null, - "index": "ae", - "roundness": { - "type": 2 - }, - "seed": 385859908, - "version": 38, - "versionNonce": 367683268, - "isDeleted": false, - "boundElements": null, - "updated": 1718070456386, - "link": null, - "locked": false, + "endArrowhead": "arrow", "points": [ [ 0, 0 ], [ - -126.66665649414062, - 110.66665649414062 + 186.42516539045573, + -19.274707665674896 ] - ], - "lastCommittedPoint": null, + ] + }, + { + "type": "arrow", + "version": 38, + "versionNonce": 367683268, + "index": "ae", + "isDeleted": false, + "id": "Op3-0vLWCxnne2RBT6xi6", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1153.3334045410156, + "y": 555.3332672119141, + "strokeColor": "#1e1e1e", + "backgroundColor": "#e9ecef", + "width": 126.66665649414062, + "height": 110.66665649414062, + "seed": 385859908, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1718070456386, + "link": null, + "locked": false, "startBinding": { "elementId": "Lj6BzDEByQki5S-EgwpMH", "focus": 0.6674665434007476, @@ -1544,49 +1533,49 @@ "focus": -0.56170540081211, "gap": 8.500030517578125 }, + "lastCommittedPoint": null, "startArrowhead": null, - "endArrowhead": "arrow" - }, - { - "id": "BxnDm2GPRo19a3p7ctAJl", - "type": "arrow", - "x": 1267.3334350585938, - "y": 557.9999237060547, - "width": 56, - "height": 108, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "#e9ecef", - "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 1, - "opacity": 100, - "groupIds": [], - "frameId": null, - "index": "af", - "roundness": { - "type": 2 - }, - "seed": 1070237124, - "version": 45, - "versionNonce": 2135977924, - "isDeleted": false, - "boundElements": null, - "updated": 1718070461942, - "link": null, - "locked": false, + "endArrowhead": "arrow", "points": [ [ 0, 0 ], [ - -56, - 108 + -126.66665649414062, + 110.66665649414062 ] - ], - "lastCommittedPoint": null, + ] + }, + { + "type": "arrow", + "version": 45, + "versionNonce": 2135977924, + "index": "af", + "isDeleted": false, + "id": "BxnDm2GPRo19a3p7ctAJl", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1267.3334350585938, + "y": 557.9999237060547, + "strokeColor": "#1e1e1e", + "backgroundColor": "#e9ecef", + "width": 56, + "height": 108, + "seed": 1070237124, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1718070461942, + "link": null, + "locked": false, "startBinding": { "elementId": "Lj6BzDEByQki5S-EgwpMH", "focus": 0.2784226011380055, @@ -1597,49 +1586,49 @@ "focus": -0.19838487694747556, "gap": 7.660033810812138 }, + "lastCommittedPoint": null, "startArrowhead": null, - "endArrowhead": "arrow" - }, - { - "id": "Hx5RRKsheyWep1sDvpIRJ", - "type": "arrow", - "x": 1410.0000610351562, - "y": 557.9999237060547, - "width": 6.66668701171875, - "height": 91.33334350585938, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "#e9ecef", - "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 1, - "opacity": 100, - "groupIds": [], - "frameId": null, - "index": "ag", - "roundness": { - "type": 2 - }, - "seed": 1812090564, - "version": 37, - "versionNonce": 372948164, - "isDeleted": false, - "boundElements": null, - "updated": 1718070464306, - "link": null, - "locked": false, + "endArrowhead": "arrow", "points": [ [ 0, 0 ], [ - 6.66668701171875, - 91.33334350585938 + -56, + 108 ] - ], - "lastCommittedPoint": null, + ] + }, + { + "type": "arrow", + "version": 37, + "versionNonce": 372948164, + "index": "ag", + "isDeleted": false, + "id": "Hx5RRKsheyWep1sDvpIRJ", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1410.0000610351562, + "y": 557.9999237060547, + "strokeColor": "#1e1e1e", + "backgroundColor": "#e9ecef", + "width": 6.66668701171875, + "height": 91.33334350585938, + "seed": 1812090564, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1718070464306, + "link": null, + "locked": false, "startBinding": { "elementId": "Lj6BzDEByQki5S-EgwpMH", "focus": -0.29210766608336375, @@ -1650,49 +1639,49 @@ "focus": -0.08919478710809753, "gap": 11.219570140634687 }, + "lastCommittedPoint": null, "startArrowhead": null, - "endArrowhead": "arrow" - }, - { - "id": "MQg59W36CWAt6YFU4SATI", - "type": "arrow", - "x": 1515.3334350585938, - "y": 555.9999237060547, - "width": 111.33331298828125, - "height": 90, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "#e9ecef", - "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 1, - "opacity": 100, - "groupIds": [], - "frameId": null, - "index": "ah", - "roundness": { - "type": 2 - }, - "seed": 477977540, - "version": 66, - "versionNonce": 1870734148, - "isDeleted": false, - "boundElements": null, - "updated": 1718070467099, - "link": null, - "locked": false, + "endArrowhead": "arrow", "points": [ [ 0, 0 ], [ - 111.33331298828125, - 90 + 6.66668701171875, + 91.33334350585938 ] - ], - "lastCommittedPoint": null, + ] + }, + { + "type": "arrow", + "version": 66, + "versionNonce": 1870734148, + "index": "ah", + "isDeleted": false, + "id": "MQg59W36CWAt6YFU4SATI", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1515.3334350585938, + "y": 555.9999237060547, + "strokeColor": "#1e1e1e", + "backgroundColor": "#e9ecef", + "width": 111.33331298828125, + "height": 90, + "seed": 477977540, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1718070467099, + "link": null, + "locked": false, "startBinding": { "elementId": "Lj6BzDEByQki5S-EgwpMH", "focus": -0.5443679842464036, @@ -1703,34 +1692,45 @@ "focus": 0.28071605903977087, "gap": 12.942412364274333 }, + "lastCommittedPoint": null, "startArrowhead": null, - "endArrowhead": "arrow" + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 111.33331298828125, + 90 + ] + ] }, { - "id": "afJRKHUH-3-DOo_qsIQTl", "type": "rectangle", - "x": 553.0000305175781, - "y": 311.33326721191406, - "width": 1223.3334655761719, - "height": 476.66668701171875, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "transparent", + "version": 196, + "versionNonce": 1990172540, + "index": "ai", + "isDeleted": false, + "id": "afJRKHUH-3-DOo_qsIQTl", "fillStyle": "solid", "strokeWidth": 2, "strokeStyle": "dashed", "roughness": 1, "opacity": 100, + "angle": 0, + "x": 553.0000305175781, + "y": 311.33326721191406, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 1223.3334655761719, + "height": 476.66668701171875, + "seed": 197202940, "groupIds": [], "frameId": null, - "index": "ai", "roundness": { "type": 3 }, - "seed": 197202940, - "version": 196, - "versionNonce": 1990172540, - "isDeleted": false, "boundElements": [ { "id": "xeVswQuTAgd1A2Kuq9lGG", @@ -1742,45 +1742,34 @@ "locked": false }, { - "id": "xeVswQuTAgd1A2Kuq9lGG", "type": "arrow", - "x": 528.0001220703124, - "y": 704.2098645909149, - "width": 88.00006103515614, - "height": 0.6925758232049475, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "transparent", + "version": 128, + "versionNonce": 1056684540, + "index": "aj", + "isDeleted": false, + "id": "xeVswQuTAgd1A2Kuq9lGG", "fillStyle": "solid", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 1, "opacity": 100, + "angle": 0, + "x": 528.0001220703124, + "y": 704.2098645909149, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 88.00006103515614, + "height": 0.6925758232049475, + "seed": 1420408516, "groupIds": [], "frameId": null, - "index": "aj", "roundness": { "type": 2 }, - "seed": 1420408516, - "version": 128, - "versionNonce": 1056684540, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1718070544911, "link": null, "locked": false, - "points": [ - [ - 0, - 0 - ], - [ - -88.00006103515614, - -0.6925758232049475 - ] - ], - "lastCommittedPoint": null, "startBinding": { "elementId": "afJRKHUH-3-DOo_qsIQTl", "focus": -0.6562028563598121, @@ -1791,49 +1780,49 @@ "focus": 0.42191535777722355, "gap": 12.333358764648438 }, + "lastCommittedPoint": null, "startArrowhead": null, - "endArrowhead": "arrow" - }, - { - "id": "Iz0Gac6daA5IVmdtIyOtD", - "type": "arrow", - "x": 1144.6505838250034, - "y": 433.32774544878237, - "width": 307.59065695281106, - "height": 123.00555228070982, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "transparent", - "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 1, - "opacity": 100, - "groupIds": [], - "frameId": null, - "index": "ak", - "roundness": { - "type": 2 - }, - "seed": 1717906556, - "version": 476, - "versionNonce": 757008836, - "isDeleted": false, - "boundElements": null, - "updated": 1718070600148, - "link": null, - "locked": false, + "endArrowhead": "arrow", "points": [ [ 0, 0 ], [ - -307.59065695281106, - 123.00555228070982 + -88.00006103515614, + -0.6925758232049475 ] - ], - "lastCommittedPoint": null, + ] + }, + { + "type": "arrow", + "version": 476, + "versionNonce": 757008836, + "index": "ak", + "isDeleted": false, + "id": "Iz0Gac6daA5IVmdtIyOtD", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1144.6505838250034, + "y": 433.32774544878237, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 307.59065695281106, + "height": 123.00555228070982, + "seed": 1717906556, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1718070600148, + "link": null, + "locked": false, "startBinding": { "elementId": "-CgiS2KzLNAWgCeskHf3s", "focus": 0.0021142989278789353, @@ -1844,8 +1833,86 @@ "focus": -0.044830342563112094, "gap": 10.33331298828125 }, + "lastCommittedPoint": null, "startArrowhead": null, - "endArrowhead": "arrow" + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -307.59065695281106, + 123.00555228070982 + ] + ] + }, + { + "type": "rectangle", + "version": 574, + "versionNonce": 542107186, + "index": "al", + "isDeleted": false, + "id": "9jaerfFJFWwBfNfcaNX1j", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 890.7144355773926, + "y": 115.28056026762181, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 473.90477752685547, + "height": 169.58440900427027, + "seed": 349984622, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [], + "updated": 1721869125195, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 1017, + "versionNonce": 1716749127, + "index": "am", + "isDeleted": false, + "id": "wQoJDMf-TEll1eClNIG4q", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 908.5033930234741, + "y": 138.26176619998978, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 437.8729370696015, + "height": 133.09364599014955, + "seed": 846936494, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721869282360, + "link": null, + "locked": false, + "fontSize": 21.294983358423927, + "fontFamily": 1, + "text": "1. configs.xlsx\n2. reach33_制动性能测试.xlsx\n3. reach66_制动性能测试.xlsx\n4. reach100_制动性能测试.xlsx\n5. 数据文件夹", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "1. configs.xlsx\n2. reach33_制动性能测试.xlsx\n3. reach66_制动性能测试.xlsx\n4. reach100_制动性能测试.xlsx\n5. 数据文件夹", + "autoResize": false, + "lineHeight": 1.25 } ], "appState": { diff --git a/aio/assets/workflow/do_brake.excalidraw b/aio/assets/workflow/do_brake.excalidraw new file mode 100644 index 0000000..bf2d905 --- /dev/null +++ b/aio/assets/workflow/do_brake.excalidraw @@ -0,0 +1,2584 @@ +{ + "type": "excalidraw", + "version": 2, + "source": "http://10.2.23.150:10020", + "elements": [ + { + "type": "rectangle", + "version": 118, + "versionNonce": 1360105599, + "index": "a0", + "isDeleted": false, + "id": "G7GvfRyoquBz-CKotoH2E", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 83.4285888671875, + "y": -67.33507537841797, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 122.07794189453125, + "height": 49.35063934326172, + "seed": 760702512, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "CBAHPncOXHa_pJUrlM-O2" + }, + { + "id": "sVTpXJGfJ64bteP_k-FEb", + "type": "arrow" + } + ], + "updated": 1719982447630, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 105, + "versionNonce": 988073259, + "index": "a1", + "isDeleted": false, + "id": "CBAHPncOXHa_pJUrlM-O2", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 124.46755981445312, + "y": -55.15975570678711, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 40, + "height": 25, + "seed": 1658646736, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "开始", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "G7GvfRyoquBz-CKotoH2E", + "originalText": "开始", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 319, + "versionNonce": 1561553193, + "index": "a4", + "isDeleted": false, + "id": "IHIeSs49oqr0TLYPMSk6V", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -444.6597213745117, + "y": -39.483978271484375, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 363.9048080444336, + "height": 135.13058797604788, + "seed": 1067092528, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [], + "updated": 1721869549899, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 646, + "versionNonce": 616064551, + "index": "a8", + "isDeleted": false, + "id": "ZEgbGldzHFnQJBlIGHlcm", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -421.2506154221511, + "y": -25.537706112166845, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 331.6304725415214, + "height": 111.38025069352125, + "seed": 1086242000, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721869581117, + "link": null, + "locked": false, + "fontSize": 17.820840110963402, + "fontFamily": 1, + "text": "1. configs.xlsx\n2. 工程文件\n3. reach33_制动性能测试.xlsx \n4. reach66_制动性能测试.xlsx\n5. reach100_制动性能测试.xlsx", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "1. configs.xlsx\n2. 工程文件\n3. reach33_制动性能测试.xlsx \n4. reach66_制动性能测试.xlsx\n5. reach100_制动性能测试.xlsx", + "autoResize": false, + "lineHeight": 1.25 + }, + { + "type": "diamond", + "version": 158, + "versionNonce": 684273585, + "index": "aA", + "isDeleted": false, + "id": "RwMIreS0QkAZwm-3ulGX-", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 24.051910400390625, + "y": 40.48309326171875, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 257.5999755859375, + "height": 100, + "seed": 51082257, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [ + { + "type": "text", + "id": "iNY8dtUFmWKoMwFFsArGd" + }, + { + "id": "cdPz-GgAqgjIqgTPRVFw-", + "type": "arrow" + }, + { + "id": "vRciE0DKBJzJ8v7fA54Kq", + "type": "arrow" + }, + { + "id": "sVTpXJGfJ64bteP_k-FEb", + "type": "arrow" + } + ], + "updated": 1719982450560, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 214, + "versionNonce": 1388834763, + "index": "aAV", + "isDeleted": false, + "id": "iNY8dtUFmWKoMwFFsArGd", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 96.951904296875, + "y": 70.48309326171875, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 112, + "height": 40, + "seed": 1500869361, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 16, + "fontFamily": 1, + "text": "检查输入文件是\n否正确", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "RwMIreS0QkAZwm-3ulGX-", + "originalText": "检查输入文件是否正确", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 243, + "versionNonce": 469737771, + "index": "aC", + "isDeleted": false, + "id": "Kf1iK8aKtz3dLPTOYumTw", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 501.41290283203125, + "y": -67.3922233581543, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 122.07794189453125, + "height": 49.35063934326172, + "seed": 179980831, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "VuHEUguk0rq5mHifBtniS" + }, + { + "id": "cdPz-GgAqgjIqgTPRVFw-", + "type": "arrow" + }, + { + "id": "E6Z8Wh6Av-c4t5msk3j0Z", + "type": "arrow" + } + ], + "updated": 1719982544519, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 234, + "versionNonce": 298321509, + "index": "aD", + "isDeleted": false, + "id": "VuHEUguk0rq5mHifBtniS", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 542.4518737792969, + "y": -55.21690368652344, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 40, + "height": 25, + "seed": 1648995903, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "结束", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "Kf1iK8aKtz3dLPTOYumTw", + "originalText": "结束", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "arrow", + "version": 159, + "versionNonce": 12219423, + "index": "aH", + "isDeleted": false, + "id": "cdPz-GgAqgjIqgTPRVFw-", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 264.76445650455105, + "y": 66.83925419197496, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 228.08738065365208, + "height": 99.95610599861558, + "seed": 339189983, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [ + { + "type": "text", + "id": "82DP34j9Ep7573KCrZFuj" + } + ], + "updated": 1719982450562, + "link": null, + "locked": false, + "startBinding": { + "elementId": "RwMIreS0QkAZwm-3ulGX-", + "focus": 0.6262400211589412, + "gap": 15.929954945665216 + }, + "endBinding": { + "elementId": "Kf1iK8aKtz3dLPTOYumTw", + "focus": 0.05115605003902535, + "gap": 8.561065673828125 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 105.68741727474583, + -79.95610599861558 + ], + [ + 228.08738065365208, + -99.95610599861558 + ] + ] + }, + { + "type": "text", + "version": 8, + "versionNonce": 1399701099, + "index": "aHV", + "isDeleted": false, + "id": "82DP34j9Ep7573KCrZFuj", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 353.6798782348633, + "y": -30.616851806640625, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 33.54399108886719, + "height": 35, + "seed": 830879743, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 28, + "fontFamily": 1, + "text": "No", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "cdPz-GgAqgjIqgTPRVFw-", + "originalText": "No", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 854, + "versionNonce": 1920767149, + "index": "aI", + "isDeleted": false, + "id": "OuZBPxPXuTv9FpsBMA2am", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -165.81548239968015, + "y": 442.3411075707638, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 215.67791748046875, + "height": 59.75057220458983, + "seed": 1897362833, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "QclqBhwtyuV2bEYeF_-0N" + }, + { + "id": "M3h-oZVLWQYI4EBdoYQJZ", + "type": "arrow" + } + ], + "updated": 1721953748956, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 876, + "versionNonce": 1295453549, + "index": "aJ", + "isDeleted": false, + "id": "QclqBhwtyuV2bEYeF_-0N", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -145.34649588844968, + "y": 459.71639367305875, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 174.7399444580078, + "height": 25, + "seed": 1385470833, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721953748956, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "将工程拷贝到xCore", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "OuZBPxPXuTv9FpsBMA2am", + "originalText": "将工程拷贝到xCore", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "arrow", + "version": 382, + "versionNonce": 125241767, + "index": "aM", + "isDeleted": false, + "id": "vRciE0DKBJzJ8v7fA54Kq", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 39.23397594216637, + "y": 109.3432557213118, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 151.79356560097065, + "height": 65.64894981180257, + "seed": 546610591, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [ + { + "type": "text", + "id": "PfWkxzSRM6swE3zdpo__p" + } + ], + "updated": 1721870178253, + "link": null, + "locked": false, + "startBinding": { + "elementId": "RwMIreS0QkAZwm-3ulGX-", + "focus": 0.544981318869258, + "gap": 12.087656934222672 + }, + "endBinding": { + "elementId": "fE8mp1oZAZIS-9AiqeeBo", + "focus": -0.3863495053337668, + "gap": 11.323810577392578 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -151.79356560097065, + 65.64894981180257 + ] + ] + }, + { + "type": "text", + "version": 6, + "versionNonce": 1804967499, + "index": "aMV", + "isDeleted": false, + "id": "PfWkxzSRM6swE3zdpo__p", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -58.280842315198406, + "y": 175.46232887218298, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 32.119964599609375, + "height": 25, + "seed": 1690013765, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982657566, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Yes", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "vRciE0DKBJzJ8v7fA54Kq", + "originalText": "Yes", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "arrow", + "version": 2061, + "versionNonce": 87686733, + "index": "aN", + "isDeleted": false, + "id": "M3h-oZVLWQYI4EBdoYQJZ", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -75.23170918127317, + "y": 513.0527698632443, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 103.33305926819273, + "height": 225.81833509965384, + "seed": 265077663, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1721953749039, + "link": null, + "locked": false, + "startBinding": { + "elementId": "OuZBPxPXuTv9FpsBMA2am", + "focus": -0.011779183463357037, + "gap": 10.961090087890625 + }, + "endBinding": { + "elementId": "1bP6Dvn7AZ9RH4DrcRdB_", + "focus": -0.6210473590710341, + "gap": 21.64673979938243 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -103.33305926819273, + 225.81833509965384 + ] + ] + }, + { + "type": "rectangle", + "version": 1053, + "versionNonce": 951735853, + "index": "aO", + "isDeleted": false, + "id": "tRrOZ-dVRENzlkE2D7JiN", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 98.2571716308596, + "y": 822.7412554423014, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 215.67791748046875, + "height": 50.20001220703125, + "seed": 1924605105, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "sMJglKTmK18wBh571qiFL" + }, + { + "id": "abhTOT48fVbhcaD6SFRLd", + "type": "arrow" + }, + { + "id": "NmxfcTzxuWNJwo4Wb-4Ga", + "type": "arrow" + }, + { + "id": "n3hZ2B8KLeQUTZ8vlZwpw", + "type": "arrow" + }, + { + "id": "OZF5-sHGF1QWh4D33VwKx", + "type": "arrow" + } + ], + "updated": 1721953748956, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 1101, + "versionNonce": 2015365453, + "index": "aP", + "isDeleted": false, + "id": "sMJglKTmK18wBh571qiFL", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 126.09613037109398, + "y": 835.341261545817, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 160, + "height": 25, + "seed": 1588684433, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721953748956, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "修改要执行的场景", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "tRrOZ-dVRENzlkE2D7JiN", + "originalText": "修改要执行的场景", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 1572, + "versionNonce": 793466797, + "index": "aX", + "isDeleted": false, + "id": "wsKk3rGTn1F-L5FxrCX5H", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 400.48233395475904, + "y": 636.3089837328594, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 205.2779541015625, + "height": 60, + "seed": 804808927, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "Ybc-XtdsXVulj0EsjVQG3" + }, + { + "id": "F-gcNIPiBPo5bXyhvYKAd", + "type": "arrow" + }, + { + "id": "ZDRN9BNAFSm7MPd4mQItT", + "type": "arrow" + }, + { + "id": "_0vJdrVWw6yxiSmedBCz_", + "type": "arrow" + } + ], + "updated": 1721953748956, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 974, + "versionNonce": 1932425933, + "index": "aY", + "isDeleted": false, + "id": "Ybc-XtdsXVulj0EsjVQG3", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 407.1213110055403, + "y": 646.3089837328594, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 192, + "height": 40, + "seed": 1607857407, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721953748956, + "link": null, + "locked": false, + "fontSize": 16, + "fontFamily": 1, + "text": "计算出初始实际百分比速度\n,并发送给RL程序", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "wsKk3rGTn1F-L5FxrCX5H", + "originalText": "计算出初始实际百分比速度,并发送给RL程序", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 1528, + "versionNonce": 1922013485, + "index": "aZ", + "isDeleted": false, + "id": "2ysxvHdQkJy90WXrs-fCv", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 644.2574768066409, + "y": 459.71647135416663, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 213.2778930664063, + "height": 65, + "seed": 958808895, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "o7Ntq3Q62WL2u4scU9yxN" + }, + { + "id": "ZDRN9BNAFSm7MPd4mQItT", + "type": "arrow" + }, + { + "id": "E6Z8Wh6Av-c4t5msk3j0Z", + "type": "arrow" + }, + { + "id": "oxtHFkwF4Nb6F5sLpb7qO", + "type": "arrow" + }, + { + "id": "i_UW5iv9D7BQ4VakeukH-", + "type": "arrow" + } + ], + "updated": 1721953748956, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 957, + "versionNonce": 414723149, + "index": "aa", + "isDeleted": false, + "id": "o7Ntq3Q62WL2u4scU9yxN", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 649.2574768066409, + "y": 472.21647135416663, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 196.43199157714844, + "height": 40, + "seed": 253330271, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721953748956, + "link": null, + "locked": false, + "fontSize": 16, + "fontFamily": 1, + "text": "一定时间后给RL发送探测速\n度,并触发急停的信号", + "textAlign": "left", + "verticalAlign": "middle", + "containerId": "2ysxvHdQkJy90WXrs-fCv", + "originalText": "一定时间后给RL发送探测速度,并触发急停的信号", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "arrow", + "version": 1564, + "versionNonce": 564039437, + "index": "ac", + "isDeleted": false, + "id": "abhTOT48fVbhcaD6SFRLd", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -70.50241563547328, + "y": 745.8669172119696, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 103.82900501690897, + "height": 59.524883796566996, + "seed": 206954833, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1721953749039, + "link": null, + "locked": false, + "startBinding": { + "elementId": "1bP6Dvn7AZ9RH4DrcRdB_", + "focus": -0.3325149350347292, + "gap": 14.65092755031094 + }, + "endBinding": { + "elementId": "s5GqtSw8Y7CZeicUEgwFQ", + "focus": 0.4870837538738663, + "gap": 15.02048596085718 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 103.82900501690897, + -59.524883796566996 + ] + ] + }, + { + "type": "arrow", + "version": 1859, + "versionNonce": 1294331853, + "index": "ad", + "isDeleted": false, + "id": "NmxfcTzxuWNJwo4Wb-4Ga", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 198.0714319972467, + "y": 705.7894871646519, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 0.3716766338358184, + "height": 104.05308996359054, + "seed": 800156593, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [ + { + "type": "text", + "id": "igjHqsZem0xmaAEzzrC-o" + } + ], + "updated": 1721953749039, + "link": null, + "locked": false, + "startBinding": { + "elementId": "s5GqtSw8Y7CZeicUEgwFQ", + "focus": -0.42034523098090276, + "gap": 17.88140725456001 + }, + "endBinding": { + "elementId": "tRrOZ-dVRENzlkE2D7JiN", + "focus": -0.06965058113267497, + "gap": 12.898678314058998 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0.3716766338358184, + 104.05308996359054 + ] + ] + }, + { + "id": "igjHqsZem0xmaAEzzrC-o", + "type": "text", + "x": 116.99028419441666, + "y": 746.1622472671509, + "width": 32.119964599609375, + "height": 25, + "angle": 0, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "frameId": null, + "index": "adV", + "roundness": null, + "seed": 1462410797, + "version": 72, + "versionNonce": 691540845, + "isDeleted": false, + "boundElements": null, + "updated": 1721953748956, + "link": null, + "locked": false, + "text": "Yes", + "fontSize": 20, + "fontFamily": 1, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "NmxfcTzxuWNJwo4Wb-4Ga", + "originalText": "Yes", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "arrow", + "version": 2324, + "versionNonce": 425468045, + "index": "ae", + "isDeleted": false, + "id": "F-gcNIPiBPo5bXyhvYKAd", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 180.74214250816976, + "y": 600.1157827263543, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 103.03265362341904, + "height": 59.18351840116395, + "seed": 1246004785, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [ + { + "type": "text", + "id": "-R5RuT2t2buAlh5vWdrju" + } + ], + "updated": 1721953749039, + "link": null, + "locked": false, + "startBinding": { + "elementId": "s5GqtSw8Y7CZeicUEgwFQ", + "focus": -0.5168038068485948, + "gap": 14.027635503254452 + }, + "endBinding": { + "elementId": "_MfULWHYB1BylU7H_Os8K", + "focus": 0.03862755846941249, + "gap": 10.200041205976277 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 103.03265362341904, + -59.18351840116395 + ] + ] + }, + { + "id": "-R5RuT2t2buAlh5vWdrju", + "type": "text", + "x": 130.42687385646795, + "y": 531.2571956080915, + "width": 23.959976196289062, + "height": 25, + "angle": 0, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "frameId": null, + "index": "aeV", + "roundness": null, + "seed": 1158134605, + "version": 68, + "versionNonce": 1622268973, + "isDeleted": false, + "boundElements": null, + "updated": 1721953748956, + "link": null, + "locked": false, + "text": "No", + "fontSize": 20, + "fontFamily": 1, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "F-gcNIPiBPo5bXyhvYKAd", + "originalText": "No", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "arrow", + "version": 2103, + "versionNonce": 617423181, + "index": "af", + "isDeleted": false, + "id": "ZDRN9BNAFSm7MPd4mQItT", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 573.6586860875127, + "y": 802.5091180102031, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 72.0303430507422, + "height": 93.89254594802867, + "seed": 1918402865, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1721953749039, + "link": null, + "locked": false, + "startBinding": { + "elementId": "X5t5PlDvqNsMmmYnCxtAV", + "focus": 0.4398310501257054, + "gap": 9.623144781862493 + }, + "endBinding": { + "elementId": "wsKk3rGTn1F-L5FxrCX5H", + "focus": 0.27018337696103994, + "gap": 12.307588329315081 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -72.0303430507422, + -93.89254594802867 + ] + ] + }, + { + "type": "arrow", + "version": 23, + "versionNonce": 977005727, + "index": "ah", + "isDeleted": false, + "id": "sVTpXJGfJ64bteP_k-FEb", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 150.45187377929688, + "y": -11.516876220703121, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 0.804804176492155, + "height": 41.8504465544745, + "seed": 445992479, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1719982450563, + "link": null, + "locked": false, + "startBinding": { + "elementId": "G7GvfRyoquBz-CKotoH2E", + "focus": -0.08754862573962541, + "gap": 6.467559814453125 + }, + "endBinding": { + "elementId": "RwMIreS0QkAZwm-3ulGX-", + "focus": -0.00340462795005759, + "gap": 10.274120072847268 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0.804804176492155, + 41.8504465544745 + ] + ] + }, + { + "type": "arrow", + "version": 3419, + "versionNonce": 1527050765, + "index": "aj", + "isDeleted": false, + "id": "_0vJdrVWw6yxiSmedBCz_", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 460.1257658440753, + "y": 621.9596405497533, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 44.84476985950141, + "height": 78.1277508427305, + "seed": 929888657, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1721953749039, + "link": null, + "locked": false, + "startBinding": { + "elementId": "wsKk3rGTn1F-L5FxrCX5H", + "focus": -0.1463333945517566, + "gap": 14.349343183106043 + }, + "endBinding": { + "elementId": "_MfULWHYB1BylU7H_Os8K", + "focus": -0.07123248806256179, + "gap": 13.09966658780877 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -44.84476985950141, + -78.1277508427305 + ] + ] + }, + { + "type": "arrow", + "version": 1776, + "versionNonce": 859938829, + "index": "am", + "isDeleted": false, + "id": "E6Z8Wh6Av-c4t5msk3j0Z", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 715.4133378842915, + "y": 313.53311157226574, + "strokeColor": "#e03131", + "backgroundColor": "#ffffff", + "width": 120.65030687843216, + "height": 317.84999084472656, + "seed": 1006891467, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [ + { + "type": "text", + "id": "3NfVy3o0TIZLU7DXhNStB" + } + ], + "updated": 1721953748957, + "link": null, + "locked": false, + "startBinding": { + "elementId": "RhNNRTMdDvRCBisjoMESc", + "gap": 12.207172393798714, + "focus": 0.7414822248073476 + }, + "endBinding": { + "elementId": "Kf1iK8aKtz3dLPTOYumTw", + "gap": 13.724704742431754, + "focus": -0.252643325157541 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -119.0926756318396, + -72.51660156250011 + ], + [ + -90.10232884919162, + -173.45002237955737 + ], + [ + -95.28829671118365, + -250.8277664184572 + ], + [ + -120.65030687843216, + -317.84999084472656 + ] + ] + }, + { + "type": "text", + "version": 38, + "versionNonce": 857285347, + "index": "an", + "isDeleted": false, + "id": "3NfVy3o0TIZLU7DXhNStB", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 535.3110090350999, + "y": 127.58308919270837, + "strokeColor": "#e03131", + "backgroundColor": "#ffffff", + "width": 180, + "height": 25, + "seed": 438263077, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721953587877, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "当所有场景采集完毕", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "E6Z8Wh6Av-c4t5msk3j0Z", + "originalText": "当所有场景采集完毕", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 974, + "versionNonce": 1564223753, + "index": "ao", + "isDeleted": false, + "id": "fE8mp1oZAZIS-9AiqeeBo", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -228.231968272816, + "y": 186.31601611050695, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 173.2778930664062, + "height": 51.20001220703126, + "seed": 1690892521, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "id": "URnwpIH42id9TLrEgAKAc", + "type": "text" + }, + { + "id": "vRciE0DKBJzJ8v7fA54Kq", + "type": "arrow" + }, + { + "id": "ERVoVoW-V8G1LL-vWEqN3", + "type": "arrow" + } + ], + "updated": 1721870191012, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 338, + "versionNonce": 668890983, + "index": "ap", + "isDeleted": false, + "id": "URnwpIH42id9TLrEgAKAc", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -191.5930217396129, + "y": 199.41602221402258, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 100, + "height": 25, + "seed": 954987465, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721870178253, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "初始化配置", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "fE8mp1oZAZIS-9AiqeeBo", + "originalText": "初始化配置", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "line", + "version": 57, + "versionNonce": 1599341575, + "index": "aq", + "isDeleted": false, + "id": "YzZ_B9eP3UNLuRQzxEz4x", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 75.80097961425781, + "y": 61.673587799072266, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 154.00003051757812, + "height": 38, + "seed": 1175702567, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1721869555973, + "link": null, + "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": null, + "points": [ + [ + 0, + 0 + ], + [ + -154.00003051757812, + -38 + ] + ] + }, + { + "type": "rectangle", + "version": 481, + "versionNonce": 2134832871, + "index": "ar", + "isDeleted": false, + "id": "NSJU9ml7UOh2MWb9fExSu", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -850.8181571960449, + "y": 191.44166783448583, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 453.90482330322266, + "height": 82.46393148190725, + "seed": 1137221705, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [], + "updated": 1721869844132, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 1360, + "versionNonce": 976060935, + "index": "as", + "isDeleted": false, + "id": "d2lyYLFFOcXxKL1kEPa3Y", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -843.0139320364582, + "y": 209.3167754405929, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 460.2965103131508, + "height": 50.96150002548767, + "seed": 1614039143, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721869844132, + "link": null, + "locked": false, + "fontSize": 13.589733340130044, + "fontFamily": 1, + "text": "1. 按照轴,创建结果数据文件夹\n2. 从configs.xlsx获取额定电流/转速/减速比/角速度/急停正负方向等信息\n3. 设定要采集的曲线信息", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "1. 按照轴,创建结果数据文件夹\n2. 从configs.xlsx获取额定电流/转速/减速比/角速度/急停正负方向等信息\n3. 设定要采集的曲线信息", + "autoResize": false, + "lineHeight": 1.25 + }, + { + "type": "line", + "version": 103, + "versionNonce": 999870377, + "index": "at", + "isDeleted": false, + "id": "sjHa4K8Z8gwgIP5xf65hb", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -241.4111619429155, + "y": 216.03721583973274, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 151.51510620117188, + "height": 10.303028453480152, + "seed": 478500679, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1721870183261, + "link": null, + "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": null, + "points": [ + [ + 0, + 0 + ], + [ + -151.51510620117188, + 10.303028453480152 + ] + ] + }, + { + "type": "rectangle", + "version": 362, + "versionNonce": 1421692749, + "index": "au", + "isDeleted": false, + "id": "RhNNRTMdDvRCBisjoMESc", + "fillStyle": "solid", + "strokeWidth": 4, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": -340.8656463623047, + "y": 325.74028396606445, + "strokeColor": "#1971c2", + "backgroundColor": "transparent", + "width": 1398.160536619082, + "height": 664.7333984375, + "seed": 124878665, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "id": "E6Z8Wh6Av-c4t5msk3j0Z", + "type": "arrow" + }, + { + "id": "ERVoVoW-V8G1LL-vWEqN3", + "type": "arrow" + } + ], + "updated": 1721953748956, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 242, + "versionNonce": 639704877, + "index": "av", + "isDeleted": false, + "id": "8LPZT3Re_9ys2AorxAlQT", + "fillStyle": "solid", + "strokeWidth": 4, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": -36.7990264892577, + "y": 377.4513486226401, + "strokeColor": "#f08c00", + "backgroundColor": "transparent", + "width": 700, + "height": 32.199999999999996, + "seed": 1415660551, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721953748957, + "link": null, + "locked": false, + "fontSize": 28, + "fontFamily": 2, + "text": "按照测试条件、轴的排组顺序循环执行三次制动测试操作", + "textAlign": "center", + "verticalAlign": "top", + "containerId": null, + "originalText": "按照测试条件、轴的排组顺序循环执行三次制动测试操作", + "autoResize": true, + "lineHeight": 1.15 + }, + { + "type": "arrow", + "version": 480, + "versionNonce": 1811464397, + "index": "aw", + "isDeleted": false, + "id": "ERVoVoW-V8G1LL-vWEqN3", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -150.6257794438431, + "y": 244.68703618675778, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 2.0674651584769776, + "height": 60.24850325150925, + "seed": 1089758057, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1721953748957, + "link": null, + "locked": false, + "startBinding": { + "elementId": "fE8mp1oZAZIS-9AiqeeBo", + "gap": 7.171007869219579, + "focus": 0.11603486920476935 + }, + "endBinding": { + "elementId": "RhNNRTMdDvRCBisjoMESc", + "gap": 20.804744527797425, + "focus": -0.6962190492310062 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 2.0674651584769776, + 60.24850325150925 + ] + ] + }, + { + "type": "rectangle", + "version": 586, + "versionNonce": 208581005, + "index": "b04", + "isDeleted": false, + "id": "1bP6Dvn7AZ9RH4DrcRdB_", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -240.22863976545636, + "y": 760.5178447622806, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 216.68566894531247, + "height": 123.42863464355466, + "seed": 1189329091, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "8sT7N39cN5FWtgjD0BEwQ" + }, + { + "id": "M3h-oZVLWQYI4EBdoYQJZ", + "type": "arrow" + }, + { + "id": "abhTOT48fVbhcaD6SFRLd", + "type": "arrow" + }, + { + "id": "dUxT3co8677f2AaonmyE4", + "type": "arrow" + } + ], + "updated": 1721953748957, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 694, + "versionNonce": 1002898189, + "index": "b05", + "isDeleted": false, + "id": "8sT7N39cN5FWtgjD0BEwQ", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -235.22863976545636, + "y": 772.2321620840579, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 192, + "height": 100, + "seed": 1813358691, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721953748957, + "link": null, + "locked": false, + "fontSize": 16, + "fontFamily": 1, + "text": "初始化:\n触发/解除急停\n清除伺服告警\n重置act信号\n处理可能的安全告警写诊断", + "textAlign": "left", + "verticalAlign": "middle", + "containerId": "1bP6Dvn7AZ9RH4DrcRdB_", + "originalText": "初始化:\n触发/解除急停\n清除伺服告警\n重置act信号\n处理可能的安全告警写诊断", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 1272, + "versionNonce": 1600985453, + "index": "b06", + "isDeleted": false, + "id": "X5t5PlDvqNsMmmYnCxtAV", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 415.075406865403, + "y": 812.1322627920656, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 253.27795410156253, + "height": 76.19992065429686, + "seed": 578301219, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "GG_qcjEkAW1tNOEYADGUw" + }, + { + "id": "OZF5-sHGF1QWh4D33VwKx", + "type": "arrow" + }, + { + "id": "ZDRN9BNAFSm7MPd4mQItT", + "type": "arrow" + } + ], + "updated": 1721953748957, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 1311, + "versionNonce": 833262733, + "index": "b07", + "isDeleted": false, + "id": "GG_qcjEkAW1tNOEYADGUw", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 420.075406865403, + "y": 825.232223119214, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 234.27987670898438, + "height": 50, + "seed": 1507627203, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721953748957, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "reload工程后,pp2main,\n并且自动模式和上电", + "textAlign": "left", + "verticalAlign": "middle", + "containerId": "X5t5PlDvqNsMmmYnCxtAV", + "originalText": "reload工程后,pp2main,并且自动模式和上电", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "diamond", + "version": 978, + "versionNonce": 1172470509, + "index": "b08", + "isDeleted": false, + "id": "s5GqtSw8Y7CZeicUEgwFQ", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -8.140500193287608, + "y": 598.232223119214, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 290.1094264220687, + "height": 112, + "seed": 1853709763, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [ + { + "type": "text", + "id": "g2NPSQBb5tSbr96V0GxNs" + }, + { + "id": "NmxfcTzxuWNJwo4Wb-4Ga", + "type": "arrow" + }, + { + "id": "abhTOT48fVbhcaD6SFRLd", + "type": "arrow" + }, + { + "id": "F-gcNIPiBPo5bXyhvYKAd", + "type": "arrow" + } + ], + "updated": 1721953748957, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 741, + "versionNonce": 869997677, + "index": "b09", + "isDeleted": false, + "id": "g2NPSQBb5tSbr96V0GxNs", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 76.88685641222956, + "y": 631.232223119214, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 120, + "height": 46, + "seed": 456306019, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721953748957, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 2, + "text": "是否为单条件\n第一次执行", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "s5GqtSw8Y7CZeicUEgwFQ", + "originalText": "是否为单条件第一次执行", + "autoResize": true, + "lineHeight": 1.15 + }, + { + "id": "OZF5-sHGF1QWh4D33VwKx", + "type": "arrow", + "x": 326.5141886036843, + "y": 844.5501604905674, + "width": 77.60009765624994, + "height": 0.2532809215430234, + "angle": 0, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "frameId": null, + "index": "b0A", + "roundness": { + "type": 2 + }, + "seed": 1655164131, + "version": 721, + "versionNonce": 881824461, + "isDeleted": false, + "boundElements": null, + "updated": 1721953749040, + "link": null, + "locked": false, + "points": [ + [ + 0, + 0 + ], + [ + 77.60009765624994, + -0.2532809215430234 + ] + ], + "lastCommittedPoint": null, + "startBinding": { + "elementId": "tRrOZ-dVRENzlkE2D7JiN", + "focus": -0.11386402972067605, + "gap": 12.579099492355965 + }, + "endBinding": { + "elementId": "X5t5PlDvqNsMmmYnCxtAV", + "focus": 0.16577286050644777, + "gap": 10.96112060546875 + }, + "startArrowhead": null, + "endArrowhead": "arrow" + }, + { + "type": "rectangle", + "version": 1452, + "versionNonce": 1122411821, + "index": "b0B", + "isDeleted": false, + "id": "_MfULWHYB1BylU7H_Os8K", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 248.67519934587176, + "y": 454.53230246491717, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 253.27795410156253, + "height": 76.19992065429686, + "seed": 339935149, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "RmXSyd3GuCSg-wa9sJf2b" + }, + { + "id": "F-gcNIPiBPo5bXyhvYKAd", + "type": "arrow" + }, + { + "id": "_0vJdrVWw6yxiSmedBCz_", + "type": "arrow" + }, + { + "id": "oxtHFkwF4Nb6F5sLpb7qO", + "type": "arrow" + } + ], + "updated": 1721953748957, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 1488, + "versionNonce": 1163404973, + "index": "b0C", + "isDeleted": false, + "id": "RmXSyd3GuCSg-wa9sJf2b", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 253.67519934587176, + "y": 467.6322627920656, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 234.27987670898438, + "height": 50, + "seed": 209748493, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721953748957, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "reload工程后,pp2main,\n并且自动模式和上电", + "textAlign": "left", + "verticalAlign": "middle", + "containerId": "_MfULWHYB1BylU7H_Os8K", + "originalText": "reload工程后,pp2main,并且自动模式和上电", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "id": "oxtHFkwF4Nb6F5sLpb7qO", + "type": "arrow", + "x": 512.114225224778, + "y": 497.48359840808337, + "width": 125.60003662109375, + "height": 0.714594187687112, + "angle": 0, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "frameId": null, + "index": "b0D", + "roundness": { + "type": 2 + }, + "seed": 1372818253, + "version": 370, + "versionNonce": 1996030861, + "isDeleted": false, + "boundElements": null, + "updated": 1721953749040, + "link": null, + "locked": false, + "points": [ + [ + 0, + 0 + ], + [ + 125.60003662109375, + 0.714594187687112 + ] + ], + "lastCommittedPoint": null, + "startBinding": { + "elementId": "_MfULWHYB1BylU7H_Os8K", + "focus": 0.10491939108920384, + "gap": 10.16107177734375 + }, + "endBinding": { + "elementId": "2ysxvHdQkJy90WXrs-fCv", + "focus": -0.20013052975390783, + "gap": 6.543214960769092 + }, + "startArrowhead": null, + "endArrowhead": "arrow" + }, + { + "type": "rectangle", + "version": 1143, + "versionNonce": 131473261, + "index": "b0E", + "isDeleted": false, + "id": "smvbNoKw6LDeWHeMhkgs3", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 717.8751810353249, + "y": 651.5322109121829, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 165.27789306640628, + "height": 41.39999389648438, + "seed": 1202250509, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "8ApgTR11RrDXeM7h2uWRO" + }, + { + "id": "i_UW5iv9D7BQ4VakeukH-", + "type": "arrow" + }, + { + "id": "pksUeLNq_8safCB-XkaZo", + "type": "arrow" + } + ], + "updated": 1721953748957, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 1214, + "versionNonce": 36264589, + "index": "b0F", + "isDeleted": false, + "id": "8ApgTR11RrDXeM7h2uWRO", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 760.514127568528, + "y": 659.7322078604251, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 80, + "height": 25, + "seed": 1410529645, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721953748957, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "急停触发", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "smvbNoKw6LDeWHeMhkgs3", + "originalText": "急停触发", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 1199, + "versionNonce": 1721270509, + "index": "b0G", + "isDeleted": false, + "id": "cQBmppzmPZSR_CwMobNmi", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 776.6752908986061, + "y": 826.332274999097, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 165.27789306640628, + "height": 41.39999389648438, + "seed": 1406773699, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "Bxu3IOJriXHxH6QCl7tps" + }, + { + "id": "pksUeLNq_8safCB-XkaZo", + "type": "arrow" + }, + { + "id": "dUxT3co8677f2AaonmyE4", + "type": "arrow" + } + ], + "updated": 1721953748957, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 1277, + "versionNonce": 1583688717, + "index": "b0H", + "isDeleted": false, + "id": "Bxu3IOJriXHxH6QCl7tps", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 819.3142374318093, + "y": 834.5322719473392, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 80, + "height": 25, + "seed": 656767331, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1721953748957, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "数据处理", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "cQBmppzmPZSR_CwMobNmi", + "originalText": "数据处理", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "id": "i_UW5iv9D7BQ4VakeukH-", + "type": "arrow", + "x": 705.7142618458718, + "y": 536.6322170156985, + "width": 54.4000244140625, + "height": 110.39999389648438, + "angle": 0, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "frameId": null, + "index": "b0I", + "roundness": { + "type": 2 + }, + "seed": 1186876749, + "version": 338, + "versionNonce": 1959609421, + "isDeleted": false, + "boundElements": null, + "updated": 1721953749040, + "link": null, + "locked": false, + "points": [ + [ + 0, + 0 + ], + [ + 54.4000244140625, + 110.39999389648438 + ] + ], + "lastCommittedPoint": null, + "startBinding": { + "elementId": "2ysxvHdQkJy90WXrs-fCv", + "focus": 0.546810493886852, + "gap": 11.9157456615319 + }, + "endBinding": { + "elementId": "smvbNoKw6LDeWHeMhkgs3", + "focus": -0.30140846268939786, + "gap": 4.5 + }, + "startArrowhead": null, + "endArrowhead": "arrow" + }, + { + "id": "pksUeLNq_8safCB-XkaZo", + "type": "arrow", + "x": 785.7142618458718, + "y": 706.2322231192142, + "width": 60.7999267578125, + "height": 106.39996337890625, + "angle": 0, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "frameId": null, + "index": "b0J", + "roundness": { + "type": 2 + }, + "seed": 240575341, + "version": 367, + "versionNonce": 1301828877, + "isDeleted": false, + "boundElements": null, + "updated": 1721953749040, + "link": null, + "locked": false, + "points": [ + [ + 0, + 0 + ], + [ + 60.7999267578125, + 106.39996337890625 + ] + ], + "lastCommittedPoint": null, + "startBinding": { + "elementId": "smvbNoKw6LDeWHeMhkgs3", + "focus": 0.3623301872560003, + "gap": 13.300018310546875 + }, + "endBinding": { + "elementId": "cQBmppzmPZSR_CwMobNmi", + "focus": 0.07258713848178447, + "gap": 13.700088500976562 + }, + "startArrowhead": null, + "endArrowhead": "arrow" + }, + { + "id": "dUxT3co8677f2AaonmyE4", + "type": "arrow", + "x": 867.5592163392541, + "y": 879.8321987051517, + "width": 1045.705451324562, + "height": 63.15636025022944, + "angle": 0, + "strokeColor": "#e03131", + "backgroundColor": "#ffffff", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "frameId": null, + "index": "b0O", + "roundness": { + "type": 2 + }, + "seed": 871599619, + "version": 745, + "versionNonce": 770061773, + "isDeleted": false, + "boundElements": [ + { + "type": "text", + "id": "Fwqff_6PMVSjIk4oBzQaG" + } + ], + "updated": 1721953749040, + "link": null, + "locked": false, + "points": [ + [ + 0, + 0 + ], + [ + -176.24497890744487, + 63.15636025022944 + ], + [ + -793.0449667004136, + 60.888645185080165 + ], + [ + -1045.705451324562, + 9.978025873211143 + ] + ], + "lastCommittedPoint": null, + "startBinding": { + "elementId": "cQBmppzmPZSR_CwMobNmi", + "focus": -0.7106381634029143, + "gap": 12.099929809570312 + }, + "endBinding": { + "elementId": "1bP6Dvn7AZ9RH4DrcRdB_", + "focus": 0.920453305511539, + "gap": 5.863745172527501 + }, + "startArrowhead": null, + "endArrowhead": "arrow" + }, + { + "id": "Fwqff_6PMVSjIk4oBzQaG", + "type": "text", + "x": 332.70622996595705, + "y": 991.7266626351698, + "width": 80, + "height": 25, + "angle": 0, + "strokeColor": "#e03131", + "backgroundColor": "#ffffff", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "frameId": null, + "index": "b0P", + "roundness": null, + "seed": 320259789, + "version": 65, + "versionNonce": 862731661, + "isDeleted": false, + "boundElements": null, + "updated": 1721953748957, + "link": null, + "locked": false, + "text": "循环三次", + "fontSize": 20, + "fontFamily": 1, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "dUxT3co8677f2AaonmyE4", + "originalText": "循环三次", + "autoResize": true, + "lineHeight": 1.25 + } + ], + "appState": { + "gridSize": null, + "viewBackgroundColor": "#ffffff" + }, + "files": {} +} \ No newline at end of file diff --git a/aio/assets/workflow/do_current.excalidraw b/aio/assets/workflow/do_current.excalidraw new file mode 100644 index 0000000..db6ae3b --- /dev/null +++ b/aio/assets/workflow/do_current.excalidraw @@ -0,0 +1,1666 @@ +{ + "type": "excalidraw", + "version": 2, + "source": "http://10.2.23.150:10020", + "elements": [ + { + "type": "rectangle", + "version": 118, + "versionNonce": 1360105599, + "index": "a0", + "isDeleted": false, + "id": "G7GvfRyoquBz-CKotoH2E", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 83.4285888671875, + "y": -67.33507537841797, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 122.07794189453125, + "height": 49.35063934326172, + "seed": 760702512, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "CBAHPncOXHa_pJUrlM-O2" + }, + { + "id": "sVTpXJGfJ64bteP_k-FEb", + "type": "arrow" + } + ], + "updated": 1719982447630, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 105, + "versionNonce": 988073259, + "index": "a1", + "isDeleted": false, + "id": "CBAHPncOXHa_pJUrlM-O2", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 124.46755981445312, + "y": -55.15975570678711, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 40, + "height": 25, + "seed": 1658646736, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "开始", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "G7GvfRyoquBz-CKotoH2E", + "originalText": "开始", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 118, + "versionNonce": 1557399729, + "index": "a4", + "isDeleted": false, + "id": "IHIeSs49oqr0TLYPMSk6V", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -258.6597213745117, + "y": 45.849365234375, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 228.5714340209961, + "height": 95.58439636230469, + "seed": 1067092528, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [], + "updated": 1719981868207, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 399, + "versionNonce": 1819946757, + "index": "a8", + "isDeleted": false, + "id": "ZEgbGldzHFnQJBlIGHlcm", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -244.47891406982174, + "y": 60.48309326171875, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 193.4991455078125, + "height": 68.81682520930795, + "seed": 1086242000, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 18.351153389148788, + "fontFamily": 1, + "text": "1. configs.xlsx\n2. T_电机电流.xlsx\n3. 工程文件", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "1. configs.xlsx\n2. T_电机电流.xlsx\n3. 工程文件", + "autoResize": false, + "lineHeight": 1.25 + }, + { + "type": "diamond", + "version": 158, + "versionNonce": 684273585, + "index": "aA", + "isDeleted": false, + "id": "RwMIreS0QkAZwm-3ulGX-", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 24.051910400390625, + "y": 40.48309326171875, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 257.5999755859375, + "height": 100, + "seed": 51082257, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [ + { + "type": "text", + "id": "iNY8dtUFmWKoMwFFsArGd" + }, + { + "id": "cdPz-GgAqgjIqgTPRVFw-", + "type": "arrow" + }, + { + "id": "vRciE0DKBJzJ8v7fA54Kq", + "type": "arrow" + }, + { + "id": "sVTpXJGfJ64bteP_k-FEb", + "type": "arrow" + } + ], + "updated": 1719982450560, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 214, + "versionNonce": 1388834763, + "index": "aAV", + "isDeleted": false, + "id": "iNY8dtUFmWKoMwFFsArGd", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 96.951904296875, + "y": 70.48309326171875, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 112, + "height": 40, + "seed": 1500869361, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 16, + "fontFamily": 1, + "text": "检查输入文件是\n否正确", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "RwMIreS0QkAZwm-3ulGX-", + "originalText": "检查输入文件是否正确", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 243, + "versionNonce": 469737771, + "index": "aC", + "isDeleted": false, + "id": "Kf1iK8aKtz3dLPTOYumTw", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 501.41290283203125, + "y": -67.3922233581543, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 122.07794189453125, + "height": 49.35063934326172, + "seed": 179980831, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "VuHEUguk0rq5mHifBtniS" + }, + { + "id": "cdPz-GgAqgjIqgTPRVFw-", + "type": "arrow" + }, + { + "id": "E6Z8Wh6Av-c4t5msk3j0Z", + "type": "arrow" + } + ], + "updated": 1719982544519, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 234, + "versionNonce": 298321509, + "index": "aD", + "isDeleted": false, + "id": "VuHEUguk0rq5mHifBtniS", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 542.4518737792969, + "y": -55.21690368652344, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 40, + "height": 25, + "seed": 1648995903, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "结束", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "Kf1iK8aKtz3dLPTOYumTw", + "originalText": "结束", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "arrow", + "version": 159, + "versionNonce": 12219423, + "index": "aH", + "isDeleted": false, + "id": "cdPz-GgAqgjIqgTPRVFw-", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 264.76445650455105, + "y": 66.83925419197496, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 228.08738065365208, + "height": 99.95610599861558, + "seed": 339189983, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [ + { + "type": "text", + "id": "82DP34j9Ep7573KCrZFuj" + } + ], + "updated": 1719982450562, + "link": null, + "locked": false, + "startBinding": { + "elementId": "RwMIreS0QkAZwm-3ulGX-", + "focus": 0.6262400211589412, + "gap": 15.929954945665216 + }, + "endBinding": { + "elementId": "Kf1iK8aKtz3dLPTOYumTw", + "focus": 0.05115605003902535, + "gap": 8.561065673828125 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 105.68741727474583, + -79.95610599861558 + ], + [ + 228.08738065365208, + -99.95610599861558 + ] + ] + }, + { + "type": "text", + "version": 8, + "versionNonce": 1399701099, + "index": "aHV", + "isDeleted": false, + "id": "82DP34j9Ep7573KCrZFuj", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 353.6798782348633, + "y": -30.616851806640625, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 33.54399108886719, + "height": 35, + "seed": 830879743, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 28, + "fontFamily": 1, + "text": "No", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "cdPz-GgAqgjIqgTPRVFw-", + "originalText": "No", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 469, + "versionNonce": 817793503, + "index": "aI", + "isDeleted": false, + "id": "OuZBPxPXuTv9FpsBMA2am", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -244.98712158203125, + "y": 267.0077705383301, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 215.67791748046875, + "height": 59.75057220458983, + "seed": 1897362833, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "QclqBhwtyuV2bEYeF_-0N" + }, + { + "id": "vRciE0DKBJzJ8v7fA54Kq", + "type": "arrow" + }, + { + "id": "M3h-oZVLWQYI4EBdoYQJZ", + "type": "arrow" + } + ], + "updated": 1719982188678, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 492, + "versionNonce": 841216453, + "index": "aJ", + "isDeleted": false, + "id": "QclqBhwtyuV2bEYeF_-0N", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -224.51813507080078, + "y": 284.383056640625, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 174.7399444580078, + "height": 25, + "seed": 1385470833, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "将工程拷贝到xCore", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "OuZBPxPXuTv9FpsBMA2am", + "originalText": "将工程拷贝到xCore", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 749, + "versionNonce": 748415083, + "index": "aK", + "isDeleted": false, + "id": "BCw88w8hesWTAf2Xay3qh", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -232.58706665039062, + "y": 429.80786514282227, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 200.4779052734375, + "height": 110, + "seed": 857530801, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "yHxIbnwKIz2AfFo1WFUv4" + }, + { + "id": "M3h-oZVLWQYI4EBdoYQJZ", + "type": "arrow" + }, + { + "id": "abhTOT48fVbhcaD6SFRLd", + "type": "arrow" + }, + { + "id": "n3hZ2B8KLeQUTZ8vlZwpw", + "type": "arrow" + } + ], + "updated": 1719982613868, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 766, + "versionNonce": 1738586379, + "index": "aL", + "isDeleted": false, + "id": "yHxIbnwKIz2AfFo1WFUv4", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -227.58706665039062, + "y": 447.30786514282227, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 180, + "height": 75, + "seed": 1700234129, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "关闭诊断曲线,触发\n软急停,并解除,切\n手动模式", + "textAlign": "left", + "verticalAlign": "middle", + "containerId": "BCw88w8hesWTAf2Xay3qh", + "originalText": "关闭诊断曲线,触发软急停,并解除,切手动模式", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "arrow", + "version": 125, + "versionNonce": 346241861, + "index": "aM", + "isDeleted": false, + "id": "vRciE0DKBJzJ8v7fA54Kq", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 61.12548359401855, + "y": 117.84151260276442, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 206.69268721882452, + "height": 140.24163253883714, + "seed": 546610591, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [ + { + "type": "text", + "id": "PfWkxzSRM6swE3zdpo__p" + } + ], + "updated": 1719982658475, + "link": null, + "locked": false, + "startBinding": { + "elementId": "RwMIreS0QkAZwm-3ulGX-", + "focus": 0.39910484083682946, + "gap": 12.087656934222686 + }, + "endBinding": { + "elementId": "OuZBPxPXuTv9FpsBMA2am", + "focus": -0.43197181050964706, + "gap": 8.924625396728516 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -206.69268721882452, + 140.24163253883714 + ] + ] + }, + { + "id": "PfWkxzSRM6swE3zdpo__p", + "type": "text", + "x": -58.280842315198406, + "y": 175.46232887218298, + "width": 32.119964599609375, + "height": 25, + "angle": 0, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "frameId": null, + "index": "aMV", + "roundness": null, + "seed": 1690013765, + "version": 6, + "versionNonce": 1804967499, + "isDeleted": false, + "boundElements": null, + "updated": 1719982657566, + "link": null, + "locked": false, + "text": "Yes", + "fontSize": 20, + "fontFamily": 1, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "vRciE0DKBJzJ8v7fA54Kq", + "originalText": "Yes", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "arrow", + "version": 426, + "versionNonce": 313666481, + "index": "aN", + "isDeleted": false, + "id": "M3h-oZVLWQYI4EBdoYQJZ", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -146.50678883428878, + "y": 337.71943283081055, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 2.9703782670530074, + "height": 79.12740325927734, + "seed": 265077663, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1719982225670, + "link": null, + "locked": false, + "startBinding": { + "elementId": "OuZBPxPXuTv9FpsBMA2am", + "focus": 0.06862940464968151, + "gap": 10.961090087890625 + }, + "endBinding": { + "elementId": "BCw88w8hesWTAf2Xay3qh", + "focus": -0.1923710725188571, + "gap": 12.961029052734375 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -2.9703782670530074, + 79.12740325927734 + ] + ] + }, + { + "type": "rectangle", + "version": 626, + "versionNonce": 1401629285, + "index": "aO", + "isDeleted": false, + "id": "tRrOZ-dVRENzlkE2D7JiN", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 75.412841796875, + "y": 461.80783462524414, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 215.67791748046875, + "height": 50.20001220703125, + "seed": 1924605105, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "sMJglKTmK18wBh571qiFL" + }, + { + "id": "abhTOT48fVbhcaD6SFRLd", + "type": "arrow" + }, + { + "id": "NmxfcTzxuWNJwo4Wb-4Ga", + "type": "arrow" + }, + { + "id": "n3hZ2B8KLeQUTZ8vlZwpw", + "type": "arrow" + } + ], + "updated": 1719982487638, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 675, + "versionNonce": 1789620517, + "index": "aP", + "isDeleted": false, + "id": "sMJglKTmK18wBh571qiFL", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 103.25180053710938, + "y": 474.40784072875977, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 160, + "height": 25, + "seed": 1588684433, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "修改要执行的场景", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "tRrOZ-dVRENzlkE2D7JiN", + "originalText": "修改要执行的场景", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 708, + "versionNonce": 713425809, + "index": "aQ", + "isDeleted": false, + "id": "RCDA1RfQ7PtPkmcBpZ0ZG", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 59.41290283203125, + "y": 276.1831512451172, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 253.27795410156253, + "height": 76.19992065429686, + "seed": 1625462961, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "AkYipAwKndA09w9Cp3MoW" + }, + { + "id": "NmxfcTzxuWNJwo4Wb-4Ga", + "type": "arrow" + }, + { + "id": "F-gcNIPiBPo5bXyhvYKAd", + "type": "arrow" + } + ], + "updated": 1719982420727, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 751, + "versionNonce": 2094751659, + "index": "aR", + "isDeleted": false, + "id": "AkYipAwKndA09w9Cp3MoW", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 64.41290283203125, + "y": 289.2831115722656, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 234.27987670898438, + "height": 50, + "seed": 1598970513, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "reload工程后,pp2main,\n并且自动模式和上电", + "textAlign": "left", + "verticalAlign": "middle", + "containerId": "RCDA1RfQ7PtPkmcBpZ0ZG", + "originalText": "reload工程后,pp2main,并且自动模式和上电", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 867, + "versionNonce": 2045773137, + "index": "aT", + "isDeleted": false, + "id": "VJKgVgVna5AHKSE1WlSKM", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 446.61285400390625, + "y": 110.58305358886719, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 173.2778930664062, + "height": 51.20001220703126, + "seed": 754615359, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "id": "DmL0yWKEJ7KMf7m5v8fBP", + "type": "text" + }, + { + "id": "F-gcNIPiBPo5bXyhvYKAd", + "type": "arrow" + }, + { + "id": "_0vJdrVWw6yxiSmedBCz_", + "type": "arrow" + } + ], + "updated": 1719982472134, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 191, + "versionNonce": 1489765509, + "index": "aTV", + "isDeleted": false, + "id": "DmL0yWKEJ7KMf7m5v8fBP", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 473.2518005371094, + "y": 123.68305969238281, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 120, + "height": 25, + "seed": 1146471505, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "开始运行程序", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "VJKgVgVna5AHKSE1WlSKM", + "originalText": "开始运行程序", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 967, + "versionNonce": 1434035473, + "index": "aX", + "isDeleted": false, + "id": "wsKk3rGTn1F-L5FxrCX5H", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 426.2130126953125, + "y": 274.0830841064453, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 213.2778930664063, + "height": 69, + "seed": 804808927, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "Ybc-XtdsXVulj0EsjVQG3" + }, + { + "id": "F-gcNIPiBPo5bXyhvYKAd", + "type": "arrow" + }, + { + "id": "ZDRN9BNAFSm7MPd4mQItT", + "type": "arrow" + }, + { + "id": "_0vJdrVWw6yxiSmedBCz_", + "type": "arrow" + } + ], + "updated": 1719982472134, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 296, + "versionNonce": 1833448011, + "index": "aY", + "isDeleted": false, + "id": "Ybc-XtdsXVulj0EsjVQG3", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 431.2130126953125, + "y": 283.5830841064453, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 200, + "height": 50, + "seed": 1607857407, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "打开诊断曲线,并执行\n采集,收集15s的数据", + "textAlign": "left", + "verticalAlign": "middle", + "containerId": "wsKk3rGTn1F-L5FxrCX5H", + "originalText": "打开诊断曲线,并执行采集,收集15s的数据", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "rectangle", + "version": 1091, + "versionNonce": 330063851, + "index": "aZ", + "isDeleted": false, + "id": "2ysxvHdQkJy90WXrs-fCv", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 424.6129150390625, + "y": 439.5830841064453, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 213.2778930664063, + "height": 85, + "seed": 958808895, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "o7Ntq3Q62WL2u4scU9yxN" + }, + { + "id": "ZDRN9BNAFSm7MPd4mQItT", + "type": "arrow" + }, + { + "id": "n3hZ2B8KLeQUTZ8vlZwpw", + "type": "arrow" + }, + { + "id": "E6Z8Wh6Av-c4t5msk3j0Z", + "type": "arrow" + } + ], + "updated": 1719982544519, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 419, + "versionNonce": 272837605, + "index": "aa", + "isDeleted": false, + "id": "o7Ntq3Q62WL2u4scU9yxN", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 429.6129150390625, + "y": 444.5830841064453, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 200, + "height": 75, + "seed": 253330271, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1719982515995, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "关闭诊断曲线,停止程\n序运行,下电并且换成\n手动模式", + "textAlign": "left", + "verticalAlign": "middle", + "containerId": "2ysxvHdQkJy90WXrs-fCv", + "originalText": "关闭诊断曲线,停止程序运行,下电并且换成手动模式", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "type": "arrow", + "version": 28, + "versionNonce": 1448801265, + "index": "ac", + "isDeleted": false, + "id": "abhTOT48fVbhcaD6SFRLd", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -23.148101806640625, + "y": 480.48313903808594, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 92.79998779296875, + "height": 4.79998779296875, + "seed": 206954833, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1719982415614, + "link": null, + "locked": false, + "startBinding": { + "elementId": "BCw88w8hesWTAf2Xay3qh", + "focus": -0.16570621576454106, + "gap": 8.9610595703125 + }, + "endBinding": { + "elementId": "tRrOZ-dVRENzlkE2D7JiN", + "focus": -0.13857316707842932, + "gap": 5.760955810546875 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 92.79998779296875, + 4.79998779296875 + ] + ] + }, + { + "type": "arrow", + "version": 43, + "versionNonce": 381333105, + "index": "ad", + "isDeleted": false, + "id": "NmxfcTzxuWNJwo4Wb-4Ga", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 186.45187377929688, + "y": 451.6831512451172, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 3.20001220703125, + "height": 93.60003662109375, + "seed": 800156593, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1719982418134, + "link": null, + "locked": false, + "startBinding": { + "elementId": "tRrOZ-dVRENzlkE2D7JiN", + "focus": 0.0405193974911985, + "gap": 10.124683380126953 + }, + "endBinding": { + "elementId": "RCDA1RfQ7PtPkmcBpZ0ZG", + "focus": 0.033589241584410304, + "gap": 5.700042724609375 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -3.20001220703125, + -93.60003662109375 + ] + ] + }, + { + "type": "arrow", + "version": 166, + "versionNonce": 696485823, + "index": "ae", + "isDeleted": false, + "id": "F-gcNIPiBPo5bXyhvYKAd", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 207.17953736663367, + "y": 265.2831268310547, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 232.07226317047576, + "height": 129.50963486385447, + "seed": 1246004785, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1719982468154, + "link": null, + "locked": false, + "startBinding": { + "elementId": "RCDA1RfQ7PtPkmcBpZ0ZG", + "focus": -0.344114401938857, + "gap": 10.9000244140625 + }, + "endBinding": { + "elementId": "VJKgVgVna5AHKSE1WlSKM", + "focus": 0.7149061721950657, + "gap": 7.361053466796875 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 232.07226317047576, + -129.50963486385447 + ] + ] + }, + { + "type": "arrow", + "version": 37, + "versionNonce": 288218289, + "index": "af", + "isDeleted": false, + "id": "ZDRN9BNAFSm7MPd4mQItT", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 537.6518859863281, + "y": 351.6831817626953, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 0.800048828125, + "height": 77.59994506835938, + "seed": 1918402865, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1719982423150, + "link": null, + "locked": false, + "startBinding": { + "elementId": "wsKk3rGTn1F-L5FxrCX5H", + "focus": -0.0490144661885691, + "gap": 8.60009765625 + }, + "endBinding": { + "elementId": "2ysxvHdQkJy90WXrs-fCv", + "focus": 0.04721468619376246, + "gap": 10.299957275390625 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -0.800048828125, + 77.59994506835938 + ] + ] + }, + { + "type": "arrow", + "version": 23, + "versionNonce": 977005727, + "index": "ah", + "isDeleted": false, + "id": "sVTpXJGfJ64bteP_k-FEb", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 150.45187377929688, + "y": -11.516876220703121, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 0.804804176492155, + "height": 41.8504465544745, + "seed": 445992479, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1719982450563, + "link": null, + "locked": false, + "startBinding": { + "elementId": "G7GvfRyoquBz-CKotoH2E", + "focus": -0.08754862573962541, + "gap": 6.467559814453125 + }, + "endBinding": { + "elementId": "RwMIreS0QkAZwm-3ulGX-", + "focus": -0.00340462795005759, + "gap": 10.274120072847268 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0.804804176492155, + 41.8504465544745 + ] + ] + }, + { + "type": "arrow", + "version": 36, + "versionNonce": 423965489, + "index": "aj", + "isDeleted": false, + "id": "_0vJdrVWw6yxiSmedBCz_", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 524.8518371582031, + "y": 169.2831268310547, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffffff", + "width": 4.800048828125, + "height": 95.19998168945312, + "seed": 929888657, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1719982472134, + "link": null, + "locked": false, + "startBinding": { + "elementId": "VJKgVgVna5AHKSE1WlSKM", + "focus": 0.11451067993145546, + "gap": 7.50006103515625 + }, + "endBinding": { + "elementId": "wsKk3rGTn1F-L5FxrCX5H", + "focus": -0.009010296063984877, + "gap": 9.5999755859375 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 4.800048828125, + 95.19998168945312 + ] + ] + }, + { + "id": "n3hZ2B8KLeQUTZ8vlZwpw", + "type": "arrow", + "x": 540.0518798828125, + "y": 543.6831512451172, + "width": 681.6000061035156, + "height": 97.59992980957031, + "angle": 0, + "strokeColor": "#e03131", + "backgroundColor": "#ffffff", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "frameId": null, + "index": "ak", + "roundness": { + "type": 2 + }, + "seed": 1992830629, + "version": 317, + "versionNonce": 2002086373, + "isDeleted": false, + "boundElements": [ + { + "type": "text", + "id": "VtM-I773QbeIZJnAnflWx" + } + ], + "updated": 1719982634421, + "link": null, + "locked": false, + "points": [ + [ + 0, + 0 + ], + [ + -330.40005111694336, + 97.59992980957031 + ], + [ + -681.6000061035156, + 12.00006103515625 + ] + ], + "lastCommittedPoint": null, + "startBinding": { + "elementId": "2ysxvHdQkJy90WXrs-fCv", + "focus": -0.8675494800251833, + "gap": 19.100067138671875 + }, + "endBinding": { + "elementId": "BCw88w8hesWTAf2Xay3qh", + "focus": 0.9205095612151336, + "gap": 15.875347137451172 + }, + "startArrowhead": null, + "endArrowhead": "arrow" + }, + { + "id": "VtM-I773QbeIZJnAnflWx", + "type": "text", + "x": 338.85186767578125, + "y": 473.18312072753906, + "width": 40, + "height": 25, + "angle": 0, + "strokeColor": "#e03131", + "backgroundColor": "#ffffff", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "frameId": null, + "index": "akV", + "roundness": null, + "seed": 26036997, + "version": 11, + "versionNonce": 1756944421, + "isDeleted": false, + "boundElements": null, + "updated": 1719982595450, + "link": null, + "locked": false, + "text": "继续", + "fontSize": 20, + "fontFamily": 1, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "n3hZ2B8KLeQUTZ8vlZwpw", + "originalText": "继续", + "autoResize": true, + "lineHeight": 1.25 + }, + { + "id": "E6Z8Wh6Av-c4t5msk3j0Z", + "type": "arrow", + "x": 650.4519348144531, + "y": 479.6831512451172, + "width": 244.800048828125, + "height": 524.0000305175781, + "angle": 0, + "strokeColor": "#e03131", + "backgroundColor": "#ffffff", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "frameId": null, + "index": "am", + "roundness": { + "type": 2 + }, + "seed": 1006891467, + "version": 413, + "versionNonce": 972534245, + "isDeleted": false, + "boundElements": [ + { + "type": "text", + "id": "3NfVy3o0TIZLU7DXhNStB" + } + ], + "updated": 1719982563646, + "link": null, + "locked": false, + "points": [ + [ + 0, + 0 + ], + [ + 159.2000732421875, + -72 + ], + [ + 228, + -289.60003662109375 + ], + [ + 131.199951171875, + -499.2000198364258 + ], + [ + -16.800048828125, + -524.0000305175781 + ] + ], + "lastCommittedPoint": null, + "startBinding": { + "elementId": "2ysxvHdQkJy90WXrs-fCv", + "focus": 0.5677327376482016, + "gap": 12.561126708984375 + }, + "endBinding": { + "elementId": "Kf1iK8aKtz3dLPTOYumTw", + "focus": -0.38766321137227633, + "gap": 10.161041259765625 + }, + "startArrowhead": null, + "endArrowhead": "arrow" + }, + { + "id": "3NfVy3o0TIZLU7DXhNStB", + "type": "text", + "x": 723.6518859863281, + "y": 151.9831085205078, + "width": 180, + "height": 25, + "angle": 0, + "strokeColor": "#e03131", + "backgroundColor": "#ffffff", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "frameId": null, + "index": "an", + "roundness": null, + "seed": 438263077, + "version": 36, + "versionNonce": 1981042341, + "isDeleted": false, + "boundElements": null, + "updated": 1719982554969, + "link": null, + "locked": false, + "text": "当所有场景采集完毕", + "fontSize": 20, + "fontFamily": 1, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "E6Z8Wh6Av-c4t5msk3j0Z", + "originalText": "当所有场景采集完毕", + "autoResize": true, + "lineHeight": 1.25 + } + ], + "appState": { + "gridSize": null, + "viewBackgroundColor": "#ffffff" + }, + "files": {} +} \ No newline at end of file diff --git a/aio/code/__init__.py b/aio/code/__init__.py deleted file mode 100644 index e6e51aa..0000000 --- a/aio/code/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__all__ = ['automatic_test', 'data_process'] \ No newline at end of file diff --git a/aio/code/aio.py b/aio/code/aio.py index adfeca2..d7d8236 100644 --- a/aio/code/aio.py +++ b/aio/code/aio.py @@ -1,21 +1,35 @@ import tkinter -from os.path import exists, dirname -from os import getcwd +from os.path import exists +from os import getcwd, remove from threading import Thread import tkinter.messagebox import customtkinter from time import time, strftime, localtime, sleep from urllib.request import urlopen -from socket import setdefaulttimeout -from data_process import * -from automatic_test import * +from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg +from data_process import brake, current, iso, wavelogger +from automatic_test import do_current, do_brake, btn_functions +from durable_action import factory_test +from commons import openapi, clibs +from matplotlib.pyplot import rcParams, figure, subplots_adjust, close +from matplotlib import use +from pandas import DataFrame, read_excel -current_path = dirname(__file__) +with open(clibs.log_data_hmi, 'w') as _hmi, open(clibs.log_data_debug, 'w', encoding='utf-8') as _debug: + for i in range(1, 11): + try: + remove(f'{clibs.log_data_hmi}.{i}') + except FileNotFoundError: + pass +logger = clibs.log_prod +logger.info("日志文件初始化完成...") + +use('Agg') customtkinter.set_appearance_mode("System") # Modes: "System" (standard), "Dark", "Light" customtkinter.set_default_color_theme("blue") # Themes: "blue" (standard), "green", "dark-blue" customtkinter.set_widget_scaling(1.1) # widget dimensions and text size customtkinter.set_window_scaling(1.1) # window geometry dimensions -setdefaulttimeout(3) + # global vars btns_func = { 'start': {'btn': '', 'row': 1, 'text': '开始运行'}, @@ -35,6 +49,10 @@ widgits_at = { 'path': {'label': '', 'entry': '', 'row': 2, 'col': 2, 'text': '数据文件夹路径'}, 'loadsel': {'label': '', 'optionmenu': '', 'row': 2, 'col': 1, 'text': '负载信息'}, } +widgits_da = { + 'path': {'label': '', 'entry': '', 'row': 1, 'col': 2, 'text': '数据文件夹路径'}, + 'curvesel': {'label': '', 'optionmenu': '', 'row': 1, 'col': 1, 'text': '指标选择'}, +} class App(customtkinter.CTk): @@ -44,6 +62,11 @@ class App(customtkinter.CTk): self.w_param = 84 self.hr = None self.md = None + self.canvas = None + self.flg = 0 + self.df_copy = None + self.old_curve = None + self.myThread = None # ===================================================================== # configure window self.title("AIO - All in one automatic toolbox") @@ -70,7 +93,7 @@ class App(customtkinter.CTk): btns_func['log']['btn'].configure(command=lambda: self.thread_it(self.func_log_callback)) btns_func['end']['btn'].configure(command=lambda: self.thread_it(self.func_end_callback)) # create version info - self.label_version = customtkinter.CTkLabel(self.frame_func, justify='left', text="Vers: 0.1.9.1\nDate: 07/12/2024", font=self.my_font, text_color="#4F4F4F") + self.label_version = customtkinter.CTkLabel(self.frame_func, justify='left', text="Vers: 0.2.0.5\nDate: 08/02/2024", font=self.my_font, text_color="#4F4F4F") self.frame_func.rowconfigure(6, weight=1) self.label_version.grid(row=6, column=0, padx=20, pady=20, sticky='s') # ===================================================================== @@ -79,6 +102,7 @@ class App(customtkinter.CTk): self.tabview.grid(row=0, column=1, padx=10, pady=5, sticky="nsew") self.tabview.add("Data Process") self.tabview.add("Automatic Test") + self.tabview.add("Durable Action") # create main menu for data process self.menu_main_dp = customtkinter.CTkOptionMenu(self.tabview.tab('Data Process'), values=["init", "brake", "current", "iso", "wavelogger"], font=self.my_font, text_color='yellow', button_color='red', fg_color='green', command=self.func_main_callback) self.menu_main_dp.grid(row=1, column=1, sticky='we', padx=5, pady=10) @@ -114,7 +138,7 @@ class App(customtkinter.CTk): # For automatic test tab START ===================================================================== # create buttons self.seg_button = customtkinter.CTkSegmentedButton(self.tabview.tab('Automatic Test'), dynamic_resizing=False, font=customtkinter.CTkFont(size=16, weight='bold'), command=lambda value='机器状态': self.thread_it(self.segmented_button_callback)) - self.seg_button.grid(row=1, column=2, columnspan=12, padx=(20, 10), pady=(10, 10), sticky="ew") + self.seg_button.grid(row=1, column=2, columnspan=12, padx=(65, 10), pady=(10, 10), sticky="ew") self.seg_button.configure(dynamic_resizing=False, values=["功能切换", "触发急停", "恢复急停", "待定功能", "功能待定", "机器状态", "告警信息"]) self.seg_button.set("功能切换") # create progress bar @@ -126,7 +150,7 @@ class App(customtkinter.CTk): for widgit in widgits_at: if widgit == 'path': widgits_at[widgit]['label'] = customtkinter.CTkLabel(self.tabview.tab('Automatic Test'), text=f'{widgit.upper()}', font=self.my_font) - widgits_at[widgit]['label'].grid(row=widgits_at[widgit]['row'], column=widgits_at[widgit]['col'], sticky='e', pady=5) + widgits_at[widgit]['label'].grid(row=widgits_at[widgit]['row'], column=widgits_at[widgit]['col'], sticky='e', padx=(20, 5), pady=5) widgits_at[widgit]['entry'] = customtkinter.CTkEntry(self.tabview.tab('Automatic Test'), width=670, placeholder_text=widgits_at[widgit]['text'], font=self.my_font) widgits_at[widgit]['entry'].grid(row=widgits_at[widgit]['row'], column=widgits_at[widgit]['col']+1, columnspan=11, padx=(5, 10), pady=5, sticky='we') widgits_at[widgit]['entry'].configure(state='disabled') @@ -136,6 +160,23 @@ class App(customtkinter.CTk): widgits_at[widgit]['optionmenu'].set(widgits_at[widgit]['text']) widgits_at[widgit]['optionmenu'].configure(state='disabled') # For automatic test tab END ===================================================================== + # For durable_action tab START ===================================================================== + # create progress bar + self.progressbar_da = customtkinter.CTkProgressBar(self.tabview.tab('Durable Action')) + self.progressbar_da.grid(row=2, column=1, padx=5, pady=5, sticky="ew") + self.progressbar_da.configure(mode="determinnate", width=self.w_param) + self.progressbar_da.start() + for widgit in widgits_da: + if widgit == 'path': + widgits_da[widgit]['label'] = customtkinter.CTkLabel(self.tabview.tab('Durable Action'), text=f'{widgit.upper()}', font=self.my_font) + widgits_da[widgit]['label'].grid(row=widgits_da[widgit]['row'], column=widgits_da[widgit]['col'], sticky='e', padx=(20, 5), pady=10) + widgits_da[widgit]['entry'] = customtkinter.CTkEntry(self.tabview.tab('Durable Action'), width=670, placeholder_text=widgits_da[widgit]['text'], font=self.my_font) + widgits_da[widgit]['entry'].grid(row=widgits_da[widgit]['row'], column=widgits_da[widgit]['col']+1, columnspan=11, padx=(5, 10), pady=10, sticky='we') + elif widgit in ['curvesel']: + widgits_da[widgit]['optionmenu'] = customtkinter.CTkOptionMenu(self.tabview.tab('Durable Action'), dynamic_resizing=False, button_color='#708090', fg_color='#778899', values=['device_servo_trq_feedback', '[max] device_servo_trq_feedback'], font=self.my_font) + widgits_da[widgit]['optionmenu'].grid(row=widgits_da[widgit]['row'], column=widgits_da[widgit]['col'], padx=5, pady=10, sticky='we') + widgits_da[widgit]['optionmenu'].set(widgits_da[widgit]['text']) + # For durable_action tab END ===================================================================== # create textbox self.textbox = customtkinter.CTkTextbox(self, wrap='none', font=customtkinter.CTkFont(family="consolas", size=14), text_color="blue", fg_color='#E9E9E9', border_width=2, border_color='#CDCDCD', border_spacing=5) self.textbox.grid(row=6, column=1, columnspan=13, ipadx=10, ipady=10, padx=10, pady=(5, 10), sticky='nsew') @@ -153,6 +194,60 @@ class App(customtkinter.CTk): tkinter.messagebox.showwarning(title="版本更新", message="连接服务器失败,无法确认当前是否是最新版本......") # functions below ↓ ---------------------------------------------------------------------------------------- + def create_canvas(self, _figure): + self.canvas = FigureCanvasTkAgg(_figure, self.tabview.tab('Durable Action')) + self.canvas.draw() + self.canvas.get_tk_widget().configure(height=600) + self.canvas.get_tk_widget().grid(row=3, column=1, rowspan=3, columnspan=13, padx=20, pady=10, sticky="nsew") + + def create_plot(self): + rcParams['font.sans-serif'] = ['SimHei'] + rcParams['axes.unicode_minus'] = False + rcParams['figure.dpi'] = 100 + rcParams['font.size'] = 14 + rcParams['lines.marker'] = 'o' + + curvesel = widgits_da['curvesel']['optionmenu'].get() + while True: + if not self.hr.durable_lock: + self.hr.durable_lock = 1 + if curvesel == 'device_servo_trq_feedback': + df = read_excel(clibs.durable_data_current_xlsx) + _title = 'device_servo_trq_feedback' + elif curvesel == '[max] device_servo_trq_feedback': + _title = '[max] device_servo_trq_feedback' + df = read_excel(clibs.durable_data_current_max_xlsx) + else: + _title = 'device_servo_trq_feedback' + df = read_excel(clibs.durable_data_current_xlsx) + self.hr.durable_lock = 0 + break + else: + sleep(1) + + if not df.equals(self.df_copy) or self.flg == 0 or curvesel != self.old_curve: + self.flg = 1 + self.df_copy = df.copy() + self.old_curve = widgits_da['curvesel']['optionmenu'].get() + close('all') + _figure = figure(frameon=True, facecolor='#E9E9E9') + subplots_adjust(left=0.04, right=0.98, bottom=0.1, top=0.95) + + _ = df['time'].to_list() + _xticks = [str(_i) for _i in _] + ax = _figure.add_subplot(1, 1, 1) + ax.set_xticks(range(len(_xticks))) + ax.set_xticklabels(_xticks) + + df.plot(grid=True, x='time', y='axis1', ax=ax) + df.plot(grid=True, x='time', y='axis2', ax=ax) + df.plot(grid=True, x='time', y='axis3', ax=ax) + df.plot(grid=True, x='time', y='axis4', ax=ax) + df.plot(grid=True, x='time', y='axis5', ax=ax) + df.plot(grid=True, x='time', y='axis6', ax=ax, title=_title, legend='upper left', rot=30) + + self.create_canvas(_figure) + def thread_it(self, func, *args): """ 将函数打包进线程 """ self.myThread = Thread(target=func, args=args) @@ -166,7 +261,7 @@ class App(customtkinter.CTk): self.seg_button.configure(state='disabled') # self.tabview.configure(state='disabled') self.textbox.delete(index1='1.0', index2='end') - with open(f'{current_path}/../assets/templates/heartbeat', 'r', encoding='utf-8') as f_h: + with open(clibs.heartbeat, 'r', encoding='utf-8') as f_h: c_state = f_h.read().strip() if c_state == '0' and value != '功能切换': @@ -181,32 +276,44 @@ class App(customtkinter.CTk): # self.tabview.configure(state='normal') def detect_network(self): - with open(f"{current_path}/../assets/templates/heartbeat", "w", encoding='utf-8') as f_hb: + df = DataFrame(clibs.durable_data_current) + df.to_excel(clibs.durable_data_current_xlsx, index=False) + df = DataFrame(clibs.durable_data_current_max) + df.to_excel(clibs.durable_data_current_max_xlsx, index=False) + + with open(clibs.heartbeat, "w", encoding='utf-8') as f_hb: f_hb.write('0') self.hr = openapi.HmiRequest(self.write2textbox) self.md = openapi.ModbusRequest(self.write2textbox) while True: - with open(f'{current_path}/../assets/templates/heartbeat', 'r', encoding='utf-8') as f_hb: + if self.tabview.get() == 'Durable Action': + self.create_plot() + + with open(clibs.heartbeat, 'r', encoding='utf-8') as f_hb: c_state = f_hb.read().strip() pb_color = 'green' if c_state == '1' else 'red' self.progressbar.configure(progress_color=pb_color) + self.progressbar_da.configure(progress_color=pb_color) if c_state == '0': self.hr.t_bool = False - sleep(3) + sleep(4) del self.hr self.hr = openapi.HmiRequest(self.write2textbox) sleep(3) def tabview_click(self): self.initialization() - tab_name = self.tabview.get() if tab_name == 'Data Process': + self.flg = 0 self.menu_main_dp.set("Start Here!") elif tab_name == 'Automatic Test': + self.flg = 0 self.menu_main_at.set("Start Here!") self.seg_button.configure(state='normal') + elif tab_name == 'Durable Action': + pass def initialization(self): tab_name = self.tabview.get() @@ -227,7 +334,7 @@ class App(customtkinter.CTk): self.menu_sub_dp.grid_forget() elif tab_name == 'Automatic Test': for widgit in widgits_at: - if widgit in ['path', 'av1', 'av2', 'av3', 'av4', 'av5', 'av6', 'rc1', 'rc2', 'rc3', 'rc4', 'rc5', 'rc6', 'rr1', 'rr2', 'rr3', 'rr4', 'rr5', 'rr6']: + if widgit in ['path', ]: widgits_at[widgit]['label'].configure(text=f'{widgit.upper()}', text_color='black') widgits_at[widgit]['entry'].delete(0, tkinter.END) widgits_at[widgit]['entry'].configure(placeholder_text=widgits_at[widgit]['text'], state='normal') @@ -237,6 +344,15 @@ class App(customtkinter.CTk): widgits_at[widgit]['optionmenu'].set(widgits_at[widgit]['text']) widgits_at[widgit]['optionmenu'].configure(state='disabled') self.seg_button.set("功能切换") + elif tab_name == 'Durable Action': + for widgit in widgits_da: + if widgit in ['path', ]: + widgits_da[widgit]['label'].configure(text=f'{widgit.upper()}', text_color='black') + widgits_da[widgit]['entry'].delete(0, tkinter.END) + widgits_da[widgit]['entry'].configure(placeholder_text=widgits_at[widgit]['text'], state='normal') + elif widgit in ['curvesel']: + widgits_da[widgit]['optionmenu'].configure(state='normal') + widgits_da[widgit]['optionmenu'].set(widgits_da[widgit]['text']) def func_main_callback(self, func_name): self.initialization() @@ -332,6 +448,7 @@ class App(customtkinter.CTk): self.textbox.tag_add(color, 'insert', 'end') self.textbox.tag_config(tagName=color, foreground=color) tab_name_cur = self.tabview.get() + logger.info(text) if tab_name == tab_name_cur: if wait != 0: @@ -347,7 +464,7 @@ class App(customtkinter.CTk): self.textbox.insert(index='end', text=text + '\n', tags=color) self.textbox.update() self.textbox.see('end') - elif tab_name == 'openapi' and tab_name_cur == 'Automatic Test': + elif tab_name == 'openapi' and tab_name_cur == 'Automatic Test' or tab_name_cur == 'Durable Action': if wait != 0: self.textbox.insert(index='end', text=text, tags=color) self.textbox.update() @@ -453,12 +570,24 @@ class App(customtkinter.CTk): return 0, 0 else: return 0, 0 + elif tab_name == 'Durable Action': + path = widgits_da['path']['entry'].get().strip() + curvesel = widgits_da['curvesel']['optionmenu'].get() + c1 = exists(path) + c2 = curvesel in ['device_servo_trq_feedback', '[max] device_servo_trq_feedback'] + if c1 and c2: + return 7, path, curvesel + else: + return 0, 0 def func_start_callback(self): self.textbox.delete(index1='1.0', index2='end') flag, *args = self.check_param() - func_dict = {1: brake.main, 2: current.main, 3: iso.main, 4: wavelogger.main, 5: do_brake.main, 6: do_current.main} + func_dict = { + 1: brake.main, 2: current.main, 3: iso.main, 4: wavelogger.main, 5: do_brake.main, 6: do_current.main, + 7: factory_test.main + } if flag == 1: func_dict[flag](path=args[0], vel=args[1], trq=args[2], estop=args[3], w2t=self.write2textbox) elif flag == 2: @@ -473,10 +602,19 @@ class App(customtkinter.CTk): elif flag == 6: self.pre_warning() func_dict[flag](path=args[0], hr=self.hr, md=self.md, loadsel=args[1], w2t=self.write2textbox) + elif flag == 7: + self.pre_warning() + func_dict[flag](path=args[0], hr=self.hr, md=self.md, w2t=self.write2textbox) else: tkinter.messagebox.showerror(title="参数错误", message="请检查对应参数是否填写正确!", ) def pre_warning(self): + if self.tabview.get() == 'Durable Action': + df = DataFrame(clibs.durable_data_current) + df.to_excel(clibs.durable_data_current_xlsx, index=False) + df = DataFrame(clibs.durable_data_current_max) + df.to_excel(clibs.durable_data_current_max_xlsx, index=False) + if tkinter.messagebox.askyesno(title="开始运行", message="确认机器已按照测试规范更新固件,并提按照测试机型前修改好工程?"): pass else: diff --git a/aio/code/automatic_test/__init__.py b/aio/code/automatic_test/__init__.py deleted file mode 100644 index f60ee0b..0000000 --- a/aio/code/automatic_test/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__all__ = ['openapi', 'btn_functions', 'do_brake', 'do_current'] \ No newline at end of file diff --git a/aio/code/automatic_test/btn_functions.py b/aio/code/automatic_test/btn_functions.py index 884a2b0..7ac7878 100644 --- a/aio/code/automatic_test/btn_functions.py +++ b/aio/code/automatic_test/btn_functions.py @@ -1,72 +1,55 @@ -from json import loads from sys import argv +from commons import clibs - -def validate_resp(_id, response, w2t): - match _id: - case 'DATA ERR': - w2t(f"数据处理错误,需要确认", 0, 4, 'red', tab_name='Automatic Test') - case 'DATA READ ERR': - w2t(f"无法读取数据,需要确认", 0, 3, 'red', tab_name='Automatic Test') - case 'NOT SUPPORT': - w2t(f"不支持的功能,需要确认", 0, 2, 'red', tab_name='Automatic Test') - if not response: - w2t(f"无法获取{id}请求的响应信息", 0, 1, 'red', tab_name='Automatic Test') - - -def execution(cmd, hr, w2t, **kwargs): - _id = hr.execution(cmd, **kwargs) - _msg = hr.get_from_id(_id) - if not _msg: - w2t(f"无法获取{_id}请求的响应信息", 0, 6, 'red', tab_name='Automatic Test') - else: - _response = loads(_msg) - validate_resp(_id, _response, w2t) - return _response +tab_name = clibs.tab_names['at'] +logger = clibs.log_prod def trigger_estop(md, w2t): md.trigger_estop() - w2t("触发急停成功,可点击机器状态验证。", 0, 0, 'green', 'Automatic Test') + w2t("触发急停成功,可点击机器状态验证。", 0, 0, 'green', tab_name) def reset_estop(md, w2t): md.reset_estop() - w2t("恢复急停成功,可点击机器状态验证。", 0, 0, 'green', 'Automatic Test') + w2t("恢复急停成功,可点击机器状态验证。", 0, 0, 'green', tab_name) def get_state(hr, w2t): # 获取机器状态 - _response = execution('state.get_state', hr, w2t) + _response = clibs.execution('state.get_state', hr, w2t, tab_name) stat_desc = {'engine': '上电状态', 'operate': '操作模式', 'rc_state': '控制器状态', 'robot_action': '机器人动作', 'safety_mode': '安全模式', 'servo_mode': '伺服工作模式', 'task_space': '工作任务空间'} for component, state in _response['data'].items(): - w2t(f"{stat_desc[component]}: {state}", tab_name='Automatic Test') + w2t(f"{stat_desc[component]}: {state}", tab_name=tab_name) # 获取设备伺服信息 - _response = execution('device.get_params', hr, w2t) + _response = clibs.execution('device.get_params', hr, w2t, tab_name) dev_desc = {0: '伺服版本', 1: '伺服参数', 2: '安全板固件', 3: '控制器', 4: '通讯总线', 5: '解释器', 6: '运动控制', 8: '力控版本', 9: '末端固件', 10: '机型文件', 11: '环境包'} dev_vers = {} for device in _response['data']['devices']: dev_vers[device['type']] = device['version'] for i in sorted(dev_desc.keys()): - w2t(f"{dev_desc[i]}: {dev_vers[i]}", tab_name='Automatic Test') + w2t(f"{dev_desc[i]}: {dev_vers[i]}", tab_name=tab_name) # 设置示教器模式 - _response = execution('state.set_tp_mode', hr, w2t, tp_mode='without') + _response = clibs.execution('state.set_tp_mode', hr, w2t, tab_name, tp_mode='without') def warning_info(hr, w2t): - for msg in hr.c_msg: - if 'alarm' in msg.lower(): - w2t(str(loads(msg)), tab_name='Automatic Test') - for msg in hr.c_msg_xs: - if 'alarm' in msg.lower(): - w2t(str(loads(msg)), tab_name='Automatic Test') + for postfix in ['', '.2', '.3', '.4', '.5', '.6', '.7', '.8', '.9', '.10']: + log_name = clibs.log_data_hmi + postfix + try: + with open(log_name, 'r', encoding='utf-8') as f_log: + for line in f_log: + if 'alarm' in line: + w2t(line.strip(), tab_name=tab_name) + except FileNotFoundError: + pass def main(hr, md, func, w2t): if hr is None: - w2t("无法连接机器人,检查是否已经使用Robot Assist软件连接机器,重试中...", 0, 49, 'red', tab_name='Automatic Test') + w2t("无法连接机器人,检查是否已经使用Robot Assist软件连接机器,重试中...", 0, 49, 'red', tab_name) # func: get_state/ match func: case 'trigger_estop': diff --git a/aio/code/automatic_test/do_brake.py b/aio/code/automatic_test/do_brake.py index 171310b..76a07e9 100644 --- a/aio/code/automatic_test/do_brake.py +++ b/aio/code/automatic_test/do_brake.py @@ -1,36 +1,20 @@ -from random import randint -from time import sleep, time +from time import sleep, time, strftime, localtime from sys import argv -from os import scandir, mkdir -from os.path import exists +from os import mkdir from paramiko import SSHClient, AutoAddPolicy from json import loads from openpyxl import load_workbook -import pandas +from pandas import DataFrame, concat +from commons import clibs -RADIAN = 57.3 # 180 / 3.1415926 - - -def traversal_files(path, w2t): - if not exists(path): - msg = f'数据文件夹{path}不存在,请确认后重试......' - w2t(msg, 0, 1, 'red', tab_name='Automatic Test') - else: - dirs = [] - files = [] - for item in scandir(path): - if item.is_dir(): - dirs.append(item.path) - elif item.is_file(): - files.append(item.path) - - return dirs, files +tab_name = clibs.tab_names['at'] +logger = clibs.log_prod def check_files(path, loadsel, data_dirs, data_files, w2t): if len(data_dirs) != 0 or len(data_files) != 5: - w2t('初始路径下不允许有文件夹,且初始路径下只能存在如下五个文件,确认后重新运行!', 0, 0, 'red', tab_name='Automatic Test') - w2t(' 1. configs.xlsx\n 2. reach33/reach66/reach100_xxxx.xlsx\n 3. xxxx.zip', 0, 1, 'red', tab_name='Automatic Test') + w2t('初始路径下不允许有文件夹,且初始路径下只能存在如下五个文件,确认后重新运行!', 0, 0, 'red', tab_name) + w2t(' 1. configs.xlsx\n 2. reach33/reach66/reach100_xxxx.xlsx\n 3. xxxx.zip', 0, 1, 'red', tab_name) config_file = reach33 = reach66 = reach100 = prj_file = None for data_file in data_files: @@ -46,8 +30,8 @@ def check_files(path, loadsel, data_dirs, data_files, w2t): elif filename.endswith('.zip'): prj_file = data_file else: - w2t('初始路径下不允许有文件夹,且初始路径下只能存在如下五个文件,确认后重新运行!', 0, 0, 'red', tab_name='Automatic Test') - w2t(' 1. configs.xlsx\n 2. reach33/reach66/reach100_xxxx.xlsx\n 3. xxxx.zip', 0, 2, 'red', tab_name='Automatic Test') + w2t('初始路径下不允许有文件夹,且初始路径下只能存在如下五个文件,确认后重新运行!', 0, 0, 'red', tab_name) + w2t(' 1. configs.xlsx\n 2. reach33/reach66/reach100_xxxx.xlsx\n 3. xxxx.zip', 0, 2, 'red', tab_name) if config_file and reach33 and reach66 and reach100 and prj_file: result_dirs = [] @@ -65,74 +49,24 @@ def check_files(path, loadsel, data_dirs, data_files, w2t): if _reach == 'reach100': mkdir(f"{path}\\j3\\{dir_name}") - w2t("数据目录合规性检查结束,未发现问题......", tab_name='Automatic Test') + w2t("数据目录合规性检查结束,未发现问题......", 0, 0, 'blue', tab_name) return config_file, reach33, reach66, reach100, prj_file, result_dirs else: - w2t('初始路径下不允许有文件夹,且初始路径下只能存在如下五个文件,确认后重新运行!', 0, 0, 'red', tab_name='Automatic Test') - w2t(' 1. configs.xlsx\n 2. reach33/reach66/reach100_xxxx.xlsx\n 3. xxxx.zip', 0, 1, 'red', tab_name='Automatic Test') - - -def prj_to_xcore(prj_file): - ssh = SSHClient() - ssh.set_missing_host_key_policy(AutoAddPolicy()) - ssh.connect('192.168.0.160', 22, username='luoshi', password='luoshi2019') - sftp = ssh.open_sftp() - sftp.put(prj_file, '/tmp/target.zip') - cmd = 'cd /tmp; rm -rf target/; mkdir target; unzip -d target/ -q target.zip; ' - cmd += 'chmod 777 -R target/; rm target.zip' - ssh.exec_command(cmd) - - cmd = 'sudo rm -rf /home/luoshi/bin/controller/projects/target; ' - cmd += 'sudo mv /tmp/target/ /home/luoshi/bin/controller/projects/' - stdin, stdout, stderr = ssh.exec_command(cmd, get_pty=True) - stdin.write('luoshi2019' + '\n') - stdin.flush() - print(stdout.read().decode()) # 必须得输出一下stdout,才能正确执行sudo - print(stderr.read().decode()) # 顺便也执行以下stderr - - _prj_name = prj_file.split('\\')[-1].removesuffix('.zip') - cmd = 'cd /home/luoshi/bin/controller/; ' - cmd += f'sudo mv projects/target/_build/{_prj_name}.prj projects/target/_build/target.prj' - stdin, stdout, stderr = ssh.exec_command(cmd, get_pty=True) - stdin.write('luoshi2019' + '\n') - stdin.flush() - print(stdout.read().decode()) # 必须得输出一下stdout,才能正确执行sudo - print(stderr.read().decode()) # 顺便也执行以下stderr - ssh.close() - - -def validate_resp(_id, response, w2t): - match _id: - case 'DATA ERR': - w2t(f"数据处理错误,需要确认", 0, 4, 'red', tab_name='Automatic Test') - case 'DATA READ ERR': - w2t(f"无法读取数据,需要确认", 0, 3, 'red', tab_name='Automatic Test') - case 'NOT SUPPORT': - w2t(f"不支持的功能,需要确认", 0, 2, 'red', tab_name='Automatic Test') - if not response: - w2t(f"无法获取{id}请求的响应信息", 0, 1, 'red', tab_name='Automatic Test') - - -def execution(cmd, hr, w2t, **kwargs): - _id = hr.execution(cmd, **kwargs) - _msg = hr.get_from_id(_id) - if not _msg: - w2t(f"无法获取{_id}请求的响应信息", 0, 6, 'red', tab_name='Automatic Test') - else: - _response = loads(_msg) - validate_resp(_id, _response, w2t) - return _response + w2t('初始路径下不允许有文件夹,且初始路径下只能存在如下五个文件,确认后重新运行!', 0, 0, 'red', tab_name) + w2t(' 1. configs.xlsx\n 2. reach33/reach66/reach100_xxxx.xlsx\n 3. xxxx.zip', 0, 1, 'red', tab_name) def gen_result_file(path, curve_data, axis, _reach, _load, _speed, count): _d2d_vel = {'hw_joint_vel_feedback': []} _d2d_trq = {'device_servo_trq_feedback': []} _d2d_stop = {'device_safety_estop': []} - for data in curve_data: + for data in curve_data[-240:]: # 保留最后12s的数据 dict_results = data['data'] - # dict_results.reverse() for item in dict_results: - item['value'].reverse() + try: + item['value'].reverse() + except KeyError: + continue if item.get('channel', None) == axis-1 and item.get('name', None) == 'hw_joint_vel_feedback': _d2d_vel['hw_joint_vel_feedback'].extend(item['value']) elif item.get('channel', None) == axis-1 and item.get('name', None) == 'device_servo_trq_feedback': @@ -140,17 +74,17 @@ def gen_result_file(path, curve_data, axis, _reach, _load, _speed, count): elif item.get('channel', None) == 0 and item.get('name', None) == 'device_safety_estop': _d2d_stop['device_safety_estop'].extend(item['value']) - df1 = pandas.DataFrame.from_dict(_d2d_vel) - df2 = pandas.DataFrame.from_dict(_d2d_trq) - df3 = pandas.DataFrame.from_dict(_d2d_stop) - df = pandas.concat([df1, df2, df3], axis=1) + df1 = DataFrame.from_dict(_d2d_vel) + df2 = DataFrame.from_dict(_d2d_trq) + df3 = DataFrame.from_dict(_d2d_stop) + df = concat([df1, df2, df3], axis=1) _filename = f"{path}\\j{axis}\\reach{_reach}_load{_load}_speed{_speed}\\reach{_reach}_load{_load}_speed{_speed}_{count}.data" df.to_csv(_filename, sep='\t', index=False) -def run_rl(path, loadsel, hr, md, config_file, prj_file, result_dirs, w2t): +def run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t): _count = 0 - speed_max = 0 + _total = 63 display_pdo_params = [ {"name": "hw_joint_vel_feedback", "channel": 0}, {"name": "hw_joint_vel_feedback", "channel": 1}, @@ -168,168 +102,195 @@ def run_rl(path, loadsel, hr, md, config_file, prj_file, result_dirs, w2t): ] wb = load_workbook(config_file, read_only=True) ws = wb['Target'] - if ws.cell(row=1, column=1).value == 'positive': - md.write_pon(True) - elif ws.cell(row=1, column=1).value == 'negative': - md.write_pon(False) - else: - w2t("configs.xlsx中Target页面A1单元格填写不正确,检查后重新运行...", 0, 111, 'red', 'Automatic Test') + write_diagnosis = float(ws.cell(row=3, column=10).value) + get_init_speed = float(ws.cell(row=4, column=10).value) + single_brake = str(ws.cell(row=5, column=10).value) + logger.info(f"write_diagnosis = {write_diagnosis}, get_init_speed = {get_init_speed}, single_brake = {single_brake}") + if ws.cell(row=1, column=1).value == 'positive': + md.write_pon(1) + elif ws.cell(row=1, column=1).value == 'negative': + md.write_pon(0) + else: + w2t("configs.xlsx中Target页面A1单元格填写不正确,检查后重新运行...", 0, 111, 'red', tab_name) + + clibs.execution('diagnosis.open', hr, w2t, tab_name, open=True, display_open=True) + clibs.execution('diagnosis.set_params', hr, w2t, tab_name, display_pdo_params=display_pdo_params) for condition in result_dirs: _reach = condition.split('_')[0].removeprefix('reach') _load = condition.split('_')[1].removeprefix('load') _speed = condition.split('_')[2].removeprefix('speed') + # for single condition test + _single_axis = 0 + if single_brake != '0': + _total = 3 + _single_axis = int(single_brake.split('-')[0]) + if _reach != single_brake.split('-')[1] or _load != single_brake.split('-')[2] or _speed != single_brake.split('-')[3]: + continue + for axis in range(1, 4): + # for single condition test + if _single_axis != 0 and _single_axis != axis: + continue + md.write_axis(axis) speed_max = 0 if axis == 3 and _reach != '100': continue + + w2t(f"-"*90, 0, 0, 'purple', tab_name) + for count in range(1, 4): _count += 1 - w2t(f"[{_count}/63-{count}] 正在执行{axis}轴{condition}的制动测试......", 0, 0, 'purple', 'Automatic Test') + this_time = strftime("%Y-%m-%d %H:%M:%S", localtime(time())) + prj_path = 'target/_build/target.prj' + w2t(f"[{this_time} | {_count}/{_total}] 正在执行 {axis} 轴 {condition} 的第 {count} 次制动测试...", 0, 0, 'purple', tab_name) # 1. 关闭诊断曲线,触发软急停,并解除,目的是让可能正在运行着的机器停下来,切手动模式并下电 md.trigger_estop() md.reset_estop() - md.write_act(False) - _response = execution('diagnosis.open', hr, w2t, open=False, display_open=False) - sleep(1) # 让曲线彻底关闭 - _response = execution('state.switch_manual', hr, w2t) - _response = execution('state.switch_motor_off', hr, w2t) + md.clear_alarm() + md.write_act(0) + sleep(write_diagnosis) # 软急停超差后,等待写诊断时间,可通过configs.xlsx配置 - # 2. 修改未要执行的场景 - ssh = SSHClient() - ssh.set_missing_host_key_policy(AutoAddPolicy()) - ssh.connect('192.168.0.160', 22, username='luoshi', password='luoshi2019') - if ws.cell(row=1, column=1).value == 'positive': - _rl_cmd = f"brake_E(j{axis}_{_reach}_p, j{axis}_{_reach}_n, p_speed, p_tool)" - elif ws.cell(row=1, column=1).value == 'negative': - _rl_cmd = f"brake_E(j{axis}_{_reach}_n, j{axis}_{_reach}_p, p_speed, p_tool)" - else: - w2t("configs.xlsx中Target页面A1单元格填写不正确,检查后重新运行...", 0, 111, 'red', 'Automatic Test') - _rl_speed = f"VelSet {_speed}" - cmd = 'cd /home/luoshi/bin/controller/; ' - cmd += 'sudo sed -i "/brake_E/d" projects/target/_build/brake/main.mod; ' - cmd += f'sudo sed -i "/DONOTDELETE/i {_rl_cmd}" projects/target/_build/brake/main.mod; ' - cmd += 'sudo sed -i "/VelSet/d" projects/target/_build/brake/main.mod; ' - cmd += f'sudo sed -i "/MoveAbsJ/i {_rl_speed}" projects/target/_build/brake/main.mod' - stdin, stdout, stderr = ssh.exec_command(cmd, get_pty=True) - stdin.write('luoshi2019' + '\n') - stdin.flush() - print(stdout.read().decode()) # 必须得输出一下stdout,才能正确执行sudo - print(stderr.read().decode()) # 顺便也执行以下stderr - - # 3. reload工程后,pp2main,并且自动模式和上电,最后运行程序 - prj_path = 'target/_build/target.prj' - _response = execution('overview.reload', hr, w2t, prj_path=prj_path, tasks=['brake', 'stop0_related']) - _response = execution('rl_task.pp_to_main', hr, w2t, tasks=['brake', 'stop0_related']) - _response = execution('state.switch_auto', hr, w2t) - _response = execution('state.switch_motor_on', hr, w2t) - _response = execution('rl_task.run', hr, w2t, tasks=['brake', 'stop0_related']) - for i in range(3): - if md.read_ready_to_go() == 1: - md.write_act(True) - break + while count == 1: + # 2. 修改未要执行的场景 + ssh = SSHClient() + ssh.set_missing_host_key_policy(AutoAddPolicy()) + ssh.connect('192.168.0.160', 22, username='luoshi', password='luoshi2019') + if ws.cell(row=1, column=1).value == 'positive': + _rl_cmd = f"brake_E(j{axis}_{_reach}_p, j{axis}_{_reach}_n, p_speed, p_tool)" + elif ws.cell(row=1, column=1).value == 'negative': + _rl_cmd = f"brake_E(j{axis}_{_reach}_n, j{axis}_{_reach}_p, p_speed, p_tool)" else: - sleep(1) - else: - w2t("未收到机器人的运行信号,需要确认RL程序编写正确并正常执行...", 0, 111, 'red', 'Automatic Test') + w2t("configs.xlsx中Target页面A1单元格填写不正确,检查后重新运行...", 0, 111, 'red', tab_name) + _rl_speed = f"VelSet {_speed}" + _rl_tool = f"tool p_tool = tool{loadsel.removeprefix('tool')}" + cmd = 'cd /home/luoshi/bin/controller/; ' + cmd += 'sudo sed -i "/brake_E/d" projects/target/_build/brake/main.mod; ' + cmd += f'sudo sed -i "/DONOTDELETE/i {_rl_cmd}" projects/target/_build/brake/main.mod; ' + cmd += 'sudo sed -i "/VelSet/d" projects/target/_build/brake/main.mod; ' + cmd += f'sudo sed -i "/MoveAbsJ/i {_rl_speed}" projects/target/_build/brake/main.mod; ' + cmd += 'sudo sed -i "/tool p_tool/d" projects/target/_build/brake/main.mod; ' + cmd += f'sudo sed -i "/VelSet/i {_rl_tool}" projects/target/_build/brake/main.mod; ' + stdin, stdout, stderr = ssh.exec_command(cmd, get_pty=True) + stdin.write('luoshi2019' + '\n') + stdout.read().decode() # 需要read一下才能正常执行 + stderr.read().decode() - # 4. 第一次打开诊断曲线,并执行采集8s,之后触发软急停,关闭曲线采集,找出最大速度,传递给RL程序,最后清除相关记录 - if count == 1: - _response = execution('diagnosis.open', hr, w2t, open=True, display_open=True) - _response = execution('diagnosis.set_params', hr, w2t, display_pdo_params=display_pdo_params) - sleep(10) # 前10秒获取实际最大速度 - - md.trigger_estop() - _response = execution('diagnosis.open', hr, w2t, open=False, display_open=False) + # 3. reload工程后,pp2main,并且自动模式和上电,最后运行程序 + clibs.execution('overview.reload', hr, w2t, tab_name, prj_path=prj_path, tasks=['brake', 'stop0_related']) + clibs.execution('rl_task.pp_to_main', hr, w2t, tab_name, tasks=['brake', 'stop0_related']) + clibs.execution('state.switch_auto', hr, w2t, tab_name) + clibs.execution('state.switch_motor_on', hr, w2t, tab_name) + clibs.execution('rl_task.run', hr, w2t, tab_name, tasks=['brake', 'stop0_related']) + _t_start = time() + while True: + if md.read_ready_to_go() == 1: + md.write_act(True) + break + else: + if (time() - _t_start) // 20 > 1: + w2t("20s内未收到机器人的运行信号,需要确认RL程序编写正确并正常执行...", 0, 111, 'red', tab_name) + else: + sleep(1) + # 4. 找出最大速度,传递给RL程序,最后清除相关记录 + sleep(get_init_speed+5) # 冗余5s,指定时间后获取实际【正|负】方向的最大速度,可通过configs.xlsx配置 + clibs.execution('rl_task.stop', hr, w2t, tab_name, tasks=['brake']) # 找出最大速度 - for _msg in hr.c_msg: + _c_msg = hr.c_msg.copy() + _number = 0 + for _msg in _c_msg: + if _number > get_init_speed*20: # 最开始回零点的时候,二轴速度可以达到最大值,实际摆动时,某一方向可能达不到 + break if 'diagnosis.result' in _msg: + _number += 1 dict_results = loads(_msg)['data'] for item in dict_results: if item.get('channel', None) == axis-1 and item.get('name', None) == 'hw_joint_vel_feedback': - _ = abs(RADIAN*sum(item['value'])/len(item['value'])) - speed_max = max(_, speed_max) + _ = clibs.RADIAN * sum(item['value']) / len(item['value']) + if ws.cell(row=1, column=1).value == 'positive': + speed_max = max(_, speed_max) + elif ws.cell(row=1, column=1).value == 'negative': + speed_max = min(_, speed_max) + logger.info(f"speed max = {speed_max}") + speed_max = abs(speed_max) speed_target = float(ws.cell(row=3, column=axis+1).value) * float(_speed) / 100 if speed_max < speed_target*0.95 or speed_max > speed_target*1.05: - w2t(f"Axis: {axis}-{count} | Speed: {speed_max} | Shouldbe: {speed_target}", 0, 0, 'indigo', 'Automatic Test') + w2t(f"Axis: {axis}-{count} | Speed: {speed_max} | Shouldbe: {speed_target}", 0, 0, 'indigo', tab_name) md.write_speed_max(speed_max) - sleep(1) - for _msg in hr.c_msg: - if 'diagnosis.result' in _msg: - _index = hr.c_msg.index(_msg) - del hr.c_msg[_index:] - hr.c_msg_xs.clear() - break + hr.c_msg_xs.clear() + if len(hr.c_msg) > 270: + del hr.c_msg[270:] + + if speed_max < 10: + md.clear_alarm() + w2t("未获取到正确的速度,即将重新获取...", 0, 0, 'red', tab_name) + continue + else: + break # 5. 清除软急停,重新运行程序,并打开曲线发送继续运动信号,当速度达到最大值时,通过DO触发急停 - md.reset_estop() - _response = execution('overview.reload', hr, w2t, prj_path=prj_path, tasks=['brake', 'stop0_related']) - _response = execution('rl_task.pp_to_main', hr, w2t, tasks=['brake', 'stop0_related']) - _response = execution('state.switch_auto', hr, w2t) - _response = execution('state.switch_motor_on', hr, w2t) - _response = execution('rl_task.run', hr, w2t, tasks=['brake', 'stop0_related']) + md.reset_estop() # 其实没必要 + md.clear_alarm() + + clibs.execution('overview.reload', hr, w2t, tab_name, prj_path=prj_path, tasks=['brake', 'stop0_related']) + clibs.execution('rl_task.pp_to_main', hr, w2t, tab_name, tasks=['brake', 'stop0_related']) + clibs.execution('state.switch_auto', hr, w2t, tab_name) + clibs.execution('state.switch_motor_on', hr, w2t, tab_name) + clibs.execution('rl_task.run', hr, w2t, tab_name, tasks=['brake', 'stop0_related']) for i in range(3): if md.read_ready_to_go() == 1: - md.write_act(True) + md.write_act(1) break else: sleep(1) else: - w2t("未收到机器人的运行信号,需要确认RL程序编写正确并正常执行...", 0, 111, 'red', 'Automatic Test') + w2t("未收到机器人的运行信号,需要确认RL程序编写正确并正常执行...", 0, 111, 'red', tab_name) - _response = execution('diagnosis.open', hr, w2t, open=True, display_open=True) - _response = execution('diagnosis.set_params', hr, w2t, display_pdo_params=display_pdo_params) - sleep(randint(3, 6)) - md.write_probe(True) + sleep(10) # 排除从其他位姿到零点位姿,再到轴极限位姿的时间 + md.write_probe(1) _t_start = time() while True: if md.read_brake_done() == 1: - sleep(1) # 保证所有数据均已返回 - md.write_probe(False) - _response = execution('diagnosis.open', hr, w2t, open=False, display_open=False) - sleep(1) # 保证所有数据均已返回 + sleep(1) # 保证速度归零 + md.write_probe(0) break else: if (time() - _t_start) > 30: - w2t(f"30s内未触发急停,该条数据无效,需要确认RL/Python程序编写正确并正常执行,或者判别是否是机器本体问题...", 0, 0, 'red', 'Automatic Test') - md.write_probe(False) - _response = execution('diagnosis.open', hr, w2t, open=False, display_open=False) - sleep(1) # 保证所有数据均已返回 + w2t(f"30s内未触发急停,该条数据无效,需要确认RL/Python程序编写正确并正常执行,或者判别是否是机器本体问题,比如正负方向速度是否一致...", 0, 0, 'red', tab_name) + md.write_probe(0) break else: sleep(1) # 6. 保留数据并处理输出 curve_data = [] - for _msg in hr.c_msg: + _c_msg = hr.c_msg.copy() + for _msg in _c_msg: if 'diagnosis.result' in _msg: curve_data.insert(0, loads(_msg)) else: - for _msg in hr.c_msg: - if 'diagnosis.result' in _msg: - _index = hr.c_msg.index(_msg) - del hr.c_msg[_index:] - hr.c_msg_xs.clear() - break + hr.c_msg_xs.clear() + if len(hr.c_msg) > 270: + del hr.c_msg[270:] gen_result_file(path, curve_data, axis, _reach, _load, _speed, count) else: - w2t(f"\n{loadsel.removeprefix('tool')}%负载的制动性能测试执行完毕,如需采集其他负载,须切换负载类型,并更换其他负载,重新执行。", 0, 0, 'green', 'Automatic Test') + w2t(f"\n{loadsel.removeprefix('tool')}%负载的制动性能测试执行完毕,如需采集其他负载,须切换负载类型,并更换其他负载,重新执行。", 0, 0, 'green', tab_name) def main(path, hr, md, loadsel, w2t): _s_time = time() - data_dirs, data_files = traversal_files(path, w2t) + data_dirs, data_files = clibs.traversal_files(path, w2t) config_file, reach33, reach66, reach100, prj_file, result_dirs = check_files(path, loadsel, data_dirs, data_files, w2t) - prj_to_xcore(prj_file) - run_rl(path, loadsel, hr, md, config_file, prj_file, result_dirs, w2t) + clibs.prj_to_xcore(prj_file) + run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t) _e_time = time() time_total = _e_time - _s_time - w2t(f"处理总时长:{time_total // 3600:02.0f} h {time_total % 3600 // 60:02.0f} m {time_total % 60:02.0f} s", 0, 0, 'green', 'Automatic Test') + w2t(f"处理总时长:{time_total // 3600:02.0f} h {time_total % 3600 // 60:02.0f} m {time_total % 60:02.0f} s", 0, 0, 'green', tab_name) if __name__ == '__main__': diff --git a/aio/code/automatic_test/do_current.py b/aio/code/automatic_test/do_current.py index 8c81968..0d15ab8 100644 --- a/aio/code/automatic_test/do_current.py +++ b/aio/code/automatic_test/do_current.py @@ -1,33 +1,33 @@ -import os +from os import mkdir from time import sleep, time from sys import argv -from os import scandir -from os.path import exists from paramiko import SSHClient, AutoAddPolicy from json import loads -import pandas +from pandas import DataFrame, concat +from commons import clibs - -def traversal_files(path, w2t): - if not exists(path): - msg = f'数据文件夹{path}不存在,请确认后重试......' - w2t(msg, 0, 1, 'red', tab_name='Automatic Test') - else: - dirs = [] - files = [] - for item in scandir(path): - if item.is_dir(): - dirs.append(item.path) - elif item.is_file(): - files.append(item.path) - - return dirs, files +logger = clibs.log_prod +tab_name = clibs.tab_names['at'] +display_pdo_params = [ + {"name": "hw_joint_vel_feedback", "channel": 0}, + {"name": "hw_joint_vel_feedback", "channel": 1}, + {"name": "hw_joint_vel_feedback", "channel": 2}, + {"name": "hw_joint_vel_feedback", "channel": 3}, + {"name": "hw_joint_vel_feedback", "channel": 4}, + {"name": "hw_joint_vel_feedback", "channel": 5}, + {"name": "device_servo_trq_feedback", "channel": 0}, + {"name": "device_servo_trq_feedback", "channel": 1}, + {"name": "device_servo_trq_feedback", "channel": 2}, + {"name": "device_servo_trq_feedback", "channel": 3}, + {"name": "device_servo_trq_feedback", "channel": 4}, + {"name": "device_servo_trq_feedback", "channel": 5}, +] def check_files(path, loadsel, data_dirs, data_files, w2t): if len(data_dirs) != 0 or len(data_files) != 3: - w2t('初始路径下不允许有文件夹,且初始路径下只能存在如下三个文件,确认后重新运行!', 0, 0, 'red', tab_name='Automatic Test') - w2t(' 1. configs.xlsx\n 2. T_电机电流.xlsx\n 3. xxxx.zip', 0, 1, 'red', tab_name='Automatic Test') + w2t('初始路径下不允许有文件夹,且初始路径下只能存在如下三个文件,确认后重新运行!', 0, 0, 'red', tab_name) + w2t(' 1. configs.xlsx\n 2. T_电机电流.xlsx\n 3. xxxx.zip', 0, 1, 'red', tab_name) config_file = current_file = prj_file = None for data_file in data_files: @@ -39,74 +39,22 @@ def check_files(path, loadsel, data_dirs, data_files, w2t): elif filename.endswith('.zip'): prj_file = data_file else: - w2t('初始路径下不允许有文件夹,且初始路径下只能存在如下三个文件,确认后重新运行!', 0, 0, 'red', tab_name='Automatic Test') - w2t(' 1. configs.xlsx\n 2. T_电机电流.xlsx\n 3. xxxx.zip', 0, 1, 'red', tab_name='Automatic Test') + w2t('初始路径下不允许有文件夹,且初始路径下只能存在如下三个文件,确认后重新运行!', 0, 0, 'red', tab_name) + w2t(' 1. configs.xlsx\n 2. T_电机电流.xlsx\n 3. xxxx.zip', 0, 1, 'red', tab_name) if config_file and current_file and prj_file: - w2t("数据目录合规性检查结束,未发现问题......", tab_name='Automatic Test') + w2t("数据目录合规性检查结束,未发现问题......", tab_name=tab_name) if loadsel == 'tool100': - os.mkdir(f"{path}\\single") - os.mkdir(f"{path}\\s_1") - os.mkdir(f"{path}\\s_2") - os.mkdir(f"{path}\\s_3") + mkdir(f"{path}\\single") + mkdir(f"{path}\\s_1") + mkdir(f"{path}\\s_2") + mkdir(f"{path}\\s_3") elif loadsel == 'inertia': - os.mkdir(f"{path}\\inertia") + mkdir(f"{path}\\inertia") return config_file, current_file, prj_file else: - w2t('初始路径下不允许有文件夹,且初始路径下只能存在如下三个文件,确认后重新运行!', 0, 0, 'red', tab_name='Automatic Test') - w2t(' 1. configs.xlsx\n 2. T_电机电流.xlsx\n 3. xxxx.zip', 0, 1, 'red', tab_name='Automatic Test') - - -def prj_to_xcore(prj_file): - ssh = SSHClient() - ssh.set_missing_host_key_policy(AutoAddPolicy()) - ssh.connect('192.168.0.160', 22, username='luoshi', password='luoshi2019') - sftp = ssh.open_sftp() - sftp.put(prj_file, '/tmp/target.zip') - cmd = 'cd /tmp; rm -rf target/; mkdir target; unzip -d target/ -q target.zip; ' - cmd += 'chmod 777 -R target/; rm target.zip' - ssh.exec_command(cmd) - - cmd = 'sudo rm -rf /home/luoshi/bin/controller/projects/target; ' - cmd += 'sudo mv /tmp/target/ /home/luoshi/bin/controller/projects/' - stdin, stdout, stderr = ssh.exec_command(cmd, get_pty=True) - stdin.write('luoshi2019' + '\n') - stdin.flush() - print(stdout.read().decode()) # 必须得输出一下stdout,才能正确执行sudo - print(stderr.read().decode()) # 顺便也执行以下stderr - - _prj_name = prj_file.split('\\')[-1].removesuffix('.zip') - cmd = 'cd /home/luoshi/bin/controller/; ' - cmd += f'sudo mv projects/target/_build/{_prj_name}.prj projects/target/_build/target.prj' - stdin, stdout, stderr = ssh.exec_command(cmd, get_pty=True) - stdin.write('luoshi2019' + '\n') - stdin.flush() - print(stdout.read().decode()) # 必须得输出一下stdout,才能正确执行sudo - print(stderr.read().decode()) # 顺便也执行以下stderr - ssh.close() - - -def validate_resp(_id, response, w2t): - match _id: - case 'DATA ERR': - w2t(f"数据处理错误,需要确认", 0, 4, 'red', tab_name='Automatic Test') - case 'DATA READ ERR': - w2t(f"无法读取数据,需要确认", 0, 3, 'red', tab_name='Automatic Test') - case 'NOT SUPPORT': - w2t(f"不支持的功能,需要确认", 0, 2, 'red', tab_name='Automatic Test') - if not response: - w2t(f"无法获取{id}请求的响应信息", 0, 1, 'red', tab_name='Automatic Test') - - -def execution(cmd, hr, w2t, **kwargs): - _id = hr.execution(cmd, **kwargs) - _msg = hr.get_from_id(_id) - if not _msg: - w2t(f"无法获取{_id}请求的响应信息", 0, 7, 'red', tab_name='Automatic Test') - else: - _response = loads(_msg) - validate_resp(_id, _response, w2t) - return _response + w2t('初始路径下不允许有文件夹,且初始路径下只能存在如下三个文件,确认后重新运行!', 0, 0, 'red', tab_name) + w2t(' 1. configs.xlsx\n 2. T_电机电流.xlsx\n 3. xxxx.zip', 0, 1, 'red', tab_name) def data_proc_regular(path, filename, channel, scenario_time): @@ -115,21 +63,22 @@ def data_proc_regular(path, filename, channel, scenario_time): lines = f_obj.readlines() _d2d_vel = {'hw_joint_vel_feedback': []} _d2d_trq = {'device_servo_trq_feedback': []} - for line in lines: + for line in lines[-500:]: # 保留最后25s的数据 data = eval(line.strip())['data'] for item in data: - item['value'].reverse() - if item.get('channel', None) == channel and item.get('name', None) == 'hw_joint_vel_feedback': + try: item['value'].reverse() + except KeyError: + continue + if item.get('channel', None) == channel and item.get('name', None) == 'hw_joint_vel_feedback': _d2d_vel['hw_joint_vel_feedback'].extend(item['value']) elif item.get('channel', None) == channel and item.get('name', None) == 'device_servo_trq_feedback': - item['value'].reverse() _d2d_trq['device_servo_trq_feedback'].extend(item['value']) - df1 = pandas.DataFrame.from_dict(_d2d_vel) - df2 = pandas.DataFrame.from_dict(_d2d_trq) - df = pandas.concat([df1, df2], axis=1) - _filename = f'{path}\\single\\j{channel+1}_single.data' + df1 = DataFrame.from_dict(_d2d_vel) + df2 = DataFrame.from_dict(_d2d_trq) + df = concat([df1, df2], axis=1) + _filename = f'{path}\\single\\j{channel+1}_single_{time()}.data' df.to_csv(_filename, sep='\t', index=False) elif channel in list(range(6, 9)): with open(filename, 'r', encoding='utf-8') as f_obj: @@ -149,7 +98,10 @@ def data_proc_regular(path, filename, channel, scenario_time): for line in lines: data = eval(line.strip())['data'] for item in data: - item['value'].reverse() + try: + item['value'].reverse() + except KeyError: + continue if item.get('channel', None) == 0 and item.get('name', None) == 'hw_joint_vel_feedback': _d2d_vel_0['hw_joint_vel_feedback'].extend(item['value']) elif item.get('channel', None) == 0 and item.get('name', None) == 'device_servo_trq_feedback': @@ -175,59 +127,62 @@ def data_proc_regular(path, filename, channel, scenario_time): elif item.get('channel', None) == 5 and item.get('name', None) == 'device_servo_trq_feedback': _d2d_trq_5['device_servo_trq_feedback'].extend(item['value']) - df_01 = pandas.DataFrame.from_dict(_d2d_vel_0) - df_02 = pandas.DataFrame.from_dict(_d2d_trq_0) - df = pandas.concat([df_01, df_02], axis=1) - _filename = f'{path}\\s_{channel-5}\\j1_s_{channel-5}_{scenario_time}.data' + df_01 = DataFrame.from_dict(_d2d_vel_0) + df_02 = DataFrame.from_dict(_d2d_trq_0) + df = concat([df_01, df_02], axis=1) + _filename = f'{path}\\s_{channel-5}\\j1_s_{channel-5}_{scenario_time}_{time()}.data' df.to_csv(_filename, sep='\t', index=False) - df_01 = pandas.DataFrame.from_dict(_d2d_vel_1) - df_02 = pandas.DataFrame.from_dict(_d2d_trq_1) - df = pandas.concat([df_01, df_02], axis=1) - _filename = f'{path}\\s_{channel-5}\\j2_s_{channel-5}_{scenario_time}.data' + df_01 = DataFrame.from_dict(_d2d_vel_1) + df_02 = DataFrame.from_dict(_d2d_trq_1) + df = concat([df_01, df_02], axis=1) + _filename = f'{path}\\s_{channel-5}\\j2_s_{channel-5}_{scenario_time}_{time()}.data' df.to_csv(_filename, sep='\t', index=False) - df_01 = pandas.DataFrame.from_dict(_d2d_vel_2) - df_02 = pandas.DataFrame.from_dict(_d2d_trq_2) - df = pandas.concat([df_01, df_02], axis=1) - _filename = f'{path}\\s_{channel-5}\\j3_s_{channel-5}_{scenario_time}.data' + df_01 = DataFrame.from_dict(_d2d_vel_2) + df_02 = DataFrame.from_dict(_d2d_trq_2) + df = concat([df_01, df_02], axis=1) + _filename = f'{path}\\s_{channel-5}\\j3_s_{channel-5}_{scenario_time}_{time()}.data' df.to_csv(_filename, sep='\t', index=False) - df_01 = pandas.DataFrame.from_dict(_d2d_vel_3) - df_02 = pandas.DataFrame.from_dict(_d2d_trq_3) - df = pandas.concat([df_01, df_02], axis=1) - _filename = f'{path}\\s_{channel-5}\\j4_s_{channel-5}_{scenario_time}.data' + df_01 = DataFrame.from_dict(_d2d_vel_3) + df_02 = DataFrame.from_dict(_d2d_trq_3) + df = concat([df_01, df_02], axis=1) + _filename = f'{path}\\s_{channel-5}\\j4_s_{channel-5}_{scenario_time}_{time()}.data' df.to_csv(_filename, sep='\t', index=False) - df_01 = pandas.DataFrame.from_dict(_d2d_vel_4) - df_02 = pandas.DataFrame.from_dict(_d2d_trq_4) - df = pandas.concat([df_01, df_02], axis=1) - _filename = f'{path}\\s_{channel-5}\\j5_s_{channel-5}_{scenario_time}.data' + df_01 = DataFrame.from_dict(_d2d_vel_4) + df_02 = DataFrame.from_dict(_d2d_trq_4) + df = concat([df_01, df_02], axis=1) + _filename = f'{path}\\s_{channel-5}\\j5_s_{channel-5}_{scenario_time}_{time()}.data' df.to_csv(_filename, sep='\t', index=False) - df_01 = pandas.DataFrame.from_dict(_d2d_vel_5) - df_02 = pandas.DataFrame.from_dict(_d2d_trq_5) - df = pandas.concat([df_01, df_02], axis=1) - _filename = f'{path}\\s_{channel-5}\\j6_s_{channel-5}_{scenario_time}.data' + df_01 = DataFrame.from_dict(_d2d_vel_5) + df_02 = DataFrame.from_dict(_d2d_trq_5) + df = concat([df_01, df_02], axis=1) + _filename = f'{path}\\s_{channel-5}\\j6_s_{channel-5}_{scenario_time}_{time()}.data' df.to_csv(_filename, sep='\t', index=False) elif channel in list(range(9, 15)): with open(filename, 'r', encoding='utf-8') as f_obj: lines = f_obj.readlines() _d2d_vel = {'hw_joint_vel_feedback': []} _d2d_trq = {'device_servo_trq_feedback': []} - for line in lines: + for line in lines[-300:]: # 保留最后15s的数据 data = eval(line.strip())['data'] for item in data: - item['value'].reverse() + try: + item['value'].reverse() + except KeyError: + continue if item.get('channel', None) == channel-9 and item.get('name', None) == 'hw_joint_vel_feedback': _d2d_vel['hw_joint_vel_feedback'].extend(item['value']) elif item.get('channel', None) == channel-9 and item.get('name', None) == 'device_servo_trq_feedback': _d2d_trq['device_servo_trq_feedback'].extend(item['value']) - df1 = pandas.DataFrame.from_dict(_d2d_vel) - df2 = pandas.DataFrame.from_dict(_d2d_trq) - df = pandas.concat([df1, df2], axis=1) - _filename = f'{path}\\single\\j{channel-8}_hold.data' + df1 = DataFrame.from_dict(_d2d_vel) + df2 = DataFrame.from_dict(_d2d_trq) + df = concat([df1, df2], axis=1) + _filename = f'{path}\\single\\j{channel-8}_hold_{time()}.data' df.to_csv(_filename, sep='\t', index=False) @@ -239,16 +194,19 @@ def data_proc_inertia(path, filename, channel): for line in lines: data = eval(line.strip())['data'] for item in data: - item['value'].reverse() + try: + item['value'].reverse() + except KeyError: + continue if item.get('channel', None) == channel+3 and item.get('name', None) == 'hw_joint_vel_feedback': _d2d_vel['hw_joint_vel_feedback'].extend(item['value']) elif item.get('channel', None) == channel+3 and item.get('name', None) == 'device_servo_trq_feedback': _d2d_trq['device_servo_trq_feedback'].extend(item['value']) - df1 = pandas.DataFrame.from_dict(_d2d_vel) - df2 = pandas.DataFrame.from_dict(_d2d_trq) - df = pandas.concat([df1, df2], axis=1) - _filename = f'{path}\\inertia\\j{channel+4}_inertia.data' + df1 = DataFrame.from_dict(_d2d_vel) + df2 = DataFrame.from_dict(_d2d_trq) + df = concat([df1, df2], axis=1) + _filename = f'{path}\\inertia\\j{channel+4}_inertia_{time()}.data' df.to_csv(_filename, sep='\t', index=False) @@ -300,119 +258,95 @@ def run_rl(path, hr, md, loadsel, w2t): conditions = c_inertia disc = disc_inertia + # preparation 触发软急停,并解除,目的是让可能正在运行着的机器停下来 + clibs.execution('diagnosis.open', hr, w2t, tab_name, open=True, display_open=True) + clibs.execution('diagnosis.set_params', hr, w2t, tab_name, display_pdo_params=display_pdo_params) + # clibs.execution('diagnosis.save', hr, w2t, tab_name, save=True) # 这条命令有问题 + md.trigger_estop() + md.reset_estop() + for condition in conditions: number = conditions.index(condition) - w2t(f"正在执行{disc[number][0]}测试......", 0, 0, 'purple', 'Automatic Test') + w2t(f"正在执行{disc[number][0]}测试......", 0, 0, 'purple', tab_name) - # 1. 关闭诊断曲线,触发软急停,并解除,目的是让可能正在运行着的机器停下来,切手动模式并下电 - _response = execution('diagnosis.open', hr, w2t, open=False, display_open=False) - md.trigger_estop() - md.reset_estop() - _response = execution('state.switch_manual', hr, w2t) - _response = execution('state.switch_motor_off', hr, w2t) - - # 2. 修改未要执行的场景 + # 1. 将act重置为False,并修改未要执行的场景 + md.write_act(False) ssh = SSHClient() ssh.set_missing_host_key_policy(AutoAddPolicy()) - ssh.connect('192.168.0.160', 22, username='luoshi', password='luoshi2019') + ssh.connect(clibs.ip_addr, 22, username='luoshi', password='luoshi2019') cmd = 'cd /home/luoshi/bin/controller/; ' cmd += 'sudo sed -i "/scenario/d" projects/target/_build/current/main.mod; ' cmd += f'sudo sed -i "/DONOTDELETE/i {condition}" projects/target/_build/current/main.mod' stdin, stdout, stderr = ssh.exec_command(cmd, get_pty=True) stdin.write('luoshi2019' + '\n') - stdin.flush() - print(stdout.read().decode()) # 必须得输出一下stdout,才能正确执行sudo - print(stderr.read().decode()) # 顺便也执行以下stderr + stdout.read().decode() # 需要read一下才能正常执行 + stderr.read().decode() - # 3. reload工程后,pp2main,并且自动模式和上电 + # 2. reload工程后,pp2main,并且自动模式和上电 prj_path = 'target/_build/target.prj' - _response = execution('overview.reload', hr, w2t, prj_path=prj_path, tasks=['current']) - _response = execution('overview.get_cur_prj', hr, w2t) - _response = execution('rl_task.pp_to_main', hr, w2t, tasks=['current']) - _response = execution('state.switch_auto', hr, w2t) - _response = execution('state.switch_motor_on', hr, w2t) + clibs.execution('overview.reload', hr, w2t, tab_name, prj_path=prj_path, tasks=['current']) + clibs.execution('rl_task.pp_to_main', hr, w2t, tab_name, tasks=['current']) + clibs.execution('state.switch_auto', hr, w2t, tab_name) + clibs.execution('state.switch_motor_on', hr, w2t, tab_name) - # 4. 开始运行程序,单轴运行15s - _response = execution('rl_task.run', hr, w2t, tasks=['current']) - for i in range(3): + # 3. 开始运行程序,单轴运行35s + clibs.execution('rl_task.run', hr, w2t, tab_name, tasks=['current']) + _t_start = time() + while True: if md.read_ready_to_go() == 1: md.write_act(True) - sleep(1) - md.write_act(False) break else: - sleep(1) - else: - w2t("未收到机器人的运行信号,需要确认RL程序编写正确并正常执行...", 0, 111, 'red', 'Automatic Test') + if (time() - _t_start) // 20 > 1: + w2t("20s内未收到机器人的运行信号,需要确认RL程序编写正确并正常执行...", 0, 111, 'red', tab_name) + else: + sleep(1) - # 5. 打开诊断曲线,并执行采集 - sleep(7) # 保证程序已经运行起来,其实主要是为了保持电流的采集而设定 - _response = execution('diagnosis.open', hr, w2t, open=True, display_open=True) - display_pdo_params = [ - {"name": "hw_joint_vel_feedback", "channel": 0}, - {"name": "hw_joint_vel_feedback", "channel": 1}, - {"name": "hw_joint_vel_feedback", "channel": 2}, - {"name": "hw_joint_vel_feedback", "channel": 3}, - {"name": "hw_joint_vel_feedback", "channel": 4}, - {"name": "hw_joint_vel_feedback", "channel": 5}, - {"name": "device_servo_trq_feedback", "channel": 0}, - {"name": "device_servo_trq_feedback", "channel": 1}, - {"name": "device_servo_trq_feedback", "channel": 2}, - {"name": "device_servo_trq_feedback", "channel": 3}, - {"name": "device_servo_trq_feedback", "channel": 4}, - {"name": "device_servo_trq_feedback", "channel": 5}, - {"name": "device_safety_estop", "channel": 0}, - ] - _response = execution('diagnosis.set_params', hr, w2t, display_pdo_params=display_pdo_params) + # 4. 打开诊断曲线,并执行采集 + sleep(10) # 保证程序已经运行起来,其实主要是为了保持电流的采集而设定 scenario_time = 0 - if number < 6 or number > 8: + if number < 6: + sleep(35) + elif number > 8: sleep(15) else: _t_start = time() while True: scenario_time = md.read_scenario_time() if float(scenario_time) > 1: - w2t(f"场景{number-5}的周期时间:{scenario_time}", 0, 0, 'green', 'Automatic Test') + w2t(f"场景{number-5}的周期时间:{scenario_time}", 0, 0, 'green', tab_name) break else: if (time()-_t_start)//60 > 3: - w2t(f"未收到场景{number-5}的周期时间,需要确认RL程序编写正确并正常执行...", 0, 111, 'red', 'Automatic Test') + w2t(f"未收到场景{number-5}的周期时间,需要确认RL程序编写正确并正常执行...", 0, 111, 'red', tab_name) else: sleep(5) sleep(1) # 一定要延迟一秒再读一次scenario time寄存器,因为一开始读取的数值不准确 scenario_time = md.read_scenario_time() sleep(float(scenario_time)*0.2) # 再运行周期的20%即可 - # 6. 关闭诊断曲线,停止程序运行,下电并且换成手动模式 - _response = execution('diagnosis.open', hr, w2t, open=False, display_open=False) - _response = execution('rl_task.stop', hr, w2t, tasks=['current']) - _response = execution('state.switch_motor_off', hr, w2t) - _response = execution('state.switch_manual', hr, w2t) - sleep(1) # 保证所有数据均已返回 - # 7. 保留数据并处理输出 - for _msg in hr.c_msg: + # 5.停止程序运行,保留数据并处理输出 + clibs.execution('rl_task.stop', hr, w2t, tab_name, tasks=['current']) + _c_msg = hr.c_msg.copy() + for _msg in _c_msg: if 'diagnosis.result' in _msg: disc[number][1].insert(0, loads(_msg)) else: - _index = 210 - for _msg in hr.c_msg: - if 'diagnosis.result' in _msg: - _index = hr.c_msg.index(_msg) - break - del hr.c_msg[_index:] hr.c_msg_xs.clear() + if len(hr.c_msg) > 270: + del hr.c_msg[270:] gen_result_file(path, loadsel, disc, number, scenario_time) else: if loadsel == 'tool100': - w2t("单轴和场景电机电流采集完毕,如需采集惯量负载,须切换负载类型,并更换惯量负载,重新执行。", 0, 0, 'green', 'Automatic Test') + w2t("单轴和场景电机电流采集完毕,如需采集惯量负载,须切换负载类型,并更换惯量负载,重新执行。", 0, 0, 'green', tab_name) elif loadsel == 'inertia': - w2t("惯量负载电机电流采集完毕,如需采集单轴/场景/保持电机电流,须切换负载类型,并更换偏置负载,重新执行。", 0, 0, 'green', 'Automatic Test') + w2t("惯量负载电机电流采集完毕,如需采集单轴/场景/保持电机电流,须切换负载类型,并更换偏置负载,重新执行。", 0, 0, 'green', tab_name) def main(path, hr, md, loadsel, w2t): - data_dirs, data_files = traversal_files(path, w2t) + data_dirs, data_files = clibs.traversal_files(path, w2t) config_file, current_file, prj_file = check_files(path, loadsel, data_dirs, data_files, w2t) - prj_to_xcore(prj_file) + clibs.prj_to_xcore(prj_file) run_rl(path, hr, md, loadsel, w2t) diff --git a/aio/code/commons/clibs.py b/aio/code/commons/clibs.py new file mode 100644 index 0000000..32f4d1a --- /dev/null +++ b/aio/code/commons/clibs.py @@ -0,0 +1,191 @@ +from os import scandir +from threading import Thread +from time import sleep +from os.path import exists +from paramiko import SSHClient, AutoAddPolicy +from socket import setdefaulttimeout +from logging import getLogger +from logging.config import dictConfig +import concurrent_log_handler + +ip_addr = '192.168.0.160' # for product +# ip_addr = '192.168.84.129' # for test +RADIAN = 57.3 # 180 / 3.1415926 +MAX_FRAME_SIZE = 1024 +TIMEOUT = 5 +setdefaulttimeout(TIMEOUT) +tab_names = {'dp': 'Data Process', 'at': 'Automatic Test', 'da': 'Duration Action', 'op': 'openapi'} +# PREFIX = '' # for pyinstaller packaging +PREFIX = '../assets/' # for source code debug +log_data_hmi = f'{PREFIX}templates/c_msg.log' +log_data_debug = f'{PREFIX}templates/debug.log' +heartbeat = f'{PREFIX}templates/heartbeat' +durable_data_current_xlsx = f'{PREFIX}templates/durable/durable_data_current.xlsx' +durable_data_current_max_xlsx = f'{PREFIX}templates/durable/durable_data_current_max.xlsx' +durable_data_current = { + 'time': list(range(1, 19)), + 'axis1': [0 for _ in range(18)], + 'axis2': [0 for _ in range(18)], + 'axis3': [0 for _ in range(18)], + 'axis4': [0 for _ in range(18)], + 'axis5': [0 for _ in range(18)], + 'axis6': [0 for _ in range(18)], +} +durable_data_current_max = { + 'time': list(range(1, 19)), + 'axis1': [0 for _ in range(18)], + 'axis2': [0 for _ in range(18)], + 'axis3': [0 for _ in range(18)], + 'axis4': [0 for _ in range(18)], + 'axis5': [0 for _ in range(18)], + 'axis6': [0 for _ in range(18)], +} + +# version:表示版本,该键值为从1开始的整数。该key必选,除此之外,其它key都是可选。 +# formatters:日志格式化器,其value值为一个字典,该字典的每个键值对都代表一个Formatter,键值对中,key代表Formatter ID(自定义ID),value为字典,描述如何配置相应的Formatter实例。默认格式为 ‘%(message)s’ +# filters:日志过滤器,其value值为一个字典,该字典的每个键值对都代表一个Filter,键值对中,key代表Filter ID(自定义ID),value为字典,描述如何配置相应的Filter实例。 +# handlers:日志处理器,其value值为一个字典,该字典的每个键值对都代表一个Handler,键值对中,key代表Handler ID(自定义ID),value为字典,描述如何配置相应的Handler实例,包含以下配置key: +# class (必选):日志处理器类全称 +# level (可选):指定该日志处理器需要处理哪些级别的日志,低于该级别的日志将不被该handler处理。level可以为代表日志级别的整数或者表大写字符串,字符串日志级别和数字日志级别对应关系如下: +# CRITICAL 50 +# ERROR 40 +# WARNING 30 +# INFO 20 +# DEBUG 10 +# NOTSET 0 +f_complex = '%(asctime)s # %(name)s-%(levelname)s-%(module)s-%(funcName)s-%(lineno)d # %(message)s' +f_simple = '%(levelname)s-%(module)s-%(funcName)s-%(lineno)d: %(message)s' +log_dicts = { + 'version': 1, + 'disable_existing_loggers': True, + 'formatters': { + 'standard': { + 'format': f_complex, + 'style': '%', + 'datefmt': '%Y-%m-%dT%H:%M:%S', + }, + 'test': { + 'format': f_simple, + 'style': '%', + 'datefmt': '%Y-%m-%dT%H:%M:%S', + }, + }, + 'filters': {}, + 'handlers': { + 'console': { + 'level': 'DEBUG', + 'class': 'logging.StreamHandler', + 'formatter': 'test', + }, + 'hmi.log': { + 'level': 'DEBUG', + 'class': 'concurrent_log_handler.ConcurrentRotatingFileHandler', + 'filename': log_data_hmi, + 'maxBytes': 1024*1024*50, + 'backupCount': 10, + 'encoding': 'utf-8', + 'formatter': 'standard', + }, + 'debug.log': { + 'level': 'INFO', + 'class': 'logging.FileHandler', + 'filename': log_data_debug, + 'encoding': 'utf-8', + 'formatter': 'standard', + }, + }, + 'loggers': { + 'normal': { + 'handlers': ['hmi.log', 'debug.log'], + 'level': 'DEBUG', + 'propagate': False + }, + 'debug': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': False + }, + '': { + 'handlers': ['hmi.log', 'debug.log'], + 'level': 'DEBUG', + 'propagate': False + }, + } +} +dictConfig(log_dicts) +log_prod = getLogger('normal') +log_debug = getLogger('debug') + + +class GetThreadResult(Thread): + def __init__(self, func, args=()): + super(GetThreadResult, self).__init__() + self.func = func + self.args = args + self.result = 0 + + def run(self): + sleep(1) + self.result = self.func(*self.args) + + def get_result(self): + Thread.join(self) # 等待线程执行完毕 + try: + return self.result + except Exception as Err: + return None + + +def traversal_files(path, w2t): + # 功能:以列表的形式分别返回指定路径下的文件和文件夹,不包含子目录 + # 参数:路径 + # 返回值:路径下的文件夹列表 路径下的文件列表 + if not exists(path): + msg = f'数据文件夹{path}不存在,请确认后重试......' + w2t(msg, 0, 1, 'red') + else: + dirs = [] + files = [] + for item in scandir(path): + if item.is_dir(): + dirs.append(item.path) + elif item.is_file(): + files.append(item.path) + + return dirs, files + + +def prj_to_xcore(prj_file): + ssh = SSHClient() + ssh.set_missing_host_key_policy(AutoAddPolicy()) + ssh.connect(ip_addr, 22, username='luoshi', password='luoshi2019') + sftp = ssh.open_sftp() + sftp.put(prj_file, '/tmp/target.zip') + cmd = 'cd /tmp; rm -rf target/; mkdir target; unzip -d target/ -q target.zip; ' + cmd += 'chmod 777 -R target/; rm target.zip' + ssh.exec_command(cmd) + + cmd = 'sudo rm -rf /home/luoshi/bin/controller/projects/target; ' + cmd += 'sudo mv /tmp/target/ /home/luoshi/bin/controller/projects/' + stdin, stdout, stderr = ssh.exec_command(cmd, get_pty=True) + stdin.write('luoshi2019' + '\n') + stdout.read().decode() # 需要read一下才能正常执行 + stderr.read().decode() + + cmd = 'cd /home/luoshi/bin/controller/; ' + cmd += 'sudo chmod -R 755 projects; rm /tmp/*.prj; sudo mv projects/target/_build/*.prj /tmp; cd /tmp; ' + cmd += 'prj=($(ls *.prj)); sudo mv ${prj[0]} /home/luoshi/bin/controller/projects/target/_build/target.prj; ' + stdin, stdout, stderr = ssh.exec_command(cmd, get_pty=True) + stdin.write('luoshi2019' + '\n') + stdout.read().decode() # 需要read一下才能正常执行 + stderr.read().decode() + ssh.close() + + +def execution(cmd, hr, w2t, tab_name, **kwargs): + _id = hr.execution(cmd, **kwargs) + _msg = hr.get_from_id(_id) + if not _msg: + w2t(f"无法获取{_id}请求的响应信息", 0, 6, 'red', tab_name) + else: + return eval(_msg.split('#')[2]) diff --git a/aio/code/automatic_test/openapi.py b/aio/code/commons/openapi.py similarity index 78% rename from aio/code/automatic_test/openapi.py rename to aio/code/commons/openapi.py index f688694..7e458e0 100644 --- a/aio/code/automatic_test/openapi.py +++ b/aio/code/commons/openapi.py @@ -1,16 +1,14 @@ -from json import load, dumps -from socket import socket, setdefaulttimeout, AF_INET, SOCK_STREAM +from json import load, dumps, loads +from socket import socket, AF_INET, SOCK_STREAM from threading import Thread import selectors from time import time, sleep -from os.path import dirname from pymodbus.client.tcp import ModbusTcpClient from pymodbus.payload import BinaryPayloadDecoder, BinaryPayloadBuilder from pymodbus.constants import Endian +from commons import clibs -MAX_FRAME_SIZE = 1024 -setdefaulttimeout(2) -current_path = dirname(__file__) +logger = clibs.log_prod class ModbusRequest(object): @@ -18,102 +16,92 @@ class ModbusRequest(object): super().__init__() self.w2t = w2t self.tab_name = 'openapi' - self.host = '192.168.0.160' + self.host = clibs.ip_addr self.port = 502 + self.interval = 0.3 self.c = ModbusTcpClient(self.host, self.port) self.c.connect() def motor_off(self): try: + self.c.write_register(40002, 0) + sleep(self.interval) self.c.write_register(40002, 1) + sleep(self.interval) + self.c.write_register(40002, 0) except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法正常下电,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法正常下电,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def motor_on(self): try: + self.c.write_register(40003, 0) + sleep(self.interval) self.c.write_register(40003, 1) + sleep(self.interval) + self.c.write_register(40003, 0) except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法正常上电,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法正常上电,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def trigger_estop(self): try: self.c.write_register(40012, 0) except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法触发软急停,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法触发软急停,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def reset_estop(self): try: self.c.write_register(40012, 1) - sleep(0.2) + sleep(self.interval) self.c.write_register(40001, 0) - sleep(0.2) + sleep(self.interval) self.c.write_register(40001, 1) - sleep(0.2) + sleep(self.interval) self.c.write_register(40001, 0) except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法重置软急停,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法重置软急停,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def clear_alarm(self): try: self.c.write_register(40000, 1) except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法清除告警,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法清除告警,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def get_cart_vel(self): try: results = self.c.read_holding_registers(40537, 7) - print(f"cart vel: {results.registers}") - except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法读取笛卡尔速度,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法读取笛卡尔速度,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def get_jnt_vel(self): try: results = self.c.read_holding_registers(40579, 7) - print(f"joint vel: {results.registers}") - except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法读取关节速度,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法读取关节速度,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def get_tcp_vel(self): try: results = self.c.read_holding_registers(40607, 7) - print(f"tcp vel: {results.registers}") - except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法读取TCP速度,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法读取TCP速度,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def get_tcp_mag_vel(self): try: results = self.c.read_holding_registers(40621, 1) - print(f"tcp mag: {results.registers}") - except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法读取TCP合成速度,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法读取TCP合成速度,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def write_act(self, number): try: self.c.write_register(41000, number) except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法发送执行信号,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法发送执行信号,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def read_ready_to_go(self): try: results = self.c.read_holding_registers(41001, 1) return results.registers[0] except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法读取准备信号,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法读取准备信号,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def read_scenario_time(self): try: @@ -122,15 +110,13 @@ class ModbusRequest(object): result = f"{result.decode_32bit_float():.3f}" return result except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法读取准备信号,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法读取准备信号,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def write_stop0(self, number): try: self.c.write_register(41004, number) except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法通过IO操作stop0急停,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法通过IO操作stop0急停,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def write_speed_max(self, speed): try: @@ -139,16 +125,14 @@ class ModbusRequest(object): payload = builder.build() self.c.write_registers(41005, payload, skip_encode=True) except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法写入速度值,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法写入速度值,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def read_brake_done(self): try: results = self.c.read_holding_registers(41007, 1) return results.registers[0] except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法读取制动已执行信号,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法读取制动已执行信号,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def write_axis(self, axis): try: @@ -157,22 +141,19 @@ class ModbusRequest(object): payload = builder.to_registers() self.c.write_registers(41008, payload) except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法写入速度值,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法写入速度值,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def write_probe(self, probe): try: self.c.write_register(41010, probe) except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法写入速度探测信号,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法写入速度探测信号,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) def write_pon(self, pon): # positive or negative try: self.c.write_register(41011, pon) except Exception as Err: - self.w2t(f"{Err}") - self.w2t("无法写入正负方向信号,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) + self.w2t(f"{Err}\n无法写入正负方向信号,连接Modbus失败,需要确认网络是否通畅,或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name) class HmiRequest(object): @@ -196,6 +177,7 @@ class HmiRequest(object): self.half_length = 0 self.index = 0 self.reset_index = 0 + self.durable_lock = 0 self.sock_conn() self.t_heartbeat = Thread(target=self.heartbeat) @@ -210,21 +192,19 @@ class HmiRequest(object): def sock_conn(self): # while True: - with open(f"{current_path}/../../assets/templates/heartbeat", "r", encoding='utf-8') as f_hb: + with open(clibs.heartbeat, "r", encoding='utf-8') as f_hb: c_state = f_hb.read().strip() if c_state == '0': try: self.c = socket(AF_INET, SOCK_STREAM) - self.c.connect(('192.168.0.160', 5050)) - # self.c.connect(('192.168.84.129', 5050)) + self.c.connect((clibs.ip_addr, 5050)) self.c.setblocking(False) self.c_xs = socket(AF_INET, SOCK_STREAM) - self.c_xs.connect(('192.168.0.160', 6666)) - # self.c_xs.connect(('192.168.84.129', 6666)) + self.c_xs.connect((clibs.ip_addr, 6666)) self.c_xs.setblocking(False) self.w2t("Connection success", 0, 0, 'green', tab_name=self.tab_name) - with open(f"{current_path}/../../assets/templates/heartbeat", "w", encoding='utf-8') as f_hb: + with open(clibs.heartbeat, "w", encoding='utf-8') as f_hb: f_hb.write('1') md = ModbusRequest(self.w2t) md.reset_estop() @@ -234,7 +214,7 @@ class HmiRequest(object): md.write_axis(1) except Exception as Err: self.w2t("Connection failed...", 0, 0, 'red', tab_name=self.tab_name) - with open(f"{current_path}/../../assets/templates/heartbeat", "w", encoding='utf-8') as f_hb: + with open(clibs.heartbeat, "w", encoding='utf-8') as f_hb: f_hb.write('0') def header_check(self, index, data): @@ -262,28 +242,29 @@ class HmiRequest(object): # print(f"in head check data: {data}") self.broke = 100 - index += MAX_FRAME_SIZE + index += clibs.MAX_FRAME_SIZE return index, 0, 0 def heartbeat(self): while self.t_bool: _id = self.execution('controller.heart') _flag = '0' if self.get_from_id(_id) is None else '1' - print(f"hb = {_flag}", end=' ') - print(f"len(c_msg) = {len(self.c_msg)}", end=' ') - print(f"len(c_msg_xs) = {len(self.c_msg_xs)}", end='\n') - with open(f"{current_path}/../../assets/templates/heartbeat", "w", encoding='utf-8') as f_hb: + # print(f"hb = {_flag}", end=' ') + # print(f"len(c_msg) = {len(self.c_msg)}", end=' ') + # print(f"len(c_msg_xs) = {len(self.c_msg_xs)}", end='\n') + with open(clibs.heartbeat, "w", encoding='utf-8') as f_hb: f_hb.write(_flag) - if _flag == '0': - self.w2t(f"{_id} 心跳丢失,连接失败,重新连接中...", 0, 7, 'red', tab_name=self.tab_name) - sleep(1.5) - # with open(f"{current_path}/../../assets/templates/c_msg.log", "w", encoding='utf-8') as f: - # for msg in self.c_msg: - # f.write(str(loads(msg)) + '\n') + if _flag == '0': + self.w2t(f"{_id} 心跳丢失,连接失败,重新连接中...", 0, 7, 'red', tab_name=self.tab_name) + sleep(2) def msg_storage(self, response, flag=0): + # response是解码后的字符串 messages = self.c_msg if flag == 0 else self.c_msg_xs - if len(messages) < 20000: + logger.debug(f"{loads(response)}") + if 'move.monitor' in response: + pass + elif len(messages) < 10000: messages.insert(0, response) else: messages.insert(0, response) @@ -327,7 +308,7 @@ class HmiRequest(object): # print(f"broke == 0 index = {self.index-8}") # print(f"broke == 0 INIT pkg size = {self.pkg_size}") # print(f"broke == 0 data = {data}") - if self.index > MAX_FRAME_SIZE: + if self.index > clibs.MAX_FRAME_SIZE: break # 详见解包原理数据.txt,self.pkg_size 永远是除了当前data之外剩余未处理的数据大小 if self.pkg_size <= len(data) - self.index: @@ -371,15 +352,15 @@ class HmiRequest(object): # print('flag = 0 encounter broke == 3') self.broke = 3 - self.index += MAX_FRAME_SIZE + self.index += clibs.MAX_FRAME_SIZE self.reset_index = 1 - break # 因为 index + 2 的大小超过 MAX_FRAME_SIZE + break # 因为 index + 2 的大小超过 clibs.MAX_FRAME_SIZE elif self.index+_frame_size-6 > len(data): self.response = data[self.index:].decode() self.pkg_size -= (len(data) - self.index) # 详见解包原理数据.txt,self.pkg_size self.leftover = (_frame_size-6-(len(data)-self.index)) - self.index += MAX_FRAME_SIZE + self.index += clibs.MAX_FRAME_SIZE self.reset_index = 1 # print(f"in flag=0 else data = {data}") @@ -448,9 +429,9 @@ class HmiRequest(object): # print('flag = 1 encounter broke == 3') self.broke = 3 - self.index += MAX_FRAME_SIZE + self.index += clibs.MAX_FRAME_SIZE self.reset_index = 1 - break # 因为 index + 2 的大小超过 MAX_FRAME_SIZE + break # 因为 index + 2 的大小超过 clibs.MAX_FRAME_SIZE # print(f"in pkg size > 0 loop after if data = {data}") # print(f"in pkg size > 0 loop after if index = {self.index}") # print(f"in pkg size > 0 loop after if pkg size = {self.pkg_size}") @@ -467,7 +448,7 @@ class HmiRequest(object): self.response += data[self.index:].decode() self.leftover -= (len(data) - self.index) self.pkg_size -= (len(data) - self.index) - self.index += MAX_FRAME_SIZE + self.index += clibs.MAX_FRAME_SIZE self.reset_index = 1 # print(f"in pkg size > 0 loop after else data = {data}") # print(f"in pkg size > 0 loop after else index = {self.index}") @@ -521,15 +502,21 @@ class HmiRequest(object): def get_from_id(self, msg_id, flag=0): for i in range(3): - messages = self.c_msg if flag == 0 else self.c_msg_xs - for msg in messages: - if msg_id is None: - return None - elif msg_id in msg: - return msg + with open(clibs.log_data_hmi, mode='r', encoding='utf-8') as f_log: + for line in f_log: + if msg_id in line.strip(): + return line sleep(1) - else: - return None + else: # 尝试在上一次分割的日志中查找,只做一次 + sleep(1) + try: + with open(clibs.log_data_hmi+'.1', mode='r', encoding='utf-8') as f_log: + for line in f_log: + if msg_id in line.strip(): + return line + except FileNotFoundError: + pass + return None def package(self, cmd): _frame_head = (len(cmd) + 6).to_bytes(length=2, byteorder='big') @@ -543,7 +530,7 @@ class HmiRequest(object): def unpackage(self, sock): def to_read(conn, mask): - data = conn.recv(MAX_FRAME_SIZE) + data = conn.recv(clibs.MAX_FRAME_SIZE) if data: # print(data) self.get_response(data) @@ -590,7 +577,7 @@ class HmiRequest(object): if flg == 0: # for old protocols req = None try: - with open(f'{current_path}/../../assets/templates/{command}.json', encoding='utf-8', + with open(f'{clibs.PREFIX}templates/json/{command}.json', encoding='utf-8', mode='r') as f_json: req = load(f_json) except: @@ -616,6 +603,8 @@ class HmiRequest(object): req['data']['type'] = kwargs['type'] req['data']['bias'] = kwargs['bias'] req['data']['value'] = kwargs['value'] + case 'diagnosis.save': + req['data']['save'] = kwargs['save'] case _: pass @@ -626,7 +615,7 @@ class HmiRequest(object): self.c.send(self.package(cmd)) sleep(0.5) except Exception as Err: - self.w2t(f"{cmd}\n请求发送失败...{Err}", 0, 0, 'red', tab_name=self.tab_name) + self.w2t(f"{cmd}: 请求发送失败...{Err}", 0, 0, 'red', tab_name=self.tab_name) return req['id'] diff --git a/aio/code/data_process/__init__.py b/aio/code/data_process/__init__.py deleted file mode 100644 index 3913f0e..0000000 --- a/aio/code/data_process/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__all__ = ['brake', 'current', 'iso', 'wavelogger'] \ No newline at end of file diff --git a/aio/code/data_process/brake.py b/aio/code/data_process/brake.py index 233e0c6..28192b4 100644 --- a/aio/code/data_process/brake.py +++ b/aio/code/data_process/brake.py @@ -1,49 +1,12 @@ -# coding: utf-8 -from os import scandir -from os.path import isfile, exists +from os.path import isfile from sys import argv from openpyxl import load_workbook from time import time, sleep, strftime, localtime from threading import Thread from pandas import read_csv +from commons import clibs - -class GetThreadResult(Thread): - def __init__(self, func, args=()): - super(GetThreadResult, self).__init__() - self.func = func - self.args = args - self.result = 0 - - def run(self): - sleep(1) - self.result = self.func(*self.args) - - def get_result(self): - Thread.join(self) # 等待线程执行完毕 - try: - return self.result - except Exception as Err: - return None - - -def traversal_files(path, w2t): - # 功能:以列表的形式分别返回指定路径下的文件和文件夹,不包含子目录 - # 参数:路径 - # 返回值:路径下的文件夹列表 路径下的文件列表 - if not exists(path): - msg = f'数据文件夹{path}不存在,请确认后重试......' - w2t(msg, 0, 1, 'red') - else: - dirs = [] - files = [] - for item in scandir(path): - if item.is_dir(): - dirs.append(item.path) - elif item.is_file(): - files.append(item.path) - - return dirs, files +logger = clibs.log_prod def check_files(path, raw_data_dirs, result_files, w2t): @@ -83,7 +46,7 @@ def check_files(path, raw_data_dirs, result_files, w2t): 规则解释:AA/BB/CC 指的是臂展/负载/速度的比例,例如reach66_load100_speed33:66%臂展,100%负载以及33%速度情况下的测试结果文件夹""" w2t(msg, 0, 4, 'red') - _, raw_data_files = traversal_files(raw_data_dir, w2t) + _, raw_data_files = clibs.traversal_files(raw_data_dir, w2t) if len(raw_data_files) != 3: msg = f"数据目录 {raw_data_dir} 下数据文件个数错误,每个数据目录下有且只能有三个以 .data 为后缀的数据文件" w2t(msg, 0, 5, 'red') @@ -109,6 +72,7 @@ def get_configs(configfile, w2t): return av, rr + def now_doing_msg(docs, flag, w2t): # 功能:输出正在处理的文件或目录 # 参数:文件或目录,start 或 done 标识 @@ -228,7 +192,7 @@ def data_process(result_file, raw_data_dirs, av, rr, vel, trq, estop, w2t): global stop stop = 0 - t_excel = GetThreadResult(load_workbook, args=(result_file, )) + t_excel = clibs.GetThreadResult(load_workbook, args=(result_file, )) t_wait = Thread(target=w2t_local, args=('.', 1, w2t)) t_excel.start() t_wait.start() @@ -242,7 +206,7 @@ def data_process(result_file, raw_data_dirs, av, rr, vel, trq, estop, w2t): for raw_data_dir in raw_data_dirs: if raw_data_dir.split('\\')[-1].split('_')[0] == prefix: now_doing_msg(raw_data_dir, 'start', w2t) - _, data_files = traversal_files(raw_data_dir, w2t) + _, data_files = clibs.traversal_files(raw_data_dir, w2t) # 数据文件串行处理模式--------------------------------- # count = 1 # for data_file in data_files: @@ -280,7 +244,7 @@ def main(path, vel, trq, estop, w2t): # 参数:initialization函数的返回值 # 返回值:- time_start = time() - raw_data_dirs, result_files = traversal_files(path, w2t) + raw_data_dirs, result_files = clibs.traversal_files(path, w2t) try: # threads = [] diff --git a/aio/code/data_process/current.py b/aio/code/data_process/current.py index b7cd024..92fda5d 100644 --- a/aio/code/data_process/current.py +++ b/aio/code/data_process/current.py @@ -1,31 +1,13 @@ from openpyxl import load_workbook -from os import scandir -from os.path import exists from sys import argv from pandas import read_csv, concat, set_option from re import match from threading import Thread from time import sleep from csv import reader, writer +from commons import clibs - -class GetThreadResult(Thread): - def __init__(self, func, args=()): - super(GetThreadResult, self).__init__() - self.func = func - self.args = args - self.result = 0 - - def run(self): - sleep(1) - self.result = self.func(*self.args) - - def get_result(self): - Thread.join(self) # 等待线程执行完毕 - try: - return self.result - except Exception as Err: - return None +logger = clibs.log_prod def w2t_local(msg, wait, w2t): @@ -38,27 +20,8 @@ def w2t_local(msg, wait, w2t): break -def traversal_files(path, w2t): - # 功能:以列表的形式分别返回指定路径下的文件和文件夹,不包含子目录 - # 参数:路径 - # 返回值:路径下的文件夹列表 路径下的文件列表 - if not exists(path): - msg = f'数据文件夹{path}不存在,请确认后重试......' - w2t(msg, 0, 8, 'red') - else: - dirs = [] - files = [] - for item in scandir(path): - if item.is_dir(): - dirs.append(item.path) - elif item.is_file(): - files.append(item.path) - - return dirs, files - - def initialization(path, sub, w2t): - _, data_files = traversal_files(path, w2t) + _, data_files = clibs.traversal_files(path, w2t) count = 0 for data_file in data_files: @@ -69,8 +32,8 @@ def initialization(path, sub, w2t): count += 1 else: if not (match('j[1-7].*\\.data', filename) or match('j[1-7].*\\.csv', filename)): - print(f"不合规 {data_file}") - msg = f"所有文件必须以 jx_ 开头,以 .data/csv 结尾(x取值1-7),请检查后重新运行。" + msg = f"不合规 {data_file}\n" + msg += f"所有文件必须以 jx_ 开头,以 .data/csv 结尾(x取值1-7),请检查后重新运行。" w2t(msg, 0, 6, 'red') if not ((sub == 'cycle' and count == 2) or (sub != 'cycle' and count == 1)): @@ -79,7 +42,7 @@ def initialization(path, sub, w2t): return data_files -def current_max(data_files, rcs, trqh, w2t): +def current_max(data_files, rcs, trq, w2t): current = {1: [], 2: [], 3: [], 4: [], 5: [], 6: [], 7: []} for data_file in data_files: if data_file.endswith('.data'): @@ -93,8 +56,8 @@ def current_max(data_files, rcs, trqh, w2t): axis = int(data_file.split('\\')[-1].split('_')[0].removeprefix('j')) rca = rcs[axis-1] - col = df.columns.values[trqh-1] - c_max = df[col].max() + col = df.columns.values[trq-1] + c_max = df[col].abs().max() scale = 1 if data_file.endswith('.csv') else 1000 _ = abs(c_max/scale*rca) @@ -118,7 +81,7 @@ def current_max(data_files, rcs, trqh, w2t): return current -def current_avg(data_files, rcs, trqh, w2t): +def current_avg(data_files, rcs, trq, w2t): current = {1: [], 2: [], 3: [], 4: [], 5: [], 6: [], 7: []} for data_file in data_files: if data_file.endswith('.data'): @@ -132,7 +95,7 @@ def current_avg(data_files, rcs, trqh, w2t): axis = int(data_file.split('\\')[-1].split('_')[0].removeprefix('j')) rca = rcs[axis-1] - col = df.columns.values[trqh - 1] + col = df.columns.values[trq-1] c_std = df[col].std() c_avg = df[col].mean() @@ -158,7 +121,7 @@ def current_avg(data_files, rcs, trqh, w2t): return current -def current_cycle(dur, data_files, rcs, vel, trq, trqh, rpms, w2t): +def current_cycle(dur, data_files, rcs, rrs, vel, trq, trqh, rpms, w2t): result = None hold = [] single = [] @@ -174,7 +137,7 @@ def current_cycle(dur, data_files, rcs, vel, trq, trqh, rpms, w2t): w2t(f"正在打开文件 {result},需要 10s 左右", 1, 0, 'orange') global stop stop = 0 - t_excel = GetThreadResult(load_workbook, args=(result, )) + t_excel = clibs.GetThreadResult(load_workbook, args=(result, )) t_wait = Thread(target=w2t_local, args=('.', 1, w2t)) t_excel.start() t_wait.start() @@ -189,14 +152,14 @@ def current_cycle(dur, data_files, rcs, vel, trq, trqh, rpms, w2t): for axis, cur_value in avg.items(): try: shtname = f"J{axis}" - wb[shtname]["J4"].value = float(cur_value) + wb[shtname]["J4"].value = float(cur_value[0]) except: pass if dur == 0: - p_single(wb, single, vel, trq, rpms, w2t) + p_single(wb, single, vel, trq, rpms, rrs, w2t) else: - p_scenario(wb, single, vel, trq, rpms, dur, w2t) + p_scenario(wb, single, vel, trq, rpms, rrs, dur, w2t) w2t(f"正在保存文件 {result},需要 10s 左右", 1, 0, 'orange') stop = 0 @@ -239,7 +202,7 @@ def find_point(data_file, pos, flag, df, _row_s, _row_e, w2t, exitcode, threshol w2t(f"[{pos}] {data_file}数据有误,需要检查,无法找到有效起始点或结束点...", 0, 0, 'red') -def p_single(wb, single, vel, trq, rpms, w2t): +def p_single(wb, single, vel, trq, rpms, rrs, w2t): # 1. 先找到第一个速度为零的点,数据从后往前找,一开始就是零的情况不予考虑 # 2. 记录第一个点的位置,继续向前查找第二个速度为零的点,同理,一开始为零的点不予考虑 # 3. 记录第二个点的位置,并将其中的数据拷贝至对应位置 @@ -253,7 +216,7 @@ def p_single(wb, single, vel, trq, rpms, w2t): set_option("display.precision", 2) if data_file.endswith('.data'): df = read_csv(data_file, sep='\t') - rr = float(wb['统计'].cell(row=2, column=axis+1).value) + rr = rrs[axis-1] addition = 180 / 3.1415926 * 60 / 360 * rr elif data_file.endswith('.csv'): df = read_csv(data_file, sep=',', encoding='gbk', header=8) @@ -270,6 +233,7 @@ def p_single(wb, single, vel, trq, rpms, w2t): col_names = list(df.columns) df_1 = df[col_names[vel-1]].multiply(rpm*addition) df_2 = df[col_names[trq-1]].multiply(scale) + # print(df_1.abs().max()) df = concat([df_1, df_2], axis=1) _step = 5 if data_file.endswith('.csv') else 50 @@ -320,7 +284,7 @@ def p_single(wb, single, vel, trq, rpms, w2t): cell.value = None -def p_scenario(wb, single, vel, trq, rpms, dur, w2t): +def p_scenario(wb, single, vel, trq, rpms, rrs, dur, w2t): for data_file in single: cycle = 0.001 axis = int(data_file.split('\\')[-1].split('_')[0].removeprefix('j')) @@ -332,7 +296,7 @@ def p_scenario(wb, single, vel, trq, rpms, dur, w2t): set_option("display.precision", 2) if data_file.endswith('.data'): df = read_csv(data_file, sep='\t') - rr = float(wb['统计'].cell(row=2, column=axis+1).value) + rr = rrs[axis-1] addition = 180 / 3.1415926 * 60 / 360 * rr elif data_file.endswith('.csv'): df = read_csv(data_file, sep=',', encoding='gbk', header=8) @@ -376,6 +340,7 @@ def get_configs(configfile, w2t): _wb = load_workbook(configfile, read_only=True) _ws = _wb['Target'] rcs = [] + rrs = [] rpms = [] for i in range(2, 9): try: @@ -388,18 +353,23 @@ def get_configs(configfile, w2t): except: rcs.append(0.0) - return rpms, rcs + try: + rrs.append(float(_ws.cell(row=2, column=i).value)) + except: + rrs.append(0.0) + + return rpms, rcs, rrs def main(path, sub, dur, vel, trq, trqh, w2t): data_files = initialization(path, sub, w2t) - rpms, rcs = get_configs(path + '\\configs.xlsx', w2t) + rpms, rcs, rrs = get_configs(path + '\\configs.xlsx', w2t) if sub == 'max': - current_max(data_files, rcs, trqh, w2t) + current_max(data_files, rcs, trq, w2t) elif sub == 'avg': - current_avg(data_files, rcs, trqh, w2t) + current_avg(data_files, rcs, trq, w2t) elif sub == 'cycle': - current_cycle(dur, data_files, rcs, vel, trq, trqh, rpms, w2t) + current_cycle(dur, data_files, rcs, rrs, vel, trq, trqh, rpms, w2t) else: pass diff --git a/aio/code/data_process/iso.py b/aio/code/data_process/iso.py index a6be621..8c13c02 100644 --- a/aio/code/data_process/iso.py +++ b/aio/code/data_process/iso.py @@ -1,27 +1,10 @@ -# _*_ encoding:utf-8 _*_ import pdfplumber from openpyxl import load_workbook -from os import scandir, remove -from os.path import exists +from os import remove from sys import argv +from commons import clibs - -def traversal_files(path, w2t): - # 功能:以列表的形式分别返回指定路径下的文件和文件夹,不包含子目录 - # 参数:路径 - # 返回值:路径下的文件夹列表 路径下的文件列表 - if not exists(path): - msg = f'数据文件夹{path}不存在,请确认后重试......' - w2t(msg, 0, 1, 'red') - else: - dirs = files = [] - for item in scandir(path): - if item.is_dir(): - dirs.append(item.path) - elif item.is_file(): - files.append(item.path) - - return dirs, files +logger = clibs.log_prod def p_iso(file, p_files, ws, tmpfile): @@ -153,7 +136,7 @@ def p_iso_1000(file, p_files, ws, tmpfile): def main(path, w2t): - dirs, files = traversal_files(path, 1) + dirs, files = clibs.traversal_files(path, 1) try: wb = load_workbook(path + "/iso-results.xlsx") diff --git a/aio/code/data_process/wavelogger.py b/aio/code/data_process/wavelogger.py index 730d276..b1e53cf 100644 --- a/aio/code/data_process/wavelogger.py +++ b/aio/code/data_process/wavelogger.py @@ -1,31 +1,10 @@ -import os -import random - from pandas import read_csv from csv import reader from sys import argv -from os.path import exists -from os import scandir, remove from openpyxl import Workbook -from random import randint +from commons import clibs -def traversal_files(path, w2t): - # 功能:以列表的形式分别返回指定路径下的文件和文件夹,不包含子目录 - # 参数:路径 - # 返回值:路径下的文件夹列表 路径下的文件列表 - if not exists(path): - msg = f'数据文件夹{path}不存在,请确认后重试......' - w2t(msg, 0, 1, 'red') - else: - dirs = [] - files = [] - for item in scandir(path): - if item.is_dir(): - dirs.append(item.path) - elif item.is_file(): - files.append(item.path) - - return dirs, files +logger = clibs.log_prod def find_point(bof, step, pos, data_file, flag, df, row, w2t): @@ -95,7 +74,7 @@ def get_cycle_info(data_file, df, row, step, w2t): def initialization(path, w2t): - _, data_files = traversal_files(path, w2t) + _, data_files = clibs.traversal_files(path, w2t) for data_file in data_files: if not data_file.lower().endswith('.csv'): @@ -126,7 +105,7 @@ def single_file_proc(ws, data_file, df, low, high, cycle, w2t): _step = 5 _data = {} row_max = df.index[-1]-100 - print(data_file) + # print(data_file) while _row < row_max: if count not in _data.keys(): _data[count] = [] @@ -149,7 +128,7 @@ def single_file_proc(ws, data_file, df, low, high, cycle, w2t): ws.cell(row=1, column=i).value = f"第{i-1}次测试" ws.cell(row=i, column=1).value = f"第{i-1}次精度变化" - print(_data) + # print(_data) for i in sorted(_data.keys()): _row = 2 _column = i + 1 @@ -162,9 +141,9 @@ def execution(data_files, w2t): wb = Workbook() for data_file in data_files: ws, df, low, high, cycle = preparation(data_file, wb, w2t) - print(f"low = {low}") - print(f"high = {high}") - print(f"cycle = {cycle}") + # print(f"low = {low}") + # print(f"high = {high}") + # print(f"cycle = {cycle}") single_file_proc(ws, data_file, df, low, high, cycle, w2t) wd = data_files[0].split('\\') diff --git a/aio/code/durable_action/factory_test.py b/aio/code/durable_action/factory_test.py new file mode 100644 index 0000000..b9c0d71 --- /dev/null +++ b/aio/code/durable_action/factory_test.py @@ -0,0 +1,224 @@ +from sys import argv +from json import loads +from time import sleep, time, strftime, localtime +from pandas import DataFrame +from openpyxl import load_workbook +from math import sqrt +from numpy import power +from csv import writer +from commons import clibs + +logger = clibs.log_prod +tab_name = clibs.tab_names['da'] +count = 0 +display_pdo_params = [ + # {"name": "hw_joint_vel_feedback", "channel": 0}, + # {"name": "hw_joint_vel_feedback", "channel": 1}, + # {"name": "hw_joint_vel_feedback", "channel": 2}, + # {"name": "hw_joint_vel_feedback", "channel": 3}, + # {"name": "hw_joint_vel_feedback", "channel": 4}, + # {"name": "hw_joint_vel_feedback", "channel": 5}, + {"name": "device_servo_trq_feedback", "channel": 0}, + {"name": "device_servo_trq_feedback", "channel": 1}, + {"name": "device_servo_trq_feedback", "channel": 2}, + {"name": "device_servo_trq_feedback", "channel": 3}, + {"name": "device_servo_trq_feedback", "channel": 4}, + {"name": "device_servo_trq_feedback", "channel": 5}, +] +title = [ + 'time', 'trq-1', 'trq-2', 'trq-3', 'trq-4', 'trq-5', 'trq-6', 'trq-max-1', 'trq-max-2', 'trq-max-3', 'trq-max-4', + 'trq-max-5', 'trq-max-6' +] + + +def check_files(data_dirs, data_files, w2t): + if len(data_dirs) != 0 or len(data_files) != 2: + w2t('初始路径下不允许有文件夹,且初始路径下只能存在如下文件,确认后重新运行!\n1. target.zip\n2. configs.xlsx', 0, 10, 'red', tab_name) + + _files = [data_files[0].split('\\')[-1], data_files[1].split('\\')[-1]] + _files.sort() + if _files != ['configs.xlsx', 'target.zip']: + w2t('初始路径下只能存在如下文件,确认后重新运行!\n1. target.zip\n2. configs.xlsx', 0, 10, 'red', tab_name) + + data_files.sort() + return data_files + + +def run_rl(path, config_file, data_all, hr, md, w2t): + # 1. 关闭诊断曲线,触发软急停,并解除,目的是让可能正在运行着的机器停下来,切手动模式并下电 + clibs.execution('diagnosis.open', hr, w2t, tab_name, open=True, display_open=True) + clibs.execution('diagnosis.set_params', hr, w2t, tab_name, display_pdo_params=display_pdo_params) + md.trigger_estop() + md.reset_estop() + md.write_act(False) + sleep(1) # 让曲线彻底关闭 + + # 2. reload工程后,pp2main,并且自动模式和上电 + prj_path = 'target/_build/target.prj' + clibs.execution('overview.reload', hr, w2t, tab_name, prj_path=prj_path, tasks=['current']) + clibs.execution('rl_task.pp_to_main', hr, w2t, tab_name, tasks=['current']) + clibs.execution('state.switch_auto', hr, w2t, tab_name) + clibs.execution('state.switch_motor_on', hr, w2t, tab_name) + + # 3. 开始运行程序 + clibs.execution('rl_task.run', hr, w2t, tab_name, tasks=['current']) + _t_start = time() + while True: + if md.read_ready_to_go() == 1: + md.write_act(True) + break + else: + if (time() - _t_start) // 20 > 1: + w2t("20s内未收到机器人的运行信号,需要确认RL程序编写正确并正常执行...", 0, 111, 'red', tab_name) + else: + sleep(1) + + # 4. 获取初始数据,周期时间,首次的各轴平均电流值,打开诊断曲线,并执行采集 + sleep(20) # 初始化 scenario time 为 0 + _t_start = time() + while True: + scenario_time = md.read_scenario_time() + if float(scenario_time) > 1: + w2t(f"场景的周期时间:{scenario_time}s", 0, 0, 'green', tab_name) + break + else: + if (time() - _t_start) // 60 > 3: + w2t(f"未收到场景的周期时间,需要确认RL程序编写正确并正常执行...", 0, 111, 'red', tab_name) + else: + sleep(5) + sleep(1) # 一定要延迟一秒再读一次scenario time寄存器,因为一开始读取的数值不准确 + scenario_time = float(md.read_scenario_time()) + sleep(scenario_time*0.2) + + # 6. 准备初始数据,关闭诊断曲线,保留数据并处理输出 + with open(f'{path}\\results.csv', mode='a+', newline='') as f_csv: + csv_writer = writer(f_csv) + csv_writer.writerow(title) + _wb = load_workbook(config_file, read_only=True) + _ws = _wb['Target'] + wait_time = float(_ws.cell(row=2, column=10).value) + rcs = [] + for i in range(6): + rcs.append(float(_ws.cell(row=6, column=i + 2).value)) + + get_durable_data(path, data_all, scenario_time, wait_time, rcs, hr, md, w2t) + + # 7. 继续运行 + while True: + # 固定间隔,更新一次数据,打开曲线,获取周期内电流,关闭曲线 + sleep(wait_time+scenario_time+7) + # 保留数据并处理输出 + get_durable_data(path, data_all, scenario_time, wait_time, rcs, hr, md, w2t) + + +def get_durable_data(path, data, scenario_time, wait_time, rcs, hr, md, w2t): + _data_list = [] + _c_msg = hr.c_msg.copy() + for _msg in _c_msg: + if 'diagnosis.result' in _msg: + _data_list.insert(0, loads(_msg)) + else: + hr.c_msg_xs.clear() + if len(hr.c_msg) > 270: + del hr.c_msg[270:] + + # with open(f'{path}\\log.txt', 'w', encoding='utf-8') as f_obj: + # for _ in _data_list: + # f_obj.write(f"{_}\n") + + _d2d_trq = {0: [], 1: [], 2: [], 3: [], 4: [], 5: []} + + for line in _data_list: + for item in line['data']: + for i in range(6): + item['value'].reverse() + if item.get('channel', None) == i and item.get('name', None) == 'device_servo_trq_feedback': + _d2d_trq[i].extend(item['value']) + + if len(_d2d_trq[0]) / 1000 > scenario_time + 1: + this_time = strftime("%Y-%m-%d %H:%M:%S", localtime(time())) + next_time = strftime("%Y-%m-%d %H:%M:%S", localtime(time()+wait_time+10+scenario_time)).split()[-1] + _df = DataFrame(_d2d_trq) + _flg = 0 + _res = [] + for i in range(6): + def overmax_data(df, index, number, flag): + if number > 100: + md.trigger_estop() + hr.durable_quit = 1 + df.to_excel(f'{path}\\{this_time}.xlsx') + w2t(f"[{this_time}] {flag}-axis-{index} 数据过大错误,需要检查确定。", 0, 10, 'red', tab_name) + + try: + _ = sqrt(_df[i].apply(lambda x: power((rcs[i]*x/1000), 2)).sum()/len(_df[i])) + except: + md.trigger_estop() + _df.to_excel(path+"\\err_data.xlsx") + w2t(f"{i}calculate error", 0, 11, 'red', tab_name) + + if not _flg: + del data[0]['time'][0] + data[0]['time'].append(this_time.split()[-1]) + del data[1]['time'][0] + data[1]['time'].append(this_time.split()[-1]) + _res.append(this_time) + _flg = 1 + + del data[0][f"axis{i + 1}"][0] + overmax_data(_df, i, _, 'trq') + data[0][f"axis{i + 1}"].append(_) + _res.append(_) + + _ = rcs[i] * _df[i].abs().max() / 1000 + overmax_data(_df, i, _, 'trq-max') + del data[1][f"axis{i + 1}"][0] + data[1][f"axis{i + 1}"].append(_) + _res.append(_) + + _df_1 = DataFrame(data[0]) + _df_2 = DataFrame(data[1]) + with open(f'{path}\\results.csv', mode='a+', newline='') as f_csv: + def change_order(res): + _time = res[0:1] + _trq = [] + _trq_max = [] + for _item in res[1::2]: + _trq.append(_item) + for _item in res[2::2]: + _trq_max.append(_item) + return _time + _trq + _trq_max + + csv_writer = writer(f_csv) + csv_writer.writerow(change_order(_res)) + + while True: + if not hr.durable_lock: + hr.durable_lock = 1 + _df_1.to_excel(clibs.durable_data_current_xlsx, index=False) + _df_2.to_excel(clibs.durable_data_current_max_xlsx, index=False) + hr.durable_lock = 0 + break + else: + sleep(1) + global count + count += 1 + w2t(f"[{this_time}] 当前次数:{count:09d} | 预计下次数据更新时间:{next_time}", 0, 0, '#008B8B', tab_name) + break + else: + md.trigger_estop() + with open(f'{path}\\device_servo_trq_feedback_0.txt', 'w', encoding='utf-8') as f_obj: + for _ in _d2d_trq[0]: + f_obj.write(f"{_}\n") + w2t("采集的数据时间长度不够,需要确认。", 0, 10, 'red', tab_name) + + +def main(path, hr, md, w2t): + data_all = [clibs.durable_data_current, clibs.durable_data_current_max] + data_dirs, data_files = clibs.traversal_files(path, w2t) + config_file, prj_file = check_files(data_dirs, data_files, w2t) + clibs.prj_to_xcore(prj_file) + run_rl(path, config_file, data_all, hr, md, w2t) + + +if __name__ == '__main__': + main(*argv[1:]) diff --git a/dial_gauge/README.md b/dial_gauge/README.md new file mode 100644 index 0000000..b16f45a --- /dev/null +++ b/dial_gauge/README.md @@ -0,0 +1,2 @@ +## 千分表数据自动采集 + diff --git a/dial_gauge/conf.ini b/dial_gauge/conf.ini new file mode 100644 index 0000000..295d61a --- /dev/null +++ b/dial_gauge/conf.ini @@ -0,0 +1,6 @@ +[md_rtu] +port = COM10 + +[md_tcp] +addr = 192.168.0.160 +port = 502 diff --git a/dial_gauge/gauge.py b/dial_gauge/gauge.py new file mode 100644 index 0000000..0f44f30 --- /dev/null +++ b/dial_gauge/gauge.py @@ -0,0 +1,99 @@ +from configparser import ConfigParser +from pymodbus.client import ModbusSerialClient, ModbusTcpClient +from time import sleep, strftime, localtime, time +from openpyxl import load_workbook, Workbook +from os import rename +# import pymodbus +# pymodbus.pymodbus_apply_logging_config("DEBUG") + + +def initializations(): + try: + now = strftime("%Y%m%d%H%M%S", localtime(time())) + rename('results.xlsx', f'results_{now}.xlsx') + except FileNotFoundError: + pass + + wb = Workbook() + ws = wb.active + ws.title = 'results' + ws['A1'].value = '时间' + ws['B1'].value = '次数' + ws['C1'].value = '结果' + wb.save('results.xlsx') + wb.close() + + +def do_connections(): + configs = ConfigParser() + configs.read('conf.ini') + + # ================ 配置Modbus TCP客户端 ================ + tcp_host = configs.get('md_tcp', 'addr') + tcp_port = configs.getint('md_tcp', 'port') + + client_tcp = ModbusTcpClient(tcp_host, tcp_port) + if client_tcp.connect(): + print(f"Modbus TCP已连接到{tcp_host}:{tcp_port}...") + else: + raise Exception(f"Modbus TCP无法连接到{tcp_host}:{tcp_port}...") + + # ================ 配置Modbus RTU客户端 ================ + rtu_port = configs.get('md_rtu', 'port') + + client_rtu = ModbusSerialClient( + method='rtu', + port=rtu_port, # 根据实际情况调整端口,Windows上可能是 'COM3' + baudrate=38400, # 根据协议设定波特率为38400 + timeout=1, + parity='N', # 无奇偶校验 + stopbits=2, # 2个停止位 + bytesize=8 # 8个数据位 + ) + if client_rtu.connect(): + print(f"Modbus RTU已连接到系统{rtu_port}端口...") + else: + raise Exception(f"Modbus RTU无法连接到系统{rtu_port}端口...") + + return client_tcp, client_rtu + + +def get_gauge_data(client_tcp, client_rtu): + count = 2 + client_tcp.write_register(41000, 1) # 将 act 信号置为 True + # ================ 功能实现 ================ + while True: + while True: + res_tcp = client_tcp.read_holding_registers(41001, 1) # 获取 time_to_go 的值 + sleep(0.5) + if not res_tcp.registers[0]: + continue + else: + break + try: + res_rtu = client_rtu.read_holding_registers(0x0000, 2, slave=1) + plus_or_minus = 1 if res_rtu.registers[0] == 0 else -1 + result = res_rtu.registers[1] * plus_or_minus / 10000 + now = strftime("%Y-%m-%d %H:%M:%S", localtime(time())) + wb = load_workbook('results.xlsx') + ws = wb['results'] + ws[f'A{count}'].value = now + ws[f'B{count}'].value = count-1 + ws[f'C{count}'].value = float(result) + wb.save('results.xlsx') + wb.close() + count += 1 + except: + client_tcp.write_register(41000, 0) # 将 act 信号置为 False + + sleep(2) # + + +def main(): + initializations() + client_tcp, client_rtu = do_connections() + get_gauge_data(client_tcp, client_rtu) + + +if __name__ == '__main__': + main() diff --git a/dial_gauge/gauge.xml b/dial_gauge/gauge.xml new file mode 100644 index 0000000..4a8fe65 --- /dev/null +++ b/dial_gauge/gauge.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dial_gauge/target_dial_gauge.zip b/dial_gauge/target_dial_gauge.zip new file mode 100644 index 0000000..27ee435 Binary files /dev/null and b/dial_gauge/target_dial_gauge.zip differ