From 2d6d21b907ce6863f5794aa0d7ee6a7f21f86e20 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 27 八月 2025 11:27:28 +0800
Subject: [PATCH] 1.CJStart事件上报功能实现，EAP模拟器接收数据并验证；
---
SourceCode/Bond/Servo/HsmsPassive.h | 2 ++
SourceCode/Bond/x64/Debug/CollectionEventList.txt | 3 +++
SourceCode/Bond/Servo/HsmsPassive.cpp | 10 ++++++++++
SourceCode/Bond/Servo/CMaster.cpp | 8 ++++++--
SourceCode/Bond/Servo/CMaster.h | 2 ++
SourceCode/Bond/Servo/Model.cpp | 8 ++++++++
SourceCode/Bond/x64/Debug/ReportList.txt | 2 ++
SourceCode/Bond/x64/Debug/VariableList.txt | 4 +++-
Document/Panel Bonder八零联合 SecsTest CheckList_v3.0.xlsx | 0
9 files changed, 36 insertions(+), 3 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 d84d8db..cefb527 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/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 38b6884..e574cd6 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -761,6 +761,10 @@
if (m_pControlJob->state() == CJState::Queued) {
LOGI("<Master>ControlJob已经启动");
m_pControlJob->start();
+
+ if (m_listener.onCjStart != nullptr) {
+ m_listener.onCjStart(this, m_pControlJob);
+ }
}
if (m_pControlJob->state() == CJState::Paused) {
LOGI("<Master>ControlJob已经恢复运行");
@@ -1315,7 +1319,7 @@
if (pGlass == nullptr) {
bOk = TRUE;
slot = m_pActiveRobotTask->getTarSlot();
- LOGI("<CMaster>onPreFethedOutJob, 已校验数据一致性.");
+ LOGI("<CMaster>onPreStoredJob, 已校验数据一致性.");
}
}
@@ -1326,7 +1330,7 @@
if (pGlass == nullptr && m_pActiveRobotTask->getSrcSlot() == port) {
bOk = TRUE;
slot = m_pActiveRobotTask->getSrcSlot();
- LOGI("<CMaster>onPreFethedOutJob, 已校验数据一致性.");
+ LOGI("<CMaster>onPreStoredJob, 已校验数据一致性.");
}
}
}
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 5d09cd9..1e52477 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -65,6 +65,8 @@
ONROBOTTASKEVENT onRobotTaskEvent;
ONLOADPORTSTATUSCHANGED onLoadPortStatusChanged;
ONCTROUNDEND onCTRoundEnd;
+ ONPJSTART onCjStart;
+ ONPJSTART onCjEnd;
ONPJSTART onPjStart;
ONPJSTART onPjEnd;
ONPJSTART onPanelStart;
diff --git a/SourceCode/Bond/Servo/HsmsPassive.cpp b/SourceCode/Bond/Servo/HsmsPassive.cpp
index 8af37bb..29106d2 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.cpp
+++ b/SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -1889,6 +1889,16 @@
return requestEventReportSend("PJ_End");
}
+int CHsmsPassive::requestEventReportSend_CJ_Start()
+{
+ return requestEventReportSend("CJ_Start");
+}
+
+int CHsmsPassive::requestEventReportSend_CJ_End()
+{
+ return requestEventReportSend("CJ_End");
+}
+
int CHsmsPassive::requestEventReportSend_Panel_Start()
{
return requestEventReportSend("Panel_Start");
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 5fd7fbc..dbbee08 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -194,6 +194,8 @@
int requestEventReportSend_PJ_Queued();
int requestEventReportSend_PJ_Start();
int requestEventReportSend_PJ_End();
+ int requestEventReportSend_CJ_Start();
+ int requestEventReportSend_CJ_End();
int requestEventReportSend_Panel_Start();
int requestEventReportSend_Panel_End();
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index fe3f448..736d110 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -387,6 +387,14 @@
masterListener.onCTRoundEnd = [&](void* pMaster, int round) {
m_configuration.setContinuousTransferCount(round);
};
+ masterListener.onCjStart = [&](void* pMaster, void* pj) {
+ m_hsmsPassive.setVariableValue("CJStartID", ((SERVO::CControlJob*)pj)->id().c_str());
+ m_hsmsPassive.requestEventReportSend_CJ_Start();
+ };
+ masterListener.onCjEnd = [&](void* pMaster, void* pj) {
+ m_hsmsPassive.setVariableValue("CJEndID", ((SERVO::CControlJob*)pj)->id().c_str());
+ m_hsmsPassive.requestEventReportSend_CJ_End();
+ };
masterListener.onPjStart = [&](void* pMaster, void* pj) {
m_hsmsPassive.setVariableValue("PJStartID", ((SERVO::CProcessJob*)pj)->id().c_str());
m_hsmsPassive.requestEventReportSend_PJ_Start();
diff --git a/SourceCode/Bond/x64/Debug/CollectionEventList.txt b/SourceCode/Bond/x64/Debug/CollectionEventList.txt
index 70ab593..61f7804 100644
--- a/SourceCode/Bond/x64/Debug/CollectionEventList.txt
+++ b/SourceCode/Bond/x64/Debug/CollectionEventList.txt
@@ -43,3 +43,6 @@
50003,PJ_End,,(50003)
50004,Panel_Start,,(50004)
50005,Panel_End,,(50005)
+50006,CJ_Start,,(50006)
+50007,CJ_End,,(50007)
+
diff --git a/SourceCode/Bond/x64/Debug/ReportList.txt b/SourceCode/Bond/x64/Debug/ReportList.txt
index b07803b..2353520 100644
--- a/SourceCode/Bond/x64/Debug/ReportList.txt
+++ b/SourceCode/Bond/x64/Debug/ReportList.txt
@@ -21,5 +21,7 @@
50003,(5005)
50004,(5006)
50005,(5007)
+50006,(5008)
+50007,(5009)
diff --git a/SourceCode/Bond/x64/Debug/VariableList.txt b/SourceCode/Bond/x64/Debug/VariableList.txt
index 917d572..81dedc8 100644
--- a/SourceCode/Bond/x64/Debug/VariableList.txt
+++ b/SourceCode/Bond/x64/Debug/VariableList.txt
@@ -41,4 +41,6 @@
5004,PJStartID,A20,PJStartID
5005,PJEndID,A20,PJEndID
5006,PanelStartID,A20,PanelStartID
-5007,PanelEndID,A20,PanelEndID
\ No newline at end of file
+5007,PanelEndID,A20,PanelEndID
+5008,CJStartID,A20,CJStartID
+5009,CJEndID,A20,CJEndID
\ No newline at end of file
--
Gitblit v1.9.3