From fc8d367963a16de61dfbc4a0ff34c78c91ec2cfe Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期五, 05 九月 2025 09:21:28 +0800 Subject: [PATCH] Merge branch 'liuyang' into clh --- SourceCode/Bond/SGMeasurement/CCLinkPerformance/PerformanceMelsec.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/SGMeasurement/CCLinkPerformance/PerformanceMelsec.h b/SourceCode/Bond/SGMeasurement/CCLinkPerformance/PerformanceMelsec.h index 6ede559..d7586f6 100644 --- a/SourceCode/Bond/SGMeasurement/CCLinkPerformance/PerformanceMelsec.h +++ b/SourceCode/Bond/SGMeasurement/CCLinkPerformance/PerformanceMelsec.h @@ -413,8 +413,8 @@ int ResetBitDevice(const StationIdentifier& station, DeviceType enDevType, short enDevNo); // 扩展设置/复位对象站的指定位软元件 - long SetBitDeviceEx(const StationIdentifier& station, long nDevType, long nDevNo); - long ResetBitDeviceEx(const StationIdentifier& station, long nDevType, long nDevNo); + long SetBitDeviceEx(const StationIdentifier& station, DeviceType enDevType, long nDevNo); + long ResetBitDeviceEx(const StationIdentifier& station, DeviceType enDevType, long nDevNo); // 执行对象站的CPU int ControlCPU(const StationIdentifier& station, ControlCode enControlCode); -- Gitblit v1.9.3