From 95e4a4995ac7403d06ebb13e706ac0c4c7d47f4f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 10 五月 2021 17:11:52 +0800
Subject: [PATCH] V1.47 增加继电器控制指令
---
源码/核心板/Src/application/serial_at_cmd_app.c | 19 +++++++++++++++----
1 files changed, 15 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..5ce444a 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,24 @@
{
case CMD_WRITE:
//从mUsartReceivePack中读取pack_length长度的字节，放到全局变量中
- memcpy((uint8_t*)&g_com_map + pack_index, mUsartReceivePack, pack_datalen);
+ if(pack_index<0xf0)
+ {
+ 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