From 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 03 六月 2025 15:13:42 +0800
Subject: [PATCH] Merge branch 'master' into liuyang
---
SourceCode/Bond/Servo/CBonder.cpp | 146 +++++++++++++++---------------------------------
1 files changed, 45 insertions(+), 101 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index 16f2d39..8be694e 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -6,7 +6,6 @@
CBonder::CBonder() : CEquipment()
{
m_nIndex = 0;
- m_bPermittedStore = FALSE;
}
CBonder::~CBonder()
@@ -88,17 +87,6 @@
}
{
- // eq process
- // 使用CEqReadStep替换CEqProcessStep
- /*
- CEqProcessStep* pStep = new CEqProcessStep();
- pStep->setName(STEP_PROCESS);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x347 : 0x647);
- pStep->setProcessDev(m_nIndex == 0 ? 0xab55 : 0xeb55);
- if (addStep(STEP_ID_PROCESS_DATA_REPORT, pStep) != 0) {
- delete pStep;
- }
- */
CEqReadStep* pStep = new CEqReadStep((m_nIndex == 0 ? 0xab55 : 0xeb55), 538 * 2,
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
if (code == ROK && pszData != nullptr && size > 0) {
@@ -299,45 +287,6 @@
}
}
- /*
- {
- CEqJobEventStep* pStep = new CEqJobEventStep();
- pStep->setName(STEP_EQ_RECEIVED_JOB_UPS1);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x300 : 0x600);
- pStep->setJobDataDev(m_nIndex == 0 ? 0x8c90 : 0xcc90);
- if (addStep(STEP_ID_RECIVE_JOB_UPS1, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqJobEventStep* pStep = new CEqJobEventStep();
- pStep->setName(STEP_EQ_RECEIVED_JOB_UPS2);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x301 : 0x601);
- pStep->setJobDataDev(m_nIndex == 0 ? 0x8dd0 : 0xcdd0);
- if (addStep(STEP_ID_RECIVE_JOB_UPS2, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqJobEventStep* pStep = new CEqJobEventStep();
- pStep->setName(STEP_EQ_SENT_OUT_JOB_DOWNS1);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x30a : 0x60a);
- pStep->setJobDataDev(m_nIndex == 0 ? 0x8000 : 0xc000);
- if (addStep(STEP_ID_SENT_OUT_JOB_DOWNS1, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqJobEventStep* pStep = new CEqJobEventStep();
- pStep->setName(STEP_EQ_SENT_OUT_JOB_DOWNS2);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x30b : 0x60b);
- pStep->setJobDataDev(m_nIndex == 0 ? 0x8140 : 0xc140);
- if (addStep(STEP_ID_SENT_OUT_JOB_DOWNS2, pStep) != 0) {
- delete pStep;
- }
- }
- */
-
{
// Fetched Out Job Report #1~15
char szBuffer[256];
@@ -387,6 +336,21 @@
}
}
+ // 必须要实现的虚函数，在此初始化Slot信息
+ void CBonder::initSlots()
+ {
+ m_slot[0].enable();
+ m_slot[0].setPosition(m_nID);
+ m_slot[0].setNo(1);
+ m_slot[0].setName("Slot 1(G1)");
+ m_slot[0].setType(MaterialsType::G1);
+ m_slot[1].enable();
+ m_slot[1].setPosition(m_nID);
+ m_slot[1].setNo(2);
+ m_slot[1].setName("Slot 2(G2)");
+ m_slot[1].setType(MaterialsType::G2);
+ }
+
void CBonder::onTimer(UINT nTimerid)
{
CEquipment::onTimer(nTimerid);
@@ -407,16 +371,6 @@
return __super::recvIntent(pPin, pIntent);
}
- BOOL CBonder::glassWillArrive(CGlass* pGlass)
- {
- BOOL bRet = __super::glassWillArrive(pGlass);
- if (!bRet) {
- return FALSE;
- }
-
- return m_glassList.empty();
- }
-
void CBonder::setIndex(unsigned int index)
{
m_nIndex = index;
@@ -427,54 +381,44 @@
return m_nIndex;
}
- int CBonder::onReceivedJob(int port, CJobDataS* pJobDataS)
- {
- m_bPermittedStore = FALSE;
- Lock();
- size_t size = m_glassList.size();
- if (size == 0) {
- m_bPermittedStore = TRUE;
- }
- else if (size == 1) {
- CGlass* pGlass = m_glassList.front();
- if ( (pGlass->getType() == MaterialsType::G1 && pJobDataS->getMaterialsType() == (int)MaterialsType::G2)
- || (pGlass->getType() == MaterialsType::G2 && pJobDataS->getMaterialsType() == (int)MaterialsType::G1)) {
- m_bPermittedStore = TRUE;
- }
- }
- Unlock();
-
- if (m_bPermittedStore) {
- return CEquipment::onReceivedJob(port, pJobDataS);
- }
- else {
- return -1;
- }
- }
-
- int CBonder::onSentOutJob(int port, CJobDataS* pJobDataS)
- {
- CEquipment::onSentOutJob(port, pJobDataS);
-
- return 0;
- }
-
int CBonder::onProcessData(CProcessData* pProcessData)
{
CEquipment::onProcessData(pProcessData);
+ // 检查数据，当前两片玻璃，一片为G1, 一片为G2, 且pProcessData中的id能匹配G1或G2
+ Lock();
+ CGlass* pGlass1 = getGlassFromSlot(1);
+ CGlass* pGlass2 = getGlassFromSlot(2);
+ if (pGlass1->getBuddy() != nullptr || pGlass2->getBuddy() != nullptr) {
+ LOGE("<CBonder-%s>onProcessData,错误!玻璃较早前已被绑定，请检查数据是否正确!", m_strName.c_str());
+ Unlock();
+ return -1;
+ }
+
+ if (pGlass1->getBuddy() != nullptr || pGlass2->getBuddy() != nullptr) {
+ LOGE("<CBonder-%s>onProcessData,错误!玻璃较早前已被贴合，请检查数据是否正确!", m_strName.c_str());
+ Unlock();
+ return -1;
+ }
+
+ if (pGlass1->getType() == pGlass2->getType()) {
+ LOGE("<CBonder-%s>onProcessData,错误!两片玻璃未匹配，必须分别为G1和G2类型，请检查数据是否正确!", m_strName.c_str());
+ Unlock();
+ return -1;
+ }
+
+ pGlass1->setBuddy(pGlass2);
+ pGlass2->setBuddy(pGlass1);
+ LOGE("<CBonder-%s>onProcessData,%s和%s已贴合!", m_strName.c_str(),
+ pGlass1->getID().c_str(), pGlass2->getID().c_str());
+ Unlock();
+
return 0;
}
- // Bonder检查腔体玻璃信息，如腔体为空可进G1或G2，
- // 如腔体只有一片G1，可进G2，如腔体只有一片G2, 可进G1
- // 其它情况不可进片
- int CBonder::storedJob(CJobDataB* pJobDataB)
+ int CBonder::getIndexerOperationModeBaseValue()
{
- if (!m_bPermittedStore)
- return -1;
-
- return CEquipment::storedJob(pJobDataB);
+ return m_nIndex == 0 ? 15000 : 20000;
}
}
--
Gitblit v1.9.3