DLMS-SPODES 0.87.15__py3-none-any.whl → 0.87.17__py3-none-any.whl

DLMS_SPODES/cosem_interface_classes/collection.py

@@ -1001,7 +1001,7 @@ class Collection:
                             case (ClassID.PROFILE_GENERIC, 3, _) | (ClassID.PROFILE_GENERIC, 6):
                                 a_val: structs.CaptureObjectDefinition
                                 obj = self.get_object(a_val.logical_name)
-                                rep.msg = F"{get_name(a_val.logical_name)}.{obj.get_attr_element(int(a_val.attribute_index))}"
+                                rep.msg = F"{get_name(a_val.logical_name, self.spec_map)}.{obj.get_attr_element(int(a_val.attribute_index))}"
                             case _:
                                 pass
                 rep.log = cdt.Log(logging.INFO)
@@ -1040,7 +1040,7 @@ class Collection:
                             case (ClassID.PROFILE_GENERIC, 3, _) | (ClassID.PROFILE_GENERIC, 6):
                                 data: structs.CaptureObjectDefinition
                                 obj = self.get_object(data.logical_name)
-                                rep.msg = F"{get_name(data.logical_name)}.{obj.get_attr_element(int(data.attribute_index))}"
+                                rep.msg = F"{get_name(data.logical_name, self.spec_map)}.{obj.get_attr_element(int(data.attribute_index))}"
                             case _:
                                 pass
                 rep.log = cdt.Log(logging.INFO)
@@ -1353,7 +1353,7 @@ class Collection:
     @lru_cache(4)
     def get_association_id(self, client_sap: enums.ClientSAP) -> int:
         """return id(association instance) from it client address without current"""
-        for ass in get_filtered(iter(self), (ln_pattern.NON_CURRENT_ASSOCIATION,)):
+        for ass in get_filtered(iter(self), (ln_pattern.ASSOCIATION,)):
             if ass.associated_partners_id.client_SAP == client_sap:
                 return ass.logical_name.e
             else:
@@ -1432,7 +1432,7 @@ class Collection:
         """ return names and type of element from collection"""
         names: list[str] = list()
         obj = self.par2obj(Parameter(value.logical_name.contents)).unwrap()
-        names.append(get_name(obj.logical_name))
+        names.append(get_name(obj.logical_name, self.spec_map))
         attr_index = int(value.attribute_index)
         data_index = int(value.data_index)
         data_type: Type[cdt.CommonDataType] = obj.get_attr_data_type(attr_index)

DLMS_SPODES/cosem_interface_classes/profile_generic/ver0.py

@@ -33,6 +33,14 @@ class SortMethod(cdt.Enum, elements=(1, 2, 3, 4, 5, 6)):
     """sort_method"""
 
 
+class GetBufferByIndex(cdt.Structure):
+    """get_buffer_by_index"""
+    from_index: cdt.DoubleLongUnsigned
+    to_index: cdt.DoubleLongUnsigned
+    selected_values: cdt.Array
+    
+
+
 class ProfileGeneric(ic.COSEMInterfaceClasses):
     """5.3.1 Profile generic"""
     CLASS_ID = ClassID.PROFILE_GENERIC
@@ -56,6 +64,9 @@ class ProfileGeneric(ic.COSEMInterfaceClasses):
     M_ELEMENTS = (
         ic.ICMElement("reset", integers.Only0),
         ic.ICMElement("capture", integers.Only0),
+        ic.ICMElement("write", cdt.Structure),  # todo: make anyhow
+        ic.ICMElement("get_buffer_by_range", integers.Only0),
+        ic.ICMElement("get_buffer_by_index", integers.Only0)
         # more 2 elements
     )
 

{dlms_spodes-0.87.15.dist-info → dlms_spodes-0.87.17.dist-info}/METADATA

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

{dlms_spodes-0.87.15.dist-info → dlms_spodes-0.87.17.dist-info}/RECORD

@@ -25,7 +25,7 @@ DLMS_SPODES/cosem_interface_classes/activity_calendar.py,sha256=iPmFZ4dtcKMbD8Le
 DLMS_SPODES/cosem_interface_classes/arbitrator.py,sha256=RMLpgDPoyMGcdTP2PEuvJJjGTbeWfbotcEDT4u_6KSs,3135
 DLMS_SPODES/cosem_interface_classes/attr_indexes.py,sha256=WyE7YsdCGa606NHCzsOrUmk-FIW58iQBc1PamziCTYg,316
 DLMS_SPODES/cosem_interface_classes/clock.py,sha256=MY9rbb3xXEcckHnuBFywiPjbDTOd1XiPYU-XNnoEETo,4372
