From 6e7d484264afa951a0491cb4a868580a2f0b647b Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 25 八月 2021 15:05:24 +0800
Subject: [PATCH] map表检查
---
源码/核心板/Src/application/serial_at_cmd_app.c | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 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 bb9b63a..52b1ae9 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"
@@ -22,10 +22,10 @@
UsartReceiveWaitChecksum1
}UsartRecvPackState;
uint8_t mUsartReceivePack[100] = {0};
-
+uint8_t send_frame[200];
void SendComMap(uint8_t data_length, uint8_t index)
{
- static uint8_t send_frame[EUART_RX_BUF_SIZE];
+
uint16_t checksum = 0;
send_frame[0] = 0x55;
send_frame[1] = 0xAA;
@@ -43,6 +43,22 @@
memcpy(&send_frame[7+data_length],&checksum,2);
UART_PushFrame(send_frame, data_length+9);
+}
+void SendAnchorState(uint16_t state)
+{
+ uint16_t checksum = 0;
+ send_frame[0] = 0x55;
+ send_frame[1] = 0xAA;
+ send_frame[2] = 0x10;
+ send_frame[3] = 14;
+ memcpy(&send_frame[4],&dev_id,2);
+ send_frame[6] = state;
+
+
+ checksum = Checksum_u16(&send_frame[2],14);
+ memcpy(&send_frame[16],&checksum,2);
+
+ USART_puts(send_frame, 17);
}
u16 rec_checksum;
void UsartParseDataHandler(uint8_t data)
@@ -76,10 +92,29 @@
memcpy((uint8_t*)&g_com_map + pack_index, mUsartReceivePack, pack_datalen);
//返回一个error状态
//SendComMap(pack_datalen,pack_index);
- if((g_com_map[CNT_REBOOT]&0xff)==1)
- {
- returnfactory_parameter();
- }
+ 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
+ }
+ if(pack_index==CNT_REBOOT*2)
+ {
+ returnfactory_parameter();
+ }
save_com_map_to_flash();
delay_ms(100);
NVIC_SystemReset();
--
Gitblit v1.9.3