From b67e16869a5bfbbde3896a4e5a13f1301f1b978d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 13 十二月 2024 14:55:55 +0800
Subject: [PATCH] 1.调整保存警告到数据库的位置； 2.CAlarmMonitor组件不再保存已完成的警告的数据；

---
 SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp |  911 ++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 736 insertions(+), 175 deletions(-)

diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index dcdc219..d8add62 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
@@ -5,14 +5,19 @@
 #include "BondEq.h"
 #include "afxdialogex.h"
 #include "AxisSettingsDlg.h"
+#include "AxisDetailSettingsDlg.h"
 #include "ToolUnits.h"
 #include <cctype>
 #include <algorithm>
 
-#define TIMER_INIT				1
-#define TIMER_READ_PLC_DATA		2
-#define TIMER_JOG_ADD           3
-#define TIMER_JOG_SUB           4
+#define COLOR_GREEN_ON    RGB(0, 255, 0)  // 姝ｅ父鐘舵�佺豢鑹�
+#define COLOR_GREEN_OFF   RGB(0, 180, 0)  // 鍋忕豢鐘舵��
+#define COLOR_RED         RGB(255, 0, 0)  // 閿欒鐘舵�佺孩鑹�
+
+#define TIMER_INIT					1
+#define TIMER_READ_PLC_DATA			2
+
+#define ID_MSG_UPDATA_DATA_TO_UI	WM_USER + 101
 
 // CAxisSettingsDlg 瀵硅瘽妗�
 
@@ -24,6 +29,36 @@
 	m_nInitialWidth = 0;
 	m_nInitialHeight = 0;
 	m_pPLC = nullptr;
+
+	m_bSEV = FALSE;
+	m_fCurPos = 0.0;
+	m_fManualSpeed = 0.0;
+	m_fAutoSpeed = 0.0;
+	m_fPrm = 0.0;
+	m_nLoad = 0;
+	m_nErrCode = 0;
+	m_nAlarmCode = 0;
+	m_bFLS = FALSE;
+	m_bDOG = FALSE;
+	m_bRLS = FALSE;
+	m_bReady = FALSE;
+	m_bBusy = FALSE;
+	m_bErr = FALSE;
+
+	for (int i = 0; i < BTN_MAX; i++) {
+		m_pBlBtns[i] = new CBlButton();
+	}
+
+	for (int i = 0; i < EDIT_MAX; i++) {
+		m_pRegexEdit[i] = new CRegexEdit();
+	}
+
+	for (int i = 0; i < LABEL_MAX; i++) {
+		m_pBlLabels[i] = new CBLLabel();
+	}
+	
+	m_nBtnsFlashState6 = 0;
+	m_nBtnsFlashState8 = 0;
 }
 
 CAxisSettingsDlg::~CAxisSettingsDlg()
@@ -35,6 +70,18 @@
 		}
 	}
 	m_mapFonts.clear();
+
+	for (int i = 0; i < BTN_MAX; i++) {
+		delete m_pBlBtns[i];
+	}
+
+	for (int i = 0; i < EDIT_MAX; i++) {
+		delete m_pRegexEdit[i];
+	}
+
+	for (int i = 0; i < LABEL_MAX; i++) {
+		delete m_pBlLabels[i];
+	}
 }
 
 void CAxisSettingsDlg::SetPLC(CPLC* pPLC)
@@ -51,26 +98,10 @@
 void CAxisSettingsDlg::DoDataExchange(CDataExchange* pDX)
 {
 	CDialogEx::DoDataExchange(pDX);
-	DDX_Control(pDX, IDC_STATIC_AXIS_TEST_FLS, m_staticFLS);
-	DDX_Control(pDX, IDC_STATIC_AXIS_TEST_DOG, m_staticDOG);
-	DDX_Control(pDX, IDC_STATIC_AXIS_TEST_RLS, m_staticRLS);
-	DDX_Control(pDX, IDC_STATIC_AXIS_TEST_READY, m_staticReady);
-	DDX_Control(pDX, IDC_STATIC_AXIS_TEST_BUSY, m_staticBusy);
-	DDX_Control(pDX, IDC_STATIC_AXIS_TEST_ERR, m_staticErr);
 	DDX_Control(pDX, IDC_COMBO_AXIS_NAME, m_comboAxisNO);
 	DDX_Control(pDX, IDC_STATIC_AXIS_NUMBER, m_staticAxisNO);
 	DDX_Control(pDX, IDC_STATIC_AXIS_DESCRIP, m_staticAxisDescription);
 	DDX_Control(pDX, IDC_STATIC_START_ADDRESS, m_staticStartAddress);
-	DDX_Control(pDX, IDC_EDIT_AXIS_MODITFY_POS, m_editManualSpeed);
-	DDX_Control(pDX, IDC_EDIT_AXIS_MODITFY_AUTO_SPEED, m_editAutoSpeed);
-	DDX_Control(pDX, IDC_EDIT_AXIS_MODITFY_ACCE_TIME, m_editAccelerationTime);
-	DDX_Control(pDX, IDC_EDIT_AXIS_MODITFY_DECE_TIME, m_editDecelerationTime);
-	DDX_Control(pDX, IDC_EDIT_AXIS_MODITFY_MICROMENTUM, m_editJogDistance);
-	DDX_Control(pDX, IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP1, m_pageButtons[0]);
-	DDX_Control(pDX, IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP2, m_pageButtons[1]);
-	DDX_Control(pDX, IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP3, m_pageButtons[2]);
-	DDX_Control(pDX, IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP4, m_pageButtons[3]);
-	DDX_Control(pDX, IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP5, m_pageButtons[4]);
 }
 
 UINT CAxisSettingsDlg::FindIDByName(const CString& strControlID)
@@ -191,30 +222,62 @@
 	label.UpdateWindow();
 }
 
-void CAxisSettingsDlg::SetStatusColor(CBLLabel& label, BOOL bStatus)
+void CAxisSettingsDlg::SetLabelColor(CBLLabel& label, COLORREF color)
 {
-	if (bStatus) {
-		label.SetBkColor(RGB(0, 255, 0)); // 缁胯壊
-	}
-	else {
-		label.SetBkColor(RGB(255, 0, 0)); // 绾㈣壊
-	}
-
+	label.SetBkColor(color);
 	label.Invalidate();              // 鏍囪鍖哄煙鏃犳晥
 	label.UpdateWindow();            // 绔嬪嵆鍒锋柊
 }
 
