Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature] Swap buttons on PS2 Mouse/Trackball #9205

Merged
merged 13 commits into from
Aug 5, 2021
Merged

[Feature] Swap buttons on PS2 Mouse/Trackball #9205

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7600c04
[Feature Request] Swap buttons on PS2 Mouse/Trackball
May 26, 2020
de9d50a
[Feature Request] Swap buttons on PS2 Mouse/Trackball
May 26, 2020
beff95a
Added id: to the doc
May 26, 2020
2fa53fd
Missing space
May 26, 2020
351b635
Solve comment
May 27, 2020
7811e9f
Solve comments https://github.com/qmk/qmk_firmware/pull/9205#discussi…
May 27, 2020
3999300
Format code more according to https://docs.qmk.fm/#/coding_conventions_c
May 28, 2020
222cc2f
change logic to LUT
May 28, 2020
d0ed90a
WIP: Clean up
May 29, 2020
94c625e
WIP: Solution with xor operators to mask the change
May 29, 2020
b649448
delete #endif & added the missed xor operator (ahhh)
May 29, 2020
0351a32
Variable (mouse_report->buttons): avoid setting twice https://github.…
May 30, 2020
c4e7a81
Update tmk_core/protocol/ps2_mouse.c
jkutianski Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions docs/feature_ps2_mouse.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,16 @@ Fine control over the scrolling is supported with the following defines:
#define PS2_MOUSE_SCROLL_DIVISOR_V 2
```

### Invert Mouse buttons :id=invert-buttons

To invert the left & right buttons you can put:

```c
#define PS2_MOUSE_INVERT_BUTTONS
```

into config.h.

### Invert Mouse and Scroll Axes :id=invert-mouse-and-scroll-axes

To invert the X and Y axes you can put:
Expand Down
5 changes: 5 additions & 0 deletions tmk_core/protocol/ps2_mouse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,13 @@ static inline void ps2_mouse_convert_report_to_hid(report_mouse_t *mouse_report)
mouse_report->x = X_IS_NEG ? ((!X_IS_OVF && -127 <= mouse_report->x && mouse_report->x <= -1) ? mouse_report->x : -127) : ((!X_IS_OVF && 0 <= mouse_report->x && mouse_report->x <= 127) ? mouse_report->x : 127);
mouse_report->y = Y_IS_NEG ? ((!Y_IS_OVF && -127 <= mouse_report->y && mouse_report->y <= -1) ? mouse_report->y : -127) : ((!Y_IS_OVF && 0 <= mouse_report->y && mouse_report->y <= 127) ? mouse_report->y : 127);

#ifdef PS2_MOUSE_INVERT_BUTTONS
// remove sign and overflow flags and apply buttons LUT
mouse_report->buttons = btns_lut[mouse_report->buttons & PS2_MOUSE_BTN_MASK];
#else
// remove sign and overflow flags
mouse_report->buttons &= PS2_MOUSE_BTN_MASK;
#endif

#ifdef PS2_MOUSE_INVERT_X
mouse_report->x = -mouse_report->x;
Expand Down
26 changes: 18 additions & 8 deletions tmk_core/protocol/ps2_mouse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,24 @@ __attribute__((unused)) static enum ps2_mouse_mode_e {
* 1|[ X movement(0-255) ]
* 2|[ Y movement(0-255) ]
*/
#define PS2_MOUSE_BTN_MASK 0x07
#define PS2_MOUSE_BTN_LEFT 0
#define PS2_MOUSE_BTN_RIGHT 1
#define PS2_MOUSE_BTN_MIDDLE 2
#define PS2_MOUSE_X_SIGN 4
#define PS2_MOUSE_Y_SIGN 5
#define PS2_MOUSE_X_OVFLW 6
#define PS2_MOUSE_Y_OVFLW 7
#define PS2_MOUSE_BTN_MASK 0x07 // 0b0000111
#define PS2_MOUSE_BTN_LEFT 0 // 0b0000001
#define PS2_MOUSE_BTN_RIGHT 1 // 0b0000010
#define PS2_MOUSE_BTN_MIDDLE 2 // 0b0000100
#define PS2_MOUSE_X_SIGN 4 // 0b0001000
#define PS2_MOUSE_Y_SIGN 5 // 0b0010000
#define PS2_MOUSE_X_OVFLW 6 // 0b0100000
#define PS2_MOUSE_Y_OVFLW 7 // 0b1000000
jkutianski marked this conversation as resolved.
Show resolved Hide resolved

#ifdef PS2_MOUSE_INVERT_BUTTONS
/*
* LUT for change mouse buttons
*
* table index is the mouse_report->buttons state from PS2 (after &= PS2_MOUSE_BTN_MASK)
* the value replace the mouse_report->buttons before to send to the USB interface
*/
static const __attribute__((unused)) uint8_t btns_lut[8] = {0b000, 0b010, 0b001, 0b011, 0b100, 0b101, 0b110, 0b111};
#endif
drashna marked this conversation as resolved.
Show resolved Hide resolved

/* mouse button to start scrolling; set 0 to disable scroll */
#ifndef PS2_MOUSE_SCROLL_BTN_MASK
Expand Down