X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/3ffa7543a05761a0c69144c9b66196b08d8f1249..3d6508c9b9505cb3393b7c12df1a0c87f7828bbe:/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c?ds=inline

diff --git a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c
index 4d50ff6ab..c29d4debd 100644
--- a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c
@@ -37,7 +37,7 @@
 #include "MouseHostWithParser.h"
 
 /** Main program entry point. This routine configures the hardware required by the application, then
- *  starts the scheduler to run the application tasks.
+ *  enters a loop to run the application tasks in sequence.
  */
 int main(void)
 {
@@ -171,8 +171,12 @@ void Mouse_HID_Task(void)
 			/* Get and process the device's first HID report descriptor */
 			if ((ErrorCode = GetHIDReportData()) != ParseSuccessful)
 			{
-				printf_P(PSTR(ESC_FG_RED "Report Parse Error.\r\n"
-				                         " -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
+				puts_P(PSTR(ESC_FG_RED "Report Parse Error.\r\n"));
+
+				if (!(HIDReportInfo.TotalReportItems))
+					puts_P(PSTR("Not a valid Mouse." ESC_FG_WHITE));
+				else
+					printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
 			
 				/* Indicate error via status LEDs */
 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
@@ -200,7 +204,7 @@ void Mouse_HID_Task(void)
 				         ((ReportSizeFeatureBits >> 3) + ((ReportSizeFeatureBits & 0x07) != 0)));
 			}
 
-			puts_P(PSTR("HID Device Enumerated.\r\n"));
+			puts_P(PSTR("Mouse Enumerated.\r\n"));
 
 			USB_HostState = HOST_STATE_Configured;
 			break;
@@ -267,6 +271,21 @@ void ProcessMouseReport(uint8_t* MouseReport)
 			  LEDMask = LEDS_ALL_LEDS;
 		}
 		else if ((ReportItem->Attributes.Usage.Page   == USAGE_PAGE_GENERIC_DCTRL) &&
+				 (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 = HID_ALIGN_DATA(ReportItem, int16_t);
+			
+			if (WheelDelta)
+			  LEDMask = (LEDS_LED1 | LEDS_LED2 | ((WheelDelta > 0) ? LEDS_LED3 : LEDS_LED4));
+		}
+		else if ((ReportItem->Attributes.Usage.Page   == USAGE_PAGE_GENERIC_DCTRL) &&
 				 ((ReportItem->Attributes.Usage.Usage == USAGE_X)                  ||
 				  (ReportItem->Attributes.Usage.Usage == USAGE_Y))                 &&
 				 (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))