Refactor variable names

Author: chrisruk

buildhat/devices.py

@@ -204,7 +204,7 @@ def get(self):
         else:
             raise DeviceError("Not in simple or combimode")
         ftr = Future()
-        self._hat.portcond[self.port].append(ftr)
+        self._hat.portftr[self.port].append(ftr)
         self._write(f"port {self.port} ; selonce {idx}\r")
         return ftr.result()
 

buildhat/hat.py

@@ -48,7 +48,7 @@ def get_vin(self):
         :rtype: float
         """
         ftr = Future()
-        Device._instance.vincond.append(ftr)
+        Device._instance.vinftr.append(ftr)
         Device._instance.write(b"vin\r")
         return ftr.result()
 

buildhat/motors.py

@@ -207,7 +207,7 @@ def _run_positional_ramp(self, pos, newpos, speed):
                f"pid {self.port} 0 1 s4 0.0027777778 0 5 0 .1 3; "
                f"set ramp {pos} {newpos} {dur} 0\r")
         ftr = Future()
-        self._hat.rampcond[self.port].append(ftr)
+        self._hat.rampftr[self.port].append(ftr)
         self._write(cmd)
         ftr.result()
         if self._release:
@@ -261,7 +261,7 @@ def _run_for_seconds(self, seconds, speed):
                f"pid {self.port} 0 0 s1 1 0 0.003 0.01 0 100; "
                f"set pulse {speed} 0.0 {seconds} 0\r")
         ftr = Future()
-        self._hat.pulsecond[self.port].append(ftr)
+        self._hat.pulseftr[self.port].append(ftr)
         self._write(cmd)
         ftr.result()
         if self._release:

buildhat/serinterface.py

@@ -84,10 +84,10 @@ def __init__(self, firmware, signature, version, device="/dev/serial0", debug=Fa
         self.cond = Condition()
         self.state = HatState.OTHER
         self.connections = []
-        self.portcond = []
-        self.pulsecond = []
-        self.rampcond = []
-        self.vincond = []
+        self.portftr = []
+        self.pulseftr = []
+        self.rampftr = []
+        self.vinftr = []
         self.motorqueue = []
         self.fin = False
         self.running = True
@@ -98,9 +98,9 @@ def __init__(self, firmware, signature, version, device="/dev/serial0", debug=Fa
 
         for _ in range(4):
             self.connections.append(Connection())
-            self.portcond.append([])
-            self.pulsecond.append([])
-            self.rampcond.append([])
+            self.portftr.append([])
+            self.pulseftr.append([])
+            self.rampftr.append([])
             self.motorqueue.append(queue.Queue())
 
         self.ser = serial.Serial(device, 115200, timeout=5)
@@ -352,10 +352,10 @@ def loop(self, cond, uselist, q, listevt):
                     if uselist and listevt.is_set():
                         count += 1
                 elif cmp(msg, BuildHAT.RAMPDONE):
-                    ftr = self.rampcond[portid].pop()
+                    ftr = self.rampftr[portid].pop()
                     ftr.set_result(True)
                 elif cmp(msg, BuildHAT.PULSEDONE):
-                    ftr = self.pulsecond[portid].pop()
+                    ftr = self.pulseftr[portid].pop()
                     ftr.set_result(True)
 
             if uselist and count == 4:
@@ -385,12 +385,12 @@ def runit():
                     q.put((callit, newdata))
                 self.connections[portid].data = newdata
                 try:
-                    ftr = self.portcond[portid].pop()
+                    ftr = self.portftr[portid].pop()
                     ftr.set_result(newdata)
                 except IndexError:
                     pass
 
             if len(line) >= 5 and line[1] == "." and line.endswith(" V"):
                 vin = float(line.split(" ")[0])
-                ftr = self.vincond.pop()
+                ftr = self.vinftr.pop()
                 ftr.set_result(vin)