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

DLMS_SPODES/hdlc/sub_layer.py

@@ -1,54 +1,54 @@
-from struct import pack
-from functools import cached_property
-
-
-class LLC:
-    __DESTINATION__LSAP: int = 0xe6
-    __BROADCAST: int = 0xff
-    __COMMAND: int = 0xe6
-    __RESPONSE: int = 0xe7
-    __QUALITY: int = 0x00
-    __destination_lsap: int
-    __source_lsap: int
-    __info: bytes
-
-    def __init__(self, content: bytearray = None,
-                 message: bytes = None):
-        if message is None:
-            self.__destination_lsap = content.pop(0)
-            if self.__destination_lsap not in (self.__DESTINATION__LSAP, self.__BROADCAST):
-                raise ValueError(F'Destination tag wrong, expected {hex(self.__DESTINATION__LSAP), hex(self.__BROADCAST)}, got {hex(self.__destination_lsap)}')
-            else:
-                self.__source_lsap = content.pop(0)
-                if self.__source_lsap not in (self.__COMMAND, self.__RESPONSE):
-                    raise ValueError(F'Destination tag wrong, expected {hex(self.__COMMAND)}, {hex(self.__RESPONSE)}, got {hex(self.__source_lsap)}')
-                else:
-                    quality = content.pop(0)
-                    if quality != self.__QUALITY:
-                        raise ValueError(F'Quality tag wrong, expected {hex(self.__QUALITY)}, got {hex(quality)}')
-                    else:
-                        self.__info = bytes(content)
-        else:
-            self.__destination_lsap = self.__DESTINATION__LSAP
-            self.__source_lsap = self.__COMMAND
-            self.__info = message
-
-    @property
-    def info(self) -> bytes:
-        return self.__info
-
-    @cached_property
-    def content(self) -> bytes:
-        return pack('BBB', self.__destination_lsap, self.__source_lsap, self.__QUALITY) + self.__info
-
-    def __str__(self):
-        return F'{"broadcast " if self.__destination_lsap == self.__BROADCAST else ""}' \
-               F'{"command" if self.__source_lsap == self.__COMMAND else "response"} {self.__info[:10].hex(" ")}'
-
-    def __len__(self):
-        return len(self.content)
-
-
-if __name__ == '__main__':
-    l = LLC(content=bytearray((0xe6, 0xe7, 0, 1, 2, 3)))
-    print(l)
+from struct import pack
+from functools import cached_property
+
+
+class LLC:
+    __DESTINATION__LSAP: int = 0xe6
+    __BROADCAST: int = 0xff
+    __COMMAND: int = 0xe6
+    __RESPONSE: int = 0xe7
+    __QUALITY: int = 0x00
+    __destination_lsap: int
+    __source_lsap: int
+    __info: bytes
+
+    def __init__(self, content: bytearray = None,
+                 message: bytes = None):
+        if message is None:
+            self.__destination_lsap = content.pop(0)
+            if self.__destination_lsap not in (self.__DESTINATION__LSAP, self.__BROADCAST):
+                raise ValueError(F'Destination tag wrong, expected {hex(self.__DESTINATION__LSAP), hex(self.__BROADCAST)}, got {hex(self.__destination_lsap)}')
+            else:
+                self.__source_lsap = content.pop(0)
+                if self.__source_lsap not in (self.__COMMAND, self.__RESPONSE):
+                    raise ValueError(F'Destination tag wrong, expected {hex(self.__COMMAND)}, {hex(self.__RESPONSE)}, got {hex(self.__source_lsap)}')
+                else:
+                    quality = content.pop(0)
+                    if quality != self.__QUALITY:
+                        raise ValueError(F'Quality tag wrong, expected {hex(self.__QUALITY)}, got {hex(quality)}')
+                    else:
+                        self.__info = bytes(content)
+        else:
+            self.__destination_lsap = self.__DESTINATION__LSAP
+            self.__source_lsap = self.__COMMAND
+            self.__info = message
+
+    @property
+    def info(self) -> bytes:
+        return self.__info
+
+    @cached_property
+    def content(self) -> bytes:
+        return pack('BBB', self.__destination_lsap, self.__source_lsap, self.__QUALITY) + self.__info
+
+    def __str__(self):
+        return F'{"broadcast " if self.__destination_lsap == self.__BROADCAST else ""}' \
+               F'{"command" if self.__source_lsap == self.__COMMAND else "response"} {self.__info[:10].hex(" ")}'
+
+    def __len__(self):
+        return len(self.content)
+
+
+if __name__ == '__main__':
+    l = LLC(content=bytearray((0xe6, 0xe7, 0, 1, 2, 3)))
+    print(l)

