From deaaa18131675b17ef4fa49befa80cfb09778898 Mon Sep 17 00:00:00 2001 From: zhangbo <zhangbo@qq.com> Date: 星期五, 13 六月 2025 18:09:02 +0800 Subject: [PATCH] 这是工卡机测试版本 --- keil/include/src/GPS.c | 63 +++++++++++++++++++------------ 1 files changed, 39 insertions(+), 24 deletions(-) diff --git a/keil/include/src/GPS.c b/keil/include/src/GPS.c index 3f37036..e7ece43 100644 --- a/keil/include/src/GPS.c +++ b/keil/include/src/GPS.c @@ -660,30 +660,45 @@ { GPS_ParseGGA(l_stGPSRecv.m_acRecvBuf, l_stGPSRecv.m_u32RecvLen); l_stGPSRecv.m_acRecvBuf[l_stGPSRecv.m_u32RecvLen - 2] = '\0'; - #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) - { - 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 - - +// #ifdef UWB_CG + if(g_com_map[GPSENBLE]==0) + { +// UDPClient_UploadGPS(l_stGPSRecv.m_acRecvBuf); + } + else if(g_com_map[GPSENBLE]&&g_com_map[GPSFrequency]==1) + { + if (l_u8PosState >= 1) + { + UDPClient_UploadGPS(l_stGPSRecv.m_acRecvBuf); // + } + else if (l_u8PosState == 0) + { + if (++GPS_UPload_sleep_flag >= 60) + { + UDPClient_UploadGPS(l_stGPSRecv.m_acRecvBuf); + GPS_UPload_sleep_flag = 0; + } + } + } + else if(g_com_map[GPSENBLE]) + { + if (l_u8PosState >= 1) + { + if (++GPS_UPLOAD_FLAG >= g_com_map[GPSFrequency]) + { + 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; + } + } + } switch(l_u8PosState) { case 0: -- Gitblit v1.9.3