From d06ab39efafbcb2a7b1ec4cb83e18fa3485789a9 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 29 三月 2025 08:55:56 +0800
Subject: [PATCH] 1.修改两个函数名称;

---
 SourceCode/Bond/Servo/CEqProcessStep.cpp |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEqProcessStep.cpp b/SourceCode/Bond/Servo/CEqProcessStep.cpp
index e64e92b..b988af8 100644
--- a/SourceCode/Bond/Servo/CEqProcessStep.cpp
+++ b/SourceCode/Bond/Servo/CEqProcessStep.cpp
@@ -6,7 +6,7 @@
 
 
 namespace SERVO {
-	CEqProcessStep::CEqProcessStep()
+	CEqProcessStep::CEqProcessStep() : CReadStep()
 	{
 		m_nProcessDev = 0;
 		m_nTotalParameter = 0;
@@ -19,7 +19,7 @@
 
 	void CEqProcessStep::getAttributeVector(CAttributeVector& attrubutes)
 	{
-		CStep::getAttributeVector(attrubutes);
+		CReadStep::getAttributeVector(attrubutes);
 
 		attrubutes.addAttribute(new CAttribute("Glass ID",
 			m_strGlassId.c_str(), ""));
@@ -46,7 +46,7 @@
 #define PROGRESS_BUF_SIZE		(1024 + 64)
 	int CEqProcessStep::onReadData()
 	{
-		CStep::onReadData();
+		CReadStep::onReadData();
 
 		// W1864 ~ W1A74, 529个word, 1058 bytes
 		char szBuffer[PROGRESS_BUF_SIZE];
@@ -59,7 +59,7 @@
 		// 解释数据
 		// Glass ID(1864~186D)
 		int index = 0;
-		convertString(&szBuffer[index], (0x186d - 0x1864 + 1) * 2, m_strStartTime);
+		convertString(&szBuffer[index], (0x186d - 0x1864 + 1) * 2, m_strGlassId);
 		index += (0x186d - 0x1864 + 1) * 2;
 
 		// Process Start Time(186e~1875)
@@ -107,7 +107,7 @@
 
 	int CEqProcessStep::onComplete()
 	{
-		CStep::onComplete();
+		CReadStep::onComplete();
 		LOGI("<CEqProcessStep> onComplete.");
 
 		return 0;
@@ -115,7 +115,7 @@
 
 	int CEqProcessStep::onTimeout()
 	{
-		CStep::onTimeout();
+		CReadStep::onTimeout();
 		LOGI("<CEqProcessStep> onTimeout.");
 
 		return 0;

--
Gitblit v1.9.3