+void CAxisSettingsDlg::SetLabelColorBasedOnState(CBLLabel& label, BOOL bState, COLORREF colorTrue, COLORREF colorFalse) {
+	SetLabelColor(label, bState ? colorTrue : colorFalse);
+}
+
+void CAxisSettingsDlg::UpdateLabels() {
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_FLS], m_bFLS, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_DOG], m_bDOG, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_RLS], m_bRLS, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_READY], m_bReady, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_BUSY], m_bBusy, COLOR_GREEN_ON, COLOR_GREEN_OFF);
+	SetLabelColorBasedOnState(*m_pBlLabels[LABEL_ERR], m_bErr, COLOR_RED, COLOR_GREEN_OFF);
+}
+
+void CAxisSettingsDlg::UpdateRegexEdit(CRegexEdit* pRegexEdit, const ValueRange& range, const CString& title)
+{
+	auto formatDouble = [](double value) -> CString {
+		CString str;
+		str.Format(_T("%.3f"), value);
+		return str;
+	};
+
+	pRegexEdit->SetWindowText(formatDouble(range.currentValue));
+	pRegexEdit->SetRegexType(RegexType::Decimal);
+	pRegexEdit->SetValueRange(range.minValue, range.maxValue);
+	pRegexEdit->SetInvalidInputCallback([title, range]() {
+		CString strError;
+		strError.Format(_T("%s鐨勫�煎繀椤诲湪 %.3f 鍜� %.3f 涔嬮棿锛�"), title, range.minValue, range.maxValue);
+		AfxMessageBox(strError);
+	});
+}
+
 void CAxisSettingsDlg::updatePageButtonStates()
 {
-	for (int i = 0; i < 5; ++i) {
-		if (i + 1 == m_currentPage) {
-			m_pageButtons[i].SetFaceColor(RGB(0, 122, 204));	// 閫変腑鑳屾櫙鑹诧紙钃濊壊锛�
-		}
-		else {
-			m_pageButtons[i].SetFaceColor(RGB(240, 240, 240));	// 榛樿鑳屾櫙鑹�
-		}
+	for (int i = 0; i < AXIS_PAGE_SIZE; ++i) {
+		BOOL bSelect = (i + 1 == m_currentPage);
+		m_pBlBtns[i]->SetFaceColor(bSelect ?
+			BTN_PAGE_FACE_SELECT_COLOR: BTN_PAGE_FACE_NORMAL_COLOR);
+		m_pBlBtns[i]->SetTextColor(bSelect ?
+			BTN_PAGE_TEXT_SELECT_COLOR : BTN_PAGE_TEXT_NORMAL_COLOR);
+	}
+}
 
-		m_pageButtons[i].Invalidate();
+void CAxisSettingsDlg::HideEditCursor(int nCtrlID)
+{
+	CEdit* pEdit = (CEdit*)GetDlgItem(nCtrlID);
+	if (pEdit && pEdit->GetSafeHwnd()) {
+		pEdit->EnableWindow(FALSE); // 绂佺敤鎺т欢
+		pEdit->SetReadOnly(TRUE);   // 璁剧疆涓哄彧璇�
+		pEdit->HideCaret();         // 闅愯棌鍏夋爣
 	}
 }
 
@@ -236,6 +299,7 @@
 	RecipeManager& recipeManager = RecipeManager::getInstance();
 	if (m_strRecipeName.IsEmpty() || !recipeManager.loadRecipe(std::string(CT2A(m_strRecipeName)))) {
 		AfxMessageBox(_T("鍔犺浇閰嶆柟澶辫触锛�"));
+		recipeManager.saveRecipe(std::string(CT2A(m_strRecipeName)));
 		return;
 	}
 
@@ -274,18 +338,19 @@
 	m_staticAxisNO.SetWindowText(CString(axisDetails.number.c_str()));					// 杞寸紪鍙�
 	m_staticAxisDescription.SetWindowText(CString(axisDetails.description.c_str()));	// 杞存弿杩�
 	m_staticStartAddress.SetWindowText(CString(axisDetails.startAddress.c_str()));		// 璧峰鍦板潃
-	m_editJogDistance.SetWindowText(formatDouble(axisDetails.jogDistance));				// 寰姩閲�
-	m_editManualSpeed.SetWindowText(formatDouble(axisDetails.manualSpeed));				// 鎵嬪姩閫熷害
-	m_editAutoSpeed.SetWindowText(formatDouble(axisDetails.autoSpeed));					// 鑷姩閫熷害
-	m_editAccelerationTime.SetWindowText(formatDouble(axisDetails.accelerationTime));	// 鍔犻�熸椂闂�
-	m_editDecelerationTime.SetWindowText(formatDouble(axisDetails.decelerationTime));	// 鍑忛�熸椂闂�
+
+	UpdateRegexEdit(m_pRegexEdit[EDIT_MICROMENTUM], axisDetails.jogDistance, _T("寰姩閲�"));
+	UpdateRegexEdit(m_pRegexEdit[EDIT_MANUAL_SPEED], axisDetails.manualSpeed, _T("鎵嬪姩閫熷害"));
+	UpdateRegexEdit(m_pRegexEdit[EDIT_AUTO_SPEED], axisDetails.autoSpeed, _T("鑷姩閫熷害"));
+	UpdateRegexEdit(m_pRegexEdit[EDIT_ACCE_TIME], axisDetails.accelerationTime, _T("鍔犻�熸椂闂�"));
+	UpdateRegexEdit(m_pRegexEdit[EDIT_DECE_TIME], axisDetails.decelerationTime, _T("鍑忛�熸椂闂�"));
 }
 
 void CAxisSettingsDlg::refreshPositionDetails(int nAxisId, int pageNumber)
 {
 	RecipeManager& recipeManager = RecipeManager::getInstance();
 	// 姣忛〉鏄剧ず鐨勫畾浣嶇偣鏁伴噺
-	const int pageSize = 5;
+	const int pageSize = AXIS_PAGE_SIZE;
 
 	// 鑾峰彇瀹氫綅鐐规暟鎹�
 	auto positions = recipeManager.getPositions(nAxisId, pageNumber, pageSize);
@@ -303,17 +368,78 @@
 		CWnd* pPositionCtrl = GetDlgItem(positionCtrlId);
 
 		if (i < positions.size()) {
-			CString description = CString(positions[i].first.c_str());
-			CString value;
-			value.Format(_T("%.3f"), positions[i].second);
+			const PositionRange& position = positions[i];
 
+			// 鏄剧ず瀹氫綅鐐圭殑鎻忚堪
+			CString description = CString(position.description.c_str());
 			if (pDescriptionCtrl) pDescriptionCtrl->SetWindowText(description);
-			if (pPositionCtrl) pPositionCtrl->SetWindowText(value);
+
+			// 鏄剧ず瀹氫綅鐐圭殑褰撳墠浣嶇疆
+			CString value;
+			value.Format(_T("%.3f"), position.range.currentValue);
+			if (pPositionCtrl) {
+				pPositionCtrl->SetWindowText(value);
+				pPositionCtrl->EnableWindow(position.isEnable);
+
+				if (position.isEnable) {
+					CString strError;
+					strError.Format(_T("瀹氫綅鐐�%d"), i + 1);
+					UpdateRegexEdit((CRegexEdit*)pPositionCtrl, position.range, strError);
+				}
+			}
 		}
 		else {
-			if (pDescriptionCtrl) pDescriptionCtrl->SetWindowText(_T(""));
-			if (pPositionCtrl) pPositionCtrl->SetWindowText(_T(""));
+			// 娓呯┖鎺т欢鍐呭
+			if (pDescriptionCtrl) {
+				pDescriptionCtrl->SetWindowText(_T("")); 
+				pDescriptionCtrl->EnableWindow(FALSE);
+			}
+
+			if (pPositionCtrl) {
+				pPositionCtrl->SetWindowText(_T("")); 
+				pPositionCtrl->EnableWindow(FALSE);
+			}
 		}
+	}
+}
+
+void CAxisSettingsDlg::UpdatePositionRange(PositionRange& position, int pageNumber, int pageSize, int currentIndex)
+{
+	// 鑾峰彇褰撳墠杈撳叆妗嗕腑鐨勬枃鏈�
+	CString strText;
+	GetDlgItem(IDC_EDIT_AXIS_CURR_POS)->GetWindowText(strText);
+	if (strText.IsEmpty()) {
+		return;
+	}
+
+	CString descriptionCtrlName, positionCtrlName;
+	descriptionCtrlName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP%d"), currentIndex + 1);
+	positionCtrlName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT%d"), currentIndex + 1);
+
+	UINT descriptionCtrlId = FindIDByName(descriptionCtrlName);
+	UINT positionCtrlId = FindIDByName(positionCtrlName);
+
+	CWnd* pDescriptionCtrl = GetDlgItem(descriptionCtrlId);
+	CWnd* pPositionCtrl = GetDlgItem(positionCtrlId);
+
+	if (pDescriptionCtrl == nullptr || pPositionCtrl == nullptr) {
+		return;
+	}
+
+	double enteredValue = _ttof(strText);
+	double minValue = position.range.minValue;
+	double maxValue = position.range.maxValue;
+
+	// 鍒ゆ柇杈撳叆鐨勫�兼槸鍚﹀湪鍚堟硶鑼冨洿鍐�
+	if (enteredValue < minValue || enteredValue > maxValue) {
+		CString strError;
+		strError.Format(_T("瀹氫綅鐐圭殑鍊煎繀椤诲湪 %f 鍜� %f 涔嬮棿锛�"), minValue, maxValue);
+		pDescriptionCtrl->SetWindowText(strError);
+	}
+	else {
+		position.range.currentValue = enteredValue;
+		pDescriptionCtrl->SetWindowText(CString(position.description.c_str()));
+		pPositionCtrl->SetWindowText(strText);
 	}
 }
 
