Merge remote-tracking branch 'upstream/master'

29 files changed, 2329 insertions, 2071 deletions

diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk
index 0eeace44ec..5b1e3d19d0 100644
--- a/tmk_core/protocol/lufa.mk
+++ b/tmk_core/protocol/lufa.mk
@@ -26,6 +26,10 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
 	$(TMK_DIR)/protocol/serial_uart.c
 endif
 
+ifeq ($(strip $(VIRTSER_ENABLE)), yes)
+	LUFA_SRC += $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDCClassDevice.c
+endif
+
 SRC += $(LUFA_SRC)
 
 # Search Path
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/Docbook/mshelp/placeholder.txt b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/Docbook/mshelp/placeholder.txt
index 486e9a4270..a34fd58dfa 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/Docbook/mshelp/placeholder.txt
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/Docbook/mshelp/placeholder.txt
@@ -1 +1 @@
-Copy the Microsoft HV1 Docbook transform contents into this directory (i.e. with the XSLT files in the current folder). The HV1 transform proposal can be found at http://sourceforge.net/tracker/?func=detail&aid=3610290&group_id=21935&atid=373750 .

+Copy the Microsoft HV1 Docbook transform contents into this directory (i.e. with the XSLT files in the current folder). The HV1 transform proposal can be found at http://sourceforge.net/tracker/?func=detail&aid=3610290&group_id=21935&atid=373750 .
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/Docbook/placeholder.txt b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/Docbook/placeholder.txt
index c017acfd75..dd69b7e0bd 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/Docbook/placeholder.txt
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/Docbook/placeholder.txt
@@ -1 +1 @@
-Copy the Docbook XSLT docbook-xsl-1.78.1 release contents into this directory (i.e. with the root Docbook files in the current folder). The Docbook releases can be found at http://sourceforge.net/projects/docbook/files/docbook-xsl/ .

+Copy the Docbook XSLT docbook-xsl-1.78.1 release contents into this directory (i.e. with the root Docbook files in the current folder). The Docbook releases can be found at http://sourceforge.net/projects/docbook/files/docbook-xsl/ .
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/HV1/lufa_hv1_transform.xslt b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/HV1/lufa_hv1_transform.xslt
index ee8a38340d..8aa4a9413e 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/HV1/lufa_hv1_transform.xslt
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/HV1/lufa_hv1_transform.xslt
@@ -1,45 +1,45 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Docbook XML to Microsoft Help Viewer 1.0 transform file -->

-

-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">

-

-	<xsl:import href="../Docbook/mshelp/docbook.xsl"/>

-

-	<xsl:output method="xml" indent="no"/>

-

-	<xsl:template match="emphasis[@role = 'keyword' or @role = 'keywordtype' or @role = 'keywordflow']">

-		<span class="hl-keyword" style="color: #0079C1">

-			<xsl:apply-templates/>

-		</span>

-	</xsl:template>

-

-	<xsl:template match="emphasis[@role = 'stringliteral' or @role = 'charliteral']">

-		<span class="hl-string" style="color: #800000">

-			<xsl:apply-templates/>

-		</span>

-	</xsl:template>

-

-	<xsl:template match="emphasis[@role = 'comment']">

-		<em class="hl-comment" style="color: #008000">

-			<xsl:apply-templates/>

-		</em>

-	</xsl:template>

-

-	<xsl:template match="emphasis[@role = 'preprocessor']">

-		<span class="hl-preprocessor" style="color: #A000A0">

-			<xsl:apply-templates/>

-		</span>

-	</xsl:template>

-

-	<xsl:template match="emphasis[@role = 'normal' and ancestor::programlisting]">

-		<xsl:apply-templates />

-	</xsl:template>

-

-</xsl:stylesheet>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Docbook XML to Microsoft Help Viewer 1.0 transform file -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+	<xsl:import href="../Docbook/mshelp/docbook.xsl"/>
+
+	<xsl:output method="xml" indent="no"/>
+
+	<xsl:template match="emphasis[@role = 'keyword' or @role = 'keywordtype' or @role = 'keywordflow']">
+		<span class="hl-keyword" style="color: #0079C1">
+			<xsl:apply-templates/>
+		</span>
+	</xsl:template>
+
+	<xsl:template match="emphasis[@role = 'stringliteral' or @role = 'charliteral']">
+		<span class="hl-string" style="color: #800000">
+			<xsl:apply-templates/>
+		</span>
+	</xsl:template>
+
+	<xsl:template match="emphasis[@role = 'comment']">
+		<em class="hl-comment" style="color: #008000">
+			<xsl:apply-templates/>
+		</em>
+	</xsl:template>
+
+	<xsl:template match="emphasis[@role = 'preprocessor']">
+		<span class="hl-preprocessor" style="color: #A000A0">
+			<xsl:apply-templates/>
+		</span>
+	</xsl:template>
+
+	<xsl:template match="emphasis[@role = 'normal' and ancestor::programlisting]">
+		<xsl:apply-templates />
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/HV1/lufa_studio_help_styling.css b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/HV1/lufa_studio_help_styling.css
index 49eb7e9706..0b6ccbd8c1 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/HV1/lufa_studio_help_styling.css
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/HV1/lufa_studio_help_styling.css
@@ -1,53 +1,53 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-.programlisting {

- 	display: block;

- 	margin-left: 15px;

- 	padding: 10px;

- 	background-color: #f4f4f4;

- 	border: 1px solid #aaaaaa;

- 	font-family: "Consolas", "Courier New", sans-serif;

- }

-

- code {

- 	background-color: #f4f4f4;

- 	font-family: "Consolas", "Courier New", sans-serif;

- }

-

-.note, .warning, .tip {

-	display: block;

- 	margin-left: 15px;

- 	padding-left: 10px;

- 	padding-bottom: 5px;

- 	background-color: #f4f4f4;

- 	border: 1px solid #aaaaaa;

-}

-

-table {

-	border: 1px solid #aaaaaa;

-	border-collapse: collapse;

-	margin-left: 15px;

-	font-size: 10pt;

-}

-

-table thead {

- 	background-color: #f4f4f4;

-}

-

-table thead th {

-	padding: 5px;

-}

-

-table tbody td {

-	padding: 5px;

-}

-

-ul {

-	padding-left: 20px;

-}

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+.programlisting {
+ 	display: block;
+ 	margin-left: 15px;
+ 	padding: 10px;
+ 	background-color: #f4f4f4;
+ 	border: 1px solid #aaaaaa;
+ 	font-family: "Consolas", "Courier New", sans-serif;
+ }
+
+ code {
+ 	background-color: #f4f4f4;
+ 	font-family: "Consolas", "Courier New", sans-serif;
+ }
+
+.note, .warning, .tip {
+	display: block;
+ 	margin-left: 15px;
+ 	padding-left: 10px;
+ 	padding-bottom: 5px;
+ 	background-color: #f4f4f4;
+ 	border: 1px solid #aaaaaa;
+}
+
+table {
+	border: 1px solid #aaaaaa;
+	border-collapse: collapse;
+	margin-left: 15px;
+	font-size: 10pt;
+}
+
+table thead {
+ 	background-color: #f4f4f4;
+}
+
+table thead th {
+	padding: 5px;
+}
+
+table tbody td {
+	padding: 5px;
+}
+
+ul {
+	padding-left: 20px;
+}
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/[Content_Types].xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/[Content_Types].xml
index 05ef8b6ba4..112d169942 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/[Content_Types].xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/[Content_Types].xml
@@ -1,13 +1,13 @@
-<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">

-	<Default Extension="vsixmanifest" ContentType="text/xml"/>

-	<Default Extension="cache" ContentType="text/xml"/>

-	<Default Extension="png" ContentType="application/octet-stream"/>

-	<Default Extension="txt" ContentType="text/plain"/>

-	<Default Extension="xml" ContentType="text/xml"/>

-	<Default Extension="zip" ContentType="application/octet-stream"/>

-	<Default Extension="dll" ContentType="application/octet-stream" />

-	<Default Extension="pkgdef" ContentType="text/plain" />

-	<Default Extension="htm" ContentType="text/html" />

-	<Default Extension="msha" ContentType="text/html" />

-	<Default Extension="mshc" ContentType="application/octet-stream"/>

-</Types>

+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
+	<Default Extension="vsixmanifest" ContentType="text/xml"/>
+	<Default Extension="cache" ContentType="text/xml"/>
+	<Default Extension="png" ContentType="application/octet-stream"/>
+	<Default Extension="txt" ContentType="text/plain"/>
+	<Default Extension="xml" ContentType="text/xml"/>
+	<Default Extension="zip" ContentType="application/octet-stream"/>
+	<Default Extension="dll" ContentType="application/octet-stream" />
+	<Default Extension="pkgdef" ContentType="text/plain" />
+	<Default Extension="htm" ContentType="text/html" />
+	<Default Extension="msha" ContentType="text/html" />
+	<Default Extension="mshc" ContentType="application/octet-stream"/>
+</Types>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/asf-manifest.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/asf-manifest.xml
index 794fd689e1..bd969518a1 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/asf-manifest.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/asf-manifest.xml
@@ -1,18 +1,18 @@
-<AsfContentProvider Version="1.0.0">

-	<Identifier Id="0e160d5c-e331-48d9-850b-e0387912171b">

-		<Org>FourWalledCubicle</Org>

-		<ShortName>LUFA</ShortName>

-		<Author>Dean Camera</Author>

-		<Description/>

-		<FollowFolderStructure>True</FollowFolderStructure>

-	</Identifier>

-	<AsfContent Type="zip" Path="contents.zip">

-		<Content>

-			<Version>0</Version>

-			<HelpURL/>

-			<Locator/>

-			<DbXMLPath>content.xml.cache</DbXMLPath>

-			<Description/>

-		</Content>

-	</AsfContent>

-</AsfContentProvider>

+<AsfContentProvider Version="1.0.0">
+	<Identifier Id="0e160d5c-e331-48d9-850b-e0387912171b">
+		<Org>FourWalledCubicle</Org>
+		<ShortName>LUFA</ShortName>
+		<Author>Dean Camera</Author>
+		<Description/>
+		<FollowFolderStructure>True</FollowFolderStructure>
+	</Identifier>
+	<AsfContent Type="zip" Path="contents.zip">
+		<Content>
+			<Version>0</Version>
+			<HelpURL/>
+			<Locator/>
+			<DbXMLPath>content.xml.cache</DbXMLPath>
+			<Description/>
+		</Content>
+	</AsfContent>
+</AsfContentProvider>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/extension.vsixmanifest b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
index ea6edeb258..8475017443 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>

-

-<Vsix xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">

-	<Identifier Id="FourWalledCubicle.LUFA.0e160d5c-e331-48d9-850b-e0387912171b">

-		<Name>LUFA Library</Name>

-		<Author>Dean Camera</Author>

-		<Version>0</Version>

-		<MoreInfoUrl>http://www.lufa-lib.org</MoreInfoUrl>

-		<Description xml:space="preserve">LUFA, the Lightweight USB Framework for AVRs.</Description>

-

-		<License>License.txt</License>

-		<Icon>LUFA_thumb.png</Icon>

-		<PreviewImage>LUFA.png</PreviewImage>

-

-		<SupportedProducts>

-			<IsolatedShell Version="6.1">AtmelStudio</IsolatedShell>

-			<IsolatedShell Version="6.2">AtmelStudio</IsolatedShell>

-		</SupportedProducts>

-

-		<SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.5"/>

-		<Locale>1033</Locale>

-

-	    <AllUsers>false</AllUsers>

-	</Identifier>

-

-	<References/>

-

-	<Content>

-		<VsPackage>LUFA.pkgdef</VsPackage>

-	    <CustomExtension Type="MSHelp">helpcontentsetup.msha</CustomExtension>

-		<CustomExtension Type="asf-manifest">asf-manifest.xml</CustomExtension>

-	</Content>

-</Vsix>

+<?xml version="1.0" encoding="utf-8"?>
+
+<Vsix xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
+	<Identifier Id="FourWalledCubicle.LUFA.0e160d5c-e331-48d9-850b-e0387912171b">
+		<Name>LUFA Library</Name>
+		<Author>Dean Camera</Author>
+		<Version>0</Version>
+		<MoreInfoUrl>http://www.lufa-lib.org</MoreInfoUrl>
+		<Description xml:space="preserve">LUFA, the Lightweight USB Framework for AVRs.</Description>
+
+		<License>License.txt</License>
+		<Icon>LUFA_thumb.png</Icon>
+		<PreviewImage>LUFA.png</PreviewImage>
+
+		<SupportedProducts>
+			<IsolatedShell Version="6.1">AtmelStudio</IsolatedShell>
+			<IsolatedShell Version="6.2">AtmelStudio</IsolatedShell>
+		</SupportedProducts>
+
+		<SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.5"/>
+		<Locale>1033</Locale>
+
+	    <AllUsers>false</AllUsers>
+	</Identifier>
+
+	<References/>
+
+	<Content>
+		<VsPackage>LUFA.pkgdef</VsPackage>
+	    <CustomExtension Type="MSHelp">helpcontentsetup.msha</CustomExtension>
+		<CustomExtension Type="asf-manifest">asf-manifest.xml</CustomExtension>
+	</Content>
+</Vsix>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/generate_caches.py b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/generate_caches.py
index c51cff400d..eb4b71efdf 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/generate_caches.py
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/VSIX/generate_caches.py
@@ -1,38 +1,38 @@
-"""

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-"""

-

-import sys

-sys.path.append("ProjectGenerator")

-

-

-def show_message(message):

-    print("[Project Generator] %s" % message)

-    sys.stdout.flush()

-

-

-def main(lufa_root_path):

-    try:

-        from asf_avrstudio5_interface import PythonFacade

-    except ImportError:

-        print("Fatal Error: The ASF project generator is missing.")

-        return 1

-

-    p = PythonFacade(lufa_root_path)

-

-    show_message("Checking database sanity...")

-    p.check_extension_database_sanity(lufa_root_path)

-

-    show_message("Building cache files...")

-    p.generate_extension_cache_files(lufa_root_path)

-

-    show_message("Cache files created.")

-    return 0

-

-

-if __name__ == "__main__":

-    sys.exit(main(sys.argv[1]))

+"""
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+"""
+
+import sys
+sys.path.append("ProjectGenerator")
+
+
+def show_message(message):
+    print("[Project Generator] %s" % message)
+    sys.stdout.flush()
+
+
+def main(lufa_root_path):
+    try:
+        from asf_avrstudio5_interface import PythonFacade
+    except ImportError:
+        print("Fatal Error: The ASF project generator is missing.")
+        return 1
+
+    p = PythonFacade(lufa_root_path)
+
+    show_message("Checking database sanity...")
+    p.check_extension_database_sanity(lufa_root_path)
+
+    show_message("Building cache files...")
+    p.generate_extension_cache_files(lufa_root_path)
+
+    show_message("Cache files created.")
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv[1]))
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa.xml
index 28afdda587..86cfc0409d 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa.xml
@@ -1,96 +1,96 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<extension-container>

-		<extension uuid="0e160d5c-e331-48d9-850b-e0387912171b" org="FourWalledCubicle" shortname="LUFA" version="" fullname="Lightweight USB Framework for AVRs (LUFA)">

-			<author name="Dean Camera" website="http://www.lufa-lib.org/" email="dean@fourwalledcubicle.com"/>

-			<description>Lightweight USB Framework for AVRs (LUFA), a USB software stack/framework.</description>

-			<icon-image path="LUFA/DoxygenPages/Images/LUFA_thumb.png"/>

-			<preview-image path="LUFA/DoxygenPages/Images/LUFA.png"/>

-			<license caption="LUFA License" path="LUFA/License.txt"/>

-			<release-notes caption="LUFA Information" url="http://www.lufa-lib.org"/>

-			<online-help>

-				<index-page caption="LUFA Documentation" url="http://www.lufa-lib.org/documentation/"/>

-				<module-help-page scheme="append" baseurl="http://www.lufa-lib.org/documentation/"/>

-				<module-guide-page scheme="append" baseurl="http://www.lufa-lib.org/documentation/"/>

-			</online-help>

-			<dependencies/>

-		</extension>

-	</extension-container>

-

-	<asf>

-		<device-alias-map name="lufa_avr8">

-			<device-support value="at90usb82"/>

-			<device-support value="atmega8u2"/>

-			<device-support value="at90usb162"/>

-			<device-support value="atmega16u2"/>

-			<device-support value="atmega16u4"/>

-			<device-support value="atmega32u2"/>

-			<device-support value="atmega32u4"/>

-			<device-support value="at90usb646"/>

-			<device-support value="at90usb647"/>

-			<device-support value="at90usb1286"/>

-			<device-support value="at90usb1287"/>

-		</device-alias-map>

-

-		<device-alias-map name="lufa_xmega">

-			<device-support value="atxmega16a4u"/>

-			<device-support value="atxmega32a4u"/>

-			<device-support value="atxmega64a4u"/>

-			<device-support value="atxmega128a4u"/>

-			<device-support value="atxmega64a3u"/>

-			<device-support value="atxmega128a3u"/>

-			<device-support value="atxmega192a3u"/>

-			<device-support value="atxmega256a3u"/>

-			<device-support value="atxmega256a3bu"/>

-			<device-support value="atxmega128a1u"/>

-			<device-support value="atxmega64b3"/>

-			<device-support value="atxmega128b3"/>

-			<device-support value="atxmega64b1"/>

-			<device-support value="atxmega128b1"/>

-			<device-support value="atxmega64c3"/>

-			<device-support value="atxmega128c3"/>

-			<!-- <device-support value="atxmega192c3"/> Wait for ASFP-3339 merge and release before enabling -->

-			<device-support value="atxmega256c3"/>

-			<device-support value="atxmega384c3"/>

-			<device-support value="atxmega16c4"/>

-		</device-alias-map>

-

-		<device-alias-map name="lufa_uc3">

-			<device-support value="at32uc3a364"/>

-			<device-support value="at32uc3a364s"/>

-			<device-support value="at32uc3a464"/>

-			<device-support value="at32uc3a464s"/>

