From a549ad408c941bfebd863c8537bc30520659c293 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期二, 24 十二月 2024 17:47:41 +0800
Subject: [PATCH] 1.添加主页面 2.修复配方列表切换配方出现标签闪烁问题(主题颜色是白色,标签控件不是,所以刷新的时候先刷新成主题颜色)
---
SourceCode/Bond/BondEq/CBonder.cpp | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CBonder.cpp b/SourceCode/Bond/BondEq/CBonder.cpp
index 4ebcf7a..c4196dd 100644
--- a/SourceCode/Bond/BondEq/CBonder.cpp
+++ b/SourceCode/Bond/BondEq/CBonder.cpp
@@ -185,7 +185,7 @@
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->addMonitor(MONITOR_ID_ALARM, 10001, 10064, MC::SOFT_COMPONENT::M, &m_pPlcData[600]);
pPlc->setName("PLC(1)");
pPlc->setDescription("PLC");
@@ -429,6 +429,27 @@
if (iii % 5 == 0) {
save();
}
+
+
+ // 测试
+ BOOL bTest = FALSE;
+ if (bTest) {
+ static int xx = 0;
+ xx++;
+ memset(&m_pPlcData[600], 0, 260);
+ if (xx == 12) {
+ m_pPlcData[600] = 0x01;
+ for (auto c : m_components) {
+ c->onData(MONITOR_ID_ALARM, &m_pPlcData[600], 260);
+ }
+ }
+ else if (xx == 20) {
+ m_pPlcData[600] = 0x00;
+ for (auto c : m_components) {
+ c->onData(MONITOR_ID_ALARM, &m_pPlcData[600], 260);
+ }
+ }
+ }
}
void CBonder::AddComponent(CComponent* pComponent)
--
Gitblit v1.9.3