From b8c1c347971a5d6700bd0abc4b9fe5c6f4c94a51 Mon Sep 17 00:00:00 2001
From: zhangsheng <zhangs1125@sina.com>
Date: Thu, 8 May 2025 10:00:32 +0800
Subject: [PATCH] fix bugs

---
 scheduler/schedule.cpp         | 1 +
 uart/uart.cpp                  | 2 ++
 uart/uart_parameter_config.cpp | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scheduler/schedule.cpp b/scheduler/schedule.cpp
index 14333fc..58170fe 100644
--- a/scheduler/schedule.cpp
+++ b/scheduler/schedule.cpp
@@ -450,6 +450,7 @@ bool SensorScheduler::MissedWave(uint16_t short_addr) {
 }
 
 void SensorScheduler::WaveSuccess(uint16_t short_addr) {
+    zlog_warn(zct, "[WaveSuccess][%x]", short_addr);
     success_set_.insert(short_addr);
     auto iter = failure_map_.find(short_addr);
     if (iter != failure_map_.end()) {        
diff --git a/uart/uart.cpp b/uart/uart.cpp
index 759a6c5..fd7e68b 100644
--- a/uart/uart.cpp
+++ b/uart/uart.cpp
@@ -611,6 +611,8 @@ void Uart::DealRecvData(const char *pData) {
             DealWaveCompress(pData,ushortAdd);
         break;
         case UPGRADE_ASK:
+            ModifyDistAddr(ushortAdd);
+            mssleep(50000);
             taskID = scheduler::instance().StartSchedule(ushortAdd,next_duration, next_task_id);
             taskID = kScheduleUpgrade;
             if (taskID == kScheduleUpgrade){
diff --git a/uart/uart_parameter_config.cpp b/uart/uart_parameter_config.cpp
index bf91013..60bc4b3 100644
--- a/uart/uart_parameter_config.cpp
+++ b/uart/uart_parameter_config.cpp
@@ -52,7 +52,7 @@ void Uart::UpdateWirelessNode(uint16_t shortAdd) {
     GetTimeNet(localtimestamp, 1);
     char insertSql[100] = {0};
     char wherecon[100] = {0};
-    sprintf(wherecon," short_Addr = '%02x%02x' and status = 3 order by start_timestamp DESC",UINT16_HIGH(shortAdd), UINT16_LOW(shortAdd));
+    sprintf(wherecon," short_Addr = '%02x%02x' and status = 3 and start_timestamp > ( SELECT MAX(submit_timestamp) FROM firmware_upgrade ) order by start_timestamp DESC",UINT16_HIGH(shortAdd), UINT16_LOW(shortAdd));
     std::string spend_count = sqlite_db_ctrl::instance().GetData(" firmware_upgrade ","spend_count",wherecon);
     if (atoi(spend_count.c_str())  >= 10){
         zlog_warn(zbt, "UpdateWirelessNode spend_count %d,shortAddr = %02x%02x", atoi(spend_count.c_str()), UINT16_HIGH(shortAdd), UINT16_LOW(shortAdd));