From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/Model.cpp | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 208 insertions(+), 26 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index fb2cf9d..e5afc98 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -37,6 +37,79 @@
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)
{
const auto prev = m_currentControlState;
@@ -111,6 +184,7 @@
int CModel::init()
{
+ const ULONGLONG boot_model_begin = GetTickCount64();
CString strIniFile;
CString strUnitId;
strIniFile.Format(_T("%s\\ServoConfiguration.ini"), (LPTSTR)(LPCTSTR)m_strWorkDir);
@@ -125,6 +199,9 @@
// CGlassPool
m_glassPool.initPool();
+ // 灏� Model 涓婁笅鏂囦紶閫掔粰 Master锛屼究浜� Master 瑙﹀彂杞欢绾ф姤璀︾瓑璺ㄥ眰鎿嶄綔
+ m_master.setModelCtx(this);
+
// Log
CString strLogDir;
@@ -138,6 +215,7 @@
CLog::GetLog()->SetLogsDir(strLogDir);
CLog::GetLog()->SetEquipmentId((LPTSTR)(LPCTSTR)strUnitId);
LOGI("\r\n\r\n~~~ Prog Start! ~~~");
+ LOGI("[BOOT][MODEL] init begin");
SECSListener listener;
@@ -166,18 +244,6 @@
}
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, 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 {
@@ -245,6 +311,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);
}
@@ -262,11 +333,24 @@
return CAACK_5;
}
+ const short scanMap = pLoadPort->getScanCassetteMap();
+ const short downloadMap = pLoadPort->getDownloadCassetteMap();
m_hsmsPassive.withVariableLock([&] {
- m_hsmsPassive.setVariableValue("SlotMapScan", pLoadPort->getScanCassetteMap());
- m_hsmsPassive.setVariableValue("SlotMapDownload", pLoadPort->getDownloadCassetteMap());
- m_hsmsPassive.requestEventReportSend_SlotMapVerificationOK();
+ m_hsmsPassive.setVariableValue("SlotMapScan", scanMap);
+ m_hsmsPassive.setVariableValue("SlotMapDownload", downloadMap);
+ if (scanMap != downloadMap) {
+ m_hsmsPassive.requestEventReportSend_SlotMapVerificationNG();
+ m_hsmsPassive.requestEventReportSend("SlotMapMismatch");
+ }
+ else {
+ m_hsmsPassive.requestEventReportSend_SlotMapVerificationOK();
+ }
});
+
+ if (scanMap != downloadMap) {
+ strErrorTxt = "rejected - SlotMap mismatch";
+ return CAACK_5;
+ }
// Host 纭 SlotMap 鍚庡啀寮�濮嬪姞宸�/娴佺▼
m_master.proceedWithCarrier(portIndex);
@@ -285,6 +369,23 @@
for (auto p : pjs) {
LOGI("<Model>onPRJobMultiCreate %s %s", p->id().c_str(), p->recipeSpec().c_str());
}
+
+ auto rejectAll = [&](uint32_t code, const std::string& msg) -> int {
+ LOGW("<Model>onPRJobMultiCreate rejected: %s", msg.c_str());
+ for (auto p : pjs) {
+ if (p != nullptr) p->addIssue(code, msg);
+ }
+ return -1;
+ };
+
+ // 鍗� PJ 妯″紡锛氬彧鎺ュ彈 1 鏉′笖褰撳墠鏃犲湪鍒� PJ
+ if (pjs.size() != 1) {
+ return rejectAll(1200, "Only 1 ProcessJob supported (single-PJ mode)");
+ }
+ if (!m_master.isProcessJobsEmpty()) {
+ return rejectAll(1201, "ProcessJob exists, cannot create new in single-PJ mode");
+ }
+
int nRet = m_master.setProcessJobs(pjs);
auto processJobs = m_master.getProcessJobs();
std::vector<SERVO::CVariable> vars;
@@ -311,6 +412,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);
@@ -318,8 +423,19 @@
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);
+ LOGI("[BOOT][MODEL] HSMS config loaded, cost=%llu ms",
+ (unsigned long long)(GetTickCount64() - boot_model_begin));
SERVO::MasterListener masterListener;
@@ -335,7 +451,7 @@
};
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(),
@@ -409,9 +525,9 @@
if (pReport != nullptr) {
m_hsmsPassive.withVariableLock([&] {
m_hsmsPassive.setVariableValue("VCRPanelID", pReport->getGlassId().c_str());
- int nRet = m_hsmsPassive.requestEventReportSend_OCR_PanelID_Read_OK();
+ int nRet = m_hsmsPassive.requestEventReportSend_OCR_PanelID_Read(pReport->getVcrResult());
if (nRet != ER_NOERROR) {
- LOGE("<CModel>requestEventReportSend_OCR_PanelID_Read_OK failed, ret=%d", nRet);
+ LOGE("<CModel>requestEventReportSend_OCR_PanelID_Read failed, ret=%d", nRet);
}
});
}
@@ -515,6 +631,27 @@
(void)pMaster;
(void)port;
if (pEquipment == nullptr || pJobDataS == nullptr) return;
+ {
+ const std::string& g1 = pJobDataS->getGlass1Id();
+ const std::string& g2 = pJobDataS->getGlass2Id();
+ std::string glassId;
+ if (!g1.empty() && !g2.empty()) {
+ glassId = g1 + "+" + g2;
+ }
+ else if (!g1.empty()) {
+ glassId = g1;
+ }
+ else {
+ glassId = g2;
+ }
+ const int slotNo = pJobDataS->getTargetSlotNo();
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+ m_hsmsPassive.setVariableValue("SubEqpSlot", slotNo);
+ m_hsmsPassive.setVariableValue("MaterialId", glassId.c_str());
+ m_hsmsPassive.requestEventReportSend("GlassReceivedJob");
+ });
+ }
const int eqId = pEquipment->getID();
const int recipeId = pJobDataS->getMasterRecipe();
std::string recipe = RecipeManager::getInstance().getPPIDById(recipeId);
@@ -547,6 +684,30 @@
m_hsmsPassive.requestEventReportSend("RecipeChanged");
});
};
+ masterListener.onJobSentOut = [&](void* pMaster, SERVO::CEquipment* pEquipment, int port, SERVO::CJobDataS* pJobDataS) {
+ (void)pMaster;
+ (void)port;
+ if (pEquipment == nullptr || pJobDataS == nullptr) return;
+ const std::string& g1 = pJobDataS->getGlass1Id();
+ const std::string& g2 = pJobDataS->getGlass2Id();
+ std::string glassId;
+ if (!g1.empty() && !g2.empty()) {
+ glassId = g1 + "+" + g2;
+ }
+ else if (!g1.empty()) {
+ glassId = g1;
+ }
+ else {
+ glassId = g2;
+ }
+ const int slotNo = pJobDataS->getSourceSlotNo();
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+ m_hsmsPassive.setVariableValue("SubEqpSlot", slotNo);
+ m_hsmsPassive.setVariableValue("MaterialId", glassId.c_str());
+ m_hsmsPassive.requestEventReportSend("GlassSentOutJob");
+ });
+ };
masterListener.onLoadPortStatusChanged = [&] (void* pMaster, SERVO::CEquipment* pEquipment, short status, __int64 data) {
LOGE("<CModel>onLoadPortStatusChanged. status = %d", status);
static std::map<int, short> s_prevPortStatus;
@@ -557,9 +718,15 @@
// Unified PortStateChange event + SV maintenance
if (pLoadPort != nullptr) {
+ const unsigned int portIndex = pLoadPort->getIndex() + 1;
+ char stateVid[64] = {0};
+ char modeVid[64] = {0};
+ sprintf_s(stateVid, "PortTransferState_P%u", portIndex);
+ sprintf_s(modeVid, "AccessMode_P%u", portIndex);
m_hsmsPassive.withVariableLock([&] {
- m_hsmsPassive.setVariableValue("PortTransferState", (__int64)status); // maintain SVID=100
- m_hsmsPassive.setVariableValue("PortStateChangePortId", pLoadPort->getID());
+ m_hsmsPassive.setVariableValue(stateVid, (__int64)status);
+ m_hsmsPassive.setVariableValue(modeVid, (__int64)pLoadPort->getPortMode());
+ m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
m_hsmsPassive.setVariableValue("PortState", (__int64)status);
m_hsmsPassive.requestEventReportSend("PortStateChange");
});
@@ -568,7 +735,10 @@
if (status == PORT_INUSE) {
m_hsmsPassive.withVariableLock([&] {
if (pLoadPort != nullptr) {
- m_hsmsPassive.setVariableValue("CarrierID", pLoadPort->getCassetteId().c_str());
+ const unsigned int portIndex = pLoadPort->getIndex() + 1;
+ char carrierVid[64] = {0};
+ sprintf_s(carrierVid, "CarrierID_P%u", portIndex);
+ m_hsmsPassive.setVariableValue(carrierVid, pLoadPort->getCassetteId().c_str());
if (prevStatus != PORT_INUSE && pLoadPort->isCompareMapsBeforeProceeding()) {
// TODO(Host鍗忓晢):
// 鏂囨。涓爣鏄庯細1-Empty锛�3-Exist锛屽洜姝ゆ垜浠彲鑳介渶瑕佸皢uint鐨刴ap杞崲涓簂ist涓婁紶
@@ -583,7 +753,7 @@
SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
m_hsmsPassive.withVariableLock([&] {
if (pLoadPort != nullptr) {
- m_hsmsPassive.setVariableValue("BlockedPortId", pLoadPort->getID());
+ m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
}
m_hsmsPassive.requestEventReportSend_Port_Blocked();
});
@@ -592,7 +762,7 @@
SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
m_hsmsPassive.withVariableLock([&] {
if (pLoadPort != nullptr) {
- m_hsmsPassive.setVariableValue("LoadReadyPortId", pLoadPort->getID());
+ m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
}
m_hsmsPassive.requestEventReportSend_Port_Load_Ready();
});
@@ -601,9 +771,9 @@
SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
m_hsmsPassive.withVariableLock([&] {
if (pLoadPort != nullptr) {
- m_hsmsPassive.setVariableValue("UnloadReadyPortId", pLoadPort->getID());
+ m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
if (prevStatus == PORT_INUSE) {
- m_hsmsPassive.setVariableValue("ReadyToReleasePortId", pLoadPort->getID());
+ m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
m_hsmsPassive.requestEventReportSend_Port_Ready_To_Release();
}
}
@@ -614,7 +784,7 @@
SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
m_hsmsPassive.withVariableLock([&] {
if (pLoadPort != nullptr) {
- m_hsmsPassive.setVariableValue("LoadPortNotAssocPortId", pLoadPort->getID());
+ m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
}
m_hsmsPassive.requestEventReportSend_LoadPortNotAssoc();
});
@@ -678,6 +848,10 @@
auto sendSv = [&](const auto& vidMap, const char* evName) {
const size_t count = (std::min)(params.size(), vidMap.size());
m_hsmsPassive.withVariableLock([&] {
+ if (pEquipment != nullptr) {
+ m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+ }
+ m_hsmsPassive.setVariableValue("SubEqpSlot", 0);
m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
for (size_t idx = 0; idx < count; ++idx) {
const std::string val = formatParamValue(params[idx]);
@@ -720,6 +894,10 @@
auto sendProcess = [&](const auto& vidMap, const char* evName) {
const size_t count = (std::min)(params.size(), vidMap.size());
m_hsmsPassive.withVariableLock([&] {
+ if (pEquipment != nullptr) {
+ m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+ }
+ m_hsmsPassive.setVariableValue("SubEqpSlot", 0);
m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
for (size_t idx = 0; idx < count; ++idx) {
const std::string val = formatParamValue(params[idx]);
@@ -823,6 +1001,8 @@
char szBuffer[MAX_PATH];
sprintf_s(szBuffer, MAX_PATH, "%s\\AlarmList.csv", (LPTSTR)(LPCTSTR)m_strWorkDir);
alarmManager.readAlarmFile(szBuffer);
+ LOGI("[BOOT][MODEL] Alarm list loaded, cost=%llu ms",
+ (unsigned long long)(GetTickCount64() - boot_model_begin));
// Glass鏁版嵁搴�
@@ -831,6 +1011,8 @@
GlassLogDb::Init(path);
+ LOGI("[BOOT][MODEL] init finished, total cost=%llu ms",
+ (unsigned long long)(GetTickCount64() - boot_model_begin));
return 0;
}
--
Gitblit v1.9.3