Merge branch 'clh' into liuyang

mrDarker

2025-06-26 adf46e4da2f53d171cc5a0e95340d751ebacf763

 SourceCode/Bond/Servo/CLoadPort.cpp

@@ -12,6 +12,14 @@
   }                                                      \
}

#define CHECK_WRITE_STEP_SIGNAL2(addr, data, size) {                     \
   BOOL bFlag = isBitOn(data, size, addr);                           \
   SERVO::CStep* pStep = getStep(addr);                           \
   if (pStep != nullptr) {                                       \
      ((CWriteStep*)pStep)->onRecvSignal(bFlag ? addr : 0);            \
   }                                                      \
}

namespace SERVO {
   CLoadPort::CLoadPort() : CEquipment()
   {
@@ -867,12 +875,12 @@
      static int cassetteTypeReply[] = { STEP_ID_PROT1_CASSETTE_TYPE_CHANGE_REPLY, STEP_ID_PROT2_CASSETTE_TYPE_CHANGE_REPLY,
         STEP_ID_PROT3_CASSETTE_TYPE_CHANGE_REPLY, STEP_ID_PROT4_CASSETTE_TYPE_CHANGE_REPLY };

      CHECK_READ_STEP_SIGNAL2(typeReply[m_nIndex], pszData, size);
      CHECK_READ_STEP_SIGNAL2(modeReply[m_nIndex], pszData, size);
      CHECK_READ_STEP_SIGNAL2(transferModeReply[m_nIndex], pszData, size);
      CHECK_READ_STEP_SIGNAL2(enableModeReply[m_nIndex], pszData, size);
      CHECK_READ_STEP_SIGNAL2(typeAutoReply[m_nIndex], pszData, size);
      CHECK_READ_STEP_SIGNAL2(cassetteTypeReply[m_nIndex], pszData, size);
      CHECK_WRITE_STEP_SIGNAL2(typeReply[m_nIndex], pszData, size);
      CHECK_WRITE_STEP_SIGNAL2(modeReply[m_nIndex], pszData, size);
      CHECK_WRITE_STEP_SIGNAL2(transferModeReply[m_nIndex], pszData, size);
      CHECK_WRITE_STEP_SIGNAL2(enableModeReply[m_nIndex], pszData, size);
      CHECK_WRITE_STEP_SIGNAL2(typeAutoReply[m_nIndex], pszData, size);
      CHECK_WRITE_STEP_SIGNAL2(cassetteTypeReply[m_nIndex], pszData, size);
   }

   int CLoadPort::decodePortStatusReport(CStep* pStep, const char* pszData, size_t size)
@@ -1140,4 +1148,42 @@
      return 0;
   }

   int CLoadPort::testGenerateGlassListFromConfig(const SERVO::PortConfig& config)
   {
      char szBuffer[64];
      for (const auto& slot : config.vecSlot) {
         int nSlotIndex = slot.nSlotID - 1;
         if (nSlotIndex < 0 || nSlotIndex >= SLOT_MAX) {
            continue;
         }
         if (!slot.isEnabled) {
            m_slot[nSlotIndex].setContext(nullptr);
            continue;
         }

         CJobDataS js;
         js.setCassetteSequenceNo(getNextCassetteSequenceNo());
         js.setJobSequenceNo(m_slot[nSlotIndex].getNo());

         sprintf_s(szBuffer, 64, "%05d%05d", js.getCassetteSequenceNo(), js.getJobSequenceNo());
         js.setJobType(1);
         js.setMaterialsType(config.nMaterialType);

         js.setLotId(config.strLotID.c_str());
         js.setProductId(config.strProductID.c_str());
         js.setOperationId(config.strOperationID.c_str());
         js.setGlass1Id(szBuffer);

         CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
         pGlass->addPath(m_nID, 0);
         pGlass->processEnd(m_nID, 0);
         pGlass->setID(szBuffer);
         pGlass->setType(static_cast<SERVO::MaterialsType>(config.nMaterialType));
         pGlass->setJobDataS(&js);

         m_slot[nSlotIndex].setContext(pGlass);
      }

      return 0;
   }
}