From fe563195087a94b2f99e9e3bda421f907bcf2d79 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 02 七月 2024 14:09:13 +0800
Subject: [PATCH] 2.11，gps上传数据在获取gps的时候，不再转移，再发出
---
FML/GPS.c | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/FML/GPS.c b/FML/GPS.c
index 4088c9c..8143d5c 100644
--- a/FML/GPS.c
+++ b/FML/GPS.c
@@ -476,8 +476,15 @@
extern uint32_t uwbled,gpsled,loraled,powerled;
extern uint8_t jinru_parsegga_flag;
extern uint8_t UDPClient_UploadGPS_flag;
+extern uint8_t fangchai_flag;
+uint8_t GPS_ParseGGA_data[256];
+uint8_t GPS_ParseGGA_changdu;
+extern uint16_t g_com_map[256];
+extern uint8_t bat_percent;
+uint8_t gpsbaoxu;
static HIDO_INT32 GPS_ParseGGA(HIDO_CHAR *_pcData, HIDO_UINT32 _u32Len)
{
+ uint16_t state_flag;
ST_GPS stGPS;
HIDO_DataStruct stPosState;
jinru_parsegga_flag=1;
@@ -506,8 +513,16 @@
// {
// UDPClient_UploadGPS(_pcData);
// UDPClient_UploadGPS_flag=0;
-// }
- memcpy(GPS_data,_pcData, _u32Len-2);//去掉回车换行
+// }
+// memcpy(GPS_data,_pcData, _u32Len-2);//去掉回车换行
+ state_flag = 0;
+ state_flag = fangchai_flag;
+
+ HIDO_UINT32 u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)GPS_ParseGGA_data, sizeof(GPS_ParseGGA_data), "%s,%X,%02x,%x,%d,%d,%d,%d\r\n",
+ _pcData, g_com_map[2], bat_percent,0,0,0,state_flag,gpsbaoxu);
+ gpsbaoxu++;
+ GPS_ParseGGA_changdu=u32Len;
+
}
else
{
@@ -520,7 +535,14 @@
// UDPClient_UploadGPS(_pcData);
// UDPClient_UploadGPS_flag=0;
// }
- memcpy(GPS_data,_pcData, _u32Len-2);
+// memcpy(GPS_data,_pcData, _u32Len-2);
+ state_flag = 0;
+ state_flag = fangchai_flag;
+
+ HIDO_UINT32 u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)GPS_ParseGGA_data, sizeof(GPS_ParseGGA_data), "%s,%X,%02x,%x,%d,%d,%d,%d\r\n",
+ _pcData, g_com_map[2], bat_percent,0,0,0,state_flag,gpsbaoxu);
+ gpsbaoxu++;
+ GPS_ParseGGA_changdu=u32Len;
}
return HIDO_OK;
@@ -669,7 +691,7 @@
if(strstr(l_stGPSRecv.m_acRecvBuf, "GGA,") != HIDO_NULL)
{
GPS_ParseGGA(l_stGPSRecv.m_acRecvBuf, l_stGPSRecv.m_u32RecvLen);
- memset(l_stGPSRecv.m_acRecvBuf,0, l_stGPSRecv.m_u32RecvLen);//去掉回车换行
+ memset(l_stGPSRecv.m_acRecvBuf,0, l_stGPSRecv.m_u32RecvLen);
}
else if(strstr(l_stGPSRecv.m_acRecvBuf, "RMC,") != HIDO_NULL)
{
--
Gitblit v1.9.3