Move trackball id check to during_bootup

Implement PixelBuf interface for pimoroni trackball
Use rotation matrix instead of trig for angle correction
2023-02-24 19:33:20 +00:00 · 2023-02-24 19:33:20 +00:00 · 2023-02-24 19:33:20 +00:00 · 2023-02-24 19:33:20 +00:00 · 2023-02-24 19:33:20 +00:00 · 2023-02-24 19:33:20 +00:00
21 changed files with 335 additions and 386 deletions
--- a/103
+++ b/103
@@ -30,19 +30,19 @@ TIMESTAMP := $(shell date +%s)

 all: copy-kmk copy-bootpy copy-keymap copy-board

-compile: $(MPY_TARGET_DIR)/.mpy.compiled
-
-$(MPY_TARGET_DIR)/.mpy.compiled: $(PY_KMK_TREE)
+.PHONY: compile compile-check
+compile: compile-check
 ifeq ($(MPY_CROSS),)
+compile-check:
 	@echo "===> Could not find mpy-cross in PATH, exiting"
 	@false
-endif
+else
+compile-check: $(PY_KMK_TREE:%.py=$(MPY_TARGET_DIR)/%.mpy)
 	@echo "===> Compiling all py files to mpy with flags $(MPY_FLAGS)"
-	@mkdir -p $(MPY_TARGET_DIR)
-	@echo "KMK_RELEASE = '$(DIST_DESCRIBE)'" > $(MPY_SOURCES)/release_info.py
-	@find $(MPY_SOURCES) -name "*.py" -exec sh -c 'mkdir -p $(MPY_TARGET_DIR)/$$(dirname {}) && $(MPY_CROSS) $(MPY_FLAGS) {} -o $(MPY_TARGET_DIR)/$$(dirname {})/$$(basename -s .py {}).mpy' \;
-	@rm -rf $(MPY_SOURCES)/release_info.py
-	@touch $(MPY_TARGET_DIR)/.mpy.compiled
+$(MPY_TARGET_DIR)/%.mpy: %.py
+	@mkdir -p $(dir $@)
+	@$(MPY_CROSS) $(MPY_FLAGS) $? -o $@
+endif

 .devdeps: Pipfile.lock
 	@echo "===> Installing dependencies with pipenv"
@@ -92,7 +92,7 @@ test: lint unit-tests

 .PHONY: unit-tests
 unit-tests: devdeps
-	@$(PIPENV) run python3 -m unittest ${TESTS}
+	@$(PIPENV) run python3 -m unittest $(TESTS)

 reset-bootloader:
 	@echo "===> Rebooting your board to bootloader (safe to ignore file not found errors)"
@@ -102,55 +102,44 @@ reset-board:
 	@echo "===> Rebooting your board (safe to ignore file not found errors)"
 	@-timeout -k 5s 10s $(PIPENV) run ampy -p /dev/ttyACM0 -d ${AMPY_DELAY} -b ${AMPY_BAUD} run util/reset.py

-ifdef MOUNTPOINT
-$(MOUNTPOINT)/kmk/.copied: $(shell find kmk/ -name "*.py" | xargs -0)
-	@echo "===> Copying KMK source folder"
-	@rsync -rh kmk $(MOUNTPOINT)/
-	@touch $(MOUNTPOINT)/kmk/.copied
-	@sync
-
-copy-kmk: $(MOUNTPOINT)/kmk/.copied
-else
-copy-kmk:
-	echo "**** MOUNTPOINT must be defined (wherever your CIRCUITPY drive is mounted) ****" && exit 1
-endif
-
-copy-board: $(MOUNTPOINT)/kb.py
-$(MOUNTPOINT)/kb.py: $(BOARD)
-	@echo "===> Copying your board to kb.py"
-	@rsync -rh $(BOARD) $@
-	@sync

 ifdef MOUNTPOINT
-$(MOUNTPOINT)/kmk/boot.py: boot.py
-	@echo "===> Copying required boot.py"
-	@rsync -rh boot.py $(MOUNTPOINT)/
-	@sync
-
-copy-bootpy: $(MOUNTPOINT)/kmk/boot.py
-else
-copy-bootpy:
-	echo "**** MOUNTPOINT must be defined (wherever your CIRCUITPY drive is mounted) ****" && exit 1
-endif
-
-ifdef MOUNTPOINT
-ifndef USER_KEYMAP
-$(MOUNTPOINT)/main.py:
-	@echo "**** USER_KEYMAP must be defined (ex. USER_KEYMAP=user_keymaps/noop.py) ****" && exit 1
-else
-$(MOUNTPOINT)/main.py: $(USER_KEYMAP)
-	@echo "===> Copying your keymap to main.py"
-	@rsync -rh $(USER_KEYMAP) $@
-	@sync
-endif # USER_KEYMAP
-
-copy-keymap: $(MOUNTPOINT)/main.py
-else
-copy-keymap:
-	echo "**** MOUNTPOINT must be defined (wherever your CIRCUITPY drive is mounted) ****" && exit 1
-
 ifdef BOARD
