From 2d8047ec3451b7b411812970ee7b149bf1a9b2d6 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 十二月 2024 09:21:46 +0800
Subject: [PATCH] 1.轴参数设定，调试，合并；

---
 SourceCode/Bond/BondEq/AxisSettingsDlg.cpp      |  376 ++++++++++++++++++++--------
 SourceCode/Bond/BondEq/AxisSettingsDlg.h        |   26 +
 SourceCode/Bond/BondEq/ToolUnits.h              |    5 
 SourceCode/Bond/BondEq/View/AxisSettingsDlg.h   |   11 
 SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp |  267 +++++++++++---------
 SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp |    8 
 SourceCode/Bond/BondEq/ToolUnits.cpp            |   50 +++
 SourceCode/Bond/BondEq/BondEq.vcxproj           |    2 
 8 files changed, 494 insertions(+), 251 deletions(-)

diff --git a/SourceCode/Bond/BondEq/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/AxisSettingsDlg.cpp
index dcdc219..36e7b07 100644
--- a/SourceCode/Bond/BondEq/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/AxisSettingsDlg.cpp
@@ -9,10 +9,13 @@
 #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 TIMER_INIT					1
+#define TIMER_READ_PLC_DATA			2
+#define TIMER_JOG_ADD				3
+#define TIMER_JOG_SUB				4
+
+// OnUpdateDataToUI
+#define ID_MSG_UPDATA_DATA_TO_UI	WM_USER + 101
 
 // CAxisSettingsDlg 瀵硅瘽妗�
 
@@ -24,6 +27,21 @@
 	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;
 }
 
 CAxisSettingsDlg::~CAxisSettingsDlg()
@@ -191,15 +209,9 @@
 	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();            // 绔嬪嵆鍒锋柊
 }
@@ -421,24 +433,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 * 1000, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鎵嬪姩閫熷害, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -448,7 +523,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 * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鑷姩閫熷害, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -458,7 +533,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 * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鍔犻�熸椂闂�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -468,7 +543,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 * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 鍑忛�熸椂闂�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -478,7 +553,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 * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
 		if (flag == 0) {
 			TRACE("\n鍐欏叆鎴愬姛: 寰姩閲�, 鍦板潃: %d, 鍊�: %lu\n", addr, value);
 		}
@@ -488,20 +563,21 @@
 	});
 
 	// 鍐欏叆瀹氫綅鐐规暟鎹�
-	int positionStartAddress = startAddress + 10;
+	int positionStartAddress = startAddress + 100;
 	for (size_t 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) {
+		m_pPLC->writeDWord(component, positionAddress, (int)(position.second * 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);
 			}
 		});
 	}
+	
 }
 
 void CAxisSettingsDlg::handleAxisOperation(AxisOperationType eOpType, bool bPressed)
@@ -516,45 +592,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 +637,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 +645,44 @@
 			TRACE("鎿嶄綔澶辫触锛氱被鍨�=%d锛屽湴鍧�=%d锛岄敊璇爜=%d\n", static_cast<int>(eOpType), nAddr, nFlag);
 		}
 	});
+}
+
+void CAxisSettingsDlg::readPLCDataToUI(int nAxisId)
+{
+	// 浠� RecipeManager 鑾峰彇杞存暟鎹�
+	RecipeManager& recipeManager = RecipeManager::getInstance();
+	auto 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 = [&, 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);
+
+			PostMessage(ID_MSG_UPDATA_DATA_TO_UI);
+		}
+	};
+	m_pPLC->readData(component, startAddress, readSize, funOnReadData);
 }
 
 
@@ -590,10 +703,13 @@
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_TEST_STOP, &CAxisSettingsDlg::OnBnClickedButtonAxisTestStop)
 	ON_CBN_SELCHANGE(IDC_COMBO_AXIS_NAME, &CAxisSettingsDlg::OnSelchangeComboAxisName)
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_SAVE, &CAxisSettingsDlg::OnBnClickedButtonAxisSave)
+	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()
+	ON_BN_CLICKED(IDC_BUTTON_AXIS_SEV, &CAxisSettingsDlg::OnBnClickedButtonAxisSev)
 END_MESSAGE_MAP()
 
 
