From 6c841ad18a86f1f075340577c0e43ea433bce427 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 01 十一月 2024 19:16:27 +0800
Subject: [PATCH] 1.20，等待现场测试一下
---
Src/radio/Lora.c | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index c4fe696..7bd987a 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -257,12 +257,12 @@
Radio.Standby();
no_rx_flag = 0;
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有效
- }
+// 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有效
+// }
if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_WGRESPTAG)
{
checksum1=Checksum_u16(RX_Buffer,BufferSize-2);
@@ -279,6 +279,7 @@
if(!memcmp(&wg_report_id,&RX_Buffer[SOURCE_ID_IDX],2))
{
wg_lost_count = 0;
+ HAL_NVIC_EnableIRQ(EXTI4_15_IRQn);
switch(RX_Buffer[PWTAG_RW_FLAG_IDX])
{
case WGRSP_RWTAG_NONE:
@@ -351,21 +352,21 @@
}
}
}
- if(!no_rx_flag)
- {
- if(lora_jianting_flag&&LoraUp_flag==0)
- {
- SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
- Radio.Rx(0);
- }
- }
+// if(!no_rx_flag)
+// {
+// if(lora_jianting_flag&&LoraUp_flag==0)
+// {
+// SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
+// Radio.Rx(0);
+// }
+// }
}
void OnTxTimeout( void )
{
Radio.Standby();
- if(lora_jianting_flag)
- SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
+// if(lora_jianting_flag)
+// SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
}
uint8_t tm;
uint16_t Lora_rece_error;
@@ -380,10 +381,11 @@
target_count+=32768;
__HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
}
+ HAL_NVIC_EnableIRQ(EXTI4_15_IRQn);
if(lora_jianting_flag)
{
- SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
- Radio.Rx(0);
+// SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
+// Radio.Rx(0);
}
}
@@ -391,8 +393,8 @@
{
Radio.Standby();
- if(lora_jianting_flag)
- SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
+// if(lora_jianting_flag)
+// SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
}
uint16_t freq_test;
@@ -431,7 +433,7 @@
RadioEvents.RxError = OnRxError;
Radio.Init( &RadioEvents );
- SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],5,0); //切换lora接收频点
+ SwitchLoraSettings(REPORT_MANGE_CHANNEL_FRQ,7,22); //切换lora接收频点
if(active_flag)
{
Radio.Rx( 0 );
--
Gitblit v1.9.3