-			<device-support value="at32uc3b064"/>

-			<device-support value="at32uc3b164"/>

-			<device-support value="at32uc3a0128"/>

-			<device-support value="at32uc3a1128"/>

-			<device-support value="at32uc3a3128"/>

-			<device-support value="at32uc3a3128s"/>

-			<device-support value="at32uc3a4128"/>

-			<device-support value="at32uc3a4128s"/>

-			<device-support value="at32uc3b0128"/>

-			<device-support value="at32uc3b1128"/>

-			<device-support value="at32uc3a0256"/>

-			<device-support value="at32uc3a1256"/>

-			<device-support value="at32uc3a3256"/>

-			<device-support value="at32uc3a3256s"/>

-			<device-support value="at32uc3a4256"/>

-			<device-support value="at32uc3a4256s"/>

-			<device-support value="at32uc3b0256"/>

-			<device-support value="at32uc3b1256"/>

-			<device-support value="at32uc3a0512"/>

-			<device-support value="at32uc3a1512"/>

-			<device-support value="at32uc3b0512"/>

-			<device-support value="at32uc3b1512"/>

-		</device-alias-map>

-	</asf>

-</lufa>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<extension-container>
+		<extension uuid="0e160d5c-e331-48d9-850b-e0387912171b" org="FourWalledCubicle" shortname="LUFA" version="" fullname="Lightweight USB Framework for AVRs (LUFA)">
+			<author name="Dean Camera" website="http://www.lufa-lib.org/" email="dean@fourwalledcubicle.com"/>
+			<description>Lightweight USB Framework for AVRs (LUFA), a USB software stack/framework.</description>
+			<icon-image path="LUFA/DoxygenPages/Images/LUFA_thumb.png"/>
+			<preview-image path="LUFA/DoxygenPages/Images/LUFA.png"/>
+			<license caption="LUFA License" path="LUFA/License.txt"/>
+			<release-notes caption="LUFA Information" url="http://www.lufa-lib.org"/>
+			<online-help>
+				<index-page caption="LUFA Documentation" url="http://www.lufa-lib.org/documentation/"/>
+				<module-help-page scheme="append" baseurl="http://www.lufa-lib.org/documentation/"/>
+				<module-guide-page scheme="append" baseurl="http://www.lufa-lib.org/documentation/"/>
+			</online-help>
+			<dependencies/>
+		</extension>
+	</extension-container>
+
+	<asf>
+		<device-alias-map name="lufa_avr8">
+			<device-support value="at90usb82"/>
+			<device-support value="atmega8u2"/>
+			<device-support value="at90usb162"/>
+			<device-support value="atmega16u2"/>
+			<device-support value="atmega16u4"/>
+			<device-support value="atmega32u2"/>
+			<device-support value="atmega32u4"/>
+			<device-support value="at90usb646"/>
+			<device-support value="at90usb647"/>
+			<device-support value="at90usb1286"/>
+			<device-support value="at90usb1287"/>
+		</device-alias-map>
+
+		<device-alias-map name="lufa_xmega">
+			<device-support value="atxmega16a4u"/>
+			<device-support value="atxmega32a4u"/>
+			<device-support value="atxmega64a4u"/>
+			<device-support value="atxmega128a4u"/>
+			<device-support value="atxmega64a3u"/>
+			<device-support value="atxmega128a3u"/>
+			<device-support value="atxmega192a3u"/>
+			<device-support value="atxmega256a3u"/>
+			<device-support value="atxmega256a3bu"/>
+			<device-support value="atxmega128a1u"/>
+			<device-support value="atxmega64b3"/>
+			<device-support value="atxmega128b3"/>
+			<device-support value="atxmega64b1"/>
+			<device-support value="atxmega128b1"/>
+			<device-support value="atxmega64c3"/>
+			<device-support value="atxmega128c3"/>
+			<!-- <device-support value="atxmega192c3"/> Wait for ASFP-3339 merge and release before enabling -->
+			<device-support value="atxmega256c3"/>
+			<device-support value="atxmega384c3"/>
+			<device-support value="atxmega16c4"/>
+		</device-alias-map>
+
+		<device-alias-map name="lufa_uc3">
+			<device-support value="at32uc3a364"/>
+			<device-support value="at32uc3a364s"/>
+			<device-support value="at32uc3a464"/>
+			<device-support value="at32uc3a464s"/>
+			<device-support value="at32uc3b064"/>
+			<device-support value="at32uc3b164"/>
+			<device-support value="at32uc3a0128"/>
+			<device-support value="at32uc3a1128"/>
+			<device-support value="at32uc3a3128"/>
+			<device-support value="at32uc3a3128s"/>
+			<device-support value="at32uc3a4128"/>
+			<device-support value="at32uc3a4128s"/>
+			<device-support value="at32uc3b0128"/>
+			<device-support value="at32uc3b1128"/>
+			<device-support value="at32uc3a0256"/>
+			<device-support value="at32uc3a1256"/>
+			<device-support value="at32uc3a3256"/>
+			<device-support value="at32uc3a3256s"/>
+			<device-support value="at32uc3a4256"/>
+			<device-support value="at32uc3a4256s"/>
+			<device-support value="at32uc3b0256"/>
+			<device-support value="at32uc3b1256"/>
+			<device-support value="at32uc3a0512"/>
+			<device-support value="at32uc3a1512"/>
+			<device-support value="at32uc3b0512"/>
+			<device-support value="at32uc3b1512"/>
+		</device-alias-map>
+	</asf>
+</lufa>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_common.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_common.xml
index 9e17b188be..c2ef7af4c7 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_common.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_common.xml
@@ -1,34 +1,34 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<asf>

-		<module type="service" id="lufa.common" caption="LUFA Common Infrastructure">

-			<device-support-alias value="lufa_avr8"/>

-			<device-support-alias value="lufa_xmega"/>

-			<device-support-alias value="lufa_uc3"/>

-

-			<info type="gui-flag" value="hidden"/>

-			<build type="doxygen-entry-point" value="Group_Common"/>

-

-			<build type="include-path" value=".."/>

-			<build type="header-file" subtype="api" value="Version.h"/>

-			<build type="distribute" subtype="license" value="License.txt"/>

-

-			<build type="header-file" subtype="api" value="Common/Common.h"/>

-			<build type="header-file" value="Common/Architectures.h"/>

-			<build type="header-file" value="Common/ArchitectureSpecific.h"/>

-			<build type="header-file" value="Common/Attributes.h"/>

-			<build type="header-file" value="Common/BoardTypes.h"/>

-			<build type="header-file" value="Common/CompilerSpecific.h"/>

-			<build type="header-file" value="Common/Endianness.h"/>

-		</module>

-	</asf>

-</lufa>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<module type="service" id="lufa.common" caption="LUFA Common Infrastructure">
+			<device-support-alias value="lufa_avr8"/>
+			<device-support-alias value="lufa_xmega"/>
+			<device-support-alias value="lufa_uc3"/>
+
+			<info type="gui-flag" value="hidden"/>
+			<build type="doxygen-entry-point" value="Group_Common"/>
+
+			<build type="include-path" value=".."/>
+			<build type="header-file" subtype="api" value="Version.h"/>
+			<build type="distribute" subtype="license" value="License.txt"/>
+
+			<build type="header-file" subtype="api" value="Common/Common.h"/>
+			<build type="header-file" value="Common/Architectures.h"/>
+			<build type="header-file" value="Common/ArchitectureSpecific.h"/>
+			<build type="header-file" value="Common/Attributes.h"/>
+			<build type="header-file" value="Common/BoardTypes.h"/>
+			<build type="header-file" value="Common/CompilerSpecific.h"/>
+			<build type="header-file" value="Common/Endianness.h"/>
+		</module>
+	</asf>
+</lufa>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_board.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_board.xml
index 3677d20036..e150aa6458 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_board.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_board.xml
@@ -1,114 +1,114 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<asf>

-		<board id="lufa.boards.dummy.avr8" vendor="LUFA" caption="AVR8 Architecture">

-			<device-support value="mega"/>

-

-			<require idref="lufa.drivers.board"/>

-			<require idref="lufa.drivers.board.info"/>

-		</board>

-

-		<board id="lufa.boards.dummy.xmega" vendor="LUFA" caption="XMEGA Architecture">

-			<device-support value="xmega"/>

-

-			<require idref="lufa.drivers.board"/>

-			<require idref="lufa.drivers.board.info"/>

-		</board>

-

-		<board id="lufa.boards.dummy.uc3" vendor="LUFA" caption="UC3 Architecture">

-			<device-support value="uc3"/>

-

-			<require idref="lufa.drivers.board"/>

-			<require idref="lufa.drivers.board.info"/>

-		</board>

-

-		<module type="driver" id="lufa.drivers.board.info" caption="LUFA Board Hardware Information Driver">

-			<device-support-alias value="lufa_avr8"/>

-			<device-support-alias value="lufa_xmega"/>

-			<device-support-alias value="lufa_uc3"/>

-

-			<build type="doxygen-entry-point" value="Group_BoardInfo"/>

-

-			<require idref="lufa.common"/>

-

-			<build type="include-path" value=".."/>

-			<build type="header-file"  subtype="api" value="Drivers/Board/Board.h"/>

-		</module>

-

-		<module type="driver" id="lufa.drivers.board.leds" caption="LUFA Board LED Driver">

-			<device-support-alias value="lufa_avr8"/>

-			<device-support-alias value="lufa_xmega"/>

-			<device-support-alias value="lufa_uc3"/>

-

-			<build type="doxygen-entry-point" value="Group_LEDs"/>

-

-			<require idref="lufa.common"/>

-

-			<build type="include-path" value=".."/>

-			<build type="header-file"  subtype="api" value="Drivers/Board/LEDs.h"/>

-		</module>

-

-		<module type="driver" id="lufa.drivers.board.buttons" caption="LUFA Board Buttons Driver">

-			<device-support-alias value="lufa_avr8"/>

-			<device-support-alias value="lufa_xmega"/>

-			<device-support-alias value="lufa_uc3"/>

-

-			<build type="doxygen-entry-point" value="Group_Buttons"/>

-

-			<require idref="lufa.common"/>

-

-			<build type="include-path" value=".."/>

-			<build type="header-file"  subtype="api" value="Drivers/Board/Buttons.h"/>

-		</module>

-

-		<module type="driver" id="lufa.drivers.board.dataflash" caption="LUFA Board Dataflash Driver">

-			<device-support-alias value="lufa_avr8"/>

-			<device-support-alias value="lufa_xmega"/>

-			<device-support-alias value="lufa_uc3"/>

-

-			<build type="doxygen-entry-point" value="Group_Dataflash"/>

-

-			<require idref="lufa.common"/>

-

-			<build type="include-path" value=".."/>

-			<build type="header-file"  subtype="api" value="Drivers/Board/Dataflash.h"/>

-		</module>

-

-		<module type="driver" id="lufa.drivers.board.joystick" caption="LUFA Board Joystick Driver">

-			<device-support-alias value="lufa_avr8"/>

-			<device-support-alias value="lufa_xmega"/>

-			<device-support-alias value="lufa_uc3"/>

-

-			<build type="doxygen-entry-point" value="Group_Joystick"/>

-

-			<require idref="lufa.common"/>

-

-			<build type="include-path" value=".."/>

-			<build type="header-file"  subtype="api" value="Drivers/Board/Joystick.h"/>

-		</module>

-

-		<module type="driver" id="lufa.drivers.board.temperature" caption="LUFA Board Temperature Sensor Driver">

-			<device-support-alias value="lufa_avr8"/>

-			<device-support-alias value="lufa_xmega"/>

-			<device-support-alias value="lufa_uc3"/>

-

-			<build type="doxygen-entry-point" value="Group_Temperature"/>

-

-			<require idref="lufa.common"/>

-			<require idref="lufa.drivers.peripheral.adc"/>

-

-			<build type="c-source"     value="Drivers/Board/Temperature.c"/>

-			<build type="include-path" value=".."/>

-			<build type="header-file"  subtype="api" value="Drivers/Board/Temperature.h"/>

-		</module>

-	</asf>

-</lufa>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<board id="lufa.boards.dummy.avr8" vendor="LUFA" caption="AVR8 Architecture">
+			<device-support value="mega"/>
+
+			<require idref="lufa.drivers.board"/>
+			<require idref="lufa.drivers.board.info"/>
+		</board>
+
+		<board id="lufa.boards.dummy.xmega" vendor="LUFA" caption="XMEGA Architecture">
+			<device-support value="xmega"/>
+
+			<require idref="lufa.drivers.board"/>
+			<require idref="lufa.drivers.board.info"/>
+		</board>
+
+		<board id="lufa.boards.dummy.uc3" vendor="LUFA" caption="UC3 Architecture">
+			<device-support value="uc3"/>
+
+			<require idref="lufa.drivers.board"/>
+			<require idref="lufa.drivers.board.info"/>
+		</board>
+
+		<module type="driver" id="lufa.drivers.board.info" caption="LUFA Board Hardware Information Driver">
+			<device-support-alias value="lufa_avr8"/>
+			<device-support-alias value="lufa_xmega"/>
+			<device-support-alias value="lufa_uc3"/>
+
+			<build type="doxygen-entry-point" value="Group_BoardInfo"/>
+
+			<require idref="lufa.common"/>
+
+			<build type="include-path" value=".."/>
+			<build type="header-file"  subtype="api" value="Drivers/Board/Board.h"/>
+		</module>
+
+		<module type="driver" id="lufa.drivers.board.leds" caption="LUFA Board LED Driver">
+			<device-support-alias value="lufa_avr8"/>
+			<device-support-alias value="lufa_xmega"/>
+			<device-support-alias value="lufa_uc3"/>
+
+			<build type="doxygen-entry-point" value="Group_LEDs"/>
+
+			<require idref="lufa.common"/>
+
+			<build type="include-path" value=".."/>
+			<build type="header-file"  subtype="api" value="Drivers/Board/LEDs.h"/>
+		</module>
+
+		<module type="driver" id="lufa.drivers.board.buttons" caption="LUFA Board Buttons Driver">
+			<device-support-alias value="lufa_avr8"/>
+			<device-support-alias value="lufa_xmega"/>
+			<device-support-alias value="lufa_uc3"/>
+
+			<build type="doxygen-entry-point" value="Group_Buttons"/>
+
+			<require idref="lufa.common"/>
+
+			<build type="include-path" value=".."/>
+			<build type="header-file"  subtype="api" value="Drivers/Board/Buttons.h"/>
+		</module>
+
+		<module type="driver" id="lufa.drivers.board.dataflash" caption="LUFA Board Dataflash Driver">
+			<device-support-alias value="lufa_avr8"/>
+			<device-support-alias value="lufa_xmega"/>
+			<device-support-alias value="lufa_uc3"/>
+
+			<build type="doxygen-entry-point" value="Group_Dataflash"/>
+
+			<require idref="lufa.common"/>
+
+			<build type="include-path" value=".."/>
+			<build type="header-file"  subtype="api" value="Drivers/Board/Dataflash.h"/>
+		</module>
+
+		<module type="driver" id="lufa.drivers.board.joystick" caption="LUFA Board Joystick Driver">
+			<device-support-alias value="lufa_avr8"/>
+			<device-support-alias value="lufa_xmega"/>
+			<device-support-alias value="lufa_uc3"/>
+
+			<build type="doxygen-entry-point" value="Group_Joystick"/>
+
+			<require idref="lufa.common"/>
+
+			<build type="include-path" value=".."/>
+			<build type="header-file"  subtype="api" value="Drivers/Board/Joystick.h"/>
+		</module>
+
+		<module type="driver" id="lufa.drivers.board.temperature" caption="LUFA Board Temperature Sensor Driver">
+			<device-support-alias value="lufa_avr8"/>
+			<device-support-alias value="lufa_xmega"/>
+			<device-support-alias value="lufa_uc3"/>
+
+			<build type="doxygen-entry-point" value="Group_Temperature"/>
+
+			<require idref="lufa.common"/>
+			<require idref="lufa.drivers.peripheral.adc"/>
+
+			<build type="c-source"     value="Drivers/Board/Temperature.c"/>
+			<build type="include-path" value=".."/>
+			<build type="header-file"  subtype="api" value="Drivers/Board/Temperature.h"/>
+		</module>
+	</asf>
+</lufa>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_board_names.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_board_names.xml
index 4b099920b7..ab7e03e4e9 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_board_names.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_board_names.xml
@@ -1,853 +1,853 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<asf>

-		<select-by-config id="lufa.drivers.board" name="lufa.drivers.board.name" default="none" caption="LUFA Board Support">

-			<info type="description" value="summary">

-				Board hardware (LEDs, Buttons, etc.) drivers for the preconfigured LUFA boards. Note that only the boards

-				compatible with the currently selected device will be shown.

-

-				To disable all hardware drivers silently, use NONE. To supply customer drivers, use USER (see manual).

-			</info>

-

-			<module type="driver" id="lufa.drivers.board#none" caption="Board Support - None">

-				<device-support value="avr"/>

-				<build type="define" name="BOARD" value="BOARD_NONE"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#user" caption="Board Support - User Supplied">

-				<device-support value="avr"/>

-				<build type="define" name="BOARD" value="BOARD_USER"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#adafruit_u4" caption="Board Support - ADAFRUITU4">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_ADAFRUITU4"/>

-

-				<device-support value="atmega32u4"/>

-				<build type="define" name="BOARD" value="BOARD_ADAFRUITU4"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/ADAFRUITU4/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/ADAFRUITU4/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#atavrusbrf01" caption="Board Support - ATAVRUSBRF01">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_ATAVRUSBRF01"/>

-

-				<device-support value="at90usb1287"/>

-				<build type="define" name="BOARD" value="BOARD_ATAVRUSBRF01"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/ATAVRUSBRF01/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/ATAVRUSBRF01/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/ATAVRUSBRF01/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#benito" caption="Board Support - BENITO">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_BENITO"/>

-

-				<device-support value="at90usb162"/>