@@ -612,7 +728,7 @@
 	// 璁剧疆娴嬭瘯鐘舵��
 	CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
 	for (auto pLabel : pLabels) {
-		SetStatusColor(*pLabel, FALSE);
+		pLabel->SetBkColor(RGB(0, 180, 0));
 		pLabel->ModifyStyle(0, SS_NOTIFY);
 		pLabel->SetTextColor(RGB(255, 255, 255));
 		pLabel->SetAlignment(AlignCenter);
@@ -678,45 +794,24 @@
 {
 	// TODO: 鍦ㄦ娣诲姞涓撶敤浠ｇ爜鍜�/鎴栬皟鐢ㄥ熀绫�
 
-	if (pMsg->message == WM_LBUTTONDOWN)
-	{
-		if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_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);
 		}
-		else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd)
-		{
+		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);
 		}
 	}
-	else if (pMsg->message == WM_LBUTTONUP)
-	{
-		if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd)
-		{
+	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);
 		}
-		else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd)
-		{
+		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);
 		}
 	}
@@ -838,42 +933,56 @@
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
 	handleAxisOperation(AxisOperationType::POSITION_1, true);
+	Sleep(200);
+	handleAxisOperation(AxisOperationType::POSITION_1, false);
 }
 
 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);
 }
 
 void CAxisSettingsDlg::OnSelchangeComboAxisName()
@@ -920,45 +1029,88 @@
 	AfxMessageBox(cstrMessage);
 }
 
+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);
+
+	//OPR 淇″彿
+	if (m_bFLS) {
+		SetLabelColor(m_staticFLS, RGB(0, 255, 0));
+	}
+	else {
+		SetLabelColor(m_staticFLS, RGB(0, 180, 0));
+	}
+
+	if (m_bDOG) {
+		SetLabelColor(m_staticDOG, RGB(0, 255, 0));
+	}
+	else {
+		SetLabelColor(m_staticDOG, RGB(0, 180, 0));
+	}
+
+	if (m_bRLS) {
+		SetLabelColor(m_staticRLS, RGB(0, 255, 0));
+	}
+	else {
+		SetLabelColor(m_staticRLS, RGB(0, 180, 0));
+	}
+
+	if (m_bReady) {
+		SetLabelColor(m_staticReady, RGB(0, 255, 0));
+	}
+	else {
+		SetLabelColor(m_staticReady, RGB(0, 180, 0));
+	}
+
+	if (m_bBusy) {
+		SetLabelColor(m_staticBusy, RGB(0, 255, 0));
+	}
+	else {
+		SetLabelColor(m_staticBusy, RGB(0, 180, 0));
+	}
+
+	if (m_bErr) {
+		SetLabelColor(m_staticErr, RGB(255, 0, 0));
+	}
+	else {
+		SetLabelColor(m_staticErr, RGB(0, 180, 0));
+	}
+
+	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();
+}
+
+void CAxisSettingsDlg::OnBnClickedButtonAxisSev()
+{
+	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+	handleAxisOperation(AxisOperationType::SEV_ON, !m_bSEV);
+}
diff --git a/SourceCode/Bond/BondEq/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/AxisSettingsDlg.h
index bd1f4d6..688f61b 100644
--- a/SourceCode/Bond/BondEq/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/AxisSettingsDlg.h
@@ -11,6 +11,7 @@
 	JOG_ADD,    // 姝ｅ悜鐐瑰姩
 	JOG_SUB,    // 鍙嶅悜鐐瑰姩
 	STOP,		// 鍋滄鎿嶄綔
+	SEV_ON,		// 浣胯兘
 	POSITION_1, // 瀹氫綅鐐�1
 	POSITION_2, // 瀹氫綅鐐�2
 	POSITION_3, // 瀹氫綅鐐�3
@@ -42,7 +43,7 @@
 	void AdjustControls(float dScaleX, float dScaleY);
 	void AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight);
 	void AdjustLabelFont(CBLLabel& label);
