From 5b130136a057f2cec4df6b4f14165b503e8ac816 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 31 五月 2020 18:19:17 +0800
Subject: [PATCH] 修改部分bug

---
 源码/核心板/Src/application/serial_at_cmd_app.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 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..f36006e 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"
@@ -33,7 +33,7 @@
 	send_frame[4] = CMD_REPLY;
 	send_frame[5] = index;
 	send_frame[6] = data_length;
-	memcpy(&send_frame[7], &g_com_map[index], data_length);
+	memcpy(&send_frame[7], &g_com_map[index>>1], data_length);
 	for(int i = 0; i<(data_length+5); i++)
 	{
 		checksum += send_frame[2+i];
@@ -69,7 +69,7 @@
 			{
 				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();
@@ -79,7 +79,7 @@
 				case CMD_READ:
 					//read包中data字节,即mUsartReceivePack[0]表示数据长度;
 				//从g_com_data结构体中的第index位置读取长度为mUsartReceivePack[0]的字节,发送出来
-					SendComMap(pack_datalen,pack_index>>1);		
+					SendComMap(pack_datalen,pack_index);		
 					break;
 				default:
 					break;
@@ -89,7 +89,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