summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-11-13 16:07:40 +0000
committerQMK Bot <hello@qmk.fm>2022-11-13 16:07:40 +0000
commit83477bfa0fa953007c12a597c7072d4faf6ecc53 (patch)
tree46690d637bd4c012d29d14122fbfcba2f738aacf
parentd3073ef4943c70a3942ac91bb46fdc1a90f9e566 (diff)
parent133fe1c013d712522fc8ae159567629ef7760ed6 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--drivers/ps2/ps2_mouse.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ps2/ps2_mouse.c b/drivers/ps2/ps2_mouse.c
index 66b48bb3c3..b32ad1e222 100644
--- a/drivers/ps2/ps2_mouse.c
+++ b/drivers/ps2/ps2_mouse.c
@@ -80,7 +80,7 @@ void ps2_mouse_task(void) {
uint8_t rcv;
rcv = ps2_host_send(PS2_MOUSE_READ_DATA);
if (rcv == PS2_ACK) {
- mouse_report.buttons = ps2_host_recv_response() | tp_buttons;
+ mouse_report.buttons = ps2_host_recv_response();
mouse_report.x = ps2_host_recv_response() * PS2_MOUSE_X_MULTIPLIER;
mouse_report.y = ps2_host_recv_response() * PS2_MOUSE_Y_MULTIPLIER;
# ifdef PS2_MOUSE_ENABLE_SCROLLING
@@ -88,11 +88,10 @@ void ps2_mouse_task(void) {
# endif
} else {
if (debug_mouse) print("ps2_mouse: fail to get mouse packet\n");
- return;
}
#else
if (pbuf_has_data()) {
- mouse_report.buttons = ps2_host_recv_response() | tp_buttons;
+ mouse_report.buttons = ps2_host_recv_response();
mouse_report.x = ps2_host_recv_response() * PS2_MOUSE_X_MULTIPLIER;
mouse_report.y = ps2_host_recv_response() * PS2_MOUSE_Y_MULTIPLIER;
# ifdef PS2_MOUSE_ENABLE_SCROLLING
@@ -100,10 +99,10 @@ void ps2_mouse_task(void) {
# endif
} else {
if (debug_mouse) print("ps2_mouse: fail to get mouse packet\n");
- return;
}
#endif
+ mouse_report.buttons |= tp_buttons;
/* if mouse moves or buttons state changes */
if (mouse_report.x || mouse_report.y || mouse_report.v || ((mouse_report.buttons ^ buttons_prev) & PS2_MOUSE_BTN_MASK)) {
#ifdef PS2_MOUSE_DEBUG_RAW