@@ -341,53 +467,57 @@
 
 void CAxisSettingsDlg::updateDataFromUI(int nAxisId)
 {
-	const int pageSize = 5; // 姣忛〉鏄剧ず 5 涓畾浣嶇偣
+	const int pageSize = AXIS_PAGE_SIZE; // 姣忛〉鏄剧ず 5 涓畾浣嶇偣
 
 	RecipeManager& recipeManager = RecipeManager::getInstance();
 	auto axisData = recipeManager.getAxis(nAxisId);
 
 	// 鑾峰彇鐣岄潰涓婄殑淇敼鍙傛暟
 	CString text;
-	m_editManualSpeed.GetWindowText(text);
-	axisData.manualSpeed = _ttof(text);
+	m_pRegexEdit[EDIT_MANUAL_SPEED]->GetWindowText(text);
+	axisData.manualSpeed.currentValue = _ttof(text);
 
-	m_editAutoSpeed.GetWindowText(text);
-	axisData.autoSpeed = _ttof(text);
+	m_pRegexEdit[EDIT_AUTO_SPEED]->GetWindowText(text);
+	axisData.autoSpeed.currentValue = _ttof(text);
 
-	m_editAccelerationTime.GetWindowText(text);
-	axisData.accelerationTime = _ttof(text);
+	m_pRegexEdit[EDIT_ACCE_TIME]->GetWindowText(text);
+	axisData.accelerationTime.currentValue = _ttof(text);
 
-	m_editDecelerationTime.GetWindowText(text);
-	axisData.decelerationTime = _ttof(text);
+	m_pRegexEdit[EDIT_DECE_TIME]->GetWindowText(text);
+	axisData.decelerationTime.currentValue = _ttof(text);
 
-	m_editJogDistance.GetWindowText(text);
-	axisData.jogDistance = _ttof(text);
+	m_pRegexEdit[EDIT_MICROMENTUM]->GetWindowText(text);
+	axisData.jogDistance.currentValue = _ttof(text);
 
 	// 鏇存柊瀹氫綅鐐规暟鎹�
 	for (int i = 0; i < pageSize; ++i) {
 		int index = (m_currentPage - 1) * pageSize + i;
 
 		if (index < axisData.positions.size()) {
+			// 鏋勫缓鎺т欢鍚嶇О
 			CString descriptionName, positionName;
 			descriptionName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP%d"), i + 1);
 			positionName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT%d"), i + 1);
 
+			// 鑾峰彇鎺т欢
 			CEdit* pDescriptionEdit = (CEdit*)GetDlgItem(FindIDByName(descriptionName));
 			CEdit* pPositionEdit = (CEdit*)GetDlgItem(FindIDByName(positionName));
 
 			if (pDescriptionEdit && pPositionEdit) {
 				CString description, positionValue;
+
+				// 鑾峰彇鎺т欢涓殑鏂囨湰
 				pDescriptionEdit->GetWindowText(description);
 				pPositionEdit->GetWindowText(positionValue);
 
 				// 鏇存柊 RecipeManager 涓殑鏁版嵁
-				axisData.positions[index].first = CT2A(description);
-				axisData.positions[index].second = _ttof(positionValue);
+				axisData.positions[index].description = CT2A(description);
+				axisData.positions[index].range.currentValue = _ttof(positionValue);
 			}
 		}
 	}
 
-	// 淇濆瓨鍥� RecipeManager
+	// 淇濆瓨 RecipeManager
 	recipeManager.updateAxis(axisData);
 }
 
@@ -421,24 +551,87 @@
 	}
 }
 
