From f0928d2abc4f3b5875d27b1beeb393cf5edf8c4a Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 24 三月 2025 15:30:38 +0800
Subject: [PATCH] 1.Master数据的缓存,主动关闭程序,或程序闪退,可重启还原。
---
SourceCode/Bond/Servo/CEquipment.cpp | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 223 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 7ef517b..393191b 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -22,10 +22,25 @@
CEquipment::~CEquipment()
{
+ for (auto item : m_glassList) {
+ item->release();
+ }
+ m_glassList.clear();
+
for (auto item : m_mapStep) {
delete item.second;
}
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);
}
@@ -95,6 +110,7 @@
void CEquipment::init()
{
+ initPins();
for (auto item : m_mapStep) {
item.second->init();
}
@@ -179,6 +195,21 @@
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_glassList) {
+ attrubutes.addAttribute(new CAttribute("Glass",
+ item->getID().c_str(), ""));
+ }
}
void CEquipment::setReadBitBlock(unsigned int start, unsigned int end)
@@ -227,7 +258,26 @@
void CEquipment::serialize(CArchive& ar)
{
-
+ if (ar.IsStoring()) {
+ Lock();
+ int count = (int)m_glassList.size();
+ ar << count;
+ for (auto item : m_glassList) {
+ item->serialize(ar);
+ }
+ Unlock();
+ }
+ else {
+ Lock();
+ int count;
+ ar >> count;
+ for (int i = 0; i < count; i++) {
+ CGlass* pGlass = new CGlass();
+ pGlass->serialize(ar);
+ addGlassToList(pGlass);
+ }
+ Unlock();
+ }
}
void CEquipment::onReceiveLBData(const char* pszData, size_t size)
@@ -372,4 +422,176 @@
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) {
+ CGlass* pGlass = (CGlass*)pIntent->getContext();
+ ASSERT(pGlass);
+ if (!glassWillArrive(pGlass)) {
+ return FLOW_REJECT;
+ }
+ return glassArrived(pGlass);
+ }
+
+
+
+ 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();
+ if (m_glassList.empty()) {
+ Unlock();
+ return -2;
+ }
+ CGlass* pContext = m_glassList.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_glassList.pop_front();
+ pContext->release(); // 添加到列队时addRef, 取出时release
+ }
+
+ pContext->release();
+ Unlock();
+
+ return 0;
+ }
+
+ BOOL CEquipment::glassWillArrive(CGlass* pGlass)
+ {
+ return TRUE;
+ }
+
+ int CEquipment::glassArrived(CGlass* pGlass)
+ {
+ Lock();
+ pGlass->addRef();
+ m_glassList.push_back(pGlass);
+ Unlock();
+ return FLOW_ACCEPT;
+ }
+
+ void CEquipment::addGlassToList(CGlass* pGlass)
+ {
+ ASSERT(pGlass);
+
+ Lock();
+ pGlass->addRef();
+ m_glassList.push_back(pGlass);
+ Unlock();
+ }
}
--
Gitblit v1.9.3