From 4180d98a386b9a5b989bc9efcf095b099718782b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Tu=C4=8Dek?= <kareltucek@centrum.cz>
Date: Fri, 7 Jul 2023 09:32:52 +0200
Subject: [PATCH 1/3] Revert "usb: hide/disable gamepad interface (#546)"

This reverts commit 624debe8f5c799dc5f99075ea9f69b86ee735fc9.
---
 right/src/usb_composite_device.c              | 35 +++++++++++++++++++
 .../usb_descriptor_configuration.c            | 15 ++++++--
 .../usb_descriptors_microsoft.c               |  6 ++--
 right/src/usb_device_config.h                 |  1 +
 right/src/usb_report_updater.c                | 10 ++++++
 5 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/right/src/usb_composite_device.c b/right/src/usb_composite_device.c
index 5de9871f0..5553beefb 100644
--- a/right/src/usb_composite_device.c
+++ b/right/src/usb_composite_device.c
@@ -165,6 +165,41 @@ static usb_device_class_config_list_struct_t UsbDeviceCompositeConfigList = {
             }}
         }}
     },
+    {
+        .classCallback = UsbGamepadCallback,
+        .classInfomation = (usb_device_class_struct_t[]) {{
+            .type = kUSB_DeviceClassTypeHid,
+            .configurations = USB_DEVICE_CONFIGURATION_COUNT,
+            .interfaceList = (usb_device_interface_list_t[USB_DEVICE_CONFIGURATION_COUNT]) {{
+                .count = USB_GAMEPAD_INTERFACE_COUNT,
+                .interfaces = (usb_device_interfaces_struct_t[USB_GAMEPAD_INTERFACE_COUNT]) {{
+                    .classCode = USB_CLASS_HID,
+                    .subclassCode = USB_HID_SUBCLASS_NONE,
+                    .protocolCode = USB_HID_PROTOCOL_NONE,
+                    .interfaceNumber = USB_GAMEPAD_INTERFACE_INDEX,
+                    .count = 1,
+                    .interface = (usb_device_interface_struct_t[]) {{
+                        .alternateSetting = USB_INTERFACE_ALTERNATE_SETTING_NONE,
+                        .endpointList = {
+                            .count = USB_GAMEPAD_ENDPOINT_COUNT,
+                            .endpoint = (usb_device_endpoint_struct_t[USB_GENERIC_HID_ENDPOINT_COUNT]) {
+                                {
+                                    .endpointAddress = USB_GAMEPAD_ENDPOINT_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
+                                    .transferType = USB_ENDPOINT_INTERRUPT,
+                                    .maxPacketSize = USB_GAMEPAD_INTERRUPT_IN_PACKET_SIZE,
+                                },
+                                {
+                                    .endpointAddress = USB_GAMEPAD_ENDPOINT_INDEX | (USB_OUT << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
+                                    .transferType = USB_ENDPOINT_INTERRUPT,
+                                    .maxPacketSize = USB_GAMEPAD_INTERRUPT_OUT_PACKET_SIZE,
+                                }
+                            }
+                        }
+                    }}
+                }}
+            }}
+        }}
+    },
 }};
 
 volatile bool SleepModeActive = true;
diff --git a/right/src/usb_descriptors/usb_descriptor_configuration.c b/right/src/usb_descriptors/usb_descriptor_configuration.c
index 99cc7a160..a971c055b 100644
--- a/right/src/usb_descriptors/usb_descriptor_configuration.c
+++ b/right/src/usb_descriptors/usb_descriptor_configuration.c
@@ -295,15 +295,21 @@
     USB_GAMEPAD_INTERRUPT_OUT_INTERVAL
 
 #define USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH    (USB_CONFIGURATION_DESCRIPTOR_BASE_LENGTH + \
-            0)
+            (USB_DESCRIPTOR_LENGTH_INTERFACE + USB_DESCRIPTOR_LENGTH_HID + (2 * USB_DESCRIPTOR_LENGTH_ENDPOINT)))
 
 static USB_DESC_STORAGE_TYPE(uint8_t) UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = {
     BASE_CONFIGURATION_DESCRIPTOR(USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH),
+    GAMEPAD_HID_CONFIGURATION_DESCRIPTOR
 };
 
 #define USB_MS_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH    (USB_CONFIGURATION_DESCRIPTOR_BASE_LENGTH + \
             (USB_DESCRIPTOR_LENGTH_INTERFACE + 0x11 + (2 * USB_DESCRIPTOR_LENGTH_ENDPOINT)))
 
