From 3628a707a38e1c590216c5983c9b97b9c742f86c Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 24 三月 2025 09:01:42 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEquipment.cpp | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 238 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 3fa85bb..ad4a356 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -27,6 +27,16 @@
}
m_mapStep.clear();
+ for (auto item : m_inputPins) {
+ delete item;
+ }
+ m_inputPins.clear();
+
+ for (auto item : m_outputPins) {
+ delete item;
+ }
+ m_outputPins.clear();
+
DeleteCriticalSection(&m_criticalSection);
}
@@ -72,6 +82,17 @@
return iter->second;
}
+ CStep* CEquipment::getStepWithName(const char* pszName)
+ {
+ for (auto item : m_mapStep) {
+ if (item.second->getName().compare(pszName) == 0) {
+ return item.second;
+ }
+ }
+
+ return nullptr;
+ }
+
int CEquipment::addStep(unsigned int addr, CStep* pStep)
{
auto iter = m_mapStep.find(addr);
@@ -84,6 +105,7 @@
void CEquipment::init()
{
+ initPins();
for (auto item : m_mapStep) {
item.second->init();
}
@@ -135,6 +157,54 @@
const StationIdentifier& CEquipment::getStation()
{
return m_station;
+ }
+
+ void CEquipment::getAttributeVector(CAttributeVector& attrubutes)
+ {
+ attrubutes.clear();
+ attrubutes.addAttribute(new CAttribute("Network",
+ std::to_string(m_station.nNetNo).c_str(), ""));
+ attrubutes.addAttribute(new CAttribute("Station",
+ std::to_string(m_station.nStNo).c_str(), ""));
+ attrubutes.addAttribute(new CAttribute("ID",
+ std::to_string(m_nID).c_str(), ""));
+ attrubutes.addAttribute(new CAttribute("Name",
+ m_strName.c_str(), ""));
+ attrubutes.addAttribute(new CAttribute("Description",
+ m_strDescription.c_str(), ""));
+ attrubutes.addAttribute(new CAttribute("Alive",
+ this->isAlive() ? _T("TRUE") : _T("FALSE"), ""));
+ attrubutes.addAttribute(new CAttribute("CIM State",
+ m_bCimState ? _T("ON") : _T("OFF"), ""));
+ attrubutes.addAttribute(new CAttribute("Upstream",
+ m_bUpstreamInline ? _T("Inline") : _T("Offline"), ""));
+ attrubutes.addAttribute(new CAttribute("Downstream",
+ m_bDownstreamInline ? _T("Inline") : _T("Offline"), ""));
+ attrubutes.addAttribute(new CAttribute("Local Alarm",
+ m_bLocalAlarm ? _T("TRUE") : _T("FALSE"), ""));
+ attrubutes.addAttribute(new CAttribute("Auto Recipe Change",
+ m_bAutoRecipeChange ? _T("TRUE") : _T("FALSE"), ""));
+ 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"), ""));
+ }
+
+ for (auto item : m_inputPins) {
+ attrubutes.addAttribute(new CAttribute(item->getName().c_str(),
+ std::to_string((int)item->getType()).c_str(), ""));
+ }
+
+ for (auto item : m_outputPins) {
+ attrubutes.addAttribute(new CAttribute(item->getName().c_str(),
+ std::to_string((int)item->getType()).c_str(), ""));
+ }
+
+ for (auto item : m_panelList) {
+ attrubutes.addAttribute(new CAttribute("Panel",
+ item->getID().c_str(), ""));
+ }
}
void CEquipment::setReadBitBlock(unsigned int start, unsigned int end)
@@ -328,4 +398,172 @@
if (index >= VCR_MAX) return FALSE;
return m_bVCREnable[index];
}
+
+ CPin* CEquipment::addPin(PinType type, char* pszName)
+ {
+ // 不允许名字添加重复的pin
+ CPin* pPin = getPin(pszName);
+ if (pPin != nullptr) return nullptr;
+
+
+ // 添加到Pin列表，看是输入pin或输出pin
+ if (type == PinType::INPUT) {
+ pPin = new CPin(this, type, pszName);
+ m_inputPins.push_back(pPin);
+ return pPin;
+ }
+ else if (type == PinType::OUTPUT) {
+ pPin = new CPin(this, type, pszName);
+ m_outputPins.push_back(pPin);
+ return pPin;
+ }
+
+ return nullptr;
+ }
+
+ CPin* CEquipment::getPin(char* pszName)
+ {
+ for (auto item : m_inputPins) {
+ if (item->getName().compare(pszName) == 0) {
+ return item;
+ }
+ }
+
+ for (auto item : m_outputPins) {
+ if (item->getName().compare(pszName) == 0) {
+ return item;
+ }
+ }
+
+ return nullptr;
+ }
+
+ std::vector<CPin*>& CEquipment::getInputPins()
+ {
+ return m_inputPins;
+ }
+
+ std::vector<CPin*>& CEquipment::getOutputPins()
+ {
+ return m_outputPins;
+ }
+
+ int CEquipment::recvIntent(CPin* pPin, CIntent* pIntent)
+ {
+ ASSERT(pPin);
+ CPin* pFromPin = pPin->getConnectedPin();
+ ASSERT(pFromPin);
+ CEquipment* pFromEq = pFromPin->getEquipment();
+ ASSERT(pFromEq);
+
+ LOGI("<CEquipment><%s-%s>收到来自<%s.%s>的Intent<%d,%s,0x%x>",
+ this->getName().c_str(),
+ pPin->getName().c_str(),
+ pFromEq->getName().c_str(),
+ pFromPin->getName().c_str(),
+ pIntent->getCode(),
+ pIntent->getMsg(),
+ pIntent->getContext());
+
+
+
+ // 以下解释处理数据
+ int code = pIntent->getCode();
+
+
+ // 测试
+ if (code == FLOW_TEST) {
+ AfxMessageBox(pIntent->getMsg());
+ return FLOW_ACCEPT;
+ }
+
+
+ // 信号
+ if (code == FLOW_SIGNAL) {
+ return FLOW_ACCEPT;
+ }
+
+
+ // 数据
+ if (code == FLOW_SIGNAL) {
+ return FLOW_ACCEPT;
+ }
+
+
+ // 物料
+ if (code == FLOW_MOVE_MATERIAL) {
+ CPanel* pPanel = (CPanel*)pIntent->getContext();
+ ASSERT(pPanel);
+ if (!glassWillArrive(pPanel)) {
+ return FLOW_REJECT;
+ }
+ return glassArrived(pPanel);
+ }
+
+
+
+ return FLOW_ACCEPT;
+ }
+
+ int CEquipment::outputGlass(int port)
+ {
+ CPin* pOutPin = nullptr;
+ if (port == 0) {
+ pOutPin = getPin("Out");
+ if (pOutPin == nullptr) {
+ pOutPin = getPin("Out1");
+ }
+ }
+ else if (port == 1) {
+ pOutPin = getPin("Out2");
+ }
+ if (pOutPin == nullptr) {
+ return -1;
+ }
+
+
+ // 模拟取出第一张Panel,传送到下一环节
+ Lock();
+ CPanel* pContext = m_panelList.front();
+ pContext->addRef();
+
+ CIntent intent(FLOW_MOVE_MATERIAL, "", pContext);
+ int nRet = pOutPin->sendIntent(&intent);
+ if (nRet == FLOW_REJECT) {
+ LOGE("<CEquipment>对方拒绝接收Intent.");
+ }
+ else if (nRet == FLOW_ACCEPT) {
+ m_panelList.pop_front();
+ pContext->release(); // 添加到列队时addRef, 取出时release
+ }
+
+ pContext->release();
+ Unlock();
+
+ return 0;
+ }
+
+ BOOL CEquipment::glassWillArrive(CPanel* pPanel)
+ {
+ return TRUE;
+ }
+
+ int CEquipment::glassArrived(CPanel* pPanel)
+ {
+ Lock();
+ pPanel->addRef();
+ m_panelList.push_back(pPanel);
+ Unlock();
+ return FLOW_ACCEPT;
+ }
+
+ void CEquipment::addPanelToList(CPanel* pPanel)
+ {
+ ASSERT(pPanel);
+
+ Lock();
+ pPanel->addRef();
+ m_panelList.push_back(pPanel);
+ Unlock();
+ }
}
--
Gitblit v1.9.3