From be27b2e2729c0255d70a60ba5d07b258b7c41e78 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 18 十一月 2020 08:55:36 +0800
Subject: [PATCH] V1.33 增加每10秒自动重启，修复串口校验判断BUG
---
源码/核心板/Src/application/serial_at_cmd_app.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/serial_at_cmd_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/serial_at_cmd_app.c"
index 60b4204..1f347bd 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/serial_at_cmd_app.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/serial_at_cmd_app.c"
@@ -4,7 +4,7 @@
#include <stdio.h>
#include "dw_app.h"
#include "RTC.h"
-
+#include "Usart.h"
#define CMD_READ 1
#define CMD_WRITE 2
@@ -31,7 +31,7 @@
send_frame[2] = 0x03;
send_frame[3] = data_length+5;
send_frame[4] = CMD_REPLY;
- send_frame[5] = index;
+ send_frame[5] = index<<1;
send_frame[6] = data_length;
memcpy(&send_frame[7], &g_com_map[index], data_length);
for(int i = 0; i<(data_length+5); i++)
@@ -63,13 +63,14 @@
checksum += pack_index;
checksum += pack_datalen;
checksum += pack_msgtype;
- if((data + checksum)&0xff == 0xFF) //校验通过
+ cmd_mode = 0;
+ if(((data + checksum)&0xff) == 0xFF) //校验通过
{
switch(pack_cmd)
{
case CMD_WRITE:
//从mUsartReceivePack中读取pack_length长度的字节，放到全局变量中
- memcpy((uint8_t*)&g_com_map + pack_index, mUsartReceivePack, pack_length);
+ memcpy((uint8_t*)&g_com_map + pack_index, mUsartReceivePack, pack_datalen);
//返回一个error状态
//SendComMap(pack_datalen,pack_index);
save_com_map_to_flash();
@@ -89,7 +90,7 @@
pack_index = 0;
pack_length = 0;
index=0;
- } else if((usart_receive_state == UsartReceiveWaitData) && (pack_index < pack_length)) { //若果收到的是正常通讯包
+ } else if((usart_receive_state == UsartReceiveWaitData) ) { //若果收到的是正常通讯包
mUsartReceivePack[index] = data;
index++;
if(index == pack_length-5) { //如果收到的index与长度相等
--
Gitblit v1.9.3