From afda00d8f213ef38531a48b8fc21d94a08f7c1e7 Mon Sep 17 00:00:00 2001
From: YuanHongbin <975559679@qq.com>
Date: Wed, 22 Jul 2026 15:38:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=BF=80=E5=85=89=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E5=99=A8=E4=B8=A4=E5=A4=84=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 网关/调试指令开激光后重置LaserTimerCount,避免立即误触发关闭
2. 自动关闭条件新增LaserTimerMinutes>0判断,laser time 0可真正禁用定时
---
 source/src/SGCP.c | 2 +-
 source/src/main.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/src/SGCP.c b/source/src/SGCP.c
index 733a12d..9ef9106 100644
--- a/source/src/SGCP.c
+++ b/source/src/SGCP.c
@@ -1864,6 +1864,7 @@ void GwRevLoopHandler(void)
 			if(SGCP.LaserOnOff == true)
 			{
 				LASER1_ON();
+				SGCP.LaserTimerCount = SGCP.LaserTimerMinutes * 2;
 				if(SGCP.LoginOk == true)
 					ToGWLaserRes(SGCP.LaserOnOff);
 				DBG_LOG("The laser has been activated!\r\n");
@@ -1877,7 +1878,6 @@ void GwRevLoopHandler(void)
 			}
 			SGCP.GWStatus = GW_STATUS_IDLE;
 		break;}
-
 		case GW_STATUS_SIGNAL:{
 			DBG_LOG("Query signal quality...\r\n");
 			SGCP.Gateway_IRQ_Status = false;
diff --git a/source/src/main.c b/source/src/main.c
index 2aad783..7ae88fe 100644
--- a/source/src/main.c
+++ b/source/src/main.c
@@ -1,4 +1,4 @@
-
+
 /******************************************************************************
  * Include files
  ******************************************************************************/
@@ -372,7 +372,7 @@ static void AppLoopHandler(void)
 				SGCP.GWStatus = GW_STATUS_UPLOAD_SENSOR;//上传
 				App.Status = APP_STATUS_WAIT_UPLOAD;
 			}
-			else if(SGCP.LaserOnOff == true && SGCP.LaserTimerCount == 0 && SGCP.GWStatus == GW_STATUS_IDLE)
+			else if(SGCP.LaserOnOff == true && SGCP.LaserTimerMinutes > 0 && SGCP.LaserTimerCount == 0 && SGCP.GWStatus == GW_STATUS_IDLE)
 			{
 				SGCP.LaserOnOff = false;
 				SGCP.GWStatus = GW_STATUS_LASER_STARES;