Merge branch 'clh'

LAPTOP-SNT8I5JK\Boounion

2025-03-10 19261d011387ec57d646decc945aadaf8913eeab

 SourceCode/Bond/Servo/CEquipment.cpp

@@ -16,6 +16,7 @@
      m_bAutoRecipeChange = FALSE;
      m_bVCREnable[0] = FALSE;
      m_pCclink = nullptr;
      m_nBaseAlarmId = 0;
      InitializeCriticalSection(&m_criticalSection);
   }

@@ -40,6 +41,16 @@
      m_pCclink = pCcLink;
   }

   void CEquipment::setBaseAlarmId(int nBaseId)
   {
      m_nBaseAlarmId = nBaseId;
   }

   int CEquipment::getBaseAlarmId()
   {
      return m_nBaseAlarmId;
   }

   void CEquipment::getProperties(std::vector<std::pair<std::string, std::string>>& container)
   {
      container.clear();
@@ -47,6 +58,11 @@
      container.push_back(std::make_pair("DeviceName", "ServoMotor"));
      container.push_back(std::make_pair("SerialNumber", "123456789"));
      container.push_back(std::make_pair("Version", "1.0"));
   }

   std::map<unsigned int, CStep*>& CEquipment::getSteps()
   {
      return m_mapStep;
   }

   CStep* CEquipment::getStep(unsigned int addr)
@@ -251,9 +267,16 @@
         bFlag = isBitOn(pszData, size, index);
         pStep = getStep(index);
         if (pStep != nullptr) {
            pStep->onSignal(bFlag);
            ((CReadStep*)pStep)->onReadSignal(bFlag);
         }
      }

      index = 0x350;
      bFlag = isBitOn(pszData, size, index);
      pStep = getStep(index);
      if (pStep != nullptr) {
         ((CWriteStep*)pStep)->onRecvSignal(bFlag);
      }
   }

   BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)