From f0a7dd2eac351fd48b358f548c181bcc49965d1e Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 03 一月 2025 17:33:37 +0800
Subject: [PATCH] 修改测距上位机显示-负值
---
keil/uwb_app.c | 266 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 209 insertions(+), 57 deletions(-)
diff --git a/keil/uwb_app.c b/keil/uwb_app.c
index fe18a30..e997d14 100644
--- a/keil/uwb_app.c
+++ b/keil/uwb_app.c
@@ -10,7 +10,7 @@
#include "global_param.h"
#include "board.h"
#include "lib_aoa.h"
-
+#include <serial_at_cmd_app.h>
extern int simple_main(void);
extern int temp_main(void);
void Calibration_Time(void);
@@ -78,7 +78,7 @@
#define RANGING_PERIOD_MS (1000)
/* This is the delay from Frame RX POLL frame to send RESP Frame */
-#define POLL_RX_TO_RESP_TX_DLY_US 2000U //yuan670 with urt 3000success
+#define POLL_RX_TO_RESP_TX_DLY_US 550U //yuan600 success 并且不卡busy
#define RESP_TX_TO_FINAL_RX_DLY_US 500U
@@ -133,10 +133,10 @@
// .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 */
//};
-#ifndef STS_MODE
+#ifdef DW1000
static struct mk_uwb_configure config = {
.phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
- .phy_cfg.ch_num = 5, /* Channel number. */
+ .phy_cfg.ch_num = 9, /* Channel number. */
.phy_cfg.code_index = 9, /* TRX preamble code */
.phy_cfg.mean_prf = MEAN_PRF_64M, /* Mean prf 64/128/256M */
.phy_cfg.data_bit_rate = DATA_BR_6M8, /* Data rate 6.8M */
@@ -149,7 +149,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 */
};
-#else
+#elif defined STS_MODE
static struct mk_uwb_configure config = {
.phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
.phy_cfg.ch_num = 5, /* Channel number. */
@@ -165,7 +165,6 @@
.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 */
};
-#endif
/* Use the default key and IV specified in the IEEE 802.15.4z attachment */
static struct UWB_STS_KEY_CONFIG_T sts_iv_key = {
.sts_vcounter = 0x1F9A3DE4,
@@ -177,6 +176,24 @@
.sts_key2 = 0xD1D336AA,
.sts_key3 = 0x14148674,
};
+#elif defined MK_MODE
+static struct mk_uwb_configure config = {
+ .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
+ .phy_cfg.ch_num = 9, /* Channel number. */
+ .phy_cfg.code_index = 9, /* TX preamble code. */
+ .phy_cfg.mean_prf = MEAN_PRF_64M, /* Data rate 6.8M */
+ .phy_cfg.data_bit_rate = DATA_BR_6M8, /* data rate 6.8M. */
+ .phy_cfg.sync_sym = PREAM_LEN_128, /* Preamble duration, length of preamble 128 */
+ .phy_cfg.sfd_sym = BPRF_NSFD2_8, /* Identifier for SFD sequence */
+ .phy_cfg.ranging_bit = 1, /* ranging bit set. */
+ .phy_cfg.trx_mode = TRX_MODE_15_4Z_BPRF, /* IEEE802.15.4z - BPRF mode */
+ .phy_cfg.sts_pkt_cfg = STS_PKT_CFG_0, /* SP0 Frame */
+ .phy_cfg.sts_segnum = STS_SEGNUM_BPRF_1, /* Number of STS segments in the frame */
+ .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 */
+};
+#endif
+
static struct anchor_id_car{
uint16_t anchor_new_id;
uint16_t change_num;
@@ -265,8 +282,17 @@
uint32_t range_timeout_us = 2000000;//yuan5000
uint8_t flag_temp2,flag_temp1;
uint16_t uwb_losttimer;
+uint8_t lorarec_usart_send[200]={0x55,0xaa};
+uint16_t lorarec_tagid;
+extern uint8_t send_lora_data[250];
+uint8_t Lora_upanc_time;
+uint8_t update_tag_time;
+extern uint16_t mubiao_anchor_ID;
+uint8_t Lora_qingqiu_flag;
+extern uint16_t Lora_qingqiu_bao;
static void rx_int_callback(struct MAC_HW_REPORT_T *rx_report)
{ uint8_t valid_sts=0;
+ uint16_t checksum1 = 0,dest_id;
// Power off radio
power_off_radio();
@@ -284,7 +310,74 @@
poll_rx_num++;
rssi = rx_report->rssi;
receive_flag=1;
- Anchor_App();
+// uart_send(UART_ID0, rx_buf,rx_length, NULL);
+ if(rx_buf[MESSAGE_TYPE_IDX]==MBX_POLL)
+ {
+ Anchor_App();
+ }
+ else
+ {
+ memcpy(&lorarec_tagid,&rx_buf[SOURCE_ID_IDX],2);
+ memcpy(&dest_id,&rx_buf[DEST_ID_IDX],2);
+ checksum1=Checksum_u16(rx_buf,rx_length-4);
+ if(!memcmp(&checksum1,&rx_buf[rx_length-4],2)) //CRC16校验是否通过
+ {
+ if(!memcmp(&dev_id,&dest_id,2)/*||dest_id==0xffff||(dest_id==0xfffe&&get_channel==5)*/)
+ {
+ switch(rx_buf[MSG_TYPE_IDX])
+ {
+ case LORA_MSGTYPE_UPDATE_CONFIRM:
+ memset(&send_lora_data,0,sizeof(send_lora_data));
+// Lora_upanc_flag=1; //升级信号启动
+ update_tag_time=20;
+ mubiao_anchor_ID=lorarec_tagid;
+ LOG_INFO(TRACE_MODULE_APP, "收到基站发送来的升级请求\r\n");
+ break;
+ case LORA_MSGTYPE_UPDATEFILE_REQUEST:
+ Lora_upanc_time=0;//数清零,不清零10次后重启
+
+ memcpy(&Lora_qingqiu_bao,&rx_buf[MUQIAN_BAG],2);
+ // Lora_qingqiu_bao=rx_buffer[MUQIAN_BAG];//看基站请求的哪一包
+ Lora_qingqiu_flag= 1; //准备发送标志位1
+ update_tag_time=20;
+// LOG_INFO(TRACE_MODULE_APP, "标签正在请求第%d包\r\n",Lora_qingqiu_bao);
+ Lora_upanc_ing_Poll();
+ break;
+
+ case 0x99:
+ LOG_INFO(TRACE_MODULE_APP, "收到结束升级请求\r\n",Lora_qingqiu_bao);
+ delay_ms(500);
+// Lora_upanc_flag=0;
+ Lora_qingqiu_flag=0;
+ NVIC_SystemReset();
+ break;
+
+ }
+ }
+ }
+ else
+ {
+// switch(rx_buf[MSG_TYPE_IDX])
+// {
+// case LORA_MSGTYPE_READPARARESP:
+ if(rx_buf[MSG_TYPE_IDX]==LORA_MSGTYPE_READPARARESP)
+ {
+ memcpy(&lorarec_usart_send[2],rx_buf,rx_length);
+ uart_send(UART_ID0, lorarec_usart_send,rx_length+2, NULL);
+ for(uint8_t i=0; i<PWTAG_MAXGROUPNUM; i++)
+ {
+ if(pwtag.groupid[i][0]<=lorarec_tagid&&lorarec_tagid<=pwtag.groupid[i][1])
+ {
+ pwtag.remain_time[i] = 0;
+ }
+ }
+// break;
+ }
+
+// }
+ }
+ }
+
#ifdef STS_MODE
valid_sts= sts_valid_check();
if (valid_sts)
@@ -312,9 +405,10 @@
temp_count= phy_timer_count_get();
memcpy(&rx_rpt, rx_report, sizeof(struct MAC_HW_REPORT_T));
rx_length = 0;
-
+// OpenUWB();//再次开启UWB接收
}
OpenUWB();//再次开启UWB接收
+// LOG_INFO(TRACE_MODULE_APP,"RXdone_uwb_rx打开\r\n");
}
/* TX done process handler. */
@@ -329,11 +423,16 @@
temp_count= phy_timer_count_get();
temp_internal=temp_count;
resp_tx_num++;
+// if(update_tag_time>0)
+// {
+// OpenUWB();//再次开启UWB接收
+// LOG_INFO(TRACE_MODULE_APP,"TXdone_uwb_rx打开\r\n");
+// }
//LOG_INFO(TRACE_MODULE_APP, "poll_rx_num is %d,resp_tx_num is %d\r\n",poll_rx_num,resp_tx_num);
}
}
uint32_t start_receive_count,end_receive_count,poll_timeout,current_count,temp_resp;
- uint16_t anchordata_id[TAG_NUM_IN_SYS],anchordata_dist[TAG_NUM_IN_SYS];
+int16_t anchordata_id[TAG_NUM_IN_SYS],anchordata_dist[TAG_NUM_IN_SYS];
static uint8_t anchordata_bat[TAG_NUM_IN_SYS];
uint8_t anchordata_num = 0;
static int32_t tagdist_list[TAG_NUM_IN_SYS];
@@ -425,10 +524,41 @@
anchordata_num=j;
}
-
-
+uint16_t g_com_receive_id;
+uint8_t cmd_flag;
uint8_t Anchor_RecNearPoll(uint8_t ancrec_nearbasepos)//根据自己是否为新基站定制消息去发送，根据是否抢占判断
{
+ cmd_flag=0;
+ uint16_t checksum1 = 0;
+ for(uint8_t i=0; i<PWTAG_MAXGROUPNUM; i++)
+ {
+ if(pwtag.remain_time[i]!=0)
+ {
+ lorarec_tagid=g_com_receive_id;
+ if(pwtag.groupid[i][0]<=lorarec_tagid&&lorarec_tagid<=pwtag.groupid[i][1])
+ {
+ send_buffer[MSG_TYPE_IDX] = LORA_MSGTYPE_WGRESPTAG;
+ send_buffer[MSG_LENGTH] = 14;
+ memcpy(&send_buffer[SOURCE_ID_IDX],&dev_id,2);
+ memcpy(&send_buffer[DEST_ID_IDX],&lorarec_tagid,2);
+ send_buffer[RW_FLAG_IDX] = pwtag.duorxie[i];
+ send_buffer[WRITE_IDX_IDX] = pwtag.index[i];
+ memcpy(&send_buffer[WRITE_VALUE_IDX],pwtag.value[i],pwtag.len[i]);
+
+ checksum1=Checksum_u16(send_buffer,pwtag.len[i]+WRITE_VALUE_IDX);
+ memcpy(&send_buffer[pwtag.len[i]+WRITE_VALUE_IDX],&checksum1,2);
+ resp_tx_en_start_u32 = poll_rx_en_start_u32+US_TO_PHY_TIMER_COUNT(POLL_RX_TO_RESP_TX_DLY_US);
+ flag_temp2=uwb_tx(send_buffer, pwtag.len[i]+WRITE_VALUE_IDX+2,1 ,resp_tx_en_start_u32);//立即发送测试size大小
+ // temp_count1=phy_timer_count_get();
+ //while(mac_is_busy());
+ gpio_pin_clr(SCL_PIN);
+ cmd_flag=1;
+ break;
+ }
+ }
+ }
+ if(cmd_flag==0)
+ {
temp_count2=poll_rx_en_start_u32;
memcpy(&send_buffer[GROUP_ID_IDX],&group_id,1);//组id
@@ -457,9 +587,11 @@
temp_resp_i64=resp_tx_ts_i64;
temp_count3= phy_timer_count_get();
flag_temp2=uwb_tx(send_buffer, 40,1 ,resp_tx_en_start_u32);//立即发送测试size大小
- temp_count1=phy_timer_count_get();
+// temp_count1=phy_timer_count_get();
//while(mac_is_busy());
gpio_pin_clr(SCL_PIN);
+ }
+
}
uint16_t uwb_searchcount;
@@ -518,23 +650,28 @@
// update_led_power_state();//更新等状态防止震动卡死在搜索
}
}
-uint16_t g_com_receive_id;
+
void CloseUWB(void)
{
uwb_rx_force_off(1);
uwb_rx_flag=0;
- LOG_INFO(TRACE_MODULE_APP,"关闭uwb_rx\r\n");
+// LOG_INFO(TRACE_MODULE_APP,"关闭uwb_rx\r\n");
}
void OpenUWB(void)
{
flag_temp1=uwb_rx(0, 0,range_timeout_us);//提交接收请求
uwb_rx_flag=1;
- LOG_INFO(TRACE_MODULE_APP,"打开uwb_rx\r\n");
+// LOG_INFO(TRACE_MODULE_APP,"打开uwb_rx\r\n");
}
void UWBOneSecondTask(void)
{
uwb_losttimer++;
+ TagListUpdate();
+ if(uwb_losttimer>g_com_map[UWB_RNAGE_TIME])
+ uwb_losttimer=g_com_map[UWB_RNAGE_TIME]+1;//防止溢出
}
+uint8_t uwbsend[200];
+
void UWBIdleTask(void)
{
@@ -542,50 +679,61 @@
{
uwbtasktimer = HIDO_TimerGetTick();
UWBOneSecondTask();
+ uwbsend[0]=0x55;
+ uwbsend[1]=0xaa;
+ uwbsend[2]=0x40;
+ uwbsend[3]=anchordata_num;
+ memcpy(&uwbsend[4],&anchordata_id,anchordata_num*2);
+ memcpy(&uwbsend[4+anchordata_num*2],&anchordata_dist,anchordata_num*2);
+ uart_send(UART_ID0, uwbsend,anchordata_num*4+4, NULL);
+// for(int i=0;i<anchordata_num;i++)
+// {
+// LOG_INFO(TRACE_MODULE_APP,"当前测距基站ID:%x,距离:%d.\r\n",anchordata_id[i],anchordata_dist[i]);
+// }
}
}
int uwb_app_poll(void)
{
- switch(wltag_state)
- {
- case RANGE:
- if(HIDO_TimerGetTick()-wltag_uwbtimer>2&&uwb_rx_flag==0)
- {
- wltag_uwbtimer = HIDO_TimerGetTick();
- OpenUWB();
- }
- else if(HIDO_TimerGetTick()-wltag_uwbtimer>1&&uwb_rx_flag==1)
- {
- wltag_uwbtimer = HIDO_TimerGetTick();
- CloseUWB();
- }
- if(uwb_losttimer>g_com_map[UWB_RNAGE_TIME])
- {
- wltag_statetimer = HIDO_TimerGetTick();
- if(uwb_rx_flag==0)//若要切换到搜索模式时没有开启则开启UWB
- {
- OpenUWB();
- }
- wltag_state = SEARCH;
- }
- break;
- case SEARCH:
- if(HIDO_TimerGetTick()-wltag_statetimer>1)
- {
- wltag_statetimer = HIDO_TimerGetTick();
- wltag_state = CLOSE;
- CloseUWB();
- }
- break;
- case CLOSE:
- if(HIDO_TimerGetTick()-wltag_statetimer>g_com_map[UWB_WAIT_TIME])
- {
- wltag_statetimer = HIDO_TimerGetTick();
- wltag_state = SEARCH;
- OpenUWB();
- }
- break;
- }
+// switch(wltag_state)
+// {
+// case RANGE:
+// if(HIDO_TimerGetTick()-wltag_uwbtimer>2&&uwb_rx_flag==0)
+// {
+// wltag_uwbtimer = HIDO_TimerGetTick();
+// OpenUWB();
+// }
+// else if(HIDO_TimerGetTick()-wltag_uwbtimer>1&&uwb_rx_flag==1)
+// {
+// wltag_uwbtimer = HIDO_TimerGetTick();
+// CloseUWB();
+// }
+// if(uwb_losttimer>g_com_map[UWB_RNAGE_TIME])
+// {
+// wltag_statetimer = HIDO_TimerGetTick();
+// if(uwb_rx_flag==0)//若要切换到搜索模式时没有开启则开启UWB
+// {
+// OpenUWB();
+// }
+// wltag_state = SEARCH;
+// }
+// break;
+// case SEARCH:
+// if(HIDO_TimerGetTick()-wltag_statetimer>1)
+// {
+// wltag_statetimer = HIDO_TimerGetTick();
+// wltag_state = CLOSE;
+// CloseUWB();
+// }
+// break;
+// case CLOSE:
+// if(HIDO_TimerGetTick()-wltag_statetimer>g_com_map[UWB_WAIT_TIME])
+// {
+// wltag_statetimer = HIDO_TimerGetTick();
+// wltag_state = SEARCH;
+// OpenUWB();
+// }
+// break;
+// }
UWBIdleTask();
}
int Anchor_App(void)
@@ -594,8 +742,9 @@
uint16_t tempid;
if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)//判断是否是和自己是同一组通讯的且为poll包
{ flag_recsuccess = 1;
+ wltag_state=RANGE;//成功后从search切换为range
memcpy(&g_com_receive_id,&rx_buf[TAG_ID_IDX],2);
- temp_count2=phy_timer_count_get();
+ //temp_count2=phy_timer_count_get();
uwb_losttimer=0;//成功测距清0 lost时间
frame_seq_nb2 = rx_buf[SEQUENCE_IDX];//获取包序
battary = rx_buf[BATTARY_IDX];
@@ -628,7 +777,10 @@
seize_anchor=1; //抢占anchor
Anchor_RecNearPoll(i);
}
+ }else{
+// OpenUWB();//接收到不是自己的包再次开启UWB接收
}
+
}
int UwbRange(void)
{
@@ -798,7 +950,7 @@
// uwb configure
uwb_configure(config.phy_work_mode, board_param.tx_power_fcc[CALIB_CH(config.phy_cfg.ch_num)], &config.phy_cfg);
- #ifdef STS_MODE
+ #if (defined STS_MODE) || (defined MK_MODE)
ranging_lib_init();
#endif
ranging_frame_type_set(config.phy_cfg.sts_pkt_cfg);
--
Gitblit v1.9.3