changing order of methods

Author: MarkoVcode

benchmesh-serial-service/src/benchmesh_service/drivers/owon_spm/driver.py

@@ -8,10 +8,6 @@ def identify(self):
         self.t.write_line('*IDN?')
         return self.t.read_until_reol(1024)
 
-    def query_status(self):
-        self.t.write_line('MEAS:ALL:INFO?')
-        return self.t.read_until_reol(1024)
-
     def query_output_voltage(self):
         self.t.write_line('MEAS:VOLT?')
         return self.t.read_until_reol(1024)
@@ -24,6 +20,10 @@ def query_output_power(self):
         self.t.write_line('MEAS:POW?')
         return self.t.read_until_reol(1024)
 
+    def query_status(self):
+        self.t.write_line('MEAS:ALL:INFO?')
+        return self.t.read_until_reol(1024)
+
     def query_output_all(self):
         self.t.write_line('MEASure:ALL?')
         return self.t.read_until_reol(1024)

benchmesh-serial-service/src/benchmesh_service/drivers/tenma_72/driver.py

@@ -1,6 +1,5 @@
 import re
 from ...transport import SerialTransport
-from ...logger import logger
 
 class TenmaPSU:
     def __init__(self, port, baudrate=115200, serial_mode='8N1', seol='', reol=''):
@@ -19,21 +18,6 @@ def query_output_current(self):
         self.t.write_line('IOUT1?')
         return self.t.read_until_reol(1024)
 
-    def _parse_numeric(self, s):
-        if s is None:
-            return None
-        if isinstance(s, bytes):
-            try:
-                s = s.decode('utf-8', 'ignore')
-            except Exception:
-                return None
-        s = str(s).strip()
-        m = re.search(r"[-+]?\d*\.?\d+(?:[eE][-+]?\d+)?", s)
-        try:
-            return float(m.group(0)) if m else None
-        except Exception:
-            return None
-
     def query_output_power(self):
         v = self.query_output_voltage()
         i = self.query_output_current()
@@ -162,6 +146,21 @@ def recall_memory(self, bank):  #bank 1-5
         self.t.read_until_reol(1024)
         return
 
+    def _parse_numeric(self, s):
+        if s is None:
+            return None
+        if isinstance(s, bytes):
+            try:
+                s = s.decode('utf-8', 'ignore')
+            except Exception:
+                return None
+        s = str(s).strip()
+        m = re.search(r"[-+]?\d*\.?\d+(?:[eE][-+]?\d+)?", s)
+        try:
+            return float(m.group(0)) if m else None
+        except Exception:
+            return None
+
     def write(self, text: str):
         self.t.write_line(text)