From a9e9f76d23ee7206ea0080a8f5a94e312c9d90f1 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 08 七月 2025 19:41:08 +0800
Subject: [PATCH] 1.UI分组启用和禁用，方便增加更多测试功能时代码整洁简单； 2.增加Are You There测试；
---
SourceCode/Bond/Servo/ServoDlg.cpp | 76 ++++++++++++++++++++++++++++++++++---
1 files changed, 69 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index b8c863c..baeec28 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
@@ -190,6 +191,18 @@
GetRuntimeFormatText(strText, "");
m_pMyStatusbar->setRunTimeText((LPTSTR)(LPCTSTR)strText);
}
+ else if (state == SERVO::MASTERSTATE::STARTING) {
+ m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_STARTING);
+ m_pMyStatusbar->setForegroundColor(RGB(0, 0, 0));
+ m_pMyStatusbar->setRunTimeText("正在启动...");
+ }
+ else if (state == SERVO::MASTERSTATE::MSERROR) {
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
+ m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_ALARM);
+ m_pMyStatusbar->setForegroundColor(RGB(0, 0, 0));
+ m_pMyStatusbar->setRunTimeText("启动失败.");
+ }
else if (state == SERVO::MASTERSTATE::RUNNING) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
@@ -223,9 +236,31 @@
else if (exCode == ROBOT_EVENT_ABORT) {
m_pMyStatusbar->setCurTaskBtnText("无");
}
+ else if (exCode == ROBOT_EVENT_RESTORE) {
+ m_pMyStatusbar->setCurTaskBtnText("无");
+ }
}
}
+ if (RX_CODE_PASSIVE_STATUS_CHANGED == code) {
+ int state = 0;
+ pAny->getIntValue("exCode", state);
+ if (STATE::NOT_CONNECTED == state) {
+ m_pMyStatusbar->setCimBtnText("Disconnected");
+ //m_labelPassiveState.setBackground(DISCONNECTED_BACKGROUND);
+ //m_labelPassiveState.setForeground(DISCONNECTED_FOREGROUND, TRUE);
+ }
+ else if (STATE::NOT_SELECTED == state) {
+ m_pMyStatusbar->setCimBtnText("Not Selected");
+ //m_labelPassiveState.setBackground(NOT_SELECTED_BACKGROUND);
+ //m_labelPassiveState.setForeground(NOT_SELECTED_FOREGROUND, TRUE);
+ }
+ else if (STATE::SELECTED == state) {
+ m_pMyStatusbar->setCimBtnText("Selected");
+ //m_labelPassiveState.setBackground(SELECTED_BACKGROUND);
+ //m_labelPassiveState.setForeground(SELECTED_FOREGROUND, TRUE);
+ }
+ }
pAny->release();
}, [&]() -> void {
// onComplete
@@ -267,6 +302,10 @@
// 执行此操作
SetIcon(m_hIcon, TRUE); // 设置大图标
SetIcon(m_hIcon, FALSE); // 设置小图标
+
+
+ // model init
+ theApp.m_model.init();
// 菜单
@@ -338,9 +377,6 @@
MoveWindow((width - rcWnd.Width()) / 2, 0, rcWnd.Width(), rcWnd.Height(), TRUE);
- // model init
- theApp.m_model.init();
-
SetTimer(TIMER_ID_CREATE_TERMINAL, 3000, nullptr);
InitRxWindows();
@@ -349,6 +385,7 @@
// 相当于延时调用master的初始化
theApp.m_model.m_master.init();
+ theApp.m_model.loadPortParams();
// 初始化master以后需要控件绑定数据
@@ -855,18 +892,40 @@
{
int id = (int)lParam;
if (id == IDC_BUTTON_RUN) {
- theApp.m_model.getMaster().start();
- m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
+ if (theApp.m_model.getMaster().getState() == SERVO::MASTERSTATE::MSERROR) {
+ AfxMessageBox("当前有机台发生错误，不能启动，请确认解决问题后再尝试重新启动！");
+ }
+ else {
+ if (theApp.m_model.getMaster().start() == 0) {
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
+ }
+ }
}
else if (id == IDC_BUTTON_STOP) {
- theApp.m_model.getMaster().stop();
- m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
+ if (theApp.m_model.getMaster().stop() == 0) {
+ 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);
CRobotCmdTestDlg dlg;
dlg.SetEFEM(pEFEM);
dlg.DoModal();
+ }
+ else if (id == IDC_BUTTON_SETTINGS) {
+ 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;
@@ -941,6 +1000,9 @@
m_pRobotTaskDlg->MoveWindow(x, rcBar.top - h, w, h);
m_pRobotTaskDlg->ShowWindow(SW_SHOW);
}
+ else if (id == IDC_BUTTON_CIM) {
+ AfxMessageBox("IDC_BUTTON_CIM");
+ }
return 0;
}
--
Gitblit v1.9.3