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 | 6 ++++--
1 files changed, 4 insertions(+), 2 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 861e9ab..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"
@@ -1022,6 +1022,7 @@
extern u16 gps_packlen;
u8 totalpack_num,currentpack_num;
u16 sendtimes;
+u32 rec_urtid;
void RecOnePackData(void)
{
dwt_setrxtimeout(0);//设定接收超时时间，0位没有超时时间
@@ -1086,7 +1087,7 @@
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;
@@ -1099,7 +1100,8 @@
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