From 84649c69381018c8cba0657922c5bed4ddfaf0f7 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 17 五月 2024 15:35:46 +0800
Subject: [PATCH] V2.28 改成收1秒 等3秒，中间会多次发lora
---
Src/radio/Lora.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index b3e3340..a21a6c1 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -259,8 +259,8 @@
lora_up_rec_flag=1;
if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_RANGEPOLL)
{
- UWB_RXStart(10);
- delay_ms(time);
+ //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)
@@ -360,18 +360,18 @@
}
}
}
- 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);
- }
+// 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);
+// }
}
void OnTxTimeout( void )
{
Radio.Standby();
- SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
+ // SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
}
uint8_t tm;
uint16_t Lora_rece_error;
@@ -383,15 +383,15 @@
while(target_count<0)
target_count+=32768;
__HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
- 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);
}
void OnRxError( void )
{
Radio.Standby();
- SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
+ // SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
}
uint16_t freq_test;
--
Gitblit v1.9.3