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

Fixed InitialTranfer after connected

Browse Source
This commit is contained in:
Federico Barresi
2020-01-17 15:29:34 +01:00
parent 6d69eca9e6
commit 412a460261
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sharp7.Rx/Extensions/PlcExtensions.cs
View File

@@ -2,6 +2,7 @@
using System.Reactive; using System.Reactive;
using System.Reactive.Disposables; using System.Reactive.Disposables;
using System.Reactive.Linq; using System.Reactive.Linq;
using System.Reactive.Threading.Tasks;
using System.Threading.Tasks; using System.Threading.Tasks;
using Sharp7.Rx.Enums; using Sharp7.Rx.Enums;
using Sharp7.Rx.Interfaces; using Sharp7.Rx.Interfaces;
@@ -23,6 +24,7 @@ namespace Sharp7.Rx.Extensions
if (initialTransfer) if (initialTransfer)
{ {
await plc.ConnectionState.FirstAsync(state => state == ConnectionState.Connected).ToTask();
var initialValue = await ReadData(plc, readData); var initialValue = await ReadData(plc, readData);
observer.OnNext(initialValue); observer.OnNext(initialValue);
} }

10
Sharp7.Rx/Sharp7Plc.cs
View File

@@ -57,9 +57,6 @@ namespace Sharp7.Rx
await s7Connector.InitializeAsync(); await s7Connector.InitializeAsync();
RunNotifications(s7Connector, TimeSpan.FromMilliseconds(100))
.AddDisposableTo(Disposables);
#pragma warning disable 4014 #pragma warning disable 4014
Task.Run(async () => Task.Run(async () =>
{ {
@@ -67,13 +64,16 @@ namespace Sharp7.Rx
{ {
await s7Connector.Connect(); await s7Connector.Connect();
} }
catch (Exception) catch (Exception e)
{ {
s7Connector.Logger.LogError(e, "Error while connecting to PLC");
} }
}); });
#pragma warning restore 4014 #pragma warning restore 4014
RunNotifications(s7Connector, TimeSpan.FromMilliseconds(100))
.AddDisposableTo(Disposables);
return true; return true;
} }