-copy-board: $(MOUNTPOINT)/kb.py
+copy-board:
+	@echo "===> Copying your board from $(BOARD) to $(MOUNTPOINT)"
+	@rsync -rhu $(BOARD)/*.py $(MOUNTPOINT)/
+	@sync
+else # BOARD
+copy-board:
+	@echo "**** Missing BOARD argument ****" && exit 1
 endif # BOARD

-endif # MOUNTPOINT
+copy-bootpy:
+	@echo "===> Copying required boot.py"
+	@rsync -rhu boot.py $(MOUNTPOINT)/boot.py
+	@sync
+
+copy-compiled:
+	@echo "===> Copying compiled KMK folder"
+	@rsync -rhu $(MPY_TARGET_DIR)/* $(MOUNTPOINT)/
+	@sync
+
+ifdef USER_KEYMAP
+copy-keymap:
+	@echo "===> Copying your keymap to main.py"
+	@rsync -rhu $(USER_KEYMAP) $(MOUNTPOINT)/main.py
+	@sync
+else # USER_KEYMAP
+copy-keymap:
+	@echo "**** Missing USER_KEYMAP argument ****" && exit 1
+endif # USER_KEYMAP
+
+copy-kmk:
+	@echo "===> Copying KMK source folder"
+	@rsync -rhu kmk $(MOUNTPOINT)/
+	@sync
+
+else # MOUNTPOINT
+copy-board copy-bootpy copy-compiled copy-keymap copy-kmk:
+	@echo "**** MOUNTPOINT must be defined (wherever your CIRCUITPY drive is mounted) ****" && exit 1
+endif # ifndef MOUNTPOINT
--- a/boards/anavi/knob1/code.py
+++ b/boards/anavi/knob1/code.py
@@ -15,6 +15,7 @@ knob.extensions.append(media_keys)

 # Rotary encoder that also acts as a key
 encoder_handler = EncoderHandler()
+encoder_handler.divisor = 2
 encoder_handler.pins = ((board.D1, board.D2, board.D0),)
 encoder_handler.map = (((KC.VOLD, KC.VOLU, KC.MUTE),),)
 knob.modules.append(encoder_handler)
--- a/boards/anavi/knobs3/code.py
+++ b/boards/anavi/knobs3/code.py
@@ -15,6 +15,7 @@ knob.extensions.append(media_keys)

 # Rotary encoders that also acts as keys
 encoder_handler = EncoderHandler()
+encoder_handler.divisor = 2
 encoder_handler.pins = (
    (board.D1, board.D2, board.D0),
    (board.D9, board.D10, board.D3),
--- a/boards/anavi/macro-pad-10/code.py
+++ b/boards/anavi/macro-pad-10/code.py
@@ -78,6 +78,7 @@ keyboard.keymap = [

 # Rotary encoder that also acts as a key
 encoder_handler = EncoderHandler()
+encoder_handler.divisor = 2
 encoder_handler.pins = ((board.D8, board.D7, board.D9),)
 encoder_handler.map = (((KC.VOLD, KC.VOLU, KC.MUTE),),)
 keyboard.modules.append(encoder_handler)
--- a/docs/en/Getting_Started.md
+++ b/docs/en/Getting_Started.md
@@ -4,7 +4,6 @@
 KMK is a keyboard focused layer that sits on top of [CircuitPython](https://circuitpython.org/). As such, it should work with most [boards that support CircuitPython](https://circuitpython.org/downloads). KMK requires CircuitPython version 7.0 or above.
 Known working and recommended devices can be found [here](Officially_Supported_Microcontrollers.md)

-<br>

 ## TL;DR Quick start guide
 > To infinity and beyond!
@@ -13,7 +12,7 @@ Known working and recommended devices can be found [here](Officially_Supported_M
 3. Unzip it and copy the KMK folder and the boot.py file at the root of the USB drive corresponding to your board (often appearing as CIRCUITPY)
 4. Create a new *code.py* or *main.py* file in the same root directory (same level as boot.py) with the example content hereunder: 

-***IMPORTANT:*** adapt the GP0 / GP1 pins to your specific board ! <br>
+***IMPORTANT:*** adapt the GP0 / GP1 pins to your specific board !

 ```
 print("Starting")
@@ -45,7 +44,6 @@ if __name__ == '__main__':

 6. If it prints the letter "a" (or a "Q" or ... depending on your keyboard layout), you're done!

-<br>


 ## Now that you're up and running, you may want to go further...
@@ -56,7 +54,7 @@ If your keyboard and microcontroller are officially supported, simply visit the

 ### You've got another, maybe DIY, board and want to customize KMK for it  
 First, be sure to understand how your device work, and particularly its specific matrix configuration. You can have a look [here](http://pcbheaven.com/wikipages/How_Key_Matrices_Works/) or read the [guide](https://docs.qmk.fm/#/hand_wire) provided by the QMK team for handwired keyboards
-<br>Once you've got the gist of it:
+Once you've got the gist of it:
 - You can have a look [here](config_and_keymap.md) and [here](keys.md) to start customizing your code.py / main.py file
 - There's a [reference](keycodes.md) of the available keycodes
 - [International](international.md) extension adds keys for non US layouts and [Media Keys](media_keys.md) adds keys for ... media
@@ -69,7 +67,6 @@ And to go even further:
 Want to have fun features such as RGB, split keyboards and more? Check out what builtin [modules](modules.md) and [extensions](extensions.md) can do!
 You can also get ideas from the various [user examples](https://github.com/KMKfw/kmk_firmware/tree/master/user_keymaps) that we provide and dig into our [documentation](README.md).

-<br>

 ## Additional help and support
 > Roads? Where we're going we don't need roads.
--- a/docs/en/contributing.md
+++ b/docs/en/contributing.md
@@ -27,9 +27,12 @@ to Black formatting as documented in `pyproject.toml`)
 Unit tests within the `tests` folder mock various CircuitPython modules to allow
 them to be executed in a desktop development environment.

-Execute tests using the command `make unit-tests`. The `unit-tests` target
-accepts an additional environment variable for selection of specific tests,
-example `make unit-tests TESTS="tests.test_kmk_keys tests.test_layers"`.
+Execute tests using the command `make unit-tests`. The unit-tests target accepts
+an optional environment variable for specifying a subset of tests with python
+unittest syntax:
+```sh
+make unit-tests TESTS="tests.test_capsword tests.test_hold_tap"
+```

 ## Contributing Documentation
 While KMK welcomes documentation from anyone with and understanding of the issues 
--- a/docs/en/mouse_keys.md
+++ b/docs/en/mouse_keys.md
@@ -15,6 +15,8 @@ keyboard.modules.append(MouseKeys())
 | `KC.MB_LMB`               | Left mouse button                    |
 | `KC.MB_RMB`               | Right mouse button                   |
 | `KC.MB_MMB`               | Middle mouse button                  |
+| `KC.MB_BTN4`              | mouse button 4                       |
+| `KC.MB_BTN5`              | mouse button 5                       |
 | `KC.MW_UP`                | Mouse wheel up                       |
 | `KC.MW_DOWN`, `KC.MW_DN`  | Mouse wheel down                     |
 | `KC.MS_UP`                | Move mouse cursor up                 |
--- a/docs/img/pro_micro_pinout.png
+++ b/docs/img/pro_micro_pinout.png
--- a/docs/en/quickpin.md
+++ b/docs/en/quickpin.md
@@ -15,7 +15,7 @@ microcontrollers with only a single line change and less mistakes.

 ## Pro micro footprint pinout

-![pro micro footprint pins](../img/pro_micro_pinout.png)
+![pro micro footprint pins](pro_micro_pinout.png)

 ## Example

--- a/docs/ja/Getting_Started.md
+++ b/docs/ja/Getting_Started.md
@@ -9,7 +9,6 @@ KMK は[CircuitPython](https://circuitpython.org/)の上に配置されるキー

 CircuitPython の最適化バージョン（特定のボードの容量制限に対処した、プリインストールされた関連モジュールの選択が可能なバージョン）も提供しています。

-<br>

 ## TL;DR クイックスタートガイド
 > To infinity and beyond!
@@ -25,7 +24,7 @@ CircuitPython の最適化バージョン（特定のボードの容量制限に

 4. 同じルートディレクトリー（boot.py と同レベル）に新規で*code.py* または *main.py*のファイルを作成する。中身は以下の例とする。

-***重要：*** GP0 / GP1 ピンを使用ボードに合わせて下さい！<br>
+***重要：*** GP0 / GP1 ピンを使用ボードに合わせて下さい


 ```
@@ -56,8 +55,6 @@ if __name__ == '__main__':

 2. "A"や"Q"(キーボードのレイアウトによって異なる)が表示されたら、完成！

-<br>
-

 ## とりあえず一通り動くようになったので、もっとに先へ進みたい場合
 > This is your last chance. After this, there is no turning back. You take the blue pill—the story ends, you wake up in your bed and believe whatever you want to believe. You take the red pill—you stay in Wonderland, and I show you how deep the rabbit hole goes. Remember: all I'm offering is the truth. Nothing more.
@@ -72,7 +69,7 @@ if __name__ == '__main__':
 最初にデバイスの動作や具体的なマトリックス構成についてしっかり理解してください。
 QMK チームが提供している手配線キーボード用の[ガイド](https://docs.qmk.fm/#/hand_wire)と[ドキュメント](http://pcbheaven.com/wikipages/How_Key_Matrices_Works/) を確認できます。

-<br>要旨をつかめてきたら：
+要旨をつかめてきたら：
 - [ここ](config_and_keymap.md) と [ここ](keys.md)を見て、code.py / main.py ファイルをカスタイマイズできます。

 - 使用可能なキーコードの[リファレンス](keycodes.md)があります。
@@ -89,7 +86,6 @@ RGB や分裂型などの機能を楽しめたい場合は、ビルトイン[モ

 私たちが提供する、いろんな [ユーザー事例](https://github.com/KMKfw/user_keymaps)や[ドキュメント](https://github.com/KMKfw/kmk_firmware/tree/master/docs)からアイデアを得ることもできます。

-<br>

 ## ヘルプ/サポート
 > Roads? Where we're going we don't need roads.
--- a/docs/ptBR/Getting_Started.md
+++ b/docs/ptBR/Getting_Started.md
@@ -13,7 +13,6 @@ Também fornecemos uma versão de CircuitPython otimizada para teclados
 (simplificada para lidar com os limites de certas placas e com a seleção dos
 módulos relevantes pré-instalados). Se você estiver se perguntando por que usar

-<br>

 ## Guia Rápido
 > Ao Infinito e Além!
@@ -30,7 +29,7 @@ módulos relevantes pré-instalados). Se você estiver se perguntando por que us
 4. Crie um novo arquivo *code.py* ou *main.py* no mesmo diretório raiz (no
   mesmo nível de boot.py) com o exemplo contido abaixo:

-***IMPORTANTE:*** adapte os pinos GP0 / GP1 para a tua placa específica! <br>
+***IMPORTANTE:*** adapte os pinos GP0 / GP1 para a tua placa específica!

 ```
 print("Starting")
@@ -61,7 +60,6 @@ if __name__ == '__main__':
 6. Se ela imprimir um "A" (ou um "Q" ou o que depender do teu layout de
   teclado), você conseguiu!

-<br>


 ## Agora que tudo está no seu lugar, você pode querer ir além...
@@ -88,7 +86,7 @@ sua configuração matricial específica. Você pode observar
 [guia](https://docs.qmk.fm/#/hand_wire) feito pelo time da QMK para teclados
 artesanais.

-<br>Uma vez que você compreendeu a essência da coisa:
+Uma vez que você compreendeu a essência da coisa:
 - Você pode dar uma olhada [aqui](config_and_keymap.md) e [aqui](keys.md) para
  começar a customizar seu arquivo code.py / main.py.
 - Eis uma [referência](keycodes.md) dos códigos de teclas (*keycodes*)
@@ -115,7 +113,6 @@ Você também pode obter ideias dos vários [exemplos de
 usuários](https://github.com/KMKfw/user_keymaps) que fornecemos e fuce nossa
 [documentação](https://github.com/KMKfw/kmk_firmware/tree/master/docs).

-<br>

 ## Ajuda e Suporte Adicionais
 > Estradas? Para onde vamos, estradas são desnecessárias.
--- a/kmk/handlers/stock.py
+++ b/kmk/handlers/stock.py
@@ -127,3 +127,13 @@ def ble_refresh(key, keyboard, *args, **kwargs):
    keyboard._hid_helper.stop_advertising()
    keyboard._hid_helper.start_advertising()
    return keyboard
+
+
+def ble_disconnect(key, keyboard, *args, **kwargs):
+    from kmk.hid import HIDModes
+
+    if keyboard.hid_type != HIDModes.BLE:
+        return keyboard
+
+    keyboard._hid_helper.clear_bonds()
+    return keyboard
--- a/kmk/hid.py
+++ b/kmk/hid.py
@@ -4,7 +4,8 @@ from micropython import const

 from storage import getmount

-from kmk.keys import FIRST_KMK_INTERNAL_KEY, ConsumerKey, ModifierKey
+from kmk.keys import FIRST_KMK_INTERNAL_KEY, ConsumerKey, ModifierKey, MouseKey
+from kmk.utils import clamp

 try:
    from adafruit_ble import BLERadio
@@ -68,6 +69,14 @@ class AbstractHID:
        self.report_mods = memoryview(self._evt)[1:2]
        self.report_non_mods = memoryview(self._evt)[3:]

+        self._cc_report = bytearray(HID_REPORT_SIZES[HIDReportTypes.CONSUMER] + 1)
+        self._cc_report[0] = HIDReportTypes.CONSUMER
+        self._cc_pending = False
+
+        self._pd_report = bytearray(HID_REPORT_SIZES[HIDReportTypes.MOUSE] + 1)
+        self._pd_report[0] = HIDReportTypes.MOUSE
+        self._pd_pending = False
+
        self.post_init()

    def __repr__(self):
@@ -76,47 +85,27 @@ class AbstractHID:
    def post_init(self):
        pass

-    def create_report(self, keys_pressed):
+    def create_report(self, keys_pressed, axes):
        self.clear_all()

-        consumer_key = None
-        for key in keys_pressed:
-            if isinstance(key, ConsumerKey):
-                consumer_key = key
-                break
-
-        reporting_device = self.report_device[0]
-        needed_reporting_device = HIDReportTypes.KEYBOARD
-
-        if consumer_key:
-            needed_reporting_device = HIDReportTypes.CONSUMER
-
-        if reporting_device != needed_reporting_device:
-            # If we are about to change reporting devices, release
-            # all keys and close our proverbial tab on the existing
-            # device, or keys will get stuck (mostly when releasing
-            # media/consumer keys)
-            self.send()
-
-        self.report_device[0] = needed_reporting_device
-
-        if consumer_key:
-            self.add_key(consumer_key)
-        else:
        for key in keys_pressed:
            if key.code >= FIRST_KMK_INTERNAL_KEY:
                continue

            if isinstance(key, ModifierKey):
                self.add_modifier(key)
+            elif isinstance(key, ConsumerKey):
+                self.add_cc(key)
+            elif isinstance(key, MouseKey):
+                self.add_pd(key)
            else:
                self.add_key(key)
-
                if key.has_modifiers:
                    for mod in key.has_modifiers:
                        self.add_modifier(mod)

-        return self
+        for axis in axes:
+            self.move_axis(axis)

    def hid_send(self, evt):
        # Don't raise a NotImplementedError so this can serve as our "dummy" HID
@@ -131,12 +120,24 @@ class AbstractHID:
            self._prev_evt[:] = self._evt
            self.hid_send(self._evt)

+        if self._cc_pending:
+            self.hid_send(self._cc_report)
+            self._cc_pending = False
+
+        if self._pd_pending:
+            self.hid_send(self._pd_report)
+            self._pd_pending = False
+
        return self

    def clear_all(self):
        for idx, _ in enumerate(self.report_keys):
            self.report_keys[idx] = 0x00

+        self.remove_cc()
+        self.remove_pd()
+        self.clear_axis()
+
        return self

    def clear_non_modifiers(self):
@@ -175,9 +176,6 @@ class AbstractHID:

        where_to_place = self.report_non_mods

-        if self.report_device[0] == HIDReportTypes.CONSUMER:
-            where_to_place = self.report_keys
-
        for idx, _ in enumerate(where_to_place):
            if where_to_place[idx] == 0x00:
                where_to_place[idx] = key.code
@@ -193,15 +191,44 @@ class AbstractHID:
    def remove_key(self, key):
        where_to_place = self.report_non_mods

-        if self.report_device[0] == HIDReportTypes.CONSUMER:
-            where_to_place = self.report_keys
-
        for idx, _ in enumerate(where_to_place):
            if where_to_place[idx] == key.code:
                where_to_place[idx] = 0x00

        return self

+    def add_cc(self, cc):
+        # Add (or write over) consumer control report. There can only be one CC
+        # active at any time.
+        memoryview(self._cc_report)[1:3] = cc.code.to_bytes(2, 'little')
+        self._cc_pending = True
+
+    def remove_cc(self):
+        # Remove consumer control report.
+        report = memoryview(self._cc_report)[1:3]
+        if report != b'\x00\x00':
+            report[:] = b'\x00\x00'
+            self._cc_pending = True
+
+    def add_pd(self, key):
+        self._pd_report[1] |= key.code
+        self._pd_pending = True
+
+    def remove_pd(self):
+        if self._pd_report[1]:
+            self._pd_pending = True
+            self._pd_report[1] = 0x00
+
+    def move_axis(self, axis):
+        delta = clamp(axis.delta, -127, 127)
+        axis.delta -= delta
+        self._pd_report[axis.code + 2] = 0xFF & delta
+        self._pd_pending = True
+
+    def clear_axis(self):
+        for idx in range(2, len(self._pd_report)):
+            self._pd_report[idx] = 0x00
+

 class USBHID(AbstractHID):
    REPORT_BYTES = 9
--- a/kmk/keys.py
+++ b/kmk/keys.py
@@ -20,6 +20,7 @@ class KeyType:
    SIMPLE = const(0)
    MODIFIER = const(1)
    CONSUMER = const(2)
+    MOUSE = const(3)


 FIRST_KMK_INTERNAL_KEY = const(1000)
@@ -33,6 +34,29 @@ ALL_NUMBER_ALIASES = tuple(f'N{x}' for x in ALL_NUMBERS)
 debug = Debug(__name__)


+class Axis:
+    def __init__(self, code: int) -> None:
+        self.code = code
+        self.delta = 0
+
+    def __repr__(self) -> str:
+        return f'Axis(code={self.code}, delta={self.delta})'
+
+    def move(self, keyboard: Keyboard, delta: int):
+        self.delta += delta
+        if self.delta:
+            keyboard.axes.add(self)
+            keyboard.hid_pending = True
+        else:
+            keyboard.axes.discard(self)
+
+
+class AX:
+    W = Axis(2)
+    X = Axis(0)
+    Y = Axis(1)
+
+
 def maybe_make_key(
    code: Optional[int],
    names: Tuple[str, ...],
@@ -340,6 +364,7 @@ def maybe_make_unicode_key(candidate: str) -> Optional[Key]:
 def maybe_make_firmware_key(candidate: str) -> Optional[Key]:
    keys = (
        ((('BLE_REFRESH',), handlers.ble_refresh)),
+        ((('BLE_DISCONNECT',), handlers.ble_disconnect)),
        ((('BOOTLOADER',), handlers.bootloader)),
        ((('DEBUG', 'DBG'), handlers.debug_pressed)),
        ((('HID_SWITCH', 'HID'), handlers.hid_switch)),
@@ -410,7 +435,7 @@ class KeyAttrDict:

    def __iter__(self):
        for partition in self.__cache:
-            for name in partition.__iter__():
+            for name in partition:
                yield name

    def __setitem__(self, name: str, key: Key):
@@ -688,6 +713,10 @@ class ConsumerKey(Key):
    pass


+class MouseKey(Key):
+    pass
+
+
 def make_key(
    code: Optional[int] = None,
    names: Tuple[str, ...] = tuple(),  # NOQA
@@ -718,6 +747,8 @@ def make_key(
        constructor = ModifierKey
    elif type == KeyType.CONSUMER:
        constructor = ConsumerKey
+    elif type == KeyType.MOUSE:
+        constructor = MouseKey
    else:
        raise ValueError('Unrecognized key type')

@@ -750,6 +781,10 @@ def make_consumer_key(*args, **kwargs) -> Key:
    return make_key(*args, **kwargs, type=KeyType.CONSUMER)


+def make_mouse_key(*args, **kwargs) -> Key:
+    return make_key(*args, **kwargs, type=KeyType.MOUSE)
+
+
 # Argumented keys are implicitly internal, so auto-gen of code
 # is almost certainly the best plan here
 def make_argumented_key(
--- a/kmk/kmk_keyboard.py
+++ b/kmk/kmk_keyboard.py
@@ -49,6 +49,7 @@ class KMKKeyboard:
    #####
    # Internal State
    keys_pressed = set()
+    axes = set()
    _coordkeys_pressed = {}
    hid_type = HIDModes.USB
    secondary_hid_type = None
@@ -88,6 +89,7 @@ class KMKKeyboard:
                f'  unicode_mode={self.unicode_mode}, ',
                f'_hid_helper={self._hid_helper},\n',
                f'  keys_pressed={self.keys_pressed},\n',
+                f'  axes={self.axes},\n',
                f'  _coordkeys_pressed={self._coordkeys_pressed},\n',
                f'  hid_pending={self.hid_pending}, ',
                f'active_layers={self.active_layers}, ',
@@ -102,15 +104,24 @@ class KMKKeyboard:
            debug(f'keys_pressed={self.keys_pressed}')

    def _send_hid(self) -> None:
-        if self._hid_send_enabled:
-            hid_report = self._hid_helper.create_report(self.keys_pressed)
+        if not self._hid_send_enabled:
+            return
+
+        if self.axes and debug.enabled:
+            debug(f'axes={self.axes}')
+
+        self._hid_helper.create_report(self.keys_pressed, self.axes)
        try:
-                hid_report.send()
+            self._hid_helper.send()
        except KeyError as e:
            if debug.enabled:
                debug(f'HidNotFound(HIDReportType={e})')
+
        self.hid_pending = False

+        for axis in self.axes:
+            axis.move(self, 0)
+
    def _handle_matrix_report(self, kevent: KeyEvent) -> None:
        if kevent is not None:
            self._on_matrix_changed(kevent)
--- a/kmk/modules/adns9800.py
+++ b/kmk/modules/adns9800.py
@@ -4,9 +4,9 @@ import microcontroller

 import time

+from kmk.keys import AX
 from kmk.modules import Module
 from kmk.modules.adns9800_firmware import firmware
-from kmk.modules.mouse_keys import PointingDevice


 class REG:
@@ -70,7 +70,6 @@ class ADNS9800(Module):
    DIR_READ = 0x7F

    def __init__(self, cs, sclk, miso, mosi, invert_x=False, invert_y=False):
-        self.pointing_device = PointingDevice()
        self.cs = digitalio.DigitalInOut(cs)
        self.cs.direction = digitalio.Direction.OUTPUT
        self.spi = busio.SPI(clock=sclk, MOSI=mosi, MISO=miso)
@@ -203,27 +202,14 @@ class ADNS9800(Module):
            if self.invert_y:
                delta_y *= -1

-            if delta_x < 0:
-                self.pointing_device.report_x[0] = (delta_x & 0xFF) | 0x80
-            else:
-                self.pointing_device.report_x[0] = delta_x & 0xFF
+            if delta_x:
+                AX.X.move(delta_x)

-            if delta_y < 0:
-                self.pointing_device.report_y[0] = (delta_y & 0xFF) | 0x80
-            else:
-                self.pointing_device.report_y[0] = delta_y & 0xFF
+            if delta_y:
+                AX.Y.move(delta_y)

            if keyboard.debug_enabled:
                print('Delta: ', delta_x, ' ', delta_y)
-            self.pointing_device.hid_pending = True
-
-        if self.pointing_device.hid_pending:
-            keyboard._hid_helper.hid_send(self.pointing_device._evt)
-            self.pointing_device.hid_pending = False
-            self.pointing_device.report_x[0] = 0
-            self.pointing_device.report_y[0] = 0
-
-        return

    def after_matrix_scan(self, keyboard):
        return
--- a/kmk/modules/easypoint.py
+++ b/kmk/modules/easypoint.py
@@ -4,8 +4,8 @@ Extension handles usage of AS5013 by AMS

 from supervisor import ticks_ms

+from kmk.keys import AX
 from kmk.modules import Module
-from kmk.modules.mouse_keys import PointingDevice

 I2C_ADDRESS = 0x40
 I2X_ALT_ADDRESS = 0x41
@@ -44,7 +44,6 @@ class Easypoint(Module):
        self._i2c_bus = i2c

        # HID parameters
-        self.pointing_device = PointingDevice()
        self.polling_interval = 20
        self.last_tick = ticks_ms()

@@ -82,12 +81,8 @@ class Easypoint(Module):
            return
        else:
            # Set the X/Y from easypoint
-            self.pointing_device.report_x[0] = x
-            self.pointing_device.report_y[0] = y
-
-            self.pointing_device.hid_pending = x != 0 or y != 0
-
-        return
+            AX.X.move(keyboard, x)
+            AX.Y.move(keyboard, y)

    def after_matrix_scan(self, keyboard):
        return
@@ -96,9 +91,6 @@ class Easypoint(Module):
        return

    def after_hid_send(self, keyboard):
-        if self.pointing_device.hid_pending:
-            keyboard._hid_helper.hid_send(self.pointing_device._evt)
-            self._clear_pending_hid()
        return

    def on_powersave_enable(self, keyboard):
@@ -107,13 +99,6 @@ class Easypoint(Module):
    def on_powersave_disable(self, keyboard):
        return

-    def _clear_pending_hid(self):
-        self.pointing_device.hid_pending = False
-        self.pointing_device.report_x[0] = 0
-        self.pointing_device.report_y[0] = 0
-        self.pointing_device.report_w[0] = 0
-        self.pointing_device.button_status[0] = 0
-
    def _read_raw_state(self):
        '''Read data from AS5013'''
        x, y = self._i2c_rdwr([X], length=2)
--- a/kmk/modules/layers.py
+++ b/kmk/modules/layers.py
@@ -114,17 +114,15 @@ class Layers(HoldTap):
        '''
        As MO(layer) but with mod active
        '''
-        keyboard.hid_pending = True
        # Sets the timer start and acts like MO otherwise
-        keyboard.keys_pressed.add(key.meta.kc)
+        keyboard.add_key(key.meta.kc)
        self._mo_pressed(key, keyboard, *args, **kwargs)

    def _lm_released(self, key, keyboard, *args, **kwargs):
        '''
        As MO(layer) but with mod active
        '''
-        keyboard.hid_pending = True
-        keyboard.keys_pressed.discard(key.meta.kc)
+        keyboard.remove_key(key.meta.kc)
        self._mo_released(key, keyboard, *args, **kwargs)

    def _tg_pressed(self, key, keyboard, *args, **kwargs):
--- a/kmk/modules/mouse_keys.py
+++ b/kmk/modules/mouse_keys.py
@@ -1,54 +1,40 @@
-from supervisor import ticks_ms
-
-from kmk.hid import HID_REPORT_SIZES, HIDReportTypes
-from kmk.keys import make_key
+from kmk.keys import AX, make_key, make_mouse_key
+from kmk.kmktime import PeriodicTimer
 from kmk.modules import Module


-class PointingDevice:
-    MB_LMB = 1
-    MB_RMB = 2
-    MB_MMB = 4
-    _evt = bytearray(HID_REPORT_SIZES[HIDReportTypes.MOUSE] + 1)
-
-    def __init__(self):
-        self.key_states = {}
-        self.hid_pending = False
-        self.report_device = memoryview(self._evt)[0:1]
-        self.report_device[0] = HIDReportTypes.MOUSE
-        self.button_status = memoryview(self._evt)[1:2]
-        self.report_x = memoryview(self._evt)[2:3]
-        self.report_y = memoryview(self._evt)[3:4]
-        self.report_w = memoryview(self._evt)[4:]
-
-
 class MouseKeys(Module):
    def __init__(self):
-        self.pointing_device = PointingDevice()
        self._nav_key_activated = 0
        self._up_activated = False
        self._down_activated = False
        self._left_activated = False
        self._right_activated = False
+        self._mw_up_activated = False
+        self._mw_down_activated = False
        self.max_speed = 10
-        self.ac_interval = 100  # Delta ms to apply acceleration
-        self._next_interval = 0  # Time for next tick interval
+        self.acc_interval = 10  # Delta ms to apply acceleration
        self.move_step = 1

-        make_key(
+        make_mouse_key(
            names=('MB_LMB',),
-            on_press=self._mb_lmb_press,
-            on_release=self._mb_lmb_release,
+            code=1,
        )
-        make_key(
+        make_mouse_key(
            names=('MB_MMB',),
-            on_press=self._mb_mmb_press,
-            on_release=self._mb_mmb_release,
+            code=4,
        )
-        make_key(
+        make_mouse_key(
            names=('MB_RMB',),
-            on_press=self._mb_rmb_press,
-            on_release=self._mb_rmb_release,
+            code=2,
+        )
+        make_mouse_key(
+            names=('MB_BTN4',),
+            code=8,
+        )
+        make_mouse_key(
+            names=('MB_BTN5',),
+            code=16,
        )
        make_key(
            names=('MW_UP',),
@@ -94,38 +80,33 @@ class MouseKeys(Module):
        )

    def during_bootup(self, keyboard):
-        return
-
-    def matrix_detected_press(self, keyboard):
-        return keyboard.matrix_update is None
+        self._timer = PeriodicTimer(self.acc_interval)

    def before_matrix_scan(self, keyboard):
        return

    def after_matrix_scan(self, keyboard):
+        if not self._timer.tick():
+            return
+
        if self._nav_key_activated:
-            if self._next_interval <= ticks_ms():
-                # print("hello: ")
-                # print(ticks_ms())
-                self._next_interval = ticks_ms() + self.ac_interval
-                # print(self._next_interval)
            if self.move_step < self.max_speed:
                self.move_step = self.move_step + 1
            if self._right_activated:
-                self.pointing_device.report_x[0] = self.move_step
+                AX.X.move(keyboard, self.move_step)
            if self._left_activated:
-                self.pointing_device.report_x[0] = 0xFF & (0 - self.move_step)
+                AX.X.move(keyboard, -self.move_step)
            if self._up_activated:
-                self.pointing_device.report_y[0] = 0xFF & (0 - self.move_step)
+                AX.Y.move(keyboard, -self.move_step)
            if self._down_activated:
-                self.pointing_device.report_y[0] = self.move_step
-            self.pointing_device.hid_pending = True
-        return
+                AX.Y.move(keyboard, self.move_step)
+
+        if self._mw_up_activated:
+            AX.W.move(keyboard, 1)
+        if self._mw_down_activated:
+            AX.W.move(keyboard, -1)

    def before_hid_send(self, keyboard):
-        if self.pointing_device.hid_pending and keyboard._hid_send_enabled:
-            keyboard._hid_helper.hid_send(self.pointing_device._evt)
-            self.pointing_device.hid_pending = False
        return

    def after_hid_send(self, keyboard):
@@ -137,50 +118,21 @@ class MouseKeys(Module):
    def on_powersave_disable(self, keyboard):
        return

-    def _mb_lmb_press(self, key, keyboard, *args, **kwargs):
-        self.pointing_device.button_status[0] |= self.pointing_device.MB_LMB
-        self.pointing_device.hid_pending = True
-
-    def _mb_lmb_release(self, key, keyboard, *args, **kwargs):
-        self.pointing_device.button_status[0] &= ~self.pointing_device.MB_LMB
-        self.pointing_device.hid_pending = True
-
-    def _mb_mmb_press(self, key, keyboard, *args, **kwargs):
-        self.pointing_device.button_status[0] |= self.pointing_device.MB_MMB
-        self.pointing_device.hid_pending = True
-
-    def _mb_mmb_release(self, key, keyboard, *args, **kwargs):
-        self.pointing_device.button_status[0] &= ~self.pointing_device.MB_MMB
-        self.pointing_device.hid_pending = True
-
-    def _mb_rmb_press(self, key, keyboard, *args, **kwargs):
-        self.pointing_device.button_status[0] |= self.pointing_device.MB_RMB
-        self.pointing_device.hid_pending = True
-
-    def _mb_rmb_release(self, key, keyboard, *args, **kwargs):
-        self.pointing_device.button_status[0] &= ~self.pointing_device.MB_RMB
-        self.pointing_device.hid_pending = True
-
    def _mw_up_press(self, key, keyboard, *args, **kwargs):
-        self.pointing_device.report_w[0] = self.move_step
-        self.pointing_device.hid_pending = True
+        self._mw_up_activated = True

    def _mw_up_release(self, key, keyboard, *args, **kwargs):
-        self.pointing_device.report_w[0] = 0
-        self.pointing_device.hid_pending = True
+        self._mw_up_activated = False

    def _mw_down_press(self, key, keyboard, *args, **kwargs):
-        self.pointing_device.report_w[0] = 0xFF
-        self.pointing_device.hid_pending = True
+        self._mw_down_activated = True

    def _mw_down_release(self, key, keyboard, *args, **kwargs):
-        self.pointing_device.report_w[0] = 0
-        self.pointing_device.hid_pending = True
+        self._mw_down_activated = False

    # Mouse movement
    def _reset_next_interval(self):
        if self._nav_key_activated == 1:
-            self._next_interval = ticks_ms() + self.ac_interval
            self.move_step = 1

    def _check_last(self):
@@ -191,56 +143,38 @@ class MouseKeys(Module):
        self._nav_key_activated += 1
        self._reset_next_interval()
        self._up_activated = True
-        self.pointing_device.report_y[0] = 0xFF & (0 - self.move_step)
-        self.pointing_device.hid_pending = True

    def _ms_up_release(self, key, keyboard, *args, **kwargs):
        self._up_activated = False
        self._nav_key_activated -= 1
        self._check_last()
-        self.pointing_device.report_y[0] = 0
-        self.pointing_device.hid_pending = False

    def _ms_down_press(self, key, keyboard, *args, **kwargs):
        self._nav_key_activated += 1
        self._reset_next_interval()
        self._down_activated = True
-        # if not self.x_activated and not self.y_activated:
-        #     self.next_interval = ticks_ms() + self.ac_intervalle
-        self.pointing_device.report_y[0] = self.move_step
-        self.pointing_device.hid_pending = True

    def _ms_down_release(self, key, keyboard, *args, **kwargs):
        self._down_activated = False
        self._nav_key_activated -= 1
        self._check_last()
-        self.pointing_device.report_y[0] = 0
-        self.pointing_device.hid_pending = False

    def _ms_left_press(self, key, keyboard, *args, **kwargs):
        self._nav_key_activated += 1
        self._reset_next_interval()
        self._left_activated = True
-        self.pointing_device.report_x[0] = 0xFF & (0 - self.move_step)
-        self.pointing_device.hid_pending = True

    def _ms_left_release(self, key, keyboard, *args, **kwargs):
        self._nav_key_activated -= 1
        self._left_activated = False
        self._check_last()
-        self.pointing_device.report_x[0] = 0
-        self.pointing_device.hid_pending = False

    def _ms_right_press(self, key, keyboard, *args, **kwargs):
        self._nav_key_activated += 1
        self._reset_next_interval()
        self._right_activated = True
-        self.pointing_device.report_x[0] = self.move_step
-        self.pointing_device.hid_pending = True

    def _ms_right_release(self, key, keyboard, *args, **kwargs):
        self._nav_key_activated -= 1
        self._right_activated = False
        self._check_last()
-        self.pointing_device.report_x[0] = 0
-        self.pointing_device.hid_pending = False
--- a/kmk/modules/pimoroni_trackball.py
+++ b/kmk/modules/pimoroni_trackball.py
@@ -6,46 +6,48 @@ from micropython import const

 import math
 import struct
+from adafruit_pixelbuf import PixelBuf

-from kmk.keys import make_argumented_key, make_key
+from kmk.keys import AX, KC, make_argumented_key, make_key
 from kmk.kmktime import PeriodicTimer
 from kmk.modules import Module
-from kmk.modules.mouse_keys import PointingDevice
+from kmk.utils import Debug

-I2C_ADDRESS = 0x0A
-I2C_ADDRESS_ALTERNATIVE = 0x0B
+_I2C_ADDRESS = const(0x0A)
+_I2C_ADDRESS_ALTERNATIVE = const(0x0B)

-CHIP_ID = 0xBA11
-VERSION = 1
+_CHIP_ID = const(0xBA11)
+_VERSION = const(1)

-REG_LED_RED = 0x00
-REG_LED_GRN = 0x01
-REG_LED_BLU = 0x02
-REG_LED_WHT = 0x03
+_REG_LED_RED = const(0x00)
+_REG_LED_GRN = const(0x01)
+_REG_LED_BLU = const(0x02)
+_REG_LED_WHT = const(0x03)

-REG_LEFT = 0x04
-REG_RIGHT = 0x05
-REG_UP = 0x06
-REG_DOWN = 0x07
-REG_SWITCH = 0x08
-MSK_SWITCH_STATE = 0b10000000
+_REG_LEFT = const(0x04)
+_REG_RIGHT = const(0x05)
+_REG_UP = const(0x06)
+_REG_DOWN = const(0x07)
+_REG_SWITCH = const(0x08)
+_MSK_SWITCH_STATE = const(0b10000000)

-REG_USER_FLASH = 0xD0
-REG_FLASH_PAGE = 0xF0
-REG_INT = 0xF9
-MSK_INT_TRIGGERED = 0b00000001
-MSK_INT_OUT_EN = 0b00000010
-REG_CHIP_ID_L = 0xFA
-RED_CHIP_ID_H = 0xFB
-REG_VERSION = 0xFC
-REG_I2C_ADDR = 0xFD
-REG_CTRL = 0xFE
-MSK_CTRL_SLEEP = 0b00000001
-MSK_CTRL_RESET = 0b00000010
-MSK_CTRL_FREAD = 0b00000100
-MSK_CTRL_FWRITE = 0b00001000
+_REG_USER_FLASH = const(0xD0)
+_REG_FLASH_PAGE = const(0xF0)
+_REG_INT = const(0xF9)
+_MSK_INT_TRIGGERED = const(0b00000001)
+_MSK_INT_OUT_EN = const(0b00000010)
+_REG_CHIP_ID_L = const(0xFA)
+_REG_CHIP_ID_H = const(0xFB)
+_REG_VERSION = const(0xFC)
+_REG_I2C_ADDR = const(0xFD)
+_REG_CTRL = const(0xFE)
+_MSK_CTRL_SLEEP = const(0b00000001)
+_MSK_CTRL_RESET = const(0b00000010)
+_MSK_CTRL_FREAD = const(0b00000100)
+_MSK_CTRL_FWRITE = const(0b00001000)

-ANGLE_OFFSET = 0
+
+debug = Debug(__name__)


 class TrackballHandlerKeyMeta:
@@ -78,31 +80,13 @@ class TrackballHandler:

 class PointingHandler(TrackballHandler):
    def handle(self, keyboard, trackball, x, y, switch, state):
-        if x > 0:
-            trackball.pointing_device.report_x[0] = x
-        elif x < 0:
-            trackball.pointing_device.report_x[0] = 0xFF & x
-        if y > 0:
-            trackball.pointing_device.report_y[0] = y
-        elif y < 0:
-            trackball.pointing_device.report_y[0] = 0xFF & y
+        if x:
+            AX.X.move(keyboard, x)
+        if y:
+            AX.Y.move(keyboard, y)

-        if x != 0 or y != 0:
-            trackball.pointing_device.hid_pending = True
-
-        if switch == 1:  # Button pressed
-            trackball.pointing_device.button_status[
-                0
-            ] |= trackball.pointing_device.MB_LMB
-            trackball.pointing_device.hid_pending = True
-
-        if not state and trackball.previous_state is True:  # Button released
-            trackball.pointing_device.button_status[
-                0
-            ] &= ~trackball.pointing_device.MB_LMB
-            trackball.pointing_device.hid_pending = True
-
-        trackball.previous_state = state
+        if switch == 1:  # Button changed state
+            keyboard.pre_process_key(KC.MB_LMB, is_pressed=state)


 class ScrollHandler(TrackballHandler):
@@ -114,19 +98,10 @@ class ScrollHandler(TrackballHandler):
            y = -y

        if y != 0:
-            pointing_device = trackball.pointing_device
-            pointing_device.report_w[0] = 0xFF & y
-            pointing_device.hid_pending = True
+            AX.W.move(keyboard, y)

-        if switch == 1:  # Button pressed
-            pointing_device.button_status[0] |= pointing_device.MB_LMB
-            pointing_device.hid_pending = True
-
-        if not state and trackball.previous_state is True:  # Button released
-            pointing_device.button_status[0] &= ~pointing_device.MB_LMB
-            pointing_device.hid_pending = True
-
-        trackball.previous_state = state
+        if switch == 1:  # Button changed state
+            keyboard.pre_process_key(KC.MB_LMB, is_pressed=state)


 class KeyHandler(TrackballHandler):
@@ -173,8 +148,8 @@ class Trackball(Module):
        self,
        i2c,
        mode=TrackballMode.MOUSE_MODE,
-        address=I2C_ADDRESS,
-        angle_offset=ANGLE_OFFSET,
+        address=_I2C_ADDRESS,
+        angle_offset=0,
        handlers=None,
    ):
        self.angle_offset = angle_offset
@@ -185,19 +160,11 @@ class Trackball(Module):
        self._i2c_address = address
        self._i2c_bus = i2c

-        self.pointing_device = PointingDevice()
        self.mode = mode
-        self.previous_state = False  # click state
        self.handlers = handlers
        self.current_handler = self.handlers[0]
        self.polling_interval = 20

-        chip_id = struct.unpack('<H', bytearray(self._i2c_rdwr([REG_CHIP_ID_L], 2)))[0]
-        if chip_id != CHIP_ID:
-            raise RuntimeError(
-                f'Invalid chip ID: 0x{chip_id:04X}, expected 0x{CHIP_ID:04X}'
-            )
-
        make_key(
            names=('TB_MODE', 'TB_NEXT_HANDLER', 'TB_N'),
            on_press=self._tb_handler_next_press,
@@ -210,8 +177,17 @@ class Trackball(Module):
        )

    def during_bootup(self, keyboard):
+        chip_id = struct.unpack('<H', bytearray(self._i2c_rdwr([_REG_CHIP_ID_L], 2)))[0]
+        if chip_id != _CHIP_ID:
+            raise RuntimeError(
+                f'Invalid chip ID: 0x{chip_id:04X}, expected 0x{_CHIP_ID:04X}'
+            )
+
        self._timer = PeriodicTimer(self.polling_interval)

+        a = math.pi * self.angle_offset / 180
+        self.rot = [[math.cos(a), math.sin(a)], [-math.sin(a), math.cos(a)]]
+
    def before_matrix_scan(self, keyboard):
        '''
        Return value will be injected as an extra matrix update
@@ -219,14 +195,15 @@ class Trackball(Module):
        if not self._timer.tick():
            return

+        if not (self._i2c_rdwr([_REG_INT], 1)[0] & _MSK_INT_TRIGGERED):
+            return
+
        up, down, left, right, switch, state = self._read_raw_state()

        x, y = self._calculate_movement(right - left, down - up)

        self.current_handler.handle(keyboard, self, x, y, switch, state)

-        return
-
    def after_matrix_scan(self, keyboard):
        return

@@ -234,9 +211,6 @@ class Trackball(Module):
        return

    def after_hid_send(self, keyboard):
-        if self.pointing_device.hid_pending:
-            keyboard._hid_helper.hid_send(self.pointing_device._evt)
-            self._clear_pending_hid()
        return

    def on_powersave_enable(self, keyboard):
@@ -247,23 +221,23 @@ class Trackball(Module):

    def set_rgbw(self, r, g, b, w):
        '''Set all LED brightness as RGBW.'''
-        self._i2c_rdwr([REG_LED_RED, r, g, b, w])
+        self._i2c_rdwr([_REG_LED_RED, r, g, b, w])

    def set_red(self, value):
        '''Set brightness of trackball red LED.'''
-        self._i2c_rdwr([REG_LED_RED, value & 0xFF])
+        self._i2c_rdwr([_REG_LED_RED, value & 0xFF])

    def set_green(self, value):
        '''Set brightness of trackball green LED.'''
-        self._i2c_rdwr([REG_LED_GRN, value & 0xFF])
+        self._i2c_rdwr([_REG_LED_GRN, value & 0xFF])

    def set_blue(self, value):
        '''Set brightness of trackball blue LED.'''
-        self._i2c_rdwr([REG_LED_BLU, value & 0xFF])
+        self._i2c_rdwr([_REG_LED_BLU, value & 0xFF])

    def set_white(self, value):
        '''Set brightness of trackball white LED.'''
-        self._i2c_rdwr([REG_LED_WHT, value & 0xFF])
+        self._i2c_rdwr([_REG_LED_WHT, value & 0xFF])

    def activate_handler(self, handler):
        if isinstance(handler, TrackballHandler):
@@ -272,7 +246,8 @@ class Trackball(Module):
            try:
                self.current_handler = self.handlers[handler]
            except KeyError:
-                print(f'no handler found with id {handler}')
+                if debug.enabled:
+                    debug(f'no handler found with id {handler}')

    def next_handler(self):
        next_index = self.handlers.index(self.current_handler) + 1
@@ -280,26 +255,19 @@ class Trackball(Module):
            next_index = 0
        self.activate_handler(next_index)

-    def _clear_pending_hid(self):
-        self.pointing_device.hid_pending = False
-        self.pointing_device.report_x[0] = 0
-        self.pointing_device.report_y[0] = 0
-        self.pointing_device.report_w[0] = 0
-        self.pointing_device.button_status[0] = 0
-
    def _read_raw_state(self):
        '''Read up, down, left, right and switch data from trackball.'''
-        left, right, up, down, switch = self._i2c_rdwr([REG_LEFT], 5)
-        switch, switch_state = (
-            switch & ~MSK_SWITCH_STATE,
-            (switch & MSK_SWITCH_STATE) > 0,
+        left, right, up, down, switch = self._i2c_rdwr([_REG_LEFT], 5)
+        switch_changed, switch_state = (
+            switch & ~_MSK_SWITCH_STATE,
+            (switch & _MSK_SWITCH_STATE) > 0,
        )
-        return up, down, left, right, switch, switch_state
+        return up, down, left, right, switch_changed, switch_state

    def _i2c_rdwr(self, data, length=0):
        '''Write and optionally read I2C data.'''
-        while not self._i2c_bus.try_lock():
-            pass
+        if not self._i2c_bus.try_lock():
+            return

        try:
            if length > 0:
@@ -327,17 +295,24 @@ class Trackball(Module):
        if raw_x == 0 and raw_y == 0:
            return 0, 0

-        var_accel = 1
-        power = 2.5
+        scale = math.sqrt(raw_x**2 + raw_y**2)
+        x = (self.rot[0][0] * raw_x + self.rot[0][1] * raw_y) * scale
+        y = (self.rot[1][0] * raw_x + self.rot[1][1] * raw_y) * scale

-        angle_rad = math.atan2(raw_y, raw_x) + self.angle_offset
-        vector_length = math.sqrt(pow(raw_x, 2) + pow(raw_y, 2))
-        vector_length = pow(vector_length * var_accel, power)
-        x = math.floor(vector_length * math.cos(angle_rad))
-        y = math.floor(vector_length * math.sin(angle_rad))
+        return int(x), int(y)

-        limit = 127  # hid size limit
-        x_clamped = max(min(limit, x), -limit)
-        y_clamped = max(min(limit, y), -limit)

-        return x_clamped, y_clamped
+class TrackballPixel(PixelBuf):
+    '''PixelBuf interface for the Trackball RGBW LED'''
+
+    def __init__(self, trackball, **kwargs):
+        self.trackball = trackball
+        kwargs['byteorder'] = 'RGBW'
+        super().__init__(1, **kwargs)
+
+    def deinit(self):
+        super().deinit()
+        self.trackball.set_rgbw(0, 0, 0, 0)
+
+    def _transmit(self, b):
+        self.trackball.set_rgbw(b[0], b[1], b[2], b[3])
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,6 +23,7 @@ per-file-ignores =
 # your imports in whatever order you want
 	user_keymaps/**/*.py: E131,F401,E501,E241,E131,BLK100,I003
 	boards/**/main.py: E131,F401,E501,E241,E131,BLK100,I003
