From 71f8bdb7c63acc381d71105bb950411029f4250f Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Mon, 03 Jun 2024 20:00:58 +0800
Subject: [PATCH] 测试远传
---
Soft/sizhu_ctrl_word.h | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Soft/sizhu_ctrl_word.h b/Soft/sizhu_ctrl_word.h
index bfc24c9..26219e4 100644
--- a/Soft/sizhu_ctrl_word.h
+++ b/Soft/sizhu_ctrl_word.h
@@ -59,7 +59,7 @@
#define __SYS_ALARM_CTL_BYTES_GET(__HANDLE__) (system_alarm_ctrl_word_g.alarm_ctl_word.__HANDLE__)
-#define __SYS_ALARM_REPORT_CTL_BYTES_GET(__HANDLE__) (system_alarm_report_ctrl_word_g.alarm_report_ctrl_word.__HANDLE__)
+#define __SYS_ALARM_REPORT_CTL_BYTES_GET(__HANDLE__) (system_alarm_report_ctrl_word_g.alarm_ctl_word.__HANDLE__)
#define SYSTEM_SINGLE_BIT_SET1 0x0001
@@ -467,11 +467,11 @@
SYS_ALARM_T alarm_ctl_word;
}SYSTEM_ALARM_CTRL_WORD_T; // ����������
-typedef union
-{
- uint16_t alarm_ctl_send_union[SYSTEM_ALARM_WORD_INF_LENGTH >> 1];
- SYS_ALARM_T alarm_report_ctrl_word;
-} SYSTEM_ALARM_REPORT_CTRL_WORD_T; // �����ϱ�����
+//typedef union
+//{
+// uint16_t alarm_ctl_send_union[SYSTEM_ALARM_WORD_INF_LENGTH >> 1];
+// SYS_ALARM_T alarm_report_ctrl_word;
+//} SYSTEM_ALARM_REPORT_CTRL_WORD_T; // �����ϱ����� ��ʽ������������һ�������Բ����ٶ���һ���ṹ����
/*********************************�������������**************************************/
@@ -782,7 +782,7 @@
extern SYSTEM_ALARM_WORD_T system_alarm_word_g;
extern SYSTEM_ALARM_WORD_T system_alarm_word_for_valve_g; //���ڷ��أ��ж��귧��֮������
extern SYSTEM_ALARM_CTRL_WORD_T system_alarm_ctrl_word_g;
-extern SYSTEM_ALARM_REPORT_CTRL_WORD_T system_alarm_report_ctrl_word_g;
+extern SYSTEM_ALARM_CTRL_WORD_T system_alarm_report_ctrl_word_g;
extern VALVE_CTL_BYTES_UNION_T valve_ctl_bytes_g;
--
Gitblit v1.9.3