From 2f0684bf01209b9ddfdc53da44fb85f4db6db326 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 06 六月 2025 15:56:02 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEquipment.h | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 7b2b24e..ac4b84c 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -38,10 +38,11 @@
namespace SERVO {
-#define SLOT_MAX 12
+#define SLOT_MAX PATH_MAX
#define SIGNAL_UPSTREAM_INLINE 0
#define SIGNAL_UPSTREAM_TROUBLE 1
-#define SIGNAL_SEND_ABLE 2
+#define SIGNAL_INTERLOCK 2
+#define SIGNAL_SEND_ABLE 3
typedef std::function<void(void* pEiuipment, BOOL bAlive)> ONALIVE;
typedef std::function<void(void* pEiuipment, int code)> ONDATACHANGED;
@@ -163,6 +164,7 @@
// 获取一个指定物料类型(G1,G2,G1&G2)的且已经加工处理的槽位
CSlot* getProcessedSlot(MaterialsType putSlotType);
+ CSlot* getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates);
// 获取玻璃物料
CGlass* getGlassFromSlot(int slotNo);
@@ -194,6 +196,7 @@
// 只在模拟测试时使用的函数，用于模拟信号
void setLinkSignal(unsigned int path, unsigned int signal, BOOL bOn);
+ void setLinkSignalBlock(unsigned int path, BOOL* pSignal);
protected:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
--
Gitblit v1.9.3