+static USB_DESC_STORAGE_TYPE(uint8_t) UsbMsConfigurationDescriptor[USB_MS_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = {
+    BASE_CONFIGURATION_DESCRIPTOR(USB_MS_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH),
+    GAMEPAD_XINPUT_CONFIGURATION_DESCRIPTOR
+};
+
 usb_status_t USB_DeviceGetHidDescriptor(
     usb_device_handle handle, usb_device_get_hid_descriptor_struct_t *hidDescriptor)
 {
@@ -325,6 +331,9 @@ usb_status_t USB_DeviceGetHidDescriptor(
         case USB_MOUSE_INTERFACE_INDEX:
             hidDescriptor->buffer = (uint8_t*)&UsbConfigurationDescriptor[USB_MOUSE_HID_DESCRIPTOR_INDEX];
             break;
+        case USB_GAMEPAD_INTERFACE_INDEX:
+            hidDescriptor->buffer = (uint8_t*)&UsbConfigurationDescriptor[USB_GAMEPAD_HID_DESCRIPTOR_INDEX];
+            break;
         default:
             return kStatus_USB_InvalidRequest;
     }
@@ -339,8 +348,8 @@ usb_status_t USB_DeviceGetConfigurationDescriptor(
             configurationDescriptor->buffer = (uint8_t*)UsbConfigurationDescriptor;
             configurationDescriptor->length = sizeof(UsbConfigurationDescriptor);
         } else {
-            configurationDescriptor->buffer = (uint8_t*)UsbConfigurationDescriptor;
-            configurationDescriptor->length = sizeof(UsbConfigurationDescriptor);
+            configurationDescriptor->buffer = (uint8_t*)UsbMsConfigurationDescriptor;
+            configurationDescriptor->length = sizeof(UsbMsConfigurationDescriptor);
         }
         return kStatus_USB_Success;
     }
diff --git a/right/src/usb_descriptors/usb_descriptors_microsoft.c b/right/src/usb_descriptors/usb_descriptors_microsoft.c
index d0fa80d53..cfbf473d1 100644
--- a/right/src/usb_descriptors/usb_descriptors_microsoft.c
+++ b/right/src/usb_descriptors/usb_descriptors_microsoft.c
@@ -105,7 +105,7 @@ static USB_DESC_STORAGE_TYPE(USBD_BOSType) usbd_bosDesc = {
         },
         .CapabilityData.DescInfoSet = {
             .dwWindowsVersion = USB_MS_OS_2P0_MIN_WINDOWS_VERSION,
-            .wMSOSDescriptorSetTotalLength = 0,
+            .wMSOSDescriptorSetTotalLength = sizeof(USB_MSOS_DescType),
             .bMS_VendorCode = USB_REQ_MICROSOFT_OS,
             .bAltEnumCode = 1,
         },
@@ -163,8 +163,8 @@ usb_status_t USB_DeviceGetMsOsDescriptor(
     usb_device_handle handle, usb_device_control_request_struct_t *controlRequest)
 {
 #if (USBD_MS_OS_DESC_VERSION == 2)
-    controlRequest->buffer = (uint8_t*)NULL;
-    controlRequest->length = 0;
+    controlRequest->buffer = (uint8_t*)&usbd_msosDesc;
+    controlRequest->length = sizeof(usbd_msosDesc);
     return kStatus_USB_Success;
 #else
     return kStatus_USB_InvalidRequest;
diff --git a/right/src/usb_device_config.h b/right/src/usb_device_config.h
index a8f4c6979..c0051d539 100644
--- a/right/src/usb_device_config.h
+++ b/right/src/usb_device_config.h
@@ -21,6 +21,7 @@
     USB_MEDIA_KEYBOARD_INTERFACE_COUNT + \
     USB_SYSTEM_KEYBOARD_INTERFACE_COUNT + \
     USB_MOUSE_INTERFACE_COUNT + \
+    USB_GAMEPAD_INTERFACE_COUNT + \
 0)
 
 // Whether the device is self-powered: 1 supported, 0 not supported
diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c
index 480180a0c..8f3e0a637 100644
--- a/right/src/usb_report_updater.c
+++ b/right/src/usb_report_updater.c
@@ -542,6 +542,7 @@ void UpdateUsbReports(void)
     UsbMediaKeyboardResetActiveReport();
     UsbSystemKeyboardResetActiveReport();
     UsbMouseResetActiveReport();
+    UsbGamepadResetActiveReport();
 
     updateActiveUsbReports();
 
@@ -593,4 +594,13 @@ void UpdateUsbReports(void)
         }
         lastActivityTime = CurrentTime;
     }
+
+    if (UsbGamepadCheckReportReady() == kStatus_USB_Success) {
+        UsbReportUpdateSemaphore |= 1 << USB_GAMEPAD_INTERFACE_INDEX;
+        usb_status_t status = UsbGamepadAction();
+        if (status != kStatus_USB_Success) {
+            UsbReportUpdateSemaphore &= ~(1 << USB_GAMEPAD_INTERFACE_INDEX);
+        }
+        lastActivityTime = CurrentTime;
+    }
 }

From e7c2831483bc070c335436c99e553af1431458e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Tu=C4=8Dek?= <kareltucek@centrum.cz>
Date: Wed, 30 Nov 2022 15:34:27 +0100
Subject: [PATCH 2/3] Add missing gamepad handle.

---
 right/src/usb_composite_device.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/right/src/usb_composite_device.c b/right/src/usb_composite_device.c
index 5553beefb..13a7bff6f 100644
--- a/right/src/usb_composite_device.c
+++ b/right/src/usb_composite_device.c
@@ -358,6 +358,7 @@ void InitUsb(void)
     UsbCompositeDevice.mediaKeyboardHandle = UsbDeviceCompositeConfigList.config[USB_MEDIA_KEYBOARD_INTERFACE_INDEX].classHandle;
     UsbCompositeDevice.systemKeyboardHandle = UsbDeviceCompositeConfigList.config[USB_SYSTEM_KEYBOARD_INTERFACE_INDEX].classHandle;
     UsbCompositeDevice.mouseHandle = UsbDeviceCompositeConfigList.config[USB_MOUSE_INTERFACE_INDEX].classHandle;
+    UsbCompositeDevice.gamepadHandle = UsbDeviceCompositeConfigList.config[USB_GAMEPAD_INTERFACE_INDEX].classHandle;
 
     uint8_t usbDeviceKhciIrq[] = USB_IRQS;
     uint8_t irqNumber = usbDeviceKhciIrq[CONTROLLER_ID - kUSB_ControllerKhci0];

From 30cb6fb47b8894dd3975a9a26b2c90fdb5ce9026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Tu=C4=8Dek?= <kareltucek@centrum.cz>
Date: Fri, 7 Jul 2023 09:41:38 +0200
Subject: [PATCH 3/3] Implement basic gamepad interface support.

---
 doc-dev/reference-manual.md                   |  8 ++-
 lib/agent                                     |  2 +-
 right/src/config_parser/parse_keymap.h        | 19 ++++++
 right/src/key_action.h                        |  6 ++
 right/src/ledmap.c                            |  4 ++
 right/src/ledmap.h                            |  3 +-
 right/src/macro_set_command.c                 | 13 +++-
 right/src/macro_shortcut_parser.c             | 34 ++++++++++
 right/src/macro_shortcut_parser.h             |  3 +-
 right/src/macros.c                            | 62 +++++++++++++++++++
 right/src/macros.h                            |  8 +++
 right/src/module.h                            |  2 +
 right/src/mouse_controller.c                  | 31 ++++++++--
 right/src/mouse_controller.h                  |  3 +
 right/src/slave_drivers/uhk_module_driver.c   |  5 ++
 right/src/str_utils.c                         |  7 +++
 .../usb_interfaces/usb_interface_gamepad.c    | 18 +++++-
 .../usb_interfaces/usb_interface_gamepad.h    |  9 ++-
 right/src/usb_report_updater.c                | 28 ++++++---
 scripts/package.json                          |  2 +-
 shared/module/slave_protocol_handler.c        |  2 +
 shared/slave_protocol.h                       |  1 +
 trackball/src/module.c                        |  1 +
 trackpoint/src/module.c                       |  1 +
 24 files changed, 245 insertions(+), 27 deletions(-)

