From 7ff7ce16ea9febfd11db4ff61e13d112d4b2ba02 Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期六, 06 五月 2023 15:16:41 +0800 Subject: [PATCH] V1.72 测试完成 --- 源码/核心板/Src/application/serial_at_cmd_app.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 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 2993869..0fa444b 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" @@ -64,6 +64,7 @@ u8 remotetag_para[30]; u8 remotesend_state=0; u16 rec_checksum; +extern u8 cmd_mode; void UsartParseDataHandler(uint8_t data) { static UsartRecvPackState usart_receive_state = UsartReceiveWaitHead0; @@ -75,6 +76,7 @@ if(usart_receive_state == UsartReceiveWaitChecksum1) { //若收到校验和包. checksum = 0; + cmd_mode = 0; for(int i = 0; i<pack_length-5; i++) { checksum += mUsartReceivePack[i]; } @@ -94,13 +96,25 @@ { case CMD_WRITE: //从mUsartReceivePack中读取pack_length长度的字节,放到全局变量中 - memcpy((uint8_t*)&g_com_map + pack_index, mUsartReceivePack, pack_datalen); + if(pack_index<0xf0&&pack_index!=0x14) + // 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(500); - SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader + 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