From 59d2aebded1f4ddb04596d4d821c7fce00ed8962 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 19 十一月 2024 20:41:41 +0800
Subject: [PATCH] 初步调通,但是发现好像是基站的问题,基站初次启动,40秒不测距。去解决基站问题

---
 Src/radio/Lora.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index b6e8638..e262254 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -259,11 +259,11 @@
     lora_up_rec_flag=1;
     if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_RANGEPOLL)
     {
-        HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_RESET);
+       // HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_RESET);
             UWB_Wkup();
-        HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_SET);
+      //  HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_SET);
             MbxTagUwbRec();   
-        HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); //片选lora有效        
+      //  HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); //片选lora有效        
             Radio.Rx(0);       
     }
     if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_WGRESPTAG)
@@ -357,7 +357,7 @@
     {
         if(lora_jianting_flag&&LoraUp_flag==0)
         {
-            SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
+            SwitchLoraSettings(UWB_CHANNEL_FRQ+group_id,UWB_CHANNEL_SF,0);
             Radio.Rx(0);
         }
     }
@@ -370,7 +370,10 @@
 {
     Radio.Standby();
     if(lora_jianting_flag)
-    SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
+    {
+        SwitchLoraSettings(UWB_CHANNEL_FRQ+group_id,UWB_CHANNEL_SF,0);
+        Radio.Rx(0);
+    }
 }
     uint8_t tm;
 uint16_t Lora_rece_error;
@@ -388,7 +391,7 @@
     }
     if(lora_jianting_flag)
     {
-        SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
+        SwitchLoraSettings(UWB_CHANNEL_FRQ+group_id,UWB_CHANNEL_SF,0);
         Radio.Rx(0);
     }
 }
@@ -398,7 +401,10 @@
 
     Radio.Standby();
     if(lora_jianting_flag)
-    SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
+    {
+        SwitchLoraSettings(UWB_CHANNEL_FRQ+group_id,UWB_CHANNEL_SF,0);
+        Radio.Rx(0);
+    }
 }
 
 uint16_t freq_test;
@@ -437,7 +443,7 @@
     RadioEvents.RxError = OnRxError;
 
     Radio.Init( &RadioEvents );
-    SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],5,0); //切换lora接收频点  
+    SwitchLoraSettings(UWB_CHANNEL_FRQ+group_id,UWB_CHANNEL_SF,0); //切换lora接收频点  
     if(active_flag)
     {
     Radio.Rx( 0 ); 

--
Gitblit v1.9.3