LAPTOP-SNT8I5JK\Boounion
2025-03-28 8322172ad4e6d5636b8c32b94d95f8abbce1ed54
SourceCode/Bond/Servo/Model.cpp
@@ -36,7 +36,7 @@
   m_configuration.getUnitId(strUnitId);
   // 机器型号和软件版本号应从配置中读取,当前先固定值
   CString strModeType = _T("Bond2860");
   CString strModeType = _T("Master");
   CString strSoftRev = _T("1.0.2");
@@ -145,12 +145,15 @@
               else {
                  LOGE("<CModel> Failed to add alarm.");
               }
               notifyPtr(RX_CODE_ALARM_SET, pStep);
            }
            else {
               alarmManager.clearAlarmByAttributes(pEqAlarmStep->getAlarmId(),
                  pEqAlarmStep->getEquipment()->getID(),
                  pEqAlarmStep->getUnitId(),
                  CToolUnits::getCurrentTimeString());
               notifyPtr(RX_CODE_ALARM_CLEAR, pStep);
            }
            m_hsmsPassive.requestAlarmReport(pEqAlarmStep->getAlarmState(),
@@ -163,6 +166,12 @@
   m_master.setListener(masterListener);
   // master 设置缓存文件
   CString strMasterDataFile;
   strMasterDataFile.Format(_T("%s\\Master.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);
   m_master.setCacheFilepath((LPTSTR)(LPCTSTR)strMasterDataFile);
   // 加载警告信息
   AlarmManager& alarmManager = AlarmManager::getInstance();
   char szBuffer[MAX_PATH];