From 6ea1a42391f86e72f53042a966dae970a3fd77cb Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 17 May 2024 17:18:57 +0800
Subject: [PATCH] 阀门控制进一步完善
---
Soft/linked_list.c | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/Soft/linked_list.c b/Soft/linked_list.c
index 1517ba3..5dd93b2 100644
--- a/Soft/linked_list.c
+++ b/Soft/linked_list.c
@@ -30,7 +30,9 @@
//˫��ָ�룺ָ��ָ���ָ�룬�����ı�ָ���ַ��ֵ�������˫��ָ��
void Alarm_List_Node_PushBack(ALARM_NODE_T ** ppList,SYS_ALARM_VALVE_T alarm_id)
{
- if(alarm_id != AV_NORMAL)
+ ALARM_NODE_T * tail, * now_ptr;
+
+ if(alarm_id != ALARM_ID_NORMAL)
{
alarm_list_cnt++;
if(*ppList == NULL)
@@ -39,7 +41,17 @@
}
else
{
- ALARM_NODE_T * tail = *ppList;
+ //�ж��������Ƿ��Ѿ����ڸñ���id���Ѿ����ڲ��ٲ�������
+ do{
+ if(now_ptr->list_data == alarm_id){
+ return;
+ }else{
+ now_ptr = now_ptr->alarm_list_next;
+ }
+
+ }while(now_ptr != NULL);
+
+ tail = *ppList;
while(tail->alarm_list_next)
tail = tail->alarm_list_next;
tail->alarm_list_next = Alarm_List_Node_Add(alarm_id);
@@ -72,7 +84,7 @@
//�������м�ɾ��
void Alarm_List_Node_Deleted(ALARM_NODE_T ** ppHeadList,SYS_ALARM_VALVE_T alarm_id)
{
- if(alarm_id != AV_NORMAL)
+ if(alarm_id != ALARM_ID_NORMAL)
{
ALARM_NODE_T * last_ptr,* now_ptr;
if(*ppHeadList == NULL)
--
Gitblit v1.9.3