dos2unix for all files

33 files changed, 3953 insertions, 3953 deletions

diff --git a/any-led/Makefile b/any-led/Makefile
index ea5bf27..0f15984 100644
--- a/any-led/Makefile
+++ b/any-led/Makefile
@@ -1,47 +1,47 @@
-##

-##  spreadspace avr utils

-##

-##

-##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

-##

-##  This file is part of spreadspace avr utils.

-##

-##  spreadspace avr utils is free software: you can redistribute it and/or modify

-##  it under the terms of the GNU General Public License as published by

-##  the Free Software Foundation, either version 3 of the License, or

-##  any later version.

-##

-##  spreadspace avr utils is distributed in the hope that it will be useful,

-##  but WITHOUT ANY WARRANTY; without even the implied warranty of

-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-##  GNU General Public License for more details.

-##

-##  You should have received a copy of the GNU General Public License

-##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

-##

-

-NAME := any-led

-BOARD_TYPE := teensy2

-OBJ := $(NAME).o

-LIBS := util led lufa-descriptor-usbserial anyio

-EXTERNAL_LIBS := lufa

-SPREADAVR_PATH := ..

-RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc

-RESET_PARAM := 'r'

-

-LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219

-LUFA_OPTS  = -D USB_DEVICE_ONLY

-LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0

-LUFA_OPTS += -D ORDERED_EP_CONFIG

-LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

-LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

-LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

-LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT

-

-LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7

-LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace any-led example\"" -D USB_PRODUCT_LEN=27

-

-LUFA_COMPONENTS := USB USBCLASS SERIAL

-

-include $(SPREADAVR_PATH)/include.mk

+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+NAME := any-led
+BOARD_TYPE := teensy2
+OBJ := $(NAME).o
+LIBS := util led lufa-descriptor-usbserial anyio
+EXTERNAL_LIBS := lufa
+SPREADAVR_PATH := ..
+RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc
+RESET_PARAM := 'r'
+
+LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219
+LUFA_OPTS  = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
+LUFA_OPTS += -D ORDERED_EP_CONFIG
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
+
+LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7
+LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace any-led example\"" -D USB_PRODUCT_LEN=27
+
+LUFA_COMPONENTS := USB USBCLASS SERIAL
+
+include $(SPREADAVR_PATH)/include.mk
diff --git a/any-led/any-led.c b/any-led/any-led.c
index 0934ed3..d3e7f93 100644
--- a/any-led/any-led.c
+++ b/any-led/any-led.c
@@ -1,68 +1,68 @@
-/*

- *  spreadspace avr utils

- *

- *

- *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

- *

- *  This file is part of spreadspace avr utils.

- *

- *  spreadspace avr utils is free software: you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation, either version 3 of the License, or

- *  any later version.

- *

- *  spreadspace avr utils is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

- */

-

-

-#include <avr/io.h>

-#include <avr/wdt.h>

-#include <avr/interrupt.h>

-#include <avr/power.h>

-#include <stdio.h>

-

-#include "util.h"

-#include "led.h"

-#include "anyio.h"

-

-void handle_cmd(uint8_t cmd)

-{

-  switch(cmd) {

-  case '0': led_off(); break;

-  case '1': led_on(); break;

-  case 't': led_toggle(); break;

-  case 'r': reset2bootloader(); break;

-  default: printf("error\r\n"); return;

-  }

-  printf("ok\r\n");

-}

-

-int main(void)

-{

-  MCUSR &= ~(1 << WDRF);

-  wdt_disable();

-

-  cpu_init();

-  led_init();

-  anyio_init(115200, 0);

-  sei();

-

-  for(;;) {

-    int16_t bytes_received = anyio_bytes_received();

-    while(bytes_received > 0) {

-      int received_byte = fgetc(stdin);

-      if(received_byte != EOF) {

-        handle_cmd(received_byte);

-      }

-      bytes_received--;

-    }

-

-    anyio_task();

-  }

-}

+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+#include <avr/power.h>
+#include <stdio.h>
+
+#include "util.h"
+#include "led.h"
+#include "anyio.h"
+
+void handle_cmd(uint8_t cmd)
+{
+  switch(cmd) {
+  case '0': led_off(); break;
+  case '1': led_on(); break;
+  case 't': led_toggle(); break;
+  case 'r': reset2bootloader(); break;
+  default: printf("error\r\n"); return;
+  }
+  printf("ok\r\n");
+}
+
+int main(void)
+{
+  MCUSR &= ~(1 << WDRF);
+  wdt_disable();
+
+  cpu_init();
+  led_init();
+  anyio_init(115200, 0);
+  sei();
+
+  for(;;) {
+    int16_t bytes_received = anyio_bytes_received();
+    while(bytes_received > 0) {
+      int received_byte = fgetc(stdin);
+      if(received_byte != EOF) {
+        handle_cmd(received_byte);
+      }
+      bytes_received--;
+    }
+
+    anyio_task();
+  }
+}
diff --git a/blink/Makefile b/blink/Makefile
index a529954..8aa652b 100644
--- a/blink/Makefile
+++ b/blink/Makefile
@@ -1,29 +1,29 @@
-##

-##  spreadspace avr utils

-##

-##

-##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

-##

-##  This file is part of spreadspace avr utils.

-##

-##  spreadspace avr utils is free software: you can redistribute it and/or modify

-##  it under the terms of the GNU General Public License as published by

-##  the Free Software Foundation, either version 3 of the License, or

-##  any later version.

-##

-##  spreadspace avr utils is distributed in the hope that it will be useful,

-##  but WITHOUT ANY WARRANTY; without even the implied warranty of

-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-##  GNU General Public License for more details.

-##

-##  You should have received a copy of the GNU General Public License

-##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

-##

-

-NAME := blink

-OBJ := $(NAME).o

-LIBS := util led

-BOARD_TYPE := culV3

-SPREADAVR_PATH := ..

-

-include $(SPREADAVR_PATH)/include.mk

+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+NAME := blink
+OBJ := $(NAME).o
+LIBS := util led
+BOARD_TYPE := culV3
+SPREADAVR_PATH := ..
+
+include $(SPREADAVR_PATH)/include.mk
diff --git a/blink/blink.c b/blink/blink.c
index 8021828..9bfa185 100644
--- a/blink/blink.c
+++ b/blink/blink.c
@@ -1,42 +1,42 @@
-/*

- *  spreadspace avr utils

- *

- *

- *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

- *

- *  This file is part of spreadspace avr utils.

- *

- *  spreadspace avr utils is free software: you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation, either version 3 of the License, or

- *  any later version.

- *

- *  spreadspace avr utils is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

- */

-

-#include <avr/io.h>

-#include <util/delay.h>

-

-#include "util.h"

-#include "led.h"

-

-int main(void)

-{

-  cpu_init();

-  led_init();

-

-  led_off();

-  led2_on();

-  for(;;) {

-    _delay_ms(250);

-    led_toggle();

-    led2_toggle();

-  }

-}

-

+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <avr/io.h>
+#include <util/delay.h>
+
+#include "util.h"
+#include "led.h"
+
+int main(void)
+{
+  cpu_init();
+  led_init();
+
+  led_off();
+  led2_on();
+  for(;;) {
+    _delay_ms(250);
+    led_toggle();
+    led2_toggle();
+  }
+}
+
diff --git a/contrib/Makefile b/contrib/Makefile
index b5e5f5f..f091ab4 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,33 +1,33 @@
-##

-##  spreadspace avr utils

-##

-##

-##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

-##                     Othmar Gsenger <otti@gsenger.com>

-##

-##  This file is part of spreadspace avr utils.

-##

-##  spreadspace avr utils is free software: you can redistribute it and/or modify

-##  it under the terms of the GNU General Public License as published by

-##  the Free Software Foundation, either version 3 of the License, or

-##  any later version.

-##

-##  spreadspace avr utils is distributed in the hope that it will be useful,

-##  but WITHOUT ANY WARRANTY; without even the implied warranty of

-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-##  GNU General Public License for more details.

-##

-##  You should have received a copy of the GNU General Public License

-##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

-##

-

-LUFA_VERSION := 120219

-

-all: download-lufa

-

-download-lufa: LUFA-${LUFA_VERSION}.zip

-

-LUFA-${LUFA_VERSION}.zip:

-	wget "http://lufa-lib.googlecode.com/files/$@" -O "$@"

-	unzip $@

-

+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+##                     Othmar Gsenger <otti@gsenger.com>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+LUFA_VERSION := 120219
+
+all: download-lufa
+
+download-lufa: LUFA-${LUFA_VERSION}.zip
+
+LUFA-${LUFA_VERSION}.zip:
+	wget "http://lufa-lib.googlecode.com/files/$@" -O "$@"
+	unzip $@
+
diff --git a/lib/lufa-descriptor-keyboardmouse.c b/lib/lufa-descriptor-keyboardmouse.c
index acc319b..3755371 100644
--- a/lib/lufa-descriptor-keyboardmouse.c
+++ b/lib/lufa-descriptor-keyboardmouse.c
@@ -1,310 +1,310 @@
-/*

-             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

- *

- *  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 "lufa-descriptor-keyboardmouse.h"

-

-/** HID class report descriptor. This is a special descriptor constructed with values from the

- *  USBIF HID class specification to describe the reports and capabilities of the HID device. This

- *  descriptor is parsed by the host and its contents used to determine what data (and in what encoding)

- *  the device will send, and what it may be sent back from the host. Refer to the HID specification for

- *  more details on HID report descriptors.

- *

- *  This descriptor describes the mouse HID interface's report structure.

- */

-const USB_Descriptor_HIDReport_Datatype_t PROGMEM MouseReport[] =

-{

-	/* Use the HID class driver's standard Mouse report.

-	 *   Min X/Y Axis values: -1

-	 *   Max X/Y Axis values:  1

-	 *   Min physical X/Y Axis values (used to determine resolution): -1

-	 *   Max physical X/Y Axis values (used to determine resolution):  1

-	 *   Buttons: 3

-	 *   Absolute screen coordinates: false

-	 */

-	HID_DESCRIPTOR_MOUSE(-1, 1, -1, 1, 3, false)

-};

-

-/** Same as the MouseReport structure, but defines the keyboard HID interface's report structure. */

-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(01.10),

-	.Class                  = USB_CSCP_NoDeviceClass,

-	.SubClass               = USB_CSCP_NoDeviceSubclass,

-	.Protocol               = USB_CSCP_NoDeviceProtocol,

-

-	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,

-

-	.VendorID               = 0x03EB,

-	.ProductID              = 0x204D,

-	.ReleaseNumber          = VERSION_BCD(00.01),

-

-	.ManufacturerStrIndex   = 0x01,

-	.ProductStrIndex        = 0x02,

-	.SerialNumStrIndex      = NO_DESCRIPTOR,

-

-	.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        = 2,

-

-			.ConfigurationNumber    = 1,

-			.ConfigurationStrIndex  = NO_DESCRIPTOR,

-

-			.ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),

-

-			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

-		},

-

-	.HID1_KeyboardInterface =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

-

-			.InterfaceNumber        = 0x00,

-			.AlternateSetting       = 0x00,

-

-			.TotalEndpoints         = 1,

-

-			.Class                  = HID_CSCP_HIDClass,

-			.SubClass               = HID_CSCP_BootSubclass,

-			.Protocol               = HID_CSCP_KeyboardBootProtocol,

-

-			.InterfaceStrIndex      = NO_DESCRIPTOR

-		},

-

-	.HID1_KeyboardHID =

-		{

-			.Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},

-

-			.HIDSpec                = VERSION_BCD(01.11),

-			.CountryCode            = 0x00,

-			.TotalReportDescriptors = 1,

-			.HIDReportType          = HID_DTYPE_Report,

-			.HIDReportLength        = sizeof(KeyboardReport)

-		},

-

-	.HID1_ReportINEndpoint =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

-

-			.EndpointAddress        = (ENDPOINT_DIR_IN | KEYBOARD_IN_EPNUM),

-			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-			.EndpointSize           = HID_EPSIZE,

-			.PollingIntervalMS      = 0x01

-		},

-

-	.HID2_MouseInterface =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

-

-			.InterfaceNumber        = 0x01,

-			.AlternateSetting       = 0x00,

-

-			.TotalEndpoints         = 1,

-

-			.Class                  = HID_CSCP_HIDClass,

-			.SubClass               = HID_CSCP_BootSubclass,

-			.Protocol               = HID_CSCP_MouseBootProtocol,

-

-			.InterfaceStrIndex      = NO_DESCRIPTOR

-		},

-

-	.HID2_MouseHID =

-		{

-			.Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},

-

-			.HIDSpec                = VERSION_BCD(01.11),

-			.CountryCode            = 0x00,

-			.TotalReportDescriptors = 1,

-			.HIDReportType          = HID_DTYPE_Report,

-			.HIDReportLength        = sizeof(MouseReport)

-		},

-

-	.HID2_ReportINEndpoint =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

-

-			.EndpointAddress        = (ENDPOINT_DIR_IN | MOUSE_IN_EPNUM),

-			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-			.EndpointSize           = HID_EPSIZE,

-			.PollingIntervalMS      = 0x01

-		}

-};

-

-/** 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 =

-{

-	.Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},

-

-	.UnicodeString          = {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 =

-{

-#ifndef USB_MANUFACTURER

-	.Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},

-  .UnicodeString          = L"Dean Camera"

-#else

-  .Header                 = {.Size = USB_STRING_LEN(USB_MANUFACTURER_LEN), .Type = DTYPE_String},

-  .UnicodeString          = USB_MANUFACTURER

-#endif

-};

-

-/** 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 =

-{

-#ifndef USB_PRODUCT

-	.Header                 = {.Size = USB_STRING_LEN(28), .Type = DTYPE_String},

-	.UnicodeString          = L"LUFA Mouse and Keyboard Demo"

-#else

-  .Header                 = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String},

-  .UnicodeString          = USB_PRODUCT

-#endif

-};

-

-/** 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 uint8_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 0x00:

-					Address = &LanguageString;

-					Size    = pgm_read_byte(&LanguageString.Header.Size);

-					break;

-				case 0x01:

-					Address = &ManufacturerString;

-					Size    = pgm_read_byte(&ManufacturerString.Header.Size);

-					break;

-				case 0x02:

-					Address = &ProductString;

-					Size    = pgm_read_byte(&ProductString.Header.Size);

-					break;

-			}

-

-			break;

-		case HID_DTYPE_HID:

-			if (!(wIndex))

-			{

-				Address = &ConfigurationDescriptor.HID1_KeyboardHID;

-				Size    = sizeof(USB_HID_Descriptor_HID_t);

-			}

-			else

-			{

-				Address = &ConfigurationDescriptor.HID2_MouseHID;

-				Size    = sizeof(USB_HID_Descriptor_HID_t);

-			}

-

-			break;

-		case HID_DTYPE_Report:

-			if (!(wIndex))

-			{

-				Address = &KeyboardReport;

-				Size    = sizeof(KeyboardReport);

-			}

-			else

-			{

-				Address = &MouseReport;

-				Size    = sizeof(MouseReport);

-			}

-

-			break;

-	}

-

-	*DescriptorAddress = Address;

-	return Size;

-}

-

+/*
+             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
+ *
+ *  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 "lufa-descriptor-keyboardmouse.h"
+
+/** HID class report descriptor. This is a special descriptor constructed with values from the
+ *  USBIF HID class specification to describe the reports and capabilities of the HID device. This
+ *  descriptor is parsed by the host and its contents used to determine what data (and in what encoding)
+ *  the device will send, and what it may be sent back from the host. Refer to the HID specification for
+ *  more details on HID report descriptors.
+ *
+ *  This descriptor describes the mouse HID interface's report structure.
+ */
+const USB_Descriptor_HIDReport_Datatype_t PROGMEM MouseReport[] =
+{
+	/* Use the HID class driver's standard Mouse report.
+	 *   Min X/Y Axis values: -1
+	 *   Max X/Y Axis values:  1
+	 *   Min physical X/Y Axis values (used to determine resolution): -1
+	 *   Max physical X/Y Axis values (used to determine resolution):  1
+	 *   Buttons: 3
+	 *   Absolute screen coordinates: false
+	 */
+	HID_DESCRIPTOR_MOUSE(-1, 1, -1, 1, 3, false)
+};
+
+/** Same as the MouseReport structure, but defines the keyboard HID interface's report structure. */
+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(01.10),
+	.Class                  = USB_CSCP_NoDeviceClass,
+	.SubClass               = USB_CSCP_NoDeviceSubclass,
+	.Protocol               = USB_CSCP_NoDeviceProtocol,
+
+	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
+
+	.VendorID               = 0x03EB,
+	.ProductID              = 0x204D,
+	.ReleaseNumber          = VERSION_BCD(00.01),
+
+	.ManufacturerStrIndex   = 0x01,
+	.ProductStrIndex        = 0x02,
+	.SerialNumStrIndex      = NO_DESCRIPTOR,
+
+	.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        = 2,
+
+			.ConfigurationNumber    = 1,
+			.ConfigurationStrIndex  = NO_DESCRIPTOR,
+
+			.ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),
+
+			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)
+		},
+
+	.HID1_KeyboardInterface =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+
+			.InterfaceNumber        = 0x00,
+			.AlternateSetting       = 0x00,
+
+			.TotalEndpoints         = 1,
+
+			.Class                  = HID_CSCP_HIDClass,
+			.SubClass               = HID_CSCP_BootSubclass,
+			.Protocol               = HID_CSCP_KeyboardBootProtocol,
+
+			.InterfaceStrIndex      = NO_DESCRIPTOR
+		},
+
+	.HID1_KeyboardHID =
+		{
+			.Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
+
+			.HIDSpec                = VERSION_BCD(01.11),
+			.CountryCode            = 0x00,
+			.TotalReportDescriptors = 1,
+			.HIDReportType          = HID_DTYPE_Report,
+			.HIDReportLength        = sizeof(KeyboardReport)
+		},
+
+	.HID1_ReportINEndpoint =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+			.EndpointAddress        = (ENDPOINT_DIR_IN | KEYBOARD_IN_EPNUM),
+			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+			.EndpointSize           = HID_EPSIZE,
+			.PollingIntervalMS      = 0x01
+		},
+
+	.HID2_MouseInterface =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+
+			.InterfaceNumber        = 0x01,
+			.AlternateSetting       = 0x00,
+
+			.TotalEndpoints         = 1,
+
+			.Class                  = HID_CSCP_HIDClass,
+			.SubClass               = HID_CSCP_BootSubclass,
+			.Protocol               = HID_CSCP_MouseBootProtocol,
+
+			.InterfaceStrIndex      = NO_DESCRIPTOR
+		},
+
+	.HID2_MouseHID =
+		{
+			.Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
+
+			.HIDSpec                = VERSION_BCD(01.11),
+			.CountryCode            = 0x00,
+			.TotalReportDescriptors = 1,
+			.HIDReportType          = HID_DTYPE_Report,
+			.HIDReportLength        = sizeof(MouseReport)
+		},
+
+	.HID2_ReportINEndpoint =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+			.EndpointAddress        = (ENDPOINT_DIR_IN | MOUSE_IN_EPNUM),
+			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+			.EndpointSize           = HID_EPSIZE,
+			.PollingIntervalMS      = 0x01
+		}
+};
+
+/** 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 =
+{
+	.Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
+
+	.UnicodeString          = {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 =
+{
+#ifndef USB_MANUFACTURER
+	.Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
+  .UnicodeString          = L"Dean Camera"
+#else
+  .Header                 = {.Size = USB_STRING_LEN(USB_MANUFACTURER_LEN), .Type = DTYPE_String},
+  .UnicodeString          = USB_MANUFACTURER
+#endif
+};
+
+/** 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 =
+{
+#ifndef USB_PRODUCT
+	.Header                 = {.Size = USB_STRING_LEN(28), .Type = DTYPE_String},
+	.UnicodeString          = L"LUFA Mouse and Keyboard Demo"
+#else
+  .Header                 = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String},
+  .UnicodeString          = USB_PRODUCT
+#endif
+};
+
+/** 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 uint8_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 0x00:
+					Address = &LanguageString;
+					Size    = pgm_read_byte(&LanguageString.Header.Size);
+					break;
+				case 0x01:
+					Address = &ManufacturerString;
+					Size    = pgm_read_byte(&ManufacturerString.Header.Size);
+					break;
+				case 0x02:
+					Address = &ProductString;
+					Size    = pgm_read_byte(&ProductString.Header.Size);
+					break;
+			}
+
+			break;
+		case HID_DTYPE_HID:
+			if (!(wIndex))
+			{
+				Address = &ConfigurationDescriptor.HID1_KeyboardHID;
+				Size    = sizeof(USB_HID_Descriptor_HID_t);
+			}
+			else
+			{
+				Address = &ConfigurationDescriptor.HID2_MouseHID;
+				Size    = sizeof(USB_HID_Descriptor_HID_t);
+			}
+
+			break;
+		case HID_DTYPE_Report:
+			if (!(wIndex))
+			{
+				Address = &KeyboardReport;
+				Size    = sizeof(KeyboardReport);
+			}
+			else
+			{
+				Address = &MouseReport;
+				Size    = sizeof(MouseReport);
+			}
+
+			break;
+	}
+
+	*DescriptorAddress = Address;
+	return Size;
+}
+
diff --git a/lib/lufa-descriptor-keyboardmouse.h b/lib/lufa-descriptor-keyboardmouse.h
index 9381602..fe41f92 100644
--- a/lib/lufa-descriptor-keyboardmouse.h
+++ b/lib/lufa-descriptor-keyboardmouse.h
@@ -1,81 +1,81 @@
-/*

-             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

- *

- *  Header file for Descriptors.c.

- */

-

-#ifndef _DESCRIPTORS_H_

-#define _DESCRIPTORS_H_

-

-	/* Includes: */

-		#include <avr/pgmspace.h>

-

-		#include <LUFA/Drivers/USB/USB.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;

-

-			// Keyboard HID Interface

-			USB_Descriptor_Interface_t            HID1_KeyboardInterface;

-			USB_HID_Descriptor_HID_t              HID1_KeyboardHID;

-			USB_Descriptor_Endpoint_t             HID1_ReportINEndpoint;

-

-			// Mouse HID Interface

-			USB_Descriptor_Interface_t            HID2_MouseInterface;

-			USB_HID_Descriptor_HID_t              HID2_MouseHID;

-			USB_Descriptor_Endpoint_t             HID2_ReportINEndpoint;

-		} USB_Descriptor_Configuration_t;

-

-	/* Macros: */

-		/** Endpoint number of the Keyboard HID reporting IN endpoint. */

-		#define KEYBOARD_IN_EPNUM         1

-

-		/** Endpoint number of the Mouse HID reporting IN endpoint. */

-		#define MOUSE_IN_EPNUM            3

-

