From be132271df9ed157025dafbe9679cd382e1d14e4 Mon Sep 17 00:00:00 2001
From: zhangsan <zezhao_wei@163.com>
Date: Thu, 3 Jun 2021 16:28:08 +0800
Subject: [PATCH] =?UTF-8?q?v2.0.2=20=E4=BC=98=E5=8C=96gm35=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../soft_gsm_main.sip_sym                     | Bin 512432 -> 729512 bytes
 .../soft_gsm_main.siwork                      | Bin 93015 -> 92949 bytes
 source/app/app_task_gm35.c                    |  41 +++++++++---------
 source/app/app_task_gm35.h                    |   2 +-
 source/app/app_task_tcp.c                     |   6 ++-
 source/app/app_task_tcp_control.c             |   2 +-
 source/clib/clib.c                            |   8 ++++
 source/clib/clib.h                            |   2 +
 source/msp/UART0.C                            |   9 ++--
 source/msp/UART4.C                            |   8 ----
 10 files changed, 41 insertions(+), 37 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 a9b59b7be5fc9980a9776186896507889ad81772..511b6f6f492ee75517fd19f3eb65e3989d1c8822 100644
GIT binary patch
delta 3497
zcmeHHU2GIp6rMYCcc;*w>@r0PBHhN7w6WqAD74UaH=xG)v`A4Nz%CI=Fk%*{TENmR
zf-NbUp;vlZt)ykDmIQ5^#gt$*CAEZ>{wBt@Xt5PE5Q(k^N+0|?XJ_!qH(&Ql?tF8;
zd*+)n_ntfLMrvzM=KT4pByE)>etoVaEsmF@6edaMI?}#p5L(0>VJ^>hi(rj|Wx!~&
zk{ZtJ$zgR%6}PDVN*De<x5(?&VI&=eNUu-a9`u8rYfD%tA)dp5W(X~MrOOhrZD_6N
z9_8U1m(m${$`vkJFFC@l%N_>7WoT2{*A(A?ne?Ph$`Gmj4G?fC92_s&;%wycjOgp%
z2)<>EC+yt4BD;9sj#su9?<<AMPh=ltK4MFNsXm3X$3;iACX$DfMWjDdj9l@H$nQLn
z9E!}Uq|G90z<|)}JR$1)EQXqx9nis%W#`bnLwx{Vs*&fihp=cbj1<`UoPS>^^yBMA
zpxiWEPGuoh!?qe(V=i&xidQrZm9jMPTdy}<G@K9zo(7v+92wI^V9YIY#&rnHletJ4
zcZu8MD3)?DfcH%kxT>#m2v(p=(N!#EC9X-_x4Q6Lb&D?Kz{6aGCR`%;oeutT<`(Wr
zy>`+q#wT?+e~7um$FG$x_^)F9Gs*C^kR7Z<IDgPY<Q^BtXBxp@XXm19COPc8cjv+Q
z7w{`+b?j1Jl~-dp<W8@q>@IO$muWvFiJ0&+e6e3KM6it~C1H3sDq;$Qy$6)j5U621
zk@me42XUV`F;9b>gNp84V_6XsHo?R}#c)1v$;5=c@b(*uk+=lwnS&uQgXUqj0E)`d
z#f~u*L`+D6yXA@j!4?}&R4~34RVC>c*mFS9pzDxAi^yTir`+tL&tPi>eu2Kn+{8vJ
zzXhBjl>NfA8MNdH=tbH28Wu<H#Dv4JzY^ctl*@Ud9phB1ntkxtVM@1(Bqn?S(<B>~
zOiW0HlW(FtZkZDkrlIf%%11He7!nh7_!DIaRx4)Z?^}8^bR4Bxjw&he@>@!y^DIu#
z5)l(RU||*d^<zliKuq`s21zzBq}LD=&Ol`~%IB<XVnP>WA4B;|OC}~<uDW$h!NGCZ
zI&U4bSG0n|t9qb*xq1YAewjn)0&{_Hg{p(=rtF40bm#dT`-E!zJL-bl3@2Br2I!lu
zQ`tuU9Syc*W3q3Zm0V~gZ-S0hss@f#I2k>(feT6k+exYcj+=^ujlyWRtU=joRTq(Z
z4vPz|-JgYpIhfS?6DIYUNmDs!(>}y8>sPdChRR&3q{L?aAI_VVJiUf0`4Jzx2wCr-
z_a7+KPMTj~ScQE|KObmctLk+j%xr)SdFn=}Kdt&}Gk6*;{<~J@d&txUGM>5nu)}nf
zvH&6>B^{d1s45iatA(IPWS+PPbJpRAGB{K4{VDmX4+5t!O)F3f#gvD`*?iT}87xrC
zwu|;2vyXRK=DS4JlNwtJ8+656*P_mazuMHNz%gdy&}67CHr{#BP}k$nn9dPx%>8q8
zBf3bP=^v_3Frl9^C&w(;Npn*FNOe8h;Td7E5nF>;55#&P)&sE~i1on#>49qY51Sm_
ABLDyZ

delta 1591
zcmZuxe@xV682`TaeUBI9V0YdTNIA~D8p~?~6{SS(Hd*S5bp>tJM5(1U3rEJ9V&Gwl
zFv)%49Xu+G9UT!gOXyhGR_)M^At4^i1&AmXwYkx{wh}kf^*s0e{#T#v-RFHi@AE#-
z^Zx9;=<W|@rKJf)DN_`_uuM@NNmi7-ilPh-th&j-pUJEtZn_(m(KQ_W?IsIz!(^A5
z6>?w9XOOd6b;*YBHHc<ory!!WJ&qiUc$2JKi`V7tD&69ff6Q+M@07_UEu#*3;G{dW
zFp|w!h8!OChKfg32C*Z|C95t4lFwjThRv)zA+yF#L--iu(BGq4*t7D|SP8^_H1ota
zD=_YRyZ6aeMMW}pk3%4$TGBQeQ%y=D_H?Y2uT6Ml^amg0ykq9jRLc|1H1dkf9S_=`
z$4q1r6G~9E%e&(m%)e;1#2t6afd;$m9w}%sahWsX11)Ca5PMx%*vqnc#4a6I95Q^_
zEdvu(>{0n=#1ksLVo3ylH7@Arlm_L?apL&2Q|3==vb>5*|BO>EQhzm<zUxjIn9;!L
zNAJ>W8hCSY?-FM<u&&3>H?vyHoJ&?-*W@6wYfh7I-Ehfi<eY1+P}7a7^#9oq-yH{B
zy{B5i*OtJgd&wc2?sR~)1nY48Y?ZMkH!dVK^#0O!4=3-yRny`VlugGyc81L~<gu$2
zdu+2NeQ$^fzreQ#)gVM)Qh91B+P}wDMY*rQ{%ZB(_(7%EQ9Or@cvv<sw?qCRRkN)%
zVi6OHVdjvE+i%FkguU?52bjWpn)9S2v>(FC7_c#x4y83JZjR5yQ|MG4kT)U${;t6Z
z<++TfsA&HbR~6+q=&MB?&p`L@H1yA*>@X!L5LVU!Hb41vbA4{a@R@`N>b8AY6NMxu
zRKvkKl+&@K1T={WZ^M&E$Qw;6jF`|0w@7X`WMV=(w0?+k)QC+?n1Ss_QLaIgqe)C?
zfcq#zX}y{O=Z~o!wi7r&S%?YEu)7}TbsI7<p$}FZNBIJpv;tzn1YAZL0>@OILTTC!
zy$k9Z(EY68PD~htyhfD2GGt;x`1tKc6&uH99=hF_aJaYagvfzYYsFC*{hGPJyH03O
z>A~J#)cen&t%TO~B1jjUgSLPV`wRL^?64zGXtF<Mk<MDqN?~Awu!D62Mu>Ldi+gSn
zJ@=3r1kGYR&L~WVO?Ei2QE0ZSSR8E*F<}W-<fE@|r*UU4=&~}Z&zaB1Y|j1q{h&{W
z5P-U;DE^lm|G8K3i4W<eZF?HaIN!_lFCh%MCo$_kD7MUTINO+@|0zB6RY3nH^bJ2I
zbl+3(LV+lO{xac%%1^Nr2c{{+7H7DXiGjv93oiuvgn(U}#dbNL!=b!TSizBDva)SZ
zS13GC-igEZLLByw@RUpp;Kdf_p^8Fr=nbiLa;Cz&J;I)1ieFJ2M@&O=kMOj0i)HZO
zoOlMTQ}_)Ag2KsWhK7S;3j^P0_`@#NoApI3#<yoE`x8;bY&S6g?I|(gSA9_H5zaOL
E0-Tz}pa1{>

diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork
index 1e53d5455adb6efe0bbb36cc28c8d4a2a1494dd9..aef5b9826a8430e3231bc4fbadeae4f2df10b3a6 100644
GIT binary patch
delta 7760
zcmbVRdw3Mbk)P2>t(C#Bf<+n`FvEL^0WA*;iI-LnkZi}WKH`9}K#O@AW4wnk;734&
z#PG!lUU{7x5#yl17b8Cc3vw)D0~Q<vkc_qXh3<pkCHb5qF}~Z}IX<0n;C{cEo@E#A
z{<;3XQuS6<S5;S6cUO<jewy|3PqU&W8D{Hz)fIW*%1058rf1}=t<POG|8S<F{K=yz
z!*s=J27cF|_YCj`z_S1o@DBxw^2dIva%YjM%#pGj@Ut1J@>f++)(2FjPE(Ytvs7hY
zuA=N+tSU>g>T?H0jLe!0MQLu$T<6}9m=e=2z3CAcV6}Dobm3a7D2b!Gn7hWt^MT{<
z=%QBQpu~$Lf0e|mC0;A}>*Vhzfdi}Z#8dM3)4;Uz%o=5b)%k%WY>>E4;!VI^p*-;;
z;P4?`{8-{=CEg6&`Iatz0!)X0D)I9YzW_|b5s6=vbQ72kG_2WR58NghzmWJPiMLDq
zvc$gx_Pwo(9TGQ6{43z<W4hQW@h*vfE%9z(j%$+mRp73p9`PDy%+Bi)zaa&FBk>-I
z_X0N^_lPJkXSxrVGuSV2v&3&o{1!0f4oLit#P3Rc5SS6&a7cFEllX|lM<xDeiH`vX
zj(Nm!`TKVgp8%$zlM<f-Hh!EZ+JG66c8T8y=2D&pru+xMSegx@LlR=Z(Y1Nv46y6T
zJn=6Q|6bw?692oz35owh;;$tBTH-EX8v1XEzmfQg#DBN&cwJnRgbZXoL#j!f34G}t
zkI0f(08?T1+UCFZ9IcKBV!v#}KH``W=(ltaT`iq+R^5GzqG&H~IXX`Emqzw|^}XhK
zS31<4ZZ#6`=glmu96Po-xa{MMk+)(Tf!ntqfGzP^hvxrua&kvrLo>p<Xqls`HELw*
z7cPGm#JEXQo1+FNgVh?LMkzRf13*!p0PF<>;vHJ(f-cN>hN?%_U)CeBC%zlGaCuaJ
z8et1U>gND1p%3^u@9L|iEw2}<wHn+WUu?M@nNi~!%mc%5+4tuTt@_TqG?%y3>*lRR
z>L@P-9jBDb9h&b8IEI!Z!T7R6oAc@!E%HH4!EiUExnm2#d~fmNRzRPF<ZqwqyVZ+;
zvcDulHIEdkvs#vT)elmFI(~xf-PK>a1`CXLybHrS-yhPwi^03v(Q1Ji9jz|9gYI#J
z<7WIXm{0!?EjNdNUIcK%?Lgl?ku$H9<rZMsnara>zjSI9BGfRzj?g&za6V%Q1d{fB
zmpZiApgw8Qsf%D0t_)SHM^VzT+Xzn+unm&ZOF|Shuk<A+ve76Q&wx7M%+Y{%!6JK(
z<Z&&-&+DQKiQ}(_twY1qA!$od2Rk9?hOp8@LMwiEHJ#DSoZ;%AenCk1q&KyYAS56W
z+JO_bZpPykF*2oqqr#8hZmcF`6>J2nWsMzE;+qvjpQ*)7J_@+kXa=rDN8q%w%5lwS
zwttdwQ)Wf~wL?2OA${$tpV!TT0XJlpfgra6pg5UXVGIt*%*tH>hVN&2VkB_M3;zhy
z*K*~W-D%}bz0uup!WsG#_8>+xlxz&A{(>&*b3J9wV!2^0EG^nniW0={0LD?CEeHk;
zcRrUV?f|aoPs3H+oH^Gn`y?aPuK$ln0N75oy9`SRyR#j;;m=_M0Cm?J#smPiRom`E
zP{M=sJCOS6M*D0Uh-KQd;qok=Q|yb&O5~z{hM8Edx>~X_)%KL_G<IA|@D3HZoVu5y
z7dy1h57XD934t-c%~9X>rtYBtrsBHI-b36!gb--4A$^2-{uXs^Zg)^z9lG!WpS$a^
ztEJ5^e`OsrW5?|8if8l*g3jP|{Z1Fdfwes=A@li{wv6wlMQgl(px}f{4PGbqKx**Z
z;2Qv_OEw>V#{sFq%f?iA*bjr$_+GG!fMsAyR{d?~i6Yr=IL_eR-Q4#NXPvMik$o)-
z`lz2|j2w)Sgi3&uRtC=GaMp=54;x?9Mf2^Kj%n5Odn<rjDf@=g-O=PEK?rl*GSQCi
zBn<2XBtT1aJE=u_T&`5dHqX5Lq&kc@#UOx{!KoS9bV?UPL4SJ9qX?>Y&I+n;+D$=K
zpfn6f4Qgm>`c4S`9($hGO-ic+&A_<SpmH(meyfWiz#lcQfZcmOw(VBlWH)#ohYxh5
z+Kt*f;eICwap?B}Qp_rTj0yfPcB7|t!5|*ahg~dScWjHkJ9eEPCj0Xuxr+x!LMz8M
ze|tLRQmL4Jvun|FIBEc?u6gZ{BwdSvp8%w~W^hV?8$;rKQx{yLG0!|=xwa7-<42o2
zCl7>c><5#sRh~$5t>UJrHGVgyMPVY<HUBTtSIdnE1#WZ=G(TvmuEDYr+pmj(!2J&_
z$7*eA<!V(-FX#4*%oydmHE>cF2KeRu$-m<rn_rgXUplOd0pPFN_%Qe%HCy~?B}sn6
z5nbF4{;tEzz<>HTHorK@_qXbzKltaaECqk?Zks=W{1HLWSuXHp!VQ)ggbYH~?oyOj
zmq(9}ko}jE;qx`7hOhE^xiEwo<!sXUJuxk?rgz$P9Wr$hS^tV2DSu_zC<;3%XdvK;
z-S%}i1av|awD|YWXe@C0n)eo}g%Ppaee0a}b<r0j|FI>Q%VXPk?NwCb+WS0XXd$Wq
zmgBd9|F8-^d^aHc^~Ky_<7L0qnn%1~Xmg<coO9q{IV$bzYh*W!b-<ZR-Cc0+@$|WL
zHsHXSZC0vYN;?yY!Rgl5b)MkLLJ48enojqy%0*A)Y{TYU-rsz1;pwToG<7lN(fcQI
z9=ytUeGg&oIriPK?>?537R%!8h~=8_$h2xC3c*$Y#wM@t7-@(t3q$L&P}+6DO8NNC
zMX>ztCMz2%#wD|5%K=^FQ$u_q_zQnvc~;SU?Y}PC*;;&17kOZNE6MM+)*f$NHdZ!0
zi&fw&tq){sHa=vn!V1v(=I@xsYM%YmT!mesl^MxmzM|Z|iXx%at|7?1<m5xs5d4}$
zX`8W*li$8N;iaGxdw(_F;In&Lv9AW5kf=iJU+X0zZ$7aakJRg04G1fM)Ggk%4NuFL
zbP@k2djToW<{0onJ^+O_)&3g*EhzO+mm?bmtrb8iS)%7C2@o#5f~APA=|9CsO*gDn
z7_?$kjvU21$7&DZZvrvnI}jf<lue&6xZ3>fq97B$%)TZg@d2*1V!07P^KHNWJ%T4v
zH8M65e5Be7UDy4D#klm-sg+wnYtlc|BC$ut8X++K2Xn35<3MUspecYLB@nF0pcOS<
zI_%86j@sm2X3<1&gBIKk;eUHHKXPbAVZRs%URmGnfdC;4TC@{Fu1DMY#o$Bd4O$u@
z(Da(6W#aGyh&G@6y)p9LK?|%b<7#?(ebbv+#=fYwpEzc4shZWiWZtQi{a$8Y(viZ2
z9^F8+8sD<#2z7Ry%DFwbaM6ggxk2!xTpu1n1Y<hfp3_t0@QfN3>9MGLTB0Sujsut+
zY>ZzNiPnJl#c-$CRQs<J!YJew1R#~?1I-N@^$;A{0O%pgqa_o~fS>_CnP^jeaM}+@
zkx*LkJ0|0wOtc^*cr@_~33K6_+8{P~{`aj7US{9mH=Rws%9!SQuxHxYv<35uJXMo^
zHpMHjBOnaLj-yHfv})&UqG^5`!ACZw*B7-gT{P1&UGjgJRxpX`nsn1)Ci%Ae(@pze
zCI(0~9j4z55s$^Ch-l*xk8nd`;!K*}RArm4*xz+NV~P`WV&_l}l|$it+dAo7*tg5w
zB8bE>u)s9NMLHWfGoZIGR;4Cio6gcTmSI-_D9LJ-5XbK(Mx=bkpneKWxM>EB&qhKB
ze%F20sqyL9FNjHn<iwI1Ake^x^_-b!J=cog_K2Psxv+UYCf4q^Csuw_)f0ee1IjoV
zHcm)s>z?*nOVA@}(3ZkYjBzml<=G4{Sff_AdIX)?w{srs_MT|jEiSvsZWP~6>!3H)
zZnPmM&8`pn<1!LZX|*V5i5u*)+DaVu2!6)NdZY$+-yLV$O{ta+c?9JGa~}kM;V6qg
z!K#+}7@(6EKHw3&*MDfvg-o~Mwv1IVC1v~vJ>nL~?7i{;WSR}@o}6G+BDse_=T|T8
z$iL;1|7wA)gJs4IUpACdoFFf!AJ%nMZV~Bjq#xFeh?H-toe$1oU5DS73arEW_HGRS
zoNyn3XNkGKNFA7QQ89m2q~4avcS?P(Zg!NY#o6(XPic4!S`x-Zc*yKHDS@lttOTEo
z=IjY-z}0o(l*UJ<xp#s(Ig>p{o6G&@QyL%UW>v9jB-O2g8Ul9|fz6WITnu&I|2(Df
zD}wnM#?VQ%1WuA7)q2g^64jmU|NAKo#jm-hM4gh!DwyoT$!dwnZqrcpnms1klN>V<
z<5>nL-C8%MO=I0_md;QO(=1W@W%8%P&kj#&(@=MtQzzLP7EDravk2=asrR{>rnPCT
z+ReRpt6p<QiR#JZ&*bRVnQa>0V96lYPsV5x_Dojq%kF%jO~Z4<6jRiJ1DpWgg$NM%
z1}CslX!;b4NGxpAP=TAj#0bXY$Q0-!;R3iW*UC1HRhv1pIwi#8p@6_zj9@iNt(}Sx
z8|&IMR&r*?RIC_#bpE|kwIut8Z5nGhb7?6!>^akNh3DoA7N+L4QhQwn`Vm))QtIcr
zJ(Vwb>6)e=L)qidYZIX~kS|!8n}uce$otALk`$@DB-@uSSQav*hVdo5<?ZP>??Ruz
zMk$W!S&fBWoG)-6B^P>QIn?rkGIx~2p-V&a1>dBcrI8Hv{YYQ}Z#KSr&{ZI17F8hB
z0g*3o%_Kv;uL2r*@0cAG(AfA`zTjtDb9iM+tewlAnh0!^N=B~JoiBKUB<Fvz5^62V
zwMwY1n+B`+B5Tf`mZG*8Y6!XnAnUuWX--oE*}=Yub|}wIvM&`gcREz^gQ;0K9V)vf
z<_n(f=H}@sDz`udfpd3mc1z023jO^yjb9GU0af-gl~qBfMX9ZV&gyRM8qaMj0g{`U
zbsvHHxS1INN+o9>{i03dvC9OVoXH+pR<eEFrtwLZ?&MccK%hcCHK@>%8h#g?i1lgL
z8gNM4smor{P^;3e@octpmp!t0B4iuws8hjVdT|S#xf?ShB{{h6jW&&+^31AxQUc~=
zo`d0v^}&w`=C_U^m#d{sWA$zJycg4Bk2;s$s}{S$N7^(V^wu$B6ksAeOqWY=4r%JN
zq&Cb@b@OZy^7<kob`<;j9(7=H*j9)Ucxw{a`1#D*(b@6uv}^b;3DaT3hzGzT@UkMX
z@n0x*@A}_rGdx2rtv53NA46L()Suz<O-4a+;E2}J8BkYi-Z4<_R4`Gny6(51TnBMq
z5)58aXF9c()!$QJ>^`q`5*|$uqf5M%2~p7MWEssHk}dPm1rM*J6!oXtsKemI`W$O!
zCm}#+1<iQFBU%<OP{Wy{JRA>Ti$k|}TdpPk7Z3?PxRluI5&O}f)iP*_8q73zJ*XD(
RgY8oDgIaa88C|a4@;|X9^7jA$

delta 8184
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

diff --git a/source/app/app_task_gm35.c b/source/app/app_task_gm35.c
index c2a497b..0b37d73 100644
--- a/source/app/app_task_gm35.c
+++ b/source/app/app_task_gm35.c
@@ -31,9 +31,6 @@ struct _s_task_gm35_gprs_ s_task_gm35_daemon;
 
 U8 ins_cipsend[30] = "AT+CIPSEND=000\r\n";
 
-#define GM35_TCP_CIPSEND(x) 	L0_uart4_sendstr(x); g_at_send_status.send_lock = 1
-#define GM35_TCP_CIPSEND_COMPLETE()		g_at_send_status.send_lock = 0
-
 U8 * _cipsend_hex(U8 len)
 {
 	U8 pos = libc_strlen("AT+CIPSEND=");
@@ -44,18 +41,19 @@ U8 * _cipsend_hex(U8 len)
 	return ins_cipsend;
 }
 
+void L3_gm35_send_str(U8 *str)
+{
+	L0_uart4_sendstr(str);
+	L0_uart0_sendstr(str);
+}
+
 //将数据放入gm35待发送缓冲区
-void L3_gm35_send(U8 *buf , U8 len)
+void L3_gm35_send_data(U8 *buf , U8 len)
 {
-	//g_at_send_status.tcp_last_send_stmp = s_nos_tick.t_1s;
-	int i = 0x20000;
-	GM35_TCP_CIPSEND(_cipsend_hex(len));
-	while(i--);
+	L3_gm35_send_str(_cipsend_hex(len));
 	L0_uart4_sendArray(buf,len);
-	GM35_TCP_CIPSEND_COMPLETE();
+	L0_uart0_sendArray(buf,len);
 }
-
-
 //------------------------------------------------------ gm35 tasks --------------------------------
 
 // void L3_task_gm35_send_init(void)
@@ -92,6 +90,8 @@ void L3_task_gm35_daemon_init(void)
 {
 	L1_task_init(&s_task_gm35_daemon.task);
 	L3_task_s_go(s_task_gm35_daemon,D_task_init);
+
+	P55 = 1;	//灯灭
 }
 
 //------------------------ GM35 Daemon Handle -----------------------------------
@@ -114,15 +114,13 @@ void L2_task_gm35_daemon_handle(struct _s_task_gm35_gprs_ *s)
 		L2_task_go_Tdelay(TTSS_TASK_GM35_DAEMON_CIPSTATUS,D_Tdelay_10s);
 
 	TTSS_Task_step(TTSS_TASK_GM35_DAEMON_CIPSTATUS)
-		//if(0 == g_at_send_status.send_lock)
-		//{
-		L0_uart4_sendstr(AT_INS_CIPSTATUS);
+		L3_gm35_send_str(AT_INS_CIPSTATUS);
 		L2_task_go_Tdelay(TTSS_TASK_GM35_DAEMON_JUDGE,D_Tdelay_2s);
-		//}
 	
 	TTSS_Task_step(TTSS_TASK_GM35_DAEMON_JUDGE)
 		if(1 == g_at_send_status.conn_ok)		//已连接
 		{
+			P55 = 0;	//灯亮
 			if(s_nos_tick.t_1s - g_at_send_status.gprs_last_recv_stmp > GPRS_MAX_IDLE)	//连续GPRS_MAX_IDLE秒没有收到 AT指令
 			{
 				//关闭连接
@@ -132,11 +130,12 @@ void L2_task_gm35_daemon_handle(struct _s_task_gm35_gprs_ *s)
 			{
 				//关闭连接
 				g_at_send_status.conn_ok = 0;
-				L0_uart4_sendstr(AT_INS_CLOSED);
+				L3_gm35_send_str(AT_INS_CLOSED);
 			}
 		}
 		else	//未连接
 		{
+			P55 = 1;	//灯灭
 			if(s_nos_tick.t_1s - g_at_send_status.tcp_close_stmp > TCP_MAX_DISCONN)
 			{
 				if(++g_at_send_status.gm35_reboot_times >= TCP_MAX_GM35_REBOOT_TIMES)
@@ -182,7 +181,7 @@ void L2_task_gm35_flow_handle(struct _s_task_gm35_gprs_ *s)
 		L2_task_go_Tdelay(TTSS_TASK_GM35_FLOW_ATEQV,D_Tdelay_10s);//上电等待10s
 		
 	TTSS_Task_step(TTSS_TASK_GM35_FLOW_ATEQV)
-		L0_uart4_sendstr(AT_INS_ATEQV);
+		L3_gm35_send_str(AT_INS_ATEQV);
 		g_at_send_status.module_ok = 0;
 		g_at_send_status.ins_stmp = s_nos_tick.t_1s;
 		L2_task_go_Tdelay(TTSS_TASK_GM35_FLOW_ATEQV_WAIT,D_Tdelay_300ms);	//指令发送完毕等待300ms
@@ -206,7 +205,7 @@ void L2_task_gm35_flow_handle(struct _s_task_gm35_gprs_ *s)
 		}
 
 	TTSS_Task_step(TTSS_TASK_GM35_FLOW_CCID)
-		L0_uart4_sendstr(AT_INS_CCID);
+		L3_gm35_send_str(AT_INS_CCID);
 		g_at_send_status.sim_ok = 0;
 		g_at_send_status.ins_stmp = s_nos_tick.t_1s;
 		L2_task_go_Tdelay(TTSS_TASK_GM35_FLOW_CCID_WAIT,D_Tdelay_300ms);	//指令发送完毕等待300ms
@@ -238,7 +237,7 @@ void L2_task_gm35_flow_handle(struct _s_task_gm35_gprs_ *s)
 		}
 
 	TTSS_Task_step(TTSS_TASK_GM35_FLOW_CREG)
-		L0_uart4_sendstr(AT_INS_CREG);
+		L3_gm35_send_str(AT_INS_CREG);
 		g_at_send_status.net_ok = 0;
 		g_at_send_status.ins_stmp = s_nos_tick.t_1s;
 		L2_task_go_Tdelay(TTSS_TASK_GM35_FLOW_CREG_WAIT,D_Tdelay_300ms);	//指令发送完毕等待300ms
@@ -262,7 +261,7 @@ void L2_task_gm35_flow_handle(struct _s_task_gm35_gprs_ *s)
 		}
 
 	TTSS_Task_step(TTSS_TASK_GM35_FLOW_GPRS)
-		L0_uart4_sendstr(AT_INS_GPRS);
+		L3_gm35_send_str(AT_INS_GPRS);
 		g_at_send_status.gprs_ok = 0;
 		g_at_send_status.ins_stmp = s_nos_tick.t_1s;
 		L2_task_go_Tdelay(TTSS_TASK_GM35_FLOW_GPRS_WAIT,D_Tdelay_300ms);	//指令发送完毕等待300ms
@@ -286,7 +285,7 @@ void L2_task_gm35_flow_handle(struct _s_task_gm35_gprs_ *s)
 		}
 
 	TTSS_Task_step(TTSS_TASK_GM35_FLOW_CIPSTART)
-		L0_uart4_sendstr(AT_INS_CIPSTART);
+		L3_gm35_send_str(AT_INS_CIPSTART);
 		g_at_send_status.conn_ok = 0;
 		g_at_send_status.ins_stmp = s_nos_tick.t_1s;
 		L2_task_go_Tdelay(TTSS_TASK_GM35_FLOW_CIPSTART_WAIT,D_Tdelay_300ms);	//指令发送完毕等待300ms
diff --git a/source/app/app_task_gm35.h b/source/app/app_task_gm35.h
index 26891a8..1502c63 100644
--- a/source/app/app_task_gm35.h
+++ b/source/app/app_task_gm35.h
@@ -84,7 +84,7 @@ extern struct _s_task_gm35_gprs_ s_task_connect_gprs;
 
 extern void L3_task_gm35_core_init(void);
 extern void L3_task_gm35_core_handle(void);
-extern void L3_gm35_send(U8 *d , U8 len);
+extern void L3_gm35_send_data(U8 *buf , U8 len);
 
 #endif 
 
diff --git a/source/app/app_task_tcp.c b/source/app/app_task_tcp.c
index da41485..d751bb5 100644
--- a/source/app/app_task_tcp.c
+++ b/source/app/app_task_tcp.c
@@ -44,8 +44,7 @@ void L3_task_tcp_handle(TS_tcp *s)
 		}
 		
 	TTSS_Task_step(D_task_tcp_send_modbus_pkg)			//发送包
-		L0_uart0_sendArray((U8*)&s->loopPkg,s->pkglen);
-		L3_gm35_send((U8*)&s->loopPkg,s->pkglen);
+		L3_gm35_send_data((U8*)&s->loopPkg,s->pkglen);
 		s->sendStamp = s_nos_tick.t_1s;
 		if(G.ccmd_slaver_info[s->slaverIndex].mask == 1)
 		{
@@ -60,7 +59,10 @@ void L3_task_tcp_handle(TS_tcp *s)
 			g_at_send_status.tcp_last_recv_stmp = s_nos_tick.t_1s;
 
 			s->pAckPkg = (TS_PH3_ccmodbus*)(s_uart4_tcp_rec.sp);
+			L0_uart0_sendstr("ATRCV=");
+			L0_uart0_uchex(s->pAckPkg->num + 3);
 			L0_uart0_sendArray((U8*)s->pAckPkg,s->pAckPkg->num + 3);
+			
 			if(s->pAckPkg->slaver == G.ccmd_slaver_info[s->slaverIndex].slaver)
 			{
 				s->ackFlag = 1;
diff --git a/source/app/app_task_tcp_control.c b/source/app/app_task_tcp_control.c
index 5507e52..ee9d007 100644
--- a/source/app/app_task_tcp_control.c
+++ b/source/app/app_task_tcp_control.c
@@ -35,7 +35,7 @@ void L3_task_tcp_control_handle(TS_tcp_control *s)
 		if(g_at_send_status.conn_ok)
 		{
 			//3s一次发送数据包
-			if(s_nos_tick.t_1s - ts_tcp_control.tcp_send_stmp >= 2)
+			if(s_nos_tick.t_1s - ts_tcp_control.tcp_send_stmp >= 3)
 			{	
 				if(!G.authed)
 				{
diff --git a/source/clib/clib.c b/source/clib/clib.c
index 1bb3a51..366548f 100644
--- a/source/clib/clib.c
+++ b/source/clib/clib.c
@@ -146,6 +146,14 @@ void L1_delay_test(void)
 }
 #endif
 
+U8 L0_strlen(U8 *str)
+{
+	U8 count = 0;
+	while(*str++)
+		count++;
+	return count;
+}
+
 void Lc_delay_us(vU16 i)
 {
 	vU16 m;
diff --git a/source/clib/clib.h b/source/clib/clib.h
index 3ee35af..92d4bea 100644
--- a/source/clib/clib.h
+++ b/source/clib/clib.h
@@ -103,6 +103,8 @@ extern U8 libc_strhas(U8 *s1,U8 len1,U8*s2,U8 len2);
 extern U8 libc_atoi(U8 *str);
 extern void byte_copy_uc(void *dst,void *src,U32 len);
 extern U8 StrStartsWith(U8 *s1,U8 *s2);
+U8 L0_strlen(U8 *str);
+
 
 #endif /* end __UART_H */
 /*****************************************************************************
diff --git a/source/msp/UART0.C b/source/msp/UART0.C
index 5aeed43..36000ba 100644
--- a/source/msp/UART0.C
+++ b/source/msp/UART0.C
@@ -58,9 +58,10 @@ msp/uartx.c    底层代码	 和cpu相关 缓存发送也放在里面
 #include "uart2.h"
 #include "uart3.h"
 #include "uart4.h"	
- #include <stdio.h> 
- 
-struct _s_protocol_ s_at0; 
+ #include <stdio.h>  
+#include "../clib/Clib.h"
+
+//struct _s_protocol_ s_at0; 
 
 struct _s_uart0_send_buf_ s_uart0_send_shop;
 struct _s_uart0_send_buf_ s_uart0_send_depot;
@@ -195,7 +196,7 @@ void L0_uart0_ulhex(vU32 ww)
 void L0_uart0_sendstr(U8 *str)
 {
 	//L0_uart0_sendbuf(str,strlen(str));
-	s_uart0_send_depot.max = strlen(str);
+	s_uart0_send_depot.max = L0_strlen(str);
 	s_uart0_send_depot.p = str;
 	L0_uart0_sendbuf();
 }
diff --git a/source/msp/UART4.C b/source/msp/UART4.C
index 7d25e95..f22d6c1 100644
--- a/source/msp/UART4.C
+++ b/source/msp/UART4.C
@@ -213,14 +213,6 @@ void L0_uart4_ulhex(vU32 ww)
 	L0_uart4_uchex(ultemp.BYTE4.byte3);		
 }
 
-U8 L0_strlen(U8 *str)
-{
-	U8 count = 0;
-	while(*str++)
-		count++;
-	return count;
-}
-
 void L0_uart4_sendstr(U8 *str)
 {
 	//L0_uart4_sendbuf(str,strlen(str));