From b97fe0e1006e09399214e49b8acc0ce10f4ffd0d Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 13 九月 2024 09:44:19 +0800
Subject: [PATCH] 1.28，修复标签心跳包发送网关收不到的bug。兼容焊没焊uwb的两种板子
---
Src/radio/Lora.c | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index b3e3340..0ef5764 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -170,6 +170,7 @@
uint32_t lora_zhuangtai;
uint16_t current_count;
extern wg_state_enum wg_state;
+extern u8 uwb_rxflag;
void OnTxDone( void )
{
if(flag_writepara_needreset) //配置写入完成设备需要重启
@@ -185,7 +186,16 @@
}
else
{
- Radio.Rx( 50 );
+ if(uwb_rxflag)
+ {
+ uwb_rxflag=0;
+ UWB_RXOFF();
+ Radio.Rx( 50 );
+ }
+ else
+ {
+ Radio.Rx( 50 );
+ }
}
}
extern LPTIM_HandleTypeDef hlptim1;
@@ -261,7 +271,6 @@
{
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)
{
@@ -322,7 +331,7 @@
}
HAL_GPIO_WritePin(GPIOC, GPIO_PIN_7, GPIO_PIN_SET);
HAL_GPIO_WritePin(GPIOC, GPIO_PIN_13, GPIO_PIN_SET);
- memcpy(&xiafayuyin_data,&RX_Buffer[PWTAG_WRITE_VALUE_IDX],BufferSize-PWTAG_WRITE_VALUE_IDX);
+ memcpy(&xiafayuyin_data,&RX_Buffer[PWTAG_WRITE_VALUE_IDX],BufferSize-PWTAG_WRITE_VALUE_IDX-2);
yuyin_sendflag=1;
yuyinzidongguan_time=0;
yuyin_no_sleep_flag=1;
@@ -431,13 +440,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