USB XMEGA support improvements; add DFLL clock platform support, ensure the endpoint...

[pub/USBasp.git] / Demos / Device / ClassDriver / GenericHID / GenericHID.c

diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.c b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
index 1c08764..466efaf 100644 (file)
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.c
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  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
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -37,15 +37,7 @@
 #include "GenericHID.h"
 
 /** Buffer to hold the previously generated HID report, for comparison purposes inside the HID class driver. */
 #include "GenericHID.h"
 
 /** Buffer to hold the previously generated HID report, for comparison purposes inside the HID class driver. */

-uint8_t PrevHIDReportBuffer[GENERIC_REPORT_SIZE];
-
-/** Structure to contain reports from the host, so that they can be echoed back upon request */
-struct
-{
-       uint8_t  ReportID;
-       uint16_t ReportSize;
-       uint8_t  ReportData[GENERIC_REPORT_SIZE];
-} HIDReportEcho;
+static uint8_t PrevHIDReportBuffer[GENERIC_REPORT_SIZE];

 
 /** LUFA HID Class driver interface configuration and state information. This structure is
  *  passed to all HID Class driver functions, so that multiple instances of the same class
 
 /** LUFA HID Class driver interface configuration and state information. This structure is
  *  passed to all HID Class driver functions, so that multiple instances of the same class


@@ -66,6 +58,7 @@ USB_ClassInfo_HID_Device_t Generic_HID_Interface =
                        },
        };
 
                        },
        };
 

+

 /** Main program entry point. This routine contains the overall program flow, including initial
  *  setup of all components and the main program loop.
  */
 /** Main program entry point. This routine contains the overall program flow, including initial
  *  setup of all components and the main program loop.
  */


@@ -122,8 +115,8 @@ void EVENT_USB_Device_ConfigurationChanged(void)
        LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);
 }
 
        LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);
 }
 

-/** Event handler for the library USB Unhandled Control Request event. */
-void EVENT_USB_Device_UnhandledControlRequest(void)
+/** Event handler for the library USB Control Request reception event. */
+void EVENT_USB_Device_ControlRequest(void)

 {
        HID_Device_ProcessControlRequest(&Generic_HID_Interface);
 }
 {
        HID_Device_ProcessControlRequest(&Generic_HID_Interface);
 }


@@ -150,13 +143,16 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
                                          void* ReportData,
                                          uint16_t* const ReportSize)
 {
                                          void* ReportData,
                                          uint16_t* const ReportSize)
 {

-       if (HIDReportEcho.ReportID)
-         *ReportID = HIDReportEcho.ReportID;
-
-       memcpy(ReportData, HIDReportEcho.ReportData, HIDReportEcho.ReportSize);
-
-       *ReportSize = HIDReportEcho.ReportSize;
-       return true;
+       uint8_t* Data = (uint8_t*)ReportData;
+       uint8_t  CurrLEDMask = LEDs_GetLEDs();
+               
+       Data[0] = ((CurrLEDMask & LEDS_LED1) ? 1 : 0);
+       Data[1] = ((CurrLEDMask & LEDS_LED2) ? 1 : 0);
+       Data[2] = ((CurrLEDMask & LEDS_LED3) ? 1 : 0);
+       Data[3] = ((CurrLEDMask & LEDS_LED4) ? 1 : 0);
+
+       *ReportSize = GENERIC_REPORT_SIZE;
+       return false;

 }
 
 /** HID class driver callback function for the processing of HID reports from the host.
 }
 
 /** HID class driver callback function for the processing of HID reports from the host.


@@ -164,7 +160,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
  *  \param[in] HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced
  *  \param[in] ReportID    Report ID of the received report from the host
  *  \param[in] ReportType  The type of report that the host has sent, either HID_REPORT_ITEM_Out or HID_REPORT_ITEM_Feature
  *  \param[in] HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced
  *  \param[in] ReportID    Report ID of the received report from the host
  *  \param[in] ReportType  The type of report that the host has sent, either HID_REPORT_ITEM_Out or HID_REPORT_ITEM_Feature

- *  \param[in] ReportData  Pointer to a buffer where the created report has been stored
+ *  \param[in] ReportData  Pointer to a buffer where the received report has been stored

  *  \param[in] ReportSize  Size in bytes of the received HID report
  */
 void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
  *  \param[in] ReportSize  Size in bytes of the received HID report
  */
 void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,


@@ -173,8 +169,21 @@ void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDI
                                           const void* ReportData,
                                           const uint16_t ReportSize)
 {
                                           const void* ReportData,
                                           const uint16_t ReportSize)
 {

-       HIDReportEcho.ReportID   = ReportID;
-       HIDReportEcho.ReportSize = ReportSize;
-       memcpy(HIDReportEcho.ReportData, ReportData, ReportSize);
+       uint8_t* Data = (uint8_t*)ReportData;
+       uint8_t  NewLEDMask = LEDS_NO_LEDS;
+       
+       if (Data[0])
+         NewLEDMask |= LEDS_LED1;
+
+       if (Data[1])
+         NewLEDMask |= LEDS_LED1;
+
+       if (Data[2])
+         NewLEDMask |= LEDS_LED1;
+
+       if (Data[3])
+         NewLEDMask |= LEDS_LED1;
+         
+       LEDs_SetAllLEDs(NewLEDMask);

 }
 
 }