From 7e0e199c4adc819b5784f689de98b8569025ed53 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 07 一月 2026 16:05:30 +0800
Subject: [PATCH] 1.实现 CJobSpace的管理的维护；
---
SourceCode/Bond/Servo/Model.cpp | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 2ead821..5857dca 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -22,6 +22,12 @@
{
}
+void CModel::refreshDerivedSVs()
+{
+ // CJobSpace: how many ControlJobs can be created (current implementation supports 0/1).
+ m_hsmsPassive.setVariableValue("CJobSpace", (__int64)(m_master.canCreateControlJob() ? 1 : 0));
+}
+
IObservable* CModel::getObservable()
{
if (m_pObservable == nullptr) {
@@ -123,7 +129,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, EQCONSTANT_VALUE_MAX, "Test%d", item.id + 1);
}
};
listener.onEQConstantSend = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
@@ -241,6 +247,7 @@
CString strVarialbleFile;
strVarialbleFile.Format(_T("%s\\VariableList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
m_hsmsPassive.loadVarialbles((LPTSTR)(LPCTSTR)strVarialbleFile);
+ refreshDerivedSVs();
m_hsmsPassive.init(this, "APP", 7000);
strVarialbleFile.Format(_T("%s\\ReportList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
m_hsmsPassive.loadReports((LPTSTR)(LPCTSTR)strVarialbleFile);
@@ -255,6 +262,10 @@
LOGI("<CModel>Master state changed(%d)", (int)state);
notify(RX_CODE_MASTER_STATE_CHANGED);
};
+ masterListener.onControlJobChanged = [this](void* pMaster) {
+ (void)pMaster;
+ this->refreshDerivedSVs();
+ };
masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
LOGI("<CModel>Equipment onAlive:%s(%s).", pEquipment->getName().c_str(),
bAlive ? _T("ON") : _T("OFF"));
@@ -480,6 +491,20 @@
}
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).
+ (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();
+ }
+ };
masterListener.onCTRoundEnd = [&](void* pMaster, int round) {
m_configuration.setContinuousTransferCount(round);
};
@@ -509,6 +534,9 @@
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();
auto& db = GlassLogDb::Instance();
db.insertFromCGlass((*(SERVO::CGlass*)pPanel));
SERVO::CGlass* pBuddy = ((SERVO::CGlass*)pPanel)->getBuddy();
--
Gitblit v1.9.3