+	boards/**/kb.py: E131,F401,E501,E241,E131,BLK100,I003
 	tests/test_data/keymaps/**/*.py: F401,E501

 [isort]
Author	SHA1	Message	Date
xs5871	cbfcd34fae	Move trackball id check to during_bootup	2023-02-24 19:33:20 +00:00
xs5871	1d53d3a8da	Implement PixelBuf interface for pimoroni trackball	2023-02-24 19:33:20 +00:00
xs5871	0e804ffd54	Use rotation matrix instead of trig for angle correction	2023-02-24 19:33:20 +00:00
xs5871	0cc308c055	Read trackball only if state changed	2023-02-24 19:33:20 +00:00
xs5871	c575fa396a	Fix trackball switch handling	2023-02-24 19:33:20 +00:00
xs5871	a83e833d10	Remove infinite blocking loop on I2C error	2023-02-24 19:33:20 +00:00
xs5871	e9af3e542a	Use debug() for error messages	2023-02-24 19:33:20 +00:00
xs5871	16d319359f	Make trackball constants const()	2023-02-24 19:33:19 +00:00
xs5871	88c3616b6a	Refactor Makefile copy-* targets for improved readability	2023-02-24 18:17:59 +00:00
xs5871	6ab4154ad5	Make copy-board target copy all BOARD/.*py files	2023-02-24 18:17:59 +00:00
xs5871	db2082f1c6	Add make target for compiled mpy code	2023-02-24 18:17:59 +00:00
xs5871	317f6407d6	Improve mpy-cross compilation target	2023-02-24 18:17:59 +00:00
xs5871	08c255b6e4	Add optional selection of specific unit test to Makefile	2023-02-24 18:17:59 +00:00
Aldoo	61cf527370	Removed extra ".__iter__()" in KeyAttrDict iterator: iterating elements in the partition already implicitly calls its __iter__ method. Actually using the dictionary iterator with this extra call would trigger an error since an iterator does not have an iterator. This is no longer the case.	2023-02-22 19:37:20 +00:00
claycooper	38acda77b4	Moved pro micro image to fix render issues	2023-02-21 01:26:39 +00:00
claycooper	7ef2c2c2d3	Removed HTML br's from markdown	2023-02-21 01:26:39 +00:00
xs5871	1f751d8374	Add mouse buttons 4/5	2023-02-21 00:57:39 +00:00
xs5871	d4fe745e71	Cleanup PointingDevice from mouse_keys	2023-02-21 00:57:39 +00:00
xs5871	1674ff4ed7	Add linter format exception for `kb.py`	2023-02-20 20:42:23 +00:00
xs5871	a90d569690	Fix CC HID report generation	2023-02-18 08:20:52 +00:00
xs5871	449aab7dcb	Add BLE_DISCONNECT key	2023-02-17 03:03:40 +00:00
Stefan Misch	dc9b5f4512	fix encoder resolution for MacroPad10	2023-02-16 09:07:48 +00:00
Stefan Misch	cbaddef9a6	fix encoder resolution for Knobs3	2023-02-16 09:07:48 +00:00
Stefan Misch	804b5ec575	fix: encoder resolution for Knob 1	2023-02-16 09:07:48 +00:00
xs5871	a28df47199	Refactor affected modules to use global pointing device	2023-02-14 20:42:08 +00:00
xs5871	9e5d2c24e1	Refactor for nicer pointing device axes handling	2023-02-14 20:42:08 +00:00
xs5871	ca800331de	Implement axis movement method	2023-02-14 20:42:08 +00:00
xs5871	1ca27dab58	refactor mouse_keys to use PeriodicTimer	2023-02-14 20:42:08 +00:00
xs5871	fc8d5edd52	refactor mouse_keys module to use global pd	2023-02-14 20:42:08 +00:00
xs5871	e84bbd0d75	add mouse buttons to pointing device	2023-02-14 20:42:08 +00:00
xs5871	69d47343e8	implement global pointing device axis handling	2023-02-14 20:42:08 +00:00
xs5871	470f16c97f	factor out consumer control from keyboard hid	2023-02-14 20:42:08 +00:00
xs5871	27f101d139	remove hid awareness from layer module	2023-02-14 20:42:08 +00:00