- Add __iter__ method to AliasEnum.
- Refactor get_data_length.
This commit is contained in:
@@ -141,6 +141,9 @@ class AliasEnumType(EnumType):
|
|||||||
"""
|
"""
|
||||||
return member in cls.__members__
|
return member in cls.__members__
|
||||||
|
|
||||||
|
def __iter__(cls):
|
||||||
|
return cls.__members__
|
||||||
|
|
||||||
|
|
||||||
# Disable Ruff warnings about duplicate values in this enum.
|
# Disable Ruff warnings about duplicate values in this enum.
|
||||||
# ruff: disable[PIE796]
|
# ruff: disable[PIE796]
|
||||||
@@ -179,6 +182,7 @@ class IECTypes(Enum, metaclass=AliasEnumType):
|
|||||||
CHAR = IECType(8)
|
CHAR = IECType(8)
|
||||||
WCHAR = IECType(16)
|
WCHAR = IECType(16)
|
||||||
|
|
||||||
|
|
||||||
# ruff: enable[PIE796]
|
# ruff: enable[PIE796]
|
||||||
|
|
||||||
|
|
||||||
@@ -358,14 +362,16 @@ def get_data_length(
|
|||||||
return IECTypes[data_type].value.get_length(unit)
|
return IECTypes[data_type].value.get_length(unit)
|
||||||
except KeyError:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
try:
|
if data_type.lower().startswith("arr"):
|
||||||
match = data_type.strip()[0:3].lower()
|
try:
|
||||||
if match == "arr":
|
|
||||||
return IECArray(data_type).get_length(unit)
|
return IECArray(data_type).get_length(unit)
|
||||||
if match == "str":
|
except ValueError:
|
||||||
|
pass
|
||||||
|
if data_type.lower().startswith("str"):
|
||||||
|
try:
|
||||||
return IECString(data_type).get_length(unit)
|
return IECString(data_type).get_length(unit)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
pass
|
pass
|
||||||
try:
|
try:
|
||||||
return udt_lengths[data_type] * DataUnit.WORD // unit
|
return udt_lengths[data_type] * DataUnit.WORD // unit
|
||||||
except KeyError:
|
except KeyError:
|
||||||
|
|||||||
@@ -29,7 +29,9 @@ class TestIEC(unittest.TestCase):
|
|||||||
("UNKNOWN_UDT", DataUnit.WORD, -1),
|
("UNKNOWN_UDT", DataUnit.WORD, -1),
|
||||||
]
|
]
|
||||||
for data_type in data_types:
|
for data_type in data_types:
|
||||||
self.assertEqual(get_data_length(data_type[0], data_type[1]), data_type[2])
|
self.assertEqual(
|
||||||
|
get_data_length(data_type[0], data_type[1]), data_type[2], data_type
|
||||||
|
)
|
||||||
|
|
||||||
def test_iec_definitions(self):
|
def test_iec_definitions(self):
|
||||||
definitions = iec_definitions()
|
definitions = iec_definitions()
|
||||||
|
|||||||
Reference in New Issue
Block a user