Merge branch 'clh' into liuyang

mrDarker

2025-06-19 8ffc831c6bf37a73961e22efc145be4e8c8f1241

 SourceCode/Bond/Servo/ServoDlg.cpp

@@ -190,6 +190,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);
@@ -856,14 +868,22 @@
{
   int id = (int)lParam;
   if (id == IDC_BUTTON_RUN) {
      theApp.m_model.getMaster().start();
      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();
      if (theApp.m_model.getMaster().stop() == 0) {
      m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
   }
   }
   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);