megamanmalte/qmk_firmware
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Constrain Cirque Pinnacle coordinates (#17803)

Browse source 
Static x & y should be the same type as touchData.xValue &
touchData.yValue: uint16_t.
Their delta could be larger than int8_t and should be constrained to
mouse_xy_report_t.
This commit is contained in:
Daniel Kao 2022-07-26 11:35:41 -07:00 committed by GitHub
parent c982d6c5e3
commit b8b2e99976
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
quantum/pointing_device/pointing_device_drivers.c
View file

@ -117,11 +117,11 @@ void cirque_pinnacle_configure_cursor_glide(float trigger_px) {
# endif # endif
report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) { report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
pinnacle_data_t touchData = cirque_pinnacle_read_data(); pinnacle_data_t touchData = cirque_pinnacle_read_data();
mouse_xy_report_t report_x = 0, report_y = 0; mouse_xy_report_t report_x = 0, report_y = 0;
static mouse_xy_report_t x = 0, y = 0; static uint16_t x = 0, y = 0;
# ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE # ifdef POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
cursor_glide_t glide_report = {0}; cursor_glide_t glide_report = {0};
if (cursor_glide_enable) { if (cursor_glide_enable) {
glide_report = cursor_glide_check(&glide); glide_report = cursor_glide_check(&glide);
@ -154,8 +154,8 @@ report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
if (!cirque_pinnacle_gestures(&mouse_report, touchData)) { if (!cirque_pinnacle_gestures(&mouse_report, touchData)) {
if (x && y && touchData.xValue && touchData.yValue) { if (x && y && touchData.xValue && touchData.yValue) {
report_x = (mouse_xy_report_t)(touchData.xValue - x); report_x = CONSTRAIN_HID_XY((int16_t)(touchData.xValue - x));
report_y = (mouse_xy_report_t)(touchData.yValue - y); report_y = CONSTRAIN_HID_XY((int16_t)(touchData.yValue - y));
} }
x = touchData.xValue; x = touchData.xValue;
y = touchData.yValue; y = touchData.yValue;