maier_st/Sharp7Reactive
1
0
Fork 0
mirror of https://github.com/evopro-ag/Sharp7Reactive.git synced 2025-12-16 19:52:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set s7Connector in constructor

Browse Source
This commit is contained in:
Peter Butzhammer
2024-02-07 11:29:48 +01:00
parent e6cea1e04f
commit c667c113e3
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sharp7.Rx/Sharp7Connector.cs
View File

@@ -13,14 +13,14 @@ namespace Sharp7.Rx;
internal class Sharp7Connector : IS7Connector internal class Sharp7Connector : IS7Connector
{ {
private readonly BehaviorSubject<ConnectionState> connectionStateSubject = new BehaviorSubject<ConnectionState>(Enums.ConnectionState.Initial); private readonly BehaviorSubject<ConnectionState> connectionStateSubject = new(Enums.ConnectionState.Initial);
private readonly int cpuSlotNr; private readonly int cpuSlotNr;
private readonly CompositeDisposable disposables = new CompositeDisposable(); private readonly CompositeDisposable disposables = new();
private readonly string ipAddress; private readonly string ipAddress;
private readonly int port; private readonly int port;
private readonly int rackNr; private readonly int rackNr;
private readonly LimitedConcurrencyLevelTaskScheduler scheduler = new LimitedConcurrencyLevelTaskScheduler(maxDegreeOfParallelism: 1); private readonly LimitedConcurrencyLevelTaskScheduler scheduler = new(maxDegreeOfParallelism: 1);
private readonly IS7VariableNameParser variableNameParser; private readonly IS7VariableNameParser variableNameParser;
private bool disposed; private bool disposed;

37
Sharp7.Rx/Sharp7Plc.cs
View File

@@ -14,13 +14,13 @@ namespace Sharp7.Rx;
public class Sharp7Plc : IPlc public class Sharp7Plc : IPlc
{ {
protected readonly CompositeDisposable Disposables = new CompositeDisposable(); private readonly CompositeDisposable disposables = new();
private readonly ConcurrentSubjectDictionary<string, byte[]> multiVariableSubscriptions = new ConcurrentSubjectDictionary<string, byte[]>(StringComparer.InvariantCultureIgnoreCase); private readonly ConcurrentSubjectDictionary<string, byte[]> multiVariableSubscriptions = new(StringComparer.InvariantCultureIgnoreCase);
private readonly List<long> performanceCoutner = new List<long>(1000); private readonly List<long> performanceCoutner = new(1000);
private readonly PlcConnectionSettings plcConnectionSettings; private readonly PlcConnectionSettings plcConnectionSettings;
private readonly IS7VariableNameParser varaibleNameParser = new CacheVariableNameParser(new S7VariableNameParser()); private readonly IS7VariableNameParser varaibleNameParser = new CacheVariableNameParser(new S7VariableNameParser());
private bool disposed; private bool disposed;
private IS7Connector s7Connector; private Sharp7Connector s7Connector;
/// <summary> /// <summary>
@@ -44,13 +44,26 @@ public class Sharp7Plc : IPlc
public Sharp7Plc(string ipAddress, int rackNumber, int cpuMpiAddress, int port = 102, TimeSpan? multiVarRequestCycleTime = null) public Sharp7Plc(string ipAddress, int rackNumber, int cpuMpiAddress, int port = 102, TimeSpan? multiVarRequestCycleTime = null)
{ {
plcConnectionSettings = new PlcConnectionSettings {IpAddress = ipAddress, RackNumber = rackNumber, CpuMpiAddress = cpuMpiAddress, Port = port}; plcConnectionSettings = new PlcConnectionSettings {IpAddress = ipAddress, RackNumber = rackNumber, CpuMpiAddress = cpuMpiAddress, Port = port};
s7Connector = new Sharp7Connector(plcConnectionSettings, varaibleNameParser);
ConnectionState = s7Connector.ConnectionState;
if (multiVarRequestCycleTime != null && multiVarRequestCycleTime > TimeSpan.FromMilliseconds(5)) if (multiVarRequestCycleTime != null)
{
if (multiVarRequestCycleTime < TimeSpan.FromMilliseconds(5))
MultiVarRequestCycleTime = TimeSpan.FromMilliseconds(5);
else
MultiVarRequestCycleTime = multiVarRequestCycleTime.Value; MultiVarRequestCycleTime = multiVarRequestCycleTime.Value;
} }
}
public IObservable<ConnectionState> ConnectionState { get; }
public ILogger Logger
{
get => s7Connector.Logger;
set => s7Connector.Logger = value;
}
public IObservable<ConnectionState> ConnectionState { get; private set; }
public ILogger Logger { get; set; }
public TimeSpan MultiVarRequestCycleTime { get; } = TimeSpan.FromSeconds(0.1); public TimeSpan MultiVarRequestCycleTime { get; } = TimeSpan.FromSeconds(0.1);
public int MultiVarRequestMaxItems { get; set; } = 16; public int MultiVarRequestMaxItems { get; set; } = 16;
@@ -108,9 +121,6 @@ public class Sharp7Plc : IPlc
public async Task<bool> InitializeAsync() public async Task<bool> InitializeAsync()
{ {
s7Connector = new Sharp7Connector(plcConnectionSettings, varaibleNameParser) {Logger = Logger};
ConnectionState = s7Connector.ConnectionState;
await s7Connector.InitializeAsync(); await s7Connector.InitializeAsync();
#pragma warning disable 4014 #pragma warning disable 4014
@@ -128,7 +138,7 @@ public class Sharp7Plc : IPlc
#pragma warning restore 4014 #pragma warning restore 4014
RunNotifications(s7Connector, MultiVarRequestCycleTime) RunNotifications(s7Connector, MultiVarRequestCycleTime)
.AddDisposableTo(Disposables); .AddDisposableTo(disposables);
return true; return true;
} }
@@ -207,7 +217,7 @@ public class Sharp7Plc : IPlc
if (disposing) if (disposing)
{ {
Disposables.Dispose(); disposables.Dispose();
if (s7Connector != null) if (s7Connector != null)
{ {
@@ -254,7 +264,8 @@ public class Sharp7Plc : IPlc
var min = performanceCoutner.Min(); var min = performanceCoutner.Min();
var max = performanceCoutner.Max(); var max = performanceCoutner.Max();
Logger?.LogTrace("Performance statistic during {0} elements of plc notification. Min: {1}, Max: {2}, Average: {3}, Plc: '{4}', Number of variables: {5}, Batch size: {6}", performanceCoutner.Capacity, min, max, average, plcConnectionSettings.IpAddress, Logger?.LogTrace("Performance statistic during {0} elements of plc notification. Min: {1}, Max: {2}, Average: {3}, Plc: '{4}', Number of variables: {5}, Batch size: {6}",
performanceCoutner.Capacity, min, max, average, plcConnectionSettings.IpAddress,
multiVariableSubscriptions.ExistingKeys.Count(), multiVariableSubscriptions.ExistingKeys.Count(),
MultiVarRequestMaxItems); MultiVarRequestMaxItems);
performanceCoutner.Clear(); performanceCoutner.Clear();