From 95f736655c46ec4974e89c7f0ca6a542cdbf3532 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 26 四月 2022 17:15:25 +0800
Subject: [PATCH] V1.73
---
源码/核心板/Src/application/serial_at_cmd_app.c | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 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 5ce444a..4addd96 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[USERDATA_MAXLEN];
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)
{
@@ -61,8 +62,23 @@
UART_PushFrame(send_frame, data_length+9);
}
+void SendDbgMsg(char* buffer, uint8_t data_length)
+{
+ uint16_t checksum = 0;
+ send_frame[0] = 0x55;
+ send_frame[1] = 0xAA;
+ send_frame[2] = 0x12;
+ send_frame[3] = data_length+3;
+ memcpy(&send_frame[4],buffer,data_length);
+ send_frame[4+data_length] = 0;
+ checksum = Checksum_u16(&send_frame[2],3+data_length);
+ memcpy(&send_frame[5+data_length],&checksum,2);
+
+ UART_PushFrame(send_frame, data_length+7);
+
+}
u8 remotetag_para[30];
-u8 remotesend_state=0;
+u8 remotesend_state=0,usartrec_userdatalen;
u16 rec_checksum;
void UsartParseDataHandler(uint8_t data)
{
@@ -94,7 +110,8 @@
{
case CMD_WRITE:
//从mUsartReceivePack中读取pack_length长度的字节，放到全局变量中
- if(pack_index<0xf0)
+ 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 +145,16 @@
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);
+ usartrec_userdatalen=pack_cmd;
+ userdata_timer = 0;
+ }
+ break;
}
}
--
Gitblit v1.9.3