-	void SetStatusColor(CBLLabel& label, BOOL bStatus);
+	void SetLabelColor(CBLLabel& label, COLORREF color);
 	void updatePageButtonStates();
 	int getCurrentSelectedAxisID();
 	void initializeAxisIDCombo();
@@ -51,9 +52,10 @@
 	void updateAxisSelection(int offset);
 	void updateDataFromUI(int nAxisId);
 	void switchToPage(int targetPage);
+	bool ParsePLCAddress(const CString& address, MC::SOFT_COMPONENT& component, int& addr);
 	void writeAxisDataToPLC(int nAxisId);
 	void handleAxisOperation(AxisOperationType eOpType, bool bPressed);
-
+	void readPLCDataToUI(int nAxisId);
 
 private:
 	CPLC* m_pPLC;
@@ -80,6 +82,22 @@
 	std::map<int, CRect> m_mapCtrlLayouts;
 	std::map<int, CFont*> m_mapFonts;
 
+	// 璇诲埌鐨勬暟鎹�
+	BOOL m_bSEV;
+	double m_fCurPos;
+	double m_fManualSpeed;
+	double m_fAutoSpeed;
+	double m_fPrm;
+	int m_nLoad;
+	int m_nErrCode;
+	int m_nAlarmCode;
+	BOOL m_bFLS;
+	BOOL m_bDOG;
+	BOOL m_bRLS;
+	BOOL m_bReady;
+	BOOL m_bBusy;
+	BOOL m_bErr;
+
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 鏀寔
 	virtual BOOL OnInitDialog();
@@ -103,6 +121,10 @@
 	afx_msg void OnBnClickedButtonAxisTestStop();
 	afx_msg void OnSelchangeComboAxisName();
 	afx_msg void OnBnClickedButtonAxisSave();
+	afx_msg LRESULT OnUpdateDataToUI(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
+	afx_msg void OnClose();
 	DECLARE_MESSAGE_MAP()
+public:
+	afx_msg void OnBnClickedButtonAxisSev();
 };
diff --git a/SourceCode/Bond/BondEq/BondEq.vcxproj b/SourceCode/Bond/BondEq/BondEq.vcxproj
index a8fc121..f39bd84 100644
--- a/SourceCode/Bond/BondEq/BondEq.vcxproj
+++ b/SourceCode/Bond/BondEq/BondEq.vcxproj
@@ -355,7 +355,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties RESOURCE_FILE="BondServo.rc" />
+      <UserProperties RESOURCE_FILE="" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/SourceCode/Bond/BondEq/ToolUnits.cpp b/SourceCode/Bond/BondEq/ToolUnits.cpp
index 69be431..f9022f8 100644
--- a/SourceCode/Bond/BondEq/ToolUnits.cpp
+++ b/SourceCode/Bond/BondEq/ToolUnits.cpp
@@ -150,12 +150,12 @@
 	return (attributes != INVALID_FILE_ATTRIBUTES && (attributes & FILE_ATTRIBUTE_DIRECTORY));
 }
 
-double CToolUnits::toInt32(const char* pBuffer)
+int CToolUnits::toInt32(const char* pBuffer)
 {
 	return (pBuffer[0] & 0xff) | (pBuffer[1] & 0xff) << 8 | (pBuffer[2] & 0xff) << 16 | (pBuffer[3] & 0xff) << 24;
 }
 
-double CToolUnits::toInt16(const char* pBuffer)
+int CToolUnits::toInt16(const char* pBuffer)
 {
 	return (pBuffer[0] & 0xff) | (pBuffer[1] & 0xff) << 8;
 }
@@ -195,6 +195,52 @@
 	return FALSE;
 }
 
