From 56d6a907e12484053abb432e664d6a8466133161 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 02 三月 2022 18:15:44 +0800
Subject: [PATCH] 1
---
源码/核心板/Src/application/dw_app.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
index 03c53c7..24b6c1a 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
@@ -1021,6 +1021,8 @@
extern u8 gpsdataready_flag;
extern u16 gps_packlen;
u8 totalpack_num,currentpack_num;
+u16 sendtimes;
+u32 rec_urtid;
void RecOnePackData(void)
{
dwt_setrxtimeout(0);//设定接收超时时间，0位没有超时时间
@@ -1048,7 +1050,7 @@
{
recdata_len = frame_len-14;
memcpy(rec_gpsdata,&rx_buffer[DATA_IDX],recdata_len);
- if(gpsdataready_flag)
+ // if(gpsdataready_flag)
{
gpsdataready_flag = 0;
tx_sync_msg[MESSAGE_TYPE_IDX]=DATA_RESPONSE;
@@ -1066,13 +1068,15 @@
dwt_writetxdata(110+14, tx_sync_msg, 0);//将Poll包数据传给DW1000，将在开启发送时传出去
dwt_writetxfctrl(110+14, 0);//设置超宽带发送数据长度
dwt_starttx(DWT_START_TX_IMMEDIATE);
+ sendtimes++;
}else{
tx_sync_msg[CURENTPACKNUM_IDX] = 1;
memcpy(&tx_sync_msg[DATA_IDX],&RTCMdata[send_i],remain_i);
dwt_writetxdata(remain_i+14, tx_sync_msg, 0);//将Poll包数据传给DW1000，将在开启发送时传出去
dwt_writetxfctrl(remain_i+14, 0);//设置超宽带发送数据长度
dwt_starttx(DWT_START_TX_IMMEDIATE);
- remain_i = 0;
+ remain_i = 0;
+ sendtimes++;
}
delay_us(1000);
}
@@ -1083,17 +1087,21 @@
GPS_ParseGGA(rec_gpsdata,recdata_len);
- const char *fmt = "{\"battery\":4.2,\"dev_type\":\"11\",\"device_sn\":\"15625394\",\"gps_type\":%d,\"high\":%.8lf,\"lat\":%.8lf,\"lng\":%.8lf}";
+ const char *fmt = "{\"battery\":4.2,\"dev_type\":\"11\",\"device_sn\":\"%d\",\"gps_type\":%d,\"high\":%.8lf,\"lat\":%.8lf,\"lng\":%.8lf}";
double lat = 0;
double lon = 0;
double high = 0;
uint8_t gps_type;
gps_type = HIDO_UtilStrBufToInt(stPosState[2].m_pData,1);
+ if(gps_type!=0)
+ {
GPS_ParseLon(&stPosState[1], &lon);
GPS_ParseLat(&stPosState[0], &lat);
GPS_ParseHeight(&stPosState[3], &high);
- printf(fmt,gps_type, high, lat, lon);
+ }
+ memcpy(&rec_urtid,&rx_buffer[ANCHOR_ID_IDX],4);
+ printf(fmt,rec_urtid,gps_type, high, lat, lon);
//USART_puts(rec_gpsdata,recdata_len);
}
}else{
--
Gitblit v1.9.3