From c8a99f8293e1ae335501390de5bab05db487a0f9 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 29 二月 2024 18:17:59 +0800
Subject: [PATCH] Merge branch '免布线基站-lora' of http://47.108.70.204:60062/r/XRange_Tag into 免布线基站-lora

---
 Src/radio/Lora.h |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Src/radio/Lora.h b/Src/radio/Lora.h
index 02b042c..d7c5d48 100644
--- a/Src/radio/Lora.h
+++ b/Src/radio/Lora.h
@@ -8,17 +8,28 @@
 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 469000000
+uint16_t GetLoraSyncCount(void);
+#define LORA_UPCHANNEL_FRQ 476
+#define LORA_UPCHANNEL_SF 7
+
+#define SYNC_CHANNEL_FRQ 477
 #define SYNC_CHANNEL_SF 7
 
-#define UWB_CHANNEL_FRQ 468000000
+#define UWB_CHANNEL_FRQ 470
 #define UWB_CHANNEL_SF 5
 
+#define APP2_ADRESS 0X8012800
+#define APP1_ADRESS 0X8005000
+
+#define APP_SIZE 0XAB00
+
+#define APP_1OR2_ADRESS 0x8004B38
 #endif 

--
Gitblit v1.9.3