From 44812eee65f5e9eb47c2b01b6cf86c101083eb61 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 25 七月 2025 17:41:24 +0800
Subject: [PATCH] 修改激活对应com表标志位位置，避免与其他元素耦合
---
keil/include/drivers/serial_at_cmd_app.c | 64 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index f0ced09..2694ec0 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -17,9 +17,11 @@
#define Label_id_local 1 //标签id
#define data_buff_MAX 50 //基站数量
#define Lora_TXD_bff_MAX 220 //发送缓存区大小 >4+8+4*基站数量+2=14+4*基站数量
-
+#define BIND_LIMIT_TIME 20
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
{
@@ -99,7 +101,7 @@
checksum = Checksum_u16(&send_frame[2],5+data_length);
memcpy(&send_frame[7+data_length],&checksum,2);
- uart_send(UART_ID1, send_frame,data_length+9, NULL);
+ uart_send(UART_ID0, send_frame,data_length+9, NULL);
}
void UpdateProcess(uint8_t index)
{
@@ -136,6 +138,9 @@
}
double d_value;
+uint16_t checksum_temp = 0,checksum_temp1=0;
+extern int16_t bind_count;
+extern uint16_t group_id;
void UsartParseDataHandler(uint8_t data)
{
if(state5V_prase_flag&&!g_com_map[MODBUS_MODE])
@@ -159,6 +164,8 @@
checksum += pack_index;
checksum += pack_datalen;
checksum += pack_msgtype;
+ checksum_temp=checksum;
+ checksum_temp1=(data + checksum)&0xff;
if(((data + checksum)&0xff) == 0xFF) //校验通过
{
switch(pack_cmd)
@@ -185,6 +192,11 @@
//从g_com_data结构体中的第index位置读取长度为mUsartReceivePack[0]的字节，发送出来
SendComMap(pack_datalen,pack_index>>1);
break;
+ case CMD_BIND:
+ g_com_map[BIND_START_INDEX] = 1;
+ bind_count=BIND_LIMIT_TIME;
+ group_id=0;//变为配对组ID
+ break;
default:
break;
}
@@ -208,6 +220,10 @@
} else if(usart_receive_state == UsartReceiveWaitCMD) { //收到指令类型字节
pack_cmd = data;
usart_receive_state = UsartReceiveWaitIndex;
+ if(pack_cmd==CMD_BIND)
+ {
+ usart_receive_state = UsartReceiveWaitChecksum;
+ }
} else if(usart_receive_state == UsartReceiveWaitLength) { //收到长度字节
pack_length = data;
@@ -246,28 +262,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);
- d_value = strtod(wdrecv.m_pData,NULL);
- if(d_value>1)
- {
- blink_led(&gps_success_state);
+ 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);
- }
- }
- index = 0;
- if(pos_state!=0)
- {
- //4g.jd=jd;
- //4g.wd=wd;
- gps_timeout_flag=1;//不超时接收状态
+ 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