diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 3ef6a53..8c35c03 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -27,14 +27,14 @@ > #define GATEWAY_SVR_ADDR2 103 // 服务器 IP[2] > #define GATEWAY_SVR_ADDR3 147 // 服务器 IP[3] > #define $18083 // 服务器端口 -> #define GATEWAY_LORA_FREQ CH0 // Lora 中心频率（CH0~CH45，470.1MHz~492.6MHz） +> #define GATEWAY_LORA_FREQ CH0 // Lora 中心频率（CH0~CH119，433.1MHz~492.6MHz） > ``` > > | 项 | 当前值 | 说明 | > | --- | --- | --- | > | 服务器 IP | 39.106.103.147 | CAT1 上传的默认服务器地址 | > | 服务器端口 | 8083 | CAT1 上传的默认端口 | -> | GATEWAY_LORA_FREQ | CH0 | Lora 中心频率，按现场干扰/组网需要从 CH0~CH45 中选择 | +> | GATEWAY_LORA_FREQ | CH6 | Lora 中心频率，按现场干扰/组网需要从 CH0~CH119 中选择 | > > ### ③ 默认通道配置（bsp.h:76-79） > diff --git a/source/User/Inc/bsp.h b/source/User/Inc/bsp.h index fedfd8a..8b48da6 100644 --- a/source/User/Inc/bsp.h +++ b/source/User/Inc/bsp.h @@ -36,54 +36,129 @@ typedef enum { CH_CAT1, }Channel_m; -/*Lora频率：470100000ul + 500000*N，N=0~45，共46个信道(470.1MHz~492.6MHz)，用于配置Lora频率更方便*/ +/*Lora频率：433100000ul + 500000*N，N=0~119，共120个信道(433.1MHz~492.6MHz)，用于配置Lora频率更方便*/ [lora-wide宽频版] typedef enum { - CH0 = (470100000ul + 0), //470.1MHz - CH1 = (470100000ul + 500000), - CH2 = (470100000ul + 1000000), - CH3 = (470100000ul + 1500000), - CH4 = (470100000ul + 2000000), - CH5 = (470100000ul + 2500000), - CH6 = (470100000ul + 3000000), - CH7 = (470100000ul + 3500000), - CH8 = (470100000ul + 4000000), - CH9 = (470100000ul + 4500000), - CH10 = (470100000ul + 5000000), - CH11 = (470100000ul + 5500000), - CH12 = (470100000ul + 6000000), - CH13 = (470100000ul + 6500000), - CH14 = (470100000ul + 7000000), - CH15 = (470100000ul + 7500000), - CH16 = (470100000ul + 8000000), - CH17 = (470100000ul + 8500000), - CH18 = (470100000ul + 9000000), - CH19 = (470100000ul + 9500000), - CH20 = (470100000ul + 10000000), - CH21 = (470100000ul + 10500000), - CH22 = (470100000ul + 11000000), - CH23 = (470100000ul + 11500000), - CH24 = (470100000ul + 12000000), - CH25 = (470100000ul + 12500000), - CH26 = (470100000ul + 13000000), - CH27 = (470100000ul + 13500000), - CH28 = (470100000ul + 14000000), - CH29 = (470100000ul + 14500000), - CH30 = (470100000ul + 15000000), - CH31 = (470100000ul + 15500000), - CH32 = (470100000ul + 16000000), - CH33 = (470100000ul + 16500000), - CH34 = (470100000ul + 17000000), - CH35 = (470100000ul + 17500000), - CH36 = (470100000ul + 18000000), - CH37 = (470100000ul + 18500000), - CH38 = (470100000ul + 19000000), - CH39 = (470100000ul + 19500000), - CH40 = (470100000ul + 20000000), - CH41 = (470100000ul + 20500000), - CH42 = (470100000ul + 21000000), - CH43 = (470100000ul + 21500000), - CH44 = (470100000ul + 22000000), - CH45 = (470100000ul + 22500000), //492.6MHz + CH0 = (433100000ul + 0), //433.1MHz + CH1 = (433100000ul + 500000), + CH2 = (433100000ul + 1000000), + CH3 = (433100000ul + 1500000), + CH4 = (433100000ul + 2000000), + CH5 = (433100000ul + 2500000), + CH6 = (433100000ul + 3000000), + CH7 = (433100000ul + 3500000), + CH8 = (433100000ul + 4000000), + CH9 = (433100000ul + 4500000), + CH10 = (433100000ul + 5000000), + CH11 = (433100000ul + 5500000), + CH12 = (433100000ul + 6000000), + CH13 = (433100000ul + 6500000), + CH14 = (433100000ul + 7000000), + CH15 = (433100000ul + 7500000), + CH16 = (433100000ul + 8000000), + CH17 = (433100000ul + 8500000), + CH18 = (433100000ul + 9000000), + CH19 = (433100000ul + 9500000), + CH20 = (433100000ul + 10000000), + CH21 = (433100000ul + 10500000), + CH22 = (433100000ul + 11000000), + CH23 = (433100000ul + 11500000), + CH24 = (433100000ul + 12000000), + CH25 = (433100000ul + 12500000), + CH26 = (433100000ul + 13000000), + CH27 = (433100000ul + 13500000), + CH28 = (433100000ul + 14000000), + CH29 = (433100000ul + 14500000), + CH30 = (433100000ul + 15000000), + CH31 = (433100000ul + 15500000), + CH32 = (433100000ul + 16000000), + CH33 = (433100000ul + 16500000), + CH34 = (433100000ul + 17000000), + CH35 = (433100000ul + 17500000), + CH36 = (433100000ul + 18000000), + CH37 = (433100000ul + 18500000), + CH38 = (433100000ul + 19000000), + CH39 = (433100000ul + 19500000), + CH40 = (433100000ul + 20000000), + CH41 = (433100000ul + 20500000), + CH42 = (433100000ul + 21000000), + CH43 = (433100000ul + 21500000), + CH44 = (433100000ul + 22000000), + CH45 = (433100000ul + 22500000), + CH46 = (433100000ul + 23000000), + CH47 = (433100000ul + 23500000), + CH48 = (433100000ul + 24000000), + CH49 = (433100000ul + 24500000), + CH50 = (433100000ul + 25000000), + CH51 = (433100000ul + 25500000), + CH52 = (433100000ul + 26000000), + CH53 = (433100000ul + 26500000), + CH54 = (433100000ul + 27000000), + CH55 = (433100000ul + 27500000), + CH56 = (433100000ul + 28000000), + CH57 = (433100000ul + 28500000), + CH58 = (433100000ul + 29000000), + CH59 = (433100000ul + 29500000), + CH60 = (433100000ul + 30000000), + CH61 = (433100000ul + 30500000), + CH62 = (433100000ul + 31000000), + CH63 = (433100000ul + 31500000), + CH64 = (433100000ul + 32000000), + CH65 = (433100000ul + 32500000), + CH66 = (433100000ul + 33000000), + CH67 = (433100000ul + 33500000), + CH68 = (433100000ul + 34000000), + CH69 = (433100000ul + 34500000), + CH70 = (433100000ul + 35000000), + CH71 = (433100000ul + 35500000), + CH72 = (433100000ul + 36000000), + CH73 = (433100000ul + 36500000), + CH74 = (433100000ul + 37000000), + CH75 = (433100000ul + 37500000), + CH76 = (433100000ul + 38000000), + CH77 = (433100000ul + 38500000), + CH78 = (433100000ul + 39000000), + CH79 = (433100000ul + 39500000), + CH80 = (433100000ul + 40000000), + CH81 = (433100000ul + 40500000), + CH82 = (433100000ul + 41000000), + CH83 = (433100000ul + 41500000), + CH84 = (433100000ul + 42000000), + CH85 = (433100000ul + 42500000), + CH86 = (433100000ul + 43000000), + CH87 = (433100000ul + 43500000), + CH88 = (433100000ul + 44000000), + CH89 = (433100000ul + 44500000), + CH90 = (433100000ul + 45000000), + CH91 = (433100000ul + 45500000), + CH92 = (433100000ul + 46000000), + CH93 = (433100000ul + 46500000), + CH94 = (433100000ul + 47000000), + CH95 = (433100000ul + 47500000), + CH96 = (433100000ul + 48000000), + CH97 = (433100000ul + 48500000), + CH98 = (433100000ul + 49000000), + CH99 = (433100000ul + 49500000), + CH100 = (433100000ul + 50000000), + CH101 = (433100000ul + 50500000), + CH102 = (433100000ul + 51000000), + CH103 = (433100000ul + 51500000), + CH104 = (433100000ul + 52000000), + CH105 = (433100000ul + 52500000), + CH106 = (433100000ul + 53000000), + CH107 = (433100000ul + 53500000), + CH108 = (433100000ul + 54000000), + CH109 = (433100000ul + 54500000), + CH110 = (433100000ul + 55000000), + CH111 = (433100000ul + 55500000), + CH112 = (433100000ul + 56000000), + CH113 = (433100000ul + 56500000), + CH114 = (433100000ul + 57000000), + CH115 = (433100000ul + 57500000), + CH116 = (433100000ul + 58000000), + CH117 = (433100000ul + 58500000), + CH118 = (433100000ul + 59000000), + CH119 = (433100000ul + 59500000), //492.6MHz + }LORA_FREQ_M; /*通讯单元通道掩码 - 与GateWay APP一致*/ #define CUCH_CH1 (1 << CH_RS485_1) @@ -97,16 +172,16 @@ typedef enum { /*当前设备版本/项目选择*/ #define GATEWAY_VER_INFO GATEWAY_VER1_0 //版本信息 #define GATEWAY_PRJ_NUM GATEWAY_PRJ_YAXIA //项目编号 -#define GATEWAY_GW_NUM 0x0003 //网关编号(2字节, 1~65535) +#define GATEWAY_GW_NUM 0x0006 //网关编号(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 8083 //服务器端口 +#define GATEWAY_SVR_PORT 8086 //服务器端口 -#define GATEWAY_LORA_FREQ CH0 //Lora中心频率(可配置为CH0~CH45) +#define GATEWAY_LORA_FREQ CH6 //Lora中心频率(可配置为CH0~CH119) /*默认通道配置 - 在Boot中直接配置, 替代原APP硬编码默认值*/ #define GATEWAY_MUCH CH_ETH //主上传通道