From 3bb0e44ef7d12ddc84e631456f4b6eab7112df1c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 08 十一月 2023 14:39:59 +0800
Subject: [PATCH] 版本v1.0 加入气压计驱动 并且放到uwb里传给urt
---
Src/application/dw_app.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index c8086cd..bc2f1eb 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -71,7 +71,7 @@
#define FINAL_MSG_FINAL_TX_TS_IDX 18
#define FINAL_MSG_TS_LEN 4
-//#define _UWB_4G
+#define _UWB_4G
static dwt_config_t config = {
#ifdef _UWB_4G
@@ -113,8 +113,8 @@
uint32_t g_UWB_com_interval = 0;
float dis_after_filter; //当前距离值
LPFilter_Frac* p_Dis_Filter; //测距用的低通滤波器
-
-
+int16_t intheight;
+extern float Altitude;
static uint64_t get_tx_timestamp_u64(void)
{
@@ -416,7 +416,8 @@
}
tx_near_msg[GROUP_ID_IDX] = group_id;
tx_near_msg[BATTARY_IDX] = bat_percent;
- tx_near_msg[BUTTON_IDX] = !GET_USERKEY|stationary_flag<<1;
+// tx_near_msg[BUTTON_IDX] = !GET_USERKEY|stationary_flag<<1;
+ memcpy(&tx_near_msg[PRESSNUM_IDX],&intheight,2);
tx_near_msg[SEQUENCE_IDX] = frame_seq_nb++;
tx_near_msg[NEARBASENUM_INDEX] = nearbase_num;
memcpy(&tx_near_msg[NEARBASEID_INDEX],&nearbaseid_list,nearbase_num*2);
@@ -427,7 +428,7 @@
dwt_writetxfctrl(13+4*nearbase_num, 0);//设置超宽带发送数据长度
dwt_starttx(DWT_START_TX_IMMEDIATE | DWT_RESPONSE_EXPECTED);//开启发送，发送完成后等待一段时间开启接收，等待时间在dwt_setrxaftertxdelay中设置
- tx_near_msg[TAGCONFIGSUCCESS_INDEX] =0;
+// tx_near_msg[TAGCONFIGSUCCESS_INDEX] =0;
para_update = 0;
get_newbase = 0;
flag_finalsend=0;
@@ -680,6 +681,7 @@
}
}
}
+extern float Height;
u8 regpoll_count;
u32 id;
void Tag_App(void)//发送模式(TAG标签)
@@ -713,6 +715,8 @@
Registor_Poll();
}
}
+GetPressAndHeight();
+intheight = Height*100;
NearPoll();
dwt_entersleep();
bat_percent=Get_VDDVlotage();
--
Gitblit v1.9.3