From 9ccac529b6e27b594585808ea467b5cc2871d78e Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期四, 18 七月 2024 14:25:10 +0800 Subject: [PATCH] 1.26,修复语音bug --- Src/radio/Lora.h | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Src/radio/Lora.h b/Src/radio/Lora.h index 83fef4f..d4fd5cd 100644 --- a/Src/radio/Lora.h +++ b/Src/radio/Lora.h @@ -3,6 +3,7 @@ #include <stdint.h> #include <stdbool.h> +#include "stm32l0xx.h" void OnTxTimeout( void ); void OnRxTimeout( void ); void OnRxError( void ); @@ -17,11 +18,14 @@ //#define TEST_FREQ #ifdef TEST_FREQ #define LORA_UPCHANNEL_FRQ 456 -#define LORA_UPCHANNEL_SF 7 +#define LORA_UPCHANNEL_SF 9 -#define TEST_FREQ_OFFSET 0 -#define UWB_CHANNEL_FRQ 450 +#define TEST_FREQ_OFFSET 1 +#define UWB_CHANNEL_FRQ 450+TEST_FREQ_OFFSET #define UWB_CHANNEL_SF 5 + +#define LR_DATA_CHANNEL_FRQ 457 +#define LR_DATA_CHANNEL_SF 9 #define REPORT_MANGE_CHANNEL_FRQ 458 +TEST_FREQ_OFFSET #define REPORT_CHANNEL_SF 7 @@ -34,11 +38,22 @@ #define REPORT_MANGE_CHANNEL_FRQ 478 #define REPORT_CHANNEL_SF 7 + +#define LR_DATA_CHANNEL_FRQ 475 +#define LR_DATA_CHANNEL_SF 9 #endif -#define APP2_ADRESS 0X8012800 + +#ifndef _NO_HANGJIN +#define APP2_ADRESS 0X8013800 +#define APP1_ADRESS 0X8007800 + +#define APP_SIZE 0XC000 +#else +#define APP2_ADRESS 0X8012400 #define APP1_ADRESS 0X8005000 -#define APP_SIZE 0XAB00 +#define APP_SIZE 0XD400 +#endif #define APP_1OR2_ADRESS 0x8004B38 -- Gitblit v1.9.3