From fe5a3541c8337576eed1f64dce3bd56f74a3b26b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 29 八月 2025 15:52:55 +0800
Subject: [PATCH] 1.PortBlocked事件上报，EAP模拟接收数据验证；
---
SourceCode/Bond/x64/Debug/CollectionEventList.txt | 2 ++
SourceCode/Bond/Servo/Model.cpp | 16 +++++++++++++++-
SourceCode/Bond/x64/Debug/ReportList.txt | 2 ++
SourceCode/Bond/x64/Debug/VariableList.txt | 4 +++-
Document/Panel Bonder八零联合 SecsTest CheckList_v3.0.xlsx | 0
5 files changed, 22 insertions(+), 2 deletions(-)
diff --git "a/Document/Panel Bonder\345\205\253\351\233\266\350\201\224\345\220\210 SecsTest CheckList_v3.0.xlsx" "b/Document/Panel Bonder\345\205\253\351\233\266\350\201\224\345\220\210 SecsTest CheckList_v3.0.xlsx"
index fd7688e..4c7dee0 100644
--- "a/Document/Panel Bonder\345\205\253\351\233\266\350\201\224\345\220\210 SecsTest CheckList_v3.0.xlsx"
+++ "b/Document/Panel Bonder\345\205\253\351\233\266\350\201\224\345\220\210 SecsTest CheckList_v3.0.xlsx"
Binary files differ
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 357ca57..d7fa9d9 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -382,10 +382,24 @@
}
m_hsmsPassive.requestEventReportSend_CarrierID_Readed();
}
+ else if (status == PORT_BLOCKED) {
+ SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
+ if (pLoadPort != nullptr) {
+ m_hsmsPassive.setVariableValue("BlockedPortId", pLoadPort->getID());
+ }
+ m_hsmsPassive.requestEventReportSend_Port_Blocked();
+ }
+ else if (status == PORT_LOAD_READY) {
+ SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
+ if (pLoadPort != nullptr) {
+ m_hsmsPassive.setVariableValue("LoadReadyPortId", pLoadPort->getID());
+ }
+ m_hsmsPassive.requestEventReportSend_Port_Load_Ready();
+ }
else if (status == PORT_UNLOAD_READY) {
SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
if (pLoadPort != nullptr) {
- m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
+ m_hsmsPassive.setVariableValue("UnloadReadyPortId", pLoadPort->getID());
}
m_hsmsPassive.requestEventReportSend_Port_Unload_Ready();
}
diff --git a/SourceCode/Bond/x64/Debug/CollectionEventList.txt b/SourceCode/Bond/x64/Debug/CollectionEventList.txt
index 79b0885..f955838 100644
--- a/SourceCode/Bond/x64/Debug/CollectionEventList.txt
+++ b/SourceCode/Bond/x64/Debug/CollectionEventList.txt
@@ -46,4 +46,6 @@
50006,CJ_Start,,(50006)
50007,CJ_End,,(50007)
50008,Port_Unload_Ready,,(50008)
+50009,Port_Load_Ready,,(50009)
+50010,Port_Blocked,,(50010)
diff --git a/SourceCode/Bond/x64/Debug/ReportList.txt b/SourceCode/Bond/x64/Debug/ReportList.txt
index c7afc77..ceadc9c 100644
--- a/SourceCode/Bond/x64/Debug/ReportList.txt
+++ b/SourceCode/Bond/x64/Debug/ReportList.txt
@@ -24,5 +24,7 @@
50006,(5008)
50007,(5009)
50008,(5010)
+50009,(5011)
+50010,(5012)
diff --git a/SourceCode/Bond/x64/Debug/VariableList.txt b/SourceCode/Bond/x64/Debug/VariableList.txt
index 7e921d8..659b40e 100644
--- a/SourceCode/Bond/x64/Debug/VariableList.txt
+++ b/SourceCode/Bond/x64/Debug/VariableList.txt
@@ -44,4 +44,6 @@
5007,PanelEndID,A20,PanelEndID
5008,CJStartID,A20,CJStartID
5009,CJEndID,A20,CJEndID
-5010,PortId,U2,"Port ID"
\ No newline at end of file
+5010,UnloadReadyPortId,U2,"Port ID"
+5011,LoadReadyPortId,U2,"Port ID"
+5012,BlockedPortId,U2,"Port ID"
\ No newline at end of file
--
Gitblit v1.9.3