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

Fixed auto value string enum conversion

Browse Source
This commit is contained in:
Felix Weiß
2022-08-04 11:47:37 +02:00
parent 6c7c368b55
commit 772f8b89a4
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Examples/Program.cs
View File

@@ -32,7 +32,7 @@ class Program {
Task.Factory.StartNew(async () => { Task.Factory.StartNew(async () => {
//attaching the logger //attaching the logger
Logger.LogLevel = LogLevel.Critical; Logger.LogLevel = LogLevel.Verbose;
Logger.OnNewLogMessage((date, msg) => { Logger.OnNewLogMessage((date, msg) => {
Console.WriteLine($"{date.ToString("HH:mm:ss")} {msg}"); Console.WriteLine($"{date.ToString("HH:mm:ss")} {msg}");
}); });

2
Examples/TestRegisters.cs
View File

@@ -68,6 +68,8 @@ namespace Examples {
[Register(50)] [Register(50)]
public CurrentState TestEnum { get; private set; } public CurrentState TestEnum { get; private set; }
[Register(100)]
public TimeSpan TsTest2 { get; private set; }
} }
} }

8
MewtocolNet/Mewtocol/Subregisters/Register.cs
View File

@@ -115,9 +115,14 @@ namespace MewtocolNet.Registers {
public string GetValueString () { public string GetValueString () {
if (enumType != null && this is NRegister<int> intEnumReg) { if (enumType != null && this is NRegister<int> intEnumReg) {
var dict = new Dictionary<int, string>(); var dict = new Dictionary<int, string>();
foreach (var name in Enum.GetNames(enumType)) { foreach (var name in Enum.GetNames(enumType)) {
dict.Add((int)Enum.Parse(enumType, name), name); int enumKey = (int)Enum.Parse(enumType, name);
if(!dict.ContainsKey(enumKey)) {
dict.Add(enumKey, name);
}
} }
if(dict.ContainsKey(intEnumReg.Value)) { if(dict.ContainsKey(intEnumReg.Value)) {
@@ -125,6 +130,7 @@ namespace MewtocolNet.Registers {
} else { } else {
return $"{intEnumReg.Value} (Missing Enum)"; return $"{intEnumReg.Value} (Missing Enum)";
} }
} }
if (this is NRegister<short> shortReg) { if (this is NRegister<short> shortReg) {
return $"{shortReg.Value}{(isUsedBitwise ? $" [{shortReg.GetBitwise().ToBitString()}]" : "")}"; return $"{shortReg.Value}{(isUsedBitwise ? $" [{shortReg.GetBitwise().ToBitString()}]" : "")}";