Merge branch 'master' into liuyang

mrDarker

2025-09-13 b7d98aad7e8728c5a41c6fab5a21b6c633042527

 SourceCode/Bond/Servo/ServoDlg.cpp

@@ -218,6 +218,7 @@
               m_pMyStatusbar->setForegroundColor(RGB(0, 0, 0));
               m_pMyStatusbar->setRunTimeText("启动失败.");
               m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(TRUE);
               KillTimer(TIMER_ID_UPDATE_RUMTIME);
            }
            else if (state == SERVO::MASTERSTATE::ATHERERROR) {
               m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
@@ -231,6 +232,7 @@
                  AfxMessageBox(_T("AOI检测失败，请操作员介入解决问题！"));
               }
               m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(TRUE);
               KillTimer(TIMER_ID_UPDATE_RUMTIME);
            }
            else if (state == SERVO::MASTERSTATE::RUNNING || state == SERVO::MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER
               || state == SERVO::MASTERSTATE::RUNNING_BATCH) {