From 016183bc4926c4fd80599dc7e06542c5396e6fd8 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 12 四月 2025 16:24:25 +0800
Subject: [PATCH] 1.读取机器的Job Event上报； 2.修复在读取CC-Link数据当单元号超出32767时读取失败的问题。

---
 SourceCode/Bond/Servo/CEquipment.h |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 407b505..82e21ca 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -16,6 +16,8 @@
 #include "CEqPortChangeStep.h"
 #include "CEqReadIntStep.h"
 #include "CEqCassetteTransferStateStep.h"
+#include "CEqCassetteCtrlCmdStep.h"
+#include "CEqJobEventStep.h"
 #include <vector>
 #include <map>
 #include <list>
@@ -104,6 +106,13 @@
 		CGlass* getFrontGlass();
 		BOOL removeClass(CGlass* pGlass);
 		bool isAlarmStep(SERVO::CStep* pStep);
+		bool isCassetteTransferStateStep(SERVO::CStep* pStep);
+		bool isCimMessageConfirmStep(SERVO::CStep* pStep);
+		int setEqMode(short mode);
+		int setCimMode(BOOL bOn);
+		int setCimMessage(const char* pszMessage, short id, short nTouchPanelNo);
+		int clearCimMessage(short id, short nTouchPanelNo);
+		int setDateTime(short year, short month, short day, short hour, short minute, short second);
 
 	// 以下为从CC-Link读取到的Bit标志位检测函数
 	public:
@@ -140,7 +149,7 @@
 
 
 		// 以下为从CC-Link读取到的Bit标志位
-	private:
+	protected:
 		ALIVE m_alive;
 		BOOL m_bCimState;			// ON/OFF
 		BOOL m_bUpstreamInline;
@@ -149,7 +158,7 @@
 		BOOL m_bAutoRecipeChange;
 		BOOL m_bVCREnable[VCR_MAX];
 
-	private:
+	protected:
 		CCCLinkIEControl* m_pCclink;
 		std::map<unsigned int, CStep*> m_mapStep;
 		int m_nBaseAlarmId;

--
Gitblit v1.9.3