From 65f1d70842d83f92aa31d79c97e364b4b0fd9ab6 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 20 五月 2025 09:39:51 +0800
Subject: [PATCH] 加入气压计驱动 空间不够报错
---
keil/uwb_app.c | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/keil/uwb_app.c b/keil/uwb_app.c
index 20ba960..cd237a8 100644
--- a/keil/uwb_app.c
+++ b/keil/uwb_app.c
@@ -11,6 +11,8 @@
#include "board.h"
#include "lib_aoa.h"
#include "WS2812.h"
+#include "TCPClient.h"
+
extern int simple_main(void);
extern int temp_main(void);
void Calibration_Time(void);
@@ -62,6 +64,7 @@
int16_t elevation = 0;
int16_t azimuth = 0;
uint8_t fom = 0;
+extern CountState_t current_state;
int32_t distance;
uint8_t taglist_num;
float *sts_rssi=NULL;
@@ -141,7 +144,7 @@
// .phy_cfg.sts_seglen = STS_SEGLEN_BPRF_64, /* Number of symbols in an STS segment */
// .phy_cfg.rx_ant_id = UWB_RX_ANT_3, /* UWB RX antenna port */
//};
-#ifdef UWB_DW1000_XB
+#ifdef UWB_MK8000_XB
static struct mk_uwb_configure config = {
.phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
.phy_cfg.ch_num = 5, /* Channel number. */
@@ -158,7 +161,7 @@
.phy_cfg.rx_ant_id = UWB_RX_ANT_3, /* UWB RX antenna port */
};
#endif
-#ifdef UWB_DW1000_MBXJZ
+#ifdef UWB_DW1000_MBXJZ_OLD
static struct mk_uwb_configure config = {
.phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
.phy_cfg.ch_num = 5, /* Channel number. */
@@ -356,9 +359,7 @@
Anchor_App();
if(resp_tx_flag==0)
{
-
OpenUWB();
-
}
// #ifdef STS_MODE
// valid_sts= sts_valid_check();
@@ -709,8 +710,8 @@
// }
// Set4LEDColor(uwbled,rtkled,led4g,powerled);
- if(taglist_num>20) //最多上传20个基站数据，距离最近的20个
- taglist_num = 20;
+ if(taglist_num>14) //最多上传20个基站数据，距离最近的20个
+ taglist_num = 14;
usart_send[0]= 0x55;
usart_send[1]= 0xaa;
usart_send[2] = 0x12;//正常模式
@@ -734,7 +735,7 @@
checksum = Checksum_u16(&usart_send[2],15+5*taglist_num);
memcpy(&usart_send[17+5*taglist_num],&checksum,2);
HexToAsciiSendUDP(usart_send,19+5*taglist_num);
- taglist_num = 0;
+// taglist_num = 0;
// rxnum=0;
}
void UWBIdleTask(void)
@@ -754,17 +755,23 @@
{
uwbtasktimer = HIDO_TimerGetTick();
UWBOneSecondTask();
-// UWBSendUDPTask();
+ if(g_com_map[UWBFrequency]==1)
+ {
+ UWBSendUDPTask();
+ }
}
}
int uwb_app_poll(void)
{
UWBIdleTask();
}
+extern uint8_t uwb_offtime_count;
int Anchor_App(void)
{
uint8_t i;
uint16_t tempid;
+ uwb_offtime_count=0;
+ current_state = STATE_NORMAL;
if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)//判断是否是和自己是同一组通讯的且为poll包
{ flag_recsuccess = 1;
wltag_state=RANGE;//成功后从search切换为range
@@ -779,6 +786,8 @@
memcpy(rec_ancdistlist,&rx_buf[FZ_NEARBASEID_INDEX+2*rec_nearbase_num],2*rec_nearbase_num);
memcpy(&rec_antdelay,&rx_buf[FZ_NEARBASEID_INDEX+rec_nearbase_num*4],2);
uwbled=BLUE;
+
+
// for(i=0; i<rec_nearbase_num; i++)
// {
// if(rec_ancidlist[i] == dev_id)
--
Gitblit v1.9.3