+bool CAxisSettingsDlg::ParsePLCAddress(const CString& address, MC::SOFT_COMPONENT& component, int& addr)
+{
+	if (address.GetLength() < 2) {
+		return false;
+	}
+
+	// 鎻愬彇缁勪欢绫诲瀷锛堢涓�涓瓧绗︼級
+	TCHAR componentChar = address[0];
+	if (address.Left(2) == _T("ZR")) {
+		component = MC::SOFT_COMPONENT::ZR;
+		// 鎻愬彇鏁板瓧閮ㄥ垎锛堝幓闄R鍓嶇紑锛�
+		CString numericAddress = address.Mid(2);
+		addr = _ttoi(numericAddress);
+		return addr != 0 || numericAddress.CompareNoCase(_T("0")) == 0;  // 濡傛灉鏄� "0"锛屼篃璁や负鏈夋晥
+	}
+
+	// 瀵逛簬鍏朵粬缁勪欢锛屾寜鐓у父瑙勮鍒欏鐞�
+	CString hexAddress = address.Mid(1);
+	switch (componentChar) {
+	case 'D':
+		component = MC::SOFT_COMPONENT::D;
+		addr = _ttoi(hexAddress);
+		break;
+	case 'M':
+		component = MC::SOFT_COMPONENT::M;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	case 'X':
+		component = MC::SOFT_COMPONENT::X;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	case 'Y':
+		component = MC::SOFT_COMPONENT::Y;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	case 'W':
+		component = MC::SOFT_COMPONENT::W;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	case 'L':
+		component = MC::SOFT_COMPONENT::L;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	case 'S':
+		component = MC::SOFT_COMPONENT::S;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	case 'B':
+		component = MC::SOFT_COMPONENT::B;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	case 'F':
+		component = MC::SOFT_COMPONENT::F;
+		addr = _tcstoul(hexAddress, nullptr, 16);
+		break;
+	default:
+		return false;
+	}
+
+	// 妫�鏌ュ湴鍧�鏄惁鏈夋晥
+	if (addr == 0 && hexAddress.CompareNoCase(_T("0")) != 0) {
+		return false;
+	}
+
+	return true;
+}
+
 void CAxisSettingsDlg::writeAxisDataToPLC(int nAxisId)
 {
 	// 浠� RecipeManager 鑾峰彇杞存暟鎹�
 	RecipeManager& recipeManager = RecipeManager::getInstance();
 	auto axisData = recipeManager.getAxis(nAxisId);
 
-	// 鍘婚櫎闈炴暟瀛楀瓧绗﹀苟杞崲璧峰鍦板潃
-	std::string cleanAddress = axisData.startAddress;
-	cleanAddress.erase(std::remove_if(cleanAddress.begin(), cleanAddress.end(),
-		[](char c) { return !std::isdigit(c); }), cleanAddress.end());
-	if (cleanAddress.empty()) {
+	int startAddress;
+	MC::SOFT_COMPONENT component;
+	if (!ParsePLCAddress(CString(axisData.startAddress.c_str()), component, startAddress)) {
 		AfxMessageBox(_T("鏃犳晥鐨勮捣濮嬪湴鍧�锛�"));
-		return;
 	}
-	int startAddress = std::stoi(cleanAddress);
 
 	// 鍐欏叆鎵嬪姩閫熷害
-	m_pPLC->writeWord(MC::SOFT_COMPONENT::D, 5120, (int)axisData.manualSpeed, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+	m_pPLC->writeDWord(component, startAddress + 82, (int)axisData.manualSpeed.currentValue * 1000, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鎵嬪姩閫熷害, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -448,7 +641,7 @@
 	});
 
 	// 鍐欏叆鑷姩閫熷害
-	m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 2, (int)axisData.autoSpeed, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+	m_pPLC->writeDWord(component, startAddress + 84, (int)(axisData.autoSpeed.currentValue * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鑷姩閫熷害, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -458,7 +651,7 @@
 	});
 
 	// 鍐欏叆鍔犻�熸椂闂�, 杞崲涓烘绉�
-	m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 4, (int)(axisData.accelerationTime * 1000), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+	m_pPLC->writeDWord(component, startAddress + 62, (int)(axisData.accelerationTime.currentValue * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鍔犻�熸椂闂�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -468,7 +661,7 @@
 	});
 
 	// 鍐欏叆鍑忛�熸椂闂�, 杞崲涓烘绉�
-	m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 6, (int)(axisData.decelerationTime * 1000), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+	m_pPLC->writeDWord(component, startAddress + 64, (int)(axisData.decelerationTime.currentValue * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鍑忛�熸椂闂�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -478,7 +671,7 @@
 	});
 
 	// 鍐欏叆寰姩閲�
-	m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 8, (int)axisData.jogDistance, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+	m_pPLC->writeWord(component, startAddress + 81, (int)(axisData.jogDistance.currentValue * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 寰姩閲�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -488,17 +681,18 @@
 	});
 
 	// 鍐欏叆瀹氫綅鐐规暟鎹�
-	int positionStartAddress = startAddress + 10;
-	for (size_t i = 0; i < axisData.positions.size(); ++i) {
+	int positionStartAddress = startAddress + 100;
+	for (int i = 0; i < axisData.positions.size(); ++i) {
 		const auto& position = axisData.positions[i];
-		int positionAddress = positionStartAddress + (i * 2);
+		unsigned int positionAddress = positionStartAddress + (i * 2);
 
-		m_pPLC->writeWord(MC::SOFT_COMPONENT::D, positionAddress, (int)position.second, [i](IMcChannel* pChannel, int addr, DWORD value, int flag) {
+		double valueToWrite = position.range.currentValue;
+		m_pPLC->writeDWord(component, positionAddress, (int)(valueToWrite * 1000), [i, positionAddress](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 			if (flag == 0) {
-				TRACE("\n鍐欏叆鎴愬姛: 瀹氫綅鐐� %d, 鍦板潃: %d, 鍊�: %lu\n", i + 1, addr, value);
+				TRACE("\n鍐欏叆鎴愬姛: 瀹氫綅鐐� %d, 鍦板潃: %d, 鍊�: %lu\n", i + 1, positionAddress, value);
 			}
 			else {
-				TRACE("\n鍐欏叆澶辫触: 瀹氫綅鐐� %d, 鍦板潃: %d, 閿欒鐮�: %d\n", i + 1, addr, flag);
+				TRACE("\n鍐欏叆澶辫触: 瀹氫綅鐐� %d, 鍦板潃: %d, 閿欒鐮�: %d\n", i + 1, positionAddress, flag);
 			}
 		});
 	}
@@ -516,45 +710,44 @@
 	RecipeManager& recipeManager = RecipeManager::getInstance();
 	auto axisData = recipeManager.getAxis(nAxisId);
 
-	std::string strCleanAddress = axisData.startAddress;
-	strCleanAddress.erase(std::remove_if(strCleanAddress.begin(), strCleanAddress.end(),
-		[](unsigned char c) { return !std::isdigit(c); }), strCleanAddress.end());
-	if (strCleanAddress.empty()) {
+	int startAddress;
+	MC::SOFT_COMPONENT component;
+	if (!ParsePLCAddress(CString(axisData.startAddress.c_str()), component, startAddress)) {
 		AfxMessageBox(_T("鏃犳晥鐨勮捣濮嬪湴鍧�锛�"));
-		return;
 	}
 
-	int nStartAddress = std::stoi(strCleanAddress);
-
 	// 鏍规嵁鎿嶄綔绫诲瀷璁＄畻鐩爣鍦板潃
-	int nTargetAddress = nStartAddress;
+	int bitIndex = 0;
+	char szWrite[4] = { 0x0, 0x0, 0x0, 0x0 };
 	switch (eOpType) {
 	case AxisOperationType::OPR:
-		nTargetAddress += 10; // OPR 淇″彿鍦板潃
+		startAddress += 0; // OPR 淇″彿鍦板潃 0,闂姩淇℃伅06.0
+		szWrite[0] = bPressed ? 0x1 : 0;
 		break;
 	case AxisOperationType::JOG_ADD:
-		nTargetAddress += 12; // JOG+ 淇″彿鍦板潃
+		startAddress += 01; // JOG+ 淇″彿鍦板潃 c
+		szWrite[1] = bPressed ? 0x10 : 0;
 		break;
 	case AxisOperationType::JOG_SUB:
-		nTargetAddress += 13; // JOG- 淇″彿鍦板潃
+		startAddress += 01; // JOG- 淇″彿鍦板潃 d
+		szWrite[1] = bPressed ? 0x20 : 0;
 		break;
 	case AxisOperationType::STOP:
-		nTargetAddress += 14; // STOP 淇″彿鍦板潃
+		startAddress += 05; // STOP 淇″彿鍦板潃 5.e
+		szWrite[1] = bPressed ? 0x40 : 0;
+		break;
+	case AxisOperationType::SEV_ON:
+		startAddress += 01; // SEV_ON 淇″彿鍦板潃 1.a
+		szWrite[1] = bPressed ? 0x04 : 0;
 		break;
 	case AxisOperationType::POSITION_1:
-		nTargetAddress += 16; // 瀹氫綅鐐� 1 淇″彿鍦板潃
-		break;
 	case AxisOperationType::POSITION_2:
-		nTargetAddress += 18; // 瀹氫綅鐐� 2 淇″彿鍦板潃
-		break;
 	case AxisOperationType::POSITION_3:
-		nTargetAddress += 20; // 瀹氫綅鐐� 3 淇″彿鍦板潃
-		break;
 	case AxisOperationType::POSITION_4:
-		nTargetAddress += 22; // 瀹氫綅鐐� 4 淇″彿鍦板潃
-		break;
 	case AxisOperationType::POSITION_5:
-		nTargetAddress += 24; // 瀹氫綅鐐� 5 淇″彿鍦板潃
+		startAddress += ((m_currentPage - 1) * 5 + ((int)eOpType - (int)AxisOperationType::POSITION_1 + 1)) / 16; 
+		bitIndex = ((m_currentPage-1) * 5 + ((int)eOpType - (int)AxisOperationType::POSITION_1 + 1)) % 16;
+		if(bPressed) CToolUnits::setBit(szWrite, bitIndex);
 		break;
 	default:
 		AfxMessageBox(_T("鏈煡鎿嶄綔绫诲瀷锛�"));
@@ -562,7 +755,7 @@
 	}
 
 	// 鍚� PLC 鍐欏叆淇″彿
-	m_pPLC->writeBit(MC::SOFT_COMPONENT::D, nTargetAddress, bPressed, [eOpType, nTargetAddress, bPressed](IMcChannel* pChannel, int nAddr, DWORD nValue, int nFlag) {
+	m_pPLC->writeData(component, startAddress, szWrite, 2, [eOpType, startAddress, bPressed](IMcChannel* pChannel, int nAddr, DWORD nValue, int nFlag) {
 		if (nFlag == 0) {
 			TRACE("鎿嶄綔鎴愬姛锛氱被鍨�=%d锛屽湴鍧�=%d锛屽��=%d\n", static_cast<int>(eOpType), nAddr, bPressed);
 		}
@@ -570,6 +763,69 @@
 			TRACE("鎿嶄綔澶辫触锛氱被鍨�=%d锛屽湴鍧�=%d锛岄敊璇爜=%d\n", static_cast<int>(eOpType), nAddr, nFlag);
 		}
 	});
+}
+
+void CAxisSettingsDlg::readPLCDataToUI(int nAxisId)
+{
+	// 浠� RecipeManager 鑾峰彇杞存暟鎹�
+	RecipeManager& recipeManager = RecipeManager::getInstance();
+	AxisInfo axisData = recipeManager.getAxis(nAxisId);
+
+	MC::SOFT_COMPONENT component;
+	int startAddress, endAddress, readSize;
+	if (!ParsePLCAddress(CString(axisData.startAddress.c_str()), component, startAddress)) {
+		AfxMessageBox(_T("鏃犳晥鐨勮捣濮嬪湴鍧�锛�"));
+	}
+	endAddress = startAddress + 300;
+	readSize = (endAddress - startAddress + 1) * 2;
+
+	auto funOnReadData = [this, nAxisId, startAddress, readSize](IMcChannel* pChannel, int addr, char* pData, unsigned int nDataSize, int flag) -> void {
+		if (nDataSize == readSize && flag == 0 && ::IsWindow(m_hWnd)) {
+			m_fCurPos = CToolUnits::toInt32(&pData[20 * 2]) * 0.001;
+			m_fManualSpeed = CToolUnits::toInt32(&pData[82 * 2]) * 0.001;
+			m_fAutoSpeed = CToolUnits::toInt32(&pData[84 * 2]) * 0.001;
+			m_fPrm = CToolUnits::toInt32(&pData[50 * 2]) * 0.1;
+			m_nLoad = CToolUnits::toInt16(&pData[54 * 2]);
+			m_nErrCode = CToolUnits::toInt16(&pData[26 * 2]);
+			m_nAlarmCode = CToolUnits::toInt16(&pData[27 * 2]);
+
+			m_bSEV = CToolUnits::getBit(pData[1 * 2 + 1], 0xa - 8);
+			m_bFLS = CToolUnits::getBit(pData[10 * 2], 1);
+			m_bDOG = CToolUnits::getBit(pData[10 * 2], 6);
+			m_bRLS = CToolUnits::getBit(pData[10 * 2], 0);
+			m_bReady = CToolUnits::getBit(pData[10 * 2 + 1], 0xA - 8);
+			m_bBusy = CToolUnits::getBit(pData[10 * 2 + 1], 0xB - 8);
+			m_bErr = CToolUnits::getBit(pData[10 * 2 + 1], 0xF - 8);
+
+			// 璁板綍鎸夐挳鍒锋柊鐘舵��
+			// 6,7,8,9涓哄師鐐瑰拰25涓偣浣嶇姸鎬佸拰瀹屾垚鐘舵��
+			// ZR 06.0 鍜� 08.0
+			// 鍥炲師鐐硅繍鍔ㄤ腑锛孼R06.0鍦�0鍜�1涓垏鎹紝鍥炲師鐐瑰畬鎴愶紝 08.0涓�1
+			// 瀹氫綅1
+			// ZR 06.1 鍜� 08.1
+			// ...
+			int b = 6 * 2;
+			m_nBtnsFlashState6 = ((BYTE)pData[b] | (BYTE)pData[b + 1] << 8);
+			m_nBtnsFlashState6 |= ((BYTE)pData[b + 2] << 16 | (BYTE)pData[b + 3] << 24);
+			m_nBtnsFlashState8 = ((BYTE)pData[b + 4] | (BYTE)pData[b + 5] << 8);
+			m_nBtnsFlashState8 |= ((BYTE)pData[b + 6] << 16 | (BYTE)pData[b + 7] << 24);
+
+			// 璇诲彇瀹氫綅鐐规暟鎹�
+			AxisInfo axisInfo = RecipeManager::getInstance().getAxis(nAxisId);
+			for (int i = 0; i < axisInfo.positions.size(); ++i) {
+				if (axisInfo.positions[i].isEnable == FALSE) {
+					unsigned int positionAddress = 100 + (i * 2);
+					//axisInfo.positions[i].range.minValue = CToolUnits::toInt32(&pData[positionAddress * 2]) * 0.001;
+					axisInfo.positions[i].range.currentValue = CToolUnits::toInt32(&pData[positionAddress * 2]) * 0.001;
+					//axisInfo.positions[i].range.maxValue = CToolUnits::toInt32(&pData[positionAddress * 2]) * 0.001;
+				}
+			}
+			RecipeManager::getInstance().updateAxis(axisInfo);
+
+			PostMessage(ID_MSG_UPDATA_DATA_TO_UI);
+		}
+	};
+	m_pPLC->readData(component, startAddress, readSize, funOnReadData);
 }
 
 
@@ -588,12 +844,17 @@
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_ANCHOR_POINT5, &CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint5)
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_TEST_OPR, &CAxisSettingsDlg::OnBnClickedButtonAxisTestOpr)
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_TEST_STOP, &CAxisSettingsDlg::OnBnClickedButtonAxisTestStop)
+	ON_BN_CLICKED(IDC_BUTTON_AXIS_SEV, &CAxisSettingsDlg::OnBnClickedButtonAxisSev)
 	ON_CBN_SELCHANGE(IDC_COMBO_AXIS_NAME, &CAxisSettingsDlg::OnSelchangeComboAxisName)
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_SAVE, &CAxisSettingsDlg::OnBnClickedButtonAxisSave)
+	ON_BN_CLICKED(IDC_BUTTON_AXIS_UPDATE_UI, &CAxisSettingsDlg::OnBnClickedButtonAxisUpdateUi)
+	ON_BN_CLICKED(IDC_BUTTON_AXIS_DETAIL_SETTINGS, &CAxisSettingsDlg::OnBnClickedButtonAxisDetailSettings)
+	ON_MESSAGE(ID_MSG_UPDATA_DATA_TO_UI, &CAxisSettingsDlg::OnUpdateDataToUI)
 	ON_WM_SIZE()
 	ON_WM_CTLCOLOR()
 	ON_WM_SIZING()
 	ON_WM_TIMER()
+	ON_WM_CLOSE()
 END_MESSAGE_MAP()
 
 
@@ -609,14 +870,94 @@
 	strTitle.Format(_T("Axis璁惧畾(閰嶆柟: %s)"), m_strRecipeName);
 	SetWindowText(strTitle);
 
+	// 闅愯棌鍏夋爣
+	HideEditCursor(IDC_EDIT_AXIS_CURR_POS);
+	HideEditCursor(IDC_EDIT_AXIS_CURR_MANUAL_SPEED);
+	HideEditCursor(IDC_EDIT_AXIS_CURR_AUTO_SPEED);
+	HideEditCursor(IDC_EDIT_AXIS_CURR_ROTA_SPEED);
+	HideEditCursor(IDC_EDIT_AXIS_CURR_LOAD);
+	HideEditCursor(IDC_EDIT_AXIS_CURR_ERROR_NUMBER);
+	HideEditCursor(IDC_EDIT_AXIS_CURR_ALARM_NUMBER);
+
 	// 璁剧疆娴嬭瘯鐘舵��
-	CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
-	for (auto pLabel : pLabels) {
-		SetStatusColor(*pLabel, FALSE);
+	m_pBlLabels[LABEL_FLS]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_FLS, this);
+	m_pBlLabels[LABEL_DOG]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_DOG, this);
+	m_pBlLabels[LABEL_RLS]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_RLS, this);
+	m_pBlLabels[LABEL_READY]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_READY, this);
+	m_pBlLabels[LABEL_BUSY]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_BUSY, this);
+	m_pBlLabels[LABEL_ERR]->SubclassDlgItem(IDC_STATIC_AXIS_TEST_ERR, this);
+
+	for (auto pLabel : m_pBlLabels) {
+		pLabel->SetBkColor(RGB(0, 180, 0));
 		pLabel->ModifyStyle(0, SS_NOTIFY);
 		pLabel->SetTextColor(RGB(255, 255, 255));
 		pLabel->SetAlignment(AlignCenter);
 		pLabel->SetDynamicFont(TRUE);
+	}
+	
+	// 鍒濆鍖栫紪杈戞
+	m_pRegexEdit[EDIT_MANUAL_SPEED]->SubclassDlgItem(IDC_EDIT_AXIS_MODITFY_MANUAL_SPEED, this);
+	m_pRegexEdit[EDIT_AUTO_SPEED]->SubclassDlgItem(IDC_EDIT_AXIS_MODITFY_AUTO_SPEED, this);
+	m_pRegexEdit[EDIT_ACCE_TIME]->SubclassDlgItem(IDC_EDIT_AXIS_MODITFY_ACCE_TIME, this);
+	m_pRegexEdit[EDIT_DECE_TIME]->SubclassDlgItem(IDC_EDIT_AXIS_MODITFY_DECE_TIME, this);
+	m_pRegexEdit[EDIT_MICROMENTUM]->SubclassDlgItem(IDC_EDIT_AXIS_MODITFY_MICROMENTUM, this);
+	m_pRegexEdit[EDIT_ANCHOR_POINT1]->SubclassDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT1, this);
+	m_pRegexEdit[EDIT_ANCHOR_POINT2]->SubclassDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT2, this);
+	m_pRegexEdit[EDIT_ANCHOR_POINT3]->SubclassDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT3, this);
+	m_pRegexEdit[EDIT_ANCHOR_POINT4]->SubclassDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT4, this);
+	m_pRegexEdit[EDIT_ANCHOR_POINT5]->SubclassDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT5, this);
+
+	// 鎸夐挳鍒濆鍖�
+	m_pBlBtns[BTN_PAGE1]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP1, this);
+	m_pBlBtns[BTN_PAGE2]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP2, this);
+	m_pBlBtns[BTN_PAGE3]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP3, this);
+	m_pBlBtns[BTN_PAGE4]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP4, this);
+	m_pBlBtns[BTN_PAGE5]->SubclassDlgItem(IDC_BUTTON_AXIS_ANCHOR_POINT_GROUP5, this);
+	m_pBlBtns[BTN_JOG_ADD]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD, this);
+	m_pBlBtns[BTN_JOG_ADD]->SetFrameColor(BS_NORMAL, BTN_JOG_FRAME_NORMAL);
+	m_pBlBtns[BTN_JOG_ADD]->SetFrameColor(BS_HOVER, BTN_JOG_FRAME_HOVER);
+	m_pBlBtns[BTN_JOG_ADD]->SetFrameColor(BS_PRESS, BTN_JOG_FRAME_PRESS);
+	m_pBlBtns[BTN_JOG_ADD]->SetBkgndColor(BS_NORMAL, BTN_JOG_BKGND_NORMAL);
+	m_pBlBtns[BTN_JOG_ADD]->SetBkgndColor(BS_HOVER, BTN_JOG_BKGND_HOVER);
+	m_pBlBtns[BTN_JOG_ADD]->SetBkgndColor(BS_PRESS, BTN_JOG_BKGND_PRESS);
+	m_pBlBtns[BTN_JOG_SUB]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB, this);
+	m_pBlBtns[BTN_JOG_SUB]->SetFrameColor(BS_NORMAL, BTN_JOG_FRAME_NORMAL);
+	m_pBlBtns[BTN_JOG_SUB]->SetFrameColor(BS_HOVER, BTN_JOG_FRAME_HOVER);
+	m_pBlBtns[BTN_JOG_SUB]->SetFrameColor(BS_PRESS, BTN_JOG_FRAME_PRESS);
+	m_pBlBtns[BTN_JOG_SUB]->SetBkgndColor(BS_NORMAL, BTN_JOG_BKGND_NORMAL);
+	m_pBlBtns[BTN_JOG_SUB]->SetBkgndColor(BS_HOVER, BTN_JOG_BKGND_HOVER);
+	m_pBlBtns[BTN_JOG_SUB]->SetBkgndColor(BS_PRESS, BTN_JOG_BKGND_PRESS);
+	m_pBlBtns[BTN_JOG_SEV]->SubclassDlgItem(IDC_BUTTON_AXIS_SEV, this);
+	m_pBlBtns[BTN_JOG_SEV]->SetFrameColor(BS_NORMAL, BTN_SEV_FRAME_NORMAL);
+	m_pBlBtns[BTN_JOG_SEV]->SetFrameColor(BS_HOVER, BTN_SEV_FRAME_HOVER);
+	m_pBlBtns[BTN_JOG_SEV]->SetFrameColor(BS_PRESS, BTN_SEV_FRAME_PRESS);
+	m_pBlBtns[BTN_JOG_SEV]->SetBkgndColor(BS_NORMAL, BTN_SEV_BKGND_NORMAL);
+	m_pBlBtns[BTN_JOG_SEV]->SetBkgndColor(BS_HOVER, BTN_SEV_BKGND_HOVER);
+	m_pBlBtns[BTN_JOG_SEV]->SetBkgndColor(BS_PRESS, BTN_SEV_BKGND_PRESS);
+	m_pBlBtns[BTN_JOG_STOP]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_STOP, this);
+	m_pBlBtns[BTN_JOG_STOP]->SetFrameColor(BS_NORMAL, BTN_STOP_FRAME_NORMAL);
+	m_pBlBtns[BTN_JOG_STOP]->SetFrameColor(BS_HOVER, BTN_STOP_FRAME_HOVER);
+	m_pBlBtns[BTN_JOG_STOP]->SetFrameColor(BS_PRESS, BTN_STOP_FRAME_PRESS);
+	m_pBlBtns[BTN_JOG_STOP]->SetBkgndColor(BS_NORMAL, BTN_STOP_BKGND_NORMAL);
+	m_pBlBtns[BTN_JOG_STOP]->SetBkgndColor(BS_HOVER, BTN_STOP_BKGND_HOVER);
+	m_pBlBtns[BTN_JOG_STOP]->SetBkgndColor(BS_PRESS, BTN_STOP_BKGND_PRESS);
+	m_pBlBtns[BTN_JOG_OPR]->SubclassDlgItem(IDC_BUTTON_AXIS_TEST_OPR, this);
+	m_pBlBtns[BTN_JOG_OPR]->SetFrameColor(BS_NORMAL, BTN_OPR_FRAME_NORMAL);
+	m_pBlBtns[BTN_JOG_OPR]->SetFrameColor(BS_HOVER, BTN_OPR_FRAME_HOVER);
+	m_pBlBtns[BTN_JOG_OPR]->SetFrameColor(BS_PRESS, BTN_OPR_FRAME_PRESS);
+	m_pBlBtns[BTN_JOG_OPR]->SetBkgndColor(BS_NORMAL, BTN_OPR_BKGND_NORMAL);
+	m_pBlBtns[BTN_JOG_OPR]->SetBkgndColor(BS_HOVER, BTN_OPR_BKGND_HOVER);
+	m_pBlBtns[BTN_JOG_OPR]->SetBkgndColor(BS_PRESS, BTN_OPR_BKGND_PRESS);
+	static UINT btnPointIds[] = { IDC_BUTTON_AXIS_ANCHOR_POINT1, IDC_BUTTON_AXIS_ANCHOR_POINT2,
+		IDC_BUTTON_AXIS_ANCHOR_POINT3, IDC_BUTTON_AXIS_ANCHOR_POINT4, IDC_BUTTON_AXIS_ANCHOR_POINT5};
+	for (int i = 0; i < 5; i++) {
+		m_pBlBtns[BTN_POINT1 + i]->SubclassDlgItem(btnPointIds[i], this);
+		m_pBlBtns[BTN_POINT1 + i]->SetFrameColor(BS_NORMAL, BTN_POINT_FRAME_NORMAL);
+		m_pBlBtns[BTN_POINT1 + i]->SetFrameColor(BS_HOVER, BTN_POINT_FRAME_HOVER);
+		m_pBlBtns[BTN_POINT1 + i]->SetFrameColor(BS_PRESS, BTN_POINT_FRAME_PRESS);
+		m_pBlBtns[BTN_POINT1 + i]->SetBkgndColor(BS_NORMAL, BTN_POINT_BKGND_NORMAL);
+		m_pBlBtns[BTN_POINT1 + i]->SetBkgndColor(BS_HOVER, BTN_POINT_BKGND_HOVER);
+		m_pBlBtns[BTN_POINT1 + i]->SetBkgndColor(BS_PRESS, BTN_POINT_BKGND_PRESS);
 	}
 
 	// 鍒濆鍖栧綋鍓嶉〉闈负绗竴椤�
@@ -677,47 +1018,120 @@
 BOOL CAxisSettingsDlg::PreTranslateMessage(MSG* pMsg)
 {
 	// TODO: 鍦ㄦ娣诲姞涓撶敤浠ｇ爜鍜�/鎴栬皟鐢ㄥ熀绫�
+	CWnd* pWnd = CWnd::FromHandle(pMsg->hwnd);
 
-	if (pMsg->message == WM_LBUTTONDOWN)
-	{
-		if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd)
-		{
-			TRACE("JOG+ 鎸夐挳鎸変笅\n");
-			m_bJogAddPressed = TRUE;
-
-			// 鍚姩瀹氭椂鍣ㄨ繛缁彂閫佷俊鍙�
-			SetTimer(TIMER_JOG_ADD, 200, nullptr);
-			handleAxisOperation(AxisOperationType::JOG_ADD, true);
+	if (pWnd) {
+		if (pMsg->message == WM_KEYDOWN && pMsg->wParam == VK_RETURN) {
+			// 闃绘鍥炶溅閿粯璁ゅ鐞嗭紝闃叉瀵硅瘽妗嗗叧闂�
+			return TRUE;
 		}
-		else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd)
-		{
-			TRACE("JOG- 鎸夐挳鎸変笅\n");
-			m_bJogSubPressed = TRUE;
 
-			// 鍚姩瀹氭椂鍣ㄨ繛缁彂閫佷俊鍙�
-			SetTimer(TIMER_JOG_SUB, 200, nullptr);
-			handleAxisOperation(AxisOperationType::JOG_SUB, true);
+		// 鍒ゆ柇榧犳爣鏄惁杩涘叆鎸囧畾鎺т欢鍖哄煙
+		if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP1)->m_hWnd ||
+			pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP2)->m_hWnd ||
+			pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP3)->m_hWnd ||
+			pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP4)->m_hWnd ||
+			pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP5)->m_hWnd) {
+			RecipeManager& recipeManager = RecipeManager::getInstance();
+			int currentIndex = -1;
+
+			// 鏍规嵁鎺т欢ID纭畾 currentIndex
+			if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP1)->m_hWnd) {
+				currentIndex = 0;
+			}
+			else if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP2)->m_hWnd) {
+				currentIndex = 1;
+			}
+			else if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP3)->m_hWnd) {
+				currentIndex = 2;
+			}
+			else if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP4)->m_hWnd) {
+				currentIndex = 3;
+			}
+			else if (pWnd->GetSafeHwnd() == GetDlgItem(IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP5)->m_hWnd) {
+				currentIndex = 4;
+			}
+
+			if (currentIndex == -1) {
+				return CDialogEx::PreTranslateMessage(pMsg);
+			}
+
+			CString descriptionCtrlName, positionCtrlName;
+			descriptionCtrlName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT_DESCRIP%d"), currentIndex + 1);
+			positionCtrlName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT%d"), currentIndex + 1);
+
+			UINT descriptionCtrlId = FindIDByName(descriptionCtrlName);
+			UINT positionCtrlId = FindIDByName(positionCtrlName);
+
+			CWnd* pDescriptionCtrl = GetDlgItem(descriptionCtrlId);
+			CWnd* pPositionCtrl = GetDlgItem(positionCtrlId);
+
+			if (pDescriptionCtrl == nullptr || pPositionCtrl == nullptr) {
+				return CDialogEx::PreTranslateMessage(pMsg);
+			}
+
+			PositionRange& position = recipeManager.getPositionByIndex(getCurrentSelectedAxisID(), m_currentPage, AXIS_PAGE_SIZE, currentIndex);
+			if (pMsg->message == WM_LBUTTONDOWN || pMsg->message == WM_LBUTTONDBLCLK) {
+				// 澶勭悊榧犳爣鐐瑰嚮浜嬩欢
+				// 璁剧疆榧犳爣涓虹澶村厜鏍�
+				::SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW));
+
+				CString strText;
+				GetDlgItem(IDC_EDIT_AXIS_CURR_POS)->GetWindowText(strText);
+				if (strText.IsEmpty()) {
+					return CDialogEx::PreTranslateMessage(pMsg);;
+				}
+
+				double enteredValue = _ttof(strText);
+				double minValue = position.range.minValue;
+				double maxValue = position.range.maxValue;
+
+				// 鍒ゆ柇杈撳叆鐨勫�兼槸鍚﹀湪鍚堟硶鑼冨洿鍐�
+				if (enteredValue < minValue || enteredValue > maxValue) {
+					CString strError;
+					strError.Format(_T("瀹氫綅鐐圭殑鍊煎繀椤诲湪 %f 鍜� %f 涔嬮棿锛�"), minValue, maxValue);
+					pDescriptionCtrl->SetWindowText(strError);
+				}
+				else {
+					position.range.currentValue = enteredValue;
+					pPositionCtrl->SetWindowText(strText);
+				}
+			}
+			else if (pMsg->message == WM_LBUTTONUP) {
+				// 澶勭悊榧犳爣鎶捣浜嬩欢
+				// 璁剧疆榧犳爣涓烘墜褰㈠厜鏍�
+				::SetCursor(AfxGetApp()->LoadStandardCursor(IDC_HAND));
+
+				CString strText;
+				strText.Format(_T("%s"), position.description.c_str());
+				pDescriptionCtrl->SetWindowText(strText);
+			}
+			else if (pMsg->message == WM_MOUSEMOVE) {
+				// 澶勭悊榧犳爣绉诲姩浜嬩欢
+				::SetCursor(AfxGetApp()->LoadStandardCursor(IDC_HAND));
+			}
 		}
