DLMS-SPODES 0.87.3__py3-none-any.whl → 0.87.6__py3-none-any.whl

DLMS_SPODES/cosem_interface_classes/cosem_interface_class.py

@@ -1,7 +1,7 @@
 """
 DLMS UA 1000-1 Ed 14
 """
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from functools import lru_cache
 from typing_extensions import deprecated
 from typing import Iterator, Type, TypeAlias, Callable, Any, Self, Literal, Optional, Protocol, ClassVar
@@ -318,18 +318,27 @@ def ClassIDVer2Name(class_id: ClassID, ver: cdt.Unsigned) -> Name:
         case _: raise exc.ITEApplication(F"not find <Interface class name> with: {class_id=}, {ver=}")
 
 
+@dataclass
+class Cardinality:
+    """4.1.4 Class description notation"""
+    min: int = 0
+    max: int = -1
+    """default -1 as infinity"""
+
+
 class COSEMInterfaceClasses(Protocol):
     CLASS_ID: ClassVar[ut.CosemClassId]
     VERSION: ClassVar[cdt.Unsigned]
     """ Identification code of the version of the class. The version of each object is retrieved together with the logical name and the class_id by reading the object_list 
     attribute of an “Association LN” / ”Association SN” object. Within one logical device, all instances of a certain class must be of the same version."""
     A_ELEMENTS: tuple[ICAElement, ...]
+    cardinality: ClassVar[Cardinality] = field(default_factory=Cardinality)
     M_ELEMENTS: tuple[ICMElement, ...] = tuple()  # empty if class not has the methods
-    cardinality: tuple[int, int | None]
     __attributes: list[cdt.CommonDataType | None]
     __specific_methods: tuple[cdt.CommonDataType, ...] = None
     _cbs_attr_post_init: dict[int, Callable]
-    collection: Any | None  # Collection. todo: remove in future
+    # collection: Any | None  # Collection. todo: remove in future
+    hash_: int
 
     def __init__(self, logical_name: cst.LogicalName | bytes | str):
         self.collection = None
@@ -534,15 +543,6 @@ class COSEMInterfaceClasses(Protocol):
         """ Cosem-Attribute-Descriptor IS/IEC 62056-53 : 2006, 8.3 Useful types """
         return self.CLASS_ID.contents + self.instance_id.contents + ut.CosemObjectAttributeId(index).contents
 
-    @property
-    def string_type_cardinality(self) -> str:
-        min_cardinality, max_cardinality = self.cardinality
-        if min_cardinality == max_cardinality:
-            return str(min_cardinality)
-        else:
-            max_cardinality = str(max_cardinality) if max_cardinality else 'n'
-            return F'{str(min_cardinality)}...{max_cardinality}'
-
     def reset_attribute(self, index: int):
         """ try set default to value """
         self.set_attr(index, self.get_attr_element(index).default)

DLMS_SPODES/cosem_interface_classes/implementations/data.py

@@ -302,6 +302,15 @@ class KPZAlarm1(DataStatic):
     A_ELEMENTS = DataStatic.get_attr_element(2).get_change(data_type=KPZAlarm1Values),
 
 
+class SPODES3ControlAlarm1Values(cdt.IntegerFlag, cdt.DoubleLongUnsigned):
+    ...
+
+
+class SPODES3ControlAlarm1(DataDynamic):
+    """СТО 34.01-5.1-006-2023v4 Таблица 13.5 Распределение событий отключения реле нагрузки по битам"""
+    A_ELEMENTS = DataNotSpecific.get_attr_element(2).get_change(data_type=SPODES3ControlAlarm1Values),
+
+
 class SPODES3PowerQuality1Event(DataNotSpecific):
     """СТО_34.01-5.1-006-2019v3 E.1 Статус качества сети (журнал качества сети)"""
     A_ELEMENTS = DataNotSpecific.get_attr_element(2).get_change(data_type=SPODES3PowerQuality1EventValues),

DLMS_SPODES/cosem_interface_classes/implementations/profile_generic.py

@@ -64,7 +64,6 @@ class SPODES3DisplayReadout(ver1.ProfileGeneric):
             obj = self.collection.add_if_missing(class_id=ut.CosemClassId(el_value.class_id.contents),
                                                  version=None,
                                                  logical_name=el_value.logical_name)
