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/CEquipment.cpp |   56 ++++++++++++++++++++++++++++----------------------------
 SourceCode/Bond/Servo/CEquipment.h   |    4 ++--
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index d7fd776..ffc0c87 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -358,39 +358,39 @@
 		// Equipment Status Change Report(0x361)
 		// Equipment Alarm Change Report(0x362 ~ 0x366)
 		for (int i = 0; i < 7; i++) {
-			checkReadStepSignalStepSignal(0x360 + i, pszData, size);
+			checkReadStepSignal(0x360 + i, pszData, size);
 		}
 
 
 		// CIM Mode
-		checkWriteStepSignalStepSignal(0x350, pszData, size);
+		checkWriteStepSignal(0x350, pszData, size);
 
 
 		// Port1 ~ Port4
-		checkReadStepSignalStepSignal(0x3e0, pszData, size);
-		checkReadStepSignalStepSignal(0x3e1, pszData, size);
-		checkReadStepSignalStepSignal(0x3e2, pszData, size);
-		checkReadStepSignalStepSignal(0x3e3, pszData, size);
-		checkReadStepSignalStepSignal(0x3e8, pszData, size);
-		checkReadStepSignalStepSignal(0x3e9, pszData, size);
-		checkReadStepSignalStepSignal(0x3ea, pszData, size);
-		checkReadStepSignalStepSignal(0x3eb, pszData, size);
-		checkReadStepSignalStepSignal(0x3f0, pszData, size);
-		checkReadStepSignalStepSignal(0x3f1, pszData, size);
-		checkReadStepSignalStepSignal(0x3f2, pszData, size);
-		checkReadStepSignalStepSignal(0x3f3, pszData, size);
-		checkReadStepSignalStepSignal(0x3f8, pszData, size);
-		checkReadStepSignalStepSignal(0x3f9, pszData, size);
-		checkReadStepSignalStepSignal(0x3fa, pszData, size);
-		checkReadStepSignalStepSignal(0x3fb, pszData, size);
-		checkReadStepSignalStepSignal(0x400, pszData, size);
-		checkReadStepSignalStepSignal(0x401, pszData, size);
-		checkReadStepSignalStepSignal(0x402, pszData, size);
-		checkReadStepSignalStepSignal(0x403, pszData, size);
-		checkReadStepSignalStepSignal(0x408, pszData, size);
-		checkReadStepSignalStepSignal(0x409, pszData, size);
-		checkReadStepSignalStepSignal(0x40a, pszData, size);
-		checkReadStepSignalStepSignal(0x40b, pszData, size);
+		checkReadStepSignal(0x3e0, pszData, size);
+		checkReadStepSignal(0x3e1, pszData, size);
+		checkReadStepSignal(0x3e2, pszData, size);
+		checkReadStepSignal(0x3e3, pszData, size);
+		checkReadStepSignal(0x3e8, pszData, size);
+		checkReadStepSignal(0x3e9, pszData, size);
+		checkReadStepSignal(0x3ea, pszData, size);
+		checkReadStepSignal(0x3eb, pszData, size);
+		checkReadStepSignal(0x3f0, pszData, size);
+		checkReadStepSignal(0x3f1, pszData, size);
+		checkReadStepSignal(0x3f2, pszData, size);
+		checkReadStepSignal(0x3f3, pszData, size);
+		checkReadStepSignal(0x3f8, pszData, size);
+		checkReadStepSignal(0x3f9, pszData, size);
+		checkReadStepSignal(0x3fa, pszData, size);
+		checkReadStepSignal(0x3fb, pszData, size);
+		checkReadStepSignal(0x400, pszData, size);
+		checkReadStepSignal(0x401, pszData, size);
+		checkReadStepSignal(0x402, pszData, size);
+		checkReadStepSignal(0x403, pszData, size);
+		checkReadStepSignal(0x408, pszData, size);
+		checkReadStepSignal(0x409, pszData, size);
+		checkReadStepSignal(0x40a, pszData, size);
+		checkReadStepSignal(0x40b, pszData, size);
 
 	}
 
@@ -675,7 +675,7 @@
 		return pGlass;
 	}
 
-	void CEquipment::checkReadStepSignalStepSignal(unsigned int addr, const char* pszData, size_t size)
+	void CEquipment::checkReadStepSignal(unsigned int addr, const char* pszData, size_t size)
 	{
 		BOOL bFlag = isBitOn(pszData, size, addr);
 		SERVO::CStep* pStep = getStep(addr);
@@ -684,7 +684,7 @@
 		}
 	}
 
-	void CEquipment::checkWriteStepSignalStepSignal(unsigned int addr, const char* pszData, size_t size)
+	void CEquipment::checkWriteStepSignal(unsigned int addr, const char* pszData, size_t size)
 	{
 		BOOL bFlag = isBitOn(pszData, size, addr);
 		SERVO::CStep* pStep = getStep(addr);
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 57eed85..a740c89 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -114,8 +114,8 @@
 	private:
 		BOOL isBitOn(const char* pszData, size_t size, int index);
 		inline BOOL equalBool(BOOL b1, BOOL b2);
-		void checkReadStepSignalStepSignal(unsigned int addr, const char* pszData, size_t size);
-		void checkWriteStepSignalStepSignal(unsigned int addr, const char* pszData, size_t size);
+		void checkReadStepSignal(unsigned int addr, const char* pszData, size_t size);
+		void checkWriteStepSignal(unsigned int addr, const char* pszData, size_t size);
 
 	protected:
 		inline void Lock() { EnterCriticalSection(&m_criticalSection); }

--
Gitblit v1.9.3