From cbe189228810812547d16a3211ab0b174831f609 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 24 三月 2025 11:56:04 +0800
Subject: [PATCH] 1.修复一个闪退问题(Glass列表为空仍要下传导致)； 2.在CEquipment派生类中实现限制上游移动（如下在加工且加工数量有限制）；
---
SourceCode/Bond/Servo/CEquipment.h | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 0ada23c..576adaa 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -16,7 +16,7 @@
#include <vector>
#include <map>
#include <list>
-#include "CPanel.h"
+#include "CGlass.h"
namespace SERVO {
@@ -89,9 +89,9 @@
std::vector<CPin*>& CEquipment::getInputPins();
std::vector<CPin*>& CEquipment::getOutputPins();
virtual int recvIntent(CPin* pPin, CIntent* pIntent);
- virtual BOOL glassWillArrive(CPanel* pPanel);
+ virtual BOOL glassWillArrive(CGlass* pGlass);
virtual int outputGlass(int port);
- virtual int glassArrived(CPanel* pPanel);
+ virtual int glassArrived(CGlass* pGlass);
// 以下为从CC-Link读取到的Bit标志位检测函数
public:
@@ -111,7 +111,7 @@
protected:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
- void addPanelToList(CPanel* pPanel);
+ void addGlassToList(CGlass* pGlass);
protected:
EquipmentListener m_listener;
@@ -124,7 +124,7 @@
MemoryBlock m_blockWriteBit;
std::vector<CPin*> m_inputPins;
std::vector<CPin*> m_outputPins;
- std::list<CPanel*> m_panelList;
+ std::list<CGlass*> m_glassList;
// 以下为从CC-Link读取到的Bit标志位
--
Gitblit v1.9.3