diff --git a/Project/GateWay/source/Module/sx127x/sx127x.c b/Project/GateWay/source/Module/sx127x/sx127x.c index 8b6a3fe..71bb2a0 100644 --- a/Project/GateWay/source/Module/sx127x/sx127x.c +++ b/Project/GateWay/source/Module/sx127x/sx127x.c @@ -474,13 +474,24 @@ void Sx1276LoRaWakeup(void) //配置本层参数的函数 //频道表 const uint32_t gdwSx1276ChannelTbl[SX1276_CHANNEL_MAX]={ - CH0, CH1, CH2, CH3, CH4, CH5, CH6, CH7, CH8, CH9, - CH10, CH11, CH12, CH13, CH14, CH15, CH16, CH17, CH18, CH19, - CH20, CH21, CH22, CH23, CH24, CH25, CH26, CH27, CH28, CH29, - CH30, CH31, CH32, CH33, CH34, CH35, CH36, CH37, CH38, CH39, - CH40, CH41, CH42, CH43, CH44, CH45 + CH0, CH1, CH2, CH3, CH4, CH5, CH6, CH7, CH8, CH9, + CH10, CH11, CH12, CH13, CH14, CH15, CH16, CH17, CH18, CH19, + CH20, CH21, CH22, CH23, CH24, CH25, CH26, CH27, CH28, CH29, + CH30, CH31, CH32, CH33, CH34, CH35, CH36, CH37, CH38, CH39, + CH40, CH41, CH42, CH43, CH44, CH45, CH46, CH47, CH48, CH49, + CH50, CH51, CH52, CH53, CH54, CH55, CH56, CH57, CH58, CH59, + CH60, CH61, CH62, CH63, CH64, CH65, CH66, CH67, CH68, CH69, + CH70, CH71, CH72, CH73, CH74, CH75, CH76, CH77, CH78, CH79, + CH80, CH81, CH82, CH83, CH84, CH85, CH86, CH87, CH88, CH89, + CH90, CH91, CH92, CH93, CH94, CH95, CH96, CH97, CH98, CH99, + CH100, CH101, CH102, CH103, CH104, CH105, CH106, CH107, CH108, CH109, + CH110, CH111, CH112, CH113, CH114, CH115, CH116, CH117, CH118, CH119, + CH120, CH121, CH122, CH123, CH124, CH125, CH126, CH127, CH128, CH129, + CH130, CH131, CH132, CH133, CH134, CH135, CH136, CH137, CH138, CH139, + CH140, CH141, CH142, CH143, CH144, CH145, CH146, CH147, CH148, CH149, + CH150, CH151, CH152, CH153, CH154, CH155, CH156, CH157, CH158, CH159, + CH160, CH161, CH162, CH163, CH164, CH165 }; - //LORAPT_CHANNEL uint8_t SX1276LoRaReadChannel(void) { diff --git a/Project/GateWay/source/Module/sx127x/sx127x.h b/Project/GateWay/source/Module/sx127x/sx127x.h index 1330c4f..bfdb714 100644 --- a/Project/GateWay/source/Module/sx127x/sx127x.h +++ b/Project/GateWay/source/Module/sx127x/sx127x.h @@ -660,7 +660,7 @@ typedef enum{ LORAPT_MAX }Sx1276LoraParaType; -#define SX1276_CHANNEL_MAX 46 +#define SX1276_CHANNEL_MAX 166 #define LORA_SPI_NSS_SET() SPI2_NSS_SET() #define LORA_SPI_NSS_CLR() SPI2_NSS_CLR() @@ -758,55 +758,174 @@ typedef struct { #endif /* -Lora频率：470100000ul + 500000*N, N=0~45, 共46个信道(470.1MHz~492.6MHz) +Lora频率：410100000ul + 500000*N, N=0~165, 共166个信道(410.1MHz~492.6MHz) [lora-wide宽频版] */ -#define CH0 (470100000ul + 0) //470.1MHz -#define CH1 (470100000ul + 500000) -#define CH2 (470100000ul + 1000000) -#define CH3 (470100000ul + 1500000) -#define CH4 (470100000ul + 2000000) -#define CH5 (470100000ul + 2500000) -#define CH6 (470100000ul + 3000000) -#define CH7 (470100000ul + 3500000) -#define CH8 (470100000ul + 4000000) -#define CH9 (470100000ul + 4500000) -#define CH10 (470100000ul + 5000000) -#define CH11 (470100000ul + 5500000) -#define CH12 (470100000ul + 6000000) -#define CH13 (470100000ul + 6500000) -#define CH14 (470100000ul + 7000000) -#define CH15 (470100000ul + 7500000) -#define CH16 (470100000ul + 8000000) -#define CH17 (470100000ul + 8500000) -#define CH18 (470100000ul + 9000000) -#define CH19 (470100000ul + 9500000) -#define CH20 (470100000ul + 10000000) -#define CH21 (470100000ul + 10500000) -#define CH22 (470100000ul + 11000000) -#define CH23 (470100000ul + 11500000) -#define CH24 (470100000ul + 12000000) -#define CH25 (470100000ul + 12500000) -#define CH26 (470100000ul + 13000000) -#define CH27 (470100000ul + 13500000) -#define CH28 (470100000ul + 14000000) -#define CH29 (470100000ul + 14500000) -#define CH30 (470100000ul + 15000000) -#define CH31 (470100000ul + 15500000) -#define CH32 (470100000ul + 16000000) -#define CH33 (470100000ul + 16500000) -#define CH34 (470100000ul + 17000000) -#define CH35 (470100000ul + 17500000) -#define CH36 (470100000ul + 18000000) -#define CH37 (470100000ul + 18500000) -#define CH38 (470100000ul + 19000000) -#define CH39 (470100000ul + 19500000) -#define CH40 (470100000ul + 20000000) -#define CH41 (470100000ul + 20500000) -#define CH42 (470100000ul + 21000000) -#define CH43 (470100000ul + 21500000) -#define CH44 (470100000ul + 22000000) -#define CH45 (470100000ul + 22500000) //492.6MHz - +#define CH0 (410100000ul + 0) //410.1MHz +#define CH1 (410100000ul + 500000) +#define CH2 (410100000ul + 1000000) +#define CH3 (410100000ul + 1500000) +#define CH4 (410100000ul + 2000000) +#define CH5 (410100000ul + 2500000) +#define CH6 (410100000ul + 3000000) +#define CH7 (410100000ul + 3500000) +#define CH8 (410100000ul + 4000000) +#define CH9 (410100000ul + 4500000) +#define CH10 (410100000ul + 5000000) +#define CH11 (410100000ul + 5500000) +#define CH12 (410100000ul + 6000000) +#define CH13 (410100000ul + 6500000) +#define CH14 (410100000ul + 7000000) +#define CH15 (410100000ul + 7500000) +#define CH16 (410100000ul + 8000000) +#define CH17 (410100000ul + 8500000) +#define CH18 (410100000ul + 9000000) +#define CH19 (410100000ul + 9500000) +#define CH20 (410100000ul + 10000000) +#define CH21 (410100000ul + 10500000) +#define CH22 (410100000ul + 11000000) +#define CH23 (410100000ul + 11500000) +#define CH24 (410100000ul + 12000000) +#define CH25 (410100000ul + 12500000) +#define CH26 (410100000ul + 13000000) +#define CH27 (410100000ul + 13500000) +#define CH28 (410100000ul + 14000000) +#define CH29 (410100000ul + 14500000) +#define CH30 (410100000ul + 15000000) +#define CH31 (410100000ul + 15500000) +#define CH32 (410100000ul + 16000000) +#define CH33 (410100000ul + 16500000) +#define CH34 (410100000ul + 17000000) +#define CH35 (410100000ul + 17500000) +#define CH36 (410100000ul + 18000000) +#define CH37 (410100000ul + 18500000) +#define CH38 (410100000ul + 19000000) +#define CH39 (410100000ul + 19500000) +#define CH40 (410100000ul + 20000000) +#define CH41 (410100000ul + 20500000) +#define CH42 (410100000ul + 21000000) +#define CH43 (410100000ul + 21500000) +#define CH44 (410100000ul + 22000000) +#define CH45 (410100000ul + 22500000) +#define CH46 (410100000ul + 23000000) +#define CH47 (410100000ul + 23500000) +#define CH48 (410100000ul + 24000000) +#define CH49 (410100000ul + 24500000) +#define CH50 (410100000ul + 25000000) +#define CH51 (410100000ul + 25500000) +#define CH52 (410100000ul + 26000000) +#define CH53 (410100000ul + 26500000) +#define CH54 (410100000ul + 27000000) +#define CH55 (410100000ul + 27500000) +#define CH56 (410100000ul + 28000000) +#define CH57 (410100000ul + 28500000) +#define CH58 (410100000ul + 29000000) +#define CH59 (410100000ul + 29500000) +#define CH60 (410100000ul + 30000000) +#define CH61 (410100000ul + 30500000) +#define CH62 (410100000ul + 31000000) +#define CH63 (410100000ul + 31500000) +#define CH64 (410100000ul + 32000000) +#define CH65 (410100000ul + 32500000) +#define CH66 (410100000ul + 33000000) +#define CH67 (410100000ul + 33500000) +#define CH68 (410100000ul + 34000000) +#define CH69 (410100000ul + 34500000) +#define CH70 (410100000ul + 35000000) +#define CH71 (410100000ul + 35500000) +#define CH72 (410100000ul + 36000000) +#define CH73 (410100000ul + 36500000) +#define CH74 (410100000ul + 37000000) +#define CH75 (410100000ul + 37500000) +#define CH76 (410100000ul + 38000000) +#define CH77 (410100000ul + 38500000) +#define CH78 (410100000ul + 39000000) +#define CH79 (410100000ul + 39500000) +#define CH80 (410100000ul + 40000000) +#define CH81 (410100000ul + 40500000) +#define CH82 (410100000ul + 41000000) +#define CH83 (410100000ul + 41500000) +#define CH84 (410100000ul + 42000000) +#define CH85 (410100000ul + 42500000) +#define CH86 (410100000ul + 43000000) +#define CH87 (410100000ul + 43500000) +#define CH88 (410100000ul + 44000000) +#define CH89 (410100000ul + 44500000) +#define CH90 (410100000ul + 45000000) +#define CH91 (410100000ul + 45500000) +#define CH92 (410100000ul + 46000000) +#define CH93 (410100000ul + 46500000) +#define CH94 (410100000ul + 47000000) +#define CH95 (410100000ul + 47500000) +#define CH96 (410100000ul + 48000000) +#define CH97 (410100000ul + 48500000) +#define CH98 (410100000ul + 49000000) +#define CH99 (410100000ul + 49500000) +#define CH100 (410100000ul + 50000000) +#define CH101 (410100000ul + 50500000) +#define CH102 (410100000ul + 51000000) +#define CH103 (410100000ul + 51500000) +#define CH104 (410100000ul + 52000000) +#define CH105 (410100000ul + 52500000) +#define CH106 (410100000ul + 53000000) +#define CH107 (410100000ul + 53500000) +#define CH108 (410100000ul + 54000000) +#define CH109 (410100000ul + 54500000) +#define CH110 (410100000ul + 55000000) +#define CH111 (410100000ul + 55500000) +#define CH112 (410100000ul + 56000000) +#define CH113 (410100000ul + 56500000) +#define CH114 (410100000ul + 57000000) +#define CH115 (410100000ul + 57500000) +#define CH116 (410100000ul + 58000000) +#define CH117 (410100000ul + 58500000) +#define CH118 (410100000ul + 59000000) +#define CH119 (410100000ul + 59500000) +#define CH120 (410100000ul + 60000000) +#define CH121 (410100000ul + 60500000) +#define CH122 (410100000ul + 61000000) +#define CH123 (410100000ul + 61500000) +#define CH124 (410100000ul + 62000000) +#define CH125 (410100000ul + 62500000) +#define CH126 (410100000ul + 63000000) +#define CH127 (410100000ul + 63500000) +#define CH128 (410100000ul + 64000000) +#define CH129 (410100000ul + 64500000) +#define CH130 (410100000ul + 65000000) +#define CH131 (410100000ul + 65500000) +#define CH132 (410100000ul + 66000000) +#define CH133 (410100000ul + 66500000) +#define CH134 (410100000ul + 67000000) +#define CH135 (410100000ul + 67500000) +#define CH136 (410100000ul + 68000000) +#define CH137 (410100000ul + 68500000) +#define CH138 (410100000ul + 69000000) +#define CH139 (410100000ul + 69500000) +#define CH140 (410100000ul + 70000000) +#define CH141 (410100000ul + 70500000) +#define CH142 (410100000ul + 71000000) +#define CH143 (410100000ul + 71500000) +#define CH144 (410100000ul + 72000000) +#define CH145 (410100000ul + 72500000) +#define CH146 (410100000ul + 73000000) +#define CH147 (410100000ul + 73500000) +#define CH148 (410100000ul + 74000000) +#define CH149 (410100000ul + 74500000) +#define CH150 (410100000ul + 75000000) +#define CH151 (410100000ul + 75500000) +#define CH152 (410100000ul + 76000000) +#define CH153 (410100000ul + 76500000) +#define CH154 (410100000ul + 77000000) +#define CH155 (410100000ul + 77500000) +#define CH156 (410100000ul + 78000000) +#define CH157 (410100000ul + 78500000) +#define CH158 (410100000ul + 79000000) +#define CH159 (410100000ul + 79500000) +#define CH160 (410100000ul + 80000000) +#define CH161 (410100000ul + 80500000) +#define CH162 (410100000ul + 81000000) +#define CH163 (410100000ul + 81500000) +#define CH164 (410100000ul + 82000000) +#define CH165 (410100000ul + 82500000) //492.6MHz /*Lora中心频率默认值(编译期用于频道表等) 实际运行频率由Boot参数区(BootPara_t.LoraFreq)配置, APP启动时覆盖ConfigPara.Lora.FreqCent*/ #define FREQ_CENT CH0