From be6f52fa8bedcfa67380c9f9ad6492487f2189a5 Mon Sep 17 00:00:00 2001
From: YuanHongbin <975559679@qq.com>
Date: Thu, 23 Jul 2026 09:59:59 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20LaserTimerMinutes=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=89=8D=E7=A7=BB=E5=B9=B6=E5=A2=9E=E5=8A=A0=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5,=E7=A7=BB=E9=99=A4=E6=96=87=E4=BB=B6BOM?=
 =?UTF-8?q?=E5=86=97=E4=BD=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Module/LaserTracing_Debug/UartDebug.c | 4 ++--
 source/src/main.c                     | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Module/LaserTracing_Debug/UartDebug.c b/Module/LaserTracing_Debug/UartDebug.c
index 7c30199..6df5696 100644
--- a/Module/LaserTracing_Debug/UartDebug.c
+++ b/Module/LaserTracing_Debug/UartDebug.c
@@ -1,4 +1,4 @@
-#include <string.h>
+#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -15,7 +15,7 @@
 #define DEBUG_CMD_CNT					16
 const DBGFunType DebugFun[DEBUG_CMD_CNT];
 
-volatile DebugChannel_e gDebugChannel = DBG_CH_RS485_1;
+volatile DebugChannel_e gDebugChannel = DBG_CH_RS485_1;//上电默认调试口
 
 static char buff[DEBUG_BUFSIZE];
 volatile uint16_t iw=0;  /* buffer write index*/
diff --git a/source/src/main.c b/source/src/main.c
index 613e238..1c46210 100644
--- a/source/src/main.c
+++ b/source/src/main.c
@@ -1,4 +1,4 @@
-
+
 /******************************************************************************
  * Include files
  ******************************************************************************/
@@ -157,6 +157,10 @@ static void AppInit(void)
 	if(App.Para.Layout.ERTime > 240 || App.Para.Layout.ERTime < 20) {
 		App.Para.Layout.ERTime = 40;
 	}
+  if(App.Para.LaserTimerMinutes < 0 || App.Para.LaserTimerMinutes > 240)
+		App.Para.LaserTimerMinutes = 10;
+	SGCP.LaserTimerMinutes = App.Para.LaserTimerMinutes;
+  
 	SAVE_APP_PARA((uint32_t *)&App.Para);
 	
 	LpUart0Init(App.Para.Rs485Ch1.BaudRate);//低功耗串口初始化
@@ -196,9 +200,6 @@ static void AppInit(void)
 	App.Login_LPTimer0 = true;
 	//LPTimer0_ON((App.Nonce % 1200) + 300);//定时30s+随机2分钟，最小间隙100ms
 	LPTimer0_ON(50);//5秒后注册
-	if(App.Para.LaserTimerMinutes == 0)
-		App.Para.LaserTimerMinutes = 10;
-	SGCP.LaserTimerMinutes = App.Para.LaserTimerMinutes;
 	App.UploadFlag = false;
 	App.Upload_LPTimer0 = false;