-				<build type="define" name="BOARD" value="BOARD_BENITO"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/BENITO/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/BENITO/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/BENITO/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#big_multio" caption="Board Support - BIGMULTIO">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_BIGMULTIO"/>

-

-				<device-support value="atmega32u4"/>

-				<build type="define" name="BOARD" value="BOARD_BIGMULTIO"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/BIGMULTIO/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/BIGMULTIO/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#blackcat" caption="Board Support - BLACKCAT">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_BLACKCAT"/>

-

-				<device-support value="at90usb162"/>

-				<build type="define" name="BOARD" value="BOARD_BLACKCAT"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/BLACKCAT/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/BLACKCAT/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#bui" caption="Board Support - BUI">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_BUI"/>

-

-				<device-support value="at90usb646"/>

-				<build type="define" name="BOARD" value="BOARD_BUI"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/BUI/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/BUI/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#bumbleb" caption="Board Support - BUMBLEB">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_BUMBLEB"/>

-

-				<device-support value="at90usb162"/>

-				<build type="define" name="BOARD" value="BOARD_BUMBLEB"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-				<require idref="lufa.drivers.board.joystick"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/BUMBLEB/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/BUMBLEB/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/BUMBLEB/Joystick.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/BUMBLEB/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#culv3" caption="Board Support - CULV3">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_CULV3"/>

-

-				<device-support value="atmega32u4"/>

-				<build type="define" name="BOARD" value="BOARD_CULV3"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/CULV3/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/CULV3/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/CULV3/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#duce" caption="Board Support - DUCE">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_DUCE"/>

-

-				<device-support value="atmega32u2"/>

-				<build type="define" name="BOARD" value="BOARD_DUCE"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/DUCE/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/DUCE/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#evk527" caption="Board Support - EVK527">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_EVK527"/>

-

-				<device-support value="atmega32u4"/>

-				<build type="define" name="BOARD" value="BOARD_EVK527"/>

-

-				<require idref="lufa.drivers.misc.at45db321c"/>

-				<require idref="lufa.drivers.peripheral.spi"/>

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.dataflash"/>

-				<require idref="lufa.drivers.board.joystick"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/EVK527/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/EVK527/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/EVK527/Dataflash.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/EVK527/Joystick.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/EVK527/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#jm_db_u2" caption="Board Support - JMDBU2">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_JMDBU2"/>

-

-				<device-support value="atmega32u2"/>

-				<build type="define" name="BOARD" value="BOARD_JMDBU2"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/JMDBU2/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/JMDBU2/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/JMDBU2/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#leonardo" caption="Board Support - LEONARDO">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_LEONARDO"/>

-

-				<device-support value="atmega32u4"/>

-				<build type="define" name="BOARD" value="BOARD_LEONARDO"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/LEONARDO/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/LEONARDO/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#maximus" caption="Board Support - MAXIMUS">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_MAXIMUS"/>

-

-				<device-support value="at90usb162"/>

-				<build type="define" name="BOARD" value="BOARD_MAXIMUS"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/MAXIMUS/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MAXIMUS/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#micropendous_32u2" caption="Board Support - MICROPENDOUS_32U2">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_32U2"/>

-

-				<device-support value="atmega32u2"/>

-				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_32U2"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-				<require idref="lufa.drivers.board.buttons"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/LEDs.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#micropendous_a" caption="Board Support - MICROPENDOUS_A">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_A"/>

-

-				<device-support value="at90usb1287"/>

-				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_A"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#micropendous_1" caption="Board Support - MICROPENDOUS_1">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_1"/>

-

-				<device-support value="at90usb162"/>

-				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_1"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#micropendous_2" caption="Board Support - MICROPENDOUS_2">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_2"/>

-

-				<device-support value="atmega32u4"/>

-				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_2"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#micropendous_3" caption="Board Support - MICROPENDOUS_3">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_3"/>

-

-				<device-support value="at90usb1287"/>

-				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_3"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#micropendous_4" caption="Board Support - MICROPENDOUS_4">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_4"/>

-

-				<device-support value="at90usb1287"/>

-				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_4"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#micropendous_dip" caption="Board Support - MICROPENDOUS_DIP">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_DIP"/>

-

-				<device-support value="at90usb1287"/>

-				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_DIP"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#micropendous_rev1" caption="Board Support - MICROPENDOUS_REV1">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_REV1"/>

-

-				<device-support value="at90usb1287"/>

-				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_REV1"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-				<require idref="lufa.drivers.board.buttons"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/LEDs.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#micropendous_rev2" caption="Board Support - MICROPENDOUS_REV2">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_REV2"/>

-

-				<device-support value="at90usb1287"/>

-				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_REV2"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-				<require idref="lufa.drivers.board.buttons"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/LEDs.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#microsin_162" caption="Board Support - MICROSIN162">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROSIN162"/>

-

-				<device-support value="atmega162"/>

-				<build type="define" name="BOARD" value="BOARD_MICROSIN162"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-				<require idref="lufa.drivers.board.buttons"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/MICROSIN162/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MICROSIN162/LEDs.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MICROSIN162/Buttons.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#minimus" caption="Board Support - MINIMUS">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_MINIMUS"/>

-

-				<device-support value="atmega32u2"/>

-				<build type="define" name="BOARD" value="BOARD_MINIMUS"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-				<require idref="lufa.drivers.board.buttons"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/MINIMUS/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MINIMUS/LEDs.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MINIMUS/Buttons.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#multio" caption="Board Support - MULTIO">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_MULTIO"/>

-

-				<device-support value="at90usb162"/>

-				<build type="define" name="BOARD" value="BOARD_MULTIO"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/MULTIO/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MULTIO/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#olimex_162" caption="Board Support - OLIMEX162">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_OLIMEX162"/>

-

-				<device-support value="at90usb162"/>

-				<build type="define" name="BOARD" value="BOARD_OLIMEX162"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-				<require idref="lufa.drivers.board.buttons"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX162/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX162/LEDs.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX162/Buttons.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#olimex_32u4" caption="Board Support - OLIMEX32U4">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_OLIMEX32U4"/>

-

-				<device-support value="atmega32u4"/>

-				<build type="define" name="BOARD" value="BOARD_OLIMEX32U4"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-				<require idref="lufa.drivers.board.buttons"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX32U4/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX32U4/LEDs.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX32U4/Buttons.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#olimex_isp_mkii" caption="Board Support - OLIMEXISPMK2">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_OLIMEXISPMK2"/>

-

-				<device-support value="at90usb162"/>

-				<build type="define" name="BOARD" value="BOARD_OLIMEXISPMK2"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-				<require idref="lufa.drivers.board.buttons"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXISPMK2/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXISPMK2/LEDs.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXISPMK2/Buttons.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#olimex_t32u4" caption="Board Support - OLIMEX_T32U4">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_OLIMEXT32U4"/>

-

-				<device-support value="atmega32u4"/>

-				<build type="define" name="BOARD" value="BOARD_OLIMEXT32U4"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-				<require idref="lufa.drivers.board.buttons"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXT32U4/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXT32U4/LEDs.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXT32U4/Buttons.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#rzusbstick" caption="Board Support - RZUSBSTICK">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_RZUSBSTICK"/>

-

-				<device-support value="at90usb1287"/>

-				<build type="define" name="BOARD" value="BOARD_RZUSBSTICK"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/RZUSBSTICK/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/RZUSBSTICK/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#sparkfun_8u2" caption="Board Support - SPARKFUN8U2">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_SPARKFUN8U2"/>

-

-				<device-support value="atmega8u2"/>

-				<build type="define" name="BOARD" value="BOARD_SPARKFUN8U2"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/SPARKFUN8U2/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/SPARKFUN8U2/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#stk525" caption="Board Support - STK525">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_STK525"/>

-

-				<device-support value="at90usb1287"/>

-				<device-support value="at90usb1286"/>

-				<device-support value="at90usb647"/>

-				<device-support value="at90usb646"/>

-				<build type="define" name="BOARD" value="BOARD_STK525"/>

-

-				<require idref="lufa.drivers.misc.at45db321c"/>

-				<require idref="lufa.drivers.peripheral.spi"/>

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.dataflash"/>

-				<require idref="lufa.drivers.board.joystick"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/STK525/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/STK525/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/STK525/Dataflash.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/STK525/Joystick.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/STK525/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#stk526" caption="Board Support - STK526">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_STK526"/>

-

-				<device-support value="at90usb162"/>

-				<device-support value="at90usb82"/>

-				<device-support value="atmega32u2"/>

-				<device-support value="atmega16u2"/>

-				<device-support value="atmega8u2"/>

-				<build type="define" name="BOARD" value="BOARD_STK526"/>

-

-				<require idref="lufa.drivers.misc.at45db642d"/>

-				<require idref="lufa.drivers.peripheral.spi"/>

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.dataflash"/>

-				<require idref="lufa.drivers.board.joystick"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/STK526/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/STK526/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/STK526/Dataflash.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/STK526/Joystick.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/STK526/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#teensy" caption="Board Support - TEENSY">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_TEENSY"/>

-

-				<device-support value="at90usb162"/>

-				<build type="define" name="BOARD" value="BOARD_TEENSY"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/TEENSY/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/TEENSY/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#teensy2" caption="Board Support - TEENSY2">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_TEENSY2"/>

-

-				<device-support value="at90usb646"/>

-				<build type="define" name="BOARD" value="BOARD_TEENSY2"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/TEENSY/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/TEENSY/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#tul" caption="Board Support - TUL">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_TUL"/>

-

-				<device-support value="atmega32u4"/>

-				<build type="define" name="BOARD" value="BOARD_TUL"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/TUL/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/TUL/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/TUL/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#udip" caption="Board Support - UDIP">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_UDIP"/>

-

-				<device-support value="atmega32u2"/>

-				<build type="define" name="BOARD" value="BOARD_UDIP"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/UDIP/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/UDIP/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/UDIP/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#uno" caption="Board Support - UNO">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_UNO"/>

-

-				<device-support value="atmega8u2"/>

-				<device-support value="atmega16u2"/>

-				<build type="define" name="BOARD" value="BOARD_UNO"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/UNO/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/UNO/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#usb2ax" caption="Board Support - USB2AX">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_USB2AX"/>

-

-				<device-support value="atmega32u2"/>

-				<build type="define" name="BOARD" value="BOARD_USB2AX"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#usb2ax_v3" caption="Board Support - USB2AX_V3">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_USB2AX_V3"/>

-

-				<device-support value="atmega32u2"/>

-				<build type="define" name="BOARD" value="BOARD_USB2AX_V3"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#usb2ax_v3_1" caption="Board Support - USB2AX_V31">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_USB2AX_V31"/>

-

-				<device-support value="atmega32u2"/>

-				<build type="define" name="BOARD" value="BOARD_USB2AX_V31"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#usbfoo" caption="Board Support - USBFOO">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_USBFOO"/>

-

-				<device-support value="atmega162"/>

-				<build type="define" name="BOARD" value="BOARD_USBFOO"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/USBFOO/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/USBFOO/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/USBFOO/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#usbkey" caption="Board Support - USBKEY">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_USBKEY"/>

-

-				<device-support value="at90usb1287"/>

-				<build type="define" name="BOARD" value="BOARD_USBKEY"/>

-

-				<require idref="lufa.drivers.misc.at45db642d"/>

-				<require idref="lufa.drivers.peripheral.spi"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.dataflash"/>

-				<require idref="lufa.drivers.board.joystick"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/USBKEY/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/USBKEY/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/USBKEY/Dataflash.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/USBKEY/Joystick.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/USBKEY/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#usbtiny_mkii" caption="Board Support - USBTINYMKII">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_USBTINYMKII"/>

-

-				<device-support value="at90usb162"/>

-				<build type="define" name="BOARD" value="BOARD_USBTINYMKII"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/USBTINYMKII/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/USBTINYMKII/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/USBTINYMKII/LEDs.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#xplain_rev1" caption="Board Support - XPLAIN (HW Rev 1)">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_XPLAIN_REV1"/>

-

-				<device-support value="at90usb1287"/>

-

-				<require idref="lufa.drivers.misc.at45db642d"/>

-				<require idref="lufa.drivers.peripheral.spi"/>

-				<require idref="lufa.drivers.board.dataflash"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/Dataflash.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/LEDs.h"/>

-

-				<build type="define" name="BOARD" value="BOARD_XPLAIN_REV1"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#xplain" caption="Board Support - XPLAIN (HW Rev 2+)">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_XPLAIN"/>

-

-				<device-support value="at90usb1287"/>

-

-				<require idref="lufa.drivers.misc.at45db642d"/>

-				<require idref="lufa.drivers.peripheral.spi"/>

-				<require idref="lufa.drivers.board.dataflash"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/Dataflash.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/LEDs.h"/>

-

-				<build type="define" name="BOARD" value="BOARD_XPLAIN"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#a3bu_xplained" caption="Board Support - A3BU_XPLAINED">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_A3BU_XPLAINED"/>

-

-				<device-support value="atxmega256a3bu"/>

-

-				<require idref="lufa.drivers.misc.at45db642d"/>

-				<require idref="lufa.drivers.peripheral.usart_spi"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.dataflash"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/XMEGA/A3BU_XPLAINED/Board.h"/>

-				<build type="header-file" value="Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h"/>

-				<build type="header-file" value="Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h"/>

-

-				<build type="define" name="BOARD" value="BOARD_A3BU_XPLAINED"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#b1_xplained" caption="Board Support - B1_XPLAINED">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_B1_XPLAINED"/>

-

-				<device-support value="atxmega128b1"/>

-

-				<require idref="lufa.drivers.misc.at45db642d"/>

-				<require idref="lufa.drivers.peripheral.usart_spi"/>

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.dataflash"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/XMEGA/B1_XPLAINED/Board.h"/>

-				<build type="header-file" value="Drivers/Board/XMEGA/B1_XPLAINED/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h"/>

-				<build type="header-file" value="Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h"/>

-

-				<build type="define" name="BOARD" value="BOARD_B1_XPLAINED"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#evk1100" caption="Board Support - EVK1100">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_EVK1100"/>

-

-				<device-support value="at32uc3a0512"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.joystick"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/UC3/EVK1100/Board.h"/>

-				<build type="header-file" value="Drivers/Board/UC3/EVK1100/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/UC3/EVK1100/Joystick.h"/>

-				<build type="header-file" value="Drivers/Board/UC3/EVK1100/LEDs.h"/>

-

-				<build type="define" name="BOARD" value="BOARD_EVK1100"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#evk1101" caption="Board Support - EVK1101">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_EVK1101"/>

-

-				<device-support value="at32uc3b0256"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.joystick"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/UC3/EVK1101/Board.h"/>

-				<build type="header-file" value="Drivers/Board/UC3/EVK1101/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/UC3/EVK1101/Joystick.h"/>

-				<build type="header-file" value="Drivers/Board/UC3/EVK1101/LEDs.h"/>

-

-				<build type="define" name="BOARD" value="BOARD_EVK1101"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#evk1104" caption="Board Support - EVK1104">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_EVK1104"/>

-

-				<device-support value="at32uc3a3256"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/UC3/EVK1104/Board.h"/>

-				<build type="header-file" value="Drivers/Board/UC3/EVK1104/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/UC3/EVK1104/LEDs.h"/>

-

-				<build type="define" name="BOARD" value="BOARD_EVK1104"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#uc3a3_xplained" caption="Board Support - UC3A3_XPLAINED">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_UC3_A3_XPLAINED"/>

-

-				<device-support value="at32uc3a3256"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/UC3/UC3A3_XPLAINED/Board.h"/>

-				<build type="header-file" value="Drivers/Board/UC3/UC3A3_XPLAINED/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/UC3/UC3A3_XPLAINED/LEDs.h"/>

-

-				<build type="define" name="BOARD" value="BOARD_UC3A3_XPLAINED"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#stange_isp" caption="Board Support - STANGE_ISP">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_STANGE_ISP"/>

-

-				<device-support value="at90usb162"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/STANGE_ISP/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/STANGE_ISP/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/STANGE_ISP/LEDs.h"/>

-

-				<build type="define" name="BOARD" value="BOARD_STANGE_ISP"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#c3_xplained" caption="Board Support - C3_XPLAINED">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_C3_XPLAINED"/>

-

-				<device-support value="atxmega384c3"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/XMEGA/C3_XPLAINED/Board.h"/>

-				<build type="header-file" value="Drivers/Board/XMEGA/C3_XPLAINED/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h"/>

-

-				<build type="define" name="BOARD" value="BOARD_C3_XPLAINED"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#u2s" caption="Board Support - U2S">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_U2S"/>

-

-				<device-support value="atmega32u2"/>

-

-				<require idref="lufa.drivers.board.buttons"/>

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/U2S/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/U2S/Buttons.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/U2S/LEDs.h"/>

-

-				<build type="define" name="BOARD" value="BOARD_U2S"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#yun" caption="Board Support - YUN">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_YUN"/>

-

-				<device-support value="atmega32u4"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/YUN/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/YUN/LEDs.h"/>

-

-				<build type="define" name="BOARD" value="BOARD_YUN"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.board#yun" caption="Board Support - MICRO">

-				<build type="doxygen-entry-point" value="Group_BoardInfo_MICRO"/>

-

-				<device-support value="atmega32u4"/>

-

-				<require idref="lufa.drivers.board.leds"/>

-

-				<build type="header-file" value="Drivers/Board/AVR8/MICRO/Board.h"/>

-				<build type="header-file" value="Drivers/Board/AVR8/MICRO/LEDs.h"/>

-

-				<build type="define" name="BOARD" value="BOARD_MICRO"/>

-			</module>

-		</select-by-config>

-	</asf>

