From 01398f3bc19abcdf4ea98f2bc9020305be3db003 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 12 二月 2026 15:21:19 +0800
Subject: [PATCH] 1.S1F3修改为支持批查询；
---
SourceCode/Bond/Servo/CMaster.cpp | 908 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 744 insertions(+), 164 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 80ce726..62a6733 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -62,6 +62,8 @@
m_ullStartTime = 0;
m_ullRunTime = 0;
m_state = MASTERSTATE::READY;
+ m_curveMode = CurveMode::Production;
+ m_schedulingMode = SchedulingMode::Production;
m_pActiveRobotTask = nullptr;
m_nLastError = ER_CODE_NOERROR;
m_isCompareMapsBeforeProceeding = FALSE;
@@ -118,6 +120,7 @@
m_hEventDispatchThreadExit[1] = nullptr;
}
+
DeleteCriticalSection(&m_criticalSection);
}
@@ -153,132 +156,173 @@
LOGE("杩炴帴CC-Link澶辫触.");
}
else {
- LOGI("杩炴帴CC-Link鎴愬姛.");
- BoardVersion version{};
- int nRet = m_cclink.GetBoardVersion(version);
- if (nRet == 0) {
- LOGD("鐗堟湰淇℃伅锛�%s.", version.toString().c_str());
- }
- else {
- LOGE("鑾峰彇CC-Link鐗堟湰淇℃伅澶辫触.");
- }
-
- BoardStatus status;
- nRet = m_cclink.GetBoardStatus(status);
- if (nRet == 0) {
- LOGD("鐘舵�侊細%s.", status.toString().c_str());
- }
- else {
- LOGE("鑾峰彇CC-Link鐘舵�佸け璐�.");
- }
+ LOGI("杩炴帴CC-Link鎴愬姛.");
+ BoardVersion version{};
+ int nRet = m_cclink.GetBoardVersion(version);
+ if (nRet == 0) {
+ LOGD("鐗堟湰淇℃伅锛�%s.", version.toString().c_str());
+ }
+ else {
+ LOGE("鑾峰彇CC-Link鐗堟湰淇℃伅澶辫触.");
}
-
- // 鍒濆鍖栨坊鍔犲悇瀛愯澶�
- CLoadPort* pPort1, * pPort2, * pPort3, * pPort4;
- CBonder* pBonder1, * pBonder2;
- CEFEM* pEfem;
- CArm* pArm;
- CArmTray* pArmTray1, * pArmTray2;
- CFliper* pFliper;
- CVacuumBake* pVacuumBake;
- CAligner* pAligner;
- CBakeCooling* pBakeCooling;
- CMeasurement* pMeasurement;
-
- pPort1 = addLoadPort(0);
- pPort2 = addLoadPort(1);
- pPort3 = addLoadPort(2);
- pPort4 = addLoadPort(3);
- pEfem = addEFEM();
- pArm = addArm();
- pArmTray1 = addArmTray(0);
- pArmTray2 = addArmTray(1);
- pFliper = addFliper();
- pVacuumBake = addVacuumBake();
- pAligner = addAligner();
- pBonder1 = addBonder(0);
- pBonder2 = addBonder(1);
- pBakeCooling = addBakeCooling();
- pMeasurement = addMeasurement();
-
- ASSERT(pEfem);
- ASSERT(pFliper);
- ASSERT(pVacuumBake);
- ASSERT(pAligner);
- ASSERT(pBonder1);
- ASSERT(pBonder2);
- ASSERT(pBakeCooling);
- ASSERT(pMeasurement);
-
- pEfem->setPort(0, pPort1);
- pEfem->setPort(1, pPort2);
- pEfem->setPort(2, pPort3);
- pEfem->setPort(3, pPort4);
- pEfem->setFliper(pFliper);
- pEfem->setAligner(pAligner);
- pEfem->setArmTray(0, pArmTray1);
- pEfem->setArmTray(1, pArmTray2);
- pPort1->setArm(pArm);
- pPort2->setArm(pArm);
- pPort3->setArm(pArm);
- pPort4->setArm(pArm);
- pArmTray1->setArm(pArm);
- pArmTray2->setArm(pArm);
- pFliper->setArm(pArm);
- pVacuumBake->setArm(pArm);
- pAligner->setArm(pArm);
- pBonder1->setArm(pArm);
- pBonder2->setArm(pArm);
- pBakeCooling->setArm(pArm);
- pMeasurement->setArm(pArm);
-
- connectEquipments();
-
-
-
- // 璇荤紦瀛樻暟鎹�
- const ULONGLONG boot_cache_begin = GetTickCount64();
- const ULONGLONG boot_read_begin = GetTickCount64();
- readCache();
- LOGI("[BOOT][MASTER] readCache finished, cost=%llu ms", (unsigned long long)(GetTickCount64() - boot_read_begin));
-
- const ULONGLONG boot_state_begin = GetTickCount64();
- loadState();
- LOGI("[BOOT][MASTER] loadState finished, cost=%llu ms", (unsigned long long)(GetTickCount64() - boot_state_begin));
- if (m_listener.onControlJobChanged) {
- notifyControlJobChanged();
+ BoardStatus status;
+ nRet = m_cclink.GetBoardStatus(status);
+ if (nRet == 0) {
+ LOGD("鐘舵�侊細%s.", status.toString().c_str());
}
-
- LOGI("[BOOT][MASTER] cache/state loaded, cost=%llu ms (since init %llu ms)",
- (unsigned long long)(GetTickCount64() - boot_cache_begin),
- (unsigned long long)(GetTickCount64() - boot_master_begin));
-
-
- // 瀹氭椂鍣�
- g_pMaster = this;
- SetTimer(NULL, 1, 250, (TIMERPROC)MasterTimerProc);
-
-
- // 璋冨害绾跨▼
- m_hDispatchThreadHandle = (HANDLE)_beginthreadex(NULL, 0, SERVO::DispatchThreadFunction, this,
- 0, &m_nDispatchThreadAddr);
-
-
- // 鐩戞帶bit绾跨▼
- m_hReadBitsThreadHandle = (HANDLE)_beginthreadex(NULL, 0, SERVO::ReadBitsThreadFunction, this,
- 0, &m_nReadBitsThreadAddr);
-
-
- // 鏇茬嚎鏈嶅姟
- CreateDAQBridgeServer();
-
-
- LOGI("<Master>鍒濆鍖栧畬鎴�.");
- LOGI("[BOOT][MASTER] init finished, total cost=%llu ms",
- (unsigned long long)(GetTickCount64() - boot_master_begin));
- return 0;
+ else {
+ LOGE("鑾峰彇CC-Link鐘舵�佸け璐�.");
+ }
}
+
+
+ // 鍒濆鍖栨坊鍔犲悇瀛愯澶�
+ CLoadPort* pPort1, * pPort2, * pPort3, * pPort4;
+ CBonder* pBonder1, * pBonder2;
+ CEFEM* pEfem;
+ CArm* pArm;
+ CArmTray* pArmTray1, * pArmTray2;
+ CFliper* pFliper;
+ CVacuumBake* pVacuumBake;
+ CAligner* pAligner;
+ CBakeCooling* pBakeCooling;
+ CMeasurement* pMeasurement;
+
+ pPort1 = addLoadPort(0);
+ pPort2 = addLoadPort(1);
+ pPort3 = addLoadPort(2);
+ pPort4 = addLoadPort(3);
+ pEfem = addEFEM();
+ pArm = addArm();
+ pArmTray1 = addArmTray(0);
+ pArmTray2 = addArmTray(1);
+ pFliper = addFliper();
+ pVacuumBake = addVacuumBake();
+ pAligner = addAligner();
+ pBonder1 = addBonder(0);
+ pBonder2 = addBonder(1);
+ pBakeCooling = addBakeCooling();
+ pMeasurement = addMeasurement();
+
+ ASSERT(pEfem);
+ ASSERT(pFliper);
+ ASSERT(pVacuumBake);
+ ASSERT(pAligner);
+ ASSERT(pBonder1);
+ ASSERT(pBonder2);
+ ASSERT(pBakeCooling);
+ ASSERT(pMeasurement);
+
+ pEfem->setPort(0, pPort1);
+ pEfem->setPort(1, pPort2);
+ pEfem->setPort(2, pPort3);
+ pEfem->setPort(3, pPort4);
+ pEfem->setFliper(pFliper);
+ pEfem->setAligner(pAligner);
+ pEfem->setArmTray(0, pArmTray1);
+ pEfem->setArmTray(1, pArmTray2);
+ pPort1->setArm(pArm);
+ pPort2->setArm(pArm);
+ pPort3->setArm(pArm);
+ pPort4->setArm(pArm);
+ pArmTray1->setArm(pArm);
+ pArmTray2->setArm(pArm);
+ pFliper->setArm(pArm);
+ pVacuumBake->setArm(pArm);
+ pAligner->setArm(pArm);
+ pBonder1->setArm(pArm);
+ pBonder2->setArm(pArm);
+ pBakeCooling->setArm(pArm);
+ pMeasurement->setArm(pArm);
+
+ connectEquipments();
+
+
+
+ // 璇荤紦瀛樻暟鎹�
+ const ULONGLONG boot_cache_begin = GetTickCount64();
+ const ULONGLONG boot_read_begin = GetTickCount64();
+ readCache();
+ LOGI("[BOOT][MASTER] readCache finished, cost=%llu ms", (unsigned long long)(GetTickCount64() - boot_read_begin));
+
+ const ULONGLONG boot_state_begin = GetTickCount64();
+ loadState();
+ LOGI("[BOOT][MASTER] loadState finished, cost=%llu ms", (unsigned long long)(GetTickCount64() - boot_state_begin));
+ if (m_listener.onControlJobChanged) {
+ notifyControlJobChanged();
+ }
+
+ LOGI("[BOOT][MASTER] cache/state loaded, cost=%llu ms (since init %llu ms)",
+ (unsigned long long)(GetTickCount64() - boot_cache_begin),
+ (unsigned long long)(GetTickCount64() - boot_master_begin));
+
+
+ // 瀹氭椂鍣�
+ g_pMaster = this;
+ SetTimer(NULL, 1, 250, (TIMERPROC)MasterTimerProc);
+
+
+ // 璋冨害绾跨▼
+ m_hDispatchThreadHandle = (HANDLE)_beginthreadex(NULL, 0, SERVO::DispatchThreadFunction, this,
+ 0, &m_nDispatchThreadAddr);
+
+
+ // 鐩戞帶bit绾跨▼
+ m_hReadBitsThreadHandle = (HANDLE)_beginthreadex(NULL, 0, SERVO::ReadBitsThreadFunction, this,
+ 0, &m_nReadBitsThreadAddr);
+
+
+ // 鏇茬嚎鏈嶅姟
+ CreateDAQBridgeServer();
+
+
+ LOGI("<Master>鍒濆鍖栧畬鎴�.");
+ LOGI("[BOOT][MASTER] init finished, total cost=%llu ms",
+ (unsigned long long)(GetTickCount64() - boot_master_begin));
+ return 0;
+ }
+
+ void CMaster::setCurveMode(CurveMode mode)
+ {
+ if (m_curveMode == mode) {
+ return;
+ }
+ m_curveMode = mode;
+ if (m_pCollector != nullptr) {
+ const uint32_t mids[] = {
+ MID_Bonder1, MID_Bonder2,
+ MID_VacuumBakeA, MID_VacuumBakeB,
+ MID_BakeCoolingA, MID_BakeCoolingB
+ };
+ for (uint32_t mid : mids) {
+ if (mode == CurveMode::EmptyChamber) {
+ m_pCollector->batchStart(mid, "EMPTY_CHAMBER", 30 * 60 * 1000ULL); // 绌鸿厰妯″紡锛氬惎鍔ㄩ噰鏍锋壒娆�
+ }
+ else {
+ m_pCollector->batchStop(mid);
+ m_pCollector->buffersClear(mid); // 鍒囧洖鐢熶骇妯″紡锛屾竻鎺夌┖鑵旀暟鎹�
+ }
+ }
+ }
+ LOGI("<Master>CurveMode=%s", mode == CurveMode::EmptyChamber ? "EmptyChamber" : "Production");
+ }
+
+ CurveMode CMaster::getCurveMode() const
+ {
+ return m_curveMode;
+ }
+
+ void CMaster::setSchedulingMode(SchedulingMode mode)
+ {
+ m_schedulingMode = mode;
+ LOGI("<Master>SchedulingMode=%s", mode == SchedulingMode::Production ? "Production" : "Tuning");
+ }
+
+ SchedulingMode CMaster::getSchedulingMode() const
+ {
+ return m_schedulingMode;
+ }
int CMaster::term()
{
@@ -305,6 +349,13 @@
}
m_listEquipment.clear();
+ // release manual-remove buffer before glass pool is torn down
+ for (auto* pGlass : m_bufGlass) {
+ if (pGlass != nullptr) {
+ pGlass->release();
+ }
+ }
+ m_bufGlass.clear();
if (m_pCollector != nullptr) {
m_pCollector->stopLoop();
@@ -656,6 +707,91 @@
continue;
}
+ // 鐢熶骇妯″紡鍥哄畾鏄犲皠锛歅ort1/3 -> G1锛孭ort2/4 -> G2銆�
+ auto isProductionPortTypeMatch = [&](int portIndex, MaterialsType type) -> bool {
+ if (m_schedulingMode != SchedulingMode::Production) return true;
+ const bool isG1Port = (portIndex == 0 || portIndex == 2);
+ if (type == MaterialsType::G1) return isG1Port;
+ if (type == MaterialsType::G2) return !isG1Port;
+ return true;
+ };
+
+ // 鐢熶骇妯″紡锛氭牴鎹嚎涓婃湭閰嶅鐜荤拑鍙嶆帹涓嬩竴鐗囧簲鏉ヨ嚜鍝釜绔彛锛圥ort1<->2, Port3<->4锛夈��
+ auto getPreferredPortForType = [&](MaterialsType targetType) -> int {
+ if (m_schedulingMode != SchedulingMode::Production) return -1;
+
+ auto preferG1ByG2 = [&](CGlass* pG2) -> int {
+ if (pG2 == nullptr || pG2->getType() != MaterialsType::G2 || pG2->getBuddy() != nullptr) return -1;
+ int originPort = -1, originSlot = -1;
+ pG2->getOrginPort(originPort, originSlot);
+ if (originPort == 1) return 0; // Port2 -> Port1
+ if (originPort == 3) return 2; // Port4 -> Port3
+ return -1;
+ };
+ auto preferG2ByG1 = [&](CGlass* pG1) -> int {
+ if (pG1 == nullptr || pG1->getType() != MaterialsType::G1 || pG1->getBuddy() != nullptr) return -1;
+ int originPort = -1, originSlot = -1;
+ pG1->getOrginPort(originPort, originSlot);
+ if (originPort == 0) return 1; // Port1 -> Port2
+ if (originPort == 2) return 3; // Port3 -> Port4
+ return -1;
+ };
+
+ if (targetType == MaterialsType::G1) {
+ int p = preferG1ByG2(pBonder1->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG1ByG2(pBonder2->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG1ByG2(pFliper->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG1ByG2(pAligner->getGlassFromSlot(1)); if (p >= 0) return p;
+ }
+ else if (targetType == MaterialsType::G2) {
+ int p = preferG2ByG1(pBonder1->getGlassFromSlot(2)); if (p >= 0) return p;
+ p = preferG2ByG1(pBonder2->getGlassFromSlot(2)); if (p >= 0) return p;
+ p = preferG2ByG1(pVacuumBake->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG2ByG1(pVacuumBake->getGlassFromSlot(2)); if (p >= 0) return p;
+ p = preferG2ByG1(pAligner->getGlassFromSlot(1)); if (p >= 0) return p;
+ }
+
+ return -1;
+ };
+
+ // Job 妯″紡涓嬭姹� Bonder 鍐呯殑 G1/G2 鏉ヨ嚜鍚屼竴涓� ProcessJob銆�
+ auto validateBonderPairProcessJob = [&](CEquipment* pBonder, const char* bonderName) -> bool {
+ if (m_pActiveRobotTask == nullptr) return false;
+ CGlass* pIncomingG1 = (CGlass*)m_pActiveRobotTask->getContext();
+ CGlass* pExistingG2 = pBonder->getGlassFromSlot(0);
+ if (pIncomingG1 == nullptr || pExistingG2 == nullptr) return true;
+
+ CProcessJob* pjG1 = pIncomingG1->getProcessJob();
+ CProcessJob* pjG2 = pExistingG2->getProcessJob();
+ if (m_bJobMode && (pjG1 == nullptr || pjG2 == nullptr || pjG1 != pjG2)) {
+ std::string pj1 = (pjG1 == nullptr) ? "NULL" : pjG1->id();
+ std::string pj2 = (pjG2 == nullptr) ? "NULL" : pjG2->id();
+ LOGW("<Master>%s閰嶅鎷︽埅锛欸1/G2鏉ヨ嚜涓嶅悓ProcessJob(G1=%s,G2=%s)銆�",
+ bonderName, pj1.c_str(), pj2.c_str());
+ delete m_pActiveRobotTask;
+ m_pActiveRobotTask = nullptr;
+ return false;
+ }
+
+ // 鐢熶骇妯″紡鍥哄畾绔彛瀵癸細Port1<->Port2锛孭ort3<->Port4銆�
+ if (m_schedulingMode == SchedulingMode::Production) {
+ int g1Port = 0, g1Slot = 0, g2Port = 0, g2Slot = 0;
+ pIncomingG1->getOrginPort(g1Port, g1Slot);
+ pExistingG2->getOrginPort(g2Port, g2Slot);
+ const bool pairOk =
+ (g1Port == 0 && g2Port == 1) ||
+ (g1Port == 2 && g2Port == 3);
+ if (!pairOk) {
+ LOGW("<Master>%s閰嶅鎷︽埅锛氱鍙ｅ涓嶅尮閰�(瑕佹眰1<->2鎴�3<->4, 瀹為檯G1Port=%d,G2Port=%d)銆�",
+ bonderName, g1Port + 1, g2Port + 1);
+ delete m_pActiveRobotTask;
+ m_pActiveRobotTask = nullptr;
+ return false;
+ }
+ }
+ return true;
+ };
+
// Bonder1銆丅onder2銆丗liper銆乂acuumBake銆丄ligner锛岀粺璁2鍜孏1鐨勬暟閲�, 閰嶅缁勬暟, 澶氬嚭鐨勭被鍨�
int nG2Count = 0, nG1Count = 0, nGlassGroup, nExtraType;
@@ -707,14 +843,22 @@
// Measurement -> LoadPort
- for (int s = 0; s < 4; s++) {
- PortType pt = pLoadPorts[s]->getPortType();
- if (!rmd.armState[0] && pLoadPorts[s]->isEnable()
- && (pt == PortType::Unloading || pt == PortType::Both)
- && pLoadPorts[s]->getPortStatus() == PORT_INUSE) {
- m_pActiveRobotTask = createTransferTask(pMeasurement, pLoadPorts[s], MaterialsType::G1, secondaryType);
- if (m_pActiveRobotTask != nullptr) {
- goto PORT_PUT;
+ if (m_schedulingMode == SchedulingMode::Production) {
+ if (!rmd.armState[0]) {
+ m_pActiveRobotTask = createTransferTask_returnOrigin(pMeasurement, pLoadPorts);
+ CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+ }
+ }
+ else {
+ for (int s = 0; s < 4; s++) {
+ PortType pt = pLoadPorts[s]->getPortType();
+ if (!rmd.armState[0] && pLoadPorts[s]->isEnable()
+ && (pt == PortType::Unloading || pt == PortType::Both)
+ && pLoadPorts[s]->getPortStatus() == PORT_INUSE) {
+ m_pActiveRobotTask = createTransferTask(pMeasurement, pLoadPorts[s], MaterialsType::G1, secondaryType);
+ if (m_pActiveRobotTask != nullptr) {
+ goto PORT_PUT;
+ }
}
}
}
@@ -778,11 +922,17 @@
// VacuumBake(G1) -> Bonder
if (!rmd.armState[0] && pBonder1->slotHasGlass(0) && !pBonder1->slotHasGlass(1)) {
m_pActiveRobotTask = createTransferTask(pVacuumBake, pBonder1, MaterialsType::G1, MaterialsType::G0);
+ if (m_pActiveRobotTask != nullptr && !validateBonderPairProcessJob(pBonder1, "Bonder1")) {
+ // 鍚� PJ 鏍￠獙澶辫触锛屾湰杞笉涓嬪彂鎼��
+ }
CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
}
if (!rmd.armState[0] && pBonder2->slotHasGlass(0) && !pBonder2->slotHasGlass(1)) {
m_pActiveRobotTask = createTransferTask(pVacuumBake, pBonder2, MaterialsType::G1, MaterialsType::G0);
+ if (m_pActiveRobotTask != nullptr && !validateBonderPairProcessJob(pBonder2, "Bonder2")) {
+ // 鍚� PJ 鏍￠獙澶辫触锛屾湰杞笉涓嬪彂鎼��
+ }
CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
}
@@ -821,15 +971,45 @@
else {
primaryType = MaterialsType::G1;
}
+ const int preferredPortForPrimary = getPreferredPortForType(primaryType);
+ {
+ static int s_prevPrimaryType = -1;
+ static int s_prevPreferredPort = -2;
+ const int curPrimaryType = (int)primaryType;
+ if (s_prevPrimaryType != curPrimaryType || s_prevPreferredPort != preferredPortForPrimary) {
+ LOGI("<Master>LoadPort->Aligner瑙勫垯(RUNNING): primaryType=%d, preferredPort=%d",
+ curPrimaryType, preferredPortForPrimary >= 0 ? (preferredPortForPrimary + 1) : 0);
+ s_prevPrimaryType = curPrimaryType;
+ s_prevPreferredPort = preferredPortForPrimary;
+ }
+ }
for (int s = 0; s < 4; s++) {
PortType pt = pLoadPorts[s]->getPortType();
if (!rmd.armState[0] && pLoadPorts[s]->isEnable()
&& (pt == PortType::Loading || pt == PortType::Both)
&& pLoadPorts[s]->getPortStatus() == PORT_INUSE) {
+ if (!isProductionPortTypeMatch(s, primaryType)) {
+ continue;
+ }
+ if (preferredPortForPrimary >= 0 && s != preferredPortForPrimary) {
+ continue;
+ }
m_pActiveRobotTask = createTransferTask(pLoadPorts[s], pAligner, primaryType, secondaryType, 1, m_bJobMode);
if (m_pActiveRobotTask != nullptr) {
CGlass* pGlass = (CGlass*)m_pActiveRobotTask->getContext();
+ CProcessJob* pPJ = (pGlass != nullptr) ? pGlass->getProcessJob() : nullptr;
+ LOGI("<Master>LoadPort->Aligner鍛戒腑(RUNNING): port=%d, primaryType=%d, preferredPort=%d, glass=%s, scheduled=%d, pj=%s",
+ s + 1, (int)primaryType, preferredPortForPrimary >= 0 ? (preferredPortForPrimary + 1) : 0,
+ pGlass != nullptr ? pGlass->getID().c_str() : "",
+ (pGlass != nullptr && pGlass->isScheduledForProcessing()) ? 1 : 0,
+ pPJ != nullptr ? pPJ->id().c_str() : "NULL");
+ if (pGlass == nullptr) {
+ LOGE("<Master>LoadPort->Aligner鍛戒腑(RUNNING)浣哻ontext涓虹┖锛屼换鍔″凡涓㈠純.");
+ delete m_pActiveRobotTask;
+ m_pActiveRobotTask = nullptr;
+ continue;
+ }
if (pGlass->getBuddy() != nullptr) {
delete m_pActiveRobotTask;
m_pActiveRobotTask = nullptr;
@@ -911,6 +1091,91 @@
continue;
}
+ // 鐢熶骇妯″紡鍥哄畾鏄犲皠锛歅ort1/3 -> G1锛孭ort2/4 -> G2銆�
+ auto isProductionPortTypeMatch = [&](int portIndex, MaterialsType type) -> bool {
+ if (m_schedulingMode != SchedulingMode::Production) return true;
+ const bool isG1Port = (portIndex == 0 || portIndex == 2);
+ if (type == MaterialsType::G1) return isG1Port;
+ if (type == MaterialsType::G2) return !isG1Port;
+ return true;
+ };
+
+ // 鐢熶骇妯″紡锛氭牴鎹嚎涓婃湭閰嶅鐜荤拑鍙嶆帹涓嬩竴鐗囧簲鏉ヨ嚜鍝釜绔彛锛圥ort1<->2, Port3<->4锛夈��
+ auto getPreferredPortForType = [&](MaterialsType targetType) -> int {
+ if (m_schedulingMode != SchedulingMode::Production) return -1;
+
+ auto preferG1ByG2 = [&](CGlass* pG2) -> int {
+ if (pG2 == nullptr || pG2->getType() != MaterialsType::G2 || pG2->getBuddy() != nullptr) return -1;
+ int originPort = -1, originSlot = -1;
+ pG2->getOrginPort(originPort, originSlot);
+ if (originPort == 1) return 0; // Port2 -> Port1
+ if (originPort == 3) return 2; // Port4 -> Port3
+ return -1;
+ };
+ auto preferG2ByG1 = [&](CGlass* pG1) -> int {
+ if (pG1 == nullptr || pG1->getType() != MaterialsType::G1 || pG1->getBuddy() != nullptr) return -1;
+ int originPort = -1, originSlot = -1;
+ pG1->getOrginPort(originPort, originSlot);
+ if (originPort == 0) return 1; // Port1 -> Port2
+ if (originPort == 2) return 3; // Port3 -> Port4
+ return -1;
+ };
+
+ if (targetType == MaterialsType::G1) {
+ int p = preferG1ByG2(pBonder1->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG1ByG2(pBonder2->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG1ByG2(pFliper->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG1ByG2(pAligner->getGlassFromSlot(1)); if (p >= 0) return p;
+ }
+ else if (targetType == MaterialsType::G2) {
+ int p = preferG2ByG1(pBonder1->getGlassFromSlot(2)); if (p >= 0) return p;
+ p = preferG2ByG1(pBonder2->getGlassFromSlot(2)); if (p >= 0) return p;
+ p = preferG2ByG1(pVacuumBake->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG2ByG1(pVacuumBake->getGlassFromSlot(2)); if (p >= 0) return p;
+ p = preferG2ByG1(pAligner->getGlassFromSlot(1)); if (p >= 0) return p;
+ }
+
+ return -1;
+ };
+
+ // Job 妯″紡涓嬭姹� Bonder 鍐呯殑 G1/G2 鏉ヨ嚜鍚屼竴涓� ProcessJob銆�
+ auto validateBonderPairProcessJob = [&](CEquipment* pBonder, const char* bonderName) -> bool {
+ if (m_pActiveRobotTask == nullptr) return false;
+ CGlass* pIncomingG1 = (CGlass*)m_pActiveRobotTask->getContext();
+ CGlass* pExistingG2 = pBonder->getGlassFromSlot(0);
+ if (pIncomingG1 == nullptr || pExistingG2 == nullptr) return true;
+
+ CProcessJob* pjG1 = pIncomingG1->getProcessJob();
+ CProcessJob* pjG2 = pExistingG2->getProcessJob();
+ if (m_bJobMode && (pjG1 == nullptr || pjG2 == nullptr || pjG1 != pjG2)) {
+ std::string pj1 = (pjG1 == nullptr) ? "NULL" : pjG1->id();
+ std::string pj2 = (pjG2 == nullptr) ? "NULL" : pjG2->id();
+ LOGW("<Master>%s閰嶅鎷︽埅锛欸1/G2鏉ヨ嚜涓嶅悓ProcessJob(G1=%s,G2=%s)銆�",
+ bonderName, pj1.c_str(), pj2.c_str());
+ delete m_pActiveRobotTask;
+ m_pActiveRobotTask = nullptr;
+ return false;
+ }
+
+ // 鐢熶骇妯″紡鍥哄畾绔彛瀵癸細Port1<->Port2锛孭ort3<->Port4銆�
+ if (m_schedulingMode == SchedulingMode::Production) {
+ int g1Port = 0, g1Slot = 0, g2Port = 0, g2Slot = 0;
+ pIncomingG1->getOrginPort(g1Port, g1Slot);
+ pExistingG2->getOrginPort(g2Port, g2Slot);
+ const bool pairOk =
+ (g1Port == 0 && g2Port == 1) ||
+ (g1Port == 2 && g2Port == 3);
+ if (!pairOk) {
+ LOGW("<Master>%s閰嶅鎷︽埅锛氱鍙ｅ涓嶅尮閰�(瑕佹眰1<->2鎴�3<->4, 瀹為檯G1Port=%d,G2Port=%d)銆�",
+ bonderName, g1Port + 1, g2Port + 1);
+ delete m_pActiveRobotTask;
+ m_pActiveRobotTask = nullptr;
+ return false;
+ }
+ }
+ return true;
+ };
+
// 5.5) 鏆傚仠鐘舵�佹鏌ワ細鑻� CJ 鎴栧湪鍒� PJ 澶勪簬 Paused锛屾殏缂撹皟搴︽柊鐨勬惉閫�
bool pausedByEvent = false;
if (m_pControlJob != nullptr && m_pControlJob->state() == CJState::Paused) {
@@ -969,19 +1234,27 @@
// 缁勬暟闂ㄩ檺锛氣墺2 缁勬椂涓嶅啀浠� LP 涓婄墖锛岄伩鍏嶅爢绉紙涓庡崟鐗囦竴鑷达級
bool blockLoadFromLP = (nGlassGroup >= 2);
- // 7) Measurement -> LoadPort锛堝浐瀹氾細G1 浼樺厛鍥� LP锛�
+ // 7) Measurement -> LoadPort
if (rmd.armState[0] || rmd.armState[1]) {
LOGD("Arm1 %s, Arm2 %s.",
rmd.armState[0] ? _T("涓嶅彲鐢�") : _T("鍙敤"),
rmd.armState[1] ? _T("涓嶅彲鐢�") : _T("鍙敤"));
}
- for (int s = 0; s < 4; s++) {
- PortType pt = pLoadPorts[s]->getPortType();
- if (!rmd.armState[0] && pLoadPorts[s]->isEnable()
- && (pt == PortType::Unloading || pt == PortType::Both)
- && pLoadPorts[s]->getPortStatus() == PORT_INUSE) {
- m_pActiveRobotTask = createTransferTask(pMeasurement, pLoadPorts[s], MaterialsType::G1, secondaryType);
- if (m_pActiveRobotTask != nullptr) { goto BATCH_PORT_PUT; }
+ if (m_schedulingMode == SchedulingMode::Production) {
+ if (!rmd.armState[0]) {
+ m_pActiveRobotTask = createTransferTask_returnOrigin(pMeasurement, pLoadPorts);
+ CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+ }
+ }
+ else {
+ for (int s = 0; s < 4; s++) {
+ PortType pt = pLoadPorts[s]->getPortType();
+ if (!rmd.armState[0] && pLoadPorts[s]->isEnable()
+ && (pt == PortType::Unloading || pt == PortType::Both)
+ && pLoadPorts[s]->getPortStatus() == PORT_INUSE) {
+ m_pActiveRobotTask = createTransferTask(pMeasurement, pLoadPorts[s], MaterialsType::G1, secondaryType);
+ if (m_pActiveRobotTask != nullptr) { goto BATCH_PORT_PUT; }
+ }
}
}
@@ -1031,10 +1304,16 @@
// 13) VacuumBake(G1) -> Bonder锛堟Ы绾у垽瀹氾細slot0(G2) 宸叉湁涓� slot1(G1) 涓虹┖锛�
if (!rmd.armState[0] && pBonder1->slotHasGlass(0) && !pBonder1->slotHasGlass(1)) {
m_pActiveRobotTask = createTransferTask(pVacuumBake, pBonder1, MaterialsType::G1, MaterialsType::G0);
+ if (m_pActiveRobotTask != nullptr && !validateBonderPairProcessJob(pBonder1, "Bonder1")) {
+ // 鍚� PJ 鏍￠獙澶辫触锛屾湰杞笉涓嬪彂鎼��
+ }
CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
}
if (!rmd.armState[0] && pBonder2->slotHasGlass(0) && !pBonder2->slotHasGlass(1)) {
m_pActiveRobotTask = createTransferTask(pVacuumBake, pBonder2, MaterialsType::G1, MaterialsType::G0);
+ if (m_pActiveRobotTask != nullptr && !validateBonderPairProcessJob(pBonder2, "Bonder2")) {
+ // 鍚� PJ 鏍￠獙澶辫触锛屾湰杞笉涓嬪彂鎼��
+ }
CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
}
@@ -1056,16 +1335,46 @@
// 16) LoadPort -> Aligner锛堝彈缁勬暟闂ㄩ檺鎺у埗锛涚粺涓� buddy/鐘舵�佹椂搴忥級
if (blockLoadFromLP) { unlock(); continue; }
+ const int preferredPortForPrimary = getPreferredPortForType(primaryType);
+ {
+ static int s_prevPrimaryType = -1;
+ static int s_prevPreferredPort = -2;
+ const int curPrimaryType = (int)primaryType;
+ if (s_prevPrimaryType != curPrimaryType || s_prevPreferredPort != preferredPortForPrimary) {
+ LOGI("<Master>LoadPort->Aligner瑙勫垯(RUNNING_BATCH): primaryType=%d, preferredPort=%d",
+ curPrimaryType, preferredPortForPrimary >= 0 ? (preferredPortForPrimary + 1) : 0);
+ s_prevPrimaryType = curPrimaryType;
+ s_prevPreferredPort = preferredPortForPrimary;
+ }
+ }
for (int s = 0; s < 4; s++) {
PortType pt = pLoadPorts[s]->getPortType();
if (!rmd.armState[0] && pLoadPorts[s]->isEnable()
&& (pt == PortType::Loading || pt == PortType::Both)
&& pLoadPorts[s]->getPortStatus() == PORT_INUSE) {
+ if (!isProductionPortTypeMatch(s, primaryType)) {
+ continue;
+ }
+ if (preferredPortForPrimary >= 0 && s != preferredPortForPrimary) {
+ continue;
+ }
m_pActiveRobotTask = createTransferTask(pLoadPorts[s], pAligner, primaryType, secondaryType, 1, m_bJobMode);
if (m_pActiveRobotTask != nullptr) {
auto* pGlass = static_cast<CGlass*>(m_pActiveRobotTask->getContext());
+ CProcessJob* pPJ = (pGlass != nullptr) ? pGlass->getProcessJob() : nullptr;
+ LOGI("<Master>LoadPort->Aligner鍛戒腑(RUNNING_BATCH): port=%d, primaryType=%d, preferredPort=%d, glass=%s, scheduled=%d, pj=%s",
+ s + 1, (int)primaryType, preferredPortForPrimary >= 0 ? (preferredPortForPrimary + 1) : 0,
+ pGlass != nullptr ? pGlass->getID().c_str() : "",
+ (pGlass != nullptr && pGlass->isScheduledForProcessing()) ? 1 : 0,
+ pPJ != nullptr ? pPJ->id().c_str() : "NULL");
+ if (pGlass == nullptr) {
+ LOGE("<Master>LoadPort->Aligner鍛戒腑(RUNNING_BATCH)浣哻ontext涓虹┖锛屼换鍔″凡涓㈠純.");
+ delete m_pActiveRobotTask;
+ m_pActiveRobotTask = nullptr;
+ continue;
+ }
if (pGlass->getBuddy() != nullptr) {
delete m_pActiveRobotTask; m_pActiveRobotTask = nullptr;
continue;
@@ -1643,12 +1952,36 @@
pGlass->setProcessJob(pj);
PJWarp& jpWarp = pj->getPjWarp();
+ int portIndex = -1;
+ switch (pPort->getID()) {
+ case EQ_ID_LOADPORT1: portIndex = 0; break;
+ case EQ_ID_LOADPORT2: portIndex = 1; break;
+ case EQ_ID_LOADPORT3: portIndex = 2; break;
+ case EQ_ID_LOADPORT4: portIndex = 3; break;
+ default: break;
+ }
+
+ BOOL scheduled = FALSE;
+ int material = 1; // G1
+ if (1 <= slot && slot <= 8) {
+ if (0 <= portIndex && portIndex <= 3 && jpWarp.selectedPorts[portIndex]) {
+ scheduled = jpWarp.checkSlots[portIndex][slot - 1];
+ material = jpWarp.materialSlots[portIndex][slot - 1];
+ }
+ else {
+ // Backward compatibility for legacy single-port PJWarp.
+ scheduled = jpWarp.checkSlot[slot - 1];
+ material = jpWarp.material[slot - 1];
+ }
+ }
+ material = (material == 2) ? 2 : 1;
+
int nRecipeID = RecipeManager::getInstance().getIdByPPID(pj->recipeSpec());
RecipeInfo stRecipeInfo = RecipeManager::getInstance().getRecipeByPPID(pj->recipeSpec());
std::vector<DeviceRecipe> vecRecipeInfo = stRecipeInfo.vecDeviceList;
- pGlass->setScheduledForProcessing(jpWarp.checkSlot[slot-1]);
- pGlass->setType(static_cast<SERVO::MaterialsType>(jpWarp.material[slot-1]));
+ pGlass->setScheduledForProcessing(scheduled);
+ pGlass->setType(static_cast<SERVO::MaterialsType>(material));
SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
if (pJobDataS != nullptr) {
@@ -1656,7 +1989,7 @@
pJobDataS->setLotId(pj->getLotId().c_str());
pJobDataS->setProductId(pj->getProductId().c_str());
pJobDataS->setOperationId(pj->getOperationId().c_str());
- pJobDataS->setMaterialsType(jpWarp.material[slot - 1]);
+ pJobDataS->setMaterialsType(material);
pJobDataS->setMasterRecipe(nRecipeID);
for (const auto& info : vecRecipeInfo) {
const std::string& name = info.strDeviceName;
@@ -1699,7 +2032,8 @@
m_state == MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER ||
m_state == MASTERSTATE::RUNNING_BATCH ||
m_state == MASTERSTATE::STARTING);
- if (!allowSvLog) {
+ const bool allowCurve = allowSvLog || (m_curveMode == CurveMode::EmptyChamber);
+ if (!allowCurve) {
return;
}
CSVData* pSVData = (CSVData*)pData;
@@ -1753,18 +2087,23 @@
int paramIndex = mapping.first;
int channel = mapping.second;
- if (paramIndex < params.size() && channel - 1 < vacuumbakeTypes.size()) {
+ if (paramIndex < params.size()) {
auto& param = params.at(paramIndex);
double value = param.getDoubleValue();
- const std::string& dataType = vacuumbakeTypes[channel - 1];
const std::string& paramName = param.getName();
const char slotTag = !paramName.empty() ? paramName[0] : '\0';
+ const int typeIndex = (slotTag == 'B') ? (channel - 8) : (channel - 1);
+ if (typeIndex < 0 || typeIndex >= (int)vacuumbakeTypes.size()) {
+ continue;
+ }
+ const int pushChannel = typeIndex + 1;
+ const std::string& dataType = vacuumbakeTypes[typeIndex];
if (m_pCollector != nullptr) {
if (slotTag == 'A')
- m_pCollector->buffersPush(SlotToMid(eqid, 1), channel, ts, value);
+ m_pCollector->buffersPush(SlotToMid(eqid, 1), pushChannel, ts, value);
else if (slotTag == 'B')
- m_pCollector->buffersPush(SlotToMid(eqid, 2), channel, ts, value);
+ m_pCollector->buffersPush(SlotToMid(eqid, 2), pushChannel, ts, value);
}
// 鏍规嵁鑵斾綋鍓嶇紑鍐欏叆瀵瑰簲 Slot 鐨勭幓鐠�
@@ -1798,20 +2137,25 @@
int paramIndex = mapping.first;
int channel = mapping.second;
- if (paramIndex < params.size() && channel - 1 < coolingTypes.size()) {
+ if (paramIndex < params.size()) {
auto& param = params.at(paramIndex);
double value = param.getDoubleValue();
- const std::string& dataType = coolingTypes[channel - 1];
const std::string& paramName = param.getName();
const char slotTag = !paramName.empty() ? paramName[0] : '\0';
const bool paramIsBake = paramName.find("鐑樼儰") != std::string::npos;
const bool paramIsCooling = paramName.find("鍐峰嵈") != std::string::npos;
+ const int typeIndex = (slotTag == 'B') ? (channel - 7) : (channel - 1);
+ if (typeIndex < 0 || typeIndex >= (int)coolingTypes.size()) {
+ continue;
+ }
+ const int pushChannel = typeIndex + 1;
+ const std::string& dataType = coolingTypes[typeIndex];
if (m_pCollector != nullptr && paramIsBake) {
if (slotTag == 'A')
- m_pCollector->buffersPush(SlotToMid(eqid, 1), channel, ts, value);
+ m_pCollector->buffersPush(SlotToMid(eqid, 1), pushChannel, ts, value);
else if (slotTag == 'B')
- m_pCollector->buffersPush(SlotToMid(eqid, 3), channel, ts, value);
+ m_pCollector->buffersPush(SlotToMid(eqid, 3), pushChannel, ts, value);
}
if (!dataType.empty()) {
@@ -1878,6 +2222,16 @@
listener.onReceivedJob = [&](void* pEquipment, int port, CJobDataS* pJobDataS) {
if (m_listener.onJobReceived != nullptr) {
m_listener.onJobReceived(this, (CEquipment*)pEquipment, port, pJobDataS);
+ }
+ };
+ listener.onSentOutJob = [&](void* pEquipment, int port, CJobDataS* pJobDataS) {
+ if (m_listener.onJobSentOut != nullptr) {
+ m_listener.onJobSentOut(this, (CEquipment*)pEquipment, port, pJobDataS);
+ }
+ };
+ listener.onEqStatusChanged = [&](void* pEquipment, int unitId, int status, int reason) {
+ if (m_listener.onEqStatusChanged != nullptr) {
+ m_listener.onEqStatusChanged(this, (CEquipment*)pEquipment, unitId, status, reason);
}
};
pEquipment->setListener(listener);
@@ -2389,11 +2743,19 @@
nRet = pLoadPort1->getPin("Out")->connectPin(pAligner->getPin("In1"));
if (nRet < 0) {
- LOGE("杩炴帴LoadPort1-Fliper澶辫触");
+ LOGE("杩炴帴LoadPort1-Aligner澶辫触");
}
nRet = pLoadPort2->getPin("Out")->connectPin(pAligner->getPin("In2"));
if (nRet < 0) {
- LOGE("杩炴帴LoadPort1-Fliper澶辫触");
+ LOGE("杩炴帴LoadPort2-Aligner澶辫触");
+ }
+ nRet = pLoadPort3->getPin("Out")->connectPin(pAligner->getPin("In3"));
+ if (nRet < 0) {
+ LOGE("杩炴帴LoadPort3-Aligner澶辫触");
+ }
+ nRet = pLoadPort4->getPin("Out")->connectPin(pAligner->getPin("In4"));
+ if (nRet < 0) {
+ LOGE("杩炴帴LoadPort4-Aligner澶辫触");
}
nRet = pAligner->getPin("Out1")->connectPin(pFliper->getPin("In"));
@@ -2438,14 +2800,29 @@
LOGE("杩炴帴BakeCooling-LoadPort3澶辫触");
}
- nRet = pMeasurement->getPin("Out1")->connectPin(pLoadPort3->getPin("In"));
- if (nRet < 0) {
- LOGE("杩炴帴BakeCooling-LoadPort3澶辫触");
- }
+ if (m_schedulingMode == SchedulingMode::Production) {
+ // 鐢熶骇妯″紡锛氭祴閲忚緭鍑哄洖鍒� G1 鍘熶綅锛堥粯璁� Port1 / Port3锛�
+ nRet = pMeasurement->getPin("Out1")->connectPin(pLoadPort1->getPin("In"));
+ if (nRet < 0) {
+ LOGE("杩炴帴Measurement-LoadPort1澶辫触");
+ }
- nRet = pMeasurement->getPin("Out2")->connectPin(pLoadPort4->getPin("In"));
- if (nRet < 0) {
- LOGE("杩炴帴BakeCooling-LoadPort4澶辫触");
+ nRet = pMeasurement->getPin("Out2")->connectPin(pLoadPort3->getPin("In"));
+ if (nRet < 0) {
+ LOGE("杩炴帴Measurement-LoadPort3澶辫触");
+ }
+ }
+ else {
+ // 璋冩満妯″紡锛氱淮鎸佸師杩炴帴锛圤ut1->Port3, Out2->Port4锛�
+ nRet = pMeasurement->getPin("Out1")->connectPin(pLoadPort3->getPin("In"));
+ if (nRet < 0) {
+ LOGE("杩炴帴Measurement-LoadPort3澶辫触");
+ }
+
+ nRet = pMeasurement->getPin("Out2")->connectPin(pLoadPort4->getPin("In"));
+ if (nRet < 0) {
+ LOGE("杩炴帴Measurement-LoadPort4澶辫触");
+ }
}
}
@@ -2675,6 +3052,57 @@
return pTask;
}
+ CRobotTask* CMaster::createTransferTask_returnOrigin(CEquipment* pEqSrc, CLoadPort** pPorts)
+ {
+ if (!pEqSrc->IsEnabled()) {
+ return nullptr;
+ }
+
+ CSlot* pSrcSlot = pEqSrc->getProcessedSlot(MaterialsType::G1, m_bJobMode);
+ if (pSrcSlot == nullptr) {
+ return nullptr;
+ }
+
+ CGlass* pGlass = (CGlass*)pSrcSlot->getContext();
+ if (pGlass == nullptr) {
+ return nullptr;
+ }
+
+ int port = 0, slot = 0;
+ pGlass->getOrginPort(port, slot);
+ if (port < 0 || port >= 4 || slot < 0 || slot >= SLOT_MAX) {
+ return nullptr;
+ }
+
+ CLoadPort* pPort = pPorts[port];
+ if (pPort == nullptr || !pPort->isEnable()) {
+ return nullptr;
+ }
+ PortType pt = pPort->getPortType();
+ if (!(pt == PortType::Unloading || pt == PortType::Both)) {
+ return nullptr;
+ }
+ if (pPort->getPortStatus() != PORT_INUSE) {
+ return nullptr;
+ }
+
+ CSlot* pTarSlot = pPort->getSlot(slot);
+ if (pTarSlot == nullptr) {
+ return nullptr;
+ }
+ if (!pTarSlot->isEnable() || pTarSlot->isLock() || pTarSlot->getContext() != nullptr) {
+ return nullptr;
+ }
+
+ CRobotTask* pTask = new CRobotTask();
+ pTask->setContext(pSrcSlot->getContext());
+ pTask->setEFEM((CEFEM*)getEquipment(EQ_ID_EFEM));
+ taskSeqNo = pTask->setRobotTransferParam(taskSeqNo, 1, pSrcSlot->getPosition(),
+ pTarSlot->getPosition(), pSrcSlot->getNo(), pTarSlot->getNo());
+
+ return pTask;
+ }
+
CRobotTask* CMaster::createTransferTask_continuous_transfer(CEquipment* pSrcEq, int nSrcSlot,
CEquipment* pTarEq, int nTarSlot, int armNo/* = 1*/)
{
@@ -2784,6 +3212,19 @@
pPort->localSetCessetteType(type);
}
+ void CMaster::applySchedulingModePortMapping()
+ {
+ // 鐢熶骇妯″紡锛氬浐瀹� Port1/Port3 涓� G1锛孭ort2/Port4 涓� G2锛圙4 鏈畾涔夛紝鎸� G2 澶勭悊锛�
+ if (m_schedulingMode != SchedulingMode::Production) {
+ return;
+ }
+
+ setPortCassetteType(0, SERVO::CassetteType::G1);
+ setPortCassetteType(1, SERVO::CassetteType::G2);
+ setPortCassetteType(2, SERVO::CassetteType::G1);
+ setPortCassetteType(3, SERVO::CassetteType::G2);
+ }
+
void CMaster::setPortEnable(unsigned int index, BOOL bEnable)
{
ASSERT(index < 4);
@@ -2847,7 +3288,57 @@
static int pid[] = { EQ_ID_LOADPORT1, EQ_ID_LOADPORT2, EQ_ID_LOADPORT3, EQ_ID_LOADPORT4};
CLoadPort* pPort = (CLoadPort*)getEquipment(pid[port]);
- pPort->sendCassetteCtrlCmd(CCC_PROCESS_START, nullptr, 0, 0, 0, nullptr, nullptr);
+ if (pPort == nullptr) return -1;
+
+ short jobExistence[12] = { 0 };
+ short slotProcess = 0;
+ short jobCount = 0; // 0 = Process All Glass
+ bool anyScheduled = false;
+
+ // Prefer hardware scan map for job existence (first 16 slots).
+ const short scanMap = pPort->getScanCassetteMap();
+ if (scanMap != 0) {
+ jobExistence[0] = scanMap;
+ }
+
+ const int maxSlots = 12 * 16;
+ const int totalSlots = (SLOT_MAX < maxSlots) ? SLOT_MAX : maxSlots;
+ for (int slot = 1; slot <= totalSlots; ++slot) {
+ CGlass* pGlass = pPort->getGlassFromSlot(slot);
+ if (pGlass == nullptr) continue;
+
+ const int wordIndex = (slot - 1) / 16;
+ const int bitIndex = (slot - 1) % 16;
+ jobExistence[wordIndex] = (short)(jobExistence[wordIndex] | (1 << bitIndex));
+
+ if (slot <= 16 && pGlass->isScheduledForProcessing()) {
+ slotProcess = (short)(slotProcess | (1 << bitIndex));
+ anyScheduled = true;
+ }
+ }
+
+ if (!anyScheduled) {
+ slotProcess = jobExistence[0];
+ }
+
+ bool hasExistence = false;
+ for (short w : jobExistence) {
+ if (w != 0) { hasExistence = true; break; }
+ }
+ const int portStatus = pPort->getPortStatus();
+ if (!hasExistence) {
+ LOGE("ProcessStart blocked (ProceedWithCarrier): no JobExistence map (port=%u, portStatus=%d, scanMap=%d, cassetteId=%s).",
+ port + 1, portStatus, scanMap, pPort->getCassetteId().c_str());
+ return -2;
+ }
+ if (portStatus != PORT_INUSE) {
+ LOGW("ProcessStart warning (ProceedWithCarrier): port status is %d (expected INUSE).", portStatus);
+ }
+ LOGI("ProcessStart payload (ProceedWithCarrier): port=%u, cassetteId=%s, scanMap=%d, jobExistence0=%d, jobExistence1=%d, slotProcess=%d, anyScheduled=%d",
+ port + 1, pPort->getCassetteId().c_str(), scanMap,
+ (int)jobExistence[0], (int)jobExistence[1], (int)slotProcess, anyScheduled ? 1 : 0);
+
+ pPort->sendCassetteCtrlCmd(CCC_PROCESS_START, jobExistence, 12, slotProcess, jobCount, nullptr, nullptr);
return 0;
}
@@ -2890,12 +3381,51 @@
}
}
+ // 鍏堟竻绌烘墍鏈夌鍙ｇ幓鐠冪殑璋冨害鏍囪锛岄伩鍏嶆部鐢ㄥ巻鍙� PJ 鐘舵�併��
+ int clearedGlassCount = 0;
+ for (int i = 0; i < 4; i++) {
+ auto* pPort = (CLoadPort*)getEquipment(EQ_ID_LOADPORT1 + i);
+ if (pPort == nullptr) continue;
+ for (int slot = 1; slot <= SLOT_MAX; slot++) {
+ auto* pGlass = pPort->getGlassFromSlot(slot);
+ if (pGlass == nullptr) continue;
+ pGlass->setProcessJob(nullptr);
+ pGlass->setScheduledForProcessing(FALSE);
+ clearedGlassCount++;
+ }
+ }
+ LOGI("<Master>setProcessJobs: cleared scheduling marks on %d glass(es).", clearedGlassCount);
+
+ auto toPortIndex = [](int eqid) -> int {
+ switch (eqid) {
+ case EQ_ID_LOADPORT1: return 0;
+ case EQ_ID_LOADPORT2: return 1;
+ case EQ_ID_LOADPORT3: return 2;
+ case EQ_ID_LOADPORT4: return 3;
+ default: return -1;
+ }
+ };
+
+ auto hasAnySelectedPorts = [](const PJWarp& warp) -> bool {
+ for (int p = 0; p < 4; p++) {
+ if (warp.selectedPorts[p]) return true;
+ }
+ return false;
+ };
+
+ auto hasAnyLegacyCheckedSlots = [](const PJWarp& warp) -> bool {
+ for (int s = 0; s < 8; s++) {
+ if (warp.checkSlot[s]) return true;
+ }
+ return false;
+ };
// 鏇存柊context
for (auto pj : m_processJobs) {
for (auto& c : pj->carriers()) {
auto pPort = getPortWithCarrierId(c.carrierId);
if (pPort == nullptr) continue;
+ const int portIndex = toPortIndex(pPort->getID());
short downloadMap = 0;
for (auto s : c.slots) {
@@ -2907,12 +3437,37 @@
std::vector<uint8_t> newSlots;
std::vector<void*> newContexts;
+ PJWarp& warp = pj->getPjWarp();
+ const bool useMultiPortWarp = hasAnySelectedPorts(warp);
+ const bool useLegacyWarp = !useMultiPortWarp && hasAnyLegacyCheckedSlots(warp);
for (auto s : c.slots) {
auto pGlass = pPort->getGlassFromSlot(s);
if (pGlass == nullptr) continue;
newSlots.push_back(s);
newContexts.push_back(pGlass);
+
+ // 榛樿锛欻ost 涓嬪彂浣嗘湭鎼哄甫 PJWarp 缁嗚妭鏃讹紝carrier slots 瑙嗕负搴斿姞宸ャ��
+ BOOL scheduled = TRUE;
+ int material = (pGlass->getType() == MaterialsType::G2) ? 2 : 1;
+
+ if (1 <= s && s <= 8) {
+ if (useMultiPortWarp && 0 <= portIndex && portIndex < 4 && warp.selectedPorts[portIndex]) {
+ scheduled = warp.checkSlots[portIndex][s - 1];
+ material = warp.materialSlots[portIndex][s - 1];
+ }
+ else if (useLegacyWarp) {
+ scheduled = warp.checkSlot[s - 1];
+ material = warp.material[s - 1];
+ }
+ }
+ material = (material == 2) ? 2 : 1;
+
+ pGlass->setProcessJob(pj);
+ pGlass->setScheduledForProcessing(scheduled);
+ pGlass->setType(static_cast<MaterialsType>(material));
+ LOGI("<Master>setProcessJobs bind: pj=%s, port=%d, slot=%d, glass=%s, scheduled=%d, material=%d",
+ pj->id().c_str(), portIndex + 1, (int)s, pGlass->getID().c_str(), scheduled ? 1 : 0, material);
}
pj->setCarrierSlotsAndContexts(c.carrierId, newSlots, newContexts);
@@ -3435,6 +3990,11 @@
}
m_pControlJob->abort(description);
+ // 鍏堜笂鎶ヤ竴娆＄姸鎬佸彉鍖栵紙渚夸簬 PrJobAbort 瑙﹀彂锛�
+ if (m_listener.onControlJobChanged) {
+ notifyControlJobChanged();
+ }
+
// 閲婃斁Job鐩稿叧
for (auto item : m_processJobs) {
@@ -3519,6 +4079,15 @@
if (pSlot == nullptr) return false;
CGlass* pGlass = (CGlass*)pSlot->getContext();
+ if (pGlass == nullptr) return false;
+
+ // Buffer 涓婇檺涓� 1锛氭柊鎼嚭鏃朵涪寮冩棫鐨�
+ if (!m_bufGlass.empty()) {
+ for (auto* oldGlass : m_bufGlass) {
+ if (oldGlass != nullptr) oldGlass->release();
+ }
+ m_bufGlass.clear();
+ }
m_bufGlass.push_back(pGlass);
pGlass->addRef();
pSlot->setContext(nullptr);
@@ -3607,14 +4176,14 @@
auto& dataTypes = CServoUtilsTool::getEqDataTypes();
auto& bonderTypes = dataTypes[MID_Bonder1];
for (size_t i = 0; i < bonderTypes.size(); ++i) {
- m_pCollector->buffersSetChannelName(MID_Bonder1, i + 1, bonderTypes[i].c_str());
- m_pCollector->buffersSetChannelName(MID_Bonder2, i + 1, bonderTypes[i].c_str());
+ m_pCollector->buffersSetChannelName(MID_Bonder1, (UINT)i + 1, bonderTypes[(UINT)i].c_str());
+ m_pCollector->buffersSetChannelName(MID_Bonder2, (UINT)i + 1, bonderTypes[(UINT)i].c_str());
}
auto& vacuumbakeTypes = dataTypes[MID_VacuumBakeA];
for (size_t i = 0; i < vacuumbakeTypes.size(); ++i) {
- m_pCollector->buffersSetChannelName(MID_VacuumBakeA, i + 1, vacuumbakeTypes[i].c_str());
- m_pCollector->buffersSetChannelName(MID_VacuumBakeB, i + 1, vacuumbakeTypes[i].c_str());
+ m_pCollector->buffersSetChannelName(MID_VacuumBakeA, (UINT)i + 1, vacuumbakeTypes[(UINT)i].c_str());
+ m_pCollector->buffersSetChannelName(MID_VacuumBakeB, (UINT)i + 1, vacuumbakeTypes[(UINT)i].c_str());
}
auto& coolingTypes = dataTypes[MID_BakeCoolingA];
@@ -3622,6 +4191,17 @@
m_pCollector->buffersSetChannelName(MID_BakeCoolingA, i + 1, coolingTypes[i].c_str());
m_pCollector->buffersSetChannelName(MID_BakeCoolingB, i + 1, coolingTypes[i].c_str());
}
+
+ if (m_curveMode == CurveMode::EmptyChamber) {
+ const uint32_t mids[] = {
+ MID_Bonder1, MID_Bonder2,
+ MID_VacuumBakeA, MID_VacuumBakeB,
+ MID_BakeCoolingA, MID_BakeCoolingB
+ };
+ for (uint32_t mid : mids) {
+ m_pCollector->batchStart(mid, "EMPTY_CHAMBER", 10 * 60 * 1000ULL);
+ }
+ }
}
}
--
Gitblit v1.9.3