From 84925ada39fdef3f5bd7266005010103897713a6 Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期五, 11 七月 2025 17:49:15 +0800 Subject: [PATCH] 1.EAP模拟器,启用或禁用警告上报功能实现和模拟测试; 2.Master端,收到EAP的启用或警告消息上报消息后,保存相关配置,如后续机器发生警告,根据配置决定是否上报警告消息; --- SourceCode/Bond/Servo/CEquipmentPage1.h | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/Servo/CEquipmentPage1.h b/SourceCode/Bond/Servo/CEquipmentPage1.h index 34106f1..5db7005 100644 --- a/SourceCode/Bond/Servo/CEquipmentPage1.h +++ b/SourceCode/Bond/Servo/CEquipmentPage1.h @@ -24,12 +24,18 @@ void setEquipment(SERVO::CEquipment* pEquipment); private: + int m_nCurrentDeviceID; SERVO::CEquipment* m_pEquipment; std::vector<SignalInfo> m_vSignalList; CJobSlotGrid m_ctrlSignalPanel; + std::map<int, std::vector<SignalInfo>> m_mapSignalListByID; - void InitSignalList(); - void LoadDeviceSignals(); + void LoadSignalListFromCSV(const CString& strFilePath); + void InitSignalListForDevice(int nDeviceID); + void UpdateSignalState(int nRow, int nCol, bool bNewState); + void InitSignalSlotTextAndClickable(); + void UpdateAllSignalStatesFromDevice(); + void ResetSignalPanel(); // 瀵硅瘽妗嗘暟鎹� @@ -46,4 +52,5 @@ afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor); afx_msg void OnDestroy(); afx_msg void OnSize(UINT nType, int cx, int cy); + afx_msg void OnTimer(UINT_PTR nIDEvent); }; -- Gitblit v1.9.3