1.修改两个函数名称；

LAPTOP-SNT8I5JK\Boounion

2025-03-29 d06ab39efafbcb2a7b1ec4cb83e18fa3485789a9

 SourceCode/Bond/Servo/CEquipment.cpp

@@ -358,20 +358,40 @@
      // Equipment Status Change Report(0x361)
      // Equipment Alarm Change Report(0x362 ~ 0x366)
      for (int i = 0; i < 7; i++) {
         index = 0x360 + i;;
         bFlag = isBitOn(pszData, size, index);
         pStep = getStep(index);
         if (pStep != nullptr) {
            ((CReadStep*)pStep)->onReadSignal(bFlag);
         }
         checkReadStepSignal(0x360 + i, pszData, size);
      }

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

      // CIM Mode
      checkWriteStepSignal(0x350, pszData, size);


      // Port1 ~ Port4
      checkReadStepSignal(0x3e0, pszData, size);
      checkReadStepSignal(0x3e1, pszData, size);
      checkReadStepSignal(0x3e2, pszData, size);
      checkReadStepSignal(0x3e3, pszData, size);
      checkReadStepSignal(0x3e8, pszData, size);
      checkReadStepSignal(0x3e9, pszData, size);
      checkReadStepSignal(0x3ea, pszData, size);
      checkReadStepSignal(0x3eb, pszData, size);
      checkReadStepSignal(0x3f0, pszData, size);
      checkReadStepSignal(0x3f1, pszData, size);
      checkReadStepSignal(0x3f2, pszData, size);
      checkReadStepSignal(0x3f3, pszData, size);
      checkReadStepSignal(0x3f8, pszData, size);
      checkReadStepSignal(0x3f9, pszData, size);
      checkReadStepSignal(0x3fa, pszData, size);
      checkReadStepSignal(0x3fb, pszData, size);
      checkReadStepSignal(0x400, pszData, size);
      checkReadStepSignal(0x401, pszData, size);
      checkReadStepSignal(0x402, pszData, size);
      checkReadStepSignal(0x403, pszData, size);
      checkReadStepSignal(0x408, pszData, size);
      checkReadStepSignal(0x409, pszData, size);
      checkReadStepSignal(0x40a, pszData, size);
      checkReadStepSignal(0x40b, pszData, size);

   }

   BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -614,6 +634,34 @@
      }
   }

   BOOL CEquipment::removeClass(CGlass* pGlass)
   {
      Lock();
      bool bExist = std::find(m_glassList.begin(), m_glassList.end(), pGlass) != m_glassList.end();
      if (bExist) {
         pGlass->addPath(EQ_ID_OPERATOR_REMOVE);
         pGlass->release();
         m_glassList.remove(pGlass);
      }
      Unlock();

      if (bExist && m_listener.onDataChanged != nullptr) {
         m_listener.onDataChanged(this, 0);
      }

      return bExist;
   }

   void CEquipment::getGlassList(std::list<CGlass*>& list)
   {
      Lock();
      for (auto item : m_glassList) {
         item->addRef();
         list.push_back(item);
      }
      Unlock();
   }

   CGlass* CEquipment::getFrontGlass()
   {
      CGlass* pGlass = nullptr;
@@ -626,4 +674,22 @@

      return pGlass;
   }

   void CEquipment::checkReadStepSignal(unsigned int addr, const char* pszData, size_t size)
   {
      BOOL bFlag = isBitOn(pszData, size, addr);
      SERVO::CStep* pStep = getStep(addr);
      if (pStep != nullptr) {
         ((CReadStep*)pStep)->onReadSignal(bFlag ? 1 : 0);
      }
   }

   void CEquipment::checkWriteStepSignal(unsigned int addr, const char* pszData, size_t size)
   {
      BOOL bFlag = isBitOn(pszData, size, addr);
      SERVO::CStep* pStep = getStep(addr);
      if (pStep != nullptr) {
         ((CWriteStep*)pStep)->onRecvSignal(bFlag);
      }
   }
}