nicer ui

python-test/flow.py

@@ -10,16 +10,39 @@ from poll import (
     get_state, set_state
 )
 
+terminal_width = 80 + 20 # TODO detect?
+
+def print_bar(value, start, end, unit):
+    width = terminal_width
+    s = "\r"
+    s += "#" * int((value - start) / (end - start) * width)
+    s += "-" * (width - int((value - start) / (end - start) * width))
+    s += " {}{}".format(value, unit)
+    print(s, end="", flush=True)
+
+async def sleep(t):
+    w = terminal_width
+    if t < w:
+        w = int(t)
+    print_bar(0, 0, w, "s")
+    for i in range(0, w):
+        await asyncio.sleep(t / w)
+        print_bar(i, 0, w, "s")
+    print()
+
 async def wait_for_temp(client, temp):
     print("Setting temperature {}".format(temp))
     await set_target_temp(client, temp)
 
     print("Waiting for temperature to rise...")
-    curr = await get_current_temp(client)
+    start = await get_current_temp(client)
+    curr = start
+    print_bar(curr, start, temp, " degC")
     while curr < temp:
-        print("Currently at {}".format(curr))
-        await asyncio.sleep(2.0)
+        await asyncio.sleep(1.0)
         curr = await get_current_temp(client)
+        print_bar(curr, start, temp, " degC")
+    print()
 
     print("Reached temperature {}".format(temp))
 
@@ -27,23 +50,23 @@ async def flow_step(client, temp, t_wait, t_pump):
     await wait_for_temp(client, temp)
 
     print("Waiting {}s for heat to settle...".format(t_wait))
-    await asyncio.sleep(t_wait)
+    await sleep(t_wait)
 
     print("Pumping for {}s".format(t_pump))
     await set_state(client, (True, True)) # turn on pump
-    await asyncio.sleep(t_pump)
+    await sleep(t_pump)
     await set_state(client, (True, False)) # turn off pump
 
 async def flow(client):
     print("Turning on heater")
     await set_state(client, (True, False))
 
-    await flow_step(client, 190.0, 25.0, 5.0)
+    await flow_step(client, 190.0, 20.0, 5.0)
     await flow_step(client, 205.0, 10.0, 20.0)
     await flow_step(client, 220.0, 10.0, 20.0)
 
-    print("Notification by pumping four times...")
-    for i in range(0, 4):
+    print("Notification by pumping three times...")
+    for i in range(0, 3):
         await asyncio.sleep(1.0)
         await set_state(client, (True, True)) # turn on pump
         await asyncio.sleep(1.0)
@@ -60,12 +83,12 @@ async def main(address):
         try:
             print("Starting Workflow")
             await flow(client)
-        except asyncio.exceptions.CancelledError:
-            print("Turning heater off")
-            await set_state(client, (False, False)) # turn off heater and pump
-        except KeyboardInterrupt:
-            print("Turning heater off")
+        except:
+            print("\nTurning heater off")
             await set_state(client, (False, False)) # turn off heater and pump
+            raise
+
+        print("Disconnecting...")
 
 if __name__ == "__main__":
     if len(sys.argv) <= 1: