From 2a3b31c2268c27c61c4500637f33552a1ec8a23d Mon Sep 17 00:00:00 2001 From: ranchuan Date: Thu, 20 Jul 2023 18:00:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E8=AF=A6=E8=A7=81ReadMe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- python/checker_save.py | 9 +- python/checker_test.py | 23 +- python/code_with_checker.py | 11 +- python/file/7-15.json | 1491 +++++++++++++++++++++++++ python/file/7.15.json | 1491 +++++++++++++++++++++++++ python/file/XT_Foundry_Test-7-15.json | 1491 +++++++++++++++++++++++++ python/file/XT_Foundry_Test-7-15.xlsx | Bin 0 -> 12583 bytes python/file/judge-xt-checker.lua | 7 +- python/prottcp.py | 13 +- source/ReadMe.txt | 6 +- source/codec/codec.c | 12 +- source/main/compiler_info.h | 2 +- source/task/prot_uc.c | 2 +- source/task/tran_for_coder2.c | 3 +- 14 files changed, 4527 insertions(+), 34 deletions(-) create mode 100644 python/file/7-15.json create mode 100644 python/file/7.15.json create mode 100644 python/file/XT_Foundry_Test-7-15.json create mode 100644 python/file/XT_Foundry_Test-7-15.xlsx diff --git a/python/checker_save.py b/python/checker_save.py index 03c0c1a..2f9ce10 100644 --- a/python/checker_save.py +++ b/python/checker_save.py @@ -60,6 +60,7 @@ class save: num=0 for i in self.json_obj["TaskArray"]: num=num+i["ReturnCount"] + # print("checkret_num=",num) return num # 计算超限错误字节个数 def calc_parerrnum(self): @@ -71,7 +72,7 @@ class save: ret_num=self.calc_retnum()*2+8+self.calc_parerrnum() slave_num=len(d)//ret_num for i in range(slave_num): - print("slave:",i+1) + # print("slave:",i+1) self.save_item(i+1,d[i*ret_num:i*ret_num+ret_num]) # 保存一个条目 @@ -85,7 +86,7 @@ class save: # print(d[8:8+errnum].hex(' ')) a,b=lua_test(self.script,self.scheme,d) s=s+a+','+str(b) - print(s) + # print(s) with open(self.save_file,"+a") as f: f.write(s+'\n') @@ -128,7 +129,7 @@ if __name__ == "__main__": # sa=save() # print(sa.hex2bit(bytes([0xab,0xcd]))) # js_test() - check_data=bytearray([0xB5,0x96,0xEC,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0xFF,0x01,0x00,0x00,0x00,0x00,0x21,0x00,0x12,0x01,0x00,0x00,0x00,0x00,0xB5,0x00,0xB1,0x00,0x6B,0x00,0x00,0x00,0xA5,0x02,0xA4,0x02,0x00,0x00,0xA4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00]) - lua_test("file/judge-xt.lua","file/EX_Coder_Test_2023-07-4.json".encode("gbk").decode("utf-8"),check_data) + check_data=bytearray([0x00,0x08,0x00,0x02,0x50,0x01,0x00,0x00,0x40,0x00,0x46,0xe3,0x4f,0x03,0x58,0x00,0xb5,0x00,0x00,0x01,0x09,0x01,0x10,0x00,0x00,0x00,0x4b,0x00,0x78,0x00,0x57,0x0a,0x21,0x01,0x6a,0x00,0xec,0x00,0x04,0x01,0x4a,0x01,0x1b,0x01,0x23,0x01,0x40,0x9c,0x7e,0x06,0x90,0x00,0x43,0x00,0x77,0x00,0x00,0x00,0x03,0x00,0x40,0x9c,0x80,0x06,0x1f,0x00,0x54,0x07,0x21,0x01,0xd0,0x07,0xff,0xff]) + lua_test("file/judge-xt-checker.lua","file/7.15.json".encode("gbk").decode("utf-8"),check_data) # lua_test("file/judge-xt.lua","file/checker_ye_cfg.json",check_data) diff --git a/python/checker_test.py b/python/checker_test.py index 29babeb..de9927e 100644 --- a/python/checker_test.py +++ b/python/checker_test.py @@ -123,7 +123,7 @@ class port: length=data[8]|(data[9]<<8)|(data[10]<<16)|(data[11]<<24) self.num_to_recv=5+length+2 if(self.num_to_recv>0 and self.num_to_recv==len(data)): - print("recv:",data.hex(" ")) + # print("recv:",data.hex(" ")) return self.decode(data) def encode(self,data:bytearray): t=bytearray() @@ -156,25 +156,36 @@ class port: while(tick zM+f@f7e+c)E6a#P8JkoAl%TU0%n%RoTF>PgLJDC8kJ23PwBq(i1>bsgG|IP*Z-iS* z$vVZ@_*WC>T_92Or7L$8i0eC9_;Zy)O`*L4w_5cUk9$t{M|(dPm=Lbj?^;__+O>m; z6@wd7=Ohs6A3yxUNqW_-?Cs?sN>s>egkG9^6eTpWiD}1cacAKV-V-N=);ODx(ZLVp zn8>ZLemu7i_;t=dDF5VD8;@-Mv^?zHMqv2eiZ`WpA$Yf_ciem-$+9I)@B5RJEA*)3 z&X+ok^r=pKw`o)EAJ9(j?pFC*sTP?PN0o~7O4nZOCrlBjN1i;HGf^aq!(K1Tk#dLE zGHjE~R;4 zWPF;O@m!j@@Ry$M$T#XXs{UM%y>Tf&W$|4KCet=qavNpZ!qy84CXb0s^i1N1uamjd zLYhgL;&3U9;{^I)KX1`eP<6{EUgFLM1X&jHS~Mq@+^ z!cLp|1-Ak#z&OybOJ%^UI5lCijzG=iuloU&3A4ad)v-D-wZy;f$5gsA`xj*ZCYqt8 z!@XWMf2|Cgg{C$nnZawzWSn^b$PFs6(h^$DP=LTgoCWOb`iAM4jzvaFIv(LXRP9WL zXmx5OSQm-yXjpA4umss6x#KuI$R?OQExg>=fSOyNmu*?dZ)O1F@N|>6;qq;cy7x&hJ25Rcp4nAX{~`EKDm8EQ>1-YHGEQY8Bot z&?+T6WaQ2#LSHp#9yB0znyIe0KV$)XDw=_C(cH328G5&=`uaF7Tf6~rr?qvFI<)3! zS^KqRLbmt_!bRt^4t93DH_IF0isu8g{J&yql%HME6aoY!?mf)@OH48Sj;SQ6s9X+= zz`H8|%9B~s!mf(sw7Ece@>&sV6l?5vxI=Pb0hN}w7XfY3+v-o_1w@O`e49JHhF1@R zzX;kIdlzpOti&_78B8mmUVrES8@GTy-Y=}k{&waS!Mm%#6|4JN!rsZ&@pj^lsKSQy zube)Fjaz0Z*7OQ2r*bFxxcoPbw_H&KPg~Q{SDn2UEbBoHoIHYw4t;iMqKO5qLFUNx zy>ClmK0MA(4X1ZDiML$E=?Evy$;OWtvugvkjhv2Gi}qaIKZqK)u-%ITVRF}Y?e;rc zZ~4r9pnn#3`gm|RUR~@t04I(%I^H@EUcA-W#=D0ky}cM-7$Jgh7u(VcZC+j)8$5Vr zt|+7vhC2A8qB6VlQ!7hh{H3mbUOcT67R<2iJm@_&+8xrr6(L@uDuF(rez*7#m56_F zwMwT%I3-Sa>8Hl7RJ(%k!i$qI<<>b$4BTBsXwuHT(`gG`Py8{cUL0lA%&Cs+AIPab z>HpK;EIo$bg=icF09#33HjX9G6ICwVl_h46Q?_KR$L_C=8^Fd536+h5gL5s8v|3+< zo0s~z0zokqaiKmg3=~P}Aesjh%8WVBI>^vSylx4?MEfJ0AXq@gFte|?WymUGbOlN= z5~ztv0UQ{cn)}B=)dDQxEi;&jLy`yh?hXnDKj*Mm+X+_Gs2u8X zD_rwU;Es)~gEqc!wiJ0UnCga)H9$c z)`GzZB_(sfD9rPy8mzycD1-$D|1wjYZm0T@PoBO|%A|-PWmxScX}A5w4KLo2S5ldV zx)9E>Bszyf1WT(F<0<6{18|TKXR4}bj#;EiCQ_}Uvr>Wa)Y2+`K2K{Q>^^mxNGBUw zlRvgpJR**&!P^ihwR2>5x;w3tlI0@-tDfZ>fw84j_i?3LxI-4(nog$@mL@qaHn83n z5H6(o(oiqGb8uIq=VV)Ly#hfvUVU|?j!R8?%(W8p@zODUcsxH?iG>YdAjQI#8r-*D zTW(1zcb2@S-4d!~aZ>vHsl2~(%VuD`ws+(BfES)Uv6?_MvDUVwj7iau*K%pg{`NW} zKUIp|F-+Iwms6-NyJ7$!DTPqi1bBwdo@jl9KsY&afkrsFtG{yC-g|L;7vhm@cHYBKNa}cLv_MQIwYYRsK0Sh0E~ezgMLaa$JYZ-`D&E!<=&oBDp!L*) z!qL!%K@1Ear$QLYW(W{^MhiqW+fWfX!VYT%zJmXooqU{>Be37uN%z0A6Z7BfBonnP z{(j;=U?!Y}7Sp+`g!@u)ggM(N#I5mi>p=l<$X1xi-}u$HBWyz%CUtQ4(Xlj5%%_qjvf{B)AxYXi$cx%2Jd z+r3vwfjk9kv(~!xnFD8Bs>*_HuC?Oekt{u5gxgOb%qJdy{Jo%0y_R+g^=&Xm_x=JGI4?Z@(4#9pXw)^; z8$uifMlOs=6;0a>BE9(;{R77qPc{uDoOqs|FZH=E-2IL~BxZ?yl`lCw)DJM^247^9 z9Y+%LkqfXGdNW`8a}b1k6ba5RMI)%-F^p!ujOV@x_a7uUjY8mR%HT{b^-g*NLZvtn zKc4S+mGWsSP7vmN#ViL*fwRrFHlLpL2H{(V!d*%wFo5A_q0&0}5c4P0h8A`G0wd4p zf>NDkS)+O#D2)D9MoOdJF^K~UsPao6@I5`F5 zkq>l1sawh4QO2T~;3@cF7c!ukZ-Rw07N4FmkJhz@`+_cCyD$uz+&BvklB z3?81RWBLoXu=UAul;a`9{6Srh{N7TJj)ChAfh2XYCX|+2&YphJmFpG(G0dqHRQODQz2#&a)5KTJ9x)(|9-XGFp^Ih zDN4iFtEd)v*p3mMP~gYVa1@%i2FPS+<)YM1xLgX=K_cWwnc0Kj0Pj`3QNyXX zk;TNoN8lbY+N;sF7#wid+%LvQqv*-$m1GO}u_Y5B@GJkwY~sbOTpKVw=Ap2Ayp{jo zWU`~%jcf5vCh7m3Oj!OVlkv#EQymP{zfzqb0cwd-aP#qF(eeikX4qok^Z=M5$-5Qg zJ_>zepj2%!@d`BG*st0zH}APlo2yOB>#Xhqs+VMrh{Ia_)69(%;mgh50`SUo3i-wf zn7Lw68|lsFb?sK$(ztf_y2#S2KL&hqawG^^ks`QjHE<|?k~=AHj^qt)Xr1l7x4FZ+ zYpf`~i~8}4z#+!)BA-u(%poB0^o<~wmq50)z}&?qahEH}-*LQ|Nc8d5wdH2YxSl`4 zYvvbi%WhR<#}BD|WegkDD5W47U65$P}fW<)Xk$V5>n%&?Q>mJzD&*^cT*y(%(JN7ZBI zsMkdPePhO^s*_e2!w8fCg{=A{&0NwmfuWurC=fk@ z5yw*>zer%av@+OLO?c{kP>@wpTD%}M3`Ujk`Na2b& zd>j?-H=4Sl*c|fDSirovJ1{YRNV&au`-v9?okPnk8@LedXzG z&v@A|vJki=1g;K%#_lKDbQI9nt2;}72V@@O^yeY`k1HU>c#<|u5 zI2vG*GCrcOADY#Q)6c)uoD@$r)nQnaI4TP362i}a0y{0#-mURU$?+c+SI-Ve$Jo-> zjNaTLRh|hPGs0&R0mM$#TsqqZ_Wqh{)Y~Pk;*;i9^ZRDCQDAB&+qYN!4x@fVYnlRP zZ5Y#hY#TIUoNE~|Vtf~;en-pE3R7k{#*}EaJ+=aY?_*(ueSDu8Ns1UnXc_Y3o8HXwAPry^qj7F>r*}ewqiv&WH)GOD}j6Kcd}Gp1AMI7P+wR z>U_7VyCxNhT-KX5tliL@xbHF1=al8B7|_}pMzH}s|2e^HGP1dy7XyFG0)wxw4O;+s zpBA7iWVBVAYi%ReKX8v1fy`LhGPa2-P?s`jVN|ue~_pyuMrW}J|X}-Zc`RN>gMt9Q*4}0wBEt0Szb@cFY z0QyEKp>OHpXomC!o%Dtri#93M+iSKTTCq{0)z4ine0g}PYik0S@V~B3j+{9>`OQ5Q zIPGerdKuH3$GXQa18R)1_7df;+}xaR9eq|vU$73|gfa*c_~jDPv1?lgOH;9y%%am9 zcX}^ww)Y>?Gd_PqFh7gfN;+SBm2{eIc+NVyISey?>5Vt}w`=D!{mWk7U8?tf{^0%X zTA;m=rNi$A*8ez|?yr^hxN-Ad29$s^FSzPE&4$jbEUj8%!nJei1V4DXQZBT?nQSMz*kHr2O zV+gf4{u&bqwFLfdNoYYoXnM9uNbY61^@ZzF_OVTHo7 zU*O3qv3hS$|L9GG$P`CSyvIZId(RK$ebWqW4CL)?Y#r#o*xLRT5a~+1HY*G$Yfk`( zQ%1~QDmZ_Ad5%v^bw!}u!(;N4-$I1p$jKJd6)_<39ETJ!V3zxbVv0|vNt9lta|YgW z;vh!tkLZ3~pPp`Qtw9g3v&gg&)S*g3nKu3;Lnc?t{vHcL7zsS(5z45R4x&{+17iXA zzoo)8kN0Z;3*UptgO#_mnjc&|$5Axqs-V@OP~)WQK_bDMxLE*rTRxd3adao&E?3Ns|t_tSQ8^ zG(2}MU-!xPa1JTG%>c7LG;oMY^c@g&&KeT*W%-yDZ=_Y46Woh=#PV-#=*C%f=virI z-FYIcRt8hK?O~f;A5qyw3D)a4u-HJaKH@Q1HFBKR z6RHu(j~du{={`Rzdp3XCB|bab?Qa!XIZ9DQO~|Yy!v3~>d3kX<=)BzTc5#w3uRUSo z&PtXNyydxEY z)7F1VVwkv3TK0ps-78((f{U^bL(9s^{i%vr;|OZotMv7-&A$WY6eLBF;obL^?_7xb zzkP3DV{i1^`7xu`Jq#!!cQ0W>Pkl(J`C&01>M;S|HRDSxbv!^yFN7LazIRrlfAH1o zXKFE#Jq_2EcBzSc?c&N-37rneg29;4E|Ll5ORT+z6`4@#H!H`CD}oFzQ0bPQs0(B- zMO3Hn66wy>o{$c0SWhJ|7;N}ZECrS=*fg)INX&Nvg+JoG4|N{$U5vI{NtU-ioq^3C zl`t+1QS!>-NVf|&2#=iV%r+(OzR$gCdW~Q|mRS*Q1FtERsMl|ulhIdZhFoSoH`^yn z?c0M`r#Y>%3pG>`4aaCQsGv8ePga8!0QT&Dye71DSMSfPW?A`Q9yFr)XGj ziU;C3)$HiqC_!xH@h>M%p}COonk4CM$2RFf&g323132yQOwY^nD38FwhY}mF2Z54c zpMP&JK78mt6vF%VegXk`Plx|%r8}5@u{SbQaz?ac z!_a{-AY?J9U=el5r8?!tu7o0+grv~{{a@;yYU~9GxUpA2?J1BVNwASO;mOG(=`W&^ zD-KT!AK*PoWSeIW4y{*`bwpuSRptt1(??xoy?7ftUl#fde(ep-?BCDsgwQV%pHoK< zLn|QQNJ z@VR0n<9xf7;|-PW8RIX=kPVmV{W+5fl_QrSIzS{!EJ8Yi9tADv*LB|2w|Ji?=f-ej zY46^L-NCw}lpz!OcBQdH7a0KN&$npkd3}3LRcs`_dwtt=y?+AA_BHofC)`^@@yMwr z$t7b(72c7~AQOHWx^9lXu0as(%8-7GHiR~B-kg3&t$zg;I(RidMozy>Te*u3kx$#^&f)i2dGrm)_?5 zxc~zL3Q^rC(h9UZM8sUZCVZf?Znmn$zzQcD9nrU}kD;u`Hj=GJ2TCy->>_?Gx&YG) z!r{Ex!wgL?xs9)$%umK_U4Qwr?6sJo~B4dtQVof z??&C-pc>Cp95y;yBWxsh0XqkZkwlmR30KV;C2l{cVkO{mq#Fg7`C;nIT5>Ow#lgf8bN^_jyo}2kz$=1Jmt^ zs4a%)o5a=v^6LYeh=p$a*G(@9o_*rBN(9K4?k+E*`vQKPmdaIvOXx2QI4}?Xz2`RP z3H+|;uZYM`LJWiia8E*hPiUKxNkL6n`2cb)2XXK7dd>wgB;$ir+Hc=xCN+8e?Yam+ zJ4(k=kFMbDQAE z=GPvxP=3hO;?%&1JnCy`iF4>l$oDv=Y^arTt23nSg)dsP==Ndud`x0AECtDWwR|S& z4H{{S78hXrD%Ro+^#!D|_!BkgSG0uMefo4iVKNd-=`??S1{V>?M~ps?@}{ggB$5FP z&LMJ&d_3P>Xxts1Q`SKYPHxl#{b5S?>jYY?Jg*&65b9f|U`*h0@K4Bz0|$7+*IIJ9 z9