+void CToolUnits::setBit(char* p, int index)
+{
+	int byteIndex = 0;
+	byte b = 0;
+	if (index >= 8) byteIndex = 1;
+	switch (index)
+	{
+	case 0:
+	case 8:
+		b = 0x1;
+		break;
+	case 1:
+	case 9:
+		b = 0x2;
+		break;
+	case 2:
+	case 0xA:
+		b = 0x4;
+		break;
+	case 3:
+	case 0xB:
+		b = 0x8;
+		break;
+	case 4:
+	case 0xC:
+		b = 0x10;
+		break;
+	case 5:
+	case 0xD:
+		b = 0x20;
+		break;
+	case 6:
+	case 0xE:
+		b = 0x40;
+		break;
+	case 7:
+	case 0xF:
+		b = 0x80;
+		break;
+	default:
+		break;
+	}
+
+	p[byteIndex] = b;
+}
+
 void CToolUnits::setDlgItemDouble(CWnd* pWnd, int nCtrlId, double value)
 {
 	CString strText;
diff --git a/SourceCode/Bond/BondEq/ToolUnits.h b/SourceCode/Bond/BondEq/ToolUnits.h
index ad88f75..cfd7de0 100644
--- a/SourceCode/Bond/BondEq/ToolUnits.h
+++ b/SourceCode/Bond/BondEq/ToolUnits.h
@@ -20,9 +20,10 @@
 	static std::string getCurrentExePath();
 	static bool isFile(const std::string& path);
 	static bool isDirectory(const std::string& path);
-	static double toInt32(const char* pBuffer);
-	static double toInt16(const char* pBuffer);
+	static int toInt32(const char* pBuffer);
+	static int toInt16(const char* pBuffer);
 	static BOOL getBit(const char c, int index);
+	static void setBit(char* p, int index);
 	static void setDlgItemDouble(CWnd* pWnd, int nCtrlId, double value);
 };
 
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index 77bc579..7ac933d 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
@@ -11,8 +11,6 @@
 
 #define TIMER_INIT				1
 #define TIMER_READ_PLC_DATA		2
-#define TIMER_JOG_ADD           3
-#define TIMER_JOG_SUB           4
 
 // CAxisSettingsDlg 瀵硅瘽妗�
 
@@ -24,6 +22,8 @@
 	m_nInitialWidth = 0;
 	m_nInitialHeight = 0;
 	m_pPLC = nullptr;
+	m_bJogAddState = FALSE;
+	m_bJogSubState = FALSE;
 }
 
 CAxisSettingsDlg::~CAxisSettingsDlg()
@@ -191,17 +191,11 @@
 	label.UpdateWindow();
 }
 
-void CAxisSettingsDlg::SetStatusColor(CBLLabel& label, BOOL bStatus)
+void CAxisSettingsDlg::SetLabelColor(CBLLabel& label, COLORREF clr)
 {
-	if (bStatus) {
-		label.SetBkColor(RGB(0, 255, 0)); // 缁胯壊
-	}
-	else {
-		label.SetBkColor(RGB(255, 0, 0)); // 绾㈣壊
-	}
-
-	label.Invalidate();              // 鏍囪鍖哄煙鏃犳晥
-	label.UpdateWindow();            // 绔嬪嵆鍒锋柊
+	label.SetBkColor(clr);
+	label.Invalidate();               // 鏍囪鍖哄煙鏃犳晥
+	label.UpdateWindow();             // 绔嬪嵆鍒锋柊
 }
 
 void CAxisSettingsDlg::updatePageButtonStates()
@@ -588,34 +582,37 @@
 	}
 
 	// 鏍规嵁鎿嶄綔绫诲瀷璁＄畻鐩爣鍦板潃
