diff --git a/threadfunc/SH_ThreadFunc.cpp b/threadfunc/SH_ThreadFunc.cpp index e9ec9bb..05f211e 100644 --- a/threadfunc/SH_ThreadFunc.cpp +++ b/threadfunc/SH_ThreadFunc.cpp @@ -220,7 +220,7 @@ void CheckThread() loose_check = 0; sql_ctl->CalculateDip(); } - if(ModifyAddr == 21000 && pUart->bModifyAddr){ + if(ModifyAddr == 3600 && pUart->bModifyAddr){ LOG_ERROR("ModifyAddr failed \n"); exit(0); } diff --git a/uart/SH_Uart.cpp b/uart/SH_Uart.cpp index 111b71a..27140c3 100644 --- a/uart/SH_Uart.cpp +++ b/uart/SH_Uart.cpp @@ -608,6 +608,7 @@ int Uart::FindRecvPackage(int bytesRead, char* mUartRecvBuf,char* head) sleep(1); modify_LocalAddr(0x8888); bModifyAddr = true; + bSendTimeStamp = false; sleep(1); tcflush(fd,TCIFLUSH); GlobalConfig::Zigbee_G.MyAddr = 0x8888; @@ -1240,6 +1241,8 @@ int Uart::UpdateConfig(unsigned char* pDestShortAddr) print_info("UpdateConfig\n"); bUpdateconfig = true; unsigned short localAddr = 0x9999; + GlobalConfig::EnterZigBeeWaveTransmittingFlag_G = ENTER_TRANSMITTING_STATUS; + GlobalConfig::EnterZigBeeWaveTransmittingCnt_G = 0; // WriteShortAddr_DistAddr2Zigbee(localAddr,pDestShortAddr);//永久参数配置 char tmpbuf[8] = {0x00}; sprintf(tmpbuf,"%02x%02x",pDestShortAddr[0],pDestShortAddr[1]);