From 6e2b230c5d3c6a9fcf78b703d0c5a91dbd7c9681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=5F666?=
 <13089258+pony-six-hundred-and-sixty-six@user.noreply.gitee.com>
Date: Thu, 23 Jan 2025 09:24:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98+1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/main.c       |  4 ++--
 bsp/src/at_device_nt26k.c |  3 +--
 bsp/src/bsp_h308.c        | 16 +++++++++++-----
 bsp/src/bsp_nt26k.c       |  6 +++---
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/applications/main.c b/applications/main.c
index 2b9fd21..3d7e784 100644
--- a/applications/main.c
+++ b/applications/main.c
@@ -463,8 +463,8 @@ int main(void)
                         {
                             Flash_Write_Record(kRecordSensoEndOfLife);
                         }
-                        LED_Y_END_OF_LIFE;
-                        // Send_Laser_Alarm_Event(kNormalDetectionEvents);
+                        // LED_Y_END_OF_LIFE;
+                        Send_Laser_Alarm_Event(kNormalDetectionEvents);
                     }
                 }
             }
diff --git a/bsp/src/at_device_nt26k.c b/bsp/src/at_device_nt26k.c
index 1b517ab..375d569 100644
--- a/bsp/src/at_device_nt26k.c
+++ b/bsp/src/at_device_nt26k.c
@@ -224,7 +224,6 @@ static void urc_tcp_recv(struct at_client *client, const char *data, rt_size_t s
             /*比较数组的长度和结构体的长度是否一致，如果不一致则数据解析错误，如果一致复制数组值到结构体中*/
             if (len == sizeof(struct Nt26kRecvData))
             {
-                nt26k_connect_sever_flag = 1;
                 rt_memset(nt26k_ops.recv, 0, sizeof(struct Nt26kRecvData)); // 清空结构体
                 rt_memcpy(nt26k_ops.recv, recv_byte_buf, sizeof(struct Nt26kRecvData));
                 if ((nt26k_ops.recv->recv_data.event_type == INSTRUCTION_HEART_BEAT) ||
@@ -236,7 +235,7 @@ static void urc_tcp_recv(struct at_client *client, const char *data, rt_size_t s
                 else
                 {
                     rt_sem_release(nt26k_recv_sem);
-                    rt_sem_release(nt26k_recv_msg_sem);// 接收到的是心跳包
+                    rt_sem_release(nt26k_recv_msg_sem);// 接收到的是响应包
                 }
             }
             else
diff --git a/bsp/src/bsp_h308.c b/bsp/src/bsp_h308.c
index f941684..ef8d340 100644
--- a/bsp/src/bsp_h308.c
+++ b/bsp/src/bsp_h308.c
@@ -17,7 +17,7 @@
 #include "bsp_flash.h"
 #include "bsp_rtc.h"
 #include "user_sys.h"
-
+#include "bsp_led.h"
 #define LOG_TAG "bsp_h308"
 #define LOG_LVL LOG_LVL_DBG
 #include <ulog.h>
@@ -194,9 +194,15 @@ static void H308_HandleFault(uint8_t count, uint8_t *flag, uint8_t threshold)
         H308.detection_flag = kH308Normal;
         Send_Laser_Alarm_Event(kFaultRcyEvent);
     }
+    else if(rt_pin_read(LED_Y_PIN) == PIN_HIGH &&(count == 0))
+    {
+        *flag               = 0;
+        H308.detection_flag = kH308Normal;
+    }
+    LOG_D(" *flag = [%d]; H308.detection_flag:[%d]",  *flag, H308.detection_flag);
 }
 
-static uint8_t H308_CheckData(rt_uint8_t alarm_flag, rt_uint8_t fault_flag)
+static uint8_t H308_CheckData(rt_uint8_t *alarm_flag, rt_uint8_t *fault_flag)
 {
 
     static rt_uint8_t alarm_count = 0, fault_count = 0;
@@ -214,8 +220,8 @@ static uint8_t H308_CheckData(rt_uint8_t alarm_flag, rt_uint8_t fault_flag)
 
     alarm_count = H308_Count(alarm_status_buffer, kH308Alarm, H308_SAMPLING_TIMS);
     fault_count = H308_Count(fault_buf, kH308Fault, H308_SAMPLING_TIMS);
-    H308_HandleAlarm(alarm_count, &alarm_flag, H308_SAMPLING_TIMS);
-    H308_HandleFault(fault_count, &fault_flag, H308_SAMPLING_TIMS);
+    H308_HandleAlarm(alarm_count, alarm_flag, H308_SAMPLING_TIMS);
+    H308_HandleFault(fault_count, fault_flag, H308_SAMPLING_TIMS);
 
     return RT_EOK;
 }
@@ -310,7 +316,7 @@ static void h308_thread_entry(void *param)
                 LOG_I("str:[%s]", str);
                 if (ret == 0)
                 {
-                    H308_CheckData(alarm_flag, fault_flag);
+                    H308_CheckData(&alarm_flag, &fault_flag);
                 }
                 else
                 {
diff --git a/bsp/src/bsp_nt26k.c b/bsp/src/bsp_nt26k.c
index 5321b8d..517aef9 100644
--- a/bsp/src/bsp_nt26k.c
+++ b/bsp/src/bsp_nt26k.c
@@ -2,7 +2,7 @@
  * @Author: mbw
  * @Date: 2024-10-09 08:42:14
  * @LastEditors: mbw && 1600520629@qq.com
- * @LastEditTime: 2025-01-21 09:08:47
+ * @LastEditTime: 2025-01-23 09:24:08
  * @FilePath: \JT-DT-YD4N02A_RTT_MRS-NT26K\bsp\src\bsp_nt26k.c
  * @Description:
  *
@@ -842,7 +842,7 @@ int Nt26k_Process_Events(Nt26kEvent nt26k_recv_event, struct at_device *device,
                 }
                 LOG_D("断网,等待连接中......\n");
             }
-            rt_thread_mdelay(2000);
+            rt_thread_mdelay(3000);
         }
     }
     // 函数执行完毕，返回0
@@ -1115,7 +1115,7 @@ void Handle_Sever_Addr_Set(struct Nt26k_Ops *ops)
         if(ops->Resp(ops, DATA_SERIAL_NUM, CMD_TYPE_INSTRUCTION_REPLY, DEVICE_TYPE_NT26K, INSTRUCTION_DOWN_SEVER_ADDR, temp, RESPONSE_CODE_SUCCESS)==RT_EOK)
         {
             Flash_Set_WorkDuration(work_duration);
-            rt_thread_mdelay(2000);
+            rt_thread_mdelay(100);
             reboot();
         }
     }