From 11e279420324ddd19266d58be21d1abdfc927ea7 Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期四, 07 三月 2024 16:19:31 +0800 Subject: [PATCH] V1.9 调整同步信号,提前5ms接收,超时时间增加5ms,同步更稳定 --- Src/radio/Lora.h | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-) diff --git a/Src/radio/Lora.h b/Src/radio/Lora.h index 75c821e..e5ac67b 100644 --- a/Src/radio/Lora.h +++ b/Src/radio/Lora.h @@ -8,17 +8,40 @@ void OnRxError( void ); void T_R_Init(uint8_t kind); void Lora_Init(void); -void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr ); +void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr); void OnTxDone( void ); void LedToggle(void); -void SwitchLoraSettings(uint32_t freq,uint8_t sf); +void SwitchLoraSettings(uint32_t freq,uint8_t sf,uint8_t power); uint8_t GetFlagLoraWaitSync(void); void SetFlagLoraWaitSync(uint8_t value); +void SwitchLoraSettingstest(uint32_t freq,uint8_t sf); uint8_t GetLoraBufferAndLen(uint8_t* buffer,uint16_t* lp_count); -#define SYNC_CHANNEL_FRQ 46900000 -#define SYNC_CHANNEL_SF 7 +uint16_t GetLoraSyncCount(void); +#define TEST_FREQ +#ifdef TEST_FREQ + #define LORA_UPCHANNEL_FRQ 456 + #define LORA_UPCHANNEL_SF 7 -#define UWB_CHANNEL_FRQ 468000000 -#define UWB_CHANNEL_SF 5 + #define SYNC_CHANNEL_FRQ 457 + #define SYNC_CHANNEL_SF 7 + #define UWB_CHANNEL_FRQ 450 + #define UWB_CHANNEL_SF 5 +#else + #define LORA_UPCHANNEL_FRQ 476 + #define LORA_UPCHANNEL_SF 7 + + #define SYNC_CHANNEL_FRQ 477 + #define SYNC_CHANNEL_SF 7 + + #define UWB_CHANNEL_FRQ 470 + #define UWB_CHANNEL_SF 5 +#endif + +#define APP2_ADRESS 0X8012800 +#define APP1_ADRESS 0X8005000 + +#define APP_SIZE 0XAB00 + +#define APP_1OR2_ADRESS 0x8004B38 #endif -- Gitblit v1.9.3