From 7096025175b6d100923dcd66c1face07d2e28555 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 24 七月 2025 15:20:21 +0800
Subject: [PATCH] 1. 完善获取配方列表的功能 2. 添加获取配方超时警告
---
SourceCode/Bond/Servo/ServoDlg.cpp | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 2de8710..bde44da 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -241,6 +241,14 @@
}
}
}
+ else if (RX_CODE_LOADPORT_INUSE == code) {
+ SERVO::CLoadPort* pLoadPort = nullptr;
+ if (pAny->getPtrValue("ptr", (void*&)pLoadPort)) {
+ CPortConfigurationDlg dlg;
+ dlg.setCurSelPort(pLoadPort->getIndex());
+ dlg.DoModal();
+ }
+ }
pAny->release();
}, [&]() -> void {
@@ -283,6 +291,10 @@
// 执行此操作
SetIcon(m_hIcon, TRUE); // 设置大图标
SetIcon(m_hIcon, FALSE); // 设置小图标
+
+
+ // model init
+ theApp.m_model.init();
// 菜单
@@ -353,9 +365,6 @@
int height = GetSystemMetrics(SM_CYSCREEN);
MoveWindow((width - rcWnd.Width()) / 2, 0, rcWnd.Width(), rcWnd.Height(), TRUE);
-
- // model init
- theApp.m_model.init();
SetTimer(TIMER_ID_CREATE_TERMINAL, 3000, nullptr);
@@ -898,8 +907,14 @@
dlg.DoModal();
}
else if (id == IDC_BUTTON_SETTINGS) {
- SERVO::CEFEM* pEFEM = (SERVO::CEFEM*)theApp.m_model.m_master.getEquipment(EQ_ID_EFEM);
- pEFEM->printDebugString001();
+ SERVO::CEquipment* pEq = theApp.m_model.m_master.getEquipment(EQ_ID_EFEM);
+ ((SERVO::CEFEM*)pEq)->printDebugRobotState();
+ 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;
--
Gitblit v1.9.3