From dbe010cbc556a3f07136b7eac67e62f115285db8 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期日, 24 三月 2024 19:00:15 +0800
Subject: [PATCH] Merge branch '免布线URT-LORA-L071' of http://47.108.70.204:60062/r/XRange_Tag into 免布线URT-LORA-L071
---
Src/radio/Lora.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index f03ed39..c0e1cab 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -126,7 +126,7 @@
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
Radio.Standby();
- Radio.Rx( 80 );
+ Radio.Rx( 100 );
// LED_TB_OFF;
}
extern LPTIM_HandleTypeDef hlptim1;
@@ -198,7 +198,8 @@
{
UWB_Wkup();
// memcpy(&test111,&RX_Buffer[1],2);
- MbxTagUwbRec();
+ MbxTagUwbRec();
+test111++;
// HAL_GPIO_WritePin(GPIOC, GPIO_PIN_5, GPIO_PIN_RESET);
// printf("LORA IdleTask:%x",test111);
HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); //片选lora有效
@@ -244,10 +245,14 @@
}
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[9],RX_Buffer[8]);
+ memcpy(&xiafayuyin_data,&RX_Buffer[PWTAG_WRITE_VALUE_IDX],BufferSize-PWTAG_WRITE_VALUE_IDX);
yuyin_sendflag=1;
yuyinzidongguan_time=0;
- yuyin_no_sleep_flag=1;
+ yuyin_no_sleep_flag=1;
+// SYN_FrameInfo(0,xiafayuyin_data); //播放内容
+// memset(xiafayuyin_data,0,sizeof(xiafayuyin_data));
+ LoraRspWriteCommap(SUBMSG_WRITE_ANCPARA);
+ no_rx_flag = 1;
}else{
memcpy(&rec_value,&RX_Buffer[PWTAG_WRITE_VALUE_IDX],2);
g_com_map[rec_index/2] = rec_value;
--
Gitblit v1.9.3