From d5d1ca2ebf9087415d3d11907cd79ba58162760e Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 12 三月 2025 17:16:33 +0800
Subject: [PATCH] 加入shell模式跟ntrip。目前没有调试好，等外包改一下
---
keil/include/drivers/serial_at_cmd_app.c | 115 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 57 insertions(+), 58 deletions(-)
diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index 51d0a94..b7e5c96 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,6 +20,8 @@
uint8_t mUsartReceivePack[100] = {0};
uint8_t mUsart2ReceivePack[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;
@@ -27,10 +29,9 @@
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_open_flag;
extern uint8_t gps_success_state,gps_enable_flag,gps_need_data_flag,gps_timeout_flag,gps_power_state;
extern uint16_t gps_wait_count;
-uint8_t gps_send_count=3;
typedef enum
{
BLE_RECV_STATE_IDLE = 0,
@@ -137,6 +138,7 @@
}
double d_value;
+uint8_t shell_receive_state;
void UsartParseDataHandler(uint8_t data)
{
if(state5V_prase_flag&&!g_com_map[MODBUS_MODE])
@@ -145,7 +147,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;
@@ -222,6 +224,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;
@@ -230,62 +242,49 @@
}
} else if(gps_prase_flag)
{
- static uint8_t index = 0;
+// static uint8_t index = 0;
//GPS解析数据
// static ST_BLERecv BLE_recvive;
- GGA_DataStruct jdrecv,wdrecv,Posstate;
-
- //接收数据开始分析
- mUsart2ReceivePack[index] = data; //char数组传进来参数data
- mUsart2ReceivePack_before = mUsart2ReceivePack_now;
- mUsart2ReceivePack_now=data;
- index++;
- 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);
- pos_state=atoi(Posstate.m_pData);
- if(pos_state!=0)
- {
-
- //4g.jd=jd;
- //4g.wd=wd;
- blink_led(&gps_success_state);
- wd=strtod(wdrecv.m_pData,NULL);
- jd=strtod(jdrecv.m_pData,NULL);
- gps_send_count--;
- gps_timeout_flag=0;//不超时接收状态
-
- gps_wait_count=0;//清0接收状态
- if(gps_send_count==0){
- gps_need_data_flag=0;//接收数据完成
- TCPHeartBeatUpload();//上传GPS数据
- gps_power_state=0;
- update_led_power_state();
- gps_send_count=3;
- }
- pos_state=0;//以防多次发生
-
-
-// gps_enable_flag=0;//收到有效数据关闭GPS
-
- }
- }
-
-
- 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));
- index=0;
- mUsart2ReceivePack_before=0;
- mUsart2ReceivePack_now=0;
- }
+// GGA_DataStruct jdrecv,wdrecv,Posstate;
+ GPS_RecvFsm(data);
+// //接收数据开始分析
+// mUsart2ReceivePack[index] = data; //char数组传进来参数data
+// mUsart2ReceivePack_before = mUsart2ReceivePack_now;
+// mUsart2ReceivePack_now=data;
+// index++;
+// 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)
+// pos_state=atoi(Posstate.m_pData);
+// if(pos_state!=0)
+// {
+// 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));
+// memset(Posstate.m_pData,0,sizeof(Posstate.m_pData));
+// index=0;
+// mUsart2ReceivePack_before=0;
+// mUsart2ReceivePack_now=0;
+// }
}
}
--
Gitblit v1.9.3