call async datastore from modbus server (#2144)

Author: ilkka-ollakka

pymodbus/pdu/bit_read_message.py

@@ -169,7 +169,9 @@ async def execute(self, context):
             return self.doException(merror.IllegalValue)
         if not context.validate(self.function_code, self.address, self.count):
             return self.doException(merror.IllegalAddress)
-        values = context.getValues(self.function_code, self.address, self.count)
+        values = await context.async_getValues(
+            self.function_code, self.address, self.count
+        )
         if isinstance(values, ExceptionResponse):
             return values
         return ReadCoilsResponse(values)
@@ -237,7 +239,9 @@ async def execute(self, context):
             return self.doException(merror.IllegalValue)
         if not context.validate(self.function_code, self.address, self.count):
             return self.doException(merror.IllegalAddress)
-        values = context.getValues(self.function_code, self.address, self.count)
+        values = await context.async_getValues(
+            self.function_code, self.address, self.count
+        )
         if isinstance(values, ExceptionResponse):
             return values
         return ReadDiscreteInputsResponse(values)

pymodbus/pdu/bit_write_message.py

@@ -14,8 +14,8 @@
 import struct
 
 from pymodbus.constants import ModbusStatus
-from pymodbus.pdu import ExceptionResponse, ModbusRequest, ModbusResponse
 from pymodbus.pdu import ModbusExceptions as merror
+from pymodbus.pdu import ModbusRequest, ModbusResponse
 from pymodbus.utilities import pack_bitstring, unpack_bitstring
 
 
@@ -90,11 +90,8 @@ async def execute(self, context):
         if not context.validate(self.function_code, self.address, 1):
             return self.doException(merror.IllegalAddress)
 
-        context.setValues(self.function_code, self.address, [self.value])
-        # result = context.setValues(self.function_code, self.address, [self.value])
-        # if isinstance(result, ExceptionResponse):
-        #    return result
-        values = context.getValues(self.function_code, self.address, 1)
+        await context.async_setValues(self.function_code, self.address, [self.value])
+        values = await context.async_getValues(self.function_code, self.address, 1)
         # if isinstance(values, ExceptionResponse):
         #    return values
         return WriteSingleCoilResponse(self.address, values[0])
@@ -227,9 +224,9 @@ async def execute(self, context):
         if not context.validate(self.function_code, self.address, count):
             return self.doException(merror.IllegalAddress)
 
-        result = context.setValues(self.function_code, self.address, self.values)
-        if isinstance(result, ExceptionResponse):
-            return result
+        await context.async_setValues(
+            self.function_code, self.address, self.values
+        )
         return WriteMultipleCoilsResponse(self.address, count)
 
     def __str__(self):

pymodbus/pdu/register_read_message.py

@@ -149,7 +149,9 @@ async def execute(self, context):
             return self.doException(merror.IllegalValue)
         if not context.validate(self.function_code, self.address, self.count):
             return self.doException(merror.IllegalAddress)
-        values = context.getValues(self.function_code, self.address, self.count)
+        values = await context.async_getValues(
+            self.function_code, self.address, self.count
+        )
         if isinstance(values, ExceptionResponse):
             return values
 
@@ -210,7 +212,9 @@ async def execute(self, context):
             return self.doException(merror.IllegalValue)
         if not context.validate(self.function_code, self.address, self.count):
             return self.doException(merror.IllegalAddress)
-        values = context.getValues(self.function_code, self.address, self.count)
+        values = await context.async_getValues(
+            self.function_code, self.address, self.count
+        )
         if isinstance(values, ExceptionResponse):
             return values
         return ReadInputRegistersResponse(values)
@@ -328,12 +332,10 @@ async def execute(self, context):
             return self.doException(merror.IllegalAddress)
         if not context.validate(self.function_code, self.read_address, self.read_count):
             return self.doException(merror.IllegalAddress)
-        result = context.setValues(
+        await context.async_setValues(
             self.function_code, self.write_address, self.write_registers
         )
-        if isinstance(result, ExceptionResponse):
-            return result
-        registers = context.getValues(
+        registers = await context.async_getValues(
             self.function_code, self.read_address, self.read_count
         )
         return ReadWriteMultipleRegistersResponse(registers)

pymodbus/pdu/register_write_message.py

@@ -68,10 +68,10 @@ async def execute(self, context):
         if not context.validate(self.function_code, self.address, 1):
             return self.doException(merror.IllegalAddress)
 
-        result = context.setValues(self.function_code, self.address, [self.value])
-        if isinstance(result, ExceptionResponse):
-            return result
-        values = context.getValues(self.function_code, self.address, 1)
+        await context.async_setValues(
+            self.function_code, self.address, [self.value]
+        )
+        values = await context.async_getValues(self.function_code, self.address, 1)
         return WriteSingleRegisterResponse(self.address, values[0])
 
     def get_response_pdu_size(self):
@@ -213,9 +213,9 @@ async def execute(self, context):
         if not context.validate(self.function_code, self.address, self.count):
             return self.doException(merror.IllegalAddress)
 
-        result = context.setValues(self.function_code, self.address, self.values)
-        if isinstance(result, ExceptionResponse):
-            return result
+        await context.async_setValues(
+            self.function_code, self.address, self.values
+        )
         return WriteMultipleRegistersResponse(self.address, self.count)
 
     def get_response_pdu_size(self):
@@ -333,13 +333,13 @@ async def execute(self, context):
             return self.doException(merror.IllegalValue)
         if not context.validate(self.function_code, self.address, 1):
             return self.doException(merror.IllegalAddress)
-        values = context.getValues(self.function_code, self.address, 1)[0]
+        values = (await context.async_getValues(self.function_code, self.address, 1))[0]
         if isinstance(values, ExceptionResponse):
             return values
         values = (values & self.and_mask) | (self.or_mask & ~self.and_mask)
-        result = context.setValues(self.function_code, self.address, [values])
-        if isinstance(result, ExceptionResponse):
-            return result
+        await context.async_setValues(
+            self.function_code, self.address, [values]
+        )
         return MaskWriteRegisterResponse(self.address, self.and_mask, self.or_mask)