-            # self.collection.raise_before(obj, self)
             el_value.set_name(self.collection.get_name_and_type(el_value)[0][-1])
         self.buffer_capture_objects = self.capture_objects
         buffer_elements: list[cdt.StructElement] = list()

DLMS_SPODES/cosem_interface_classes/parameters.py

@@ -18,6 +18,7 @@ class ActiveFirmwareIdentifier(Data):
         return cls.parse(f"0.{b}.0.2.0.255")
 
 
+LDN = Data.parse("0.0.42.0.0.255")
 ACTIVE_FIRMWARE_IDENTIFIER_0 = ActiveFirmwareIdentifier.from_b()
 
 

DLMS_SPODES/cosem_interface_classes/profile_generic/ver1.py

@@ -6,6 +6,7 @@ from ...relation_to_OBIS import get_name
 from ... import exceptions as exc
 from ..__class_init__ import *
 from ...types.implementations import integers, arrays, structs
+from ...types.choices import CommonDataTypeChoiceBase
 from ..overview import VERSION_1
 
 
@@ -36,6 +37,59 @@ class AccessSelector(ut.Unsigned8):
             raise ValueError(F'The {self.__class__.__name__} got {int(self)}, expected 1..2')
 
 
+class RangeDescriptorValueChoice(CommonDataTypeChoiceBase, types=(
+        cdt.DoubleLong,
+        cdt.DoubleLongUnsigned,
+        cdt.OctetString,
+        cdt.VisibleString,
+        cdt.Utf8String,
+        cdt.Integer,
+        cdt.Unsigned,
+        cdt.LongUnsigned,
+        cdt.Long,
+        cdt.Long64Unsigned,
+        cdt.Float32,
+        cdt.Float64,
+        cdt.DateTime,
+        cdt.Date,
+        cdt.Time
+)):
+    """Types of range_descriptor.from_value/to_value"""
+
+
+class RangeDescriptor(cdt.Structure):
+    restricting_object: structs.CaptureObjectDefinition
+    from_value: RangeDescriptorValueChoice
+    to_value: RangeDescriptorValueChoice
+    selected_values: CaptureObjects
+
+
+class Data(ut.Data):
+    restricting_object: structs.CaptureObjectDefinition
+    from_value: cdt.SimpleDataType
+    to_value: cdt.SimpleDataType
+    selected_values: CaptureObjects
+    from_entry: FromEntry
+    to_entry: cdt.DoubleLongUnsigned
+    from_selected_value: cdt.LongUnsigned
+    to_selected_value: cdt.LongUnsigned
+    ELEMENTS = {1: ut.SequenceElement('range_descriptor', RangeDescriptor),
+                2: ut.SequenceElement('entry_descriptor', EntryDescriptor)}
+
+
+class SelectiveAccessDescriptor(ut.SelectiveAccessDescriptor):
+    access_selector: AccessSelector
+    access_parameters: Data
+    ELEMENTS = (ut.SequenceElement('access_selector', AccessSelector),
+                ut.SequenceElement('access_parameters', Data))
+
+
+class CosemAttributeDescriptorWithSelection(ut.CosemAttributeDescriptorWithSelection):
+    access_selection: SelectiveAccessDescriptor
+    ELEMENTS = (ut.SequenceElement('cosem_attribute_descriptor', ut.CosemAttributeDescriptor),
+                ut.SequenceElement('access_selection', SelectiveAccessDescriptor))
+
+
 class ProfileGeneric(ver0.ProfileGeneric):
     """4.3.6 Profile generic"""
     VERSION = VERSION_1
@@ -132,45 +186,6 @@ class ProfileGeneric(ver0.ProfileGeneric):
         """ Available after got sort object. TODO: need rewrite. maybe replace to collection level. Wrong used sort_obj, it can be any element from capture_objects"""
         if self.sort_object is None:
             raise exc.EmptyObj(F"<sort object> is empty")
