From a14c8cb51345fa3342addde7fa584465c4bc7083 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 09 十二月 2024 17:58:17 +0800
Subject: [PATCH] 1.加入GDI+ 2.警告信息获取;

---
 SourceCode/Bond/BondEq/CBonder.cpp |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/BondEq/CBonder.cpp b/SourceCode/Bond/BondEq/CBonder.cpp
index 9f81e4e..4ebcf7a 100644
--- a/SourceCode/Bond/BondEq/CBonder.cpp
+++ b/SourceCode/Bond/BondEq/CBonder.cpp
@@ -175,11 +175,18 @@
 				c->onData(id, &m_pPlcData[400], 184);
 			}
 		}
+		else if (id == MONITOR_ID_ALARM) {
+			for (auto c : m_components) {
+				c->onData(id, &m_pPlcData[600], 260);
+			}
+		}
 	};
 	pPlc->setListener(listener);
 	pPlc->addMonitor(1, 4400, 4499, MC::SOFT_COMPONENT::D, m_pPlcData);
 	pPlc->addMonitor(2, 4500, 4599, MC::SOFT_COMPONENT::D, &m_pPlcData[200]);
 	pPlc->addMonitor(3, 4700, 4791, MC::SOFT_COMPONENT::D, &m_pPlcData[400]);
+	pPlc->addMonitor(MONITOR_ID_ALARM, 1001, 1064, MC::SOFT_COMPONENT::M, &m_pPlcData[600]);
+	
 	pPlc->setName("PLC(1)");
 	pPlc->setDescription("PLC");
 	pPlc->setIndex(0);
@@ -201,7 +208,6 @@
 	CAlarmMonitor* pAlarmMonitor1 = new CAlarmMonitor();
 	pAlarmMonitor1->setName("警告信息");
 	pAlarmMonitor1->setDescription("警告信息监控");
-	pAlarmMonitor1->setBeginAddr(4461 - 4400);
 	pAlarmMonitor1->setIndex(0);
 	pAlarmMonitor1->readAlarmListFromFile((LPTSTR)(LPCTSTR)strAlarmFile);
 	AddComponent(pAlarmMonitor1);

--
Gitblit v1.9.3