From ffaf7a55a60971c4290f79d412ee5610fe9376dd Mon Sep 17 00:00:00 2001
From: YuanHongbin <975559679@qq.com>
Date: Fri, 11 Sep 2026 09:53:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E4=B9=B1=E7=A0=81=E5=B9=B6=E6=9B=B4=E6=96=B0=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- main.c/main.h: 丢弃工作区GBK乱码副本, 恢复为最新提交版本(UTF-8干净注释, 保留APP_BOOT_UPGRADE_FLAG升级标记特性)
- bsp.h: 网关编号0x0006->0x0008, 服务器端口8086->8088, Lora默认频率CH6->CH8
---
 source/User/Inc/bsp.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/User/Inc/bsp.h b/source/User/Inc/bsp.h
index 219da41..3bfacce 100644
--- a/source/User/Inc/bsp.h
+++ b/source/User/Inc/bsp.h
@@ -172,16 +172,16 @@ typedef enum {
 /*当前设备版本/项目选择*/
 #define GATEWAY_VER_INFO										GATEWAY_VER1_0			//版本信息
 #define GATEWAY_PRJ_NUM											GATEWAY_PRJ_YAXIA		//项目编号
-#define GATEWAY_GW_NUM											0x0006					//网关编号(2字节, 1~65535)
+#define GATEWAY_GW_NUM											0x0008					//网关编号(2字节, 1~65535)
 
 /*CAT1服务器/Lora配置 - 替代原MAC_ADDR_TYPE编译宏, 在Boot中直接配置*/
 #define GATEWAY_SVR_ADDR0										39						//服务器IP[0]
 #define GATEWAY_SVR_ADDR1										106						//服务器IP[1]
 #define GATEWAY_SVR_ADDR2										103						//服务器IP[2]
 #define GATEWAY_SVR_ADDR3										147						//服务器IP[3]
-#define GATEWAY_SVR_PORT										8086					//服务器端口
+#define GATEWAY_SVR_PORT										8088					//服务器端口
 
-#define GATEWAY_LORA_FREQ										CH6						//Lora中心频率(可配置为CH0~CH119)
+#define GATEWAY_LORA_FREQ										CH8						//Lora中心频率(可配置为CH0~CH119)
 
 /*默认通道配置 - 在Boot中直接配置, 替代原APP硬编码默认值*/
 #define GATEWAY_MUCH										CH_ETH						//主上传通道