From f82a6f224019b2eaee1e546d67c54ebbf921d590 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 08 五月 2025 16:30:44 +0800
Subject: [PATCH] 修改了新的上传逻辑现在gps和uwb互不影响
---
keil/include/src/GPS.c | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/keil/include/src/GPS.c b/keil/include/src/GPS.c
index 2e97834..3f37036 100644
--- a/keil/include/src/GPS.c
+++ b/keil/include/src/GPS.c
@@ -615,6 +615,7 @@
* Modified Date: : 2021年5月07日
*******************************************************************************/
extern uint8_t GPS_UPLOAD_FLAG;
+uint16_t GPS_UPload_sleep_flag=0;
uint8_t gpserror;
HIDO_VOID GPS_RecvFsm(HIDO_UINT8 _u8RecvChar)
{
@@ -659,11 +660,29 @@
{
GPS_ParseGGA(l_stGPSRecv.m_acRecvBuf, l_stGPSRecv.m_u32RecvLen);
l_stGPSRecv.m_acRecvBuf[l_stGPSRecv.m_u32RecvLen - 2] = '\0';
- if(GPS_UPLOAD_FLAG==1)
+ #ifdef UWB_CG
+ UDPClient_UploadGPS(l_stGPSRecv.m_acRecvBuf);
+ #elseif UWB_CK
+ UDPClient_UploadGPS(l_stGPSRecv.m_acRecvBuf);
+ #else UWB_1_5HZ
+ if (l_u8PosState >= 1)
{
- UDPClient_UploadGPS(l_stGPSRecv.m_acRecvBuf);
- GPS_UPLOAD_FLAG=0;
- }
+ if (++GPS_UPLOAD_FLAG >= 5)
+ {
+ UDPClient_UploadGPS(l_stGPSRecv.m_acRecvBuf);
+ GPS_UPLOAD_FLAG = 0; //
+ }
+ }
+ else if (l_u8PosState == 0)
+ {
+ if (++GPS_UPload_sleep_flag >= 60)
+ {
+ UDPClient_UploadGPS(l_stGPSRecv.m_acRecvBuf);
+ GPS_UPload_sleep_flag = 0;
+ }
+ }
+ #endif
+
switch(l_u8PosState)
{
--
Gitblit v1.9.3