From b54cb6d1d8742e94bd79623d4f410b3ff5abde86 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 26 六月 2025 08:47:12 +0800
Subject: [PATCH] 6.定时轮询比特位,修改为只轮询EFEM, Bonder1, Bonder2, BakeCooling, VacuuumBake, Measurent, 其它只是以上的子单元,共用CC-Link的数据块。 7.修改一处转换机械手的放置目标POS时的错误 问题。 8.增加机械手状态和托盘是否有物料的信息打印,以便于创建搬送任务时观察和调试

---
 SourceCode/Bond/Servo/CGlass.cpp |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/SourceCode/Bond/Servo/CGlass.cpp b/SourceCode/Bond/Servo/CGlass.cpp
index dc47c5e..a88255a 100644
--- a/SourceCode/Bond/Servo/CGlass.cpp
+++ b/SourceCode/Bond/Servo/CGlass.cpp
@@ -108,8 +108,6 @@
 				m_pPath->serialize(ar);
 			}
 			char temp[JOBDATAS_SIZE] = { 0 };
-			m_jobDataB.serialize(temp, JOBDATAB_SIZE);
-			ar.Write(temp, JOBDATAB_SIZE);
 			m_jobDataS.serialize(temp, JOBDATAS_SIZE);
 			ar.Write(temp, JOBDATAS_SIZE);
 			ar << (ULONGLONG)m_pBuddy;
@@ -131,8 +129,6 @@
 				m_pPath->serialize(ar);
 			}
 			char temp[JOBDATAS_SIZE];
-			ar.Read(temp, JOBDATAB_SIZE);
-			m_jobDataB.unserialize(temp, JOBDATAB_SIZE);
 			ar.Read(temp, JOBDATAS_SIZE);
 			m_jobDataS.unserialize(temp, JOBDATAS_SIZE);
 			ar >> ullPath;	m_pBuddy = (CGlass*)ullPath;
@@ -141,21 +137,16 @@
 		}
 	}
 
-	void CGlass::setJobDataB(CJobDataB* pJobDataB)
-	{
-		m_jobDataB.copy(pJobDataB);
-	}
-
-	CJobDataB* CGlass::getJobDataB()
-	{
-		return &m_jobDataB;
-	}
-
 	void CGlass::setJobDataS(CJobDataS* pJobDataS)
 	{
 		m_jobDataS.copy(pJobDataS);
 	}
 
+	void CGlass::updateJobDataS(CJobDataS* pJobDataS)
+	{
+		m_jobDataS.update(pJobDataS);
+	}
+
 	CJobDataS* CGlass::getJobDataS()
 	{
 		return &m_jobDataS;

--
Gitblit v1.9.3