整理bsp.h配置项并清理冗余文件
修改事项: 1. bsp.h: 通讯单元通道掩码(CUCH_*)定义移至LORA_FREQ_M枚举之后, 集中管理 2. bsp.h: 设备版本/项目、CAT1服务器/Lora、默认通道等配置项增加醒目标注横幅(下载前必须检查) 3. bsp.h: GATEWAY_LORA_FREQ默认频率由CH3改为CH0 4. 删除Update.exe及旧版串口升级协议.xlsx(已被传感器通用串口升级协议V1.1.xlsx替代)
This commit is contained in:
+11
-8
@@ -36,13 +36,6 @@ typedef enum {
|
||||
CH_CAT1,
|
||||
}Channel_m;
|
||||
|
||||
/*通讯单元通道掩码 - 与GateWay APP一致*/
|
||||
#define CUCH_CH1 (1 << CH_RS485_1)
|
||||
#define CUCH_CH2 (1 << CH_RS485_2)
|
||||
#define CUCH_ETH (1 << CH_ETH)
|
||||
#define CUCH_LORA (1 << CH_LORA)
|
||||
#define CUCH_CAT1 (1 << CH_CAT1)
|
||||
|
||||
/*Lora频率:470100000ul + 500000*N,N=0~45,共46个信道(470.1MHz~492.6MHz),用于配置Lora频率更方便*/
|
||||
typedef enum {
|
||||
CH0 = (470100000ul + 0), //470.1MHz
|
||||
@@ -92,7 +85,15 @@ typedef enum {
|
||||
CH44 = (470100000ul + 22000000),
|
||||
CH45 = (470100000ul + 22500000), //492.6MHz
|
||||
}LORA_FREQ_M;
|
||||
/*通讯单元通道掩码 - 与GateWay APP一致*/
|
||||
#define CUCH_CH1 (1 << CH_RS485_1)
|
||||
#define CUCH_CH2 (1 << CH_RS485_2)
|
||||
#define CUCH_ETH (1 << CH_ETH)
|
||||
#define CUCH_LORA (1 << CH_LORA)
|
||||
#define CUCH_CAT1 (1 << CH_CAT1)
|
||||
|
||||
/*****************************************************************************************/
|
||||
/*********************************下载前必须检查配置项************************************/
|
||||
/*当前设备版本/项目选择*/
|
||||
#define GATEWAY_VER_INFO GATEWAY_VER1_0 //版本信息
|
||||
#define GATEWAY_PRJ_NUM GATEWAY_PRJ_YAXIA //项目编号
|
||||
@@ -105,13 +106,15 @@ typedef enum {
|
||||
#define GATEWAY_SVR_ADDR3 147 //服务器IP[3]
|
||||
#define GATEWAY_SVR_PORT 8080 //服务器端口
|
||||
|
||||
#define GATEWAY_LORA_FREQ CH3 //Lora中心频率(可配置为CH0~CH45)
|
||||
#define GATEWAY_LORA_FREQ CH0 //Lora中心频率(可配置为CH0~CH45)
|
||||
|
||||
/*默认通道配置 - 在Boot中直接配置, 替代原APP硬编码默认值*/
|
||||
#define GATEWAY_MUCH CH_ETH //主上传通道
|
||||
#define GATEWAY_AUCH CH_NULL //辅助上传通道
|
||||
#define GATEWAY_DUCH CH_CAT1 //调试/升级通道
|
||||
#define GATEWAY_CUCH_MASK CUCH_LORA //通讯单元通道掩码
|
||||
/*********************************下载前必须检查配置项************************************/
|
||||
/*****************************************************************************************/
|
||||
|
||||
/*Flash分区 - 32KB Boot + APP(0x8000起) + 参数区(0x7C000)*/
|
||||
#define FLASH_SECTOR_SIZE 0x2000ul //8KB
|
||||
|
||||
Reference in New Issue
Block a user