From 652158f9e454819fc17364f90d727706e298d4f1 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期三, 02 四月 2025 14:32:19 +0800
Subject: [PATCH] 修改室内外判断逻辑现在的根据卫星强度,卫星数量以及是否有固定解判断在室内还是在室外

---
 keil/include/main/main.c |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index ed2dccf..1d02e1d 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -278,6 +278,7 @@
 uint8_t heart_upload_time=0;
 extern uint8_t taglist_num;
 //extern uint8_t ceshidata[500];
+extern uint8_t fixed_solution_count_minute;
 extern uint8_t ceshichangdu;
 uint8_t gps_ntripsend;
 extern uint8_t in_the_room_flag;
@@ -313,16 +314,18 @@
 //        OpenUWB();
         }
 //				in_the_room_flag=1;	
+			if(ceju_leave_flag==1)
+			{
 			Receive_g_spsum_Data(g_spsum_GSV);
 			Receive_g_snum_Data(g_snum_GSV);
 			
-			if((g_spsum_GSV_sum<200&&g_snum_GSV_sum<3)&&(ceju_leave_flag==1))				
+			if((g_spsum_GSV_sum<200&&g_snum_GSV_sum<3)||(fixed_solution_count_minute<30))				
 //			if((g_spsum_GSV_sum<200&&g_snum_GSV_sum<3)&&(ceju_leave_flag==1))
 			{
 			lounei_flag=1;
 			Switch_low_power_mode(lounei_flag);
 			}
-			if((100<g_spsum_GSV_sum&&2<g_snum_GSV_sum))			
+			if((200<g_spsum_GSV_sum&&2<g_snum_GSV_sum)&&(fixed_solution_count_minute>30))			
 //			if((200<g_spsum_GSV_sum&&3<g_snum_GSV_sum)&&(ceju_leave_flag==1))
 			{
 			lounei_flag=0;
@@ -332,21 +335,19 @@
 			{
 				TCPHeartBeatUpload();	
 				heart_upload_time=0;
-			if(lounei_flag==1)
-			{
-			//	 PCA9555_Set_One_Value_Output(LED_POWER,0);
-				PCA9555_Set_One_Value_Output(GPS_POWER,0);
-				//	 PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);
+				if(lounei_flag==1)
+				{
+//					PCA9555_Set_One_Value_Output(LED_POWER,0);
+					PCA9555_Set_One_Value_Output(GPS_POWER,0);
+				}
+					if(heart_upload_time==60)
+					{
+						ceju_leave_flag=0;
+						fixed_solution_count_minute=0;
+					}
 			}
-			}
-			heart_upload_time++;		
-
-
-
-		
-
-
-
+			heart_upload_time++;
+			}			
     }else{
         flag_secondtask = 0;
     }

--
Gitblit v1.9.3