From 8c50f65b795212ba492eced867dd58b82d867996 Mon Sep 17 00:00:00 2001
From: zhangsheng <zhangs1125@sina.com>
Date: Thu, 15 May 2025 20:17:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsonparse/web_cmd_parse3.cpp   |  5 +++++
 uart/uart_cmd.cpp              |  2 +-
 uart/uart_parameter_config.cpp | 11 +++++------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/jsonparse/web_cmd_parse3.cpp b/jsonparse/web_cmd_parse3.cpp
index e3bd383..a60663d 100644
--- a/jsonparse/web_cmd_parse3.cpp
+++ b/jsonparse/web_cmd_parse3.cpp
@@ -1181,6 +1181,11 @@ std::string JsonData::JsonCmd_Cgi_65(Param_65 &param){
             }
             std::vector<std::string> vRssi;
             boost::split(vRssi, vetRes[i][2], boost::is_any_of(","), boost::token_compress_on);
+            if (vRssi.size() > 0 ){
+                iTem.append(atof(vRssi[0].c_str())/float(255));
+                iTem.append(atof(vRssi[1].c_str())/float(255));
+            }
+            
             jsBody.append(iTem);
             
         }
diff --git a/uart/uart_cmd.cpp b/uart/uart_cmd.cpp
index 6218611..3f07198 100644
--- a/uart/uart_cmd.cpp
+++ b/uart/uart_cmd.cpp
@@ -170,7 +170,7 @@ void Uart::WriteTranTimeout2Zigbee(unsigned char Time) {
 
     unsigned short tmp = GlobalConfig::Zigbee_G.MyAddr;
     GlobalConfig::Zigbee_G.PowerLevel = 0x03;
-    GlobalConfig::Zigbee_G.RetryNum = 0x64;
+    GlobalConfig::Zigbee_G.RetryNum = 0x0A;
     GlobalConfig::Zigbee_G.TranTimeout = Time;
     modify_info(tmp, (char *)&GlobalConfig::Zigbee_G);
 
diff --git a/uart/uart_parameter_config.cpp b/uart/uart_parameter_config.cpp
index 7c898cb..dfbd45e 100644
--- a/uart/uart_parameter_config.cpp
+++ b/uart/uart_parameter_config.cpp
@@ -588,17 +588,16 @@ int Uart::TaskResp(ScheduleTask scheduleTask){
         tmp += send_data[k];
     }
     send_data[99] = tmp;
-    if (scheduleTask.cmd != REVIVE_DURATION)
+    if (scheduleTask.cmd == REVIVE_DURATION)
     {
-        mssleep(50000);
-        WriteToUart((const char*)send_data, 100);
-        mssleep(50000);
-        WriteToUart((const char*)send_data, 100);
-    }else {
         map_send_data[scheduleTask.shortAddr] = std::vector<uint8_t>(send_data, send_data + 100);
     }
     mssleep(50000);
     WriteToUart((const char*)send_data, 100);
+    mssleep(50000);
+    WriteToUart((const char*)send_data, 100);
+    mssleep(50000);
+    WriteToUart((const char*)send_data, 100);
     
     int iRet = CheckZigbeeACK();
     if (iRet == 0) {