From 51b6c7e11c8863fe4710305431c5718a9d0d1985 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 15 十一月 2021 20:02:38 +0800
Subject: [PATCH] V1.63
---
源码/核心板/Src/application/serial_at_cmd_app.c | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 58 insertions(+), 23 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 3519e97..b50be74 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,11 +7,12 @@
#define MSG_RW 3
#define MSG_WTAG 6
+#define MSG_USERDATA 0x10
#define CMD_READ 1
#define CMD_WRITE 2
#define CMD_REPLY 3
-#define EUART_RX_BUF_SIZE 100
+#define EUART_RX_BUF_SIZE 200
typedef enum{ UsartReceiveWaitHead0,
UsartReceiveWaitHead1,
UsartReceiveWaitMsgType,
@@ -20,7 +21,8 @@
UsartReceiveWaitIndex,
UsartReceiveWaitDataLen,
UsartReceiveWaitData,
- UsartReceiveWaitChecksum
+ UsartReceiveWaitChecksum0,
+ UsartReceiveWaitChecksum1
}UsartRecvPackState;
uint8_t mUsartReceivePack[100] = {0};
@@ -34,11 +36,12 @@
send_frame[3] = 8;
send_frame[4] = pack_msgtype;
send_frame[5] = pack_length;
-
+OUT485_ENABLE;
checksum = Checksum_u16(&send_frame[2],8);
memcpy(&send_frame[10],&checksum,2);
- UART_PushFrame(send_frame, 12);
+ USART_puts(send_frame, 12);
+ OUT485_DISABLE;
}
void SendComMap(uint8_t data_length, uint8_t index)
{
@@ -51,14 +54,20 @@
send_frame[5] = index;
send_frame[6] = data_length;
memcpy(&send_frame[7], &g_com_map[index>>1], data_length);
-
+ for(int i = 0; i<(data_length+5); i++)
+ {
+ checksum += send_frame[2+i];
+ }
checksum = Checksum_u16(&send_frame[2],5+data_length);
memcpy(&send_frame[7+data_length],&checksum,2);
UART_PushFrame(send_frame, data_length+9);
}
-u8 remotetag_para[30];
+u8 remotetag_para[30],remotetag_paralen,userdata_len,userdata[50];
+
u8 remotesend_state=0;
+u16 rec_checksum,userdata_targetid;
+u32 getuserdata_tick;
void UsartParseDataHandler(uint8_t data)
{
static UsartRecvPackState usart_receive_state = UsartReceiveWaitHead0;
@@ -68,7 +77,7 @@
- if(usart_receive_state == UsartReceiveWaitChecksum) { //若收到校验和包
+ if(usart_receive_state == UsartReceiveWaitChecksum1) { //???????.
checksum = 0;
for(int i = 0; i<pack_length-5; i++) {
checksum += mUsartReceivePack[i];
@@ -78,7 +87,9 @@
checksum += pack_index;
checksum += pack_datalen;
checksum += pack_msgtype;
- if(((data + checksum)&0xff) == 0xFF) //校验通过
+ checksum = ~checksum;
+ rec_checksum = rec_checksum|(data<<8);
+ if(rec_checksum == checksum) //????
{
switch(pack_msgtype)
{
@@ -86,22 +97,43 @@
switch(pack_cmd)
{
case CMD_WRITE:
- //从mUsartReceivePack中读取pack_length长度的字节，放到全局变量中
+ //?mUsartReceivePack???pack_length?????,???????
memcpy((uint8_t*)&g_com_map + pack_index, mUsartReceivePack, pack_datalen);
- //返回一个error状态
+ //????error??
//SendComMap(pack_datalen,pack_index);
save_com_map_to_flash();
SendConfigConfirm(pack_msgtype,pack_length);
- Program_Init();
+ delay_ms(500);
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //?????bootloader
break;
case CMD_READ:
- //read包中data字节，即mUsartReceivePack[0]表示数据长度；
- //从g_com_data结构体中的第index位置读取长度为mUsartReceivePack[0]的字节，发送出来
+ //read??data??,?mUsartReceivePack[0]??????;
+ //?g_com_data??????index???????mUsartReceivePack[0]???,????
SendComMap(pack_datalen,pack_index);
break;
default:
break;
}
+ break;
+ case MSG_WTAG:
+ remotesend_state++;
+ if(remotesend_state>14)
+ remotesend_state=1;
+ memcpy(remotetag_para,mUsartReceivePack,REMOTEPARA_LEN);
+ break;
+
+ case MSG_USERDATA:
+ userdata_targetid = pack_cmd|pack_index<<8;
+ userdata_len = pack_datalen;
+ //memcpy(&userdata_targetid,mUsartReceivePack,2);
+ if(userdata_len==USERDATA_LEN)
+ {
+ memcpy(userdata,&userdata_targetid,2);
+ userdata[2] = userdata_len;
+ memcpy(&userdata[3],&mUsartReceivePack,USERDATA_LEN);
+ getuserdata_tick = time32_incr;
+ SendConfigConfirm(pack_msgtype,pack_length);
+ }
break;
}
@@ -110,30 +142,33 @@
pack_index = 0;
pack_length = 0;
index=0;
- } else if((usart_receive_state == UsartReceiveWaitData) ) { //若果收到的是正常通讯包
+ } else if((usart_receive_state == UsartReceiveWaitChecksum0) ) {
+ rec_checksum = data;
+ usart_receive_state = UsartReceiveWaitChecksum1;
+ }else if((usart_receive_state == UsartReceiveWaitData) ) { //???????????
mUsartReceivePack[index] = data;
index++;
- if(index == pack_length-5) { //如果收到的index与长度相等
- usart_receive_state = UsartReceiveWaitChecksum;
+ if(index == pack_length-5) { //?????index?????
+ usart_receive_state = UsartReceiveWaitChecksum0;
}
- } else if(usart_receive_state == UsartReceiveWaitDataLen) { //收到指令类型字节
+ } else if(usart_receive_state == UsartReceiveWaitDataLen) { //????????
pack_datalen = data;
usart_receive_state = UsartReceiveWaitData;
- }else if(usart_receive_state == UsartReceiveWaitIndex) { //收到指令类型字节
+ }else if(usart_receive_state == UsartReceiveWaitIndex) { //????????
pack_index = data;
usart_receive_state = UsartReceiveWaitDataLen;
- } else if(usart_receive_state == UsartReceiveWaitCMD) { //收到指令类型字节
+ } else if(usart_receive_state == UsartReceiveWaitCMD) { //????????
pack_cmd = data;
usart_receive_state = UsartReceiveWaitIndex;
- } else if(usart_receive_state == UsartReceiveWaitLength) { //收到长度字节
+ } else if(usart_receive_state == UsartReceiveWaitLength) { //??????
pack_length = data;
pack_index = 0;
usart_receive_state = UsartReceiveWaitCMD;
- } else if((usart_receive_state == UsartReceiveWaitHead0) && (data == 0x55)) { //收到第一个包头
+ } else if((usart_receive_state == UsartReceiveWaitHead0) && (data == 0x55)) { //???????
usart_receive_state = UsartReceiveWaitHead1;
- } else if((usart_receive_state == UsartReceiveWaitHead1) && (data == 0xAA)) { //收到第二个包头
+ } else if((usart_receive_state == UsartReceiveWaitHead1) && (data == 0xAA)) { //???????
usart_receive_state = UsartReceiveWaitMsgType;
}else if ((usart_receive_state == UsartReceiveWaitMsgType)) {
usart_receive_state = UsartReceiveWaitLength;
@@ -145,4 +180,4 @@
pack_length = 0;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3