From 9c9100b078e9ac4ee7ed61500b4d7c7a74207549 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 08 一月 2026 10:32:44 +0800
Subject: [PATCH] 1.继续完善模拟测试等
---
SourceCode/Bond/Servo/Model.cpp | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 5857dca..bbff0f7 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -26,6 +26,9 @@
{
// CJobSpace: how many ControlJobs can be created (current implementation supports 0/1).
m_hsmsPassive.setVariableValue("CJobSpace", (__int64)(m_master.canCreateControlJob() ? 1 : 0));
+
+ // PJobSpace: how many ProcessJobs can be created (current implementation supports 0/1).
+ m_hsmsPassive.setVariableValue("PJobSpace", (__int64)(m_master.isProcessJobsEmpty() ? 1 : 0));
}
IObservable* CModel::getObservable()
@@ -181,11 +184,13 @@
const unsigned int portIndex = PTN - 1;
SERVO::CLoadPort* pLoadPort = (SERVO::CLoadPort*)m_master.getEquipment(EQ_ID_LOADPORT1 + portIndex);
+ LOGI("<Model>onCarrierAction %d, %s, %d, %d", DATAID, pszCarrierAction, pszCarrierId, PTN);
if (_strcmpi(pszCarrierAction, "ProceedWithCarrier") == 0) {
// 鏂囨。娴佺▼锛歅roceedWithCarrier 涔嬪悗璁惧杩涘叆 Check SlotMap锛圵FH锛夛紝
// 鐪熸鐨勨�滃紑濮嬧�濈敱 ProceedWithSlotMap 鍐崇瓥瑙﹀彂銆�
// 浠呭綋鏈紑鍚� CompareMapsBeforeProceeding 鏃讹紝鎵嶆部鐢ㄦ棫閫昏緫鐩存帴 Start銆�
+ LOGI("<CModel>ProceedWithCarrier");
if (pLoadPort == nullptr || !pLoadPort->isCompareMapsBeforeProceeding()) {
m_master.proceedWithCarrier(portIndex);
}
@@ -197,6 +202,7 @@
// 褰撳墠 S3F17 瑙ｆ瀽缁撴瀯浠呮敮鎸� {DATAID, CarrierAction, CarrierID, PTN}锛屽皻鏈疄鐜颁笂杩版墿灞曞瓧娈电殑瑙ｆ瀽/鏍￠獙銆�
// 鏈潵鑻ュ鎴风‘璁� SECS-II 缁撴瀯锛岄渶瑕佸湪 CHsmsPassive::replyCarrierAction() 鎵╁睍瑙ｆ瀽骞跺湪姝ゅ钀藉簱/鏍￠獙銆�
// 浠呭湪 CompareMapsBeforeProceeding 鍚敤锛圚ost 妯″紡锛変笅鍏佽姝ゅ姩浣�
+ LOGI("<CModel>ProceedWithSlotMap");
if (pLoadPort == nullptr || !pLoadPort->isCompareMapsBeforeProceeding()) {
strErrorTxt = "rejected - SlotMap check disabled";
return CAACK_5;
@@ -211,13 +217,13 @@
return CAACK_0;
}
else if (_strcmpi(pszCarrierAction, "CarrierRelease") == 0) {
+ LOGI("<CModel>CarrierRelease");
m_master.carrierRelease(portIndex);
return CAACK_0;
}
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) {
--
Gitblit v1.9.3