-DLMS_SPODES/cosem_interface_classes/collection.py,sha256=mNJsCLw-rRfbeHf7MDS-dml5T6EFYwj9Ku07Zx6mGcw,96404
+DLMS_SPODES/cosem_interface_classes/collection.py,sha256=ZzkdERdnZTcIqX9UdBrMoapJqMPA3tM9l8SiMYm9Joo,96437
 DLMS_SPODES/cosem_interface_classes/cosem_interface_class.py,sha256=xtdinFiaCGKi98Wn8KhFVsWqRmxhecQjFryezCqPx6A,22601
 DLMS_SPODES/cosem_interface_classes/data.py,sha256=1M7_74iiv2lu8CP1Dt95J5lWvQZWQ8fNTWaP5EqlJRM,788
 DLMS_SPODES/cosem_interface_classes/disconnect_control.py,sha256=QZS2-8m_2mtL2yfvFpTrkl3Z9nbopPQhvWrsp-YAR08,2852
@@ -80,7 +80,7 @@ DLMS_SPODES/cosem_interface_classes/modem_configuration/ver1.py,sha256=fJhnkbwAE
 DLMS_SPODES/cosem_interface_classes/ntp_setup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DLMS_SPODES/cosem_interface_classes/ntp_setup/ver0.py,sha256=Bj_qB6f2CdzaCGMgkYdyMKl6u4iE_p_KNh1MuMsxV8M,1977
 DLMS_SPODES/cosem_interface_classes/profile_generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-DLMS_SPODES/cosem_interface_classes/profile_generic/ver0.py,sha256=d_8uWmM_uWGYqVgQ0oAo5IZPmaHxgbBAcVIP8oYQFp4,4098
+DLMS_SPODES/cosem_interface_classes/profile_generic/ver0.py,sha256=WkJnkHaeS_ETw9RTnLiJS06uD3xoZFDd8lztFJ265HY,4472
 DLMS_SPODES/cosem_interface_classes/profile_generic/ver1.py,sha256=uTcor-jm_TcFMRToHGhRXlwDDNQH3Gtpukm_40vaW1I,13728
 DLMS_SPODES/cosem_interface_classes/push_setup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DLMS_SPODES/cosem_interface_classes/push_setup/ver0.py,sha256=ltZuV-GwbvgvnmGCg8ef_jS1rDrMA5xlADRqAhhslhI,373
@@ -111,7 +111,7 @@ DLMS_SPODES/types/implementations/integers.py,sha256=aw1Y7-2VI_eyGoDPUZEj5_xTtPO
 DLMS_SPODES/types/implementations/long_unsigneds.py,sha256=0JDdc3rygG7TlbKcBkKawe4hlhai32UxO7-Hu49qRJY,8634
 DLMS_SPODES/types/implementations/octet_string.py,sha256=K_evjfdZvK4MEl1YStDxZvey2dIKHjBpST8lmRZ6Pak,283
 DLMS_SPODES/types/implementations/structs.py,sha256=bq720Jv9uEgdTrz-Cj-8DXnbWUIV_uqzuHlrmHpL1VY,1995
-dlms_spodes-0.87.15.dist-info/METADATA,sha256=N8KKT6nRGmkTBagubh0vXJubz5wmvhQeFWxa6khD6eI,1079
-dlms_spodes-0.87.15.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-dlms_spodes-0.87.15.dist-info/top_level.txt,sha256=k26SRuRdwBZrSM3NgNZECAUNIDZREbJuLCnPbWtTNak,12
-dlms_spodes-0.87.15.dist-info/RECORD,,
+dlms_spodes-0.87.17.dist-info/METADATA,sha256=DuQ-DrdqsvCgUbW1sjCTdPGK2KTZpnZdvzsH0OW9Lew,1079
+dlms_spodes-0.87.17.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dlms_spodes-0.87.17.dist-info/top_level.txt,sha256=k26SRuRdwBZrSM3NgNZECAUNIDZREbJuLCnPbWtTNak,12
+dlms_spodes-0.87.17.dist-info/RECORD,,