From 96a63685fd53bd939772377296a9e732333e3748 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 28 三月 2022 10:23:16 +0800
Subject: [PATCH] V2.47 可能有无法接收数据的bug
---
源码/核心板/Src/application/serial_at_cmd_app.c | 70 ++++++++++++++++++++++++++++++++--
1 files changed, 65 insertions(+), 5 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 8600cc5..1d89251 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,13 @@
#define MSG_RW 3
#define MSG_WTAG 6
#define MSG_PWTAG 8
+#define MSG_REGTAGRESPONSE 0x0b
+#define MSG_TAGPOS 0x0D
#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,
@@ -41,6 +43,22 @@
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)
{
uint16_t checksum = 0;
@@ -60,7 +78,10 @@
}
u8 remotetag_para[30],remotetag_paralen;
u8 remotesend_state=0;
-uint16_t configremotetagID;
+uint16_t configremotetagID,rec_times1,rec_times2;
+struct regtag_structure regtag_map;
+extern u16 taglist_pos;
+struct tagpos_structure tagpos[10];
void UsartParseDataHandler(uint8_t data)
{
static UsartRecvPackState usart_receive_state = UsartReceiveWaitHead0;
@@ -77,11 +98,12 @@
}
checksum += pack_msgtype;
checksum += pack_length;
-
+rec_times1++;
if(((data + checksum)&0xff) == 0xFF) //校验通过
{
switch(pack_msgtype)
{
+ uint16_t serial_tag_id_recv;
case MSG_RW:
pack_cmd = mUsartReceivePack[0];
pack_index = mUsartReceivePack[1];
@@ -91,8 +113,28 @@
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);
+ if(pack_index==CNT_RESTART*2)
+ {
+ SendAnchorState(SM_RESTART);
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ }
+ if(pack_index==CNT_UPDATE*2)
+ {
+ uint32_t result = 0;
+ u16 tmp = 0xAAAA;
+ SendAnchorState(SM_UPDATE);
+ __disable_irq();
+ result = FLASH_Prepare(0x8004A38, 2);
+ if(result)
+ result = FLASH_Write(0x8004A38, (const uint8_t*)&tmp, 2);
+ __enable_irq();
+ printf("进入升级模式\r\n");
+ //delay_ms(100);
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ }
save_com_map_to_flash();
delay_ms(100);
NVIC_SystemReset();
@@ -100,13 +142,14 @@
case CMD_READ:
//read包中data字节，即mUsartReceivePack[0]表示数据长度；
//从g_com_data结构体中的第index位置读取长度为mUsartReceivePack[0]的字节，发送出来
+ rec_times2++;
SendComMap(pack_datalen,pack_index);
break;
default:
break;
}
break;
- case MSG_WTAG:
+ case MSG_WTAG: //修改标签参数
remotesend_state=1;
memcpy(&configremotetagID,&mUsartReceivePack[0],2);
//configremotetagID = pack_cmd|pack_index<<8;
@@ -114,7 +157,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;
@@ -124,6 +167,23 @@
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;
+ case MSG_TAGPOS:
+ memcpy(&serial_tag_id_recv,&mUsartReceivePack[0],2);
+ taglist_pos=CmpTagInList(serial_tag_id_recv);
+ tagpos[taglist_pos].tagid = serial_tag_id_recv;
+ tagpos[taglist_pos].datalen = mUsartReceivePack[2];
+ if(mUsartReceivePack[2]<=30)
+ memcpy(&tagpos[taglist_pos].data,&mUsartReceivePack[3],mUsartReceivePack[2]);
+ break;
}
SendConfigConfirm(pack_msgtype,pack_length);
}
--
Gitblit v1.9.3