From 6b306b81f8a07c3e36676a0a5c305b3b1ea68c60 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 09 一月 2026 15:33:05 +0800
Subject: [PATCH] 1.实现S1F23_QueryAllCEID和S1F11_QueryAllSVID
---
SourceCode/Bond/Servo/Model.cpp | 210 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 138 insertions(+), 72 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 9011afb..ad932b1 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -35,15 +35,17 @@
{
const auto prev = m_currentControlState;
if (newState != m_currentControlState) {
- m_hsmsPassive.setVariableValue("PreviousControlState", (__int64)static_cast<uint8_t>(prev));
m_currentControlState = newState;
- }
-
- // Always keep SV in sync (even if state didn't change or variables were just loaded).
- m_hsmsPassive.setVariableValue("CurrentControlState", (__int64)static_cast<uint8_t>(m_currentControlState));
-
- if (newState != prev) {
+ // 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));
}
}
@@ -239,9 +241,11 @@
return CAACK_5;
}
- m_hsmsPassive.setVariableValue("SlotMapScan", pLoadPort->getScanCassetteMap());
- m_hsmsPassive.setVariableValue("SlotMapDownload", pLoadPort->getDownloadCassetteMap());
- m_hsmsPassive.requestEventReportSend_SlotMapVerificationOK();
+ 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);
@@ -269,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 {
@@ -374,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) {
@@ -484,97 +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());
- 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.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();
+ 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);
- if (pLoadPort != nullptr) {
- m_hsmsPassive.setVariableValue("LoadPortNotAssocPortId", pLoadPort->getID());
- }
- m_hsmsPassive.requestEventReportSend_LoadPortNotAssoc();
+ 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 state) {
- // SubEqpStart/SubEqpEnd: align to log's EV_SubEqpStart/EV_SubEqpEnd stage (no report payload required).
+ masterListener.onProcessStateChanged = [&](void* pMaster, SERVO::CEquipment* pEquipment, int slotNo, SERVO::PROCESS_STATE prevState, SERVO::PROCESS_STATE state) {
(void)pMaster;
- if (pEquipment != nullptr) {
- m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
- }
- m_hsmsPassive.setVariableValue("SubEqpSlot", slotNo);
- if (state == SERVO::PROCESS_STATE::Processing) {
- m_hsmsPassive.requestEventReportSend_SubEqpStart();
- }
- else if (state == SERVO::PROCESS_STATE::Complete) {
- m_hsmsPassive.requestEventReportSend_SubEqpEnd();
- }
+ 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();
- // 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();
+ 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