1.自绘按钮，修改为支持文字在按钮下，或在按钮右。 2.日志页，修改为“包含”和“排除”关键字，以及正则表达式的支持，便于在调试过程中快速观察日志

LAPTOP-SNT8I5JK\Boounion

2025-06-28 6747bc043d0af20d6fa02a6cf385d81eb44643d0

 SourceCode/Bond/Servo/CEquipment.cpp

@@ -35,11 +35,13 @@
      m_bLocalAlarm = FALSE;
      m_bAutoRecipeChange = FALSE;
      m_bVCREnable[0] = FALSE;
      memset(m_bLinkSignal, 0, sizeof(m_bLinkSignal));
      memset(m_bLinkSignalToUpstream, 0, sizeof(m_bLinkSignalToUpstream));
      memset(m_bLinkSignalToDownstream, 0, sizeof(m_bLinkSignalToDownstream));
      m_pCclink = nullptr;
      m_nBaseAlarmId = 0;
      m_pArm = nullptr;
      m_processState = PROCESS_STATE::Ready;
      m_blockReadBit = { 0 };
      InitializeCriticalSection(&m_criticalSection);
   }

@@ -399,14 +401,26 @@
      BOOL bFlag;
      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);
         m_bLinkSignalToUpstream[i][SIGNAL_UPSTREAM_INLINE] = isBitOn(pszData, size, index + 0);
         m_bLinkSignalToUpstream[i][SIGNAL_UPSTREAM_TROUBLE] = isBitOn(pszData, size, index + 1);
         m_bLinkSignalToUpstream[i][SIGNAL_INTERLOCK] = isBitOn(pszData, size, index + 2);
         m_bLinkSignalToUpstream[i][SIGNAL_SEND_ABLE] = isBitOn(pszData, size, index + 3);
         index += 0x40;
      }       
      if(m_bLinkSignal[0][SIGNAL_SEND_ABLE]) {
      if(m_bLinkSignalToUpstream[0][SIGNAL_SEND_ABLE]) {
         onSendAble();
      }

      index += 0x40 * 2;
      for (int i = 0; i < 8; i++) {
         m_bLinkSignalToDownstream[i][SIGNAL_UPSTREAM_INLINE] = isBitOn(pszData, size, index + 0);
         m_bLinkSignalToDownstream[i][SIGNAL_UPSTREAM_TROUBLE] = isBitOn(pszData, size, index + 1);
         m_bLinkSignalToDownstream[i][SIGNAL_INTERLOCK] = isBitOn(pszData, size, index + 2);
         m_bLinkSignalToDownstream[i][SIGNAL_RECEIVE_ABLE] = isBitOn(pszData, size, index + 3);
         index += 0x40;
      }
      if (m_bLinkSignalToDownstream[0][SIGNAL_RECEIVE_ABLE]) {
         onReceiveAble();
      }

      // 其它信号及响应
@@ -581,6 +595,19 @@

      // Indexer Operation Mode Change
      CHECK_WRITE_STEP_SIGNAL(STEP_ID_IN_OP_CMD_REPLY, pszData, size);

      // Panel Data Report
      CHECK_WRITE_STEP_SIGNAL(STEP_ID_PANEL_DATA_REPORT, pszData, size);

      // Panel Data Request
      CHECK_WRITE_STEP_SIGNAL(STEP_ID_PANEL_DATA_REQUEST, pszData, size);	

      // Job Data Request
      CHECK_READ_STEP_SIGNAL(STEP_ID_JOB_DATA_REQUEST, pszData, size);

      // job process start/end report
      CHECK_READ_STEP_SIGNAL(STEP_ID_JOB_PROCESS_START_REPORT, pszData, size);
      CHECK_READ_STEP_SIGNAL(STEP_ID_JOB_PROCESS_END_REPORT, pszData, size);
   }

   BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -633,25 +660,47 @@
      return m_bVCREnable[index];
   }

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

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

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

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

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

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

@@ -748,6 +797,11 @@
   std::vector<CPin*>& CEquipment::getOutputPins()
   {
      return m_outputPins;
   }

   CRecipeList* CEquipment::getRecipeList(int unitNo)
   {
      return m_recipesManager.getRecipeList(unitNo);
   }

   int CEquipment::recvIntent(CPin* pPin, CIntent* pIntent)
@@ -1102,7 +1156,7 @@
      return 0;
   }

   int CEquipment::masterRecipeListRequest(short unitNo)
   int CEquipment::masterRecipeListRequest(short unitNo, ONSYNCINGSTATECHANGED block)
   {
      SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EQ_MASTER_RECIPE_LIST_REQ);
      if (pStep == nullptr) {
@@ -1110,6 +1164,7 @@
      }

      LOGI("<CEquipment-%s>正在请求单元<%d>主配方列表", m_strName.c_str(), unitNo);
      m_recipesManager.setOnSyncingStateChanged(block);
      if (m_recipesManager.syncing() != 0) {
         return -2;
      }