-	int nTargetAddress = startAddress + 10;
+	char szWrite[4] = {0x0, 0x0, 0x0, 0x0};
 	switch (eOpType) {
 	case AxisOperationType::OPR:
-		nTargetAddress += 10; // OPR 淇″彿鍦板潃
+		startAddress += 0; // OPR 淇″彿鍦板潃 0,闂姩淇℃伅04.0
+		szWrite[0] = 0x1;
 		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 += 14; // STOP 淇″彿鍦板潃
 		break;
 	case AxisOperationType::POSITION_1:
-		nTargetAddress += 16; // 瀹氫綅鐐� 1 淇″彿鍦板潃
+		startAddress += 16; // 瀹氫綅鐐� 1 淇″彿鍦板潃
 		break;
 	case AxisOperationType::POSITION_2:
-		nTargetAddress += 18; // 瀹氫綅鐐� 2 淇″彿鍦板潃
+		startAddress += 18; // 瀹氫綅鐐� 2 淇″彿鍦板潃
 		break;
 	case AxisOperationType::POSITION_3:
-		nTargetAddress += 20; // 瀹氫綅鐐� 3 淇″彿鍦板潃
+		startAddress += 20; // 瀹氫綅鐐� 3 淇″彿鍦板潃
 		break;
 	case AxisOperationType::POSITION_4:
-		nTargetAddress += 22; // 瀹氫綅鐐� 4 淇″彿鍦板潃
+		startAddress += 22; // 瀹氫綅鐐� 4 淇″彿鍦板潃
 		break;
 	case AxisOperationType::POSITION_5:
-		nTargetAddress += 24; // 瀹氫綅鐐� 5 淇″彿鍦板潃
+		startAddress += 24; // 瀹氫綅鐐� 5 淇″彿鍦板潃
 		break;
 	default:
 		AfxMessageBox(_T("鏈煡鎿嶄綔绫诲瀷锛�"));
@@ -623,7 +620,7 @@
 	}
 
 	// 鍚� PLC 鍐欏叆淇″彿
-	m_pPLC->writeBit(component, 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);
 		}
