From 66df4edbedc1c39eca39a61d5a13b9aa8ee3aac9 Mon Sep 17 00:00:00 2001 From: gitea Date: Fri, 16 May 2025 13:55:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E6=9C=BA=E7=94=B5=E6=B5=81=E5=8D=95?= =?UTF-8?q?=E7=8B=AC=E6=B5=8B=E8=AF=95=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aio.py | 1 - assets/files/projects/configs.xlsx | Bin 227406 -> 227545 bytes assets/files/version/file_version_info.txt | 8 ++--- assets/files/version/local_vers | 2 +- assets/files/version/server_vers | 2 +- codes/autotest/do_brake.py | 20 ++++++++++--- codes/autotest/do_current.py | 33 ++++++++++++++------- 7 files changed, 44 insertions(+), 22 deletions(-) diff --git a/aio.py b/aio.py index 8b6b420..5c1da0a 100644 --- a/aio.py +++ b/aio.py @@ -807,7 +807,6 @@ class MainWindow(main_window.Ui_MainWindow): def prog_done_ec_send(self, results): flag, result, ret, error, idx, cmd = results - print(f"res = {results}") if ret[1] == "error": clibs.logger("ERROR", "openapi", f"{ret[0]}", "red") else: diff --git a/assets/files/projects/configs.xlsx b/assets/files/projects/configs.xlsx index 675b2f69a0c30ab8adb67fe84ee1073e92cb7a9e..bf413cec92091cdb2bdb93b3e514970e90131a2a 100644 GIT binary patch delta 4322 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 bB2zEyk6?%*k%}*tKLm1>q{RPH?}7dY@?{BI delta 4151 zcmY*cXEYpa)84gu%j%*;TfIjwQC3|MiPbyNd$)vGSsSaj6^n!rY;>ZF=$)t$BvGS< zB_v3K;PXE3kLUg7oO{l7&$-T=`7!rBbA9?jGjT{$$4W+0rrPatgykd?Mpi3BH@e?A z&uXY^5+Lj#p!hViQ-UdMGz?7aAvs0W_{H{B(l1$9?R3$G|2r5%kATj^pC9Az+0VX( zXSfe0lf#sf(t{oOV(W4Qv+nVRsC~=5=c51A3MDh4kFH739;%+NP2I9J)O&HC2H;$AMa*rXHhsjyk4j7WV>oi>LmFh?hW{m zVwJEU)mn+|ZbX^~mSQFDY6DRo$U&}0ikt#VQ|h2BA4^jRjV&WrK#k}#9=<+!zJO^41nTcNvhC6^ ztq~`bgw1qw41GKqobl0m?9`C8FdFVm0~e9RDbE`fCWPVR9W66x-6pVXDJLORSvMvAI9@M&HCMwW3ovAHdEd(^~j+B@=% zzQF)#EtVT!F4FqY4k^S1nQPe|KcX>zF+PD+3=cJRz2;8N*Y^MsbTuUrcr@_f;=78_ zq`PYD!zYkTSIOT+Y^jKWhjhvo3ijJ|46-QvPGt1tu^n3I?sjXJi9XJ`AGE|N6@#OI>Npt2Q+Pir^9*YZOL$gQ4POj}AfduvgRA$?vkgjCP z0KY56OTFQc#)(=4?r1a|#_$Z9j_IV5I9axV3JObw`Ao*$;}BKm1E~_Z?t*Q{WuPj5 z-^z8}Qgz1P3j1SaLtOcsIo`aXr{a6~pGSzR{q4Tr?Ok1$i&uYW5bd3*m5W+7=rgJ5 z`y8CRza~i`lB=2gHkaN0`wpQ~sp`xOubSU=i2K*VClc+F8!Qz#4Vh?G{998-olkCj zI3vSOgBTm+DLber6-n<9ZxI6ko^)6T@J*zQM7Xcd3+zbhS1EAZ0pGZab|?#O^NR-j_4{k=CSe*XeTPt&EBy)aRLkV5a(tZ$V zm*{1e?x4=nA)Qd=Y&KF-Q^+k?x8ZboGPYMZKIaFpMWaWVUDg-<@*vs%8q(|pPNXTT zm1l8IUzc0{LO#$u4wq$EFUu*An2;!oE^osWS%~(m=^R;WZnDJ#M>uv{*xxj8-un?5 zkeKV+K?tl4i?^f{UKG}VmHaslwe#%DrYES)sI5;=uPXF8ESFLc6mqjxb!|F=q%*O) zN4}?6mrSW>fu%VlOWZF8P~_STN})Q^|+(&Wy9SS+-V_at%VF-ftB$o>8O~#f^lr|=00Z6w97=E_3qZqVg~gbJAiLH#+>lohFHFv*_x|cNb}Ug1n+P zdlH7vZjE#t*gf*&xu=zNtP8`C=hKO0egES;V)XXKJ;E8)(H}WH54?rAl%2PP-OR6r zd}sx|AN6?->3*xFlxMX0L9-|EF@v-&Iz&mlqb?oKV_>~>e4(vFJi`gsNLyc7`oBo$42>Pg0&i%G^>a{y$Ud`4kiaA)# z$M+`JYQT-!>L6%h{hzbcS|swK%a@l&U(~PWD)IVRV3?b8%j>NW4l_|IBKwaol9R7s zGXw-odAn+Z@fjtr9!b$%zKTdNJ|~$^1!jBEQr^4P?OY1?%_Ci-Ttd(G_hW;v@P~6?kC!XrQ2jFG^xz27-xywWvQXM`zRL~ zCJf^?J#7;=w*2f_6zSEFtw9-gU=E!ua*f*fnLdGYJpX}NQH*Z$3n;Ma2$FZ#z7(d{ zWAQC=-itP`cezxf!L1EZZM>y#*F14#pVExjoA!?EQ`^4=GjD=8&<=^h9j3JB0xM-T zN$-rUiV$!mD<-QG@+TH|*t(u;a_|}mRCQC2ax!O@R9NDr`tiNuLGd|wRX${guwqP1 zTZfBx#tI6`-Z@|KiE;(naMP}0P-7rSj>x-8FU^Y~XVA$vLzrcQ$;VXQm`vlPzH5fO z@>Fso>m$K@8lnJg|4Q*PGn?S9X1;u_Wz4S*=KTYTj`jefqjx?!dgl~g!5&i&r9aM^ z53LJeZXNV~G4W~mJcPG=te7J}jF1|U+!|m_(ngZV&-Ca9{YjrQ<5E{}-|Ax+IN@bVi%2xl>m_y5Gjfy^}@uSJn(vUyIwDf`s`p z`Wr{lwk)4!)=}7&*`Tn5x8HACC2nZ4S(< zKp5S$xVUh6ckWz>PJh6xyJFTXzjWN!O!PBimeo@yBRbb-uCG2EZU+X5XEM7^VkIxS=$Y__X ze&P-8?jWd81;1?mv^&0cZ-I5?;*-l`Lz6ebld2;*DPh0;Y-clO`OYyY`4qx#Kat&? zkoTY5{5(8OO)|2<8Py1D(~bUj>pfFuT2EGEJBy<0{k$@=8gvPtRtB3h-+Z>w-B%!| zhim?<#Eml*XY-CTipvl0co(m$^VO`7 zY1=aFF^QFmjMx3DnGY@HuRh$_;C62e@;6b@y+f7n-lX6uyfFld+rzm8Gwa9SvSkoyJ4Xr|ds!uUvHs~7A~_uI36U<}FLvklzBTG}sA3Gf zhBrm)SV_l}mVeF2J~&d$W^5TGd-!n9^wA2l)Z^#q;{dwPvMKz``qfF*HiMpjrLw&y>faswyMT) zp&I0^2dJfoyBM%^1-B7CE!fGf71B}vq2$h4Ake4!d3+9?za1HvIf!&aC%hcuhT+i;*b!nl( zm#&9V^akZ#G5e3cwNq{RpvQoX%$LOf`8;B)L@-q%!0SWQQY8Ws)Fff`dBbPhvfvGp z0U|%Iy(rq(7^>kQH)lM6{`431p2^g1??ACUA~3|?mv`uET-uG}-4IX`beKTutJ;tC zMw0seg!2nglmFEC0pIY-C~WuHO-pwdGeI$xqKJLF3j-fLqCZOf3GYjh5S@}ITUW}w zon=8`ZEa(mOyhuZ5eT5&?2jntZ}6*RX+=Ja8eop$gT`5+Tv1kW?1c^|+KpP2%Y2oB zc8!1@X+~~MtJps7esy~)>pXSI#?dDxTVW<`xnY4fKA{i~5A2`6Qwb?KbZU^T%^EiQhbagzTEW1M^l2o4m%C4_+VfIhhC5ReWL z42%UbGvUNTK};O~$_M~}^?Din*S49iS!}rQP>=`^gewjO2?+eVjQ{{N|1z%;2@e1e z?jso-65->DlMVwhvH$;B@xSDEIIb{|CJ>Bs3cD^QTntwh22uwpx`A+O?jSbYg&T+x zM~eW7faKl(2|;iU*EgUdE)fBG093$zL4cIm|7ji|0N_jn0MPw!c7Os-DjcLnH0p~B V2*1{7O#!%?a1cK!M= 20: - clibs.logger("ERROR", "do_brake", "20s 内未触发急停,需排查......", "red") + clibs.logger("INFO", "do_brake", "20s 内未触发急停,需排查,当前先继续执行......", "red") + break try: clibs.lock.acquire(True) @@ -337,10 +341,18 @@ class DoBrakeTest(QThread): time.sleep(clibs.INTERVAL*2) # wait speed goes down to 0 flag = False break - return time.time() + return time.time(), flag time.sleep(11) # 排除从其他位姿到零点位姿,再到轴极限位姿的时间 - end_time = exec_brake() + end_time, flag = exec_brake() + if flag is True: # 没有触发急停 + if clibs.count < 3: + clibs.count += 1 + continue + else: + clibs.count = 0 + break + # 6. 保留数据并处理输出 ret = self.gen_result_file(axis, end_time, reach, load, speed, speed_max, rounds) if ret != "retry": diff --git a/codes/autotest/do_current.py b/codes/autotest/do_current.py index 9137feb..7870f89 100644 --- a/codes/autotest/do_current.py +++ b/codes/autotest/do_current.py @@ -3,6 +3,7 @@ import threading import time import paramiko import pandas +import openpyxl from PySide6.QtCore import Signal, QThread from codes.common import clibs @@ -16,9 +17,9 @@ class DoCurrentTest(QThread): def initialization(self, data_dirs, data_files): def check_files(): - msg = "初始路径下不允许有文件夹,初始路径下只能存在如下两个文件,且文件为关闭状态,确认后重新运行!
" - msg += "1. T_电机电流.xlsx
2. xxxx.zip" - if len(data_dirs) != 0 or len(data_files) != 2: + msg = "初始路径下不允许有文件夹,初始路径下只能存在如下三个文件,且文件为关闭状态,确认后重新运行!
" + msg += "1. T_电机电流.xlsx
2. configs.xlsx
3. xxxx.zip" + if len(data_dirs) != 0 or len(data_files) != 3: clibs.logger("ERROR", "do_current", msg, "red") prj_file, count = None, 0 @@ -26,13 +27,16 @@ class DoCurrentTest(QThread): filename = data_file.split("/")[-1] if filename == "T_电机电流.xlsx": count += 1 + elif filename == "configs.xlsx": + count += 1 + config_file = data_file elif filename.endswith(".zip"): count += 1 prj_file = data_file else: clibs.logger("ERROR", "do_current", msg, "red") - if count != 2: + if count != 3: clibs.logger("ERROR", "do_current", msg, "red") if self.tool == "tool100": @@ -45,7 +49,7 @@ class DoCurrentTest(QThread): else: clibs.logger("ERROR", "do_current", "负载选择错误,电机电流测试只能选择 tool100/inertia 规格!", "red") - return prj_file + return prj_file, config_file def get_configs(): robot_type = None @@ -157,7 +161,14 @@ class DoCurrentTest(QThread): clibs.c_hr.execution("diagnosis.open", open=stat, display_open=stat) clibs.c_hr.execution("diagnosis.set_params", display_pdo_params=display_pdo_params) - def run_rl(self, prj_file): + def run_rl(self, prj_file, config_file): + wb = openpyxl.load_workbook(config_file, read_only=True) + ws = wb["Target"] + try: + single_current = int(str(ws.cell(row=6, column=2).value).strip()) + except: + single_current = -1 + wb.close() prj_name = ".".join(prj_file.split("/")[-1].split(".")[:-1]) c_regular = [ "scenario(0, j1_p, j1_n, p_speed, p_tool, i_tool)", @@ -199,9 +210,9 @@ class DoCurrentTest(QThread): clibs.logger("ERROR", "do_current", "后台数据清零完成,现在可以重新运行其他程序。", "green") number = conditions.index(condition) - # for testing - # if number < 12: - # continue + if single_current in range(0, 15) and single_current != number: + continue + clibs.logger("INFO", "do_current", f"正在执行{disc[number]}测试......") # 1. 将act重置为False,并修改将要执行的场景 @@ -278,9 +289,9 @@ class DoCurrentTest(QThread): clibs.logger("ERROR", "do_current", "processing: 需要在网络设置中连接HMI以及Modbus通信!", "red") data_dirs, data_files = clibs.traversal_files(self.dir_path) - prj_file = self.initialization(data_dirs, data_files) + prj_file, config_file = self.initialization(data_dirs, data_files) clibs.c_pd.push_prj_to_server(prj_file) - self.run_rl(prj_file) + self.run_rl(prj_file, config_file) clibs.logger("INFO", "do_current", "-" * 60 + "
全部处理完毕
", "purple") time_total = time.time() - time_start