From 1bc4fecb9cc1641ed3ad0a2fda30766fc06fb13e Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 01 四月 2025 16:05:07 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEquipment.cpp | 132 ++++++++++++++++++++++++++++++-------------
1 files changed, 91 insertions(+), 41 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index ffc0c87..85f5a0b 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -3,11 +3,27 @@
#include "ToolUnits.h"
+#define CHECK_READ_STEP_SIGNAL(addr, data, size) { \
+ BOOL bFlag = isBitOn(data, size, addr); \
+ SERVO::CStep* pStep = getStep(addr); \
+ if (pStep != nullptr) { \
+ ((CReadStep*)pStep)->onReadSignal(bFlag ? addr : 0); \
+ } \
+}
+
+#define CHECK_WRITE_STEP_SIGNAL(addr, data, size) { \
+ BOOL bFlag = isBitOn(data, size, addr); \
+ SERVO::CStep* pStep = getStep(addr); \
+ if (pStep != nullptr) { \
+ ((CWriteStep*)pStep)->onRecvSignal(bFlag ? addr : 0); \
+ } \
+}
+
namespace SERVO {
CEquipment::CEquipment() : m_nID(0), m_strName(""), m_strDescription(""), m_station(0, 255)
{
- m_listener = { nullptr, nullptr, nullptr };
+ m_listener = { nullptr, nullptr, nullptr, nullptr };
m_alive = {FALSE, 0, FALSE};
m_bCimState = FALSE;
m_bUpstreamInline = FALSE;
@@ -49,6 +65,7 @@
{
m_listener.onAlive = listener.onAlive;
m_listener.onCimStateChanged = listener.onCimStateChanged;
+ m_listener.onAlarm = listener.onAlarm;
m_listener.onDataChanged = listener.onDataChanged;
}
@@ -358,40 +375,65 @@
// Equipment Status Change Report(0x361)
// Equipment Alarm Change Report(0x362 ~ 0x366)
for (int i = 0; i < 7; i++) {
- checkReadStepSignal(0x360 + i, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x360 + i, pszData, size);
}
// CIM Mode
- checkWriteStepSignal(0x350, pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(0x350, pszData, size);
// Port1 ~ Port4
- checkReadStepSignal(0x3e0, pszData, size);
- checkReadStepSignal(0x3e1, pszData, size);
- checkReadStepSignal(0x3e2, pszData, size);
- checkReadStepSignal(0x3e3, pszData, size);
- checkReadStepSignal(0x3e8, pszData, size);
- checkReadStepSignal(0x3e9, pszData, size);
- checkReadStepSignal(0x3ea, pszData, size);
- checkReadStepSignal(0x3eb, pszData, size);
- checkReadStepSignal(0x3f0, pszData, size);
- checkReadStepSignal(0x3f1, pszData, size);
- checkReadStepSignal(0x3f2, pszData, size);
- checkReadStepSignal(0x3f3, pszData, size);
- checkReadStepSignal(0x3f8, pszData, size);
- checkReadStepSignal(0x3f9, pszData, size);
- checkReadStepSignal(0x3fa, pszData, size);
- checkReadStepSignal(0x3fb, pszData, size);
- checkReadStepSignal(0x400, pszData, size);
- checkReadStepSignal(0x401, pszData, size);
- checkReadStepSignal(0x402, pszData, size);
- checkReadStepSignal(0x403, pszData, size);
- checkReadStepSignal(0x408, pszData, size);
- checkReadStepSignal(0x409, pszData, size);
- checkReadStepSignal(0x40a, pszData, size);
- checkReadStepSignal(0x40b, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3e0, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3e1, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3e2, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3e3, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3e8, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3e9, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3ea, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3eb, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3f0, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3f1, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3f2, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3f3, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3f8, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3f9, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3fa, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x3fb, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x400, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x401, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x402, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x403, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x408, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x409, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x40a, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x40b, pszData, size);
+ // CEqCassetteTranserStateStep
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_EMPTY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_LOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_LOADED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_INUSE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_UNLOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_BLOCKED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_EMPTY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_LOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_LOADED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_INUSE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_UNLOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_BLOCKED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_EMPTY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_LOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_LOADED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_INUSE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_UNLOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_BLOCKED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_EMPTY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_LOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_LOADED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_INUSE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_UNLOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_BLOCKED, pszData, size);
}
BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -442,6 +484,26 @@
{
if (index >= VCR_MAX) return FALSE;
return m_bVCREnable[index];
+ }
+
+ int CEquipment::onStepEvent(CStep* pStep, int code)
+ {
+ if (code == STEP_EVENT_READDATA) {
+ if (isAlarmStep(pStep)) {
+ SERVO::CEqAlarmStep* pEqAlarmStep = (SERVO::CEqAlarmStep*)pStep;
+ int state = pEqAlarmStep->getAlarmState();
+ ASSERT(state == 0 || state == 1);
+ if (m_listener.onAlarm != nullptr) {
+ m_listener.onAlarm(this, state,
+ pEqAlarmStep->getAlarmId(),
+ pEqAlarmStep->getUnitId(),
+ pEqAlarmStep->getAlarmLevel());
+ }
+ }
+ }
+
+
+ return 0;
}
CPin* CEquipment::addPin(PinType type, char* pszName)
@@ -675,21 +737,9 @@
return pGlass;
}
- void CEquipment::checkReadStepSignal(unsigned int addr, const char* pszData, size_t size)
+ bool CEquipment::isAlarmStep(SERVO::CStep* pStep)
{
- BOOL bFlag = isBitOn(pszData, size, addr);
- SERVO::CStep* pStep = getStep(addr);
- if (pStep != nullptr) {
- ((CReadStep*)pStep)->onReadSignal(bFlag ? 1 : 0);
- }
+ return CToolUnits::startsWith(pStep->getName(), STEP_ALARM_START);
}
- void CEquipment::checkWriteStepSignal(unsigned int addr, const char* pszData, size_t size)
- {
- BOOL bFlag = isBitOn(pszData, size, addr);
- SERVO::CStep* pStep = getStep(addr);
- if (pStep != nullptr) {
- ((CWriteStep*)pStep)->onRecvSignal(bFlag);
- }
- }
}
--
Gitblit v1.9.3