fix

Author: xiongyihui

keyboard/model/is32fl3733.py

@@ -91,23 +91,26 @@ def pixel(self, i, r, g, b):
         """Set the pixel. It takes effect after calling update()"""
         row = i >> 4  # i // 16
         col = i & 15  # i % 16
-        self.pixels[row * 48 + col] = g
-        self.pixels[row * 48 + 16 + col] = r
-        self.pixels[row * 48 + 32 + col] = b
+        offset = row * 48 + col
+        self.pixels[offset] = g
+        self.pixels[offset + 16] = r
+        self.pixels[offset + 32] = b
 
     def update_pixel(self, i, r, g, b):
         """Set the pixel and update"""
         row = i >> 4  # i // 16
         col = i & 15  # i % 16
-        self.pixels[row * 48 + col] = g
-        self.pixels[row * 48 + 16 + col] = r
-        self.pixels[row * 48 + 32 + col] = b
-        if not self.power.value:
-            self.power.value = 1
+        offset = row * 48 + col
+        self.pixels[offset] = g
+        self.pixels[offset + 16] = r
+        self.pixels[offset + 32] = b
+        self.power.value = 1
         self.page(1)
-        self.write(row * 48 + col, g)
-        self.write(row * 48 + 16 + col, r)
-        self.write(row * 48 + 32 + col, b)
+        self.write(offset, g)
+        self.write(offset + 16, r)
+        self.write(offset + 32, b)
+        if not self.any():
+            self.power.value = 0
 
     def update(self):
         self.power.value = 1

keyboard/model/m60.py

@@ -179,8 +179,7 @@ def hue(self):
     @hue.setter
     def hue(self, h):
         self.hsv[0] = h & 0xFF
-        if not self.dynamic:
-            self.mode_function()
+        self.refresh()
 
     @property
     def sat(self):
@@ -189,8 +188,7 @@ def sat(self):
     @sat.setter
     def sat(self, s):
         self.hsv[1] = 0 if s < 0 else (255 if s > 255 else s)
-        if not self.dynamic:
-            self.mode_function()
+        self.refresh()
 
     @property
     def val(self):
@@ -337,7 +335,7 @@ def set_hid_leds(self, 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()
+            self.refresh()
 
     def set_bt_led(self, v):
         if v == 0:
@@ -358,10 +356,15 @@ def check(self):
             return self.mode_function()
         return False
 
+    def refresh(self):
+        if self.enabled and not self.dynamic:
+            self.mode_function()
+
     def next(self):
         self.set_mode(self.mode + 1)
 
     def set_mode(self, mode):
+        self.enabled = True
         self.dev.clear()
         self.mode = mode if mode < len(self.modes) else 0
         self.mode_function = self.modes[self.mode]