From da96e6da0b677c6a4e96308aaecd3d619a8e4db2 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 26 六月 2025 08:46:11 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/ServoDlg.cpp | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index bf9c874..dde6456 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -21,6 +21,7 @@
#include "SystemLogManagerDlg.h"
#include "UserManager.h"
#include "SystemLogManager.h"
+#include "PortConfigurationDlg.h"
#ifdef _DEBUG
@@ -885,6 +886,10 @@
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
}
}
+ else if (id == IDC_BUTTON_PORT_CONFIG) {
+ CPortConfigurationDlg dlg;
+ dlg.DoModal();
+ }
else if (id == IDC_BUTTON_ROBOT) {
theApp.m_model.getMaster().clearError();
SERVO::CEFEM* pEFEM = (SERVO::CEFEM*)theApp.m_model.getMaster().getEquipment(EQ_ID_EFEM);
@@ -892,6 +897,14 @@
dlg.SetEFEM(pEFEM);
dlg.DoModal();
}
+ else if (id == IDC_BUTTON_SETTINGS) {
+ SERVO::CEquipment* pEq = theApp.m_model.m_master.getEquipment(EQ_ID_EFEM);
+ pEq->printDebugString001();
+ pEq = theApp.m_model.m_master.getEquipment(EQ_ID_Bonder1);
+ pEq->printDebugString001();
+ pEq = theApp.m_model.m_master.getEquipment(EQ_ID_Bonder2);
+ pEq->printDebugString001();
+ }
else if (id == IDC_BUTTON_OPERATOR) {
int menuId = (int)wParam;
SystemLogManager& logManager = SystemLogManager::getInstance();
--
Gitblit v1.9.3