1.enum修改为enum class, 理顺CLoadPort各成员变量在调度中的判定作用；

LAPTOP-SNT8I5JK\Boounion

2025-05-27 e42e8364112e97d89eeaecd13f043dff42179949

 SourceCode/Bond/Servo/CEquipment.cpp

@@ -3,6 +3,8 @@
#include "ToolUnits.h"
#include <regex>
#include "CArm.h"
#include "CGlassPool.h"
#include "Servo.h"


#define CHECK_READ_STEP_SIGNAL(addr, data, size) {                     \
@@ -315,7 +317,7 @@
         int count;
         ar >> count;
         for (int i = 0; i < count; i++) {
            CGlass* pGlass = new CGlass();
            CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
            pGlass->serialize(ar);
            addGlassToList(pGlass);
         }
@@ -491,30 +493,30 @@


      // CEqCassetteTranserStateStep
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_EMPTY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_LOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_LOADED, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_INUSE, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_UNLOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_BLOCKED, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_EMPTY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_LOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_LOADED, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_INUSE, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_UNLOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_BLOCKED, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_EMPTY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_LOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_LOADED, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_INUSE, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_UNLOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_BLOCKED, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_EMPTY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_LOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_LOADED, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_INUSE, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_UNLOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_BLOCKED, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_EMPTY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_LOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_LOADED, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_INUSE, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_UNLOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_BLOCKED, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_EMPTY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_LOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_LOADED, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_INUSE, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_UNLOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_BLOCKED, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_EMPTY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_LOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_LOADED, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_INUSE, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_UNLOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_BLOCKED, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_EMPTY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_LOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_LOADED, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_INUSE, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_UNLOAD_READY, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_BLOCKED, pszData, size);
   }

   BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -593,6 +595,7 @@
            panelNo = (value & 0xffff);
            LOGI("Cim Message Confirm(msgID = %d, panel no.=%d).", msgId, panelNo);
         }
         /*
         else if (isVcrEventStep(pStep)) {
            SERVO::CEqVcrEventStep* pEqVcrEventStep = (SERVO::CEqVcrEventStep*)pStep;
            CVcrEventReport* pVcrEventReport = pEqVcrEventStep->getVcrEventReport();
@@ -605,6 +608,7 @@
            pEqVcrEventStep->setReturnCode(1);      
            return 1;
         }
         */
      }


@@ -883,6 +887,19 @@
         return -3;
      }

      // 如果此玻璃已经贴合，贴合的玻璃也要从列表中移除
      CGlass* pBuddy = pContext->getBuddy();
      if (pBuddy != nullptr) {
         for (auto iter = m_glassList.begin(); iter != m_glassList.end(); iter++) {
            if ((*iter)->getID().compare(pBuddy->getID()) == 0) {
               (*iter)->release();
               m_glassList.erase(iter);
               break;
            }
         }
      }


      ((CArm*)m_pArm)->tempStore(pContext);
      pContext->release();
      Unlock();
@@ -913,6 +930,18 @@
      m_glassList.push_back(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);
         Unlock();
      }


      if (m_listener.onDataChanged != nullptr) {
         m_listener.onDataChanged(this, 0);
@@ -1034,6 +1063,61 @@
      }

      return pStep->setDateTime(year, month, day, hour, minute, second);
   }

   int CEquipment::setDispatchingMode(DISPATCHING_MODE mode, ONWRITED onWritedBlock/* = nullptr*/)
   {
      SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EQ_DISPATCHINT_MODE_CHANGE);
      if (pStep == nullptr) {
         return -1;
      }

      LOGI("<CEquipment-%s>准备设置DispatchingMode<%d>", m_strName.c_str(), (int)mode);
      if (onWritedBlock != nullptr) {
         pStep->writeShort((short)mode, onWritedBlock);
      }
      else {
         pStep->writeShort((short)mode, [&, mode](int code) -> int {
            if (code == WOK) {
               LOGI("<CEquipment-%s>设置DispatchingMode成功.", m_strName.c_str());
            }
            else {
               LOGI("<CEquipment-%s>设置DispatchingMode失败，code:%d", m_strName.c_str(), code);
            }

            return 0;
            });
      }

      return 0;
   }

   int CEquipment::indexerOperationModeChange(IDNEXER_OPERATION_MODE mode, ONWRITED onWritedBlock/* = nullptr*/)
   {
      SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EFEM_IN_OP_MODE_CHANGE);
      if (pStep == nullptr) {
         return -1;
      }

      unsigned short operationMode = (unsigned short)((unsigned short)mode + getIndexerOperationModeBaseValue());
      LOGI("<CEquipment-%s>准备设置indexerOperationMode<%d>", m_strName.c_str(), (int)mode);
      if (onWritedBlock != nullptr) {
         pStep->writeShort(operationMode, onWritedBlock);
      }
      else {
         pStep->writeShort(operationMode, [&, mode](int code) -> int {
            if (code == WOK) {
               LOGI("<CEquipment-%s>设置indexerOperationMode成功.", m_strName.c_str());
            }
            else {
               LOGI("<CEquipment-%s>设置indexerOperationMode失败，code:%d", m_strName.c_str(), code);
            }

            return 0;
            });
      }

      return 0;
   }

   int CEquipment::masterRecipeListRequest(short unitNo)
@@ -1280,6 +1364,27 @@
      return index;
   }

   int CEquipment::decodeVCREventReport(CStep* pStep, const char* pszData, size_t size)
   {
      CVcrEventReport vcrEventReport;
      vcrEventReport.unserialize(pszData, size);
      LOGI("<CEquipment-%s>decodeVCREventReport<Result:%d, GlassId:%s>\n", m_strName.c_str(),
         vcrEventReport.getVcrResult(),
         vcrEventReport.getGlassId().c_str());


      // 缓存Attribute，用于调试时显示信息
      unsigned int weight = 201;
      CAttributeVector attrubutes;
      vcrEventReport.getAttributeVector(attrubutes, weight);
      pStep->addAttributeVector(attrubutes);

      // 0426, 先固定返回1(OK)
      ((CReadStep*)pStep)->setReturnCode((short)VCR_Reply_Code::OK);

      return 0;
   }

   int CEquipment::onPreStoredJob(int port, CJobDataB* pJobDataB)
   {
      LOGI("<CEquipment-%s>onPreStoredJob:port:%d|GlassId:%s",
@@ -1310,6 +1415,11 @@
      return 0;
   }

   int CEquipment::getIndexerOperationModeBaseValue()
   {
      return 0;
   }

   int CEquipment::addJobDataB(CJobDataB* pJobDataB)
   {
      // 添加之前先删除旧的，以免数据重复