temp.

Author: janiversen

pymodbus/datastore/simulator.py

@@ -534,9 +534,7 @@ def action_reset(cls, inx):
     # Internal helper methods
     # --------------------------------------------
 
-    def validate_type(
-        self, func_code, real_address, count
-    ):
+    def validate_type(self, func_code, real_address, count):
         """Check if request is done against correct type
 
         :meta private:

test/test_datastore_simulator.py

@@ -62,8 +62,9 @@ class TestSimulator:
             [3, 4],
         ],
         "write": [
-            6,
-            [8, 10],
+            5,
+            [7, 8],
+            [16, 17],
         ],
         "bits": [
             5,
@@ -95,19 +96,19 @@ class TestSimulator:
         Cell(CELL_TYPE_ILLEGAL, False, 0, None),
         Cell(CELL_TYPE_ILLEGAL, False, 0, None),
         Cell(CELL_TYPE_ILLEGAL, False, 0, None),
-        Cell(CELL_TYPE_BIT, False, 1800, None),
-        Cell(CELL_TYPE_ILLEGAL, True, 0, None),
-        Cell(CELL_TYPE_BIT, False, 1800, None),
         Cell(CELL_TYPE_BIT, True, 1800, None),
-        Cell(CELL_TYPE_ILLEGAL, True, 0, None),
-        Cell(CELL_TYPE_BIT, True, 0x81, None),  # 10
+        Cell(CELL_TYPE_ILLEGAL, False, 0, None),
+        Cell(CELL_TYPE_BIT, True, 1800, None),
+        Cell(CELL_TYPE_BIT, True, 1800, None),
+        Cell(CELL_TYPE_ILLEGAL, False, 0, None),
+        Cell(CELL_TYPE_BIT, False, 0x81, None),  # 10
         Cell(CELL_TYPE_BIT, False, 0x42, None),
         Cell(CELL_TYPE_BIT, False, 0x42, None),
         Cell(CELL_TYPE_BIT, False, 1800, True),
         Cell(CELL_TYPE_BIT, False, 15, True),
         Cell(CELL_TYPE_ILLEGAL, False, 0, None),
-        Cell(CELL_TYPE_UINT16, False, 14661, True),
-        Cell(CELL_TYPE_UINT16, False, 14661, True),
+        Cell(CELL_TYPE_UINT16, True, 14661, True),
+        Cell(CELL_TYPE_UINT16, True, 14661, True),
         Cell(CELL_TYPE_UINT32, False, 17320, True),
         Cell(CELL_TYPE_NEXT, False, 5, None),
         Cell(CELL_TYPE_UINT32, False, 17320, True),  # 20
@@ -187,7 +188,7 @@ def test_simulator_validate_illegal(self):
                 exp2 = self.simulator.validate(func_code, addr, count)
                 if addr in {0, 1, 2, 3, 4, 6, 9, 15} or (
                     func_code in (FX_WRITE_BIT, FX_WRITE_REG)
-                    and addr not in {6, 8, 9, 10}
+                    and addr not in {5, 7, 8, 16, 17}
                 ):
                     assert not exp1, f"at index {addr}"
                 else:
@@ -196,7 +197,7 @@ def test_simulator_validate_illegal(self):
                     if addr in {8, 14} or (
                         func_code in (FX_WRITE_BIT, FX_WRITE_REG) and addr in {6, 9, 10}
                     ):
-                        assert not exp2, f"at index {addr}"
+                        assert not exp2, f"at yy index {addr}"
 
     def test_simulator_type_validate(self):
         """Test validate call."""