From c06fa6af065885a1a3e84fbdbc7a95391011d6ac Mon Sep 17 00:00:00 2001
From: zhangsheng <zhangs1125@sina.com>
Date: Sat, 28 Feb 2026 22:29:46 +0800
Subject: [PATCH] add code

---
 uart/uart.cpp                  |  3 ++-
 uart/uart_feature_parse.cpp    |  7 ++++++
 uart/uart_parameter_config.cpp | 42 +++++++++++++++++-----------------
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/uart/uart.cpp b/uart/uart.cpp
index 5b7045b..3beeef3 100644
--- a/uart/uart.cpp
+++ b/uart/uart.cpp
@@ -654,7 +654,8 @@ void Uart::DealRecvData(const char *pData) {
         nowTimetamp = std::string(localtimestamp);
         last_time  = atol(nowTimetamp.c_str());
     }
-    if (ushortAdd != last_short_addr){
+    //if (ushortAdd != last_short_addr)
+    {
         mssleep(50000);
         ModifyDistAddr(ushortAdd);
         mssleep(50000);
diff --git a/uart/uart_feature_parse.cpp b/uart/uart_feature_parse.cpp
index 801b776..a681595 100644
--- a/uart/uart_feature_parse.cpp
+++ b/uart/uart_feature_parse.cpp
@@ -705,10 +705,17 @@ std::vector<float> Uart::DealData(int iChannel, float coe, unsigned int sampleRa
             waveCount = VecWaveDataZ.size();
         }
         waveCount = m_waveCountZ;
+        printf("\n");
         for (; j < waveCount; j++) {
             RecvData recvData = g_VecWaveDataZ[j];
             memcpy(data + j * 92, recvData.Data, 92);
+            if (j + 3 > waveCount)
+            {
+                printf("%02x ",recvData.Order);
+            }
+            
         }
+        printf("\n");
         memset(buf, 0x00, sizeof(buf));
         sprintf(buf, "%02x%02x", g_VecWaveDataZ[0].ShortAddr[0], g_VecWaveDataZ[0].ShortAddr[1]);
         strShortAddr = std::string(buf);
diff --git a/uart/uart_parameter_config.cpp b/uart/uart_parameter_config.cpp
index 545466e..0f98bfc 100644
--- a/uart/uart_parameter_config.cpp
+++ b/uart/uart_parameter_config.cpp
@@ -599,13 +599,13 @@ int Uart::TaskResp(ScheduleTask scheduleTask){
     mssleep(50000);
     WriteToUart((const char*)send_data, 100);
     
-    int iRet = CheckZigbeeACK();
-    if (iRet == 0) {
-        zlog_info(zct, "TaskResp ACK send success,shortAddr = %02x%02x", UINT16_HIGH(scheduleTask.shortAddr),UINT16_LOW(scheduleTask.shortAddr));
-    } else {
-        zlog_warn(zct, "TaskResp ACK send failed,shortAddr = %02x%02x", UINT16_HIGH(scheduleTask.shortAddr),UINT16_LOW(scheduleTask.shortAddr));
-    }
-    return iRet;
+    // int iRet = CheckZigbeeACK();
+    // if (iRet == 0) {
+    //     zlog_info(zct, "TaskResp ACK send success,shortAddr = %02x%02x", UINT16_HIGH(scheduleTask.shortAddr),UINT16_LOW(scheduleTask.shortAddr));
+    // } else {
+    //     zlog_warn(zct, "TaskResp ACK send failed,shortAddr = %02x%02x", UINT16_HIGH(scheduleTask.shortAddr),UINT16_LOW(scheduleTask.shortAddr));
+    // }
+    return 0;
 }
 int Uart::SendReviveDuration(ReviveDuration recvDuration){
 
@@ -626,13 +626,13 @@ int Uart::SendReviveDuration(ReviveDuration recvDuration){
     }
     UpdateData[99] = tmp;
     WriteToUart((const char*)UpdateData, 100);
-    int iRet = CheckZigbeeACK();
-    if (iRet == 0) {
-        zlog_info(zct, "SendReviveDuration ACK send success,shortAddr = %d", recvDuration.shortAddr);
-    } else {
-        zlog_warn(zct, "SendReviveDuration ACK send failed,shortAddr = %d", recvDuration.shortAddr);
-    }
-    return iRet;
+    // int iRet = CheckZigbeeACK();
+    // if (iRet == 0) {
+    //     zlog_info(zct, "SendReviveDuration ACK send success,shortAddr = %d", recvDuration.shortAddr);
+    // } else {
+    //     zlog_warn(zct, "SendReviveDuration ACK send failed,shortAddr = %d", recvDuration.shortAddr);
+    // }
+    return 0;
 }
 int Uart::WaveResp(uint16_t shortAddr){
     unsigned char sendData[8] = {0};
@@ -653,13 +653,13 @@ int Uart::WaveResp(uint16_t shortAddr){
     WriteToUart((const char*)sendData, 8);
     mssleep(50000);
     WriteToUart((const char*)sendData, 8);
-    int iRet = CheckZigbeeACK();
-    if (iRet == 0) {
-        zlog_info(zct, "WaveResp ACK send success,shortAddr = %x", shortAddr);
-    } else {
-        zlog_warn(zct, "WaveResp ACK send failed,shortAddr = %x", shortAddr);
-    }
-    return iRet;
+    // int iRet = CheckZigbeeACK();
+    // if (iRet == 0) {
+    //     zlog_info(zct, "WaveResp ACK send success,shortAddr = %x", shortAddr);
+    // } else {
+    //     zlog_warn(zct, "WaveResp ACK send failed,shortAddr = %x", shortAddr);
+    // }
+    return 0;
 }
 int Uart::CheckZigbeeACK() {
     if (gpio_read(GlobalConfig::GPIO_G.zigAckrep) == 48) gpio_set(GlobalConfig::GPIO_G.zigAckreset, 1);