From ec22d5dcf5153cefc08d495ecf339edf3d799cba Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期二, 02 四月 2024 15:58:16 +0800 Subject: [PATCH] Merge branch '免布线URT-LORA-L071' of http://47.108.70.204:60062/r/XRange_Tag into 免布线URT-LORA-L071 --- Src/radio/Lora.h | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Src/radio/Lora.h b/Src/radio/Lora.h index 83fef4f..3de6fc8 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 ); @@ -14,7 +15,7 @@ void SwitchLoraSettings(uint32_t freq,uint8_t sf,uint8_t power); void LoraInit(void); -//#define TEST_FREQ +#define TEST_FREQ #ifdef TEST_FREQ #define LORA_UPCHANNEL_FRQ 456 #define LORA_UPCHANNEL_SF 7 @@ -35,10 +36,18 @@ #define REPORT_MANGE_CHANNEL_FRQ 478 #define REPORT_CHANNEL_SF 7 #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