From 655ca318efcdf71554da38ab30ccdaa53b8c6075 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期一, 25 三月 2024 17:54:17 +0800
Subject: [PATCH] V1.13，修复lora收到升级命令后发射回应包，如果回应包没有触发txdone无法触发标志位，重复发射5次后，会清零，不会重启的BUG
---
Src/application/dw_app.c | 65 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index 99a5aea..0329888 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -243,51 +243,58 @@
}
}
#include "radio.h"
+#include "dw_mbx_anc.h"
u8 lora_start_poll_buff[4] = {LORA_MSGTYPE_RANGEPOLL,'I','N','G'};
uint16_t current_count,target_count;
-nextpoll_enum next_poll_state;
+typedef enum{ Next_Poll_RANGE,
+ Next_Poll_LORASYNC,
+}nextpoll_enum;
+nextpoll_enum next_poll_state = Next_Poll_RANGE;
+extern uint8_t sync_lost_count;
void Tag_App(void)//发送模式(TAG标签)
{
- if(next_poll_state==Next_Poll_RANGE)
+ SyncStateSwitch();
+ if(next_poll_state==Next_Poll_RANGE) //读取本次的工作状态 测距还是同步
{
current_count=HAL_LPTIM_ReadCounter(&hlptim1);
- target_count = GetUwbPollCount();
- SwitchLoraToSyncRec(UWB_CHANNEL_FRQ,5); //切换lora接收频点
- while(current_count<target_count||current_count>target_count+16384)
- {
- current_count=HAL_LPTIM_ReadCounter(&hlptim1);
- if(current_count<target_count-300)
- {
- break;
- }
- }
+
+ SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],5,g_com_map[LORA_POWER]); //切换lora接收频点
+
memcpy(&lora_start_poll_buff[ANC_ID_IDX],&g_com_map[DEV_ID],2);
+ LED_TB_ON;
Radio.Send(lora_start_poll_buff, 4);
- UWB_Wkup();
- delay_us(700);
+ UWB_Wkup();
+ delay_us(1000);
MBXANCPoll();
dwt_entersleep();
- bat_percent=Get_VDDVlotage();
next_poll_state = Next_Poll_LORASYNC;
}else{
- current_count=HAL_LPTIM_ReadCounter(&hlptim1);
- target_count = GetWGRecSyncCount()-2000/LPTIMER_LSB; //提前2ms进入接收状态
- while(current_count<target_count||current_count>target_count+16384)
- {
- current_count=HAL_LPTIM_ReadCounter(&hlptim1);
- if(current_count<target_count-300)
- {
- break;
- }
- }
- LoraSyncRecPoll();
- if(GetRangeState())
+ LoraSyncRecPoll();
+ if(GetRangeState()) //获取当前测距状态，是否开启。如果开启下次为测距，否为同步
{
next_poll_state = Next_Poll_RANGE;
}else{
next_poll_state = Next_Poll_LORASYNC;
- }
-
+ }
}
+ Radio.Sleep();
+ if(next_poll_state == Next_Poll_LORASYNC) //设定下一次的唤醒时间
+ {
+// if(sync_state==Sync_Lost)
+// {
+// target_count = GetLoraSyncCount()-(18000)/LPTIMER_LSB+sync_lost_count*1000;
+// }else
+ {
+ target_count = GetLoraSyncCount()-(23000)/LPTIMER_LSB; //比上次收到的lora提前17ms唤醒（lora接收大概17ms），如果在同步间隔内，则会快速进入休眠。
+ }
+ if(target_count<0)
+ target_count+=32768;
+ __HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
+ }else{
+
+ target_count = GetUwbPollCount(); //测距提前2ms唤醒
+ __HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
+ }
+
}
--
Gitblit v1.9.3