From e80c06f1244bf23bfb1b46e093cdb1edb6bb0f20 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 23 八月 2021 10:25:43 +0800
Subject: [PATCH] V2.23上海动车测试完成
---
源码/核心板/Src/application/serial_at_cmd_app.c | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 9e306fa..198e8a5 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"
@@ -77,7 +77,7 @@
}
u8 remotetag_para[30],remotetag_paralen;
u8 remotesend_state=0;
-uint16_t configremotetagID;
+uint16_t configremotetagID,rec_times1,rec_times2;
struct regtag_structure regtag_map;
void UsartParseDataHandler(uint8_t data)
{
@@ -95,7 +95,7 @@
}
checksum += pack_msgtype;
checksum += pack_length;
-
+rec_times1++;
if(((data + checksum)&0xff) == 0xFF) //校验通过
{
switch(pack_msgtype)
@@ -109,9 +109,28 @@
case CMD_WRITE:
//从mUsartReceivePack中读取pack_length长度的字节，放到全局变量中
memcpy((uint8_t*)&g_com_map + pack_index, &mUsartReceivePack[3], pack_datalen);
- memcpy((uint8_t*)&g_com_map2 + pack_index, &mUsartReceivePack[3], pack_datalen);
+ // memcpy((uint8_t*)&g_com_map2 + pack_index, &mUsartReceivePack[3], pack_datalen);
//返回一个error状态
//SendComMap(pack_datalen,pack_index);
+ if(pack_index==CNT_RESTART*2)
+ {
+ SendAnchorState(SM_RESTART);
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ }
+ if(pack_index==CNT_UPDATE*2)
+ {
+ uint32_t result = 0;
+ u16 tmp = 0xAAAA;
+ SendAnchorState(SM_UPDATE);
+ __disable_irq();
+ result = FLASH_Prepare(0x8004A38, 2);
+ if(result)
+ result = FLASH_Write(0x8004A38, (const uint8_t*)&tmp, 2);
+ __enable_irq();
+ printf("进入升级模式\r\n");
+ //delay_ms(100);
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ }
save_com_map_to_flash();
delay_ms(100);
NVIC_SystemReset();
@@ -119,6 +138,7 @@
case CMD_READ:
//read包中data字节，即mUsartReceivePack[0]表示数据长度；
//从g_com_data结构体中的第index位置读取长度为mUsartReceivePack[0]的字节，发送出来
+ rec_times2++;
SendComMap(pack_datalen,pack_index);
break;
default:
--
Gitblit v1.9.3