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/BondEq/CProjectPageRemoteEqs.cpp |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp b/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp
index 2eed02d..e120046 100644
--- a/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp
+++ b/SourceCode/Bond/BondEq/CProjectPageRemoteEqs.cpp
@@ -55,7 +55,7 @@
 			// onNext
 			pAny->addRef();
 			int code = pAny->getCode();
-			if (RX_CODE_REMOTEEQ_STATE_CHANGED == code) {
+			if (RX_CODE_EQ_STATE_CHANGED == code) {
 				BEQ::IRemoteEquipment* pRemoteEq;
 				if (pAny->getPtrValue("ptr", (void*&)pRemoteEq)) {
 					HTREEITEM hItem = getTreeItem(pRemoteEq);
@@ -128,9 +128,10 @@
 		::DeleteObject(m_hbrBkgnd);
 	}
 
-	ASSERT(m_pObserver != NULL);
-	m_pObserver->unsubscribe();
-	m_pObserver = NULL;
+	if (m_pObserver != NULL) {
+		m_pObserver->unsubscribe();
+		m_pObserver = NULL;
+	}
 }
 
 
@@ -195,16 +196,6 @@
 	if (1 == nIDEvent) {
 		KillTimer(1);
 		InitRxWindows();
-
-		// 杩滅▼璁惧鍒楄〃
-		char szEqName[256];
-		BEQ::IRemoteEquipment* pRemoteEq = theApp.m_model.getBond1();
-		ASSERT(pRemoteEq);
-		pRemoteEq->getName(szEqName, 256);
-		
-		HTREEITEM hItemEq = m_treeRemoteEqs.InsertItem(szEqName);
-		m_treeRemoteEqs.SetItemIcon(hItemEq, pRemoteEq->isConnected() ? m_hIconRemoteEqLight : m_hIconRemoteEqDark);
-		m_treeRemoteEqs.SetItemData(hItemEq, (DWORD_PTR)pRemoteEq);
 	}
 
 	CDialogEx::OnTimer(nIDEvent);

--
Gitblit v1.9.3