-</lufa>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<select-by-config id="lufa.drivers.board" name="lufa.drivers.board.name" default="none" caption="LUFA Board Support">
+			<info type="description" value="summary">
+				Board hardware (LEDs, Buttons, etc.) drivers for the preconfigured LUFA boards. Note that only the boards
+				compatible with the currently selected device will be shown.
+
+				To disable all hardware drivers silently, use NONE. To supply customer drivers, use USER (see manual).
+			</info>
+
+			<module type="driver" id="lufa.drivers.board#none" caption="Board Support - None">
+				<device-support value="avr"/>
+				<build type="define" name="BOARD" value="BOARD_NONE"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#user" caption="Board Support - User Supplied">
+				<device-support value="avr"/>
+				<build type="define" name="BOARD" value="BOARD_USER"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#adafruit_u4" caption="Board Support - ADAFRUITU4">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_ADAFRUITU4"/>
+
+				<device-support value="atmega32u4"/>
+				<build type="define" name="BOARD" value="BOARD_ADAFRUITU4"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/ADAFRUITU4/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/ADAFRUITU4/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#atavrusbrf01" caption="Board Support - ATAVRUSBRF01">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_ATAVRUSBRF01"/>
+
+				<device-support value="at90usb1287"/>
+				<build type="define" name="BOARD" value="BOARD_ATAVRUSBRF01"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/ATAVRUSBRF01/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/ATAVRUSBRF01/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/ATAVRUSBRF01/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#benito" caption="Board Support - BENITO">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_BENITO"/>
+
+				<device-support value="at90usb162"/>
+				<build type="define" name="BOARD" value="BOARD_BENITO"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/BENITO/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/BENITO/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/BENITO/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#big_multio" caption="Board Support - BIGMULTIO">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_BIGMULTIO"/>
+
+				<device-support value="atmega32u4"/>
+				<build type="define" name="BOARD" value="BOARD_BIGMULTIO"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/BIGMULTIO/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/BIGMULTIO/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#blackcat" caption="Board Support - BLACKCAT">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_BLACKCAT"/>
+
+				<device-support value="at90usb162"/>
+				<build type="define" name="BOARD" value="BOARD_BLACKCAT"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/BLACKCAT/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/BLACKCAT/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#bui" caption="Board Support - BUI">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_BUI"/>
+
+				<device-support value="at90usb646"/>
+				<build type="define" name="BOARD" value="BOARD_BUI"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/BUI/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/BUI/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#bumbleb" caption="Board Support - BUMBLEB">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_BUMBLEB"/>
+
+				<device-support value="at90usb162"/>
+				<build type="define" name="BOARD" value="BOARD_BUMBLEB"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.joystick"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/BUMBLEB/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/BUMBLEB/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/BUMBLEB/Joystick.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/BUMBLEB/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#culv3" caption="Board Support - CULV3">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_CULV3"/>
+
+				<device-support value="atmega32u4"/>
+				<build type="define" name="BOARD" value="BOARD_CULV3"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/CULV3/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/CULV3/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/CULV3/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#duce" caption="Board Support - DUCE">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_DUCE"/>
+
+				<device-support value="atmega32u2"/>
+				<build type="define" name="BOARD" value="BOARD_DUCE"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/DUCE/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/DUCE/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#evk527" caption="Board Support - EVK527">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_EVK527"/>
+
+				<device-support value="atmega32u4"/>
+				<build type="define" name="BOARD" value="BOARD_EVK527"/>
+
+				<require idref="lufa.drivers.misc.at45db321c"/>
+				<require idref="lufa.drivers.peripheral.spi"/>
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.joystick"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/EVK527/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/EVK527/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/EVK527/Dataflash.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/EVK527/Joystick.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/EVK527/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#jm_db_u2" caption="Board Support - JMDBU2">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_JMDBU2"/>
+
+				<device-support value="atmega32u2"/>
+				<build type="define" name="BOARD" value="BOARD_JMDBU2"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/JMDBU2/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/JMDBU2/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/JMDBU2/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#leonardo" caption="Board Support - LEONARDO">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_LEONARDO"/>
+
+				<device-support value="atmega32u4"/>
+				<build type="define" name="BOARD" value="BOARD_LEONARDO"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/LEONARDO/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/LEONARDO/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#maximus" caption="Board Support - MAXIMUS">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_MAXIMUS"/>
+
+				<device-support value="at90usb162"/>
+				<build type="define" name="BOARD" value="BOARD_MAXIMUS"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MAXIMUS/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MAXIMUS/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#micropendous_32u2" caption="Board Support - MICROPENDOUS_32U2">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_32U2"/>
+
+				<device-support value="atmega32u2"/>
+				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_32U2"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/LEDs.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#micropendous_a" caption="Board Support - MICROPENDOUS_A">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_A"/>
+
+				<device-support value="at90usb1287"/>
+				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_A"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#micropendous_1" caption="Board Support - MICROPENDOUS_1">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_1"/>
+
+				<device-support value="at90usb162"/>
+				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_1"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#micropendous_2" caption="Board Support - MICROPENDOUS_2">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_2"/>
+
+				<device-support value="atmega32u4"/>
+				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_2"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#micropendous_3" caption="Board Support - MICROPENDOUS_3">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_3"/>
+
+				<device-support value="at90usb1287"/>
+				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_3"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#micropendous_4" caption="Board Support - MICROPENDOUS_4">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_4"/>
+
+				<device-support value="at90usb1287"/>
+				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_4"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#micropendous_dip" caption="Board Support - MICROPENDOUS_DIP">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_DIP"/>
+
+				<device-support value="at90usb1287"/>
+				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_DIP"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#micropendous_rev1" caption="Board Support - MICROPENDOUS_REV1">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_REV1"/>
+
+				<device-support value="at90usb1287"/>
+				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_REV1"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/LEDs.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#micropendous_rev2" caption="Board Support - MICROPENDOUS_REV2">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROPENDOUS_REV2"/>
+
+				<device-support value="at90usb1287"/>
+				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_REV2"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/LEDs.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#microsin_162" caption="Board Support - MICROSIN162">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_MICROSIN162"/>
+
+				<device-support value="atmega162"/>
+				<build type="define" name="BOARD" value="BOARD_MICROSIN162"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROSIN162/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MICROSIN162/LEDs.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MICROSIN162/Buttons.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#minimus" caption="Board Support - MINIMUS">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_MINIMUS"/>
+
+				<device-support value="atmega32u2"/>
+				<build type="define" name="BOARD" value="BOARD_MINIMUS"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MINIMUS/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MINIMUS/LEDs.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MINIMUS/Buttons.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#multio" caption="Board Support - MULTIO">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_MULTIO"/>
+
+				<device-support value="at90usb162"/>
+				<build type="define" name="BOARD" value="BOARD_MULTIO"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MULTIO/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MULTIO/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#olimex_162" caption="Board Support - OLIMEX162">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_OLIMEX162"/>
+
+				<device-support value="at90usb162"/>
+				<build type="define" name="BOARD" value="BOARD_OLIMEX162"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX162/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX162/LEDs.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX162/Buttons.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#olimex_32u4" caption="Board Support - OLIMEX32U4">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_OLIMEX32U4"/>
+
+				<device-support value="atmega32u4"/>
+				<build type="define" name="BOARD" value="BOARD_OLIMEX32U4"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX32U4/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX32U4/LEDs.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX32U4/Buttons.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#olimex_isp_mkii" caption="Board Support - OLIMEXISPMK2">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_OLIMEXISPMK2"/>
+
+				<device-support value="at90usb162"/>
+				<build type="define" name="BOARD" value="BOARD_OLIMEXISPMK2"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXISPMK2/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXISPMK2/LEDs.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXISPMK2/Buttons.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#olimex_t32u4" caption="Board Support - OLIMEX_T32U4">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_OLIMEXT32U4"/>
+
+				<device-support value="atmega32u4"/>
+				<build type="define" name="BOARD" value="BOARD_OLIMEXT32U4"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXT32U4/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXT32U4/LEDs.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXT32U4/Buttons.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#rzusbstick" caption="Board Support - RZUSBSTICK">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_RZUSBSTICK"/>
+
+				<device-support value="at90usb1287"/>
+				<build type="define" name="BOARD" value="BOARD_RZUSBSTICK"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/RZUSBSTICK/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/RZUSBSTICK/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#sparkfun_8u2" caption="Board Support - SPARKFUN8U2">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_SPARKFUN8U2"/>
+
+				<device-support value="atmega8u2"/>
+				<build type="define" name="BOARD" value="BOARD_SPARKFUN8U2"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/SPARKFUN8U2/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/SPARKFUN8U2/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#stk525" caption="Board Support - STK525">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_STK525"/>
+
+				<device-support value="at90usb1287"/>
+				<device-support value="at90usb1286"/>
+				<device-support value="at90usb647"/>
+				<device-support value="at90usb646"/>
+				<build type="define" name="BOARD" value="BOARD_STK525"/>
+
+				<require idref="lufa.drivers.misc.at45db321c"/>
+				<require idref="lufa.drivers.peripheral.spi"/>
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.joystick"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/STK525/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/STK525/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/STK525/Dataflash.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/STK525/Joystick.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/STK525/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#stk526" caption="Board Support - STK526">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_STK526"/>
+
+				<device-support value="at90usb162"/>
+				<device-support value="at90usb82"/>
+				<device-support value="atmega32u2"/>
+				<device-support value="atmega16u2"/>
+				<device-support value="atmega8u2"/>
+				<build type="define" name="BOARD" value="BOARD_STK526"/>
+
+				<require idref="lufa.drivers.misc.at45db642d"/>
+				<require idref="lufa.drivers.peripheral.spi"/>
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.joystick"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/STK526/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/STK526/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/STK526/Dataflash.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/STK526/Joystick.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/STK526/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#teensy" caption="Board Support - TEENSY">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_TEENSY"/>
+
+				<device-support value="at90usb162"/>
+				<build type="define" name="BOARD" value="BOARD_TEENSY"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/TEENSY/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/TEENSY/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#teensy2" caption="Board Support - TEENSY2">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_TEENSY2"/>
+
+				<device-support value="at90usb646"/>
+				<build type="define" name="BOARD" value="BOARD_TEENSY2"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/TEENSY/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/TEENSY/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#tul" caption="Board Support - TUL">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_TUL"/>
+
+				<device-support value="atmega32u4"/>
+				<build type="define" name="BOARD" value="BOARD_TUL"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/TUL/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/TUL/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/TUL/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#udip" caption="Board Support - UDIP">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_UDIP"/>
+
+				<device-support value="atmega32u2"/>
+				<build type="define" name="BOARD" value="BOARD_UDIP"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/UDIP/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/UDIP/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/UDIP/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#uno" caption="Board Support - UNO">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_UNO"/>
+
+				<device-support value="atmega8u2"/>
+				<device-support value="atmega16u2"/>
+				<build type="define" name="BOARD" value="BOARD_UNO"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/UNO/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/UNO/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#usb2ax" caption="Board Support - USB2AX">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_USB2AX"/>
+
+				<device-support value="atmega32u2"/>
+				<build type="define" name="BOARD" value="BOARD_USB2AX"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#usb2ax_v3" caption="Board Support - USB2AX_V3">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_USB2AX_V3"/>
+
+				<device-support value="atmega32u2"/>
+				<build type="define" name="BOARD" value="BOARD_USB2AX_V3"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#usb2ax_v3_1" caption="Board Support - USB2AX_V31">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_USB2AX_V31"/>
+
+				<device-support value="atmega32u2"/>
+				<build type="define" name="BOARD" value="BOARD_USB2AX_V31"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#usbfoo" caption="Board Support - USBFOO">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_USBFOO"/>
+
+				<device-support value="atmega162"/>
+				<build type="define" name="BOARD" value="BOARD_USBFOO"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/USBFOO/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/USBFOO/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/USBFOO/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#usbkey" caption="Board Support - USBKEY">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_USBKEY"/>
+
+				<device-support value="at90usb1287"/>
+				<build type="define" name="BOARD" value="BOARD_USBKEY"/>
+
+				<require idref="lufa.drivers.misc.at45db642d"/>
+				<require idref="lufa.drivers.peripheral.spi"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.joystick"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/USBKEY/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/USBKEY/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/USBKEY/Dataflash.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/USBKEY/Joystick.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/USBKEY/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#usbtiny_mkii" caption="Board Support - USBTINYMKII">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_USBTINYMKII"/>
+
+				<device-support value="at90usb162"/>
+				<build type="define" name="BOARD" value="BOARD_USBTINYMKII"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/USBTINYMKII/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/USBTINYMKII/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/USBTINYMKII/LEDs.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#xplain_rev1" caption="Board Support - XPLAIN (HW Rev 1)">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_XPLAIN_REV1"/>
+
+				<device-support value="at90usb1287"/>
+
+				<require idref="lufa.drivers.misc.at45db642d"/>
+				<require idref="lufa.drivers.peripheral.spi"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/Dataflash.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/LEDs.h"/>
+
+				<build type="define" name="BOARD" value="BOARD_XPLAIN_REV1"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#xplain" caption="Board Support - XPLAIN (HW Rev 2+)">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_XPLAIN"/>
+
+				<device-support value="at90usb1287"/>
+
+				<require idref="lufa.drivers.misc.at45db642d"/>
+				<require idref="lufa.drivers.peripheral.spi"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/Dataflash.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/LEDs.h"/>
+
+				<build type="define" name="BOARD" value="BOARD_XPLAIN"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#a3bu_xplained" caption="Board Support - A3BU_XPLAINED">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_A3BU_XPLAINED"/>
+
+				<device-support value="atxmega256a3bu"/>
+
+				<require idref="lufa.drivers.misc.at45db642d"/>
+				<require idref="lufa.drivers.peripheral.usart_spi"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/XMEGA/A3BU_XPLAINED/Board.h"/>
+				<build type="header-file" value="Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h"/>
+				<build type="header-file" value="Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h"/>
+
+				<build type="define" name="BOARD" value="BOARD_A3BU_XPLAINED"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#b1_xplained" caption="Board Support - B1_XPLAINED">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_B1_XPLAINED"/>
+
+				<device-support value="atxmega128b1"/>
+
+				<require idref="lufa.drivers.misc.at45db642d"/>
+				<require idref="lufa.drivers.peripheral.usart_spi"/>
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/XMEGA/B1_XPLAINED/Board.h"/>
+				<build type="header-file" value="Drivers/Board/XMEGA/B1_XPLAINED/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h"/>
+				<build type="header-file" value="Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h"/>
+
+				<build type="define" name="BOARD" value="BOARD_B1_XPLAINED"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#evk1100" caption="Board Support - EVK1100">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_EVK1100"/>
+
+				<device-support value="at32uc3a0512"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.joystick"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/UC3/EVK1100/Board.h"/>
+				<build type="header-file" value="Drivers/Board/UC3/EVK1100/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/UC3/EVK1100/Joystick.h"/>
+				<build type="header-file" value="Drivers/Board/UC3/EVK1100/LEDs.h"/>
+
+				<build type="define" name="BOARD" value="BOARD_EVK1100"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#evk1101" caption="Board Support - EVK1101">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_EVK1101"/>
+
+				<device-support value="at32uc3b0256"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.joystick"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/UC3/EVK1101/Board.h"/>
+				<build type="header-file" value="Drivers/Board/UC3/EVK1101/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/UC3/EVK1101/Joystick.h"/>
+				<build type="header-file" value="Drivers/Board/UC3/EVK1101/LEDs.h"/>
+
+				<build type="define" name="BOARD" value="BOARD_EVK1101"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#evk1104" caption="Board Support - EVK1104">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_EVK1104"/>
+
+				<device-support value="at32uc3a3256"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/UC3/EVK1104/Board.h"/>
+				<build type="header-file" value="Drivers/Board/UC3/EVK1104/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/UC3/EVK1104/LEDs.h"/>
+
+				<build type="define" name="BOARD" value="BOARD_EVK1104"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#uc3a3_xplained" caption="Board Support - UC3A3_XPLAINED">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_UC3_A3_XPLAINED"/>
+
+				<device-support value="at32uc3a3256"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/UC3/UC3A3_XPLAINED/Board.h"/>
+				<build type="header-file" value="Drivers/Board/UC3/UC3A3_XPLAINED/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/UC3/UC3A3_XPLAINED/LEDs.h"/>
+
+				<build type="define" name="BOARD" value="BOARD_UC3A3_XPLAINED"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#stange_isp" caption="Board Support - STANGE_ISP">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_STANGE_ISP"/>
+
+				<device-support value="at90usb162"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/STANGE_ISP/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/STANGE_ISP/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/STANGE_ISP/LEDs.h"/>
+
+				<build type="define" name="BOARD" value="BOARD_STANGE_ISP"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#c3_xplained" caption="Board Support - C3_XPLAINED">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_C3_XPLAINED"/>
+
+				<device-support value="atxmega384c3"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/XMEGA/C3_XPLAINED/Board.h"/>
+				<build type="header-file" value="Drivers/Board/XMEGA/C3_XPLAINED/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h"/>
+
+				<build type="define" name="BOARD" value="BOARD_C3_XPLAINED"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#u2s" caption="Board Support - U2S">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_U2S"/>
+
+				<device-support value="atmega32u2"/>
+
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/U2S/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/U2S/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/U2S/LEDs.h"/>
+
+				<build type="define" name="BOARD" value="BOARD_U2S"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#yun" caption="Board Support - YUN">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_YUN"/>
+
+				<device-support value="atmega32u4"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/YUN/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/YUN/LEDs.h"/>
+
+				<build type="define" name="BOARD" value="BOARD_YUN"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.board#yun" caption="Board Support - MICRO">
+				<build type="doxygen-entry-point" value="Group_BoardInfo_MICRO"/>
+
+				<device-support value="atmega32u4"/>
+
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICRO/Board.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/MICRO/LEDs.h"/>
+
+				<build type="define" name="BOARD" value="BOARD_MICRO"/>
+			</module>
+		</select-by-config>
+	</asf>
+</lufa>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_misc.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_misc.xml
index 8680ca2dff..4311ae87b7 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_misc.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_misc.xml
@@ -1,57 +1,57 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<asf>

-		<module type="component" id="lufa.drivers.misc.at45db321c" caption="LUFA AT45DB321C Dataflash Commands">

-			<device-support-alias value="lufa_avr8"/>

-			<device-support-alias value="lufa_xmega"/>

-			<device-support-alias value="lufa_uc3"/>

-

-			<build type="doxygen-entry-point" value="Group_AT45DB321C"/>

-

-			<build type="include-path" value=".."/>