-		/** Size in bytes of each of the HID reporting IN endpoints. */

-		#define HID_EPSIZE                8

-

-	/* Function Prototypes: */

-		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

-		                                    const uint8_t wIndex,

-		                                    const void** const DescriptorAddress)

-		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

-

-#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
+ *
+ *  Header file for Descriptors.c.
+ */
+
+#ifndef _DESCRIPTORS_H_
+#define _DESCRIPTORS_H_
+
+	/* Includes: */
+		#include <avr/pgmspace.h>
+
+		#include <LUFA/Drivers/USB/USB.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;
+
+			// Keyboard HID Interface
+			USB_Descriptor_Interface_t            HID1_KeyboardInterface;
+			USB_HID_Descriptor_HID_t              HID1_KeyboardHID;
+			USB_Descriptor_Endpoint_t             HID1_ReportINEndpoint;
+
+			// Mouse HID Interface
+			USB_Descriptor_Interface_t            HID2_MouseInterface;
+			USB_HID_Descriptor_HID_t              HID2_MouseHID;
+			USB_Descriptor_Endpoint_t             HID2_ReportINEndpoint;
+		} USB_Descriptor_Configuration_t;
+
+	/* Macros: */
+		/** Endpoint number of the Keyboard HID reporting IN endpoint. */
+		#define KEYBOARD_IN_EPNUM         1
+
+		/** Endpoint number of the Mouse HID reporting IN endpoint. */
+		#define MOUSE_IN_EPNUM            3
+
+		/** Size in bytes of each of the HID reporting IN endpoints. */
+		#define HID_EPSIZE                8
+
+	/* Function Prototypes: */
+		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+		                                    const uint8_t wIndex,
+		                                    const void** const DescriptorAddress)
+		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+
+#endif
+
diff --git a/lib/lufa-descriptor-midi.c b/lib/lufa-descriptor-midi.c
index 99fab41..b804386 100644
--- a/lib/lufa-descriptor-midi.c
+++ b/lib/lufa-descriptor-midi.c
@@ -1,337 +1,337 @@
-/*

-             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

- *

- *  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 "lufa-descriptor-midi.h"

-

-/** 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(01.10),

-	.Class                  = USB_CSCP_NoDeviceClass,

-	.SubClass               = USB_CSCP_NoDeviceSubclass,

-	.Protocol               = USB_CSCP_NoDeviceProtocol,

-

-	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,

-

-	.VendorID               = 0x03EB,

-	.ProductID              = 0x2048,

-	.ReleaseNumber          = VERSION_BCD(00.01),

-

-	.ManufacturerStrIndex   = 0x01,

-	.ProductStrIndex        = 0x02,

-	.SerialNumStrIndex      = NO_DESCRIPTOR,

-

-	.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          = 2,

-

-			.ConfigurationNumber      = 1,

-			.ConfigurationStrIndex    = NO_DESCRIPTOR,

-

-			.ConfigAttributes         = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),

-

-			.MaxPowerConsumption      = USB_CONFIG_POWER_MA(100)

-		},

-

-	.Audio_ControlInterface =

-		{

-			.Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

-

-			.InterfaceNumber          = 0,

-			.AlternateSetting         = 0,

-

-			.TotalEndpoints           = 0,

-

-			.Class                    = AUDIO_CSCP_AudioClass,

-			.SubClass                 = AUDIO_CSCP_ControlSubclass,

-			.Protocol                 = AUDIO_CSCP_ControlProtocol,

-

-			.InterfaceStrIndex        = NO_DESCRIPTOR

-		},

-

-	.Audio_ControlInterface_SPC =

-		{

-			.Header                   = {.Size = sizeof(USB_Audio_Descriptor_Interface_AC_t), .Type = DTYPE_CSInterface},

-			.Subtype                  = AUDIO_DSUBTYPE_CSInterface_Header,

-

-			.ACSpecification          = VERSION_BCD(01.00),

-			.TotalLength              = sizeof(USB_Audio_Descriptor_Interface_AC_t),

-

-			.InCollection             = 1,

-			.InterfaceNumber          = 1,

-		},

-

-	.Audio_StreamInterface =

-		{

-			.Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

-

-			.InterfaceNumber          = 1,

-			.AlternateSetting         = 0,

-

-			.TotalEndpoints           = 2,

-

-			.Class                    = AUDIO_CSCP_AudioClass,

-			.SubClass                 = AUDIO_CSCP_MIDIStreamingSubclass,

-			.Protocol                 = AUDIO_CSCP_StreamingProtocol,

-

-			.InterfaceStrIndex        = NO_DESCRIPTOR

-		},

-

-	.Audio_StreamInterface_SPC =

-		{

-			.Header                   = {.Size = sizeof(USB_MIDI_Descriptor_AudioInterface_AS_t), .Type = DTYPE_CSInterface},

-			.Subtype                  = AUDIO_DSUBTYPE_CSInterface_General,

-

-			.AudioSpecification       = VERSION_BCD(01.00),

-

-			.TotalLength              = (sizeof(USB_Descriptor_Configuration_t) -

-			                             offsetof(USB_Descriptor_Configuration_t, Audio_StreamInterface_SPC))

-		},

-

-	.MIDI_In_Jack_Emb =

-		{

-			.Header                   = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = DTYPE_CSInterface},

-			.Subtype                  = AUDIO_DSUBTYPE_CSInterface_InputTerminal,

-

-			.JackType                 = MIDI_JACKTYPE_Embedded,

-			.JackID                   = 0x01,

-

-			.JackStrIndex             = NO_DESCRIPTOR

-		},

-

-	.MIDI_In_Jack_Ext =

-		{

-			.Header                   = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = DTYPE_CSInterface},

-			.Subtype                  = AUDIO_DSUBTYPE_CSInterface_InputTerminal,

-

-			.JackType                 = MIDI_JACKTYPE_External,

-			.JackID                   = 0x02,

-

-			.JackStrIndex             = NO_DESCRIPTOR

-		},

-

-	.MIDI_Out_Jack_Emb =

-		{

-			.Header                   = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = DTYPE_CSInterface},

-			.Subtype                  = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,

-

-			.JackType                 = MIDI_JACKTYPE_Embedded,

-			.JackID                   = 0x03,

-

-			.NumberOfPins             = 1,

-			.SourceJackID             = {0x02},

-			.SourcePinID              = {0x01},

-

-			.JackStrIndex             = NO_DESCRIPTOR

-		},

-

-	.MIDI_Out_Jack_Ext =

-		{

-			.Header                   = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = DTYPE_CSInterface},

-			.Subtype                  = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,

-

-			.JackType                 = MIDI_JACKTYPE_External,

-			.JackID                   = 0x04,

-

-			.NumberOfPins             = 1,

-			.SourceJackID             = {0x01},

-			.SourcePinID              = {0x01},

-

-			.JackStrIndex             = NO_DESCRIPTOR

-		},

-

-	.MIDI_In_Jack_Endpoint =

-		{

-			.Endpoint =

-				{

-					.Header              = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},

-

-					.EndpointAddress     = (ENDPOINT_DIR_OUT | MIDI_STREAM_OUT_EPNUM),

-					.Attributes          = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-					.EndpointSize        = MIDI_STREAM_EPSIZE,

-					.PollingIntervalMS   = 0x01

-				},

-

-			.Refresh                  = 0,

-			.SyncEndpointNumber       = 0

-		},

-

-	.MIDI_In_Jack_Endpoint_SPC =

-		{

-			.Header                   = {.Size = sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t), .Type = DTYPE_CSEndpoint},

-			.Subtype                  = AUDIO_DSUBTYPE_CSEndpoint_General,

-

-			.TotalEmbeddedJacks       = 0x01,

-			.AssociatedJackID         = {0x01}

-		},

-

-	.MIDI_Out_Jack_Endpoint =

-		{

-			.Endpoint =

-				{

-					.Header              = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},

-

-					.EndpointAddress     = (ENDPOINT_DIR_IN | MIDI_STREAM_IN_EPNUM),

-					.Attributes          = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-					.EndpointSize        = MIDI_STREAM_EPSIZE,

-					.PollingIntervalMS   = 0x01

-				},

-

-			.Refresh                  = 0,

-			.SyncEndpointNumber       = 0

-		},

-

-	.MIDI_Out_Jack_Endpoint_SPC =

-		{

-			.Header                   = {.Size = sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t), .Type = DTYPE_CSEndpoint},

-			.Subtype                  = AUDIO_DSUBTYPE_CSEndpoint_General,

-

-			.TotalEmbeddedJacks       = 0x01,

-			.AssociatedJackID         = {0x03}

-		}

-};

-

-/** 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 =

-{

-	.Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},

-

-	.UnicodeString          = {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 =

-{

-#ifndef USB_MANUFACTURER

-	.Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},

-	.UnicodeString          = L"Dean Camera"

-#else

-  .Header                 = {.Size = USB_STRING_LEN(USB_MANUFACTURER_LEN), .Type = DTYPE_String},

-	.UnicodeString          = USB_MANUFACTURER

-#endif

-};

-

-/** 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 =

-{

-#ifndef USB_PRODUCT

-	.Header                 = {.Size = USB_STRING_LEN(14), .Type = DTYPE_String},

-	.UnicodeString          = L"LUFA MIDI Demo"

-#else

-  .Header                 = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String},

-	.UnicodeString          = USB_PRODUCT

-#endif

-};

-

-/** 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 uint8_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 0x00:

-					Address = &LanguageString;

-					Size    = pgm_read_byte(&LanguageString.Header.Size);

-					break;

-				case 0x01:

-					Address = &ManufacturerString;

-					Size    = pgm_read_byte(&ManufacturerString.Header.Size);

-					break;

-				case 0x02:

-					Address = &ProductString;

-					Size    = pgm_read_byte(&ProductString.Header.Size);

-					break;

-			}

-

-			break;

-	}

-

-	*DescriptorAddress = Address;

-	return Size;

-}

-

+/*
+             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
+ *
+ *  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 "lufa-descriptor-midi.h"
+
+/** 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(01.10),
+	.Class                  = USB_CSCP_NoDeviceClass,
+	.SubClass               = USB_CSCP_NoDeviceSubclass,
+	.Protocol               = USB_CSCP_NoDeviceProtocol,
+
+	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
+
+	.VendorID               = 0x03EB,
+	.ProductID              = 0x2048,
+	.ReleaseNumber          = VERSION_BCD(00.01),
+
+	.ManufacturerStrIndex   = 0x01,
+	.ProductStrIndex        = 0x02,
+	.SerialNumStrIndex      = NO_DESCRIPTOR,
+
+	.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          = 2,
+
+			.ConfigurationNumber      = 1,
+			.ConfigurationStrIndex    = NO_DESCRIPTOR,
+
+			.ConfigAttributes         = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),
+
+			.MaxPowerConsumption      = USB_CONFIG_POWER_MA(100)
+		},
+
+	.Audio_ControlInterface =
+		{
+			.Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+
+			.InterfaceNumber          = 0,
+			.AlternateSetting         = 0,
+
+			.TotalEndpoints           = 0,
+
+			.Class                    = AUDIO_CSCP_AudioClass,
+			.SubClass                 = AUDIO_CSCP_ControlSubclass,
+			.Protocol                 = AUDIO_CSCP_ControlProtocol,
+
+			.InterfaceStrIndex        = NO_DESCRIPTOR
+		},
+
+	.Audio_ControlInterface_SPC =
+		{
+			.Header                   = {.Size = sizeof(USB_Audio_Descriptor_Interface_AC_t), .Type = DTYPE_CSInterface},
+			.Subtype                  = AUDIO_DSUBTYPE_CSInterface_Header,
+
+			.ACSpecification          = VERSION_BCD(01.00),
+			.TotalLength              = sizeof(USB_Audio_Descriptor_Interface_AC_t),
+
+			.InCollection             = 1,
+			.InterfaceNumber          = 1,
+		},
+
+	.Audio_StreamInterface =
+		{
+			.Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+
+			.InterfaceNumber          = 1,
+			.AlternateSetting         = 0,
+
+			.TotalEndpoints           = 2,
+
+			.Class                    = AUDIO_CSCP_AudioClass,
+			.SubClass                 = AUDIO_CSCP_MIDIStreamingSubclass,
+			.Protocol                 = AUDIO_CSCP_StreamingProtocol,
+
+			.InterfaceStrIndex        = NO_DESCRIPTOR
+		},
+
+	.Audio_StreamInterface_SPC =
+		{
+			.Header                   = {.Size = sizeof(USB_MIDI_Descriptor_AudioInterface_AS_t), .Type = DTYPE_CSInterface},
+			.Subtype                  = AUDIO_DSUBTYPE_CSInterface_General,
+
+			.AudioSpecification       = VERSION_BCD(01.00),
+
+			.TotalLength              = (sizeof(USB_Descriptor_Configuration_t) -
+			                             offsetof(USB_Descriptor_Configuration_t, Audio_StreamInterface_SPC))
+		},
+
+	.MIDI_In_Jack_Emb =
+		{
+			.Header                   = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = DTYPE_CSInterface},
+			.Subtype                  = AUDIO_DSUBTYPE_CSInterface_InputTerminal,
+
+			.JackType                 = MIDI_JACKTYPE_Embedded,
+			.JackID                   = 0x01,
+
+			.JackStrIndex             = NO_DESCRIPTOR
+		},
+
+	.MIDI_In_Jack_Ext =
+		{
+			.Header                   = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = DTYPE_CSInterface},
+			.Subtype                  = AUDIO_DSUBTYPE_CSInterface_InputTerminal,
+
+			.JackType                 = MIDI_JACKTYPE_External,
+			.JackID                   = 0x02,
+
+			.JackStrIndex             = NO_DESCRIPTOR
+		},
+
+	.MIDI_Out_Jack_Emb =
+		{
+			.Header                   = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = DTYPE_CSInterface},
+			.Subtype                  = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,
+
+			.JackType                 = MIDI_JACKTYPE_Embedded,
+			.JackID                   = 0x03,
+
+			.NumberOfPins             = 1,
+			.SourceJackID             = {0x02},
+			.SourcePinID              = {0x01},
+
+			.JackStrIndex             = NO_DESCRIPTOR
+		},
+
+	.MIDI_Out_Jack_Ext =
+		{
+			.Header                   = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = DTYPE_CSInterface},
+			.Subtype                  = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,
+
+			.JackType                 = MIDI_JACKTYPE_External,
+			.JackID                   = 0x04,
+
+			.NumberOfPins             = 1,
+			.SourceJackID             = {0x01},
+			.SourcePinID              = {0x01},
+
+			.JackStrIndex             = NO_DESCRIPTOR
+		},
+
+	.MIDI_In_Jack_Endpoint =
+		{
+			.Endpoint =
+				{
+					.Header              = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
+
+					.EndpointAddress     = (ENDPOINT_DIR_OUT | MIDI_STREAM_OUT_EPNUM),
+					.Attributes          = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+					.EndpointSize        = MIDI_STREAM_EPSIZE,
+					.PollingIntervalMS   = 0x01
+				},
+
+			.Refresh                  = 0,
+			.SyncEndpointNumber       = 0
+		},
+
+	.MIDI_In_Jack_Endpoint_SPC =
+		{
+			.Header                   = {.Size = sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t), .Type = DTYPE_CSEndpoint},
+			.Subtype                  = AUDIO_DSUBTYPE_CSEndpoint_General,
+
+			.TotalEmbeddedJacks       = 0x01,
+			.AssociatedJackID         = {0x01}
+		},
+
+	.MIDI_Out_Jack_Endpoint =
+		{
+			.Endpoint =
+				{
+					.Header              = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint},
+
+					.EndpointAddress     = (ENDPOINT_DIR_IN | MIDI_STREAM_IN_EPNUM),
+					.Attributes          = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+					.EndpointSize        = MIDI_STREAM_EPSIZE,
+					.PollingIntervalMS   = 0x01
+				},
+
+			.Refresh                  = 0,
+			.SyncEndpointNumber       = 0
+		},
+
+	.MIDI_Out_Jack_Endpoint_SPC =
+		{
+			.Header                   = {.Size = sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t), .Type = DTYPE_CSEndpoint},
+			.Subtype                  = AUDIO_DSUBTYPE_CSEndpoint_General,
+
+			.TotalEmbeddedJacks       = 0x01,
+			.AssociatedJackID         = {0x03}
+		}
+};
+
+/** 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 =
+{
+	.Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
+
+	.UnicodeString          = {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 =
+{
+#ifndef USB_MANUFACTURER
+	.Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
+	.UnicodeString          = L"Dean Camera"
+#else
+  .Header                 = {.Size = USB_STRING_LEN(USB_MANUFACTURER_LEN), .Type = DTYPE_String},
+	.UnicodeString          = USB_MANUFACTURER
+#endif
+};
+
+/** 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 =
+{
+#ifndef USB_PRODUCT
+	.Header                 = {.Size = USB_STRING_LEN(14), .Type = DTYPE_String},
+	.UnicodeString          = L"LUFA MIDI Demo"
+#else
+  .Header                 = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String},
+	.UnicodeString          = USB_PRODUCT
+#endif
+};
+
+/** 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 uint8_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 0x00:
+					Address = &LanguageString;
+					Size    = pgm_read_byte(&LanguageString.Header.Size);
+					break;
+				case 0x01:
+					Address = &ManufacturerString;
+					Size    = pgm_read_byte(&ManufacturerString.Header.Size);
+					break;
+				case 0x02:
+					Address = &ProductString;
+					Size    = pgm_read_byte(&ProductString.Header.Size);
+					break;
+			}
+
+			break;
+	}
+
+	*DescriptorAddress = Address;
+	return Size;
+}
+
diff --git a/lib/lufa-descriptor-midi.h b/lib/lufa-descriptor-midi.h
index 592ac9f..c5dc2e2 100644
--- a/lib/lufa-descriptor-midi.h
+++ b/lib/lufa-descriptor-midi.h
@@ -1,87 +1,87 @@
-/*

-             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

- *

- *  Header file for Descriptors.c.

- */

-

-#ifndef _DESCRIPTORS_H_

-#define _DESCRIPTORS_H_

-

-	/* Includes: */

-		#include <LUFA/Drivers/USB/USB.h>

-

-		#include <avr/pgmspace.h>

-

-	/* Macros: */

-		/** Endpoint number of the MIDI streaming data IN endpoint, for device-to-host data transfers. */

-		#define MIDI_STREAM_IN_EPNUM        2

-

-		/** Endpoint number of the MIDI streaming data OUT endpoint, for host-to-device data transfers. */

-		#define MIDI_STREAM_OUT_EPNUM       1

-

-		/** Endpoint size in bytes of the Audio isochronous streaming data IN and OUT endpoints. */

-		#define MIDI_STREAM_EPSIZE          64

-

-	/* 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;

-

-			// MIDI Audio Control Interface

-			USB_Descriptor_Interface_t                Audio_ControlInterface;

-			USB_Audio_Descriptor_Interface_AC_t       Audio_ControlInterface_SPC;

-

-			// MIDI Audio Streaming Interface

-			USB_Descriptor_Interface_t                Audio_StreamInterface;

-			USB_MIDI_Descriptor_AudioInterface_AS_t   Audio_StreamInterface_SPC;

-			USB_MIDI_Descriptor_InputJack_t           MIDI_In_Jack_Emb;

-			USB_MIDI_Descriptor_InputJack_t           MIDI_In_Jack_Ext;

-			USB_MIDI_Descriptor_OutputJack_t          MIDI_Out_Jack_Emb;

-			USB_MIDI_Descriptor_OutputJack_t          MIDI_Out_Jack_Ext;

-			USB_Audio_Descriptor_StreamEndpoint_Std_t MIDI_In_Jack_Endpoint;

-			USB_MIDI_Descriptor_Jack_Endpoint_t       MIDI_In_Jack_Endpoint_SPC;

-			USB_Audio_Descriptor_StreamEndpoint_Std_t MIDI_Out_Jack_Endpoint;

-			USB_MIDI_Descriptor_Jack_Endpoint_t       MIDI_Out_Jack_Endpoint_SPC;

-		} USB_Descriptor_Configuration_t;

-

-	/* Function Prototypes: */

-		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

-		                                    const uint8_t wIndex,

-		                                    const void** const DescriptorAddress)

-		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

-

