From f224d649c2d62d0289f47ba704c7da3509647ff4 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 17 四月 2025 14:26:19 +0800
Subject: [PATCH] 现在的UWB常开1s测距一次(和老免布线基站测距)功耗是95ma一秒上传一次数据

---
 keil/include/src/GPS.c |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/keil/include/src/GPS.c b/keil/include/src/GPS.c
index bcf8535..ba7e412 100644
--- a/keil/include/src/GPS.c
+++ b/keil/include/src/GPS.c
@@ -496,8 +496,9 @@
 extern uint16_t g_spsum_GSV_sum;
 extern uint16_t g_snum_GSV_sum;
 extern uint8_t heart_upload_time;
-extern uint8_t ceju_leave_flag;
 uint8_t fixed_solution_count_minute;
+extern uint8_t ceju_leave_flag;
+extern uint8_t open_gps_time;
 static HIDO_INT32 GPS_ParseGGA(HIDO_CHAR *_pcData, HIDO_UINT32 _u32Len)
 {
     uint16_t state_flag;
@@ -517,6 +518,7 @@
     }
     memcpy(YUANGPS_ParseGGA_data,_pcData,_u32Len);
     YUANGPS_ParseGGA_changdu=_u32Len;
+
     if(*(HIDO_CHAR *)stPosState.m_pData != '0')
     {
 //        HIDO_DebugString(_pcData, _u32Len);
@@ -525,11 +527,6 @@
             l_fnGPSEventCallback(GPS_TYPE_GGA, _pcData, _u32Len);
         }
         rtkled=BLUE;
-				if(ceju_leave_flag==1)
-				{
-				 fixed_solution_count_minute++;
-				
-				}
         GPS_successful_flag=1;
         _pcData[_u32Len-1]=0;
         _pcData[_u32Len-2]=0;
@@ -541,6 +538,10 @@
                 _pcData, g_com_map[2], bat_percent,g_spsum_GSV_sum,g_snum_GSV_sum,lounei_flag,state_flag,gpsbaoxu);
         gpsbaoxu++;
         GPS_ParseGGA_changdu=u32Len;
+				if(ceju_leave_flag==1)
+				{
+				 fixed_solution_count_minute++;
+				}
 
     }
     else
@@ -559,15 +560,12 @@
                 _pcData, g_com_map[2], bat_percent,g_spsum_GSV_sum,g_snum_GSV_sum,lounei_flag,state_flag,gpsbaoxu);
         gpsbaoxu++;
         GPS_ParseGGA_changdu=u32Len;
-				if(ceju_leave_flag==1)
-				{
-					fixed_solution_count_minute++;
-				}
     }
   
     gps_ntripsend=1;
-		if(heart_upload_time%UPLOAD_4G_TIME==0&&lounei_flag==0)
+		if((open_gps_time%UPLOAD_4G_TIME==0))
 		{
+			
 		UDPClient_UploadGPS();
     NTRIPApp_ReportGGA(GPS_ParseGGA_data, _u32Len);		
 		}
@@ -596,7 +594,7 @@
 //        }
     return HIDO_OK;
 }
-extern uint8_t in_the_room_flag;
+
 
 uint16_t g_spsum_GSV,g_snum_GSV;
 static HIDO_INT32 GPS_ParseGSV(HIDO_CHAR *_pcData, HIDO_UINT32 _u32Len)
@@ -992,10 +990,10 @@
 
 void Switch_low_power_mode()
 {
-	if(lounei_flag==0)
+	if(lounei_flag==1)
 	{
-	 PCA9555_Set_One_Value_Output(GPS_POWER,1);
-	 PCA9555_Set_One_Value_Output(LED_POWER,1);
+	 PCA9555_Set_One_Value_Output(GPS_POWER,0);
+//	 PCA9555_Set_One_Value_Output(LED_POWER,0);
 	}
 
 }
\ No newline at end of file

--
Gitblit v1.9.3