From 4897210a25e7c98ddacb1fa4ecee3e8bdd1ae98e Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 12 六月 2025 14:18:16 +0800
Subject: [PATCH] 1.手臂选择匹配问题，
---
SourceCode/Bond/Servo/CEquipment.cpp | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 154 insertions(+), 21 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index bd36700..db4ab5a 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -35,6 +35,7 @@
m_bLocalAlarm = FALSE;
m_bAutoRecipeChange = FALSE;
m_bVCREnable[0] = FALSE;
+ memset(m_bLinkSignal, 0, sizeof(m_bLinkSignal));
m_pCclink = nullptr;
m_nBaseAlarmId = 0;
m_pArm = nullptr;
@@ -46,7 +47,6 @@
for (int i = 0; i < SLOT_MAX; i++) {
CContext* pContext = m_slot[i].getContext();
if (pContext != nullptr) {
- pContext->release();
m_slot[i].setContext(nullptr);
}
}
@@ -334,22 +334,23 @@
}
// 梳理各玻璃之间的绑定关系
- /*
Lock();
- std::list<CGlass*> list = m_glassList;
- for (auto item : list) {
- std::string& strBuddyId = item->getBuddyId();
- if (!strBuddyId.empty()) {
- for (auto item2 : m_glassList) {
- if (strBuddyId.compare(item2->getID()) == 0) {
- item->setBuddy(item2);
- TRACE("绑定关系: %s <- %s\n", item->getID().c_str(), item2->getID().c_str());
+ for (int i = 0; i < SLOT_MAX; i++) {
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (pGlass != nullptr) {
+ std::string& strBuddyId = pGlass->getBuddyId();
+ if (!strBuddyId.empty()) {
+ for (int j = 0; j < SLOT_MAX; j++) {
+ CGlass* pBudy = (CGlass*)m_slot[j].getContext();
+ if (pBudy != nullptr && strBuddyId.compare(pBudy->getID()) == 0) {
+ pGlass->setBuddy(pBudy);
+ TRACE("绑定关系: %s <- %s\n", pGlass->getID().c_str(), pBudy->getID().c_str());
+ }
}
}
}
}
Unlock();
- */
}
}
@@ -363,9 +364,20 @@
}
*/
- // 以下解释和处理数据
+ // 连接信号解释和保存
BOOL bFlag;
- int index = 0x540;
+ int index = 0;
+ for (int i = 0; i < 8; i++) {
+ m_bLinkSignal[i][SIGNAL_UPSTREAM_INLINE] = isBitOn(pszData, size, index + 0);
+ m_bLinkSignal[i][SIGNAL_UPSTREAM_TROUBLE] = isBitOn(pszData, size, index + 1);
+ m_bLinkSignal[i][SIGNAL_INTERLOCK] = isBitOn(pszData, size, index + 2);
+ m_bLinkSignal[i][SIGNAL_SEND_ABLE] = isBitOn(pszData, size, index + 3);
+ index += 0x40;
+ }
+
+
+ // 其它信号及响应
+ index = 0x540;
// alive
@@ -582,6 +594,28 @@
return m_bVCREnable[index];
}
+ BOOL CEquipment::isLinkSignalOn(unsigned int path, unsigned int signal)
+ {
+ if (path >= PATH_MAX) return FALSE;
+ if (signal >= SIGNAL_MAX) return FALSE;
+ return m_bLinkSignal[path][signal];
+ }
+
+ void CEquipment::setLinkSignal(unsigned int path, unsigned int signal, BOOL bOn)
+ {
+ if (path >= PATH_MAX) return;
+ if (signal >= SIGNAL_MAX) return;
+ m_bLinkSignal[path][signal] = bOn;
+ }
+
+ void CEquipment::setLinkSignalBlock(unsigned int path, BOOL* pSignal)
+ {
+ if (path >= PATH_MAX) return;
+ for (int i = 0; i < SIGNAL_MAX; i++) {
+ m_bLinkSignal[path][i] = pSignal[i];
+ }
+ }
+
int CEquipment::onStepEvent(CStep* pStep, int code)
{
if (code == STEP_EVENT_READDATA) {
@@ -756,7 +790,7 @@
return 0;
}
- int CEquipment::storedJob(CJobDataB* pJobDataB, short& putSlot)
+ int CEquipment::storedJob(CJobDataB* pJobDataB, short putSlot)
{
if (m_pArm == nullptr) {
return -1;
@@ -770,7 +804,7 @@
ASSERT(pGlass);
Lock();
- pGlass->addPath(m_nID);
+ pGlass->addPath(m_nID, getSlotUnit(putSlot));
m_slot[putSlot - 1].setContext(pGlass);
pGlass->release(); // tempFetchOut需要调用一次release
Unlock();
@@ -780,7 +814,7 @@
CGlass* pBuddy = pGlass->getBuddy();
if (pBuddy != nullptr) {
Lock();
- pBuddy->addPath(m_nID);
+ pBuddy->addPath(m_nID, 0);
if (putSlot % 2 == 0) {
m_slot[putSlot - 2].setContext(pBuddy);
}
@@ -1114,16 +1148,53 @@
if (m_slot[i].isLock()) continue;
CGlass* pGlass = (CGlass*)m_slot[i].getContext();
if (pGlass == nullptr) continue;
+ int lsPath = m_slot[i].getLinkSignalPath();
+ if(!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE]
+ || m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+ || !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK]
+ || !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE] ) continue;
MaterialsType glassType = pGlass->getType();
if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;
- if (!pGlass->isProcessed(m_nID)) continue;
return &m_slot[i];
}
return nullptr;
+ }
+
+ CSlot* CEquipment::getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates)
+ {
+ for (auto item : candidates) {
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (item == i + 1) {
+ if (!m_slot[i].isEnable()) continue;
+ if (m_slot[i].isLock()) continue;
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (pGlass == nullptr) continue;
+ int lsPath = m_slot[i].getLinkSignalPath();
+ if (!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE]
+ || m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+ || !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK]
+ || !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE]) continue;
+
+ MaterialsType glassType = pGlass->getType();
+ if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
+ if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;
+
+ return &m_slot[i];
+ }
+ }
+ }
+
+ return nullptr;
+ }
+
+ CSlot* CEquipment::getSlot(int index)
+ {
+ if (index >= SLOT_MAX) return nullptr;
+ return &m_slot[index];
}
CGlass* CEquipment::getGlassFromSlot(int slotNo)
@@ -1163,6 +1234,21 @@
if (m_slot[slotIndex].getContext() != nullptr) return FALSE;
return TRUE;
+ }
+
+ int CEquipment::removeGlass(int slotNo)
+ {
+ CSlot* pSlot = nullptr;
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (!m_slot[i].isEnable()) continue;
+ if (m_slot[i].getNo() != slotNo) continue;
+ pSlot = &m_slot[i];
+ break;
+ }
+
+ if (pSlot == nullptr) return -1;
+ pSlot->setContext(nullptr);
+ return 0;
}
short CEquipment::decodeRecipeListReport(const char* pszData, size_t size)
@@ -1384,6 +1470,57 @@
return 0;
}
+ int CEquipment::decodePanelDataReport(CStep* pStep, const char* pszData, size_t size)
+ {
+ short cassetteNo, jobSequenceNo;
+ int index = 0;
+ std::string strPanelJudgeData, strPanelGradeData;
+ memcpy(&cassetteNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+ memcpy(&jobSequenceNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+ CToolUnits::convertString(&pszData[index], 128 * 2, strPanelJudgeData);
+ index += 128 * 2;
+ CToolUnits::convertString(&pszData[index], 256 * 2, strPanelJudgeData);
+ index += 256 * 2;
+
+
+ // 缓存Attribute，用于调试时显示信息
+ unsigned int weight = 201;
+ pStep->addAttribute(new CAttribute("CassetteNo",
+ std::to_string(cassetteNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("JobSequenceNo",
+ std::to_string(jobSequenceNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("PanelJudgeData",
+ strPanelJudgeData.c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("PanelGradeData",
+ strPanelGradeData.c_str(), "", weight++));
+
+
+ return 0;
+ }
+
+ int CEquipment::decodeFacDataReport(CStep* pStep, const char* pszData, size_t size)
+ {
+ int index = 0;
+ std::string strSvTimeRecord, strSvData;
+ CToolUnits::convertString(&pszData[index], 8 * 2, strSvTimeRecord);
+ index += 128 * 2;
+ CToolUnits::convertString(&pszData[index], 640 * 2, strSvData);
+ index += 256 * 2;
+
+
+ // 缓存Attribute，用于调试时显示信息
+ unsigned int weight = 201;
+ pStep->addAttribute(new CAttribute("SV Time Record",
+ strSvTimeRecord.c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("SV Data",
+ strSvData.c_str(), "", weight++));
+
+
+ return 0;
+ }
+
int CEquipment::onPreStoredJob(int port, CJobDataB* pJobDataB, short& putSlot)
{
LOGI("<CEquipment-%s>onPreStoredJob:port:%d|GlassId:%s",
@@ -1441,10 +1578,6 @@
int CEquipment::onProcessData(CProcessData* pProcessData)
{
LOGI("<CEquipment-%s>onProcessData.", m_strName.c_str());
- CGlass* pGlass = getGlass(pProcessData->getGlassId().c_str());
- if (pGlass != nullptr) {
- pGlass->processEnd(m_nID);
- }
return 0;
}
--
Gitblit v1.9.3