From 161f357f6b2ffecbb948e23ae6b802e3fa496d39 Mon Sep 17 00:00:00 2001 From: Teemu Erkkola Date: Sun, 10 Jan 2021 13:58:19 +0200 Subject: [PATCH 1/2] Swap left/right nub click handling to match received events --- pyrainput.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyrainput.cpp b/pyrainput.cpp index fafcf49..8ec43d9 100644 --- a/pyrainput.cpp +++ b/pyrainput.cpp @@ -348,18 +348,18 @@ void handle(input_event const& e, unsigned int role) { break; case EV_KEY: switch(e.code) { - case BTN_LEFT: // mouse click + case BTN_LEFT: // Right nub click if (role == ROLE_GPIO && global.settings.exportMouse) { - handleNubClick(global.settings.leftNubClickMode, e.value, global.mouse, global.gamepad, global.settings); + handleNubClick(global.settings.rightNubClickMode, e.value, global.mouse, global.gamepad, global.settings); if (global.settings.exportGamepad) { global.gamepad->send(EV_KEY, BTN_THUMBL, e.value); global.gamepad->send(EV_SYN, 0, 0); } } break; - case BTN_RIGHT: + case BTN_RIGHT: // Left nub click if (role == ROLE_GPIO && global.settings.exportMouse) { - handleNubClick(global.settings.rightNubClickMode, e.value, global.mouse, global.gamepad, global.settings); + handleNubClick(global.settings.leftNubClickMode, e.value, global.mouse, global.gamepad, global.settings); if (global.settings.exportGamepad) { global.gamepad->send(EV_KEY, BTN_THUMBR, e.value); global.gamepad->send(EV_SYN, 0, 0); -- GitLab From 32af8af2a553b1ce608158a9594962729c7c38f1 Mon Sep 17 00:00:00 2001 From: Teemu Erkkola Date: Sun, 10 Jan 2021 14:00:46 +0200 Subject: [PATCH 2/2] Fix gamepad nub events --- pyrainput.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyrainput.cpp b/pyrainput.cpp index 8ec43d9..cc2f578 100644 --- a/pyrainput.cpp +++ b/pyrainput.cpp @@ -352,7 +352,7 @@ void handle(input_event const& e, unsigned int role) { if (role == ROLE_GPIO && global.settings.exportMouse) { handleNubClick(global.settings.rightNubClickMode, e.value, global.mouse, global.gamepad, global.settings); if (global.settings.exportGamepad) { - global.gamepad->send(EV_KEY, BTN_THUMBL, e.value); + global.gamepad->send(EV_KEY, BTN_THUMBR, e.value); global.gamepad->send(EV_SYN, 0, 0); } } @@ -361,7 +361,7 @@ void handle(input_event const& e, unsigned int role) { if (role == ROLE_GPIO && global.settings.exportMouse) { handleNubClick(global.settings.leftNubClickMode, e.value, global.mouse, global.gamepad, global.settings); if (global.settings.exportGamepad) { - global.gamepad->send(EV_KEY, BTN_THUMBR, e.value); + global.gamepad->send(EV_KEY, BTN_THUMBL, e.value); global.gamepad->send(EV_SYN, 0, 0); } } -- GitLab