From 016183bc4926c4fd80599dc7e06542c5396e6fd8 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 12 四月 2025 16:24:25 +0800
Subject: [PATCH] 1.读取机器的Job Event上报； 2.修复在读取CC-Link数据当单元号超出32767时读取失败的问题。
---
SourceCode/Bond/Servo/CEquipment.cpp | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 93d8455..4d23681 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -370,7 +370,6 @@
// 以下根据信号做流程处理
- CStep* pStep;
// Equipment Mode Change Report(0x360)
// Equipment Status Change Report(0x361)
@@ -383,8 +382,24 @@
// 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);
+
+ // EQ Job Event
+ CHECK_READ_STEP_SIGNAL(0x380, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x381, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x386, pszData, size);
+ CHECK_READ_STEP_SIGNAL(0x387, pszData, size);
// Port1 ~ Port4
CHECK_READ_STEP_SIGNAL(0x3e0, pszData, size);
@@ -504,6 +519,16 @@
}
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);
}
}
@@ -753,6 +778,11 @@
&& 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);
@@ -775,4 +805,34 @@
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