From 9e4167eeef5b1841936266300ec20443d372c5da Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 18 三月 2022 16:28:38 +0800
Subject: [PATCH] 初次完成
---
源码/核心板/Src/application/serial_at_cmd_app.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 fc4c71d..2ad289c 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"
@@ -7,6 +7,7 @@
#define MSG_RW 3
#define MSG_WTAG 6
+#define MSG_USERDATA 0x11
#define CMD_READ 1
#define CMD_WRITE 2
@@ -25,7 +26,7 @@
}UsartRecvPackState;
uint8_t mUsartReceivePack[100] = {0};
-uint8_t send_frame[200];
+uint8_t send_frame[200],uartrec_userdata[20];
void SendConfigConfirm(uint8_t pack_msgtype,uint8_t pack_length)
{
uint16_t checksum = 0;
@@ -39,7 +40,7 @@
checksum = Checksum_u16(&send_frame[2],8);
memcpy(&send_frame[10],&checksum,2);
- UART_PushFrame(send_frame, 12);
+ USART_puts(send_frame, 12);
}
void SendComMap(uint8_t data_length, uint8_t index)
{
@@ -94,7 +95,8 @@
{
case CMD_WRITE:
//从mUsartReceivePack中读取pack_length长度的字节，放到全局变量中
- if(pack_index<512)
+ if(pack_index<0xf0&&pack_index!=0x14)
+ // if(pack_index>100)
{
memcpy((uint8_t*)&g_com_map + pack_index, mUsartReceivePack, pack_datalen);
//返回一个error状态
@@ -128,6 +130,14 @@
remotesend_state=1;
memcpy(remotetag_para,mUsartReceivePack,REMOTEPARA_LEN);
break;
+ case MSG_USERDATA:
+ if(pack_datalen<20)
+ {
+ uartrec_userdata[0] = pack_index;
+ uartrec_userdata[1] = pack_datalen;
+ memcpy((uint8_t*)&uartrec_userdata[2], &mUsartReceivePack, pack_cmd-2);
+ }
+ break;
}
}
--
Gitblit v1.9.3