-			<build type="header-file" subtype="api" value="Drivers/Misc/AT45DB321C.h"/>

-		</module>

-

-		<module type="component" id="lufa.drivers.misc.at45db642d" caption="LUFA AT45DB642D Dataflash Commands">

-			<device-support-alias value="lufa_avr8"/>

-			<device-support-alias value="lufa_xmega"/>

-			<device-support-alias value="lufa_uc3"/>

-

-			<build type="doxygen-entry-point" value="Group_AT45DB321C"/>

-

-			<build type="include-path" value=".."/>

-			<build type="header-file" subtype="api" value="Drivers/Misc/AT45DB642D.h"/>

-		</module>

-

-		<module type="service" id="lufa.drivers.misc.ringbuffer" caption="LUFA Ring Buffer">

-			<device-support-alias value="lufa_avr8"/>

-			<device-support-alias value="lufa_xmega"/>

-			<device-support-alias value="lufa_uc3"/>

-

-			<build type="doxygen-entry-point" value="Group_RingBuff"/>

-

-			<build type="include-path" value=".."/>

-			<build type="header-file" subtype="api" value="Drivers/Misc/RingBuffer.h"/>

-		</module>

-

-		<module type="service" id="lufa.drivers.misc.ansi" caption="LUFA ANSI Terminal Commands">

-			<device-support-alias value="lufa_avr8"/>

-			<device-support-alias value="lufa_xmega"/>

-			<device-support-alias value="lufa_uc3"/>

-

-			<build type="doxygen-entry-point" value="Group_Terminal"/>

-

-			<build type="include-path" value=".."/>

-			<build type="header-file" subtype="api" value="Drivers/Misc/TerminalCodes.h"/>

-		</module>

-	</asf>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<module type="component" id="lufa.drivers.misc.at45db321c" caption="LUFA AT45DB321C Dataflash Commands">
+			<device-support-alias value="lufa_avr8"/>
+			<device-support-alias value="lufa_xmega"/>
+			<device-support-alias value="lufa_uc3"/>
+
+			<build type="doxygen-entry-point" value="Group_AT45DB321C"/>
+
+			<build type="include-path" value=".."/>
+			<build type="header-file" subtype="api" value="Drivers/Misc/AT45DB321C.h"/>
+		</module>
+
+		<module type="component" id="lufa.drivers.misc.at45db642d" caption="LUFA AT45DB642D Dataflash Commands">
+			<device-support-alias value="lufa_avr8"/>
+			<device-support-alias value="lufa_xmega"/>
+			<device-support-alias value="lufa_uc3"/>
+
+			<build type="doxygen-entry-point" value="Group_AT45DB321C"/>
+
+			<build type="include-path" value=".."/>
+			<build type="header-file" subtype="api" value="Drivers/Misc/AT45DB642D.h"/>
+		</module>
+
+		<module type="service" id="lufa.drivers.misc.ringbuffer" caption="LUFA Ring Buffer">
+			<device-support-alias value="lufa_avr8"/>
+			<device-support-alias value="lufa_xmega"/>
+			<device-support-alias value="lufa_uc3"/>
+
+			<build type="doxygen-entry-point" value="Group_RingBuff"/>
+
+			<build type="include-path" value=".."/>
+			<build type="header-file" subtype="api" value="Drivers/Misc/RingBuffer.h"/>
+		</module>
+
+		<module type="service" id="lufa.drivers.misc.ansi" caption="LUFA ANSI Terminal Commands">
+			<device-support-alias value="lufa_avr8"/>
+			<device-support-alias value="lufa_xmega"/>
+			<device-support-alias value="lufa_uc3"/>
+
+			<build type="doxygen-entry-point" value="Group_Terminal"/>
+
+			<build type="include-path" value=".."/>
+			<build type="header-file" subtype="api" value="Drivers/Misc/TerminalCodes.h"/>
+		</module>
+	</asf>
 </lufa>
\ No newline at end of file
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_peripheral.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_peripheral.xml
index 3a982e565f..76ea516dbc 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_peripheral.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_peripheral.xml
@@ -1,198 +1,198 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<asf>

-		<select-by-device id="lufa.drivers.peripheral.usart" caption="LUFA USART Driver">

-			<module type="driver" id="lufa.drivers.peripheral.usart#avr8" caption="LUFA USART Driver - AVR8">

-				<device-support-alias value="lufa_avr8"/>

-

-				<build type="doxygen-entry-point" value="Group_Serial"/>

-

-				<require idref="lufa.common"/>

-				<require idref="lufa.drivers.misc.ansi"/>

-

-				<build type="c-source" value="Drivers/Peripheral/AVR8/Serial_AVR8.c"/>

-				<build type="header-file" value="Drivers/Peripheral/AVR8/Serial_AVR8.h"/>

-				<build type="include-path" value=".."/>

-				<build type="header-file" subtype="api" value="Drivers/Peripheral/Serial.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.peripheral.usart#xmega" caption="LUFA USART Driver - AVR8">

-				<device-support-alias value="lufa_xmega"/>

-

-				<build type="doxygen-entry-point" value="Group_Serial"/>

-

-				<require idref="lufa.common"/>

-				<require idref="lufa.drivers.misc.ansi"/>

-

-				<build type="c-source" value="Drivers/Peripheral/XMEGA/Serial_XMEGA.c"/>

-				<build type="header-file" value="Drivers/Peripheral/XMEGA/Serial_XMEGA.h"/>

-				<build type="include-path" value=".."/>

-				<build type="header-file" subtype="api" value="Drivers/Peripheral/Serial.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.peripheral.usart#uc3" caption="LUFA USART Driver - UC3">

-				<device-support-alias value="lufa_uc3"/>

-

-				<build type="doxygen-entry-point" value="Group_Serial"/>

-

-				<require idref="lufa.common"/>

-				<require idref="lufa.drivers.misc.ansi"/>

-

-				<info type="gui-flag" value="hidden"/>

-			</module>

-		</select-by-device>

-

-		<select-by-device id="lufa.drivers.peripheral.spi" caption="LUFA SPI Driver">

-			<module type="driver" id="lufa.drivers.peripheral.spi#avr8" caption="LUFA SPI Driver - AVR8">

-				<device-support-alias value="lufa_avr8"/>

-

-				<build type="doxygen-entry-point" value="Group_SPI"/>

-

-				<require idref="lufa.common"/>

-

-				<build type="header-file" value="Drivers/Peripheral/AVR8/SPI_AVR8.h"/>

-				<build type="include-path" value=".."/>

-				<build type="header-file" subtype="api" value="Drivers/Peripheral/SPI.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.peripheral.spi#xmega" caption="LUFA SPI Driver - XMEGA">

-				<device-support-alias value="lufa_xmega"/>

-

-				<build type="doxygen-entry-point" value="Group_SPI"/>

-

-				<require idref="lufa.common"/>

-

-				<build type="header-file" value="Drivers/Peripheral/XMEGA/SPI_XMEGA.h"/>

-				<build type="include-path" value=".."/>

-				<build type="header-file" subtype="api" value="Drivers/Peripheral/SPI.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.peripheral.spi#uc3" caption="LUFA SPI Driver - UC3">

-				<device-support-alias value="lufa_uc3"/>

-

-				<build type="doxygen-entry-point" value="Group_SPI"/>

-

-				<require idref="lufa.common"/>

-

-				<info type="gui-flag" value="hidden"/>

-			</module>

-		</select-by-device>

-

-		<select-by-device id="lufa.drivers.peripheral.usart_spi" caption="LUFA USART SPI Driver">

-			<module type="driver" id="lufa.drivers.peripheral.usart_spi#avr8" caption="LUFA USART SPI Driver - AVR8">

-				<device-support-alias value="lufa_avr8"/>

-

-				<build type="doxygen-entry-point" value="Group_SerialSPI"/>

-

-				<require idref="lufa.common"/>

-

-				<build type="header-file" value="Drivers/Peripheral/AVR8/SerialSPI_AVR8.h"/>

-				<build type="include-path" value=".."/>

-				<build type="header-file" subtype="api"  value="Drivers/Peripheral/SerialSPI.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.peripheral.usart_spi#xmega" caption="LUFA USART SPI Driver - XMEGA">

-				<device-support-alias value="lufa_xmega"/>

-

-				<build type="doxygen-entry-point" value="Group_SerialSPI"/>

-

-				<require idref="lufa.common"/>

-

-				<build type="header-file" value="Drivers/Peripheral/XMEGA/SerialSPI_XMEGA.h"/>

-				<build type="include-path" value=".."/>

-				<build type="header-file" subtype="api" value="Drivers/Peripheral/SerialSPI.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.peripheral.usart_spi#uc3" caption="LUFA USART SPI Driver - UC3">

-				<device-support-alias value="lufa_uc3"/>

-

-				<build type="doxygen-entry-point" value="Group_SerialSPI"/>

-

-				<require idref="lufa.common"/>

-

-				<info type="gui-flag" value="hidden"/>

-			</module>

-		</select-by-device>

-

-		<select-by-device id="lufa.drivers.peripheral.twi" caption="LUFA TWI Master Driver">

-			<module type="driver" id="lufa.drivers.peripheral.twi#avr8" caption="LUFA TWI Master Driver - AVR8">

-				<device-support-alias value="lufa_avr8"/>

-

-				<build type="doxygen-entry-point" value="Group_TWI"/>

-

-				<require idref="lufa.common"/>

-

-				<build type="c-source" value="Drivers/Peripheral/AVR8/TWI_AVR8.c"/>

-				<build type="header-file" value="Drivers/Peripheral/AVR8/TWI_AVR8.h"/>

-				<build type="include-path" value=".."/>

-				<build type="header-file" subtype="api" value="Drivers/Peripheral/TWI.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.peripheral.twi#xmega" caption="LUFA TWI Master Driver - XMEGA">

-				<device-support-alias value="lufa_xmega"/>

-

-				<build type="doxygen-entry-point" value="Group_TWI"/>

-

-				<require idref="lufa.common"/>

-

-				<build type="c-source" value="Drivers/Peripheral/XMEGA/TWI_XMEGA.c"/>

-				<build type="header-file" value="Drivers/Peripheral/XMEGA/TWI_XMEGA.h"/>

-				<build type="include-path" value=".."/>

-				<build type="header-file" subtype="api" value="Drivers/Peripheral/TWI.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.peripheral.twi#uc3" caption="LUFA TWI Master Driver - UC3">

-				<device-support-alias value="lufa_uc3"/>

-

-				<build type="doxygen-entry-point" value="Group_TWI"/>

-

-				<require idref="lufa.common"/>

-

-				<info type="gui-flag" value="hidden"/>

-			</module>

-		</select-by-device>

-

-		<select-by-device id="lufa.drivers.peripheral.adc" caption="LUFA ADC Driver">

-			<module type="driver" id="lufa.drivers.peripheral.adc#avr8" caption="LUFA ADC Driver - AVR8">

-				<device-support-alias value="lufa_avr8"/>

-

-				<build type="doxygen-entry-point" value="Group_ADC"/>

-

-				<require idref="lufa.common"/>

-

-				<build type="header-file" value="Drivers/Peripheral/AVR8/ADC_AVR8.h"/>

-				<build type="include-path" value=".."/>

-				<build type="header-file" subtype="api" value="Drivers/Peripheral/ADC.h"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.peripheral.adc#xmega" caption="LUFA ADC Driver - XMEGA">

-				<device-support-alias value="lufa_xmega"/>

-

-				<build type="doxygen-entry-point" value="Group_ADC"/>

-

-				<require idref="lufa.common"/>

-

-				<info type="gui-flag" value="hidden"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.peripheral.adc#uc3" caption="LUFA ADC Driver - UC3">

-				<device-support-alias value="lufa_uc3"/>

-

-				<build type="doxygen-entry-point" value="Group_ADC"/>

-

-				<require idref="lufa.common"/>

-

-				<info type="gui-flag" value="hidden"/>

-			</module>

-		</select-by-device>

-	</asf>

-</lufa>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<select-by-device id="lufa.drivers.peripheral.usart" caption="LUFA USART Driver">
+			<module type="driver" id="lufa.drivers.peripheral.usart#avr8" caption="LUFA USART Driver - AVR8">
+				<device-support-alias value="lufa_avr8"/>
+
+				<build type="doxygen-entry-point" value="Group_Serial"/>
+
+				<require idref="lufa.common"/>
+				<require idref="lufa.drivers.misc.ansi"/>
+
+				<build type="c-source" value="Drivers/Peripheral/AVR8/Serial_AVR8.c"/>
+				<build type="header-file" value="Drivers/Peripheral/AVR8/Serial_AVR8.h"/>
+				<build type="include-path" value=".."/>
+				<build type="header-file" subtype="api" value="Drivers/Peripheral/Serial.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.peripheral.usart#xmega" caption="LUFA USART Driver - AVR8">
+				<device-support-alias value="lufa_xmega"/>
+
+				<build type="doxygen-entry-point" value="Group_Serial"/>
+
+				<require idref="lufa.common"/>
+				<require idref="lufa.drivers.misc.ansi"/>
+
+				<build type="c-source" value="Drivers/Peripheral/XMEGA/Serial_XMEGA.c"/>
+				<build type="header-file" value="Drivers/Peripheral/XMEGA/Serial_XMEGA.h"/>
+				<build type="include-path" value=".."/>
+				<build type="header-file" subtype="api" value="Drivers/Peripheral/Serial.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.peripheral.usart#uc3" caption="LUFA USART Driver - UC3">
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="doxygen-entry-point" value="Group_Serial"/>
+
+				<require idref="lufa.common"/>
+				<require idref="lufa.drivers.misc.ansi"/>
+
+				<info type="gui-flag" value="hidden"/>
+			</module>
+		</select-by-device>
+
+		<select-by-device id="lufa.drivers.peripheral.spi" caption="LUFA SPI Driver">
+			<module type="driver" id="lufa.drivers.peripheral.spi#avr8" caption="LUFA SPI Driver - AVR8">
+				<device-support-alias value="lufa_avr8"/>
+
+				<build type="doxygen-entry-point" value="Group_SPI"/>
+
+				<require idref="lufa.common"/>
+
+				<build type="header-file" value="Drivers/Peripheral/AVR8/SPI_AVR8.h"/>
+				<build type="include-path" value=".."/>
+				<build type="header-file" subtype="api" value="Drivers/Peripheral/SPI.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.peripheral.spi#xmega" caption="LUFA SPI Driver - XMEGA">
+				<device-support-alias value="lufa_xmega"/>
+
+				<build type="doxygen-entry-point" value="Group_SPI"/>
+
+				<require idref="lufa.common"/>
+
+				<build type="header-file" value="Drivers/Peripheral/XMEGA/SPI_XMEGA.h"/>
+				<build type="include-path" value=".."/>
+				<build type="header-file" subtype="api" value="Drivers/Peripheral/SPI.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.peripheral.spi#uc3" caption="LUFA SPI Driver - UC3">
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="doxygen-entry-point" value="Group_SPI"/>
+
+				<require idref="lufa.common"/>
+
+				<info type="gui-flag" value="hidden"/>
+			</module>
+		</select-by-device>
+
+		<select-by-device id="lufa.drivers.peripheral.usart_spi" caption="LUFA USART SPI Driver">
+			<module type="driver" id="lufa.drivers.peripheral.usart_spi#avr8" caption="LUFA USART SPI Driver - AVR8">
+				<device-support-alias value="lufa_avr8"/>
+
+				<build type="doxygen-entry-point" value="Group_SerialSPI"/>
+
+				<require idref="lufa.common"/>
+
+				<build type="header-file" value="Drivers/Peripheral/AVR8/SerialSPI_AVR8.h"/>
+				<build type="include-path" value=".."/>
+				<build type="header-file" subtype="api"  value="Drivers/Peripheral/SerialSPI.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.peripheral.usart_spi#xmega" caption="LUFA USART SPI Driver - XMEGA">
+				<device-support-alias value="lufa_xmega"/>
+
+				<build type="doxygen-entry-point" value="Group_SerialSPI"/>
+
+				<require idref="lufa.common"/>
+
+				<build type="header-file" value="Drivers/Peripheral/XMEGA/SerialSPI_XMEGA.h"/>
+				<build type="include-path" value=".."/>
+				<build type="header-file" subtype="api" value="Drivers/Peripheral/SerialSPI.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.peripheral.usart_spi#uc3" caption="LUFA USART SPI Driver - UC3">
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="doxygen-entry-point" value="Group_SerialSPI"/>
+
+				<require idref="lufa.common"/>
+
+				<info type="gui-flag" value="hidden"/>
+			</module>
+		</select-by-device>
+
+		<select-by-device id="lufa.drivers.peripheral.twi" caption="LUFA TWI Master Driver">
+			<module type="driver" id="lufa.drivers.peripheral.twi#avr8" caption="LUFA TWI Master Driver - AVR8">
+				<device-support-alias value="lufa_avr8"/>
+
+				<build type="doxygen-entry-point" value="Group_TWI"/>
+
+				<require idref="lufa.common"/>
+
+				<build type="c-source" value="Drivers/Peripheral/AVR8/TWI_AVR8.c"/>
+				<build type="header-file" value="Drivers/Peripheral/AVR8/TWI_AVR8.h"/>
+				<build type="include-path" value=".."/>
+				<build type="header-file" subtype="api" value="Drivers/Peripheral/TWI.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.peripheral.twi#xmega" caption="LUFA TWI Master Driver - XMEGA">
+				<device-support-alias value="lufa_xmega"/>
+
+				<build type="doxygen-entry-point" value="Group_TWI"/>
+
+				<require idref="lufa.common"/>
+
+				<build type="c-source" value="Drivers/Peripheral/XMEGA/TWI_XMEGA.c"/>
+				<build type="header-file" value="Drivers/Peripheral/XMEGA/TWI_XMEGA.h"/>
+				<build type="include-path" value=".."/>
+				<build type="header-file" subtype="api" value="Drivers/Peripheral/TWI.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.peripheral.twi#uc3" caption="LUFA TWI Master Driver - UC3">
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="doxygen-entry-point" value="Group_TWI"/>
+
+				<require idref="lufa.common"/>
+
+				<info type="gui-flag" value="hidden"/>
+			</module>
+		</select-by-device>
+
+		<select-by-device id="lufa.drivers.peripheral.adc" caption="LUFA ADC Driver">
+			<module type="driver" id="lufa.drivers.peripheral.adc#avr8" caption="LUFA ADC Driver - AVR8">
+				<device-support-alias value="lufa_avr8"/>
+
+				<build type="doxygen-entry-point" value="Group_ADC"/>
+
+				<require idref="lufa.common"/>
+
+				<build type="header-file" value="Drivers/Peripheral/AVR8/ADC_AVR8.h"/>
+				<build type="include-path" value=".."/>
+				<build type="header-file" subtype="api" value="Drivers/Peripheral/ADC.h"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.peripheral.adc#xmega" caption="LUFA ADC Driver - XMEGA">
+				<device-support-alias value="lufa_xmega"/>
+
+				<build type="doxygen-entry-point" value="Group_ADC"/>
+
+				<require idref="lufa.common"/>
+
+				<info type="gui-flag" value="hidden"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.peripheral.adc#uc3" caption="LUFA ADC Driver - UC3">
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="doxygen-entry-point" value="Group_ADC"/>
+
+				<require idref="lufa.common"/>
+
+				<info type="gui-flag" value="hidden"/>
+			</module>
+		</select-by-device>
+	</asf>
+</lufa>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb.xml
index 7ff4b39492..263c411dff 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb.xml
@@ -1,32 +1,32 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<asf>

