Merge branch 'clh' into liuyang

mrDarker

6 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 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,
@@ -91,7 +91,7 @@
            AfxMessageBox("设置EAS模式成功！");
         }
         else {
            LOGI("<CEquipment-%s>设置DispatchingMode失败，code:%d", m_pEquipment->getName().c_str(), code);
            LOGE("<CEquipment-%s>设置DispatchingMode失败，code:%d", m_pEquipment->getName().c_str(), code);
            AfxMessageBox("设置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());