diff --git a/doc-dev/reference-manual.md b/doc-dev/reference-manual.md
index 6a72dfc41..4ebed3e0a 100644
--- a/doc-dev/reference-manual.md
+++ b/doc-dev/reference-manual.md
@@ -158,7 +158,7 @@ The following grammar is supported:
     LABEL = <string identifier>
     SHORTCUT = MODMASK- | MODMASK-KEY | KEY | MODMASK
     MODMASK = [MODMASK]+ | [L|R]{S|C|A|G} | {p|r|h|t} | {s|i|o}
-    NAVIGATIONMODE = cursor | scroll | caret | media | zoom | zoomPc | zoomMac | none
+    NAVIGATIONMODE = cursor | scroll | caret | media | zoom | zoomPc | zoomMac | none | gamepadStickLeft | gamepadStickRight
     NAVIGATIONMODECUSTOM = caret | media | zoomPc | zoomMac
     MODULEID = trackball | touchpad | trackpoint | keycluster
     KEY = CHAR|KEYABBREV
@@ -184,11 +184,14 @@ The following grammar is supported:
     KEYABBREV = f1 | f2 | f3 | f4 | f5 | f6 | f7 | f8 | f9 | f10 | f11 | f12 | f13 | f14 | f15 | f16 | f17 | f18 | f19 | f20 | f21 | f22 | f23 | f24
     KEYABBREV = mediaVolumeMute | mediaVolumeUp | mediaVolumeDown | mediaRecord | mediaFastForward | mediaRewind | mediaNext | mediaPrevious | mediaStop | mediaPlayPause | mediaPause
     KEYABBREV = systemPowerDown | systemSleep | systemWakeUp
-    KEYABBREV = mouseBtnLeft | mouseBtnRight | mouseBtnMiddle | mouseBtn4 | mouseBtn5 | mouseBtn6 | mouseBtn7 | mouseBtn8
+    KEYABBREV = mouse.btn1 | mouse.btn2 | mouse.btn3 | mouse.btn4 | mouse.btn5 | mouse.btn6 | mouse.btn7 | mouse.btn8 | mouse.btnLeft | mouse.btnMiddle | mouse.btnRight
+    KEYABBREV = gamepad.a | gamepad.b | gamepad.back | gamepad.dPadDown | gamepad.dPadLeft | gamepad.dPadRight | gamepad.dPadUp | gamepad.home
+    KEYABBREV = gamepad.leftBumper | gamepad.leftStick | gamepad.rightBumper | gamepad.rightStick | gamepad.start | gamepad.x | gamepad.y
     MACRONAME = <Case sensitive macro identifier as named in Agent. Identifier shall not contain spaces.>
     ############
     #DEPRECATED#
     ############
+    KEYABBREV = mouseBtnLeft | mouseBtnRight | mouseBtnMiddle | mouseBtn4 | mouseBtn5 | mouseBtn6 | mouseBtn7 | mouseBtn8
     COMMAND = set macroEngine.scheduler {blocking|preemptive}
     COMMAND = set doubletapDelay <time in ms, at most 65535, alias to doubletapTimeout (NUMBER)>
     COMMAND = switchLayer LAYERID
@@ -553,6 +556,7 @@ UHK modules feature four navigation modes, which are mapped by layer and module.
 - **Media mode** - in this mode, up/down directions control volume (via media key scancodes), while horizontal play/pause and switch to next track. At the moment, this mode is not enabled by default on any layer. Sensitivity is shared with the caret mode.
 - **Zoom mode pc / mac** - in this mode, `Ctrl +`/`Ctrl -` or `Gui +`/`Gui -` shortcuts are produced.
 - **Zoom mode** - This mode serves specifically to implement touchpad's gesture. It alternates actions of zoomPc and zoomMac modes. Can be customized via `set module.touchpad.pinchZoomMode NAVIGATIONMODE`.
+- **gamepadStickLeft / gamepadStickRight** - in this module, trackpoint acts as a gamepad thumbstick.
 
 Caret and media modes can be customized by `set navigationModeAction` command.
 
diff --git a/lib/agent b/lib/agent
index 0a17555a9..3ea954349 160000
--- a/lib/agent
+++ b/lib/agent
@@ -1 +1 @@
-Subproject commit 0a17555a929df6ca21fa637c02b9e0645bead14e
+Subproject commit 3ea9543492307d7c8de589e35a1feb890ad04aa3
diff --git a/right/src/config_parser/parse_keymap.h b/right/src/config_parser/parse_keymap.h
index 8137ad737..019e472b6 100644
--- a/right/src/config_parser/parse_keymap.h
+++ b/right/src/config_parser/parse_keymap.h
@@ -56,6 +56,25 @@
         SerializedMouseAction_Last = SerializedMouseAction_Button_8,
     } serialized_mouse_action_t;
 
+    typedef enum {
+        SerializedGamepadAction_A = 0,
+        SerializedGamepadAction_B = 1,
+        SerializedGamepadAction_X = 2,
+        SerializedGamepadAction_Y = 3,
+        SerializedGamepadAction_Left_Bumper = 4,
+        SerializedGamepadAction_Right_Bumper = 5,
+        SerializedGamepadAction_Back = 8,
+        SerializedGamepadAction_Start = 9,
+        SerializedGamepadAction_Left_Stick_Press = 10,
+        SerializedGamepadAction_Right_Stick_Press = 11,
+        SerializedGamepadAction_Dpad_Up = 12,
+        SerializedGamepadAction_Dpad_Down = 13,
+        SerializedGamepadAction_Dpad_Left = 14,
+        SerializedGamepadAction_Dpad_Right = 15,
+        SerializedGamepadAction_Home = 16,
+        SerializedGamepadAction_Last = SerializedGamepadAction_Home,
+    } serialized_gamepad_action_t;
+
     typedef enum {
         SerializedLayerName_mod,
         SerializedLayerName_fn,
diff --git a/right/src/key_action.h b/right/src/key_action.h
index 86d97edb7..594373776 100644
--- a/right/src/key_action.h
+++ b/right/src/key_action.h
@@ -19,6 +19,7 @@
         KeyActionType_SwitchLayer,
         KeyActionType_SwitchKeymap,
         KeyActionType_PlayMacro,
+        KeyActionType_Gamepad,
     } key_action_type_t;
 
     typedef enum {
@@ -50,6 +51,10 @@
         uint8_t blue;
     } rgb_t;
 
