OpenLogics/MewtocolNet
1
0
Fork 0
mirror of https://github.com/OpenLogics/MewtocolNet.git synced 2025-12-06 03:01:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added performance improvements for cyclic polling by using single frame building of multiple registers

Browse Source 
- cleaned and refactored codebase
This commit is contained in:
Felix Weiß
2023-06-27 20:44:11 +02:00
parent 7be52efb7e
commit a9bd2962b4
34 changed files with 1099 additions and 958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
Examples/ExampleScenarios.cs
View File

@@ -7,20 +7,25 @@ using System.Collections;
using MewtocolNet.RegisterBuilding;
using System.Collections.Generic;
using MewtocolNet.Registers;
using System.Diagnostics;
using System.Text;
namespace Examples;
public class ExampleScenarios {
public static bool MewtocolLoggerEnabled = false;
public void SetupLogger () {
//attaching the logger
Logger.LogLevel = LogLevel.Verbose;
Logger.OnNewLogMessage((date, msg) => {
if(MewtocolLoggerEnabled)
Console.WriteLine($"{date.ToString("HH:mm:ss")} {msg}");
Logger.LogLevel = LogLevel.Info;
Logger.OnNewLogMessage((date, level, msg) => {
if (level == LogLevel.Error) Console.ForegroundColor = ConsoleColor.Red;
Console.WriteLine($"{date.ToString("HH:mm:ss")} {msg}");
Console.ResetColor();
});
}
@@ -61,7 +66,7 @@ public class ExampleScenarios {
foreach (var register in interf.Registers) {
Console.WriteLine($"{register.GetCombinedName()} / {register.GetRegisterPLCName()} - Value: {register.GetValueString()}");
Console.WriteLine($"{register.ToString(true)}");
}
@@ -186,10 +191,8 @@ public class ExampleScenarios {
[Scenario("Read register test")]
public async Task RunReadTest () {
Console.WriteLine("Starting auto enums and bitwise");
//setting up a new PLC interface and register collection
MewtocolInterface interf = new MewtocolInterface("192.168.115.210").WithPoller();
MewtocolInterface interf = new MewtocolInterface("192.168.115.210");
//auto add all built registers to the interface
var builder = RegBuilder.ForInterface(interf);
@@ -200,8 +203,9 @@ public class ExampleScenarios {
var shortReg = builder.FromPlcRegName("DT35").AsPlcType(PlcVarType.INT).Build();
builder.FromPlcRegName("DDT36").AsPlcType(PlcVarType.DINT).Build();
builder.FromPlcRegName("DT200").AsBytes(30).Build();
//builder.FromPlcRegName("DDT38").AsPlcType(PlcVarType.TIME).Build();
builder.FromPlcRegName("DDT38").AsPlcType(PlcVarType.TIME).Build();
//builder.FromPlcRegName("DT40").AsPlcType(PlcVarType.STRING).Build();
//connect
@@ -214,12 +218,20 @@ public class ExampleScenarios {
await interf.SetRegisterAsync(r0reg, !(bool)r0reg.Value);
await interf.SetRegisterAsync(shortReg, (short)new Random().Next(0, 100));
var sw = Stopwatch.StartNew();
foreach (var reg in interf.Registers) {
Console.WriteLine($"Register {reg.GetRegisterPLCName()} val: {reg.Value}");
await reg.ReadAsync();
Console.WriteLine($"Register {reg.ToString()}");
}
sw.Stop();
Console.WriteLine($"Total read time for registers: {sw.Elapsed.TotalMilliseconds:N0}ms");
Console.WriteLine();
await Task.Delay(1000);
@@ -228,4 +240,69 @@ public class ExampleScenarios {
}
[Scenario("Test multi frame")]
public async Task MultiFrameTest() {
var preLogLevel = Logger.LogLevel;
Logger.LogLevel = LogLevel.Error;
//setting up a new PLC interface and register collection
MewtocolInterface interf = new MewtocolInterface("192.168.115.210");
//auto add all built registers to the interface
var builder = RegBuilder.ForInterface(interf);
var r0reg = builder.FromPlcRegName("R0").Build();
builder.FromPlcRegName("R1").Build();
builder.FromPlcRegName("R1F").Build();
builder.FromPlcRegName("R60A").Build();
builder.FromPlcRegName("R61A").Build();
builder.FromPlcRegName("R62A").Build();
builder.FromPlcRegName("R63A").Build();
builder.FromPlcRegName("R64A").Build();
builder.FromPlcRegName("R65A").Build();
builder.FromPlcRegName("R66A").Build();
builder.FromPlcRegName("R67A").Build();
builder.FromPlcRegName("R68A").Build();
builder.FromPlcRegName("R69A").Build();
builder.FromPlcRegName("R70A").Build();
builder.FromPlcRegName("R71A").Build();
//connect
await interf.ConnectAsync();
Console.WriteLine("Poller cycle started");
var sw = Stopwatch.StartNew();
await interf.RunPollerCylceManual(false);
sw.Stop();
Console.WriteLine("Poller cycle finished");
Console.WriteLine($"Single frame excec time: {sw.ElapsedMilliseconds:N0}ms");
interf.Disconnect();
await Task.Delay(1000);
await interf.ConnectAsync();
sw = Stopwatch.StartNew();
Console.WriteLine("Poller cycle started");
await interf.RunPollerCylceManual(true);
sw.Stop();
Console.WriteLine("Poller cycle finished");
Console.WriteLine($"Multi frame excec time: {sw.ElapsedMilliseconds:N0}ms");
Logger.LogLevel = preLogLevel;
await Task.Delay(10000);
}
}

19
Examples/Program.cs
View File

@@ -5,6 +5,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using MewtocolNet.Logging;
using System.Text.RegularExpressions;
namespace Examples;
@@ -55,20 +57,23 @@ class Program {
Console.WriteLine("\nEnter a number to excecute a example");
Console.ResetColor();
Console.WriteLine("\nOther possible commands: \n\n" +
"'toggle logger' - toggle the built in mewtocol logger on/off\n" +
"'exit' - to close this program \n" +
"'clear' - to clear the output \n");
Console.WriteLine("\nOther possible commands: \n");
Console.WriteLine($"'logger <level>' - set loglevel to one of: {string.Join(", ", Enum.GetNames(typeof(LogLevel)).ToList())}");
Console.WriteLine("'exit' - to close this program");
Console.WriteLine("'clear' - to clear the output");
Console.Write("> ");
var line = Console.ReadLine();
if (line == "toggle logger") {
var loggerMatch = Regex.Match(line, @"logger (?<level>[a-zA-Z]{0,})");
ExampleScenarios.MewtocolLoggerEnabled = !ExampleScenarios.MewtocolLoggerEnabled;
if (loggerMatch.Success && Enum.TryParse<LogLevel>(loggerMatch.Groups["level"].Value, out var loglevel)) {
Console.WriteLine(ExampleScenarios.MewtocolLoggerEnabled ? "Logger enabled" : "Logger disabled");
Logger.LogLevel = loglevel;
Console.WriteLine($"Loglevel changed to: {loglevel}");
} else if (line == "exit") {