From 3d2dc18d3447f199ec1f4d7676646cc7fb24e547 Mon Sep 17 00:00:00 2001
From: mj <mj370@protonmail.com>
Date: Fri, 26 Nov 2021 21:33:22 +0100
Subject: [PATCH] WIP test scripts

---
 tests/find_device.py  | 14 +++-----------
 tests/query_device.py |  1 +
 tests/sensor.py       |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/tests/find_device.py b/tests/find_device.py
index 9837501..8ea55f2 100755
--- a/tests/find_device.py
+++ b/tests/find_device.py
@@ -72,17 +72,9 @@ for a in addr:
     for b in baud:
         print(f'Address {a : >3} baud {b : >6}: ', end='')
         try:
-            # modbus init
-            instrument = minimalmodbus.Instrument('/dev/rs485', a, close_port_after_each_call=True)  # port name, slave address (in decimal)
-            instrument.serial.baudrate = b
-            instrument.serial.bytesize = 8
-            instrument.serial.parity   = serial.PARITY_EVEN
-            instrument.serial.stopbits = 1
-            instrument.serial.timeout  = 0.05          # seconds
-            instrument.mode = minimalmodbus.MODE_RTU   # rtu or ascii mode
-            instrument.clear_buffers_before_each_transaction = True
-            ##
-            CO2 = instrument.read_register(CO2_offset, 1, functioncode=4) * 10
+            s = Sensor(address=a, baudrate=b)
+            reg_number = Sensor.input_register_start + Sensor.input_register_offset['CO2']
+            s.read_register(reg_number)
             print('DEVICE RESPONDED')
             total_devices += 1
         except minimalmodbus.NoResponseError:
diff --git a/tests/query_device.py b/tests/query_device.py
index 601267c..40aae18 100755
--- a/tests/query_device.py
+++ b/tests/query_device.py
@@ -136,6 +136,7 @@ elif action == 'write':
     print('---- Register write ----')
     try:
         s.write_register(reg_number, value)
+        print(f'{reg_number : <10} {int(value) : <10}')
     except ValueError:
         print(f'Register number {reg_number} cannot be written')
         exit(-9)
diff --git a/tests/sensor.py b/tests/sensor.py
index b719a2a..76b46fc 100644
--- a/tests/sensor.py
+++ b/tests/sensor.py
@@ -79,7 +79,7 @@ class Sensor():
             except (minimalmodbus.NoResponseError, minimalmodbus.InvalidResponseError) as e:
                 retries -= 1
                 continue
-        raise e
+            raise e
     # generic read register function
     def read_register(self, register_number):
         if self.input_register_start <= register_number <= self.input_register_end: