From 7a042b7a62942a129326d2db5ea955c37698f65d Mon Sep 17 00:00:00 2001 From: zhangsan Date: Sun, 20 Dec 2020 16:41:10 +0800 Subject: [PATCH] 333 --- .../soft_gsm_main.sip_sym | Bin 509552 -> 509552 bytes .../soft_gsm_main.sip_xm | Bin 324 -> 324 bytes .../soft_gsm_main.siwork | Bin 121524 -> 121554 bytes source/app/app_task_tcp_control.c | 28 +++++++++--------- 4 files changed, 14 insertions(+), 14 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 aa5943c5bfe60390916e8ff43e58ced9e8bb16b5..6f188353c8298a90e4c99dc873d6073b87aaa527 100644 GIT binary patch delta 88 zcmey+BmbdCUR0EwfgzTGfrXo!fq@5zXEHJ{Y}u%IpK-cC2eV)^E7NvXCdPjG$p*|U k+h-^;YA`a+Xg{dL2*gZ4%nZaVK+FonY}*eiv9DhY0K@edu>b%7 delta 91 zcmey+BmbdCUR0EwfgzTGfrW>gfdPd7{r~@e%SOffjMD`=m<5|znYObsG4{((Vq%&6 mK$T_t97RSIM#h=#2bCCsm|iq diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index bc94bd3e84f479f0271cd4901e102fae66757b8c..b32481a252d919d7fc985de0790a5d2552148543 100644 GIT binary patch delta 10143 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 { - if(!G.authed) + //3s一次发送数据包 + if(s_nos_tick.t_1s - ts_tcp_control.tcp_send_stmp >= 2) { - //发送认证包 - G.ccmd_slaver_info[0].mask = 1; - } - else if(!G.flowStarted) - { - //发送流程开始包 - G.ccmd_slaver_info[2].mask = 1; - } - else - { - //3s一次发送数据包 - if(s_nos_tick.t_1s - ts_tcp_control.tcp_send_stmp >= 2) + if(!G.authed) + { + //发送认证包 + G.ccmd_slaver_info[0].mask = 1; + } + else if(!G.flowStarted) + { + //发送流程开始包 + G.ccmd_slaver_info[2].mask = 1; + } + else { G.ccmd_slaver_info[3].mask = 1; - ts_tcp_control.tcp_send_stmp = s_nos_tick.t_1s; } } + ts_tcp_control.tcp_send_stmp = s_nos_tick.t_1s; } L2_task_go(D_task_tcp_control_01);