From 58b5bb07de4bcbf670db5ad79ff8b9bd7afc1e28 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 17 六月 2025 11:35:47 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEFEM.cpp | 177 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 124 insertions(+), 53 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 05e7074..33e6b29 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -22,6 +22,10 @@
m_pPort[3] = nullptr;
m_pAligner = nullptr;
m_pFliper = nullptr;
+ m_robotData.status = ROBOT_STATUS::Idle;
+ m_robotData.position = ROBOT_POSITION::Port1;
+ m_robotData.armState[0] = FALSE;
+ m_robotData.armState[1] = FALSE;
}
CEFEM::~CEFEM()
@@ -126,15 +130,15 @@
return 0;
}
- int CEFEM::SendHome(int seq)
+ int CEFEM::robotSendHome(int seq, ONWRITED onWritedBlock/* = nullptr*/)
{
SERVO::ROBOT_CMD_PARAM cmd = {};
cmd.sequenceNo = static_cast<short>(seq);
cmd.rcmd = static_cast<short>(SERVO::RCMD::Robot_home);
- return robotCmd(cmd);
+ return robotCmd(cmd, onWritedBlock);
}
- int CEFEM::SendTransfer(int seq, int armNo, int fromPos, int toPos, int fromSlot, int toSlot)
+ int CEFEM::robotSendTransfer(int seq, int armNo, int fromPos, int toPos, int fromSlot, int toSlot, ONWRITED onWritedBlock/* = nullptr*/)
{
SERVO::ROBOT_CMD_PARAM cmd = {};
cmd.sequenceNo = static_cast<short>(seq);
@@ -144,10 +148,10 @@
cmd.getSlotNo = static_cast<short>(fromSlot);
cmd.putPosition = static_cast<short>(toPos);
cmd.putSlotNo = static_cast<short>(toSlot);
- return robotCmd(cmd);
+ return robotCmd(cmd, onWritedBlock);
}
- int CEFEM::SendMoveToGet(int seq, int armNo, int pos, int slot)
+ int CEFEM::robotSendMoveToGet(int seq, int armNo, int pos, int slot, ONWRITED onWritedBlock/* = nullptr*/)
{
SERVO::ROBOT_CMD_PARAM cmd = {};
cmd.sequenceNo = static_cast<short>(seq);
@@ -156,10 +160,10 @@
cmd.getPosition = static_cast<short>(pos);
cmd.getSlotNo = static_cast<short>(slot);
cmd.subCmd = 1;
- return robotCmd(cmd);
+ return robotCmd(cmd, onWritedBlock);
}
- int CEFEM::SendMoveToPut(int seq, int armNo, int pos, int slot)
+ int CEFEM::robotSendMoveToPut(int seq, int armNo, int pos, int slot, ONWRITED onWritedBlock/* = nullptr*/)
{
SERVO::ROBOT_CMD_PARAM cmd = {};
cmd.sequenceNo = static_cast<short>(seq);
@@ -168,10 +172,10 @@
cmd.putPosition = static_cast<short>(pos);
cmd.putSlotNo = static_cast<short>(slot);
cmd.subCmd = 2;
- return robotCmd(cmd);
+ return robotCmd(cmd, onWritedBlock);
}
- int CEFEM::SendGet(int seq, int armNo, int pos, int slot)
+ int CEFEM::robotSendGet(int seq, int armNo, int pos, int slot, ONWRITED onWritedBlock/* = nullptr*/)
{
SERVO::ROBOT_CMD_PARAM cmd = {};
cmd.sequenceNo = static_cast<short>(seq);
@@ -179,10 +183,10 @@
cmd.armNo = static_cast<short>(armNo);
cmd.getPosition = static_cast<short>(pos);
cmd.getSlotNo = static_cast<short>(slot);
- return robotCmd(cmd);
+ return robotCmd(cmd, onWritedBlock);
}
- int CEFEM::SendPut(int seq, int armNo, int pos, int slot)
+ int CEFEM::robotSendPut(int seq, int armNo, int pos, int slot, ONWRITED onWritedBlock/* = nullptr*/)
{
SERVO::ROBOT_CMD_PARAM cmd = {};
cmd.sequenceNo = static_cast<short>(seq);
@@ -190,10 +194,10 @@
cmd.armNo = static_cast<short>(armNo);
cmd.putPosition = static_cast<short>(pos);
cmd.putSlotNo = static_cast<short>(slot);
- return robotCmd(cmd);
+ return robotCmd(cmd, onWritedBlock);
}
- int CEFEM::SendExchange(int seq, int armNo, int pos, int getSlot, int putSlot)
+ int CEFEM::robotSendExchange(int seq, int armNo, int pos, int getSlot, int putSlot, ONWRITED onWritedBlock/* = nullptr*/)
{
SERVO::ROBOT_CMD_PARAM cmd = {};
cmd.sequenceNo = static_cast<short>(seq);
@@ -203,18 +207,18 @@
cmd.putPosition = static_cast<short>(pos);
cmd.getSlotNo = static_cast<short>(getSlot);
cmd.putSlotNo = static_cast<short>(putSlot);
- return robotCmd(cmd);
+ return robotCmd(cmd, onWritedBlock);
}
- int CEFEM::SendCommandClear(int seq)
+ int CEFEM::robotSendCommandClear(int seq, ONWRITED onWritedBlock/* = nullptr*/)
{
SERVO::ROBOT_CMD_PARAM cmd = {};
cmd.sequenceNo = static_cast<short>(seq);
cmd.rcmd = static_cast<short>(SERVO::RCMD::Command_Clear);
- return robotCmd(cmd);
+ return robotCmd(cmd, onWritedBlock);
}
- int CEFEM::SendBatchGet(int seq, int getPos, int getSlot)
+ int CEFEM::robotSendBatchGet(int seq, int getPos, int getSlot, ONWRITED onWritedBlock/* = nullptr*/)
{
SERVO::ROBOT_CMD_PARAM cmd = {};
cmd.sequenceNo = static_cast<short>(seq);
@@ -222,10 +226,10 @@
cmd.armNo = ARM_ALL;
cmd.getPosition = static_cast<short>(getPos);
cmd.getSlotNo = static_cast<short>(getSlot);
- return robotCmd(cmd);
+ return robotCmd(cmd, onWritedBlock);
}
- int CEFEM::SendBatchPut(int seq, int putPos, int putSlot)
+ int CEFEM::robotSendBatchPut(int seq, int putPos, int putSlot, ONWRITED onWritedBlock/* = nullptr*/)
{
SERVO::ROBOT_CMD_PARAM cmd = {};
cmd.sequenceNo = static_cast<short>(seq);
@@ -233,10 +237,10 @@
cmd.armNo = ARM_ALL;
cmd.putPosition = static_cast<short>(putPos);
cmd.putSlotNo = static_cast<short>(putSlot);
- return robotCmd(cmd);
+ return robotCmd(cmd, onWritedBlock);
}
- int CEFEM::SendMoveToGetAndHome(int seq, int armNo, int getPos, int getSlot)
+ int CEFEM::robotSendMoveToGetAndHome(int seq, int armNo, int getPos, int getSlot, ONWRITED onWritedBlock/* = nullptr*/)
{
SERVO::ROBOT_CMD_PARAM cmds[2] = {};
@@ -252,10 +256,10 @@
cmds[1].sequenceNo = static_cast<short>(seq + 1);
cmds[1].rcmd = static_cast<short>(SERVO::RCMD::Robot_home);
- return robotCmds(cmds, 2);
+ return robotCmds(cmds, 2, onWritedBlock);
}
- int CEFEM::SendMoveToPutAndHome(int seq, int armNo, int putPos, int putSlot)
+ int CEFEM::robotSendMoveToPutAndHome(int seq, int armNo, int putPos, int putSlot, ONWRITED onWritedBlock/* = nullptr*/)
{
SERVO::ROBOT_CMD_PARAM cmds[2] = {};
@@ -271,10 +275,10 @@
cmds[1].sequenceNo = static_cast<short>(seq + 1);
cmds[1].rcmd = static_cast<short>(SERVO::RCMD::Robot_home);
- return robotCmds(cmds, 2);
+ return robotCmds(cmds, 2, onWritedBlock);
}
- int CEFEM::SendTransferAndHome(int seq, int armNo, int fromPos, int toPos, int fromSlot, int toSlot)
+ int CEFEM::robotSendTransferAndHome(int seq, int armNo, int fromPos, int toPos, int fromSlot, int toSlot, ONWRITED onWritedBlock/* = nullptr*/)
{
SERVO::ROBOT_CMD_PARAM cmds[2] = {};
@@ -291,10 +295,10 @@
cmds[1].sequenceNo = static_cast<short>(seq + 1);
cmds[1].rcmd = static_cast<short>(SERVO::RCMD::Robot_home);
- return robotCmds(cmds, 2);
+ return robotCmds(cmds, 2, onWritedBlock);
}
- int CEFEM::SendGetAndPut(int seq, int armNo, int getPos, int getSlot, int putPos, int putSlot)
+ int CEFEM::robotSendGetAndPut(int seq, int armNo, int getPos, int getSlot, int putPos, int putSlot, ONWRITED onWritedBlock/* = nullptr*/)
{
SERVO::ROBOT_CMD_PARAM cmds[2] = {};
@@ -310,10 +314,10 @@
cmds[1].putPosition = static_cast<short>(putPos);
cmds[1].putSlotNo = static_cast<short>(putSlot);
- return robotCmds(cmds, 2);
+ return robotCmds(cmds, 2, onWritedBlock);
}
- int CEFEM::SendPutAndHome(int seq, int armNo, int putPos, int putSlot)
+ int CEFEM::robotSendPutAndHome(int seq, int armNo, int putPos, int putSlot, ONWRITED onWritedBlock/* = nullptr*/)
{
SERVO::ROBOT_CMD_PARAM cmds[2] = {};
@@ -328,7 +332,12 @@
cmds[1].sequenceNo = static_cast<short>(seq + 1);
cmds[1].rcmd = static_cast<short>(SERVO::RCMD::Robot_home);
- return robotCmds(cmds, 2);
+ return robotCmds(cmds, 2, onWritedBlock);
+ }
+
+ RMDATA& CEFEM::getRobotMonitoringData()
+ {
+ return m_robotData;
}
void CEFEM::init()
@@ -357,7 +366,7 @@
// Eq mode
CEqModeStep* pStep = new CEqModeStep();
pStep->setName(STEP_MODE);
- pStep->setWriteSignalDev(0x50);
+ pStep->setWriteSignalDev(0x40);
pStep->setModeDev(0x5d7d);
if (addStep(STEP_ID_EQMODE_CHANGED, pStep) != 0) {
delete pStep;
@@ -368,7 +377,7 @@
// Eq Status
CEqStatusStep* pStep = new CEqStatusStep();
pStep->setName(STEP_STATUS);
- pStep->setWriteSignalDev(0x51);
+ pStep->setWriteSignalDev(0x41);
pStep->setStatusDev(0x5d59);
if (addStep(STEP_ID_EQSTATUS_CHANGED, pStep) != 0) {
delete pStep;
@@ -379,7 +388,7 @@
// Eq Alarm
static char* pszName[] = { STEP_ALARM_BLOCK1, STEP_ALARM_BLOCK2, STEP_ALARM_BLOCK3, STEP_ALARM_BLOCK4, STEP_ALARM_BLOCK5 };
static int dev[] = { 0x5f0e , 0x5f3b, 0x5f68, 0x5f95, 0x5fc2 };
- static int writeSignalDev[] = { 0x52, 0x53, 0x54, 0x55, 0x56 };
+ static int writeSignalDev[] = { 0x42, 0x43, 0x44, 0x45, 0x46 };
static int addr[] = { STEP_ID_EQALARM1, STEP_ID_EQALARM2, STEP_ID_EQALARM3, STEP_ID_EQALARM4, STEP_ID_EQALARM5 };
for (int i = 0; i < 5; i++) {
@@ -398,7 +407,7 @@
// eq process
CEqProcessStep* pStep = new CEqProcessStep();
pStep->setName(STEP_PROCESS);
- pStep->setWriteSignalDev(0x57);
+ pStep->setWriteSignalDev(0x47);
pStep->setProcessDev(0x6b55);
if (addStep(STEP_ID_PROCESS_DATA_REPORT, pStep) != 0) {
delete pStep;
@@ -409,7 +418,7 @@
// eq cim mode change
CEqCimModeChangeStep* pStep = new CEqCimModeChangeStep();
pStep->setName(STEP_CIM_MODE_CHANGE);
- pStep->setWriteSignalDev(0x70);
+ pStep->setWriteSignalDev(0x60);
pStep->setCimModeDev(0x15);
if (addStep(STEP_ID_CIMMODE_CHANGED_CMD_REPLY, pStep) != 0) {
delete pStep;
@@ -420,7 +429,7 @@
// eq cim message
CEqCimMessageCmdStep* pStep = new CEqCimMessageCmdStep();
pStep->setName(STEP_CIM_MESSAGE_CMD);
- pStep->setWriteSignalDev(0x71);
+ pStep->setWriteSignalDev(0x61);
pStep->setCimMessageDev(0x0);
if (addStep(STEP_ID_CIM_MSG_SET_CMD_REPLY, pStep) != 0) {
delete pStep;
@@ -430,9 +439,9 @@
{
// CIM Message Confirm
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x5f80);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x5d80);
pStep->setName(STEP_EQ_CIM_MESSAGE_CONFIRM);
- pStep->setWriteSignalDev(0x59);
+ pStep->setWriteSignalDev(0x49);
if (addStep(STEP_ID_CIM_MSG_CONFIRM_REPORT, pStep) != 0) {
delete pStep;
}
@@ -460,7 +469,7 @@
// eq cim message clear
CEqCimMessageClearStep* pStep = new CEqCimMessageClearStep();
pStep->setName(STEP_CIM_MESSAGE_CLEAR);
- pStep->setWriteSignalDev(0x72);
+ pStep->setWriteSignalDev(0x62);
pStep->setClearCimMessageDev(0x13);
if (addStep(STEP_ID_CIM_MSG_CLEAR_CMD_REPLY, pStep) != 0) {
delete pStep;
@@ -471,7 +480,7 @@
// datetime set cmd
CEqDateTimeSetCmdStep* pStep = new CEqDateTimeSetCmdStep();
pStep->setName(STEP_DATETIME_SET_CMD);
- pStep->setWriteSignalDev(0x73);
+ pStep->setWriteSignalDev(0x63);
pStep->setDateTimeDev(0x16);
if (addStep(STEP_ID_DATETIME_SET_CMD_REPLY, pStep) != 0) {
delete pStep;
@@ -482,7 +491,7 @@
// vcr enable
CEqVCREnableStep* pStep = new CEqVCREnableStep();
pStep->setName(STEP_EQ_VCR_ENABLE);
- pStep->setWriteSignalDev(0x74);
+ pStep->setWriteSignalDev(0x64);
pStep->setEqVCRModeDev(0x1F);
if (addStep(STEP_ID_VCR_ENABLE_CMD_REPLY, pStep) != 0) {
delete pStep;
@@ -493,7 +502,7 @@
// eq mode change
CEqModeChangeStep* pStep = new CEqModeChangeStep();
pStep->setName(STEP_EQ_MODE_CHANGE);
- pStep->setWriteSignalDev(0x75);
+ pStep->setWriteSignalDev(0x40);
pStep->setEqModeDev(0x1E);
if (addStep(STEP_ID_EQMODE_CHANGE_CMD_REPLY, pStep) != 0) {
delete pStep;
@@ -610,7 +619,7 @@
CEqWriteStep* pStep = new CEqWriteStep();
pStep->setName(STEP_EFEM_ROBOT_CMD);
pStep->setWriteSignalDev(0x14D);
- pStep->setDataDev(0x90a);
+ pStep->setDataDev(0x5c7);
if (addStep(STEP_ID_ROBOT_CMD_REPLY, pStep) != 0) {
delete pStep;
}
@@ -626,6 +635,46 @@
delete pStep;
}
}
+
+ {
+ // Panel Data Report
+ CEqReadStep* pStep = new CEqReadStep(0x617f, 386 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ decodePanelDataReport((CStep*)pFrom, pszData, size);
+ }
+ return -1;
+ });
+ pStep->setName(STEP_EQ_PANEL_DATA_REPORT);
+ pStep->setProp("Port", (void*)1);
+ pStep->setWriteSignalDev(0x15e);
+ if (addStep(STEP_ID_PANEL_DATA_REPORT, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // FAC Data Report
+ CEqReadStep* pStep = new CEqReadStep(0x6301, 108 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ decodePanelDataReport((CStep*)pFrom, pszData, size);
+ }
+ return -1;
+ });
+ pStep->setName(STEP_EQ_FAC_DATA_REPORT);
+ pStep->setProp("Port", (void*)1);
+ pStep->setWriteSignalDev(0x04d);
+ if (addStep(STEP_ID_FAC_DATA_REPORT, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ }
+
+ // 必须要实现的虚函数，在此初始化Slot信息
+ void CEFEM::initSlots()
+ {
+
}
void CEFEM::onTimer(UINT nTimerid)
@@ -648,25 +697,47 @@
return __super::recvIntent(pPin, pIntent);
}
- BOOL CEFEM::glassWillArrive(CGlass* pGlass)
- {
- BOOL bRet = __super::glassWillArrive(pGlass);
- if (!bRet) {
- return FALSE;
- }
-
- return m_glassList.empty();
- }
-
void CEFEM::onReceiveLBData(const char* pszData, size_t size)
{
__super::onReceiveLBData(pszData, size);
+
+ // 解释得到Robot状态
+ // 地址从(0x3500 - 0x3000)开始
+ int index = 0x500;
+ for (int i = 0; i < 6; i++) {
+ if (isBitOn(pszData, size, index + i)) {
+ m_robotData.status = (ROBOT_STATUS)i;
+ break;
+ }
+ }
+ index += 8;
+
+ for (int i = 0; i < 11; i++) {
+ if (isBitOn(pszData, size, index + i)) {
+ m_robotData.position = (ROBOT_POSITION)i;
+ break;
+ }
+ }
+ index += 16;
+ m_robotData.armState[0] = isBitOn(pszData, size, index);
+ m_robotData.armState[1] = isBitOn(pszData, size, index + 1);
+
for (unsigned int i = 0; i < 4; i++) {
if (m_pPort[i] != nullptr) {
m_pPort[i]->onReceiveLBData(pszData, size);
}
}
+
+ // 更新信号到LoadPort, Robot, Aligner, Fliper
+ m_pPort[0]->setLinkSignalBlock(0, &m_bLinkSignal[0][0]);
+ m_pPort[1]->setLinkSignalBlock(0, &m_bLinkSignal[1][0]);
+ m_pPort[2]->setLinkSignalBlock(0, &m_bLinkSignal[2][0]);
+ m_pPort[3]->setLinkSignalBlock(0, &m_bLinkSignal[3][0]);
+ m_pArmTray[0]->setLinkSignalBlock(0, &m_bLinkSignal[4][0]);
+ m_pArmTray[1]->setLinkSignalBlock(0, &m_bLinkSignal[5][0]);
+ m_pAligner->setLinkSignalBlock(0, &m_bLinkSignal[6][0]);
+ m_pFliper->setLinkSignalBlock(0, &m_bLinkSignal[7][0]);
}
int CEFEM::onReceivedJob(int port, CJobDataS* pJobDataS)
--
Gitblit v1.9.3