feat: LoRa中心频率改为470.1~492.6MHz(46信道), 激光默认关闭时间改为1分钟, 软件版本升至13
- sx127x.h: CH0~CH45中心频率改为470100000~492600000, 步进500000; FREQ_CENT/USE_LORA_CH扩展至CH45 - sx127x.c: LoraSetChannel信道上限16->45; LoraSetFreqCent频率校验改为470.1~492.6MHz; 移除BOM - main.c: LoraFreq频率校验同步改为470.1~492.6MHz; 激光默认关闭时间10分钟->1分钟 - UartDebug.c: lora帮助文本信道范围更新为0~45 - main.h: 软件版本12->13 - docs: 更新软件版本号与LoRa频率范围说明 - MDK: 调试器配置更新
This commit is contained in:
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include "Update.h"
|
||||
#include "Imu.h"
|
||||
|
||||
#define SOFTWARE_VERSION 12 //软件版本
|
||||
#define SOFTWARE_VERSION 13 //软件版本
|
||||
#define HARDWARE_VERSION 11 //硬件版本
|
||||
|
||||
#define MAIN_DBG_LOG(...) { if(MainDispEn) DBG_LOG(__VA_ARGS__);}
|
||||
|
||||
+3
-3
@@ -137,10 +137,10 @@ static void AppInit(void)
|
||||
App.Para.Layout.FPOTimeStart = 0;
|
||||
}
|
||||
|
||||
if(App.Para.BLPara.LoraFreq < 410000000 || App.Para.BLPara.LoraFreq > 525000000)
|
||||
if(App.Para.BLPara.LoraFreq < 470100000ul || App.Para.BLPara.LoraFreq > 492600000ul)
|
||||
App.Para.BLPara.LoraFreq = CH0;
|
||||
App.Para.Lora.FreqCent = App.Para.BLPara.LoraFreq;
|
||||
SX1276LoRaWriteFreq(App.Para.Lora.FreqCent); //Lora频率:433100000ul + 200000*N
|
||||
SX1276LoRaWriteFreq(App.Para.Lora.FreqCent); //Lora频率:470100000ul + 500000*N
|
||||
|
||||
if(App.Para.Rs485Ch1.Addr > 16 || App.Para.Rs485Ch1.Addr < 1){
|
||||
App.Para.Rs485Ch1.Addr = 1;
|
||||
@@ -167,7 +167,7 @@ static void AppInit(void)
|
||||
App.Para.Layout.FPOTime = 0;
|
||||
}
|
||||
if(App.Para.LaserTimerMinutes < 0 || App.Para.LaserTimerMinutes > 240)
|
||||
App.Para.LaserTimerMinutes = 10;
|
||||
App.Para.LaserTimerMinutes = 1;
|
||||
SGCP.LaserTimerMinutes = App.Para.LaserTimerMinutes;
|
||||
|
||||
SAVE_APP_PARA((uint32_t *)&App.Para);
|
||||
|
||||
Reference in New Issue
Block a user