Fix the LUFA lib to use a submodule instead of just files (#6245)

* Remove LUFA files

* Update descriptions for newer version of LUFA

* Create PR6245.md

* Fix CDC(Serial) type errors

* Fix missed merge conflict for AUDIO_DTYPE_CSInterface

13 files changed, 0 insertions, 3748 deletions

diff --git a/lib/lufa/Projects/Magstripe/Config/AppConfig.h b/lib/lufa/Projects/Magstripe/Config/AppConfig.h
deleted file mode 100644
index 2b417b8a90..0000000000
--- a/lib/lufa/Projects/Magstripe/Config/AppConfig.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2017.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2017  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 disclaims 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 Application Configuration Header File
- *
- *  This is a header file which is be used to configure some of
- *  the application's compile time options, as an alternative to
- *  specifying the compile time constants supplied through a
- *  makefile or build system.
- *
- *  For information on what each token does, refer to the
- *  \ref Sec_Options section of the application documentation.
- */
-
-#ifndef _APP_CONFIG_H_
-#define _APP_CONFIG_H_
-
-	#define MAG_T1_CLOCK         (1 << 0)
-	#define MAG_T1_DATA          (1 << 1)
-	#define MAG_T2_CLOCK         (1 << 2)
-	#define MAG_T2_DATA          (1 << 3)
-	#define MAG_T3_CLOCK         (1 << 4)
-	#define MAG_T3_DATA          (1 << 5)
-	#define MAG_CARDPRESENT      (1 << 6)
-
-	#define MAG_PORT             PORTC
-	#define MAG_PIN              PINC
-	#define MAG_DDR              DDRC
-
-#endif
diff --git a/lib/lufa/Projects/Magstripe/Config/LUFAConfig.h b/lib/lufa/Projects/Magstripe/Config/LUFAConfig.h
deleted file mode 100644
index 2b8d027a3d..0000000000
--- a/lib/lufa/Projects/Magstripe/Config/LUFAConfig.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2017.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2017  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 disclaims 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            0
-		#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
diff --git a/lib/lufa/Projects/Magstripe/Descriptors.c b/lib/lufa/Projects/Magstripe/Descriptors.c
deleted file mode 100644
index 8032bccc84..0000000000
--- a/lib/lufa/Projects/Magstripe/Descriptors.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2017.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
-  Copyright 2017  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 disclaims 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
- *
- *  USB Device Descriptors, for library use when in USB device mode. Descriptors are special
- *  computer-readable structures which the host requests upon device enumeration, to determine
- *  the device's capabilities and functions.
- */
-
-#include "Descriptors.h"
-
-/** HID report descriptor. This is a HID class specific descriptor, which defines the structure of the
- *  reports sent and received by the HID device to and from the USB host. It indicates what data is sent,
- *  where in the report each element is located and exactly how the data should be interpreted and used.
- *
- *  See the HID class specification for more information on HID report descriptors.
- */
-const USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] =
-{
-	/* Use the HID class driver's standard Keyboard report.
-	 *   Max simultaneous keys: 6
-	 */
-	HID_DESCRIPTOR_KEYBOARD(6)
-};
-
-/** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
- *  device characteristics, including the supported USB version, control endpoint size and the
- *  number of device configurations. The descriptor is read out by the USB host when the enumeration
- *  process begins.
- */
-const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
-{
-	.Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
-
-	.USBSpecification       = VERSION_BCD(1,1,0),
-	.Class                  = USB_CSCP_NoDeviceClass,
-	.SubClass               = USB_CSCP_NoDeviceSubclass,
-	.Protocol               = USB_CSCP_NoDeviceProtocol,
-
-	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
-
-	.VendorID               = 0x03EB,
-	.ProductID              = 0x2042,
-	.ReleaseNumber          = VERSION_BCD(0,0,1),
-
-	.ManufacturerStrIndex   = STRING_ID_Manufacturer,
-	.ProductStrIndex        = STRING_ID_Product,
-	.SerialNumStrIndex      = USE_INTERNAL_SERIAL,
-
-	.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
-};
-
-/** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage
- *  of the device in one of its supported configurations, including information about any device interfaces
- *  and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
- *  a configuration so that the host may correctly communicate with the USB device.
- */
-const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
-{
-	.Config =
-		{
-			.Header                 = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
-
-			.TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
-			.TotalInterfaces        = 1,
-
-			.ConfigurationNumber    = 1,
-			.ConfigurationStrIndex  = NO_DESCRIPTOR,
-
-			.ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),
-
-			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)
-		},
-
-	.HID_Interface =
-		{
-			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
-
-			.InterfaceNumber        = INTERFACE_ID_Keyboard,
-			.AlternateSetting       = 0x00,
-
-			.TotalEndpoints         = 1,
-
-			.Class                  = HID_CSCP_HIDClass,
-			.SubClass               = HID_CSCP_BootSubclass,
-			.Protocol               = HID_CSCP_KeyboardBootProtocol,
-
-			.InterfaceStrIndex      = NO_DESCRIPTOR
-		},
-
-	.HID_KeyboardHID =
-		{
-			.Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
-
-			.HIDSpec                = VERSION_BCD(1,1,1),
-			.CountryCode            = 0x00,
-			.TotalReportDescriptors = 1,
-			.HIDReportType          = HID_DTYPE_Report,
-			.HIDReportLength        = sizeof(KeyboardReport)
-		},
-
-	.HID_ReportINEndpoint =
-		{
-			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
-
-			.EndpointAddress        = KEYBOARD_EPADDR,
-			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
-			.EndpointSize           = KEYBOARD_EPSIZE,
-			.PollingIntervalMS      = 0x05
-		},
-};
-
-/** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests
- *  the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
- *  via the language ID table available at USB.org what languages the device supports for its string descriptors. */
-const USB_Descriptor_String_t PROGMEM LanguageString = USB_STRING_DESCRIPTOR_ARRAY(LANGUAGE_ID_ENG);
-
-/** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable
- *  form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
- *  Descriptor.
- */
-const USB_Descriptor_String_t PROGMEM ManufacturerString = USB_STRING_DESCRIPTOR(L"Dean Camera and Denver Gingerich");
-
-/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
- *  and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
- *  Descriptor.
- */
-const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"Magnetic Card Reader");
-
-/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
- *  documentation) by the application code so that the address and size of a requested descriptor can be given
- *  to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function
- *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
- *  USB host.
- */
-uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint16_t wIndex,
-                                    const void** const DescriptorAddress)
-{
-	const uint8_t  DescriptorType   = (wValue >> 8);
-	const uint8_t  DescriptorNumber = (wValue & 0xFF);
-
-	const void* Address = NULL;
-	uint16_t    Size    = NO_DESCRIPTOR;
-
-	switch (DescriptorType)
-	{
-		case DTYPE_Device:
-			Address = &DeviceDescriptor;
-			Size    = sizeof(USB_Descriptor_Device_t);
-			break;
-		case DTYPE_Configuration:
-			Address = &ConfigurationDescriptor;
-			Size    = sizeof(USB_Descriptor_Configuration_t);
-			break;
-		case DTYPE_String:
-			switch (DescriptorNumber)
-			{
-				case STRING_ID_Language:
-					Address = &LanguageString;
-					Size    = pgm_read_byte(&LanguageString.Header.Size);
-					break;
-				case STRING_ID_Manufacturer:
-					Address = &ManufacturerString;
-					Size    = pgm_read_byte(&ManufacturerString.Header.Size);
-					break;
-				case STRING_ID_Product:
-					Address = &ProductString;
-					Size    = pgm_read_byte(&ProductString.Header.Size);
-					break;
-			}
-
-			break;
-		case HID_DTYPE_HID:
-			Address = &ConfigurationDescriptor.HID_KeyboardHID;
-			Size    = sizeof(USB_HID_Descriptor_HID_t);
-			break;
-		case HID_DTYPE_Report:
-			Address = &KeyboardReport;
-			Size    = sizeof(KeyboardReport);
-			break;
-	}
-
-	*DescriptorAddress = Address;
-	return Size;
-}
-
diff --git a/lib/lufa/Projects/Magstripe/Descriptors.h b/lib/lufa/Projects/Magstripe/Descriptors.h
deleted file mode 100644
index 149fe75314..0000000000
--- a/lib/lufa/Projects/Magstripe/Descriptors.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2017.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
-  Copyright 2017  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 disclaims 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
- *
- *  Header file for Descriptors.c.
- */
-
-#ifndef _DESCRIPTORS_H_
-#define _DESCRIPTORS_H_
-
-	/* Includes: */
-		#include <avr/pgmspace.h>
-
-		#include <LUFA/Drivers/USB/USB.h>
-
-		#include "Config/AppConfig.h"
-
-	/* Type Defines: */
-		/** Type define for the device configuration descriptor structure. This must be defined in the
-		 *  application code, as the configuration descriptor contains several sub-descriptors which
-		 *  vary between devices, and which describe the device's usage to the host.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Configuration_Header_t Config; /**< Configuration descriptor header structure */
-
-			// Keyboard HID Interface
-			USB_Descriptor_Interface_t            HID_Interface; /**< Keyboard interface descriptor */
-			USB_HID_Descriptor_HID_t              HID_KeyboardHID; /**< Keyboard HID descriptor */
-			USB_Descriptor_Endpoint_t             HID_ReportINEndpoint; /**< Keyboard key report endpoint descriptor */
-		} USB_Descriptor_Configuration_t;
-
-		/** Enum for the device interface descriptor IDs within the device. Each interface descriptor
-		 *  should have a unique ID index associated with it, which can be used to refer to the
-		 *  interface from other descriptors.
-		 */
-		enum InterfaceDescriptors_t
-		{
-			INTERFACE_ID_Keyboard = 0, /**< Keyboard interface descriptor ID */
-		};
-
-		/** Enum for the device string descriptor IDs within the device. Each string descriptor should
-		 *  have a unique ID index associated with it, which can be used to refer to the string from
-		 *  other descriptors.
-		 */
-		enum StringDescriptors_t
-		{
-			STRING_ID_Language     = 0, /**< Supported Languages string descriptor ID (must be zero) */
-			STRING_ID_Manufacturer = 1, /**< Manufacturer string ID */
-			STRING_ID_Product      = 2, /**< Product string ID */
-		};
-
-	/* Macros: */
-		/** Endpoint address of the keyboard key press reporting endpoint. */
-		#define KEYBOARD_EPADDR              (ENDPOINT_DIR_IN | 1)
-
-		/** Size of the keyboard report endpoints, in bytes. */
-		#define KEYBOARD_EPSIZE              8
-
-	/* Function Prototypes: */
-		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-		                                    const uint16_t wIndex,
-		                                    const void** const DescriptorAddress)
-		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
-
-#endif
-
diff --git a/lib/lufa/Projects/Magstripe/Lib/CircularBitBuffer.c b/lib/lufa/Projects/Magstripe/Lib/CircularBitBuffer.c
deleted file mode 100644
index 802d040c5b..0000000000
--- a/lib/lufa/Projects/Magstripe/Lib/CircularBitBuffer.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2017.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
-  Copyright 2017  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 disclaims 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.
-*/
-
-/** Circular bit buffer library. This will allow for individual bits
- *  to be stored in packed form inside circular buffers, to reduce
- *  overall RAM usage.
- */
-
-#include "CircularBitBuffer.h"
-
-/** Function to initialize or reset a bit buffer, ready for data to be stored into it. */
-void BitBuffer_Init(BitBuffer_t* const Buffer)
-{
-	/* Reset the number of stored bits in the buffer */
-	Buffer->Elements        = 0;
-
-	/* Reset the data in and out pointer structures in the buffer to the first buffer bit */
-	Buffer->In.CurrentByte  = Buffer->Data;
-	Buffer->In.ByteMask     = (1 << 0);
-	Buffer->Out.CurrentByte = Buffer->Data;
-	Buffer->Out.ByteMask    = (1 << 0);
-}
-
-/** Function to store the given bit into the given bit buffer. */
-void BitBuffer_StoreNextBit(BitBuffer_t* const Buffer,
-                            const bool Bit)
-{
-	/* If the bit to store is true, set the next bit in the buffer */
-	if (Bit)
-	  *Buffer->In.CurrentByte |= Buffer->In.ByteMask;
-
-	/* Increment the number of stored bits in the buffer counter */
-	Buffer->Elements++;
-
-	/* Check if the current buffer byte is full of stored bits */
-	if (Buffer->In.ByteMask == (1 << 7))
-	{
-		/* Check if the end of the buffer has been reached, if so reset to start of buffer, otherwise advance to next bit */
-		if (Buffer->In.CurrentByte != &Buffer->Data[sizeof(Buffer->Data) - 1])
-		  Buffer->In.CurrentByte++;
-		else
-		  Buffer->In.CurrentByte = Buffer->Data;
-
-		/* Reset the storage bit mask in the current buffer byte to the first bit */
-		Buffer->In.ByteMask = (1 << 0);
-	}
-	else
-	{
-		/* Shift the current storage bit mask to the next bit in the current byte */
-		Buffer->In.ByteMask <<= 1;
-	}
-}
-
-/** Function to retrieve the next bit stored in the given bit buffer. */
-bool BitBuffer_GetNextBit(BitBuffer_t* const Buffer)
-{
-	/* Retrieve the value of the next bit stored in the buffer */
-	bool Bit = ((*Buffer->Out.CurrentByte & Buffer->Out.ByteMask) != 0);
-
-	/* Clear the buffer bit */
-	*Buffer->Out.CurrentByte &= ~Buffer->Out.ByteMask;
-
-	/* Decrement the number of stored bits in the buffer counter */
-	Buffer->Elements--;
-
-	/* Check if the current buffer byte is empty of stored bits */
-	if (Buffer->Out.ByteMask == (1 << 7))
-	{
-		/* Check if the end of the buffer has been reached, if so reset to start of buffer, otherwise advance to next bit */
-		if (Buffer->Out.CurrentByte != &Buffer->Data[sizeof(Buffer->Data) - 1])
-		  Buffer->Out.CurrentByte++;
-		else
-		  Buffer->Out.CurrentByte = Buffer->Data;
-
-		/* Reset the retrieval bit mask in the current buffer byte to the first bit */
-		Buffer->Out.ByteMask = (1 << 0);
-	}
-	else
-	{
-		/* Shift the current retrieval bit mask to the next bit in the current byte */
-		Buffer->Out.ByteMask <<= 1;
-	}
-
-	/* Return the retrieved bit from the buffer */
-	return Bit;
-}
-
diff --git a/lib/lufa/Projects/Magstripe/Lib/CircularBitBuffer.h b/lib/lufa/Projects/Magstripe/Lib/CircularBitBuffer.h
deleted file mode 100644
index 0adbe0c89e..0000000000
--- a/lib/lufa/Projects/Magstripe/Lib/CircularBitBuffer.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2017.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
-  Copyright 2017  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 disclaims 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
- *
- *  Header file for CircularBitBuffer.c.
- */
-
-#ifndef _CIRCULARBITBUFFER_H_
-#define _CIRCULARBITBUFFER_H_
-
-	/* Includes: */
-		#include <avr/io.h>
-		#include <stdbool.h>
-
-		#include <LUFA/Common/Common.h>
-
-	/* Macros: */
-		#if (defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \
-		     defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__)) || defined(__DOXYGEN__)
-			/** Maximum number of bits which can be stored into a bit buffer. The memory usage is one eighth of this value per buffer. */
-			#define MAX_BITS 8192
-		#else
-			#define MAX_BITS 1024
-		#endif
-
-	/* Type Defines: */
-		/** Type define for a pointer to a bit in a bit buffer. */
-		typedef struct
-		{
-			uint8_t* CurrentByte; /**< Pointer to the current byte in the buffer */
-			uint8_t  ByteMask; /**< Mask of the current bit in the buffer */
-		} BitBufferPointer_t;
-
-		/** Type define for a circular packet bit buffer. */
-		typedef struct
-		{
-			uint8_t            Data[MAX_BITS / 8]; /**< Buffer to hold the stored bits in packed form */
-			uint16_t           Elements; /**< Number of stored bits in the bit buffer */
-
-			BitBufferPointer_t In; /**< Bit pointer to the next storage location in the buffer */
-			BitBufferPointer_t Out; /**< Bit pointer to the next retrieval location in the buffer */
-		} BitBuffer_t;
-
-	/* Function Prototypes: */
-		/** Initializes or resets a given bit buffer, ready to store new bits.
-		 *
-		 *  \param[in,out] Buffer  Bit buffer to initialize
-		 */
-		void BitBuffer_Init(BitBuffer_t* const Buffer) ATTR_NON_NULL_PTR_ARG(1);
-
-		/** Stores a bit into the next location inside a given bit buffer.
-		 *
-		 *  \param[in,out] Buffer  Bit buffer to store a bit into
-		 *  \param[in] Bit  Bit to store into the buffer
-		 */
-		void BitBuffer_StoreNextBit(BitBuffer_t* const Buffer,
-		                            const bool Bit) ATTR_NON_NULL_PTR_ARG(1);
-
-		/** Retrieves a bit from the next location inside a given bit buffer.
-		 *
-		 *  \param[in,out] Buffer  Bit buffer to retrieve a bit from
-		 *
-		 *  \return Next bit from the buffer
-		 */
-		bool BitBuffer_GetNextBit(BitBuffer_t* const Buffer) ATTR_NON_NULL_PTR_ARG(1);
-
-#endif
-
diff --git a/lib/lufa/Projects/Magstripe/Lib/MagstripeHW.h b/lib/lufa/Projects/Magstripe/Lib/MagstripeHW.h
deleted file mode 100644
index 6d9cc8cbc4..0000000000
--- a/lib/lufa/Projects/Magstripe/Lib/MagstripeHW.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-  Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
-  Copyright 2017  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 disclaims 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.
-*/
-
-/*
-	NOTE: The user of this include file MUST define the following macros
-	prior to including the file:
-
-	MAG_T1_CLOCK_PIN   Pin connected to Track 1 clock wire (i.e.. PORTC1)
-	MAG_T1_DATA_PIN    Pin connected to Track 1 data wire (i.e.. PORTC2)
-	MAG_T2_CLOCK_PIN   Pin connected to Track 2 clock wire (i.e.. PORTC3)
-	MAG_T2_DATA_PIN    Pin connected to Track 2 data wire (i.e.. PORTC0)
-	MAG_T3_CLOCK_PIN   Pin connected to Track 3 clock wire (i.e.. PORTC5)
-	MAG_T3_DATA_PIN    Pin connected to Track 3 data wire (i.e.. PORTC6)
-	MAG_CLS_PIN        Pin connected to card loaded wire (i.e.. PORTC4)
-	MAG_PIN            PIN macro for the reader's port (i.e.. PINC)
-	MAG_DDR            DDR macro for the reader's port (i.e.. DDRC)
-	MAG_PORT           PORT macro for the reader's port (i.e.. PORTC)
-
-	The example macros listed above assume that the Track 2 data wire is
-	connected to pin 0 on port C, the Track 2 clock wire is connected to
-	pin 3 on port C (similarly for Tracks 1 and 3), and the card loaded
-	wire is connected to pin 4 on port C.
-
-	If the mag-stripe reader you are using only reads one or two tracks,
-	then set the clock and data pins for the tracks it doesn't read to a
-	pin that is unused.  For example, on the AT90USBKey, any of the pins on
-	port C that do not have wires attached will be unused since they are
-	not connected to any onboard devices (such as the joystick or
-	temperature sensor).
-
-	Connecting wires to pins on different ports (i.e.. a data wire to pin 0
-	on port C and a clock wire to pin 0 on port D) is currently
-	unsupported.  All pins specified above must be on the same port.
-*/
-
-/** \file
- *
- *  Driver header for a TTL Magnetic Card reader device (such as the Omron V3B-4K).
- */
-
-#ifndef _MAGSTRIPEHW_H_
-#define _MAGSTRIPEHW_H_
-
-	/* Includes: */
-		#include <avr/io.h>
-
-		#include <LUFA/Common/Common.h>
-		#include "Config/AppConfig.h"
-
-	/* Private Interface - For use in library only: */
-		/* Macros: */
-			/** Mask of the track data, clock and card detection pins. */
-			#define MAG_MASK    (MAG_T1_DATA | MAG_T1_CLOCK | \
-			                     MAG_T2_DATA | MAG_T2_CLOCK | \
-			                     MAG_T3_DATA | MAG_T3_CLOCK | \
-			                     MAG_CARDPRESENT)
-
-	/* Public Interface - May be used in end-application: */
-		/* Inline Functions: */
-			/** Initializes the magnetic stripe card reader ports and pins so that the card reader
-			 *  device can be controlled and read by the card reader driver. This must be called before
-			 *  trying to read any of the card reader's status lines.
-			 */
-			static inline void Magstripe_Init(void)
-			{
-				MAG_DDR  &= ~MAG_MASK;
-				MAG_PORT |=  MAG_MASK;
-			};
-
-			/** Returns the status of all the magnetic card reader's outputs.
-			 *
-			 *  \return A mask indicating which card lines are high or low
-			 */
-			static inline uint8_t Magstripe_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Magstripe_GetStatus(void)
-			{
-				/* Mag-stripe IOs are active low and must be inverted when read */
-				return ((uint8_t)~MAG_PIN & MAG_MASK);
-			}
-
-#endif
-
diff --git a/lib/lufa/Projects/Magstripe/Magstripe.c b/lib/lufa/Projects/Magstripe/Magstripe.c
deleted file mode 100644
index 9bb6ff01a0..0000000000
--- a/lib/lufa/Projects/Magstripe/Magstripe.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2017.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
-  Copyright 2017  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 disclaims 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
- *
- *  Main source file for the MagStripe reader program. This file contains the main tasks of
- *  the project and is responsible for the initial application hardware configuration.
- */
-