From b84cfd7132f578a4d12764700ade6b15faf7c7e9 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 17 四月 2025 11:30:44 +0800
Subject: [PATCH] 加入ota
---
keil/include/drivers/serial_at_cmd_app.c | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index 3f0756b..2035a2f 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -259,24 +259,35 @@
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(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", \
+ 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);
- datalenth_gga = sprintf((char*)&GGA_Final_message[u32GGaLenth],"%s",GGA_Format_message);
- u32GGaLenth += datalenth_gga;
- gga_num++;//有效数据计数
- }else{
- UDPClient_UploadGPS_10pack();//上传GPS超时无效数据
- }
+ 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超时无效数据
+ }
+ }
+ }
if(pos_state!=0)
{
-
-
+ if(wd!=0)
+ blink_led(&gps_success_state);
//gps_power_state=0;//关闭gps
// if(gps_open_flag){
if(gps_open_flag&&!gps_first_flag){
@@ -285,9 +296,11 @@
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();
+
+ UDPClient_UploadGPS();//上传GPS超时无效数据
+
// }else{
//
}
--
Gitblit v1.9.3