From d256f84735b75529a640ca61384c3c55b557fce9 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 12 五月 2025 16:22:57 +0800
Subject: [PATCH] 1. 修复日志时顺问题 2. 解决远程路径不存在编译报错的问题
---
SourceCode/Bond/Servo/CPageGraph2.cpp | 91 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 87 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index 2a5a00e..ffc169d 100644
--- a/SourceCode/Bond/Servo/CPageGraph2.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -8,6 +8,8 @@
#include "CHMPropertyDlg.h"
#include "CEquipmentPage1.h"
#include "CEquipmentPage2.h"
+#include "CPagePortProperty.h"
+#include "CPageCassetteCtrlCmd.h"
// CPageGraph2 瀵硅瘽妗�
@@ -86,15 +88,26 @@
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
CHMPropertyDlg dlg(pEquipment->getName().c_str(), 600, 680);
- CEquipmentPage1* pPage1 = new CEquipmentPage1();
- pPage1->setEquipment(pEquipment);
- pPage1->Create(IDD_PAGE_EQUIPMENT1);
- dlg.addPage(pPage1, "test1");
+
+ if (_strcmpi(pEquipment->getClassName(), "CLoadPort") == 0) {
+ CPagePortProperty* pPage1 = new CPagePortProperty();
+ pPage1->setLoadPort((SERVO::CLoadPort*)pEquipment);
+ pPage1->Create(IDD_PAGE_PORT_PROPERTY);
+ dlg.addPage(pPage1, "灞炴��");
+ }
CEquipmentPage2* pPage2 = new CEquipmentPage2();
pPage2->setEquipment(pEquipment);
pPage2->Create(IDD_PAGE_EQUIPMENT2);
dlg.addPage(pPage2, "Glass");
+
+ if (pEquipment->getID() == EQ_ID_LOADPORT1
+ || pEquipment->getID() == EQ_ID_LOADPORT2) {
+ CPageCassetteCtrlCmd* pPage = new CPageCassetteCtrlCmd();
+ pPage->setEquipment(pEquipment);
+ pPage->Create(IDD_PAGE_CASSETTE_CTRL_CMD);
+ dlg.addPage(pPage, "Cassette control command");
+ }
dlg.DoModal();
return true;
@@ -149,6 +162,69 @@
}
else if (nCmd == ID_EQSGRAPHITEM_TEST3) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
+
+ // 娴嬭瘯涓嬪彂Cim Message
+ /*
+ if (pEquipment->getID() == EQ_ID_Bonder1
+ || pEquipment->getID() == EQ_ID_Bonder2) {
+ static int msgId = 0; msgId++;
+ if (msgId % 2 == 0) {
+ pEquipment->setCimMessage("Hello!", msgId, 1);
+ }
+ else {
+ pEquipment->setCimMessage("ABC0123456789", msgId, 2);
+ }
+ }
+ */
+
+
+ // 娴嬭瘯娓呴櫎Cim Message
+ /*
+ if (pEquipment->getID() == EQ_ID_Bonder1
+ || pEquipment->getID() == EQ_ID_Bonder2) {
+ static int msgId = 0; msgId++;
+ if (msgId % 2 == 0) {
+ pEquipment->clearCimMessage(msgId, 1);
+ }
+ else {
+ pEquipment->clearCimMessage(msgId, 2);
+ }
+ }
+ */
+
+ // 娴嬭瘯璁剧疆鏃堕棿
+ /*
+ if (pEquipment->getID() == EQ_ID_Bonder1
+ || pEquipment->getID() == EQ_ID_Bonder2) {
+ CTime time = CTime::GetCurrentTime();
+ pEquipment->setDateTime((short)time.GetYear(),
+ (short)time.GetMonth(),
+ (short)time.GetDay(),
+ (short)time.GetHour(),
+ (short)time.GetMinute(),
+ (short)time.GetSecond());
+ }
+ */
+
+
+ // 娴嬭瘯璁剧疆cim mode
+ /*
+ if (pEquipment->getID() == EQ_ID_Bonder1
+ || pEquipment->getID() == EQ_ID_Bonder2) {
+ static int ii = 0; ii++;
+ pEquipment->setCimMode(ii % 2 == 0);
+ }
+ */
+
+ /*
+ if (pEquipment->getID() == EQ_ID_Bonder1
+ || pEquipment->getID() == EQ_ID_Bonder2) {
+ static int ii = 0; ii++;
+ pEquipment->setEqMode((ii % 5) + 1);
+ }
+ */
+
+ /*
SERVO::CGlass* pGlass = pEquipment->getFrontGlass();
if (pGlass != nullptr) {
std::string strDescription;
@@ -159,6 +235,13 @@
pPath = pPath->getNext();
}
}
+ */
+
+
+ // 璇锋眰涓婚厤鏂瑰垪琛�
+ if (pEquipment != nullptr) {
+ pEquipment->masterRecipeListRequest(0);
+ }
}
--
Gitblit v1.9.3