-#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
+ *
+ *  Header file for Descriptors.c.
+ */
+
+#ifndef _DESCRIPTORS_H_
+#define _DESCRIPTORS_H_
+
+	/* Includes: */
+		#include <LUFA/Drivers/USB/USB.h>
+
+		#include <avr/pgmspace.h>
+
+	/* Macros: */
+		/** Endpoint number of the MIDI streaming data IN endpoint, for device-to-host data transfers. */
+		#define MIDI_STREAM_IN_EPNUM        2
+
+		/** Endpoint number of the MIDI streaming data OUT endpoint, for host-to-device data transfers. */
+		#define MIDI_STREAM_OUT_EPNUM       1
+
+		/** Endpoint size in bytes of the Audio isochronous streaming data IN and OUT endpoints. */
+		#define MIDI_STREAM_EPSIZE          64
+
+	/* 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;
+
+			// MIDI Audio Control Interface
+			USB_Descriptor_Interface_t                Audio_ControlInterface;
+			USB_Audio_Descriptor_Interface_AC_t       Audio_ControlInterface_SPC;
+
+			// MIDI Audio Streaming Interface
+			USB_Descriptor_Interface_t                Audio_StreamInterface;
+			USB_MIDI_Descriptor_AudioInterface_AS_t   Audio_StreamInterface_SPC;
+			USB_MIDI_Descriptor_InputJack_t           MIDI_In_Jack_Emb;
+			USB_MIDI_Descriptor_InputJack_t           MIDI_In_Jack_Ext;
+			USB_MIDI_Descriptor_OutputJack_t          MIDI_Out_Jack_Emb;
+			USB_MIDI_Descriptor_OutputJack_t          MIDI_Out_Jack_Ext;
+			USB_Audio_Descriptor_StreamEndpoint_Std_t MIDI_In_Jack_Endpoint;
+			USB_MIDI_Descriptor_Jack_Endpoint_t       MIDI_In_Jack_Endpoint_SPC;
+			USB_Audio_Descriptor_StreamEndpoint_Std_t MIDI_Out_Jack_Endpoint;
+			USB_MIDI_Descriptor_Jack_Endpoint_t       MIDI_Out_Jack_Endpoint_SPC;
+		} USB_Descriptor_Configuration_t;
+
+	/* Function Prototypes: */
+		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+		                                    const uint8_t wIndex,
+		                                    const void** const DescriptorAddress)
+		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+
+#endif
+
diff --git a/lib/lufa-descriptor-rndis.c b/lib/lufa-descriptor-rndis.c
index ba29037..635b1f5 100644
--- a/lib/lufa-descriptor-rndis.c
+++ b/lib/lufa-descriptor-rndis.c
@@ -1,267 +1,267 @@
-/*

-             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

- *

- *  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 "lufa-descriptor-rndis.h"

-

-/** 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(01.10),

-	.Class                  = CDC_CSCP_CDCClass,

-	.SubClass               = CDC_CSCP_NoSpecificSubclass,

-	.Protocol               = CDC_CSCP_NoSpecificProtocol,

-

-	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,

-

-	.VendorID               = 0x03EB,

-	.ProductID              = 0x204C,

-	.ReleaseNumber          = VERSION_BCD(00.01),

-

-	.ManufacturerStrIndex   = 0x01,

-	.ProductStrIndex        = 0x02,

-	.SerialNumStrIndex      = NO_DESCRIPTOR,

-

-	.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        = 2,

-

-			.ConfigurationNumber    = 1,

-			.ConfigurationStrIndex  = NO_DESCRIPTOR,

-

-			.ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),

-

-			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

-		},

-

-	.CDC_CCI_Interface =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

-

-			.InterfaceNumber        = 0,

-			.AlternateSetting       = 0,

-

-			.TotalEndpoints         = 1,

-

-			.Class                  = CDC_CSCP_CDCClass,

-			.SubClass               = CDC_CSCP_ACMSubclass,

-			.Protocol               = CDC_CSCP_VendorSpecificProtocol,

-

-			.InterfaceStrIndex      = NO_DESCRIPTOR

-		},

-

-	.CDC_Functional_Header =

-		{

-			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},

-			.Subtype                = CDC_DSUBTYPE_CSInterface_Header,

-

-			.CDCSpecification       = VERSION_BCD(01.10),

-		},

-

-	.CDC_Functional_ACM =

-		{

-			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},

-			.Subtype                = CDC_DSUBTYPE_CSInterface_ACM,

-

-			.Capabilities           = 0x00,

-		},

-

-	.CDC_Functional_Union =

-		{

-			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},

-			.Subtype                = CDC_DSUBTYPE_CSInterface_Union,

-

-			.MasterInterfaceNumber  = 0,

-			.SlaveInterfaceNumber   = 1,

-		},

-

-	.CDC_NotificationEndpoint =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

-

-			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC_NOTIFICATION_EPNUM),

-			.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        = 1,

-			.AlternateSetting       = 0,

-

-			.TotalEndpoints         = 2,

-

-			.Class                  = CDC_CSCP_CDCDataClass,

-			.SubClass               = CDC_CSCP_NoDataSubclass,

-			.Protocol               = CDC_CSCP_NoDataProtocol,

-

-			.InterfaceStrIndex      = NO_DESCRIPTOR

-		},

-

-	.RNDIS_DataOutEndpoint =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

-

-			.EndpointAddress        = (ENDPOINT_DIR_OUT | CDC_RX_EPNUM),

-			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-			.EndpointSize           = CDC_TXRX_EPSIZE,

-			.PollingIntervalMS      = 0x01

-		},

-

-	.RNDIS_DataInEndpoint =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

-

-			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC_TX_EPNUM),

-			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-			.EndpointSize           = CDC_TXRX_EPSIZE,

-			.PollingIntervalMS      = 0x01

-		}

-};

-

-/** 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 =

-{

-	.Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},

-

-	.UnicodeString          = {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 =

-{

-#ifndef USB_MANUFACTURER

-  .Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},

-  .UnicodeString          = L"Dean Camera"

-#else

-  .Header                 = {.Size = USB_STRING_LEN(USB_MANUFACTURER_LEN), .Type = DTYPE_String},

-  .UnicodeString          = USB_MANUFACTURER

-#endif

-};

-

-/** 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 =

-{

-#ifndef USB_PRODUCT

-  .Header                 = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String},

-  .UnicodeString          = L"LUFA USB-RS232 Adapter"

-#else

-  .Header                 = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String},

-  .UnicodeString          = USB_PRODUCT

-#endif

-};

-

-/** 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 uint8_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 0x00:

-					Address = &LanguageString;

-					Size    = pgm_read_byte(&LanguageString.Header.Size);

-					break;

-				case 0x01:

-					Address = &ManufacturerString;

-					Size    = pgm_read_byte(&ManufacturerString.Header.Size);

-					break;

-				case 0x02:

-					Address = &ProductString;

-					Size    = pgm_read_byte(&ProductString.Header.Size);

-					break;

-			}

-

-			break;

-	}

-

-	*DescriptorAddress = Address;

-	return Size;

-}

-

+/*
+             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
+ *
+ *  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 "lufa-descriptor-rndis.h"
+
+/** 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(01.10),
+	.Class                  = CDC_CSCP_CDCClass,
+	.SubClass               = CDC_CSCP_NoSpecificSubclass,
+	.Protocol               = CDC_CSCP_NoSpecificProtocol,
+
+	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
+
+	.VendorID               = 0x03EB,
+	.ProductID              = 0x204C,
+	.ReleaseNumber          = VERSION_BCD(00.01),
+
+	.ManufacturerStrIndex   = 0x01,
+	.ProductStrIndex        = 0x02,
+	.SerialNumStrIndex      = NO_DESCRIPTOR,
+
+	.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        = 2,
+
+			.ConfigurationNumber    = 1,
+			.ConfigurationStrIndex  = NO_DESCRIPTOR,
+
+			.ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),
+
+			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)
+		},
+
+	.CDC_CCI_Interface =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+
+			.InterfaceNumber        = 0,
+			.AlternateSetting       = 0,
+
+			.TotalEndpoints         = 1,
+
+			.Class                  = CDC_CSCP_CDCClass,
+			.SubClass               = CDC_CSCP_ACMSubclass,
+			.Protocol               = CDC_CSCP_VendorSpecificProtocol,
+
+			.InterfaceStrIndex      = NO_DESCRIPTOR
+		},
+
+	.CDC_Functional_Header =
+		{
+			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},
+			.Subtype                = CDC_DSUBTYPE_CSInterface_Header,
+
+			.CDCSpecification       = VERSION_BCD(01.10),
+		},
+
+	.CDC_Functional_ACM =
+		{
+			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},
+			.Subtype                = CDC_DSUBTYPE_CSInterface_ACM,
+
+			.Capabilities           = 0x00,
+		},
+
+	.CDC_Functional_Union =
+		{
+			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
+			.Subtype                = CDC_DSUBTYPE_CSInterface_Union,
+
+			.MasterInterfaceNumber  = 0,
+			.SlaveInterfaceNumber   = 1,
+		},
+
+	.CDC_NotificationEndpoint =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC_NOTIFICATION_EPNUM),
+			.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        = 1,
+			.AlternateSetting       = 0,
+
+			.TotalEndpoints         = 2,
+
+			.Class                  = CDC_CSCP_CDCDataClass,
+			.SubClass               = CDC_CSCP_NoDataSubclass,
+			.Protocol               = CDC_CSCP_NoDataProtocol,
+
+			.InterfaceStrIndex      = NO_DESCRIPTOR
+		},
+
+	.RNDIS_DataOutEndpoint =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+			.EndpointAddress        = (ENDPOINT_DIR_OUT | CDC_RX_EPNUM),
+			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+			.EndpointSize           = CDC_TXRX_EPSIZE,
+			.PollingIntervalMS      = 0x01
+		},
+
+	.RNDIS_DataInEndpoint =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC_TX_EPNUM),
+			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+			.EndpointSize           = CDC_TXRX_EPSIZE,
+			.PollingIntervalMS      = 0x01
+		}
+};
+
+/** 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 =
+{
+	.Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
+
+	.UnicodeString          = {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 =
+{
+#ifndef USB_MANUFACTURER
+  .Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
+  .UnicodeString          = L"Dean Camera"
+#else
+  .Header                 = {.Size = USB_STRING_LEN(USB_MANUFACTURER_LEN), .Type = DTYPE_String},
+  .UnicodeString          = USB_MANUFACTURER
+#endif
+};
+
+/** 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 =
+{
+#ifndef USB_PRODUCT
+  .Header                 = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String},
+  .UnicodeString          = L"LUFA USB-RS232 Adapter"
+#else
+  .Header                 = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String},
+  .UnicodeString          = USB_PRODUCT
+#endif
+};
+
+/** 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 uint8_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 0x00:
+					Address = &LanguageString;
+					Size    = pgm_read_byte(&LanguageString.Header.Size);
+					break;
+				case 0x01:
+					Address = &ManufacturerString;
+					Size    = pgm_read_byte(&ManufacturerString.Header.Size);
+					break;
+				case 0x02:
+					Address = &ProductString;
+					Size    = pgm_read_byte(&ProductString.Header.Size);
+					break;
+			}
+
+			break;
+	}
+
+	*DescriptorAddress = Address;
+	return Size;
+}
+
diff --git a/lib/lufa-descriptor-rndis.h b/lib/lufa-descriptor-rndis.h
index 508ac2f..7c40d87 100644
--- a/lib/lufa-descriptor-rndis.h
+++ b/lib/lufa-descriptor-rndis.h
@@ -1,89 +1,89 @@
-/*

-             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

- *

- *  Header file for Descriptors.c.

- */

-

-#ifndef _DESCRIPTORS_H_

-#define _DESCRIPTORS_H_

-

-	/* Includes: */

-		#include <LUFA/Drivers/USB/USB.h>

-

-		#include <avr/pgmspace.h>

-

-	/* Macros: */

-		/** Endpoint number of the CDC device-to-host notification IN endpoint. */

-		#define CDC_NOTIFICATION_EPNUM         3

-

-		/** Endpoint number of the CDC device-to-host data IN endpoint. */

-		#define CDC_TX_EPNUM                   1

-

-		/** Endpoint number of the CDC host-to-device data OUT endpoint. */

-		#define CDC_RX_EPNUM                   2

-

-		/** Size in bytes of the CDC device-to-host notification IN endpoint. */

-		#define CDC_NOTIFICATION_EPSIZE        8

-

-		/** Size in bytes of the CDC data IN and OUT endpoints. */

-		#define CDC_TXRX_EPSIZE                64

-

-	/* 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;

-

-			// RNDIS 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;

-

-			// RNDIS CDC Data Interface

-			USB_Descriptor_Interface_t            CDC_DCI_Interface;

-			USB_Descriptor_Endpoint_t             RNDIS_DataOutEndpoint;

-			USB_Descriptor_Endpoint_t             RNDIS_DataInEndpoint;

-		} USB_Descriptor_Configuration_t;

-

-	/* Function Prototypes: */

-		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

-		                                    const uint8_t wIndex,

-		                                    const void** const DescriptorAddress)

-		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

-

-#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
+ *
+ *  Header file for Descriptors.c.
+ */
+
+#ifndef _DESCRIPTORS_H_
+#define _DESCRIPTORS_H_
+
+	/* Includes: */
+		#include <LUFA/Drivers/USB/USB.h>
+
+		#include <avr/pgmspace.h>
+
+	/* Macros: */
+		/** Endpoint number of the CDC device-to-host notification IN endpoint. */
+		#define CDC_NOTIFICATION_EPNUM         3
+
+		/** Endpoint number of the CDC device-to-host data IN endpoint. */
+		#define CDC_TX_EPNUM                   1
+
+		/** Endpoint number of the CDC host-to-device data OUT endpoint. */
+		#define CDC_RX_EPNUM                   2
+
+		/** Size in bytes of the CDC device-to-host notification IN endpoint. */
+		#define CDC_NOTIFICATION_EPSIZE        8
+
+		/** Size in bytes of the CDC data IN and OUT endpoints. */
+		#define CDC_TXRX_EPSIZE                64
+
+	/* 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;
+
+			// RNDIS 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;
+
+			// RNDIS CDC Data Interface
+			USB_Descriptor_Interface_t            CDC_DCI_Interface;
+			USB_Descriptor_Endpoint_t             RNDIS_DataOutEndpoint;
+			USB_Descriptor_Endpoint_t             RNDIS_DataInEndpoint;
+		} USB_Descriptor_Configuration_t;
+
+	/* Function Prototypes: */
+		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+		                                    const uint8_t wIndex,
+		                                    const void** const DescriptorAddress)
+		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+
+#endif
+
diff --git a/lib/lufa-descriptor-usbdualserial.c b/lib/lufa-descriptor-usbdualserial.c
index 639391c..f270b5f 100644
--- a/lib/lufa-descriptor-usbdualserial.c
+++ b/lib/lufa-descriptor-usbdualserial.c
@@ -1,394 +1,394 @@
-/*

-             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

- *

- *  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 "lufa-descriptor-usbdualserial.h"

-

-/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as

- * the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.

- * This allows the host to track a device across insertions on different ports, allowing them to retain allocated

- * resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices

- * so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value

- * from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and

- * port location).

- */

-#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

-	#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

-#endif

-

-/** 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(01.10),

-	.Class                  = USB_CSCP_IADDeviceClass,

-	.SubClass               = USB_CSCP_IADDeviceSubclass,

-	.Protocol               = USB_CSCP_IADDeviceProtocol,

-

-	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,

-

-	.VendorID               = 0x03EB,

-	.ProductID              = 0x204E,

-	.ReleaseNumber          = VERSION_BCD(00.01),

-

-	.ManufacturerStrIndex   = 0x01,

-	.ProductStrIndex        = 0x02,

-	.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        = 4,

-

-			.ConfigurationNumber    = 1,

-			.ConfigurationStrIndex  = NO_DESCRIPTOR,

-

-			.ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),

-

-			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

-		},

-

-	.CDC1_IAD =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},

-

-			.FirstInterfaceIndex    = 0,

-			.TotalInterfaces        = 2,

-

-			.Class                  = CDC_CSCP_CDCClass,

-			.SubClass               = CDC_CSCP_ACMSubclass,

-			.Protocol               = CDC_CSCP_ATCommandProtocol,

-

-			.IADStrIndex            = NO_DESCRIPTOR

-		},

-

-	.CDC1_CCI_Interface =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

-

-			.InterfaceNumber        = 0,

-			.AlternateSetting       = 0,

-

-			.TotalEndpoints         = 1,

-

-			.Class                  = CDC_CSCP_CDCClass,

-			.SubClass               = CDC_CSCP_ACMSubclass,

-			.Protocol               = CDC_CSCP_ATCommandProtocol,

-

-			.InterfaceStrIndex      = NO_DESCRIPTOR

-		},

-

-	.CDC1_Functional_Header =

-		{

-			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},

-			.Subtype                = CDC_DSUBTYPE_CSInterface_Header,

-

-			.CDCSpecification       = VERSION_BCD(01.10),

-		},

-

-	.CDC1_Functional_ACM =

-		{

-			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},

-			.Subtype                = CDC_DSUBTYPE_CSInterface_ACM,

-

-			.Capabilities           = 0x06,

-		},

-

-	.CDC1_Functional_Union =

-		{

-			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},

-			.Subtype                = CDC_DSUBTYPE_CSInterface_Union,

-

-			.MasterInterfaceNumber  = 0,

-			.SlaveInterfaceNumber   = 1,

-		},

-

-	.CDC1_ManagementEndpoint =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

-

-			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC1_NOTIFICATION_EPNUM),

-			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-			.EndpointSize           = CDC_NOTIFICATION_EPSIZE,

-			.PollingIntervalMS      = 0xFF

-		},

-

-	.CDC1_DCI_Interface =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

-

-			.InterfaceNumber        = 1,

-			.AlternateSetting       = 0,

-

-			.TotalEndpoints         = 2,

-

-			.Class                  = CDC_CSCP_CDCDataClass,

-			.SubClass               = CDC_CSCP_NoDataSubclass,

-			.Protocol               = CDC_CSCP_NoDataProtocol,

-

-			.InterfaceStrIndex      = NO_DESCRIPTOR

-		},

-

-	.CDC1_DataOutEndpoint =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

-

-			.EndpointAddress        = (ENDPOINT_DIR_OUT | CDC1_RX_EPNUM),

-			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-			.EndpointSize           = CDC_TXRX_EPSIZE,

-			.PollingIntervalMS      = 0x01

-		},

-

-	.CDC1_DataInEndpoint =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

-

-			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC1_TX_EPNUM),

-			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-			.EndpointSize           = CDC_TXRX_EPSIZE,

-			.PollingIntervalMS      = 0x01

-		},

-

-	.CDC2_IAD =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},

-

-			.FirstInterfaceIndex    = 2,

-			.TotalInterfaces        = 2,

-

-			.Class                  = CDC_CSCP_CDCClass,

-			.SubClass               = CDC_CSCP_ACMSubclass,

-			.Protocol               = CDC_CSCP_ATCommandProtocol,

-

-			.IADStrIndex            = NO_DESCRIPTOR

-		},

-

-	.CDC2_CCI_Interface =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

-

-			.InterfaceNumber        = 2,

-			.AlternateSetting       = 0,

-

-			.TotalEndpoints         = 1,

-

-			.Class                  = CDC_CSCP_CDCClass,

-			.SubClass               = CDC_CSCP_ACMSubclass,

-			.Protocol               = CDC_CSCP_ATCommandProtocol,

-

-			.InterfaceStrIndex      = NO_DESCRIPTOR

-		},

-

-	.CDC2_Functional_Header =

-		{

-			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},

-			.Subtype                = CDC_DSUBTYPE_CSInterface_Header,

-

-			.CDCSpecification       = VERSION_BCD(01.10),

-		},

-

-	.CDC2_Functional_ACM =

-		{

-			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},

-			.Subtype                = CDC_DSUBTYPE_CSInterface_ACM,

-

-			.Capabilities           = 0x06,

-		},

-

-	.CDC2_Functional_Union =

-		{

-			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},

-			.Subtype                = CDC_DSUBTYPE_CSInterface_Union,

-

-			.MasterInterfaceNumber  = 2,

-			.SlaveInterfaceNumber   = 3,

-		},

-

-	.CDC2_ManagementEndpoint =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

-

-			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC2_NOTIFICATION_EPNUM),

-			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-			.EndpointSize           = CDC_NOTIFICATION_EPSIZE,

-			.PollingIntervalMS      = 0xFF

-		},

-

-	.CDC2_DCI_Interface =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

-

-			.InterfaceNumber        = 3,

-			.AlternateSetting       = 0,

-

-			.TotalEndpoints         = 2,

-

-			.Class                  = CDC_CSCP_CDCDataClass,

-			.SubClass               = CDC_CSCP_NoDataSubclass,

-			.Protocol               = CDC_CSCP_NoDataProtocol,

-

-			.InterfaceStrIndex      = NO_DESCRIPTOR

-		},

-

-	.CDC2_DataOutEndpoint =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

-

-			.EndpointAddress        = (ENDPOINT_DIR_OUT | CDC2_RX_EPNUM),

-			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-			.EndpointSize           = CDC_TXRX_EPSIZE,

-			.PollingIntervalMS      = 0x01

-		},

-

-	.CDC2_DataInEndpoint =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

-

-			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC2_TX_EPNUM),

-			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-			.EndpointSize           = CDC_TXRX_EPSIZE,

-			.PollingIntervalMS      = 0x01

-		}

-};

-

-/** 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 =

-{

-	.Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},

-

-	.UnicodeString          = {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 =

-{

-#ifndef USB_MANUFACTURER

-	.Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},

-  .UnicodeString          = L"Dean Camera"

-#else

-  .Header                 = {.Size = USB_STRING_LEN(USB_MANUFACTURER_LEN), .Type = DTYPE_String},

-  .UnicodeString          = USB_MANUFACTURER

-#endif

-};

-

-/** 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 =

-{

-#ifndef USB_PRODUCT

-	.Header                 = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String},

-	.UnicodeString          = L"LUFA Dual CDC Demo"

-#else

-  .Header                 = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String},

-  .UnicodeString          = USB_PRODUCT

-#endif

-};

-

-/** 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 uint8_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 0x00:

-					Address = &LanguageString;

-					Size    = pgm_read_byte(&LanguageString.Header.Size);

-					break;

-				case 0x01:

-					Address = &ManufacturerString;

-					Size    = pgm_read_byte(&ManufacturerString.Header.Size);

-					break;

-				case 0x02:

-					Address = &ProductString;

-					Size    = pgm_read_byte(&ProductString.Header.Size);

-					break;

-			}

-

-			break;

-	}

-

-	*DescriptorAddress = Address;

-	return Size;

-}

-

+/*
+             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
+ *
+ *  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 "lufa-descriptor-usbdualserial.h"
+
+/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as
+ * the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.
+ * This allows the host to track a device across insertions on different ports, allowing them to retain allocated
+ * resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices
+ * so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value
+ * from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and
+ * port location).
+ */
+#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)
+	#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.
+#endif
+
+/** 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(01.10),
+	.Class                  = USB_CSCP_IADDeviceClass,
+	.SubClass               = USB_CSCP_IADDeviceSubclass,
+	.Protocol               = USB_CSCP_IADDeviceProtocol,
+
+	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
+
+	.VendorID               = 0x03EB,
+	.ProductID              = 0x204E,
+	.ReleaseNumber          = VERSION_BCD(00.01),
+
+	.ManufacturerStrIndex   = 0x01,
+	.ProductStrIndex        = 0x02,
+	.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        = 4,
+
+			.ConfigurationNumber    = 1,
+			.ConfigurationStrIndex  = NO_DESCRIPTOR,
+
+			.ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),
+
+			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)
+		},
+
+	.CDC1_IAD =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
+
+			.FirstInterfaceIndex    = 0,
+			.TotalInterfaces        = 2,
+
+			.Class                  = CDC_CSCP_CDCClass,
+			.SubClass               = CDC_CSCP_ACMSubclass,
+			.Protocol               = CDC_CSCP_ATCommandProtocol,
+
+			.IADStrIndex            = NO_DESCRIPTOR
+		},
+
+	.CDC1_CCI_Interface =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+
+			.InterfaceNumber        = 0,
+			.AlternateSetting       = 0,
+
+			.TotalEndpoints         = 1,
+
+			.Class                  = CDC_CSCP_CDCClass,
+			.SubClass               = CDC_CSCP_ACMSubclass,
+			.Protocol               = CDC_CSCP_ATCommandProtocol,
+
+			.InterfaceStrIndex      = NO_DESCRIPTOR
+		},
+
+	.CDC1_Functional_Header =
+		{
+			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},
+			.Subtype                = CDC_DSUBTYPE_CSInterface_Header,
+
+			.CDCSpecification       = VERSION_BCD(01.10),
+		},
+
+	.CDC1_Functional_ACM =
+		{
+			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},
+			.Subtype                = CDC_DSUBTYPE_CSInterface_ACM,
+
+			.Capabilities           = 0x06,
+		},
+
+	.CDC1_Functional_Union =
+		{
+			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
+			.Subtype                = CDC_DSUBTYPE_CSInterface_Union,
+
+			.MasterInterfaceNumber  = 0,
+			.SlaveInterfaceNumber   = 1,
+		},
+
+	.CDC1_ManagementEndpoint =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC1_NOTIFICATION_EPNUM),
+			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+			.EndpointSize           = CDC_NOTIFICATION_EPSIZE,
+			.PollingIntervalMS      = 0xFF
+		},
+
+	.CDC1_DCI_Interface =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+
+			.InterfaceNumber        = 1,
+			.AlternateSetting       = 0,
+
+			.TotalEndpoints         = 2,
+
+			.Class                  = CDC_CSCP_CDCDataClass,
+			.SubClass               = CDC_CSCP_NoDataSubclass,
+			.Protocol               = CDC_CSCP_NoDataProtocol,
+
+			.InterfaceStrIndex      = NO_DESCRIPTOR
+		},
+
+	.CDC1_DataOutEndpoint =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+			.EndpointAddress        = (ENDPOINT_DIR_OUT | CDC1_RX_EPNUM),
+			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+			.EndpointSize           = CDC_TXRX_EPSIZE,
+			.PollingIntervalMS      = 0x01
+		},
+
+	.CDC1_DataInEndpoint =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC1_TX_EPNUM),
+			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+			.EndpointSize           = CDC_TXRX_EPSIZE,
+			.PollingIntervalMS      = 0x01
+		},
+
+	.CDC2_IAD =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
+
+			.FirstInterfaceIndex    = 2,
+			.TotalInterfaces        = 2,
+
+			.Class                  = CDC_CSCP_CDCClass,
+			.SubClass               = CDC_CSCP_ACMSubclass,
+			.Protocol               = CDC_CSCP_ATCommandProtocol,
+
+			.IADStrIndex            = NO_DESCRIPTOR
+		},
+
+	.CDC2_CCI_Interface =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+
+			.InterfaceNumber        = 2,
+			.AlternateSetting       = 0,
+
+			.TotalEndpoints         = 1,
+
+			.Class                  = CDC_CSCP_CDCClass,
+			.SubClass               = CDC_CSCP_ACMSubclass,
+			.Protocol               = CDC_CSCP_ATCommandProtocol,
+
+			.InterfaceStrIndex      = NO_DESCRIPTOR
+		},
+
+	.CDC2_Functional_Header =
+		{
+			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},
+			.Subtype                = CDC_DSUBTYPE_CSInterface_Header,
+
+			.CDCSpecification       = VERSION_BCD(01.10),
+		},
+
+	.CDC2_Functional_ACM =
+		{
+			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},
+			.Subtype                = CDC_DSUBTYPE_CSInterface_ACM,
+
+			.Capabilities           = 0x06,
+		},
+
+	.CDC2_Functional_Union =
+		{
+			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
+			.Subtype                = CDC_DSUBTYPE_CSInterface_Union,
+
+			.MasterInterfaceNumber  = 2,
+			.SlaveInterfaceNumber   = 3,
+		},
+
+	.CDC2_ManagementEndpoint =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC2_NOTIFICATION_EPNUM),
+			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+			.EndpointSize           = CDC_NOTIFICATION_EPSIZE,
+			.PollingIntervalMS      = 0xFF
+		},
+
+	.CDC2_DCI_Interface =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+
+			.InterfaceNumber        = 3,
+			.AlternateSetting       = 0,
+
+			.TotalEndpoints         = 2,
+
+			.Class                  = CDC_CSCP_CDCDataClass,
+			.SubClass               = CDC_CSCP_NoDataSubclass,
+			.Protocol               = CDC_CSCP_NoDataProtocol,
+
+			.InterfaceStrIndex      = NO_DESCRIPTOR
+		},
+
+	.CDC2_DataOutEndpoint =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+			.EndpointAddress        = (ENDPOINT_DIR_OUT | CDC2_RX_EPNUM),
+			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+			.EndpointSize           = CDC_TXRX_EPSIZE,
+			.PollingIntervalMS      = 0x01
+		},
+
+	.CDC2_DataInEndpoint =
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC2_TX_EPNUM),
+			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+			.EndpointSize           = CDC_TXRX_EPSIZE,
+			.PollingIntervalMS      = 0x01
+		}
+};
+
+/** 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 =
+{
+	.Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
+
+	.UnicodeString          = {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 =
+{
+#ifndef USB_MANUFACTURER
+	.Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
+  .UnicodeString          = L"Dean Camera"
+#else
+  .Header                 = {.Size = USB_STRING_LEN(USB_MANUFACTURER_LEN), .Type = DTYPE_String},
+  .UnicodeString          = USB_MANUFACTURER
+#endif
+};
+
+/** 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 =
+{
+#ifndef USB_PRODUCT
+	.Header                 = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String},
+	.UnicodeString          = L"LUFA Dual CDC Demo"
+#else
+  .Header                 = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String},
+  .UnicodeString          = USB_PRODUCT
+#endif
+};
+
+/** 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 uint8_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 0x00:
+					Address = &LanguageString;
+					Size    = pgm_read_byte(&LanguageString.Header.Size);
+					break;
+				case 0x01:
+					Address = &ManufacturerString;
+					Size    = pgm_read_byte(&ManufacturerString.Header.Size);
+					break;
+				case 0x02:
+					Address = &ProductString;
+					Size    = pgm_read_byte(&ProductString.Header.Size);
+					break;
+			}
+
+			break;
+	}
+
+	*DescriptorAddress = Address;
+	return Size;
+}
+
diff --git a/lib/lufa-descriptor-usbdualserial.h b/lib/lufa-descriptor-usbdualserial.h
index d1e6ca6..01d10f2 100644
--- a/lib/lufa-descriptor-usbdualserial.h
+++ b/lib/lufa-descriptor-usbdualserial.h
@@ -1,112 +1,112 @@
-/*

-             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

- *

- *  Header file for Descriptors.c.

- */