-		<module type="driver" id="lufa.drivers.usb" caption="LUFA USB Driver">

-			<device-support-alias value="lufa_avr8"/>

-			<device-support-alias value="lufa_xmega"/>

-			<device-support-alias value="lufa_uc3"/>

-

-			<build type="doxygen-entry-point" value="Group_USB"/>

-

-			<build type="define" name="USE_LUFA_CONFIG_HEADER" value=""/>

-			<build type="module-config" subtype="path" value="CodeTemplates"/>

-			<build type="module-config" subtype="required-header-file" value="LUFAConfig.h"/>

-

-			<build type="include-path" value=".."/>

-			<build type="header-file" subtype="api" value="Drivers/USB/USB.h"/>

-

-			<require idref="lufa.common"/>

-			<require idref="lufa.drivers.usb.class"/>

-			<require idref="lufa.drivers.usb.core"/>

-		</module>

-	</asf>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<module type="driver" id="lufa.drivers.usb" caption="LUFA USB Driver">
+			<device-support-alias value="lufa_avr8"/>
+			<device-support-alias value="lufa_xmega"/>
+			<device-support-alias value="lufa_uc3"/>
+
+			<build type="doxygen-entry-point" value="Group_USB"/>
+
+			<build type="define" name="USE_LUFA_CONFIG_HEADER" value=""/>
+			<build type="module-config" subtype="path" value="CodeTemplates"/>
+			<build type="module-config" subtype="required-header-file" value="LUFAConfig.h"/>
+
+			<build type="include-path" value=".."/>
+			<build type="header-file" subtype="api" value="Drivers/USB/USB.h"/>
+
+			<require idref="lufa.common"/>
+			<require idref="lufa.drivers.usb.class"/>
+			<require idref="lufa.drivers.usb.core"/>
+		</module>
+	</asf>
 </lufa>
\ No newline at end of file
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_class.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_class.xml
index cd18bf10e7..67ab760d33 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_class.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_class.xml
@@ -1,32 +1,32 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<asf>

-		<module type="service" id="lufa.drivers.usb.class" caption="LUFA USB Class Drivers">

-			<device-support-alias value="lufa_avr8"/>

-			<device-support-alias value="lufa_xmega"/>

-			<device-support-alias value="lufa_uc3"/>

-

-			<info type="gui-flag" value="hidden"/>

-			<build type="doxygen-entry-point" value="Group_USBClassDrivers"/>

-

-			<require idref="lufa.drivers.usb.class.android"/>

-			<require idref="lufa.drivers.usb.class.audio"/>

-			<require idref="lufa.drivers.usb.class.cdc"/>

-			<require idref="lufa.drivers.usb.class.hid"/>

-			<require idref="lufa.drivers.usb.class.ms"/>

-			<require idref="lufa.drivers.usb.class.midi"/>

-			<require idref="lufa.drivers.usb.class.printer"/>

-			<require idref="lufa.drivers.usb.class.rndis"/>

-			<require idref="lufa.drivers.usb.class.si"/>

-		</module>

-	</asf>

-</lufa>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<module type="service" id="lufa.drivers.usb.class" caption="LUFA USB Class Drivers">
+			<device-support-alias value="lufa_avr8"/>
+			<device-support-alias value="lufa_xmega"/>
+			<device-support-alias value="lufa_uc3"/>
+
+			<info type="gui-flag" value="hidden"/>
+			<build type="doxygen-entry-point" value="Group_USBClassDrivers"/>
+
+			<require idref="lufa.drivers.usb.class.android"/>
+			<require idref="lufa.drivers.usb.class.audio"/>
+			<require idref="lufa.drivers.usb.class.cdc"/>
+			<require idref="lufa.drivers.usb.class.hid"/>
+			<require idref="lufa.drivers.usb.class.ms"/>
+			<require idref="lufa.drivers.usb.class.midi"/>
+			<require idref="lufa.drivers.usb.class.printer"/>
+			<require idref="lufa.drivers.usb.class.rndis"/>
+			<require idref="lufa.drivers.usb.class.si"/>
+		</module>
+	</asf>
+</lufa>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core.xml
index 58f8917ef4..58a0b388f6 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core.xml
@@ -1,85 +1,85 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<asf>

-		<module type="driver" id="lufa.drivers.usb.core.common" caption="LUFA USB Core Driver - Common">

-			<device-support-alias value="lufa_avr8"/>

-			<device-support-alias value="lufa_xmega"/>

-			<device-support-alias value="lufa_uc3"/>

-

-			<build type="doxygen-entry-point" value="Group_USBManagement"/>

-

-			<info type="gui-flag" value="hidden"/>

-

-			<build type="header-file" value="Drivers/USB/Core/Device.h"/>

-			<build type="header-file" value="Drivers/USB/Core/Endpoint.h"/>

-			<build type="header-file" value="Drivers/USB/Core/Host.h"/>

-			<build type="header-file" value="Drivers/USB/Core/Pipe.h"/>

-			<build type="header-file" value="Drivers/USB/Core/OTG.h"/>

-			<build type="header-file" value="Drivers/USB/Core/USBController.h"/>

-			<build type="header-file" value="Drivers/USB/Core/USBInterrupt.h"/>

-			<build type="header-file" value="Drivers/USB/Core/EndpointStream.h"/>

-			<build type="header-file" value="Drivers/USB/Core/PipeStream.h"/>

-	        <build type="c-source"    value="Drivers/USB/Core/ConfigDescriptors.c"/>

-			<build type="header-file" value="Drivers/USB/Core/ConfigDescriptors.h"/>

-	        <build type="c-source"    value="Drivers/USB/Core/DeviceStandardReq.c"/>

-			<build type="header-file" value="Drivers/USB/Core/DeviceStandardReq.h"/>

-	        <build type="c-source"    value="Drivers/USB/Core/Events.c"/>

-			<build type="header-file" value="Drivers/USB/Core/Events.h"/>

-	        <build type="c-source"    value="Drivers/USB/Core/HostStandardReq.c"/>

-			<build type="header-file" value="Drivers/USB/Core/HostStandardReq.h"/>

-	        <build type="c-source"    value="Drivers/USB/Core/USBTask.c"/>

-			<build type="header-file" value="Drivers/USB/Core/USBTask.h"/>

-			<build type="header-file" value="Drivers/USB/Core/USBMode.h"/>

-			<build type="header-file" value="Drivers/USB/Core/StdDescriptors.h"/>

-			<build type="header-file" value="Drivers/USB/Core/StdRequestType.h"/>

-

-	        <build type="c-source"    value="Drivers/USB/Class/Common/HIDParser.c"/>

-	        <build type="header-file" value="Drivers/USB/Class/Common/HIDParser.h"/>

-	        <build type="header-file" value="Drivers/USB/Class/Common/HIDReportData.h"/>

-	    </module>

-

-		<select-by-device id="lufa.drivers.usb.core" caption="LUFA USB Core Driver">

-			<module type="driver" id="lufa.drivers.usb.core#avr8" caption="LUFA USB Core Driver - AVR8">

-				<device-support-alias value="lufa_avr8"/>

-

-				<info type="gui-flag" value="hidden"/>

-

-				<build type="doxygen-entry-point" value="Group_USBManagement_AVR8"/>

-

-				<require idref="lufa.drivers.usb.core.common"/>

-				<require idref="lufa.drivers.usb.core.avr8"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.usb.core#xmega" caption="LUFA USB Core Driver - XMEGA">

-				<device-support-alias value="lufa_xmega"/>

-

-				<info type="gui-flag" value="hidden"/>

-

-				<build type="doxygen-entry-point" value="Group_USBManagement_XMEGA"/>

-

-				<require idref="lufa.drivers.usb.core.common"/>

-				<require idref="lufa.drivers.usb.core.xmega"/>

-			</module>

-

-			<module type="driver" id="lufa.drivers.usb.core#uc3" caption="LUFA USB Core Driver - UC3">

-				<device-support-alias value="lufa_uc3"/>

-

-				<info type="gui-flag" value="hidden"/>

-

-				<build type="doxygen-entry-point" value="Group_USBManagement_UC3"/>

-

-				<require idref="lufa.drivers.usb.core.common"/>

-				<require idref="lufa.drivers.usb.core.uc3"/>

-			</module>

-		</select-by-device>

-	</asf>

-</lufa>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<module type="driver" id="lufa.drivers.usb.core.common" caption="LUFA USB Core Driver - Common">
+			<device-support-alias value="lufa_avr8"/>
+			<device-support-alias value="lufa_xmega"/>
+			<device-support-alias value="lufa_uc3"/>
+
+			<build type="doxygen-entry-point" value="Group_USBManagement"/>
+
+			<info type="gui-flag" value="hidden"/>
+
+			<build type="header-file" value="Drivers/USB/Core/Device.h"/>
+			<build type="header-file" value="Drivers/USB/Core/Endpoint.h"/>
+			<build type="header-file" value="Drivers/USB/Core/Host.h"/>
+			<build type="header-file" value="Drivers/USB/Core/Pipe.h"/>
+			<build type="header-file" value="Drivers/USB/Core/OTG.h"/>
+			<build type="header-file" value="Drivers/USB/Core/USBController.h"/>
+			<build type="header-file" value="Drivers/USB/Core/USBInterrupt.h"/>
+			<build type="header-file" value="Drivers/USB/Core/EndpointStream.h"/>
+			<build type="header-file" value="Drivers/USB/Core/PipeStream.h"/>
+	        <build type="c-source"    value="Drivers/USB/Core/ConfigDescriptors.c"/>
+			<build type="header-file" value="Drivers/USB/Core/ConfigDescriptors.h"/>
+	        <build type="c-source"    value="Drivers/USB/Core/DeviceStandardReq.c"/>
+			<build type="header-file" value="Drivers/USB/Core/DeviceStandardReq.h"/>
+	        <build type="c-source"    value="Drivers/USB/Core/Events.c"/>
+			<build type="header-file" value="Drivers/USB/Core/Events.h"/>
+	        <build type="c-source"    value="Drivers/USB/Core/HostStandardReq.c"/>
+			<build type="header-file" value="Drivers/USB/Core/HostStandardReq.h"/>
+	        <build type="c-source"    value="Drivers/USB/Core/USBTask.c"/>
+			<build type="header-file" value="Drivers/USB/Core/USBTask.h"/>
+			<build type="header-file" value="Drivers/USB/Core/USBMode.h"/>
+			<build type="header-file" value="Drivers/USB/Core/StdDescriptors.h"/>
+			<build type="header-file" value="Drivers/USB/Core/StdRequestType.h"/>
+
+	        <build type="c-source"    value="Drivers/USB/Class/Common/HIDParser.c"/>
+	        <build type="header-file" value="Drivers/USB/Class/Common/HIDParser.h"/>
+	        <build type="header-file" value="Drivers/USB/Class/Common/HIDReportData.h"/>
+	    </module>
+
+		<select-by-device id="lufa.drivers.usb.core" caption="LUFA USB Core Driver">
+			<module type="driver" id="lufa.drivers.usb.core#avr8" caption="LUFA USB Core Driver - AVR8">
+				<device-support-alias value="lufa_avr8"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<build type="doxygen-entry-point" value="Group_USBManagement_AVR8"/>
+
+				<require idref="lufa.drivers.usb.core.common"/>
+				<require idref="lufa.drivers.usb.core.avr8"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.usb.core#xmega" caption="LUFA USB Core Driver - XMEGA">
+				<device-support-alias value="lufa_xmega"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<build type="doxygen-entry-point" value="Group_USBManagement_XMEGA"/>
+
+				<require idref="lufa.drivers.usb.core.common"/>
+				<require idref="lufa.drivers.usb.core.xmega"/>
+			</module>
+
+			<module type="driver" id="lufa.drivers.usb.core#uc3" caption="LUFA USB Core Driver - UC3">
+				<device-support-alias value="lufa_uc3"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<build type="doxygen-entry-point" value="Group_USBManagement_UC3"/>
+
+				<require idref="lufa.drivers.usb.core.common"/>
+				<require idref="lufa.drivers.usb.core.uc3"/>
+			</module>
+		</select-by-device>
+	</asf>
+</lufa>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml
index 166b9257aa..4688f05f91 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml
@@ -1,43 +1,43 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<asf>

-		<module type="driver" id="lufa.drivers.usb.core.avr8" caption="LUFA USB Core Driver for AVR8">

-			<device-support-alias value="lufa_avr8"/>

-

-			<info type="gui-flag" value="hidden"/>

-

-			<build type="doxygen-entry-point" value="Group_USBManagement_AVR8"/>

-

-			<build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_R.c"/>

-			<build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_W.c"/>

-			<build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_RW.c"/>

-			<build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Pipe_RW.c"/>

-			<build type="c-source"    value="Drivers/USB/Core/AVR8/Device_AVR8.c"/>

-			<build type="header-file" value="Drivers/USB/Core/AVR8/Device_AVR8.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/AVR8/Endpoint_AVR8.c"/>

-			<build type="header-file" value="Drivers/USB/Core/AVR8/Endpoint_AVR8.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/AVR8/Host_AVR8.c"/>

-			<build type="header-file" value="Drivers/USB/Core/AVR8/Host_AVR8.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/AVR8/Pipe_AVR8.c"/>

-			<build type="header-file" value="Drivers/USB/Core/AVR8/Pipe_AVR8.h"/>

-			<build type="header-file" value="Drivers/USB/Core/AVR8/OTG_AVR8.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/AVR8/USBController_AVR8.c"/>

-			<build type="header-file" value="Drivers/USB/Core/AVR8/USBController_AVR8.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/AVR8/USBInterrupt_AVR8.c"/>

-			<build type="header-file" value="Drivers/USB/Core/AVR8/USBInterrupt_AVR8.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/AVR8/EndpointStream_AVR8.c"/>

-			<build type="header-file" value="Drivers/USB/Core/AVR8/EndpointStream_AVR8.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/AVR8/PipeStream_AVR8.c"/>

-			<build type="header-file" value="Drivers/USB/Core/AVR8/PipeStream_AVR8.h"/>

-		</module>

-	</asf>

-</lufa>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<module type="driver" id="lufa.drivers.usb.core.avr8" caption="LUFA USB Core Driver for AVR8">
+			<device-support-alias value="lufa_avr8"/>
+
+			<info type="gui-flag" value="hidden"/>
+
+			<build type="doxygen-entry-point" value="Group_USBManagement_AVR8"/>
+
+			<build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_R.c"/>
+			<build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_W.c"/>
+			<build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_RW.c"/>
+			<build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Pipe_RW.c"/>
+			<build type="c-source"    value="Drivers/USB/Core/AVR8/Device_AVR8.c"/>
+			<build type="header-file" value="Drivers/USB/Core/AVR8/Device_AVR8.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/AVR8/Endpoint_AVR8.c"/>
+			<build type="header-file" value="Drivers/USB/Core/AVR8/Endpoint_AVR8.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/AVR8/Host_AVR8.c"/>
+			<build type="header-file" value="Drivers/USB/Core/AVR8/Host_AVR8.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/AVR8/Pipe_AVR8.c"/>
+			<build type="header-file" value="Drivers/USB/Core/AVR8/Pipe_AVR8.h"/>
+			<build type="header-file" value="Drivers/USB/Core/AVR8/OTG_AVR8.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/AVR8/USBController_AVR8.c"/>
+			<build type="header-file" value="Drivers/USB/Core/AVR8/USBController_AVR8.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/AVR8/USBInterrupt_AVR8.c"/>
+			<build type="header-file" value="Drivers/USB/Core/AVR8/USBInterrupt_AVR8.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/AVR8/EndpointStream_AVR8.c"/>
+			<build type="header-file" value="Drivers/USB/Core/AVR8/EndpointStream_AVR8.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/AVR8/PipeStream_AVR8.c"/>
+			<build type="header-file" value="Drivers/USB/Core/AVR8/PipeStream_AVR8.h"/>
+		</module>
+	</asf>
+</lufa>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml
index 7e0540cda7..2e7185f24a 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml
@@ -1,42 +1,42 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<asf>

-		<module type="driver" id="lufa.drivers.usb.core.uc3" caption="LUFA USB Core Driver for UC3">

-			<device-support-alias value="lufa_uc3"/>

-

-			<info type="gui-flag" value="hidden"/>

-

-			<build type="doxygen-entry-point" value="Group_USBManagement_UC3"/>

-

-			<build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_R.c"/>

-			<build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_W.c"/>

-			<build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Endpoint_RW.c"/>

-			<build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Pipe_RW.c"/>

