zhangsheng/wirelessgateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复配置更新时网关zigbee本地地址切换问题

Browse Source
This commit is contained in:
CHINAMI-TV221UM\Administrator 2024-07-20 10:27:28 +08:00
parent 9dd61e77cd
commit f8d318e788
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
threadfunc/SH_ThreadFunc.cpp
View File

@ -220,7 +220,7 @@ void CheckThread()
loose_check = 0; loose_check = 0;
sql_ctl->CalculateDip(); sql_ctl->CalculateDip();
} }
if(ModifyAddr == 21000 && pUart->bModifyAddr){ if(ModifyAddr == 3600 && pUart->bModifyAddr){
LOG_ERROR("ModifyAddr failed \n"); LOG_ERROR("ModifyAddr failed \n");
exit(0); exit(0);
} }

3
uart/SH_Uart.cpp
View File

@ -608,6 +608,7 @@ int Uart::FindRecvPackage(int bytesRead, char* mUartRecvBuf,char* head)
sleep(1); sleep(1);
modify_LocalAddr(0x8888); modify_LocalAddr(0x8888);
bModifyAddr = true; bModifyAddr = true;
bSendTimeStamp = false;
sleep(1); sleep(1);
tcflush(fd,TCIFLUSH); tcflush(fd,TCIFLUSH);
GlobalConfig::Zigbee_G.MyAddr = 0x8888; GlobalConfig::Zigbee_G.MyAddr = 0x8888;
@ -1240,6 +1241,8 @@ int Uart::UpdateConfig(unsigned char* pDestShortAddr)
print_info("UpdateConfig\n"); print_info("UpdateConfig\n");
bUpdateconfig = true; bUpdateconfig = true;
unsigned short localAddr = 0x9999; unsigned short localAddr = 0x9999;
GlobalConfig::EnterZigBeeWaveTransmittingFlag_G = ENTER_TRANSMITTING_STATUS;
GlobalConfig::EnterZigBeeWaveTransmittingCnt_G = 0;
// WriteShortAddr_DistAddr2Zigbee(localAddr,pDestShortAddr);//永久参数配置 // WriteShortAddr_DistAddr2Zigbee(localAddr,pDestShortAddr);//永久参数配置
char tmpbuf[8] = {0x00}; char tmpbuf[8] = {0x00};
sprintf(tmpbuf,"%02x%02x",pDestShortAddr[0],pDestShortAddr[1]); sprintf(tmpbuf,"%02x%02x",pDestShortAddr[0],pDestShortAddr[1]);