From 2b51944a4bf6123ca5fb59bd967b8f4a1fa944e1 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 16 Feb 2010 12:25:31 +0000 Subject: Make sure the button report set masks use OR in all circumstances, to prevent user confusion. While the first set of the buttons report item can be a direct assignment, it is not immediately clear to new developers why this is the case. --- Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Demos/Device/ClassDriver/KeyboardMouse') diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c index af6e83949..1c01730b0 100644 --- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c +++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c @@ -217,7 +217,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn MouseReport->X = 1; if (JoyStatus_LCL & JOY_PRESS) - MouseReport->Button = (1 << 0); + MouseReport->Button |= (1 << 0); *ReportSize = sizeof(USB_MouseReport_Data_t); return true; -- cgit v1.2.3