From 8bcc2c41d0f310772f0334a5e4ced6791de89964 Mon Sep 17 00:00:00 2001
From: YuanHongbin <975559679@qq.com>
Date: Tue, 25 Aug 2026 18:35:15 +0800
Subject: [PATCH] =?UTF-8?q?feat(debug):=20para=E5=91=BD=E4=BB=A4Cat1=20IME?=
 =?UTF-8?q?I/SIM=E5=A7=8B=E7=BB=88=E6=98=BE=E7=A4=BA+=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E8=BD=AC=E5=8F=91RS485=20Ch1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. para命令的Cat1 IMEI和SIM打印不再受ChannelIsActive(CH_CAT1)限制,
   无论Cat1配置为Much/Auch/Duch/Cuch哪个通道(或未配置)都显示
2. 新增ParaEchoCh1标志: 执行para命令时, 除正常调试输出外,
   额外通过RS485Ch1UartSend向RS485 Ch1发送一份相同的调试信息,
   与Duch通讯方式无关; 命令结束后标志复位, 不影响其他命令
---
 .../source/Module/GateWay_Debug/DebugCmd.c       | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Project/GateWay/source/Module/GateWay_Debug/DebugCmd.c b/Project/GateWay/source/Module/GateWay_Debug/DebugCmd.c
index beb5834..213da04 100644
--- a/Project/GateWay/source/Module/GateWay_Debug/DebugCmd.c
+++ b/Project/GateWay/source/Module/GateWay_Debug/DebugCmd.c
@@ -36,6 +36,7 @@ static uint8_t DebugRxBuff[DBG_RX_LEN_MAX];
 static uint8_t DebugRxTimeOut1mSCnt;
 static rt_sem_t DebugRev_Sem;
 static char tempBuff[DEBUG_BUFF_MAX];
+static bool ParaEchoCh1 = false;
 
 void Debug_Printf(char *format, ...)
 {
@@ -57,6 +58,9 @@ void Debug_Printf(char *format, ...)
 	} else {
 		rt_kprintf(tempBuff);
 	}
+	if(ParaEchoCh1) {
+		RS485Ch1UartSend((uint8_t *)tempBuff, strlen(tempBuff));
+	}
 	va_end(args);
 }
 /*****************************************************************************************
@@ -1433,6 +1437,7 @@ static void DebugCmdGetPara(int argc, char *argv[])
 			return;
 		}
 	}
+	ParaEchoCh1 = true;
 	DBG_LOG("\r\n**********************************************************\r\n");
 	DBG_LOG("SoftWare V:%d.%d, HardWare V:%d.%d\r\n", SOFTWARE_VERSION / 10, SOFTWARE_VERSION % 10, HARDWARE_VERSION / 10, HARDWARE_VERSION % 10);
 	DBG_LOG("GateWay MAC: %02X-%02X-%02X-%02X-%02X-%02X\r\n",
@@ -1447,12 +1452,10 @@ static void DebugCmdGetPara(int argc, char *argv[])
 		(GateWay->ConfigPara.CuchMask & CUCH_ETH)  ? "eth " : "",
 		(GateWay->ConfigPara.CuchMask & CUCH_LORA) ? "lora " : "",
 		(GateWay->ConfigPara.CuchMask & CUCH_CAT1) ? "cat1 " : "");
-	if(ChannelIsActive(GateWay->ConfigPara, CH_CAT1)) {
-		char Imei[20], Sim[32];
-		CatReadImeiOrSim(Imei, Sim);
-		DBG_LOG("Cat1 IMEI: %s\r\n", Imei);
-		DBG_LOG("Cat1 SIM: %s\r\n", Sim);
-	}
+	char Imei[20], Sim[32];
+	CatReadImeiOrSim(Imei, Sim);
+	DBG_LOG("Cat1 IMEI: %s\r\n", Imei);
+	DBG_LOG("Cat1 SIM: %s\r\n", Sim);
 	DBG_LOG("CommUnitReadInterval: %d\r\n", GateWay->ConfigPara.CommUnitReadInterval);
 	DBG_LOG("Svr MAC: %02X-%02X-%02X-%02X-%02X-%02X\r\n",
 					GateWay->SvrMac[0], GateWay->SvrMac[1], GateWay->SvrMac[2], GateWay->SvrMac[3], GateWay->SvrMac[4], GateWay->SvrMac[5]);
@@ -1498,6 +1501,7 @@ static void DebugCmdGetPara(int argc, char *argv[])
   DBG_LOG("%d:",stime->tm_min);
   DBG_LOG("%d\r\n",stime->tm_sec);
   DBG_LOG("**********************************************************\r\n");
+  ParaEchoCh1 = false;
 }
 
 /*****************************************************************************************