-

-#ifndef _DESCRIPTORS_H_

-#define _DESCRIPTORS_H_

-

-	/* Includes: */

-		#include <avr/pgmspace.h>

-

-		#include <LUFA/Drivers/USB/USB.h>

-

-	/* Macros: */

-		/** Endpoint number of the first CDC interface's device-to-host data IN endpoint. */

-		#define CDC1_TX_EPNUM                  1

-

-		/** Endpoint number of the first CDC interface's host-to-device data OUT endpoint. */

-		#define CDC1_RX_EPNUM                  2

-

-		/** Endpoint number of the first CDC interface's device-to-host notification IN endpoint. */

-		#define CDC1_NOTIFICATION_EPNUM        3

-

-		/** Endpoint number of the second CDC interface's device-to-host data IN endpoint. */

-		#define CDC2_TX_EPNUM                  4

-

-		/** Endpoint number of the second CDC interface's host-to-device data OUT endpoint. */

-		#define CDC2_RX_EPNUM                  5

-

-		/** Endpoint number of the second CDC interface's device-to-host notification IN endpoint. */

-		#define CDC2_NOTIFICATION_EPNUM        6

-

-		/** Size in bytes of the CDC device-to-host notification IN endpoints. */

-		#define CDC_NOTIFICATION_EPSIZE        8

-

-		/** Size in bytes of the CDC data IN and OUT endpoints. */

-		#define CDC_TXRX_EPSIZE                16

-

-	/* 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;

-

-			// First CDC Control Interface

-			USB_Descriptor_Interface_Association_t   CDC1_IAD;

-			USB_Descriptor_Interface_t               CDC1_CCI_Interface;

-			USB_CDC_Descriptor_FunctionalHeader_t    CDC1_Functional_Header;

-			USB_CDC_Descriptor_FunctionalACM_t       CDC1_Functional_ACM;

-			USB_CDC_Descriptor_FunctionalUnion_t     CDC1_Functional_Union;

-			USB_Descriptor_Endpoint_t                CDC1_ManagementEndpoint;

-

-			// First CDC Data Interface

-			USB_Descriptor_Interface_t               CDC1_DCI_Interface;

-			USB_Descriptor_Endpoint_t                CDC1_DataOutEndpoint;

-			USB_Descriptor_Endpoint_t                CDC1_DataInEndpoint;

-

-			// Second CDC Control Interface

-			USB_Descriptor_Interface_Association_t   CDC2_IAD;

-			USB_Descriptor_Interface_t               CDC2_CCI_Interface;

-			USB_CDC_Descriptor_FunctionalHeader_t    CDC2_Functional_Header;

-			USB_CDC_Descriptor_FunctionalACM_t       CDC2_Functional_ACM;

-			USB_CDC_Descriptor_FunctionalUnion_t     CDC2_Functional_Union;

-			USB_Descriptor_Endpoint_t                CDC2_ManagementEndpoint;

-

-			// Second CDC Data Interface

-			USB_Descriptor_Interface_t               CDC2_DCI_Interface;

-			USB_Descriptor_Endpoint_t                CDC2_DataOutEndpoint;

-			USB_Descriptor_Endpoint_t                CDC2_DataInEndpoint;

-		} USB_Descriptor_Configuration_t;

-

-	/* Function Prototypes: */

-		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

-		                                    const uint8_t wIndex,

-		                                    const void** const DescriptorAddress)

-		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

-

-#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
+ *
+ *  Header file for Descriptors.c.
+ */
+
+#ifndef _DESCRIPTORS_H_
+#define _DESCRIPTORS_H_
+
+	/* Includes: */
+		#include <avr/pgmspace.h>
+
+		#include <LUFA/Drivers/USB/USB.h>
+
+	/* Macros: */
+		/** Endpoint number of the first CDC interface's device-to-host data IN endpoint. */
+		#define CDC1_TX_EPNUM                  1
+
+		/** Endpoint number of the first CDC interface's host-to-device data OUT endpoint. */
+		#define CDC1_RX_EPNUM                  2
+
+		/** Endpoint number of the first CDC interface's device-to-host notification IN endpoint. */
+		#define CDC1_NOTIFICATION_EPNUM        3
+
+		/** Endpoint number of the second CDC interface's device-to-host data IN endpoint. */
+		#define CDC2_TX_EPNUM                  4
+
+		/** Endpoint number of the second CDC interface's host-to-device data OUT endpoint. */
+		#define CDC2_RX_EPNUM                  5
+
+		/** Endpoint number of the second CDC interface's device-to-host notification IN endpoint. */
+		#define CDC2_NOTIFICATION_EPNUM        6
+
+		/** Size in bytes of the CDC device-to-host notification IN endpoints. */
+		#define CDC_NOTIFICATION_EPSIZE        8
+
+		/** Size in bytes of the CDC data IN and OUT endpoints. */
+		#define CDC_TXRX_EPSIZE                16
+
+	/* 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;
+
+			// First CDC Control Interface
+			USB_Descriptor_Interface_Association_t   CDC1_IAD;
+			USB_Descriptor_Interface_t               CDC1_CCI_Interface;
+			USB_CDC_Descriptor_FunctionalHeader_t    CDC1_Functional_Header;
+			USB_CDC_Descriptor_FunctionalACM_t       CDC1_Functional_ACM;
+			USB_CDC_Descriptor_FunctionalUnion_t     CDC1_Functional_Union;
+			USB_Descriptor_Endpoint_t                CDC1_ManagementEndpoint;
+
+			// First CDC Data Interface
+			USB_Descriptor_Interface_t               CDC1_DCI_Interface;
+			USB_Descriptor_Endpoint_t                CDC1_DataOutEndpoint;
+			USB_Descriptor_Endpoint_t                CDC1_DataInEndpoint;
+
+			// Second CDC Control Interface
+			USB_Descriptor_Interface_Association_t   CDC2_IAD;
+			USB_Descriptor_Interface_t               CDC2_CCI_Interface;
+			USB_CDC_Descriptor_FunctionalHeader_t    CDC2_Functional_Header;
+			USB_CDC_Descriptor_FunctionalACM_t       CDC2_Functional_ACM;
+			USB_CDC_Descriptor_FunctionalUnion_t     CDC2_Functional_Union;
+			USB_Descriptor_Endpoint_t                CDC2_ManagementEndpoint;
+
+			// Second CDC Data Interface
+			USB_Descriptor_Interface_t               CDC2_DCI_Interface;
+			USB_Descriptor_Endpoint_t                CDC2_DataOutEndpoint;
+			USB_Descriptor_Endpoint_t                CDC2_DataInEndpoint;
+		} USB_Descriptor_Configuration_t;
+
+	/* Function Prototypes: */
+		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+		                                    const uint8_t wIndex,
+		                                    const void** const DescriptorAddress)
+		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+
+#endif
+
diff --git a/lib/lufa-descriptor-usbserial.c b/lib/lufa-descriptor-usbserial.c
index fa2ef25..cb83679 100644
--- a/lib/lufa-descriptor-usbserial.c
+++ b/lib/lufa-descriptor-usbserial.c
@@ -1,280 +1,280 @@
-/*

-             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

- *

- *  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 "lufa-descriptor-usbserial.h"

-

-/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as

- * the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.

- * This allows the host to track a device across insertions on different ports, allowing them to retain allocated

- * resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices

- * so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value

- * from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and

- * port location).

- */

-#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

-  #warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

-#endif

-

-/** 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(01.10),

-  .Class                  = CDC_CSCP_CDCClass,

-  .SubClass               = CDC_CSCP_NoSpecificSubclass,

-  .Protocol               = CDC_CSCP_NoSpecificProtocol,

-

-  .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,

-

-  .VendorID               = 0x03EB,

-  .ProductID              = 0x204B,

-  .ReleaseNumber          = VERSION_BCD(00.01),

-

-  .ManufacturerStrIndex   = 0x01,

-  .ProductStrIndex        = 0x02,

-  .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        = 2,

-

-      .ConfigurationNumber    = 1,

-      .ConfigurationStrIndex  = NO_DESCRIPTOR,

-

-      .ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),

-

-      .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

-    },

-

-  .CDC_CCI_Interface =

-    {

-      .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

-

-      .InterfaceNumber        = 0,

-      .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                = CDC_DSUBTYPE_CSInterface_Header,

-

-      .CDCSpecification       = VERSION_BCD(01.10),

-    },

-

-  .CDC_Functional_ACM =

-    {

-      .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},

-      .Subtype                = CDC_DSUBTYPE_CSInterface_ACM,

-

-      .Capabilities           = 0x06,

-    },

-

-  .CDC_Functional_Union =

-    {

-      .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},

-      .Subtype                = CDC_DSUBTYPE_CSInterface_Union,

-

-      .MasterInterfaceNumber  = 0,

-      .SlaveInterfaceNumber   = 1,

-    },

-

-  .CDC_NotificationEndpoint =

-    {

-      .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

-

-      .EndpointAddress        = (ENDPOINT_DIR_IN | CDC_NOTIFICATION_EPNUM),

-      .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        = 1,

-      .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        = (ENDPOINT_DIR_OUT | CDC_RX_EPNUM),

-      .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-      .EndpointSize           = CDC_TXRX_EPSIZE,

-      .PollingIntervalMS      = 0x01

-    },

-

-  .CDC_DataInEndpoint =

-    {

-      .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

-

-      .EndpointAddress        = (ENDPOINT_DIR_IN | CDC_TX_EPNUM),

-      .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-      .EndpointSize           = CDC_TXRX_EPSIZE,

-      .PollingIntervalMS      = 0x01

-    }

-};

-

-/** 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 =

-{

-  .Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},

-

-  .UnicodeString          = {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 =

-{

-#ifndef USB_MANUFACTURER

-  .Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},

-  .UnicodeString          = L"Dean Camera"

-#else

-  .Header                 = {.Size = USB_STRING_LEN(USB_MANUFACTURER_LEN), .Type = DTYPE_String},

-  .UnicodeString          = USB_MANUFACTURER

-#endif

-};

-

-/** 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 =

-{

-#ifndef USB_PRODUCT

-  .Header                 = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String},

-  .UnicodeString          = L"LUFA USB-RS232 Adapter"

-#else

-  .Header                 = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String},

-  .UnicodeString          = USB_PRODUCT

-#endif

-};

-

-/** 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 uint8_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 0x00:

-          Address = &LanguageString;

-          Size    = pgm_read_byte(&LanguageString.Header.Size);

-          break;

-        case 0x01:

-          Address = &ManufacturerString;

-          Size    = pgm_read_byte(&ManufacturerString.Header.Size);

-          break;

-        case 0x02:

-          Address = &ProductString;

-          Size    = pgm_read_byte(&ProductString.Header.Size);

-          break;

-      }

-

-      break;

-  }

-

-  *DescriptorAddress = Address;

-  return Size;

-}

-

+/*
+             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
+ *
+ *  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 "lufa-descriptor-usbserial.h"
+
+/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as
+ * the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.
+ * This allows the host to track a device across insertions on different ports, allowing them to retain allocated
+ * resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices
+ * so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value
+ * from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and
+ * port location).
+ */
+#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)
+  #warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.
+#endif
+
+/** 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(01.10),
+  .Class                  = CDC_CSCP_CDCClass,
+  .SubClass               = CDC_CSCP_NoSpecificSubclass,
+  .Protocol               = CDC_CSCP_NoSpecificProtocol,
+
+  .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
+
+  .VendorID               = 0x03EB,
+  .ProductID              = 0x204B,
+  .ReleaseNumber          = VERSION_BCD(00.01),
+
+  .ManufacturerStrIndex   = 0x01,
+  .ProductStrIndex        = 0x02,
+  .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        = 2,
+
+      .ConfigurationNumber    = 1,
+      .ConfigurationStrIndex  = NO_DESCRIPTOR,
+
+      .ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),
+
+      .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)
+    },
+
+  .CDC_CCI_Interface =
+    {
+      .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
+
+      .InterfaceNumber        = 0,
+      .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                = CDC_DSUBTYPE_CSInterface_Header,
+
+      .CDCSpecification       = VERSION_BCD(01.10),
+    },
+
+  .CDC_Functional_ACM =
+    {
+      .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},
+      .Subtype                = CDC_DSUBTYPE_CSInterface_ACM,
+
+      .Capabilities           = 0x06,
+    },
+
+  .CDC_Functional_Union =
+    {
+      .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
+      .Subtype                = CDC_DSUBTYPE_CSInterface_Union,
+
+      .MasterInterfaceNumber  = 0,
+      .SlaveInterfaceNumber   = 1,
+    },
+
+  .CDC_NotificationEndpoint =
+    {
+      .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+      .EndpointAddress        = (ENDPOINT_DIR_IN | CDC_NOTIFICATION_EPNUM),
+      .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        = 1,
+      .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        = (ENDPOINT_DIR_OUT | CDC_RX_EPNUM),
+      .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+      .EndpointSize           = CDC_TXRX_EPSIZE,
+      .PollingIntervalMS      = 0x01
+    },
+
+  .CDC_DataInEndpoint =
+    {
+      .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+
+      .EndpointAddress        = (ENDPOINT_DIR_IN | CDC_TX_EPNUM),
+      .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+      .EndpointSize           = CDC_TXRX_EPSIZE,
+      .PollingIntervalMS      = 0x01
+    }
+};
+
+/** 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 =
+{
+  .Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
+
+  .UnicodeString          = {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 =
+{
+#ifndef USB_MANUFACTURER
+  .Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
+  .UnicodeString          = L"Dean Camera"
+#else
+  .Header                 = {.Size = USB_STRING_LEN(USB_MANUFACTURER_LEN), .Type = DTYPE_String},
+  .UnicodeString          = USB_MANUFACTURER
+#endif
+};
+
+/** 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 =
+{
+#ifndef USB_PRODUCT
+  .Header                 = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String},
+  .UnicodeString          = L"LUFA USB-RS232 Adapter"
+#else
+  .Header                 = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String},
+  .UnicodeString          = USB_PRODUCT
+#endif
+};
+
+/** 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 uint8_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 0x00:
+          Address = &LanguageString;
+          Size    = pgm_read_byte(&LanguageString.Header.Size);
+          break;
+        case 0x01:
+          Address = &ManufacturerString;
+          Size    = pgm_read_byte(&ManufacturerString.Header.Size);
+          break;
+        case 0x02:
+          Address = &ProductString;
+          Size    = pgm_read_byte(&ProductString.Header.Size);
+          break;
+      }
+
+      break;
+  }
+
+  *DescriptorAddress = Address;
+  return Size;
+}
+
diff --git a/lib/lufa-descriptor-usbserial.h b/lib/lufa-descriptor-usbserial.h
index 97afd41..3bb021a 100644
--- a/lib/lufa-descriptor-usbserial.h
+++ b/lib/lufa-descriptor-usbserial.h
@@ -1,89 +1,89 @@
-/*

-             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

- *

- *  Header file for Descriptors.c.

- */

-

-#ifndef _DESCRIPTORS_H_

-#define _DESCRIPTORS_H_

-

-  /* Includes: */

-    #include <avr/pgmspace.h>

-

-    #include <LUFA/Drivers/USB/USB.h>

-

-  /* Macros: */

-    /** Endpoint number of the CDC device-to-host notification IN endpoint. */

-    #define CDC_NOTIFICATION_EPNUM         2

-

-    /** Endpoint number of the CDC device-to-host data IN endpoint. */

-    #define CDC_TX_EPNUM                   3

-

-    /** Endpoint number of the CDC host-to-device data OUT endpoint. */

-    #define CDC_RX_EPNUM                   4

-

-    /** Size in bytes of the CDC device-to-host notification IN endpoint. */

-    #define CDC_NOTIFICATION_EPSIZE        8

-

-    /** Size in bytes of the CDC data IN and OUT endpoints. */

-    #define CDC_TXRX_EPSIZE                16

-

-  /* 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;

-

-      // CDC Command 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;

-    } USB_Descriptor_Configuration_t;

-

-  /* Function Prototypes: */

-    uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

-                                        const uint8_t wIndex,

-                                        const void** const DescriptorAddress)

-                                        ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

-

-#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
+ *
+ *  Header file for Descriptors.c.
+ */
+
+#ifndef _DESCRIPTORS_H_
+#define _DESCRIPTORS_H_
+
+  /* Includes: */
+    #include <avr/pgmspace.h>
+
+    #include <LUFA/Drivers/USB/USB.h>
+
+  /* Macros: */
+    /** Endpoint number of the CDC device-to-host notification IN endpoint. */
+    #define CDC_NOTIFICATION_EPNUM         2
+
+    /** Endpoint number of the CDC device-to-host data IN endpoint. */
+    #define CDC_TX_EPNUM                   3
+
+    /** Endpoint number of the CDC host-to-device data OUT endpoint. */
+    #define CDC_RX_EPNUM                   4
+
+    /** Size in bytes of the CDC device-to-host notification IN endpoint. */
+    #define CDC_NOTIFICATION_EPSIZE        8
+
+    /** Size in bytes of the CDC data IN and OUT endpoints. */
+    #define CDC_TXRX_EPSIZE                16
+
+  /* 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;
+
+      // CDC Command 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;
+    } USB_Descriptor_Configuration_t;
+
+  /* Function Prototypes: */
+    uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+                                        const uint8_t wIndex,
+                                        const void** const DescriptorAddress)
+                                        ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+
+#endif
+
diff --git a/lufa.mk b/lufa.mk
index e2f45e1..3a576ca 100644
--- a/lufa.mk
+++ b/lufa.mk
@@ -1,41 +1,41 @@
-##