@@ -1166,6 +1221,28 @@
   }

   CSlot* CEquipment::getAvailableSlotForGlass(MaterialsType type)
   {
      for (int i = 0; i < SLOT_MAX; i++) {
         if (!m_slot[i].isEnable()) continue;
         if (m_slot[i].isLock()) continue;
         if (!m_slot[i].isEmpty()) continue;
         int lsPath = m_slot[i].getLinkSignalPath();
         if (!m_bLinkSignalToDownstream[lsPath][SIGNAL_UPSTREAM_INLINE]
            || m_bLinkSignalToDownstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
            || !m_bLinkSignalToDownstream[lsPath][SIGNAL_INTERLOCK]
            || !m_bLinkSignalToDownstream[lsPath][SIGNAL_RECEIVE_ABLE]) continue;

         MaterialsType slotType = m_slot[i].getType();
         if (type == MaterialsType::G1 && slotType == MaterialsType::G2) continue;
         if (type == MaterialsType::G2 && slotType == MaterialsType::G1) continue;

         return &m_slot[i];
      }

      return nullptr;
   }

   CSlot* CEquipment::getAvailableSlotForGlassExcludeSignal(MaterialsType type)
   {
      for (int i = 0; i < SLOT_MAX; i++) {
         if (!m_slot[i].isEnable()) continue;
@@ -1229,10 +1306,10 @@
         CGlass* pGlass = (CGlass*)m_slot[i].getContext();
         if (pGlass == nullptr) continue;
         int lsPath = m_slot[i].getLinkSignalPath();
         if(!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE]
            || m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE]
            || !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK]
            || !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE] ) continue;
         if(!m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_INLINE]
            || m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
            || !m_bLinkSignalToUpstream[lsPath][SIGNAL_INTERLOCK]
            || !m_bLinkSignalToUpstream[lsPath][SIGNAL_SEND_ABLE] ) continue;

         MaterialsType glassType = pGlass->getType();
         if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
@@ -1254,10 +1331,10 @@
               CGlass* pGlass = (CGlass*)m_slot[i].getContext();
               if (pGlass == nullptr) continue;
               int lsPath = m_slot[i].getLinkSignalPath();
               if (!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE]
                  || m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE]
                  || !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK]
                  || !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE]) continue;
               if (!m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_INLINE]
                  || m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
                  || !m_bLinkSignalToUpstream[lsPath][SIGNAL_INTERLOCK]
                  || !m_bLinkSignalToUpstream[lsPath][SIGNAL_SEND_ABLE]) continue;

               MaterialsType glassType = pGlass->getType();
               if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
@@ -1332,11 +1409,8 @@

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


      onProcessData(&processData);

      return nRet;
@@ -1350,11 +1424,8 @@

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


      onReceivedJob(port, &jobDataS);

      return nRet;
@@ -1374,11 +1445,8 @@

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


      onSentOutJob(port, &jobDataS);

      return nRet;
@@ -1524,9 +1592,8 @@

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

      // 0426, 先固定返回1(OK)
      ((CReadStep*)pStep)->setReturnCode((short)VCR_Reply_Code::OK);
