From c0d56e6ac7ec15e232fb38c457eefc89cf80e9da Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 21 五月 2025 16:02:09 +0800
Subject: [PATCH] 1.Port Command功能实现;
---
SourceCode/Bond/Servo/CLoadPort.cpp | 302 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 255 insertions(+), 47 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index 9cab3d1..c7c6040 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -1,5 +1,7 @@
#include "stdafx.h"
#include "CLoadPort.h"
+#include "CGlassPool.h"
+#include "Servo.h"
#define CHECK_READ_STEP_SIGNAL2(addr, data, size) { \
@@ -83,7 +85,13 @@
static int writeSignalDev[] = { 0xa0, 0xa1, 0xa2, 0xa3 };
static int addr[] = { STEP_ID_PORT1_TYPE_CHANGE, STEP_ID_PORT2_TYPE_CHANGE, STEP_ID_PORT3_TYPE_CHANGE, STEP_ID_PORT4_TYPE_CHANGE };
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[m_nIndex]);
+ CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ m_nType = (unsigned int)CToolUnits::toInt16(pszData);
+ }
+ return 0;
+ });
pStep->setName(pszName[m_nIndex]);
pStep->setWriteSignalDev(writeSignalDev[m_nIndex]);
if (addStep(addr[m_nIndex], pStep) != 0) {
@@ -98,7 +106,13 @@
static int writeSignalDev[] = { 0xa8, 0xa9, 0xaa, 0xab };
static int addr[] = { STEP_ID_PORT1_MODE_CHANGE, STEP_ID_PORT2_MODE_CHANGE, STEP_ID_PORT3_MODE_CHANGE, STEP_ID_PORT4_MODE_CHANGE };
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[m_nIndex]);
+ CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ m_nMode = (unsigned int)CToolUnits::toInt16(pszData);
+ }
+ return 0;
+ });
pStep->setName(pszName[m_nIndex]);
pStep->setWriteSignalDev(writeSignalDev[m_nIndex]);
if (addStep(addr[m_nIndex], pStep) != 0) {
@@ -113,7 +127,13 @@
static int writeSignalDev[] = { 0xb0, 0xb1, 0xb2, 0xb3 };
static int addr[] = { STEP_ID_PORT1_CASSETTE_TYPE_CHANGE, STEP_ID_PORT2_CASSETTE_TYPE_CHANGE, STEP_ID_PORT3_CASSETTE_TYPE_CHANGE, STEP_ID_PORT4_CASSETTE_TYPE_CHANGE };
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[m_nIndex]);
+ CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ m_nCassetteType = (unsigned int)CToolUnits::toInt16(pszData);
+ }
+ return 0;
+ });
pStep->setName(pszName[m_nIndex]);
pStep->setWriteSignalDev(writeSignalDev[m_nIndex]);
if (addStep(addr[m_nIndex], pStep) != 0) {
@@ -128,7 +148,13 @@
static int writeSignalDev[] = { 0xb8, 0xb9, 0xba, 0xbb };
static int addr[] = { STEP_ID_PORT1_TRANSFER_MODE_CHANGE, STEP_ID_PORT2_TRANSFER_MODE_CHANGE, STEP_ID_PORT3_TRANSFER_MODE_CHANGE, STEP_ID_PORT4_TRANSFER_MODE_CHANGE };
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[m_nIndex]);
+ CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ m_nTransferMode = (unsigned int)CToolUnits::toInt16(pszData);
+ }
+ return 0;
+ });
pStep->setName(pszName[m_nIndex]);
pStep->setWriteSignalDev(writeSignalDev[m_nIndex]);
if (addStep(addr[m_nIndex], pStep) != 0) {
@@ -143,7 +169,13 @@
static int writeSignalDev[] = { 0xc0, 0xc1, 0xc2, 0xc3 };
static int addr[] = { STEP_ID_PORT1_ENABLE_MODE_CHANGE, STEP_ID_PORT2_ENABLE_MODE_CHANGE, STEP_ID_PORT3_ENABLE_MODE_CHANGE, STEP_ID_PORT4_ENABLE_MODE_CHANGE };
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[m_nIndex]);
+ CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ m_bEnable = (unsigned int)CToolUnits::toInt16(pszData) == 1;
+ }
+ return 0;
+ });
pStep->setName(pszName[m_nIndex]);
pStep->setWriteSignalDev(writeSignalDev[m_nIndex]);
if (addStep(addr[m_nIndex], pStep) != 0) {
@@ -158,11 +190,151 @@
static int writeSignalDev[] = { 0xc8, 0xc9, 0xca, 0xcb };
static int addr[] = { STEP_ID_PORT1_TYPE_AUTO_CHANGE, STEP_ID_PORT2_TYPE_AUTO_CHANGE, STEP_ID_PORT3_TYPE_AUTO_CHANGE, STEP_ID_PORT4_TYPE_AUTO_CHANGE };
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[m_nIndex]);
+ CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ m_bAutoChangeEnable = (unsigned int)CToolUnits::toInt16(pszData) == 1;
+ }
+ return 0;
+ });
pStep->setName(pszName[m_nIndex]);
pStep->setWriteSignalDev(writeSignalDev[m_nIndex]);
if (addStep(addr[m_nIndex], pStep) != 0) {
delete pStep;
+ }
+ }
+
+ {
+ // port command
+ // Port Type Change Command
+ static char* pszName[] = { STEP_PORT1_TYPE_CHANGE, STEP_PORT2_TYPE_CHANGE, STEP_PORT3_TYPE_CHANGE, STEP_PORT4_TYPE_CHANGE };
+ static int dev[] = { 0x024, 0x02c, 0x034, 0x03c };
+
+ CEqWriteStep* pStep = new CEqWriteStep();
+ pStep->setName(pszName[m_nIndex]);
+ pStep->setWriteSignalDev(0x100 + m_nIndex);
+ pStep->setDataDev(dev[m_nIndex]);
+ if (addStep(STEP_ID_PROT1_TYPE_CHANGE_REPLY + m_nIndex, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // port command
+ // Port Mode Change Command
+ static char* pszName[] = { STEP_PORT1_MODE_CHANGE, STEP_PORT2_MODE_CHANGE, STEP_PORT3_MODE_CHANGE, STEP_PORT4_MODE_CHANGE };
+ static int dev[] = { 0x025, 0x02d, 0x035, 0x03d };
+
+ CEqWriteStep* pStep = new CEqWriteStep();
+ pStep->setName(pszName[m_nIndex]);
+ pStep->setWriteSignalDev(0x108 + m_nIndex);
+ pStep->setDataDev(dev[m_nIndex]);
+ if (addStep(STEP_ID_PROT1_MODE_CHANGE_REPLY + m_nIndex, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // port command
+ // Port Transfer Mode Change Command
+ static char* pszName[] = { STEP_PORT1_TRANSFER_MODE_CHANGE, STEP_PORT2_TRANSFER_MODE_CHANGE, STEP_PORT3_TRANSFER_MODE_CHANGE, STEP_PORT4_TRANSFER_MODE_CHANGE };
+ static int dev[] = { 0x028, 0x030, 0x038, 0x040 };
+
+ CEqWriteStep* pStep = new CEqWriteStep();
+ pStep->setName(pszName[m_nIndex]);
+ pStep->setWriteSignalDev(0x110 + m_nIndex);
+ pStep->setDataDev(dev[m_nIndex]);
+ if (addStep(STEP_ID_PROT1_TRANSFER_MODE_CHANGE_REPLY + m_nIndex, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // port command
+ // Port Enable Mode Change Command
+ static char* pszName[] = { STEP_PORT1_ENABLE_MODE_CHANGE, STEP_PORT2_ENABLE_MODE_CHANGE, STEP_PORT3_ENABLE_MODE_CHANGE, STEP_PORT4_ENABLE_MODE_CHANGE };
+ static int dev[] = { 0x029, 0x031, 0x039, 0x041 };
+
+ CEqWriteStep* pStep = new CEqWriteStep();
+ pStep->setName(pszName[m_nIndex]);
+ pStep->setWriteSignalDev(0x118 + m_nIndex);
+ pStep->setDataDev(dev[m_nIndex]);
+ if (addStep(STEP_ID_PROT1_ENABLE_MODE_CHANGE_REPLY + m_nIndex, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // port command
+ // Port Type Auto Change Command
+ static char* pszName[] = { STEP_PORT1_TYPE_AUTO_CHANGE, STEP_PORT2_TYPE_AUTO_CHANGE, STEP_PORT3_TYPE_AUTO_CHANGE, STEP_PORT4_TYPE_AUTO_CHANGE };
+ static int dev[] = { 0x02A, 0x032, 0x03A, 0x042 };
+
+ CEqWriteStep* pStep = new CEqWriteStep();
+ pStep->setName(pszName[m_nIndex]);
+ pStep->setWriteSignalDev(0x120 + m_nIndex);
+ pStep->setDataDev(dev[m_nIndex]);
+ if (addStep(STEP_ID_PROT1_TYPE_AUTO_CHANGE_REPLY + m_nIndex, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // port command
+ // Port Cassette Type Change Command
+ static char* pszName[] = { STEP_PORT1_CASSETTE_TYPE_CHANGE, STEP_PORT2_CASSETTE_TYPE_CHANGE, STEP_PORT3_CASSETTE_TYPE_CHANGE, STEP_PORT4_CASSETTE_TYPE_CHANGE };
+ static int dev[] = { 0x026, 0x02E, 0x036, 0x03E };
+
+ CEqWriteStep* pStep = new CEqWriteStep();
+ pStep->setName(pszName[m_nIndex]);
+ pStep->setWriteSignalDev(0x128 + m_nIndex);
+ pStep->setDataDev(dev[m_nIndex]);
+ if (addStep(STEP_ID_PROT1_TYPE_AUTO_CHANGE_REPLY + m_nIndex, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ char* pszName[6][4] = {
+ {STEP_EQ_PORT1_EMPTY, STEP_EQ_PORT2_EMPTY, STEP_EQ_PORT3_EMPTY, STEP_EQ_PORT4_EMPTY},
+ {STEP_EQ_PORT1_LOAD_EADY, STEP_EQ_PORT2_LOAD_EADY, STEP_EQ_PORT3_LOAD_EADY, STEP_EQ_PORT4_LOAD_EADY},
+ {STEP_EQ_PORT1_LOADED, STEP_EQ_PORT2_LOADED, STEP_EQ_PORT3_LOADED, STEP_EQ_PORT4_LOADED},
+ {STEP_EQ_PORT1_INUSE, STEP_EQ_PORT2_INUSE, STEP_EQ_PORT3_INUSE, STEP_EQ_PORT4_INUSE},
+ {STEP_EQ_PORT1_UNLOAD_EADY, STEP_EQ_PORT2_UNLOAD_EADY, STEP_EQ_PORT3_UNLOAD_EADY, STEP_EQ_PORT4_UNLOAD_EADY},
+ {STEP_EQ_PORT1_BLOCKED, STEP_EQ_PORT2_BLOCKED, STEP_EQ_PORT3_BLOCKED, STEP_EQ_PORT4_BLOCKED}
+ };
+ static int dev[] = { 0x6050, 0x6070, 0x6090, 0x60b0 };
+ static int writeSignalDev[6][4] = {
+ {0xd8, 0xd9, 0xda, 0xdb},
+ {0xe0, 0xe1, 0xe2, 0xe3},
+ {0xe8, 0xe9, 0xea, 0xeb},
+ {0xf0, 0xf1, 0xf2, 0xf3},
+ {0xf8, 0xf9, 0xfa, 0xfb},
+ {0x100, 0x101, 0x102, 0x103}
+ };
+ static int addr[6][4] = {
+ { STEP_ID_PORT1_EMPTY, STEP_ID_PORT2_EMPTY, STEP_ID_PORT3_EMPTY, STEP_ID_PORT4_EMPTY },
+ { STEP_ID_PORT1_LOAD_READY, STEP_ID_PORT2_LOAD_READY, STEP_ID_PORT3_LOAD_READY, STEP_ID_PORT4_LOAD_READY },
+ { STEP_ID_PORT1_LOADED, STEP_ID_PORT2_LOADED, STEP_ID_PORT3_LOADED, STEP_ID_PORT4_LOADED },
+ { STEP_ID_PORT1_INUSE, STEP_ID_PORT2_INUSE, STEP_ID_PORT3_INUSE, STEP_ID_PORT4_INUSE },
+ { STEP_ID_PORT1_UNLOAD_READY, STEP_ID_PORT2_UNLOAD_READY, STEP_ID_PORT3_UNLOAD_READY, STEP_ID_PORT4_UNLOAD_READY },
+ { STEP_ID_PORT1_BLOCKED, STEP_ID_PORT2_BLOCKED, STEP_ID_PORT3_BLOCKED, STEP_ID_PORT4_BLOCKED },
+ };
+
+ for (int i = 0; i < 6; i++) {
+ CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], 32 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ decodePortStatusReport((CStep*)pFrom, pszData, size);
+ }
+ return -1;
+ });
+ pStep->setName(pszName[i][m_nIndex]);
+ pStep->setProp("Port", (void*)(__int64)(m_nIndex + 1));
+ pStep->setWriteSignalDev(writeSignalDev[i][m_nIndex]);
+ if (addStep(addr[i][m_nIndex], pStep) != 0) {
+ delete pStep;
+ }
}
}
}
@@ -206,19 +378,6 @@
int CLoadPort::outputGlass(int port)
{
- // 如果列表中没有Panel,模拟生成10张
- if (m_glassList.empty()) {
- static int ii = 0;
- char szBuffer[64];
- LOGI("<CLoadPort>模拟生成10张PANEL");
- for (int i = 0; i < 10; i++) {
- sprintf_s(szBuffer, "P20250320A1A%d", ++ii);
- CGlass* pGlass = new CGlass();
- pGlass->setID(szBuffer);
- addGlassToList(pGlass);
- }
- }
-
return __super::outputGlass(port);
}
@@ -478,41 +637,90 @@
CHECK_READ_STEP_SIGNAL2(transferMode[m_nIndex], pszData, size);
CHECK_READ_STEP_SIGNAL2(enable[m_nIndex], pszData, size);
CHECK_READ_STEP_SIGNAL2(autoType[m_nIndex], pszData, size);
+
+
+ static int typeReply[] = { STEP_ID_PROT1_TYPE_CHANGE_REPLY, STEP_ID_PROT2_TYPE_CHANGE_REPLY,
+ STEP_ID_PROT3_TYPE_CHANGE_REPLY, STEP_ID_PROT4_TYPE_CHANGE_REPLY };
+ static int modeReply[] = { STEP_ID_PROT1_MODE_CHANGE_REPLY, STEP_ID_PROT2_MODE_CHANGE_REPLY,
+ STEP_ID_PROT3_MODE_CHANGE_REPLY, STEP_ID_PROT4_MODE_CHANGE_REPLY };
+ static int transferModeReply[] = { STEP_ID_PROT1_TRANSFER_MODE_CHANGE_REPLY, STEP_ID_PROT2_TRANSFER_MODE_CHANGE_REPLY,
+ STEP_ID_PROT3_TRANSFER_MODE_CHANGE_REPLY, STEP_ID_PROT4_TRANSFER_MODE_CHANGE_REPLY };
+ static int enableModeReply[] = { STEP_ID_PROT1_ENABLE_MODE_CHANGE_REPLY, STEP_ID_PROT2_ENABLE_MODE_CHANGE_REPLY,
+ STEP_ID_PROT3_ENABLE_MODE_CHANGE_REPLY, STEP_ID_PROT4_ENABLE_MODE_CHANGE_REPLY };
+ static int typeAutoReply[] = { STEP_ID_PROT1_TYPE_AUTO_CHANGE_REPLY, STEP_ID_PROT2_TYPE_AUTO_CHANGE_REPLY,
+ STEP_ID_PROT3_TYPE_AUTO_CHANGE_REPLY, STEP_ID_PROT4_TYPE_AUTO_CHANGE_REPLY };
+ static int cassetteTypeReply[] = { STEP_ID_PROT1_CASSETTE_TYPE_CHANGE_REPLY, STEP_ID_PROT2_CASSETTE_TYPE_CHANGE_REPLY,
+ STEP_ID_PROT3_CASSETTE_TYPE_CHANGE_REPLY, STEP_ID_PROT4_CASSETTE_TYPE_CHANGE_REPLY };
+
+ CHECK_READ_STEP_SIGNAL2(typeReply[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL2(modeReply[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL2(transferModeReply[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL2(enableModeReply[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL2(typeAutoReply[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL2(cassetteTypeReply[m_nIndex], pszData, size);
}
- int CLoadPort::onStepEvent(CStep* pStep, int code)
+ int CLoadPort::decodePortStatusReport(CStep* pStep, const char* pszData, size_t size)
{
- int nRet = CEquipment::onStepEvent(pStep, code);
- if (nRet > 0) return nRet;
+ CPortStatusReport portStatusReport;
+ int nRet = portStatusReport.unserialize(&pszData[0], (int)size);
+ if (nRet < 0) return nRet;
+ m_portStatusReport.copyEx(portStatusReport);
- if (code == STEP_EVENT_READDATA) {
- if (isPortTypeStep(pStep)) {
- SERVO::CEqReadIntStep* pReadIntStep = (SERVO::CEqReadIntStep*)pStep;
- m_nType = pReadIntStep->getValue();
- }
- else if(isPortModeStep(pStep)) {
- SERVO::CEqReadIntStep* pReadIntStep = (SERVO::CEqReadIntStep*)pStep;
- m_nMode = pReadIntStep->getValue();
- }
- else if (isPortCassetteTypeStep(pStep)) {
- SERVO::CEqReadIntStep* pReadIntStep = (SERVO::CEqReadIntStep*)pStep;
- m_nCassetteType = pReadIntStep->getValue();
- }
- else if (isPortTransferModeStep(pStep)) {
- SERVO::CEqReadIntStep* pReadIntStep = (SERVO::CEqReadIntStep*)pStep;
- m_nTransferMode = pReadIntStep->getValue();
- }
- else if (isPortEnableStep(pStep)) {
- SERVO::CEqReadIntStep* pReadIntStep = (SERVO::CEqReadIntStep*)pStep;
- m_bEnable = pReadIntStep->getValue() == 1;
- }
- else if (isPortTypeAutoChangeEnableStep(pStep)) {
- SERVO::CEqReadIntStep* pReadIntStep = (SERVO::CEqReadIntStep*)pStep;
- m_bAutoChangeEnable = pReadIntStep->getValue() == 1;
- }
+
+ // 缓存Attribute,用于调试时显示信息
+ unsigned int weight = 201;
+ CAttributeVector attrubutes;
+ m_portStatusReport.getAttributeVector(attrubutes, weight);
+ pStep->addAttributeVector(attrubutes);
+
+
+ LOGI("<CCassetteTranserStateStep>decodePortStatusReport<Status:%d, CassetteSequenceNo:%d>",
+ m_portStatusReport.getPortStatus(), m_portStatusReport.getCassetteSequenceNo());
+
+
+ return nRet;
+ }
+
+ /*
+ * 生成测试用的玻璃列表
+ */
+ int CLoadPort::testGenerateGlassList(MaterialsType type, int count, const char* pszPrefix, int startSuffix)
+ {
+ // 如果非空就不生成了
+ Lock();
+ if (!m_glassList.empty()) {
+ Unlock();
+ return -1;
}
+ Unlock();
+
+ char szBuffer[64];
+ int suffix = startSuffix;
+ for (int i = 0; i < count; i++) {
+ CJobDataB jb;
+ CJobDataS js;
+
+ sprintf_s(szBuffer, "%s%d", pszPrefix, suffix++);
+ jb.setGlassId(szBuffer);
+ js.setMaterialsType((int)type);
+ if (type == MaterialsType::G1) {
+ js.setGlass1Id(szBuffer);
+ }
+ else if (type == MaterialsType::G2) {
+ js.setGlass2Id(szBuffer);
+ }
+
+ CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
+ pGlass->setID(szBuffer);
+ pGlass->setJobDataB(&jb);
+ pGlass->setType(type);
+ pGlass->setJobDataS(&js);
+ addGlassToList(pGlass);
+ }
return 0;
}
+
}
--
Gitblit v1.9.3