From b4a3dfd45831f0db1e19f74beb685027e8dbc564 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 29 八月 2024 12:04:09 +0800
Subject: [PATCH] 修改部分状态逻辑判断
---
keil/include/drivers/serial_at_cmd_app.c | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index 3776eee..538a1ce 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -22,7 +22,7 @@
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);
@@ -137,7 +137,7 @@
}
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 +163,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 +228,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,9 +241,12 @@
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))
- {
+ {
+ if(g_com_map[MODBUS_MODE])
+ LOG_INFO(TRACE_MODULE_APP,"%s", mUsart2ReceivePack);
wd=strtod(wdrecv.m_pData,NULL);
jd=strtod(jdrecv.m_pData,NULL);
pos_state=atoi(Posstate.m_pData);
@@ -244,6 +254,7 @@
wd=0;
jd=0;
}
+ index = 0;
blink_led(&gps_success_state);
if(pos_state!=0)
{
--
Gitblit v1.9.3