From d14420e7f85b5fe7289aafe6bef0c053dede3657 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 16 一月 2026 11:20:39 +0800
Subject: [PATCH] 1.修复以下问题： CEID 校验恒通过：ceidDefined 返回 true，PauseEvent ID 不做有效性检查。Host 若下发无效 CEID，将被接受但运行时无法触发暂停，风险难以察觉。 建议的上线前防护 / 改进（无需真机也可先改） 2.软件侧警告id上抛；
---
SourceCode/Bond/Servo/Model.cpp | 259 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 226 insertions(+), 33 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index e86862d..61f3a80 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -10,8 +10,11 @@
#include "RecipeManager.h"
#include "GlassLogDb.h"
#include "CParam.h"
+#include "CJobDataS.h"
#include <algorithm>
#include <iomanip>
+#include <sstream>
+#include <array>
#include <map>
@@ -32,6 +35,79 @@
// PJobSpace: how many ProcessJobs can be created (current implementation supports 0/1).
m_hsmsPassive.setVariableValue("PJobSpace", (__int64)(m_master.isProcessJobsEmpty() ? 1 : 0));
+}
+
+void CModel::notifyControlJobChanged()
+{
+ // 1) 鍒锋柊娲剧敓 SV
+ refreshDerivedSVs();
+ // 2) 閫氱煡涓婂眰 UI锛圧X_CODE_CONTROLJOB_CHANGED锛�
+ notify(RX_CODE_CONTROLJOB_CHANGED);
+}
+
+bool CModel::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;
+
+ 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;
+ // 鑻ユ湭鏄惧紡鎻愪緵璁惧/鍗曞厓鍚嶇О锛屽皾璇曢�氳繃 deviceId/unitId 瑙ｆ瀽锛坰oft alarm 榛樿鍧囦负 0锛�
+ if (alarmData.strDeviceName.empty()) {
+ alarmData.strDeviceName = alarmManager.getDeviceNameById(deviceId);
+ }
+ if (alarmData.strUnitName.empty()) {
+ alarmData.strUnitName = alarmManager.getUnitNameById(deviceId, unitId);
+ }
+ alarmData.strStartTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
+ alarmData.strEndTime = "";
+ alarmData.strDescription = descText;
+
+ int nAlarmEventId = 0;
+ bool result = alarmManager.addAlarm(alarmData, nAlarmEventId);
+ if (result) {
+ notify(RX_CODE_ALARM_SET);
+ if (m_master.isAlarmReportEnable()) {
+ m_hsmsPassive.requestAlarmReport(1, alarmId, descText.c_str());
+ }
+ }
+ return result;
+}
+
+void CModel::clearSoftAlarm(int alarmId, int deviceId, int unitId)
+{
+ AlarmManager& alarmManager = AlarmManager::getInstance();
+ alarmManager.clearAlarmByAttributes(alarmId, deviceId, unitId, CToolUnits::getCurrentTimeString());
+ notify(RX_CODE_ALARM_CLEAR);
+ if (m_master.isAlarmReportEnable()) {
+ const AlarmInfo* info = alarmManager.getAlarmInfoByID(alarmId);
+ std::string descText;
+ if (info != nullptr) descText = info->strAlarmText;
+ m_hsmsPassive.requestAlarmReport(0, alarmId, descText.c_str());
+ }
}
void CModel::setControlState(ControlState newState)
@@ -122,6 +198,9 @@
// CGlassPool
m_glassPool.initPool();
+ // 灏� Model 涓婁笅鏂囦紶閫掔粰 Master锛屼究浜� Master 瑙﹀彂杞欢绾ф姤璀︾瓑璺ㄥ眰鎿嶄綔
+ m_master.setModelCtx(this);
+
// Log
CString strLogDir;
@@ -165,18 +244,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);
@@ -187,6 +254,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);
@@ -227,6 +309,11 @@
// 鐪熸鐨勨�滃紑濮嬧�濈敱 ProceedWithSlotMap 鍐崇瓥瑙﹀彂銆�
// 浠呭綋鏈紑鍚� CompareMapsBeforeProceeding 鏃讹紝鎵嶆部鐢ㄦ棫閫昏緫鐩存帴 Start銆�
LOGI("<CModel>ProceedWithCarrier");
+ if (m_master.getControlJob() == nullptr || m_master.isProcessJobsEmpty()) {
+ strErrorTxt = "rejected - ControlJob/ProcessJob not ready";
+ LOGW("<CModel>ProceedWithCarrier rejected: no CJ/PJ, port=%d", portIndex + 1);
+ return CAACK_5;
+ }
if (pLoadPort == nullptr || !pLoadPort->isCompareMapsBeforeProceeding()) {
m_master.proceedWithCarrier(portIndex);
}
@@ -293,6 +380,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);
@@ -300,18 +391,33 @@
m_hsmsPassive.loadReports((LPTSTR)(LPCTSTR)strVarialbleFile);
strVarialbleFile.Format(_T("%s\\CollectionEventList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
m_hsmsPassive.loadCollectionEvents((LPTSTR)(LPCTSTR)strVarialbleFile);
+ {
+ auto events = m_hsmsPassive.getCollectionEvents();
+ std::vector<unsigned int> ceids;
+ ceids.reserve(events.size());
+ for (auto e : events) {
+ if (e != nullptr) ceids.push_back(e->getEventId());
+ }
+ m_master.setAllowedCeids(ceids);
+ }
strVarialbleFile.Format(_T("%s\\HsmsPassive.cache"), (LPTSTR)(LPCTSTR)m_strWorkDir);
m_hsmsPassive.loadCacheFromFile(strVarialbleFile);
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);
};
masterListener.onControlJobChanged = [this](void* pMaster) {
(void)pMaster;
- this->refreshDerivedSVs();
+ this->notifyControlJobChanged();
};
masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
LOGI("<CModel>Equipment onAlive:%s(%s).", pEquipment->getName().c_str(),
@@ -487,6 +593,42 @@
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;
@@ -611,32 +753,83 @@
}
});
};
+ 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");
+ }
+ 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 (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;
- if (eqId != EQ_ID_Bonder1 && eqId != EQ_ID_Bonder2) return;
- auto formatVal = [](const CParam& p) {
- std::ostringstream oss;
- oss.setf(std::ios::fixed);
- oss << std::setprecision(4) << p.getDoubleValue();
- return oss.str();
+ 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);
+ });
};
- static const int vidMap[] = {
- 6100,6101,6102,6103,6104,6105,6106,6107,6108,6109,6110,
- 6111,6112,6113,6114,6115,6116,6117,6118,6119,6120,6121
- };
- const size_t count = (std::min)(params.size(), sizeof(vidMap) / sizeof(vidMap[0]));
- m_hsmsPassive.withVariableLock([&] {
- m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
- for (size_t idx = 0; idx < count; ++idx) {
- auto& p = params[idx];
- std::string val = formatVal(p);
- m_hsmsPassive.setVariableValue(std::to_string(vidMap[idx]).c_str(), val.c_str());
- }
- m_hsmsPassive.requestEventReportSend("BonderProcessData");
- });
+ 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);
--
Gitblit v1.9.3