+    typedef struct {
+        uint8_t property;
+    } gamepad_action_t;
+
     typedef struct {
         uint8_t type;
         union {
@@ -60,6 +65,7 @@
                 uint16_t scancode;
             } ATTR_PACKED keystroke;
             serialized_mouse_action_t mouseAction;
+            serialized_gamepad_action_t gamepadPropertyId;
             struct {
                 switch_layer_mode_t mode;
                 uint8_t layer;
diff --git a/right/src/ledmap.c b/right/src/ledmap.c
index 6a83ee1bd..ff080282c 100644
--- a/right/src/ledmap.c
+++ b/right/src/ledmap.c
@@ -26,6 +26,7 @@ rgb_t KeyActionColors[keyActionColor_Length] = {
     RGB(0xFF, 0x00, 0x00), // KeyActionColor_SwitchKeymap
     RGB(0x00, 0xFF, 0x00), // KeyActionColor_Mouse
     RGB(0xFF, 0x00, 0xFF), // KeyActionColor_Macro
+    RGB(0x55, 0xFF, 0x00), // KeyActionColor_Gamepad
 };
 
 static rgb_t LedMap[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = {
@@ -193,6 +194,9 @@ static void updateLedsByFunctionalStrategy() {
                 case KeyActionType_Mouse:
                     keyActionColor = KeyActionColor_Mouse;
                     break;
+                case KeyActionType_Gamepad:
+                    keyActionColor = KeyActionColor_Gamepad;
+                    break;
                 case KeyActionType_SwitchKeymap:
                     keyActionColor = KeyActionColor_SwitchKeymap;
                     break;
diff --git a/right/src/ledmap.h b/right/src/ledmap.h
index 78eb74d8b..3f7644548 100644
--- a/right/src/ledmap.h
+++ b/right/src/ledmap.h
@@ -27,7 +27,8 @@
         KeyActionColor_SwitchKeymap,
         KeyActionColor_Mouse,
         KeyActionColor_Macro,
-        keyActionColor_Last = KeyActionColor_Macro,
+        KeyActionColor_Gamepad,
+        keyActionColor_Last = KeyActionColor_Gamepad,
         keyActionColor_Length = keyActionColor_Last + 1,
     } key_action_color_t;
 
diff --git a/right/src/macro_set_command.c b/right/src/macro_set_command.c
index 9f3a9c9a2..79898c416 100644
--- a/right/src/macro_set_command.c
+++ b/right/src/macro_set_command.c
@@ -2,6 +2,8 @@
 #include "layer.h"
 #include "ledmap.h"
 #include "macros.h"
+#include "module.h"
+#include "slave_protocol.h"
 #include "timer.h"
 #include "keymap.h"
 #include "key_matrix.h"
@@ -31,7 +33,7 @@ static const char* proceedByDot(const char* cmd, const char *cmdEnd)
     return cmd+1;
 }
 
-static void moduleNavigationMode(const char* arg1, const char *textEnd, module_configuration_t* module)
+static void moduleNavigationMode(const char* arg1, const char *textEnd, module_id_t moduleId, module_configuration_t* module)
 {
     layer_id_t layerId = Macros_ParseLayerId(arg1, textEnd);
     navigation_mode_t modeId = ParseNavigationModeId(NextTok(arg1, textEnd), textEnd);
@@ -41,6 +43,13 @@ static void moduleNavigationMode(const char* arg1, const char *textEnd, module_c
         return;
     }
 
+    bool isGamepadMode = modeId == NavigationMode_GamepadStickLeft || modeId == NavigationMode_GamepadStickRight;
+    bool isGamepadCompatible = moduleId == ModuleId_TrackpointRight;
+    if (isGamepadMode && !isGamepadCompatible) {
+        Macros_ReportError("This module is not compatible with gamepad stick output!", NULL, NULL);
+        return;
+    }
+
     if (Macros_ParserError) {
         return;
     }
@@ -112,7 +121,7 @@ static void module(const char* arg1, const char *textEnd)
 
     if (TokenMatches(arg2, textEnd, "navigationMode")) {
         const char* arg3 = proceedByDot(arg2, textEnd);
-        moduleNavigationMode(arg3, textEnd, module);
+        moduleNavigationMode(arg3, textEnd, moduleId, module);
     }
     else {
         moduleSpeed(arg2, textEnd, module, moduleId);
diff --git a/right/src/macro_shortcut_parser.c b/right/src/macro_shortcut_parser.c
index 91513af0e..020a80d33 100644
--- a/right/src/macro_shortcut_parser.c
+++ b/right/src/macro_shortcut_parser.c
@@ -176,6 +176,21 @@ const lookup_record_t lookup_table[] = {
         {"f8", HID_KEYBOARD_SC_F8, scType_basic},
         {"f9", HID_KEYBOARD_SC_F9, scType_basic},
         {"find", HID_KEYBOARD_SC_FIND, scType_basic},
+        {"gamepad.a", GAMEPAD_A, scType_gamepad},
+        {"gamepad.b", GAMEPAD_B, scType_gamepad},
+        {"gamepad.back", GAMEPAD_BACK, scType_gamepad},
+        {"gamepad.dPadDown", GAMEPAD_DPAD_DOWN, scType_gamepad},
+        {"gamepad.dPadLeft", GAMEPAD_DPAD_LEFT, scType_gamepad},
+        {"gamepad.dPadRight", GAMEPAD_DPAD_RIGHT, scType_gamepad},
+        {"gamepad.dPadUp", GAMEPAD_DPAD_UP, scType_gamepad},
+        {"gamepad.home", GAMEPAD_HOME, scType_gamepad},
+        {"gamepad.leftBumper", GAMEPAD_LEFT_BUMPER, scType_gamepad},
+        {"gamepad.leftStick", GAMEPAD_LEFT_STICK_PRESS, scType_gamepad},
+        {"gamepad.rightBumper", GAMEPAD_RIGHT_BUMPER, scType_gamepad},
+        {"gamepad.rightStick", GAMEPAD_RIGHT_STICK_PRESS, scType_gamepad},
+        {"gamepad.start", GAMEPAD_START, scType_gamepad},
+        {"gamepad.x", GAMEPAD_X, scType_gamepad},
+        {"gamepad.y", GAMEPAD_Y, scType_gamepad},
         {"graveAccentAndTilde", HID_KEYBOARD_SC_GRAVE_ACCENT_AND_TILDE, scType_basic},
         {"help", HID_KEYBOARD_SC_HELP, scType_basic},
         {"home", HID_KEYBOARD_SC_HOME, scType_basic},
@@ -281,6 +296,17 @@ const lookup_record_t lookup_table[] = {
         {"mediaVolumeUp", MEDIA_VOLUME_UP, scType_media},
         {"menu", HID_KEYBOARD_SC_MENU, scType_basic},
         {"minusAndUnderscore", HID_KEYBOARD_SC_MINUS_AND_UNDERSCORE, scType_basic},
+        {"mouse.btn1", MouseButton_Left, scType_mouseBtn},
+        {"mouse.btn2", MouseButton_Right, scType_mouseBtn},
+        {"mouse.btn3", MouseButton_Middle, scType_mouseBtn},
+        {"mouse.btn4", MouseButton_4, scType_mouseBtn},
+        {"mouse.btn5", MouseButton_5, scType_mouseBtn},
+        {"mouse.btn6", MouseButton_6, scType_mouseBtn},
+        {"mouse.btn7", MouseButton_7, scType_mouseBtn},
+        {"mouse.btn8", MouseButton_8, scType_mouseBtn},
+        {"mouse.btnLeft", MouseButton_Left, scType_mouseBtn},
+        {"mouse.btnMiddle", MouseButton_Middle, scType_mouseBtn},
+        {"mouse.btnRight", MouseButton_Right, scType_mouseBtn},
         {"mouseBtn1", MouseButton_Left, scType_mouseBtn},
         {"mouseBtn2", MouseButton_Right, scType_mouseBtn},
         {"mouseBtn3", MouseButton_Middle, scType_mouseBtn},
@@ -554,6 +580,10 @@ static bool parseAbbrev(const char* str, const char* strEnd, macro_action_t* out
                 outMacroAction->type = MacroActionType_MouseButton;
                 outMacroAction->mouseButton.mouseButtonsMask = record->scancode;
                 break;
+            case scType_gamepad:
+                outMacroAction->type = MacroActionType_GamepadButton;
+                outMacroAction->gamepadButton.propertyId = record->scancode;
+                break;
         }
     }
 
@@ -578,6 +608,10 @@ static bool parseAbbrev(const char* str, const char* strEnd, macro_action_t* out
                 outKeyAction->type = KeyActionType_Mouse;
                 outKeyAction->mouseAction = mouseBtnToSerializedMouseAction(record->scancode);
                 break;
+            case scType_gamepad:
+                outKeyAction->type = KeyActionType_Gamepad;
+                outKeyAction->gamepadPropertyId = record->scancode;
+                break;
         }
     }
     return true;
diff --git a/right/src/macro_shortcut_parser.h b/right/src/macro_shortcut_parser.h
index 8d71c7af1..ec1c17161 100644
--- a/right/src/macro_shortcut_parser.h
+++ b/right/src/macro_shortcut_parser.h
@@ -14,7 +14,8 @@
         scType_basic,
         scType_system,
         scType_media,
-        scType_mouseBtn
+        scType_mouseBtn,
+        scType_gamepad,
     } shortcut_type_t;
 
     typedef struct {
diff --git a/right/src/macros.c b/right/src/macros.c
index 81db9d91e..bcaf78ff6 100644
--- a/right/src/macros.c
+++ b/right/src/macros.c
@@ -420,6 +420,66 @@ static macro_result_t processMouseButtonAction(void)
     return processMouseButton(s->ms.currentMacroAction);
 }
 
+
+static macro_result_t processGamepadButton(macro_action_t macro_action)
+{
+    s->ms.reportsUsed = true;
+    uint8_t propertyId = macro_action.gamepadButton.propertyId;
+    macro_sub_action_t action = macro_action.mouseButton.action;
+
+    uint16_t propertyMask = UsbGamepad_GetPropertyMask(propertyId);
+
+    s->as.actionPhase++;
+
+    switch (macro_action.mouseButton.action) {
+        case MacroSubAction_Hold:
+        case MacroSubAction_Tap:
+            switch(s->as.actionPhase) {
+            case 1:
+                s->ms.macroGamepadReportButtonMask |= propertyMask;
+                return MacroResult_Blocking;
+            case 2:
+                if (currentMacroKeyIsActive() && action == MacroSubAction_Hold) {
+                    s->as.actionPhase--;
+                    return sleepTillKeystateChange();
+                }
+                s->ms.macroGamepadReportButtonMask &= ~propertyMask;
+                return MacroResult_Blocking;
+            case 3:
+                s->as.actionPhase = 0;
+                return MacroResult_Finished;
+
+            }
+            break;
+        case MacroSubAction_Release:
+            switch(s->as.actionPhase) {
+            case 1:
+                s->ms.macroGamepadReportButtonMask &= ~propertyMask;
+                return MacroResult_Blocking;
+            case 2:
+                s->as.actionPhase = 0;
+                return MacroResult_Finished;
+            }
+            break;
+        case MacroSubAction_Press:
+            switch(s->as.actionPhase) {
+            case 1:
+                s->ms.macroGamepadReportButtonMask |= propertyMask;
+                return MacroResult_Blocking;
+            case 2:
+                s->as.actionPhase = 0;
+                return MacroResult_Finished;
+            }
+            break;
+    }
+    return MacroResult_Finished;
+}
+
+static macro_result_t processGamepadButtonAction(void)
+{
+    return processGamepadButton(s->ms.currentMacroAction);
+}
+
 static macro_result_t processMoveMouseAction(void)
 {
     s->ms.reportsUsed = true;
@@ -2905,6 +2965,8 @@ static macro_result_t processCurrentMacroAction(void)
             return processKeyAction();
         case MacroActionType_MouseButton:
             return processMouseButtonAction();
+        case MacroActionType_GamepadButton:
+            return processGamepadButtonAction();
         case MacroActionType_MoveMouse:
             return processMoveMouseAction();
         case MacroActionType_ScrollMouse:
diff --git a/right/src/macros.h b/right/src/macros.h
index 600896b4f..71211cc53 100644
--- a/right/src/macros.h
+++ b/right/src/macros.h
@@ -5,9 +5,11 @@
 
     #include <stdint.h>
     #include <stdbool.h>
+    #include "attributes.h"
     #include "key_action.h"
     #include "usb_device_config.h"
     #include "key_states.h"
+    #include "usb_interfaces/usb_interface_gamepad.h"
 
 // Macros:
     #define MACRO_CYCLES_TO_POSTPONE 4
@@ -66,6 +68,7 @@
         MacroActionType_Delay,
         MacroActionType_Text,
         MacroActionType_Command,
+        MacroActionType_GamepadButton,
     } macro_action_type_t;
 
     typedef enum {
@@ -100,6 +103,10 @@
                 int16_t x;
                 int16_t y;
             } ATTR_PACKED moveMouse;
+            struct {
+                macro_sub_action_t action;
+                uint8_t propertyId;
+            } ATTR_PACKED gamepadButton;
             struct {
                 int16_t x;
                 int16_t y;
@@ -160,6 +167,7 @@
             macro_autorepeat_state_t autoRepeatPhase: 1;
 
             uint8_t inputModifierMask;
+            uint16_t macroGamepadReportButtonMask;
             usb_mouse_report_t macroMouseReport;
             usb_basic_keyboard_report_t macroBasicKeyboardReport;
             usb_media_keyboard_report_t macroMediaKeyboardReport;
diff --git a/right/src/module.h b/right/src/module.h
index db9dc9007..ccebe9a97 100644
--- a/right/src/module.h
+++ b/right/src/module.h
@@ -17,6 +17,8 @@
         /* fixed behaviour */
         NavigationMode_Cursor,
         NavigationMode_Scroll,
+        NavigationMode_GamepadStickLeft,
+        NavigationMode_GamepadStickRight,
         NavigationMode_Zoom,
         NavigationMode_None,
 
diff --git a/right/src/mouse_controller.c b/right/src/mouse_controller.c
index e26e76969..bcc76fa0d 100644
--- a/right/src/mouse_controller.c
+++ b/right/src/mouse_controller.c
@@ -2,6 +2,8 @@
 #include "key_action.h"
 #include "led_display.h"
 #include "layer.h"
+#include "module.h"
+#include "usb_interfaces/usb_interface_gamepad.h"
 #include "usb_interfaces/usb_interface_mouse.h"
 #include "peripherals/test_led.h"
 #include "slave_drivers/is31fl3xxx_driver.h"
@@ -611,6 +613,7 @@ static void processAxisLocking(
 static void processModuleKineticState(
         float x,
         float y,
+        uint8_t scanCount,
         module_configuration_t* moduleConfiguration,
         module_kinetic_state_t* ks,
         uint8_t forcedNavigationMode
@@ -661,6 +664,21 @@ static void processModuleKineticState(
             }
             break;
         }
+        case NavigationMode_GamepadStickLeft:
+        case NavigationMode_GamepadStickRight: {
+            if (scanCount > 0) {
+                ks->lastX = x / scanCount;
+                ks->lastY = y / scanCount;
+            }
+            if (ks->currentNavigationMode == NavigationMode_GamepadStickLeft) {
+                ActiveUsbGamepadReport->X360.lX = COERCE(ks->lastX, -32, 32)*1024;
+                ActiveUsbGamepadReport->X360.lY = -COERCE(ks->lastY, -32, 32)*1024;
+            } else {
+                ActiveUsbGamepadReport->X360.rX += COERCE(ks->lastX, -32, 32)*1024;
+                ActiveUsbGamepadReport->X360.rY += -COERCE(ks->lastY, -32, 32)*1024;
+            }
+            break;
+        }
         case NavigationMode_Zoom:
         case NavigationMode_ZoomPc:
         case NavigationMode_ZoomMac:
@@ -706,6 +724,7 @@ static void processModuleActions(
         uint8_t moduleId,
         float x,
         float y,
+        uint8_t scanCount,
         uint8_t forcedNavigationMode
 ) {
     module_configuration_t *moduleConfiguration = GetModuleConfiguration(moduleId);
@@ -749,7 +768,7 @@ static void processModuleActions(
     //we want to process kinetic state even if x == 0 && y == 0, at least as
     //long as caretAxis != CaretAxis_None because of fake key states that may
     //be active.
-    processModuleKineticState(x, y, moduleConfiguration, ks, forcedNavigationMode);
+    processModuleKineticState(x, y, scanCount, moduleConfiguration, ks, forcedNavigationMode);
 }
 
 void MouseController_ProcessMouseActions()
@@ -779,9 +798,9 @@ void MouseController_ProcessMouseActions()
             handleRunningCaretModeAction(ks);
         }
 
-        processModuleActions(ks, ModuleId_TouchpadRight, (int16_t)TouchpadEvents.x, (int16_t)TouchpadEvents.y, 0xFF);
-        processModuleActions(ks, ModuleId_TouchpadRight, (int16_t)TouchpadEvents.wheelX, (int16_t)TouchpadEvents.wheelY, NavigationMode_Scroll);
-        processModuleActions(ks, ModuleId_TouchpadRight, 0, (int16_t)TouchpadEvents.zoomLevel, NavigationMode_Zoom);
+        processModuleActions(ks, ModuleId_TouchpadRight, (int16_t)TouchpadEvents.x, (int16_t)TouchpadEvents.y, 1, 0xFF);
+        processModuleActions(ks, ModuleId_TouchpadRight, (int16_t)TouchpadEvents.wheelX, (int16_t)TouchpadEvents.wheelY, 1, NavigationMode_Scroll);
+        processModuleActions(ks, ModuleId_TouchpadRight, 0, (int16_t)TouchpadEvents.zoomLevel, 1, NavigationMode_Zoom);
         TouchpadEvents.zoomLevel = 0;
         TouchpadEvents.wheelX = 0;
         TouchpadEvents.wheelY = 0;
@@ -801,8 +820,10 @@ void MouseController_ProcessMouseActions()
         // sequence atomic.
         int16_t x = moduleState->pointerDelta.x;
         int16_t y = moduleState->pointerDelta.y;
+        uint8_t scanCount = moduleState->pointerDelta.scanCount;
         moduleState->pointerDelta.x = 0;
         moduleState->pointerDelta.y = 0;
+        moduleState->pointerDelta.scanCount = 0;
         __enable_irq();
 
         module_kinetic_state_t *ks = getKineticState(moduleState->moduleId);
@@ -811,7 +832,7 @@ void MouseController_ProcessMouseActions()
             handleRunningCaretModeAction(ks);
         }
 
-        processModuleActions(ks, moduleState->moduleId, x, y, 0xFF);
+        processModuleActions(ks, moduleState->moduleId, x, y, scanCount, 0xFF);
     }
 
     if (ActiveMouseStates[SerializedMouseAction_LeftClick]) {
diff --git a/right/src/mouse_controller.h b/right/src/mouse_controller.h
index ed7eebc5a..7c2a30fcf 100644
--- a/right/src/mouse_controller.h
+++ b/right/src/mouse_controller.h
@@ -10,6 +10,7 @@
 
     #define ACTIVE_MOUSE_STATES_COUNT (SerializedMouseAction_Last + 1)
     #define ABS(A) ((A) < 0 ? (-A) : (A))
+    #define COERCE(V, MIN, MAX) ((V) < (MIN) ? (MIN) : ((V) > (MAX) ? (MAX) : (V)))
 
 // Typedefs:
 
@@ -49,6 +50,8 @@
         key_state_t caretFakeKeystate;
         float xFractionRemainder;
         float yFractionRemainder;
+        float lastX;
+        float lastY;
         uint32_t lastUpdate;
 
         uint8_t caretAxis;
diff --git a/right/src/slave_drivers/uhk_module_driver.c b/right/src/slave_drivers/uhk_module_driver.c
index 88f02d59d..5bd2fdd18 100644
--- a/right/src/slave_drivers/uhk_module_driver.c
+++ b/right/src/slave_drivers/uhk_module_driver.c
@@ -334,6 +334,11 @@ slave_result_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId)
                     pointer_delta_t *pointerDelta = (pointer_delta_t*)(rxMessage->data + keyStatesLength);
                     uhkModuleState->pointerDelta.x += pointerDelta->x;
                     uhkModuleState->pointerDelta.y += pointerDelta->y;
+                    if (VERSION_AT_LEAST(uhkModuleState->moduleProtocolVersion, 4, 3, 0)) {
+                        uhkModuleState->pointerDelta.scanCount += pointerDelta->scanCount;
+                    } else {
+                        uhkModuleState->pointerDelta.scanCount = 1;
+                    }
                 }
             }
             res.status = kStatus_Uhk_IdleCycle;
diff --git a/right/src/str_utils.c b/right/src/str_utils.c
index 941b98b93..4b8bb1159 100644
--- a/right/src/str_utils.c
+++ b/right/src/str_utils.c
@@ -1,6 +1,7 @@
 #include "str_utils.h"
 #include "config_parser/parse_keymap.h"
 #include "macros.h"
+#include "module.h"
 #include "slave_protocol.h"
 
 float ParseFloat(const char *a, const char *aEnd)
@@ -242,6 +243,12 @@ navigation_mode_t ParseNavigationModeId(const char* arg1, const char* cmdEnd)
     else if (TokenMatches(arg1, cmdEnd, "zoomMac")) {
         return NavigationMode_ZoomMac;
     }
+    else if (TokenMatches(arg1, cmdEnd, "gamepadStickLeft")) {
+        return NavigationMode_GamepadStickLeft;
+    }
+    else if (TokenMatches(arg1, cmdEnd, "gamepadStickRight")) {
+        return NavigationMode_GamepadStickRight;
+    }
     else if (TokenMatches(arg1, cmdEnd, "none")) {
         return NavigationMode_None;
     }
diff --git a/right/src/usb_interfaces/usb_interface_gamepad.c b/right/src/usb_interfaces/usb_interface_gamepad.c
index 95c50d22b..e4b2859fa 100644
--- a/right/src/usb_interfaces/usb_interface_gamepad.c
+++ b/right/src/usb_interfaces/usb_interface_gamepad.c
@@ -1,4 +1,5 @@
 #include "usb_composite_device.h"
+#include "usb_interfaces/usb_interface_gamepad.h"
 #include "usb_report_updater.h"
 
 /* key: usb_gamepad_property_t, value: shift for button in X360 buttons field */
@@ -55,12 +56,22 @@ usb_status_t UsbGamepadCheckIdleElapsed()
 
 usb_status_t UsbGamepadCheckReportReady()
 {
-    if (memcmp(ActiveUsbGamepadReport, GetInactiveUsbGamepadReport(), sizeof(usb_gamepad_report_t)) != 0)
+    if (memcmp(ActiveUsbGamepadReport, GetInactiveUsbGamepadReport(), sizeof(usb_gamepad_report_t)) != 0
+            || ActiveUsbGamepadReport->X360.lX
+            || ActiveUsbGamepadReport->X360.lY
+            || ActiveUsbGamepadReport->X360.rX
+            || ActiveUsbGamepadReport->X360.rY
+            )
         return kStatus_USB_Success;
 
     return UsbGamepadCheckIdleElapsed();
 }
 
+uint16_t UsbGamepad_GetPropertyMask(usb_gamepad_property_t key)
+{
+    return 1 << x360padButtonMap[key];
+}
+
 void UsbGamepadSetProperty(usb_gamepad_report_t* report, usb_gamepad_property_t key, int value)
 {
     if ((key <= _GAMEPAD_BUTTONS_END) /* && (key >= _GAMEPAD_BUTTONS_BEGIN)*/) {
@@ -119,3 +130,8 @@ usb_status_t UsbGamepadCallback(class_handle_t handle, uint32_t event, void *par
 
     return error;
 }
+
+void UsbGamepad_MergeReports(const usb_gamepad_report_t* sourceReport, usb_gamepad_report_t* targetReport)
+{
+    targetReport->X360.buttons |= sourceReport->X360.buttons;
+}
diff --git a/right/src/usb_interfaces/usb_interface_gamepad.h b/right/src/usb_interfaces/usb_interface_gamepad.h
index c57462980..b6c9cb962 100644
--- a/right/src/usb_interfaces/usb_interface_gamepad.h
+++ b/right/src/usb_interfaces/usb_interface_gamepad.h
@@ -48,7 +48,7 @@
         GAMEPAD_LEFT_STICK_Y = 33,
         GAMEPAD_RIGHT_STICK_X = 34,
         GAMEPAD_RIGHT_STICK_Y = 35,
-    }usb_gamepad_property_t;
+    } usb_gamepad_property_t;
 
     typedef PACKED(union) {
         PACKED(struct) {
@@ -84,8 +84,8 @@
 #if (USB_GAMEPAD_REPORT_IN_PADDING > 0)
             uint8_t reserved[USB_GAMEPAD_REPORT_IN_PADDING];
 #endif
-        }X360;
-    }usb_gamepad_report_t;
+        } X360;
+    } usb_gamepad_report_t;
 
 // Variables:
 
