diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 94b2d11b..945ec2ec 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-reportgenerator-globaltool": {
- "version": "5.4.18",
+ "version": "5.5.6",
"commands": [
"reportgenerator"
],
diff --git a/NtoLib/NtoLib.csproj b/NtoLib/NtoLib.csproj
index 44152f0d..0c225e33 100644
--- a/NtoLib/NtoLib.csproj
+++ b/NtoLib/NtoLib.csproj
@@ -1,7 +1,7 @@
-
-
+
+
Debug
AnyCPU
@@ -13,7 +13,7 @@
v4.8
512
true
-
+
10
@@ -41,11 +41,13 @@
false
-
- ..\packages\AngouriMath.1.3.0\lib\net472\AngouriMath.dll
+
+ ..\packages\AngouriMath.1.4.0\lib\netstandard2.0\AngouriMath.dll
+ True
-
- ..\packages\Antlr4.Runtime.Standard.4.9.2\lib\netstandard2.0\Antlr4.Runtime.Standard.dll
+
+ ..\packages\Antlr4.Runtime.Standard.4.13.1\lib\net45\Antlr4.Runtime.Standard.dll
+ True
..\resources\COMDeviceSDK.dll
@@ -63,18 +65,25 @@
..\packages\FluentResults.4.0.0\lib\netstandard2.0\FluentResults.dll
-
- ..\packages\GenericTensor.1.0.4\lib\net472\GenericTensor.dll
+
+ ..\packages\GenericTensor.1.0.5\lib\net472\GenericTensor.dll
+ True
-
- ..\packages\HonkSharp.1.0.1\lib\net472\HonkSharp.dll
+
+ ..\packages\HonkPerf.NET.Core.1.0.2\lib\netstandard2.0\HonkPerf.NET.Core.dll
+ True
+
+
+ ..\packages\HonkSharp.1.0.3\lib\net472\HonkSharp.dll
+ True
..\Resources\ICSharpCode.Core.Presentation.dll
False
-
- ..\packages\IndexRange.1.0.0\lib\net471\IndexRange.dll
+
+ ..\packages\IndexRange.1.1.1\lib\net47\IndexRange.dll
+ True
..\Resources\InSAT.Library.dll
@@ -87,6 +96,46 @@
..\packages\Microsoft.Bcl.AsyncInterfaces.10.0.7\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
+
+ ..\packages\Microsoft.Bcl.HashCode.6.0.0\lib\net462\Microsoft.Bcl.HashCode.dll
+ True
+
+
+ ..\packages\Microsoft.Bcl.Memory.10.0.7\lib\net462\Microsoft.Bcl.Memory.dll
+ True
+
+
+ ..\packages\Microsoft.Bcl.TimeProvider.10.0.7\lib\net462\Microsoft.Bcl.TimeProvider.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.DependencyInjection.10.0.7\lib\net462\Microsoft.Extensions.DependencyInjection.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.10.0.7\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.Logging.10.0.7\lib\net462\Microsoft.Extensions.Logging.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.Logging.Abstractions.10.0.7\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.Options.10.0.7\lib\net462\Microsoft.Extensions.Options.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.Primitives.10.0.7\lib\net462\Microsoft.Extensions.Primitives.dll
+ True
+
+
+ ..\packages\PeterO.Numbers.1.8.2\lib\net40\Numbers.dll
+ True
+
..\Resources\Opc.Ua.Core.dll
False
@@ -115,53 +164,31 @@
..\Resources\OpcUaClient.dll
false
-
- ..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll
-
-
- ..\packages\Microsoft.Bcl.TimeProvider.8.0.0\lib\net462\Microsoft.Bcl.TimeProvider.dll
-
-
- ..\packages\Microsoft.Extensions.DependencyInjection.9.0.8\lib\net462\Microsoft.Extensions.DependencyInjection.dll
-
-
- ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.8\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll
-
-
- ..\packages\Microsoft.Extensions.Logging.9.0.0\lib\net462\Microsoft.Extensions.Logging.dll
-
-
- ..\packages\Microsoft.Extensions.Logging.Abstractions.9.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll
-
-
- ..\packages\Microsoft.Extensions.Options.9.0.0\lib\net462\Microsoft.Extensions.Options.dll
-
-
- ..\packages\Microsoft.Extensions.Primitives.9.0.0\lib\net462\Microsoft.Extensions.Primitives.dll
-
-
-
- ..\packages\PeterO.Numbers.1.8.0\lib\net40\Numbers.dll
-
+
..\packages\OneOf.3.0.271\lib\net45\OneOf.dll
-
- ..\packages\Polly.8.6.4\lib\net472\Polly.dll
+
+ ..\packages\Polly.8.6.6\lib\net472\Polly.dll
+ True
-
- ..\packages\Polly.Core.8.6.4\lib\net472\Polly.Core.dll
+
+ ..\packages\Polly.Core.8.6.6\lib\net472\Polly.Core.dll
+ True
-
-
-
- ..\packages\Serilog.4.3.0\lib\net471\Serilog.dll
+
+
+
+ ..\packages\Serilog.4.3.1\lib\net471\Serilog.dll
+ True
-
- ..\packages\Serilog.Extensions.Logging.9.0.2\lib\net462\Serilog.Extensions.Logging.dll
+
+ ..\packages\Serilog.Extensions.Logging.10.0.0\lib\net462\Serilog.Extensions.Logging.dll
+ True
-
- ..\packages\Serilog.Sinks.Console.6.0.0\lib\net471\Serilog.Sinks.Console.dll
+
+ ..\packages\Serilog.Sinks.Console.6.1.1\lib\net471\Serilog.Sinks.Console.dll
+ True
..\packages\Serilog.Sinks.Debug.3.0.0\lib\net471\Serilog.Sinks.Debug.dll
@@ -169,25 +196,29 @@
..\packages\Serilog.Sinks.File.7.0.0\lib\net471\Serilog.Sinks.File.dll
-
+
..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll
-
- ..\packages\System.Collections.Immutable.9.0.7\lib\net462\System.Collections.Immutable.dll
+
+ ..\packages\System.Collections.Immutable.10.0.7\lib\net462\System.Collections.Immutable.dll
+ True
-
- ..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll
+
+ ..\packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll
+ True
-
-
-
-
- ..\packages\System.Diagnostics.DiagnosticSource.9.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll
+
+
+
+
+ ..\packages\System.Diagnostics.DiagnosticSource.10.0.7\lib\net462\System.Diagnostics.DiagnosticSource.dll
+ True
-
-
- ..\packages\System.Formats.Nrbf.9.0.7\lib\net462\System.Formats.Nrbf.dll
+
+
+ ..\packages\System.Formats.Nrbf.10.0.7\lib\net462\System.Formats.Nrbf.dll
+ True
..\packages\System.IO.Pipelines.10.0.7\lib\net462\System.IO.Pipelines.dll
@@ -195,58 +226,62 @@
..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll
-
+
..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll
-
- ..\packages\System.Reflection.Metadata.9.0.7\lib\net462\System.Reflection.Metadata.dll
+
+ ..\packages\System.Reflection.Metadata.10.0.7\lib\net462\System.Reflection.Metadata.dll
+ True
-
- ..\packages\System.Resources.Extensions.9.0.7\lib\net462\System.Resources.Extensions.dll
+
+ ..\packages\System.Resources.Extensions.10.0.7\lib\net462\System.Resources.Extensions.dll
+ True
-
+
..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll
-
+
..\packages\System.Text.Encodings.Web.10.0.7\lib\net462\System.Text.Encodings.Web.dll
..\packages\System.Text.Json.10.0.7\lib\net462\System.Text.Json.dll
-
- ..\packages\System.Threading.Channels.8.0.0\lib\net462\System.Threading.Channels.dll
+
+ ..\packages\System.Threading.Channels.10.0.7\lib\net462\System.Threading.Channels.dll
+ True
..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll
-
-
-
-
-
-
-
-
-
- ..\packages\YamlDotNet.16.3.0\lib\net47\YamlDotNet.dll
+
+
+
+
+
+
+
+
+
+ ..\packages\YamlDotNet.17.0.1\lib\net47\YamlDotNet.dll
+ True
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
UserControl
@@ -271,442 +306,442 @@
Lamp.cs
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
Component
NumericBox.cs
-
-
+
+
UserControl
NumericBoxControl.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
UserControl
@@ -725,22 +760,22 @@
UserControl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
True
True
@@ -752,55 +787,54 @@
PumpControl.cs
-
-
+
+
Form
PumpSettingForm.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Form
SettingsForm.cs
-
+
UserControl
ValveControl.cs
-
+
-
+
LabeledValue.cs
@@ -819,10 +853,10 @@
NumericBoxControl.cs
-
-
-
-
+
+
+
+
TableControl.cs
@@ -836,70 +870,71 @@
PumpSettingForm.cs
-
-
-
+
+
SettingsForm.cs
ValveControl.cs
-
-
+
+
-
-
+
+
PreserveNewest
-
+
SettingsSingleFileGenerator
Settings.Designer.cs
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
+
-
-
+
+
+
\ No newline at end of file
diff --git a/NtoLib/app.config b/NtoLib/app.config
index 6bf68c78..6a0852b4 100644
--- a/NtoLib/app.config
+++ b/NtoLib/app.config
@@ -31,7 +31,7 @@
-
+
@@ -47,15 +47,15 @@
-
+
-
+
-
+
@@ -67,15 +67,15 @@
-
+
-
+
-
+
@@ -83,11 +83,11 @@
-
+
-
+
@@ -95,19 +95,19 @@
-
+
-
+
-
+
-
+
@@ -115,12 +115,56 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/NtoLib/packages.config b/NtoLib/packages.config
index 1ac67561..9e16d853 100644
--- a/NtoLib/packages.config
+++ b/NtoLib/packages.config
@@ -1,48 +1,51 @@
-
-
+
+
-
-
+
+
+
-
+
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
+
+
\ No newline at end of file
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 3c1ec4d4..cc420231 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -16,11 +16,11 @@
-
-
+
+
-
-
+
+
@@ -28,7 +28,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+