Merge branch 'liuyang' into clh

LAPTOP-SNT8I5JK\Boounion

2024-12-02 aedb3b85fed48cb2cf0abb5fafa8e7591644c9f4

 SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp

@@ -952,10 +952,12 @@
   else if (nIDEvent == TIMER_JOG_ADD && m_bJogAddPressed) {
      TRACE("持续发送 JOG+\n");
      handleAxisOperation(AxisOperationType::JOG_ADD, true); // 持续发送 JOG+
      Sleep(20);
   }
   else if (nIDEvent == TIMER_JOG_SUB && m_bJogSubPressed) {
      TRACE("持续发送 JOG-\n");
      handleAxisOperation(AxisOperationType::JOG_SUB, true); // 持续发送 JOG-
      Sleep(20);
   }

   CDialogEx::OnTimer(nIDEvent);