Merge branch 'clh' into liuyang

mrDarker

2025-06-06 2f0684bf01209b9ddfdc53da44fb85f4db6db326

 SourceCode/Bond/Servo/CEquipment.cpp

@@ -35,6 +35,7 @@
      m_bLocalAlarm = FALSE;
      m_bAutoRecipeChange = FALSE;
      m_bVCREnable[0] = FALSE;
      memset(m_bLinkSignal, 0, sizeof(m_bLinkSignal));
      m_pCclink = nullptr;
      m_nBaseAlarmId = 0;
      m_pArm = nullptr;
@@ -334,22 +335,23 @@
         }
         
         // 梳理各玻璃之间的绑定关系
         /*
         Lock();
         std::list<CGlass*> list = m_glassList;
         for (auto item : list) {
            std::string& strBuddyId = item->getBuddyId();
            if (!strBuddyId.empty()) {
               for (auto item2 : m_glassList) {
                  if (strBuddyId.compare(item2->getID()) == 0) {
                     item->setBuddy(item2);
                     TRACE("绑定关系: %s <- %s\n", item->getID().c_str(), item2->getID().c_str());
         for (int i = 0; i < SLOT_MAX; i++) {
            CGlass* pGlass = (CGlass*)m_slot[i].getContext();
            if (pGlass != nullptr) {
               std::string& strBuddyId = pGlass->getBuddyId();
               if (!strBuddyId.empty()) {
                  for (int j = 0; j < SLOT_MAX; j++) {
                     CGlass* pBudy = (CGlass*)m_slot[j].getContext();
                     if (pBudy != nullptr && strBuddyId.compare(pBudy->getID()) == 0) {
                        pGlass->setBuddy(pBudy);
                        TRACE("绑定关系: %s <- %s\n", pGlass->getID().c_str(), pBudy->getID().c_str());
                     }
                  }
               }
            }
         }
         Unlock();
         */
      }
   }

@@ -363,9 +365,20 @@
      }
      */

      // 以下解释和处理数据
      // 连接信号解释和保存
      BOOL bFlag;
      int index = 0x540;
      int index = 0;
      for (int i = 0; i < 8; i++) {
         m_bLinkSignal[i][SIGNAL_UPSTREAM_INLINE] = isBitOn(pszData, size, index + 0);
         m_bLinkSignal[i][SIGNAL_UPSTREAM_TROUBLE] = isBitOn(pszData, size, index + 1);
         m_bLinkSignal[i][SIGNAL_INTERLOCK] = isBitOn(pszData, size, index + 2);
         m_bLinkSignal[i][SIGNAL_SEND_ABLE] = isBitOn(pszData, size, index + 3);
         index += 0x40;
      }		 


      // 其它信号及响应
      index = 0x540;


      // alive
@@ -582,6 +595,28 @@
      return m_bVCREnable[index];
   }

   BOOL CEquipment::isLinkSignalOn(unsigned int path, unsigned int signal)
   {
      if (path >= PATH_MAX) return FALSE;
      if (signal >= SIGNAL_MAX) return FALSE;
      return m_bLinkSignal[path][signal];
   }

   void CEquipment::setLinkSignal(unsigned int path, unsigned int signal, BOOL bOn)
   {
      if (path >= PATH_MAX) return;
      if (signal >= SIGNAL_MAX) return;
      m_bLinkSignal[path][signal] = bOn;
   }

   void CEquipment::setLinkSignalBlock(unsigned int path, BOOL* pSignal)
   {
      if (path >= PATH_MAX) return;
      for (int i = 0; i < SIGNAL_MAX; i++) {
         m_bLinkSignal[path][i] = pSignal[i];
      }
   }

   int CEquipment::onStepEvent(CStep* pStep, int code)
   {
      if (code == STEP_EVENT_READDATA) {
@@ -756,7 +791,7 @@
      return 0;
   }

   int CEquipment::storedJob(CJobDataB* pJobDataB, short& putSlot)
   int CEquipment::storedJob(CJobDataB* pJobDataB, short putSlot)
   {
      if (m_pArm == nullptr) {
         return -1;
@@ -770,23 +805,26 @@

      ASSERT(pGlass);
      Lock();
      pGlass->addPath(m_nID);
      pGlass->addPath(m_nID, getSlotUnit(putSlot));
      m_slot[putSlot - 1].setContext(pGlass);
      pGlass->release();            // tempFetchOut需要调用一次release
      Unlock();


      // 如果此玻璃已经贴合，贴合的玻璃也要从加入到列表中
      /*
      CGlass* pBuddy = pGlass->getBuddy();
      if (pBuddy != nullptr) {
         Lock();
         pBuddy->addPath(m_nID);
         pBuddy->addRef();               // 加入list,addRef
         m_glassList.push_back(pBuddy);
         pBuddy->addPath(m_nID, 0);
         if (putSlot % 2 == 0) {
            m_slot[putSlot - 2].setContext(pBuddy);
         }
         else {
            m_slot[putSlot].setContext(pBuddy);
         }
         Unlock();
      }
      */


      if (m_listener.onDataChanged != nullptr) {
         m_listener.onDataChanged(this, EDCC_STORED_JOB);
@@ -1111,13 +1149,42 @@
         if (m_slot[i].isLock()) continue;
         CGlass* pGlass = (CGlass*)m_slot[i].getContext();
         if (pGlass == nullptr) continue;
         if(!m_bLinkSignal[0][SIGNAL_UPSTREAM_INLINE]
            || m_bLinkSignal[0][SIGNAL_UPSTREAM_TROUBLE]
            || !m_bLinkSignal[0][SIGNAL_INTERLOCK]
            || !m_bLinkSignal[0][SIGNAL_SEND_ABLE] ) continue;

         MaterialsType glassType = pGlass->getType();
         if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
         if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;
         if (!pGlass->isProcessed(m_nID)) continue;

         return &m_slot[i];
      }

      return nullptr;
   }

   CSlot* CEquipment::getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates)
   {
      for (auto item : candidates) {
         for (int i = 0; i < SLOT_MAX; i++) {
            if (item == i + 1) {
               if (!m_slot[i].isEnable()) continue;
               if (m_slot[i].isLock()) continue;
               CGlass* pGlass = (CGlass*)m_slot[i].getContext();
               if (pGlass == nullptr) continue;
               if (!m_bLinkSignal[0][SIGNAL_UPSTREAM_INLINE]
                  || m_bLinkSignal[0][SIGNAL_UPSTREAM_TROUBLE]
                  || !m_bLinkSignal[0][SIGNAL_INTERLOCK]
                  || !m_bLinkSignal[0][SIGNAL_SEND_ABLE]) continue;

               MaterialsType glassType = pGlass->getType();
               if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
               if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;

               return &m_slot[i];
            }
         }
      }

      return nullptr;
@@ -1438,10 +1505,6 @@
   int CEquipment::onProcessData(CProcessData* pProcessData)
   {
      LOGI("<CEquipment-%s>onProcessData.", m_strName.c_str());
      CGlass* pGlass = getGlass(pProcessData->getGlassId().c_str());
      if (pGlass != nullptr) {
         pGlass->processEnd(m_nID);
      }

      return 0;
   }