From e1b3a1f5e35b09be95d694bc259b0ba92c4d3436 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 26 四月 2025 10:55:23 +0800
Subject: [PATCH] 1.再一次修改地址；
---
SourceCode/Bond/Servo/CEquipment.cpp | 160 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 124 insertions(+), 36 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index e61b4b3..86a2bf2 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;
@@ -311,7 +311,7 @@
// 以下解释和处理数据
BOOL bFlag;
- int index = 0x340;
+ int index = 0x840;
// alive
@@ -328,7 +328,7 @@
}
}
}
-
+
// CIM State
bFlag = isBitOn(pszData, size, ++index);
if (!equalBool(m_bCimState, bFlag)) {
@@ -370,45 +370,63 @@
// 以下根据信号做流程处理
- CStep* pStep;
-
- // Equipment Mode Change Report(0x360)
- // Equipment Status Change Report(0x361)
- // Equipment Alarm Change Report(0x362 ~ 0x366)
for (int i = 0; i < 7; i++) {
- CHECK_READ_STEP_SIGNAL(0x360 + i, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_EQMODE_CHANGED + i, pszData, size);
}
// CIM Mode
- CHECK_WRITE_STEP_SIGNAL(0x350, pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_CIMMODE_CHANGED_CMD_REPLY, pszData, size);
+ // CIM Message Set cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_CIM_MSG_SET_CMD_REPLY, pszData, size);
+
+ // CIM Message Clear cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_CIM_MSG_CLEAR_CMD_REPLY, pszData, size);
+
+ // Datetime set cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_DATETIME_SET_CMD_REPLY, pszData, size);
+
+ // vcr enable cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_VCR_ENABLE_CMD_REPLY, pszData, size);
+
+ // EQ mode change cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_EQMODE_CHANGE_CMD_REPLY, pszData, size);
+
+ // CIM Message Confirm
+ CHECK_READ_STEP_SIGNAL(STEP_ID_CIM_MSG_CONFIRM_REPORT, pszData, size);
+
+ // EQ Job Event
+ CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS1, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS2, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS1, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS2, pszData, size);
// Port1 ~ Port4
- 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);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTE_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTE_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTE_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTE_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_TRANSFER_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_TRANSFER_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_TRANSFER_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_TRANSFER_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_ENABLE_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_ENABLE_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_ENABLE_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_ENABLE_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_TYPE_AUTO_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_TYPE_AUTO_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_TYPE_AUTO_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_TYPE_AUTO_CHANGE, pszData, size);
// CEqCassetteTranserStateStep
CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_EMPTY, pszData, size);
@@ -495,11 +513,23 @@
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;
+ }
+ else if (isCimMessageConfirmStep(pStep)) {
+ SERVO::CEqReadIntStep* pEqReadIntStep = (SERVO::CEqReadIntStep*)pStep;
+ int value = pEqReadIntStep->getValue();
+ // 此处将value按高低位拆分为message id和panel no.
+ // 可能还需要上报到cim
+ short msgId, panelNo;
+ msgId = (value & 0xffff0000 >> 16);
+ panelNo = (value & 0xffff);
+ LOGI("Cim Message Confirm(msgID = %d, panel no.=%d).", msgId, panelNo);
}
}
@@ -748,4 +778,62 @@
return CToolUnits::startsWith(pStep->getName(), "EQPort")
&& pStep->getName().find("Cassette") != std::string::npos;
}
-}
+
+ bool CEquipment::isCimMessageConfirmStep(SERVO::CStep* pStep)
+ {
+ return pStep->getName().compare(STEP_EQ_CIM_MESSAGE_CONFIRM) == 0;
+ }
+
+ 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();
+ }
+
+ int CEquipment::setCimMessage(const char* pszMessage, short id, short nTouchPanelNo)
+ {
+ SERVO::CEqCimMessageCmdStep* pStep = (SERVO::CEqCimMessageCmdStep*)getStepWithName(STEP_CIM_MESSAGE_CMD);
+ if (pStep == nullptr) {
+ return -1;
+ }
+
+ return pStep->setCimMessage(pszMessage, id, nTouchPanelNo);
+ }
+
+ int CEquipment::clearCimMessage(short id, short nTouchPanelNo)
+ {
+ SERVO::CEqCimMessageClearStep* pStep = (SERVO::CEqCimMessageClearStep*)getStepWithName(STEP_CIM_MESSAGE_CLEAR);
+ if (pStep == nullptr) {
+ return -1;
+ }
+
+ return pStep->clearCimMessage(id, nTouchPanelNo);
+ }
+
+ int CEquipment::setDateTime(short year, short month, short day, short hour, short minute, short second)
+ {
+ SERVO::CEqDateTimeSetCmdStep* pStep = (SERVO::CEqDateTimeSetCmdStep*)getStepWithName(STEP_DATETIME_SET_CMD);
+ if (pStep == nullptr) {
+ return -1;
+ }
+
+ return pStep->setDateTime(year, month, day, hour, minute, second);
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3