From 260b16a1debe7dbc33982768a37dfd48ca34b248 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 09 一月 2026 14:27:21 +0800
Subject: [PATCH] 1.EAP模拟器完善
---
SourceCode/Bond/Servo/Model.cpp | 262 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 217 insertions(+), 45 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 310da04..ad932b1 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -22,6 +22,33 @@
{
}
+void CModel::refreshDerivedSVs()
+{
+ // CJobSpace: how many ControlJobs can be created (current implementation supports 0/1).
+ m_hsmsPassive.setVariableValue("CJobSpace", (__int64)(m_master.canCreateControlJob() ? 1 : 0));
+
+ // PJobSpace: how many ProcessJobs can be created (current implementation supports 0/1).
+ m_hsmsPassive.setVariableValue("PJobSpace", (__int64)(m_master.isProcessJobsEmpty() ? 1 : 0));
+}
+
+void CModel::setControlState(ControlState newState)
+{
+ const auto prev = m_currentControlState;
+ if (newState != m_currentControlState) {
+ m_currentControlState = newState;
+ // S6F11 (CEID=600): ControlStateChanged
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("PreviousControlState", (__int64)static_cast<uint8_t>(prev));
+ m_hsmsPassive.setVariableValue("CurrentControlState", (__int64)static_cast<uint8_t>(m_currentControlState));
+ m_hsmsPassive.requestEventReportSend("ControlStateChanged");
+ });
+ notifyInt(RX_CODE_CONTROL_STATE_CHANGED, static_cast<int>(m_currentControlState));
+ } else {
+ // Keep SV in sync even if unchanged/load-time refresh.
+ m_hsmsPassive.setVariableValue("CurrentControlState", (__int64)static_cast<uint8_t>(m_currentControlState));
+ }
+}
+
IObservable* CModel::getObservable()
{
if (m_pObservable == nullptr) {
@@ -108,22 +135,37 @@
SECSListener listener;
- listener.onEQOffLine = [&](void* pFrom) -> void {
+ listener.onEQOffLine = [this](void* pFrom) -> void {
LOGI("杩滅▼璇锋眰OffLine");
+ (void)pFrom;
+ setControlState(ControlState::OfflineHost);
};
- listener.onEQOnLine = [&](void* pFrom) -> void {
+ listener.onEQOnLine = [this](void* pFrom) -> void {
LOGI("杩滅▼璇锋眰OnLine");
+ (void)pFrom;
+ // Customer flow: S1F17 RequestOnline defaults to OnlineRemote.
+ setControlState(ControlState::OnlineRemote);
};
- listener.onCommand = [&](void* pFrom, const char* pszName, std::vector<CommandParameter>& params) -> void {
+ listener.onCommand = [this](void* pFrom, const char* pszName, std::vector<CommandParameter>& params) -> void {
LOGI("onCommand:%s", pszName);
+ (void)pFrom;
for (auto& item : params) {
LOGI("param:%s,%s", item.szName, item.szValue);
+ }
+
+ if (pszName == nullptr) return;
+ // S2F41 GoLocal / GoRemote (RCMD)
+ if (_strcmpi(pszName, "GoLocal") == 0 || _strcmpi(pszName, "LOCAL") == 0 || _strcmpi(pszName, "GoLOCAL") == 0) {
+ setControlState(ControlState::OnlineLocal);
+ }
+ else if (_strcmpi(pszName, "GoRemote") == 0 || _strcmpi(pszName, "REMOTE") == 0 || _strcmpi(pszName, "GoREMOTE") == 0) {
+ setControlState(ControlState::OnlineRemote);
}
};
listener.onEQConstantRequest = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
// 鍦ㄦ濉厖甯搁噺鍊硷紝鐩墠浠呮槸鍔�1鍚庤繑鍥�
for (auto& item : eqcs) {
- sprintf_s(item.szValue, 256, "Test%d", item.id + 1);
+ sprintf_s(item.szValue, EQCONSTANT_VALUE_MAX, "Test%d", item.id + 1);
}
};
listener.onEQConstantSend = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
@@ -173,18 +215,50 @@
return CAACK_3;
}
+ const unsigned int portIndex = PTN - 1;
+ SERVO::CLoadPort* pLoadPort = (SERVO::CLoadPort*)m_master.getEquipment(EQ_ID_LOADPORT1 + portIndex);
+ LOGI("<Model>onCarrierAction %d, %s, %d, %d", DATAID, pszCarrierAction, pszCarrierId, PTN);
+
if (_strcmpi(pszCarrierAction, "ProceedWithCarrier") == 0) {
- m_master.proceedWithCarrier(PTN);
+ // 鏂囨。娴佺▼锛歅roceedWithCarrier 涔嬪悗璁惧杩涘叆 Check SlotMap锛圵FH锛夛紝
+ // 鐪熸鐨勨�滃紑濮嬧�濈敱 ProceedWithSlotMap 鍐崇瓥瑙﹀彂銆�
+ // 浠呭綋鏈紑鍚� CompareMapsBeforeProceeding 鏃讹紝鎵嶆部鐢ㄦ棫閫昏緫鐩存帴 Start銆�
+ LOGI("<CModel>ProceedWithCarrier");
+ if (pLoadPort == nullptr || !pLoadPort->isCompareMapsBeforeProceeding()) {
+ m_master.proceedWithCarrier(portIndex);
+ }
+ return CAACK_0;
+ }
+ else if (_strcmpi(pszCarrierAction, "ProceedWithSlotMap") == 0) {
+ // TODO(Host鍗忓晢):
+ // 鏂囨。涓� ProceedWithSlotMap 鍙兘浼氭惡甯� LotID / PanelIDList / SlotMap 绛夋暟鎹紙鏈�澶�13鐗囷級鐢ㄤ簬鏍煎紡鏍￠獙涓庣粦瀹氥��
+ // 褰撳墠 S3F17 瑙ｆ瀽缁撴瀯浠呮敮鎸� {DATAID, CarrierAction, CarrierID, PTN}锛屽皻鏈疄鐜颁笂杩版墿灞曞瓧娈电殑瑙ｆ瀽/鏍￠獙銆�
+ // 鏈潵鑻ュ鎴风‘璁� SECS-II 缁撴瀯锛岄渶瑕佸湪 CHsmsPassive::replyCarrierAction() 鎵╁睍瑙ｆ瀽骞跺湪姝ゅ钀藉簱/鏍￠獙銆�
+ // 浠呭湪 CompareMapsBeforeProceeding 鍚敤锛圚ost 妯″紡锛変笅鍏佽姝ゅ姩浣�
+ LOGI("<CModel>ProceedWithSlotMap");
+ if (pLoadPort == nullptr || !pLoadPort->isCompareMapsBeforeProceeding()) {
+ strErrorTxt = "rejected - SlotMap check disabled";
+ return CAACK_5;
+ }
+
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("SlotMapScan", pLoadPort->getScanCassetteMap());
+ m_hsmsPassive.setVariableValue("SlotMapDownload", pLoadPort->getDownloadCassetteMap());
+ m_hsmsPassive.requestEventReportSend_SlotMapVerificationOK();
+ });
+
+ // Host 纭 SlotMap 鍚庡啀寮�濮嬪姞宸�/娴佺▼
+ m_master.proceedWithCarrier(portIndex);
return CAACK_0;
}
else if (_strcmpi(pszCarrierAction, "CarrierRelease") == 0) {
- m_master.carrierRelease(PTN);
+ LOGI("<CModel>CarrierRelease");
+ m_master.carrierRelease(portIndex);
return CAACK_0;
}
strErrorTxt = "rejected - invalid state";
return CAACK_5;
- LOGI("<Model>onCarrierAction %d, %s, %d, %d", DATAID, pszCarrierAction, pszCarrierId, PTN);
};
listener.onPRJobMultiCreate = [&](void* pFrom, std::vector<SERVO::CProcessJob*>& pjs) -> int {
for (auto p : pjs) {
@@ -199,8 +273,10 @@
vars.push_back(var);
}
- m_hsmsPassive.setVariableValue("PJQueued", vars);
- m_hsmsPassive.requestEventReportSend_PJ_Queued();
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("PJQueued", vars);
+ m_hsmsPassive.requestEventReportSend_PJ_Queued();
+ });
return nRet;
};
listener.onControlJobCreate = [&](void* pFrom, SERVO::CControlJob& controlJob) -> int {
@@ -214,6 +290,8 @@
CString strVarialbleFile;
strVarialbleFile.Format(_T("%s\\VariableList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
m_hsmsPassive.loadVarialbles((LPTSTR)(LPCTSTR)strVarialbleFile);
+ setControlState(m_currentControlState);
+ refreshDerivedSVs();
m_hsmsPassive.init(this, "APP", 7000);
strVarialbleFile.Format(_T("%s\\ReportList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
m_hsmsPassive.loadReports((LPTSTR)(LPCTSTR)strVarialbleFile);
@@ -228,6 +306,10 @@
LOGI("<CModel>Master state changed(%d)", (int)state);
notify(RX_CODE_MASTER_STATE_CHANGED);
};
+ masterListener.onControlJobChanged = [this](void* pMaster) {
+ (void)pMaster;
+ this->refreshDerivedSVs();
+ };
masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
LOGI("<CModel>Equipment onAlive:%s(%s).", pEquipment->getName().c_str(),
bAlive ? _T("ON") : _T("OFF"));
@@ -298,11 +380,13 @@
masterListener.onEqVcrEventReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, SERVO::CVcrEventReport* pReport) {
LOGE("<CModel>onEqVcrEventReport.");
if (pReport != nullptr) {
- m_hsmsPassive.setVariableValue("VCRPanelID", pReport->getGlassId().c_str());
- int nRet = m_hsmsPassive.requestEventReportSend_OCR_PanelID_Read_OK();
- if (nRet != ER_NOERROR) {
- LOGE("<CModel>requestEventReportSend_OCR_PanelID_Read_OK failed, ret=%d", nRet);
- }
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("VCRPanelID", pReport->getGlassId().c_str());
+ int nRet = m_hsmsPassive.requestEventReportSend_OCR_PanelID_Read_OK();
+ if (nRet != ER_NOERROR) {
+ LOGE("<CModel>requestEventReportSend_OCR_PanelID_Read_OK failed, ret=%d", nRet);
+ }
+ });
}
};
masterListener.onEqDataChanged = [&](void* pMaster, SERVO::CEquipment* pEquipment, int code) {
@@ -408,67 +492,155 @@
s_prevPortStatus[eqId] = status;
if (status == PORT_INUSE) {
SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
- if (pLoadPort != nullptr) {
- m_hsmsPassive.setVariableValue("CarrierID", pLoadPort->getCassetteId().c_str());
- }
- m_hsmsPassive.requestEventReportSend_CarrierID_Readed();
+ m_hsmsPassive.withVariableLock([&] {
+ if (pLoadPort != nullptr) {
+ m_hsmsPassive.setVariableValue("CarrierID", pLoadPort->getCassetteId().c_str());
+ if (prevStatus != PORT_INUSE && pLoadPort->isCompareMapsBeforeProceeding()) {
+ // TODO(Host鍗忓晢):
+ // 鏂囨。涓爣鏄庯細1-Empty锛�3-Exist锛屽洜姝ゆ垜浠彲鑳介渶瑕佸皢uint鐨刴ap杞崲涓簂ist涓婁紶
+ m_hsmsPassive.setVariableValue("SlotMap", pLoadPort->getScanCassetteMap());
+ m_hsmsPassive.requestEventReportSend_CheckSlotMap();
+ }
+ }
+ m_hsmsPassive.requestEventReportSend_CarrierID_Readed();
+ });
}
else if (status == PORT_BLOCKED) {
SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
- if (pLoadPort != nullptr) {
- m_hsmsPassive.setVariableValue("BlockedPortId", pLoadPort->getID());
- }
- m_hsmsPassive.requestEventReportSend_Port_Blocked();
+ m_hsmsPassive.withVariableLock([&] {
+ if (pLoadPort != nullptr) {
+ m_hsmsPassive.setVariableValue("BlockedPortId", pLoadPort->getID());
+ }
+ m_hsmsPassive.requestEventReportSend_Port_Blocked();
+ });
}
else if (status == PORT_LOAD_READY) {
SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
- if (pLoadPort != nullptr) {
- m_hsmsPassive.setVariableValue("LoadReadyPortId", pLoadPort->getID());
- }
- m_hsmsPassive.requestEventReportSend_Port_Load_Ready();
+ m_hsmsPassive.withVariableLock([&] {
+ if (pLoadPort != nullptr) {
+ m_hsmsPassive.setVariableValue("LoadReadyPortId", pLoadPort->getID());
+ }
+ m_hsmsPassive.requestEventReportSend_Port_Load_Ready();
+ });
}
else if (status == PORT_UNLOAD_READY) {
SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
- if (pLoadPort != nullptr) {
- m_hsmsPassive.setVariableValue("UnloadReadyPortId", pLoadPort->getID());
- if (prevStatus == PORT_INUSE) {
- m_hsmsPassive.setVariableValue("ReadyToReleasePortId", pLoadPort->getID());
- m_hsmsPassive.requestEventReportSend_Port_Ready_To_Release();
+ m_hsmsPassive.withVariableLock([&] {
+ if (pLoadPort != nullptr) {
+ m_hsmsPassive.setVariableValue("UnloadReadyPortId", pLoadPort->getID());
+ if (prevStatus == PORT_INUSE) {
+ m_hsmsPassive.setVariableValue("ReadyToReleasePortId", pLoadPort->getID());
+ m_hsmsPassive.requestEventReportSend_Port_Ready_To_Release();
+ }
}
- }
- m_hsmsPassive.requestEventReportSend_Port_Unload_Ready();
+ m_hsmsPassive.requestEventReportSend_Port_Unload_Ready();
+ });
+ }
+ else if (status == PORT_EMPTY) {
+ SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
+ m_hsmsPassive.withVariableLock([&] {
+ if (pLoadPort != nullptr) {
+ m_hsmsPassive.setVariableValue("LoadPortNotAssocPortId", pLoadPort->getID());
+ }
+ m_hsmsPassive.requestEventReportSend_LoadPortNotAssoc();
+ });
}
notifyPtr(RX_CODE_LOADPORT_STATUS_CHANGED, pEquipment);
+ };
+ masterListener.onProcessStateChanged = [&](void* pMaster, SERVO::CEquipment* pEquipment, int slotNo, SERVO::PROCESS_STATE prevState, SERVO::PROCESS_STATE state) {
+ (void)pMaster;
+ const int eqId = pEquipment ? pEquipment->getID() : 0;
+
+ // 淇濇寔鍚屼竴閿佽寖鍥村唴锛氭洿鏂版墍闇� SV 骞朵緷娆′笂鎶ワ紝淇濊瘉 set+send 鍘熷瓙鎬�
+ m_hsmsPassive.withVariableLock([&] {
+ // Timestamp VID (Clock, VID=500) for all related reports.
+ m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
+
+ // Common payload VIDs for SubEqp/Unit
+ if (pEquipment != nullptr) {
+ m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+ }
+ m_hsmsPassive.setVariableValue("SubEqpSlot", slotNo);
+
+ // ProcessStateChanged (equipment-level): update SVs 700/701, then report CEID=700
+ m_hsmsPassive.setVariableValue("PreviousProcessState", (__int64)prevState);
+ m_hsmsPassive.setVariableValue("CurrentProcessState", (__int64)state);
+ m_hsmsPassive.requestEventReportSend("ProcessStateChanged");
+
+ // SubEqp events (per equipment, ignore slot distinction except payload)
+ static std::map<int, SERVO::PROCESS_STATE> s_prevSubEqpState;
+ const auto prevEqState = s_prevSubEqpState[eqId];
+ if (prevEqState != state) {
+ // state change
+ m_hsmsPassive.requestEventReportSend("SubEqpStateChange");
+ }
+ if (state == SERVO::PROCESS_STATE::Processing) {
+ m_hsmsPassive.requestEventReportSend_SubEqpStart();
+ }
+ else if (state == SERVO::PROCESS_STATE::Complete) {
+ m_hsmsPassive.requestEventReportSend_SubEqpEnd();
+ }
+ s_prevSubEqpState[eqId] = state;
+
+ // Unit events (per equipment slot)
+ static std::map<int, std::map<int, SERVO::PROCESS_STATE>> s_prevUnitState;
+ const auto prevUnitState = s_prevUnitState[eqId][slotNo];
+ if (prevUnitState != state) {
+ m_hsmsPassive.requestEventReportSend("UnitStateChange");
+ if (state == SERVO::PROCESS_STATE::Processing) {
+ m_hsmsPassive.requestEventReportSend("UnitStart");
+ }
+ else if (state == SERVO::PROCESS_STATE::Complete) {
+ m_hsmsPassive.requestEventReportSend("UnitEnd");
+ }
+ s_prevUnitState[eqId][slotNo] = state;
+ }
+ });
};
masterListener.onCTRoundEnd = [&](void* pMaster, int round) {
m_configuration.setContinuousTransferCount(round);
};
masterListener.onCjStart = [&](void* pMaster, void* pj) {
- m_hsmsPassive.setVariableValue("CJStartID", ((SERVO::CControlJob*)pj)->id().c_str());
- m_hsmsPassive.requestEventReportSend_CJ_Start();
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("CJStartID", ((SERVO::CControlJob*)pj)->id().c_str());
+ m_hsmsPassive.requestEventReportSend_CJ_Start();
+ });
};
masterListener.onCjEnd = [&](void* pMaster, void* pj) {
- m_hsmsPassive.setVariableValue("CJEndID", ((SERVO::CControlJob*)pj)->id().c_str());
- m_hsmsPassive.requestEventReportSend_CJ_End();
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("CJEndID", ((SERVO::CControlJob*)pj)->id().c_str());
+ m_hsmsPassive.requestEventReportSend_CJ_End();
+ });
// 缁撴壒锛屼繚瀛楥ontrolJob
//
};
masterListener.onPjStart = [&](void* pMaster, void* pj) {
- m_hsmsPassive.setVariableValue("PJStartID", ((SERVO::CProcessJob*)pj)->id().c_str());
- m_hsmsPassive.requestEventReportSend_PJ_Start();
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("PJStartID", ((SERVO::CProcessJob*)pj)->id().c_str());
+ m_hsmsPassive.requestEventReportSend_PJ_Start();
+ });
};
masterListener.onPjEnd = [&](void* pMaster, void* pj) {
- m_hsmsPassive.setVariableValue("PJEndID", ((SERVO::CProcessJob*)pj)->id().c_str());
- m_hsmsPassive.requestEventReportSend_PJ_End();
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("PJEndID", ((SERVO::CProcessJob*)pj)->id().c_str());
+ m_hsmsPassive.requestEventReportSend_PJ_End();
+ });
};
masterListener.onPanelStart = [&](void* pMaster, void* pPanel) {
- m_hsmsPassive.setVariableValue("PanelStartID", ((SERVO::CGlass*)pPanel)->getID().c_str());
- m_hsmsPassive.requestEventReportSend_Panel_Start();
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("PanelStartID", ((SERVO::CGlass*)pPanel)->getID().c_str());
+ m_hsmsPassive.requestEventReportSend_Panel_Start();
+ });
};
masterListener.onPanelEnd = [&](void* pMaster, void* pPanel) {
- m_hsmsPassive.setVariableValue("PanelEndID", ((SERVO::CGlass*)pPanel)->getID().c_str());
- m_hsmsPassive.requestEventReportSend_Panel_End();
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("PanelEndID", ((SERVO::CGlass*)pPanel)->getID().c_str());
+ m_hsmsPassive.requestEventReportSend_Panel_End();
+ // Placeholder payload to match log shape: EV_PROCESS_DATA_REPORT can carry a single A-string (may be empty).
+ m_hsmsPassive.setVariableValue("ProcessDataReportText", "");
+ m_hsmsPassive.requestEventReportSend_ProcessDataReport();
+ });
auto& db = GlassLogDb::Instance();
db.insertFromCGlass((*(SERVO::CGlass*)pPanel));
SERVO::CGlass* pBuddy = ((SERVO::CGlass*)pPanel)->getBuddy();
--
Gitblit v1.9.3