Merge branch 'clh' into liuyang

mrDarker

2025-08-27 3e0ceaf4e569ea1f57a14de2f6135d1f1a50d080

 SourceCode/Bond/Servo/Model.cpp

@@ -387,6 +387,14 @@
   masterListener.onCTRoundEnd = [&](void* pMaster, int round) {
      m_configuration.setContinuousTransferCount(round);
   };
   masterListener.onPjStart = [&](void* pMaster, void* pj) {
      m_hsmsPassive.setVariableValue("PJStartID", ((SERVO::CProcessJob*)pj)->id().c_str());
      m_hsmsPassive.requestEventReportSend_PJ_Start();
   };
   masterListener.onPjEnd = [&](void* pMaster, void* pj) {
      m_hsmsPassive.setVariableValue("PJEndID", ((SERVO::CProcessJob*)pj)->id().c_str());
      m_hsmsPassive.requestEventReportSend_PJ_End();
   };
   m_master.setListener(masterListener);
   m_master.setContinuousTransferCount(m_configuration.getContinuousTransferCount());

@@ -396,6 +404,7 @@
   strMasterDataFile.Format(_T("%s\\Master.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);
   m_master.setCacheFilepath((LPTSTR)(LPCTSTR)strMasterDataFile);
   m_master.setCompareMapsBeforeProceeding(m_configuration.isCompareMapsBeforeProceeding());
   m_master.setJobMode(m_configuration.isJobMode());

   // 加截Job
   strMasterDataFile.Format(_T("%s\\MasterState.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);