Fixed setting stream delay after stream change

Author: plasmapper

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.3.1] - 2024-01-06
+### Fixed
+- Setting stream delay after stream change.
+
 ## [2.3.0] - 2024-01-05
 ### Added
 - Properties for communication settings.

PL.Modbus/Client.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.IO.Ports;
+using System.Net;
 
 namespace PL.Modbus
 {
@@ -28,11 +29,9 @@ public class Client : IDisposable
         /// <param name="stationAddress">Server station address.</param>
         public Client(SerialPort serialPort, Protocol protocol = Protocol.Rtu, byte stationAddress = 1)
         {
-            _stream = new SerialStream(serialPort);
             _protocol = protocol;
             _stationAddress = stationAddress;
-            if (protocol == Protocol.Rtu)
-                _stream.DelayBeforeWrite = serialPort.BaudRate < 19200 ? 28000 / serialPort.BaudRate : 2;
+            Stream = new SerialStream(serialPort);
         }
 
         /// <summary>
@@ -44,11 +43,9 @@ public Client(SerialPort serialPort, Protocol protocol = Protocol.Rtu, byte stat
         /// <param name="stationAddress">Server station address.</param>
         public Client(string ipAddress, ushort port = 502, Protocol protocol = Protocol.Tcp, byte stationAddress = 255)
         {
-            _stream = new NetworkStream(ipAddress, port);
             _protocol = protocol;
             _stationAddress = stationAddress;
-            if (protocol == Protocol.Rtu)
-                _stream.DelayBeforeWrite = 2;
+            Stream = new NetworkStream(ipAddress, port);
         }
 
         /// <summary>
@@ -62,6 +59,14 @@ public Stream Stream
                 lock (this)
                 {
                     _stream = value;
+
+                    if (Protocol == Protocol.Rtu)
+                    {
+                        if (_stream is SerialStream serialStream)
+                            _stream.DelayBeforeWrite = serialStream.Port.BaudRate < 19200 ? 28000 / serialStream.Port.BaudRate : 2;
+                        else
+                            _stream.DelayBeforeWrite = 2;
+                    }
                 }
             }
         }

PL.Modbus/PL.Modbus.csproj

@@ -11,10 +11,10 @@
     <RepositoryUrl>https://github.com/plasmapper/modbus-dotnet</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>modbus;client</PackageTags>
-    <PackageReleaseNotes>Added
-- Properties for communication settings.</PackageReleaseNotes>
+    <PackageReleaseNotes>Fixed
+- Setting stream delay after stream change.</PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <VersionPrefix>2.3.0</VersionPrefix>
+    <VersionPrefix>2.3.1</VersionPrefix>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

PL.Modbus/SerialStream.cs

@@ -9,13 +9,13 @@ namespace PL.Modbus
     /// </summary>
     public class SerialStream : Stream
     {
-        private readonly SerialPort _serialPort;
-
         /// <summary>
         /// Initializes a new instance of the SerialStream class.
         /// </summary>
-        /// <param name="serialPort">Serial port.</param>
-        public SerialStream(SerialPort serialPort) => _serialPort = serialPort;
+        /// <param name="port">Serial port.</param>
+        public SerialStream(SerialPort port) => Port = port;
+
+        public SerialPort Port { get; }
 
         /// <summary>
         /// Reads data from a serial stream. Timeout is increased depending on the number of bytes to read and baud rate.
@@ -26,10 +26,10 @@ public override byte[] Read(int byteCount)
         {
             byte[] buffer = new byte[byteCount];
             int offset = 0;
-            _serialPort.ReadTimeout = _serialPort.BaudRate == 0 ? ReadTimeout : ReadTimeout + byteCount * 11 * 1000 / _serialPort.BaudRate;
+            Port.ReadTimeout = Port.BaudRate == 0 ? ReadTimeout : ReadTimeout + byteCount * 11 * 1000 / Port.BaudRate;
             while (byteCount > 0)
             {
-                int bytesRead = _serialPort.Read(buffer, offset, byteCount);
+                int bytesRead = Port.Read(buffer, offset, byteCount);
                 offset += bytesRead;
                 byteCount -= bytesRead;
             }     
@@ -38,13 +38,13 @@ public override byte[] Read(int byteCount)
 
         public override void ReadAvailableData()
         {
-            if (_serialPort.BytesToRead == 0)
+            if (Port.BytesToRead == 0)
                 return;
-            _serialPort.ReadTimeout = 1;
+            Port.ReadTimeout = 1;
             try
             {
                 while (true)
-                    _serialPort.ReadByte();
+                    Port.ReadByte();
             }
             catch { }
         }
@@ -54,18 +54,18 @@ public override void Write(byte[] buffer)
             ReadAvailableData();
             if (DelayBeforeWrite > 0)
                 Thread.Sleep(DelayBeforeWrite);
-            _serialPort.Write(buffer, 0, buffer.Length);
+            Port.Write(buffer, 0, buffer.Length);
         }
 
         public override void Open()
         {
-            if (!_serialPort.IsOpen)
-                _serialPort.Open();
+            if (!Port.IsOpen)
+                Port.Open();
         }
 
         public override void Close() { }
 
-        public override IDisposable Lock() => new SerialPortLock(_serialPort);
+        public override IDisposable Lock() => new SerialPortLock(Port);
 
         private class SerialPortLock : IDisposable
         {