From eb5744975619696dba932a30c8dc7ec080e4bd39 Mon Sep 17 00:00:00 2001 From: zhangsan Date: Thu, 17 Dec 2020 17:38:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=98=BE=E7=A4=BA=E6=9D=BF?= =?UTF-8?q?=E6=8C=89=E9=94=AE=E5=8F=91=E9=80=81=E6=9C=8D=E5=8A=A1=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft_gsm_main.sip_sym | Bin 563192 -> 563192 bytes .../soft_gsm_main.siwork | Bin 121721 -> 121586 bytes source/app/app_common.c | 6 ++++++ source/app/app_common.h | 2 +- source/app/app_task_485.c | 7 +++++++ 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym index 46567559889a9bdc219778bd6294786bd70d0d39..10d2d860b8cfbb5c751a21e3ef1317a42d91546f 100644 GIT binary patch delta 94 zcmeydUg^hrr425^+&K&k42(d`%n;n{FWl}g%m~CxK+L?|UzjDafja}LfP=wv`|ims l8%3ulM6k0=f1t&}!3vaOSkzv-k_CuaftYQ3?Mn9QcL0no8nFNX delta 85 zcmeydUg^hrr425^+-VF942(d`%;4ATFWl}g%m~CxK+L?|UzjDafjbeZfQ`Xv`|ims d8%3uVlyC?z&S|e*$pXZzK+Lwib|riDI{?fJ85jTn diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index fa41e131b3f5759de829581879a3707a177d252f..75f0e8cc027db12a5a03a4762ee6819502387079 100644 GIT binary patch delta 11002 zcmb7KeRxwv*1tE?OH-hb3Z<2nato;a014lz&=M$x0s`SfsRBzD)J0*}2&?NWNVAWu zR6yUvd5&VcQDvC-__u0C*8o@;rmG^hQRk2+J}Bwa7_= zun@I1;D;_)1|*R9}$H-lOX&#A_{IM2;aRd3c)l%c=|n2 zxXpXtztXGa9$qeQ+=PjJKa(cZYv5&7dii)^Glrn!1<4y|HS#vod3f470!iK+IS-8 zl_p+coF{QEfs+G|!I1bS@Yu1S^f>2FaQ?rXd%#Jr8vN2CKYNOEh4VVjpXPkC#w*zt zE_jCXt(8Ka->e*ToNS*c&Dp9DL7d8SKLm`TMP-JL;IlDHherG{WzK;f#gKh_{ z0IdaiKz`73pjSbsK>r5)1nPltGC-7>3uvDOy)6g@!eLZ)fu07f2i*@^3YrZX4;lix z29)xo^#&zptN2qtihzm?>0jU!t-)f{ADxFBwXCTU)ybJWLCuMB#Uq-PwkO2ynb8|D zH@9}qM0`CmapnopYRVRd1z7nv^=g#l5K$P}@cgY&YALK1nV5eBBHA;?fiF2TK%J5K zaBjxqf#O>+BUE3|gdn}MXH4??tUX(b{wls9dR>mZq>-a-MP4iywNX}Drn%=`SY|G! zWb4xvDL}4QxVj)sYN0@Vk7-_UkwATv-we>F-eGdDvH)r{0&QZ(f|rP30VQ!^94Tmj zQX7qu`a6(=WVi3d3UpPA*Lt&ObWa-zJ9@(D1yo;(I9qo91z9zfl{U}zzi%4c1#+UU zpbp3L0<2<*zthS;wXU8iPp=j0ymmQh(gtYv1kpxkEc!^glR{yDU0Sa_CbZ0Gi8&y% zevQ%6s>C_U=aph_Ii4S20fCoTJG&VB@BfqDH@6sG8Z=_V;$EA zy*T8gipNZ)7-XJLg5KixoNPOMaPzVBemC^3c%&8UI59oda*vNX|d_866n%kIO*%Y$-oG+!s*r%>gv@S;$%)YkDSn%ujROC` zMo0%|0g08BPHMjIi!V)?)(mTC8xFo=Uq5Kg8K-HL8ni0ljBT!;4TILYWYXF@5?Xi} zm0B?!Uz##<-~h{-JXgx%sRq0*NGY};PzYmY$*8a{U{%w zU&r%NrsczpeAoeE%*QdqqvF79dlFWGk7OWVBOpa2jp;%z$NkFOKC^Gu& z2`EmqeIPB8tFbgV{cJE$mapy$l(saEGEqbE^~JM;tQfO)DXhg31G+T}Q2QNx5(>P*^vhU>BRv?4jq=c`eohfQ%saeHw@bgN4!8ku6m0khvjC1gUcPSpoXr zy`4a&C-G2|i37OzXLYM7vhleG zNE~DgMb<$um@lIMa9|*70!ZFoEnfoUVURJB z7(l|HM3DBeA?XGvE{|paWMEta(ca4$avw|zjEs@Q_GlnZ0QeF>qG-oJMvxL1FPj~b zt_R5E=>+n0y9Pq9% zE2+O!$k+*@(9Ji8r0Y;mf2j{b?|D`Y-KL#JGGvV802#e+*Ph?(2=Zb9!M3CL(2n-f zV|SwF0~xJPH8o1%aHCYtV~?RfnlOrtcAVQ8W4A)?f}G&=*zJ&+Khi1W@f{%bjo;q~OAj=R z9y<2m$0%|f!3w3d<%CWgWE>@owuRdn^D9H<;<|c%t&ly46FuJeSuxZr_}fi?;&7f~$NXi8t^Hgs@mA;}uX$LRuJebm_D>48$W0tBKG$;@Hgl?Uo9B46^j8xgX#wm8Fo%g*UX~>v#nI;!RaR$CuEW9 zHftvsHyUA(aex@wZoXF-PB0@!&s_qw!AZErm=KcsqyE8;UdTi1el-uHwF6y-1$l6S zjCnZqtd<7{lIl$EoChD;ap+TgW(=y6o(CB=j>A56Jo2=cq(g^PVj z<)O{$!|j3!krhK$Js$9GKIqRvHO@DHOXwnU0oD1Ek2TM4%M`QR@W0kgfIF`iesC1HrPR*wK!IC=@C(db)$^ zNKU4TJ8?_>Wljj=#8E$FqIl_Yew-4HoCshNuN>Yj{vT&>y$312R~0Da&L(y@giN(q)bGOTHmX! zDX7uC$0fBz7irY@gW8&g8ZDb2)z)<0`bllwj8-z}=Z-$I`=z4~4dDv4DruB))Wq$s zvCypQqtMl`u}~k`(OyZn#m1uBSsrLqZ_N$J#&VYqQBw3pm*fDBJGxIYDnq>`Kovigq!|=7OsAdMyNi7 zWOTTW&xi+o;e>GAkVPOf&IrwVe0)g4Cq3a$zbBAI_i7;g938)i-6H`c!uK#cCe*?r`9FlrNukf{0fCQImAp9`t0*LRwog-=Y)7r|hK^y}aAn@p;4U@z`8YYLN zUQnDmhcN#0dlh4ZerUUZ$^Nc0hI^;Begy!y5W1hb49I^*(A4prO zcKBui8I65drj9_P6vfs~OErSQtqCz%5WkP-fNb@p8iUNib@inxLuS`5bh6?Yt32^S z2mR4SzD~zG_scx=&zM{B@Rpnf}QTuV@Q+%L#>jHo)9-|ECxqt!mZ@o zv}b?iNZs2(i4Iv?y4ZE*yUw-QW%X4R?gKxF`#EcBcY!r}|*{V{}J`jqBm7 z=Oc0_0vCPdzjnv|R!~Ys|0fqxRCi3hh2~W@)tzCJTheSI&LuF7V>sg!G-yZc*-=2r z=r?#GgrRGPT%Q6TIxFBGedVP`;^JBjsug}cy65;9`hw%dgLr3?AY{^spxI|Vt$n;H zDjjJxe7qS}hJF8}sfjIkiP!x=8aYwN-)|jqy7v{CO*DJ~k1zUD0j(YG8r z?a(bgjYXNGN4H}gNrJbB^;-JSSKjG8UkfGrKY^~`Z4>AtZ1Mp0Ikh&&*1u;OOi9p5 zp9=dL{FGkg>+}f8$G1w}d-7~q?$uZ=P=H;>d(KI1{Mb00motF=d4N1y^Fp$^AQgn4 zdgiUc^yQW6CC@9>RpJynHD2SLZhF1mDw+7VJ*#$Fr0>Fclq~XD_elms!yTPJlQm4* zA>p*RW{9q=XIQ`rZg*Y%U`*MI!f)G|t&;Y^*rG4)c+VzAmx{{t1~E@ruubfpq&8P= z6CLJgo}bZaTsg5#97i?nUsjTow(X)VxgB4|alBEcHHi7j#_eKnY8f@m=Dtmg&N#~D z?XXA9*qfX;sfpp@LD?LJeVY&VXc;xk_L)tLUO-CW4%nk+>`ktyXkvKJYWC-Lz;k-* zD$EbhT}zr6ZO_UAzc?;Qt!*KB)ruxYKb1+Ir)1Rw6isD#y*NAB_W;mFg_I5TVzF8| z4yn1--NfiekFxQ3SWFK9Mr|$)P=YozF}hw>+5&)4YnMshUemYpL!uBRcuT14!5JqaP@LAE3oY~mKaNtw=hLDe4&%!lo{n!H6tj$f#bCcRttX6Ih zL0VT(!*FXw4(BVULoh%~Pf@o9u_*cO8b{gie&*5K<|^LZ zfTJIMO7m`nJs#fUf?Dae2Ucor`W~dObzTj_kw}Z`#2zu-gvQP$1Z7_g=kQ@p8M_x2 zRO`TroUCE^9j_eU2b>Fg#cXQnz85x$Hgn#A8b;qlmE}z^R%_&Zvh8>ctC$*64hE3K z!myamaClWp!-%W=Obw&kZDmUsCTi_8$t%8t2|nafa%E-iK18K9SM8(O_hGKas-6_9 zm9G2Ydid`(jBb~;)wgj!<_b;4PkqrZYZ$%$l*{{(bJTRd>FG4beyL&fp^f~`Q`(xb zZq+6&!Q^x=Fs%-= zbs5mHQ!7~qAy;b)4#HPUNiD;*v@)#?zEWjF8-lMZuVwT}P1$uAxnzfsOSL)h5Qb`4 zRLkfCsj~VIY*5kXyS(+^wT%8Z1{%@A!97r*alV$E}&1==%{76|z_6 z9)@e?c~3Fy_sY)0Vs8H%@ERc#{X%dm>O@qaWSpF2`@^*i{}7@S>=1K@>4ttN66KNw z&Xx39qW>D9rm@s1+1thO=Bg33jQ-hz_8wW5Ir;`@5|JlFR8*}Cl*%t>jDrvQI+Y0A$~GiS55f*DB6@)nQTZ+VOhNhML9xUv zI4z9U|rl0j#XcBSQy?~9L_l!G6N#meVz<2js)qDKrY}XK*Y`uJCZ<$gop~-NE}h4G$=DsP+LUdDI@Ja zDoV!&3*}=Ar0GPIhLDd6*u)kyep^Lf@SC^%yy)X;e6wa2J{X;S>elVt^mENxQ)`_* z^*MF+Ij8DY)veoqZ%_NBBP~*!!XwAjVf>w^)t*2$v!{HyqA6>|^_iNYl#WuAm3BoW zJylWaky``a13C)&78J};l*b=bl_}d)C9E5=^!w2vRVheOl#@|a@i9fYC#EXRS&E{6 zqAFKwO<5BHdTRZp7b_EQT>7s!-MUn-s#|pNWeXNnU+i8`S9L|5o-v`SZi-o|te;R< z?XI6tSU+Las#Q~0E?&NT>Z+TT-GmxvQF&SYiuzk8w7r_TH2q3p0AN=kV-l)W8jV>-P)&;f3{++QSrH~_yU{&-QW~~`LetKydWB4 z*GPUXI4Qbb@_v{U^8zo;VdBa+nxmogMk}n5OkA&DQlHVrly^`N9 z`3mq&?{{l=NWKz0@=}Q1Dfu5|{oRt^E4fedwf7-I9zP)YLy|u%`J}EGxE1zE$#Vl0PSTQ1a&`-!A!1$(tqL zC3#r#7Rg_be7EE;f;YZd+O55W42|_3$s>~Qm3*J%ZIbU_(RSbXscMb~Ps=bom^2S; z$iM!aQ>i=piFyfN{Ioh!O%EK-nJ*TiPFjf6Kwn-#YN?}YTEOKvDhjp5Wz*VFNSXZy zbSEM;c_2yyquQC{`K`m~!KCyX(tsm|MQkupn<;;Nph_PZ@am}=Y*H3cDTCUmFMZ0&m->X4^gPc2;m^h*`b1 zeHUWsxQPVu4J3U7ikDkAyi3jYJCS=7c&JZ`i6< zOx98H1+eHjuRy+Y@i!<*Ktmv>e?qJE_A@Y#)-QCnJ5 zYD@;xG2-Un`scN?-jmHk!m|1=##lg1BnlbSD-TfzX`FX ztn5I9r{WT)YkW1e~R662^N@3hmLN; zUk685fliOaAuLJ}$ooLn(OpP`usg&q0P8yZ7?A32G?2<229o>wg?Cc z5@~=!i9Xf=prJmoE5u5{gHJsOq;+lssmw$|uf8Ot6N#bDaH7c%N}!M;l%t?zplC;k zm7sm{ruzYO^kNA#+i=MRpm^<2mo{PM(~6-tXE@R1pFI>Pg1RUu8ED~)Ayy2aNssyf zlviy4mDU(Q{+f0cgeGh3A_khhgseKEzy@#x#BBxgZdQri2P) zT;v1l2${&7zHZd{rK~x9-PGUQssldVp6elrq+K-%smARc{KHvlxtPPjP>9jn%cuEk z;QGii!}a3o#2mH>v4I^Sc0R;z8hJOwUY%-)70pVBWsjKC9AZ-;vS;*ah_C`f#8G7g zF;WHdW(^IZw=jlRyX=7X-Hdr?4ua4>k!-Nv0kV!3Eyr|pr?b$ElXr?Uz`4T}WyEJ? zBk2r4`9*u_3{clOFJFBxaRx}KEoqzK_#|bvxtI=v26LlvxNz3k_}Y*W?wj(@$3c3B zqyD#u<+>0#O7!|*O(a3u&C&AAY-gJ;!_tgI%QY<-ZiJ%mTObTsu6>6?jI@T-l?Y*> zU4*b?cDWJ4IP?s_QtLe21S=_o?h_eKH1$CQ{S#>bWgEh3hEPWftz7zn5Ss%2YsLxy z9nF$JPRnq1?F+HV5ZU?dZ4k*DZiv)4pD*RBf8Y=GkgSs*6O?c3-E~XWr@99gIc0knu|$r$L4&h;qaC9f3W+P0WiTAD8Wm&_>jUviGMb3;g)o9o2DosSqKV3L@~* z{k;(!I^0syiX5fW7I=`Ot;zOyOrujyTHVcX``FLI?JDVZ)Cs@fx^;ki3K9cc?nPS^ zg#L*XM>$eHIFmeRA)x-}W7;|3C-WNsH2$vwsJzUGucr*10A>a949=u-2NWtqmZU>I z2%=z8@}P}QJI?1~+S$l&_;o3O{{3qMsMG+8lwcr1R-m}?Y|vo`W_U}7!nh%AE0w#2 z0)b#s_x?#S&5eOPadu1-haERGcpzl4Rq>Ek5aAM;>yICGL25%XcZ(>>apSO)t50iZ zE;+l+!_EMV=&65=zq(8<7^R~lg}3X`n06NUUo&rn*Kd5jh|#M0<##`%*nLHKwv&vu z!Dw2W{QEMTP&Xh=fC7;sD0|Vxh^!IY8L&IPF{Vv~#D$+N2Fmo0>3yW+0^@zeRSdI1 z*3jyR3Bic17;PSyA|VVMGOfrAE(G)>1*`FpMWDooSto+)fK^@yS+%%OHvmn^!Sz8d zC}k7DMY$2d{p#qr84C4FYWG4 zs~ki9_n&9@k6m;OntdcIVB>n`=nlqNkj5dA*g?xLk;vcVFoI}y}*QJ3sa0gq{8AUNaLWx)BF3!K>|&bd&O%d(q|tS%Lg02givsj2@x3YY&P` zLefFtClHX;(2)*%1HY_y|pd#yrI6C>NZH1^)Ki zont8IGN@*E59)f*J*#PS7H#i+TVvX2;CI!{fs^;&C!Cx$%UFYzFZBXxV4krE=X+3ygRD`C!o&VzoYabAfy;k5vljZjNjf5^>yzE6tGT@opw5Lh z!ZVj(1?6zRahIVZ??}GOKwbL6gIeH+M&l}@_nDY>CKOz8MlC#^d=G89#Z_%H9UrG~ zTx1w8ftz;5v{4W$Iav*%4_6AI@`OFv>=SYxL&ETPgt5>JdQGB#;M+d`Uny45bMa zL|YVu{)yy(hdL-3$p3b?mIbLl?YR&@f4^D)mC08j9p3}oNkAUy5k19dawOrnQ1+mk ziQ|E8a>)5sw{|-C*uB$$bKwGkQz}p710yk6@jb#CxdzMfHwyC*gzkytfOr&j$vD2( zyES^qUVE|>IQP#LI3@Bx9tDmMWW}*3MkvFXjhTYx1PC%gl;a>PPA2O6db+g{;Qz9r z7&wz_1x~SX=Wop4UcCF!Cp40FUE_dMYo(AXGNcOW)x{+9Uch?>=1{D2$VUtJ%tKmW zaZR?sbJImY21i%=y0josLP2>zl%Aw4(nF&32y!%IAEr`ZY)zy15Ja%%)7%Hh-VMgv z6nzLH8bF;dKj|_b_2NSi|LJDcuDc6wYdrpRO866 zR?)2u<*zlq-0tO7k~v16EqD*#yhFV4kTEnhPRu%# zI9F30IrbTdzRTPp2I5oXXez86Qo37|NRraMqV%p&P<&LXc}te)%dRzZn|W2+}8AnghIZ3g+b(g)}dVYU%R=F6kZcuWRhk zuT#BGcWP~}5=Tm21g)zFx`nqdKn0Ntb_qu&^RYe2IIxz~lq;`k)H zI-h54RYyNHIknAq?n+i<_B8`zLtnq=h%k5(#)T-d8CMXezal<#o)u^+%P%804uakX z{TcM1AbJW%gLKeopi`*(0n`gR0@@#Vu`FNB4ZK^{5xBJQ&K!c!LBc!=xANg3M#oFO z8($PtMeg`k)tzqt{1BrHF!g(?mzkG+t814)HJt6 zEl-;jW^{qdmv1+FQjwb1w5sL9mWLVMnfdUbTA4~O&k2V7l&5l$|wEKKv zMi=_L;(0)d+?wZM>ZZrSjK1j*U;#h%yqcXVirL#$cUojanBl60FWatGip&e!)%j^X z+rkX5Bz(#)brLV!p=OIx^$vA@dS4j!;hK+c*#Q)h`+Nr!o!A#=>MJ3A>Dl*?>JpMp2T4BvqG3tQFk{K00#kiH1cPH+*-*3^o-L8ogJyFgn`sbuBQDa@0fv zn09^(qt6{QGYa_JR$x&v(bH4Y!f4Cp2U^in(OMYY z^77-cD{s}?0FyY!Pd_++u%>;9^irq#8Mze!+>Y47Y!L`hHmXP8-0e^mQ8|m7dzl=-UK6YZa*?w`M<# z?>`1rI5+T9U6>XE@6>+aQC$Mhe_AV}&%bdZ9vE0~_|cav)fW`~+S z`aQ@H(Vjs>Nl4I>GiPBd!-m2)cOVjl9dL-Y7hcl=tDV)YjJ}@m`Y>E3U6bfumdM<| zNEe9^x2Dth|7=xfrbp+sGWw9uw{##LB8U0wPLDWS8T|u=&wUA+k9T75>N|lg>Q;7Q zg!)#sG918YQ5i1;>>Hq;hz_Del<0`Yx4a7Z_>xwJyDs%LA zeQccnSsWdvM8yvI3QkN!5!Cg6jBS26pBz)ir1*#N+L-!mrV}=t3;Pb^bjyQps8hKs zUrp^C_lCMY|u@H(&3mW{tUM6{to_eTspAckPkg->buf[3]) << 8 | (U16)(s->pAckPkg->buf[4]); G.asga.zaxis = (U16)(s->pAckPkg->buf[5]) << 8 | (U16)(s->pAckPkg->buf[6]); } + else if(s->pAckPkg->salver == G.md_slaver_info[4].slaver && s->pAckPkg->oper == MODBUS_OPER_READ) + { + if(s->pAckPkg->buf[1] != 0 && s->pAckPkg->buf[2] != 0) //按键不为0 + { + G.rfid = s->pAckPkg->buf[1] << 8 | s->pAckPkg->buf[2]; + } + } } } s->retryTimes++;