From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEqPortChangeStep.cpp | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqPortChangeStep.cpp b/SourceCode/Bond/Servo/CEqPortChangeStep.cpp
index 0927225..92fe57e 100644
--- a/SourceCode/Bond/Servo/CEqPortChangeStep.cpp
+++ b/SourceCode/Bond/Servo/CEqPortChangeStep.cpp
@@ -24,21 +24,22 @@
{
CReadStep::getAttributeVector(attrubutes);
+ unsigned int weight = 31;
std::string strTemp;
attrubutes.addAttribute(new CAttribute("Port Dev",
- ("W" + CToolUnits::toHexString(m_nPortDev, strTemp)).c_str(), ""));
+ ("W" + CToolUnits::toHexString(m_nPortDev, strTemp)).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("PortType",
- std::to_string(m_nPortType).c_str(), getPortTypeDescription(strTemp).c_str()));
+ std::to_string(m_nPortType).c_str(), getPortTypeDescription(strTemp).c_str(), weight++));
attrubutes.addAttribute(new CAttribute("PortMode",
- std::to_string(m_nPortMode).c_str(), getPortModeDescription(strTemp).c_str()));
+ std::to_string(m_nPortMode).c_str(), getPortModeDescription(strTemp).c_str(), weight++));
attrubutes.addAttribute(new CAttribute("PortCassetteType",
- std::to_string(m_nPortCassetteType).c_str(), getPortCassetteTypeDescription(strTemp).c_str()));
+ std::to_string(m_nPortCassetteType).c_str(), getPortCassetteTypeDescription(strTemp).c_str(), weight++));
attrubutes.addAttribute(new CAttribute("PortTransferMode",
- std::to_string(m_nPortTransferMode).c_str(), getPortTransferModeDescription(strTemp).c_str()));
+ std::to_string(m_nPortTransferMode).c_str(), getPortTransferModeDescription(strTemp).c_str(), weight++));
attrubutes.addAttribute(new CAttribute("PortEnableMode",
- std::to_string(m_nPortEanbleMode).c_str(), getPortEnableModeDescription(strTemp).c_str()));
+ std::to_string(m_nPortEanbleMode).c_str(), getPortEnableModeDescription(strTemp).c_str(), weight++));
attrubutes.addAttribute(new CAttribute("PortTypeAutoChangeMode",
- std::to_string(m_nPortTypeAutoChangeMode).c_str(), getPortTypeAutoChangeModeDescription(strTemp).c_str()));
+ std::to_string(m_nPortTypeAutoChangeMode).c_str(), getPortTypeAutoChangeModeDescription(strTemp).c_str(), weight++));
}
int CEqPortChangeStep::onReadData()
@@ -79,7 +80,7 @@
int CEqPortChangeStep::onTimeout()
{
CReadStep::onTimeout();
- LOGI("<CEQPortChangeStep> onTimeout.");
+ LOGE("<CEQPortChangeStep> onTimeout.");
return 0;
}
--
Gitblit v1.9.3