From 38f2ff1e5bc6c4434875e03b8cadc8f3f4e39bf6 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 27 八月 2025 18:18:02 +0800
Subject: [PATCH] 1.修改调度逻辑，增加G0，第二类型，增加TestFlag, 用于必要时输出指定日志；
---
SourceCode/Bond/Servo/CEquipment.h | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 465354d..c2e93cd 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -54,6 +54,8 @@
typedef std::function<BOOL(void* pEiuipment, int port, CJobDataB* pJobDataB)> ONPREFETCHEDOUTJOB;
typedef std::function<BOOL(void* pEiuipment, int port, CJobDataB* pJobDataB, short& putSlot)> ONPRESTOREDJOB;
typedef std::function<void(void* pEiuipment, PROCESS_STATE state)> ONPROCESSSTATE;
+ typedef std::function<void(void* pEiuipment, short scanMap, short downMap)> ONMAPMISMATCH;
+ typedef std::function<void(void* pEiuipment, short status, __int64 data)> ONPORTSTATUSCHANGED;
typedef struct _EquipmentListener
{
ONALIVE onAlive;
@@ -64,6 +66,9 @@
ONPREFETCHEDOUTJOB onPreFethedOutJob;
ONPRESTOREDJOB onPreStoredJob;
ONPROCESSSTATE onProcessStateChanged;
+ ONMAPMISMATCH onMapMismatch;
+ ONPORTSTATUSCHANGED onPortStatusChanged;
+
} EquipmentListener;
@@ -74,6 +79,8 @@
virtual ~CEquipment();
public:
+ void SetEnable(BOOL bEnable);
+ BOOL IsEnabled() const;
virtual const char* getClassName() = 0;
virtual void setListener(EquipmentListener listener);
void setCcLink(CCCLinkIEControl* pCcLink);
@@ -169,6 +176,7 @@
// 获取一个指定物料类型(G1,G2,G1&G2)的空槽位
CSlot* getAvailableSlotForGlass(MaterialsType type);
CSlot* getAvailableSlotForGlassExcludeSignal(MaterialsType type);
+ CSlot* isSlotAvailable(unsigned int slot);
// 在指定的槽列表中，获取一个指定物料类型(G1,G2,G1&G2)的空槽位
CSlot* getAvailableSlotForGlass2(MaterialsType type, const std::vector<int>& candidates);
@@ -177,9 +185,10 @@
CSlot* getNonEmptySlot(MaterialsType type);
// 获取一个指定物料类型(G1,G2,G1&G2)的且已经加工处理的槽位
- CSlot* getProcessedSlot(MaterialsType putSlotType);
+ CSlot* getProcessedSlot(MaterialsType putSlotType, BOOL bJobMode = FALSE);
CSlot* getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates);
CSlot* getInspFailSlot();
+ CSlot* getProcessedSlotCt(unsigned int slot);
// 获取玻璃物料
CGlass* getGlassFromSlot(int slotNo);
@@ -246,6 +255,7 @@
void setProcessState(PROCESS_STATE state);
protected:
+ BOOL m_bEnable;
EquipmentListener m_listener;
int m_nID;
std::string m_strName;
@@ -280,6 +290,9 @@
private:
CEquipment* m_pArm;
+
+ public:
+ int m_nTestFlag;
};
}
--
Gitblit v1.9.3