[modbus] add value checking in write_values + logs

pyheatpump/modbus.py

@@ -5,8 +5,10 @@ from umodbus.client.serial import rtu
 import umodbus
 from pprint import pprint
 
-from .config import config
-from .models import *
+from pyheatpump.config import config
+
+from pyheatpump.logger import logger_init
+logger = logger_init()
 
 serial_conn = None
 
@@ -38,6 +40,9 @@ def read_coils(start, end):
     address = -1
     qty = -1
 
+    logger.info('Read coils [{}, {}]'.format(
+        start, end
+    ))
     try:
         for address in range(start, end + 1, 125):
             qty = 125 if (end - address) >= 125 else (end - address)
@@ -67,6 +72,10 @@ def read_holding_registers(start, end):
     address = -1
     qty = -1
 
+    logger.info('Read registers [{}, {}]'.format(
+        start, end
+    ))
+
     try:
         for address in range(start, end + 1, 125):
             qty = 125 if (end - address) >= 125 else (end - address)
@@ -86,37 +95,84 @@ def read_holding_registers(start, end):
 
     return res
 
-def write_coil(var_value: VariableValue):
+def write_coil(var_value):
     global serial_conn
     connect()
 
+    logger.info('Write coil at address {} with value {}]'.format(
+        var_value.address, var_value.value
+    ))
+
     try:
         req_adu = rtu.write_single_coil(
             slave_id=1,
             address=var_value.address,
             value=var_value.value)
-        return resp.send_message(req_adu, serial_conn)
+        resp = rtu.send_message(req_adu, serial_conn)
+        logger.info('Modbus response : {}'.format(resp))
+        if resp != var_value.value:
+            return False
+        return True
     except Exception as e:
         raise e
 
 
-def write_holding_register(var_value: VariableValue):
+def write_holding_register(var_value):
     global serial_conn
     connect()
 
+    logger.info('Write register at address {} with value {}]'.format(
+        var_value.address, var_value.value
+    ))
+
     try:
         req_adu = rtu.write_single_register(
             slave_id=1,
             address=var_value.address,
             value=var_value.value)
-        return resp.send_message(req_adu, serial_conn)
+        resp = rtu.send_message(req_adu, serial_conn)
+        logger.info('Modbus response : {}'.format(resp))
+        if resp != var_value.value:
+            return False
+        return True
     except Exception as e:
         raise e
 
 if __name__ == '__main__':
-    resp = read_holding_registers(1, 5000)
+    resp = read_holding_registers(1, 10)
     #pprint(resp)
     print(len(resp))
-    resp = read_coils(1, 2000)
+    resp = read_coils(90, 100)
     #pprint(resp)
     print(len(resp))
+    
+    from pyheatpump.models.variable_value import VariableValue
+    """
+    write_coil(VariableValue(**{
+        'type':'D',
+        'address':91,
+        'value':1}))
+    """
+
+    resp = read_coils(91, 93)
+    print(f'91 : {resp[0]} - 92 : {resp[1]}')
+
+    """
+    write_coil(VariableValue(**{
+        'type':'D',
+        'address':91,
+        'value':0}))
+    """
+
+    resp = read_coils(91, 93)
+    print(f'91 : {resp[0]} - 92 : {resp[1]}')
+
+    resp = read_holding_registers(240, 242) 
+    print(resp)
+
+    """
+    write_holding_register(VariableValue(**{
+        'type':'D',
+        'address':91,
+        'value':1})
+    """