From ceb64b6612309fe384e096dcdc8b5a5e0dfe6cce Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 30 一月 2026 15:08:47 +0800
Subject: [PATCH] 1.增加日志，监控Efem的请求JobData事件；
---
SourceCode/Bond/Servo/CMaster.cpp | 675 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 639 insertions(+), 36 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 8df061b..d9fb326 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -3,10 +3,14 @@
#include "CMaster.h"
#include <future>
#include <vector>
+#include <algorithm>
#include "RecipeManager.h"
#include <fstream>
#include "SerializeUtil.h"
#include "CServoUtilsTool.h"
+#include "AlarmManager.h"
+#include "ToolUnits.h"
+#include "Model.h"
namespace SERVO {
@@ -58,6 +62,7 @@
m_ullStartTime = 0;
m_ullRunTime = 0;
m_state = MASTERSTATE::READY;
+ m_curveMode = CurveMode::Production;
m_pActiveRobotTask = nullptr;
m_nLastError = ER_CODE_NOERROR;
m_isCompareMapsBeforeProceeding = FALSE;
@@ -71,6 +76,8 @@
m_nContinuousWorkingPort = 0;
m_nContinuousWorkingSlot = 0;
m_pControlJob = nullptr;
+ m_bPauseAlarmRaised = false;
+ m_pModelCtx = nullptr;
m_nTestFlag = 0;
InitializeCriticalSection(&m_criticalSection);
}
@@ -112,12 +119,18 @@
m_hEventDispatchThreadExit[1] = nullptr;
}
+
DeleteCriticalSection(&m_criticalSection);
}
void CMaster::setListener(MasterListener listener)
{
m_listener = listener;
+ }
+
+ void CMaster::setModelCtx(CModel* pModel)
+ {
+ m_pModelCtx = pModel;
}
CRobotTask* CMaster::getActiveRobotTask()
@@ -127,11 +140,18 @@
int CMaster::init()
{
+ const ULONGLONG boot_master_begin = GetTickCount64();
LOGI("<Master>姝ｅ湪鍒濆鍖�...");
+ LOGI("[BOOT][MASTER] init begin");
// cclink
- if (m_cclink.Connect(CC_LINK_IE_CONTROL_CHANNEL(1)) != 0) {
+ const ULONGLONG boot_cclink_begin = GetTickCount64();
+ const int cc_ret = m_cclink.Connect(CC_LINK_IE_CONTROL_CHANNEL(1));
+ LOGI("[BOOT][MASTER] CC-Link connect ret=%d, cost=%llu ms",
+ cc_ret,
+ (unsigned long long)(GetTickCount64() - boot_cclink_begin));
+ if (cc_ret != 0) {
LOGE("杩炴帴CC-Link澶辫触.");
}
else {
@@ -220,8 +240,21 @@
// 璇荤紦瀛樻暟鎹�
+ 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));
// 瀹氭椂鍣�
@@ -244,7 +277,39 @@
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;
}
int CMaster::term()
@@ -272,6 +337,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();
@@ -875,6 +947,33 @@
m_pActiveRobotTask->place();
}
unlock(); // 绛夊綋鍓嶄换鍔″畬鎴愭垨涓鍚庣户缁�
+ continue;
+ }
+
+ // 5.5) 鏆傚仠鐘舵�佹鏌ワ細鑻� CJ 鎴栧湪鍒� PJ 澶勪簬 Paused锛屾殏缂撹皟搴︽柊鐨勬惉閫�
+ bool pausedByEvent = false;
+ if (m_pControlJob != nullptr && m_pControlJob->state() == CJState::Paused) {
+ pausedByEvent = true;
+ }
+ for (auto pj : m_inProcesJobs) {
+ if (pj != nullptr && pj->state() == PJState::Paused) {
+ pausedByEvent = true;
+ break;
+ }
+ }
+ if (!pausedByEvent && m_bPauseAlarmRaised) {
+ if (m_pModelCtx != nullptr) {
+ m_pModelCtx->clearSoftAlarm(ALID_SOFTWARE_PAUSE_EVENT, 0, 0);
+ }
+ else {
+ AlarmManager& alarmManager = AlarmManager::getInstance();
+ alarmManager.clearAlarmByAttributes(ALID_SOFTWARE_PAUSE_EVENT, 0, 0, CToolUnits::getCurrentTimeString());
+ }
+ m_bPauseAlarmRaised = false;
+ }
+ if (pausedByEvent) {
+ LOGI("<Master>璋冨害鏆傚仠锛欳ontrolJob/ProcessJob 澶勪簬 Paused 鐘舵�侊紙鍙兘鐢� PauseEvent 瑙﹀彂锛�");
+ unlock();
continue;
}
@@ -1483,6 +1582,7 @@
this->saveState();
LOGE("<Master>ProcessJob(%s)瀹屾垚.",
pJob->id().c_str());
+ processJobFromInPorcessToComplete(pJob);
if (m_listener.onPjEnd != nullptr) {
m_listener.onPjEnd(this, pJob);
}
@@ -1536,19 +1636,30 @@
unlock();
}
};
- listener.onProcessStateChanged = [&](void* pEquipment, int slotNo, PROCESS_STATE state) -> void {
+ listener.onProcessStateChanged = [&](void* pEquipment, int slotNo, PROCESS_STATE prevState, PROCESS_STATE state) -> void {
ASSERT(1 <= slotNo && slotNo <= 8);
int eqid = ((CEquipment*)pEquipment)->getID();
CGlass* pGlass = ((CEquipment*)pEquipment)->getGlassFromSlot(slotNo);
LOGI("<Master>onProcessStateChanged<%d>", (int)state);
if (state == PROCESS_STATE::Processing) {
if (pGlass != nullptr) {
- m_pCollector->batchStart(eqid,
+ m_pCollector->batchStart(SlotToMid(eqid, slotNo),
pGlass->getID().c_str(), 10 * 60 * 1000ULL);
}
}
else if (state == PROCESS_STATE::Complete) {
- m_pCollector->batchStop(eqid);
+ if (pGlass != nullptr) {
+ m_pCollector->batchStop(SlotToMid(eqid, slotNo));
+ }
+ }
+
+ if (m_listener.onProcessStateChanged != nullptr) {
+ m_listener.onProcessStateChanged(this, (CEquipment*)pEquipment, slotNo, prevState, state);
+ }
+ };
+ listener.onProcessDataReport = [&](void* pEquipment, const std::vector<CParam>& params) {
+ if (m_listener.onProcessDataReport != nullptr) {
+ m_listener.onProcessDataReport(this, (CEquipment*)pEquipment, params);
}
};
listener.onMapMismatch = [&](void* pEquipment, short scanMap, short downMap) {
@@ -1622,6 +1733,15 @@
}
};
listener.onSVDataReport = [&](void* pEquipment, void* pData) {
+ const bool allowSvLog =
+ (m_state == MASTERSTATE::RUNNING ||
+ m_state == MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER ||
+ m_state == MASTERSTATE::RUNNING_BATCH ||
+ m_state == MASTERSTATE::STARTING);
+ const bool allowCurve = allowSvLog || (m_curveMode == CurveMode::EmptyChamber);
+ if (!allowCurve) {
+ return;
+ }
CSVData* pSVData = (CSVData*)pData;
auto rawData = pSVData->getSVRawData();
std::vector<CParam> params;
@@ -1641,16 +1761,16 @@
{8, 8}, {9, 9}, {10, 10}, {11, 11}, {12, 12}, {13, 13}, {14, 14}, {15, 15}, {16, 16}
};
- CGlass* pGlass = ((CEquipment*)pEquipment)->getGlassFromSlot(1);
+ CGlass* pGlass = ((CEquipment*)pEquipment)->getGlassFromSlot(2);
auto& dataTypes = CServoUtilsTool::getEqDataTypes();
- auto& bonderTypes = dataTypes[eqid];
+ auto& bonderTypes = dataTypes[SlotToMid(eqid, 2)];
for (const auto& mapping : bonderMapping) {
int paramIndex = mapping.first;
int channel = mapping.second;
if (paramIndex < params.size() && channel - 1 < bonderTypes.size()) {
if(m_pCollector != nullptr)
- m_pCollector->buffersPush(eqid, channel, ts, params.at(paramIndex).getDoubleValue());
+ m_pCollector->buffersPush(SlotToMid(eqid, 2), channel, ts, params.at(paramIndex).getDoubleValue());
if(pGlass != nullptr)
pGlass->addSVData(eqid, bonderTypes[channel - 1], ts, params.at(paramIndex).getDoubleValue());
}
@@ -1664,19 +1784,39 @@
{10, 8}, {11, 9}, {12, 10}, {13, 11}, {14, 12}, {15, 13}, {16, 14}
};
- CGlass* pGlass = ((CEquipment*)pEquipment)->getGlassFromSlot(1);
+ CGlass* pGlass1 = ((CEquipment*)pEquipment)->getGlassFromSlot(1);
+ CGlass* pGlass2 = ((CEquipment*)pEquipment)->getGlassFromSlot(2);
auto& dataTypes = CServoUtilsTool::getEqDataTypes();
- auto& vacuumbakeTypes = dataTypes[eqid];
+ auto& vacuumbakeTypes = dataTypes[SlotToMid(eqid, 1)];
LOGD("<Master>onSVDataReport 003 : %d", vacuumMapping.size());
for (const auto& mapping : vacuumMapping) {
int paramIndex = mapping.first;
int channel = mapping.second;
- if (paramIndex < params.size() && channel - 1 < vacuumbakeTypes.size()) {
- if (m_pCollector != nullptr)
- m_pCollector->buffersPush(eqid, channel, ts, params.at(paramIndex).getDoubleValue());
- if (pGlass != nullptr)
- pGlass->addSVData(eqid, vacuumbakeTypes[channel - 1], ts, params.at(paramIndex).getDoubleValue());
+ if (paramIndex < params.size()) {
+ auto& param = params.at(paramIndex);
+ double value = param.getDoubleValue();
+ 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), pushChannel, ts, value);
+ else if (slotTag == 'B')
+ m_pCollector->buffersPush(SlotToMid(eqid, 2), pushChannel, ts, value);
+ }
+
+ // 鏍规嵁鑵斾綋鍓嶇紑鍐欏叆瀵瑰簲 Slot 鐨勭幓鐠�
+ if (pGlass1 != nullptr && !dataType.empty() && slotTag == 'A')
+ pGlass1->addSVData(eqid, dataType, ts, value);
+ if (pGlass2 != nullptr && !dataType.empty() && slotTag == 'B')
+ pGlass2->addSVData(eqid, dataType, ts, value);
}
}
}
@@ -1688,19 +1828,60 @@
{11, 7}, {12, 8}, {13, 9}, {14, 10}, {15, 11}, {16, 12}
};
- CGlass* pGlass = ((CEquipment*)pEquipment)->getGlassFromSlot(1);
+ CGlass* pGlass1 = ((CEquipment*)pEquipment)->getGlassFromSlot(1); // A Bake
+ CGlass* pGlass2 = ((CEquipment*)pEquipment)->getGlassFromSlot(2); // A Cool
+ CGlass* pGlass3 = ((CEquipment*)pEquipment)->getGlassFromSlot(3); // B Bake
+ CGlass* pGlass4 = ((CEquipment*)pEquipment)->getGlassFromSlot(4); // B Cool
auto& dataTypes = CServoUtilsTool::getEqDataTypes();
- auto& coolingTypes = dataTypes[eqid];
+ auto& coolingTypes = dataTypes[SlotToMid(eqid, 1)];
LOGD("<Master>onSVDataReport 003B : %d", coolingMapping.size());
+ auto addToGlass = [&](CGlass* glass, const std::string& type, double val) {
+ if (glass != nullptr)
+ glass->addSVData(eqid, type, ts, val);
+ };
for (const auto& mapping : coolingMapping) {
int paramIndex = mapping.first;
int channel = mapping.second;
- if (paramIndex < params.size() && channel - 1 < coolingTypes.size()) {
- if (m_pCollector != nullptr)
- m_pCollector->buffersPush(eqid, channel, ts, params.at(paramIndex).getDoubleValue());
- if (pGlass != nullptr)
- pGlass->addSVData(eqid, coolingTypes[channel - 1], ts, params.at(paramIndex).getDoubleValue());
+ if (paramIndex < params.size()) {
+ auto& param = params.at(paramIndex);
+ double value = param.getDoubleValue();
+ 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), pushChannel, ts, value);
+ else if (slotTag == 'B')
+ m_pCollector->buffersPush(SlotToMid(eqid, 3), pushChannel, ts, value);
+ }
+
+ if (!dataType.empty()) {
+ switch (slotTag) {
+ case 'A':
+ if (paramIsBake)
+ addToGlass(pGlass1, dataType, value);
+ else if (paramIsCooling)
+ addToGlass(pGlass2, dataType, value);
+ break;
+ case 'B':
+ if (paramIsBake)
+ addToGlass(pGlass3, dataType, value);
+ else if (paramIsCooling)
+ addToGlass(pGlass4, dataType, value);
+ break;
+ default:
+ break;
+ }
+ }
}
}
}
@@ -1720,6 +1901,10 @@
strOut.append(szBuffer);
}
LOGD("<CMaster-%s>SVDataReport:%s", ((CEquipment*)pEquipment)->getName().c_str(), strOut.c_str());
+
+ if (m_listener.onSVDataReport != nullptr) {
+ m_listener.onSVDataReport(this, (CEquipment*)pEquipment, params);
+ }
};
listener.onPanelDataReport = [&](void* pEquipment, void* pContext) {
LOGD("<CMaster-%s>onPanelDataReport", ((CEquipment*)pEquipment)->getName().c_str());
@@ -1739,6 +1924,21 @@
}
}
+ };
+ 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);
pEquipment->setCcLink(&m_cclink);
@@ -1977,6 +2177,201 @@
}
}
+
+ // 妯℃嫙娴嬭瘯锛堟棤鏈哄櫒鑱旀満鏃剁敤浜庤仈璋� EAP锛�
+ // 璇诲彇 test.ini锛堝綋鍓嶇洰褰曟垨 exe 鍚岀洰褰曪級
+ {
+ struct SimCfg {
+ bool enabled{ false };
+ DWORD intervalMs{ 5000 };
+ int step{ 0 };
+ };
+ auto loadCfg = [&]() -> SimCfg {
+ SimCfg cfg;
+
+ // Try INI: current dir, then exe dir
+ char iniPath[MAX_PATH] = { 0 };
+ strcpy_s(iniPath, "test.ini");
+ auto readIni = [&](const char* path) -> bool {
+ const UINT en = GetPrivateProfileIntA("SimEap", "Enabled", 0, path);
+ if (en == 0) return false; // treat as missing/disabled
+ cfg.enabled = (en != 0);
+ cfg.intervalMs = (DWORD)GetPrivateProfileIntA("SimEap", "IntervalMs", 5000, path);
+ cfg.intervalMs = max(500u, cfg.intervalMs);
+ cfg.step = (int)GetPrivateProfileIntA("SimEap", "Step", 0, path);
+ return true;
+ };
+ if (!readIni(iniPath)) {
+ char exePath[MAX_PATH] = { 0 };
+ GetModuleFileNameA(NULL, exePath, MAX_PATH);
+ char* lastSlash = strrchr(exePath, '\\');
+ if (lastSlash != nullptr) {
+ *(lastSlash + 1) = '\0';
+ strcat_s(exePath, "test.ini");
+ readIni(exePath);
+ }
+ }
+ return cfg;
+ };
+
+ const SimCfg cfg = loadCfg();
+ if (cfg.enabled) {
+ static DWORD lastTick = 0;
+ static int lastExecutedStep = -1;
+ static bool inited = false;
+ static SERVO::CGlass simGlass;
+ static SERVO::CVcrEventReport simVcr;
+ static SERVO::CProcessJob simPj("PJ1001");
+ static SERVO::CControlJob simCj("CJ5007");
+
+ if (!inited) {
+ inited = true;
+ simGlass.setID("SIM_PANEL_001");
+ simVcr.getGlassId() = "SIM_PANEL_001";
+ }
+
+ DWORD now = GetTickCount();
+ if (lastTick == 0) lastTick = now;
+ if ((now - lastTick) < cfg.intervalMs) {
+ return;
+ }
+ lastTick = now;
+
+ // 鍗曟瑙﹀彂锛氭瘡涓� Step 鍙墽琛屼竴娆★紱浣犳墜鍔ㄤ慨鏀� ini 鐨� Step 鍊煎悗浼氬啀娆¤Е鍙�
+ const int step = cfg.step;
+ if (step <= 0 || step == lastExecutedStep) {
+ return;
+ }
+ lastExecutedStep = step;
+
+ // 鍙栦竴涓� LoadPort 浣滀负妯℃嫙鐩爣
+ SERVO::CLoadPort* pLpEq = (SERVO::CLoadPort*)getEquipment(EQ_ID_LOADPORT1);
+
+ auto fireLoadPortStatus = [&](short status) {
+ pLpEq->simulateSetCassetteId("Test-Cassette-001");
+ if (m_listener.onLoadPortStatusChanged != nullptr && pLpEq != nullptr) {
+ m_listener.onLoadPortStatusChanged(this, pLpEq, status, 0);
+ }
+ };
+ auto fireProcessState = [&](SERVO::CEquipment* pEq, int slotNo, SERVO::PROCESS_STATE st) {
+ // Drive equipment state so listeners receive prev/current states consistently.
+ if (pEq != nullptr) {
+ pEq->fireSetProcessState(slotNo, st);
+ }
+ };
+
+ LOGI("<Master>SIM_EAP single-step=%d", step);
+ switch (step) {
+ // ===== 涓氬姟娴佺▼姝ラ锛�1~23锛�=====
+ case 1: // E87_06 Material Arrived(TransferBlock) -> Port Blocked
+ fireLoadPortStatus(PORT_BLOCKED);
+ break;
+ case 2: // E87_03 CarrierID Readed -> Port InUse
+ fireLoadPortStatus(PORT_INUSE);
+ break;
+ case 3: // S1F3 Query CJ Space (Host->EQ) - wait host
+ LOGI("<Master>SIM_EAP step3: wait host S1F3");
+ break;
+ case 4: // S16F21 Query PJ Space (Host->EQ) - wait host
+ LOGI("<Master>SIM_EAP step4: wait host S16F21");
+ break;
+ case 5: // S7F19 Query PPID List (Host->EQ) - wait host
+ LOGI("<Master>SIM_EAP step5: wait host S7F19");
+ break;
+ case 6: // S3F17 ProceedWithCarrier (Host->EQ) - wait host
+ LOGI("<Master>SIM_EAP step6: wait host S3F17 ProceedWithCarrier");
+ break;
+ case 7: // E87_14 Check SlotMap (璁惧涓婃姤/杩涘叆 WFH) - 鐢� PORT_INUSE 鍐呴儴瑙﹀彂
+ fireLoadPortStatus(PORT_INUSE);
+ break;
+ case 8: // S3F17 ProceedWithSlotMap (Host->EQ) - wait host
+ LOGI("<Master>SIM_EAP step8: wait host S3F17 ProceedWithSlotMap");
+ break;
+ case 9: // SlotMap Verify OK (鏈」鐩湪鏀跺埌 ProceedWithSlotMap 鍚庝笂鎶�) - wait host
+ LOGI("<Master>SIM_EAP step9: wait host ProceedWithSlotMap to trigger VerifyOK");
+ break;
+ case 10: // Create PJ (Host->EQ) - wait host
+ LOGI("<Master>SIM_EAP step10: wait host S16F15 CreateMultiPJ");
+ break;
+ case 11: // PJ Queued锛堟湰椤圭洰鍦ㄥ垱寤� PJ 鍚庝笂鎶ワ級 - wait host
+ LOGI("<Master>SIM_EAP step11: wait host CreateMultiPJ to trigger PJ_Queued");
+ break;
+ case 12: // Create CJ (Host->EQ) - wait host
+ LOGI("<Master>SIM_EAP step12: wait host S14F9 CreateCJ");
+ break;
+ case 13: // CJ Start
+ if (m_listener.onCjStart != nullptr) m_listener.onCjStart(this, &simCj);
+ break;
+ case 14: // PJ Start
+ if (m_listener.onPjStart != nullptr) m_listener.onPjStart(this, &simPj);
+ break;
+ case 15: // OCR
+ if (m_listener.onEqVcrEventReport != nullptr && pLpEq != nullptr) {
+ m_listener.onEqVcrEventReport(this, pLpEq, &simVcr);
+ }
+ break;
+ case 16: // Panel Start
+ if (m_listener.onPanelStart != nullptr) m_listener.onPanelStart(this, &simGlass);
+ // 鍚屾椂瑙﹀彂涓�娆″瓙鏈哄彴寮�濮嬶紙绀轰緥锛欱onder1, slot 1锛�
+ fireProcessState(getEquipment(EQ_ID_Bonder1), 1, SERVO::PROCESS_STATE::Processing);
+ break;
+ case 17: // Panel End
+ // 鍚屾椂瑙﹀彂涓�娆″瓙鏈哄彴缁撴潫锛堢ず渚嬶細Bonder1, slot 1锛�
+ fireProcessState(getEquipment(EQ_ID_Bonder1), 1, SERVO::PROCESS_STATE::Complete);
+ if (m_listener.onPanelEnd != nullptr) m_listener.onPanelEnd(this, &simGlass);
+ break;
+ case 18: // PJ End
+ if (m_listener.onPjEnd != nullptr) m_listener.onPjEnd(this, &simPj);
+ break;
+ case 19: // CJ End
+ if (m_listener.onCjEnd != nullptr) m_listener.onCjEnd(this, &simCj);
+ break;
+ case 20: // Ready to Release (Port Unload Ready; with prev INUSE will also trigger ReadyToRelease)
+ fireLoadPortStatus(PORT_UNLOAD_READY);
+ break;
+ case 21: // CarrierRelease (Host->EQ) - optional / wait host
+ LOGI("<Master>SIM_EAP step21: wait host S3F17 CarrierRelease");
+ break;
+ case 22: // Ready to Unload
+ fireLoadPortStatus(PORT_UNLOAD_READY);
+ break;
+ case 23: // Material Removed (and ReadyToLoad)
+ fireLoadPortStatus(PORT_LOAD_READY);
+ fireLoadPortStatus(PORT_EMPTY); // will also raise LoadPortNotAssoc via Model
+ break;
+ case 24: { // 妯℃嫙 SV Data锛堢ず渚嬶細Bonder1锛�
+ SERVO::CEquipment* pEq = getEquipment(EQ_ID_Bonder1);
+ if (pEq != nullptr && m_listener.onSVDataReport != nullptr) {
+ static int counter = 0;
+ ++counter;
+ std::vector<CParam> params;
+ params.emplace_back("MockSV_Temp", "1", "C", 25 + (counter % 5));
+ params.emplace_back("MockSV_Pressure", "2", "kPa", 100 + (counter % 3));
+ params.emplace_back("MockSV_Speed", "3", "mm/s", 50 + (counter % 7));
+ m_listener.onSVDataReport(this, pEq, params);
+ LOGI("<Master>SIM_EAP step24: mock SVData (Bonder1), params=%zu", params.size());
+ }
+ break;
+ }
+ case 25: { // 妯℃嫙 Process Data锛堢ず渚嬶細Bonder1锛�
+ SERVO::CEquipment* pEq = getEquipment(EQ_ID_Bonder1);
+ if (pEq != nullptr && m_listener.onProcessDataReport != nullptr) {
+ static int counter = 0;
+ ++counter;
+ std::vector<CParam> params;
+ params.emplace_back("MockProc_CycleTime", "1", "s", 30 + (counter % 4));
+ params.emplace_back("MockProc_MaxTemp", "2", "C", 200 + (counter % 6));
+ params.emplace_back("MockProc_Result", "3", "", (counter % 2) ? 1 : 0);
+ m_listener.onProcessDataReport(this, pEq, params);
+ LOGI("<Master>SIM_EAP step25: mock ProcessData (Bonder1), params=%zu", params.size());
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ }
+ }
// 妯℃嫙娴嬭瘯
@@ -2512,7 +2907,40 @@
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];
+ }
+
+ pPort->sendCassetteCtrlCmd(CCC_PROCESS_START, jobExistence, 12, slotProcess, jobCount, nullptr, nullptr);
return 0;
}
@@ -2547,15 +2975,31 @@
}
m_processJobs = temp;
+ // 閲嶇疆鍚勭鍙� DownloadMap锛圚ost/鏈湴鍕鹃�夌殑鏈熸湜鍔犲伐妲戒綅锛�
+ for (int i = 0; i < 4; i++) {
+ auto* pPort = (CLoadPort*)getEquipment(EQ_ID_LOADPORT1 + i);
+ if (pPort != nullptr) {
+ pPort->setDownloadCassetteMap(0);
+ }
+ }
+
// 鏇存柊context
- std::vector<uint8_t> newSlots;
- std::vector<void*> newContexts;
for (auto pj : m_processJobs) {
for (auto& c : pj->carriers()) {
auto pPort = getPortWithCarrierId(c.carrierId);
if (pPort == nullptr) continue;
+ short downloadMap = 0;
+ for (auto s : c.slots) {
+ if (s >= 1 && s <= 8) {
+ downloadMap |= (short)(1 << (s - 1));
+ }
+ }
+ pPort->setDownloadCassetteMap((short)(pPort->getDownloadCassetteMap() | downloadMap));
+
+ std::vector<uint8_t> newSlots;
+ std::vector<void*> newContexts;
for (auto s : c.slots) {
auto pGlass = pPort->getGlassFromSlot(s);
if (pGlass == nullptr) continue;
@@ -2571,6 +3015,9 @@
this->saveState();
+ if (m_listener.onControlJobChanged) {
+ notifyControlJobChanged();
+ }
return (int)m_processJobs.size();
}
@@ -2628,6 +3075,9 @@
}
m_pControlJob->setPJs(temps);
this->saveState();
+ if (m_listener.onControlJobChanged) {
+ notifyControlJobChanged();
+ }
return 0;
@@ -2680,7 +3130,98 @@
bool CMaster::ceidDefined(uint32_t ceid) const
{
- return true;
+ if (m_allowedCeids.empty()) return true; // backward compatible: treat as all allowed when not configured
+ return m_allowedCeids.find(ceid) != m_allowedCeids.end();
+ }
+
+ bool CMaster::raiseSoftAlarm(int alarmId,
+ const std::string& desc,
+ int level/* = -1*/,
+ int deviceId/* = 0*/,
+ int unitId/* = 0*/,
+ const char* deviceName/* = "Software"*/,
+ const char* unitName/* = "App"*/)
+ {
+ AlarmManager& alarmManager = AlarmManager::getInstance();
+ const AlarmInfo* info = alarmManager.getAlarmInfoByID(alarmId);
+
+ int severity = level;
+ if (severity < 0 && info != nullptr) {
+ severity = info->nAlarmLevel;
+ }
+ if (severity < 0) severity = 0; // fallback
+
+ std::string descText = desc;
+ if (descText.empty() && info != nullptr) {
+ descText = !info->strDescription.empty() ? info->strDescription : info->strAlarmText;
+ }
+ if (descText.empty()) {
+ descText = CToolUnits::formatString("Alarm %d", alarmId);
+ }
+
+ AlarmData alarmData;
+ alarmData.nId = alarmId;
+ alarmData.nSeverityLevel = severity;
+ alarmData.nDeviceId = deviceId;
+ alarmData.nUnitId = unitId;
+ alarmData.strDeviceName = deviceName;
+ alarmData.strUnitName = unitName;
+ alarmData.strStartTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
+ alarmData.strEndTime = "";
+ alarmData.strDescription = descText;
+
+ int nAlarmEventId = 0;
+ return alarmManager.addAlarm(alarmData, nAlarmEventId);
+ }
+
+ void CMaster::handleCollectionEvent(uint32_t ceid)
+ {
+ // 閬嶅巻褰撳墠 PJ锛屽懡涓� pauseEvents 鏃跺彲鍦ㄦ鎵╁睍鏆傚仠鍔ㄤ綔
+ bool pausedAny = false;
+ for (auto pj : m_processJobs) {
+ if (pj == nullptr) continue;
+ const auto& pauseList = pj->pauseEvents();
+ if (std::find(pauseList.begin(), pauseList.end(), ceid) != pauseList.end()) {
+ LOGW("<Master>PauseEvent hit: CEID=%u, PJ=%s, state=%d", ceid, pj->id().c_str(), (int)pj->state());
+ if (pj->pause()) {
+ LOGI("<Master>PJ paused by CEID=%u", ceid);
+ pausedAny = true;
+ }
+ if (m_pControlJob != nullptr && m_pControlJob->state() == CJState::Executing) {
+ if (m_pControlJob->pause()) {
+ LOGI("<Master>ControlJob paused by CEID=%u", ceid);
+ pausedAny = true;
+ }
+ }
+ }
+ }
+ if (pausedAny && m_listener.onControlJobChanged) {
+ // 閫氱煡搴旂敤灞傚埛鏂� UI/鎸夐挳鐘舵��
+ notifyControlJobChanged();
+ }
+ if (pausedAny && !m_bPauseAlarmRaised) {
+ std::string desc = CToolUnits::formatString("<PauseEvent CEID=%u>", ceid);
+ bool raised = false;
+ if (m_pModelCtx != nullptr) {
+ raised = m_pModelCtx->raiseSoftAlarm(ALID_SOFTWARE_PAUSE_EVENT, desc);
+ }
+ else {
+ raised = raiseSoftAlarm(ALID_SOFTWARE_PAUSE_EVENT, desc);
+ }
+ if (raised) {
+ LOGI("<Master>PauseEvent soft alarm raised, CEID=%u", ceid);
+ m_bPauseAlarmRaised = true;
+ }
+ }
+ }
+
+ void CMaster::setAllowedCeids(const std::vector<unsigned int>& ceids)
+ {
+ m_allowedCeids.clear();
+ m_allowedCeids.reserve(ceids.size());
+ for (auto id : ceids) {
+ m_allowedCeids.insert(id);
+ }
}
bool CMaster::saveState() const
@@ -2970,6 +3511,9 @@
saveState();
+ if (m_listener.onControlJobChanged) {
+ notifyControlJobChanged();
+ }
return true;
}
@@ -2983,6 +3527,11 @@
item->abort(description);
}
m_pControlJob->abort(description);
+
+ // 鍏堜笂鎶ヤ竴娆＄姸鎬佸彉鍖栵紙渚夸簬 PrJobAbort 瑙﹀彂锛�
+ if (m_listener.onControlJobChanged) {
+ notifyControlJobChanged();
+ }
// 閲婃斁Job鐩稿叧
@@ -3004,6 +3553,9 @@
saveState();
+ if (m_listener.onControlJobChanged) {
+ notifyControlJobChanged();
+ }
return true;
}
@@ -3065,6 +3617,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);
@@ -3141,29 +3702,71 @@
// 1) 娉ㄥ唽鏈哄彴锛堟帹鑽愶細鍏堟敞鍐� id + 鏈哄櫒鍚嶇О锛�
RetentionPolicy defP; defP.mode = RetainMode::ByCount; defP.maxSamples = 200;
- m_pCollector->registryAddMachine(EQ_ID_Bonder1, "Bonder1", defP);
- m_pCollector->registryAddMachine(EQ_ID_Bonder2, "Bonder2", defP);
- m_pCollector->registryAddMachine(EQ_ID_VACUUMBAKE, "鍓嶇儤鐑�", defP);
- m_pCollector->registryAddMachine(EQ_ID_BAKE_COOLING, "鐑樼儰鍐峰嵈", defP);
+ m_pCollector->registryAddMachine(MID_Bonder1, "Bonder1", defP);
+ m_pCollector->registryAddMachine(MID_Bonder2, "Bonder2", defP);
+ m_pCollector->registryAddMachine(MID_VacuumBakeA, "鍓嶇儤-A", defP);
+ m_pCollector->registryAddMachine(MID_VacuumBakeB, "鍓嶇儤-B", defP);
+ m_pCollector->registryAddMachine(MID_BakeCoolingA, "鍚庣儤-A", defP);
+ m_pCollector->registryAddMachine(MID_BakeCoolingB, "鍚庣儤-B", defP);
// 2) 涓洪�氶亾璁剧疆鈥滄洸绾垮悕绉扳��
auto& dataTypes = CServoUtilsTool::getEqDataTypes();
- auto& bonderTypes = dataTypes[EQ_ID_Bonder1];
+ auto& bonderTypes = dataTypes[MID_Bonder1];
for (size_t i = 0; i < bonderTypes.size(); ++i) {
- m_pCollector->buffersSetChannelName(EQ_ID_Bonder1, i + 1, bonderTypes[i].c_str());
- m_pCollector->buffersSetChannelName(EQ_ID_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[EQ_ID_VACUUMBAKE];
+ auto& vacuumbakeTypes = dataTypes[MID_VacuumBakeA];
for (size_t i = 0; i < vacuumbakeTypes.size(); ++i) {
- m_pCollector->buffersSetChannelName(EQ_ID_VACUUMBAKE, 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[EQ_ID_BAKE_COOLING];
+ auto& coolingTypes = dataTypes[MID_BakeCoolingA];
for (size_t i = 0; i < coolingTypes.size(); ++i) {
- m_pCollector->buffersSetChannelName(EQ_ID_VACUUMBAKE, i + 1, coolingTypes[i].c_str());
+ 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);
+ }
}
}
}
+
+ uint32_t CMaster::SlotToMid(int eqid, int slot)
+ {
+ if (eqid == EQ_ID_Bonder1) {
+ return MID_Bonder1;
+ }
+
+ if (eqid == EQ_ID_Bonder2) {
+ return MID_Bonder2;
+ }
+
+ if (eqid == EQ_ID_VACUUMBAKE) {
+ if(slot == 1)
+ return MID_VacuumBakeA;
+ if (slot == 2)
+ return MID_VacuumBakeB;
+ }
+
+ if (eqid == EQ_ID_BAKE_COOLING) {
+ if (slot == 1)
+ return MID_BakeCoolingA;
+ if (slot == 3)
+ return MID_BakeCoolingB;
+ }
+
+ return 0;
+ }
}
--
Gitblit v1.9.3