@@ -101,6 +101,9 @@
     usb_status_t UsbGamepadCheckIdleElapsed();
     usb_status_t UsbGamepadCheckReportReady();
 
+    uint16_t UsbGamepad_GetPropertyMask(usb_gamepad_property_t key);
+
     void UsbGamepadSetProperty(usb_gamepad_report_t* report, usb_gamepad_property_t key, int value);
+    void UsbGamepad_MergeReports(const usb_gamepad_report_t* sourceReport, usb_gamepad_report_t* targetReport);
 
 #endif
diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c
index 8f3e0a637..e8e47cf62 100644
--- a/right/src/usb_report_updater.c
+++ b/right/src/usb_report_updater.c
@@ -2,6 +2,7 @@
 #include "key_action.h"
 #include "led_display.h"
 #include "layer.h"
+#include "usb_interfaces/usb_interface_gamepad.h"
 #include "usb_interfaces/usb_interface_mouse.h"
 #include "keymap.h"
 #include "peripherals/test_led.h"
@@ -270,6 +271,9 @@ void ApplyKeyAction(key_state_t *keyState, key_action_cached_t *cachedAction, ke
             }
             ActiveMouseStates[action->mouseAction]++;
             break;
+        case KeyActionType_Gamepad:
+            UsbGamepadSetProperty(ActiveUsbGamepadReport, (usb_gamepad_property_t)action->gamepadPropertyId, 1);
+            break;
         case KeyActionType_SwitchLayer:
             if (keyState->current != keyState->previous) {
                 applyToggleLayerAction(keyState, action);
@@ -293,15 +297,6 @@ void ApplyKeyAction(key_state_t *keyState, key_action_cached_t *cachedAction, ke
     }
 }
 