-        sort_obj: ic.COSEMInterfaceClasses = self.collection.get_object(self.sort_object.logical_name)
-        if sort_obj.CLASS_ID.contents == self.sort_object.class_id.contents:
-            value_type: Type[cdt.CommonDataType] = sort_obj.get_attr_data_type(int(self.sort_object.attribute_index))
-        else:
-            exc.NoObject(F"got {self.sort_object.class_id=}, expected {sort_obj.CLASS_ID=} from collection")
-
-        class RangeDescriptor(cdt.Structure):
-            # cb_preset = TODO: make check 'selected_values' from self.capture_objects or
-            # cb_post_set = TODO: make check 'selected_values' from self.capture_objects
-            DEFAULT = b'\x02\x04\x02\x04\x12\x00\x01\x09\x06\x00\x00\x01\x00\x00\xff\x0f\x02\x12\x00\x00\x09\x0c\x07\xe4\x01\x01\xff\xff\xff\xff\xff\x80\x00\xff' \
-                      b'\x09\x0c\x07\xe4\x01\x02\xff\xff\xff\xff\xff\x80\x00\xff\x01\x00'
-            restricting_object: structs.CaptureObjectDefinition
-            from_value: value_type
-            to_value: value_type
-            selected_values: CaptureObjects
-
-        class Data(ut.Data):
-            restricting_object: structs.CaptureObjectDefinition
-            from_value: cdt.SimpleDataType
-            to_value: cdt.SimpleDataType
-            selected_values: CaptureObjects
-            from_entry: FromEntry
-            to_entry: cdt.DoubleLongUnsigned
-            from_selected_value: cdt.LongUnsigned
-            to_selected_value: cdt.LongUnsigned
-            ELEMENTS = {1: ut.SequenceElement('range_descriptor', RangeDescriptor),
-                        2: ut.SequenceElement('entry_descriptor', EntryDescriptor)}
-
-        class SelectiveAccessDescriptor(ut.SelectiveAccessDescriptor):
-            access_selector: AccessSelector
-            access_parameters: Data
-            ELEMENTS = (ut.SequenceElement('access_selector', AccessSelector),
-                        ut.SequenceElement('access_parameters', Data))
-
-        class CosemAttributeDescriptorWithSelection(ut.CosemAttributeDescriptorWithSelection):
-            access_selection: SelectiveAccessDescriptor
-            ELEMENTS = (ut.SequenceElement('cosem_attribute_descriptor', ut.CosemAttributeDescriptor),
-                        ut.SequenceElement('access_selection', SelectiveAccessDescriptor))
-
         self.attr_descriptor_with_selection = CosemAttributeDescriptorWithSelection
         self.buffer.selective_access = SelectiveAccessDescriptor()
 

DLMS_SPODES/cosem_interface_classes/special_days_table.py

@@ -52,8 +52,6 @@ class SpecialDaysTable(ic.COSEMInterfaceClasses):
                   ic.ICMElement("delete", cdt.LongUnsigned))  # Todo: was Delete.with_cb(None, self.entries.get_indexes)
 
     def characteristics_init(self):
-        self.cardinality = (0, 1)
-
         self._cbs_attr_post_init.update({2: self.__set_delete})
         self.set_attr(2, None)
 

DLMS_SPODES/obis/media_id.py

@@ -1,15 +1,31 @@
 from abc import ABC, abstractmethod
+from typing import Protocol
 from itertools import count
 from ..config_parser import config
+from ..settings import settings
+from ..types import cdt
 
 
-_mid_names = config["DLMS"]["media_id_name"]
+_mid_names = config["DLMS"]["media_id_name"]  # todo: make with settings
 
 
-class MediaId(ABC):
+class MediaIdProto(Protocol):
+    _value: tuple[int]
+    _inst = None
+    TYPE: type[cdt.CommonDataType]
+
+    def __eq__(self, other: int) -> bool:
+        """with integer"""
+
+    def __hash__(self) -> int:
+        """for hashable"""
+
+
+class MediaId(MediaIdProto):
     """DLMS UA 1000-1 Ed 14. Table 53 – OBIS code structure and use of value groups. For Group A"""
     _value: tuple[int]
     _inst = None
+    TYPE: type[cdt.CommonDataType]
 
     @classmethod
     def from_int(cls, value: int):
@@ -24,15 +40,7 @@ class MediaId(ABC):
             case int(): return Reserved(value)
             case _:     raise ValueError(F"can't create {cls.__name__} from {value=}")
 