-	}
-	else if (pMsg->message == WM_LBUTTONUP)
-	{
-		if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd)
-		{
-			TRACE("JOG+ 鎸夐挳鏉惧紑\n");
-			m_bJogAddPressed = FALSE;
 
-			// 鍋滄瀹氭椂鍣�
-			KillTimer(TIMER_JOG_ADD);
-			handleAxisOperation(AxisOperationType::JOG_ADD, false);
+		if (pMsg->message == WM_LBUTTONDOWN) {
+			if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd) {
+				TRACE("JOG+ 鎸夐挳鎸変笅\n");
+				handleAxisOperation(AxisOperationType::JOG_ADD, true);
+			}
+			else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd) {
+				TRACE("JOG- 鎸夐挳鎸変笅\n");
+				// 鍚姩瀹氭椂鍣ㄨ繛缁彂閫佷俊鍙�
+				handleAxisOperation(AxisOperationType::JOG_SUB, true);
+			}
 		}
-		else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd)
-		{
-			TRACE("JOG- 鎸夐挳鏉惧紑\n");
-			m_bJogSubPressed = FALSE;
-
-			// 鍋滄瀹氭椂鍣�
-			KillTimer(TIMER_JOG_SUB);
-			handleAxisOperation(AxisOperationType::JOG_SUB, false);
+		else if (pMsg->message == WM_LBUTTONUP) {
+			if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd) {
+				TRACE("JOG+ 鎸夐挳鏉惧紑\n");
+				handleAxisOperation(AxisOperationType::JOG_ADD, false);
+			}
+			else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd) {
+				TRACE("JOG- 鎸夐挳鏉惧紑\n");
+				handleAxisOperation(AxisOperationType::JOG_SUB, false);
+			}
 		}
 	}
 
