From 92dee0d8070594c351008d02fd9645c9e5de80a7 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 11 四月 2025 09:01:04 +0800
Subject: [PATCH] 1.车间测试部分功能； 2.警告测试，修复未能显示警告到报表中的问题。
---
SourceCode/Bond/Servo/CEquipment.cpp | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index e61b4b3..93d8455 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -24,7 +24,7 @@
CEquipment::CEquipment() : m_nID(0), m_strName(""), m_strDescription(""), m_station(0, 255)
{
m_listener = { nullptr, nullptr, nullptr, nullptr };
- m_alive = {FALSE, 0, FALSE};
+ m_alive = { FALSE, 0, FALSE };
m_bCimState = FALSE;
m_bUpstreamInline = FALSE;
m_bDownstreamInline = FALSE;
@@ -328,7 +328,7 @@
}
}
}
-
+
// CIM State
bFlag = isBitOn(pszData, size, ++index);
if (!equalBool(m_bCimState, bFlag)) {
@@ -383,6 +383,8 @@
// CIM Mode
CHECK_WRITE_STEP_SIGNAL(0x350, pszData, size);
+ // EQ Mode
+ CHECK_WRITE_STEP_SIGNAL(0x355, pszData, size);
// Port1 ~ Port4
CHECK_READ_STEP_SIGNAL(0x3e0, pszData, size);
@@ -495,11 +497,13 @@
int state = pEqAlarmStep->getAlarmState();
ASSERT(state == 0 || state == 1);
if (m_listener.onAlarm != nullptr) {
- m_listener.onAlarm(this, state,
+ m_listener.onAlarm(this, state,
pEqAlarmStep->getAlarmId(),
pEqAlarmStep->getUnitId(),
pEqAlarmStep->getAlarmLevel());
}
+
+ return 1;
}
}
@@ -748,4 +752,27 @@
return CToolUnits::startsWith(pStep->getName(), "EQPort")
&& pStep->getName().find("Cassette") != std::string::npos;
}
-}
+
+ int CEquipment::setEqMode(short mode)
+ {
+ SERVO::CEqModeChangeStep* pStep = (SERVO::CEqModeChangeStep*)getStepWithName(STEP_EQ_MODE_CHANGE);
+ if (pStep == nullptr) {
+ return -1;
+ }
+
+ return pStep->setEqMode(mode);
+ }
+
+ int CEquipment::setCimMode(BOOL bOn)
+ {
+ SERVO::CEqCimModeChangeStep* pStep = (SERVO::CEqCimModeChangeStep*)getStepWithName(STEP_CIM_MODE_CHANGE);
+ if (pStep == nullptr) {
+ return -1;
+ }
+
+ if (bOn)
+ return pStep->cimOn();
+ else
+ return pStep->cimOff();
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3