-			<build type="c-source"    value="Drivers/USB/Core/UC3/Device_UC3.c"/>

-			<build type="header-file" value="Drivers/USB/Core/UC3/Device_UC3.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/UC3/Endpoint_UC3.c"/>

-			<build type="header-file" value="Drivers/USB/Core/UC3/Endpoint_UC3.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/UC3/Host_UC3.c"/>

-			<build type="header-file" value="Drivers/USB/Core/UC3/Host_UC3.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/UC3/Pipe_UC3.c"/>

-			<build type="header-file" value="Drivers/USB/Core/UC3/Pipe_UC3.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/UC3/USBController_UC3.c"/>

-			<build type="header-file" value="Drivers/USB/Core/UC3/USBController_UC3.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/UC3/USBInterrupt_UC3.c"/>

-			<build type="header-file" value="Drivers/USB/Core/UC3/USBInterrupt_UC3.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/UC3/EndpointStream_UC3.c"/>

-			<build type="header-file" value="Drivers/USB/Core/UC3/EndpointStream_UC3.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/UC3/PipeStream_UC3.c"/>

-			<build type="header-file" value="Drivers/USB/Core/UC3/PipeStream_UC3.h"/>

-		</module>

-	</asf>

-</lufa>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<module type="driver" id="lufa.drivers.usb.core.uc3" caption="LUFA USB Core Driver for UC3">
+			<device-support-alias value="lufa_uc3"/>
+
+			<info type="gui-flag" value="hidden"/>
+
+			<build type="doxygen-entry-point" value="Group_USBManagement_UC3"/>
+
+			<build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_R.c"/>
+			<build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_W.c"/>
+			<build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Endpoint_RW.c"/>
+			<build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Pipe_RW.c"/>
+			<build type="c-source"    value="Drivers/USB/Core/UC3/Device_UC3.c"/>
+			<build type="header-file" value="Drivers/USB/Core/UC3/Device_UC3.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/UC3/Endpoint_UC3.c"/>
+			<build type="header-file" value="Drivers/USB/Core/UC3/Endpoint_UC3.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/UC3/Host_UC3.c"/>
+			<build type="header-file" value="Drivers/USB/Core/UC3/Host_UC3.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/UC3/Pipe_UC3.c"/>
+			<build type="header-file" value="Drivers/USB/Core/UC3/Pipe_UC3.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/UC3/USBController_UC3.c"/>
+			<build type="header-file" value="Drivers/USB/Core/UC3/USBController_UC3.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/UC3/USBInterrupt_UC3.c"/>
+			<build type="header-file" value="Drivers/USB/Core/UC3/USBInterrupt_UC3.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/UC3/EndpointStream_UC3.c"/>
+			<build type="header-file" value="Drivers/USB/Core/UC3/EndpointStream_UC3.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/UC3/PipeStream_UC3.c"/>
+			<build type="header-file" value="Drivers/USB/Core/UC3/PipeStream_UC3.h"/>
+		</module>
+	</asf>
+</lufa>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core_xmega.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core_xmega.xml
index 9e9f4f6a1d..c79a0f5b52 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core_xmega.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_drivers_usb_core_xmega.xml
@@ -1,36 +1,36 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<asf>

-		<module type="driver" id="lufa.drivers.usb.core.xmega" caption="LUFA USB Core Driver for XMEGA">

-			<device-support-alias value="lufa_xmega"/>

-

-			<info type="gui-flag" value="hidden"/>

-

-			<build type="doxygen-entry-point" value="Group_USBManagement_XMEGA"/>

-

-			<build type="c-source"    value="Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_R.c"/>

-			<build type="c-source"    value="Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_W.c"/>

-			<build type="c-source"    value="Drivers/USB/Core/XMEGA/Template/Template_Endpoint_RW.c"/>

-			<build type="c-source"    value="Drivers/USB/Core/XMEGA/Device_XMEGA.c"/>

-			<build type="header-file" value="Drivers/USB/Core/XMEGA/Device_XMEGA.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/XMEGA/Endpoint_XMEGA.c"/>

-			<build type="header-file" value="Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/XMEGA/Pipe_XMEGA.c"/>

-			<build type="c-source"    value="Drivers/USB/Core/XMEGA/USBController_XMEGA.c"/>

-			<build type="header-file" value="Drivers/USB/Core/XMEGA/USBController_XMEGA.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c"/>

-			<build type="header-file" value="Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.h"/>

-			<build type="c-source"    value="Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c"/>

-			<build type="header-file" value="Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.h"/>

-		</module>

-	</asf>

-</lufa>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<module type="driver" id="lufa.drivers.usb.core.xmega" caption="LUFA USB Core Driver for XMEGA">
+			<device-support-alias value="lufa_xmega"/>
+
+			<info type="gui-flag" value="hidden"/>
+
+			<build type="doxygen-entry-point" value="Group_USBManagement_XMEGA"/>
+
+			<build type="c-source"    value="Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_R.c"/>
+			<build type="c-source"    value="Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_W.c"/>
+			<build type="c-source"    value="Drivers/USB/Core/XMEGA/Template/Template_Endpoint_RW.c"/>
+			<build type="c-source"    value="Drivers/USB/Core/XMEGA/Device_XMEGA.c"/>
+			<build type="header-file" value="Drivers/USB/Core/XMEGA/Device_XMEGA.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/XMEGA/Endpoint_XMEGA.c"/>
+			<build type="header-file" value="Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/XMEGA/Pipe_XMEGA.c"/>
+			<build type="c-source"    value="Drivers/USB/Core/XMEGA/USBController_XMEGA.c"/>
+			<build type="header-file" value="Drivers/USB/Core/XMEGA/USBController_XMEGA.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c"/>
+			<build type="header-file" value="Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.h"/>
+			<build type="c-source"    value="Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c"/>
+			<build type="header-file" value="Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.h"/>
+		</module>
+	</asf>
+</lufa>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_platform.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_platform.xml
index 02c7463ee5..4ee51f6ee0 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_platform.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_platform.xml
@@ -1,60 +1,60 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<asf>

-		<select-by-device id="lufa.platform" caption="LUFA Platform Specific Support">

-			<module type="service" id="lufa.platform#avr8" caption="LUFA Platform Specific Support - AVR8">

-				<device-support-alias value="lufa_avr8"/>

-

-				<build type="define" name="ARCH" value="ARCH_AVR8"/>

-

-				<build type="doxygen-entry-point" value="Group_PlatformDrivers"/>

-

-				<build type="include-path" value=".."/>

-				<build type="header-file" subtype="api" value="Platform/Platform.h"/>

-

-				<require idref="lufa.common"/>

-			</module>

-

-			<module type="service" id="lufa.platform#xmega" caption="LUFA Platform Specific Support - XMEGA">

-				<device-support-alias value="lufa_xmega"/>

-

-				<build type="define" name="ARCH" value="ARCH_XMEGA"/>

-

-				<build type="doxygen-entry-point" value="Group_PlatformDrivers"/>

-

-				<build type="include-path" value=".."/>

-				<build type="header-file" subtype="api" value="Platform/Platform.h"/>

-

-				<build type="distribute" value="Platform/XMEGA/XMEGAExperimentalInfo.txt" subtype="license"/>

-

-				<require idref="lufa.platform.xmega"/>

-				<require idref="lufa.common"/>

-			</module>

-

-			<module type="service" id="lufa.platform#uc3" caption="LUFA Platform Specific Support - UC3">

-				<device-support-alias value="lufa_uc3"/>

-

-				<build type="define" name="ARCH" value="ARCH_UC3"/>

-

-				<build type="doxygen-entry-point" value="Group_PlatformDrivers"/>

-

-				<build type="include-path" value=".."/>

-				<build type="header-file" subtype="api" value="Platform/Platform.h"/>

-

-				<build type="distribute" value="Platform/UC3/UC3ExperimentalInfo.txt" subtype="license"/>

-

-				<require idref="lufa.platform.uc3"/>

-				<require idref="lufa.common"/>

-			</module>

-		</select-by-device>

-	</asf>

-</lufa>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<select-by-device id="lufa.platform" caption="LUFA Platform Specific Support">
+			<module type="service" id="lufa.platform#avr8" caption="LUFA Platform Specific Support - AVR8">
+				<device-support-alias value="lufa_avr8"/>
+
+				<build type="define" name="ARCH" value="ARCH_AVR8"/>
+
+				<build type="doxygen-entry-point" value="Group_PlatformDrivers"/>
+
+				<build type="include-path" value=".."/>
+				<build type="header-file" subtype="api" value="Platform/Platform.h"/>
+
+				<require idref="lufa.common"/>
+			</module>
+
+			<module type="service" id="lufa.platform#xmega" caption="LUFA Platform Specific Support - XMEGA">
+				<device-support-alias value="lufa_xmega"/>
+
+				<build type="define" name="ARCH" value="ARCH_XMEGA"/>
+
+				<build type="doxygen-entry-point" value="Group_PlatformDrivers"/>
+
+				<build type="include-path" value=".."/>
+				<build type="header-file" subtype="api" value="Platform/Platform.h"/>
+
+				<build type="distribute" value="Platform/XMEGA/XMEGAExperimentalInfo.txt" subtype="license"/>
+
+				<require idref="lufa.platform.xmega"/>
+				<require idref="lufa.common"/>
+			</module>
+
+			<module type="service" id="lufa.platform#uc3" caption="LUFA Platform Specific Support - UC3">
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="define" name="ARCH" value="ARCH_UC3"/>
+
+				<build type="doxygen-entry-point" value="Group_PlatformDrivers"/>
+
+				<build type="include-path" value=".."/>
+				<build type="header-file" subtype="api" value="Platform/Platform.h"/>
+
+				<build type="distribute" value="Platform/UC3/UC3ExperimentalInfo.txt" subtype="license"/>
+
+				<require idref="lufa.platform.uc3"/>
+				<require idref="lufa.common"/>
+			</module>
+		</select-by-device>
+	</asf>
+</lufa>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_platform_uc3.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_platform_uc3.xml
index a488c4b83d..98017b08ad 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_platform_uc3.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_platform_uc3.xml
@@ -1,26 +1,26 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<asf>

-		<module type="driver" id="lufa.platform.uc3" caption="LUFA UC3 Platform Drivers">

-			<device-support-alias value="lufa_uc3"/>

-

-			<info type="gui-flag" value="hidden"/>

-

-			<build type="doxygen-entry-point" value="Group_PlatformDrivers_UC3"/>

-

-			<build type="header-file" value="Platform/UC3/ClockManagement.h"/>

-			<build type="header-file" value="Platform/UC3/InterruptManagement.h"/>

-			<build type="c-source" value="Platform/UC3/InterruptManagement.c"/>

-			<build type="asm-source" value="Platform/UC3/Exception.S"/>

-		</module>

-	</asf>

-</lufa>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<module type="driver" id="lufa.platform.uc3" caption="LUFA UC3 Platform Drivers">
+			<device-support-alias value="lufa_uc3"/>
+
+			<info type="gui-flag" value="hidden"/>
+
+			<build type="doxygen-entry-point" value="Group_PlatformDrivers_UC3"/>
+
+			<build type="header-file" value="Platform/UC3/ClockManagement.h"/>
+			<build type="header-file" value="Platform/UC3/InterruptManagement.h"/>
+			<build type="c-source" value="Platform/UC3/InterruptManagement.c"/>
+			<build type="asm-source" value="Platform/UC3/Exception.S"/>
+		</module>
+	</asf>
+</lufa>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_platform_xmega.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_platform_xmega.xml
index 1674a77b02..e613fe5206 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_platform_xmega.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_platform_xmega.xml
@@ -1,23 +1,23 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<asf xmlversion="1.0">

-		<module type="driver" id="lufa.platform.xmega" caption="LUFA XMEGA Platform Drivers">

-			<device-support-alias value="lufa_xmega"/>

-

-			<info type="gui-flag" value="hidden"/>

-

-			<build type="doxygen-entry-point" value="Group_PlatformDrivers_XMEGA"/>

-

-			<build type="header-file" value="Platform/XMEGA/ClockManagement.h"/>

-		</module>

-	</asf>

-</lufa>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf xmlversion="1.0">
+		<module type="driver" id="lufa.platform.xmega" caption="LUFA XMEGA Platform Drivers">
+			<device-support-alias value="lufa_xmega"/>
+
+			<info type="gui-flag" value="hidden"/>
+
+			<build type="doxygen-entry-point" value="Group_PlatformDrivers_XMEGA"/>
+
+			<build type="header-file" value="Platform/XMEGA/ClockManagement.h"/>
+		</module>
+	</asf>
+</lufa>
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_toolchain.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_toolchain.xml
index 031c8a2be6..a76b6d0d3b 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_toolchain.xml
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/lufa_toolchain.xml
@@ -1,43 +1,43 @@
-<!--

-             LUFA Library

-     Copyright (C) Dean Camera, 2013.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

--->

-

-<!-- Atmel Studio framework integration file -->

-

-<lufa>

-	<asf>

-		<select-by-device id="common.utils.toolchain_config" caption="Toolchain configuration defaults">

-			<module type="build-specific" id="common.utils.toolchain_config#avr" caption="Toolchain configuration defaults for 8-bit AVR">

-				<info type="gui-flag" value="hidden"/>

-				<device-support value="avr"/>

-

-				<toolchain-config name="avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned" value="True" toolchain="avrgcc"/>

-				<toolchain-config name="avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned" value="True" toolchain="avrgcc"/>

-				<toolchain-config name="avrgcc.compiler.optimization.OtherFlags" value="-fdata-sections" toolchain="avrgcc"/>

-				<toolchain-config name="avrgcc.compiler.optimization.PrepareFunctionsForGarbageCollection" value="True" toolchain="avrgcc"/>

-				<toolchain-config name="avrgcc.compiler.warnings.AllWarnings" value="True" toolchain="avrgcc"/>

-				<toolchain-config name="avrgcc.compiler.miscellaneous.OtherFlags" value="-mrelax -std=gnu99 -fno-strict-aliasing -fno-jump-tables" toolchain="avrgcc"/>

-				<toolchain-config name="avrgcc.linker.optimization.GarbageCollectUnusedSections" value="True" toolchain="avrgcc"/>

-				<toolchain-config name="avrgcc.linker.optimization.RelaxBranches" value="True" toolchain="avrgcc"/>

-			</module>

-		</select-by-device>

-

-		<module type="build-specific" id="common.utils.toolchain_config#uc3" caption="Toolchain configuration defaults for 32-bit AVR">

-			<info type="gui-flag" value="hidden"/>

-			<device-support value="uc3"/>

-

-			<toolchain-config name="avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned" value="True" toolchain="avr32gcc"/>

-			<toolchain-config name="avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned" value="True" toolchain="avr32gcc"/>

-			<toolchain-config name="avr32gcc.compiler.optimization.OtherFlags" value="-fdata-sections" toolchain="avr32gcc"/>

-			<toolchain-config name="avr32gcc.compiler.optimization.PrepareFunctionsForGarbageCollection" value="True" toolchain="avr32gcc"/>

-			<toolchain-config name="avr32gcc.compiler.warnings.AllWarnings" value="True" toolchain="avr32gcc"/>

-			<toolchain-config name="avr32gcc.compiler.miscellaneous.OtherFlags" value="-mrelax -std=gnu99 -fno-strict-aliasing -mno-cond-exec-before-reload" toolchain="avr32gcc"/>

-			<toolchain-config name="avr32gcc.linker.optimization.GarbageCollectUnusedSections" value="True" toolchain="avr32gcc"/>

-			<toolchain-config name="avr32gcc.linker.optimization.RelaxBranches" value="True" toolchain="avr32gcc"/>

-		</module>

-	</asf>

-</lufa>

+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<select-by-device id="common.utils.toolchain_config" caption="Toolchain configuration defaults">
+			<module type="build-specific" id="common.utils.toolchain_config#avr" caption="Toolchain configuration defaults for 8-bit AVR">
+				<info type="gui-flag" value="hidden"/>
+				<device-support value="avr"/>
+
+				<toolchain-config name="avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned" value="True" toolchain="avrgcc"/>
+				<toolchain-config name="avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned" value="True" toolchain="avrgcc"/>
+				<toolchain-config name="avrgcc.compiler.optimization.OtherFlags" value="-fdata-sections" toolchain="avrgcc"/>
+				<toolchain-config name="avrgcc.compiler.optimization.PrepareFunctionsForGarbageCollection" value="True" toolchain="avrgcc"/>
+				<toolchain-config name="avrgcc.compiler.warnings.AllWarnings" value="True" toolchain="avrgcc"/>
+				<toolchain-config name="avrgcc.compiler.miscellaneous.OtherFlags" value="-mrelax -std=gnu99 -fno-strict-aliasing -fno-jump-tables" toolchain="avrgcc"/>
+				<toolchain-config name="avrgcc.linker.optimization.GarbageCollectUnusedSections" value="True" toolchain="avrgcc"/>
+				<toolchain-config name="avrgcc.linker.optimization.RelaxBranches" value="True" toolchain="avrgcc"/>
+			</module>
+		</select-by-device>
+
+		<module type="build-specific" id="common.utils.toolchain_config#uc3" caption="Toolchain configuration defaults for 32-bit AVR">
+			<info type="gui-flag" value="hidden"/>
+			<device-support value="uc3"/>
+
+			<toolchain-config name="avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned" value="True" toolchain="avr32gcc"/>
+			<toolchain-config name="avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned" value="True" toolchain="avr32gcc"/>
+			<toolchain-config name="avr32gcc.compiler.optimization.OtherFlags" value="-fdata-sections" toolchain="avr32gcc"/>
+			<toolchain-config name="avr32gcc.compiler.optimization.PrepareFunctionsForGarbageCollection" value="True" toolchain="avr32gcc"/>
+			<toolchain-config name="avr32gcc.compiler.warnings.AllWarnings" value="True" toolchain="avr32gcc"/>
+			<toolchain-config name="avr32gcc.compiler.miscellaneous.OtherFlags" value="-mrelax -std=gnu99 -fno-strict-aliasing -mno-cond-exec-before-reload" toolchain="avr32gcc"/>
+			<toolchain-config name="avr32gcc.linker.optimization.GarbageCollectUnusedSections" value="True" toolchain="avr32gcc"/>
+			<toolchain-config name="avr32gcc.linker.optimization.RelaxBranches" value="True" toolchain="avr32gcc"/>
+		</module>
+	</asf>
+</lufa>
diff --git a/tmk_core/protocol/lufa/descriptor.c b/tmk_core/protocol/lufa/descriptor.c
index 539a58d66b..6f2407f580 100644
--- a/tmk_core/protocol/lufa/descriptor.c
+++ b/tmk_core/protocol/lufa/descriptor.c
@@ -231,9 +231,15 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
     .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 
     .USBSpecification       = VERSION_BCD(1,1,0),
