log optimize

JiapengLi · JiapengLi · commit b51cd25f84ac · 2023-02-04T19:55:19.000+08:00
diff --git a/code.py b/code.py
@@ -101,23 +101,23 @@ def keymap():
         keys.append(tuple(l))
     return tuple(keys)
 
-def macro_handler(dev, n, is_down):
-    if is_down:
+def macro_handler(dev, n, pressed):
+    if pressed:
         dev.send_text('You pressed macro #{}\n'.format(n))
     else:
         dev.send_text('You released macro #{}\n'.format(n))
 
 def pairs_handler(dev, n):
-    dev.send_text('You just triggered pair keys #{}\n'.format(n))
+    dev.send_text(f'You just triggered pair keys #{n}\n')
 
 keyboard = Keyboard(keymap())
 keyboard.macro_handler = macro_handler
 keyboard.pairs_handler = pairs_handler
 
 # Pairs: J & K, U & I
 # keyboard.pairs = [{35, 36}, {20, 19}]
-keyboard.pairs = []
+keyboard.pairs = [{20, 19}]
 
-#dasfasfakeyboard.verbose = False
+#keyboard.verbose = False
 
 keyboard.run()
diff --git a/keyboard/__init__.py b/keyboard/__init__.py
@@ -21,10 +21,10 @@
 class Device:
     def __init__(self, kbd):
         self.kbd = kbd
-        self.backlight = kbd.backlight
-        self.send_consumer = kbd.send_consumer
-        self.wait = kbd.matrix.wait
-        self.suspend = kbd.matrix.suspend
+        # self.backlight = kbd.backlight
+        # self.send_consumer = kbd.send_consumer
+        # self.wait = kbd.matrix.wait
+        # self.suspend = kbd.matrix.suspend
 
     def send(self, *names):
         keycodes = map(get_action_code, names)
@@ -609,11 +609,7 @@ def run(self):
                         dt = ms(matrix.time() - keydown_time)
                         dt2 = ms(keydown_time - last_time)
                         last_time = keydown_time
-                        print(
-                            "{} {} \\ {} latency {} | {}".format(
-                                key, key_name(key), hex(action_code), dt, dt2
-                            )
-                        )
+                        print(f"{key} {key_name(key)} \\ {hex(action_code)} latency {dt} | {dt2}")
                 else:
                     action_code = keys[key]
                     if action_code < 0xFF:
@@ -662,11 +658,8 @@ def run(self):
                         dt = ms(matrix.time() - keyup_time)
                         dt2 = ms(keyup_time - last_time)
                         last_time = keyup_time
-                        print(
-                            "{} {} / {} latency {} | {}".format(
-                                key, key_name(key), hex(action_code), dt, dt2
-                            )
-                        )
+
+                        print(f"{key} {key_name(key)} / {hex(action_code)} latency {dt} | {dt2}")
 
             if mouse_action:
                 x, y, wheel = MS_MOVEMENT[mouse_action]
