YuanHongbin/GateWay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(lora): Lora中心频率改为470.1~492.6MHz共46信道(500kHz步进)+校验范围同步 软件版本V1.2

Browse Source
This commit is contained in:
YuanHongbin
2026-09-02 12:32:21 +08:00
parent 68a5a185fc
commit a6c8cd8a71
4 changed files with 57 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Project/GateWay/source/Module/sx127x/sx127x.c
+7 -7
View File
@@ -466,11 +466,11 @@ void Sx1276LoRaWakeup(void)
//配置本层参数的函数
//频道表
const uint32_t gdwSx1276ChannelTbl[SX1276_CHANNEL_MAX]={
FREQ_CENT-FREQ_DEV*8, FREQ_CENT-FREQ_DEV*7, FREQ_CENT-FREQ_DEV*6, FREQ_CENT-FREQ_DEV*5,
FREQ_CENT-FREQ_DEV*4, FREQ_CENT-FREQ_DEV*3, FREQ_CENT-FREQ_DEV*2, FREQ_CENT-FREQ_DEV*1,
FREQ_CENT+FREQ_DEV*0, FREQ_CENT+FREQ_DEV*1, FREQ_CENT+FREQ_DEV*2, FREQ_CENT+FREQ_DEV*3,
FREQ_CENT+FREQ_DEV*4, FREQ_CENT+FREQ_DEV*5, FREQ_CENT+FREQ_DEV*6, FREQ_CENT+FREQ_DEV*7,
FREQ_CENT+FREQ_DEV*8
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
};
//LORAPT_CHANNEL
@@ -481,7 +481,7 @@ uint8_t SX1276LoRaReadChannel(void)
bool SX1276LoRaWriteChannel(uint8_t Channel)
{
if(Channel > SX1276_CHANNEL_MAX) {
if(Channel >= SX1276_CHANNEL_MAX) {
return false;
}
@@ -658,7 +658,7 @@ bool LoraSetRegPreamble(uint8_t RegPreamble)
}
bool LoraSetFreqCent(uint32_t FreqCent)
{
if(FreqCent < 410000000 || FreqCent > 525000000)
if(FreqCent < 470100000 || FreqCent > 492600000)
return false;
LoRaPara.dwFreqHz = FreqCent;
return true;
Project/GateWay/source/Module/sx127x/sx127x.h
+48 -13
View File
@@ -660,7 +660,7 @@ typedef enum{
LORAPT_MAX
}Sx1276LoraParaType;
#define SX1276_CHANNEL_MAX 17
#define SX1276_CHANNEL_MAX 46
#define LORA_SPI_NSS_SET() SPI2_NSS_SET()
#define LORA_SPI_NSS_CLR() SPI2_NSS_CLR()
@@ -758,19 +758,54 @@ typedef struct {
#endif
/*
中心频率配置：433100000ul + 200000*N
Lora频率：470100000ul + 500000*N, N=0~45, 共46个信道(470.1MHz~492.6MHz)
*/
#define CH0 (433100000ul + 0) //测试频率
#define CH1 (433100000ul + 200000)
#define CH2 (433100000ul + 400000)
#define CH3 (433100000ul + 600000)
#define CH4 (433100000ul + 800000)
#define CH5 (433100000ul + 1000000)
#define CH6 (433100000ul + 1200000)
#define CH7 (433100000ul + 1400000)
#define CH8 (433100000ul + 1600000)
#define CH9 (433100000ul + 1800000)
#define CH10 (433100000ul + 2000000)
#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
/*Lora中心频率默认值(编译期用于频道表等)
实际运行频率由Boot参数区(BootPara_t.LoraFreq)配置, APP启动时覆盖ConfigPara.Lora.FreqCent*/
Project/GateWay/source/User/Inc/main.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "Public.h"
#include "DebugCmd.h"
#define SOFTWARE_VERSION 11
#define SOFTWARE_VERSION 12
#define HARDWARE_VERSION 12
extern bool MainDispEn;
Project/GateWay/source/User/Src/main.c
+1 -1
View File
@@ -183,7 +183,7 @@ void GateWayInit(void)
}
if(LoraSetFreqCent(GateWay.ConfigPara.Lora.FreqCent) == false)
{
GateWay.ConfigPara.Lora.FreqCent = 433100000;
GateWay.ConfigPara.Lora.FreqCent = 470100000;
LoraSetFreqCent(GateWay.ConfigPara.Lora.FreqCent);
}
if(LoraSetPower(GateWay.ConfigPara.Lora.ucPower) == false) {