DLMS-SPODES-client 0.19.28__tar.gz → 0.19.30__tar.gz

dlms_spodes_client-0.19.30/.vscode/launch.json

@@ -0,0 +1,24 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug test_SetBits",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "-m",
+            "args": [
+                "unittest",
+                "test.test_Client.TestType.test_Session",
+                "-v"
+            ],
+            "console": "integratedTerminal",
+            "justMyCode": false,
+            "env": {
+                "PYTHONPATH": "${workspaceFolder}"
+            }
+        },
+    ]
+}

{dlms_spodes_client-0.19.28 → dlms_spodes_client-0.19.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES_client
-Version: 0.19.28
+Version: 0.19.30
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/SPODESclient_prj

{dlms_spodes_client-0.19.28 → dlms_spodes_client-0.19.30}/pyproject.toml

@@ -15,7 +15,7 @@ exclude = ["Types"]
 
 [project]
 name = "DLMS_SPODES_client"
-version = "0.19.28"
+version = "0.19.30"
 requires-python = ">= 3.12"
 authors = [
     {name="Serj Kotilevski", email="youserj@outlook.com"}

{dlms_spodes_client-0.19.28 → dlms_spodes_client-0.19.30}/src/DLMS_SPODES_client/task.py

@@ -928,7 +928,7 @@ class NonInit:
 class MapTypeCreator:
     adapter: Adapter
     lock: asyncio.Lock
-    con: dict[[IDSAP], CreateType]
+    con: dict[IDSAP, CreateType]
 
     def __init__(self, adapter: Adapter):
         self.adapter = adapter
@@ -961,7 +961,7 @@ class MapTypeCreator:
                 self.adapter.set_collection(res.value)
         res.value, err = res.value.copy().unpack()
         if err is not None:
-            res.extend_err(err)
+            res.append_err(err)
         return res
 
 
@@ -1240,6 +1240,43 @@ class Write2(SimpleCopy, OK):
         return result.OK
 
 
+@dataclass(frozen=True)
+class SetBits(SimpleCopy, OK):
+    """set bits by pattern"""
+    par: Parameter
+    pattern: dict[int, int]
+    msg: str = "set bits"
+
+    async def exchange(self, c: Client) -> result.Ok | result.Error:
+        if isinstance(res_obj := c.objects.par2obj(self.par), result.Error):
+            return res_obj
+        if isinstance(res_read := await Par2Data[cdt.Digital | cdt.BitString](self.par.attr).exchange(c), result.Error):
+            return res_read
+        data = res_read.value
+        for el in self.par.elements():
+            data = data[el]
+        if isinstance(data, cdt.Digital):
+            data_int = int(data)
+            for pos, val in self.pattern.items():
+                data_int = (data_int | (1 << pos)) if val else (data_int & ~(1 << pos))
+            data.set(data_int)
+        elif isinstance(data, cdt.BitString):
+            for pos, val in self.pattern.items():
+                try:
+                    data[pos] = val
+                except IndexError as e:
+                    return result.Error.from_e(ValueError(f"can't set bit {pos} in {self.par}"))
+        else:
+            return result.Error.from_e(TypeError(f"{self.par} not available SetBits"))
+        c.get_set_request_normal(
+            obj=res_obj.value,
+            attr_index=self.par.i,
+            value=res_read.value.encoding)
+        if isinstance(res_pdu := await c.read_data_block(), result.Error):
+            return res_pdu
+        return result.OK
+
+
 @dataclass
 @deprecated("use <WriteTranscript>")
 class WriteParValue(SimpleCopy, OK):

{dlms_spodes_client-0.19.28 → dlms_spodes_client-0.19.30}/src/DLMS_SPODES_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES_client
-Version: 0.19.28
+Version: 0.19.30
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/SPODESclient_prj

{dlms_spodes_client-0.19.28 → dlms_spodes_client-0.19.30}/src/DLMS_SPODES_client.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@
 README.md
 pyproject.toml
 .github/workflows/publish.yaml
+.vscode/launch.json
 src/DLMS_SPODES_client/FCS16.py
 src/DLMS_SPODES_client/__init__.py
 src/DLMS_SPODES_client/client.py
@@ -64,6 +65,7 @@ src/DLMS_SPODES_client/gurux_dlms/enums/Task.py
 src/DLMS_SPODES_client/gurux_dlms/enums/VdeStateError.py
 src/DLMS_SPODES_client/gurux_dlms/enums/__init__.py
 src/DLMS_SPODES_client/gurux_dlms/internal/_GXCommon.py
+test/__init__.py
 test/client_log.txt
 test/config.toml
 test/name2.csv

{dlms_spodes_client-0.19.28 → dlms_spodes_client-0.19.30}/test/test_Client.py

@@ -20,8 +20,8 @@ from src.DLMS_SPODES_client import task
 task.get_adapter(adapter := xml50)
 
 
-port1 = "COM6"
-port2 = "COM5"
+port1 = "COM5"
+port2 = "COM6"
 # mac = "A0:6C:65:53:7D:86"
 mac = "5C:53:10:5A:E2:4B"
 
@@ -132,6 +132,16 @@ class TestType(unittest.TestCase):
         ))
         print(sess)
 
+    def test_SetBits(self):
+        self.start_coro(sess := Session(
+            c=c_Serial_HIGH,
+            tsk=task.SetBits(
+                par=Parameter.parse("0.0.96.3.20.255:3").append(0),
+                pattern={1: 1, 0: 0}
+            )
+        ))
+        print(sess)
+
     def test_WriteTime(self):
         self.start_coro(sess := Session(
             c=c_Serial_HIGH,