From 2ebb8217f43b69f491620423ea4d5d5944d1f91d Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期六, 05 七月 2025 22:43:58 +0800
Subject: [PATCH] 格式化部分代码
---
keil/include/drivers/serial_at_cmd_app.c | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index 7419cc3..5a45325 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -10,7 +10,7 @@
#include "board.h"
//#include "Spi.h"
//#include "radio.h"
-
+#include "DBG.h"
//#define EUART_RX_BUF_SIZE 100
@@ -20,8 +20,8 @@
uint8_t mUsartReceivePack[100] = {0};
uint8_t mUsart2ReceivePack[150] = {0};
-uint8_t GPS_GGAmessage[150]={0};
-uint8_t GPS_GSVmessage[150]={0};
+uint8_t GPS_GGAmessage[150]= {0};
+uint8_t GPS_GSVmessage[150]= {0};
double jd,wd;
int analysis_num,pos_state;
uint8_t state5V_prase_flag=1,gps_prase_flag=1;
@@ -138,6 +138,10 @@
}
double d_value;
+uint8_t shell_receive_state;
+//static HIDO_UINT8 l_u8GPSBuff[512];
+//static HIDO_UINT32 l_u8GPSLen = 0;
+//static HIDO_UINT32 l_u8GPSRecvTick = 0;
void UsartParseDataHandler(uint8_t data)
{
if(state5V_prase_flag&&!g_com_map[MODBUS_MODE])
@@ -146,7 +150,7 @@
uint16_t checksum = 0;
static uint8_t pack_datalen = 0,pack_length = 0,pack_index = 0,pack_msgtype = 0,pack_cmd = CMD_READ;
static uint8_t index = 0;
-
+//uint8_t shell_receive_state;
@@ -166,12 +170,12 @@
switch(pack_cmd)
{
case CMD_WRITE:
- if(pack_index==MODBUS_MODE*2)
- {
- Uart1GpsRecDebugSend();
- g_com_map[MODBUS_MODE] = 1;
- return;
- }
+ 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)
@@ -223,6 +227,16 @@
} else if ((usart_receive_state == UsartReceiveWaitMsgType) && (data == 0x3)) {
usart_receive_state = UsartReceiveWaitLength;
pack_msgtype = data;
+ } else if ((shell_receive_state == 0) && (data == 0x03)) {
+ shell_receive_state = 1;
+ uart_send(UART_ID1, data,1, NULL);
+ } else if ((shell_receive_state == 1) && (data == 0x03)) {
+ shell_receive_state = 2;
+ uart_send(UART_ID1, data,1, NULL);
+ } else if ((shell_receive_state == 2) && (data == 0x03)) {
+ DBG_SetMode(DBG_MODE_SHELL);
+ uart_send(UART_ID1, data,1, NULL);
+ shell_receive_state=0;
}
else {
usart_receive_state = UsartReceiveWaitHead0;
@@ -236,6 +250,14 @@
// static ST_BLERecv BLE_recvive;
// GGA_DataStruct jdrecv,wdrecv,Posstate;
GPS_RecvFsm(data);
+// l_u8GPSBuff[l_u8GPSLen++] = data;
+// if(l_u8GPSLen >= sizeof(l_u8GPSBuff))
+// {
+// NTRIPApp_ReportGGA(l_u8GPSBuff, l_u8GPSLen);
+// l_u8GPSLen = 0;
+// }
+
+// l_u8GPSRecvTick = HIDO_TimerGetTick();
// //接收数据开始分析
// mUsart2ReceivePack[index] = data; //char数组传进来参数data
// mUsart2ReceivePack_before = mUsart2ReceivePack_now;
@@ -244,12 +266,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))
-// {
+// {
// memcpy(GPS_GGAmessage,mUsart2ReceivePack,strlen(mUsart2ReceivePack)-2);
-//
+//
// wd=strtod(wdrecv.m_pData,NULL);
// jd=strtod(jdrecv.m_pData,NULL);
// if(wd!=0)
@@ -258,14 +280,14 @@
// {
// pos_state=0;//防止多次进入
// }
-//
+//
// }
//// if(!memcmp(gps_header,"GBGSV",5))
//// {memcpy(GPS_GSVmessage,mUsart2ReceivePack,strlen(mUsart2ReceivePack)-2);
//// GPS_ParseGSV(GPS_GSVmessage,strlen(GPS_GSVmessage));
-////
+////
//// }
-//
+//
// memset(mUsart2ReceivePack,0,sizeof(mUsart2ReceivePack));
// memset(wdrecv.m_pData,0,sizeof(wdrecv.m_pData));
// memset(jdrecv.m_pData,0,sizeof(jdrecv.m_pData));
--
Gitblit v1.9.3