Skip to content

Feature/delay method #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 19, 2022
Merged

Feature/delay method #71

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51bce7d
[modify]
HowardWhile Oct 1, 2021
f290ddd
Distribute spinwait to local funciton
HowardWhile Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 45 additions & 20 deletions EasyModbus/ModbusClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using System.Reflection;
using System.Text;
using System.Collections.Generic;
using System.Threading;

namespace EasyModbus
{
Expand Down Expand Up @@ -941,11 +942,12 @@ public bool[] ReadDiscreteInputs(int startingAddress, int quantity)
DateTime dateTimeSend = DateTime.Now;
byte receivedUnitIdentifier = 0xFF;


SpinWait sw_delay = new SpinWait();
while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
{
while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
System.Threading.Thread.Sleep(1);
while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
sw_delay.SpinOnce();

data = new byte[2100];
Array.Copy(readBuffer, 0, data, 6, readBuffer.Length);
receivedUnitIdentifier = data[6];
Expand Down Expand Up @@ -1135,10 +1137,13 @@ public bool[] ReadCoils(int startingAddress, int quantity)
readBuffer = new byte[256];
DateTime dateTimeSend = DateTime.Now;
byte receivedUnitIdentifier = 0xFF;

SpinWait sw_delay = new SpinWait();
while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
{
while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
System.Threading.Thread.Sleep(1);
while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
sw_delay.SpinOnce();

data = new byte[2100];

Array.Copy(readBuffer, 0, data, 6, readBuffer.Length);
Expand Down Expand Up @@ -1326,11 +1331,14 @@ public int[] ReadHoldingRegisters(int startingAddress, int quantity)

DateTime dateTimeSend = DateTime.Now;
byte receivedUnitIdentifier = 0xFF;

SpinWait sw_delay = new SpinWait();
while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
{
while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
System.Threading.Thread.Sleep(1);
data = new byte[2100];
sw_delay.SpinOnce();

data = new byte[2100];
Array.Copy(readBuffer, 0, data, 6, readBuffer.Length);

receivedUnitIdentifier = data[6];
Expand Down Expand Up @@ -1528,12 +1536,14 @@ public int[] ReadInputRegisters(int startingAddress, int quantity)
readBuffer = new byte[256];
DateTime dateTimeSend = DateTime.Now;
byte receivedUnitIdentifier = 0xFF;


SpinWait sw_delay = new SpinWait();
while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
{
while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
System.Threading.Thread.Sleep(1);
data = new byte[2100];
sw_delay.SpinOnce();

data = new byte[2100];
Array.Copy(readBuffer, 0, data, 6, readBuffer.Length);
receivedUnitIdentifier = data[6];
}
Expand Down Expand Up @@ -1729,11 +1739,14 @@ public void WriteSingleCoil(int startingAddress, bool value)
readBuffer = new byte[256];
DateTime dateTimeSend = DateTime.Now;
byte receivedUnitIdentifier = 0xFF;

SpinWait sw_delay = new SpinWait();
while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
{
while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
System.Threading.Thread.Sleep(1);
data = new byte[2100];
sw_delay.SpinOnce();

data = new byte[2100];
Array.Copy(readBuffer, 0, data, 6, readBuffer.Length);
receivedUnitIdentifier = data[6];
}
Expand Down Expand Up @@ -1908,11 +1921,14 @@ public void WriteSingleRegister(int startingAddress, int value)
readBuffer = new byte[256];
DateTime dateTimeSend = DateTime.Now;
byte receivedUnitIdentifier = 0xFF;

SpinWait sw_delay = new SpinWait();
while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
{
while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
System.Threading.Thread.Sleep(1);
data = new byte[2100];
sw_delay.SpinOnce();

data = new byte[2100];
Array.Copy(readBuffer, 0, data, 6, readBuffer.Length);
receivedUnitIdentifier = data[6];
}
Expand Down Expand Up @@ -2104,11 +2120,14 @@ public void WriteMultipleCoils(int startingAddress, bool[] values)
readBuffer = new byte[256];
DateTime dateTimeSend = DateTime.Now;
byte receivedUnitIdentifier = 0xFF;

SpinWait sw_delay = new SpinWait();
while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
{
while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
System.Threading.Thread.Sleep(1);
data = new byte[2100];
sw_delay.SpinOnce();

data = new byte[2100];
Array.Copy(readBuffer, 0, data, 6, readBuffer.Length);
receivedUnitIdentifier = data[6];
}
Expand Down Expand Up @@ -2289,11 +2308,14 @@ public void WriteMultipleRegisters(int startingAddress, int[] values)
readBuffer = new byte[256];
DateTime dateTimeSend = DateTime.Now;
byte receivedUnitIdentifier = 0xFF;

SpinWait sw_delay = new SpinWait();
while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
{
while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
System.Threading.Thread.Sleep(1);
data = new byte[2100];
sw_delay.SpinOnce();

data = new byte[2100];
Array.Copy(readBuffer, 0, data, 6, readBuffer.Length);
receivedUnitIdentifier = data[6];
}
Expand Down Expand Up @@ -2492,11 +2514,14 @@ public int[] ReadWriteMultipleRegisters(int startingAddressRead, int quantityRea
readBuffer = new byte[256];
DateTime dateTimeSend = DateTime.Now;
byte receivedUnitIdentifier = 0xFF;

SpinWait sw_delay = new SpinWait();
while (receivedUnitIdentifier != this.unitIdentifier & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
{
while (dataReceived == false & !((DateTime.Now.Ticks - dateTimeSend.Ticks) > TimeSpan.TicksPerMillisecond * this.connectTimeout))
System.Threading.Thread.Sleep(1);
data = new byte[2100];
sw_delay.SpinOnce();

data = new byte[2100];
Array.Copy(readBuffer, 0, data, 6, readBuffer.Length);
receivedUnitIdentifier = data[6];
}
Expand Down