-##  spreadspace avr utils

-##

-##

-##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

-##

-##  This file is part of spreadspace avr utils.

-##

-##  spreadspace avr utils is free software: you can redistribute it and/or modify

-##  it under the terms of the GNU General Public License as published by

-##  the Free Software Foundation, either version 3 of the License, or

-##  any later version.

-##

-##  spreadspace avr utils is distributed in the hope that it will be useful,

-##  but WITHOUT ANY WARRANTY; without even the implied warranty of

-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-##  GNU General Public License for more details.

-##

-##  You should have received a copy of the GNU General Public License

-##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

-##

-

-include $(SPREADAVR_PATH)/defines.mk

-

-include $(LUFA_PATH)/LUFA/makefile

-SRC:=$(foreach COMP,$(LUFA_COMPONENTS),$(LUFA_SRC_$(COMP)))

-

-CFLAGS += -DF_USB=$(F_USB)UL

-CFLAGS += -DBOARD=BOARD_$(LUFA_BOARD)

-CFLAGS += $(LUFA_OPTS)

-

-OBJ = $(SRC:%.c=%.o)

-

-liblufa.a: $(OBJ)

-	$(AR) $@ $(OBJ)

-

-%.o: %.c

-	$(CC) -c $(CFLAGS) $< -o $@

-

-clean:

-	rm -f $(SRC:%.c=%.o)

+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+include $(SPREADAVR_PATH)/defines.mk
+
+include $(LUFA_PATH)/LUFA/makefile
+SRC:=$(foreach COMP,$(LUFA_COMPONENTS),$(LUFA_SRC_$(COMP)))
+
+CFLAGS += -DF_USB=$(F_USB)UL
+CFLAGS += -DBOARD=BOARD_$(LUFA_BOARD)
+CFLAGS += $(LUFA_OPTS)
+
+OBJ = $(SRC:%.c=%.o)
+
+liblufa.a: $(OBJ)
+	$(AR) $@ $(OBJ)
+
+%.o: %.c
+	$(CC) -c $(CFLAGS) $< -o $@
+
+clean:
+	rm -f $(SRC:%.c=%.o)
diff --git a/serial-led/Makefile b/serial-led/Makefile
index 4156d4a..79ad0ee 100644
--- a/serial-led/Makefile
+++ b/serial-led/Makefile
@@ -1,33 +1,33 @@
-##

-##  spreadspace avr utils

-##

-##

-##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

-##

-##  This file is part of spreadspace avr utils.

-##

-##  spreadspace avr utils is free software: you can redistribute it and/or modify

-##  it under the terms of the GNU General Public License as published by

-##  the Free Software Foundation, either version 3 of the License, or

-##  any later version.

-##

-##  spreadspace avr utils is distributed in the hope that it will be useful,

-##  but WITHOUT ANY WARRANTY; without even the implied warranty of

-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-##  GNU General Public License for more details.

-##

-##  You should have received a copy of the GNU General Public License

-##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

-##

-

-NAME := serial-led

-BOARD_TYPE := slowpandongle1

-OBJ := $(NAME).o

-LIBS := util led serialio

-EXTERNAL_LIBS := lufa

-SPREADAVR_PATH := ..

-

-LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219

-LUFA_COMPONENTS := SERIAL

-

-include $(SPREADAVR_PATH)/include.mk

+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+NAME := serial-led
+BOARD_TYPE := slowpandongle1
+OBJ := $(NAME).o
+LIBS := util led serialio
+EXTERNAL_LIBS := lufa
+SPREADAVR_PATH := ..
+
+LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219
+LUFA_COMPONENTS := SERIAL
+
+include $(SPREADAVR_PATH)/include.mk
diff --git a/serial-led/serial-led.c b/serial-led/serial-led.c
index 76dd03a..8ccb6d4 100644
--- a/serial-led/serial-led.c
+++ b/serial-led/serial-led.c
@@ -1,67 +1,67 @@
-/*

- *  spreadspace avr utils

- *

- *

- *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

- *

- *  This file is part of spreadspace avr utils.

- *

- *  spreadspace avr utils is free software: you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation, either version 3 of the License, or

- *  any later version.

- *

- *  spreadspace avr utils is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

- */

-

-

-#include <avr/io.h>

-#include <avr/wdt.h>

-#include <avr/interrupt.h>

-#include <avr/power.h>

-#include <stdio.h>

-

-#include "util.h"

-#include "led.h"

-#include "serialio.h"

-

-void handle_cmd(uint8_t cmd)

-{

-  switch(cmd) {

-  case '0': led_off(); break;

-  case '1': led_on(); break;

-  case 't': led_toggle(); break;

-  case 'r': reset2bootloader(); break;

-  default: printf("error\r\n"); return;

-  }

-  printf("ok\r\n");

-}

-

-int main(void)

-{

-  MCUSR &= ~(1 << WDRF);

-  wdt_disable();

-

-  cpu_init();

-  led_init();

-  serialio_init(9600, 0);

-  sei();

-

-  for(;;) {

-    int16_t BytesReceived = serialio_bytes_received();

-    while(BytesReceived > 0) {

-      int ReceivedByte = fgetc(stdin);

-      if(ReceivedByte != EOF) {

-        handle_cmd(ReceivedByte);

-      }

-      BytesReceived--;

-    }

-    serialio_task();

-  }

-}

+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+#include <avr/power.h>
+#include <stdio.h>
+
+#include "util.h"
+#include "led.h"
+#include "serialio.h"
+
+void handle_cmd(uint8_t cmd)
+{
+  switch(cmd) {
+  case '0': led_off(); break;
+  case '1': led_on(); break;
+  case 't': led_toggle(); break;
+  case 'r': reset2bootloader(); break;
+  default: printf("error\r\n"); return;
+  }
+  printf("ok\r\n");
+}
+
+int main(void)
+{
+  MCUSR &= ~(1 << WDRF);
+  wdt_disable();
+
+  cpu_init();
+  led_init();
+  serialio_init(9600, 0);
+  sei();
+
+  for(;;) {
+    int16_t BytesReceived = serialio_bytes_received();
+    while(BytesReceived > 0) {
+      int ReceivedByte = fgetc(stdin);
+      if(ReceivedByte != EOF) {
+        handle_cmd(ReceivedByte);
+      }
+      BytesReceived--;
+    }
+    serialio_task();
+  }
+}
diff --git a/usb-1wire/Makefile b/usb-1wire/Makefile
index 70cb4a2..7b12bd2 100644
--- a/usb-1wire/Makefile
+++ b/usb-1wire/Makefile
@@ -1,47 +1,47 @@
-##

-##  spreadspace avr utils

-##

-##

-##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

-##

-##  This file is part of spreadspace avr utils.

-##

-##  spreadspace avr utils is free software: you can redistribute it and/or modify

-##  it under the terms of the GNU General Public License as published by

-##  the Free Software Foundation, either version 3 of the License, or

-##  any later version.

-##

-##  spreadspace avr utils is distributed in the hope that it will be useful,

-##  but WITHOUT ANY WARRANTY; without even the implied warranty of

-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-##  GNU General Public License for more details.

-##

-##  You should have received a copy of the GNU General Public License

-##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

-##

-

-NAME := usb-1wire

-BOARD_TYPE := teensy2

-OBJ := $(NAME).o

-LIBS := util led lufa-descriptor-usbserial usbio onewire ds1820

-EXTERNAL_LIBS := lufa

-SPREADAVR_PATH := ..

-RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc

-RESET_PARAM := 'r'

-

-LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219

-LUFA_OPTS  = -D USB_DEVICE_ONLY

-LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0

-LUFA_OPTS += -D ORDERED_EP_CONFIG

-LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

-LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

-LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

-LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT

-

-LUFA_OPTS += -D USB_MANUFACTURER="L\"xro\"" -D USB_MANUFACTURER_LEN=3

-LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-1wire example\"" -D USB_PRODUCT_LEN=29

-

-LUFA_COMPONENTS := USB USBCLASS

-

-include $(SPREADAVR_PATH)/include.mk

+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+NAME := usb-1wire
+BOARD_TYPE := teensy2
+OBJ := $(NAME).o
+LIBS := util led lufa-descriptor-usbserial usbio onewire ds1820
+EXTERNAL_LIBS := lufa
+SPREADAVR_PATH := ..
+RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc
+RESET_PARAM := 'r'
+
+LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219
+LUFA_OPTS  = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
+LUFA_OPTS += -D ORDERED_EP_CONFIG
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
+
+LUFA_OPTS += -D USB_MANUFACTURER="L\"xro\"" -D USB_MANUFACTURER_LEN=3
+LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-1wire example\"" -D USB_PRODUCT_LEN=29
+
+LUFA_COMPONENTS := USB USBCLASS
+
+include $(SPREADAVR_PATH)/include.mk
diff --git a/usb-1wire/usb-1wire.c b/usb-1wire/usb-1wire.c
index a94067c..9a044f0 100644
--- a/usb-1wire/usb-1wire.c
+++ b/usb-1wire/usb-1wire.c
@@ -1,168 +1,168 @@
-/*

- *  spreadspace avr utils - usb-1wire example

- *

- *

- *  Copyright (C) 2013-2014 Bernhard Tittelbach <xro@realraum.at>

- *  basically this is refactored and enhanced code from:

- *   http://www.pjrc.com/teensy/td_libs_OneWire.html

- *

- *  This file is part of spreadspace avr utils.

- *

- *  spreadspace avr utils is free software: you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation, either version 3 of the License, or

- *  any later version.

- *

- *  spreadspace avr utils is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

- */

-

-

-#include <avr/io.h>

-#include <avr/wdt.h>

-#include <avr/interrupt.h>

-#include <util/delay.h>

-#include <stdio.h>

-

-#include "util.h"

-#include "led.h"

-#include "usbio.h"

-

-#define MAX_OWI_DEVICES 8

-

-#include "onewire.h"

-#include "ds1820.h"

-

-

-uint8_t owi_addr_[MAX_OWI_DEVICES][8];

-uint8_t num_owi_dev_found_ = 0;

-uint8_t num_temp_sensors_ = 0;

-

-void discoverOWIBus(void)

-{

-    uint8_t d=0;

-    led_on();

-

-    printf("Searching 1W Bus ");

-    num_owi_dev_found_ = 0;

-    if (owi_reset())

-        printf(" !something is there! ");

-    owi_reset_search();

-    _delay_ms(250);

-

-    while ( owi_search(owi_addr_[ d ]))

-    {

-        d++;

-        printf("%d. found, ", d);

-        led_toggle();

-        if ( d >= MAX_OWI_DEVICES)

-            break;

-    }

-    num_owi_dev_found_ = d;

-    printf(" done \r\n");

-    printf("%d devices found\r\n", d);

-

-    for (d=0; d<num_owi_dev_found_; d++)

-    {

-        printf("OW Dev #%d: addr = ", d);

-        for (uint8_t a=0;  a<8; a++)

-            printf("%02x ", owi_addr_[d][a]);

-        if (owi_crc8(owi_addr_[d], 7) == owi_addr_[d][7])

-            printf("  CRC OK");

-        else

-            printf("  CRC ERROR");

-        printf("\r\n");

-    }

-    led_off();

-}

-

-void tempToUSB(uint8_t bit_resolution)

-{

-    uint8_t sensor_index = 0;

-    uint16_t raw_temp = 0;

-    double temp=0.0;

-

-    led_on();

-

-    if (num_temp_sensors_ == 0)

-    {

-        printf("No DS1820 sensors ?? running bus discovery... \r\n");

-        num_temp_sensors_ = ds1820_discover();

-    }

-    printf("%d DS18x20 sensors on the bus\r\n", num_temp_sensors_);

-

-    for (sensor_index=0; sensor_index < num_temp_sensors_; sensor_index++)

-    {

-        ds1820_set_resolution(sensor_index, bit_resolution);

-        ds1820_start_measuring(sensor_index);

-    }

-

-    ds1820_wait_conversion_time(bit_resolution);

-

-    for (sensor_index=0; sensor_index < num_temp_sensors_; sensor_index++)

-    {

-        raw_temp = ds1820_read_temperature(sensor_index);

-        printf("DS1820 #%d: ", sensor_index);

-        if (raw_temp == DS1820_ERROR)

-        {

-            printf("CRC comm error\r\n");

-        } else {

-            temp = ds1820_raw_temp_to_celsius( raw_temp );

-            printf("raw: %d, celsius (float): %f, celsius (int): %d.%02d, %d bit resolution\r\n",

-                raw_temp,

-                temp ,

-                raw_temp / 16, (raw_temp <0 ? -1 : 1) * 100 * (raw_temp % 16) / 16,

-                bit_resolution

-            );

-        }

-    }

-    led_off();

-}

-

-

-void handle_cmd(uint8_t cmd)

-{

-    switch(cmd) {

-        case '0': discoverOWIBus(); break;

-        case '1': num_temp_sensors_ = ds1820_discover(); break;

-        case '2': tempToUSB(9); break;

-        case '3': tempToUSB(10); break;

-        case '4': tempToUSB(11); break;

-        case '5': tempToUSB(12); break;

-        case 'r': reset2bootloader(); break;

-        default: printf("error\r\n"); return;

-    }

-    printf("ok\r\n");

-}

-

-int main(void)

-{

-    MCUSR &= ~(1 << WDRF);

-    wdt_disable();

-

-    cpu_init();

-    led_init();

-    usbio_init();

-    sei();

-    owi_init(7, &PINC);

-

-    for(;;)

-    {

-        int16_t BytesReceived = usbio_bytes_received();

-        while(BytesReceived > 0)

-        {

-            int ReceivedByte = fgetc(stdin);

-            if(ReceivedByte != EOF) {

-                handle_cmd(ReceivedByte);

-            }

-            BytesReceived--;

-        }

-

-    usbio_task();

-    }

-}

+/*
+ *  spreadspace avr utils - usb-1wire example
+ *
+ *
+ *  Copyright (C) 2013-2014 Bernhard Tittelbach <xro@realraum.at>
+ *  basically this is refactored and enhanced code from:
+ *   http://www.pjrc.com/teensy/td_libs_OneWire.html
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+#include <util/delay.h>
+#include <stdio.h>
+
+#include "util.h"
+#include "led.h"
+#include "usbio.h"
+
+#define MAX_OWI_DEVICES 8
+
+#include "onewire.h"
+#include "ds1820.h"
+
+
+uint8_t owi_addr_[MAX_OWI_DEVICES][8];
+uint8_t num_owi_dev_found_ = 0;
+uint8_t num_temp_sensors_ = 0;
+
+void discoverOWIBus(void)
+{
+    uint8_t d=0;
+    led_on();
+
+    printf("Searching 1W Bus ");
+    num_owi_dev_found_ = 0;
+    if (owi_reset())
+        printf(" !something is there! ");
+    owi_reset_search();
+    _delay_ms(250);
+
+    while ( owi_search(owi_addr_[ d ]))
+    {
+        d++;
+        printf("%d. found, ", d);
+        led_toggle();
+        if ( d >= MAX_OWI_DEVICES)
+            break;
+    }
+    num_owi_dev_found_ = d;
+    printf(" done \r\n");
+    printf("%d devices found\r\n", d);
+
+    for (d=0; d<num_owi_dev_found_; d++)
+    {
+        printf("OW Dev #%d: addr = ", d);
+        for (uint8_t a=0;  a<8; a++)
+            printf("%02x ", owi_addr_[d][a]);
+        if (owi_crc8(owi_addr_[d], 7) == owi_addr_[d][7])
+            printf("  CRC OK");
+        else
+            printf("  CRC ERROR");
+        printf("\r\n");
+    }
+    led_off();
+}
+
+void tempToUSB(uint8_t bit_resolution)
+{
+    uint8_t sensor_index = 0;
+    uint16_t raw_temp = 0;
+    double temp=0.0;
+
+    led_on();
+
+    if (num_temp_sensors_ == 0)
+    {
+        printf("No DS1820 sensors ?? running bus discovery... \r\n");
+        num_temp_sensors_ = ds1820_discover();
+    }
+    printf("%d DS18x20 sensors on the bus\r\n", num_temp_sensors_);
+
+    for (sensor_index=0; sensor_index < num_temp_sensors_; sensor_index++)
+    {
+        ds1820_set_resolution(sensor_index, bit_resolution);
+        ds1820_start_measuring(sensor_index);
+    }
+
+    ds1820_wait_conversion_time(bit_resolution);
+
+    for (sensor_index=0; sensor_index < num_temp_sensors_; sensor_index++)
+    {
+        raw_temp = ds1820_read_temperature(sensor_index);
+        printf("DS1820 #%d: ", sensor_index);
+        if (raw_temp == DS1820_ERROR)
+        {
+            printf("CRC comm error\r\n");
+        } else {
+            temp = ds1820_raw_temp_to_celsius( raw_temp );
+            printf("raw: %d, celsius (float): %f, celsius (int): %d.%02d, %d bit resolution\r\n",
+                raw_temp,
+                temp ,
+                raw_temp / 16, (raw_temp <0 ? -1 : 1) * 100 * (raw_temp % 16) / 16,
+                bit_resolution
+            );
+        }
+    }
+    led_off();
+}
+
+
+void handle_cmd(uint8_t cmd)
+{
+    switch(cmd) {
+        case '0': discoverOWIBus(); break;
+        case '1': num_temp_sensors_ = ds1820_discover(); break;
+        case '2': tempToUSB(9); break;
+        case '3': tempToUSB(10); break;
+        case '4': tempToUSB(11); break;
+        case '5': tempToUSB(12); break;
+        case 'r': reset2bootloader(); break;
+        default: printf("error\r\n"); return;
+    }
+    printf("ok\r\n");
+}
+
+int main(void)
+{
+    MCUSR &= ~(1 << WDRF);
+    wdt_disable();
+
+    cpu_init();
+    led_init();
+    usbio_init();
+    sei();
+    owi_init(7, &PINC);
+
+    for(;;)
+    {
+        int16_t BytesReceived = usbio_bytes_received();
+        while(BytesReceived > 0)
+        {
+            int ReceivedByte = fgetc(stdin);
+            if(ReceivedByte != EOF) {
+                handle_cmd(ReceivedByte);
+            }
+            BytesReceived--;
+        }
+
+    usbio_task();
+    }
+}
diff --git a/usb-adc-dustsensor/Makefile b/usb-adc-dustsensor/Makefile
index 64b48b2..8881db2 100644
--- a/usb-adc-dustsensor/Makefile
+++ b/usb-adc-dustsensor/Makefile
@@ -1,47 +1,47 @@
-##

-##  spreadspace avr utils

-##

-##

-##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

-##

-##  This file is part of spreadspace avr utils.

-##

-##  spreadspace avr utils is free software: you can redistribute it and/or modify

-##  it under the terms of the GNU General Public License as published by

-##  the Free Software Foundation, either version 3 of the License, or

-##  any later version.

-##

-##  spreadspace avr utils is distributed in the hope that it will be useful,

-##  but WITHOUT ANY WARRANTY; without even the implied warranty of

-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-##  GNU General Public License for more details.

-##

-##  You should have received a copy of the GNU General Public License

-##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

-##

-

-NAME := usb-adc-dustsensor

-BOARD_TYPE := teensy2

-OBJ := $(NAME).o

-LIBS := util led lufa-descriptor-usbserial usbio

-EXTERNAL_LIBS := lufa

-SPREADAVR_PATH := ..

-RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc

-RESET_PARAM := 'r'

-

-LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219

-LUFA_OPTS  = -D USB_DEVICE_ONLY

-LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0

-LUFA_OPTS += -D ORDERED_EP_CONFIG

-LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

-LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

-LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

-LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT

-

-LUFA_OPTS += -D USB_MANUFACTURER="L\"xro\"" -D USB_MANUFACTURER_LEN=3

-LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-adc-dustsensor example\"" -D USB_PRODUCT_LEN=38

-

-LUFA_COMPONENTS := USB USBCLASS

-

-include $(SPREADAVR_PATH)/include.mk

+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+NAME := usb-adc-dustsensor
+BOARD_TYPE := teensy2
+OBJ := $(NAME).o
+LIBS := util led lufa-descriptor-usbserial usbio
+EXTERNAL_LIBS := lufa
+SPREADAVR_PATH := ..
+RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc
+RESET_PARAM := 'r'
+
+LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219
+LUFA_OPTS  = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
+LUFA_OPTS += -D ORDERED_EP_CONFIG
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
+
+LUFA_OPTS += -D USB_MANUFACTURER="L\"xro\"" -D USB_MANUFACTURER_LEN=3
+LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-adc-dustsensor example\"" -D USB_PRODUCT_LEN=38
+
+LUFA_COMPONENTS := USB USBCLASS
+
+include $(SPREADAVR_PATH)/include.mk
diff --git a/usb-adc-dustsensor/usb-adc-dustsensor.c b/usb-adc-dustsensor/usb-adc-dustsensor.c
index a0b9057..480596e 100644
--- a/usb-adc-dustsensor/usb-adc-dustsensor.c
+++ b/usb-adc-dustsensor/usb-adc-dustsensor.c
@@ -1,116 +1,116 @@
-/*

- *  spreadspace avr utils

- *

- *

- *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

- *

- *  This file is part of spreadspace avr utils.

- *

- *  spreadspace avr utils is free software: you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation, either version 3 of the License, or

- *  any later version.

- *

- *  spreadspace avr utils is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

- */

-

-

-#include <avr/io.h>

-#include <avr/wdt.h>

-#include <avr/interrupt.h>

-#include <avr/power.h>

-#include <util/delay.h>

-

-#include "util.h"

-#include "led.h"

-

-#include "usbio.h"

-#include <stdio.h>

-

-

-// Dustsensor defines:

-#include <LUFA/Drivers/Peripheral/ADC.h>

-

-#define PIN_HIGH(PORT, PIN) PORT |= (1 << PIN)

-#define PIN_LOW(PORT, PIN) PORT &= ~(1 << PIN)

-

-#define OP_SETBIT |=

-#define OP_CLEARBIT &= ~

-#define OP_CHECK &

-#define PIN_SW(PORTDDRREG, PIN, OP) PORTDDRREG OP (1 << PIN)

-

-#define HIGHv OP_SETBIT

-#define LOWv OP_CLEARBIT

-#define DUSTS_LED(OP) PIN_SW(PORTF, PF0, OP)

-

-#define DUSTS_ADC_NUM 1

-#define DUSTS_ADC_MUX_MASK ADC_CHANNEL1

-

-

-void dusts_init(void)

