From e71ce2771abe8afff42768a0ad74784da44c708e Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 13 九月 2024 09:37:56 +0800
Subject: [PATCH] 更新一些DMAGPS数据判断逻辑
---
keil/include/src/gps.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/keil/include/src/gps.c b/keil/include/src/gps.c
index cd7bfa0..e02ad9f 100644
--- a/keil/include/src/gps.c
+++ b/keil/include/src/gps.c
@@ -4,10 +4,11 @@
#define GPS_OPEN_TIME_OUT 240
#define GPS_RESTART_TIME1 1200
#define GPS_RESTART_TIME2 120
-#define GPS_RESTART_TIME3 3600
-#define GPS_OPEN_TIME_OUT1 60
+#define GPS_RESTART_TIME3 60
+#define GPS_OPEN_TIME_OUT1 600
extern uint16_t gps_wait_count;
uint8_t gps_power_state,gps_uwb_flag,gps_4g_flag,gps_timeout_flag,gps_need_data_flag = 1,gps_1h_open_flag=1;
+extern uint8_t air780_success_state;
extern HIDO_INT32 l_i32TCPClientID;
extern double jd,wd;
void GPS_Poll(void)
@@ -64,18 +65,21 @@
{
if(gps_1h_open_flag) {
- gps_power_state = 1; //打开GPS电源
+
if(gps_need_data_flag) {
+ gps_power_state = 1; //打开GPS电源
+ air780_success_state=1;//4G亮起
gps_wait_count++;
if(gps_wait_count>=GPS_OPEN_TIME_OUT1) { //超时切换工作状态
gps_timeout_flag=1;//串口添加改变timeout逻辑
gps_wait_count=0;
gps_need_data_flag=0;//切换为关闭模式
- TCPHeartBeatUpload();//上传GPS超时无效数据
+ TCPHeartBeatUpload();//上传GPS超时无效数据
}
} else {
gps_wait_count++;
gps_power_state=0;//关闭GPS
+ air780_success_state=0;//关闭gps1234
if(gps_wait_count>GPS_RESTART_TIME3) {
gps_power_state=1;//开启GPS
gps_need_data_flag=1;
--
Gitblit v1.9.3