From 3e0ceaf4e569ea1f57a14de2f6135d1f1a50d080 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 27 八月 2025 13:47:31 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/Model.cpp | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index a65aa90..b71d072 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -88,7 +88,7 @@
::CreateDirectory(strLogDir, NULL);
CLog::GetLog()->SetOnLogCallback([&](int level, const char* pszMessage) -> void {
notifyTextAndInt(RX_CODE_LOG, pszMessage, level);
- });
+ });
CLog::GetLog()->SetAutoAppendTimeString(TRUE);
CLog::GetLog()->SetOutputTarget(OT_FILE);
CLog::GetLog()->SetLogsDir(strLogDir);
@@ -112,7 +112,7 @@
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, 256, "Test%d", item.id + 1);
}
};
listener.onEQConstantSend = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
@@ -151,8 +151,8 @@
}
return ppids;
};
- listener.onCarrierAction = [&](void* pFrom,
- unsigned int DATAID,
+ listener.onCarrierAction = [&](void* pFrom,
+ unsigned int DATAID,
const char* pszCarrierAction,
const char* pszCarrierId,
unsigned char PTN,
@@ -174,6 +174,28 @@
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) {
+ LOGI("<Model>onPRJobMultiCreate %s %s", p->id().c_str(), p->recipeSpec().c_str());
+ }
+ int nRet = m_master.setProcessJobs(pjs);
+ auto processJobs = m_master.getProcessJobs();
+ std::vector<SERVO::CVariable> vars;
+ for (auto pj : processJobs) {
+ SERVO::CVariable var("", "PRJOBID", "A50", "PRJOBID");
+ var.setValue(pj->id().c_str());
+ vars.push_back(var);
+ }
+
+ m_hsmsPassive.setVariableValue("PJQueued", vars);
+ m_hsmsPassive.requestEventReportSend_PJ_Queued();
+ return nRet;
+ };
+ listener.onControlJobCreate = [&](void* pFrom, SERVO::CControlJob& controlJob) -> int {
+ LOGI("<Model>onControlJobCreate %s %d", controlJob.id().c_str(), controlJob.priority());
+ int nRet = m_master.setControlJob(controlJob);
+ return nRet;
};
m_hsmsPassive.setListener(listener);
m_hsmsPassive.setEquipmentModelType((LPTSTR)(LPCTSTR)strModeType);
@@ -362,7 +384,19 @@
}
notifyPtr(RX_CODE_LOADPORT_STATUS_CHANGED, pEquipment);
};
+ masterListener.onCTRoundEnd = [&](void* pMaster, int round) {
+ m_configuration.setContinuousTransferCount(round);
+ };
+ masterListener.onPjStart = [&](void* pMaster, void* pj) {
+ 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_master.setListener(masterListener);
+ m_master.setContinuousTransferCount(m_configuration.getContinuousTransferCount());
// master 设置缓存文件
@@ -370,6 +404,15 @@
strMasterDataFile.Format(_T("%s\\Master.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);
m_master.setCacheFilepath((LPTSTR)(LPCTSTR)strMasterDataFile);
m_master.setCompareMapsBeforeProceeding(m_configuration.isCompareMapsBeforeProceeding());
+ m_master.setJobMode(m_configuration.isJobMode());
+
+ // 加截Job
+ strMasterDataFile.Format(_T("%s\\MasterState.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);
+ std::string strPath = std::string((LPTSTR)(LPCTSTR)strMasterDataFile);
+ if (!m_master.loadState(strPath)) {
+ LOGE("<Master>加载MasterState.dat文件失败.");
+ }
+
// 加载警告信息
AlarmManager& alarmManager = AlarmManager::getInstance();
--
Gitblit v1.9.3