@@ -740,8 +1154,7 @@
 	AdjustControls(dScaleX, dScaleY);
 
 	// 鍔ㄦ�佽皟鏁村悇涓� CBLLabel 鐨勫瓧浣撳ぇ灏�
-	CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
-	for (auto pLabel : pLabels) {
+	for (auto pLabel : m_pBlLabels) {
 		AdjustLabelFont(*pLabel);
 	}
 
@@ -838,42 +1251,69 @@
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
 	handleAxisOperation(AxisOperationType::POSITION_1, true);
+	Sleep(200);
+	handleAxisOperation(AxisOperationType::POSITION_1, false);
+	m_pBlBtns[BTN_POINT1]->Flash(500);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint2()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
 	handleAxisOperation(AxisOperationType::POSITION_2, true);
+	Sleep(200);
+	handleAxisOperation(AxisOperationType::POSITION_2, false);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint3()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
 	handleAxisOperation(AxisOperationType::POSITION_3, true);
+	Sleep(200);
+	handleAxisOperation(AxisOperationType::POSITION_3, false);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint4()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
 	handleAxisOperation(AxisOperationType::POSITION_4, true);
+	Sleep(200);
+	handleAxisOperation(AxisOperationType::POSITION_4, false);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint5()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
 	handleAxisOperation(AxisOperationType::POSITION_5, true);
+	Sleep(200);
+	handleAxisOperation(AxisOperationType::POSITION_5, false);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisTestOpr()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
 	handleAxisOperation(AxisOperationType::OPR, true);
+	Sleep(200);
+	handleAxisOperation(AxisOperationType::OPR, false);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisTestStop()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
 	handleAxisOperation(AxisOperationType::STOP, true);
+	Sleep(200);
+	handleAxisOperation(AxisOperationType::STOP, false);
+	m_pBlBtns[BTN_JOG_OPR]->StopFlash();
+	m_pBlBtns[BTN_POINT1]->StopFlash();
+	m_pBlBtns[BTN_POINT2]->StopFlash();
+	m_pBlBtns[BTN_POINT3]->StopFlash();
+	m_pBlBtns[BTN_POINT3]->StopFlash();
+	m_pBlBtns[BTN_POINT4]->StopFlash();
+}
+
+void CAxisSettingsDlg::OnBnClickedButtonAxisSev()
+{
+	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	handleAxisOperation(AxisOperationType::SEV_ON, !m_bSEV);
 }
 
 void CAxisSettingsDlg::OnSelchangeComboAxisName()
@@ -909,6 +1349,7 @@
 	updateDataFromUI(axisId);
 	if (RecipeManager::getInstance().saveRecipe(std::string(CT2A(m_strRecipeName)))) {
 		writeAxisDataToPLC(axisId);
+
 		cstrMessage.Format(_T("淇濆瓨杞� [%d] 鍙傛暟鎴愬姛锛�"), axisId);
 		SystemLogManager::getInstance().log(SystemLogManager::LogType::Operation, std::string(CT2A(cstrMessage)));
 	}
@@ -920,45 +1361,165 @@
 	AfxMessageBox(cstrMessage);
 }
 