@@ -635,8 +632,6 @@
 
 void CAxisSettingsDlg::readPLCDataToUI(int nAxisId)
 {	
-	CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
-
 	// 浠� RecipeManager 鑾峰彇杞存暟鎹�
 	RecipeManager& recipeManager = RecipeManager::getInstance();
 	auto axisData = recipeManager.getAxis(nAxisId);
@@ -646,32 +641,83 @@
 	if (!ParsePLCAddress(CString(axisData.startAddress.c_str()), component, startAddress)) {
 		AfxMessageBox(_T("鏃犳晥鐨勮捣濮嬪湴鍧�锛�"));
 	}
+	endAddress = startAddress + 300;
+	readSize = (endAddress - startAddress + 1) * 2;
 
-	// 浠� OPR 淇″彿鍦板潃寮�濮嬭鍙�
-	startAddress += 10;
-	endAddress = startAddress + 24;
-	readSize = endAddress - startAddress + 1;
+	{
+		auto funOnReadData = [&, startAddress, readSize](IMcChannel* pChannel, int addr, char* pData, unsigned int nDataSize, int flag) -> void {
+			if (nDataSize == readSize && flag == 0 && ::IsWindow(m_hWnd)) {
+				double fCurPos = CToolUnits::toInt32(&pData[20*2]) * 0.001;
+				double fManualSpeed = CToolUnits::toInt32(&pData[82 * 2]) * 0.001;
+				double fAutoSpeed = CToolUnits::toInt32(&pData[84 * 2]) * 0.001;
+				double fPrm = CToolUnits::toInt32(&pData[50 * 2]) * 0.1;
+				int nLoad = CToolUnits::toInt16(&pData[54 * 2]);
+				int nErrCode = CToolUnits::toInt16(&pData[26 * 2]);
+				int nAlarmCode = CToolUnits::toInt16(&pData[27 * 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);
 
-	// 鍥炶皟澶勭悊杈撳叆鏁版嵁
-	auto funOnReadData = [this, startAddress, &pLabels](IMcChannel* pChannel, int addr, char* pData, unsigned int nDataSize, int flag) {
-		if (flag == 0) {
-			int nOffset = 0;
-			for (auto pLabel : pLabels) {
-				int value = CToolUnits::toInt16(&pData[(startAddress + nOffset) * 2]);
-				if (value == 0) {
-					SetStatusColor(*pLabel, FALSE);
-				} else {
-					SetStatusColor(*pLabel, TRUE);
+				// OPR 淇″彿
+				BOOL bFLS = CToolUnits::getBit(pData[10 * 2], 1);
+				if (bFLS) {
+					SetLabelColor(m_staticFLS, RGB(0, 255, 0));
+				}
+				else {
+					SetLabelColor(m_staticFLS, RGB(0, 180, 0));
 				}
 
-				nOffset++;
+				BOOL bDOG = CToolUnits::getBit(pData[10 * 2], 6);
+				if (bDOG) {
+					SetLabelColor(m_staticDOG, RGB(0, 255, 0));
+				}
+				else {
+					SetLabelColor(m_staticDOG, RGB(0, 180, 0));
+				}
+
+				BOOL bRLS = CToolUnits::getBit(pData[10 * 2], 0);
+				if (bRLS) {
+					SetLabelColor(m_staticRLS, RGB(0, 255, 0));
+				}
+				else {
+					SetLabelColor(m_staticRLS, RGB(0, 180, 0));
+				}
+
+				BOOL bReady = CToolUnits::getBit(pData[10 * 2 + 1], 0xA - 8);
+				if (bReady) {
+					SetLabelColor(m_staticReady, RGB(0, 255, 0));
+				}
+				else {
+					SetLabelColor(m_staticReady, RGB(0, 180, 0));
+				}
+
+				BOOL bBusy = CToolUnits::getBit(pData[10 * 2 + 1], 0xB - 8);
+				if (bBusy) {
+					SetLabelColor(m_staticBusy, RGB(0, 255, 0));
+				}
+				else {
+					SetLabelColor(m_staticBusy, RGB(0, 180, 0));
+				}
+
+				BOOL bErr = CToolUnits::getBit(pData[10 * 2 + 1], 0xF - 8);
+				if (bErr) {
+					SetLabelColor(m_staticErr, RGB(255, 0, 0));
+				}
+				else {
+					SetLabelColor(m_staticErr, RGB(0, 180, 0));
+				}
+
+				m_bJogAddState = CToolUnits::getBit(pData[1 + 1], 0xC - 8);	// 1.D
+				m_bJogSubState = CToolUnits::getBit(pData[1+1], 0xD - 8);	// 1.D
 			}
-		}
-	};
-
-	m_pPLC->readData(component, startAddress, readSize, funOnReadData);
+		};
+		m_pPLC->readData(component, startAddress, readSize, funOnReadData);
+	}
 }
-
 
 BEGIN_MESSAGE_MAP(CAxisSettingsDlg, CDialogEx)
 	ON_BN_CLICKED(IDC_BUTTON_AXIS_LAST, &CAxisSettingsDlg::OnBnClickedButtonAxisLast)
@@ -712,7 +758,7 @@
 	// 璁剧疆娴嬭瘯鐘舵��
 	CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
 	for (auto pLabel : pLabels) {
-		SetStatusColor(*pLabel, FALSE);
+		pLabel->SetBkColor(RGB(255, 255, 255));
 		pLabel->ModifyStyle(0, SS_NOTIFY);
 		pLabel->SetTextColor(RGB(255, 255, 255));
 		pLabel->SetAlignment(AlignCenter);
@@ -782,42 +828,50 @@
 	{
 		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);
+			int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
+			if (!m_bJogAddState) {
+				m_bJogAddState = !m_bJogAddState;
+				Sleep(nSleep < 0 ? 0 : nSleep);
+				handleAxisOperation(AxisOperationType::JOG_ADD, true);
+				m_ullJogPressedTick = GetTickCount64();
+				TRACE("JOG+ 鎸夐挳鎸変笅 %d\n", nSleep);
+			}
 		}
 		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);
+			int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
+			if (!m_bJogSubState) {
+				m_bJogSubState = !m_bJogSubState;
+				Sleep(nSleep < 0 ? 0 : nSleep);
+				handleAxisOperation(AxisOperationType::JOG_SUB, true);
+				m_ullJogPressedTick = GetTickCount64();
+				TRACE("JOG- 鎸夐挳鎸変笅%d\n", nSleep);
+			}
 		}
 	}
 	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);