-    @abstractmethod
-    def __eq__(self, other: int):
-        """with integer"""
-
-    @abstractmethod
-    def __hash__(self):
-        """for hashable"""
-
-    def __str__(self):
+    def __str__(self) -> str:
         if _mid_names and (t := _mid_names.get(self.__class__.__name__)):
             return t
         else:
@@ -66,16 +74,6 @@ class TwoValueMixin:
         return self._value[0]
 
 
-class Singleton:
-    _inst: MediaId | None
-
-    def __new__(cls, *args, **kwargs):
-        if cls._inst:
-            return cls._inst
-        else:
-            return super().__new__(cls)
-
-
 sub_group_hash = count()
 
 
@@ -289,6 +287,7 @@ class CompactDataObjects(Abstract):
 
 class DeviceIdObjects(Abstract):
     """6_2_42"""
+    TYPE = cdt.DoubleLongUnsigned | cdt.OctetString | cdt.VisibleString | cdt.Utf8String | cdt.Unsigned | cdt.LongUnsigned
 
 
 class MeteringPointIdObjects(Abstract):

DLMS_SPODES/pardata.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from .cosem_interface_classes import Parameter
+from .cosem_interface_classes.parameter import Parameter
 from typing import Optional, Iterator
 from .types import cdt
 
@@ -9,14 +9,6 @@ class ParValues[T]:
     par:  Parameter
     data: T
 
-    def __getitem__(self, item):
-        if item == 0:
-            return self.par
-        elif item == 1:
-            return self.data
-        else:
-            raise StopIteration
-
     def __iter__(self) -> Iterator[Parameter | T]:
         yield self.par
         yield self.data

