From 2ffaec40444a4add7d8e638e5b20a2f81daa18af Mon Sep 17 00:00:00 2001
From: Darker <mr.darker@163.com>
Date: 星期二, 25 二月 2025 17:27:42 +0800
Subject: [PATCH] 1. 合并代码
---
SourceCode/Bond/Servo/CEqModeStep.cpp | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqModeStep.cpp b/SourceCode/Bond/Servo/CEqModeStep.cpp
index 149075d..888117b 100644
--- a/SourceCode/Bond/Servo/CEqModeStep.cpp
+++ b/SourceCode/Bond/Servo/CEqModeStep.cpp
@@ -20,14 +20,17 @@
CStep::onReadData();
DWordContainer dc;
- if (0 == m_pCclink->ReadDWordData(m_station, DeviceType::W, m_nModeDev, 1, dc)
- && dc.size() >= 1) {
- m_nMode = dc.at(0);
- std::string strTemp;
- LOGI("<CEqModeStep> Equipment Mode Changed<%s>\n",
- getModeDescription(strTemp).c_str());
+ if (0 != m_pCclink->ReadDWordData(m_station, DeviceType::W, m_nModeDev, 1, dc)) {
+ return -2;
+ }
+ if (dc.size() < 1) {
+ return -2;
}
+ m_nMode = dc.at(0);
+ std::string strTemp;
+ LOGI("<CEqModeStep> Equipment Mode Changed<%s>\n",
+ getModeDescription(strTemp).c_str());
return 0;
}
--
Gitblit v1.9.3