From 5cf5e464a5891c8eb62aafadfce0d204fdc79b02 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 22 五月 2025 13:50:02 +0800
Subject: [PATCH] 1. 添加机械臂快速测试界面
---
SourceCode/Bond/Servo/CEquipment.cpp | 399 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 369 insertions(+), 30 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index b14e096..1d3f312 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -3,6 +3,8 @@
#include "ToolUnits.h"
#include <regex>
#include "CArm.h"
+#include "CGlassPool.h"
+#include "Servo.h"
#define CHECK_READ_STEP_SIGNAL(addr, data, size) { \
@@ -83,6 +85,11 @@
ASSERT(pEquipment->isArm());
ASSERT(!this->isArm());
m_pArm = pEquipment;
+ }
+
+ CEquipment* CEquipment::getArm()
+ {
+ return m_pArm;
}
void CEquipment::setBaseAlarmId(int nBaseId)
@@ -203,48 +210,50 @@
void CEquipment::getAttributeVector(CAttributeVector& attrubutes)
{
attrubutes.clear();
+
+ unsigned int weight = 0;
attrubutes.addAttribute(new CAttribute("Network",
- std::to_string(m_station.nNetNo).c_str(), ""));
+ std::to_string(m_station.nNetNo).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Station",
- std::to_string(m_station.nStNo).c_str(), ""));
+ std::to_string(m_station.nStNo).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("ID",
- std::to_string(m_nID).c_str(), ""));
+ std::to_string(m_nID).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Name",
- m_strName.c_str(), ""));
+ m_strName.c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Description",
- m_strDescription.c_str(), ""));
+ m_strDescription.c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Alive",
- this->isAlive() ? _T("TRUE") : _T("FALSE"), ""));
+ this->isAlive() ? _T("TRUE") : _T("FALSE"), "", weight++));
attrubutes.addAttribute(new CAttribute("CIM State",
- m_bCimState ? _T("ON") : _T("OFF"), ""));
+ m_bCimState ? _T("ON") : _T("OFF"), "", weight++));
attrubutes.addAttribute(new CAttribute("Upstream",
- m_bUpstreamInline ? _T("Inline") : _T("Offline"), ""));
+ m_bUpstreamInline ? _T("Inline") : _T("Offline"), "", weight++));
attrubutes.addAttribute(new CAttribute("Downstream",
- m_bDownstreamInline ? _T("Inline") : _T("Offline"), ""));
+ m_bDownstreamInline ? _T("Inline") : _T("Offline"), "", weight++));
attrubutes.addAttribute(new CAttribute("Local Alarm",
- m_bLocalAlarm ? _T("TRUE") : _T("FALSE"), ""));
+ m_bLocalAlarm ? _T("TRUE") : _T("FALSE"), "", weight++));
attrubutes.addAttribute(new CAttribute("Auto Recipe Change",
- m_bAutoRecipeChange ? _T("TRUE") : _T("FALSE"), ""));
+ m_bAutoRecipeChange ? _T("TRUE") : _T("FALSE"), "", weight++));
char szTemp[256];
for (int i = 0; i < VCR_MAX; i++) {
sprintf_s(szTemp, 256, "VCR-%d", i + 1);
attrubutes.addAttribute(new CAttribute(szTemp,
- m_bVCREnable[i] ? _T("Enable") : _T("Disable"), ""));
+ m_bVCREnable[i] ? _T("Enable") : _T("Disable"), "", weight++));
}
for (auto item : m_inputPins) {
attrubutes.addAttribute(new CAttribute(item->getName().c_str(),
- std::to_string((int)item->getType()).c_str(), ""));
+ std::to_string((int)item->getType()).c_str(), "", weight++));
}
for (auto item : m_outputPins) {
attrubutes.addAttribute(new CAttribute(item->getName().c_str(),
- std::to_string((int)item->getType()).c_str(), ""));
+ std::to_string((int)item->getType()).c_str(), "", weight++));
}
for (auto item : m_glassList) {
attrubutes.addAttribute(new CAttribute("Glass",
- item->getID().c_str(), ""));
+ item->getID().c_str(), "", weight++));
}
}
@@ -304,13 +313,28 @@
Unlock();
}
else {
- Lock();
+ // addGlassToList前不需要上锁，因其内部有锁
int count;
ar >> count;
for (int i = 0; i < count; i++) {
- CGlass* pGlass = new CGlass();
+ CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
pGlass->serialize(ar);
addGlassToList(pGlass);
+ }
+
+ // 梳理各玻璃之间的绑定关系
+ 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());
+ }
+ }
+ }
}
Unlock();
}
@@ -779,6 +803,21 @@
}
}
+ CGlass* CEquipment::getGlassFromList(const char* pszId)
+ {
+ CGlass* pGlass = nullptr;
+ Lock();
+ for (auto item : m_glassList) {
+ if (item->getID().compare(pszId) == 0) {
+ pGlass = item;
+ break;
+ }
+ }
+ Unlock();
+
+ return pGlass;
+ }
+
BOOL CEquipment::removeClass(CGlass* pGlass)
{
Lock();
@@ -820,7 +859,7 @@
return pGlass;
}
- int CEquipment::fetchedOut(const char* pszGlassId)
+ int CEquipment::fetchedOutJob(CJobDataB* pJobDataB)
{
if (m_pArm == nullptr) {
return -1;
@@ -835,7 +874,7 @@
CGlass* pContext = nullptr;
for (auto iter = m_glassList.begin(); iter != m_glassList.end(); iter++) {
- if ((*iter)->getID().compare(pszGlassId) == 0) {
+ if ((*iter)->getID().compare(pJobDataB->getGlassId()) == 0) {
pContext = (*iter);
m_glassList.erase(iter);
break;
@@ -845,6 +884,19 @@
Unlock();
return -3;
}
+
+ // 如果此玻璃已经贴合，贴合的玻璃也要从列表中移除
+ CGlass* pBuddy = pContext->getBuddy();
+ if (pBuddy != nullptr) {
+ for (auto iter = m_glassList.begin(); iter != m_glassList.end(); iter++) {
+ if ((*iter)->getID().compare(pBuddy->getID()) == 0) {
+ (*iter)->release();
+ m_glassList.erase(iter);
+ break;
+ }
+ }
+ }
+
((CArm*)m_pArm)->tempStore(pContext);
pContext->release();
@@ -857,7 +909,7 @@
return 0;
}
- int CEquipment::storedJob(const char* pszGlassId)
+ int CEquipment::storedJob(CJobDataB* pJobDataB)
{
if (m_pArm == nullptr) {
return -1;
@@ -876,6 +928,18 @@
m_glassList.push_back(pGlass);
pGlass->release(); // tempFetchOut需要调用一次release
Unlock();
+
+
+ // 如果此玻璃已经贴合，贴合的玻璃也要从加入到列表中
+ CGlass* pBuddy = pGlass->getBuddy();
+ if (pBuddy != nullptr) {
+ Lock();
+ pBuddy->addPath(m_nID);
+ pBuddy->addRef(); // 加入list,addRef
+ m_glassList.push_back(pBuddy);
+ Unlock();
+ }
+
if (m_listener.onDataChanged != nullptr) {
m_listener.onDataChanged(this, 0);
@@ -999,6 +1063,33 @@
return pStep->setDateTime(year, month, day, hour, minute, second);
}
+ int CEquipment::setDispatchingMode(DISPATCHING_MODE mode, ONWRITED onWritedBlock/* = nullptr*/)
+ {
+ SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EQ_DISPATCHINT_MODE_CHANGE);
+ if (pStep == nullptr) {
+ return -1;
+ }
+
+ LOGI("<CEquipment-%s>准备设置DispatchingMode<%d>", m_strName.c_str(), (int)mode);
+ if (onWritedBlock != nullptr) {
+ pStep->writeShort((short)mode, onWritedBlock);
+ }
+ else {
+ pStep->writeShort((short)mode, [&, mode](int code) -> int {
+ if (code == WOK) {
+ LOGI("<CEquipment-%s>设置DispatchingMode成功.", m_strName.c_str());
+ }
+ else {
+ LOGI("<CEquipment-%s>设置DispatchingMode失败，code:%d", m_strName.c_str(), code);
+ }
+
+ return 0;
+ });
+ }
+
+ return 0;
+ }
+
int CEquipment::masterRecipeListRequest(short unitNo)
{
SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EQ_MASTER_RECIPE_LIST_REQ);
@@ -1059,12 +1150,89 @@
return m_recipesManager.decodeRecipeParameterReport(pszData, size);
}
- int CEquipment::decodeFetchedOutJobReport(int port, const char* pszData, size_t size)
+ int CEquipment::decodeProcessDataReport(CStep* pStep, const char* pszData, size_t size)
+ {
+ CProcessData processData;
+ int nRet = processData.unserialize(&pszData[0], (int)size);
+ if (nRet < 0) return nRet;
+
+ // 缓存Attribute，用于调试时显示信息
+ unsigned int weight = 201;
+ CAttributeVector attrubutes;
+ processData.getAttributeVector(attrubutes, weight);
+ pStep->addAttributeVector(attrubutes);
+
+
+ onProcessData(&processData);
+
+ return nRet;
+ }
+
+ int CEquipment::decodeReceivedJobReport(CStep* pStep, int port, const char* pszData, size_t size)
+ {
+ CJobDataS jobDataS;
+ int nRet = jobDataS.unserialize(&pszData[0], (int)size);
+ if (nRet < 0) return nRet;
+
+ // 缓存Attribute，用于调试时显示信息
+ unsigned int weight = 201;
+ CAttributeVector attrubutes;
+ jobDataS.getAttributeVector(attrubutes, weight);
+ pStep->addAttributeVector(attrubutes);
+
+
+ onReceivedJob(port, &jobDataS);
+
+ return nRet;
+ }
+
+ int CEquipment::onReceivedJob(int port, CJobDataS* pJobDataS)
+ {
+ LOGI("<CEquipment-%s>onReceivedJob.", m_strName.c_str());
+
+ addJobDataS(pJobDataS);
+ return 0;
+ }
+
+ int CEquipment::decodeSentOutJobReport(CStep* pStep, int port, const char* pszData, size_t size)
+ {
+ CJobDataS jobDataS;
+ int nRet = jobDataS.unserialize(&pszData[0], (int)size);
+ if (nRet < 0) return nRet;
+
+ // 缓存Attribute，用于调试时显示信息
+ unsigned int weight = 201;
+ CAttributeVector attrubutes;
+ jobDataS.getAttributeVector(attrubutes, weight);
+ pStep->addAttributeVector(attrubutes);
+
+
+ onReceivedJob(port, &jobDataS);
+
+ return nRet;
+ }
+
+ int CEquipment::onSentOutJob(int port, CJobDataS* pJobDataS)
+ {
+ LOGI("<CEquipment-%s>onSentOutJob.", m_strName.c_str());
+
+ int count = removeJobDataS(pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo());
+ if (count == 1) {
+ LOGI("<CEquipment-%s>onSentOutJob,删除数据 %d 条", m_strName.c_str(), count);
+ }
+ else {
+ LOGE("<CEquipment-%s>onSentOutJob,删除数据 %d 条，注意排查风险", m_strName.c_str(), count);
+ }
+
+ return 0;
+ }
+
+ int CEquipment::decodeFetchedOutJobReport(CStep* pStep, int port, const char* pszData, size_t size)
{
int index = 0;
short unitOrPort, unitOrPortNo, subUnitNo, subSlotNo;
CJobDataB jobDataB;
- int nRet = jobDataB.unserialize(&pszData[index], size);
+ int nRet = jobDataB.unserialize(&pszData[index], (int)size);
if (nRet < 0) return nRet;
index += nRet;
@@ -1077,22 +1245,59 @@
memcpy(&subSlotNo, &pszData[index], sizeof(short));
index += sizeof(short);
- onFetchedOut(port, jobDataB.getGlassId().c_str());
+
+ // 缓存Attribute，用于调试时显示信息
+ unsigned int weight = 201;
+ pStep->addAttribute(new CAttribute("UnitOrPort",
+ std::to_string(unitOrPort).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("UnitOrPortNo",
+ std::to_string(unitOrPortNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("SubUnitNo",
+ std::to_string(subUnitNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("SubSlotNo",
+ std::to_string(subSlotNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("CassetteSequenceNo",
+ std::to_string(jobDataB.getCassetteSequenceNo()).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("JobSequenceNo",
+ std::to_string(jobDataB.getJobSequenceNo()).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("GlassId",
+ jobDataB.getGlassId().c_str(), "", weight++));
+
+
+ onFetchedOutJob(port, &jobDataB);
return index;
}
- int CEquipment::onFetchedOut(int port, const char* pszGlassId)
+ int CEquipment::onPreFetchedOutJob(int port, CJobDataB* pJobDataB)
{
- return fetchedOut(pszGlassId);
+ LOGI("<CEquipment-%s>onPreFetchedOutJob:port:%d|GlassId:%s",
+ m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
+ return TRUE;
}
- int CEquipment::decodeStoredJobReport(int port, const char* pszData, size_t size)
+ int CEquipment::onFetchedOutJob(int port, CJobDataB* pJobDataB)
+ {
+ LOGI("<CEquipment-%s>onFetchedOutJob:port:%d|GlassId:%s",
+ m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
+
+ BOOL bCheck = onPreFetchedOutJob(port, pJobDataB);
+ if (bCheck) {
+ return fetchedOutJob(pJobDataB);
+ }
+
+ // 数据异常，处理或显示
+ LOGI("<CEquipment-%s>onFetchedOutJob Error.ort:%d|GlassId:%s",
+ m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
+ return -1;
+ }
+
+ int CEquipment::decodeStoredJobReport(CStep* pStep, int port, const char* pszData, size_t size)
{
int index = 0;
short unitOrPort, unitOrPortNo, subUnitNo, subSlotNo;
CJobDataB jobDataB;
- int nRet = jobDataB.unserialize(&pszData[index], size);
+ int nRet = jobDataB.unserialize(&pszData[index], (int)size);
if (nRet < 0) return nRet;
index += nRet;
@@ -1105,13 +1310,147 @@
memcpy(&subSlotNo, &pszData[index], sizeof(short));
index += sizeof(short);
- onStore(port, jobDataB.getGlassId().c_str());
+
+ // 缓存Attribute，用于调试时显示信息
+ unsigned int weight = 201;
+ pStep->addAttribute(new CAttribute("UnitOrPort",
+ std::to_string(unitOrPort).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("UnitOrPortNo",
+ std::to_string(unitOrPortNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("SubUnitNo",
+ std::to_string(subUnitNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("SubSlotNo",
+ std::to_string(subSlotNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("CassetteSequenceNo",
+ std::to_string(jobDataB.getCassetteSequenceNo()).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("JobSequenceNo",
+ std::to_string(jobDataB.getJobSequenceNo()).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("GlassId",
+ jobDataB.getGlassId().c_str(), "", weight++));
+
+
+ onStoredJob(port, &jobDataB);
return index;
}
- int CEquipment::onStore(int port, const char* pszGlassId)
+ int CEquipment::onPreStoredJob(int port, CJobDataB* pJobDataB)
{
- return storedJob(pszGlassId);
+ LOGI("<CEquipment-%s>onPreStoredJob:port:%d|GlassId:%s",
+ m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
+ return TRUE;
+ }
+
+ int CEquipment::onStoredJob(int port, CJobDataB* pJobDataB)
+ {
+ LOGI("<CEquipment-%s>onStore:port:%d|GlassId:%s",
+ m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
+
+ BOOL bCheck = onPreStoredJob(port, pJobDataB);
+ if (bCheck) {
+ addJobDataB(pJobDataB);
+ return storedJob(pJobDataB);
+ }
+
+ // 数据异常，处理或显示
+ LOGI("<CEquipment-%s>onStoredJob Error.ort:%d|GlassId:%s",
+ m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
+ return -1;
+ }
+
+ int CEquipment::onProcessData(CProcessData* pProcessData)
+ {
+ LOGI("<CEquipment-%s>onProcessData.", m_strName.c_str());
+ return 0;
+ }
+
+ int CEquipment::addJobDataB(CJobDataB* pJobDataB)
+ {
+ // 添加之前先删除旧的，以免数据重复
+ Lock();
+ int count = removeJobDataB(pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
+ if (count > 0) {
+ LOGE("<CEquipment-%s>addJobDataB,删除重复数据 %d 条，注意排查风险", m_strName.c_str(), count);
+ }
+
+ m_listJobDataB.push_back(std::move(*pJobDataB));
+ Unlock();
+
+ return (int)m_listJobDataB.size();
+ }
+
+ int CEquipment::removeJobDataB(int nCassetteSequenceNo, int nJobSequenceNo)
+ {
+ int count = 0;
+ for (auto it = m_listJobDataB.begin(); it != m_listJobDataB.end(); ) {
+ if ((*it).getCassetteSequenceNo() == nCassetteSequenceNo
+ && (*it).getJobSequenceNo() == nJobSequenceNo) {
+ it = m_listJobDataB.erase(it);
+ count++;
+ }
+ else {
+ ++it;
+ }
+ }
+
+ return count;
+ }
+
+ CJobDataB* CEquipment::getJobDataB(int nCassetteSequenceNo, int nJobSequenceNo)
+ {
+ for (auto& item : m_listJobDataB) {
+ if (item.getCassetteSequenceNo() == nCassetteSequenceNo
+ && item.getJobSequenceNo() == nJobSequenceNo) {
+ return &item;
+ }
+ }
+
+ return nullptr;
+ }
+
+ int CEquipment::addJobDataS(CJobDataS* pJobDataS)
+ {
+ // 添加之前先删除旧的，以免数据重复
+ Lock();
+ int count = removeJobDataS(pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo());
+ if (count > 0) {
+ LOGE("<CEquipment-%s>addJobDataS,删除重复数据 %d 条，注意排查风险", m_strName.c_str(), count);
+ }
+
+ m_listJobDataS.push_back(std::move(*pJobDataS));
+ Unlock();
+
+ return (int)m_listJobDataB.size();
+ }
+
+ int CEquipment::removeJobDataS(int nCassetteSequenceNo, int nJobSequenceNo)
+ {
+ int count = 0;
+ Lock();
+ for (auto it = m_listJobDataS.begin(); it != m_listJobDataS.end(); ) {
+ if ((*it).getCassetteSequenceNo() == nCassetteSequenceNo
+ && (*it).getJobSequenceNo() == nJobSequenceNo) {
+ it = m_listJobDataS.erase(it);
+ count++;
+ }
+ else {
+ ++it;
+ }
+ }
+ Unlock();
+
+ return count;
+ }
+
+ CJobDataS* CEquipment::getJobDataS(int nCassetteSequenceNo, int nJobSequenceNo)
+ {
+ for (auto& item : m_listJobDataS) {
+ if (item.getCassetteSequenceNo() == nCassetteSequenceNo
+ && item.getJobSequenceNo() == nJobSequenceNo) {
+ return &item;
+ }
+ }
+
+ return nullptr;
}
}
\ No newline at end of file
--
Gitblit v1.9.3