simplify

Author: xiongyihui

keyboard/model/is32fl3733.py

@@ -9,7 +9,9 @@ def __init__(self, address=0x50):
         self.address = address
         self._page = None
         self._buffer = bytearray(12 * 16 + 1)
+        self._buffer[0] = 0
         self.pixels = memoryview(self._buffer)[1:]
+        self.mode_mask = 0
 
         self.power = digitalio.DigitalInOut(microcontroller.pin.P1_04)
         self.power.direction = digitalio.Direction.OUTPUT
@@ -24,6 +26,8 @@ def __init__(self, address=0x50):
         # print(self.open_pixels())
         # print(self.short_pixels())
 
+        self.power.value = 0
+
     def page(self, n):
         if self._page is n:
             return
@@ -37,6 +41,7 @@ def reset(self):
         self.read(0x11)
 
     def setup(self):
+        # configure 3 breathing modes
         self.page(3)
         self.write(2, (2 << 5) | (0 << 1))
         self.write(3, (2 << 5) | (3 << 1))
@@ -54,11 +59,11 @@ def setup(self):
         self.write(0, 3)
         self.write(0xE, 0)
 
+        self.set_brightness(128)
+
         self.page(0)
         self.write(0, [255] * 0x18)
 
-        self.set_brightness(255)
-
     def set_brightness(self, n):
         n &= 0xFF
         self._brightness = n
@@ -105,13 +110,16 @@ def update_pixel(self, i, r, g, b):
         self.write(row * 48 + 32 + col, b)
 
     def update(self):
-        if not self.power.value:
-            self.power.value = 1
+        self.power.value = 1
         self.page(1)
         self.i2c.writeto(self.address, self._buffer)
+        if not self.any():
+            self.power.value = 0
 
     def any(self):
         """Check if any pixel is not zero"""
+        if self.mode_mask > 0:
+            return True
         for pixel in self.pixels:
             if pixel > 0:
                 return True
@@ -131,15 +139,20 @@ def read(self, register):
         self.i2c.writeto_then_readfrom(self.address, bytearray((register,)), buffer)
         return buffer[0]
 
-    def breathing_pixel(self, i, mode=2):
-        if not self.power.value:
-            self.power.value = 1
+    def set_mode(self, i, mode=2):
+        self.power.value = 1
         self.page(2)
         row = i >> 4  # i // 16
         col = i & 15  # i % 16
         self.write(row * 48 + 32 + col, mode)  # blue
         # self.write(row * 48 + col, mode)         # green
         # self.write(row * 48 + 16 + col, mode)    # red
+        if mode:
+            self.mode_mask |= 1 << i
+        else:
+            self.mode_mask &= ~(1 << i)
+            if not self.any():
+                self.power.value = 0
 
     def open_pixels(self):
         # 18h ~ 2Fh LED Open Register

keyboard/model/m60.py

@@ -295,66 +295,44 @@ def elapse(self):
             t = self.keys[i]
             self.pixel(i, *wheel2(255 - t, t))
             t -= 1
-            if t < 0:
+            if t <= 0:
                 self.keys.pop(i)
             else:
                 self.keys[i] = t
         self.update()
         return True
 
     def set_hid_leds(self, v):
-        self._hid_leds = v
-        if self._hid_leds & 2:
-            # capslock
-            self.dev.update_pixel(28, 0, 0x80, 0)
-        else:
-            self.dev.update_pixel(28, 0, 0, 0)
+        if self._hid_leds != v:
+            self._hid_leds = v
+            g = 128 if (self._hid_leds & 2) else 0
+            self.dev.update_pixel(28, 0, g, 0)
             self.mode_function()
 
     def set_bt_led(self, v):
-        if self._bt_led is not None:
-            self.dev.breathing_pixel(self._bt_led, 0)
         if v == 0:
             v = 10
-        self._bt_led = v
         if v is not None:
-            self.dev.breathing_pixel(v, 2)
-        elif (self._hid_leds & 2) == 0 and not self.dev.any():
-            self.dev.power.value = 0
+            self.dev.set_mode(v, 2)
+        if self._bt_led is not None:
+            self.dev.set_mode(self._bt_led, 0)
+        self._bt_led = v
 
     def update(self):
-        in_use = False
         if self._hid_leds & 2:
             self.pixel(28, 0, 0x80, 0)
-            in_use = True
-        if self._bt_led:
-            self.pixel(self._bt_led, 0, 0, 0)
-            in_use = True
-        self.pixel(63, 0, 0, 0)
         self.dev.update()
-        if not in_use and not self.dev.any():
-            self.dev.power.value = 0
 
     def check(self):
         if self.enabled and self.dynamic:
             return self.mode_function()
         return False
 
     def next(self):
-        self.dev.clear()
-        self.mode += 1
-        if self.mode >= len(self.modes):
-            self.mode = 0
-        self.mode_function = self.modes[self.mode]
-        if self.mode == 6:
-            self.keys.clear()
-        if self.mode >= 3:
-            self.dynamic = True
-        else:
-            self.dynamic = False
-            self.mode_function()
+        self.set_mode(self.mode + 1)
 
     def set_mode(self, mode):
+        self.dev.clear()
         self.mode = mode if mode < len(self.modes) else 0
         self.mode_function = self.modes[self.mode]
         if self.mode == 6: