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

fix bugs

Browse Source
This commit is contained in:
zhangsheng 2026-03-16 11:35:16 +08:00
parent 3770680271
commit 8cc3cb10b7
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Cidn-SH Executable file
View File

Binary file not shown.

10
uart/uart.cpp
View File

@ -131,6 +131,7 @@ Uart::Uart() : mUart(mIoSev), mStrand(mIoSev) {
memset(send_data, 0, sizeof(send_data)); memset(send_data, 0, sizeof(send_data));
last_short_addr = 0; last_short_addr = 0;
last_time = 0; last_time = 0;
last_time_upgrade = 0;
current_z = false; current_z = false;
} }
@ -385,7 +386,7 @@ int Uart::DealAskTask(uint16_t ushortAdd){
scheduleTask.next_taskID = UPGRADE; scheduleTask.next_taskID = UPGRADE;
TaskResp(scheduleTask); TaskResp(scheduleTask);
} }
DealReviveDuration(ushortAdd);
// if (next_task_id == kScheduleEigenValue) //1.特征值 // if (next_task_id == kScheduleEigenValue) //1.特征值
// { // {
@ -646,8 +647,9 @@ int Uart::DealFeatureValue(const char *pData,uint16_t ushortAdd){
GetTimeNet(localtimestamp, 1); GetTimeNet(localtimestamp, 1);
std::string nowTimetamp = std::string(localtimestamp); std::string nowTimetamp = std::string(localtimestamp);
long now_time = atol(nowTimetamp.c_str()); long now_time = atol(nowTimetamp.c_str());
zlog_info(zct, "DealFeatureValue1 short_addr_last = %02x%02x,timestamp_last = %ld,nowTime = %ld",UINT16_HIGH(ushortAdd), UINT16_LOW(ushortAdd),last_time,now_time);
if(ushortAdd == last_short_addr && (now_time - last_time) < 5){ if(ushortAdd == last_short_addr && (now_time - last_time) < 5){
zlog_warn(zct, "DealFeatureValue short_addr_last = %02x%02x,timestamp_last = %ld,nowTime = %ld",UINT16_HIGH(ushortAdd), UINT16_LOW(ushortAdd),last_time,now_time); zlog_warn(zct, "DealFeatureValue2 short_addr_last = %02x%02x,timestamp_last = %ld,nowTime = %ld",UINT16_HIGH(ushortAdd), UINT16_LOW(ushortAdd),last_time,now_time);
int iRet = DealDataNodeFeature(pData, 0); int iRet = DealDataNodeFeature(pData, 0);
if (iRet != 0) if (iRet != 0)
{ {
@ -715,13 +717,13 @@ void Uart::DealRecvData(const char *pData) {
GetTimeNet(localtimestamp, 1); GetTimeNet(localtimestamp, 1);
std::string nowTimetamp = std::string(localtimestamp); std::string nowTimetamp = std::string(localtimestamp);
long now_time = atol(nowTimetamp.c_str()); long now_time = atol(nowTimetamp.c_str());
if(ushortAdd == last_short_addr && (now_time - last_time) < 5){ if(ushortAdd == last_short_addr && (now_time - last_time_upgrade) < 5){
zlog_warn(zct, "WAVE_COMPRESS | UPGRADE_ASK short_addr_last = %02x%02x,timestamp_last = %ld,nowTime = %ld",UINT16_HIGH(ushortAdd), UINT16_LOW(ushortAdd),last_time,now_time); zlog_warn(zct, "WAVE_COMPRESS | UPGRADE_ASK short_addr_last = %02x%02x,timestamp_last = %ld,nowTime = %ld",UINT16_HIGH(ushortAdd), UINT16_LOW(ushortAdd),last_time,now_time);
return ; return ;
} }
GetTimeNet(localtimestamp, 1); GetTimeNet(localtimestamp, 1);
nowTimetamp = std::string(localtimestamp); nowTimetamp = std::string(localtimestamp);
last_time = atol(nowTimetamp.c_str()); last_time_upgrade = atol(nowTimetamp.c_str());
} }
if (ushortAdd != last_short_addr){ if (ushortAdd != last_short_addr){

1
uart/uart.hpp
View File

@ -284,6 +284,7 @@ private:
uint8_t send_data[100]; uint8_t send_data[100];
uint16_t last_short_addr; uint16_t last_short_addr;
long last_time; long last_time;
long last_time_upgrade;
bool current_z; bool current_z;
std::map<uint16_t, std::vector<uint8_t>> map_send_data; std::map<uint16_t, std::vector<uint8_t>> map_send_data;