From ef13ded1ca160a6edabe2e32b5a37eed87b388f1 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 21 十一月 2024 12:04:02 +0800
Subject: [PATCH] V2.11随机上传时间，分析网关丢包问题
---
Src/radio/Lora.c | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index 611fc24..ff6aaa1 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -259,11 +259,12 @@
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);
- MbxTagUwbRec();
- HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); //片选lora有效
+ // 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有效
+ Radio.Rx(0);
}
if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_WGRESPTAG)
{
@@ -302,8 +303,8 @@
target_count = current_count + rec_delaytime*3.2768 - delaytime-datalen_offset;
while(target_count>=32768)
target_count-=32768;
- __HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
- rx_count = HAL_LPTIM_ReadCounter(&hlptim1);
+ //__HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
+ // rx_count = HAL_LPTIM_ReadCounter(&hlptim1);
// printf("tx %d,rx %d,delay %d",current_count>>5,rx_count>>5,rec_delaytime);
break;
case WGRSP_RWTAG_READ:
@@ -340,10 +341,10 @@
{}//文件过大，超出范围
else
{
- memcpy(&wangguan_up_id,&RX_Buffer[SOURCE_ID_IDX],2);//网关ID 占用2个字节
- shengji_flag=1;
- LoraUp_flag=1;
- imu_enable=0;
+ memcpy(&wangguan_up_id,&RX_Buffer[SOURCE_ID_IDX],2);//网关ID 占用2个字节
+ shengji_flag=1;
+ LoraUp_flag=1;
+ imu_enable=0;
}
// LoraUp_Poll();
break;
@@ -352,40 +353,45 @@
}
}
}
- }
if(!no_rx_flag)
{
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);
}
}
- HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_RESET);
+}
+HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_RESET);
+
}
void OnTxTimeout( void )
{
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;
void OnRxTimeout( void )
{
Radio.Standby();
- if(wg_state==WG_Lost)
+
{
- current_count = HAL_LPTIM_ReadCounter(&hlptim1);
- target_count-=current_count%3276;
+// current_count = HAL_LPTIM_ReadCounter(&hlptim1);
+// target_count-=current_count%3276;
+ target_count-=66;//提前2ms发lora
while(target_count<0)
target_count+=32768;
__HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
}
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);
}
}
@@ -395,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;
@@ -434,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