add graphical progress bar

python-test/state_connect.py

@@ -62,6 +62,11 @@ class StateConnect:
                     return 2 # selection
                 else:
                     return 0 # scan
+            else:
+                if self.state == False:
+                    self.lcd.text("Disconnecting...", 0, 100, self.lcd.white)
+                else:
+                    self.lcd.text("Connecting...", 0, 100, self.lcd.white)
 
         self.lcd.show()
         return -1 # stay in this state

python-test/state_heat.py

@@ -56,6 +56,11 @@ class StateHeat:
                     return 5 # disconnect
                 else:
                     return 6 # wait for temperature
+            else:
+                if self.state == False:
+                    self.lcd.text("Turning heater off...", 0, 100, self.lcd.white)
+                else:
+                    self.lcd.text("Turning heater on...", 0, 100, self.lcd.white)
 
         self.lcd.show()
         return -1 # stay in this state

python-test/state_pump.py

@@ -58,9 +58,14 @@ class StatePump:
 
         async with self.lock:
             if self.start != None:
-                draw_graph(self.lcd, 0.0, time.time() - self.start, self.duration)
+                now = time.time()
+                if now - self.start <= self.duration:
+                    draw_graph(self.lcd, 0.0, now - self.start, self.duration)
+                else:
+                    self.lcd.text("Turning off pump...", 0, 100, self.lcd.white)
             else:
                 self.lcd.text("Turning on pump...", 0, 100, self.lcd.white)
+
             if self.done:
                 if self.value[2] >= (len(workflow["steps"]) - 1):
                     # TODO notify

python-test/state_wait_temp.py

@@ -4,8 +4,17 @@ import uasyncio as asyncio
 from poll import set_target_temp, get_current_temp
 
 def draw_graph(lcd, min, val, max):
-    # TODO
-    lcd.text("{} -> {} -> {}".format(min, val, max), 0, 100, lcd.white)
+    if max == min:
+        lcd.text("{} -> {} -> {}".format(min, val, max), 0, 100, lcd.white)
+        return
+
+    w = lcd.width - 10
+    ratio = (val - min) / (max - min)
+    wfull = int(w * ratio)
+    wempty = w - wfull
+    lcd.rect(4, 100, wfull + 1, 50, lcd.green, True)
+    lcd.rect(4 + wfull, 100, wempty + 2, 50, lcd.green, False)
+    lcd.text("{}".format(val), int(lcd.width / 2), 125, lcd.white)
 
 class StateWaitTemp:
     def __init__(self, lcd):
@@ -64,7 +73,11 @@ class StateWaitTemp:
             return 4 # heat off
 
         async with self.lock:
-            draw_graph(self.lcd, self.min, self.temp, self.max)
+            if self.temp == 0.0:
+                self.lcd.text("Setting temperature...", 0, 100, self.lcd.white)
+            else:
+                draw_graph(self.lcd, self.min, self.temp, self.max)
+
             if self.temp >= self.max:
                 print("switch, {} >= {}".format(self.temp, self.max))
                 return 7 # wait for time

python-test/state_wait_time.py

@@ -32,6 +32,7 @@ class StateWaitTime:
 
         now = time.time()
         draw_graph(self.lcd, 0.0, now - self.start, self.end - self.start)
+
         if now >= self.end:
             print("switch, {} >= {}".format(now, self.end))
             return 8 # pump