From 2f970f748458c34496445a9a7ae50973f97fb824 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期日, 04 一月 2026 16:50:20 +0800
Subject: [PATCH] 1.增加EV_PROCESS_DATA_REPORT事件（CEID)
---
SourceCode/Bond/Servo/CEqModeStep.cpp | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqModeStep.cpp b/SourceCode/Bond/Servo/CEqModeStep.cpp
index e869c74..edb3eec 100644
--- a/SourceCode/Bond/Servo/CEqModeStep.cpp
+++ b/SourceCode/Bond/Servo/CEqModeStep.cpp
@@ -4,7 +4,7 @@
namespace SERVO {
- CEqModeStep::CEqModeStep() : CStep()
+ CEqModeStep::CEqModeStep() : CReadStep()
{
m_nModeDev = 0;
m_nMode = 0;
@@ -15,23 +15,41 @@
}
+ void CEqModeStep::getAttributeVector(CAttributeVector& attrubutes)
+ {
+ CReadStep::getAttributeVector(attrubutes);
+
+ unsigned int weight = 31;
+ std::string strTemp;
+ attrubutes.addAttribute(new CAttribute("Mode",
+ std::to_string(m_nMode).c_str(), getModeDescription(strTemp).c_str(), weight++));
+ attrubutes.addAttribute(new CAttribute("Mode Dev",
+ ("W" + CToolUnits::toHexString(m_nModeDev, strTemp)).c_str(), "", weight++));
+ }
+
int CEqModeStep::onReadData()
{
- CStep::onReadData();
+ CReadStep::onReadData();
DWordContainer dc;
- m_pCclink->ReadDWordData(m_station, DeviceType::W, m_nModeDev, 1, dc);
+ if (0 != m_pCclink->ReadDWordDataEx(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());
+ getModeDescription(strTemp).c_str());
return 0;
}
int CEqModeStep::onComplete()
{
- CStep::onComplete();
+ CReadStep::onComplete();
LOGI("<CEqModeStep> onComplete.");
return 0;
@@ -39,7 +57,7 @@
int CEqModeStep::onTimeout()
{
- CStep::onTimeout();
+ CReadStep::onTimeout();
LOGI("<CEqModeStep> onTimeout.");
return 0;
@@ -50,6 +68,11 @@
m_nModeDev = nDev;
}
+ int CEqModeStep::getMode()
+ {
+ return m_nMode;
+ }
+
/*
0: No Equipment Mode exist
1: Normal Mode
@@ -58,7 +81,6 @@
4 : Cold Run Mode
5 : ETC."
*/
-
std::string& CEqModeStep::getModeDescription(std::string& strDescription)
{
switch (m_nMode) {
--
Gitblit v1.9.3