From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEquipmentPage3.cpp | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipmentPage3.cpp b/SourceCode/Bond/Servo/CEquipmentPage3.cpp
index ed1aae9..00fe069 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage3.cpp
+++ b/SourceCode/Bond/Servo/CEquipmentPage3.cpp
@@ -31,8 +31,8 @@
ON_WM_CTLCOLOR()
ON_WM_DESTROY()
ON_WM_SIZE()
- ON_BN_CLICKED(IDC_BUTTON_DISPATCHING_MODE_EAP, &CEquipmentPage3::OnBnClickedButtonDispatchingModeEap)
- ON_BN_CLICKED(IDC_BUTTON_DISPATCHING_MODE_LOCAL, &CEquipmentPage3::OnBnClickedButtonDispatchingModeLocal)
+ ON_BN_CLICKED(IDC_RADIO_DISPATCHING_EAP, &CEquipmentPage3::OnBnClickedRadioEap)
+ ON_BN_CLICKED(IDC_RADIO_DISPATCHING_LOCAL, &CEquipmentPage3::OnBnClickedRadioLocal)
END_MESSAGE_MAP()
@@ -81,7 +81,7 @@
// TODO: 鍦ㄦ澶勬坊鍔犳秷鎭鐞嗙▼搴忎唬鐮�
}
-void CEquipmentPage3::OnBnClickedButtonDispatchingModeEap()
+void CEquipmentPage3::OnBnClickedRadioEap()
{
ASSERT(m_pEquipment);
m_pEquipment->setDispatchingMode(SERVO::DISPATCHING_MODE::EAS,
@@ -99,10 +99,11 @@
});
}
-void CEquipmentPage3::OnBnClickedButtonDispatchingModeLocal()
+
+void CEquipmentPage3::OnBnClickedRadioLocal()
{
ASSERT(m_pEquipment);
- m_pEquipment->setDispatchingMode(SERVO::DISPATCHING_MODE::Local,
+ m_pEquipment->setDispatchingMode(SERVO::DISPATCHING_MODE::Local,
[&](int code) -> int {
if (code == WOK) {
LOGI("<CEquipment-%s>璁剧疆DispatchingMode鎴愬姛.", m_pEquipment->getName().c_str());
--
Gitblit v1.9.3