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/main/main.c |   55 ++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index ed2dccf..64fa1b5 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -286,10 +286,13 @@
 extern uint16_t g_spsum_GSV_sum;
 extern uint16_t g_snum_GSV_sum;
 extern uint8_t ceju_leave_flag;
+extern uint8_t fixed_solution_count_minute;
+uint8_t open_gps_time=0;
 static void sleep_timer_callback(void *dev, uint32_t time)
 {
 if(secondtask_count++%2==0)
-    {   
+    {  
+        open_gps_time++;			
         input5v_time=1;
         flag_secondtask = 1;
         if(!read_5v_input_pca())
@@ -313,39 +316,61 @@
 //        OpenUWB();
         }
 //				in_the_room_flag=1;	
+      if(30<open_gps_time<90)
+			{
 			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)&&(ceju_leave_flag==1))
+			}
+			if(ceju_leave_flag==1)
+			{
+			Receive_g_spsum_Data(g_spsum_GSV);
+			Receive_g_snum_Data(g_snum_GSV);
+			if(open_gps_time>90)
+			{
+			 open_gps_time=90;
+
+//			if((g_spsum_GSV_sum<200&&g_snum_GSV_sum<3)&&(fixed_solution_count_minute<30||fixed_solution_count_minute==0))				
+			if((g_spsum_GSV_sum<300||g_snum_GSV_sum<20)&&(fixed_solution_count_minute<30))
 			{
 			lounei_flag=1;
-			Switch_low_power_mode(lounei_flag);
+
+//			Switch_low_power_mode(lounei_flag);
 			}
-			if((100<g_spsum_GSV_sum&&2<g_snum_GSV_sum))			
+			if((400<g_spsum_GSV_sum&&10<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;
-			Switch_low_power_mode(lounei_flag);
+//			Switch_low_power_mode(lounei_flag);
+			}
+			} 
+			
+			if(heart_upload_time==60)
+			{
+			ceju_leave_flag=0;
+			fixed_solution_count_minute=0;
+			if(lounei_flag==1)
+			{
+				PCA9555_Set_One_Value_Output(GPS_POWER,0);	
+			}
 			}
 			if(heart_upload_time==0||heart_upload_time==60)
 			{
 				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);
+
 			}
+			heart_upload_time++;
 			}
-			heart_upload_time++;		
+
+			
 
 
+	
+			
+ 			    
+      	
 
 		
-
-
 
     }else{
         flag_secondtask = 0;

--
Gitblit v1.9.3