diff --git a/Cidn-SH b/Cidn-SH index 22c3598..817ee23 100644 Binary files a/Cidn-SH and b/Cidn-SH differ diff --git a/uart/SH_Uart.cpp b/uart/SH_Uart.cpp index 1d90c9e..5e05978 100644 --- a/uart/SH_Uart.cpp +++ b/uart/SH_Uart.cpp @@ -47,9 +47,9 @@ int Uart::UartRecv(int fd, char srcshow,char* buffer) memset(buff, 0, sizeof(buff)); ret = read_data(fd, buff, BUF_LENGTH, 10); if (ret <= 0 ){ - if(!bUpdate && !bUpdateconfig){ + if(!bUpdate && !bUpdateconfig && GlobalConfig::EnterZigBeeWaveTransmittingCnt_G > 15){ timeoutflag ++; - if(timeoutflag > 1500){ + if(timeoutflag > 300){ LOG_DEBUG("===============0x9999 timeout= %d offSize = %d===============\n",timeoutflag,offSize); print_info("0x9999 timeout %d===============Size = %d\n",timeoutflag,offSize); FindRecvPackage(offSize, mUartRecvTmpBuf,head); @@ -69,9 +69,9 @@ int Uart::UartRecv(int fd, char srcshow,char* buffer) LOG_DEBUG("wave end\n"); } usleep(10000); - }else if(bUpdatePre || (bUpdateconfig)){ + }else if(bUpdatePre || (bUpdateconfig && GlobalConfig::EnterZigBeeWaveTransmittingCnt_G > 15)){ timeoutflag ++; - if(timeoutflag > 1500){ + if(timeoutflag > 300){ print_info("bUpdateconfig %d===============\n",timeoutflag); GlobalConfig::EnterZigBeeWaveTransmittingFlag_G = NO_ENTER_TRANSMITTING_STATUS; GlobalConfig::EnterZigBeeWaveTransmittingCnt_G = 0;