From fadf2a684268a36b7d3069f0e4e932147416c481 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期一, 21 四月 2025 18:23:57 +0800
Subject: [PATCH] 手环V1.16版本，修改gps闪灯状态e后为1时不用状态机控制，修改5s后关闭4g和gps逻辑，初步测试成功，但OTA中途会重连导致升级不了
---
keil/include/drivers/serial_at_cmd_app.c | 95 ++++++++++++++++++++++++++++-------------------
1 files changed, 57 insertions(+), 38 deletions(-)
diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index d48a5a2..5237b7a 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -17,6 +17,7 @@
#define Label_id_local 1 //标签id
#define data_buff_MAX 50 //基站数量
#define Lora_TXD_bff_MAX 220 //发送缓存区大小 >4+8+4*基站数量+2=14+4*基站数量
+#define FIRST_MIN_OPEN_TIME 30
uint8_t mUsartReceivePack[100] = {0};
uint8_t mUsart2ReceivePack[150] = {0};
@@ -32,6 +33,11 @@
extern uint8_t gps_success_state,gps_open_flag;
extern uint8_t gps_success_state,gps_enable_flag,gps_need_data_flag,gps_timeout_flag,gps_power_state;
extern uint16_t gps_wait_count;
+typedef enum {
+ STATE_IDLE,
+ STATE_VALID,
+ STATE_INVALID
+} GPSState;
typedef enum
{
BLE_RECV_STATE_IDLE = 0,
@@ -143,7 +149,8 @@
uint32_t datalenth_gga,gga_num;
uint32_t u32GGaLenth;
char GGA_Format_message[200];
-extern uint8_t bat_percent,userkey_state;
+extern uint8_t bat_percent,userkey_state,gps_first_flag;
+extern GPSState GPS_state;
void UsartParseDataHandler(uint8_t data)
{
if(state5V_prase_flag&&!g_com_map[MODBUS_MODE])
@@ -249,60 +256,72 @@
index++;
if( mUsart2ReceivePack_before == 0x0D && mUsart2ReceivePack_now==0x0A )//接收数据到“0x0D 0x0A”结束
{
- //解析该条GPS报文
+// //解析该条GPS报文
analysis_num=sscanf((char*)mUsart2ReceivePack,"$%[^,],%*[^,],%[^,],%*[^,],%[^,],%*[^,],%[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*s",gps_header,wdrecv.m_pData,jdrecv.m_pData,Posstate.m_pData);
if(!memcmp(gps_header,"GNGGA",5))
{
memcpy(GPS_GGAmessage,mUsart2ReceivePack,strlen(mUsart2ReceivePack)-2);
-
+ GPS_state=STATE_INVALID;
wd=strtod(wdrecv.m_pData,NULL);
jd=strtod(jdrecv.m_pData,NULL);
- if(wd!=0)
- blink_led(&gps_success_state);
+
pos_state=atoi(Posstate.m_pData);
+// if(!gps_open_flag){
+// if(g_com_map[SEND_4G_SECOND]==5)
+// {
+// snprintf(GGA_Format_message, sizeof(GGA_Format_message), "%s,%04x,%x,%d,%d,0,0\r\n", \
+// GPS_GGAmessage,g_com_map[DEV_ID],bat_percent,userkey_state,gps_timeout_flag);
+// gga_num++;
+// if(gga_num>=g_com_map[SEND_4G_SECOND]){
+// UDPClient_UploadGPS_1pack();
+// }
+// }else{
+// if(gga_num<10)
+// {
+// gps_timeout_flag=0;
+// snprintf(GGA_Format_message, sizeof(GGA_Format_message), "%s,%04x,%x,%d,%d,0,0\r\n", \
+// GPS_GGAmessage,g_com_map[DEV_ID],bat_percent,userkey_state,gps_timeout_flag);
+// datalenth_gga = sprintf((char*)&GGA_Final_message[u32GGaLenth],"%s",GGA_Format_message);
+// u32GGaLenth += datalenth_gga;
+// gga_num++;//有效数据计数
+// }else{
+// UDPClient_UploadGPS_10pack();//上传GPS超时无效数据
+// }
+// }
+// }
+
+ snprintf(GGA_Format_message, sizeof(GGA_Format_message), "%s,%04x,%x,%d,%d,0,0\r\n", \
+ GPS_GGAmessage,g_com_map[DEV_ID],bat_percent,userkey_state,gps_timeout_flag);
if(pos_state!=0)
{
-
- gps_timeout_flag=0;//不超时接收状态
+ GPS_state=STATE_IDLE;
+ if(wd!=0)
+ blink_led(&gps_success_state);
+ //gps_power_state=0;//关闭gps
+ if(gps_open_flag&&!gps_first_flag){
+ delay_ms(1000);
+ gps_timeout_flag=0;//不超时接收状态
gps_need_data_flag=0;//接收数据完成
gps_wait_count=0;//清0接收状态
- //gps_power_state=0;//关闭gps
- if(gps_open_flag){
-
- UDPClient_UploadGPS();//上传GPS超时无效数据
gps_power_state=0;//立即关掉gps，防止串口数据过多导致无法切换休眠
update_led_power_state();
- }else{
- if(gga_num<10)
- {
- snprintf(GGA_Format_message, sizeof(GGA_Format_message), "%s,%04x,%02u%%,%d,%d,0,0\r\n", \
- GPS_GGAmessage,g_com_map[DEV_ID],bat_percent,userkey_state,gps_timeout_flag);
- datalenth_gga = sprintf((char*)&GGA_Final_message[u32GGaLenth],"%s",GGA_Format_message);
- u32GGaLenth += datalenth_gga;
- gga_num++;//有效数据计数
- }else{
- UDPClient_UploadGPS_10pack();//上传GPS超时无效数据
- }
- }
- pos_state=0;//防止多次进入
+
+ UDPClient_UploadGPS();//上传GPS超时无效数据
}
-
- }
- if(!memcmp(gps_header,"GBGSV",5))
- {memcpy(GPS_GSVmessage,mUsart2ReceivePack,strlen(mUsart2ReceivePack)-2);
- GPS_ParseGSV(GPS_GSVmessage,strlen(GPS_GSVmessage));
-
- }
+ pos_state=0;//防止多次进入
+
+ }
- memset(mUsart2ReceivePack,0,sizeof(mUsart2ReceivePack));
- memset(wdrecv.m_pData,0,sizeof(wdrecv.m_pData));
- memset(jdrecv.m_pData,0,sizeof(jdrecv.m_pData));
- memset(Posstate.m_pData,0,sizeof(Posstate.m_pData));
- index=0;
- mUsart2ReceivePack_before=0;
- mUsart2ReceivePack_now=0;
}
+ memset(mUsart2ReceivePack,0,sizeof(mUsart2ReceivePack));
+ memset(wdrecv.m_pData,0,sizeof(wdrecv.m_pData));
+ memset(jdrecv.m_pData,0,sizeof(jdrecv.m_pData));
+ memset(Posstate.m_pData,0,sizeof(Posstate.m_pData));
+ index=0;
+ mUsart2ReceivePack_before=0;
+ mUsart2ReceivePack_now=0;
}
+ }
}
--
Gitblit v1.9.3