From 0986af59682e4f702401b4b108e54076dd91b478 Mon Sep 17 00:00:00 2001
From: YuanHongbin <975559679@qq.com>
Date: Tue, 12 May 2026 16:39:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Project/GateWay/MDK/GateWay.uvoptx     | 13 +++++++++----
 Project/GateWay/source/User/Inc/main.h |  2 +-
 Project/GateWay/source/User/Src/main.c |  8 ++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Project/GateWay/MDK/GateWay.uvoptx b/Project/GateWay/MDK/GateWay.uvoptx
index 5e0720a..c9b58bf 100644
--- a/Project/GateWay/MDK/GateWay.uvoptx
+++ b/Project/GateWay/MDK/GateWay.uvoptx
@@ -75,7 +75,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>255</CpuCode>
       <DebugOpt>
@@ -350,7 +350,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>255</CpuCode>
       <DebugOpt>
@@ -410,7 +410,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>JL2CM3</Key>
-          <Name>-U4294967295 -O78 -S4 -ZTIFSpeedSel2000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8027 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO8 -FD1FFF8000 -FC1000 -FN2 -FF0HC32F460_otp.FLM -FS03000C00 -FL03FC -FP0($$Device:HC32F460KETA$FlashARM\HC32F460_otp.FLM) -FF1HC32F460_512K.FLM -FS10 -FL180000 -FP1($$Device:HC32F460KETA$FlashARM\HC32F460_512K.FLM)</Name>
+          <Name>-U12345678 -O78 -S4 -ZTIFSpeedSel2000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8027 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO8 -FD1FFF8000 -FC1000 -FN2 -FF0HC32F460_otp.FLM -FS03000C00 -FL03FC -FP0($$Device:HC32F460KETA$FlashARM\HC32F460_otp.FLM) -FF1HC32F460_512K.FLM -FS10 -FL180000 -FP1($$Device:HC32F460KETA$FlashARM\HC32F460_512K.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -460,6 +460,11 @@
           <WinNumber>1</WinNumber>
           <ItemText>SCPara-&gt;RS485RxBuff</ItemText>
         </Ww>
+        <Ww>
+          <count>6</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>argv[1],0x0A</ItemText>
+        </Ww>
       </WatchWindow1>
       <WatchWindow2>
         <Ww>
@@ -490,7 +495,7 @@
       <DebugFlag>
         <trace>0</trace>
         <periodic>1</periodic>
-        <aLwin>1</aLwin>
+        <aLwin>0</aLwin>
         <aCover>0</aCover>
         <aSer1>0</aSer1>
         <aSer2>0</aSer2>
diff --git a/Project/GateWay/source/User/Inc/main.h b/Project/GateWay/source/User/Inc/main.h
index 1741e94..b30cf0f 100644
--- a/Project/GateWay/source/User/Inc/main.h
+++ b/Project/GateWay/source/User/Inc/main.h
@@ -7,7 +7,7 @@
 #define	SOFTWARE_VERSION								12
 #define	HARDWARE_VERSION								12
 
-#define	MAC_ADDR_TYPE									1//0为测试服务器
+#define	MAC_ADDR_TYPE									4//0为测试服务器
 
 extern bool MainDispEn;
 #define	MAIN_DBG_LOG(...)									{ if(MainDispEn) Debug_Printf(__VA_ARGS__);}
diff --git a/Project/GateWay/source/User/Src/main.c b/Project/GateWay/source/User/Src/main.c
index c6df189..ffbc81b 100644
--- a/Project/GateWay/source/User/Src/main.c
+++ b/Project/GateWay/source/User/Src/main.c
@@ -140,7 +140,7 @@ void GateWayInit(void)
 		GateWay.ConfigPara.SvrAddr[2] = 104;
 		GateWay.ConfigPara.SvrAddr[3] = 4;
 		GateWay.ConfigPara.SvrPort = 8007;
-		GateWay.ConfigPara.CommUnitReadInterval = COMMUNIT_READ_SENSOR_INTERVAL_MAX;
+		GateWay.ConfigPara.CommUnitReadInterval = COMMUNIT_READ_SENSOR_INTERVAL_MAX;//非低功耗设备
 		memset(GateWay.ConfigPara.CommUnitArray, 0x00, sizeof(CommUnitData_t) * COMMUNIT_NUM_MAX);
 		GateWay.ConfigPara.Rs485Ch1.Enable = true;
 		GateWay.ConfigPara.Rs485Ch1.CommUnitEnable = false;
@@ -198,12 +198,12 @@ void GateWayInit(void)
 	GateWay.ConfigPara.DebugChannel = DEBUG_CH_DBG;
 #elif MAC_ADDR_TYPE == 1
 	memcpy(GateWay.ConfigPara.GwMac, GateWayMac_BL1, 6);
-	//GateWay.ConfigPara.DebugChannel = DEBUG_CH_RS485_1;
-	GateWay.ConfigPara.DebugChannel = DEBUG_CH_DBG;
+	GateWay.ConfigPara.DebugChannel = DEBUG_CH_RS485_1;
+//	GateWay.ConfigPara.DebugChannel = DEBUG_CH_DBG;
 #elif MAC_ADDR_TYPE == 2
 	memcpy(GateWay.ConfigPara.GwMac, GateWayMac_BL2, 6);
 	GateWay.ConfigPara.DebugChannel = DEBUG_CH_RS485_1;
-	//GateWay.ConfigPara.DebugChannel = DEBUG_CH_DBG;
+//	GateWay.ConfigPara.DebugChannel = DEBUG_CH_DBG;
 #elif MAC_ADDR_TYPE == 3
 	memcpy(GateWay.ConfigPara.GwMac, GateWayMac_BL3, 6);
 	GateWay.ConfigPara.DebugChannel = DEBUG_CH_RS485_1;