LAPTOP-SNT8I5JK\Boounion
2025-08-26 b38a5723b06c7a9e5ec350b1942881338453ef75
1.PJStart事件上报功能实现,EAP模拟器接收数据并验证;
已修改9个文件
23 ■■■■■ 文件已修改
Document/Panel Bonder八零联合 SecsTest CheckList_v3.0.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/CMaster.cpp 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/CMaster.h 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/HsmsPassive.cpp 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/HsmsPassive.h 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/Model.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/x64/Debug/CollectionEventList.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/x64/Debug/ReportList.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/x64/Debug/VariableList.txt 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Document/Panel Bonder八零联合 SecsTest CheckList_v3.0.xlsx
Binary files differ
SourceCode/Bond/Servo/CMaster.cpp
@@ -773,6 +773,11 @@
                    auto pj = acquireNextProcessJob();
                    if (pj != nullptr) {
                        m_inProcesJobs.push_back(pj);
                        // 杩欓噷涓婃姤PJ Start浜嬩欢
                        if (m_listener.onPjStart != nullptr) {
                            m_listener.onPjStart(this, pj);
                        }
                    }
                }
                if (m_inProcesJobs.empty()) {
SourceCode/Bond/Servo/CMaster.h
@@ -53,6 +53,7 @@
    typedef std::function<void(void* pMaster, CRobotTask* pTask, int code)> ONROBOTTASKEVENT;
    typedef std::function<void(void* pMaster, CEquipment* pEquipment, short status, __int64 data)> ONLOADPORTSTATUSCHANGED;
    typedef std::function<void(void* pMaster, int round)> ONCTROUNDEND;
    typedef std::function<void(void* pMaster, void* pj)> ONPJSTART;
    typedef struct _MasterListener
    {
        ONMASTERSTATECHANGED    onMasterStateChanged;
@@ -64,6 +65,8 @@
        ONROBOTTASKEVENT        onRobotTaskEvent;
        ONLOADPORTSTATUSCHANGED    onLoadPortStatusChanged;
        ONCTROUNDEND            onCTRoundEnd;
        ONPJSTART               onPjStart;
    } MasterListener;
    class CMaster : public IResourceView
SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -1879,6 +1879,11 @@
    return requestEventReportSend("PJ_Queued");
}
int CHsmsPassive::requestEventReportSend_PJ_Start()
{
    return requestEventReportSend("PJ_Start");
}
SourceCode/Bond/Servo/HsmsPassive.h
@@ -192,6 +192,7 @@
    int requestEventReportSend(const char* pszEventName);
    int requestEventReportSend_CarrierID_Readed();
    int requestEventReportSend_PJ_Queued();
    int requestEventReportSend_PJ_Start();
private:
    void replyAck(int s, int f, unsigned int systemBytes, BYTE ack, const char* pszAckName);
SourceCode/Bond/Servo/Model.cpp
@@ -387,6 +387,10 @@
    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();
    };
    m_master.setListener(masterListener);
    m_master.setContinuousTransferCount(m_configuration.getContinuousTransferCount());
SourceCode/Bond/x64/Debug/CollectionEventList.txt
@@ -39,3 +39,4 @@
40001,E90_SPSM_InProcess_To_ProcessCompleted,,(40000)
50000,CarrierID_Readed,,(50000)
50001,PJ_Queued,,(50001)
50002,PJ_Start,,(50002)
SourceCode/Bond/x64/Debug/ReportList.txt
@@ -17,4 +17,5 @@
40000,(1,10203,20000)
50000,(5000)
50001,(5003)
50002,(5004)
SourceCode/Bond/x64/Debug/VariableList.txt
@@ -37,4 +37,5 @@
5000,CarrierID,A20,鍗″專ID
5001,CJobSpace,U1,CJ Space
5002,PJobSpace,U1,PJ Space
5003,PJQueued,L,PJ Queued
5003,PJQueued,L,PJ Queued
5004,PJStartID,A20,PJStartID