From 5102fff8a13c0319d8125a51d3d2354e7aacdcea Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 31 七月 2025 16:40:06 +0800
Subject: [PATCH] 修改为2HZ发poll包,修改second task从原来2s一次为1s一次

---
 keil/include/drivers/serial_at_cmd_app.c |  131 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 127 insertions(+), 4 deletions(-)

diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index be1ba0c..445a9f4 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -81,7 +81,30 @@
     sum = ~sum;
     return sum;
 }
-
+ 
+void SendComMap0(uint8_t data_length, uint8_t index)//表示成功读取的回应包
+{
+  static uint8_t send_frame[EUART0_RX_BUF_SIZE];
+    uint16_t checksum = 0;
+    send_frame[0] = 0x55;
+    send_frame[1] = 0xAA;
+    send_frame[2] = 0x03;
+    send_frame[3] = data_length+5;
+    send_frame[4] = CMD_REPLY;
+    send_frame[5] = index;
+    send_frame[6] = data_length;
+    memcpy(&send_frame[7], &g_com_map[index], data_length);
+    for(int i = 0; i<(data_length+5); i++)
+    {
+        checksum += send_frame[2+i];
+    }
+    checksum = Checksum_u16(&send_frame[2],5+data_length);
+    memcpy(&send_frame[7+data_length],&checksum,2);
+		gpio_pin_set(CHANGE_UART_PIN);//;拉高变发送
+    uart_send(UART_ID0, send_frame,data_length+9, NULL);
+				while(uart_tx_in_progress(UART_ID0));
+			gpio_pin_clr(CHANGE_UART_PIN);//;拉低变接收
+}
 void SendComMap(uint8_t data_length, uint8_t index)//表示成功读取的回应包
 {
     static uint8_t send_frame[EUART0_RX_BUF_SIZE];
@@ -260,7 +283,107 @@
 		}
 }
 extern uint8_t bind_flag;
+extern uint32_t dev_id;
+uint16_t temp_id;
+	
+
+
 void Usart0ParseDataHandler(uint8_t data)
+{
+if(state5V_prase_flag&&!g_com_map[MODBUS_MODE])
+    {   //升级程序
+        static UsartRecvPackState usart_receive_state = UsartReceiveWaitHead0;
+        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;
+			
+        if(usart_receive_state == UsartReceiveWaitChecksum)
+        {   //若收到校验和包
+            checksum = 0;
+            for(int i = 0; i<pack_length-5; i++) {
+                checksum += mUsart2ReceivePack[i];
+            }
+            checksum += pack_cmd;
+            checksum += pack_length;
+            checksum += pack_index;
+            checksum += pack_datalen;
+            checksum += pack_msgtype;
+            if(((data + checksum)&0xff) == 0xFF)				//校验通过
+            {
+                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, mUsart2ReceivePack, pack_datalen);
+                    if(mUsart2ReceivePack[0]==1)
+                        UpdateProcess(pack_index);
+                    //返回一个error状态
+                    //SendComMap(pack_datalen,pack_index);
+                    save_com_map_to_flash();
+                    //delay_ms(100);
+                    NVIC_SystemReset();
+                    break;
+                case CMD_READ:
+                    //read包中data字节,即mUsart2ReceivePack[0]表示数据长度;
+                    //从g_com_data结构体中的第index位置读取长度为mUsart2ReceivePack[0]的字节,发送出来
+								memcpy(&temp_id,&mUsart2ReceivePack[0],2);
+								//SendComMap0(pack_datalen,pack_index>>1);
+								if(memcmp(&temp_id,&dev_id,2)==0)
+									buffer_message_send();
+                    //SendComMap0(pack_datalen,pack_index>>1);
+                    break;
+                default:
+                    break;
+                }
+            }
+            usart_receive_state = UsartReceiveWaitHead0;
+            pack_index = 0;
+            pack_length = 0;
+            index=0;
+        } else if((usart_receive_state == UsartReceiveWaitData) ) {	//若果收到的是正常通讯包
+            mUsart2ReceivePack[index] = data;
+            index++;
+            if(index == pack_length-5) {		//如果收到的index与长度相等
+                usart_receive_state = UsartReceiveWaitChecksum;
+            }
+        } else if(usart_receive_state == UsartReceiveWaitDataLen) {						//收到指令类型字节
+            pack_datalen = data;
+            usart_receive_state = UsartReceiveWaitData;
+        } else if(usart_receive_state == UsartReceiveWaitIndex) {						//收到指令类型字节
+            pack_index = data;
+            usart_receive_state = UsartReceiveWaitDataLen;
+        } else if(usart_receive_state == UsartReceiveWaitCMD) {							//收到指令类型字节
+            pack_cmd = data;
+            usart_receive_state = UsartReceiveWaitIndex;
+        } else if(usart_receive_state == UsartReceiveWaitLength) {						//收到长度字节
+
+            pack_length = data;
+            pack_index = 0;
+            usart_receive_state = UsartReceiveWaitCMD;
+
+        } else if((usart_receive_state == UsartReceiveWaitHead0) && (data == 0x55)) {	//收到第一个包头
+            usart_receive_state = UsartReceiveWaitHead1;
+        } else if((usart_receive_state == UsartReceiveWaitHead1) && (data == 0xAA)) {	//收到第二个包头
+            usart_receive_state = UsartReceiveWaitMsgType;
+        } else if ((usart_receive_state == UsartReceiveWaitMsgType) && (data == 0x3)) {
+            usart_receive_state = UsartReceiveWaitLength;
+            pack_msgtype = data;
+        }
+				
+        else {
+            usart_receive_state = UsartReceiveWaitHead0;
+            pack_index = 0;
+            pack_length = 0;
+        }
+    }
+}
+void Usart3ParseDataHandler(uint8_t data)
 {
 	// 全局变量
 static Usart0ReceiveState usart0_receive_state = Usart0ReceiveWaitHead0;
@@ -275,8 +398,8 @@
 static uint8_t send_frame[256];  // 用于计算校验和的帧
 static uint8_t frame_index = 0;  // 帧缓冲区索引
 static uint8_t pack_datalen = 0;
-    
-	LOG_INFO(TRACE_MODULE_APP,"收到 %#x\r\n",data);
+    LOG_INFO(TRACE_MODULE_APP,"收到数据%c\r\n",data);
+	//LOG_INFO(TRACE_MODULE_APP,"收到 %#x\r\n",data);
     switch(usart0_receive_state) {
         case Usart0ReceiveWaitHead0:
             if(data == 0x55) {
@@ -471,7 +594,7 @@
                 case CMD_READ:
                     //read包中data字节,即mUsartReceivePack[0]表示数据长度;
                     //从g_com_data结构体中的第index位置读取长度为mUsartReceivePack[0]的字节,发送出来
-                    SendComMap(pack_datalen,pack_index>>1);
+                    SendComMap0(pack_datalen,pack_index>>1);
                     break;
                 default:
                     break;

--
Gitblit v1.9.3