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/CCLinkPerformance/CCLinkIEControl.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CCLinkPerformance/CCLinkIEControl.h b/SourceCode/Bond/Servo/CCLinkPerformance/CCLinkIEControl.h
index 3a33626..5d92f9e 100644
--- a/SourceCode/Bond/Servo/CCLinkPerformance/CCLinkIEControl.h
+++ b/SourceCode/Bond/Servo/CCLinkPerformance/CCLinkIEControl.h
@@ -59,7 +59,7 @@
     // 读取LED状态
     int ReadLedStatus(LedStatus& outLedStatus);
 
-    int ReadData2(const StationIdentifier& station, short devType, short devNo, short size, void* pData);
+    int ReadData2(const StationIdentifier& station, DeviceType enDevType, short devNo, short size, void* pData);
 
 private:
     static CCLinkIEControlMode ConvertToCCLinkIEControlMode(short nMode);

--
Gitblit v1.9.3