From 655ca318efcdf71554da38ab30ccdaa53b8c6075 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期一, 25 三月 2024 17:54:17 +0800
Subject: [PATCH] V1.13，修复lora收到升级命令后发射回应包，如果回应包没有触发txdone无法触发标志位，重复发射5次后，会清零，不会重启的BUG

---
 Src/radio/Lora.h |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/Src/radio/Lora.h b/Src/radio/Lora.h
index e73d134..33932c1 100644
--- a/Src/radio/Lora.h
+++ b/Src/radio/Lora.h
@@ -8,15 +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 SwitchLoraToSyncRec(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
-#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