From 7fbe6dee0ae4b61ee8845ffc17995f88f0cee09c Mon Sep 17 00:00:00 2001
From: Nico <nico-2006@web.de>
Date: Fri, 2 Jan 2015 16:59:05 +0100
Subject: [PATCH] HID Report fix

---
 avr/cores/hid/USB-Core/HID.h | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/avr/cores/hid/USB-Core/HID.h b/avr/cores/hid/USB-Core/HID.h
index 85d21de..b6820a8 100644
--- a/avr/cores/hid/USB-Core/HID.h
+++ b/avr/cores/hid/USB-Core/HID.h
@@ -25,18 +25,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // for the extern HID descriptors
 #include "pins_Arduino.h"
 
-// default HID report descriptor
-#ifdef HID_KEYBOARD_LEDS_ENABLED
-#define DEFAULT_HID_REPORT \
-HID_REPORT_KEYBOARD_LEDS(HID_REPORTID_KEYBOARD), \
-HID_REPORT_MOUSE(HID_REPORTID_MOUSE)
-
-#else
-#define DEFAULT_HID_REPORT \
-HID_REPORT_KEYBOARD_KEYS(HID_REPORTID_KEYBOARD), \
-HID_REPORT_MOUSE(HID_REPORTID_MOUSE)
-#endif
-
 // extern accessible led out report
 #if defined(HID_KEYBOARD_LEDS_ENABLED)
 extern uint8_t hid_keyboard_leds;
@@ -192,7 +180,6 @@ extern uint8_t hid_keyboard_leds;
     0x75, 0x08,                      /*   REPORT_SIZE (8) */ \
     0x81, 0x03,                      /*   INPUT (Cnst,Var,Abs) */ \
 \
-	HID_REPORT_KEYBOARD_LEDS \
       /* 6 Keyboard keys */ \
     0x95, 0x06,                      /*   REPORT_COUNT (6) */ \
     0x75, 0x08,                      /*   REPORT_SIZE (8) */ \
@@ -321,6 +308,18 @@ extern uint8_t hid_keyboard_leds;
     0xC0                         /* end collection */ 
 #endif
 
+// default HID report descriptor
+#ifdef HID_KEYBOARD_LEDS_ENABLED
+#define DEFAULT_HID_REPORT \
+HID_REPORT_KEYBOARD_LEDS(HID_REPORTID_KEYBOARD), \
+HID_REPORT_MOUSE(HID_REPORTID_MOUSE)
+
+#else
+#define DEFAULT_HID_REPORT \
+HID_REPORT_KEYBOARD_KEYS(HID_REPORTID_KEYBOARD), \
+HID_REPORT_MOUSE(HID_REPORTID_MOUSE)
+#endif
+
 #if defined(USBCON)
 
 #include "USBDesc.h"