From 11535c7be70e1f23e8c12a179a10e800ae080b9d Mon Sep 17 00:00:00 2001 From: zhangsan Date: Sun, 20 Dec 2020 16:51:12 +0800 Subject: [PATCH] 23232 --- .../soft_gsm_main.sip_sym | Bin 509552 -> 509732 bytes .../soft_gsm_main.siwork | Bin 121554 -> 121848 bytes source/app/app_common.c | 1 + source/app/app_common.h | 5 +++-- source/app/app_task_tcp.c | 13 ++++++------- source/app/app_task_tcp_control.c | 12 +++++++++++- 6 files changed, 21 insertions(+), 10 deletions(-) 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 6f188353c8298a90e4c99dc873d6073b87aaa527..789c675451fb5bea566d10976c8c2b8229d83074 100644 GIT binary patch delta 424 zcmXxeze`(D6bJBo-n}oWO@j9sgH?yT#D@}VAwx02wu8~&(qQNy2o)4@C|#5m|AK-- zLP>jsGx!5brE4oU5FCUE4h~T?V?okRT^uqvO4IWSUik36e3$QOm*WQ?Q6#9wu5qdQ&>awrYUw3q_CSgJJlF=hB2$g%H4`m@_4{JAjov<)pZ{X7@Qt zSKqCuDaL;VoEG$?}2B$)J+7_KUKt^IAZ>5 zVj^Rpi6`BCc$3-r|BIrVSGb>5c9`!5Ox!&+*V!P@X_u|(b^tWCXOwv`u_&pbxl#?O zsaUdHZDE$p}19tx3zu;1~pacwhrZZ+&?5B9@A_B@}Dh5 zX%}Mj+qIsd+pXxXDP7p6lO#mx?2YwgqmTqIW})xvHOhCS^=WyJAqGJRJU4o)WDA!-kW)EitEAZTCky^ma%chK-U>_lO4|3 z*{Suy#p|2ulbTZEzB$I2Mx5-#5#Fm(&r(IrOl1kV3VSVhatpprI(R03xl5Ff6~BxJ zUu#6+Py_sEGjOP_fE)YZaZ_W3&CsT$yKRsw}gU9*n zf;dq|t5@Em@}oHnScn2o;v8K+M_pWuN-*#-U|@9wq^oa2^#G0Ek>89< zNxz7%Dj?VT&3a)R@Gw5aHpJjA56k8F)-_L;nti<0*ltol3|=X2Jxa6ADjExkn8k;& zTZKSitjEr$7G~}IWX_(Y>ecJ6J1UniT)J%e!nV5>{cLR8!rCRvwK3ZAF^$U?FTH(k z+pSByTH|D`TGvNKHaZrU^h1A=gwCtMbfTcM&){=dP73zvbCbL{(%I*+;+0NQacDbw zJ7nmdKvt502xy57P-H-a!-QcU1`qj6Z}a*+ zobTm)ALsGq(n{9RyS!jO=La}{kMo0^AL9Hl=Lyb_aDJ5Y_c=cXPKNb`!Nf1%yp;3) zZ7Z#ci+Dj9=Pu3%a9+-N1?K}fAH=!F`4G;Baz2dn;ox2S+tm@^6uFV$EeG4x%9T7b zit|f3zl`(IoR8srEa&4m*Et{0c@^i?oY!z(%lQP(>%eKKS5D%Y%Xviu=aV^aa?X3l4FewD>ns#hbkVs=`Y#rbS-vg{||6e17j zb2z`2^SPYQS@t%fBAUP^z+aQQ7NbbL@D&4;>ezPT&49%=?qfroitnCR*580 z-Bb{@n-uK#`GvivA*X^a&y#+VCmBo{2d&FMw=#+LhoPX`m^2_d>oLGzK&U zG$-gB`alJFPsu>Z&q1rMODmJX4?gf&CR!Sh4aI?Q>QTh@RFTX5k>W5w_ShxfN-O5+ z33A082{k?tn&*-a(GGwtlrv{E)Vu+r3EBX@^Pc_PvBL{uAt+yF#lS^DikK%}d>~^-oP8Q929Z~bZ6LgYG24o*d zMAJYGp}CsV$|UdugMjw8Us|I!v5AkGgr33$INfo96DADQqIoWPQRcLbnt>X^>7JHW zCW2RPPG+Jt_i~&oI8N*YtUI3XPtUsoCxDs|2+eaT0Xgs^{uoo!3eEWoF9Xi~OF7Oo zj^m}CfMt)HjumXhO+$?vlmkH~3^|Ne_PDj6dAKpH)SKOKPu-rGAft<<7+YxGZ+>; z6hc`TWDh(|Bz<05sR4gvAaI;>IZi#t2>~YovWL!x&{+cuM>oCyQ3nrYSzSDfr*K!=LxTZGi_+$xGBm7@0tu(804&p^es! zvYvx#-Wb!2E^((7`pmknJjp&K>l{*aR-Jq!eYxst_{46RoL1<|{N<59W}@vnH@BKk z1m6M0q4QWliJb{L#Y(Stqs9ktsu9Tp<9wjP374%)D`TM)YXQ#jQ5>g=<9GVn*4~cVy%oGx ze8rvnF^(Ynw6D)CFWQO#dw@kaCFoa>m`Xmh34haBz$Em>5DdGfSfMZ zD9X$FG7r4aB9hQD_2d(#ezClvLWe?}Pwp)0h`fN+deTbt?-$E1x!etv@Xz!62ty_5 zf5Ox%Pq08s3X0e_71fx(4o2l9cG_?^7!%;loBAclg{Uqgxu4rnm6{7 zhm}jPNCT0=LQXp5)>VCjSFLZG=0@Jb>qQ3!mGP+2fryeiUay%j*FcVT^^%AE>L~C} z4)tWB4=Q{*@MB0>@@-5zM1w4+M3yJ~EE4r$lf|A6z3|xN{3{}1ehS|dR87#!Q14-#m%KnxfV08v|!LXZ<63&H|nCxZw5>PRRJ{NjU5WW@hk zApD?H<^+fVvU}pTJSq3S2`^D60El}~rp2uNJb`?mpsj@QTjlRio59(!zz3xi$li&B zMls%yfJLQyH$32gVm}X{ZTFqlvA~J?dOmF8SYS}!ORQtT$WjfxQD9qs?N>*DPw~R% zrQaB|f!6TDP+4LZ;L*(PbN3T`^Z*|&G#9W*l-mQ_h{mD+_N$iw(s8U{-2L)U`Hgg{|LhfTR86g*I*Zbb5;EWjJuBNIYd7({v^G6~4dtyW|V z>WB9w>b+zHKb6~IY2_g9ZX6{GKr{e&VN@YVa+zNp43PSZ0FvBpfzX&qOL;XCPGq#JdgF7J&3TY=uiB z03usT09c22g&_J8zd8_ly9NWq`?3YX4}N7%fM_7QC(Rs0N4W=N!;lQfF;F2$>c9Ld zt=u~Q(M+WKISYiJ`pS&g5#z1-AQA_0!|Ff*h!47<9|1YF+^^CO?j3YA^IC{attz_c z`nsqr0SF0X_ruF~XD7OgMe_YfLDr#f_alYIblH3{AntkQNG7t!wESS_#$!dMuUmGk zS?6>~FJNTm=ii{|k7FOHTvuNnL$3*rCf2?i7C5nM{&L+2&5L^90;@4uOBOg+cc?4S zLFE(ZWcNC~TtkBZ6j7f$zj)B88=drCKdeGSos-v#2Wo<+T>RO5BOCVI-Rg3k%`1tvk9fM)9ae~PIg(~`ITQSgT}})(C|KF z1*D07Wc;~k)NfHi7tl&?RL7xqx|`}s#POL?jKx4x3tw$YiF4J zmKJ9Vot>w06U&izi5Gqjt8aDwC0-131Yo&D5uwv*U(gJ?#G7Nks7s*-<09)PEX9c8 z5W^s*4)tbX%yng71oWXW9`UPqg_2sU4rgAwkDRWWA&xED$fsV+9}@Jn^DTfEehQJn_8SuF`qr zhg}CVk)B&E5b^DfZ3GC&9tP-PnOkfL3Tnj(E)260U$4$P!Ifaq2N%w*40_f%YDrlb=3S2k%{M18 zSvAH~`-u--dZ7fAvk9`s8&YFY8A4eA z`lKlKlN96_Khf!^cY^HoZff&mCpy{~Qg64bv^0OZ=RhX%*>r;z(R6l5$*p&%E4fZ_ zbiqNp8@^SD(2QC23p{HPz5NUqFAFu(>ZhIEoT{d?bI7rx>4ZZ>-iV=%{a$gj{Kb0XMKRk2 zT!=sAMIxsTfM}GjWN$kAxzx<01SHz7X67VnaTQ53k03{#(Nms12|L8F=?I|IdW@cp z*t^aZ;06V?`y=bUCs;AGA@7Zc#)jTaX}){b?9W6RYptS2BR1JbtXR-g3V;$Qt31~#%LPe{n+65iNZh;IReI36 zXdujbbSyKgNt~f1nBWB2r;2CaBXo^Y?=i7X{wIH;2cR1Q2@nGvUxJ~aw_=KV=cacv zkq?HlB^=$-Up`SZn)VkW+LndqiB7DSukt-#)%l)l+8#kDNYE zpXA!ACVsq|J_`K^68?w3!0%mePu^2n>~Q|wEe*+N&@fOXO<#F>P}9ogCBX)*yqAtr zvi~wR&Br50ks8hPs)GToJa|Sc2}ZQiUK+|VLee;j6+5?FsU9nx;vcABznyvsgX(KHhuZ0b>??A0)Jqdd!NIU_dQJ!6LGKtvxi zNxqBXP0N!7UK5!iB0~XTRl`JPxX4^0G9yHW?gN=JyL}W(F|q4A1wUlX!yDxxX6IVD z!a+Z4&F;0br^Ge0kArUNP3Jnff#o{-xy;lid1CRt?-Y89GrbX6Gvn*fj6_sFyNZQUXO+>=Ua~swI9Ay=yB8xy^dzt^=QUKS4j30*PoM7aQ|Q~3(1pNW=lw( zQ{r)E6nYOZlUvZFas!$$v3UdfYrQz5&~H~Wv;jCQmqdB7Z+J$*4`=htGjOV9Bihi< zXmiCzwCNn1QRv~+Ol(9OmUBLX@^F1dp?9#SH_4S|;2F8pL6X@;b@6E#g>K7H*WjRx z>D~mG3qi7Ylo{J3my%@tqn3l>P@KIUSP%NmanH()Mc~Vxg-6a?GYTDT&G@r& z1Le$R-6*d788C3HHjU>{jGV2b68F7mgSQz9sAjr0!y_i@yJVN?*^H34tjs8M>tO~q z!$y`%Y=-Hl{*h7Wox_ZEp`3CwhOXz)#Qg?5#_`u|c^-(!S%!43&M5ToXr@r?U^)E- z^whNuHsBy@8h?NdfskBchF?IKSXmqz#rpFZ1$SZQ;1@B1lv(&99E-=%A1<$~5$t(U zt{~COP@QoqqtL6o>3IoQloL~^JCaf8)ytY;B`?EcCRV--Q#|h@@Hp<8zL#M+a`sqx z|D93j{};^gE9jGQqR*~TS%se4O!sRTWA7FiPok)f&&?`y@FPPTC};0gugNO(-zBsb zG_x}ddr0JMi;d-31vgt}-&f%}Wv+P@?w$HoR-u1xpx|SfyoyFlJoPG^@U6`%bSFaA zG&oq!_ZrFruVoc_Bp}Z#P5pIDD~RTmucO0~uB<{&m$ZNy9F!9VbT`7jrG9hED>UV| z$^#YLg_tY0Vpv?e;P%5<;#*-GW%_PISMHhU3O5F3>o)3&a$Vb?9om;waMf#`*#>RO zOo_^KiYt$16DhsiWMbmj=)tI+A2O}X&{ushSQ zrM;YJ_Y{e=L|*V$%+niWck!yMLjN3OrgqAeqn4nO$eyUyE>r#|=J&74Q%ZV1&M0&x zLDO0rEDWG;84(>Wi6}wK9wzOnj6y&A%}UI(q5-mbRhN7*m2f395tb*Oa~eZ<(DHv2 z{o4o;eGG{x(SO%jxwC)!n{zh7t8>0r=-=ARmYuSu3B%?`MvGw6LGL%;sGP z{{N#Lg2S};~#0g6TE>i5P6=)wR7LJlEG2&*N~@z z>duv0=v$d|x!QNB;V}@-X@f z0|&({;uLi+%DV9GxG5ozs7OL+9$^{r9!8NUMGECvA;AT$$~sJc zg2FIt(oohtY_+-`@(mz*qdkmnIzV$l7lL|VTL`oWbP4Dy*!U8NP9oJHI%sSM(V@E$ zM2XIKNM>DJo?w2wR~~0Bh+~J=dgNZwwh!blW%KtR%6~PT`(@SC4?ze2nAT=$C*(eA T+amASR`Z)fa=?7$knH|HqbH{1 delta 11689 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 jPW<#d`+$kbr`gpdUUiloopPkg,s->pkglen); L3_gm35_send((U8*)&s->loopPkg,s->pkglen); s->sendStamp = s_nos_tick.t_5ms; + if(G.ccmd_slaver_info[s->slaverIndex].mask == 1) + { + G.ccmd_slaver_info[s->slaverIndex].mask = 0; + } L2_task_go(D_task_tcp_wait_modbus_ack); TTSS_Task_step(D_task_tcp_wait_modbus_ack) - if(s_nos_tick.t_5ms - s->sendStamp >= 20) + if(s_nos_tick.t_5ms - s->sendStamp >= 300) { if(s_uart4_tcp_rec.ok) { @@ -60,17 +64,12 @@ void L3_task_tcp_handle(TS_tcp *s) if(s->pAckPkg->slaver == G.ccmd_slaver_info[s->slaverIndex].slaver) { s->ackFlag = 1; - if(G.ccmd_slaver_info[s->slaverIndex].mask == 1) - { - G.ccmd_slaver_info[s->slaverIndex].mask = 0; - } - + G.tcpLastRecvStamp = s_nos_tick.t_1s; if(s->pAckPkg->oper == MODBUS_OPER_WRITE_M) { U16 reg = (U16)(s->pAckPkg->buf[0]) << 8 | (U16)(s->pAckPkg->buf[1]); if(reg == G.ccmd_slaver_info[0].reg) { - //收到认证包ack G.authed = 1; } else if(reg == G.md_slaver_info[2].reg) diff --git a/source/app/app_task_tcp_control.c b/source/app/app_task_tcp_control.c index 2361d61..c62030c 100644 --- a/source/app/app_task_tcp_control.c +++ b/source/app/app_task_tcp_control.c @@ -15,6 +15,7 @@ void L3_task_tcp_control_init(void) } #define D_task_tcp_control_01 0x51 +#define D_task_tcp_control_02 0x52 void L3_task_tcp_control_handle(TS_tcp_control *s) { @@ -51,8 +52,17 @@ void L3_task_tcp_control_handle(TS_tcp_control *s) ts_tcp_control.tcp_send_stmp = s_nos_tick.t_1s; } - L2_task_go(D_task_tcp_control_01); + L2_task_go(D_task_tcp_control_02); + TTSS_Task_step(D_task_tcp_control_02) + if(g_at_send_status.conn_ok) + { + if(s_nos_tick.t_1s - G.tcpLastRecvStamp >= 20) + { + g_at_send_status.conn_ok = 0; + } + } + L2_task_go(D_task_tcp_control_01); TTSS_Task_end(); }