Added support for auto enum casting

- counted up version number
- cleaned up register constructors that are used inernally only
This commit is contained in:
Felix Weiß
2022-06-24 11:25:26 +02:00
parent 83f17a4eae
commit e953938a65
7 changed files with 69 additions and 12 deletions

View File

@@ -327,7 +327,7 @@ namespace MewtocolNet {
}
internal void AddRegister<T> (Type _colType, int _address, int _length = 1, string _name = null, bool _isBitwise = false) {
internal void AddRegister<T> (Type _colType, int _address, int _length = 1, string _name = null, bool _isBitwise = false, Type _enumType = null) {
Type regType = typeof(T);
@@ -351,7 +351,7 @@ namespace MewtocolNet {
} else if (regType == typeof(ushort)) {
reg = new NRegister<ushort>(_address, _name);
} else if (regType == typeof(int)) {
reg = new NRegister<int>(_address, _name, _isBitwise);
reg = new NRegister<int>(_address, _name, _isBitwise, _enumType);
} else if (regType == typeof(uint)) {
reg = new NRegister<uint>(_address, _name);
} else if (regType == typeof(float)) {

View File

@@ -264,6 +264,10 @@ namespace MewtocolNet {
AddRegister<string>(collection.GetType(), cAttribute.MemoryArea, cAttribute.StringLength, _name: propName);
}
if (prop.PropertyType.IsEnum) {
AddRegister<int>(collection.GetType(), cAttribute.MemoryArea, _name: propName, _enumType: prop.PropertyType);
}
//read number as bit array
if (prop.PropertyType == typeof(BitArray)) {
@@ -376,6 +380,10 @@ namespace MewtocolNet {
foundToUpdate.SetValue(collection, ((NRegister<float>)reg).Value);
}
if (foundToUpdate.PropertyType.IsEnum) {
foundToUpdate.SetValue(collection, ((NRegister<int>)reg).Value);
}
//setting back strings
if (foundToUpdate.PropertyType == typeof(string)) {

View File

@@ -19,8 +19,33 @@ namespace MewtocolNet.Registers {
/// Defines a register containing a number
/// </summary>
/// <param name="_adress">Memory start adress max 99999</param>
/// <param name="_format">The format in which the variable is stored</param>
public NRegister(int _adress, string _name = null, bool isBitwise = false) {
/// <param name="_name">Name of the register</param>
public NRegister (int _adress, string _name = null) {
if (_adress > 99999)
throw new NotSupportedException("Memory adresses cant be greater than 99999");
memoryAdress = _adress;
name = _name;
Type numType = typeof(T);
if (numType == typeof(short)) {
memoryLength = 0;
} else if (numType == typeof(ushort)) {
memoryLength = 0;
} else if (numType == typeof(int)) {
memoryLength = 1;
} else if (numType == typeof(uint)) {
memoryLength = 1;
} else if (numType == typeof(float)) {
memoryLength = 1;
} else if (numType == typeof(TimeSpan)) {
memoryLength = 1;
} else {
throw new NotSupportedException($"The type {numType} is not allowed for Number Registers");
}
}
internal NRegister(int _adress, string _name = null, bool isBitwise = false, Type _enumType = null) {
if (_adress > 99999) throw new NotSupportedException("Memory adresses cant be greater than 99999");
memoryAdress = _adress;
@@ -43,6 +68,7 @@ namespace MewtocolNet.Registers {
}
isUsedBitwise = isBitwise;
enumType = _enumType;
}

View File

@@ -67,6 +67,7 @@ namespace MewtocolNet.Registers {
public string ContainerName => GetContainerName();
internal bool isUsedBitwise { get; set; }
internal Type enumType { get; set; }
internal Register () {
ValueChanged += (obj) => {
@@ -110,6 +111,18 @@ namespace MewtocolNet.Registers {
/// <returns></returns>
public string GetValueString () {
if (enumType != null && this is NRegister<int> intEnumReg) {
var dict = new Dictionary<int, string>();
foreach (var name in Enum.GetNames(enumType)) {
dict.Add((int)Enum.Parse(enumType, name), name);
}
if(dict.ContainsKey(intEnumReg.Value)) {
return $"{intEnumReg.Value} ({dict[intEnumReg.Value]})";
} else {
return $"{intEnumReg.Value} (Missing Enum)";
}
}
if (this is NRegister<short> shortReg) {
return $"{shortReg.Value}{(isUsedBitwise ? $" [{shortReg.GetBitwise().ToBitString()}]" : "")}";
}
@@ -133,7 +146,6 @@ namespace MewtocolNet.Registers {
}
if (this is SRegister stringReg) {
return stringReg.Value.ToString();
}
return "Type of the register is not supported.";