From 5634c27b87d185b213dc31c921f9b64e5303d368 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期一, 22 一月 2024 22:22:41 +0800
Subject: [PATCH] Merge branch '免布线基站-lora' of http://47.108.70.204:60062/r/XRange_Tag into 免布线基站-lora
---
Src/radio/Lora.c | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index a3c10f7..346c609 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -14,7 +14,6 @@
#define USE_MODEM_LORA
//#define USE_MODEM_FSK
#define REGION_CN779
-
#if defined( REGION_AS923 )
#define RF_FREQUENCY 923000000 // Hz
@@ -90,7 +89,7 @@
#define LORA_SYMBOL_TIMEOUT 0 // Symbols
#define LORA_FIX_LENGTH_PAYLOAD_ON false
#define LORA_IQ_INVERSION_ON_T false
-#define LORA_IQ_INVERSION_ON_R true
+#define LORA_IQ_INVERSION_ON_R false
#elif defined( USE_MODEM_FSK )
@@ -283,18 +282,27 @@
// TX_Buffer[5]=crc_value;
}
-#define SYNC_CHANNEL_FRQ 48000000
uint8_t GetFlagLoraWaitSync(void)
{
return flag_lora_wait_sync;
}
-void SwitchLoraToSyncRec()
+void SwitchLoraToSyncRec(uint32_t freq,uint8_t sf)
{
RadioEvents.RxDone = OnRxDone;
RadioEvents.RxTimeout = OnRxTimeout;
RadioEvents.RxError = OnRxError;
Radio.Init( &RadioEvents );
- Radio.SetChannel( SYNC_CHANNEL_FRQ );
+ Radio.SetChannel( freq );
flag_lora_wait_sync = 1;
+
+ Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, 2,
+ sf, LORA_CODINGRATE,LORA_PREAMBLE_LENGTH_T, LORA_FIX_LENGTH_PAYLOAD_ON,
+ false, 0, 0, LORA_IQ_INVERSION_ON_T, 3000 );
+
+ Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH,
+ sf,LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH_R,
+ LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON,
+ 0, false, 0, 0, LORA_IQ_INVERSION_ON_R, 1 );
+
}
--
Gitblit v1.9.3