Merge pull request #8 from scs/feature/gurux_update

Feature/gurux update
* set and freeze gurux-dlms to 1.0.107
* reduce max HDLC buffer size to 5KB (~10x default L+G meter message)

Pipfile

@@ -4,9 +4,9 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-aioserial = "~=1.3"
-asyncio-mqtt = "~=0.10"
-gurux-dlms = "~=1.0.104"
+aioserial = "~=1.3.0"
+asyncio-mqtt = "~=0.10.0"
+gurux-dlms = "==1.0.107"
 
 [dev-packages]
 autopep8 = "*"

setup.py

@@ -51,11 +51,11 @@
     install_requires=[
         "aioserial==1.3.0",
         "asyncio-mqtt==0.10.0",
-        "gurux-dlms==1.0.104",
+        "gurux-dlms==1.0.107",
         "paho-mqtt==1.5.1",
         "pyserial==3.5",
     ],
-    scripts=['bin/smartmeter-datacollector'],
+    scripts=["bin/smartmeter-datacollector"],
     zip_safe=True,
     dependency_links=[],
 )

smartmeter_datacollector/smartmeter/hdlc_dlms_parser.py

@@ -10,7 +10,7 @@
 from typing import Any, Dict, List, Optional, Tuple
 
 from gurux_dlms import GXByteBuffer, GXDateTime, GXDLMSClient, GXReplyData
-from gurux_dlms.enums import ObjectType, Security
+from gurux_dlms.enums import InterfaceType, ObjectType, Security
 from gurux_dlms.objects import GXDLMSClock, GXDLMSData, GXDLMSObject, GXDLMSRegister
 from gurux_dlms.secure import GXDLMSSecureClient
 
@@ -21,17 +21,20 @@
 
 
 class HdlcDlmsParser:
-    HDLC_BUFFER_MAX_SIZE = 10000
+    HDLC_BUFFER_MAX_SIZE = 5000
 
     def __init__(self, cosem_config: CosemConfig, block_cipher_key: str = None) -> None:
         if block_cipher_key:
-            self._client = GXDLMSSecureClient(True)
+            self._client = GXDLMSSecureClient(
+                useLogicalNameReferencing=True,
+                interfaceType=InterfaceType.HDLC)
             self._client.ciphering.security = Security.ENCRYPTION
             self._client.ciphering.blockCipherKey = GXByteBuffer.hexToBytes(block_cipher_key)
         else:
-            self._client = GXDLMSClient(True)
+            self._client = GXDLMSClient(
+                useLogicalNameReferencing=True,
+                interfaceType=InterfaceType.HDLC)
 
-        # self._client.settings.standard = Standard.IDIS use IDIS for ISKRA meter?
         self._hdlc_buffer = GXByteBuffer()
         self._dlms_data = GXReplyData()
         self._cosem = cosem_config