From 151346bb19c81774009b9cc205fa0492492ce909 Mon Sep 17 00:00:00 2001
From: drunsinn <max@chp1.net>
Date: Thu, 20 Jun 2024 19:44:59 +0200
Subject: [PATCH] add dword support for plc input and output (#63)

* add dword for input and output memory

* add test and demo for input/output word and dword
---
 pyLSV2/client.py       | 10 ++++++++++
 pyLSV2/const.py        |  2 ++
 pyLSV2/scripts/demo.py |  6 +++++-
 tests/test_plc_read.py |  5 ++++-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/pyLSV2/client.py b/pyLSV2/client.py
index 6babd6d..d807725 100644
--- a/pyLSV2/client.py
+++ b/pyLSV2/client.py
@@ -1280,6 +1280,16 @@ def read_plc_memory(
             max_elements = self._sys_par.number_of_output_words
             mem_byte_count = 2
             unpack_string = "<H"
+        elif mem_type is lc.MemoryType.OUTPUT_DWORD:
+            start_address = self._sys_par.output_words_start_address
+            max_elements = self._sys_par.number_of_output_words / 4
+            mem_byte_count = 4
+            unpack_string = "<l"
+        elif mem_type is lc.MemoryType.INPUT_DWORD:
+            start_address = self._sys_par.input_words_start_address
+            max_elements = self._sys_par.number_of_input_words / 4
+            mem_byte_count = 4
+            unpack_string = "<l"
         else:
             raise LSV2InputException("unknown address type")
 
diff --git a/pyLSV2/const.py b/pyLSV2/const.py
index 70a5c84..6326a89 100644
--- a/pyLSV2/const.py
+++ b/pyLSV2/const.py
@@ -189,6 +189,8 @@ class MemoryType(IntEnum):
     STRING = 9
     INPUT_WORD = 10
     OUTPUT_WORD = 11
+    OUTPUT_DWORD = 12
+    INPUT_DWORD = 13
 
 
 class LSV2StatusCode(IntEnum):
diff --git a/pyLSV2/scripts/demo.py b/pyLSV2/scripts/demo.py
index 17b7f98..3a4df18 100644
--- a/pyLSV2/scripts/demo.py
+++ b/pyLSV2/scripts/demo.py
@@ -100,7 +100,11 @@ def comprehensive_demo():
         print("## double word: {}".format(con.read_plc_memory(0, MemoryType.DWORD, 5)))
         print("## string: {}".format(con.read_plc_memory(0, MemoryType.STRING, 5)))
         print("## input: {}".format(con.read_plc_memory(0, MemoryType.INPUT, 5)))
-        print("## output: {}".format(con.read_plc_memory(0, MemoryType.OUTPUT_WORD, 5)))
+        print("## output: {}".format(con.read_plc_memory(0, MemoryType.OUTPUT, 5)))
+        print("## input word: {}".format(con.read_plc_memory(0, MemoryType.INPUT_WORD, 5)))
+        print("## output word: {}".format(con.read_plc_memory(0, MemoryType.OUTPUT_WORD, 5)))
+        print("## input dword: {}".format(con.read_plc_memory(0, MemoryType.INPUT_DWORD, 5)))
+        print("## output dword: {}".format(con.read_plc_memory(0, MemoryType.OUTPUT_DWORD, 5)))
 
         print("# data values via data path, only available on some iTNC530")
         if con.versions.is_itnc():
diff --git a/tests/test_plc_read.py b/tests/test_plc_read.py
index 4c22ef5..5eaa241 100644
--- a/tests/test_plc_read.py
+++ b/tests/test_plc_read.py
@@ -16,8 +16,11 @@ def test_plc_read(address: str, timeout: float):
     assert lsv2.read_plc_memory(0, pyLSV2.MemoryType.WORD, 1) is not False
     assert lsv2.read_plc_memory(0, pyLSV2.MemoryType.DWORD, 1) is not False
     assert lsv2.read_plc_memory(0, pyLSV2.MemoryType.STRING, 1) is not False
-    assert lsv2.read_plc_memory(0, pyLSV2.MemoryType.INPUT, 1) is not False
     assert lsv2.read_plc_memory(0, pyLSV2.MemoryType.OUTPUT_WORD, 1) is not False
+    assert lsv2.read_plc_memory(0, pyLSV2.MemoryType.OUTPUT_DWORD, 1) is not False
+    assert lsv2.read_plc_memory(0, pyLSV2.MemoryType.INPUT, 1) is not False
+    assert lsv2.read_plc_memory(0, pyLSV2.MemoryType.INPUT_WORD, 1) is not False
+    assert lsv2.read_plc_memory(0, pyLSV2.MemoryType.INPUT_DWORD, 1) is not False
 
     lsv2.logout(pyLSV2.Login.PLCDEBUG)