From d3a77da7be3808ce65448dbfa9d43d13ba9e0ecd Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 17 八月 2021 14:58:21 +0800
Subject: [PATCH] 增加基站状态输出，增加map表对比
---
源码/核心板/Src/application/serial_at_cmd_app.c | 107 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 76 insertions(+), 31 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 37a965b..9e306fa 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,14 @@
#define MSG_RW 3
#define MSG_WTAG 6
+#define MSG_PWTAG 8
+#define MSG_REGTAGRESPONSE 0x0b
#define CMD_READ 1
#define CMD_WRITE 2
#define CMD_REPLY 3
-#define EUART_RX_BUF_SIZE 100
+
+struct pwtag_structure pwtag;
typedef enum{ UsartReceiveWaitHead0,
UsartReceiveWaitHead1,
UsartReceiveWaitMsgType,
@@ -23,10 +26,40 @@
UsartReceiveWaitChecksum
}UsartRecvPackState;
uint8_t mUsartReceivePack[100] = {0};
+uint8_t send_frame[200];
+void SendConfigConfirm(uint8_t pack_msgtype,uint8_t pack_length)
+{
+ uint16_t checksum = 0;
+ send_frame[0] = 0x55;
+ send_frame[1] = 0xAA;
+ send_frame[2] = 0x09;
+ send_frame[3] = 8;
+ send_frame[4] = pack_msgtype;
+ send_frame[5] = pack_length;
+ checksum = Checksum_u16(&send_frame[2],8);
+ memcpy(&send_frame[10],&checksum,2);
+
+ UART_PushFrame(send_frame, 12);
+}
+void SendAnchorState(uint16_t state)
+{
+ uint16_t checksum = 0;
+ send_frame[0] = 0x55;
+ send_frame[1] = 0xAA;
+ send_frame[2] = 0x10;
+ send_frame[3] = 14;
+ memcpy(&send_frame[4],&dev_id,2);
+ send_frame[6] = state;
+
+
+ checksum = Checksum_u16(&send_frame[2],14);
+ memcpy(&send_frame[16],&checksum,2);
+
+ USART_puts(send_frame, 17);
+}
void SendComMap(uint8_t data_length, uint8_t index)
{
- static uint8_t send_frame[EUART_RX_BUF_SIZE];
uint16_t checksum = 0;
send_frame[0] = 0x55;
send_frame[1] = 0xAA;
@@ -36,10 +69,7 @@
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);
@@ -48,35 +78,38 @@
u8 remotetag_para[30],remotetag_paralen;
u8 remotesend_state=0;
uint16_t configremotetagID;
+struct regtag_structure regtag_map;
void UsartParseDataHandler(uint8_t data)
{
static UsartRecvPackState usart_receive_state = UsartReceiveWaitHead0;
uint16_t checksum = 0;
static uint8_t pack_datalen = 0,pack_length = 0,pack_index = 0,pack_msgtype = 0,pack_cmd = CMD_READ;
static uint8_t index = 0;
-
+ uint8_t i;
if(usart_receive_state == UsartReceiveWaitChecksum) { //若收到校验和包
checksum = 0;
- for(int i = 0; i<pack_length-5; i++) {
+ for(int i = 0; i<pack_length-2; i++) {
checksum += mUsartReceivePack[i];
}
- checksum += pack_cmd;
- checksum += pack_length;
- checksum += pack_index;
- checksum += pack_datalen;
checksum += pack_msgtype;
- if((data + checksum)&0xff == 0xFF) //校验通过
+ checksum += pack_length;
+
+ if(((data + checksum)&0xff) == 0xFF) //校验通过
{
switch(pack_msgtype)
{
case MSG_RW:
+ pack_cmd = mUsartReceivePack[0];
+ pack_index = mUsartReceivePack[1];
+ pack_datalen = mUsartReceivePack[2];
switch(pack_cmd)
{
case CMD_WRITE:
//从mUsartReceivePack中读取pack_length长度的字节，放到全局变量中
- memcpy((uint8_t*)&g_com_map + pack_index, mUsartReceivePack, pack_datalen);
+ memcpy((uint8_t*)&g_com_map + pack_index, &mUsartReceivePack[3], pack_datalen);
+ memcpy((uint8_t*)&g_com_map2 + pack_index, &mUsartReceivePack[3], pack_datalen);
//返回一个error状态
//SendComMap(pack_datalen,pack_index);
save_com_map_to_flash();
@@ -92,39 +125,51 @@
break;
}
break;
- case MSG_WTAG:
+ case MSG_WTAG: //修改标签参数
remotesend_state=1;
- configremotetagID = pack_cmd|pack_index<<8;
- remotetag_para[0] = pack_datalen;
- remotetag_paralen = mUsartReceivePack[1]+3;
- memcpy(&remotetag_para[1],mUsartReceivePack,remotetag_paralen);
+ memcpy(&configremotetagID,&mUsartReceivePack[0],2);
+ //configremotetagID = pack_cmd|pack_index<<8;
+ //remotetag_para[0] = mUsartReceivePack[2];
+ remotetag_paralen = mUsartReceivePack[4]+3;
+ memcpy(&remotetag_para[1],&mUsartReceivePack[3],remotetag_paralen);
+ break;
+ case MSG_PWTAG: //批量修改标签参数
+ pwtag.groupnum = mUsartReceivePack[0];
+ pwtag.index = mUsartReceivePack[1];
+ pwtag.remain_time = 5;
+ for(i=0;i<pwtag.groupnum;i++)
+ {
+ memcpy(pwtag.groupid[i],&mUsartReceivePack[i*6+2],4);
+ memcpy(&pwtag.group_interval[i],&mUsartReceivePack[i*6+6],2);
+ }
+ break;
+ case MSG_REGTAGRESPONSE:
+ regtag_map.index++;
+ if(regtag_map.index==MAX_REGTAGNUM)
+ {regtag_map.index = 0;}
+ regtag_map.remain_time[regtag_map.index]=5;
+ memcpy(®tag_map.tagid[regtag_map.index],&mUsartReceivePack[0],2);
+ memcpy(®tag_map.tag_frequency[regtag_map.index],&mUsartReceivePack[2],2);
+ memcpy(®tag_map.tag_slotpos[regtag_map.index],&mUsartReceivePack[4],2);
break;
}
+ SendConfigConfirm(pack_msgtype,pack_length);
}
usart_receive_state = UsartReceiveWaitHead0;
pack_index = 0;
pack_length = 0;
index=0;
- } else if((usart_receive_state == UsartReceiveWaitData) ) { //若果收到的是正常通讯包
+ } else if(usart_receive_state == UsartReceiveWaitData) { //若果收到的是正常通讯包
mUsartReceivePack[index] = data;
index++;
- if(index == pack_length-5) { //如果收到的index与长度相等
+ if(index == pack_length-2) { //如果收到的index与长度相等
usart_receive_state = UsartReceiveWaitChecksum;
}
- } else if(usart_receive_state == UsartReceiveWaitDataLen) { //收到指令类型字节
- pack_datalen = data;
- usart_receive_state = UsartReceiveWaitData;
- }else if(usart_receive_state == UsartReceiveWaitIndex) { //收到指令类型字节
- pack_index = data;
- usart_receive_state = UsartReceiveWaitDataLen;
- } else if(usart_receive_state == UsartReceiveWaitCMD) { //收到指令类型字节
- pack_cmd = data;
- usart_receive_state = UsartReceiveWaitIndex;
} else if(usart_receive_state == UsartReceiveWaitLength) { //收到长度字节
pack_length = data;
pack_index = 0;
- usart_receive_state = UsartReceiveWaitCMD;
+ usart_receive_state = UsartReceiveWaitData;
} else if((usart_receive_state == UsartReceiveWaitHead0) && (data == 0x55)) { //收到第一个包头
usart_receive_state = UsartReceiveWaitHead1;
--
Gitblit v1.9.3