From 54a0b191c9e60a63562bff03b73d04c707be46e3 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 17 九月 2021 15:52:08 +0800
Subject: [PATCH] V1.54 测试通过
---
源码/核心板/Src/application/serial_at_cmd_app.c | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 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 c81b079..4bb6ca1 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"
@@ -35,12 +35,11 @@
send_frame[3] = 8;
send_frame[4] = pack_msgtype;
send_frame[5] = pack_length;
-OUT485_ENABLE;
+
checksum = Checksum_u16(&send_frame[2],8);
memcpy(&send_frame[10],&checksum,2);
- USART_puts(send_frame, 12);
- OUT485_DISABLE;
+ UART_PushFrame(send_frame, 12);
}
void SendComMap(uint8_t data_length, uint8_t index)
{
@@ -95,13 +94,46 @@
{
case CMD_WRITE:
//从mUsartReceivePack中读取pack_length长度的字节，放到全局变量中
+ if(pack_index<512)
+ // if(pack_index>100)
+ {
+ memcpy((uint8_t*)&g_com_map + pack_index, mUsartReceivePack, pack_datalen);
+ //返回一个error状态
+ //SendComMap(pack_datalen,pack_index);
+ if(pack_index==CNT_RESTART*2)
+ {
+ // delay_ms(500);
+ // SendAnchorState(SM_RESTART);
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ delay_ms(100);
+ }
+ 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
+ }
+ SendConfigConfirm(pack_msgtype,pack_length);
+ save_com_map_to_flash();
+ delay_ms(500);
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+
+ }else{
memcpy((uint8_t*)&g_com_map + pack_index, mUsartReceivePack, pack_datalen);
//返回一个error状态
//SendComMap(pack_datalen,pack_index);
- save_com_map_to_flash();
+ //save_com_map_to_flash();
SendConfigConfirm(pack_msgtype,pack_length);
- delay_ms(500);
- SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+
+ }
break;
case CMD_READ:
//read包中data字节，即mUsartReceivePack[0]表示数据长度；
--
Gitblit v1.9.3