+void CAxisSettingsDlg::OnBnClickedButtonAxisUpdateUi()
+{
+	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	int axisId = getCurrentSelectedAxisID();
+	if (axisId == -1) {
+		AfxMessageBox(_T("璇烽�夋嫨涓�涓湁鏁堢殑杞寸紪鍙凤紒"));
+		return;
+	}
+
+	refreshAxisDetails(axisId);
+	refreshPositionDetails(axisId, m_currentPage);
+}
+
+void CAxisSettingsDlg::OnBnClickedButtonAxisDetailSettings()
+{
+	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	int nAxisId = getCurrentSelectedAxisID();
+	if (nAxisId == -1) {
+		AfxMessageBox(_T("璇烽�夋嫨涓�涓湁鏁堢殑杞寸紪鍙凤紒"));
+		return;
+	}
+
+	CAxisDetailSettingsDlg dlg(m_strRecipeName, nAxisId, this);
+	dlg.SetPLC(m_pPLC);
+	dlg.DoModal();
+
+	refreshAxisDetails(nAxisId);
+	refreshPositionDetails(nAxisId, m_currentPage);
+}
+
+LRESULT CAxisSettingsDlg::OnUpdateDataToUI(WPARAM wParam, LPARAM lParam)
+{
+	CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_POS, m_fCurPos);
+	CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_MANUAL_SPEED, m_fManualSpeed);
+	CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_AUTO_SPEED, m_fAutoSpeed);
+	CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_ROTA_SPEED, m_fPrm);
+	SetDlgItemInt(IDC_EDIT_AXIS_CURR_LOAD, m_nLoad);
+	SetDlgItemInt(IDC_EDIT_AXIS_CURR_ERROR_NUMBER, m_nErrCode);
+	SetDlgItemInt(IDC_EDIT_AXIS_CURR_ALARM_NUMBER, m_nAlarmCode);
+
+	// 鏇存柊Labels鐘舵��
+	UpdateLabels();
+
+	// 鏇存柊涓嶅彲鍐欑殑瀹氫綅鐐规暟鎹�
+	RecipeManager& recipeManager = RecipeManager::getInstance();
+	for (int i = 0; i < AXIS_PAGE_SIZE; ++i) {
+		PositionRange position = recipeManager.getPositionByIndex(getCurrentSelectedAxisID(), m_currentPage, AXIS_PAGE_SIZE, 0);
+		if (position.isEnable) {
+			continue;
+		}
+
+		CString positionName;
+		positionName.Format(_T("IDC_EDIT_AXIS_ANCHOR_POINT%d"), i + 1);
+
+		CEdit* pPositionEdit = (CEdit*)GetDlgItem(FindIDByName(positionName));
+		if (pPositionEdit) {
+			CString positionValue;
+			positionValue.Format(_T("%.3f"), position.range.currentValue);
+			pPositionEdit->GetWindowText(positionValue);
+		}
+	}
+	
+	// OPR鎸夐挳鏄惁瑕侀棯鐑佹垨鍋滄闂儊
+	// 06.0鍜�08.0
+	if (m_nBtnsFlashState6 & 0x01) {
+		// 06.0
+		if (!m_pBlBtns[BTN_JOG_OPR]->IsFlash()) {
+			m_pBlBtns[BTN_JOG_OPR]->Flash(500);
+		}
+	}
+	else if (m_nBtnsFlashState8 & 0x01) {
+		if (m_pBlBtns[BTN_JOG_OPR]->IsFlash()) {
+			m_pBlBtns[BTN_JOG_OPR]->StopFlash();
+		}
+	}
+
+	int v = 0x02;
+	if (m_currentPage > 1) {
+		v = v << (5 * (m_currentPage - 1));
+	}
+
+	if (m_nBtnsFlashState6 & v) {
+		if (!m_pBlBtns[BTN_POINT1]->IsFlash()) {
+			m_pBlBtns[BTN_POINT1]->Flash(500);
+		}
+	}
+	else if (m_nBtnsFlashState8 & v) {
+		if (m_pBlBtns[BTN_POINT1]->IsFlash()) {
+			m_pBlBtns[BTN_POINT1]->StopFlash();
+		}
+	}
+
+	if (m_nBtnsFlashState6 & (v << 1)) {
+		if (!m_pBlBtns[BTN_POINT2]->IsFlash()) {
+			m_pBlBtns[BTN_POINT2]->Flash(500);
+		}
+	}
+	else if (m_nBtnsFlashState8 & (v << 1)) {
+		if (m_pBlBtns[BTN_POINT2]->IsFlash()) {
+			m_pBlBtns[BTN_POINT2]->StopFlash();
+		}
+	}
+
+	if (m_nBtnsFlashState6 & (v << 2)) {
+		if (!m_pBlBtns[BTN_POINT3]->IsFlash()) {
+			m_pBlBtns[BTN_POINT3]->Flash(500);
+		}
+	}
+	else if (m_nBtnsFlashState8 & (v << 2)) {
+		if (m_pBlBtns[BTN_POINT3]->IsFlash()) {
+			m_pBlBtns[BTN_POINT3]->StopFlash();
+		}
+	}
+
+	if (m_nBtnsFlashState6 & (v << 3)) {
+		if (!m_pBlBtns[BTN_POINT4]->IsFlash()) {
+			m_pBlBtns[BTN_POINT4]->Flash(500);
+		}
+	}
+	else if (m_nBtnsFlashState8 & (v << 3)) {
+		if (m_pBlBtns[BTN_POINT4]->IsFlash()) {
+			m_pBlBtns[BTN_POINT4]->StopFlash();
+		}
+	}
+
+	if (m_nBtnsFlashState6 & (v << 4)) {
+		if (!m_pBlBtns[BTN_POINT5]->IsFlash()) {
+			m_pBlBtns[BTN_POINT5]->Flash(500);
+		}
+	}
+	else if (m_nBtnsFlashState8 & (v << 4)) {
+		if (m_pBlBtns[BTN_POINT5]->IsFlash()) {
+			m_pBlBtns[BTN_POINT5]->StopFlash();
+		}
+	}
+
+	return 0;
+}
+
 void CAxisSettingsDlg::OnTimer(UINT_PTR nIDEvent)
 {
 	if (TIMER_READ_PLC_DATA == nIDEvent) {
 		ASSERT(m_pPLC);
 
-		int addr1, addr2, readSize;
-		addr1 = 5120;
-		addr2 = 5425;
-		readSize = (addr2 - addr1 + 1) * 2;
-		auto funOnReadData = [&, addr1, readSize](IMcChannel* pChannel, int addr, char* pData, unsigned int nDataSize, int flag) -> void {
-			if (nDataSize == readSize && flag == 0) {
-				double fCurPos = CToolUnits::toInt32(pData) * 0.001;
-				double fManualSpeed = CToolUnits::toInt32(&pData[(5422- addr1)*2]) * 0.001;
-				double fAutoSpeed = CToolUnits::toInt32(&pData[(5424 - addr1) * 2]) * 0.001;
-				double fPrm = CToolUnits::toInt32(&pData[(5150 - addr1) * 2]) * 0.1;
-				int nLoad = CToolUnits::toInt16(&pData[(5154 - addr1) * 2]);
-				int nErrCode = CToolUnits::toInt16(&pData[(5126 - addr1) * 2]);
-				int nAlarmCode = CToolUnits::toInt16(&pData[(5127 - addr1) * 2]);
-				CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_POS, fCurPos);
-				CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_MANUAL_SPEED, fManualSpeed);
-				CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_AUTO_SPEED, fAutoSpeed);
-				CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_ROTA_SPEED, fPrm);
-				SetDlgItemInt(IDC_EDIT_AXIS_CURR_LOAD, nLoad);
-				SetDlgItemInt(IDC_EDIT_AXIS_CURR_ERROR_NUMBER, nErrCode);
-				SetDlgItemInt(IDC_EDIT_AXIS_CURR_ALARM_NUMBER, nAlarmCode);
-			}
-		};
-		m_pPLC->readData(MC::SOFT_COMPONENT::D, addr1, readSize, funOnReadData);
+		int nAxisId = getCurrentSelectedAxisID();
+		if (nAxisId == -1) {
+			return;
+		}
+
+		readPLCDataToUI(nAxisId);
 	}	
-	else if (nIDEvent == TIMER_JOG_ADD && m_bJogAddPressed) {
-		TRACE("鎸佺画鍙戦�� JOG+\n");
-		handleAxisOperation(AxisOperationType::JOG_ADD, true); // 鎸佺画鍙戦�� JOG+
-		Sleep(20);
-	}
-	else if (nIDEvent == TIMER_JOG_SUB && m_bJogSubPressed) {
-		TRACE("鎸佺画鍙戦�� JOG-\n");
-		handleAxisOperation(AxisOperationType::JOG_SUB, true); // 鎸佺画鍙戦�� JOG-
-		Sleep(20);
-	}
 
 	CDialogEx::OnTimer(nIDEvent);
 }
+
+void CAxisSettingsDlg::OnClose()
+{
+	// TODO: 鍦ㄦ娣诲姞娑堟伅澶勭悊绋嬪簭浠ｇ爜鍜�/鎴栬皟鐢ㄩ粯璁ゅ��
+	KillTimer(TIMER_READ_PLC_DATA);
+
+	CDialogEx::OnClose();
+}

--
Gitblit v1.9.3