-static void clearActiveReports(void)
-{
-    memset(ActiveUsbMouseReport, 0, sizeof *ActiveUsbMouseReport);
-    memset(ActiveUsbBasicKeyboardReport, 0, sizeof *ActiveUsbBasicKeyboardReport);
-    memset(ActiveUsbMediaKeyboardReport, 0, sizeof *ActiveUsbMediaKeyboardReport);
-    memset(ActiveUsbSystemKeyboardReport, 0, sizeof *ActiveUsbSystemKeyboardReport);
-}
-
-
 static void mergeReports(void)
 {
     for(uint8_t j = 0; j < MACRO_STATE_POOL_SIZE; j++) {
@@ -321,6 +316,8 @@ static void mergeReports(void)
             ActiveUsbMouseReport->y += s->ms.macroMouseReport.y;
             ActiveUsbMouseReport->wheelX += s->ms.macroMouseReport.wheelX;
             ActiveUsbMouseReport->wheelY += s->ms.macroMouseReport.wheelY;
+
+            ActiveUsbGamepadReport->X360.buttons |= s->ms.macroGamepadReportButtonMask;
         }
     }
 }
@@ -392,7 +389,6 @@ static void handleLayerChanges() {
 
 static void updateActiveUsbReports(void)
 {
-    clearActiveReports();
     InputModifiersPrevious = InputModifiers;
     InputModifiers = 0;
     OutputModifiers = 0;
@@ -512,6 +508,7 @@ static void updateLedSleepModeState(uint32_t lastActivityTime) {
     }
 }
 
+
 void UpdateUsbReports(void)
 {
     static uint32_t lastUpdateTime;
@@ -586,6 +583,17 @@ void UpdateUsbReports(void)
         lastActivityTime = CurrentTime;
     }
 
+
+    if (UsbGamepadCheckReportReady() == kStatus_USB_Success) {
+        WATCH_CALL_COUNT(2);
+        UsbReportUpdateSemaphore |= 1 << USB_GAMEPAD_INTERFACE_INDEX;
+        usb_status_t status = UsbGamepadAction();
+        if (status != kStatus_USB_Success) {
+            UsbReportUpdateSemaphore &= ~(1 << USB_MOUSE_INTERFACE_INDEX);
+        }
+        lastActivityTime = CurrentTime;
+    }
+
     if (UsbMouseCheckReportReady() == kStatus_USB_Success) {
         UsbReportUpdateSemaphore |= 1 << USB_MOUSE_INTERFACE_INDEX;
         usb_status_t status = UsbMouseAction();
diff --git a/scripts/package.json b/scripts/package.json
index 8237c88af..2325d411d 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -18,7 +18,7 @@
   },
   "firmwareVersion": "9.3.0",
   "deviceProtocolVersion": "4.9.0",
-  "moduleProtocolVersion": "4.2.0",
+  "moduleProtocolVersion": "4.3.0",
   "userConfigVersion": "5.1.0",
   "hardwareConfigVersion": "1.0.0",
   "smartMacrosVersion": "1.2.0",
diff --git a/shared/module/slave_protocol_handler.c b/shared/module/slave_protocol_handler.c
index fed84da22..7535caa6f 100644
--- a/shared/module/slave_protocol_handler.c
+++ b/shared/module/slave_protocol_handler.c
@@ -128,8 +128,10 @@ void SlaveTxHandler(void)
                 // (This handler can be interrupted by sensor interrupts.)
                 pointerDelta->x = PointerDelta.x;
                 pointerDelta->y = PointerDelta.y;
+                pointerDelta->scanCount = PointerDelta.scanCount;
                 PointerDelta.x = 0;
                 PointerDelta.y = 0;
+                PointerDelta.scanCount = 0;
                 __enable_irq();
                 messageLength += sizeof(pointer_delta_t);
             }