>k#ubZBog;3Ko@2Re+&<7zeGcqd74sPRl;%Verz@LkD||$m=QcLoZIO1-)DH* zzz4EhO;}W>Q|Rm5v3k@~dC36OY!hV3)(OKSpvv-}fQsZs?gBAdC_Et9>h8E~mmx9AF;&1f`w|L@$!w%;$D1~9`+%eC z5eF~31j0;i2d7)6(lU+|ZtK*PDXwQLgR9$_nNot?$OsL}X) zaGXPh!wG)SdmCC}q$dWEccH4JCwlIQf@DWEn?hHX(5Gk)654+|tqKGPN(e&Eel*(t6_gvya<5EgiV&PEE9fqi>0`#x*rRR{~v z?U1V=V;09%#4__^%g+jRVLui2h~lO%&WUzTfPAA69=J5F!)K;O=S{YOt{Ac=478%_ zg2u}cvwRZj_DeJ@(^_<1 zd=F)B)onPC7PTt)41G_+AaESXPWh^sNu{=8BVeQs;DUa2eOcC9Q7#Ij&|GE;KBjDO z?DiMIEWW9(I7fmK%U&J?uZan03J!2&#U1xPU+=Q!C^ZUTyiXe^Kf&%HL?G+-V76LM zOy)+fV7QCtp}}ZL5vv5^pEfdq_^PAy*wXEB`@7v&{=(!*5TFtBsXC2v(O3tiD#==k z`rN2zT!YP5jsKZ_du7x;Cc;%)T|Xk#B~ZMAfn!GmNv%fKbq_HVyTkvD%gV4_-q}*3 zN)5fd-k}^cHuE(0nzmG$*@!*V=jGJ~raR{|JD{Ynq|IaSyDfS+JF+%e$*v@xJF}wJ zTv#ccsx=UOZRC41NJ-Sv*3>n4w2^FYhjoqVq)x_4HUy=^)TNAD{)OE$(oyB&mvJ&?sF8#04(MfviZ(72c z22|mQ$_MJQAh0QIi|&zjr(;6CW<C{b*SD>2kbGN49YtggrG_EkW?N)g2o?XyNh+=$M(hlb;wFKS5iUkfC zoz3azMb=CY6<#sgR| zz2ndl+4;Qp)^(aKEURUcJw!0XbjRA}by$)-sVRvjW)IQemHpbDdo^Gyi~+m6_?;mf zQew1q5{VUrX=>ybha$ez=dYp)KER@;j2IGAS6tg2)9y9W@D*;hY;Ds+%DjIJccZKkYKi zA1evwKH-PkUSwAuKkr0)={Q`Ps~SEO!k%ui)MtE@Q75lr1=6#EfEK>pX(u5{9!wP9Y$`h zZjRGq|EvC9k;H`ZYn8*R=AML_du{w$Y&>D{5P%^%Qu*hZAzq~bX^UORIz|pO_acCE zU*_ee?|Esl{f)SJZ|KBH;>0QM%w7M?(lCfUdWJb_COWAVjGoeL75`}(KymAYuruP| zB;;_@Xa5p4wvgOd|Y?|Q`7wHBAiFbF!)&WI+LQZt8Ab$cXFSS%%5Dq(Ac+&=gWl~FsVjw^ln%&n0a;S$$3>=Nl3w4{)TL>mU5B-!CRHCSY%kl2rbpV^nZoRsfK zNhziS^`U3~)-nW_IH>E2Ta|Gt+|9(ID=%heQsF}}BSJfhVV>6ydmBntq)&Ep=%;^VQt|?!7 z@bT7~yB*h&oV?Z$?JB=mF&o5f4qp?YMYl*>g&-O##7?#LAR$1RMx)W{pqnjW&rMLjiG7!}2QGoM z%F7Sg*Q)Q>y?nlgOxggxp98FdeZb%l_4+sw2=sjVv7F>^#(Wj`iG%CXd!zwjgT+Jo1%jyM#Q7*O{VlANhMix`%p`TSpb-43Eo`v zZqv{E2q_lW4Oq`doNp@Hof~I2>5!cWzP!k^PVaq{&npKLZsu9f_VF&2yYneVZ3CUv zUx7!?t*4r>8|vGsfP3fixz)17^KpuGow?4|rK5UDSC>$m@=a*$dChSqKJdWsfmlpO zyh#y5tnZ8_YT@T>T`N}*>N%F5TJ0azReos(oY^vh2w-WKnTF5Ok{BF=Rs`opXK`Tq zF2K&8?r3FbFG(7a9Kfa&McycU%_dLyt|sT>dUMU_esevw)lM0F=grsV^LD;22h{`M zKyvI!-0*r`Sjf!cC-%9z>`pXpo4x3KyFaMi=wJYkNAi4~%jM7DaeqCp#opj&=wgQ? zIyfhZ2oYWw23`Jzx@e3dAiC{{(Tg&J28je}26C&S4yK#=#kj{wV#%!$f&~Qq{PJ2> zVxe7L8j}^IGDrcoX`J)O{tL^VIgJ#%2_CfZmVU`kXU28*;Zs6bE1wjBk4osHy5f@N zrwk!%NaE5Ml4lpNBv3UgaS6{YGQ8as!~n;UAy&FrU5RGt|*#`qqu4yun~QCrwd)uLA#daPTj0wSEdLmU?#S6rerUN#DIa! z`|vKUn}^nfh!j^p6NAw{JcuI#y`}ucz0z!Y9?ypIg#7b#KP#ZG*#sqjSu*Z;&fd_@ zEf7fn(0Hmj)GINF*GmqWr~vkCxa`XSza9CjxF>D_>q^0Y-0WbM29YjQJV04XJ&04q z+2Zw(T=x*@l3GkWF#saO&XtT6(Qrj?{)HIv6K+&!A&qmw=r&O%4e71m8%V^W^0EGp z)?|}JISL-;!>d4FI4i7BwTkB)xX6wi>Jso;@;(tcbBpT9t)&~mV9Wes6Se)1@z)}O$WCH0|{E>(G+by=-Cb#`su=qkgC8|Uk5sr0G5Ea zR)nt^Qgm_XBcCdnacn@Fv{A~;R-!x=f|-Y*3kLQ(K$S` zuHo_6F^RM$8ihLGr^LR6qJ1XKu)zM+xJckPVKv?qH^yUkOx^2oiCgCby_ zo4_67ZiJ}kCvOQD*V+5DR_ld`@k{s{5H~)&nUaw~?lJx9zK4em6YjBY^w2)Bb8prU zf)LJpG#QI};gGh&`bKN8+N*5qGTBac|B*jYs8-%_X9Dm=5-9q(55=bThot7w0^XGZun>HN2YIne$s1$1Pgo)})P98u|G`$=OaB`6X5pF}l z65k10+QE(|{R1v08|Fe~Hg9`m_=_zO=RxfnotAz}%`DoGfu@oal*|W6nj1q{5_5Hv z_2C4%u8Z?bT-G&cw7nn$3b3L(oPCMSVRlhs0je?(eXAP8GcV5Vo~|YEx&n`(=yg`w zg^A(kd1K`B(ZJzChuB)V)Y~$wWuh*d{-KqVYb_fnjVI#dTn`dXYdZ456Q8}!6Q2&B z8$@|2P%sei_x|#K8Q^|@L4SXI{rk*ZgCBjQPK;|3|&~)BI08;vaJ~DnsSEu}G`e$zZk0}quZ___BN1;6Dxjq^Exj gnQ1{l{sURbOF_Of*str_err,"recv data check error."); } int cmd_no=arr_get(data,5)|(arr_get(data,6)<<8); - if(p->cmd_no==cmd_no) - { - // 重复的cmd_no - DBG_WARN("duplicate sequence number."); - str_set(p->str_err,"duplicate sequence number."); - } +// if(p->cmd_no==cmd_no) +// { +// // 重复的cmd_no +// DBG_WARN("duplicate sequence number."); +// str_set(p->str_err,"duplicate sequence number."); +// } p->cmd=arr_get(data,4); // 数据负载 arr_delete(r); diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h index c7cd8db..336974a 100644 --- a/source/main/compiler_info.h +++ b/source/main/compiler_info.h @@ -6,7 +6,7 @@ -#define BUILD_DATE "2023-07-14 16:23:08" +#define BUILD_DATE "2023-07-20 17:41:21" #define SOFT_VERSION "0.10" diff --git a/source/task/prot_uc.c b/source/task/prot_uc.c index aafa804..dd15158 100644 --- a/source/task/prot_uc.c +++ b/source/task/prot_uc.c @@ -281,7 +281,7 @@ void protu_send_call(protu_def *p,uint8_t cmd,array_def *data) if(cmd!=0){ p->cmd=cmd; // 上报数据不增加流水号 2023.7.14 - // p->cmd_no++; + p->cmd_no++; if(p->codec) t=p->codec->encode(p,data); }else if(p->cmd==0) diff --git a/source/task/tran_for_coder2.c b/source/task/tran_for_coder2.c index f8f4093..c4cb483 100644 --- a/source/task/tran_for_coder2.c +++ b/source/task/tran_for_coder2.c @@ -77,6 +77,7 @@ static void write_uid_upmit(write_uid_def *w) emit tran_send_signal(w->u.p,0x82,arr_temp(a)); g_self.step=0; // 把命令字改为0x82用于接收主机应答 + tran_set_busy(w->u.p,0); w->u.cmd=0x82; } @@ -375,7 +376,7 @@ static void check_end(ucport_def *u,port_mcu *src,void *data,int ack,char *err_s arr_append(a,w->type); arr_appends(a,w->ack,(6)*10); emit tran_send_signal(w->u.p,0x81,arr_temp(a)); - //tran_set_busy(w->u.p,0); + tran_set_busy(w->u.p,0); // 把命令字改为0x81用于接收主机应答 w->u.cmd=0x81; g_self.step=1;