From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/CEquipmentPage1.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipmentPage1.h b/SourceCode/Bond/Servo/CEquipmentPage1.h
index 0938f12..5db7005 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage1.h
+++ b/SourceCode/Bond/Servo/CEquipmentPage1.h
@@ -30,11 +30,12 @@
 	CJobSlotGrid m_ctrlSignalPanel;
 	std::map<int, std::vector<SignalInfo>> m_mapSignalListByID;
 
-	void LoadSignalPanelUI();
 	void LoadSignalListFromCSV(const CString& strFilePath);
 	void InitSignalListForDevice(int nDeviceID);
 	void UpdateSignalState(int nRow, int nCol, bool bNewState);
+	void InitSignalSlotTextAndClickable();
 	void UpdateAllSignalStatesFromDevice();
+	void ResetSignalPanel();
 
 
 // 瀵硅瘽妗嗘暟鎹�
@@ -51,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