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 |   56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 8 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 ed74945..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"
@@ -8,11 +8,12 @@
 #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,
@@ -25,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;
@@ -38,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);
 	
@@ -50,6 +78,7 @@
 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;
@@ -80,6 +109,7 @@
 						case CMD_WRITE:
 							//从mUsartReceivePack中读取pack_length长度的字节，放到全局变量中
 							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();
@@ -95,7 +125,7 @@
 							break;
 					}
 					break;
-				case MSG_WTAG:
+				case MSG_WTAG:    //修改标签参数
 					remotesend_state=1;
 					memcpy(&configremotetagID,&mUsartReceivePack[0],2);
 					//configremotetagID = pack_cmd|pack_index<<8;
@@ -103,7 +133,7 @@
 					remotetag_paralen = mUsartReceivePack[4]+3;
 					memcpy(&remotetag_para[1],&mUsartReceivePack[3],remotetag_paralen);
 					break;
-				case MSG_PWTAG:			
+				case MSG_PWTAG:		//批量修改标签参数	
 						pwtag.groupnum = mUsartReceivePack[0];
 						pwtag.index =  mUsartReceivePack[1];
 						pwtag.remain_time = 5;
@@ -113,7 +143,17 @@
 							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(&regtag_map.tagid[regtag_map.index],&mUsartReceivePack[0],2);
+					memcpy(&regtag_map.tag_frequency[regtag_map.index],&mUsartReceivePack[2],2);
+					memcpy(&regtag_map.tag_slotpos[regtag_map.index],&mUsartReceivePack[4],2);
+					break;
 		}
+			SendConfigConfirm(pack_msgtype,pack_length);
 		}
 		usart_receive_state = UsartReceiveWaitHead0;
 		pack_index = 0;

--
Gitblit v1.9.3