From 5526b60c69c0c2dd0df985ced5824e9aa673c846 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期一, 14 四月 2025 09:45:31 +0800
Subject: [PATCH] 测试基本通过，现在开机30秒到90秒会确定在室内室外，然后现在室外的阈值提高信号强度高于400大于10个卫星
---
keil/include/src/GPS.c | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/keil/include/src/GPS.c b/keil/include/src/GPS.c
index bcf8535..ce4dbfd 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,14 +560,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++;
- }
}
gps_ntripsend=1;
- if(heart_upload_time%UPLOAD_4G_TIME==0&&lounei_flag==0)
+ if((heart_upload_time%UPLOAD_4G_TIME==0&&lounei_flag==0&&open_gps_time>120)||(open_gps_time%UPLOAD_4G_TIME==0&&lounei_flag==0&&open_gps_time<120))
{
UDPClient_UploadGPS();
NTRIPApp_ReportGGA(GPS_ParseGGA_data, _u32Len);
@@ -596,7 +593,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 +989,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