wanshenmean
2026-03-13 750ff5304ebbe9cff4f07997f05fe6274b3a2e22
feat: implement I/Q/T/C regions

- Add IRegion (Input) with bit operations
- Add QRegion (Output) with bit operations
- Add TRegion (Timer) with timer read/write
- Add CRegion (Counter) with counter read/write
- All regions use proper dispose pattern with disposed checks

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
已添加4个文件
378 ■■■■■ 文件已修改
Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Memory/CRegion.cs 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Memory/IRegion.cs 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Memory/QRegion.cs 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Memory/TRegion.cs 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Memory/CRegion.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,83 @@
using System;
using WIDESEAWCS_S7Simulator.Core.Interfaces;
namespace WIDESEAWCS_S7Simulator.Core.Memory
{
    /// <summary>
    /// C区(计数器区/Counter)实现
    /// ç”¨äºŽæ¨¡æ‹Ÿè¥¿é—¨å­S7 PLC的计数器区域
    /// æ¯ä¸ªè®¡æ•°å™¨å ç”¨2字节,存储计数器的当前值
    /// </summary>
    public class CRegion : MemoryRegion, IMemoryRegion
    {
        /// <summary>
        /// æ ‡è¯†å¯¹è±¡æ˜¯å¦å·²è¢«é‡Šæ”¾
        /// </summary>
        private bool _disposed = false;
        /// <summary>
        /// åŒºåŸŸç±»åž‹
        /// </summary>
        public override string RegionType => "C";
        /// <summary>
        /// æ¯ä¸ªè®¡æ•°å™¨å ç”¨çš„字节数(S7计数器为2字节)
        /// </summary>
        private const int CounterSize = 2;
        /// <summary>
        /// æž„造函数
        /// </summary>
        /// <param name="counterCount">计数器数量</param>
        public CRegion(int counterCount) : base(counterCount * CounterSize)
        {
        }
        /// <summary>
        /// è¯»å–计数器值
        /// </summary>
        /// <param name="counterNumber">计数器号(从1开始)</param>
        /// <returns>计数器值</returns>
        public ushort ReadCounter(ushort counterNumber)
        {
            if (_disposed)
                throw new ObjectDisposedException(nameof(CRegion));
            ushort offset = (ushort)((counterNumber - 1) * CounterSize);
            var data = Read(offset, CounterSize);
            return (ushort)((data[0] << 8) | data[1]);
        }
        /// <summary>
        /// å†™å…¥è®¡æ•°å™¨å€¼
        /// </summary>
        /// <param name="counterNumber">计数器号(从1开始)</param>
        /// <param name="value">计数器值</param>
        public void WriteCounter(ushort counterNumber, ushort value)
        {
            if (_disposed)
                throw new ObjectDisposedException(nameof(CRegion));
            ushort offset = (ushort)((counterNumber - 1) * CounterSize);
            var data = new byte[] { (byte)(value >> 8), (byte)(value & 0xFF) };
            Write(offset, data);
        }
        /// <summary>
        /// é‡Šæ”¾èµ„源
        /// </summary>
        /// <param name="disposing">是否正在释放托管资源</param>
        protected override void Dispose(bool disposing)
        {
            if (!_disposed)
            {
                if (disposing)
                {
                    // é‡Šæ”¾æ‰˜ç®¡èµ„源
                }
                _disposed = true;
            }
            base.Dispose(disposing);
        }
    }
}
Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Memory/IRegion.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,106 @@
using System;
using WIDESEAWCS_S7Simulator.Core.Interfaces;
namespace WIDESEAWCS_S7Simulator.Core.Memory
{
    /// <summary>
    /// I区(输入区/Input)实现
    /// ç”¨äºŽæ¨¡æ‹Ÿè¥¿é—¨å­S7 PLC的输入过程映像区
    /// </summary>
    public class IRegion : MemoryRegion, IMemoryRegion
    {
        /// <summary>
        /// æ ‡è¯†å¯¹è±¡æ˜¯å¦å·²è¢«é‡Šæ”¾
        /// </summary>
        private bool _disposed = false;
        /// <summary>
        /// åŒºåŸŸç±»åž‹
        /// </summary>
        public override string RegionType => "I";
        /// <summary>
        /// æž„造函数
        /// </summary>
        /// <param name="size">区域大小(字节)</param>
        public IRegion(int size) : base(size)
        {
        }
        /// <summary>
        /// è¯»å–位
        /// </summary>
        /// <param name="byteOffset">字节偏移量</param>
        /// <param name="bitOffset">位偏移量(0-7)</param>
        /// <returns>位状态(true/false)</returns>
        public bool ReadBit(ushort byteOffset, byte bitOffset)
        {
            if (_disposed)
                throw new ObjectDisposedException(nameof(IRegion));
            if (bitOffset > 7)
                throw new ArgumentOutOfRangeException(nameof(bitOffset), "位偏移必须在0-7之间");
            _lock.EnterReadLock();
            try
            {
                if (byteOffset >= Size)
                    throw new ArgumentOutOfRangeException(nameof(byteOffset), "字节偏移超出I区范围");
                return (_memory[byteOffset] & (1 << bitOffset)) != 0;
            }
            finally
            {
                _lock.ExitReadLock();
            }
        }
        /// <summary>
        /// å†™å…¥ä½
        /// </summary>
        /// <param name="byteOffset">字节偏移量</param>
        /// <param name="bitOffset">位偏移量(0-7)</param>
        /// <param name="value">位值(true/false)</param>
        public void WriteBit(ushort byteOffset, byte bitOffset, bool value)
        {
            if (_disposed)
                throw new ObjectDisposedException(nameof(IRegion));
            if (bitOffset > 7)
                throw new ArgumentOutOfRangeException(nameof(bitOffset), "位偏移必须在0-7之间");
            _lock.EnterWriteLock();
            try
            {
                if (byteOffset >= Size)
                    throw new ArgumentOutOfRangeException(nameof(byteOffset), "字节偏移超出I区范围");
                if (value)
                    _memory[byteOffset] |= (byte)(1 << bitOffset);
                else
                    _memory[byteOffset] &= (byte)~(1 << bitOffset);
            }
            finally
            {
                _lock.ExitWriteLock();
            }
        }
        /// <summary>
        /// é‡Šæ”¾èµ„源
        /// </summary>
        /// <param name="disposing">是否正在释放托管资源</param>
        protected override void Dispose(bool disposing)
        {
            if (!_disposed)
            {
                if (disposing)
                {
                    // é‡Šæ”¾æ‰˜ç®¡èµ„源
                }
                _disposed = true;
            }
            base.Dispose(disposing);
        }
    }
}
Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Memory/QRegion.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,106 @@
using System;
using WIDESEAWCS_S7Simulator.Core.Interfaces;
namespace WIDESEAWCS_S7Simulator.Core.Memory
{
    /// <summary>
    /// Q区(输出区/Output)实现
    /// ç”¨äºŽæ¨¡æ‹Ÿè¥¿é—¨å­S7 PLC的输出过程映像区
    /// </summary>
    public class QRegion : MemoryRegion, IMemoryRegion
    {
        /// <summary>
        /// æ ‡è¯†å¯¹è±¡æ˜¯å¦å·²è¢«é‡Šæ”¾
        /// </summary>
        private bool _disposed = false;
        /// <summary>
        /// åŒºåŸŸç±»åž‹
        /// </summary>
        public override string RegionType => "Q";
        /// <summary>
        /// æž„造函数
        /// </summary>
        /// <param name="size">区域大小(字节)</param>
        public QRegion(int size) : base(size)
        {
        }
        /// <summary>
        /// è¯»å–位
        /// </summary>
        /// <param name="byteOffset">字节偏移量</param>
        /// <param name="bitOffset">位偏移量(0-7)</param>
        /// <returns>位状态(true/false)</returns>
        public bool ReadBit(ushort byteOffset, byte bitOffset)
        {
            if (_disposed)
                throw new ObjectDisposedException(nameof(QRegion));
            if (bitOffset > 7)
                throw new ArgumentOutOfRangeException(nameof(bitOffset), "位偏移必须在0-7之间");
            _lock.EnterReadLock();
            try
            {
                if (byteOffset >= Size)
                    throw new ArgumentOutOfRangeException(nameof(byteOffset), "字节偏移超出Q区范围");
                return (_memory[byteOffset] & (1 << bitOffset)) != 0;
            }
            finally
            {
                _lock.ExitReadLock();
            }
        }
        /// <summary>
        /// å†™å…¥ä½
        /// </summary>
        /// <param name="byteOffset">字节偏移量</param>
        /// <param name="bitOffset">位偏移量(0-7)</param>
        /// <param name="value">位值(true/false)</param>
        public void WriteBit(ushort byteOffset, byte bitOffset, bool value)
        {
            if (_disposed)
                throw new ObjectDisposedException(nameof(QRegion));
            if (bitOffset > 7)
                throw new ArgumentOutOfRangeException(nameof(bitOffset), "位偏移必须在0-7之间");
            _lock.EnterWriteLock();
            try
            {
                if (byteOffset >= Size)
                    throw new ArgumentOutOfRangeException(nameof(byteOffset), "字节偏移超出Q区范围");
                if (value)
                    _memory[byteOffset] |= (byte)(1 << bitOffset);
                else
                    _memory[byteOffset] &= (byte)~(1 << bitOffset);
            }
            finally
            {
                _lock.ExitWriteLock();
            }
        }
        /// <summary>
        /// é‡Šæ”¾èµ„源
        /// </summary>
        /// <param name="disposing">是否正在释放托管资源</param>
        protected override void Dispose(bool disposing)
        {
            if (!_disposed)
            {
                if (disposing)
                {
                    // é‡Šæ”¾æ‰˜ç®¡èµ„源
                }
                _disposed = true;
            }
            base.Dispose(disposing);
        }
    }
}
Code/WCS/WIDESEAWCS_S7Simulator/WIDESEAWCS_S7Simulator.Core/Memory/TRegion.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,83 @@
using System;
using WIDESEAWCS_S7Simulator.Core.Interfaces;
namespace WIDESEAWCS_S7Simulator.Core.Memory
{
    /// <summary>
    /// T区(定时器区/Timer)实现
    /// ç”¨äºŽæ¨¡æ‹Ÿè¥¿é—¨å­S7 PLC的定时器区域
    /// æ¯ä¸ªå®šæ—¶å™¨å ç”¨2字节,存储定时器的时间值(毫秒)
    /// </summary>
    public class TRegion : MemoryRegion, IMemoryRegion
    {
        /// <summary>
        /// æ ‡è¯†å¯¹è±¡æ˜¯å¦å·²è¢«é‡Šæ”¾
        /// </summary>
        private bool _disposed = false;
        /// <summary>
        /// åŒºåŸŸç±»åž‹
        /// </summary>
        public override string RegionType => "T";
        /// <summary>
        /// æ¯ä¸ªå®šæ—¶å™¨å ç”¨çš„字节数(S7定时器为2字节)
        /// </summary>
        private const int TimerSize = 2;
        /// <summary>
        /// æž„造函数
        /// </summary>
        /// <param name="timerCount">定时器数量</param>
        public TRegion(int timerCount) : base(timerCount * TimerSize)
        {
        }
        /// <summary>
        /// è¯»å–定时器值
        /// </summary>
        /// <param name="timerNumber">定时器号(从1开始)</param>
        /// <returns>定时器值(毫秒)</returns>
        public ushort ReadTimer(ushort timerNumber)
        {
            if (_disposed)
                throw new ObjectDisposedException(nameof(TRegion));
            ushort offset = (ushort)((timerNumber - 1) * TimerSize);
            var data = Read(offset, TimerSize);
            return (ushort)((data[0] << 8) | data[1]);
        }
        /// <summary>
        /// å†™å…¥å®šæ—¶å™¨å€¼
        /// </summary>
        /// <param name="timerNumber">定时器号(从1开始)</param>
        /// <param name="value">定时器值(毫秒)</param>
        public void WriteTimer(ushort timerNumber, ushort value)
        {
            if (_disposed)
                throw new ObjectDisposedException(nameof(TRegion));
            ushort offset = (ushort)((timerNumber - 1) * TimerSize);
            var data = new byte[] { (byte)(value >> 8), (byte)(value & 0xFF) };
            Write(offset, data);
        }
        /// <summary>
        /// é‡Šæ”¾èµ„源
        /// </summary>
        /// <param name="disposing">是否正在释放托管资源</param>
        protected override void Dispose(bool disposing)
        {
            if (!_disposed)
            {
                if (disposing)
                {
                    // é‡Šæ”¾æ‰˜ç®¡èµ„源
                }
                _disposed = true;
            }
            base.Dispose(disposing);
        }
    }
}