Fixup: Refactor hid.py

Author: xs5871

kmk/hid.py

@@ -115,7 +115,7 @@ def get_action_map(self):
 
 class NKROKeyboardReport(KeyboardReport):
     def __init__(self):
-        super().__init__(size=_REPORT_SIZE_KEYBOARD_NKRO)
+        super().__init__(_REPORT_SIZE_KEYBOARD_NKRO)
 
     def add_key(self, key):
         self.buffer[(key.code >> 3) + 1] |= 1 << (key.code & 0x07)
@@ -142,8 +142,8 @@ def get_action_map(self):
 
 
 class PointingDeviceReport(Report):
-    def __init__(self):
-        super().__init__(_REPORT_SIZE_MOUSE)
+    def __init__(self, size=_REPORT_SIZE_MOUSE):
+        super().__init__(size)
 
     def add_button(self, key):
         self.buffer[0] |= key.code
@@ -167,7 +167,7 @@ def get_action_map(self):
         return {Axis: self.move_axis, MouseKey: self.add_button}
 
 
-class HSPointingDeviceReport(Report):
+class HSPointingDeviceReport(PointingDeviceReport):
     def __init__(self):
         super().__init__(_REPORT_SIZE_MOUSE_HSCROLL)
 

kmk/keys.py

@@ -30,10 +30,10 @@ def __repr__(self) -> str:
     def move(self, keyboard: Keyboard, delta: int):
         self.delta += delta
         if self.delta:
-            keyboard.axes.add(self)
+            keyboard.keys_pressed.add(self)
             keyboard.hid_pending = True
         else:
-            keyboard.axes.discard(self)
+            keyboard.keys_pressed.discard(self)
 
 
 class AX:

kmk/kmk_keyboard.py

@@ -291,8 +291,11 @@ def _init_hid(self) -> None:
             debug('hid=', self._hid_helper)
 
     def _deinit_hid(self) -> None:
-        self._hid_helper.clear_all()
-        self._hid_helper.send()
+        try:
+            self._hid_helper.create_report({})
+            self._hid_helper.send()
+        except Exception as e:
+            debug_error(self, '_deinit_hid', e)
 
     def _init_matrix(self) -> None:
         if self.matrix is None: