From f6a5e27c91e635ad59d2fd45a52d56c085c7d066 Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期二, 26 八月 2025 12:37:22 +0800 Subject: [PATCH] 1.顶部工具条增加按钮"批运行",用于ControlJob模式调度的运行; 2.CMaster增加startBatch,启动批运动模式; 3.CMaster在兼容原单片Glass调试的情况下,增加startBatch调度,开始实现调度功能。 --- 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