@@ -1585,7 +1652,7 @@
      return 0;
   }

   int CEquipment::decodePanelDataRequest(CStep* pStep, const char* pszData, size_t size)
   int CEquipment::decodeJobDataRequest(CStep* pStep, const char* pszData, size_t size)
   {
      int index = 0;
      short cassetteSequenceNo, jobSequenceNo;
@@ -1593,24 +1660,9 @@
      index += sizeof(short);
      memcpy(&jobSequenceNo, &pszData[index], sizeof(short));
      index += sizeof(short);
      cassetteSequenceNo = 4000;
      jobSequenceNo = 1;


      // efme， 获取数据后返回
      // Cassette Sequence No      1W
      // Job Sequence No         1W
      // Job DataS            256W
      char szBuffer[1024];
      index = 0;
      memcpy(&szBuffer[index], &cassetteSequenceNo, sizeof(short));
      index += sizeof(short);
      memcpy(&szBuffer[index], &jobSequenceNo, sizeof(short));
      index += sizeof(short);

      CJobDataS* pJobDataS = getJobDataSWithCassette(cassetteSequenceNo, jobSequenceNo);
      if (pJobDataS != nullptr) {
         index += pJobDataS->serialize(&szBuffer[index], 1024 - sizeof(short) - sizeof(short));
         ((CEqReadStep*)pStep)->setReturnData(szBuffer, index);
      }


      // 缓存Attribute，用于调试时显示信息
@@ -1621,6 +1673,139 @@
         (std::to_string(jobSequenceNo)).c_str(), "", weight++));


      return 0;
   }

   int CEquipment::decodeJobProcessStartReport(CStep* pStep, const char* pszData, size_t size)
   {
      LOGI("<CEquipment-%s>decodeJobProcessStartReport", getName().c_str());
      short cassetteNo, jobSequenceNo, unitNo, subUnitNo, slotNo;
      int year, month, day, hour, minute, second;

      int index = 0;
      memcpy(&cassetteNo, &pszData[index], sizeof(short));
      index += sizeof(short);
      memcpy(&jobSequenceNo, &pszData[index], sizeof(short));
      index += sizeof(short);
      memcpy(&unitNo, &pszData[index], sizeof(short));
      index += sizeof(short);
      memcpy(&subUnitNo, &pszData[index], sizeof(short));
      index += sizeof(short);
      memcpy(&slotNo, &pszData[index], sizeof(short));
      index += sizeof(short);

      memcpy(&year, &pszData[index], sizeof(short));
      index += sizeof(short);
      month = (int)pszData[index];
      index += 1;
      day = (int)pszData[index];
      index += 1;
      hour = (int)pszData[index];
      index += 1;
      minute = (int)pszData[index];
      index += 1;
      second = (int)pszData[index];
      index += 1;

      LOGI("<CEquipment-%s>cassetteNo:%d, jobSequenceNo:%d,unitNo:%d, subUnitNo:%d, slotNo:%d %d-%d-%d %d:%d:%d", 
         getName().c_str(),
         cassetteNo, 
         jobSequenceNo, 
         unitNo,
         subUnitNo,
         slotNo,
         year, month, day, hour, minute, second
         );


      if (m_processState != PROCESS_STATE::Processing) {
         setProcessState(PROCESS_STATE::Processing);
      }


      // 缓存Attribute，用于调试时显示信息
      unsigned int weight = 201;
      pStep->addAttribute(new CAttribute("CassetteNo",
         std::to_string(cassetteNo).c_str(), "", weight++));
      pStep->addAttribute(new CAttribute("JobSequenceNo",
         std::to_string(jobSequenceNo).c_str(), "", weight++));
      pStep->addAttribute(new CAttribute("UnitNo",
         std::to_string(unitNo).c_str(), "", weight++));
      pStep->addAttribute(new CAttribute("SubUnitNo",
         std::to_string(subUnitNo).c_str(), "", weight++));
      pStep->addAttribute(new CAttribute("SlotNo",
         std::to_string(slotNo).c_str(), "", weight++));
      pStep->addAttribute(new CAttribute("ProcessStartTime",
         (std::to_string(year) + std::to_string(day) + std::to_string(day) + std::to_string(hour) + std::to_string(minute) + std::to_string(second)).c_str()
         , "", weight++));

      return 0;
   }

   int CEquipment::decodeJobProcessEndReport(CStep* pStep, const char* pszData, size_t size)
   {
      LOGI("<CEquipment-%s>decodeJobProcessEndReport", getName().c_str());

      short cassetteNo, jobSequenceNo, unitNo, subUnitNo, slotNo;
      int year, month, day, hour, minute, second;

      int index = 0;
      std::string strPanelJudgeData, strPanelGradeData;
      memcpy(&cassetteNo, &pszData[index], sizeof(short));
      index += sizeof(short);
      memcpy(&jobSequenceNo, &pszData[index], sizeof(short));
      index += sizeof(short);
      memcpy(&unitNo, &pszData[index], sizeof(short));
      index += sizeof(short);
      memcpy(&subUnitNo, &pszData[index], sizeof(short));
      index += sizeof(short);
      memcpy(&slotNo, &pszData[index], sizeof(short));
      index += sizeof(short);

      memcpy(&year, &pszData[index], sizeof(short));
      index += sizeof(short);
      month = (int)pszData[index];
      index += 1;
      day = (int)pszData[index];
      index += 1;
      hour = (int)pszData[index];
      index += 1;
      minute = (int)pszData[index];
      index += 1;
      second = (int)pszData[index];
      index += 1;

      LOGI("<CEquipment-%s>cassetteNo:%d, jobSequenceNo:%d,unitNo:%d, subUnitNo:%d, slotNo:%d %d-%d-%d %d:%d:%d",
         getName().c_str(),
         cassetteNo,
         jobSequenceNo,
         unitNo,
         subUnitNo,
         slotNo,
         year, month, day, hour, minute, second
      );


      if (m_processState != PROCESS_STATE::Complete) {
         setProcessState(PROCESS_STATE::Complete);
      }

      // 缓存Attribute，用于调试时显示信息
      unsigned int weight = 201;
      pStep->addAttribute(new CAttribute("CassetteNo",
         std::to_string(cassetteNo).c_str(), "", weight++));
      pStep->addAttribute(new CAttribute("JobSequenceNo",
         std::to_string(jobSequenceNo).c_str(), "", weight++));
      pStep->addAttribute(new CAttribute("UnitNo",
         std::to_string(unitNo).c_str(), "", weight++));
      pStep->addAttribute(new CAttribute("SubUnitNo",
         std::to_string(subUnitNo).c_str(), "", weight++));
      pStep->addAttribute(new CAttribute("SlotNo",
         std::to_string(slotNo).c_str(), "", weight++));
      pStep->addAttribute(new CAttribute("ProcessStartTime",
         (std::to_string(year) + std::to_string(day) + std::to_string(day) + std::to_string(hour) + std::to_string(minute) + std::to_string(second)).c_str()
         , "", weight++));
			
      return 0;
   }

