From 96f8a44bc278be96d8851dbb1694cfc2995bf370 Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期一, 24 二月 2025 16:29:17 +0800 Subject: [PATCH] 定位手环V1.7版本,增加4Gsos震动下发和sos报警上传和sos上传成功震动逻辑 --- keil/include/drivers/serial_at_cmd_app.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c index d48a5a2..3f0756b 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}; @@ -143,7 +144,7 @@ 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; void UsartParseDataHandler(uint8_t data) { if(state5V_prase_flag&&!g_com_map[MODBUS_MODE]) @@ -261,21 +262,9 @@ if(wd!=0) blink_led(&gps_success_state); pos_state=atoi(Posstate.m_pData); - if(pos_state!=0) - { - - 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) + if(gga_num<10&&!gps_open_flag) { + gps_timeout_flag=0; 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); @@ -284,6 +273,23 @@ }else{ UDPClient_UploadGPS_10pack();//上传GPS超时无效数据 } + if(pos_state!=0) + { + + + //gps_power_state=0;//关闭gps +// if(gps_open_flag){ + if(gps_open_flag&&!gps_first_flag){ + + delay_ms(1000); + gps_timeout_flag=0;//不超时接收状态 + gps_need_data_flag=0;//接收数据完成 + gps_wait_count=0;//清0接收状态 + UDPClient_UploadGPS();//上传GPS超时无效数据 + gps_power_state=0;//立即关掉gps,防止串口数据过多导致无法切换休眠 + update_led_power_state(); +// }else{ +// } pos_state=0;//防止多次进入 } -- Gitblit v1.9.3