From 3ddda900487f55bec506562fffd9f38e419a3ecd Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期六, 12 七月 2025 16:34:10 +0800
Subject: [PATCH] 成功调好485串口接和收逻辑，usb串口用于查看log输出和上位机配置，需要注意在打印彻底完成后进行切换
---
keil/include/drivers/serial_at_cmd_app.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 93 insertions(+), 9 deletions(-)
diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index 1682788..60f1ee5 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -81,7 +81,27 @@
sum = ~sum;
return sum;
}
-
+void SendComMap0(uint8_t data_length, uint8_t index)//表示成功读取的回应包
+{
+ static uint8_t send_frame[EUART0_RX_BUF_SIZE];
+ uint16_t checksum = 0;
+ send_frame[0] = 0x55;
+ send_frame[1] = 0xAA;
+ send_frame[2] = 0x03;
+ send_frame[3] = data_length+5;
+ send_frame[4] = CMD_REPLY;
+ send_frame[5] = index;
+ send_frame[6] = data_length;
+ memcpy(&send_frame[7], &g_com_map[index], 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_send(UART_ID0, send_frame,data_length+9, NULL);
+}
void SendComMap(uint8_t data_length, uint8_t index)//表示成功读取的回应包
{
static uint8_t send_frame[EUART0_RX_BUF_SIZE];
@@ -147,7 +167,56 @@
uint32_t temp_key;
uint8_t required_size_temp;
uint8_t delete_count_temp;
-int low_temp,high_temp,mid_temp;
+int low_temp,high_temp,mid_temp,elements_to_move_temp,temp_index;
+void add_new_tag_id_to_list(uint8_t* add_list,uint32_t*tag_authorization_idlist,uint32_t*authorization_list_num)
+{
+uint32_t count = add_list[0];
+ uint32_t current_size = *authorization_list_num;
+ uint32_t new_size = current_size + count;
+
+ // 处理每个新ID
+ for (uint32_t i = 0; i < count; i++) {
+ uint32_t add_offset = 1 + i * 4; // 跳过计数byte
+ uint32_t new_id=0;
+ memcpy(&new_id,&add_list[add_offset],4);
+
+ // 二分查找确定插入位置
+ uint32_t left = 0;
+ uint32_t right = current_size;
+ uint32_t insert_pos = current_size;
+ bool exists = false;
+ while (left < right) {
+ uint32_t mid = left + (right - left) / 2;
+ uint32_t mid_val = tag_authorization_idlist[mid];
+
+ if (mid_val == new_id) {
+ exists = true;
+ break;
+ } else if(tag_authorization_idlist[mid] < new_id) {
+ left = mid + 1;
+ } else {
+ right = mid;
+ }
+ }
+
+ // 如果ID不存在，则插入
+ if (!exists) {
+ insert_pos = left;
+ // 使用memmove移动元素为新ID腾出空间
+ memmove(
+ &tag_authorization_idlist[left + 1],
+ &tag_authorization_idlist[left],
+ (current_size - left) * sizeof(uint32_t)
+ );
+
+ // 插入新ID
+ tag_authorization_idlist[left] = new_id;
+ current_size++; // 更新当前大小
+ }
+ }
+ *authorization_list_num = current_size; // 更新总数
+
+}
void delete_authorization_list(uint8_t* delete_list,uint32_t*tag_authorization_idlist,uint32_t*authorization_list_num)
{
if (*authorization_list_num == 0) {
@@ -174,22 +243,25 @@
temp_key=key;
while (low <= high) {
int mid = low + (high - low) / 2; // 防止整数溢出
-
+ LOG_INFO(TRACE_MODULE_APP,"high%d,low%d,mid%d,key%#x\r\n",high,low,mid,key);
if (tag_id_authorization_list[mid] == key) {
found = 1; // 找到匹配项
index=mid;
+ temp_index=index;
break;
} else if (tag_id_authorization_list[mid] < key) {
low = mid + 1; // 在右半部分继续查找
} else {
high = mid - 1; // 在左半部分继续查找
}
- mid_temp=mid;//测试
+
}
if(found)
{
+ LOG_INFO(TRACE_MODULE_APP,"进入删除index%d,key%#x\r\n",index,key);
int elements_to_move = *authorization_list_num - index - 1;
+ elements_to_move_temp=elements_to_move;
if (elements_to_move > 0) {
// 计算源地址和目标地址
void *src = (uint32_t *)tag_authorization_idlist + (index + 1);
@@ -198,11 +270,16 @@
// 使用memmove进行内存块移动（处理重叠内存区域）
memmove(dest, src, elements_to_move * 4);
*authorization_list_num=*authorization_list_num-1;//成功删除一个更新数量
+ tag_authorization_idlist[*authorization_list_num]=0xffffffff;//将多余重叠部分重置
+ }else if (elements_to_move==0&&index==0){
+ *authorization_list_num=*authorization_list_num-1;//成功删除一个更新数量
+ tag_authorization_idlist[index]=0xffffffff;
}
}
}
}
+extern uint8_t bind_flag;
void Usart0ParseDataHandler(uint8_t data)
{
// 全局变量
@@ -218,8 +295,8 @@
static uint8_t send_frame[256]; // 用于计算校验和的帧
static uint8_t frame_index = 0; // 帧缓冲区索引
static uint8_t pack_datalen = 0;
-
- LOG_INFO(TRACE_MODULE_APP,"收到 %#x\r\n",data);
+ LOG_INFO(TRACE_MODULE_APP,"收到数据%c\r\n",data);
+ //LOG_INFO(TRACE_MODULE_APP,"收到 %#x\r\n",data);
switch(usart0_receive_state) {
case Usart0ReceiveWaitHead0:
if(data == 0x55) {
@@ -250,7 +327,7 @@
break;
case Usart0ReceiveWaitMsgType:
- if(data == 0x2||data==0x1||data == 0x3||data==0x4||data==0x5) { // 读写回复消息类型
+ if(data == 0x2||data==0x1||data == 0x3||data==0x4||data==0x5||data==0x6) { // 读写回复消息类型
pack_msg_type = data;
usart0_receive_state = Usart0ReceiveWaitDataLen;
send_frame[frame_index++] = data;
@@ -320,14 +397,17 @@
case BIND_DISTANCE_FOR_TAG:
memcpy(&bind_distance,&mUsart2ReceivePack[0],2);
memcpy(&g_com_map[BIND_DISTANCE],&bind_distance,2);
+ bind_flag=1;
save_com_map_to_flash();
break;
case DELETE_ALL:
memset(tag_id_authorization_list,0,sizeof(tag_id_authorization_list));
+ save_taglist_map_to_flash();
break;
case DELETE_PART:
delete_authorization_list(&mUsart2ReceivePack,&tag_id_authorization_list,&tag_id_authorization_list_num);//删表中元素操作
- break;
+ save_taglist_map_to_flash();
+ break;
case SET_DISTANCE_DETERMINATION:
memcpy(&button_determinate_distance,&mUsart2ReceivePack[0],2);//设定开关判断距离
memcpy(&g_com_map[DETERMINATION_DISTANCE],&button_determinate_distance,2);
@@ -340,6 +420,10 @@
memcpy(&g_com_map[NERA_FREQUENCY],&tag_near_frequency,1);
save_com_map_to_flash();
break;
+ case ADD_NEW_TAG_IN_LIST:
+ add_new_tag_id_to_list(&mUsart2ReceivePack,&tag_id_authorization_list,&tag_id_authorization_list_num);
+ save_taglist_map_to_flash();//存入flash
+ break;
default:
break;
}
@@ -407,7 +491,7 @@
case CMD_READ:
//read包中data字节，即mUsartReceivePack[0]表示数据长度；
//从g_com_data结构体中的第index位置读取长度为mUsartReceivePack[0]的字节，发送出来
- SendComMap(pack_datalen,pack_index>>1);
+ SendComMap0(pack_datalen,pack_index>>1);
break;
default:
break;
--
Gitblit v1.9.3