From f8d318e788ef050e72b44ae33ac9c970f77d9cfe Mon Sep 17 00:00:00 2001 From: "CHINAMI-TV221UM\\Administrator" Date: Sat, 20 Jul 2024 10:27:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=B6=E7=BD=91=E5=85=B3zigbee=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=88=87=E6=8D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- threadfunc/SH_ThreadFunc.cpp | 2 +- uart/SH_Uart.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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]);