-{

-    DDRF = (1 << PF0);

-    DUSTS_LED(HIGHv);

-    //ADC_Init(ADC_SINGLE_CONVERSION);

-    ADC_Init(ADC_FREE_RUNNING);

-    ADC_SetupChannel (DUSTS_ADC_NUM);

-}

-

-int16_t dusts_measure(void) {

-    DUSTS_LED(LOWv);

-    _delay_us(280);

-    

-    //measure ADC

-    int16_t m =  ADC_GetChannelReading(ADC_REFERENCE_AVCC | DUSTS_ADC_MUX_MASK);

-    

-    _delay_us(40);

-    DUSTS_LED(HIGHv);

-    return m;

-}

-

-

-

-

-

-void handle_cmd(uint8_t cmd)

-{

-  int16_t mv=0;

-  switch(cmd) {

-      case 'm': mv = dusts_measure();  printf("Dust Value: %d\r\n", mv); break;

-      case 'r': reset2bootloader(); break;

-      default: printf("error\r\n"); return;

-  }

-}

-

-int main(void)

-{

-  MCUSR &= ~(1 << WDRF);

-  wdt_disable();

-  led_init();

-  led_on();

-  cpu_init();

-  usbio_init();

-  dusts_init();

-  sei();

-

-  for(;;) {

-    led_off();

-    int16_t BytesReceived = usbio_bytes_received();

-    while(BytesReceived > 0) {

-      int ReceivedByte = fgetc(stdin);

-      if(ReceivedByte != EOF) {

-        handle_cmd(ReceivedByte);

-      }

-      BytesReceived--;

-    }

-    usbio_task();

-    led_on();

-    _delay_ms(100);

-  }

-}

+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+#include <avr/power.h>
+#include <util/delay.h>
+
+#include "util.h"
+#include "led.h"
+
+#include "usbio.h"
+#include <stdio.h>
+
+
+// Dustsensor defines:
+#include <LUFA/Drivers/Peripheral/ADC.h>
+
+#define PIN_HIGH(PORT, PIN) PORT |= (1 << PIN)
+#define PIN_LOW(PORT, PIN) PORT &= ~(1 << PIN)
+
+#define OP_SETBIT |=
+#define OP_CLEARBIT &= ~
+#define OP_CHECK &
+#define PIN_SW(PORTDDRREG, PIN, OP) PORTDDRREG OP (1 << PIN)
+
+#define HIGHv OP_SETBIT
+#define LOWv OP_CLEARBIT
+#define DUSTS_LED(OP) PIN_SW(PORTF, PF0, OP)
+
+#define DUSTS_ADC_NUM 1
+#define DUSTS_ADC_MUX_MASK ADC_CHANNEL1
+
+
+void dusts_init(void)
+{
+    DDRF = (1 << PF0);
+    DUSTS_LED(HIGHv);
+    //ADC_Init(ADC_SINGLE_CONVERSION);
+    ADC_Init(ADC_FREE_RUNNING);
+    ADC_SetupChannel (DUSTS_ADC_NUM);
+}
+
+int16_t dusts_measure(void) {
+    DUSTS_LED(LOWv);
+    _delay_us(280);
+    
+    //measure ADC
+    int16_t m =  ADC_GetChannelReading(ADC_REFERENCE_AVCC | DUSTS_ADC_MUX_MASK);
+    
+    _delay_us(40);
+    DUSTS_LED(HIGHv);
+    return m;
+}
+
+
+
+
+
+void handle_cmd(uint8_t cmd)
+{
+  int16_t mv=0;
+  switch(cmd) {
+      case 'm': mv = dusts_measure();  printf("Dust Value: %d\r\n", mv); break;
+      case 'r': reset2bootloader(); break;
+      default: printf("error\r\n"); return;
+  }
+}
+
+int main(void)
+{
+  MCUSR &= ~(1 << WDRF);
+  wdt_disable();
+  led_init();
+  led_on();
+  cpu_init();
+  usbio_init();
+  dusts_init();
+  sei();
+
+  for(;;) {
+    led_off();
+    int16_t BytesReceived = usbio_bytes_received();
+    while(BytesReceived > 0) {
+      int ReceivedByte = fgetc(stdin);
+      if(ReceivedByte != EOF) {
+        handle_cmd(ReceivedByte);
+      }
+      BytesReceived--;
+    }
+    usbio_task();
+    led_on();
+    _delay_ms(100);
+  }
+}
diff --git a/usb-dual-serial/Makefile b/usb-dual-serial/Makefile
index c6ca219..a2ea03c 100644
--- a/usb-dual-serial/Makefile
+++ b/usb-dual-serial/Makefile
@@ -1,44 +1,44 @@
-##

-##  spreadspace avr utils

-##

-##

-##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

-##

-##  This file is part of spreadspace avr utils.

-##

-##  spreadspace avr utils is free software: you can redistribute it and/or modify

-##  it under the terms of the GNU General Public License as published by

-##  the Free Software Foundation, either version 3 of the License, or

-##  any later version.

-##

-##  spreadspace avr utils is distributed in the hope that it will be useful,

-##  but WITHOUT ANY WARRANTY; without even the implied warranty of

-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-##  GNU General Public License for more details.

-##

-##  You should have received a copy of the GNU General Public License

-##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

-##

-

-NAME := usb-dual-serial

-BOARD_TYPE := teensy2

-OBJ := $(NAME).o

-LIBS := util led lufa-descriptor-usbdualserial

-EXTERNAL_LIBS := lufa

-SPREADAVR_PATH := ..

-RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc

-RESET_PARAM := 'r'

-

-LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219

-LUFA_OPTS  = -D USB_DEVICE_ONLY

-LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

-LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

-LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

-

-LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7

-LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-dual-serial example\"" -D USB_PRODUCT_LEN=35

-

-LUFA_COMPONENTS := USB USBCLASS SERIAL

-

-include $(SPREADAVR_PATH)/include.mk

+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+NAME := usb-dual-serial
+BOARD_TYPE := teensy2
+OBJ := $(NAME).o
+LIBS := util led lufa-descriptor-usbdualserial
+EXTERNAL_LIBS := lufa
+SPREADAVR_PATH := ..
+RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc
+RESET_PARAM := 'r'
+
+LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219
+LUFA_OPTS  = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+
+LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7
+LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-dual-serial example\"" -D USB_PRODUCT_LEN=35
+
+LUFA_COMPONENTS := USB USBCLASS SERIAL
+
+include $(SPREADAVR_PATH)/include.mk
diff --git a/usb-dual-serial/usb-dual-serial.c b/usb-dual-serial/usb-dual-serial.c
index a58f278..02b50be 100644
--- a/usb-dual-serial/usb-dual-serial.c
+++ b/usb-dual-serial/usb-dual-serial.c
@@ -1,238 +1,238 @@
-/*

- *  spreadspace avr utils

- *

- *

- *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

- *

- *  This file is part of spreadspace avr utils.

- *

- *  spreadspace avr utils is free software: you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation, either version 3 of the License, or

- *  any later version.

- *

- *  spreadspace avr utils is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

- */

-

-

-#include <avr/io.h>

-#include <avr/wdt.h>

-#include <avr/interrupt.h>

-#include <avr/power.h>

-

-#include "util.h"

-#include "led.h"

-

-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-#include <LUFA/Drivers/USB/USB.h>

-#include <LUFA/Drivers/Peripheral/Serial.h>

-#include <LUFA/Drivers/Misc/RingBuffer.h>

-#include "lufa-descriptor-usbdualserial.h"

-

-static RingBuffer_t USBtoUSART_Buffer;

-static uint8_t      USBtoUSART_Buffer_Data[128];

-static RingBuffer_t USARTtoUSB_Buffer;

-static uint8_t      USARTtoUSB_Buffer_Data[128];

-

-USB_ClassInfo_CDC_Device_t VirtualSerial1_CDC_Interface =

-	{

-		.Config =

-			{

-				.ControlInterfaceNumber           = 0,

-

-				.DataINEndpointNumber             = CDC1_TX_EPNUM,

-				.DataINEndpointSize               = CDC_TXRX_EPSIZE,

-				.DataINEndpointDoubleBank         = false,

-

-				.DataOUTEndpointNumber            = CDC1_RX_EPNUM,

-				.DataOUTEndpointSize              = CDC_TXRX_EPSIZE,

-				.DataOUTEndpointDoubleBank        = false,

-

-				.NotificationEndpointNumber       = CDC1_NOTIFICATION_EPNUM,

-				.NotificationEndpointSize         = CDC_NOTIFICATION_EPSIZE,

-				.NotificationEndpointDoubleBank   = false,

-			},

-	};

-

-USB_ClassInfo_CDC_Device_t VirtualSerial2_CDC_Interface =

-	{

-		.Config =

-			{

-				.ControlInterfaceNumber           = 2,

-

-				.DataINEndpointNumber             = CDC2_TX_EPNUM,

-				.DataINEndpointSize               = CDC_TXRX_EPSIZE,

-				.DataINEndpointDoubleBank         = false,

-

-				.DataOUTEndpointNumber            = CDC2_RX_EPNUM,

-				.DataOUTEndpointSize              = CDC_TXRX_EPSIZE,

-				.DataOUTEndpointDoubleBank        = false,

-

-				.NotificationEndpointNumber       = CDC2_NOTIFICATION_EPNUM,

-				.NotificationEndpointSize         = CDC_NOTIFICATION_EPSIZE,

-				.NotificationEndpointDoubleBank   = false,

-			},

-	};

-

-void EVENT_USB_Device_ConfigurationChanged(void)

-{

-	CDC_Device_ConfigureEndpoints(&VirtualSerial1_CDC_Interface);

-	CDC_Device_ConfigureEndpoints(&VirtualSerial2_CDC_Interface);

-}

-

-void EVENT_USB_Device_ControlRequest(void)

-{

-	CDC_Device_ProcessControlRequest(&VirtualSerial1_CDC_Interface);

-	CDC_Device_ProcessControlRequest(&VirtualSerial2_CDC_Interface);

-}

-

-void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)

-{

-  if(CDCInterfaceInfo != &VirtualSerial1_CDC_Interface)

-    return;

-

-  uint8_t ConfigMask = 0;

-

-  switch (CDCInterfaceInfo->State.LineEncoding.ParityType)

-  {

-    case CDC_PARITY_Odd:

-      ConfigMask = ((1 << UPM11) | (1 << UPM10));

-      break;

-    case CDC_PARITY_Even:

-      ConfigMask = (1 << UPM11);

-      break;

-  }

-

-  if (CDCInterfaceInfo->State.LineEncoding.CharFormat == CDC_LINEENCODING_TwoStopBits)

-    ConfigMask |= (1 << USBS1);

-

-  switch (CDCInterfaceInfo->State.LineEncoding.DataBits)

-  {

-    case 6:

-      ConfigMask |= (1 << UCSZ10);

-      break;

-    case 7:

-      ConfigMask |= (1 << UCSZ11);

-      break;

-    case 8:

-      ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));

-      break;

-  }

-

-  /* Must turn off USART before reconfiguring it, otherwise incorrect operation may occur */

-  UCSR1B = 0;

-  UCSR1A = 0;

-  UCSR1C = 0;

-

-  /* Set the new baud rate before configuring the USART */

-  UBRR1  = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);

-

-  /* Reconfigure the USART in double speed mode for a wider baud rate range at the expense of accuracy */

-  UCSR1C = ConfigMask;

-  UCSR1A = (1 << U2X1);

-  UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));

-}

-

-ISR(USART1_RX_vect, ISR_BLOCK)

-{

-  uint8_t ReceivedByte = UDR1;

-

-  if (USB_DeviceState == DEVICE_STATE_Configured)

-    RingBuffer_Insert(&USARTtoUSB_Buffer, ReceivedByte);

-}

-

-void usbserial_init(void)

-{

-  RingBuffer_InitBuffer(&USBtoUSART_Buffer, USBtoUSART_Buffer_Data, sizeof(USBtoUSART_Buffer_Data));

-  RingBuffer_InitBuffer(&USARTtoUSB_Buffer, USARTtoUSB_Buffer_Data, sizeof(USARTtoUSB_Buffer_Data));

-  TCCR0B = (1 << CS02);

-}

-

-void usbserial_task(void)

-{

-    if (!(RingBuffer_IsFull(&USBtoUSART_Buffer))) {

-      int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);

-      if (!(ReceivedByte < 0))

-        RingBuffer_Insert(&USBtoUSART_Buffer, ReceivedByte);

-    }

-

-    uint16_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);

-    if ((TIFR0 & (1 << TOV0)) || (BufferCount > (uint8_t)(sizeof(USARTtoUSB_Buffer_Data) * .75))) {

-      TIFR0 |= (1 << TOV0);

-      while (BufferCount--) {

-        if (CDC_Device_SendByte(&VirtualSerial1_CDC_Interface, RingBuffer_Peek(&USARTtoUSB_Buffer)) != ENDPOINT_READYWAIT_NoError)

-          break;

-

-        RingBuffer_Remove(&USARTtoUSB_Buffer);

-      }

-    }

-

-    if (!(RingBuffer_IsEmpty(&USBtoUSART_Buffer)))

-      Serial_SendByte(RingBuffer_Remove(&USBtoUSART_Buffer));

-}

-/* end LUFA CDC-ACM specific definitions*/

-

-

-

-FILE usb_stream;

-

-void stdio_init(void)

-{

-  CDC_Device_CreateStream(&VirtualSerial2_CDC_Interface, &usb_stream);

-  stdin = &usb_stream;

-  stdout = &usb_stream;

-  stderr = &usb_stream;

-}

-

-void handle_cmd(uint8_t cmd)

-{

-  switch(cmd) {

-  case '0': led_off(); break;

-  case '1': led_on(); break;

-  case 't': led_toggle(); break;

-  case 'r': reset2bootloader(); break;

-  default: printf("unknown command\r\n"); return;

-  }

-  printf("ok\r\n");

-}

-

-int main(void)

-{

-  MCUSR &= ~(1 << WDRF);

-  wdt_disable();

-

-  cpu_init();

-  led_init();

-  USB_Init();

-  stdio_init();

-  usbserial_init();

-  sei();

-

-  for(;;) {

-    int16_t BytesReceived = CDC_Device_BytesReceived(&VirtualSerial2_CDC_Interface);

-    while(BytesReceived > 0) {

-      int ReceivedByte = fgetc(stdin);

-      if(ReceivedByte != EOF) {

-        handle_cmd(ReceivedByte);

-      }

-      BytesReceived--;

-    }

-

-    usbserial_task();

-		CDC_Device_USBTask(&VirtualSerial1_CDC_Interface);

-		CDC_Device_USBTask(&VirtualSerial2_CDC_Interface);

-    USB_USBTask();

-  }

-}

+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+#include <avr/power.h>
+
+#include "util.h"
+#include "led.h"
+
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+#include <LUFA/Drivers/USB/USB.h>
+#include <LUFA/Drivers/Peripheral/Serial.h>
+#include <LUFA/Drivers/Misc/RingBuffer.h>
+#include "lufa-descriptor-usbdualserial.h"
+
+static RingBuffer_t USBtoUSART_Buffer;
+static uint8_t      USBtoUSART_Buffer_Data[128];
+static RingBuffer_t USARTtoUSB_Buffer;
+static uint8_t      USARTtoUSB_Buffer_Data[128];
+
+USB_ClassInfo_CDC_Device_t VirtualSerial1_CDC_Interface =
+	{
+		.Config =
+			{
+				.ControlInterfaceNumber           = 0,
+
+				.DataINEndpointNumber             = CDC1_TX_EPNUM,
+				.DataINEndpointSize               = CDC_TXRX_EPSIZE,
+				.DataINEndpointDoubleBank         = false,
+
+				.DataOUTEndpointNumber            = CDC1_RX_EPNUM,
+				.DataOUTEndpointSize              = CDC_TXRX_EPSIZE,
+				.DataOUTEndpointDoubleBank        = false,
+
+				.NotificationEndpointNumber       = CDC1_NOTIFICATION_EPNUM,
+				.NotificationEndpointSize         = CDC_NOTIFICATION_EPSIZE,
+				.NotificationEndpointDoubleBank   = false,
+			},
+	};
+
+USB_ClassInfo_CDC_Device_t VirtualSerial2_CDC_Interface =
+	{
+		.Config =
+			{
+				.ControlInterfaceNumber           = 2,
+
+				.DataINEndpointNumber             = CDC2_TX_EPNUM,
+				.DataINEndpointSize               = CDC_TXRX_EPSIZE,
+				.DataINEndpointDoubleBank         = false,
+
+				.DataOUTEndpointNumber            = CDC2_RX_EPNUM,
+				.DataOUTEndpointSize              = CDC_TXRX_EPSIZE,
+				.DataOUTEndpointDoubleBank        = false,
+
+				.NotificationEndpointNumber       = CDC2_NOTIFICATION_EPNUM,
+				.NotificationEndpointSize         = CDC_NOTIFICATION_EPSIZE,
+				.NotificationEndpointDoubleBank   = false,
+			},
+	};
+
+void EVENT_USB_Device_ConfigurationChanged(void)
+{
+	CDC_Device_ConfigureEndpoints(&VirtualSerial1_CDC_Interface);
+	CDC_Device_ConfigureEndpoints(&VirtualSerial2_CDC_Interface);
+}
+
+void EVENT_USB_Device_ControlRequest(void)
+{
+	CDC_Device_ProcessControlRequest(&VirtualSerial1_CDC_Interface);
+	CDC_Device_ProcessControlRequest(&VirtualSerial2_CDC_Interface);
+}
+
+void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
+{
+  if(CDCInterfaceInfo != &VirtualSerial1_CDC_Interface)
+    return;
+
+  uint8_t ConfigMask = 0;
+
+  switch (CDCInterfaceInfo->State.LineEncoding.ParityType)
+  {
+    case CDC_PARITY_Odd:
+      ConfigMask = ((1 << UPM11) | (1 << UPM10));
+      break;
+    case CDC_PARITY_Even:
+      ConfigMask = (1 << UPM11);
+      break;
+  }
+
+  if (CDCInterfaceInfo->State.LineEncoding.CharFormat == CDC_LINEENCODING_TwoStopBits)
+    ConfigMask |= (1 << USBS1);
+
+  switch (CDCInterfaceInfo->State.LineEncoding.DataBits)
+  {
+    case 6:
+      ConfigMask |= (1 << UCSZ10);
+      break;
+    case 7:
+      ConfigMask |= (1 << UCSZ11);
+      break;
+    case 8:
+      ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));
+      break;
+  }
+
+  /* Must turn off USART before reconfiguring it, otherwise incorrect operation may occur */
+  UCSR1B = 0;
+  UCSR1A = 0;
+  UCSR1C = 0;
+
+  /* Set the new baud rate before configuring the USART */
+  UBRR1  = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);
+
+  /* Reconfigure the USART in double speed mode for a wider baud rate range at the expense of accuracy */
+  UCSR1C = ConfigMask;
+  UCSR1A = (1 << U2X1);
+  UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));
+}
+
+ISR(USART1_RX_vect, ISR_BLOCK)
+{
+  uint8_t ReceivedByte = UDR1;
+
+  if (USB_DeviceState == DEVICE_STATE_Configured)
+    RingBuffer_Insert(&USARTtoUSB_Buffer, ReceivedByte);
+}
+
+void usbserial_init(void)
+{
+  RingBuffer_InitBuffer(&USBtoUSART_Buffer, USBtoUSART_Buffer_Data, sizeof(USBtoUSART_Buffer_Data));
+  RingBuffer_InitBuffer(&USARTtoUSB_Buffer, USARTtoUSB_Buffer_Data, sizeof(USARTtoUSB_Buffer_Data));
+  TCCR0B = (1 << CS02);
+}
+
+void usbserial_task(void)
+{
+    if (!(RingBuffer_IsFull(&USBtoUSART_Buffer))) {
+      int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);
+      if (!(ReceivedByte < 0))
+        RingBuffer_Insert(&USBtoUSART_Buffer, ReceivedByte);
+    }
+
+    uint16_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);
+    if ((TIFR0 & (1 << TOV0)) || (BufferCount > (uint8_t)(sizeof(USARTtoUSB_Buffer_Data) * .75))) {
+      TIFR0 |= (1 << TOV0);
+      while (BufferCount--) {
+        if (CDC_Device_SendByte(&VirtualSerial1_CDC_Interface, RingBuffer_Peek(&USARTtoUSB_Buffer)) != ENDPOINT_READYWAIT_NoError)
+          break;
+
+        RingBuffer_Remove(&USARTtoUSB_Buffer);
+      }
+    }
+
+    if (!(RingBuffer_IsEmpty(&USBtoUSART_Buffer)))
+      Serial_SendByte(RingBuffer_Remove(&USBtoUSART_Buffer));
+}
+/* end LUFA CDC-ACM specific definitions*/
+
+
+
+FILE usb_stream;
+
+void stdio_init(void)
+{
+  CDC_Device_CreateStream(&VirtualSerial2_CDC_Interface, &usb_stream);
+  stdin = &usb_stream;
+  stdout = &usb_stream;
+  stderr = &usb_stream;
+}
+
+void handle_cmd(uint8_t cmd)
+{
+  switch(cmd) {
+  case '0': led_off(); break;
+  case '1': led_on(); break;
+  case 't': led_toggle(); break;
+  case 'r': reset2bootloader(); break;
+  default: printf("unknown command\r\n"); return;
+  }
+  printf("ok\r\n");
+}
+
+int main(void)
+{
+  MCUSR &= ~(1 << WDRF);
+  wdt_disable();
+
+  cpu_init();
+  led_init();
+  USB_Init();
+  stdio_init();
+  usbserial_init();
+  sei();
+
+  for(;;) {
+    int16_t BytesReceived = CDC_Device_BytesReceived(&VirtualSerial2_CDC_Interface);
+    while(BytesReceived > 0) {
+      int ReceivedByte = fgetc(stdin);
+      if(ReceivedByte != EOF) {
+        handle_cmd(ReceivedByte);
+      }
+      BytesReceived--;
+    }
+
+    usbserial_task();
+		CDC_Device_USBTask(&VirtualSerial1_CDC_Interface);
+		CDC_Device_USBTask(&VirtualSerial2_CDC_Interface);
+    USB_USBTask();
+  }
+}
diff --git a/usb-eth/Makefile b/usb-eth/Makefile
index 2aa6f71..23c51f7 100644
--- a/usb-eth/Makefile
+++ b/usb-eth/Makefile
@@ -1,43 +1,43 @@
-##

-##  spreadspace avr utils

-##

-##

-##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

-##

-##  This file is part of spreadspace avr utils.

-##

-##  spreadspace avr utils is free software: you can redistribute it and/or modify

-##  it under the terms of the GNU General Public License as published by

-##  the Free Software Foundation, either version 3 of the License, or

-##  any later version.

-##

-##  spreadspace avr utils is distributed in the hope that it will be useful,

