menu scrolling and other tweaks

python-test/lcd.py

@@ -41,11 +41,12 @@ class LCD(framebuf.FrameBuffer):
         super().__init__(self.buffer, self.width, self.height, framebuf.RGB565)
         self.init_display()
 
-        self.red   = 0x07E0
-        self.green = 0x001f
-        self.blue  = 0xf800
-        self.white = 0xffff
-        self.black = 0x0000
+        self.red    = self.color(0xFF, 0x00, 0x00)
+        self.green  = self.color(0x00, 0xFF, 0x00)
+        self.blue   = self.color(0x00, 0x00, 0xFF)
+        self.yellow = self.color(0xFF, 0xFF, 0x00)
+        self.white  = self.color(0xFF, 0xFF, 0xFF)
+        self.black  = self.color(0x00, 0x00, 0x00)
 
         self.fill(self.black)
         self.show()
@@ -54,16 +55,15 @@ class LCD(framebuf.FrameBuffer):
         self.pwm.freq(1000)
         self.brightness(0.0)
 
-        self.keyA = Pin(15,Pin.IN,Pin.PULL_UP)
-        self.keyB = Pin(17,Pin.IN,Pin.PULL_UP)
-        self.keyX = Pin(19 ,Pin.IN,Pin.PULL_UP)
-        self.keyY= Pin(21 ,Pin.IN,Pin.PULL_UP)
-
-        self.up = Pin(2,Pin.IN,Pin.PULL_UP)
-        self.down = Pin(18,Pin.IN,Pin.PULL_UP)
-        self.left = Pin(16,Pin.IN,Pin.PULL_UP)
-        self.right = Pin(20,Pin.IN,Pin.PULL_UP)
-        self.ctrl = Pin(3,Pin.IN,Pin.PULL_UP)
+        self.keyA  = Pin(15, Pin.IN, Pin.PULL_UP)
+        self.keyB  = Pin(17, Pin.IN, Pin.PULL_UP)
+        self.keyX  = Pin(19, Pin.IN, Pin.PULL_UP)
+        self.keyY  = Pin(21, Pin.IN, Pin.PULL_UP)
+        self.up    = Pin( 2, Pin.IN, Pin.PULL_UP)
+        self.down  = Pin(18, Pin.IN, Pin.PULL_UP)
+        self.left  = Pin(16, Pin.IN, Pin.PULL_UP)
+        self.right = Pin(20, Pin.IN, Pin.PULL_UP)
+        self.ctrl  = Pin( 3, Pin.IN, Pin.PULL_UP)
 
         self.keys_old = {
             "a": False,
@@ -93,6 +93,10 @@ class LCD(framebuf.FrameBuffer):
         self.keys_old = keys.copy()
         return kc
 
+    # Convert RGB888 to RGB565
+    def color(self, R, G, B):
+        return (((G & 0b00011100) << 3) + ((B & 0b11111000) >> 3) << 8) + (R & 0b11111000) + ((G & 0b11100000) >> 5)
+
     def brightness(self, v):
         self.pwm.duty_u16(int(v * 65535))
 

python-test/state_scan.py

@@ -11,8 +11,10 @@ class StateScan:
         self.lock = asyncio.Lock()
 
     def enter(self, val = None):
+        n = None
         self.results = []
         self.current = None
+        self.menuOff = 0
         self.scanner = asyncio.create_task(self.scan())
 
     def exit(self):
@@ -48,20 +50,33 @@ class StateScan:
                         self.results.append(value)
 
     def draw_list(self):
+        if len(self.results) <= 0:
+            self.lcd.textC("No devices found yet", int(self.lcd.width / 2), int(self.lcd.height / 2), self.lcd.white)
+            return
+
         for i, d in enumerate(self.results):
-            name, mac, rssi, timeout, device = self.results[i]
-            s1 = "{}: {}".format(i + 1, name)
-            s2 = "[{}] {}".format(mac, rssi)
+            if i < self.menuOff:
+                continue
 
-            off = i * 25 + 30
+            off = (i - self.menuOff) * 25 + 30
             if off >= self.lcd.height:
                 break
 
+            selection = "  "
+            if self.current == i:
+                selection = "->"
+            name, mac, rssi, timeout, device = self.results[i]
+            age = int(time.time() - timeout)
+            s1 = "{}: {}".format(i + 1, name)
+            s2 = "{} [{}] {} {}".format(selection, mac, rssi, age)
+
             c1 = self.lcd.white
             if name == "S&B VOLCANO H":
                 c1 = self.lcd.green
                 if self.current == None:
                     self.current = i
+            elif name == "STORZ&BICKEL":
+                c1 = self.lcd.yellow
             elif self.current == i:
                 c1 = self.lcd.red
             c2 = self.lcd.white
@@ -78,22 +93,36 @@ class StateScan:
         keys = self.lcd.buttons()
 
         async with self.lock:
-            if keys.once("enter"):
+            if keys.once("enter") or keys.once("a"):
                 if self.current < len(self.results):
                     return 2
             elif keys.once("up"):
                 if self.current == None:
                     self.current = len(self.results) - 1
-                elif self.current > 0:
+                else:
                     self.current -= 1
             elif keys.once("down"):
                 if self.current == None:
                     self.current = 0
-                elif self.current < (len(self.results) - 1):
+                else:
                     self.current += 1
 
+            if self.current != None:
+                while self.current < 0:
+                    self.current += len(self.results)
+                while self.current >= len(self.results):
+                    self.current -= len(self.results)
+                while self.current < self.menuOff:
+                    self.menuOff -= 1
+                while self.current >= (self.menuOff + int((self.lcd.height - 30) / 25)):
+                    self.menuOff += 1
+
             # remove entries after timeout
             self.results = [x for x in self.results if (time.time() - x[3]) < 10.0]
+
+            # filter out incompatible devices
+            #self.results = [x for x in self.results if (x[0] != None) and (("S&B" in x[0]) or ("STORZ&BICKEL" == x[0]))]
+
             if self.current != None:
                 if self.current >= len(self.results):
                     self.current = len(self.results) - 1

python-test/state_select.py

@@ -44,7 +44,7 @@ class StateSelect:
         elif keys.once("down"):
             if self.current < (len(workflows) - 1):
                 self.current += 1
-        elif keys.once("enter"):
+        elif keys.once("enter") or keys.once("a"):
             return 1
 
         self.draw_list()

python-test/states.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 
 import uasyncio as asyncio
+import io
+import sys
 
 class States:
     def __init__(self, lcd):
@@ -85,13 +87,16 @@ def state_machine(lcd):
 
 from lcd import LCD
 lcd = LCD()
+
+lcd.fill(lcd.black)
+lcd.textC("S&B Volcano Remote", int(lcd.width / 2), int(lcd.height / 2) - 5, lcd.green)
+lcd.textC("by xythobuz", int(lcd.width / 2), int(lcd.height / 2) + 5, lcd.yellow)
+lcd.show()
 lcd.brightness(1.0)
 
 try:
     state_machine(lcd)
 except Exception as e:
-    import io
-    import sys
     os = io.StringIO()
     sys.print_exception(e, os)
     s = os.getvalue()

python-test/workflows.py

@@ -9,7 +9,7 @@ workflows = [
             (205.0, 10.0, 20.0),
             (220.0, 10.0, 20.0),
         ],
-        "notify": (3, 1.0),
+        "notify": (4, 1.0),
         "reset_temperature": 190.0,
     },
     {