+			int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
+			if (m_bJogAddState) {
+				m_bJogAddState = !m_bJogAddState;
+				Sleep(nSleep < 0 ? 0 : nSleep);
+				handleAxisOperation(AxisOperationType::JOG_ADD, false);
+				m_ullJogPressedTick = GetTickCount64();
+				TRACE("JOG+ 鎸夐挳鏉惧紑 %d\n", nSleep);
+			}
 		}
 		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);
+			int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
+			if (m_bJogSubState) {
+				m_bJogSubState = !m_bJogSubState;
+				Sleep(nSleep < 0 ? 0 : nSleep);
+				handleAxisOperation(AxisOperationType::JOG_SUB, false);
+				m_ullJogPressedTick = GetTickCount64();
+				TRACE("JOG- 鎸夐挳鏉惧紑%d\n", nSleep);
+			}
 		}
 	}
 
@@ -840,7 +894,7 @@
 	AdjustControls(dScaleX, dScaleY);
 
 	// 鍔ㄦ�佽皟鏁村悇涓� CBLLabel 鐨勫瓧浣撳ぇ灏�
-	CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
+	CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticBusy };
 	for (auto pLabel : pLabels) {
 		AdjustLabelFont(*pLabel);
 	}
@@ -895,89 +949,90 @@
 void CAxisSettingsDlg::OnBnClickedButtonAxisLast()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	updateAxisSelection(-1);
