From f94a5365f1400b6234cda1f2925dba2a50110c71 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 05 十二月 2024 14:17:16 +0800
Subject: [PATCH] 安邦车载手环V1.13，修改4G发送时间和GPS刷新时间单位为s可配置
---
keil/include/drivers/serial_at_cmd_app.c | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index 3776eee..6230465 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -22,12 +22,12 @@
uint8_t mUsart2ReceivePack[150] = {0};
double jd,wd;
int analysis_num,pos_state;
-uint8_t state5V_prase_flag,gps_prase_flag=1;
+uint8_t state5V_prase_flag=1,gps_prase_flag=1;
extern void IO_LED_control_change(uint8_t data);
extern void IO_control_init(void);
extern void blink_led(uint8_t*state);
extern void updata_led_power_state(void);
-extern uint8_t gps_success_state;
+extern uint8_t gps_success_state,gps_power_state;
extern uint8_t gps_success_state,gps_enable_flag,gps_need_data_flag,gps_timeout_flag;
extern uint16_t gps_wait_count;
typedef enum
@@ -135,9 +135,10 @@
}
}
+double d_value,d_value1;
void UsartParseDataHandler(uint8_t data)
{
- if(state5V_prase_flag)
+ if(state5V_prase_flag&&!g_com_map[MODBUS_MODE])
{ //升级程序
static UsartRecvPackState usart_receive_state = UsartReceiveWaitHead0;
uint16_t checksum = 0;
@@ -163,6 +164,12 @@
switch(pack_cmd)
{
case CMD_WRITE:
+ if(pack_index==MODBUS_MODE*2)
+ {
+ Uart1GpsRecDebugSend();
+ g_com_map[MODBUS_MODE] = 1;
+ return;
+ }
//从mUsartReceivePack中读取pack_length长度的字节，放到全局变量中,赋值保存的参数并且存入flash
memcpy((uint8_t*)&g_com_map + pack_index, mUsartReceivePack, pack_datalen);
if(mUsartReceivePack[0]==1)
@@ -222,10 +229,11 @@
}
} else if(gps_prase_flag)
{
+ static uint8_t index = 0;
//GPS解析数据
// static ST_BLERecv BLE_recvive;
GGA_DataStruct jdrecv,wdrecv,Posstate;
- static uint8_t index = 0;
+
//接收数据开始分析
mUsart2ReceivePack[index] = data; //char数组传进来参数data
mUsart2ReceivePack_before = mUsart2ReceivePack_now;
@@ -234,27 +242,30 @@
if( mUsart2ReceivePack_before == 0x0D && mUsart2ReceivePack_now==0x0A )//接收数据到“0x0D 0x0A”结束
{
//解析该条GPS报文
+
analysis_num=sscanf((char*)mUsart2ReceivePack,"$%[^,],%*[^,],%[^,],%*[^,],%[^,],%*[^,],%[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*s",gps_header,wdrecv.m_pData,jdrecv.m_pData,Posstate.m_pData);
if(!memcmp(gps_header,"GNGGA",5))
- {
- wd=strtod(wdrecv.m_pData,NULL);
- jd=strtod(jdrecv.m_pData,NULL);
- pos_state=atoi(Posstate.m_pData);
- } else {
- wd=0;
- jd=0;
- }
- blink_led(&gps_success_state);
- if(pos_state!=0)
- {
- //4g.jd=jd;
- //4g.wd=wd;
- gps_timeout_flag=1;//不超时接收状态
+ { d_value=strtod(wdrecv.m_pData,NULL);
+ d_value1=strtod(jdrecv.m_pData,NULL);
+ if(d_value>0&&d_value1>0)
+ {
+ blink_led(&gps_success_state);
+ wd=strtod(wdrecv.m_pData,NULL);
+ jd=strtod(jdrecv.m_pData,NULL);
+ 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_enable_flag=0;//收到有效数据关闭GPS
- }
- //memset(mUsart2ReceivePack,0,sizeof(mUsart2ReceivePack));
+ gps_power_state=0;//立即关闭gps避免紧接着进入搜索导致未及时关闭//注释为了防止GPS获得数据过快导致DMA缓存区数据重新涌入
+ update_led_power_state();
+ 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));
--
Gitblit v1.9.3