From ee0d5aab5ecbbd265660cba45c8a1946005b8f8c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 18 九月 2024 13:49:17 +0800
Subject: [PATCH] v1.30，把gcom表1搬到表2的时候往后挪，防止保存出错一直重启。

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

diff --git a/Src/radio/Lora.h b/Src/radio/Lora.h
index 4578b3a..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 );
@@ -13,13 +14,48 @@
 void LedToggle(void);
 void SwitchLoraSettings(uint32_t freq,uint8_t sf,uint8_t power);
 void LoraInit(void);
-#define SYNC_CHANNEL_FRQ 469
-#define SYNC_CHANNEL_SF 7
 
-#define UWB_CHANNEL_FRQ 460
+//#define TEST_FREQ
+#ifdef  TEST_FREQ
+#define LORA_UPCHANNEL_FRQ 456
+#define LORA_UPCHANNEL_SF 9
+    
+#define TEST_FREQ_OFFSET   1
+#define UWB_CHANNEL_FRQ 450+TEST_FREQ_OFFSET
 #define UWB_CHANNEL_SF 5
 
-#define REPORT_MANGE_CHANNEL_FRQ 470
+#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
+#else
+#define LORA_UPCHANNEL_FRQ 476
+#define LORA_UPCHANNEL_SF 7
+    
+#define UWB_CHANNEL_FRQ 470
+#define UWB_CHANNEL_SF 5
+
+#define REPORT_MANGE_CHANNEL_FRQ 478
 #define REPORT_CHANNEL_SF 7
 
+#define LR_DATA_CHANNEL_FRQ 475
+#define LR_DATA_CHANNEL_SF 9
+#endif
+
+#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 0XD400
+#endif
+
+#define APP_1OR2_ADRESS 0x8004B38
+
 #endif 
+void LoraUp_Poll();
\ No newline at end of file

--
Gitblit v1.9.3