From f112683ebf09e14f0baf3daf899492122f89a9f7 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: Wed, 15 Jan 2025 10:32:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E9=9D=9E=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E4=B8=8D=E6=B6=88=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bsp/src/at_device_nt26k.c | 11 +++++++++++
 bsp/src/bsp_button.c      |  5 ++++-
 bsp/src/bsp_flash.c       |  2 +-
 bsp/src/bsp_h308.c        |  2 +-
 bsp/src/bsp_nt26k.c       |  2 ++
 rt-thread/rtconfig.h      |  2 +-
 6 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/bsp/src/at_device_nt26k.c b/bsp/src/at_device_nt26k.c
index de1e058..a773c25 100644
--- a/bsp/src/at_device_nt26k.c
+++ b/bsp/src/at_device_nt26k.c
@@ -888,6 +888,10 @@ static void nt26k_init_thread_entry (void *parameter)
             rt_memcpy (nt26k.imei, imei, NT26K_IMEI_LEN);
             Flash_Sys_Cfg (kIotImeiId, nt26k.imei, NT26K_IMEI_LEN);
         }
+        else
+        {
+            Get_IotImei((char *)nt26k.imei, NT26K_IMEI_LEN);
+        }
         rt_thread_mdelay (1);
         /* set network interface device hardware iccid  */
         if ((*(rt_uint16_t *)FLASH_IOT_ICCID_ADDR == 0xE339) || (*(rt_uint16_t *)FLASH_IOT_ICCID_ADDR == 0x39E3))  // 未写入
@@ -915,6 +919,9 @@ static void nt26k_init_thread_entry (void *parameter)
             rt_memcpy (nt26k.iccid, iccid, NT26K_ICCID_LEN);
             Flash_Sys_Cfg (kIotIccidId, nt26k.iccid, NT26K_ICCID_LEN);
         }
+        else {
+            Get_IotIccid((char *)nt26k.iccid, NT26K_ICCID_LEN);
+        }
         rt_thread_mdelay (1);
         /* set network interface device hardware imsi  */
         if ((*(rt_uint16_t *)FLASH_IOT_IMSI_ADDR == 0xE339) || (*(rt_uint16_t *)FLASH_IOT_IMSI_ADDR == 0x39E3))  // 未写入
@@ -942,6 +949,10 @@ static void nt26k_init_thread_entry (void *parameter)
             rt_memcpy (nt26k.imsi, imsi, NT26K_IMSI_LEN);
             Flash_Sys_Cfg (kIotImsiId, nt26k.imsi, NT26K_IMSI_LEN);
         }
+        else {
+            //已经写入了，将其赋值给结构体
+             Get_IotImei((char *)nt26k.imsi, FLASH_IOT_IMEI_LEN);
+        }
         rt_thread_mdelay (1);
         /*网络注册 */
         for (i = 0; i < CSQ_RETRY; i++)
diff --git a/bsp/src/bsp_button.c b/bsp/src/bsp_button.c
index e8a837d..1297c01 100644
--- a/bsp/src/bsp_button.c
+++ b/bsp/src/bsp_button.c
@@ -59,7 +59,10 @@ static void _CommonBtnEvtCb(void *arg)
 {
     if (flex_button_event_read(&user_button[USER_BUTTON_0]) == FLEX_BTN_PRESS_CLICK)
     {
-        Send_Laser_Alarm_Event(KMuteEvent);
+        if (SysControl.status == kAlarmEvent)
+        {
+           Send_Laser_Alarm_Event(KMuteEvent);
+        }  
     }
     else if (flex_button_event_read(&user_button[USER_BUTTON_0]) == FLEX_BTN_PRESS_LONG_HOLD)
     {
diff --git a/bsp/src/bsp_flash.c b/bsp/src/bsp_flash.c
index 1585545..8985b41 100644
--- a/bsp/src/bsp_flash.c
+++ b/bsp/src/bsp_flash.c
@@ -815,7 +815,7 @@ INIT_PREV_EXPORT (BSP_Flash_Init);
 #endif
 
 #ifdef TEST_ENABLE
-static void TEST_Flash_GetMaxIndex_Records (int argc, char **argv)
+void TEST_Flash_GetMaxIndex_Records (int argc, char **argv)
 {
     if (argc == 2)
     {
diff --git a/bsp/src/bsp_h308.c b/bsp/src/bsp_h308.c
index 5fbc217..0da00be 100644
--- a/bsp/src/bsp_h308.c
+++ b/bsp/src/bsp_h308.c
@@ -2,7 +2,7 @@
  * @Author: mbw
  * @Date: 2024-11-14 10:21:04
  * @LastEditors: mbw && 1600520629@qq.com
- * @LastEditTime: 2025-01-09 15:25:27
+ * @LastEditTime: 2025-01-15 10:15:25
  * @FilePath: \JT-DT-YD4N02A_RTT_MRS-NT26K\bsp\src\bsp_h308.c
  * @Description:
  *
diff --git a/bsp/src/bsp_nt26k.c b/bsp/src/bsp_nt26k.c
index 7824413..f843940 100644
--- a/bsp/src/bsp_nt26k.c
+++ b/bsp/src/bsp_nt26k.c
@@ -787,7 +787,9 @@ int Nt26k_Process_Events (Nt26kEvent nt26k_recv_event, struct at_device *device,
             {
                 if (event->send_func)
                 {
+#ifdef TEST_ENABLE
                     RTC_ShowTime();  // 每次发送打印下时间，容易定位问题
+#endif
                     // 如果事件有关联的发送函数，则调用该发送函数
                     rt_thread_mdelay (IMEI_Delay());
                     int result = event->send_func (device, nt26k_ops);
diff --git a/rt-thread/rtconfig.h b/rt-thread/rtconfig.h
index 0146df1..a457a8a 100644
--- a/rt-thread/rtconfig.h
+++ b/rt-thread/rtconfig.h
@@ -17,7 +17,7 @@
 #define ULOG_USING_FILTER //开启动态修改日志等级 默认修改在ulog.c 1522行
 
 #define ENABLE_LOG_ALL
-#define TEST_ENABLE  //打开所有的终端测试程序
+// #define TEST_ENABLE  //打开所有的终端测试程序
 #define ULOG_OUTPUT_LVL 7  // 生产时将其设为0
  #define IOT_MODULE_SWITCH  1 //开启物联网功能