From dbe010cbc556a3f07136b7eac67e62f115285db8 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期日, 24 三月 2024 19:00:15 +0800
Subject: [PATCH] Merge branch '免布线URT-LORA-L071' of http://47.108.70.204:60062/r/XRange_Tag into 免布线URT-LORA-L071
---
Src/application/GPS.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Src/application/GPS.c b/Src/application/GPS.c
index d0251f8..3fd298a 100644
--- a/Src/application/GPS.c
+++ b/Src/application/GPS.c
@@ -39,7 +39,7 @@
typedef struct
{
E_GPSRecvState m_eState;
- HIDO_CHAR m_acRecvBuf[128];
+ HIDO_CHAR m_acRecvBuf[256];
HIDO_UINT32 m_u32RecvLen;
} ST_GPSRecv;
@@ -445,12 +445,12 @@
char _pcData_final[256];
extern uint8_t fangchai_flag;
extern uint8_t GPSchangdu;
-extern uint8_t GPS_GGAdate[200];
+extern uint8_t GPS_GGAdate[400];
extern u8 gps_state,gps_chafenlingqi,gps_satel_num,gps_signalpower;
extern double gps_jingdu,gps_weidu;
extern float gps_height;
extern uint8_t fangzhijinrushuimian_flag;
-static HIDO_INT32 GPS_ParseGGA(HIDO_CHAR *_pcData, HIDO_UINT32 _u32Len)
+HIDO_INT32 GPS_ParseGGA(HIDO_CHAR *_pcData, HIDO_UINT32 _u32Len)
{
ST_GPS stGPS;
HIDO_DataStruct stTime;//时间
@@ -626,7 +626,10 @@
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);
+// fangzhijinrushuimian_flag=0;
}
}
@@ -721,7 +724,10 @@
{
GPS_RecvFsm(u8RecvChar);
}
-
+HIDO_VOID GPS_ParseGGAPoll(HIDO_UINT8 data,HIDO_UINT8 datanum)
+{
+ GPS_ParseGGA(&data, datanum);
+}
///*******************************************************************************
// * Function Name : GPS_SetEventCallback
// * Description : GPS设置GPS事件回调
--
Gitblit v1.9.3