From 2c357cdc55074c72d951ef49a932867082a02647 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 07 八月 2025 14:21:29 +0800
Subject: [PATCH] 1.Master软件启动时，Master写给EFEM的bit数据区(0x0 ~ 0x1087),全部清0
---
SourceCode/Bond/BondEq/Alarm.cpp | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/BondEq/Alarm.cpp b/SourceCode/Bond/BondEq/Alarm.cpp
index 266e4ca..ef82a47 100644
--- a/SourceCode/Bond/BondEq/Alarm.cpp
+++ b/SourceCode/Bond/BondEq/Alarm.cpp
@@ -107,22 +107,24 @@
if (ar.IsStoring())
{
Lock();
+ ar << m_nUnitId;
+ ar << m_nId;
+ ar << m_nLevel;
ar << m_timeOn;
ar << m_timeOff;
ar << m_nStatus;
- ar << m_nId;
- ar << m_nLevel;
WriteString(ar, m_strText);
Unlock();
}
else
{
Lock();
+ ar >> m_nUnitId;
+ ar >> m_nId;
+ ar >> m_nLevel;
ar >> m_timeOn;
ar >> m_timeOff;
ar >> m_nStatus;
- ar >> m_nId;
- ar >> m_nLevel;
ReadString(ar, m_strText);
Unlock();
}
--
Gitblit v1.9.3