X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/d4ca7fb44c7d326b96cf391f0275dc323dbe24de..61a799ed55c5e4d5d0fd8dd4b35bfe57db33822e:/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c

diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
index 1da5966d1..c735b5c00 100644
--- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this 
   software and its documentation for any purpose is hereby granted
@@ -115,9 +115,8 @@ int main(void)
 					break;
 				}
 				
-				LEDs_SetAllLEDs(LEDS_NO_LEDS);
-				
 				printf("Mouse Enumerated.\r\n");
+				LEDs_SetAllLEDs(LEDMASK_USB_READY);
 				USB_HostState = HOST_STATE_Configured;
 				break;
 			case HOST_STATE_Configured:
@@ -132,15 +131,14 @@ int main(void)
 					{
 						HID_ReportItem_t* ReportItem = &HIDReportInfo.ReportItems[ReportNumber];
 						
+						/* Update the report item value if it is contained within the current report */
+						if (!(USB_GetHIDReportItemInfo(MouseReport, ReportItem)))
+						  continue;
+						
+						/* Determine what report item is being tested, process updated value as needed */
 						if ((ReportItem->Attributes.Usage.Page        == USAGE_PAGE_BUTTON) &&
 							(ReportItem->ItemType                     == REPORT_ITEM_TYPE_In))
 						{
-							/* Get the mouse button value if it is contained within the current report, if not,
-							 * skip to the next item in the parser list
-							 */
-							if (!(USB_GetHIDReportItemInfo(MouseReport, ReportItem)))
-							  continue;
-
 							if (ReportItem->Value)
 							  LEDMask = LEDS_ALL_LEDS;
 						}
@@ -148,13 +146,7 @@ int main(void)
 								 (ReportItem->Attributes.Usage.Usage  == USAGE_SCROLL_WHEEL)       &&
 								 (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))
 						{
-							/* Get the mouse wheel value if it is contained within the current 
-							 * report, if not, skip to the next item in the parser list
-							 */
-							if (!(USB_GetHIDReportItemInfo(MouseReport, ReportItem)))
-							  continue;							  
-
-							int16_t WheelDelta = (int16_t)(ReportItem->Value << (16 - ReportItem->Attributes.BitSize));
+							int16_t WheelDelta = HID_ALIGN_DATA(ReportItem, int16_t);
 							
 							if (WheelDelta)
 							  LEDMask = (LEDS_LED1 | LEDS_LED2 | ((WheelDelta > 0) ? LEDS_LED3 : LEDS_LED4));
@@ -164,13 +156,7 @@ int main(void)
 								  (ReportItem->Attributes.Usage.Usage == USAGE_Y))                 &&
 								 (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))
 						{
-							/* Get the mouse relative position value if it is contained within the current 
-							 * report, if not, skip to the next item in the parser list
-							 */
-							if (!(USB_GetHIDReportItemInfo(MouseReport, ReportItem)))
-							  continue;							  
-
-							int16_t DeltaMovement = (int16_t)(ReportItem->Value << (16 - ReportItem->Attributes.BitSize));
+							int16_t DeltaMovement = HID_ALIGN_DATA(ReportItem, int16_t);
 							
 							if (ReportItem->Attributes.Usage.Usage == USAGE_X)
 							{