From 9f69a1d045d3b737fa6f42d715289c528699f947 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 11 六月 2024 15:17:26 +0800
Subject: [PATCH] 1111

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

diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index 6f65055..fd9ded6 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -185,7 +185,7 @@
     }
     else
     {
-    Radio.Rx( 100 ); 
+    Radio.Rx( 50 ); 
     } 
 }
 extern LPTIM_HandleTypeDef hlptim1;
@@ -246,7 +246,7 @@
 uint16_t rec_value,rec_delaytime,rx_count;
 uint16_t rec_value,rec_delaytime,rx_count,datalen_offset;
 int32_t target_count;
-uint8_t shengji_flag;
+uint8_t shengji_flag,time=5;
 extern uint32_t uwbled,gpsled,loraled,powerled;
 void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr )
 {    uint16_t checksum1;
@@ -259,9 +259,9 @@
     lora_up_rec_flag=1;
     if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_RANGEPOLL)
     {
-            UWB_Wkup();
-            MbxTagUwbRec();       
-            HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); //片选lora有效
+        UWB_RXStart(10);
+        delay_ms(time);
+//        HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); //片选lora有效
     }
     if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_WGRESPTAG)
     {
@@ -362,6 +362,7 @@
     } 
     if(!no_rx_flag&&LoraUp_flag==0)
     {
+        if(RX_Buffer[MSG_TYPE_IDX]!=LORA_MSGTYPE_RANGEPOLL)
         SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
         Radio.Rx(0);
     }
@@ -430,13 +431,14 @@
 
     Radio.Init( &RadioEvents );
     SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],5,0); //切换lora接收频点  
-    if(active_flag)
-    {
+//    if(active_flag)
+//    {
     Radio.Rx( 0 ); 
-    }else{
-        Radio.Sleep();
-    }        
+//    }else{
+//        Radio.Sleep();
+//    }        
 //        Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
+    RadioGetStatus();
                                    
 }
 uint32_t IAP_JumpTo(uint32_t ApplicationAddress)

--
Gitblit v1.9.3