{dlms_spodes-0.87.3.dist-info → dlms_spodes-0.87.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES
-Version: 0.87.3
+Version: 0.87.6
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/DlmsSPODES-project

{dlms_spodes-0.87.3.dist-info → dlms_spodes-0.87.6.dist-info}/RECORD

@@ -6,7 +6,7 @@ DLMS_SPODES/enums.py,sha256=13BE0owOyJBNlOI4NY1d-kpqVoHF7JPR9brkPKHLERE,17789
 DLMS_SPODES/exceptions.py,sha256=UBZRQlQIRi1CzRxWTeqX5PVNuFS770f77BAizQ99IDU,3006
 DLMS_SPODES/firmwares.py,sha256=lFRnxtq4joYhpZPxHD8Pv30-GvgcEfZCDZUYo_pIeQU,3850
 DLMS_SPODES/literals.py,sha256=5u6hreLSXgmN7Z_5pXchyBKsuPYJ5deqxKHqewQEFoI,1632
-DLMS_SPODES/pardata.py,sha256=yktr4g59FITC_L1kRbQuwp0PMQvGdMwXqWxpXcCDpQU,700
+DLMS_SPODES/pardata.py,sha256=_VluNrP4R7PLVXa9xmqD7fiqEXQqyVXp48NieTct5jY,519
 DLMS_SPODES/pdu_enums.py,sha256=5xiV-tZTPXOcHT8XQcHWrwAMKTOmCH09Sk4iL1N7I3c,2276
 DLMS_SPODES/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DLMS_SPODES/relation_to_OBIS.py,sha256=KcSMIQ_5amjeT0Lya3HbYoaDdz_BjZC2JLVhl2nffwo,32761
@@ -24,9 +24,9 @@ DLMS_SPODES/cosem_interface_classes/a_parameter.py,sha256=5C1DqtDDPX0U2zj_sakEiD
 DLMS_SPODES/cosem_interface_classes/activity_calendar.py,sha256=VWSiKn2LNBA1VLAAyW6Xx5rxCMwJDrqQqkRzxupMSmM,10584
 DLMS_SPODES/cosem_interface_classes/arbitrator.py,sha256=S9TguoMG6O5DpMBp6mpcJpw6PHanvh4SEAN3M_v6qts,3240
 DLMS_SPODES/cosem_interface_classes/attr_indexes.py,sha256=aUSnT-dKoBsDbwLhlgtLIHGRl7PZrT-ld2ThCEUjUeA,328
-DLMS_SPODES/cosem_interface_classes/clock.py,sha256=9OJwRGrbFPws_VZPayHv-hzFJegIcjgoJoenIqofd5w,4525
-DLMS_SPODES/cosem_interface_classes/collection.py,sha256=3ivTtIv2dCanGsXqBbvcuoNqRm211S523DeZvN9dwuU,96317
-DLMS_SPODES/cosem_interface_classes/cosem_interface_class.py,sha256=SIME0IC1XyX9RSsfxt0cbghN7rCyWzjqCbesQEpTCM8,23347
+DLMS_SPODES/cosem_interface_classes/clock.py,sha256=vgRt9NcPAAlRZfDrlR11Q8o-wHz6uA0PnBUP2318WsY,4503
+DLMS_SPODES/cosem_interface_classes/collection.py,sha256=4zafwek9zuWPLlpOZqZ0-uC7z2X-IhsVC5kCUaxhEmY,98545
+DLMS_SPODES/cosem_interface_classes/cosem_interface_class.py,sha256=tPHsO-AlCflQzWO3gARSHoBkn6-SW_Y_O2TTCzB1sK8,23184
 DLMS_SPODES/cosem_interface_classes/data.py,sha256=YSjA3Y0M5NMcfYzWPEuZw6ojIqr2UghgW_ck8dXySMU,809
 DLMS_SPODES/cosem_interface_classes/disconnect_control.py,sha256=CIx7I4QRpPxAC5iYxpbhCIuv6U2P3s6ELam8eD-kD5w,2926
 DLMS_SPODES/cosem_interface_classes/extended_register.py,sha256=xULCS11YVWjFMoaRUrm4whvH39Gx0Cu6breUos_oLCs,1153
@@ -38,14 +38,14 @@ DLMS_SPODES/cosem_interface_classes/ln_pattern.py,sha256=IPluhyGWJQLBEUjOjdfEMct
 DLMS_SPODES/cosem_interface_classes/obis.py,sha256=yEwYm5CshJx8X8uSy3QH8XIbdVPg8Tt6zPUjFgkAB0M,575
 DLMS_SPODES/cosem_interface_classes/overview.py,sha256=0eko1CW0eH397J5kM20G7RSQUzCGV6lGCMPbLsKPEqQ,7146
 DLMS_SPODES/cosem_interface_classes/parameter.py,sha256=esTD-1VzvX0rnazsHSVIR8mLuVxpdqwdjzppxj5Zz7s,18961
-DLMS_SPODES/cosem_interface_classes/parameters.py,sha256=VZDBm9H25VIGxUGGJ-OcVu0pAO8VJhFF2XdZTQMnmoM,4354
+DLMS_SPODES/cosem_interface_classes/parameters.py,sha256=aYkpdsomVxOFCkNduYlWxxqyH8Y7Ncvn3qGYWOouSNE,4390
 DLMS_SPODES/cosem_interface_classes/register.py,sha256=Cfikftpo1Nzg_B2drOmJDwoGkbS2wXlqQpxVgXL1w2U,1886
 DLMS_SPODES/cosem_interface_classes/register_monitor.py,sha256=fNM-JrjHxQB8b5DgUOtDcnkO_hxu5bFICiuKEoZa37g,1792
 DLMS_SPODES/cosem_interface_classes/reports.py,sha256=zsWmKGqdP6uiZrH8hR5aqHJPMsyHwyrSCRf6khhFoSg,3365
 DLMS_SPODES/cosem_interface_classes/schedule.py,sha256=IT9sVrkOCdWV4uuTt8Kbu5bL6jchiVTgUqA15x1fq5s,8041
 DLMS_SPODES/cosem_interface_classes/script_table.py,sha256=aPDXwjCkrvT-yGkCOOZXWjiOZViRy6N-Tb_Gl1aTIik,3455
 DLMS_SPODES/cosem_interface_classes/single_action_schedule.py,sha256=UGRO-x2q1du3CupfB4KQtUyyUAcbJGqph_apIe0QfFY,1708
-DLMS_SPODES/cosem_interface_classes/special_days_table.py,sha256=etTcvCBYqkJe6vFYuD87VKY1KeD45b2567ifvf3MRgk,3356
+DLMS_SPODES/cosem_interface_classes/special_days_table.py,sha256=M9yHEviXs1_B6tI9JRU-qu9T3bXdD8Ub8MyPBsytMqI,3319
 DLMS_SPODES/cosem_interface_classes/tcp_udp_setup.py,sha256=m7P0XTxupoi5XCq3nsqHKD_lhbEj3tQj-65Acx2S53A,2246
 DLMS_SPODES/cosem_interface_classes/association_ln/__init__.py,sha256=Y3YnJNv4fFcnnEp3MH3wCBt3u8odMWK9TqnDTagHrSE,22
 DLMS_SPODES/cosem_interface_classes/association_ln/abstract.py,sha256=komQiQ3ax4kVZuC2xS_PgSeYVSr04LbTzAfGt9rSwGg,866
@@ -72,8 +72,8 @@ DLMS_SPODES/cosem_interface_classes/image_transfer/image_transfer_status.py,sha2
 DLMS_SPODES/cosem_interface_classes/image_transfer/ver0.py,sha256=rnHj2XnK1Zr4CvPG_MrPSoBBcdh883rwqdIus1RxKMw,5371
 DLMS_SPODES/cosem_interface_classes/implementations/__init__.py,sha256=z4OfnPPyYr6f94rj-PU3---Wk05ddduf9MkmWxhczXA,77
 DLMS_SPODES/cosem_interface_classes/implementations/arbitrator.py,sha256=cMhYLi9ZFqfJ0yxjONHq9JZZJ3QuzrF0jtPjk4nf0eo,573
-DLMS_SPODES/cosem_interface_classes/implementations/data.py,sha256=zyhnnJ-9erdj2rZ28ZjtP7rHH704yuUkqdvJAafvaQs,18598
-DLMS_SPODES/cosem_interface_classes/implementations/profile_generic.py,sha256=oibO3EV9fRHxxaBdMQqz436GrMMqo1BlT6lgVtzUKU0,4318
+DLMS_SPODES/cosem_interface_classes/implementations/data.py,sha256=PCa_exj-y0WFt5gVTZQvIpI1wNTqTFc6ZoUSmLKz1Ys,19001
+DLMS_SPODES/cosem_interface_classes/implementations/profile_generic.py,sha256=YHRV96fmvgx5FEfg9M88xuwgokqUcc3Fqmylbpa7b-0,4263
 DLMS_SPODES/cosem_interface_classes/modem_configuration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DLMS_SPODES/cosem_interface_classes/modem_configuration/ver0.py,sha256=nFU3Y0fFhsOKfSl21TmA1CaWJo-N9Iqm7XlcGuSSjoQ,3071
 DLMS_SPODES/cosem_interface_classes/modem_configuration/ver1.py,sha256=Ze_W-UNKmng8uWLuEDfD78bIVO0u0IlM0sBnpzeOZ1c,1776
@@ -81,7 +81,7 @@ DLMS_SPODES/cosem_interface_classes/ntp_setup/__init__.py,sha256=47DEQpj8HBSa-_T
 DLMS_SPODES/cosem_interface_classes/ntp_setup/ver0.py,sha256=1Eaf9dnqK8kFbn38Op-PxbHg1b63QwAQEY41f3ZXF2E,2044
 DLMS_SPODES/cosem_interface_classes/profile_generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DLMS_SPODES/cosem_interface_classes/profile_generic/ver0.py,sha256=AhOPl9gCwWNCZ-Hvn-pG5SRg2yP1kPljnG_Uelr_BXg,4220
-DLMS_SPODES/cosem_interface_classes/profile_generic/ver1.py,sha256=9kt0XvrlFskBbBHqHkHed8d1Y8M9Mz2uK7Ae0PTZBBc,10768
+DLMS_SPODES/cosem_interface_classes/profile_generic/ver1.py,sha256=-B8CWiWXif2bhjhepMz5iVwJFrwoT2kRBKJct1CzXws,10293
 DLMS_SPODES/cosem_interface_classes/push_setup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DLMS_SPODES/cosem_interface_classes/push_setup/ver0.py,sha256=JDbN0uyXM9iAWQe7JOgkz5DxibdcUQQrxPfTCII7CJ8,385
 DLMS_SPODES/cosem_interface_classes/push_setup/ver1.py,sha256=D25GXpg2uLl2nQ6eQMScFyId4ZhKdUwcU7jWUP3egG4,348
@@ -96,8 +96,7 @@ DLMS_SPODES/hdlc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 DLMS_SPODES/hdlc/frame.py,sha256=ar5DvkPK5tUGSZcQYCpeku1Ansx7QecugvmcV-xekqI,34784
 DLMS_SPODES/hdlc/sub_layer.py,sha256=zTxe5ddTt8tliFSY145HhluLwIh57gvOG19Mc8-vnEM,2147
 DLMS_SPODES/obis/__init__.py,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-DLMS_SPODES/obis/abstract_objects.py,sha256=0ZoJKRQ_7FoChC2rNSgNV573hso8JYZQKdLF3Wgaoqw,443
-DLMS_SPODES/obis/media_id.py,sha256=GRiwHPe9-3iCg4u_J6qf2rMc3Wjw0aJHKiSnBtNYD3o,22339
+DLMS_SPODES/obis/media_id.py,sha256=D_Vm7aT6XevrIN22NQgMHReVju_VGH9mYphfh1Nn09c,22516
 DLMS_SPODES/types/__init__.py,sha256=UFiP4suA72o_kvaqUnHLGK-cedDXLl8kVHYsjXHYUDw,116
 DLMS_SPODES/types/choices.py,sha256=z7IasrlRaagOYNfRvgbpojDxf1jgYUc9cz59PH2PMi0,6350
 DLMS_SPODES/types/common_data_types.py,sha256=jUQem7YkKNL93d-F7MArMiAFu-pxfaeMY4aDPKrOkKc,96953
@@ -112,7 +111,7 @@ DLMS_SPODES/types/implementations/integers.py,sha256=Asy4X260t1Fzw_V5iw0uiDOxtfB
 DLMS_SPODES/types/implementations/long_unsigneds.py,sha256=SxmFvD2moQ03p-KZSBYK1Rv7bQSaywlHVXBfkTZG1OQ,8761
 DLMS_SPODES/types/implementations/octet_string.py,sha256=Jo_sfWcsfstiP4O6mXfBOOQlksx1c2qJMI-vbAOV-yM,294
 DLMS_SPODES/types/implementations/structs.py,sha256=GMOo6Jy8jA9d6KTLs0D-j5t0oSRvxUIwtBr_4UePwbA,2059
-dlms_spodes-0.87.3.dist-info/METADATA,sha256=ANlxJv9tqVDNQ2qtmssUfyu_kFHEl4V8FglWBADITRQ,1027
-dlms_spodes-0.87.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dlms_spodes-0.87.3.dist-info/top_level.txt,sha256=k26SRuRdwBZrSM3NgNZECAUNIDZREbJuLCnPbWtTNak,12
-dlms_spodes-0.87.3.dist-info/RECORD,,
+dlms_spodes-0.87.6.dist-info/METADATA,sha256=wehMrVJEQXZiW2GNtUpjl6ehFbTXDoL8rLvGiAAaEWY,1027
+dlms_spodes-0.87.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dlms_spodes-0.87.6.dist-info/top_level.txt,sha256=k26SRuRdwBZrSM3NgNZECAUNIDZREbJuLCnPbWtTNak,12
+dlms_spodes-0.87.6.dist-info/RECORD,,

DLMS_SPODES/obis/abstract_objects.py

@@ -1,17 +0,0 @@
-"""DLMS UA 1000-1 Ed. 14. 7.4 Abstract objects (Value group A = 0)"""
-from struct import pack_into
-from ..types import cst
-
-
-_buf = bytearray(6)
-
-
-def BILLING_PERIOD_COUNTER(b: int = 0, f: int = 255):
-    return cst.LogicalName(bytes((0, b, 0, 1, 0, f)))
-
-
-def SPODES3_DISPLAY_MODE():
-    return cst.LogicalName(pack_into(">6B", _buf, 0, 0, 96, 4, 1, 255))
-
-
-LDN = cst.LogicalName(pack_into(">6B", _buf, 0, 0, 42, 0, 0, 255))