From 87c5da242b0502626deac934d75579559032c2c8 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 12 四月 2025 09:01:16 +0800
Subject: [PATCH] 1.CIM Message set（下发CIM消息到PLC），测试成功 2.CIM Message clear(清除PLC中的指定CIM消息)， 测试成功 3.CIM Message Confirm（PLC确认CIM消息事件检测和获取），测试成功
---
SourceCode/Bond/Servo/CEquipment.cpp | 90 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 86 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index e61b4b3..595b2ee 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,18 @@
// CIM Mode
CHECK_WRITE_STEP_SIGNAL(0x350, pszData, size);
+ // CIM Message Set
+ CHECK_WRITE_STEP_SIGNAL(0x351, pszData, size);
+
+ // CIM Message Clear
+ CHECK_WRITE_STEP_SIGNAL(0x352, pszData, size);
+
+ // CIM Message Confirm
+ CHECK_READ_STEP_SIGNAL(0x369, pszData, size);
+
+
+ // EQ Mode
+ CHECK_WRITE_STEP_SIGNAL(0x355, pszData, size);
// Port1 ~ Port4
CHECK_READ_STEP_SIGNAL(0x3e0, pszData, size);
@@ -495,11 +507,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 +772,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