From e4424eb6b50d0300583c422dfb71d58e040f4b9e Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Tue, 11 Jun 2024 19:54:37 +0800
Subject: [PATCH] 继续测试优化
---
Soft/sizhu_ctrl_word.h | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/Soft/sizhu_ctrl_word.h b/Soft/sizhu_ctrl_word.h
index 26219e4..1e4bd01 100644
--- a/Soft/sizhu_ctrl_word.h
+++ b/Soft/sizhu_ctrl_word.h
@@ -2,11 +2,12 @@
#define _SIZHU_CTRL_WORD_H
#include "define_all.h"
#include "extern_rtc.h"
+//#include "sizhu_alarm_record.h"
#define __SYS_STATUS_BYTES_GET(__HANDLE__) (system_status_word_g.status_word.__HANDLE__)
-//����״̬��λ�ʺϵ�bit״̬��λ�����ʺ϶�bit״̬�����緧��״̬ռ���bit��������
+//����״̬��λ�ʺϵ�bit״̬��λ(һ���ж�Ӧ����)�����ʺ϶�bit״̬�����緧��״̬ռ���bit��������
#define __SYS_STATUS_BYTES_STATUS(__HANDLE__, __FLAG__, __ID__) \
do \
{ \
@@ -27,6 +28,7 @@
{ \
if(__SYS_ALARM_CTL_BYTES_GET(__HANDLE__)){ \
system_alarm_word_for_valve_g.alarm_word.__HANDLE__ = SET; \
+ sizhuAlarmRecord(ALARM_HAPPEN,__ID__); \
if(__SYS_ALARM_REPORT_CTL_BYTES_GET(__HANDLE__) ==SET){ \
if(AlarmCntIncrease(__ID__) ==SET){ \
system_alarm_word_g.alarm_word.__HANDLE__ = SET; \
@@ -44,6 +46,7 @@
if ((__SYS_STATUS_BYTES_GET(__HANDLE__) != SET)&&(__SYS_ALARM_CTL_BYTES_GET(__HANDLE__))){ \
system_status_word_g.status_word.__HANDLE__ = SET; \
system_alarm_word_for_valve_g.alarm_word.__HANDLE__ = SET; \
+ sizhuAlarmRecord(ALARM_HAPPEN,__ID__); \
if(__SYS_ALARM_REPORT_CTL_BYTES_GET(__HANDLE__) ==SET){ \
if(AlarmCntIncrease(__ID__) ==SET){ \
system_alarm_word_g.alarm_word.__HANDLE__ = SET; \
--
Gitblit v1.9.3