mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-03-04 10:48:52 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
5a26e551c6
@ -251,6 +251,7 @@ __attribute__((weak)) bool pointing_device_task(void) {
|
|||||||
# else
|
# else
|
||||||
if (readPin(POINTING_DEVICE_MOTION_PIN))
|
if (readPin(POINTING_DEVICE_MOTION_PIN))
|
||||||
# endif
|
# endif
|
||||||
|
{
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(SPLIT_POINTING_ENABLE)
|
#if defined(SPLIT_POINTING_ENABLE)
|
||||||
@ -268,6 +269,10 @@ __attribute__((weak)) bool pointing_device_task(void) {
|
|||||||
local_mouse_report = pointing_device_driver.get_report(local_mouse_report);
|
local_mouse_report = pointing_device_driver.get_report(local_mouse_report);
|
||||||
#endif // defined(SPLIT_POINTING_ENABLE)
|
#endif // defined(SPLIT_POINTING_ENABLE)
|
||||||
|
|
||||||
|
#ifdef POINTING_DEVICE_MOTION_PIN
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// allow kb to intercept and modify report
|
// allow kb to intercept and modify report
|
||||||
#if defined(SPLIT_POINTING_ENABLE) && defined(POINTING_DEVICE_COMBINED)
|
#if defined(SPLIT_POINTING_ENABLE) && defined(POINTING_DEVICE_COMBINED)
|
||||||
if (is_keyboard_left()) {
|
if (is_keyboard_left()) {
|
||||||
|
Loading…
Reference in New Issue
Block a user