DLMS_SPODES/literals.py

@@ -1,17 +1,17 @@
-from typing import Literal
-
-
-Attributes = Literal[
-    'value', 'scaler_unit', 'status', 'capture_time', 'current_average_value', 'last_average_value', 'start_time_current', 'period', 'number_of_periods', 'mask', 'active_value',
-    'active_objects', 'buffer', 'capture_objects', 'capture_period', 'sort_method', 'sort_object', 'entries_in_use', 'profile_entries', 'table', 'table_cell_values', 'status_map',
-    'compact_buffer', 'object_list', 'access_rights_list', 'sap_assignment_list', 'image_block_size', 'image_transferred_blocks_status',
-    'image_first_not_transferred_block_number', 'image_transfer_enabled', 'image_transfer_status', 'security_policy', 'security_suite', 'push_object_list',
-    'send_destination_and_method', 'protection_parameters_get', 'protection_parameters_set', 'function', 'array_components', 'protection_mode', 'time', 'time_zone', 'scripts',
-    'entries', 'calendar_name', 'season_profile', 'week_profile', 'thresholds', 'monitored_value', 'executed_script', 'output_state', 'sensor_values', 'action_sets',
-    'payment_mode', 'account_balance', 'current_credit_amount', 'unit_charge_active', 'token'
-]
-Methods = Literal[
-    'reset', 'next_period', 'image_transfer_initiate', 'image_block_transfer', 'image_verify', 'image_activate', 'security_activate', 'push', 'get_protected_attributes',
-    'set_protected_attributes', 'invoke_protected_method', 'add_element', 'remove_element', 'adjust_to_measurement', 'adjust_to_quarter', 'adjust_to_minute', 'activate',
-    'disconnect', 'reconnect', 'credit_payment', 'debit_payment', 'set_credit', 'collect_charge', 'process_token'
-]
+from typing import Literal
+
+
+Attributes = Literal[
+    'value', 'scaler_unit', 'status', 'capture_time', 'current_average_value', 'last_average_value', 'start_time_current', 'period', 'number_of_periods', 'mask', 'active_value',
+    'active_objects', 'buffer', 'capture_objects', 'capture_period', 'sort_method', 'sort_object', 'entries_in_use', 'profile_entries', 'table', 'table_cell_values', 'status_map',
+    'compact_buffer', 'object_list', 'access_rights_list', 'sap_assignment_list', 'image_block_size', 'image_transferred_blocks_status',
+    'image_first_not_transferred_block_number', 'image_transfer_enabled', 'image_transfer_status', 'security_policy', 'security_suite', 'push_object_list',
+    'send_destination_and_method', 'protection_parameters_get', 'protection_parameters_set', 'function', 'array_components', 'protection_mode', 'time', 'time_zone', 'scripts',
+    'entries', 'calendar_name', 'season_profile', 'week_profile', 'thresholds', 'monitored_value', 'executed_script', 'output_state', 'sensor_values', 'action_sets',
+    'payment_mode', 'account_balance', 'current_credit_amount', 'unit_charge_active', 'token'
+]
+Methods = Literal[
+    'reset', 'next_period', 'image_transfer_initiate', 'image_block_transfer', 'image_verify', 'image_activate', 'security_activate', 'push', 'get_protected_attributes',
+    'set_protected_attributes', 'invoke_protected_method', 'add_element', 'remove_element', 'adjust_to_measurement', 'adjust_to_quarter', 'adjust_to_minute', 'activate',
+    'disconnect', 'reconnect', 'credit_payment', 'debit_payment', 'set_credit', 'collect_charge', 'process_token'
+]

DLMS_SPODES/obis/__init__.py

@@ -1 +1 @@
-
+