From 60726d9d07b83c3f70262b5af30ac247dcbbb2df Mon Sep 17 00:00:00 2001 From: gitea Date: Thu, 1 Aug 2024 17:11:12 +0800 Subject: [PATCH] =?UTF-8?q?7.=20[APIs:=20btn=5Ffunctions.py]:=20=E9=87=8D?= =?UTF-8?q?=E5=86=99=E4=BA=86=E5=91=8A=E8=AD=A6=E8=BE=93=E5=87=BA=E5=87=BD?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E4=BB=8E=E6=97=A5=E5=BF=97=E4=B8=AD=E6=8B=BF?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=208.=20[APIs:=20aio.py]:=20=E5=B0=86?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A1=86=E8=BE=93=E5=87=BA=E7=9A=84=E5=86=85?= =?UTF-8?q?=E5=AE=B9=EF=BC=8C=E4=B9=9F=E4=BF=9D=E5=AD=98=E8=87=B3=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=96=87=E4=BB=B6=209.=20[APIs:=20do=5Fbrake.py]=20?= =?UTF-8?q?=20=20=20-=20=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E9=80=9F=E5=BA=A6=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E8=8E=B7=E5=8F=96configs=E6=96=87=E4=BB=B6=E4=B8=AD?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E6=97=B6=E9=97=B4=E5=86=85=E7=9A=84?= =?UTF-8?q?=E9=80=9F=E5=BA=A6=20=20=20=20-=20=E6=96=B0=E5=A2=9E=20configs?= =?UTF-8?q?=20=E5=8F=82=E6=95=B0=20single=5Fbrake=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E9=92=88=E5=AF=B9=E7=89=B9=E5=AE=9A=E6=9D=A1=E4=BB=B6=E5=81=9A?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aio/README.md | 6 ++++- aio/assets/configs.xlsx | Bin 226625 -> 226780 bytes aio/code/aio.py | 1 + aio/code/automatic_test/btn_functions.py | 15 +++++++----- aio/code/automatic_test/do_brake.py | 29 +++++++++++++++++++---- aio/code/automatic_test/do_current.py | 4 ++-- 6 files changed, 41 insertions(+), 14 deletions(-) diff --git a/aio/README.md b/aio/README.md index 632dbdd..08af704 100644 --- a/aio/README.md +++ b/aio/README.md @@ -590,4 +590,8 @@ v0.2.0.5(2024/07/31) - 保持电流,只取最后 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,可针对特定条件做测试 \ No newline at end of file diff --git a/aio/assets/configs.xlsx b/aio/assets/configs.xlsx index c35dab9d5040a37a0945b415e3a87e9516f78df3..16eadd3a2633d06138cf75d353a3cb5bb3c53f66 100644 GIT binary patch delta 6579 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 delta 6381 zcmZ8lby!q;yB!z?n4!C42&D$3I|qS5r9nix8>vAg1}RZMha8ZSZb=F0kRDP=3F(j& zq~+>8-#y`umrF+W}S+VhGVaSG*hEU<>&cpVA(^`bVBhcW+6p(WX?mRS{Yx zm(AKe)o}%urTi#GpO}O`m7+dXLBKNVcMT#@M7Xtc-!$+kKspbP8@d{QNCcZE-ZQA} z=vfuiD&&UN%ChZV()}nOv{BA5y}HLd-)&3##-2NM6rtHWfpbXABeRH6%ss=`xd+6f z1^@trfEQZJO5EMmt-J{^AUn$JUe_J!$bHZayg%se8p^A#}4@Oi|$fX`{LMM^RdZY=v?Q~}J786ba`E|wPs0nue&_7Y6hq@}_(tiIQo-W=pg<)L*He->-2q@x#IN4HEi zEY{i3j5TOHBV34Uo;^1^5C9+tC+I>L62JsBsK-#|^l%@Ehb6{-S zVwEttV8&7Cw=>zr^WjhJ>%ZhzHdXVjImkSh9^A?C7obeuhhOb%Oki2mG!x{YrmJGz z4kZWIKYtWH;9X6V(J7(0v&z>^P#*nZzw}H=G)GQ%lo_c970vmkyBB1rp-H)u=y`(_ zK|MNSu#$dHKY7GR8do4tK*ph9FE&N{8i^hTj0dAapCdj2=AWLF# zhiP-rSRjJ3_@{N;c~Y%aGC%4|zi2dpD(9zxs6bg-NhMPyuZkGapt`Ne&?0yLf$HM{ z6@Sk?15;`q;|l|I_58a(mBc#cVt3nXzM|Z_b-j}(9A17F4hz{}S<4|7CVnp3TzRd` z6xKF>7HiS@?#$jAo#zzQhPTt3uWa1zp?1&L^UY9RGvv@-qLn+67|B~$wZ*_uneM16 zEvZU=Re$QjGUTK*acS^1;%$HWFnI+Afkks|CFBRUojrR7a zBV3&c#x5hw9_K zBrPd`Sd#`-W~xZqgjHjKLXBY>!|l@nnhNw#4t)AON^Xh%GeeHB&~JjQW66EXB_uaH2~QKLpDH|_IkXj$SL zrM*8T)!TncdTMl8Ys+^u2!_PRaV9aW$1*KUUA5(P=XW_%f@fIpl2Jy1b4#z!s#X+5 z`T$H(``9jbya}Nz!aP`@I$b*UP4q15oe&bAlai|6efq{UzIYSkKH;zmD*Q^#6o159 zzYcfHmx3_EnC$?)7AHt`p<>k68dIp2{^n{okZemqaos$+(-cmwN91P&gMmwb&sQH%5OYR zerQK)NsR286Rs(TmzZ4yF1j5F<*ow;9aHvnwZ5F=5B3dcJ6vTl z2<+ZIR8V{Byg&taulK)|GDMnRM2+vH8poG{Y8u)3Nxf_Lh~N{rJpYtmx;J#lARC`nuay(`^S||neREFR8%rn ze9R=bwvq9MT>>#6$UZPT2VQF1ua|UDdN=F25Y`z=R?^3Rn14762LoH*--R~ilciY# zEPl+JJCT>sc5K%7TOFRfK4h#iyJ&l%-CriT1#4Z)ae1M8e3QArx0oL|X`$feBleUJ z61SD-&l|{mm+O^^dT1PqSa}3x!OX797$A(-+@&2<8v&GG0e!Q*rAmZDZ?Q`(EU z^Q{V$$T?q=BHk;Am5amm$C&QZNbYle=DRrGl7E?Mb0&azLfgz!cWjme>@LPpNGWrv zdi?Y)_z#nIe;j>gn-pWI@Gd3GDT0ruE&A*&xciW9N#kk%@?k3>+xbPyGFl!HbnTp&?XgT%>B10Mz z9XCMs={hJxGDvQ@FfR>@`By&3k-X39Mz#KSsGtsU6^U?6JCM9@Uxzq~?8iD%w&%q1 z7y9+B@xNGDAHcfzdR}}&ndSDIwap(pt5e^BSVN>hFL4CKB_9?md)&ja=!V^jWQ5Rz zghA<{-GF4qlzy7VKR|ksG8LQz6cd_)tEFrWxJSaA$^ZGCWH;-`W=y88nDA$vcAhBS zC2B7G%Fja;dSMI6j9wXKV|X6dzrOwhYHvZ^MY)g8>A~Gw#oy95W{2pK>$mf25L*_H zRlLG1I&Hd@G(s`Qj1P##|KU!DyF%v=rJnYrqjk|gn!qQr^K1PKUt#ijXXOM;a5Ovx zZvEoP3$9yLhE^RB)!`MgH>V)Hd6?nGvshm-xi3D~jHqb~LQ*Tzmn@wu@hRO#5q3YV z4L9A3b36#3vnh=^;nEUS@CG<#!gNXHSMxH+@7`k=RE+Ne&99kaLnRw7%O(7>9CFJC z+o*Et%{mF?j{C2uxMfv~l&D%c>o765t_Ij!<2(5tx|^#GU!aQ4MafT;EKwDT;vRzj zM}e`j(!8vrXb{fI^HN3gZ|mZg(k;eey0HW#iK-WVvdoR%@Be{O{K3NhV9>vrj2Yjt zd1G6|8nULI?xOpke<}FvI1b%*Zr7qhGD?hkoF&sr2X515p)mb$P}^OVO}gnfawjJ6 zuKd2oYXMF;v1Pt-MkCXC(}R2ZhHRf5#_G06FGXPO4NkT;9aWdLCYuXu*&1D6gcM2j zu8jsIrpik!_^ZPDnL*2U@65t*12jkbD{;i)oaujg&wlqB)r*2@q-rhcNWgO++*H`k z>ogF2z$jm!ef;wpb{td7Tp7qhP(x$g~H)E|PWp8M>ZeD>(p!fcrBiz>s zs6~FRFa_oa%(TMB<_fFX%X_sKSI-1u=?o-6?TLHaJ!Tv}p?+;m8|5&DGk8)-`+jrc!q&D~*;dtPDGZEqVOh&3-Be%GQny+wH6zwOLQGPOgu8?G>EXoS#(qCk6Im6e(h7pMM>Z zU3nHxoVr5U8P?WQ#U9Wj_Ik$U)IU2&);rr9^Zi{tr39IV6Uvn`!y!oh-Hwb&2nt%p z>3FAv_kOJlB+FTU^P%W=ym*B6kusyV!vC%gSqjtAN8uk zT9Zj?U3n_0oZL8IOfECw)uHoxNY{#ZL7e^k4*h}7xY3F!S2Us4DbpnoRj7PhHt4qW z1MYq4ayuZ5>8MOL$w+Fvx+?hr&!DV)0&?^xA5^PJZ-|#0l>1_ro1Wx$8h|7F^;-li!;l5S0m3idiJ+}Msll!cBWk4T( zhr5)d`V5K8jQiH~QBn8|N*=>?Ri+kC%VuWl>bDO` z&l7=om+PFnzzo;LCwYF*rv@s!X~P0e1ivMhoE&)TN&PQ|<0Uln>}+6ZI>|q@@byT^ zo5PM-lb*dxXi3oWf1^1a$H!XV8c8H(TJ(*BgwCZQ+$;T&2-+(IWl8&eP1pXpmWT`A zF3lUw_4$5J&aq>k_6bSK*upQW6Mwx3|Jy)b0>TC5d4&Pl(f$Plne-b?#~f^Vu@BzG zZxdU^;&Ol{Ap7dfOK}Y8m4VirR7NBj(LVva>Uwf|Z;@UTB^ihY2|8T8e**A0XFr+3CZ#7Dljd(!DqL zBJ(w|k1Y?HYB0_vdXrQ6DvsR>ccE*CpX_`Q#~-(_S?!qI`KKrA__F!I6Q0mbQA{&k z+kSQ=u@4N+!m!n6tbQwIH7Hk~8J##4)v63u7?w0al@hfgK1FTlU}YN%p+K`i9d$Js zk;ynPCjq7o5`Pr6$wV(aEJ==R^ubz<#8Fr%L-!fHjVy`MA&?<=S=9I`Ngsksc$8p_rn1igrAtsy#5y_-IJfQgP1 zMsQAV*M0k@mG-CWe}%{u)MO?@@|x9RD4eT2g~xMZ-{`6Zs;m9OFENE14c8h4RL#%z z5hA>k(I2vm`lnZNK{XJP{GJYloAy8b8)|*cdvH^c6oUajZ3CDY;PK?W9;W<@@nwkfbpJ{Qoi`EZi z0#k&fl~NJkh?izTqVmH7q#8VGmZZvN4B5^}C4E>RBW>zmJF(wRrf>wGP$X7T5pBPd z@7X;eD1)u#kcMX=QSjz-HZ*I^Ds2n}>AJk|tKr{U?)yXl05t%^<_)ApVT~Sp%o;JH zvOe#JTxq#c4&*>gKcwbxkAIdg3yN)CqIhU2ngvJtd(GlDQdCPgB_x{GaYNH6`w|Pd z8KU;}&Y9=5uOZiIVT98f$_5ENz|h5;tNp3XmMs1L_VhB&yZSb!n|19VTVJ(kerJvz z`3rXrsU8q{^5=%c&j!+{o@)-yz09XO(L5?rfM&i|o;CD^`$uwbQ;BZii_#TX zcynYNbF{~XFL!{u%C0@~re!lhN9t)WnObPJxei_KMg2iUFv$=Cg^21P?2R5{fE91y z$R7s9q@|FXu+dH47Ne>0o7~Fr{o>k^k>tZw|83N9`qNqReSz^W@Pc7O(YylB2X{^M zR3x_;!HRpE+ubh4`FYi@66One@$Us@v9Ow-l4syCc9&AN9e#T(yKh+X`@R`P`=B&I z7QGep5GF*mny5Az_a5cNjUZC7Z(?vdO(L&?(q%3ai98u44YXtySnz4`^!3&X-&rNv1iW^M>p}y zjgKBz4+<&Ja~r`|-&smP*kV|Icrk2`xVw*!b8wDbH=AK`P(nezkp8oaG{l*k#M{Y> z!|VPRNN>85Wa?o=)hv@$a{H6_rO8duhX+Aau;quGi`vRYbTcIvX-{y_|*HDFWNRd z#a}jiQr~!#Lzr?D*=p)mT-f>(jJ5o^6_Vo_EINBX7@#zbs!rYHa_`X#vI}WJnC?6t znoTkc{`NY~d2GgUR)H%V$2BToNridVpg^#`BRs;KrrsV*S%tpxHA_V06;fk zSbz={FRb+^sr2L8v-B@SB-HU4CTJ3po9VpJvzPQol*u4%n;y(8;hF*_%|mgtCcH?@ zDaRsX`-4YN3ODi8I1C z99HzUzUURxD2IsQV9Q`?uWfROz3gR50H~L@Uye)H7;k?Tj=-l)BW_>sJT&!NT8+6k zORjdINSwqa7wSS&?v1W{?npkA6O?e+Ir=312~M;9mx`QNV4R zVofRWi^NS|&kyUk+Co87xmr(|y$Y&|3e2AHV2dr1@>WHR);Qm|MS@AM73`;v_d;9? zQ%N>0rMg+81s2=WVL+3v4BAR9P{)a;t=suQ^ITgqo4Ma2o5f|lcHj%XkG!)xIa3t9 zv6(&d0}hup(yJhRTv*H0_|(IjG0}`rw_@S9obwf%S}=7#3aYXD3C_iC$IpT)Eck#431SrGwzv1%l??!^VIsxaf;z*|gz|3$yukp0#5A2+u!R6f9`K#U6z^V}6kgIV 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': @@ -195,7 +214,7 @@ def run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t): speed_max = max(_, speed_max) elif ws.cell(row=1, column=1).value == 'negative': speed_max = min(_, speed_max) - print(f"speed max = {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: diff --git a/aio/code/automatic_test/do_current.py b/aio/code/automatic_test/do_current.py index e489a13..9b8ec12 100644 --- a/aio/code/automatic_test/do_current.py +++ b/aio/code/automatic_test/do_current.py @@ -64,7 +64,7 @@ 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: try: @@ -168,7 +168,7 @@ 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[-300:]: + for line in lines[-300:]: # 保留最后15s的数据 data = eval(line.strip())['data'] for item in data: try: