X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=protocol%2Fserial_mouse_microsoft.c;h=54fedae778faed17ffa487f384c06a7e8ea9685e;hb=eb902844946f0bda7da76cdb1e9aafae4881b63c;hp=f83036a317591333572438872efdb3491b4ef106;hpb=0bfba7acc4e05e66c8ab448286fc51bc94d03a57;p=tmk_firmware.git diff --git a/protocol/serial_mouse_microsoft.c b/protocol/serial_mouse_microsoft.c index f83036a..54fedae 100644 --- a/protocol/serial_mouse_microsoft.c +++ b/protocol/serial_mouse_microsoft.c @@ -27,6 +27,11 @@ along with this program. If not, see . #include "print.h" #include "debug.h" +#ifdef MAX +#undef MAX +#endif +#define MAX(X, Y) ((X) > (Y) ? (X) : (Y)) + static void print_usb_data(const report_mouse_t *report); void serial_mouse_task(void) @@ -91,8 +96,8 @@ void serial_mouse_task(void) report.y = ((buffer[0] << 4) & 0xC0) | buffer[2]; /* USB HID uses values from -127 to 127 only */ - report.x = report.x < -127 ? -127 : report.x; - report.y = report.y < -127 ? -127 : report.y; + report.x = MAX(report.x, -127); + report.y = MAX(report.y, -127); #if 0 if (!report.buttons && !report.x && !report.y) {