@@ -1640,7 +1825,7 @@
      CJobDataS* pJobDataS = pGlass->getJobDataS();
      ASSERT(pJobDataS);
      if (!compareJobData(pJobDataB, pJobDataS)) {
         LOGE("<CFliper-%s>onPreFetchedOutJob,JobData数据不匹配(JobDataB(%d, %d),JobDataS(%d, %d)), 注意排查风险!", m_strName.c_str(),
         LOGE("<CEquipemnt-%s>onPreStoredJob,JobData数据不匹配(JobDataB(%d, %d),JobDataS(%d, %d)), 注意排查风险!", m_strName.c_str(),
            pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo(),
            pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo());
         return FALSE;
@@ -1648,10 +1833,10 @@

      // 如果没有可用位置，报错
      Lock();
      CSlot* pSlot = getAvailableSlotForGlass((MaterialsType)pJobDataS->getMaterialsType());
      CSlot* pSlot = getAvailableSlotForGlassExcludeSignal((MaterialsType)pJobDataS->getMaterialsType());
      if (pSlot == nullptr) {
         Unlock();
         LOGE("<CFliper-%s>onPreFetchedOutJob,找不到匹配的Slot，不能进料，请注意风险！", m_strName.c_str());
         LOGE("<CEquipemnt-%s>onPreFetchedOutJob,找不到匹配的Slot，不能进料，请注意风险！", m_strName.c_str());
         return FALSE;
      }
      Unlock();
@@ -1701,10 +1886,16 @@
   int CEquipment::onSendAble()
   {
      LOGI("<CEquipment-%s>onSendAble.", m_strName.c_str());

      if (m_processState != PROCESS_STATE::Complete) {
         setProcessState(PROCESS_STATE::Complete);
      }

      return 0;
   }

   int CEquipment::onReceiveAble()
   {
      LOGI("<CEquipment-%s>onReceiveAble.", m_strName.c_str());

      return 0;
   }
@@ -1731,4 +1922,26 @@

      return TRUE;
   }

   void CEquipment::printDebugString001()
   {
      for (int i = 0; i < 8; i++) {
         LOGI("<CEquipment-%s>Link Signal to UP stream Path#%d, Signal:%s, %s, %s, %s",
            m_strName.c_str(), i,
            m_bLinkSignalToUpstream[i][SIGNAL_UPSTREAM_INLINE] ? "ON" : "OFF",
            m_bLinkSignalToUpstream[i][SIGNAL_UPSTREAM_TROUBLE] ? "ON" : "OFF",
            m_bLinkSignalToUpstream[i][SIGNAL_INTERLOCK] ? "ON" : "OFF",
            m_bLinkSignalToUpstream[i][SIGNAL_SEND_ABLE] ? "ON" : "OFF"
         );
      }
      for (int i = 0; i < 8; i++) {
         LOGI("<CEquipment-%s>Link Signal to Down stream Path#%d, Signal:%s, %s, %s, %s",
            m_strName.c_str(), i,
            m_bLinkSignalToDownstream[i][SIGNAL_UPSTREAM_INLINE] ? "ON" : "OFF",
            m_bLinkSignalToDownstream[i][SIGNAL_UPSTREAM_TROUBLE] ? "ON" : "OFF",
            m_bLinkSignalToDownstream[i][SIGNAL_INTERLOCK] ? "ON" : "OFF",
            m_bLinkSignalToDownstream[i][SIGNAL_SEND_ABLE] ? "ON" : "OFF"
         );
      }
   }
}