From 5cf5e464a5891c8eb62aafadfce0d204fdc79b02 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 22 五月 2025 13:50:02 +0800
Subject: [PATCH] 1. 添加机械臂快速测试界面
---
SourceCode/Bond/Servo/CPageGraph2.cpp | 97 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 93 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index 3a7d3bf..3e161a7 100644
--- a/SourceCode/Bond/Servo/CPageGraph2.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -8,8 +8,12 @@
#include "CHMPropertyDlg.h"
#include "CEquipmentPage1.h"
#include "CEquipmentPage2.h"
+#include "CEquipmentPage3.h"
#include "CPagePortProperty.h"
#include "CPageCassetteCtrlCmd.h"
+#include "CJobDataB.h"
+#include "CRobotCmdContainerDlg.h"
+#include "CRobotCmdTestDlg.h"
// CPageGraph2 瀵硅瘽妗�
@@ -83,6 +87,7 @@
BOOL CPageGraph2::OnInitDialog()
{
CDialogEx::OnInitDialog();
+ InitRxWindows();
SetTimer(1, 2000, nullptr);
@@ -135,6 +140,13 @@
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) {
@@ -190,16 +202,91 @@
else if (nCmd == ID_EQSGRAPHITEM_TEST1) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
if (pEquipment->getID() == EQ_ID_LOADPORT1) {
- pEquipment->outputGlass(1);
+ ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G1, 10,
+ "P20250320G1X", 1);
}
- pEquipment->fetchedOut("P20250320A1A2");
+ else if (pEquipment->getID() == EQ_ID_LOADPORT2) {
+ ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G2, 10,
+ "P20250320G2X", 1);
+ }
+ SERVO::CGlass* pGlass = pEquipment->getFrontGlass();
+ if (pGlass != nullptr) {
+ SERVO::CJobDataB* pJobDataB = pGlass->getJobDataB();
+ SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
+ if (pJobDataB != nullptr && pJobDataS != nullptr) {
+ pEquipment->fetchedOutJob(pJobDataB);
+ pEquipment->onSentOutJob(0, pJobDataS);
+ }
+ }
}
else if (nCmd == ID_EQSGRAPHITEM_TEST2) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
- pEquipment->storeJob("P20250320A1A2");
+ SERVO::CArm* pArm = (SERVO::CArm*)pEquipment->getArm();
+ if (pArm != nullptr) {
+ SERVO::CGlass* pGlass = pArm->getFrontGlass();
+ if (pGlass != nullptr) {
+ SERVO::CJobDataB* pJobDataB = pGlass->getJobDataB();
+ SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
+ if (pJobDataB != nullptr && pJobDataS != nullptr) {
+ pEquipment->onReceivedJob(0, pJobDataS);
+ Sleep(600);
+ pEquipment->onStoredJob(0, pJobDataB);
+ }
+ }
+ }
}
else if (nCmd == ID_EQSGRAPHITEM_TEST3) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
+ if (pEquipment != nullptr) {
+ SERVO::CGlass* pGlass = pEquipment->getFrontGlass();
+ if (pGlass != nullptr) {
+ SERVO::CProcessData pd;
+ pd.setGlassId(pGlass->getID().c_str());
+ pEquipment->onProcessData(&pd);
+ }
+ }
+ }
+ 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
/*
@@ -375,7 +462,6 @@
void CPageGraph2::OnTimer(UINT_PTR nIDEvent)
{
if (1 == nIDEvent) {
- InitRxWindows();
KillTimer(1);
std::list<SERVO::CEquipment*>& eqs = theApp.m_model.m_master.getEquipmentList();
for (auto eq : eqs) {
@@ -404,6 +490,9 @@
std::list<SERVO::CEquipment*>& eqs = theApp.m_model.m_master.getEquipmentList();
for (auto item : eqs) {
EQITEM* pEqItem = m_pEqsGraphWnd->GetItem((DWORD_PTR)item);
+ if (nullptr == pEqItem) {
+ continue;
+ }
strValue.Format(_T("%d"), pEqItem->rect.left);
WritePrivateProfileString(item->getName().c_str(), _T("Left"),
--
Gitblit v1.9.3