+#if VIRTSER_ENABLE
+    .Class                  = USB_CSCP_IADDeviceClass,
+    .SubClass               = USB_CSCP_IADDeviceSubclass,
+    .Protocol               = USB_CSCP_IADDeviceProtocol,
+#else
     .Class                  = USB_CSCP_NoDeviceClass,
     .SubClass               = USB_CSCP_NoDeviceSubclass,
     .Protocol               = USB_CSCP_NoDeviceProtocol,
+#endif
 
     .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
 
@@ -643,8 +649,112 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
             .TotalEmbeddedJacks       = 0x01,
             .AssociatedJackID         = {0x03}
-        }
+        },
 #endif
+
+#ifdef VIRTSER_ENABLE
+    .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 =
+            {
+                    .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .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 =
+            {
+                    .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},
+                    .Subtype                = 0x00,
+
+                    .CDCSpecification       = VERSION_BCD(1,1,0),
+            },
+
+    .CDC_Functional_ACM =
+            {
+                    .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},
+                    .Subtype                = 0x02,
+
+                    .Capabilities           = 0x02,
+            },
+
+    .CDC_Functional_Union =
+            {
+                    .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
+                    .Subtype                = 0x06,
+
+                    .MasterInterfaceNumber  = CCI_INTERFACE,
+                    .SlaveInterfaceNumber   = CDI_INTERFACE,
+            },
+
+    .CDC_NotificationEndpoint =
+            {
+                    .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .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 =
+            {
+                    .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .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 =
+            {
+                    .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .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 =
+            {
+                    .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+                    .EndpointAddress        = CDC_IN_EPADDR,
+                    .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+                    .EndpointSize           = CDC_EPSIZE,
+                    .PollingIntervalMS      = 0x05
+            },
+#endif
+
 };
 
 
diff --git a/tmk_core/protocol/lufa/descriptor.h b/tmk_core/protocol/lufa/descriptor.h
index 4fd81a0e87..316650a7b1 100644
--- a/tmk_core/protocol/lufa/descriptor.h
+++ b/tmk_core/protocol/lufa/descriptor.h
@@ -104,6 +104,21 @@ typedef struct
       USB_MIDI_Descriptor_Jack_Endpoint_t       MIDI_Out_Jack_Endpoint_SPC;
 #endif
 
+#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;
+	USB_Descriptor_Endpoint_t                CDC_DataInEndpoint;
+#endif
 } USB_Descriptor_Configuration_t;
 
 
@@ -141,8 +156,15 @@ typedef struct
 #   define AS_INTERFACE           NKRO_INTERFACE
 #endif
 
+#ifdef VIRTSER_ENABLE
+#   define CCI_INTERFACE         (AS_INTERFACE + 1)
+#   define CDI_INTERFACE         (AS_INTERFACE + 2)
+#else
+#   define CDI_INTERFACE         AS_INTERFACE
+#endif
+
 /* nubmer of interfaces */
-#define TOTAL_INTERFACES            AS_INTERFACE + 1
+#define TOTAL_INTERFACES            (CDI_INTERFACE + 1)
 
 
 // Endopoint number and size
@@ -180,11 +202,24 @@ typedef struct
 #   define MIDI_STREAM_OUT_EPNUM    (NKRO_IN_EPNUM + 2)
 #   define MIDI_STREAM_IN_EPADDR    (ENDPOINT_DIR_IN | MIDI_STREAM_IN_EPNUM)
 #   define MIDI_STREAM_OUT_EPADDR   (ENDPOINT_DIR_OUT | MIDI_STREAM_OUT_EPNUM)
+#else
+#   define MIDI_STREAM_OUT_EPNUM     NKRO_IN_EPNUM
+#endif
+
+#ifdef VIRTSER_ENABLE
+#   define CDC_NOTIFICATION_EPNUM   (MIDI_STREAM_OUT_EPNUM + 1)
+#   define CDC_IN_EPNUM		    (MIDI_STREAM_OUT_EPNUM + 2)
+#   define CDC_OUT_EPNUM		    (MIDI_STREAM_OUT_EPNUM + 3)
+#   define CDC_NOTIFICATION_EPADDR        (ENDPOINT_DIR_IN | CDC_NOTIFICATION_EPNUM)
+#   define CDC_IN_EPADDR                  (ENDPOINT_DIR_IN | CDC_IN_EPNUM)
+#   define CDC_OUT_EPADDR                  (ENDPOINT_DIR_OUT | CDC_OUT_EPNUM)
+#else
+#   define CDC_OUT_EPNUM	MIDI_STREAM_OUT_EPNUM
 #endif
 
 
-#if defined(__AVR_ATmega32U2__) && MIDI_STREAM_OUT_EPADDR > 4
-# error "Endpoints are not available enough to support all functions. Remove some in Makefile.(MOUSEKEY, EXTRAKEY, CONSOLE, NKRO, MIDI)"
+#if defined(__AVR_ATmega32U2__) && CDC_OUT_EPNUM > 4
+# error "Endpoints are not available enough to support all functions. Remove some in Makefile.(MOUSEKEY, EXTRAKEY, CONSOLE, NKRO, MIDI, SERIAL)"
 #endif
 
 #define KEYBOARD_EPSIZE             8
@@ -193,6 +228,8 @@ typedef struct
 #define CONSOLE_EPSIZE              32
 #define NKRO_EPSIZE                 16
 #define MIDI_STREAM_EPSIZE          64
+#define CDC_NOTIFICATION_EPSIZE     8
+#define CDC_EPSIZE                  16
 
 
 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 9ca55dbc9d..9b201374a2 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -60,6 +60,10 @@
     #include "bluetooth.h"
 #endif
 
+#ifdef VIRTSER_ENABLE
+    #include "virtser.h"
+#endif
+
 uint8_t keyboard_idle = 0;
 /* 0: Boot Protocol, 1: Report Protocol(default) */
 uint8_t keyboard_protocol = 1;
@@ -127,6 +131,34 @@ USB_ClassInfo_MIDI_Device_t USB_MIDI_Interface =
 #define SYS_COMMON_3 0x30
 #endif
 
+#ifdef VIRTSER_ENABLE
+USB_ClassInfo_CDC_Device_t cdc_device =
+{
+  .Config =
+  {
+    .ControlInterfaceNumber = CCI_INTERFACE,
+    .DataINEndpoint         =
+    {
+      .Address		= CDC_IN_EPADDR,
+      .Size		= CDC_EPSIZE,
+      .Banks		= 1,
+    },
+    .DataOUTEndpoint	    =
+    {
+      .Address		= CDC_OUT_EPADDR,
+      .Size		= CDC_EPSIZE,
+      .Banks		= 1,
+    },
+    .NotificationEndpoint   =
+    {
+      .Address		= CDC_NOTIFICATION_EPADDR,
+      .Size		= CDC_NOTIFICATION_EPSIZE,
+      .Banks		= 1,
+    },
+  },
+};
+#endif
+
 
 /*******************************************************************************
  * Console
@@ -311,6 +343,12 @@ void EVENT_USB_Device_ConfigurationChanged(void)
     ConfigSuccess &= Endpoint_ConfigureEndpoint(MIDI_STREAM_IN_EPADDR, EP_TYPE_BULK, MIDI_STREAM_EPSIZE, ENDPOINT_BANK_SINGLE);
     ConfigSuccess &= Endpoint_ConfigureEndpoint(MIDI_STREAM_OUT_EPADDR, EP_TYPE_BULK, MIDI_STREAM_EPSIZE, ENDPOINT_BANK_SINGLE);
 #endif
+
+#ifdef VIRTSER_ENABLE
+    ConfigSuccess &= Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPADDR, EP_TYPE_INTERRUPT, CDC_NOTIFICATION_EPSIZE, ENDPOINT_BANK_SINGLE);
+    ConfigSuccess &= Endpoint_ConfigureEndpoint(CDC_OUT_EPADDR, EP_TYPE_BULK, CDC_EPSIZE, ENDPOINT_BANK_SINGLE);
+    ConfigSuccess &= Endpoint_ConfigureEndpoint(CDC_IN_EPADDR, EP_TYPE_BULK, CDC_EPSIZE, ENDPOINT_BANK_SINGLE);
+#endif
 }
 
 /*
@@ -432,10 +470,15 @@ void EVENT_USB_Device_ControlRequest(void)
 
             break;
     }
+
+#ifdef VIRTSER_ENABLE
+    CDC_Device_ProcessControlRequest(&cdc_device);
+#endif
 }
 
 /*******************************************************************************
  * Host driver
+p
  ******************************************************************************/
 static uint8_t keyboard_leds(void)
 {
@@ -827,6 +870,61 @@ void MIDI_Task(void)
 
 #endif
 
+/*******************************************************************************
+ * VIRTUAL SERIAL
+ ******************************************************************************/
+
+#ifdef VIRTSER_ENABLE
+void virtser_init(void)
+{
+  cdc_device.State.ControlLineStates.DeviceToHost = CDC_CONTROL_LINE_IN_DSR ;
+  CDC_Device_SendControlLineStateChange(&cdc_device);
+}
+
+void virtser_recv(uint8_t c) __attribute__ ((weak));
+void virtser_recv(uint8_t c)
+{
+  // Ignore by default
+}
+
+void virtser_task(void)
+{
+  uint16_t count = CDC_Device_BytesReceived(&cdc_device);
+  uint8_t ch;
+  if (count)
+  {
+    ch = CDC_Device_ReceiveByte(&cdc_device);
+    virtser_recv(ch);
+  }
+}
+void virtser_send(const uint8_t byte)
+{
+  uint8_t timeout = 255;
+  uint8_t ep = Endpoint_GetCurrentEndpoint();
+
+  if (cdc_device.State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR)
+  {
+    /* IN packet */
+    Endpoint_SelectEndpoint(cdc_device.Config.DataINEndpoint.Address);
+
+    if (!Endpoint_IsEnabled() || !Endpoint_IsConfigured()) {
+        Endpoint_SelectEndpoint(ep);
+        return;
+    }
+
+    while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
+
+    Endpoint_Write_8(byte);
+    CDC_Device_Flush(&cdc_device);
+
+    if (Endpoint_IsINReady()) {
+      Endpoint_ClearIN();
+    }
+
+    Endpoint_SelectEndpoint(ep);
+  }
+}
+#endif
 
 /*******************************************************************************
  * main
@@ -918,6 +1016,10 @@ int main(void)
     sleep_led_init();
 #endif
 
+#ifdef VIRTSER_ENABLE
+    virtser_init();
+#endif
+
     print("Keyboard start.\n");
     while (1) {
         #ifndef BLUETOOTH_ENABLE
@@ -936,6 +1038,11 @@ int main(void)
 #endif
         keyboard_task();
 
+#ifdef VIRTSER_ENABLE
+        virtser_task();
+        CDC_Device_USBTask(&cdc_device);
+#endif
+
 #if !defined(INTERRUPT_CONTROL_ENDPOINT)
         USB_USBTask();
 #endif
diff --git a/tmk_core/protocol/midi/Config/LUFAConfig.h b/tmk_core/protocol/midi/Config/LUFAConfig.h
index fa9404498f..a1d7482672 100755
--- a/tmk_core/protocol/midi/Config/LUFAConfig.h
+++ b/tmk_core/protocol/midi/Config/LUFAConfig.h
@@ -1,93 +1,93 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-

-/*

-  Copyright 2012  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

-  without fee, provided that the above copyright notice appear in

-  all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting

-  documentation, and that the name of the author not be used in

-  advertising or publicity pertaining to distribution of the

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-/** \file

- *  \brief LUFA Library Configuration Header File

- *

- *  This header file is used to configure LUFA's compile time options,

- *  as an alternative to the compile time constants supplied through

- *  a makefile.

- *

- *  For information on what each token does, refer to the LUFA

- *  manual section "Summary of Compile Tokens".

- */

-

-#ifndef _LUFA_CONFIG_H_

-#define _LUFA_CONFIG_H_

-

-	#if (ARCH == ARCH_AVR8)

-

-		/* Non-USB Related Configuration Tokens: */

-//		#define DISABLE_TERMINAL_CODES

-

-		/* USB Class Driver Related Tokens: */

-//		#define HID_HOST_BOOT_PROTOCOL_ONLY

-//		#define HID_STATETABLE_STACK_DEPTH       {Insert Value Here}

-//		#define HID_USAGE_STACK_DEPTH            {Insert Value Here}

-//		#define HID_MAX_COLLECTIONS              {Insert Value Here}

-//		#define HID_MAX_REPORTITEMS              {Insert Value Here}

-//		#define HID_MAX_REPORT_IDS               {Insert Value Here}

-//		#define NO_CLASS_DRIVER_AUTOFLUSH

-

-		/* General USB Driver Related Tokens: */

-//		#define ORDERED_EP_CONFIG

-		#define USE_STATIC_OPTIONS               (USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)

-		#define USB_DEVICE_ONLY

-//		#define USB_HOST_ONLY

-//		#define USB_STREAM_TIMEOUT_MS            {Insert Value Here}

-//		#define NO_LIMITED_CONTROLLER_CONNECT

-//		#define NO_SOF_EVENTS

-

-		/* USB Device Mode Driver Related Tokens: */

-//		#define USE_RAM_DESCRIPTORS

-		#define USE_FLASH_DESCRIPTORS

-//		#define USE_EEPROM_DESCRIPTORS

-//		#define NO_INTERNAL_SERIAL

-		#define FIXED_CONTROL_ENDPOINT_SIZE      8

-//		#define DEVICE_STATE_AS_GPIOR            {Insert Value Here}

-		#define FIXED_NUM_CONFIGURATIONS         1

-//		#define CONTROL_ONLY_DEVICE

-//		#define INTERRUPT_CONTROL_ENDPOINT

-//		#define NO_DEVICE_REMOTE_WAKEUP

-//		#define NO_DEVICE_SELF_POWER

-

-		/* USB Host Mode Driver Related Tokens: */

-//		#define HOST_STATE_AS_GPIOR              {Insert Value Here}

-//		#define USB_HOST_TIMEOUT_MS              {Insert Value Here}

-//		#define HOST_DEVICE_SETTLE_DELAY_MS	     {Insert Value Here}

-//      #define NO_AUTO_VBUS_MANAGEMENT

-//      #define INVERTED_VBUS_ENABLE_LINE

-

-	#else

-

-		#error Unsupported architecture for this LUFA configuration file.

-

-	#endif

-#endif

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  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
+  without fee, provided that the above copyright notice appear in
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *  \brief LUFA Library Configuration Header File
+ *
+ *  This header file is used to configure LUFA's compile time options,
+ *  as an alternative to the compile time constants supplied through
+ *  a makefile.
+ *
+ *  For information on what each token does, refer to the LUFA
+ *  manual section "Summary of Compile Tokens".
+ */
+
+#ifndef _LUFA_CONFIG_H_
+#define _LUFA_CONFIG_H_
+
+	#if (ARCH == ARCH_AVR8)
+
+		/* Non-USB Related Configuration Tokens: */
+//		#define DISABLE_TERMINAL_CODES
+
+		/* USB Class Driver Related Tokens: */
+//		#define HID_HOST_BOOT_PROTOCOL_ONLY
+//		#define HID_STATETABLE_STACK_DEPTH       {Insert Value Here}
+//		#define HID_USAGE_STACK_DEPTH            {Insert Value Here}
+//		#define HID_MAX_COLLECTIONS              {Insert Value Here}
+//		#define HID_MAX_REPORTITEMS              {Insert Value Here}
+//		#define HID_MAX_REPORT_IDS               {Insert Value Here}
+//		#define NO_CLASS_DRIVER_AUTOFLUSH
+
+		/* General USB Driver Related Tokens: */
+//		#define ORDERED_EP_CONFIG
+		#define USE_STATIC_OPTIONS               (USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)
+		#define USB_DEVICE_ONLY
+//		#define USB_HOST_ONLY
+//		#define USB_STREAM_TIMEOUT_MS            {Insert Value Here}
+//		#define NO_LIMITED_CONTROLLER_CONNECT
+//		#define NO_SOF_EVENTS
+
+		/* USB Device Mode Driver Related Tokens: */
+//		#define USE_RAM_DESCRIPTORS
+		#define USE_FLASH_DESCRIPTORS
+//		#define USE_EEPROM_DESCRIPTORS
+//		#define NO_INTERNAL_SERIAL
+		#define FIXED_CONTROL_ENDPOINT_SIZE      8
+//		#define DEVICE_STATE_AS_GPIOR            {Insert Value Here}
+		#define FIXED_NUM_CONFIGURATIONS         1
+//		#define CONTROL_ONLY_DEVICE
+//		#define INTERRUPT_CONTROL_ENDPOINT
+//		#define NO_DEVICE_REMOTE_WAKEUP
+//		#define NO_DEVICE_SELF_POWER
+
+		/* USB Host Mode Driver Related Tokens: */
+//		#define HOST_STATE_AS_GPIOR              {Insert Value Here}
+//		#define USB_HOST_TIMEOUT_MS              {Insert Value Here}
+//		#define HOST_DEVICE_SETTLE_DELAY_MS	     {Insert Value Here}
+//      #define NO_AUTO_VBUS_MANAGEMENT
+//      #define INVERTED_VBUS_ENABLE_LINE
+
+	#else
+
+		#error Unsupported architecture for this LUFA configuration file.
+
+	#endif
+#endif