diff --git a/shared/slave_protocol.h b/shared/slave_protocol.h
index 43622d0a6..5199fe0d9 100644
--- a/shared/slave_protocol.h
+++ b/shared/slave_protocol.h
@@ -66,6 +66,7 @@
     typedef struct {
         int16_t x;
         int16_t y;
+        uint8_t scanCount;
     } ATTR_PACKED pointer_delta_t;
 
 // Variables:
diff --git a/trackball/src/module.c b/trackball/src/module.c
index f7c8f055a..62fcc97ab 100644
--- a/trackball/src/module.c
+++ b/trackball/src/module.c
@@ -116,6 +116,7 @@ void trackballUpdate(SPI_Type *base, spi_master_handle_t *masterHandle, status_t
             PointerDelta.y += deltaX; // This is correct given the sensor orientation.
             tx(txBufferGetMotion);
             modulePhase = ModulePhase_ProcessMotion;
+            PointerDelta.scanCount++;
             break;
     }
 }
diff --git a/trackpoint/src/module.c b/trackpoint/src/module.c
index 58f3f6d39..831b6e5fa 100644
--- a/trackpoint/src/module.c
+++ b/trackpoint/src/module.c
@@ -258,6 +258,7 @@ void PS2_CLOCK_IRQ_HANDLER(void) {
                 if ( errno == 0 ) {
                     PointerDelta.x -= deltaX;
                     PointerDelta.y -= deltaY;
+                    PointerDelta.scanCount++;
                     lastX = deltaX;
                     lastY = deltaY;
                 } else {