gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-06-06 08:22:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[chore]: move and rename mouse/scroll min/max defines (#25141)

Browse Source 
* protocol: move {XY/HV}_REPORT_{MIN,MAX} into report.h

..to allow easier re-use in other code implementations.

* protocol: rename {XY/HV}_REPORT_{MIN/MAX} to MOUSE_REPORT_{XY/HV}_{MIN/MAX}

..to avoid naming collisions.
This commit is contained in:
Stefan Kerkmann 2025-04-13 18:36:13 +02:00 committed by GitHub
parent d0611b0468
commit a7bf8e64a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/sensors/pimoroni_trackball.c
View File

@ -101,12 +101,12 @@ int16_t pimoroni_trackball_get_offsets(uint8_t negative_dir, uint8_t positive_di
} }
mouse_xy_report_t pimoroni_trackball_adapt_values(xy_clamp_range_t *offset) { mouse_xy_report_t pimoroni_trackball_adapt_values(xy_clamp_range_t *offset) {
if (*offset > XY_REPORT_MAX) { if (*offset > MOUSE_REPORT_XY_MAX) {
*offset -= XY_REPORT_MAX; *offset -= MOUSE_REPORT_XY_MAX;
return (mouse_xy_report_t)XY_REPORT_MAX; return (mouse_xy_report_t)MOUSE_REPORT_XY_MAX;
} else if (*offset < XY_REPORT_MIN) { } else if (*offset < MOUSE_REPORT_XY_MIN) {
*offset += XY_REPORT_MAX; *offset += MOUSE_REPORT_XY_MAX;
return (mouse_xy_report_t)XY_REPORT_MIN; return (mouse_xy_report_t)MOUSE_REPORT_XY_MIN;
} else { } else {
mouse_xy_report_t temp_return = *offset; mouse_xy_report_t temp_return = *offset;
*offset = 0; *offset = 0;

16
quantum/pointing_device/pointing_device.c
View File

@ -404,10 +404,10 @@ void pointing_device_set_cpi_on_side(bool left, uint16_t cpi) {
* @return mouse_hv_report_t clamped value * @return mouse_hv_report_t clamped value
*/ */
static inline mouse_hv_report_t pointing_device_hv_clamp(hv_clamp_range_t value) { static inline mouse_hv_report_t pointing_device_hv_clamp(hv_clamp_range_t value) {
if (value < HV_REPORT_MIN) { if (value < MOUSE_REPORT_HV_MIN) {
return HV_REPORT_MIN; return MOUSE_REPORT_HV_MIN;
} else if (value > HV_REPORT_MAX) { } else if (value > MOUSE_REPORT_HV_MAX) {
return HV_REPORT_MAX; return MOUSE_REPORT_HV_MAX;
} else { } else {
return value; return value;
} }
@ -420,10 +420,10 @@ static inline mouse_hv_report_t pointing_device_hv_clamp(hv_clamp_range_t value)
* @return mouse_xy_report_t clamped value * @return mouse_xy_report_t clamped value
*/ */
static inline mouse_xy_report_t pointing_device_xy_clamp(xy_clamp_range_t value) { static inline mouse_xy_report_t pointing_device_xy_clamp(xy_clamp_range_t value) {
if (value < XY_REPORT_MIN) { if (value < MOUSE_REPORT_XY_MIN) {
return XY_REPORT_MIN; return MOUSE_REPORT_XY_MIN;
} else if (value > XY_REPORT_MAX) { } else if (value > MOUSE_REPORT_XY_MAX) {
return XY_REPORT_MAX; return MOUSE_REPORT_XY_MAX;
} else { } else {
return value; return value;
} }

10
quantum/pointing_device/pointing_device.h
View File

@ -92,27 +92,19 @@ typedef enum {
} pointing_device_buttons_t; } pointing_device_buttons_t;
#ifdef MOUSE_EXTENDED_REPORT #ifdef MOUSE_EXTENDED_REPORT
# define XY_REPORT_MIN INT16_MIN
# define XY_REPORT_MAX INT16_MAX
typedef int32_t xy_clamp_range_t; typedef int32_t xy_clamp_range_t;
#else #else
# define XY_REPORT_MIN INT8_MIN
# define XY_REPORT_MAX INT8_MAX
typedef int16_t xy_clamp_range_t; typedef int16_t xy_clamp_range_t;
#endif #endif
#ifdef WHEEL_EXTENDED_REPORT #ifdef WHEEL_EXTENDED_REPORT
# define HV_REPORT_MIN INT16_MIN
# define HV_REPORT_MAX INT16_MAX
typedef int32_t hv_clamp_range_t; typedef int32_t hv_clamp_range_t;
#else #else
# define HV_REPORT_MIN INT8_MIN
# define HV_REPORT_MAX INT8_MAX
typedef int16_t hv_clamp_range_t; typedef int16_t hv_clamp_range_t;
#endif #endif
#define CONSTRAIN_HID(amt) ((amt) < INT8_MIN ? INT8_MIN : ((amt) > INT8_MAX ? INT8_MAX : (amt))) #define CONSTRAIN_HID(amt) ((amt) < INT8_MIN ? INT8_MIN : ((amt) > INT8_MAX ? INT8_MAX : (amt)))
#define CONSTRAIN_HID_XY(amt) ((amt) < XY_REPORT_MIN ? XY_REPORT_MIN : ((amt) > XY_REPORT_MAX ? XY_REPORT_MAX : (amt))) #define CONSTRAIN_HID_XY(amt) ((amt) < MOUSE_REPORT_XY_MIN ? MOUSE_REPORT_XY_MIN : ((amt) > MOUSE_REPORT_XY_MAX ? MOUSE_REPORT_XY_MAX : (amt)))
void pointing_device_init(void); void pointing_device_init(void);
bool pointing_device_task(void); bool pointing_device_task(void);

8
tmk_core/protocol/report.h
View File

@ -194,14 +194,22 @@ typedef struct {
} PACKED report_programmable_button_t; } PACKED report_programmable_button_t;
#ifdef MOUSE_EXTENDED_REPORT #ifdef MOUSE_EXTENDED_REPORT
# define MOUSE_REPORT_XY_MIN INT16_MIN
# define MOUSE_REPORT_XY_MAX INT16_MAX
typedef int16_t mouse_xy_report_t; typedef int16_t mouse_xy_report_t;
#else #else
# define MOUSE_REPORT_XY_MIN INT8_MIN
# define MOUSE_REPORT_XY_MAX INT8_MAX
typedef int8_t mouse_xy_report_t; typedef int8_t mouse_xy_report_t;
#endif #endif
#ifdef WHEEL_EXTENDED_REPORT #ifdef WHEEL_EXTENDED_REPORT
# define MOUSE_REPORT_HV_MIN INT16_MIN
# define MOUSE_REPORT_HV_MAX INT16_MAX
typedef int16_t mouse_hv_report_t; typedef int16_t mouse_hv_report_t;
#else #else
# define MOUSE_REPORT_HV_MIN INT8_MIN
# define MOUSE_REPORT_HV_MAX INT8_MAX
typedef int8_t mouse_hv_report_t; typedef int8_t mouse_hv_report_t;
#endif #endif