From e9628df331488a100bb4134469a3a0ce7f321625 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期一, 16 十二月 2024 14:30:12 +0800
Subject: [PATCH] 灯初步调通，颜色和设置的值一样，串口改变复用从中断改为轮询
---
keil/include/drivers/serial_at_cmd_app.c | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index 538a1ce..31d7f51 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -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,8 +29,8 @@
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_enable_flag,gps_need_data_flag,gps_timeout_flag;
+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;
typedef enum
{
@@ -135,6 +137,7 @@
}
}
+double d_value;
void UsartParseDataHandler(uint8_t data)
{
if(state5V_prase_flag&&!g_com_map[MODBUS_MODE])
@@ -245,27 +248,36 @@
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);
- } else {
- wd=0;
- jd=0;
- }
- index = 0;
- blink_led(&gps_success_state);
- if(pos_state!=0)
- {
- //4g.jd=jd;
- //4g.wd=wd;
- gps_timeout_flag=1;//不超时接收状态
+ memcpy(GPS_GGAmessage,mUsart2ReceivePack,strlen(mUsart2ReceivePack)-2);
+
+ 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(pos_state!=0)
+ {
+ gps_timeout_flag=0;//不超时接收状态
+
gps_need_data_flag=0;//接收数据完成
gps_wait_count=0;//清0接收状态
-// gps_enable_flag=0;//收到有效数据关闭GPS
+ //gps_power_state=0;//关闭gps
+ if(gps_open_flag){
+ UDPClient_UploadGPS();//上传GPS超时无效数据
+ gps_power_state=0;//立即关掉gps，防止串口数据过多导致无法切换休眠
+ update_led_power_state();
+ }
+ pos_state=0;//防止多次进入
+ }
+
}
- //memset(mUsart2ReceivePack,0,sizeof(mUsart2ReceivePack));
+// 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));
--
Gitblit v1.9.3