From 2a803976ed12e59f3e082e7c08941ef5004e6ea1 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 20 五月 2025 11:40:10 +0800
Subject: [PATCH] 1. 添加机器臂命令配置界面
---
SourceCode/Bond/Servo/CPageGraph2.cpp | 152 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 145 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index 4d81345..cbce17f 100644
--- a/SourceCode/Bond/Servo/CPageGraph2.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -8,8 +8,11 @@
#include "CHMPropertyDlg.h"
#include "CEquipmentPage1.h"
#include "CEquipmentPage2.h"
+#include "CEquipmentPage3.h"
#include "CPagePortProperty.h"
#include "CPageCassetteCtrlCmd.h"
+#include "CJobDataB.h"
+#include "CRobotCmdContainerDlg.h"
// CPageGraph2 瀵硅瘽妗�
@@ -22,6 +25,7 @@
m_pEqsGraphWnd = nullptr;
m_crBkgnd = PAGE_GRPAH2_BACKGROUND_COLOR;
m_hbrBkgnd = nullptr;
+ m_pObserver = nullptr;
}
CPageGraph2::~CPageGraph2()
@@ -45,9 +49,44 @@
// CPageGraph2 娑堟伅澶勭悊绋嬪簭
+void CPageGraph2::InitRxWindows()
+{
+ /* code */
+ // 璁㈤槄鏁版嵁
+ IRxWindows* pRxWindows = RX_GetRxWindows();
+ pRxWindows->enableLog(5);
+ if (m_pObserver == NULL) {
+ m_pObserver = pRxWindows->allocObserver([&](IAny* pAny) -> void {
+ // onNext
+ pAny->addRef();
+ int code = pAny->getCode();
+ if (RX_CODE_EQ_DATA_CHANGED == code) {
+ // 閫氱煡璁惧鐘舵��
+ SERVO::CEquipment* pEquipment = nullptr;
+ if (pAny->getPtrValue("ptr", (void*&)pEquipment)) {
+ if (pEquipment != nullptr) {
+ m_pEqsGraphWnd->ShowItemIndicator((DWORD_PTR)pEquipment, !pEquipment->isGlassListEmpty());
+ }
+ }
+ }
+
+ pAny->release();
+ }, [&]() -> void {
+ // onComplete
+ }, [&](IThrowable* pThrowable) -> void {
+ // onErrorm
+ pThrowable->printf();
+ });
+
+ theApp.m_model.getObservable()->observeOn(pRxWindows->mainThread())
+ ->subscribe(m_pObserver);
+ }
+}
+
BOOL CPageGraph2::OnInitDialog()
{
CDialogEx::OnInitDialog();
+ InitRxWindows();
SetTimer(1, 2000, nullptr);
@@ -100,6 +139,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) {
@@ -154,14 +200,88 @@
// 娴嬭瘯
else if (nCmd == ID_EQSGRAPHITEM_TEST1) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
- pEquipment->outputGlass(0);
+ if (pEquipment->getID() == EQ_ID_LOADPORT1) {
+ ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G1, 10,
+ "P20250320G1X", 1);
+ }
+ 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->outputGlass(1);
+ 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());
+ }
+ }
+ }
+
+
+
// 娴嬭瘯涓嬪彂Cim Message
/*
@@ -176,8 +296,10 @@
}
}
*/
+
+
// 娴嬭瘯娓呴櫎Cim Message
-
+ /*
if (pEquipment->getID() == EQ_ID_Bonder1
|| pEquipment->getID() == EQ_ID_Bonder2) {
static int msgId = 0; msgId++;
@@ -188,7 +310,7 @@
pEquipment->clearCimMessage(msgId, 2);
}
}
-
+ */
// 娴嬭瘯璁剧疆鏃堕棿
/*
@@ -214,15 +336,15 @@
}
*/
- /*
+
if (pEquipment->getID() == EQ_ID_Bonder1
|| pEquipment->getID() == EQ_ID_Bonder2) {
static int ii = 0; ii++;
pEquipment->setEqMode((ii % 5) + 1);
}
- */
+
+
/*
- SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
SERVO::CGlass* pGlass = pEquipment->getFrontGlass();
if (pGlass != nullptr) {
std::string strDescription;
@@ -234,6 +356,12 @@
}
}
*/
+
+
+ // 璇锋眰涓婚厤鏂瑰垪琛�
+ if (pEquipment != nullptr) {
+ pEquipment->masterRecipeListRequest(0);
+ }
}
@@ -282,6 +410,11 @@
if (m_hbrBkgnd != nullptr) {
::DeleteObject(m_hbrBkgnd);
}
+
+ if (m_pObserver != nullptr) {
+ m_pObserver->unsubscribe();
+ m_pObserver = NULL;
+ }
}
@@ -317,6 +450,8 @@
for (auto outPin : outPins) {
m_pEqsGraphWnd->AddPin(pItem, OUTPIN, outPin->getName().c_str(), (DWORD_PTR)outPin);
}
+
+ m_pEqsGraphWnd->ShowItemIndicator((DWORD_PTR)pEquipment, !pEquipment->isGlassListEmpty());
}
void CPageGraph2::OnTimer(UINT_PTR nIDEvent)
@@ -350,6 +485,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