From 6fc65c5cf54432d1044fbe9799aca76f7273798c Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 23 五月 2025 18:02:27 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/CPageGraph2.cpp | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index ea4010b..7e4811e 100644
--- a/SourceCode/Bond/Servo/CPageGraph2.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -8,9 +8,13 @@
#include "CHMPropertyDlg.h"
#include "CEquipmentPage1.h"
#include "CEquipmentPage2.h"
+#include "CEquipmentPage3.h"
#include "CPagePortProperty.h"
+#include "CPagePortStatus.h"
#include "CPageCassetteCtrlCmd.h"
#include "CJobDataB.h"
+#include "CRobotCmdContainerDlg.h"
+#include "CRobotCmdTestDlg.h"
// CPageGraph2 瀵硅瘽妗�
@@ -124,19 +128,31 @@
ASSERT(pItem);
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
- CHMPropertyDlg dlg(pEquipment->getName().c_str(), 600, 680);
+ CHMPropertyDlg dlg(pEquipment->getName().c_str(), 658, 788);
if (_strcmpi(pEquipment->getClassName(), "CLoadPort") == 0) {
- CPagePortProperty* pPage1 = new CPagePortProperty();
- pPage1->setLoadPort((SERVO::CLoadPort*)pEquipment);
- pPage1->Create(IDD_PAGE_PORT_PROPERTY);
- dlg.addPage(pPage1, "灞炴��");
+ CPagePortProperty* pPageA = new CPagePortProperty();
+ pPageA->setLoadPort((SERVO::CLoadPort*)pEquipment);
+ pPageA->Create(IDD_PAGE_PORT_PROPERTY);
+ dlg.addPage(pPageA, "灞炴��");
+
+ CPagePortStatus* pPageB = new CPagePortStatus();
+ pPageB->setLoadPort((SERVO::CLoadPort*)pEquipment);
+ pPageB->Create(IDD_PAGE_PORT_STATUS);
+ dlg.addPage(pPageB, "Status");
}
CEquipmentPage2* pPage2 = new CEquipmentPage2();
pPage2->setEquipment(pEquipment);
pPage2->Create(IDD_PAGE_EQUIPMENT2);
dlg.addPage(pPage2, "Glass");
+
+ if (pEquipment->getID() == EQ_ID_EFEM) {
+ CEquipmentPage3* pPage3 = new CEquipmentPage3();
+ pPage3->setEquipment(pEquipment);
+ pPage3->Create(IDD_PAGE_EQUIPMENT3);
+ dlg.addPage(pPage3, "Dispatching Mode");
+ }
if (pEquipment->getID() == EQ_ID_LOADPORT1
|| pEquipment->getID() == EQ_ID_LOADPORT2) {
@@ -239,6 +255,45 @@
else if (nCmd == ID_EQSGRAPHITEM_TEST4) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
+ /* 娴嬭瘯 RobotCMD */
+ if (pEquipment->getID() == EQ_ID_EFEM) {
+ SERVO::CEFEM* pEFEM = (SERVO::CEFEM*)pEquipment;
+
+ //SERVO::ROBOT_CMD_PARAM cmds[4];
+ //cmds[0].sequenceNo = 1;
+ //cmds[0].rcmd = (short)SERVO::RCMD::Move;
+ //cmds[0].armNo = 1;
+ //cmds[0].getPosition = 1;
+ //cmds[0].putPosition = 2;
+ //cmds[0].getSlotNo = 3;
+ //cmds[0].putSlotNo = 4;
+ //cmds[0].subCmd = 5;
+ //cmds[1].sequenceNo = 2;
+ //cmds[1].rcmd = (short)SERVO::RCMD::Transfer;
+ //cmds[1].armNo = 2;
+ //cmds[1].getPosition = 6;
+ //cmds[1].putPosition = 7;
+ //cmds[1].getSlotNo = 8;
+ //cmds[1].putSlotNo = 9;
+ //cmds[1].subCmd = 10;
+ //pEFEM->robotCmds(cmds, 2);
+
+ //CRobotCmdContainerDlg dlg;
+ //if (dlg.DoModal() == IDOK) {
+ // std::vector<SERVO::ROBOT_CMD_PARAM>& cmds = dlg.GetResultCmds();
+ // if (!cmds.empty()) {
+ // pEFEM->robotCmds(cmds.data(), (int)cmds.size());
+ // }
+ //}
+
+ CRobotCmdTestDlg dlg;
+ dlg.SetEFEM(pEFEM);
+ dlg.DoModal();
+ }
+
+
+
+
// 娴嬭瘯涓嬪彂Cim Message
/*
if (pEquipment->getID() == EQ_ID_Bonder1
--
Gitblit v1.9.3