-##  but WITHOUT ANY WARRANTY; without even the implied warranty of

-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-##  GNU General Public License for more details.

-##

-##  You should have received a copy of the GNU General Public License

-##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

-##

-

-NAME := usb-eth

-BOARD_TYPE := teensy2

-OBJ := $(NAME).o

-LIBS := util led lufa-descriptor-rndis

-EXTERNAL_LIBS := lufa

-SPREADAVR_PATH := ..

-

-LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219

-

-LUFA_OPTS  = -D USB_DEVICE_ONLY

-LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

-LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

-LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

-

-LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7

-LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-eth example\"" -D USB_PRODUCT_LEN=27

-

-LUFA_COMPONENTS := USB USBCLASS

-

-include $(SPREADAVR_PATH)/include.mk

+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+NAME := usb-eth
+BOARD_TYPE := teensy2
+OBJ := $(NAME).o
+LIBS := util led lufa-descriptor-rndis
+EXTERNAL_LIBS := lufa
+SPREADAVR_PATH := ..
+
+LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219
+
+LUFA_OPTS  = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+
+LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7
+LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-eth example\"" -D USB_PRODUCT_LEN=27
+
+LUFA_COMPONENTS := USB USBCLASS
+
+include $(SPREADAVR_PATH)/include.mk
diff --git a/usb-led/Makefile b/usb-led/Makefile
index 290a668..3bd8811 100644
--- a/usb-led/Makefile
+++ b/usb-led/Makefile
@@ -1,47 +1,47 @@
-##

-##  spreadspace avr utils

-##

-##

-##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

-##

-##  This file is part of spreadspace avr utils.

-##

-##  spreadspace avr utils is free software: you can redistribute it and/or modify

-##  it under the terms of the GNU General Public License as published by

-##  the Free Software Foundation, either version 3 of the License, or

-##  any later version.

-##

-##  spreadspace avr utils is distributed in the hope that it will be useful,

-##  but WITHOUT ANY WARRANTY; without even the implied warranty of

-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-##  GNU General Public License for more details.

-##

-##  You should have received a copy of the GNU General Public License

-##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

-##

-

-NAME := usb-led

-BOARD_TYPE := teenstep

-OBJ := $(NAME).o

-LIBS := util led lufa-descriptor-usbserial usbio

-EXTERNAL_LIBS := lufa

-SPREADAVR_PATH := ..

-RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc

-RESET_PARAM := 'r'

-

-LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219

-LUFA_OPTS  = -D USB_DEVICE_ONLY

-LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0

-LUFA_OPTS += -D ORDERED_EP_CONFIG

-LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

-LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

-LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

-LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT

-

-LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7

-LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-led example\"" -D USB_PRODUCT_LEN=27

-

-LUFA_COMPONENTS := USB USBCLASS

-

-include $(SPREADAVR_PATH)/include.mk

+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+NAME := usb-led
+BOARD_TYPE := teenstep
+OBJ := $(NAME).o
+LIBS := util led lufa-descriptor-usbserial usbio
+EXTERNAL_LIBS := lufa
+SPREADAVR_PATH := ..
+RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc
+RESET_PARAM := 'r'
+
+LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219
+LUFA_OPTS  = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
+LUFA_OPTS += -D ORDERED_EP_CONFIG
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
+
+LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7
+LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-led example\"" -D USB_PRODUCT_LEN=27
+
+LUFA_COMPONENTS := USB USBCLASS
+
+include $(SPREADAVR_PATH)/include.mk
diff --git a/usb-led/usb-led.c b/usb-led/usb-led.c
index b2dc1b0..892761c 100644
--- a/usb-led/usb-led.c
+++ b/usb-led/usb-led.c
@@ -1,68 +1,68 @@
-/*

- *  spreadspace avr utils

- *

- *

- *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

- *

- *  This file is part of spreadspace avr utils.

- *

- *  spreadspace avr utils is free software: you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation, either version 3 of the License, or

- *  any later version.

- *

- *  spreadspace avr utils is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

- */

-

-

-#include <avr/io.h>

-#include <avr/wdt.h>

-#include <avr/interrupt.h>

-#include <avr/power.h>

-#include <stdio.h>

-

-#include "util.h"

-#include "led.h"

-#include "usbio.h"

-

-void handle_cmd(uint8_t cmd)

-{

-  switch(cmd) {

-  case '0': led_off(); break;

-  case '1': led_on(); break;

-  case 't': led_toggle(); break;

-  case 'r': reset2bootloader(); break;

-  default: printf("error\r\n"); return;

-  }

-  printf("ok\r\n");

-}

-

-int main(void)

-{

-  MCUSR &= ~(1 << WDRF);

-  wdt_disable();

-

-  cpu_init();

-  led_init();

-  usbio_init();

-  sei();

-

-  for(;;) {

-    int16_t BytesReceived = usbio_bytes_received();

-    while(BytesReceived > 0) {

-      int ReceivedByte = fgetc(stdin);

-      if(ReceivedByte != EOF) {

-        handle_cmd(ReceivedByte);

-      }

-      BytesReceived--;

-    }

-

-    usbio_task();

-  }

-}

+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+#include <avr/power.h>
+#include <stdio.h>
+
+#include "util.h"
+#include "led.h"
+#include "usbio.h"
+
+void handle_cmd(uint8_t cmd)
+{
+  switch(cmd) {
+  case '0': led_off(); break;
+  case '1': led_on(); break;
+  case 't': led_toggle(); break;
+  case 'r': reset2bootloader(); break;
+  default: printf("error\r\n"); return;
+  }
+  printf("ok\r\n");
+}
+
+int main(void)
+{
+  MCUSR &= ~(1 << WDRF);
+  wdt_disable();
+
+  cpu_init();
+  led_init();
+  usbio_init();
+  sei();
+
+  for(;;) {
+    int16_t BytesReceived = usbio_bytes_received();
+    while(BytesReceived > 0) {
+      int ReceivedByte = fgetc(stdin);
+      if(ReceivedByte != EOF) {
+        handle_cmd(ReceivedByte);
+      }
+      BytesReceived--;
+    }
+
+    usbio_task();
+  }
+}
diff --git a/usb-pwm/Makefile b/usb-pwm/Makefile
index dcc7a11..9a33e68 100644
--- a/usb-pwm/Makefile
+++ b/usb-pwm/Makefile
@@ -1,47 +1,47 @@
-##

-##  spreadspace avr utils

-##

-##

-##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

-##

-##  This file is part of spreadspace avr utils.

-##

-##  spreadspace avr utils is free software: you can redistribute it and/or modify

-##  it under the terms of the GNU General Public License as published by

-##  the Free Software Foundation, either version 3 of the License, or

-##  any later version.

-##

-##  spreadspace avr utils is distributed in the hope that it will be useful,

-##  but WITHOUT ANY WARRANTY; without even the implied warranty of

-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-##  GNU General Public License for more details.

-##

-##  You should have received a copy of the GNU General Public License

-##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

-##

-

-NAME := usb-pwm

-BOARD_TYPE := teensy2

-OBJ := $(NAME).o

-LIBS := util led lufa-descriptor-usbserial usbio

-EXTERNAL_LIBS := lufa

-SPREADAVR_PATH := ..

-RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc

-RESET_PARAM := 'r'

-

-LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219

-LUFA_OPTS  = -D USB_DEVICE_ONLY

-LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0

-LUFA_OPTS += -D ORDERED_EP_CONFIG

-LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

-LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

-LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

-LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT

-

-LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7

-LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-pwm example\"" -D USB_PRODUCT_LEN=27

-

-LUFA_COMPONENTS := USB USBCLASS

-

-include $(SPREADAVR_PATH)/include.mk

+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+NAME := usb-pwm
+BOARD_TYPE := teensy2
+OBJ := $(NAME).o
+LIBS := util led lufa-descriptor-usbserial usbio
+EXTERNAL_LIBS := lufa
+SPREADAVR_PATH := ..
+RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc
+RESET_PARAM := 'r'
+
+LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219
+LUFA_OPTS  = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
+LUFA_OPTS += -D ORDERED_EP_CONFIG
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
+
+LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7
+LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-pwm example\"" -D USB_PRODUCT_LEN=27
+
+LUFA_COMPONENTS := USB USBCLASS
+
+include $(SPREADAVR_PATH)/include.mk
diff --git a/usb-pwm/usb-pwm.c b/usb-pwm/usb-pwm.c
index a6fe2ad..14f42fb 100644
--- a/usb-pwm/usb-pwm.c
+++ b/usb-pwm/usb-pwm.c
@@ -1,112 +1,112 @@
-/*

- *  spreadspace avr utils

- *

- *

- *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

- *

- *  This file is part of spreadspace avr utils.

- *

- *  spreadspace avr utils is free software: you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation, either version 3 of the License, or

- *  any later version.

- *

- *  spreadspace avr utils is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

- */

-

-

-#include <avr/io.h>

-#include <avr/wdt.h>

-#include <avr/interrupt.h>

-#include <avr/power.h>

-#include <stdio.h>

-

-#include "util.h"

-#include "led.h"

-#include "usbio.h"

-

-

-#define PWM_VAL OCR1BL

-

-void pwm_init(void)

-{

-  DDRB |= (1<<PB6);

-  TCCR1B = 0;

-  TCNT1 = 0;

-  OCR1B = 0;

-  TCCR1A = (1<<COM1B1) | (1<<WGM10);

-  TCCR1B = (1<<WGM12);

-}

-

-inline void pwm_on(void)

-{

-  TCCR1B = (TCCR1B & 0xF8) | (1<<CS10);

-}

-

-inline void pwm_off(void)

-{

-  TCCR1B = (TCCR1B & 0xF8);

-  TCNT1 = 0;

-}

-

-inline void pwm_set(uint8_t val)

-{

-  PWM_VAL = val;

-}

-

-inline void pwm_inc(void)

-{

-  if(PWM_VAL < 255)

-    PWM_VAL++;

-}

-

-inline void pwm_dec(void)

-{

-  if(PWM_VAL > 0)

-    PWM_VAL--;

-}

-

-

-void handle_cmd(uint8_t cmd)

-{

-  switch(cmd) {

-  case '0': pwm_off(); led_off(); printf("ok\r\n"); break;

-  case '1': pwm_on(); led_on(); printf("ok\r\n"); break;

-  case '+': pwm_inc(); printf("pwm = %d\r\n", PWM_VAL);  break;

-  case '-': pwm_dec(); printf("pwm = %d\r\n", PWM_VAL); break;

-  case 'r': reset2bootloader(); break;

-  default: printf("error\r\n"); return;

-  }

-

-}

-

-int main(void)

-{

-  MCUSR &= ~(1 << WDRF);

-  wdt_disable();

-

-  cpu_init();

-  led_init();

-  usbio_init();

-  pwm_init();

-  sei();

-

-  for(;;) {

-    int16_t BytesReceived = usbio_bytes_received();

-    while(BytesReceived > 0) {

-      int ReceivedByte = fgetc(stdin);

-      if(ReceivedByte != EOF) {

-        handle_cmd(ReceivedByte);

-      }

-      BytesReceived--;

-    }

-

-    usbio_task();

-  }

-}

+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+#include <avr/power.h>
+#include <stdio.h>
+
+#include "util.h"
+#include "led.h"
+#include "usbio.h"
+
+
+#define PWM_VAL OCR1BL
+
+void pwm_init(void)
+{
+  DDRB |= (1<<PB6);
+  TCCR1B = 0;
+  TCNT1 = 0;
+  OCR1B = 0;
+  TCCR1A = (1<<COM1B1) | (1<<WGM10);
+  TCCR1B = (1<<WGM12);
+}
+
+inline void pwm_on(void)
+{
+  TCCR1B = (TCCR1B & 0xF8) | (1<<CS10);
+}
+
+inline void pwm_off(void)
+{
+  TCCR1B = (TCCR1B & 0xF8);
+  TCNT1 = 0;
+}
+
+inline void pwm_set(uint8_t val)
+{
+  PWM_VAL = val;
+}
+
+inline void pwm_inc(void)
+{
+  if(PWM_VAL < 255)
+    PWM_VAL++;
+}
+
+inline void pwm_dec(void)
+{
+  if(PWM_VAL > 0)
+    PWM_VAL--;
+}
+
+
+void handle_cmd(uint8_t cmd)
+{
+  switch(cmd) {
+  case '0': pwm_off(); led_off(); printf("ok\r\n"); break;
+  case '1': pwm_on(); led_on(); printf("ok\r\n"); break;
+  case '+': pwm_inc(); printf("pwm = %d\r\n", PWM_VAL);  break;
+  case '-': pwm_dec(); printf("pwm = %d\r\n", PWM_VAL); break;
+  case 'r': reset2bootloader(); break;
+  default: printf("error\r\n"); return;
+  }
+
+}
+
+int main(void)
+{
+  MCUSR &= ~(1 << WDRF);
+  wdt_disable();
+
+  cpu_init();
+  led_init();
+  usbio_init();
+  pwm_init();
+  sei();
+
+  for(;;) {
+    int16_t BytesReceived = usbio_bytes_received();
+    while(BytesReceived > 0) {
+      int ReceivedByte = fgetc(stdin);
+      if(ReceivedByte != EOF) {
+        handle_cmd(ReceivedByte);
+      }
+      BytesReceived--;
+    }
+
+    usbio_task();
+  }
+}
diff --git a/usb-serial/Makefile b/usb-serial/Makefile
index 26bae81..093a2c9 100644
--- a/usb-serial/Makefile
+++ b/usb-serial/Makefile
@@ -1,45 +1,45 @@
-##

-##  spreadspace avr utils

-##

-##

-##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

-##

-##  This file is part of spreadspace avr utils.

-##

-##  spreadspace avr utils is free software: you can redistribute it and/or modify

-##  it under the terms of the GNU General Public License as published by

-##  the Free Software Foundation, either version 3 of the License, or

-##  any later version.

-##

-##  spreadspace avr utils is distributed in the hope that it will be useful,

-##  but WITHOUT ANY WARRANTY; without even the implied warranty of

-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-##  GNU General Public License for more details.

-##

-##  You should have received a copy of the GNU General Public License

-##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

-##

-

-NAME := usb-serial

-BOARD_TYPE := slowpandongle2

-OBJ := $(NAME).o

-LIBS := util led lufa-descriptor-usbserial

-EXTERNAL_LIBS := lufa

-SPREADAVR_PATH := ..

-

-LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219

-LUFA_OPTS  = -D USB_DEVICE_ONLY

-LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0

-LUFA_OPTS += -D ORDERED_EP_CONFIG

-LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

-LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

-LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

-LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT

-

-LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7

-LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-serial example\"" -D USB_PRODUCT_LEN=30

-

-LUFA_COMPONENTS := USB USBCLASS SERIAL

-

-include $(SPREADAVR_PATH)/include.mk

+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+NAME := usb-serial
+BOARD_TYPE := slowpandongle2
+OBJ := $(NAME).o
+LIBS := util led lufa-descriptor-usbserial
+EXTERNAL_LIBS := lufa
+SPREADAVR_PATH := ..
+
+LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219
+LUFA_OPTS  = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
+LUFA_OPTS += -D ORDERED_EP_CONFIG
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
+
+LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7
+LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-serial example\"" -D USB_PRODUCT_LEN=30
+
+LUFA_COMPONENTS := USB USBCLASS SERIAL
+
+include $(SPREADAVR_PATH)/include.mk
diff --git a/usb-serial/usb-serial.c b/usb-serial/usb-serial.c
index 9983d9d..f333675 100644
--- a/usb-serial/usb-serial.c
+++ b/usb-serial/usb-serial.c
@@ -1,281 +1,281 @@
-/*

- *  spreadspace avr utils

- *

- *

- *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

- *

- *  This file is part of spreadspace avr utils.

- *

- *  spreadspace avr utils is free software: you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation, either version 3 of the License, or

- *  any later version.

- *

- *  spreadspace avr utils is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

- */

-

-

-/* this is more or less the same as the LUFA example Project USBtoSerial and

-   this is their LICENSE Header */

-

-/*

-             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

- *

- *  Main source file for the USBtoSerial project. This file contains the main tasks of

- *  the project and is responsible for the initial application hardware configuration.

- */

-

-

-#include <avr/io.h>

-#include <avr/wdt.h>

-#include <avr/interrupt.h>

-#include <avr/power.h>

-

-#include "lufa-descriptor-usbserial.h"

-

-#include "util.h"

-#include "led.h"

-

-#include <LUFA/Version.h>

-#include <LUFA/Drivers/Peripheral/Serial.h>

-#include <LUFA/Drivers/Misc/RingBuffer.h>

-#include <LUFA/Drivers/USB/USB.h>

-

-    /* Function Prototypes: */

-void SetupHardware(void);

-

-void EVENT_USB_Device_Connect(void);

-void EVENT_USB_Device_Disconnect(void);

-void EVENT_USB_Device_ConfigurationChanged(void);

-void EVENT_USB_Device_ControlRequest(void);

-

-void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);

-

-/** Circular buffer to hold data from the host before it is sent to the device via the serial port. */

-static RingBuffer_t USBtoUSART_Buffer;

-

-/** Underlying data buffer for \ref USBtoUSART_Buffer, where the stored bytes are located. */

-static uint8_t      USBtoUSART_Buffer_Data[128];

-

-/** Circular buffer to hold data from the serial port before it is sent to the host. */

-static RingBuffer_t USARTtoUSB_Buffer;

-

-/** Underlying data buffer for \ref USARTtoUSB_Buffer, where the stored bytes are located. */

-static uint8_t      USARTtoUSB_Buffer_Data[128];

-

-/** LUFA CDC Class driver interface configuration and state information. This structure is

- *  passed to all CDC Class driver functions, so that multiple instances of the same class

- *  within a device can be differentiated from one another.

- */

-USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =

-  {

-    .Config =

-      {

-        .ControlInterfaceNumber         = 0,

-

-        .DataINEndpointNumber           = CDC_TX_EPNUM,

-        .DataINEndpointSize             = CDC_TXRX_EPSIZE,

-        .DataINEndpointDoubleBank       = false,

-

-        .DataOUTEndpointNumber          = CDC_RX_EPNUM,

-        .DataOUTEndpointSize            = CDC_TXRX_EPSIZE,

-        .DataOUTEndpointDoubleBank      = false,

-

-        .NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM,

-        .NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE,

-        .NotificationEndpointDoubleBank = false,

-      },

-  };

-

-

-/** Main program entry point. This routine contains the overall program flow, including initial

- *  setup of all components and the main program loop.

- */

-int main(void)

-{

-  SetupHardware();

-

-  RingBuffer_InitBuffer(&USBtoUSART_Buffer, USBtoUSART_Buffer_Data, sizeof(USBtoUSART_Buffer_Data));

-  RingBuffer_InitBuffer(&USARTtoUSB_Buffer, USARTtoUSB_Buffer_Data, sizeof(USARTtoUSB_Buffer_Data));

-

-  sei();

-

-  for (;;)

-  {

-    /* Only try to read in bytes from the CDC interface if the transmit buffer is not full */

-    if (!(RingBuffer_IsFull(&USBtoUSART_Buffer)))

-    {

-      int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);

-

-      /* Read bytes from the USB OUT endpoint into the USART transmit buffer */

-      if (!(ReceivedByte < 0))

-        RingBuffer_Insert(&USBtoUSART_Buffer, ReceivedByte);

-    }

-

-    /* Check if the UART receive buffer flush timer has expired or the buffer is nearly full */

-    uint16_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);

-    if ((TIFR0 & (1 << TOV0)) || (BufferCount > (uint8_t)(sizeof(USARTtoUSB_Buffer_Data) * .75)))

-    {

-      /* Clear flush timer expiry flag */

-      TIFR0 |= (1 << TOV0);

-

-      /* Read bytes from the USART receive buffer into the USB IN endpoint */

-      while (BufferCount--)

-      {

-        /* Try to send the next byte of data to the host, abort if there is an error without dequeuing */

-        if (CDC_Device_SendByte(&VirtualSerial_CDC_Interface,

-                                RingBuffer_Peek(&USARTtoUSB_Buffer)) != ENDPOINT_READYWAIT_NoError)

-        {

-          break;

-        }

-

-        /* Dequeue the already sent byte from the buffer now we have confirmed that no transmission error occurred */

-        RingBuffer_Remove(&USARTtoUSB_Buffer);

-      }

-    }

-

-    /* Load the next byte from the USART transmit buffer into the USART */

-    if (!(RingBuffer_IsEmpty(&USBtoUSART_Buffer)))

-      Serial_SendByte(RingBuffer_Remove(&USBtoUSART_Buffer));

-

-    CDC_Device_USBTask(&VirtualSerial_CDC_Interface);

-    USB_USBTask();

-  }

-}

-

-/** Configures the board hardware and chip peripherals for the demo's functionality. */

-void SetupHardware(void)

-{

-  /* Disable watchdog if enabled by bootloader/fuses */

-  MCUSR &= ~(1 << WDRF);

-  wdt_disable();

-

-  cpu_init();

-  led_init();

-  USB_Init();

-

-  /* Start the flush timer so that overflows occur rapidly to push received bytes to the USB interface */

-  TCCR0B = (1 << CS02);

-}

-

-/** Event handler for the library USB Connection event. */

-void EVENT_USB_Device_Connect(void)

-{

-  led_on();

-}

-

-/** Event handler for the library USB Disconnection event. */

-void EVENT_USB_Device_Disconnect(void)

-{

-  led_off();

-}

-

-/** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_Device_ConfigurationChanged(void)

-{

-  CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);

-  led_toggle();

-  _delay_ms(10);

-  led_toggle();

-}

-

-/** Event handler for the library USB Control Request reception event. */

-void EVENT_USB_Device_ControlRequest(void)

-{

-  CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);

-}

-

-/** ISR to manage the reception of data from the serial port, placing received bytes into a circular buffer

- *  for later transmission to the host.

- */

-ISR(USART1_RX_vect, ISR_BLOCK)

-{

-  uint8_t ReceivedByte = UDR1;

-

-  if (USB_DeviceState == DEVICE_STATE_Configured)

-    RingBuffer_Insert(&USARTtoUSB_Buffer, ReceivedByte);

-}

-

-/** Event handler for the CDC Class driver Line Encoding Changed event.

- *

- *  \param[in] CDCInterfaceInfo  Pointer to the CDC class interface configuration structure being referenced

- */

-void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)

