From 02a406fb7e3d635dca0ef87914fee54c7fd6bd3c Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 11:36:58 +0800
Subject: [PATCH] 1.DVID的界面操作。新增，编辑，删除等
---
SourceCode/Bond/Servo/Model.cpp | 374 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 292 insertions(+), 82 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 9011afb..f571def 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -9,6 +9,12 @@
#include "TransferManager.h"
#include "RecipeManager.h"
#include "GlassLogDb.h"
+#include "CParam.h"
+#include "CJobDataS.h"
+#include <algorithm>
+#include <iomanip>
+#include <sstream>
+#include <array>
#include <map>
@@ -35,15 +41,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));
}
}
@@ -160,18 +168,6 @@
setControlState(ControlState::OnlineRemote);
}
};
- listener.onEQConstantRequest = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
- // 鍦ㄦ濉厖甯搁噺鍊硷紝鐩墠浠呮槸鍔�1鍚庤繑鍥�
- for (auto& item : eqcs) {
- sprintf_s(item.szValue, EQCONSTANT_VALUE_MAX, "Test%d", item.id + 1);
- }
- };
- listener.onEQConstantSend = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
- // 鍦ㄦ淇濆瓨鍜岃缃満鍣ㄥ父閲忓��
- for (auto& item : eqcs) {
- LOGI("onEQConstantRequest: %d, %s", item.id, item.szValue);
- }
- };
listener.onDatetimeSync = [&](void* pFrom, SYSTEMTIME& time) -> void {
LOGI("onDatetimeSync: %d%02d%02d%02d%02d%02d", time.wYear,
time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond);
@@ -182,6 +178,21 @@
if (ids.empty()) {
m_master.enableEventReport(bEnable);
}
+ };
+ listener.onDeletePPID = [&](void* pFrom, const std::vector<std::string>& ppids) -> bool {
+ (void)pFrom;
+ bool allOk = true;
+ std::vector<std::string> targets = ppids;
+ if (targets.empty()) {
+ // L:0 => delete all PPIDs
+ targets = RecipeManager::getInstance().getAllPPID();
+ }
+ for (auto& ppid : targets) {
+ bool ok = RecipeManager::getInstance().deleteRecipeByPPID(ppid);
+ allOk = allOk && ok;
+ LOGI("<CModel>DeletePPID: %s, result=%s", ppid.c_str(), ok ? "OK" : "FAIL");
+ }
+ return allOk;
};
listener.onEnableDisableAlarmReport = [&](void* pFrom, bool bEnable, unsigned int id) -> void {
LOGI("onEnableDisableAlarmReport bEnable:%s, id:%d", bEnable ? _T("YES") : _T("NO"), id);
@@ -239,9 +250,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 +282,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 {
@@ -284,6 +299,10 @@
CString strVarialbleFile;
strVarialbleFile.Format(_T("%s\\VariableList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
m_hsmsPassive.loadVarialbles((LPTSTR)(LPCTSTR)strVarialbleFile);
+ strVarialbleFile.Format(_T("%s\\DataVariableList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
+ m_hsmsPassive.loadDataVarialbles((LPTSTR)(LPCTSTR)strVarialbleFile);
+ strVarialbleFile.Format(_T("%s\\EquipmentConstantList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
+ m_hsmsPassive.loadEquipmentConstants((LPTSTR)(LPCTSTR)strVarialbleFile);
setControlState(m_currentControlState);
refreshDerivedSVs();
m_hsmsPassive.init(this, "APP", 7000);
@@ -296,6 +315,12 @@
SERVO::MasterListener masterListener;
+ auto formatParamValue = [](const CParam& p) {
+ std::ostringstream oss;
+ oss.setf(std::ios::fixed);
+ oss << std::setprecision(4) << p.getDoubleValue();
+ return oss.str();
+ };
masterListener.onMasterStateChanged = [&](void* pMaster, SERVO::MASTERSTATE state) -> void {
LOGI("<CModel>Master state changed(%d)", (int)state);
notify(RX_CODE_MASTER_STATE_CHANGED);
@@ -374,11 +399,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) {
@@ -476,105 +503,288 @@
notifyPtrAndInt(RX_CODE_EQ_ROBOT_TASK, pTask, nullptr, code);
};
+ masterListener.onJobReceived = [&](void* pMaster, SERVO::CEquipment* pEquipment, int port, SERVO::CJobDataS* pJobDataS) {
+ (void)pMaster;
+ (void)port;
+ if (pEquipment == nullptr || pJobDataS == nullptr) return;
+ const int eqId = pEquipment->getID();
+ const int recipeId = pJobDataS->getMasterRecipe();
+ std::string recipe = RecipeManager::getInstance().getPPIDById(recipeId);
+ if (recipe.empty()) {
+ recipe = std::to_string(recipeId);
+ }
+ const std::string prev = pEquipment->getCurrentRecipe();
+ if (recipe.empty() || recipe == prev) {
+ pEquipment->setCurrentRecipe(recipe);
+ return;
+ }
+ pEquipment->setCurrentRecipe(recipe);
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
+ m_hsmsPassive.setVariableValue("EQPPExecName", recipe.c_str());
+ m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+ const char* recipeVid = nullptr;
+ switch (eqId) {
+ case EQ_ID_Bonder1: recipeVid = "Bonder1CurrentRecipe"; break;
+ case EQ_ID_Bonder2: recipeVid = "Bonder2CurrentRecipe"; break;
+ case EQ_ID_VACUUMBAKE: recipeVid = "VacuumBakeCurrentRecipe"; break;
+ case EQ_ID_BAKE_COOLING: recipeVid = "BakeCoolingCurrentRecipe"; break;
+ case EQ_ID_MEASUREMENT: recipeVid = "MeasurementCurrentRecipe"; break;
+ case EQ_ID_EFEM: recipeVid = "EFEMCurrentRecipe"; break;
+ default: break;
+ }
+ if (recipeVid != nullptr) {
+ m_hsmsPassive.setVariableValue(recipeVid, recipe.c_str());
+ }
+ m_hsmsPassive.requestEventReportSend("RecipeChanged");
+ });
+ };
masterListener.onLoadPortStatusChanged = [&] (void* pMaster, SERVO::CEquipment* pEquipment, short status, __int64 data) {
LOGE("<CModel>onLoadPortStatusChanged. status = %d", status);
static std::map<int, short> s_prevPortStatus;
const int eqId = (pEquipment != nullptr) ? pEquipment->getID() : 0;
const short prevStatus = s_prevPortStatus[eqId];
s_prevPortStatus[eqId] = status;
+ SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
+
+ // Unified PortStateChange event + SV maintenance
+ if (pLoadPort != nullptr) {
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("PortTransferState", (__int64)status); // maintain SVID=100
+ m_hsmsPassive.setVariableValue("PortStateChangePortId", pLoadPort->getID());
+ m_hsmsPassive.setVariableValue("PortState", (__int64)status);
+ m_hsmsPassive.requestEventReportSend("PortStateChange");
+ });
+ }
+
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());
+ 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.onSVDataReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, const std::vector<CParam>& params) {
+ (void)pMaster;
+ const int eqId = pEquipment ? pEquipment->getID() : 0;
+
+ auto sendSv = [&](const auto& vidMap, const char* evName) {
+ const size_t count = (std::min)(params.size(), vidMap.size());
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
+ for (size_t idx = 0; idx < count; ++idx) {
+ const std::string val = formatParamValue(params[idx]);
+ m_hsmsPassive.setVariableValue(std::to_string(vidMap[idx]).c_str(), val.c_str());
+ }
+ m_hsmsPassive.requestEventReportSend(evName);
+ });
+ };
+
+ if (eqId == EQ_ID_Bonder1 || eqId == EQ_ID_Bonder2) {
+ static constexpr std::array<int, 19> vids = {
+ 6000,6001,6002,6003,6004,6005,6006,6007,6008,6009,
+ 6010,6011,6012,6013,6014,6015,6016,6017,6018
+ };
+ sendSv(vids, "BonderSVData");
}
- m_hsmsPassive.setVariableValue("SubEqpSlot", slotNo);
- if (state == SERVO::PROCESS_STATE::Processing) {
- m_hsmsPassive.requestEventReportSend_SubEqpStart();
+ else if (eqId == EQ_ID_VACUUMBAKE) {
+ static constexpr std::array<int, 18> vids = {
+ 6200,6201,6202,6203,6204,6205,6206,6207,6208,
+ 6209,6210,6211,6212,6213,6214,6215,6216,6217
+ };
+ sendSv(vids, "VacuumBakeSVData");
}
- else if (state == SERVO::PROCESS_STATE::Complete) {
- m_hsmsPassive.requestEventReportSend_SubEqpEnd();
+ else if (eqId == EQ_ID_BAKE_COOLING) {
+ static constexpr std::array<int, 20> vids = {
+ 6400,6401,6402,6403,6404,6405,6406,6407,6408,6409,
+ 6410,6411,6412,6413,6414,6415,6416,6417,6418,6419
+ };
+ sendSv(vids, "BakeCoolingSVData");
+ }
+ else if (eqId == EQ_ID_MEASUREMENT) {
+ static constexpr std::array<int, 2> vids = { 6600, 6601 };
+ sendSv(vids, "MeasurementSVData");
+ }
+ };
+ masterListener.onProcessDataReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, const std::vector<CParam>& params) {
+ (void)pMaster;
+ const int eqId = pEquipment ? pEquipment->getID() : 0;
+
+ auto sendProcess = [&](const auto& vidMap, const char* evName) {
+ const size_t count = (std::min)(params.size(), vidMap.size());
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
+ for (size_t idx = 0; idx < count; ++idx) {
+ const std::string val = formatParamValue(params[idx]);
+ m_hsmsPassive.setVariableValue(std::to_string(vidMap[idx]).c_str(), val.c_str());
+ }
+ m_hsmsPassive.requestEventReportSend(evName);
+ });
+ };
+
+ if (eqId == EQ_ID_Bonder1 || eqId == EQ_ID_Bonder2) {
+ static constexpr std::array<int, 22> vids = {
+ 6100,6101,6102,6103,6104,6105,6106,6107,6108,6109,6110,
+ 6111,6112,6113,6114,6115,6116,6117,6118,6119,6120,6121
+ };
+ sendProcess(vids, "BonderProcessData");
+ }
+ else if (eqId == EQ_ID_VACUUMBAKE) {
+ static constexpr std::array<int, 5> vids = { 6300,6301,6302,6303,6304 };
+ sendProcess(vids, "VacuumBakeProcessData");
+ }
+ else if (eqId == EQ_ID_BAKE_COOLING) {
+ static constexpr std::array<int, 4> vids = { 6500,6501,6502,6503 };
+ sendProcess(vids, "BakeCoolingProcessData");
+ }
+ else if (eqId == EQ_ID_MEASUREMENT) {
+ static constexpr std::array<int, 4> vids = { 6700,6701,6702,6703 };
+ sendProcess(vids, "MeasurementProcessData");
}
};
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