From 127bcc70c9d3e0871a0fd80ff8e21190c80a8229 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期三, 22 九月 2021 17:59:03 +0800 Subject: [PATCH] V1.56 固定参数版本 --- 源码/核心板/Src/application/serial_at_cmd_app.c | 20 ++++++++++++++++---- 1 files changed, 16 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 78f6044..0d75284 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" @@ -39,7 +39,7 @@ checksum = Checksum_u16(&send_frame[2],8); memcpy(&send_frame[10],&checksum,2); - USART_puts(send_frame, 12); + UART_PushFrame(send_frame, 12); } void SendComMap(uint8_t data_length, uint8_t index) { @@ -94,13 +94,25 @@ { case CMD_WRITE: //从mUsartReceivePack中读取pack_length长度的字节,放到全局变量中 - memcpy((uint8_t*)&g_com_map + pack_index, mUsartReceivePack, pack_datalen); + 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); save_com_map_to_flash(); SendConfigConfirm(pack_msgtype,pack_length); - delay_ms(10); - SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader + 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(); + SendConfigConfirm(pack_msgtype,pack_length); + + } break; case CMD_READ: //read包中data字节,即mUsartReceivePack[0]表示数据长度; -- Gitblit v1.9.3