From 592f34bbed79c54aa7b3b323e93534678c5a1cea Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期二, 26 十一月 2024 18:31:13 +0800
Subject: [PATCH] 1.使用writeWord已经可以写入PLC

---
 SourceCode/Bond/BondEq/View/AxisSettingsDlg.h |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index 5db1535..971ee59 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -6,6 +6,18 @@
 
 // CAxisSettingsDlg 瀵硅瘽妗�
 
+enum class AxisOperationType {
+	OPR = 0,    // 鍥炲師鐐�
+	JOG_ADD,    // 姝e悜鐐瑰姩
+	JOG_SUB,    // 鍙嶅悜鐐瑰姩
+	STOP,		// 鍋滄鎿嶄綔
+	POSITION_1, // 瀹氫綅鐐�1
+	POSITION_2, // 瀹氫綅鐐�2
+	POSITION_3, // 瀹氫綅鐐�3
+	POSITION_4, // 瀹氫綅鐐�4
+	POSITION_5  // 瀹氫綅鐐�5
+};
+
 class CAxisSettingsDlg : public CDialogEx
 {
 	DECLARE_DYNAMIC(CAxisSettingsDlg)
@@ -34,10 +46,14 @@
 	void updatePageButtonStates();
 	int getCurrentSelectedAxisID();
 	void initializeAxisIDCombo();
-	void refreshAxisDetails();
-	void refreshPositionDetails(int pageNumber);
+	void refreshAxisDetails(int nAxisId);
+	void refreshPositionDetails(int nAxisId, int pageNumber);
 	void updateAxisSelection(int offset);
-	void updateDataFromUI();
+	void updateDataFromUI(int nAxisId);
+	void switchToPage(int targetPage);
+	void writeAxisDataToPLC(int nAxisId);
+	void handleAxisOperation(AxisOperationType eOpType, bool bPressed);
+
 
 private:
 	CPLC* m_pPLC;
@@ -45,10 +61,14 @@
 	int m_nInitialHeight;
 
 	// 褰撳墠閫変腑鐨勫畾浣嶉〉闈㈢储寮�
-	int m_currentPage; 
+	int m_currentPage;
 
 	// 閰嶆柟鍚嶇О
 	CString m_strRecipeName;
+
+	// 鎸変笅鏍囪瘑
+	BOOL m_bJogAddPressed;
+	BOOL m_bJogSubPressed;
 
 	// 鎺т欢
 	CBLLabel m_staticFLS, m_staticDOG, m_staticRLS, m_staticReady, m_staticBusy, m_staticErr;
@@ -79,11 +99,15 @@
 	afx_msg void OnBnClickedButtonAxisAnchorPoint4();
 	afx_msg void OnBnClickedButtonAxisAnchorPoint5();
 	afx_msg void OnBnClickedButtonAxisTestOpr();
-	afx_msg void OnBnClickedButtonAxisTestJogAdd();
-	afx_msg void OnBnClickedButtonAxisTestJogSub();
 	afx_msg void OnBnClickedButtonAxisTestStop();
+	afx_msg void OnBnClickedJogAddDown();
+	afx_msg void OnBnClickedJogAddUp();
+	afx_msg void OnBnClickedJogSubDown();
+	afx_msg void OnBnClickedJogSubUp();
 	afx_msg void OnSelchangeComboAxisName();
 	afx_msg void OnBnClickedButtonAxisSave();
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
+	//afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
+	//afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
 	DECLARE_MESSAGE_MAP()
 };

--
Gitblit v1.9.3