-{

-  uint8_t ConfigMask = 0;

-

-  switch (CDCInterfaceInfo->State.LineEncoding.ParityType)

-  {

-    case CDC_PARITY_Odd:

-      ConfigMask = ((1 << UPM11) | (1 << UPM10));

-      break;

-    case CDC_PARITY_Even:

-      ConfigMask = (1 << UPM11);

-      break;

-  }

-

-  if (CDCInterfaceInfo->State.LineEncoding.CharFormat == CDC_LINEENCODING_TwoStopBits)

-    ConfigMask |= (1 << USBS1);

-

-  switch (CDCInterfaceInfo->State.LineEncoding.DataBits)

-  {

-    case 6:

-      ConfigMask |= (1 << UCSZ10);

-      break;

-    case 7:

-      ConfigMask |= (1 << UCSZ11);

-      break;

-    case 8:

-      ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));

-      break;

-  }

-

-  /* Must turn off USART before reconfiguring it, otherwise incorrect operation may occur */

-  UCSR1B = 0;

-  UCSR1A = 0;

-  UCSR1C = 0;

-

-  /* Set the new baud rate before configuring the USART */

-  UBRR1  = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);

-

-  /* Reconfigure the USART in double speed mode for a wider baud rate range at the expense of accuracy */

-  UCSR1C = ConfigMask;

-  UCSR1A = (1 << U2X1);

-  UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));

-}

-

+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+/* this is more or less the same as the LUFA example Project USBtoSerial and
+   this is their LICENSE Header */
+
+/*
+             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
+ *
+ *  Main source file for the USBtoSerial project. This file contains the main tasks of
+ *  the project and is responsible for the initial application hardware configuration.
+ */
+
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+#include <avr/power.h>
+
+#include "lufa-descriptor-usbserial.h"
+
+#include "util.h"
+#include "led.h"
+
+#include <LUFA/Version.h>
+#include <LUFA/Drivers/Peripheral/Serial.h>
+#include <LUFA/Drivers/Misc/RingBuffer.h>
+#include <LUFA/Drivers/USB/USB.h>
+
+    /* Function Prototypes: */
+void SetupHardware(void);
+
+void EVENT_USB_Device_Connect(void);
+void EVENT_USB_Device_Disconnect(void);
+void EVENT_USB_Device_ConfigurationChanged(void);
+void EVENT_USB_Device_ControlRequest(void);
+
+void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
+
+/** Circular buffer to hold data from the host before it is sent to the device via the serial port. */
+static RingBuffer_t USBtoUSART_Buffer;
+
+/** Underlying data buffer for \ref USBtoUSART_Buffer, where the stored bytes are located. */
+static uint8_t      USBtoUSART_Buffer_Data[128];
+
+/** Circular buffer to hold data from the serial port before it is sent to the host. */
+static RingBuffer_t USARTtoUSB_Buffer;
+
+/** Underlying data buffer for \ref USARTtoUSB_Buffer, where the stored bytes are located. */
+static uint8_t      USARTtoUSB_Buffer_Data[128];
+
+/** LUFA CDC Class driver interface configuration and state information. This structure is
+ *  passed to all CDC Class driver functions, so that multiple instances of the same class
+ *  within a device can be differentiated from one another.
+ */
+USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
+  {
+    .Config =
+      {
+        .ControlInterfaceNumber         = 0,
+
+        .DataINEndpointNumber           = CDC_TX_EPNUM,
+        .DataINEndpointSize             = CDC_TXRX_EPSIZE,
+        .DataINEndpointDoubleBank       = false,
+
+        .DataOUTEndpointNumber          = CDC_RX_EPNUM,
+        .DataOUTEndpointSize            = CDC_TXRX_EPSIZE,
+        .DataOUTEndpointDoubleBank      = false,
+
+        .NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM,
+        .NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE,
+        .NotificationEndpointDoubleBank = false,
+      },
+  };
+
+
+/** Main program entry point. This routine contains the overall program flow, including initial
+ *  setup of all components and the main program loop.
+ */
+int main(void)
+{
+  SetupHardware();
+
+  RingBuffer_InitBuffer(&USBtoUSART_Buffer, USBtoUSART_Buffer_Data, sizeof(USBtoUSART_Buffer_Data));
+  RingBuffer_InitBuffer(&USARTtoUSB_Buffer, USARTtoUSB_Buffer_Data, sizeof(USARTtoUSB_Buffer_Data));
+
+  sei();
+
+  for (;;)
+  {
+    /* Only try to read in bytes from the CDC interface if the transmit buffer is not full */
+    if (!(RingBuffer_IsFull(&USBtoUSART_Buffer)))
+    {
+      int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
+
+      /* Read bytes from the USB OUT endpoint into the USART transmit buffer */
+      if (!(ReceivedByte < 0))
+        RingBuffer_Insert(&USBtoUSART_Buffer, ReceivedByte);
+    }
+
+    /* Check if the UART receive buffer flush timer has expired or the buffer is nearly full */
+    uint16_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);
+    if ((TIFR0 & (1 << TOV0)) || (BufferCount > (uint8_t)(sizeof(USARTtoUSB_Buffer_Data) * .75)))
+    {
+      /* Clear flush timer expiry flag */
+      TIFR0 |= (1 << TOV0);
+
+      /* Read bytes from the USART receive buffer into the USB IN endpoint */
+      while (BufferCount--)
+      {
+        /* Try to send the next byte of data to the host, abort if there is an error without dequeuing */
+        if (CDC_Device_SendByte(&VirtualSerial_CDC_Interface,
+                                RingBuffer_Peek(&USARTtoUSB_Buffer)) != ENDPOINT_READYWAIT_NoError)
+        {
+          break;
+        }
+
+        /* Dequeue the already sent byte from the buffer now we have confirmed that no transmission error occurred */
+        RingBuffer_Remove(&USARTtoUSB_Buffer);
+      }
+    }
+
+    /* Load the next byte from the USART transmit buffer into the USART */
+    if (!(RingBuffer_IsEmpty(&USBtoUSART_Buffer)))
+      Serial_SendByte(RingBuffer_Remove(&USBtoUSART_Buffer));
+
+    CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
+    USB_USBTask();
+  }
+}
+
+/** Configures the board hardware and chip peripherals for the demo's functionality. */
+void SetupHardware(void)
+{
+  /* Disable watchdog if enabled by bootloader/fuses */
+  MCUSR &= ~(1 << WDRF);
+  wdt_disable();
+
+  cpu_init();
+  led_init();
+  USB_Init();
+
+  /* Start the flush timer so that overflows occur rapidly to push received bytes to the USB interface */
+  TCCR0B = (1 << CS02);
+}
+
+/** Event handler for the library USB Connection event. */
+void EVENT_USB_Device_Connect(void)
+{
+  led_on();
+}
+
+/** Event handler for the library USB Disconnection event. */
+void EVENT_USB_Device_Disconnect(void)
+{
+  led_off();
+}
+
+/** Event handler for the library USB Configuration Changed event. */
+void EVENT_USB_Device_ConfigurationChanged(void)
+{
+  CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);
+  led_toggle();
+  _delay_ms(10);
+  led_toggle();
+}
+
+/** Event handler for the library USB Control Request reception event. */
+void EVENT_USB_Device_ControlRequest(void)
+{
+  CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);
+}
+
+/** ISR to manage the reception of data from the serial port, placing received bytes into a circular buffer
+ *  for later transmission to the host.
+ */
+ISR(USART1_RX_vect, ISR_BLOCK)
+{
+  uint8_t ReceivedByte = UDR1;
+
+  if (USB_DeviceState == DEVICE_STATE_Configured)
+    RingBuffer_Insert(&USARTtoUSB_Buffer, ReceivedByte);
+}
+
+/** Event handler for the CDC Class driver Line Encoding Changed event.
+ *
+ *  \param[in] CDCInterfaceInfo  Pointer to the CDC class interface configuration structure being referenced
+ */
+void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
+{
+  uint8_t ConfigMask = 0;
+
+  switch (CDCInterfaceInfo->State.LineEncoding.ParityType)
+  {
+    case CDC_PARITY_Odd:
+      ConfigMask = ((1 << UPM11) | (1 << UPM10));
+      break;
+    case CDC_PARITY_Even:
+      ConfigMask = (1 << UPM11);
+      break;
+  }
+
+  if (CDCInterfaceInfo->State.LineEncoding.CharFormat == CDC_LINEENCODING_TwoStopBits)
+    ConfigMask |= (1 << USBS1);
+
+  switch (CDCInterfaceInfo->State.LineEncoding.DataBits)
+  {
+    case 6:
+      ConfigMask |= (1 << UCSZ10);
+      break;
+    case 7:
+      ConfigMask |= (1 << UCSZ11);
+      break;
+    case 8:
+      ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));
+      break;
+  }
+
+  /* Must turn off USART before reconfiguring it, otherwise incorrect operation may occur */
+  UCSR1B = 0;
+  UCSR1A = 0;
+  UCSR1C = 0;
+
+  /* Set the new baud rate before configuring the USART */
+  UBRR1  = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);
+
+  /* Reconfigure the USART in double speed mode for a wider baud rate range at the expense of accuracy */
+  UCSR1C = ConfigMask;
+  UCSR1A = (1 << U2X1);
+  UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));
+}
+
diff --git a/usb-spi/Makefile b/usb-spi/Makefile
index b0516bc..67e99aa 100644
--- a/usb-spi/Makefile
+++ b/usb-spi/Makefile
@@ -1,45 +1,45 @@
-##

-##  spreadspace avr utils

-##

-##

-##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

-##

-##  This file is part of spreadspace avr utils.

-##

-##  spreadspace avr utils is free software: you can redistribute it and/or modify

-##  it under the terms of the GNU General Public License as published by

-##  the Free Software Foundation, either version 3 of the License, or

-##  any later version.

-##

-##  spreadspace avr utils is distributed in the hope that it will be useful,

-##  but WITHOUT ANY WARRANTY; without even the implied warranty of

-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-##  GNU General Public License for more details.

-##

-##  You should have received a copy of the GNU General Public License

-##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

-##

-

-NAME := usb-spi

-BOARD_TYPE := teensy2

-OBJ := $(NAME).o

-LIBS := util led lufa-descriptor-usbserial

-EXTERNAL_LIBS := lufa

-SPREADAVR_PATH := ..

-

-LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219

-LUFA_OPTS  = -D USB_DEVICE_ONLY

-LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0

-LUFA_OPTS += -D ORDERED_EP_CONFIG

-LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

-LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

-LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

-LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT

-

-LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7

-LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-spi example\"" -D USB_PRODUCT_LEN=27

-

-LUFA_COMPONENTS := USB USBCLASS

-

-include $(SPREADAVR_PATH)/include.mk

+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+NAME := usb-spi
+BOARD_TYPE := teensy2
+OBJ := $(NAME).o
+LIBS := util led lufa-descriptor-usbserial
+EXTERNAL_LIBS := lufa
+SPREADAVR_PATH := ..
+
+LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219
+LUFA_OPTS  = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
+LUFA_OPTS += -D ORDERED_EP_CONFIG
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
+
+LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7
+LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-spi example\"" -D USB_PRODUCT_LEN=27
+
+LUFA_COMPONENTS := USB USBCLASS
+
+include $(SPREADAVR_PATH)/include.mk
diff --git a/usb-spi/usb-spi.c b/usb-spi/usb-spi.c
index 1c000ed..6ae785a 100644
--- a/usb-spi/usb-spi.c
+++ b/usb-spi/usb-spi.c
@@ -1,199 +1,199 @@
-/*

- *  spreadspace avr utils

- *

- *

- *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

- *

- *  This file is part of spreadspace avr utils.

- *

- *  spreadspace avr utils is free software: you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation, either version 3 of the License, or

- *  any later version.

- *

- *  spreadspace avr utils is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

- */

-

-#include <avr/io.h>

-#include <avr/wdt.h>

-#include <avr/interrupt.h>

-#include <avr/power.h>

-

-#include "util.h"

-#include "led.h"

-

-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-#include <LUFA/Version.h>

-#include <LUFA/Drivers/Peripheral/SPI.h>

-#include <LUFA/Drivers/Misc/RingBuffer.h>

-#include <LUFA/Drivers/USB/USB.h>

-#include "lufa-descriptor-usbserial.h"

-

-    /* Global I/O Buffers: */

-static RingBuffer_t USBtoSPI_Buffer;

-static uint8_t      USBtoSPI_Buffer_Data[128];

-static RingBuffer_t SPItoUSB_Buffer;

-static uint8_t      SPItoUSB_Buffer_Data[128];

-

-/** LUFA CDC Class driver interface configuration and state information. This structure is

- *  passed to all CDC Class driver functions, so that multiple instances of the same class

- *  within a device can be differentiated from one another.

- */

-USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =

-  {

-    .Config =

-      {

-        .ControlInterfaceNumber         = 0,

-

-        .DataINEndpointNumber           = CDC_TX_EPNUM,

-        .DataINEndpointSize             = CDC_TXRX_EPSIZE,

-        .DataINEndpointDoubleBank       = false,

-

-        .DataOUTEndpointNumber          = CDC_RX_EPNUM,

-        .DataOUTEndpointSize            = CDC_TXRX_EPSIZE,

-        .DataOUTEndpointDoubleBank      = false,

-

-        .NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM,

-        .NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE,

-        .NotificationEndpointDoubleBank = false,

-      },

-  };

-

-void EVENT_USB_Device_ConfigurationChanged(void)

-{

-  CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);

-}

-

-void EVENT_USB_Device_ControlRequest(void)

-{

-  CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);

-}

-

-/* end LUFA CDC-ACM specific definitions */

-

-    /* Hardware Defines: */

-#define SPI_CS_DDR DDRB

-#define SPI_CS_PORT PORTB

-#define CS   0

-

-#define RESET_DDR DDRB

-#define RESET_PORT PORTB

-#define RESET   7

-

-void SetupHardware(void)

-{

-  MCUSR &= ~(1 << WDRF);

-  wdt_disable();

-

-  cpu_init();

-  led_init();

-  USB_Init();

-

-  TCCR0B = (1 << CS02);

-

-  SPI_Init(SPI_SPEED_FCPU_DIV_16  | SPI_MODE_MASTER | SPI_ORDER_MSB_FIRST |

-           SPI_SCK_LEAD_RISING | SPI_SAMPLE_LEADING);

-  SPI_CS_DDR |= (1<<CS);

-  SPI_CS_PORT |= (1<<CS);

-

-  RESET_DDR |= (1<<RESET);

-  RESET_PORT |= (1<<RESET);

-

-/* INT0 as input with pull-up */

-  DDRD &= ~(1<<0);

-  PORTD |= (1<<0);

-  EICRA |= (1<<ISC01);

-  EIFR |= (1<<INTF0);

-  EIMSK |= (1<<INT0);

-}

-

-void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)

-{

-  if(CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR)

-    RESET_PORT &= ~(1<<RESET);

-  else

-    RESET_PORT |= (1<<RESET);

-}

-

-void EVENT_CDC_Device_BreakSent(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, const uint8_t Duration)

-{

-  SPI_CS_PORT ^= (1<<CS);

-}

-

-ISR(INT0_vect)

-{

-  SPI_CS_PORT &= ~(1<<CS);

-  led_on();

-

-  uint8_t ReceivedByte = SPI_ReceiveByte();

-  RingBuffer_Insert(&SPItoUSB_Buffer, ReceivedByte);

-

-  led_off();

-  SPI_CS_PORT |= (1<<CS);

-}

-

-void SPI_SendBuffer(void)

-{

-  SPI_CS_PORT &= ~(1<<CS);

-  led_on();

-

-  while(!(RingBuffer_IsEmpty(&USBtoSPI_Buffer))) {

-    SPI_SendByte(RingBuffer_Remove(&USBtoSPI_Buffer));

-  }

-

-  led_off();

-  SPI_CS_PORT |= (1<<CS);

-}

-

-int main(void)

-{

-  SetupHardware();

-

-  RingBuffer_InitBuffer(&USBtoSPI_Buffer, USBtoSPI_Buffer_Data, sizeof(USBtoSPI_Buffer_Data));

-  RingBuffer_InitBuffer(&SPItoUSB_Buffer, SPItoUSB_Buffer_Data, sizeof(SPItoUSB_Buffer_Data));

-

-  sei();

-

-  for (;;) {

-    int16_t BytesReceived = CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface);

-    while(BytesReceived > 0) {

-      if(!(RingBuffer_IsFull(&USBtoSPI_Buffer))) {

-        int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);

-        if (!(ReceivedByte < 0))

-          RingBuffer_Insert(&USBtoSPI_Buffer, ReceivedByte);

-

-        BytesReceived--;

-      }

-    }

-

-    uint16_t BufferCount = RingBuffer_GetCount(&SPItoUSB_Buffer);

-    if ((TIFR0 & (1 << TOV0)) || (BufferCount > (uint8_t)(sizeof(SPItoUSB_Buffer_Data) * .75))) {

-      TIFR0 |= (1 << TOV0);

-      while (BufferCount--) {

-        if (CDC_Device_SendByte(&VirtualSerial_CDC_Interface,

-                                RingBuffer_Peek(&SPItoUSB_Buffer)) != ENDPOINT_READYWAIT_NoError)

-          break;

-

-        RingBuffer_Remove(&SPItoUSB_Buffer);

-      }

-    }

-

-    if (!(RingBuffer_IsEmpty(&USBtoSPI_Buffer)))

-      SPI_SendBuffer();

-

-    CDC_Device_USBTask(&VirtualSerial_CDC_Interface);

-    USB_USBTask();

-  }

-}

+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+#include <avr/power.h>
+
+#include "util.h"
+#include "led.h"
+
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+#include <LUFA/Version.h>
+#include <LUFA/Drivers/Peripheral/SPI.h>
+#include <LUFA/Drivers/Misc/RingBuffer.h>
+#include <LUFA/Drivers/USB/USB.h>
+#include "lufa-descriptor-usbserial.h"
+
+    /* Global I/O Buffers: */
+static RingBuffer_t USBtoSPI_Buffer;
+static uint8_t      USBtoSPI_Buffer_Data[128];
+static RingBuffer_t SPItoUSB_Buffer;
+static uint8_t      SPItoUSB_Buffer_Data[128];
+
+/** LUFA CDC Class driver interface configuration and state information. This structure is
+ *  passed to all CDC Class driver functions, so that multiple instances of the same class
+ *  within a device can be differentiated from one another.
+ */
+USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
+  {
+    .Config =
+      {
+        .ControlInterfaceNumber         = 0,
+
+        .DataINEndpointNumber           = CDC_TX_EPNUM,
+        .DataINEndpointSize             = CDC_TXRX_EPSIZE,
+        .DataINEndpointDoubleBank       = false,
+
+        .DataOUTEndpointNumber          = CDC_RX_EPNUM,
+        .DataOUTEndpointSize            = CDC_TXRX_EPSIZE,
+        .DataOUTEndpointDoubleBank      = false,
+
+        .NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM,
+        .NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE,
+        .NotificationEndpointDoubleBank = false,
+      },
+  };
+
+void EVENT_USB_Device_ConfigurationChanged(void)
+{
+  CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);
+}
+
+void EVENT_USB_Device_ControlRequest(void)
+{
+  CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);
+}
+
+/* end LUFA CDC-ACM specific definitions */
+
+    /* Hardware Defines: */
+#define SPI_CS_DDR DDRB
+#define SPI_CS_PORT PORTB
+#define CS   0
+
+#define RESET_DDR DDRB
+#define RESET_PORT PORTB
+#define RESET   7
+
+void SetupHardware(void)
+{
+  MCUSR &= ~(1 << WDRF);
+  wdt_disable();
+
+  cpu_init();
+  led_init();
+  USB_Init();
+
+  TCCR0B = (1 << CS02);
+
+  SPI_Init(SPI_SPEED_FCPU_DIV_16  | SPI_MODE_MASTER | SPI_ORDER_MSB_FIRST |
+           SPI_SCK_LEAD_RISING | SPI_SAMPLE_LEADING);
+  SPI_CS_DDR |= (1<<CS);
+  SPI_CS_PORT |= (1<<CS);
+
+  RESET_DDR |= (1<<RESET);
+  RESET_PORT |= (1<<RESET);
+
+/* INT0 as input with pull-up */
+  DDRD &= ~(1<<0);
+  PORTD |= (1<<0);
+  EICRA |= (1<<ISC01);
+  EIFR |= (1<<INTF0);
+  EIMSK |= (1<<INT0);
+}
+
+void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
+{
+  if(CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR)
+    RESET_PORT &= ~(1<<RESET);
+  else
+    RESET_PORT |= (1<<RESET);
+}
+
+void EVENT_CDC_Device_BreakSent(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, const uint8_t Duration)
+{
+  SPI_CS_PORT ^= (1<<CS);
+}
+
+ISR(INT0_vect)
+{
+  SPI_CS_PORT &= ~(1<<CS);
+  led_on();
+
+  uint8_t ReceivedByte = SPI_ReceiveByte();
+  RingBuffer_Insert(&SPItoUSB_Buffer, ReceivedByte);
+
+  led_off();
+  SPI_CS_PORT |= (1<<CS);
+}
+
+void SPI_SendBuffer(void)
+{
+  SPI_CS_PORT &= ~(1<<CS);
+  led_on();
+
+  while(!(RingBuffer_IsEmpty(&USBtoSPI_Buffer))) {
+    SPI_SendByte(RingBuffer_Remove(&USBtoSPI_Buffer));
+  }
+
+  led_off();
+  SPI_CS_PORT |= (1<<CS);
+}
+
+int main(void)
+{
+  SetupHardware();
+
+  RingBuffer_InitBuffer(&USBtoSPI_Buffer, USBtoSPI_Buffer_Data, sizeof(USBtoSPI_Buffer_Data));
+  RingBuffer_InitBuffer(&SPItoUSB_Buffer, SPItoUSB_Buffer_Data, sizeof(SPItoUSB_Buffer_Data));
+
+  sei();
+
+  for (;;) {
+    int16_t BytesReceived = CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface);
+    while(BytesReceived > 0) {
+      if(!(RingBuffer_IsFull(&USBtoSPI_Buffer))) {
+        int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
+        if (!(ReceivedByte < 0))
+          RingBuffer_Insert(&USBtoSPI_Buffer, ReceivedByte);
+
+        BytesReceived--;
+      }
+    }
+
+    uint16_t BufferCount = RingBuffer_GetCount(&SPItoUSB_Buffer);
+    if ((TIFR0 & (1 << TOV0)) || (BufferCount > (uint8_t)(sizeof(SPItoUSB_Buffer_Data) * .75))) {
+      TIFR0 |= (1 << TOV0);
+      while (BufferCount--) {
+        if (CDC_Device_SendByte(&VirtualSerial_CDC_Interface,
+                                RingBuffer_Peek(&SPItoUSB_Buffer)) != ENDPOINT_READYWAIT_NoError)
+          break;
+
+        RingBuffer_Remove(&SPItoUSB_Buffer);
+      }
+    }
+
+    if (!(RingBuffer_IsEmpty(&USBtoSPI_Buffer)))
+      SPI_SendBuffer();
+
+    CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
+    USB_USBTask();
+  }
+}