+	//updateAxisSelection(-1);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisNext()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	updateAxisSelection(1);
+	//updateAxisSelection(1);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup1()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	switchToPage(1);
+	//switchToPage(1);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup2()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	switchToPage(2);
+	//switchToPage(2);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup3()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	switchToPage(3);
+	//switchToPage(3);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup4()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	switchToPage(4);
+	//switchToPage(4);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup5()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	switchToPage(5);
+	//switchToPage(5);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint1()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	handleAxisOperation(AxisOperationType::POSITION_1, true);
+	//handleAxisOperation(AxisOperationType::POSITION_1, true);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint2()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	handleAxisOperation(AxisOperationType::POSITION_2, true);
+	//handleAxisOperation(AxisOperationType::POSITION_2, true);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint3()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	handleAxisOperation(AxisOperationType::POSITION_3, true);
+	//handleAxisOperation(AxisOperationType::POSITION_3, true);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint4()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	handleAxisOperation(AxisOperationType::POSITION_4, true);
+	//handleAxisOperation(AxisOperationType::POSITION_4, true);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint5()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	handleAxisOperation(AxisOperationType::POSITION_5, true);
+	//handleAxisOperation(AxisOperationType::POSITION_5, true);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisTestOpr()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	handleAxisOperation(AxisOperationType::OPR, true);
+	//handleAxisOperation(AxisOperationType::OPR, true);
 }
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisTestStop()
 {
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
-	handleAxisOperation(AxisOperationType::STOP, true);
+	//handleAxisOperation(AxisOperationType::STOP, true);
 }
 
 void CAxisSettingsDlg::OnSelchangeComboAxisName()
 {
+
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
 	int axisId = getCurrentSelectedAxisID();
 	if (axisId == -1) {
@@ -992,6 +1047,7 @@
 
 void CAxisSettingsDlg::OnBnClickedButtonAxisSave()
 {
+
 	// TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
 	int axisId = getCurrentSelectedAxisID();
 	if (axisId == -1) {
@@ -1026,46 +1082,11 @@
 		ASSERT(m_pPLC);
 
 		int nAxisId = getCurrentSelectedAxisID();
-		if (nAxisId == -1) {
-			return;
+		if (nAxisId != -1) {
+			readPLCDataToUI(nAxisId);
 		}
-
-		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);
-
-		//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);
 }
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
index d94c18b..d8e18a2 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.h
@@ -4,6 +4,7 @@
 #include "BLLabel.h"
 #include "CPLC.h"
 
+
 // CAxisSettingsDlg 瀵硅瘽妗�
 
 enum class AxisOperationType {
@@ -42,7 +43,7 @@
 	void AdjustControls(float dScaleX, float dScaleY);
 	void AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight);
 	void AdjustLabelFont(CBLLabel& label);
-	void SetStatusColor(CBLLabel& label, BOOL bStatus);
+	void SetLabelColor(CBLLabel& label, COLORREF clr);
 	void updatePageButtonStates();
 	int getCurrentSelectedAxisID();
 	void initializeAxisIDCombo();
@@ -68,16 +69,16 @@
 	CString m_strRecipeName;
 
 	// 鎸変笅鏍囪瘑
-	BOOL m_bJogAddPressed;
-	BOOL m_bJogSubPressed;
+	ULONGLONG m_ullJogPressedTick;
+	BOOL m_bJogSubState;
+	BOOL m_bJogAddState;
 
 	// 鎺т欢
 	CBLLabel m_staticFLS, m_staticDOG, m_staticRLS, m_staticReady, m_staticBusy, m_staticErr;
+	CBlButton m_pageButtons[5];
 	CComboBox m_comboAxisNO;
 	CStatic m_staticAxisNO, m_staticAxisDescription, m_staticStartAddress;
 	CEdit m_editManualSpeed, m_editAutoSpeed, m_editAccelerationTime, m_editDecelerationTime, m_editJogDistance;
-	CBlButton m_pageButtons[5];
-
 	std::map<int, CRect> m_mapCtrlLayouts;
 	std::map<int, CFont*> m_mapFonts;
 
diff --git a/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp b/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp
index d72dd77..8d6d9d3 100644
--- a/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp
@@ -59,7 +59,7 @@
 
 	// 璁＄畻椤垫暟
 	m_nCurrentPage = 1;
-	m_nTotalPages = (m_displayData.size() + m_nRowsPerPage - 1) / m_nRowsPerPage;
+	m_nTotalPages = ((int)m_displayData.size() + m_nRowsPerPage - 1) / m_nRowsPerPage;
 }
 
 void CIOMonitoringDlg::SetPLC(CPLC* pPLC)
@@ -161,7 +161,7 @@
 	ScreenToClient(&nextButtonRect);
 
 	int buttonHeight = prevButtonRect.Height();     // 鎸夐挳鐨勯珮搴�
-	int topMargin = rect.Height() * 0.05;           // 椤堕儴淇濈暀 5% 鐨勯珮搴�
+	int topMargin = int(rect.Height() * 0.05);      // 椤堕儴淇濈暀 5% 鐨勯珮搴�
 	int bottomMargin = buttonHeight + topMargin;    // 搴曢儴淇濈暀鎸夐挳楂樺害鍔犻棿璺�
 	int sideMargin = topMargin;                     // 宸﹀彸闂磋窛涓庨《閮ㄩ棿璺濈浉鍚�
 	int groupSpacing = 20;                          // 涓ょ粍涔嬮棿鐨勯棿璺�
@@ -490,7 +490,7 @@
 			MC::SOFT_COMPONENT enComponent;
 			if (ParsePLCAddress(CString(data.inputAddress.c_str()), enComponent, nAddress)) {
 				int nOffset = nAddress - inputStartAddr;
-				if (nOffset >= 0 && nOffset < nDataSize) {
+				if (nOffset >= 0 && nOffset < (int)nDataSize) {
 					int byteIndex = nOffset / 8;
 					int bitIndex = nOffset % 8;
 					data.bInputStates = CToolUnits::getBit(pData[byteIndex], bitIndex);
@@ -511,7 +511,7 @@
 			MC::SOFT_COMPONENT enComponent;
 			if (ParsePLCAddress(CString(data.outputAddress.c_str()), enComponent, nAddress)) {
 				int nOffset = nAddress - outputStartAddr;
-				if (nOffset >= 0 && nOffset < nDataSize) {
+				if (nOffset >= 0 && nOffset < (int)nDataSize) {
 					int byteIndex = nOffset / 8;
 					int bitIndex = nOffset % 8;
 					data.bOutputStates = CToolUnits::getBit(pData[byteIndex], bitIndex);

--
Gitblit v1.9.3