forgot about tests

* Swedish extra keymap refactor

* Fix swedish $ sign definition (#81)

* Fix br abnt2 keymap compilation error

* Add PR changelog doc

* Update PR6198.md

docs/ChangeLog/20190830/PR4871.md

@@ -0,0 +1,4 @@
+* LUFA USB descriptor cleanup
+    * Some code cleanups related to the USB HID descriptors on AVR keyboards, to make them easier to read and understand
+    * More information: see https://github.com/qmk/qmk_firmware/pull/4871
+    * No behaviour changes anticipated and no keymaps modified

docs/ChangeLog/20190830/PR6198.md

@@ -0,0 +1,4 @@
+* Backport changes to keymap language files from ZSA fork
+  * Fixes an issue in the `keymap_br_abnt2.h` file that includes the wrong source (`keymap_common.h` instead of `keymap.h`)
+  * Updates the `keymap_swedish.h` file to be specific to swedish, and not just "nordic" in general. 
+  * Any keymaps using this will need to remove `NO_*` and replace it with `SE_*`. 

quantum/keymap_extras/keymap_br_abnt2.h

@@ -17,7 +17,7 @@
 #ifndef KEYMAP_BR_ABNT2_H
 #define KEYMAP_BR_ABNT2_H
 
-#include "keymap_common.h"
+#include "keymap.h"
 
 /* Scan codes for the Brazilian ABNT2 keyboard layout */
 

quantum/keymap_extras/keymap_swedish.h

@@ -17,34 +17,72 @@
 #ifndef KEYMAP_SWEDISH_H
 #define KEYMAP_SWEDISH_H
 
-#include "keymap_nordic.h"
+#include "keymap.h"
 
-// There are slight differrences in the keyboards in the nordic contries
+// Normal characters
+#define SE_HALF	KC_GRV
+#define SE_PLUS	KC_MINS
+#define SE_ACUT	KC_EQL
 
-// Swedish redifinitions from the nordic keyset
+#define SE_AM	KC_LBRC
-#undef  NO_AE
+#define SE_QUOT	KC_RBRC // this is the "umlaut" char on Nordic keyboards, Apple layout
-#define NO_AE   KC_QUOT  // ä
+#define SE_AE   KC_QUOT  // ä
-#undef  NO_CIRC
+#define SE_OSLH KC_SCLN  // ö
-#define NO_CIRC LSFT(KC_RBRC)  // ^
+#define	SE_APOS	KC_NUHS
-#undef  NO_OSLH
-#define NO_OSLH KC_SCLN  // ö
 
-// Additional Swedish keys not defined in the nordic keyset
+#define SE_LESS	KC_NUBS
-#define NO_AA   KC_LBRC  // å
+#define SE_MINS KC_SLSH
-#define NO_ASTR LSFT(KC_BSLS)  // *
+
+// Shifted characters
+#define SE_SECT LSFT(SE_HALF)
+#define SE_QUO2	LSFT(KC_2)
+#define SE_BULT LSFT(KC_4)
+#define SE_AMPR	LSFT(KC_6)
+#define SE_SLSH LSFT(KC_7)
+#define SE_LPRN	LSFT(KC_8)
+#define SE_RPRN	LSFT(KC_9)
+#define SE_EQL	LSFT(KC_0)
+#define SE_QUES	LSFT(SE_PLUS)
+#define SE_GRV	LSFT(SE_ACUT)
+
+#define SE_CIRC LSFT(KC_RBRC)  // ^
+
+#define SE_GRTR	LSFT(SE_LESS)
+#define SE_SCLN LSFT(KC_COMM)
+#define SE_COLN LSFT(KC_DOT)
+#define SE_UNDS LSFT(SE_MINS)
+
+// Alt Gr-ed characters
+#define SE_AT	ALGR(KC_2)
+#define SE_PND	ALGR(KC_3)
+#define SE_DLR	ALGR(KC_4)
+#define SE_LCBR ALGR(KC_7)
+#define SE_LBRC ALGR(KC_8)
+#define SE_RBRC ALGR(KC_9)
+#define SE_RCBR	ALGR(KC_0)
+#define SE_PIPE ALGR(KC_NUBS)
+
+#define SE_EURO ALGR(KC_E)
+#define SE_TILD ALGR(SE_QUOT)
+
+#define SE_BSLS ALGR(KC_MINS)
+#define SE_MU 	ALGR(KC_M)
+
+#define SE_AA   KC_LBRC  // å
+#define SE_ASTR LSFT(KC_BSLS)  // *
 
 // Norwegian unique MAC characters (not vetted for Swedish)
-#define NO_ACUT_MAC KC_EQL  // =
+#define SE_ACUT_MAC KC_EQL  // =
-#define NO_APOS_MAC KC_NUBS  // '
+#define SE_APOS_MAC KC_NUBS  // '
-#define NO_AT_MAC   KC_BSLS  // @
+#define SE_AT_MAC   KC_BSLS  // @
-#define NO_BSLS_MAC ALGR(LSFT(KC_7)) // '\'
+#define SE_BSLS_MAC ALGR(LSFT(KC_7)) // '\'
-#define NO_DLR_MAC  LSFT(KC_4) // $
+#define SE_DLR_MAC  ALGR(KC_4) // $
-#define NO_GRV_MAC ALGR(NO_BSLS) // `
+#define SE_GRV_MAC ALGR(SE_BSLS) // `
-#define NO_GRTR_MAC LSFT(KC_GRV)  // >
+#define SE_GRTR_MAC LSFT(KC_GRV)  // >
-#define NO_LCBR_MAC ALGR(LSFT(KC_8))  // {
+#define SE_LCBR_MAC ALGR(LSFT(KC_8))  // {
-#define NO_LESS_MAC KC_GRV  // <
+#define SE_LESS_MAC KC_GRV  // <
-#define NO_PIPE_MAC ALGR(KC_7)  // |
+#define SE_PIPE_MAC ALGR(KC_7)  // |
-#define NO_RCBR_MAC ALGR(LSFT(KC_9))  // }
+#define SE_RCBR_MAC ALGR(LSFT(KC_9))  // }
 
 #endif
 

readme.md

@@ -7,6 +7,14 @@
 [![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly)
 [![GitHub forks](https://img.shields.io/github/forks/qmk/qmk_firmware.svg?style=social&label=Fork)](https://github.com/qmk/qmk_firmware/)
 
+# NOTICE: THIS IS A TESTING BRANCH
+
+This is the `breaking_changes` branch for Aug 2019. You can [read more in the tracking issue](https://github.com/qmk/qmk_firmware/issues/6146).
+
+We encourage you to try this branch out and see if there are any bugs. Our goal is to merge this branch to `master` on Aug 30. Please [report any bugs](https://github.com/qmk/qmk_firmware/issues/new?template=bug_report.md) you find.
+
+Original readme.md continues:
+
 This is a keyboard firmware based on the [tmk\_keyboard firmware](https://github.com/tmk/tmk_keyboard) with some useful features for Atmel AVR and ARM controllers, and more specifically, the [OLKB product line](https://olkb.com), the [ErgoDox EZ](https://ergodox-ez.com) keyboard, and the [Clueboard product line](https://clueboard.co).
 
 ## Documentation

tmk_core/protocol/usb_descriptor.c

@@ -40,115 +40,114 @@
 #include "report.h"
 #include "usb_descriptor.h"
 
-#ifndef USB_MAX_POWER_CONSUMPTION
+/*
-#define USB_MAX_POWER_CONSUMPTION 500
+ * HID report descriptors
-#endif
+ */
-
-/*******************************************************************************
- * HID Report Descriptors
- ******************************************************************************/
 #ifdef KEYBOARD_SHARED_EP
 const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
     #define SHARED_REPORT_STARTED
 #else
 const USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] = {
 #endif
-    HID_RI_USAGE_PAGE(8, 0x01), /* Generic Desktop */
+    HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
-    HID_RI_USAGE(8, 0x06), /* Keyboard */
+    HID_RI_USAGE(8, 0x06), // Keyboard
-    HID_RI_COLLECTION(8, 0x01), /* Application */
+    HID_RI_COLLECTION(8, 0x01), // Application
 #ifdef KEYBOARD_SHARED_EP
         HID_RI_REPORT_ID(8, REPORT_ID_KEYBOARD),
 #endif
-        HID_RI_USAGE_PAGE(8, 0x07), /* Key Codes */
+        // Modifiers (8 bits)
-        HID_RI_USAGE_MINIMUM(8, 0xE0), /* Keyboard Left Control */
+        HID_RI_USAGE_PAGE(8, 0x07), // Keyboard/Keypad
-        HID_RI_USAGE_MAXIMUM(8, 0xE7), /* Keyboard Right GUI */
+        HID_RI_USAGE_MINIMUM(8, 0xE0), // Keyboard Left Control
+        HID_RI_USAGE_MAXIMUM(8, 0xE7), // Keyboard Right GUI
         HID_RI_LOGICAL_MINIMUM(8, 0x00),
         HID_RI_LOGICAL_MAXIMUM(8, 0x01),
         HID_RI_REPORT_COUNT(8, 0x08),
         HID_RI_REPORT_SIZE(8, 0x01),
         HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
-
+        // Reserved (1 byte)
         HID_RI_REPORT_COUNT(8, 0x01),
         HID_RI_REPORT_SIZE(8, 0x08),
-        HID_RI_INPUT(8, HID_IOF_CONSTANT),  /* reserved */
+        HID_RI_INPUT(8, HID_IOF_CONSTANT),
+        // Keycodes (6 bytes)
+        HID_RI_USAGE_PAGE(8, 0x07), // Keyboard/Keypad
+        HID_RI_USAGE_MINIMUM(8, 0x00),
+        HID_RI_USAGE_MAXIMUM(8, 0xFF),
+        HID_RI_LOGICAL_MINIMUM(8, 0x00),
+        HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
+        HID_RI_REPORT_COUNT(8, 0x06),
+        HID_RI_REPORT_SIZE(8, 0x08),
+        HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
 
-        HID_RI_USAGE_PAGE(8, 0x08), /* LEDs */
+        // Status LEDs (5 bits)
-        HID_RI_USAGE_MINIMUM(8, 0x01), /* Num Lock */
+        HID_RI_USAGE_PAGE(8, 0x08), // LED
-        HID_RI_USAGE_MAXIMUM(8, 0x05), /* Kana */
+        HID_RI_USAGE_MINIMUM(8, 0x01), // Num Lock
+        HID_RI_USAGE_MAXIMUM(8, 0x05), // Kana
         HID_RI_REPORT_COUNT(8, 0x05),
         HID_RI_REPORT_SIZE(8, 0x01),
         HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
+        // LED padding (3 bits)
         HID_RI_REPORT_COUNT(8, 0x01),
         HID_RI_REPORT_SIZE(8, 0x03),
         HID_RI_OUTPUT(8, HID_IOF_CONSTANT),
-
-        HID_RI_USAGE_PAGE(8, 0x07), /* Keyboard */
-        HID_RI_USAGE_MINIMUM(8, 0x00), /* Reserved (no event indicated) */
-        HID_RI_USAGE_MAXIMUM(8, 0xFF), /* Keyboard Application */
-        HID_RI_LOGICAL_MINIMUM(8, 0x00),
-        HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
-        HID_RI_REPORT_COUNT(8, 0x06),
-        HID_RI_REPORT_SIZE(8, 0x08),
-        HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
     HID_RI_END_COLLECTION(0),
-
 #ifndef KEYBOARD_SHARED_EP
 };
 #endif
 
-#if defined(MOUSE_ENABLE)
+#ifdef MOUSE_ENABLE
-
+    #ifndef MOUSE_SHARED_EP
-#   if !defined(MOUSE_SHARED_EP)
 const USB_Descriptor_HIDReport_Datatype_t PROGMEM MouseReport[] = {
     #elif !defined(SHARED_REPORT_STARTED)
 const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
         #define SHARED_REPORT_STARTED
     #endif
-    HID_RI_USAGE_PAGE(8, 0x01), /* Generic Desktop */
+    HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
-    HID_RI_USAGE(8, 0x02), /* Mouse */
+    HID_RI_USAGE(8, 0x02), // Mouse
-    HID_RI_COLLECTION(8, 0x01), /* Application */
+    HID_RI_COLLECTION(8, 0x01), // Application
     #ifdef MOUSE_SHARED_EP
         HID_RI_REPORT_ID(8, REPORT_ID_MOUSE),
     #endif
-        HID_RI_USAGE(8, 0x01), /* Pointer */
+        HID_RI_USAGE(8, 0x01), // Pointer
-        HID_RI_COLLECTION(8, 0x00), /* Physical */
+        HID_RI_COLLECTION(8, 0x00), // Physical
-
+            // Buttons (5 bits)
-            HID_RI_USAGE_PAGE(8, 0x09), /* Button */
+            HID_RI_USAGE_PAGE(8, 0x09), // Button
-            HID_RI_USAGE_MINIMUM(8, 0x01),  /* Button 1 */
+            HID_RI_USAGE_MINIMUM(8, 0x01), // Button 1
-            HID_RI_USAGE_MAXIMUM(8, 0x05),  /* Button 5 */
+            HID_RI_USAGE_MAXIMUM(8, 0x05), // Button 5
             HID_RI_LOGICAL_MINIMUM(8, 0x00),
             HID_RI_LOGICAL_MAXIMUM(8, 0x01),
             HID_RI_REPORT_COUNT(8, 0x05),
             HID_RI_REPORT_SIZE(8, 0x01),
             HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
+            // Button padding (3 bits)
             HID_RI_REPORT_COUNT(8, 0x01),
             HID_RI_REPORT_SIZE(8, 0x03),
             HID_RI_INPUT(8, HID_IOF_CONSTANT),
 
-            HID_RI_USAGE_PAGE(8, 0x01), /* Generic Desktop */
+            // X/Y position (2 bytes)
-            HID_RI_USAGE(8, 0x30), /* Usage X */
+            HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
-            HID_RI_USAGE(8, 0x31), /* Usage Y */
+            HID_RI_USAGE(8, 0x30), // X
+            HID_RI_USAGE(8, 0x31), // Y
             HID_RI_LOGICAL_MINIMUM(8, -127),
             HID_RI_LOGICAL_MAXIMUM(8, 127),
             HID_RI_REPORT_COUNT(8, 0x02),
             HID_RI_REPORT_SIZE(8, 0x08),
             HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
 
-            HID_RI_USAGE(8, 0x38), /* Wheel */
+            // Vertical wheel (1 byte)
+            HID_RI_USAGE(8, 0x38), // Wheel
             HID_RI_LOGICAL_MINIMUM(8, -127),
             HID_RI_LOGICAL_MAXIMUM(8, 127),
             HID_RI_REPORT_COUNT(8, 0x01),
             HID_RI_REPORT_SIZE(8, 0x08),
             HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
-
+            // Horizontal wheel (1 byte)
-            HID_RI_USAGE_PAGE(8, 0x0C), /* Consumer */
+            HID_RI_USAGE_PAGE(8, 0x0C), // Consumer
-            HID_RI_USAGE(16, 0x0238), /* AC Pan (Horizontal wheel) */
+            HID_RI_USAGE(16, 0x0238), // AC Pan
             HID_RI_LOGICAL_MINIMUM(8, -127),
             HID_RI_LOGICAL_MAXIMUM(8, 127),
             HID_RI_REPORT_COUNT(8, 0x01),
             HID_RI_REPORT_SIZE(8, 0x08),
             HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
-
         HID_RI_END_COLLECTION(0),
     HID_RI_END_COLLECTION(0),
     #ifndef MOUSE_SHARED_EP
@@ -159,66 +158,70 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
 #if defined(SHARED_EP_ENABLE) && !defined(SHARED_REPORT_STARTED)
 const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
 #endif
+
 #ifdef EXTRAKEY_ENABLE
-    HID_RI_USAGE_PAGE(8, 0x01), /* Generic Desktop */
+    HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
-    HID_RI_USAGE(8, 0x80), /* System Control */
+    HID_RI_USAGE(8, 0x80), // System Control
-    HID_RI_COLLECTION(8, 0x01), /* Application */
+    HID_RI_COLLECTION(8, 0x01), // Application
         HID_RI_REPORT_ID(8, REPORT_ID_SYSTEM),
+        HID_RI_USAGE_MINIMUM(16, 0x0081), // System Power Down
+        HID_RI_USAGE_MAXIMUM(16, 0x0083), // System Wake Up
         HID_RI_LOGICAL_MINIMUM(16, 0x0001),
         HID_RI_LOGICAL_MAXIMUM(16, 0x0003),
-        HID_RI_USAGE_MINIMUM(16, 0x0081), /* System Power Down */
-        HID_RI_USAGE_MAXIMUM(16, 0x0083), /* System Wake Up */
-        HID_RI_REPORT_SIZE(8, 16),
         HID_RI_REPORT_COUNT(8, 1),
+        HID_RI_REPORT_SIZE(8, 16),
         HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
     HID_RI_END_COLLECTION(0),
 
-    HID_RI_USAGE_PAGE(8, 0x0C), /* Consumer */
+    HID_RI_USAGE_PAGE(8, 0x0C), // Consumer
-    HID_RI_USAGE(8, 0x01), /* Consumer Control */
+    HID_RI_USAGE(8, 0x01), // Consumer Control
-    HID_RI_COLLECTION(8, 0x01), /* Application */
+    HID_RI_COLLECTION(8, 0x01), // Application
         HID_RI_REPORT_ID(8, REPORT_ID_CONSUMER),
+        HID_RI_USAGE_MINIMUM(16, 0x0001), // Consumer Control
+        HID_RI_USAGE_MAXIMUM(16, 0x029C), // AC Distribute Vertically
         HID_RI_LOGICAL_MINIMUM(16, 0x0001),
         HID_RI_LOGICAL_MAXIMUM(16, 0x029C),
-        HID_RI_USAGE_MINIMUM(16, 0x0001), /* +10 */
-        HID_RI_USAGE_MAXIMUM(16, 0x029C), /* AC Distribute Vertically */
-        HID_RI_REPORT_SIZE(8, 16),
         HID_RI_REPORT_COUNT(8, 1),
+        HID_RI_REPORT_SIZE(8, 16),
         HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
     HID_RI_END_COLLECTION(0),
 #endif
 
 #ifdef NKRO_ENABLE
-    HID_RI_USAGE_PAGE(8, 0x01), /* Generic Desktop */
+    HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
-    HID_RI_USAGE(8, 0x06), /* Keyboard */
+    HID_RI_USAGE(8, 0x06), // Keyboard
-    HID_RI_COLLECTION(8, 0x01), /* Application */
+    HID_RI_COLLECTION(8, 0x01), // Application
         HID_RI_REPORT_ID(8, REPORT_ID_NKRO),
-        HID_RI_USAGE_PAGE(8, 0x07), /* Key Codes */
+        // Modifiers (8 bits)
-        HID_RI_USAGE_MINIMUM(8, 0xE0), /* Keyboard Left Control */
+        HID_RI_USAGE_PAGE(8, 0x07), // Keyboard/Keypad
-        HID_RI_USAGE_MAXIMUM(8, 0xE7), /* Keyboard Right GUI */
+        HID_RI_USAGE_MINIMUM(8, 0xE0), // Keyboard Left Control
+        HID_RI_USAGE_MAXIMUM(8, 0xE7), // Keyboard Right GUI
         HID_RI_LOGICAL_MINIMUM(8, 0x00),
         HID_RI_LOGICAL_MAXIMUM(8, 0x01),
         HID_RI_REPORT_COUNT(8, 0x08),
         HID_RI_REPORT_SIZE(8, 0x01),
         HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
+        // Keycodes
+        HID_RI_USAGE_PAGE(8, 0x07), // Keyboard/Keypad
+        HID_RI_USAGE_MINIMUM(8, 0x00),
+        HID_RI_USAGE_MAXIMUM(8, KEYBOARD_REPORT_BITS * 8 - 1),
+        HID_RI_LOGICAL_MINIMUM(8, 0x00),
+        HID_RI_LOGICAL_MAXIMUM(8, 0x01),
+        HID_RI_REPORT_COUNT(8, KEYBOARD_REPORT_BITS * 8),
+        HID_RI_REPORT_SIZE(8, 0x01),
+        HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
 
-        HID_RI_USAGE_PAGE(8, 0x08), /* LEDs */
+        // Status LEDs (5 bits)
-        HID_RI_USAGE_MINIMUM(8, 0x01), /* Num Lock */
+        HID_RI_USAGE_PAGE(8, 0x08), // LED
-        HID_RI_USAGE_MAXIMUM(8, 0x05), /* Kana */
+        HID_RI_USAGE_MINIMUM(8, 0x01), // Num Lock
+        HID_RI_USAGE_MAXIMUM(8, 0x05), // Kana
         HID_RI_REPORT_COUNT(8, 0x05),
         HID_RI_REPORT_SIZE(8, 0x01),
         HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
+        // LED padding (3 bits)
         HID_RI_REPORT_COUNT(8, 0x01),
         HID_RI_REPORT_SIZE(8, 0x03),
         HID_RI_OUTPUT(8, HID_IOF_CONSTANT),
-
-        HID_RI_USAGE_PAGE(8, 0x07), /* Key Codes */
-        HID_RI_USAGE_MINIMUM(8, 0x00), /* Keyboard 0 */
-        HID_RI_USAGE_MAXIMUM(8, KEYBOARD_REPORT_BITS*8-1),
-        HID_RI_LOGICAL_MINIMUM(8, 0x00),
-        HID_RI_LOGICAL_MAXIMUM(8, 0x01),
-        HID_RI_REPORT_COUNT(8, KEYBOARD_REPORT_BITS*8),
-        HID_RI_REPORT_SIZE(8, 0x01),
-        HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
     HID_RI_END_COLLECTION(0),
 #endif
 #ifdef SHARED_EP_ENABLE
@@ -226,18 +229,19 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
 #endif
 
 #ifdef RAW_ENABLE
-const USB_Descriptor_HIDReport_Datatype_t PROGMEM RawReport[] =
+const USB_Descriptor_HIDReport_Datatype_t PROGMEM RawReport[] = {
-{
+    HID_RI_USAGE_PAGE(16, 0xFF60), // Vendor Defined
-    HID_RI_USAGE_PAGE(16, 0xFF60), /* Vendor Page 0xFF60 */
+    HID_RI_USAGE(8, 0x61), // Vendor Defined
-    HID_RI_USAGE(8, 0x61), /* Vendor Usage 0x61 */
+    HID_RI_COLLECTION(8, 0x01), // Application
-    HID_RI_COLLECTION(8, 0x01), /* Application */
+        // Data to host
-        HID_RI_USAGE(8, 0x62), /* Vendor Usage 0x62 */
+        HID_RI_USAGE(8, 0x62), // Vendor Defined
         HID_RI_LOGICAL_MINIMUM(8, 0x00),
         HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
         HID_RI_REPORT_COUNT(8, RAW_EPSIZE),
         HID_RI_REPORT_SIZE(8, 0x08),
         HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
-        HID_RI_USAGE(8, 0x63), /* Vendor Usage 0x63 */
+        // Data from host
+        HID_RI_USAGE(8, 0x63), // Vendor Defined
         HID_RI_LOGICAL_MINIMUM(8, 0x00),
         HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
         HID_RI_REPORT_COUNT(8, RAW_EPSIZE),
@@ -248,18 +252,19 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM RawReport[] =
 #endif
 
 #ifdef CONSOLE_ENABLE
-const USB_Descriptor_HIDReport_Datatype_t PROGMEM ConsoleReport[] =
+const USB_Descriptor_HIDReport_Datatype_t PROGMEM ConsoleReport[] = {
-{
+    HID_RI_USAGE_PAGE(16, 0xFF31), // Vendor Defined (PJRC Teensy compatible)
-    HID_RI_USAGE_PAGE(16, 0xFF31), /* Vendor Page(PJRC Teensy compatible) */
+    HID_RI_USAGE(8, 0x74), // Vendor Defined (PJRC Teensy compatible)
-    HID_RI_USAGE(8, 0x74), /* Vendor Usage(PJRC Teensy compatible) */
+    HID_RI_COLLECTION(8, 0x01), // Application
-    HID_RI_COLLECTION(8, 0x01), /* Application */
+        // Data to host
-        HID_RI_USAGE(8, 0x75), /* Vendor Usage 0x75 */
+        HID_RI_USAGE(8, 0x75), // Vendor Defined
         HID_RI_LOGICAL_MINIMUM(8, 0x00),
         HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
         HID_RI_REPORT_COUNT(8, CONSOLE_EPSIZE),
         HID_RI_REPORT_SIZE(8, 0x08),
         HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
-        HID_RI_USAGE(8, 0x76), /* Vendor Usage 0x76 */
+        // Data from host
+        HID_RI_USAGE(8, 0x76), // Vendor Defined
         HID_RI_LOGICAL_MINIMUM(8, 0x00),
         HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
         HID_RI_REPORT_COUNT(8, CONSOLE_EPSIZE),
@@ -269,14 +274,14 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM ConsoleReport[] =
 };
 #endif
 
-
+/*
-/*******************************************************************************
+ * Device descriptor
- * Device Descriptors
+ */
- ******************************************************************************/
+const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = {
-const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
+    .Header = {
-{
+        .Size               = sizeof(USB_Descriptor_Device_t),
-    .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
+        .Type               = DTYPE_Device
-
+    },
     .USBSpecification       = VERSION_BCD(1, 1, 0),
 #if VIRTSER_ENABLE
     .Class                  = USB_CSCP_IADDeviceClass,
@@ -287,76 +292,72 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
     .SubClass               = USB_CSCP_NoDeviceSubclass,
     .Protocol               = USB_CSCP_NoDeviceProtocol,
 #endif
-
     .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
-
+    // Specified in config.h
-    /* specified in config.h */
     .VendorID               = VENDOR_ID,
     .ProductID              = PRODUCT_ID,
     .ReleaseNumber          = DEVICE_VER,
-
     .ManufacturerStrIndex   = 0x01,
     .ProductStrIndex        = 0x02,
     .SerialNumStrIndex      = 0x03,
-
     .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
 };
 
-/*******************************************************************************
+#ifndef USB_MAX_POWER_CONSUMPTION
- * Configuration Descriptors
+    #define USB_MAX_POWER_CONSUMPTION 500
- ******************************************************************************/
+#endif
-const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
-{
-    .Config =
-        {
-            .Header                 = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
 
+/*
+ * Configuration descriptors
+ */
+const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = {
+    .Config = {
+        .Header = {
+            .Size               = sizeof(USB_Descriptor_Configuration_Header_t),
+            .Type               = DTYPE_Configuration
+        },
         .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
         .TotalInterfaces        = TOTAL_INTERFACES,
-
         .ConfigurationNumber    = 1,
         .ConfigurationStrIndex  = NO_DESCRIPTOR,
-
         .ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_REMOTEWAKEUP),
-
         .MaxPowerConsumption    = USB_CONFIG_POWER_MA(USB_MAX_POWER_CONSUMPTION)
     },
 
+#ifndef KEYBOARD_SHARED_EP
     /*
      * Keyboard
      */
-#ifndef KEYBOARD_SHARED_EP
+    .Keyboard_Interface = {
-    .Keyboard_Interface =
+        .Header = {
-        {
+            .Size               = sizeof(USB_Descriptor_Interface_t),
-            .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+            .Type               = DTYPE_Interface
-
+        },
         .InterfaceNumber        = KEYBOARD_INTERFACE,
         .AlternateSetting       = 0x00,
-
         .TotalEndpoints         = 1,
-
         .Class                  = HID_CSCP_HIDClass,
         .SubClass               = HID_CSCP_BootSubclass,
         .Protocol               = HID_CSCP_KeyboardBootProtocol,
 
         .InterfaceStrIndex      = NO_DESCRIPTOR
     },
-
+    .Keyboard_HID = {
-    .Keyboard_HID =
+        .Header = {
-        {
+            .Size               = sizeof(USB_HID_Descriptor_HID_t),
-            .Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
+            .Type               = HID_DTYPE_HID
-
+        },
         .HIDSpec                = VERSION_BCD(1, 1, 1),
         .CountryCode            = 0x00,
         .TotalReportDescriptors = 1,
         .HIDReportType          = HID_DTYPE_Report,
         .HIDReportLength        = sizeof(KeyboardReport)
     },
-
+    .Keyboard_INEndpoint = {
-    .Keyboard_INEndpoint =
+        .Header = {
-        {
+            .Size               = sizeof(USB_Descriptor_Endpoint_t),
-            .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+            .Type               = DTYPE_Endpoint
-
+        },
         .EndpointAddress        = (ENDPOINT_DIR_IN | KEYBOARD_IN_EPNUM),
         .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
         .EndpointSize           = KEYBOARD_EPSIZE,
@@ -364,41 +365,39 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
     },
 #endif
 
+#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
     /*
      * Mouse
      */
-#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
+    .Mouse_Interface = {
-    .Mouse_Interface =
+        .Header = {
-        {
+            .Size               = sizeof(USB_Descriptor_Interface_t),
-            .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+            .Type               = DTYPE_Interface
-
+        },
         .InterfaceNumber        = MOUSE_INTERFACE,
         .AlternateSetting       = 0x00,
-
         .TotalEndpoints         = 1,
-
         .Class                  = HID_CSCP_HIDClass,
         .SubClass               = HID_CSCP_BootSubclass,
         .Protocol               = HID_CSCP_MouseBootProtocol,
-
         .InterfaceStrIndex      = NO_DESCRIPTOR
     },
-
+    .Mouse_HID = {
-    .Mouse_HID =
+        .Header = {
-        {
+            .Size               = sizeof(USB_HID_Descriptor_HID_t),
-            .Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
+            .Type               = HID_DTYPE_HID
-
+        },
         .HIDSpec                = VERSION_BCD(1, 1, 1),
         .CountryCode            = 0x00,
         .TotalReportDescriptors = 1,
         .HIDReportType          = HID_DTYPE_Report,
         .HIDReportLength        = sizeof(MouseReport)
     },
-
+    .Mouse_INEndpoint = {
-    .Mouse_INEndpoint =
+        .Header = {
-        {
+            .Size               = sizeof(USB_Descriptor_Endpoint_t),
-            .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+            .Type               = DTYPE_Endpoint
-
+        },
         .EndpointAddress        = (ENDPOINT_DIR_IN | MOUSE_IN_EPNUM),
         .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
         .EndpointSize           = MOUSE_EPSIZE,
@@ -406,19 +405,18 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
     },
 #endif
 
+#ifdef SHARED_EP_ENABLE
     /*
      * Shared
      */
-#ifdef SHARED_EP_ENABLE
+    .Shared_Interface = {
-    .Shared_Interface =
+        .Header = {
-        {
+            .Size               = sizeof(USB_Descriptor_Interface_t),
-            .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+            .Type               = DTYPE_Interface
-
+        },
         .InterfaceNumber        = SHARED_INTERFACE,
         .AlternateSetting       = 0x00,
-
         .TotalEndpoints         = 1,
-
         .Class                  = HID_CSCP_HIDClass,
 #ifdef KEYBOARD_SHARED_EP
         .SubClass               = HID_CSCP_BootSubclass,
@@ -427,25 +425,24 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
         .SubClass               = HID_CSCP_NonBootSubclass,
         .Protocol               = HID_CSCP_NonBootProtocol,
 #endif
-
         .InterfaceStrIndex      = NO_DESCRIPTOR
     },
-
+    .Shared_HID = {
-    .Shared_HID =
+        .Header = {
-        {
+            .Size               = sizeof(USB_HID_Descriptor_HID_t),
-            .Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
+            .Type               = HID_DTYPE_HID
-
+        },
         .HIDSpec                = VERSION_BCD(1, 1, 1),
         .CountryCode            = 0x00,
         .TotalReportDescriptors = 1,
         .HIDReportType          = HID_DTYPE_Report,
         .HIDReportLength        = sizeof(SharedReport)
     },
-
+    .Shared_INEndpoint = {
-    .Shared_INEndpoint =
+        .Header = {
-        {
+            .Size               = sizeof(USB_Descriptor_Endpoint_t),
-            .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+            .Type               = DTYPE_Endpoint
-
+        },
         .EndpointAddress        = (ENDPOINT_DIR_IN | SHARED_IN_EPNUM),
         .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
         .EndpointSize           = SHARED_EPSIZE,
@@ -453,51 +450,49 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
     },
 #endif
 
+#ifdef RAW_ENABLE
     /*
-	     * Raw
+     * Raw HID
      */
-	#ifdef RAW_ENABLE
+    .Raw_Interface = {
-	    .Raw_Interface =
+        .Header = {
-	        {
+            .Size               = sizeof(USB_Descriptor_Interface_t),
-	            .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+            .Type               = DTYPE_Interface
-
+        },
         .InterfaceNumber        = RAW_INTERFACE,
         .AlternateSetting       = 0x00,
-
         .TotalEndpoints         = 2,
-
         .Class                  = HID_CSCP_HIDClass,
         .SubClass               = HID_CSCP_NonBootSubclass,
         .Protocol               = HID_CSCP_NonBootProtocol,
-
         .InterfaceStrIndex      = NO_DESCRIPTOR
     },
-
+    .Raw_HID = {
-	    .Raw_HID =
+        .Header = {
-	        {
+            .Size               = sizeof(USB_HID_Descriptor_HID_t),
-	            .Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
+            .Type               = HID_DTYPE_HID
-
+        },
         .HIDSpec                = VERSION_BCD(1, 1, 1),
         .CountryCode            = 0x00,
         .TotalReportDescriptors = 1,
         .HIDReportType          = HID_DTYPE_Report,
         .HIDReportLength        = sizeof(RawReport)
     },
-
+    .Raw_INEndpoint = {
-	    .Raw_INEndpoint =
+        .Header = {
-	        {
+            .Size               = sizeof(USB_Descriptor_Endpoint_t),
-	            .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+            .Type               = DTYPE_Endpoint
-
+        },
         .EndpointAddress        = (ENDPOINT_DIR_IN | RAW_IN_EPNUM),
         .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
         .EndpointSize           = RAW_EPSIZE,
         .PollingIntervalMS      = 0x01
     },
-
+    .Raw_OUTEndpoint = {
-	    .Raw_OUTEndpoint =
+        .Header = {
-	        {
+            .Size               = sizeof(USB_Descriptor_Endpoint_t),
-	            .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+            .Type               = DTYPE_Endpoint
-
+        },
         .EndpointAddress        = (ENDPOINT_DIR_OUT | RAW_OUT_EPNUM),
         .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
         .EndpointSize           = RAW_EPSIZE,
@@ -505,51 +500,49 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
     },
 #endif
 
+#ifdef CONSOLE_ENABLE
     /*
      * Console
      */
-#ifdef CONSOLE_ENABLE
+    .Console_Interface = {
-    .Console_Interface =
+        .Header = {
-        {
+            .Size               = sizeof(USB_Descriptor_Interface_t),
-            .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+            .Type               = DTYPE_Interface
-
+        },
         .InterfaceNumber        = CONSOLE_INTERFACE,
         .AlternateSetting       = 0x00,
-
         .TotalEndpoints         = 2,
-
         .Class                  = HID_CSCP_HIDClass,
         .SubClass               = HID_CSCP_NonBootSubclass,
         .Protocol               = HID_CSCP_NonBootProtocol,
-
         .InterfaceStrIndex      = NO_DESCRIPTOR
     },
-
+    .Console_HID = {
-    .Console_HID =
+        .Header = {
-        {
+            .Size               = sizeof(USB_HID_Descriptor_HID_t),
-            .Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
+            .Type               = HID_DTYPE_HID
-
+        },
         .HIDSpec                = VERSION_BCD(1, 1, 1),
         .CountryCode            = 0x00,
         .TotalReportDescriptors = 1,
         .HIDReportType          = HID_DTYPE_Report,
         .HIDReportLength        = sizeof(ConsoleReport)
     },
-
+    .Console_INEndpoint = {
-    .Console_INEndpoint =
+        .Header = {
-        {
+            .Size               = sizeof(USB_Descriptor_Endpoint_t),
-            .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+            .Type               = DTYPE_Endpoint
-
+        },
         .EndpointAddress        = (ENDPOINT_DIR_IN | CONSOLE_IN_EPNUM),
         .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
         .EndpointSize           = CONSOLE_EPSIZE,
         .PollingIntervalMS      = 0x01
     },
-
+    .Console_OUTEndpoint = {
-    .Console_OUTEndpoint =
+        .Header = {
-        {
+            .Size               = sizeof(USB_Descriptor_Endpoint_t),
-            .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+            .Type               = DTYPE_Endpoint
-
+        },
         .EndpointAddress        = (ENDPOINT_DIR_OUT | CONSOLE_OUT_EPNUM),
         .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
         .EndpointSize           = CONSOLE_EPSIZE,
@@ -558,274 +551,253 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 #endif
 
 #ifdef MIDI_ENABLE
-    .Audio_Interface_Association =
+    /*
-        {
+     * MIDI
-            .Header                   = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
+     */
-
+    .Audio_Interface_Association = {
+        .Header = {
+            .Size               = sizeof(USB_Descriptor_Interface_Association_t),
+            .Type               = DTYPE_InterfaceAssociation
+        },
         .FirstInterfaceIndex    = AC_INTERFACE,
         .TotalInterfaces        = 2,
-
         .Class                  = AUDIO_CSCP_AudioClass,
         .SubClass               = AUDIO_CSCP_ControlSubclass,
         .Protocol               = AUDIO_CSCP_ControlProtocol,
-
         .IADStrIndex            = NO_DESCRIPTOR,
     },
-    .Audio_ControlInterface =
+    .Audio_ControlInterface = {
-        {
+        .Header = {
-            .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+            .Size               = sizeof(USB_Descriptor_Interface_t),
-
+            .Type               = DTYPE_Interface
+        },
         .InterfaceNumber        = AC_INTERFACE,
         .AlternateSetting       = 0,
-
         .TotalEndpoints         = 0,
-
         .Class                  = AUDIO_CSCP_AudioClass,
         .SubClass               = AUDIO_CSCP_ControlSubclass,
         .Protocol               = AUDIO_CSCP_ControlProtocol,
-
         .InterfaceStrIndex      = NO_DESCRIPTOR
     },
-
+    .Audio_ControlInterface_SPC = {
-    .Audio_ControlInterface_SPC =
+        .Header = {
-        {
+            .Size               = sizeof(USB_Audio_Descriptor_Interface_AC_t),
-            .Header                   = {.Size = sizeof(USB_Audio_Descriptor_Interface_AC_t), .Type = DTYPE_CSInterface},
+            .Type               = DTYPE_CSInterface
+        },
         .Subtype                = AUDIO_DSUBTYPE_CSInterface_Header,
-
         .ACSpecification        = VERSION_BCD(1, 0, 0),
         .TotalLength            = sizeof(USB_Audio_Descriptor_Interface_AC_t),
-
         .InCollection           = 1,
         .InterfaceNumber        = AS_INTERFACE,
     },
-
+    .Audio_StreamInterface = {
-    .Audio_StreamInterface =
+        .Header = {
-        {
+            .Size               = sizeof(USB_Descriptor_Interface_t),
-            .Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+            .Type               = DTYPE_Interface
-
+        },
         .InterfaceNumber        = AS_INTERFACE,
         .AlternateSetting       = 0,
-
         .TotalEndpoints         = 2,
-
         .Class                  = AUDIO_CSCP_AudioClass,
         .SubClass               = AUDIO_CSCP_MIDIStreamingSubclass,
         .Protocol               = AUDIO_CSCP_StreamingProtocol,
-
         .InterfaceStrIndex      = NO_DESCRIPTOR
     },
-
+    .Audio_StreamInterface_SPC = {
-    .Audio_StreamInterface_SPC =
+        .Header = {
-        {
+            .Size               = sizeof(USB_MIDI_Descriptor_AudioInterface_AS_t),
-            .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_AudioInterface_AS_t), .Type = DTYPE_CSInterface},
+            .Type               = DTYPE_CSInterface
+        },
         .Subtype                = AUDIO_DSUBTYPE_CSInterface_General,
-
         .AudioSpecification     = VERSION_BCD(1, 0, 0),
-
+        .TotalLength            = offsetof(USB_Descriptor_Configuration_t, MIDI_Out_Jack_Endpoint_SPC) + sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t) - offsetof(USB_Descriptor_Configuration_t, Audio_StreamInterface_SPC)
-            .TotalLength              = offsetof(USB_Descriptor_Configuration_t, MIDI_Out_Jack_Endpoint_SPC)
+    },
-                                        + sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t)
+    .MIDI_In_Jack_Emb = {
-                                        - offsetof(USB_Descriptor_Configuration_t, Audio_StreamInterface_SPC)
+        .Header = {
+            .Size               = sizeof(USB_MIDI_Descriptor_InputJack_t),
+            .Type               = DTYPE_CSInterface
         },
-
-    .MIDI_In_Jack_Emb =
-        {
-            .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = DTYPE_CSInterface},
         .Subtype                = AUDIO_DSUBTYPE_CSInterface_InputTerminal,
-
         .JackType               = MIDI_JACKTYPE_Embedded,
         .JackID                 = 0x01,
-
         .JackStrIndex           = NO_DESCRIPTOR
     },
-
+    .MIDI_In_Jack_Ext = {
-    .MIDI_In_Jack_Ext =
+        .Header = {
-        {
+            .Size               = sizeof(USB_MIDI_Descriptor_InputJack_t),
-            .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = DTYPE_CSInterface},
+            .Type               = DTYPE_CSInterface
+        },
         .Subtype                = AUDIO_DSUBTYPE_CSInterface_InputTerminal,
-
         .JackType               = MIDI_JACKTYPE_External,
         .JackID                 = 0x02,
-
         .JackStrIndex           = NO_DESCRIPTOR
     },
-
+    .MIDI_Out_Jack_Emb = {
-    .MIDI_Out_Jack_Emb =
+        .Header = {
-        {
+            .Size               = sizeof(USB_MIDI_Descriptor_OutputJack_t),
-            .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = DTYPE_CSInterface},
+            .Type               = DTYPE_CSInterface
+        },
         .Subtype                = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,
-
         .JackType               = MIDI_JACKTYPE_Embedded,
         .JackID                 = 0x03,
-
         .NumberOfPins           = 1,
         .SourceJackID           = {0x02},
         .SourcePinID            = {0x01},
-
         .JackStrIndex           = NO_DESCRIPTOR
     },
-
+    .MIDI_Out_Jack_Ext = {
-    .MIDI_Out_Jack_Ext =
+        .Header = {
-        {
+            .Size               = sizeof(USB_MIDI_Descriptor_OutputJack_t),
-            .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = DTYPE_CSInterface},
+            .Type               = DTYPE_CSInterface
+        },
         .Subtype                = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,
-
         .JackType               = MIDI_JACKTYPE_External,
         .JackID                 = 0x04,
-
         .NumberOfPins           = 1,
         .SourceJackID           = {0x01},
         .SourcePinID            = {0x01},
-
         .JackStrIndex           = NO_DESCRIPTOR
     },
-
+    .MIDI_In_Jack_Endpoint = {
-    .MIDI_In_Jack_Endpoint =
+        .Endpoint = {
-        {
+            .Header = {
-            .Endpoint =
+                .Size           = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t),
-                {
+                .Type           = DTYPE_Endpoint
-                    .Header              = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
+            },
-
             .EndpointAddress    = MIDI_STREAM_OUT_EPADDR,
             .Attributes         = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
             .EndpointSize       = MIDI_STREAM_EPSIZE,
             .PollingIntervalMS  = 0x05
         },
-
         .Refresh                = 0,
         .SyncEndpointNumber     = 0
     },
-
+    .MIDI_In_Jack_Endpoint_SPC = {
-    .MIDI_In_Jack_Endpoint_SPC =
+        .Header = {
-        {
+            .Size               = sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t),
-            .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t), .Type = DTYPE_CSEndpoint},
+            .Type               = DTYPE_CSEndpoint
+        },
         .Subtype                = AUDIO_DSUBTYPE_CSEndpoint_General,
-
         .TotalEmbeddedJacks     = 0x01,
         .AssociatedJackID       = {0x01}
     },
-
+    .MIDI_Out_Jack_Endpoint = {
-    .MIDI_Out_Jack_Endpoint =
+        .Endpoint = {
-        {
+            .Header = {
-            .Endpoint =
+                .Size           = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t),
-                {
+                .Type           = DTYPE_Endpoint
-                    .Header              = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
+            },
-
             .EndpointAddress    = MIDI_STREAM_IN_EPADDR,
             .Attributes         = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
             .EndpointSize       = MIDI_STREAM_EPSIZE,
             .PollingIntervalMS  = 0x05
         },
-
         .Refresh                = 0,
         .SyncEndpointNumber     = 0
     },
-
+    .MIDI_Out_Jack_Endpoint_SPC = {
-    .MIDI_Out_Jack_Endpoint_SPC =
+        .Header = {
-        {
+            .Size               = sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t),
-            .Header                   = {.Size = sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t), .Type = DTYPE_CSEndpoint},
+            .Type               = DTYPE_CSEndpoint
+        },
         .Subtype                = AUDIO_DSUBTYPE_CSEndpoint_General,
-
         .TotalEmbeddedJacks     = 0x01,
         .AssociatedJackID       = {0x03}
     },
 #endif
 
 #ifdef VIRTSER_ENABLE
-    .CDC_Interface_Association =
+    /*
-            {
+     * Virtual Serial
-                    .Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
+     */
-
+    .CDC_Interface_Association = {
+        .Header = {
+            .Size               = sizeof(USB_Descriptor_Interface_Association_t),
+            .Type               = DTYPE_InterfaceAssociation
+        },
         .FirstInterfaceIndex    = CCI_INTERFACE,
         .TotalInterfaces        = 2,
-
         .Class                  = CDC_CSCP_CDCClass,
         .SubClass               = CDC_CSCP_ACMSubclass,
         .Protocol               = CDC_CSCP_ATCommandProtocol,
-
         .IADStrIndex            = NO_DESCRIPTOR,
     },
-
+    .CDC_CCI_Interface = {
-    .CDC_CCI_Interface =
+        .Header = {
-            {
+            .Size               = sizeof(USB_Descriptor_Interface_t),
-                    .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+            .Type               = DTYPE_Interface
-
+        },
         .InterfaceNumber        = CCI_INTERFACE,
         .AlternateSetting       = 0,
-
         .TotalEndpoints         = 1,
-
         .Class                  = CDC_CSCP_CDCClass,
         .SubClass               = CDC_CSCP_ACMSubclass,
         .Protocol               = CDC_CSCP_ATCommandProtocol,
-
         .InterfaceStrIndex      = NO_DESCRIPTOR
     },
-
+    .CDC_Functional_Header = {
-    .CDC_Functional_Header =
+        .Header = {
-            {
+            .Size               = sizeof(USB_CDC_Descriptor_FunctionalHeader_t),
-                    .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},
+            .Type               = DTYPE_CSInterface
+        },
         .Subtype                = 0x00,
-
         .CDCSpecification       = VERSION_BCD(1, 1, 0),
     },
-
+    .CDC_Functional_ACM = {
-    .CDC_Functional_ACM =
+        .Header = {
-            {
+            .Size               = sizeof(USB_CDC_Descriptor_FunctionalACM_t),
-                    .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},
+            .Type               = DTYPE_CSInterface
+        },
         .Subtype                = 0x02,
-
         .Capabilities           = 0x02,
     },
-
+    .CDC_Functional_Union = {
-    .CDC_Functional_Union =
+        .Header = {
-            {
+            .Size               = sizeof(USB_CDC_Descriptor_FunctionalUnion_t),
-                    .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
+            .Type               = DTYPE_CSInterface
+        },
         .Subtype                = 0x06,
-
         .MasterInterfaceNumber  = CCI_INTERFACE,
         .SlaveInterfaceNumber   = CDI_INTERFACE,
     },
-
+    .CDC_NotificationEndpoint = {
-    .CDC_NotificationEndpoint =
+        .Header = {
-            {
+            .Size               = sizeof(USB_Descriptor_Endpoint_t),
-                    .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+            .Type               = DTYPE_Endpoint
-
+        },
         .EndpointAddress        = CDC_NOTIFICATION_EPADDR,
         .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
         .EndpointSize           = CDC_NOTIFICATION_EPSIZE,
         .PollingIntervalMS      = 0xFF
     },
-
+    .CDC_DCI_Interface = {
-    .CDC_DCI_Interface =
+        .Header = {
-            {
+            .Size               = sizeof(USB_Descriptor_Interface_t),
-                    .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+            .Type               = DTYPE_Interface
-
+        },
         .InterfaceNumber        = CDI_INTERFACE,
         .AlternateSetting       = 0,
-
         .TotalEndpoints         = 2,
-
         .Class                  = CDC_CSCP_CDCDataClass,
         .SubClass               = CDC_CSCP_NoDataSubclass,
         .Protocol               = CDC_CSCP_NoDataProtocol,
-
         .InterfaceStrIndex      = NO_DESCRIPTOR
     },
-
+    .CDC_DataOutEndpoint = {
-    .CDC_DataOutEndpoint =
+        .Header = {
-            {
+            .Size               = sizeof(USB_Descriptor_Endpoint_t),
-                    .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+            .Type               = DTYPE_Endpoint
-
+        },
         .EndpointAddress        = CDC_OUT_EPADDR,
         .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
         .EndpointSize           = CDC_EPSIZE,
         .PollingIntervalMS      = 0x05
     },
-
+    .CDC_DataInEndpoint = {
-    .CDC_DataInEndpoint =
+        .Header = {
-            {
+            .Size               = sizeof(USB_Descriptor_Endpoint_t),
-                    .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+            .Type               = DTYPE_Endpoint
-
+        },
         .EndpointAddress        = CDC_IN_EPADDR,
         .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
         .EndpointSize           = CDC_EPSIZE,
@@ -834,30 +806,30 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 #endif
 };
 
-
+/*
-/*******************************************************************************
+ * String descriptors
- * String Descriptors
+ */
- ******************************************************************************/
+const USB_Descriptor_String_t PROGMEM LanguageString = {
-const USB_Descriptor_String_t PROGMEM LanguageString =
+    .Header = {
-{
+        .Size      = USB_STRING_LEN(1),
-    .Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
+        .Type      = DTYPE_String
-
+    },
     .UnicodeString = {LANGUAGE_ID_ENG}
 };
 
-const USB_Descriptor_String_t PROGMEM ManufacturerString =
+const USB_Descriptor_String_t PROGMEM ManufacturerString = {
-{
+    .Header = {
-    /* subtract 1 for null terminator */
+        .Size      = USB_STRING_LEN(sizeof(STR(MANUFACTURER)) - 1), // Subtract 1 for null terminator
-    .Header                 = {.Size = USB_STRING_LEN(sizeof(STR(MANUFACTURER))-1), .Type = DTYPE_String},
+        .Type      = DTYPE_String
-
+    },
     .UnicodeString = LSTR(MANUFACTURER)
 };
 
-const USB_Descriptor_String_t PROGMEM ProductString =
+const USB_Descriptor_String_t PROGMEM ProductString = {
-{
+    .Header = {
-    /* subtract 1 for null terminator */
+        .Size      = USB_STRING_LEN(sizeof(STR(PRODUCT)) - 1), // Subtract 1 for null terminator
-    .Header                 = {.Size = USB_STRING_LEN(sizeof(STR(PRODUCT))-1), .Type = DTYPE_String},
+        .Type      = DTYPE_String
-
+    },
     .UnicodeString = LSTR(PRODUCT)
 };
 
@@ -865,61 +837,62 @@ const USB_Descriptor_String_t PROGMEM ProductString =
     #define SERIAL_NUMBER 0
 #endif
 
-const USB_Descriptor_String_t PROGMEM SerialNumberString =
+const USB_Descriptor_String_t PROGMEM SerialNumberString = {
-{
+    .Header = {
-    /* subtract 1 for null terminator */
+        .Size      = USB_STRING_LEN(sizeof(STR(SERIAL_NUMBER)) - 1), // Subtract 1 for null terminator
-    .Header                 = {.Size = USB_STRING_LEN(sizeof(STR(SERIAL_NUMBER))-1), .Type = DTYPE_String},
+        .Type      = DTYPE_String
-
+    },
     .UnicodeString = LSTR(SERIAL_NUMBER)
 };
 
-
+/**
-/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
+ * This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
  * documentation) by the application code so that the address and size of a requested descriptor can be given
  * to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function
  * is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
  * USB host.
  */
-uint16_t get_usb_descriptor(const uint16_t wValue,
+uint16_t get_usb_descriptor(const uint16_t wValue, const uint16_t wIndex, const void** const DescriptorAddress) {
-                            const uint16_t wIndex,
-                            const void** const DescriptorAddress)
-{
     const uint8_t DescriptorType  = (wValue >> 8);
     const uint8_t DescriptorIndex = (wValue & 0xFF);
-
     const void*   Address         = NULL;
     uint16_t      Size            = NO_DESCRIPTOR;
 
-    switch (DescriptorType)
+    switch (DescriptorType) {
-    {
         case DTYPE_Device:
             Address = &DeviceDescriptor;
             Size    = sizeof(USB_Descriptor_Device_t);
+
             break;
         case DTYPE_Configuration:
             Address = &ConfigurationDescriptor;
             Size    = sizeof(USB_Descriptor_Configuration_t);
+
             break;
         case DTYPE_String:
-            switch (DescriptorIndex )
+            switch (DescriptorIndex) {
-            {
                 case 0x00:
                     Address = &LanguageString;
                     Size    = pgm_read_byte(&LanguageString.Header.Size);
+
                     break;
                 case 0x01:
                     Address = &ManufacturerString;
                     Size    = pgm_read_byte(&ManufacturerString.Header.Size);
+
                     break;
                 case 0x02:
                     Address = &ProductString;
                     Size    = pgm_read_byte(&ProductString.Header.Size);
+
                     break;
                 case 0x03:
                     Address = &SerialNumberString;
                     Size    = pgm_read_byte(&SerialNumberString.Header.Size);
+
                     break;
             }
+
             break;
         case HID_DTYPE_HID:
             switch (wIndex) {
@@ -929,31 +902,40 @@ uint16_t get_usb_descriptor(const uint16_t wValue,
                     Size    = sizeof(USB_HID_Descriptor_HID_t);
                     break;
 #endif
+
 #if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
                 case MOUSE_INTERFACE:
                     Address = &ConfigurationDescriptor.Mouse_HID;
                     Size    = sizeof(USB_HID_Descriptor_HID_t);
+
                     break;
 #endif
+
 #ifdef SHARED_EP_ENABLE
                 case SHARED_INTERFACE:
                     Address = &ConfigurationDescriptor.Shared_HID;
                     Size    = sizeof(USB_HID_Descriptor_HID_t);
+
                     break;
 #endif
+
 #ifdef RAW_ENABLE
                 case RAW_INTERFACE:
                     Address = &ConfigurationDescriptor.Raw_HID;
                     Size    = sizeof(USB_HID_Descriptor_HID_t);
+
                     break;
 #endif
+
 #ifdef CONSOLE_ENABLE
                 case CONSOLE_INTERFACE:
                     Address = &ConfigurationDescriptor.Console_HID;
                     Size    = sizeof(USB_HID_Descriptor_HID_t);
+
                     break;
 #endif
             }
+
             break;
         case HID_DTYPE_Report:
             switch (wIndex) {
@@ -961,36 +943,47 @@ uint16_t get_usb_descriptor(const uint16_t wValue,
                 case KEYBOARD_INTERFACE:
                     Address = &KeyboardReport;
                     Size    = sizeof(KeyboardReport);
+
                     break;
 #endif
+
 #if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
                 case MOUSE_INTERFACE:
                     Address = &MouseReport;
                     Size    = sizeof(MouseReport);
+
                     break;
 #endif
+
 #ifdef SHARED_EP_ENABLE
                 case SHARED_INTERFACE:
                     Address = &SharedReport;
                     Size    = sizeof(SharedReport);
+
                     break;
 #endif
+
 #ifdef RAW_ENABLE
                 case RAW_INTERFACE:
                     Address = &RawReport;
                     Size    = sizeof(RawReport);
+
                     break;
 #endif
+
 #ifdef CONSOLE_ENABLE
                 case CONSOLE_INTERFACE:
                     Address = &ConsoleReport;
                     Size    = sizeof(ConsoleReport);
+
                     break;
 #endif
             }
+
             break;
     }
 
     *DescriptorAddress = Address;
+
     return Size;
 }

tmk_core/protocol/usb_descriptor.h

@@ -40,17 +40,19 @@
  *
  *  Header file for Descriptors.c.
  */
-
 #ifndef _DESCRIPTORS_H_
     #define _DESCRIPTORS_H_
 
     #include <LUFA/Drivers/USB/USB.h>
+
     #ifdef PROTOCOL_CHIBIOS
         #include "hal.h"
     #endif
 
-typedef struct
+/*
-{
+ * USB descriptor structure
+ */
+typedef struct {
     USB_Descriptor_Configuration_Header_t    Config;
 
     #ifndef KEYBOARD_SHARED_EP
@@ -67,13 +69,14 @@ typedef struct
     USB_Descriptor_Endpoint_t                 Mouse_INEndpoint;
     #endif
 
-#if defined(SHARED_EP_ENABLE)
+    #ifdef SHARED_EP_ENABLE
+    // Shared Interface
     USB_Descriptor_Interface_t                Shared_Interface;
     USB_HID_Descriptor_HID_t                  Shared_HID;
     USB_Descriptor_Endpoint_t                 Shared_INEndpoint;
     #endif
 
-#if defined(RAW_ENABLE)
+    #ifdef RAW_ENABLE
     // Raw HID Interface
     USB_Descriptor_Interface_t                Raw_Interface;
     USB_HID_Descriptor_HID_t                  Raw_HID;
@@ -94,7 +97,6 @@ typedef struct
     // MIDI Audio Control Interface
     USB_Descriptor_Interface_t                Audio_ControlInterface;
     USB_Audio_Descriptor_Interface_AC_t       Audio_ControlInterface_SPC;
-
     // MIDI Audio Streaming Interface
     USB_Descriptor_Interface_t                Audio_StreamInterface;
     USB_MIDI_Descriptor_AudioInterface_AS_t   Audio_StreamInterface_SPC;
@@ -110,14 +112,12 @@ typedef struct
 
     #ifdef VIRTSER_ENABLE
     USB_Descriptor_Interface_Association_t    CDC_Interface_Association;
-
     // CDC Control Interface
     USB_Descriptor_Interface_t                CDC_CCI_Interface;
     USB_CDC_Descriptor_FunctionalHeader_t     CDC_Functional_Header;
     USB_CDC_Descriptor_FunctionalACM_t        CDC_Functional_ACM;
     USB_CDC_Descriptor_FunctionalUnion_t      CDC_Functional_Union;
     USB_Descriptor_Endpoint_t                 CDC_NotificationEndpoint;
-
     // CDC Data Interface
     USB_Descriptor_Interface_t                CDC_DCI_Interface;
     USB_Descriptor_Endpoint_t                 CDC_DataOutEndpoint;
@@ -125,63 +125,80 @@ typedef struct
     #endif
 } USB_Descriptor_Configuration_t;
 
-
+/*
-/* index of interface */
+ * Interface indexes
+ */
 enum usb_interfaces {
-#if !defined(KEYBOARD_SHARED_EP)
+    #ifndef KEYBOARD_SHARED_EP
     KEYBOARD_INTERFACE,
     #else
         #define KEYBOARD_INTERFACE SHARED_INTERFACE
     #endif
+
     // It is important that the Raw HID interface is at a constant
     // interface number, to support Linux/OSX platforms and chrome.hid
     // If Raw HID is enabled, let it be always 1.
-#if defined(RAW_ENABLE)
+    #ifdef RAW_ENABLE
     RAW_INTERFACE,
     #endif
+
     #if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
     MOUSE_INTERFACE,
     #endif
-#if defined(SHARED_EP_ENABLE)
+
+    #ifdef SHARED_EP_ENABLE
     SHARED_INTERFACE,
     #endif
-#if defined(CONSOLE_ENABLE)
+
+    #ifdef CONSOLE_ENABLE
     CONSOLE_INTERFACE,
     #endif
-#if defined(MIDI_ENABLE)
+
+    #ifdef MIDI_ENABLE
     AC_INTERFACE,
     AS_INTERFACE,
     #endif
-#if defined(VIRTSER_ENABLE)
+
+    #ifdef VIRTSER_ENABLE
     CCI_INTERFACE,
     CDI_INTERFACE,
     #endif
+
     TOTAL_INTERFACES
 };
 
     #define NEXT_EPNUM __COUNTER__
 
+/*
+ * Endpoint numbers
+ */
 enum usb_endpoints {
-    __unused_epnum__ = NEXT_EPNUM,   /* EP numbering starts at 1 */
+    __unused_epnum__ = NEXT_EPNUM, // Endpoint numbering starts at 1
-#if !defined(KEYBOARD_SHARED_EP)
+
+    #ifndef KEYBOARD_SHARED_EP
     KEYBOARD_IN_EPNUM = NEXT_EPNUM,
     #else
         #define KEYBOARD_IN_EPNUM SHARED_IN_EPNUM
     #endif
+
     #if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
     MOUSE_IN_EPNUM = NEXT_EPNUM,
     #else
         #define MOUSE_IN_EPNUM SHARED_IN_EPNUM
     #endif
-#if defined(RAW_ENABLE)
+
+    #ifdef RAW_ENABLE
     RAW_IN_EPNUM = NEXT_EPNUM,
     RAW_OUT_EPNUM = NEXT_EPNUM,
     #endif
-#if defined(SHARED_EP_ENABLE)
+
+    #ifdef SHARED_EP_ENABLE
     SHARED_IN_EPNUM = NEXT_EPNUM,
     #endif
-#if defined(CONSOLE_ENABLE)
+
+    #ifdef CONSOLE_ENABLE
     CONSOLE_IN_EPNUM = NEXT_EPNUM,
+
         #ifdef PROTOCOL_CHIBIOS
     // ChibiOS has enough memory and descriptor to actually enable the endpoint
     // It could use the same endpoint numbers, as that's supported by ChibiOS
@@ -191,12 +208,14 @@ enum usb_endpoints {
             #define CONSOLE_OUT_EPNUM CONSOLE_IN_EPNUM
         #endif
     #endif
+
     #ifdef MIDI_ENABLE
     MIDI_STREAM_IN_EPNUM = NEXT_EPNUM,
     MIDI_STREAM_OUT_EPNUM = NEXT_EPNUM,
         #define MIDI_STREAM_IN_EPADDR  (ENDPOINT_DIR_IN  | MIDI_STREAM_IN_EPNUM)
         #define MIDI_STREAM_OUT_EPADDR (ENDPOINT_DIR_OUT | MIDI_STREAM_OUT_EPNUM)
     #endif
+
     #ifdef VIRTSER_ENABLE
     CDC_NOTIFICATION_EPNUM = NEXT_EPNUM,
     CDC_IN_EPNUM = NEXT_EPNUM,
@@ -207,18 +226,18 @@ enum usb_endpoints {
     #endif
 };
 
-#if defined(PROTOCOL_LUFA)
+    #ifdef PROTOCOL_LUFA
-/* LUFA tells us total endpoints including control */
+        // LUFA tells us total endpoints including control
         #define MAX_ENDPOINTS (ENDPOINT_TOTAL_ENDPOINTS - 1)
     #elif defined(PROTOCOL_CHIBIOS)
-/* ChibiOS gives us number of available user endpoints, not control */
+        // ChibiOS gives us number of available user endpoints, not control
         #define MAX_ENDPOINTS USB_MAX_ENDPOINTS
     #endif
-/* TODO - ARM_ATSAM */
 
+    // TODO - ARM_ATSAM
 
     #if (NEXT_EPNUM - 1) > MAX_ENDPOINTS
-# error There are not enough available endpoints to support all functions. Remove some in the rules.mk file. (MOUSEKEY, EXTRAKEY, CONSOLE, NKRO, MIDI, SERIAL, STENO)
+        #error There are not enough available endpoints to support all functions. Please disable one or more of the following: Mouse Keys, Extra Keys, Console, NKRO, MIDI, Serial, Steno
     #endif
 
     #define KEYBOARD_EPSIZE          8
@@ -230,17 +249,5 @@ enum usb_endpoints {
     #define CDC_NOTIFICATION_EPSIZE  8
     #define CDC_EPSIZE              16
 
-uint16_t get_usb_descriptor(const uint16_t wValue,
+uint16_t get_usb_descriptor(const uint16_t wValue, const uint16_t wIndex, const void** const DescriptorAddress);
-                            const uint16_t wIndex,
-                            const void** const DescriptorAddress);
-
-/* new API */
-#if LUFA_VERSION_INTEGER < 0x140302
-    #undef VERSION_BCD
-    #define VERSION_BCD(Major, Minor, Revision) \
-                                              CPU_TO_LE16( ((Major & 0xFF) << 8) | \
-                                                           ((Minor & 0x0F) << 4) | \
-                                                           (Revision & 0x0F) )
-#endif
-
 #endif

util/linux_install.sh

@@ -17,6 +17,7 @@ if grep ID /etc/os-release | grep -qE "fedora"; then
 		avr-gcc \
 		avr-libc \
 		binutils-avr32-linux-gnu \
+		clang \
 		dfu-util \
 		dfu-programmer \
 		diffutils \
@@ -42,6 +43,7 @@ elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then
 		avr-libc \
 		binutils-arm-none-eabi \
 		binutils-avr \
+		clang-format \
 		dfu-programmer \
 		dfu-util \
 		diffutils \
@@ -66,6 +68,7 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
 		avr-libc \
 		avr-gcc \
 		base-devel \
+		clang \
 		dfu-util \
 		diffutils \
 		gcc \
@@ -94,6 +97,7 @@ elif grep ID /etc/os-release | grep -q gentoo; then
 			dev-embedded/avrdude \
 			dev-lang/python:3.5 \
 			net-misc/wget \
+			sys-devel/clang \
 			sys-devel/gcc \
 			sys-devel/crossdev
 		sudo crossdev -s4 --stable --g =4.9.4 --portage --verbose --target avr
@@ -110,6 +114,7 @@ elif grep ID /etc/os-release | grep -q sabayon; then
 		dev-embedded/avrdude \
 		dev-lang/python \
 		net-misc/wget \
+		sys-devel/clang \
 		sys-devel/gcc \
 		sys-devel/crossdev
 	sudo crossdev -s4 --stable --g =4.9.4 --portage --verbose --target avr
@@ -124,6 +129,7 @@ elif grep ID /etc/os-release | grep -qE "opensuse|tumbleweed"; then
 	fi
 	sudo zypper install \
 		avr-libc \
+		clang \
 		$CROSS_AVR_GCC \
 		$CROSS_ARM_GCC \
 		cross-avr-binutils \

util/macos_install.sh

@@ -22,5 +22,5 @@ fi
 brew tap osx-cross/avr
 brew tap PX4/homebrew-px4
 brew update
-brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude dfu-util python3
+brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude clang-format dfu-util python3
 brew link --force avr-gcc@8

util/msys2_install.sh

@@ -7,7 +7,7 @@ armtools=gcc-arm-none-eabi
 installflip=false
 
 echo "Installing dependencies needed for the installation (quazip)"
-pacman --needed -S base-devel mingw-w64-x86_64-toolchain msys/git msys/p7zip msys/python3 msys/unzip
+pacman --needed -S base-devel mingw-w64-x86_64-toolchain msys/clang msys/git msys/p7zip msys/python3 msys/unzip
 
 source "$dir/win_shared_install.sh"
 

util/travis_compiled_push.sh

@@ -9,9 +9,10 @@ echo "Using git hash ${rev}"
 
 if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
 
-# convert to unix line-endings
+# fix formatting
 git checkout master
 git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix
+git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | grep -e '^drivers' -e '^quantum' -e '^tests' -e '^tmk_core' | xargs -0 clang-format
 git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add
 git commit -m "convert to unix line-endings [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master