diff --git a/hardware/arduino/sam/firmwares/atmega16u2/Arduino-DUE-usbserial.hex b/hardware/arduino/sam/firmwares/atmega16u2/Arduino-DUE-usbserial.hex
new file mode 100644
index 000000000..2c219ff7c
--- /dev/null
+++ b/hardware/arduino/sam/firmwares/atmega16u2/Arduino-DUE-usbserial.hex
@@ -0,0 +1,274 @@
+:10000000A7C00000C0C00000BEC00000BCC000000F
+:10001000BAC00000B8C00000B6C00000B4C0000004
+:10002000B2C00000B0C00000AEC00000CBC40000F1
+:100030008FC40000A8C00000A6C00000A4C000003B
+:10004000A2C00000A0C000009EC000009CC0000034
+:100050009AC0000098C0000096C0000021C10000B6
+:1000600092C0000090C000008EC000008CC0000054
+:100070008AC0000088C0000086C0000084C0000064
+:1000800082C0000080C000007EC000007CC0000074
+:100090007AC0000078C000001201100102000008C0
+:1000A00041233D0001000102DC0109023E00020182
+:1000B00000C0320904000001020201000524000111
+:1000C0001004240206052406000107058203080027
+:1000D000FF09040100020A000000070504024000B5
+:1000E00001070583024000010403090432034100B3
+:1000F00072006400750069006E006F002000280027
+:100100007700770077002E006100720064007500B0
+:1001100069006E006F002E0063006300290000007C
+:100120002E03410072006400750069006E006F00CC
+:1001300020004400750065002000500072006F0030
+:1001400067002E00200050006F0072007400000055
+:1001500011241FBECFEFD2E0DEBFCDBF11E0A0E083
+:10016000B1E0E8EEF0E102C005900D92A831B107D0
+:10017000D9F712E0A8E1B1E001C01D92A833B107A0
+:10018000E1F722D1AFC73CCF9C01DC01AE57BF4F96
+:10019000ED91FC91119741911196FC93EE9380584B
+:1001A0009F4FE817F90711F42D933C939FB7F894EC
+:1001B000F901EC57FF4F8081815080839FBF842FCE
+:1001C0000895882311F03F9A01C03F9847980895F9
+:1001D000882311F046980895469A0895DF92EF9289
+:1001E000FF920F931F93FC018489813019F08230B4
+:1001F00019F404C010E303C010E001C010E28389C9
+:10020000823009F418608589873031F0883031F008
+:10021000863029F4126003C0146001C01660109289
+:10022000C9001092C8001092CA000785F088E188C2
+:10023000D288202F3F2D4E2D5D2D10921E01203B88
+:1002400084E0380780E0480780E0580719F481E02F
+:1002500080931E01CA01B90122E030E040E050E085
+:1002600026D720583B47414E5F4FCA01B901202F86
+:100270003F2D4E2D5D2DF9D6215030403093CD00CD
+:100280002093CC001093CA0082E08093C80088E9D4
+:100290008093C9001F910F91FF90EF90DF90089518
+:1002A0001F920F920FB60F9211242F938F939F934B
+:1002B000EF93FF939091CE008EB38430F1F4E091F0
+:1002C000A201F091A3019083E091A201F091A3011A
+:1002D000CF0101969093A3018093A201825A91408D
+:1002E00021F482E291E0928381839FB7F894809118
+:1002F000A6018F5F8093A6019FBFFF91EF919F9111
+:100300008F912F910F900FBE0F901F901895FC01A9
+:1003100040911A0140931B0180911C0180931D01A3
+:100320008585282F30E02170307020931A01858553
+:1003300090E096958795817080931C0180911E01B5
+:10034000882339F08FE590E090931901809318018C
+:100350000895442341F4222331F08EE190E09093FC
+:10036000190180931801089580E091E014C680E09F
+:1003700091E0C7C51F9384B7877F84BF18E10FB68C
+:10038000F89410936000109260000FBE80E019DFB7
+:10039000469A3E9A87E690E09093CD008093CC00F9
+:1003A00086E08093CA001092C8001093C900539A47
+:1003B0005A9A8AB180638AB98BB180638BB9BDD2F6
+:1003C00084E085BD1F9108950F931F93CF93DF9312
+:1003D000D1DF2FB7F89487EA91E0909328028093B9
+:1003E000270290932A02809329022FBF2FB7F894F7
+:1003F00082E291E09093A3018093A2019093A501E2
+:100400008093A4012FBF7894C7EAD1E003E08FB7AF
+:10041000F89490912B028FBF903809F180E091E021
+:10042000E6D497FD1CC0E0912702F091280280835A
+:10043000E0912702F0912802CF01019690932802C3
+:10044000809327028752924011F4D283C1839FB7D1
+:10045000F89480912B028F5F80932B029FBF8FB700
+:10046000F8941091A6018FBFA89903C0113608F423
+:1004700069C0A89A8091A601882361F05D980093D5
+:100480001F0108C082E291E07FDE682F80E091E0EA
+:1004900014D511501123B1F780911F01882351F019
+:1004A00080911F01815080931F0180911F0188233B
+:1004B00009F45D9A80912001882351F080912001F8
+:1004C00081508093200180912001882309F45C9A57
+:1004D0008091180190911901181619067CF58F3535
+:1004E000910521F481E074DE80E06BDE80911801DB
+:1004F00090911901839721F480E06ADE80E061DE4B
+:100500008091180190911901499721F480E060DEF3
+:1005100081E057DE8091180190911901019721F433
+:1005200080E056DE80E04DDE809118019091190147
+:100530000197909319018093180104C080E048DE70
+:1005400080E03FDE8FB7F89490912B028FBF992304
+:1005500069F087EA91E018DE982F8091C80085FF46
+:10056000FCCF9093CE005C980093200180E091E056
+:1005700095D42AD44CCFDA01923049F0933061F00F
+:100580009130F9F4E8E9F0E022E130E01EC0EAEA57
+:10059000F0E02EE330E019C0813049F0813018F0EE
+:1005A000823079F408C0E8EEF0E0849107C0ECEE08
+:1005B000F0E0849103C0E0E2F1E08491282F30E084
+:1005C00004C0E0E0F0E020E030E0ED93FC93C901EE
+:1005D000089528E030E040E003C04F5F220F331F52
+:1005E00028173907D0F3842F8295807F0895809350
+:1005F000E9008091EB0081608093EB001092ED00A8
+:100600006093EC004093ED008091EE00881F8827F6
+:10061000881F08951092F40090E09093E9001092E2
+:10062000F0001092E8001092ED008091EB008E7FB8
+:100630008093EB009F5F953081F7089580913002A1
+:1006400088238CF403C08EB38823B1F08091E80036
+:1006500082FFF9CF8091E8008B778093E8000895BE
+:100660008EB3882349F08091E80080FFF9CF809114
+:10067000E8008E778093E800089594E68091EC007E
+:1006800080FF05C08091E80080FF05C023C08091F5
+:10069000E80082FD1FC08EB3882311F482E0089524
+:1006A0008EB3853011F483E008958091EB0085FFCF
+:1006B00002C081E008958091E10082FFDFCF809148
+:1006C000E1008B7F8093E100992311F484E0089589
+:1006D0009150D4CF80E008959C0140913602509112
+:1006E00037024617570718F4F90120E038C06115A2
+:1006F000710511F0AB01F8CF8091E8008E778093FF
+:10070000E80040E050E0F0CF8091E80083FF02C0B5
+:1007100081E008958091E80082FD2DC08EB388238A
+:1007200081F18EB3853079F18091E80080FF17C0A8
+:100730009091F20006C081918093F10041505040A9
+:100740009F5F4115510511F09830A8F320E09830D3
+:1007500009F421E08091E8008E778093E80041154C
+:10076000510591F6222381F606C08EB3882349F005
+:100770008EB3853041F08091E80082FFF6CF80E0B3
+:10078000089582E0089583E008959C014091360227
+:10079000509137024617570710F490E03BC061159F
+:1007A000710511F0AB01F9CF8091E8008E7780934D
+:1007B000E80040E050E0F1CF8091E80083FF02C004
+:1007C00081E008958091E80082FD30C08EB38823D7
+:1007D00099F18EB3853091F18091E80080FF1AC0C5
+:1007E0008091F20009C0F9012F5F3F4FE491E0933F
+:1007F000F100415050408F5F4115510511F0883094
+:1008000090F390E0883009F491E08091E8008E77D1
+:100810008093E8004115510579F6992369F606C0E1
+:100820008EB3882349F08EB3853041F08091E80083
+:1008300082FFF6CF80E0089582E0089583E0089576
+:100840009C016115710529F48091E8008B778093F4
+:10085000E800F90120C08091E80083FF02C081E038
+:1008600008958EB3882339F18EB3853031F18091AC
+:10087000E80082FFF0CF06C08091F10081936150C3
+:10088000704021F08091F2008823B1F78091E80058
+:100890008B778093E80061157105E9F606C08EB389
+:1008A000882349F08EB3853041F08091E80080FFC5
+:1008B000F6CF80E0089582E0089583E0089542D065
+:1008C00044D01EBA10922E0210922D0210922C02C9
+:1008D00084E089BD89B5826089BD09B400FEFDCF81
+:1008E0008091D800982F9F779093D800806880934C
+:1008F000D800809163008E7F809363008091D80040
+:100900008F7D8093D8008091E0008E7F8093E000FF
+:100910008091E1008E7F8093E1008091E200816010
+:100920008093E2008091E100877F8093E1008091D5
+:10093000E20088608093E2000895C1DF81E0809347
+:100940002F0208951092E20008951092E100089598
+:100950001F920F920FB60F9211241F932F933F9364
+:100960004F935F936F937F938F939F93AF93BF93B7
+:10097000EF93FF93E9EEF0E0108117701082E0EF43
+:10098000F0E08081877F80837894C3D0F894A9EECB
+:10099000B0E01C92E0EFF0E08081886080831C93DF
+:1009A000FF91EF91BF91AF919F918F917F916F9147
+:1009B0005F914F913F912F911F910F900FBE0F901C
+:1009C0001F9018951F920F920FB60F9211242F931C
+:1009D0003F934F935F936F937F938F939F93AF93C7
+:1009E000BF93EF93FF938091E10080FF1BC0809144
+:1009F000E20080FF17C08091E1008E7F8093E100CC
+:100A00008091E2008E7F8093E2008091E20080611D
+:100A10008093E2008091D80080628093D80019BC56
+:100A20001EBAD1D18091E10084FF29C08091E200FB
+:100A300084FF25C084E089BD89B5826089BD09B481
+:100A400000FEFDCF8091D8008F7D8093D8008091EB
+:100A5000E1008F7E8093E1008091E2008F7E8093A1
+:100A6000E2008091E20081608093E20080912E029A
+:100A7000882311F481E001C084E08EBBA4D1809171
+:100A8000E10083FF27C08091E20083FF23C08091B3
+:100A9000E100877F8093E10082E08EBB10922E02FE
+:100AA0008091E1008E7F8093E1008091E2008E7F53
+:100AB0008093E2008091E20080618093E200AADDF1
+:100AC00080E060E042E093DD8091F00088608093F8
+:100AD000F00079D18091E10082FF0AC08091E200AC
+:100AE00082FF06C08091E1008B7F8093E1006BD193
+:100AF000FF91EF91BF91AF919F918F917F916F91F6
+:100B00005F914F913F912F910F900FBE0F901F90CB
+:100B100018951F93DF93CF93CDB7DEB7AC970FB681
+:100B2000F894DEBF0FBECDBFE0E3F2E08091F100AC
+:100B3000819322E0E833F207C9F7809130023091C7
+:100B40003102353009F487C0363040F43130C9F114
+:100B5000313070F0333009F01DC133C0383009F442
+:100B6000EFC0393009F4FEC0363009F013C192C02D
+:100B7000803821F0823809F00DC108C090912C0214
+:100B800080912D02882399F0926011C080913402E7
+:100B900087708093E9008091EB0090E025E09695C6
+:100BA00087952A95E1F7982F91701092E90080912E
+:100BB000E800877F8093E8009093F1001092F100A5
+:100BC000CAC0882319F0823009F0E4C090E08F7128
+:100BD0009070009721F0029709F0DDC00CC0809161
+:100BE0003202813009F0D7C010922D02333069F5FE
+:100BF00080932D022AC080913202882331F5209102
+:100C00003402277009F4C7C02093E9008091EB00FB
+:100C100080FFC1C0333021F48091EB00806213C0AB
+:100C20008091EB0080618093EB0081E090E002C056
+:100C3000880F991F2A95E2F78093EA001092EA0044
+:100C40008091EB0088608093EB001092E900809126
+:100C5000E800877F83C0882309F09CC0109132028E
+:100C60008091E800877F8093E800E8DC04C08EB3C1
+:100C7000882309F490C08091E80080FFF8CF812F8D
+:100C80008F7711F492E001C093E09EBB806880935F
+:100C9000E30081C08058823008F07CC0809132022D
+:100CA0009091330223E08C3D920799F55FB7F89459
+:100CB000DE0115964EE020E030E061E2E42FF0E046
+:100CC00060935700849120FF03C082958F704F5F1F
+:100CD000982F9F70892F805D8A3308F0895F8C93ED
+:100CE00011961C9211972F5F3F4F129624313105B8
+:100CF00029F75FBF8AE28B8383E08C838091E800D1
+:100D0000877F8093E800CE0103966AE270E0E4DC1E
+:100D100011C060913402AE014F5F5F4F2CDCBC010B
+:100D20000097C9F18091E800877F8093E80089816E
+:100D30009A812BDD8091E8008B778093E8002BC0AF
+:100D4000803841F58091E800877F8093E8008091AA
+:100D50002E028093F1008091E8008E778093E80066
+:100D60006DDC19C08823B1F490913202923098F46E
+:100D70008091E800877F8093E80090932E025EDCEC
+:100D800080912E02882311F483E001C084E08EBBA1
+:100D9000EEDA01C0E9DA8091E80083FF0AC08091B1
+:100DA000EB0080628093EB008091E800877F809366
+:100DB000E800AC960FB6F894DEBF0FBECDBFCF9162
+:100DC000DF911F91089508951F938EB3882361F0DA
+:100DD0001091E9001092E9008091E80083FF01C0C2
+:100DE00098DE17701093E9001F9108950895FC0193
+:100DF0008EB3843021F587859089A189B2890097C7
+:100E0000A105B105E1F085818093E9008091E800BA
+:100E100082FF15C08091F200882319F42FEF3FEF75
+:100E200004C08091F100282F30E08091F2008823E7
+:100E300041F48091E8008B778093E80002C02FEFA7
+:100E40003FEFC9010895FC018EB3843011F5878509
+:100E50009089A189B2890097A105B105D1F081815E
+:100E60008093E9008091F2008823A9F09091E80036
+:100E70008091E8008E778093E80095FD0CC0FDDB43
+:100E8000982F882349F48091E8008E778093E800BA
+:100E900003C092E001C090E0892F0895FC018EB359
+:100EA000843051F487859089A189B2890097A10582
+:100EB000B10511F0CF01C7CF08951F93FC01162F84
+:100EC0008EB38430D9F487859089A189B28900973F
+:100ED000A105B10599F081818093E9008091E80036
+:100EE00085FD08C08091E8008E778093E800C5DB1F
+:100EF000882329F41093F10080E001C082E01F9163
+:100F000008950F931F93CF93DF93EC010D96FC018F
+:100F100089E0DF011D928A95E9F72A813B810981E9
+:100F20008C81882311F410E001C014E0C90151DB69
+:100F3000182B1260802F61E8412F59DB882329F19B
+:100F40002E813F810D818885882311F410E001C036
+:100F500014E0C9013EDB182B1260802F60E8412F9E
+:100F600046DB882391F02A853B8509858C8588237B
+:100F700011F410E001C014E0C9012BDB182B126042
+:100F8000802F61EC412F33DB01C080E0DF91CF91F6
+:100F90001F910F910895CF93DF93EC018091E800AA
+:100FA00083FF60C0888190E0209134023091350247
+:100FB0002817390709F056C080913102813261F05B
+:100FC000823220F4803209F04DC019C0823269F1BA
+:100FD000833209F047C038C080913002813A09F06D
+:100FE00041C08091E800877F8093E800CE010F9692
+:100FF00067E070E071DB8091E8008B7713C080912F
+:101000003002813279F58091E800877F8093E80093
+:10101000CE010F9667E070E013DCCE01DFD880913F
+:10102000E8008E778093E8001DC080913002813205
+:10103000C9F48091E800877F8093E80080913202B4
+:101040008D87CE0164D90DC080913002813251F478
+:101050008091E800877F8093E800CE0160913202A2
+:10106000C5DEECDADF91CF910895A1E21A2EAA1B1A
+:10107000BB1BFD010DC0AA1FBB1FEE1FFF1FA21748
+:10108000B307E407F50720F0A21BB30BE40BF50B45
+:10109000661F771F881F991F1A9469F760957095CE
+:1010A000809590959B01AC01BD01CF01089597FB00
+:1010B000092E05260ED057FD04D0D7DF0AD0001C1C
+:1010C00038F450954095309521953F4F4F4F5F4FE5
+:1010D0000895F6F790958095709561957F4F8F4FA5
+:0810E0009F4F0895F894FFCF23
+:1010E8000003400000044000000208000000000067
+:0810F8000000000000001400DC
+:00000001FF
diff --git a/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Arduino-usbserial.c b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Arduino-usbserial.c
new file mode 100644
index 000000000..598e0c974
--- /dev/null
+++ b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Arduino-usbserial.c
@@ -0,0 +1,312 @@
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2010.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2010  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 Arduino-usbserial project. This file contains the main tasks of
+ *  the project and is responsible for the initial application hardware configuration.
+ */
+
+#include "Arduino-usbserial.h"
+
+/** Circular buffer to hold data from the host before it is sent to the device via the serial port. */
+RingBuff_t USBtoUSART_Buffer;
+
+/** Circular buffer to hold data from the serial port before it is sent to the host. */
+RingBuff_t USARTtoUSB_Buffer;
+
+/** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
+volatile struct
+{
+	uint8_t TxLEDPulse; /**< Milliseconds remaining for data Tx LED pulse */
+	uint8_t RxLEDPulse; /**< Milliseconds remaining for data Rx LED pulse */
+	uint8_t PingPongLEDPulse; /**< Milliseconds remaining for enumeration Tx/Rx ping-pong LED pulse */
+} PulseMSRemaining;
+
+/** 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,
+			},
+	};
+
+int ResetTimer = 0;
+int tries = 20;
+bool CurrentDTRState = false;
+bool PreviousDTRState = false;
+bool CurrentRTSState = false;
+bool PreviousRTSState = false;
+bool Selected1200BPS = false;
+
+void setResetPin(bool v) {
+	/* Target /RESET line  */
+	if (v) {
+		/* ACTIVE   => OUTPUT LOW (0v on target /RESET) */
+		AVR_RESET_LINE_DDR  |= AVR_RESET_LINE_MASK;
+		AVR_RESET_LINE_PORT &= ~AVR_RESET_LINE_MASK;
+		//LEDs_TurnOnLEDs(LEDMASK_RX);
+	} else {
+	 	/* INACTIVE => set as INPUT (internal pullup on target /RESET keep it at 3.3v) */
+		AVR_RESET_LINE_DDR  &= ~AVR_RESET_LINE_MASK;
+		AVR_RESET_LINE_PORT &= ~AVR_RESET_LINE_MASK;
+		//LEDs_TurnOffLEDs(LEDMASK_RX);
+	}
+}
+
+void setErasePin(bool v) {
+	if (v) {
+		AVR_ERASE_LINE_PORT &= ~AVR_ERASE_LINE_MASK;
+		//LEDs_TurnOnLEDs(LEDMASK_TX);
+	} else {
+		AVR_ERASE_LINE_PORT |= AVR_ERASE_LINE_MASK;
+		//LEDs_TurnOffLEDs(LEDMASK_TX);
+	}
+}
+
+
+/** 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);
+	RingBuffer_InitBuffer(&USARTtoUSB_Buffer);
+
+	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
+		RingBuff_Count_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);
+		if ((TIFR0 & (1 << TOV0)) || (BufferCount > BUFFER_NEARLY_FULL))
+		{
+			TIFR0 |= (1 << TOV0);
+
+			if (USARTtoUSB_Buffer.Count) {
+				LEDs_TurnOnLEDs(LEDMASK_TX);
+				PulseMSRemaining.TxLEDPulse = TX_RX_LED_PULSE_MS;
+			}
+
+			// Read bytes from the USART receive buffer into the USB IN endpoint
+			while (BufferCount--)
+			  CDC_Device_SendByte(&VirtualSerial_CDC_Interface, RingBuffer_Remove(&USARTtoUSB_Buffer));
+			  
+			// Turn off TX LED(s) once the TX pulse period has elapsed
+			if (PulseMSRemaining.TxLEDPulse && !(--PulseMSRemaining.TxLEDPulse))
+			  LEDs_TurnOffLEDs(LEDMASK_TX);
+
+			// Turn off RX LED(s) once the RX pulse period has elapsed
+			if (PulseMSRemaining.RxLEDPulse && !(--PulseMSRemaining.RxLEDPulse))
+			  LEDs_TurnOffLEDs(LEDMASK_RX);
+
+			if (ResetTimer > 0)
+			{
+				// SAM3X RESET/ERASE Sequence
+				// --------------------------
+				if (ResetTimer == 95) {
+					setErasePin(true);
+					setResetPin(false);
+				}
+				if (ResetTimer == 35) {
+					setErasePin(false);
+					setResetPin(false);
+				}
+				if (ResetTimer == 25) {
+					setErasePin(false);
+					setResetPin(true);
+				}
+				if (ResetTimer == 1) {
+					setErasePin(false);
+					setResetPin(false);
+				}
+				ResetTimer--;
+			} else {
+				setErasePin(false);
+				setResetPin(false);
+			}
+		}
+		
+		// Load the next byte from the USART transmit buffer into the USART
+		if (!(RingBuffer_IsEmpty(&USBtoUSART_Buffer))) {
+			Serial_TxByte(RingBuffer_Remove(&USBtoUSART_Buffer));
+			LEDs_TurnOnLEDs(LEDMASK_RX);
+			PulseMSRemaining.RxLEDPulse = TX_RX_LED_PULSE_MS;
+		}
+		
+		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();
+
+	setResetPin(false);
+
+	/* Target /ERASE line is active HIGH: there is a mosfet that inverts logic */
+	AVR_ERASE_LINE_PORT |= AVR_ERASE_LINE_MASK;
+	AVR_ERASE_LINE_DDR  |= AVR_ERASE_LINE_MASK;	
+
+	/* Hardware Initialization */
+	Serial_Init(9600, false);
+	LEDs_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 Configuration Changed event. */
+void EVENT_USB_Device_ConfigurationChanged(void)
+{
+	CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);
+}
+
+/** Event handler for the library USB Unhandled Control Request event. */
+void EVENT_USB_Device_UnhandledControlRequest(void)
+{
+	CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);
+}
+
+/** 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;
+
+	long bps = CDCInterfaceInfo->State.LineEncoding.BaudRateBPS;
+	Selected1200BPS = (bps == 1200);
+
+	UBRR1  = SERIAL_2X_UBBRVAL(bps);
+	UCSR1C = ConfigMask;
+	UCSR1A = (1 << U2X1);
+	UCSR1B = (1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1);
+}
+
+/** 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 Host-to-Device Line Encoding Changed event.
+ *
+ *  \param[in] CDCInterfaceInfo  Pointer to the CDC class interface configuration structure being referenced
+ */
+void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
+{
+	PreviousDTRState = CurrentDTRState;
+	PreviousRTSState = CurrentRTSState;
+	CurrentDTRState = (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR);
+	CurrentRTSState = (CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_RTS);
+
+	if (Selected1200BPS) {
+		/* Start Erase / Reset procedure when receiving the magic "1200" baudrate */
+		ResetTimer = 95;
+	} else if (!PreviousDTRState && CurrentDTRState) {
+		/* Reset on rising edge of DTR */
+		ResetTimer = 30;
+	}
+}
+
diff --git a/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Arduino-usbserial.h b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Arduino-usbserial.h
new file mode 100644
index 000000000..99fde3914
--- /dev/null
+++ b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Arduino-usbserial.h
@@ -0,0 +1,79 @@
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2010.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2010  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 Arduino-usbserial.c.
+ */
+
+#ifndef _ARDUINO_USBSERIAL_H_
+#define _ARDUINO_USBSERIAL_H_
+
+	/* Includes: */
+		#include <avr/io.h>
+		#include <avr/wdt.h>
+		#include <avr/interrupt.h>
+		#include <avr/power.h>
+
+		#include "Descriptors.h"
+
+		#include "Lib/LightweightRingBuff.h"
+
+		#include <LUFA/Version.h>
+		#include <LUFA/Drivers/Board/LEDs.h>
+		#include <LUFA/Drivers/Peripheral/Serial.h>
+		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Drivers/USB/Class/CDC.h>
+		
+	/* Macros: */
+		/** LED mask for the library LED driver, to indicate TX activity. */
+		#define LEDMASK_TX               LEDS_LED1
+
+		/** LED mask for the library LED driver, to indicate RX activity. */
+		#define LEDMASK_RX               LEDS_LED2
+		
+		/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
+		#define LEDMASK_ERROR            (LEDS_LED1 | LEDS_LED2)
+		
+		/** LED mask for the library LED driver, to indicate that the USB interface is busy. */
+		#define LEDMASK_BUSY             (LEDS_LED1 | LEDS_LED2)		
+		
+	/* 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_UnhandledControlRequest(void);
+		
+		void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
+		void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);		
+
+#endif /* _ARDUINO_USBSERIAL_H_ */
diff --git a/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Board/LEDs.h b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Board/LEDs.h
new file mode 100644
index 000000000..152e8f571
--- /dev/null
+++ b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Board/LEDs.h
@@ -0,0 +1,110 @@
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2010.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2010  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.
+*/
+
+/*
+   Board LEDs driver for the Benito board, from www.dorkbotpdx.org.
+*/
+
+#ifndef __LEDS_ARDUINOUNO_H__
+#define __LEDS_ARDUINOUNO_H__
+
+	/* Includes: */
+		#include <avr/io.h>
+
+/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
+	/* Preprocessor Checks: */
+		#if !defined(INCLUDE_FROM_LEDS_H)
+			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
+		#endif
+
+	/* Public Interface - May be used in end-application: */
+		/* Macros: */
+			/** LED mask for the first LED on the board. */
+			#define LEDS_LED1        (1 << 5)
+
+			/** LED mask for the second LED on the board. */
+			#define LEDS_LED2        (1 << 4)
+
+			/** LED mask for all the LEDs on the board. */
+			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2)
+
+			/** LED mask for the none of the board LEDs */
+			#define LEDS_NO_LEDS     0
+
+		/* Inline Functions: */
+		#if !defined(__DOXYGEN__)
+			static inline void LEDs_Init(void)
+			{
+				DDRD  |= LEDS_ALL_LEDS;
+				PORTD |= LEDS_ALL_LEDS;
+			}
+			
+			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
+			{
+				PORTD &= ~LEDMask;
+			}
+
+			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
+			{
+				PORTD |= LEDMask;
+			}
+
+			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
+			{
+				PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask);
+			}
+			
+			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask)
+			{
+				PORTD = ((PORTD | ActiveMask) & ~LEDMask);
+			}
+
+			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
+			{
+				PORTD ^= LEDMask;
+			}
+			
+			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
+			static inline uint8_t LEDs_GetLEDs(void)
+			{
+				return (PORTD & LEDS_ALL_LEDS);
+			}
+		#endif
+
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+		
+#endif
diff --git a/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Descriptors.c b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Descriptors.c
new file mode 100644
index 000000000..658508c6e
--- /dev/null
+++ b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Descriptors.c
@@ -0,0 +1,281 @@
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2010.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2010  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 "Descriptors.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.
+ */
+USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
+{
+	.Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
+		
+	.USBSpecification       = VERSION_BCD(01.10),
+	.Class                  = 0x02,
+	.SubClass               = 0x00,
+	.Protocol               = 0x00,
+				
+	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
+		
+	.VendorID               = 0x2341, // Arduino
+	.ProductID          	= 0x003D, // Arduino Due on board USB2Serial
+
+	.ReleaseNumber          = 0x0001,
+		
+	.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.
+ */
+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_BUSPOWERED | 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                  = 0x02,
+			.SubClass               = 0x02,
+			.Protocol               = 0x01,
+				
+			.InterfaceStrIndex      = NO_DESCRIPTOR
+		},
+
+	.CDC_Functional_IntHeader = 
+		{
+			.Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
+			.SubType                = 0x00,
+			
+			.Data                   = {0x01, 0x10}
+		},
+
+	.CDC_Functional_AbstractControlManagement = 
+		{
+			.Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},
+			.SubType                = 0x02,
+			
+			.Data                   = {0x06}
+		},
+		
+	.CDC_Functional_Union = 
+		{
+			.Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
+			.SubType                = 0x06,
+			
+			.Data                   = {0x00, 0x01}
+		},
+
+	.CDC_NotificationEndpoint = 
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+			
+			.EndpointAddress        = (ENDPOINT_DESCRIPTOR_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                  = 0x0A,
+			.SubClass               = 0x00,
+			.Protocol               = 0x00,
+				
+			.InterfaceStrIndex      = NO_DESCRIPTOR
+		},
+
+	.CDC_DataOutEndpoint = 
+		{
+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+			
+			.EndpointAddress        = (ENDPOINT_DESCRIPTOR_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_DESCRIPTOR_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.
+ */
+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.
+ */
+USB_Descriptor_String_t PROGMEM ManufacturerString =
+{
+	.Header                 = {.Size = USB_STRING_LEN(24), .Type = DTYPE_String},
+		
+	.UnicodeString          = L"Arduino (www.arduino.cc)"
+};
+
+/** 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.
+ */
+USB_Descriptor_String_t PROGMEM ProductString =
+{
+	#if (ARDUINO_MODEL_PID == ARDUINO_UNO_PID)
+		.Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
+			
+		.UnicodeString          = L"Arduino Uno"
+	#elif (ARDUINO_MODEL_PID == ARDUINO_DUE_PID)
+		.Header                 = {.Size = USB_STRING_LEN(22), .Type = DTYPE_String},
+			
+		.UnicodeString          = L"Arduino Due Prog. Port"
+	#elif (ARDUINO_MODEL_PID == ARDUINO_MEGA2560_PID)
+		.Header                 = {.Size = USB_STRING_LEN(17), .Type = DTYPE_String},
+			
+		.UnicodeString          = L"Arduino Mega 2560"
+	#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,
+                                    void** const DescriptorAddress)
+{
+	const uint8_t  DescriptorType   = (wValue >> 8);
+	const uint8_t  DescriptorNumber = (wValue & 0xFF);
+
+	void*    Address = NULL;
+	uint16_t Size    = NO_DESCRIPTOR;
+
+	switch (DescriptorType)
+	{
+		case DTYPE_Device: 
+			Address = (void*)&DeviceDescriptor;
+			Size    = sizeof(USB_Descriptor_Device_t);
+			break;
+		case DTYPE_Configuration: 
+			Address = (void*)&ConfigurationDescriptor;
+			Size    = sizeof(USB_Descriptor_Configuration_t);
+			break;
+		case DTYPE_String: 
+			switch (DescriptorNumber)
+			{
+				case 0x00: 
+					Address = (void*)&LanguageString;
+					Size    = pgm_read_byte(&LanguageString.Header.Size);
+					break;
+				case 0x01: 
+					Address = (void*)&ManufacturerString;
+					Size    = pgm_read_byte(&ManufacturerString.Header.Size);
+					break;
+				case 0x02: 
+					Address = (void*)&ProductString;
+					Size    = pgm_read_byte(&ProductString.Header.Size);
+					break;
+			}
+			
+			break;
+	}
+	
+	*DescriptorAddress = Address;
+	return Size;
+}
diff --git a/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Descriptors.h b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Descriptors.h
new file mode 100644
index 000000000..69e4b6799
--- /dev/null
+++ b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Descriptors.h
@@ -0,0 +1,89 @@
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2010.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2010  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>
+		#include <LUFA/Drivers/USB/Class/CDC.h>
+		
+	/* Product-specific definitions: */
+		#define ARDUINO_UNO_PID				0x0001
+		#define ARDUINO_DUE_PID				0x003D
+		#define ARDUINO_MEGA2560_PID		0x0010
+
+	/* 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                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;
+			USB_Descriptor_Interface_t               CDC_CCI_Interface;
+			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_IntHeader;
+			CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;
+			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;
+			USB_Descriptor_Endpoint_t                CDC_NotificationEndpoint;
+			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,
+		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+
+#endif
diff --git a/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Lib/LightweightRingBuff.h b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Lib/LightweightRingBuff.h
new file mode 100644
index 000000000..fb48c1f73
--- /dev/null
+++ b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/Lib/LightweightRingBuff.h
@@ -0,0 +1,197 @@
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2010.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2010  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
+ *
+ *  Ultra lightweight ring buffer, for fast insertion/deletion.
+ */
+ 
+#ifndef _ULW_RING_BUFF_H_
+#define _ULW_RING_BUFF_H_
+
+	/* Includes: */
+		#include <util/atomic.h>
+	
+		#include <stdint.h>
+		#include <stdbool.h>
+
+	/* Defines: */
+		/** Size of each ring buffer, in data elements - must be between 1 and 255. */
+		#define BUFFER_SIZE         128
+		
+		/** Maximum number of data elements to buffer before forcing a flush. 
+		 *  Must be less than BUFFER_SIZE
+		 */
+		#define BUFFER_NEARLY_FULL	96
+		
+		/** Type of data to store into the buffer. */
+		#define RingBuff_Data_t     uint8_t
+
+		/** Datatype which may be used to store the count of data stored in a buffer, retrieved
+		 *  via a call to \ref RingBuffer_GetCount().
+		 */
+		#if (BUFFER_SIZE <= 0xFF)
+			#define RingBuff_Count_t   uint8_t
+		#else
+			#define RingBuff_Count_t   uint16_t
+		#endif
+
+	/* Type Defines: */
+		/** Type define for a new ring buffer object. Buffers should be initialized via a call to
+		 *  \ref RingBuffer_InitBuffer() before use.
+		 */
+		typedef struct
+		{
+			RingBuff_Data_t  Buffer[BUFFER_SIZE]; /**< Internal ring buffer data, referenced by the buffer pointers. */
+			RingBuff_Data_t* In; /**< Current storage location in the circular buffer */
+			RingBuff_Data_t* Out; /**< Current retrieval location in the circular buffer */
+			RingBuff_Count_t Count;
+		} RingBuff_t;
+	
+	/* Inline Functions: */
+		/** Initializes a ring buffer ready for use. Buffers must be initialized via this function
+		 *  before any operations are called upon them. Already initialized buffers may be reset
+		 *  by re-initializing them using this function.
+		 *
+		 *  \param[out] Buffer  Pointer to a ring buffer structure to initialize
+		 */
+		static inline void RingBuffer_InitBuffer(RingBuff_t* const Buffer)
+		{
+			ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+			{
+				Buffer->In  = Buffer->Buffer;
+				Buffer->Out = Buffer->Buffer;
+			}
+		}
+		
+		/** Retrieves the minimum number of bytes stored in a particular buffer. This value is computed
+		 *  by entering an atomic lock on the buffer while the IN and OUT locations are fetched, so that
+		 *  the buffer cannot be modified while the computation takes place. This value should be cached
+		 *  when reading out the contents of the buffer, so that as small a time as possible is spent
+		 *  in an atomic lock.
+		 *
+		 *  \note The value returned by this function is guaranteed to only be the minimum number of bytes
+		 *        stored in the given buffer; this value may change as other threads write new data and so
+		 *        the returned number should be used only to determine how many successive reads may safely
+		 *        be performed on the buffer.
+		 *
+		 *  \param[in] Buffer  Pointer to a ring buffer structure whose count is to be computed
+		 */
+		static inline RingBuff_Count_t RingBuffer_GetCount(RingBuff_t* const Buffer)
+		{
+			RingBuff_Count_t Count;
+			
+			ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+			{
+				Count = Buffer->Count;
+			}
+			
+			return Count;
+		}
+		
+		/** Atomically determines if the specified ring buffer contains any free space. This should
+		 *  be tested before storing data to the buffer, to ensure that no data is lost due to a
+		 *  buffer overrun.
+		 *
+		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to insert into
+		 *
+		 *  \return Boolean true if the buffer contains no free space, false otherwise
+		 */		 
+		static inline bool RingBuffer_IsFull(RingBuff_t* const Buffer)
+		{
+			return (RingBuffer_GetCount(Buffer) == BUFFER_SIZE);
+		}
+
+		/** Atomically determines if the specified ring buffer contains any data. This should
+		 *  be tested before removing data from the buffer, to ensure that the buffer does not
+		 *  underflow.
+		 *
+		 *  If the data is to be removed in a loop, store the total number of bytes stored in the
+		 *  buffer (via a call to the \ref RingBuffer_GetCount() function) in a temporary variable
+		 *  to reduce the time spent in atomicity locks.
+		 *
+		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to insert into
+		 *
+		 *  \return Boolean true if the buffer contains no free space, false otherwise
+		 */		 
+		static inline bool RingBuffer_IsEmpty(RingBuff_t* const Buffer)
+		{
+			return (RingBuffer_GetCount(Buffer) == 0);
+		}
+
+		/** Inserts an element into the ring buffer.
+		 *
+		 *  \note Only one execution thread (main program thread or an ISR) may insert into a single buffer
+		 *        otherwise data corruption may occur. Insertion and removal may occur from different execution
+		 *        threads.
+		 *
+		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to insert into
+		 *  \param[in]     Data    Data element to insert into the buffer
+		 */
+		static inline void RingBuffer_Insert(RingBuff_t* const Buffer,
+		                                     const RingBuff_Data_t Data)
+		{
+			*Buffer->In = Data;
+			
+			if (++Buffer->In == &Buffer->Buffer[BUFFER_SIZE])
+			  Buffer->In = Buffer->Buffer;
+
+			ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+			{
+				Buffer->Count++;
+			}
+		}
+
+		/** Removes an element from the ring buffer.
+		 *
+		 *  \note Only one execution thread (main program thread or an ISR) may remove from a single buffer
+		 *        otherwise data corruption may occur. Insertion and removal may occur from different execution
+		 *        threads.
+		 *
+		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to retrieve from
+		 *
+		 *  \return Next data element stored in the buffer
+		 */
+		static inline RingBuff_Data_t RingBuffer_Remove(RingBuff_t* const Buffer)
+		{
+			RingBuff_Data_t Data = *Buffer->Out;
+			
+			if (++Buffer->Out == &Buffer->Buffer[BUFFER_SIZE])
+			  Buffer->Out = Buffer->Buffer;
+
+			ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+			{
+				Buffer->Count--;
+			}
+			
+			return Data;
+		}
+
+#endif
diff --git a/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/makefile b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/makefile
new file mode 100644
index 000000000..6899dd392
--- /dev/null
+++ b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/makefile
@@ -0,0 +1,792 @@
+# Hey Emacs, this is a -*- makefile -*-
+#----------------------------------------------------------------------------
+# WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al.
+#  >> Modified for use with the LUFA project. <<
+#
+# Released to the Public Domain
+#
+# Additional material for this makefile was written by:
+# Peter Fleury
+# Tim Henigan
+# Colin O'Flynn
+# Reiner Patommel
+# Markus Pfaff
+# Sander Pool
+# Frederik Rouleau
+# Carlos Lamas
+# Dean Camera
+# Opendous Inc.
+# Denver Gingerich
+#
+#----------------------------------------------------------------------------
+# On command line:
+#
+# make all = Make software.
+#
+# make clean = Clean out built project files.
+#
+# make coff = Convert ELF to AVR COFF.
+#
+# make extcoff = Convert ELF to AVR Extended COFF.
+#
+# make program = Download the hex file to the device, using avrdude.
+#                Please customize the avrdude settings below first!
+#
+# make dfu = Download the hex file to the device, using dfu-programmer (must
+#            have dfu-programmer installed).
+#
+# make flip = Download the hex file to the device, using Atmel FLIP (must
+#             have Atmel FLIP installed).
+#
+# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
+#               (must have dfu-programmer installed).
+#
+# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
+#                (must have Atmel FLIP installed).
+#
+# make doxygen = Generate DoxyGen documentation for the project (must have
+#                DoxyGen installed)
+#
+# make debug = Start either simulavr or avarice as specified for debugging, 
+#              with avr-gdb or avr-insight as the front end for debugging.
+#
+# make filename.s = Just compile filename.c into the assembler code only.
+#
+# make filename.i = Create a preprocessed source file for use in submitting
+#                   bug reports to the GCC project.
+#
+# To rebuild project do "make clean" then "make all".
+#----------------------------------------------------------------------------
+
+# MCU name(s)
+# 	Since the ATMEGA8U2 part is not directly supported by the current
+#	versions of either avrdude or dfu-programmer, we specify a dummy
+#	part; AT90USB82 which is close enough in memory size and organization
+
+#MCU = atmega8u2
+MCU = atmega16u2
+#MCU = atmega32u2
+
+# MCU_AVRDUDE = at90usb82
+# MCU_DFU = at90usb82
+MCU_AVRDUDE = $(MCU)
+MCU_DFU = $(MCU)
+
+# Specify the Arduino model using the assigned PID.  This is used by Descriptors.c
+#   to set PID and product descriptor string
+# Uno PID:
+#ARDUINO_MODEL_PID = 0x0001
+# Mega 2560 PID:
+#ARDUINO_MODEL_PID = 0x0010
+# Due PID:
+ARDUINO_MODEL_PID = 0x003D
+
+
+
+# Target board (see library "Board Types" documentation, NONE for projects not requiring
+# LUFA board drivers). If USER is selected, put custom board drivers in a directory called 
+# "Board" inside the application directory.
+BOARD  = USER
+
+
+# Processor frequency.
+#     This will define a symbol, F_CPU, in all source code files equal to the 
+#     processor frequency in Hz. You can then use this symbol in your source code to 
+#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+#     automatically to create a 32-bit value in your source code.
+#
+#     This will be an integer division of F_CLOCK below, as it is sourced by
+#     F_CLOCK after it has run through any CPU prescalers. Note that this value
+#     does not *change* the processor frequency - it should merely be updated to
+#     reflect the processor speed set externally so that the code can use accurate
+#     software delays.
+#F_CPU = 8000000
+F_CPU = 16000000
+
+
+# Input clock frequency.
+#     This will define a symbol, F_CLOCK, in all source code files equal to the 
+#     input clock frequency (before any prescaling is performed) in Hz. This value may
+#     differ from F_CPU if prescaling is used on the latter, and is required as the
+#     raw input clock is fed directly to the PLL sections of the AVR for high speed
+#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+#     at the end, this will be done automatically to create a 32-bit value in your
+#     source code.
+#
+#     If no clock division is performed on the input clock inside the AVR (via the
+#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+F_CLOCK = $(F_CPU)
+
+
+# Output format. (can be srec, ihex, binary)
+FORMAT = ihex
+
+
+# Target file name (without extension).
+TARGET = Arduino-usbserial
+
+
+# Object files directory
+#     To put object files in current directory, use a dot (.), do NOT make
+#     this an empty or blank macro!
+OBJDIR = .
+
+
+# Path to the LUFA library
+LUFA_PATH = ../..
+
+
+# LUFA library compile-time options
+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 INTERRUPT_CONTROL_ENDPOINT
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+
+
+# Create the LUFA source path variables by including the LUFA root makefile
+include $(LUFA_PATH)/LUFA/makefile
+
+
+# List C source files here. (C dependencies are automatically generated.)
+SRC = $(TARGET).c                                                 \
+	  Descriptors.c                                               \
+	  $(LUFA_SRC_USB)                                             \
+	  $(LUFA_SRC_USBCLASS)										  \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Device.c			  \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/HostStandardReq.c	  \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \
+ 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \
+ 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/USBController.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/USBInterrupt.c       \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/CDC.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/CDC.c              
+
+
+# List C++ source files here. (C dependencies are automatically generated.)
+CPPSRC = 
+
+
+# List Assembler source files here.
+#     Make them always end in a capital .S.  Files ending in a lowercase .s
+#     will not be considered source files but generated files (assembler
+#     output from the compiler), and will be deleted upon "make clean"!
+#     Even though the DOS/Win* filesystem matches both .s and .S the same,
+#     it will preserve the spelling of the filenames, and gcc itself does
+#     care about how the name is spelled on its command-line.
+ASRC =
+
+
+# Optimization level, can be [0, 1, 2, 3, s]. 
+#     0 = turn off optimization. s = optimize for size.
+#     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
+OPT = s
+
+
+# Debugging format.
+#     Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.
+#     AVR Studio 4.10 requires dwarf-2.
+#     AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.
+DEBUG = dwarf-2
+
+
+# List any extra directories to look for include files here.
+#     Each directory must be seperated by a space.
+#     Use forward slashes for directory separators.
+#     For a directory that has spaces, enclose it in quotes.
+EXTRAINCDIRS = $(LUFA_PATH)/
+
+
+# Compiler flag to set the C Standard level.
+#     c89   = "ANSI" C
+#     gnu89 = c89 plus GCC extensions
+#     c99   = ISO C99 standard (not yet fully implemented)
+#     gnu99 = c99 plus GCC extensions
+CSTANDARD = -std=gnu99
+
+
+# Place -D or -U options here for C sources
+CDEFS  = -DF_CPU=$(F_CPU)UL 
+CDEFS += -DF_CLOCK=$(F_CLOCK)UL 
+CDEFS += -DARDUINO_MODEL_PID=$(ARDUINO_MODEL_PID)
+CDEFS += -DBOARD=BOARD_$(BOARD) 
+CDEFS += $(LUFA_OPTS)
+
+CDEFS += -DAVR_RESET_LINE_PORT="PORTC"
+CDEFS += -DAVR_RESET_LINE_DDR="DDRC"
+CDEFS += -DAVR_RESET_LINE_MASK="(1 << 7)"
+
+CDEFS += -DAVR_ERASE_LINE_PORT="PORTC"
+CDEFS += -DAVR_ERASE_LINE_DDR="DDRC"
+CDEFS += -DAVR_ERASE_LINE_MASK="(1 << 6)"
+
+CDEFS += -DTX_RX_LED_PULSE_MS=3
+CDEFS += -DPING_PONG_LED_PULSE_MS=100
+
+# Place -D or -U options here for ASM sources
+ADEFS  = -DF_CPU=$(F_CPU)
+ADEFS += -DF_CLOCK=$(F_CLOCK)UL
+ADEFS += -DBOARD=BOARD_$(BOARD)
+ADEFS += $(LUFA_OPTS)
+
+# Place -D or -U options here for C++ sources
+CPPDEFS  = -DF_CPU=$(F_CPU)UL
+CPPDEFS += -DF_CLOCK=$(F_CLOCK)UL
+CPPDEFS += -DBOARD=BOARD_$(BOARD)
+CPPDEFS += $(LUFA_OPTS)
+#CPPDEFS += -D__STDC_LIMIT_MACROS
+#CPPDEFS += -D__STDC_CONSTANT_MACROS
+
+
+
+#---------------- Compiler Options C ----------------
+#  -g*:          generate debugging information
+#  -O*:          optimization level
+#  -f...:        tuning, see GCC manual and avr-libc documentation
+#  -Wall...:     warning level
+#  -Wa,...:      tell GCC to pass this to the assembler.
+#    -adhlns...: create assembler listing
+CFLAGS = -g$(DEBUG)
+CFLAGS += $(CDEFS)
+CFLAGS += -O$(OPT)
+CFLAGS += -funsigned-char
+CFLAGS += -funsigned-bitfields
+CFLAGS += -ffunction-sections
+CFLAGS += -fno-inline-small-functions
+CFLAGS += -fpack-struct
+CFLAGS += -fshort-enums
+CFLAGS += -fno-strict-aliasing
+CFLAGS += -Wall
+CFLAGS += -Wstrict-prototypes
+#CFLAGS += -mshort-calls
+#CFLAGS += -fno-unit-at-a-time
+#CFLAGS += -Wundef
+#CFLAGS += -Wunreachable-code
+#CFLAGS += -Wsign-compare
+CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
+CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
+CFLAGS += $(CSTANDARD)
+
+
+#---------------- Compiler Options C++ ----------------
+#  -g*:          generate debugging information
+#  -O*:          optimization level
+#  -f...:        tuning, see GCC manual and avr-libc documentation
+#  -Wall...:     warning level
+#  -Wa,...:      tell GCC to pass this to the assembler.
+#    -adhlns...: create assembler listing
+CPPFLAGS = -g$(DEBUG)
+CPPFLAGS += $(CPPDEFS)
+CPPFLAGS += -O$(OPT)
+CPPFLAGS += -funsigned-char
+CPPFLAGS += -funsigned-bitfields
+CPPFLAGS += -fpack-struct
+CPPFLAGS += -fshort-enums
+CPPFLAGS += -fno-exceptions
+CPPFLAGS += -Wall
+CPPFLAGS += -Wundef
+CFLAGS += -Wundef
+#CPPFLAGS += -mshort-calls
+#CPPFLAGS += -fno-unit-at-a-time
+#CPPFLAGS += -Wstrict-prototypes
+#CPPFLAGS += -Wunreachable-code
+#CPPFLAGS += -Wsign-compare
+CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
+CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
+#CPPFLAGS += $(CSTANDARD)
+
+
+#---------------- Assembler Options ----------------
+#  -Wa,...:   tell GCC to pass this to the assembler.
+#  -adhlns:   create listing
+#  -gstabs:   have the assembler create line number information; note that
+#             for use in COFF files, additional information about filenames
+#             and function names needs to be present in the assembler source
+#             files -- see avr-libc docs [FIXME: not yet described there]
+#  -listing-cont-lines: Sets the maximum number of continuation lines of hex 
+#       dump that will be displayed for a given single line of source input.
+ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
+
+
+#---------------- Library Options ----------------
+# Minimalistic printf version
+PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min
+
+# Floating point printf version (requires MATH_LIB = -lm below)
+PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt
+
+# If this is left blank, then it will use the Standard printf version.
+PRINTF_LIB = 
+#PRINTF_LIB = $(PRINTF_LIB_MIN)
+#PRINTF_LIB = $(PRINTF_LIB_FLOAT)
+
+
+# Minimalistic scanf version
+SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min
+
+# Floating point + %[ scanf version (requires MATH_LIB = -lm below)
+SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt
+
+# If this is left blank, then it will use the Standard scanf version.
+SCANF_LIB = 
+#SCANF_LIB = $(SCANF_LIB_MIN)
+#SCANF_LIB = $(SCANF_LIB_FLOAT)
+
+
+MATH_LIB = -lm
+
+
+# List any extra directories to look for libraries here.
+#     Each directory must be seperated by a space.
+#     Use forward slashes for directory separators.
+#     For a directory that has spaces, enclose it in quotes.
+EXTRALIBDIRS = 
+
+
+
+#---------------- External Memory Options ----------------
+
+# 64 KB of external RAM, starting after internal RAM (ATmega128!),
+# used for variables (.data/.bss) and heap (malloc()).
+#EXTMEMOPTS = -Wl,-Tdata=0x801100,--defsym=__heap_end=0x80ffff
+
+# 64 KB of external RAM, starting after internal RAM (ATmega128!),
+# only used for heap (malloc()).
+#EXTMEMOPTS = -Wl,--section-start,.data=0x801100,--defsym=__heap_end=0x80ffff
+
+EXTMEMOPTS =
+
+
+
+#---------------- Linker Options ----------------
+#  -Wl,...:     tell GCC to pass this to linker.
+#    -Map:      create map file
+#    --cref:    add cross reference to  map file
+LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref
+LDFLAGS += -Wl,--relax 
+LDFLAGS += -Wl,--gc-sections
+LDFLAGS += $(EXTMEMOPTS)
+LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))
+LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
+#LDFLAGS += -T linker_script.x
+
+
+
+#---------------- Programming Options (avrdude) ----------------
+
+# Programming hardware
+# Type: avrdude -c ?
+# to get a full listing.
+#
+AVRDUDE_PROGRAMMER = avrispmkii
+
+# com1 = serial port. Use lpt1 to connect to parallel port.
+AVRDUDE_PORT = usb
+
+AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex
+#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep
+
+
+# Uncomment the following if you want avrdude's erase cycle counter.
+# Note that this counter needs to be initialized first using -Yn,
+# see avrdude manual.
+#AVRDUDE_ERASE_COUNTER = -y
+
+# Uncomment the following if you do /not/ wish a verification to be
+# performed after programming the device.
+#AVRDUDE_NO_VERIFY = -V
+
+# Increase verbosity level.  Please use this when submitting bug
+# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude> 
+# to submit bug reports.
+#AVRDUDE_VERBOSE = -v -v
+
+AVRDUDE_FORCE = -F
+
+AVRDUDE_FLAGS = -p $(MCU_AVRDUDE) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
+AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)
+AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)
+AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
+AVRDUDE_FLAGS += $(AVRDUDE_FORCE)
+
+
+
+#---------------- Debugging Options ----------------
+
+# For simulavr only - target MCU frequency.
+DEBUG_MFREQ = $(F_CPU)
+
+# Set the DEBUG_UI to either gdb or insight.
+# DEBUG_UI = gdb
+DEBUG_UI = insight
+
+# Set the debugging back-end to either avarice, simulavr.
+DEBUG_BACKEND = avarice
+#DEBUG_BACKEND = simulavr
+
+# GDB Init Filename.
+GDBINIT_FILE = __avr_gdbinit
+
+# When using avarice settings for the JTAG
+JTAG_DEV = /dev/com1
+
+# Debugging port used to communicate between GDB / avarice / simulavr.
+DEBUG_PORT = 4242
+
+# Debugging host used to communicate between GDB / avarice / simulavr, normally
+#     just set to localhost unless doing some sort of crazy debugging when 
+#     avarice is running on a different computer.
+DEBUG_HOST = localhost
+
+
+
+#============================================================================
+
+
+# Define programs and commands.
+SHELL = sh
+CC = avr-gcc
+OBJCOPY = avr-objcopy
+OBJDUMP = avr-objdump
+SIZE = avr-size
+AR = avr-ar rcs
+NM = avr-nm
+AVRDUDE = avrdude
+REMOVE = rm -f
+REMOVEDIR = rm -rf
+COPY = cp
+WINSHELL = cmd
+
+# Define Messages
+# English
+MSG_ERRORS_NONE = Errors: none
+MSG_BEGIN = -------- begin --------
+MSG_END = --------  end  --------
+MSG_SIZE_BEFORE = Size before: 
+MSG_SIZE_AFTER = Size after:
+MSG_COFF = Converting to AVR COFF:
+MSG_EXTENDED_COFF = Converting to AVR Extended COFF:
+MSG_FLASH = Creating load file for Flash:
+MSG_EEPROM = Creating load file for EEPROM:
+MSG_EXTENDED_LISTING = Creating Extended Listing:
+MSG_SYMBOL_TABLE = Creating Symbol Table:
+MSG_LINKING = Linking:
+MSG_COMPILING = Compiling C:
+MSG_COMPILING_CPP = Compiling C++:
+MSG_ASSEMBLING = Assembling:
+MSG_CLEANING = Cleaning project:
+MSG_CREATING_LIBRARY = Creating library:
+
+
+
+
+# Define all object files.
+OBJ = $(SRC:%.c=$(OBJDIR)/%.o) $(CPPSRC:%.cpp=$(OBJDIR)/%.o) $(ASRC:%.S=$(OBJDIR)/%.o) 
+
+# Define all listing files.
+LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OBJDIR)/%.lst) 
+
+
+# Compiler flags to generate dependency files.
+GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
+
+
+# Combine all necessary flags and optional flags.
+# Add target processor to flags.
+ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) $(GENDEPFLAGS)
+ALL_CPPFLAGS = -mmcu=$(MCU) -I. -x c++ $(CPPFLAGS) $(GENDEPFLAGS)
+ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
+
+
+
+
+
+# Default target.
+#all: begin gccversion sizebefore build checkinvalidevents showliboptions showtarget sizeafter end
+all: begin gccversion sizebefore build showliboptions showtarget sizeafter end
+
+# Change the build target to build a HEX file or a library.
+build: elf hex eep lss sym asm
+#build: lib
+
+
+elf: $(TARGET).elf
+hex: $(TARGET).hex
+eep: $(TARGET).eep
+lss: $(TARGET).lss
+sym: $(TARGET).sym
+asm: $(TARGET).s
+LIBNAME=lib$(TARGET).a
+lib: $(LIBNAME)
+
+
+
+# Eye candy.
+# AVR Studio 3.x does not check make's exit code but relies on
+# the following magic strings to be generated by the compile job.
+begin:
+	@echo
+	@echo $(MSG_BEGIN)
+
+end:
+	@echo $(MSG_END)
+	@echo
+
+
+# Display size of file.
+HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex
+ELFSIZE = $(SIZE) $(MCU_FLAG) $(FORMAT_FLAG) $(TARGET).elf
+MCU_FLAG = $(shell $(SIZE) --help | grep -- --mcu > /dev/null && echo --mcu=$(MCU) )
+FORMAT_FLAG = $(shell $(SIZE) --help | grep -- --format=.*avr > /dev/null && echo --format=avr )
+
+sizebefore:
+	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \
+	2>/dev/null; echo; fi
+
+sizeafter:
+	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \
+	2>/dev/null; echo; fi
+
+#$(LUFA_PATH)/LUFA/LUFA_Events.lst:
+#	@make -C $(LUFA_PATH)/LUFA/ LUFA_Events.lst
+
+#checkinvalidevents: $(LUFA_PATH)/LUFA/LUFA_Events.lst
+#	@echo
+#	@echo Checking for invalid events...
+#	@$(shell) avr-nm $(OBJ) | sed -n -e 's/^.*EVENT_/EVENT_/p' | \
+#	                 grep -F -v --file=$(LUFA_PATH)/LUFA/LUFA_Events.lst > InvalidEvents.tmp || true
+#	@sed -n -e 's/^/  WARNING - INVALID EVENT NAME: /p' InvalidEvents.tmp
+#	@if test -s InvalidEvents.tmp; then exit 1; fi
+	
+showliboptions:
+	@echo
+	@echo ---- Compile Time Library Options ----
+	@for i in $(LUFA_OPTS:-D%=%); do \
+		echo $$i; \
+	done
+	@echo --------------------------------------
+
+showtarget:
+	@echo
+	@echo --------- Target Information ---------
+	@echo AVR Model: $(MCU)
+	@echo Board:     $(BOARD)
+	@echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master
+	@echo --------------------------------------
+	
+
+# Display compiler version information.
+gccversion : 
+	@$(CC) --version
+
+
+# Program the device.  
+program: $(TARGET).hex $(TARGET).eep
+	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)
+
+flip: $(TARGET).hex
+	batchisp -hardware usb -device $(MCU_DFU) -operation erase f
+	batchisp -hardware usb -device $(MCU_DFU) -operation loadbuffer $(TARGET).hex program
+	batchisp -hardware usb -device $(MCU_DFU) -operation start reset 0
+
+dfu: $(TARGET).hex
+	dfu-programmer $(MCU_DFU) erase
+	dfu-programmer $(MCU_DFU) flash --debug 1 $(TARGET).hex
+	dfu-programmer $(MCU_DFU) reset
+
+
+flip-ee: $(TARGET).hex $(TARGET).eep
+	$(COPY) $(TARGET).eep $(TARGET)eep.hex
+	batchisp -hardware usb -device $(MCU_DFU) -operation memory EEPROM erase
+	batchisp -hardware usb -device $(MCU_DFU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program
+	batchisp -hardware usb -device $(MCU_DFU) -operation start reset 0
+	$(REMOVE) $(TARGET)eep.hex
+
+dfu-ee: $(TARGET).hex $(TARGET).eep
+	dfu-programmer $(MCU_DFU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep
+	dfu-programmer $(MCU_DFU) reset
+
+
+# Generate avr-gdb config/init file which does the following:
+#     define the reset signal, load the target file, connect to target, and set 
+#     a breakpoint at main().
+gdb-config: 
+	@$(REMOVE) $(GDBINIT_FILE)
+	@echo define reset >> $(GDBINIT_FILE)
+	@echo SIGNAL SIGHUP >> $(GDBINIT_FILE)
+	@echo end >> $(GDBINIT_FILE)
+	@echo file $(TARGET).elf >> $(GDBINIT_FILE)
+	@echo target remote $(DEBUG_HOST):$(DEBUG_PORT)  >> $(GDBINIT_FILE)
+ifeq ($(DEBUG_BACKEND),simulavr)
+	@echo load  >> $(GDBINIT_FILE)
+endif
+	@echo break main >> $(GDBINIT_FILE)
+
+debug: gdb-config $(TARGET).elf
+ifeq ($(DEBUG_BACKEND), avarice)
+	@echo Starting AVaRICE - Press enter when "waiting to connect" message displays.
+	@$(WINSHELL) /c start avarice --jtag $(JTAG_DEV) --erase --program --file \
+	$(TARGET).elf $(DEBUG_HOST):$(DEBUG_PORT)
+	@$(WINSHELL) /c pause
+
+else
+	@$(WINSHELL) /c start simulavr --gdbserver --device $(MCU) --clock-freq \
+	$(DEBUG_MFREQ) --port $(DEBUG_PORT)
+endif
+	@$(WINSHELL) /c start avr-$(DEBUG_UI) --command=$(GDBINIT_FILE)
+
+
+
+
+# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
+COFFCONVERT = $(OBJCOPY) --debugging
+COFFCONVERT += --change-section-address .data-0x800000
+COFFCONVERT += --change-section-address .bss-0x800000
+COFFCONVERT += --change-section-address .noinit-0x800000
+COFFCONVERT += --change-section-address .eeprom-0x810000
+
+
+
+coff: $(TARGET).elf
+	@echo
+	@echo $(MSG_COFF) $(TARGET).cof
+	$(COFFCONVERT) -O coff-avr $< $(TARGET).cof
+
+
+extcoff: $(TARGET).elf
+	@echo
+	@echo $(MSG_EXTENDED_COFF) $(TARGET).cof
+	$(COFFCONVERT) -O coff-ext-avr $< $(TARGET).cof
+
+
+
+# Create final output files (.hex, .eep) from ELF output file.
+%.hex: %.elf
+	@echo
+	@echo $(MSG_FLASH) $@
+	$(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock $< $@
+
+%.eep: %.elf
+	@echo
+	@echo $(MSG_EEPROM) $@
+	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
+	--change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0
+
+# Create extended listing file from ELF output file.
+%.lss: %.elf
+	@echo
+	@echo $(MSG_EXTENDED_LISTING) $@
+	$(OBJDUMP) -h -S -z $< > $@
+
+# Create a symbol table from ELF output file.
+%.sym: %.elf
+	@echo
+	@echo $(MSG_SYMBOL_TABLE) $@
+	$(NM) -n $< > $@
+
+
+
+# Create library from object files.
+.SECONDARY : $(TARGET).a
+.PRECIOUS : $(OBJ)
+%.a: $(OBJ)
+	@echo
+	@echo $(MSG_CREATING_LIBRARY) $@
+	$(AR) $@ $(OBJ)
+
+
+# Link: create ELF output file from object files.
+.SECONDARY : $(TARGET).elf
+.PRECIOUS : $(OBJ)
+%.elf: $(OBJ)
+	@echo
+	@echo $(MSG_LINKING) $@
+	$(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS)
+
+
+# Compile: create object files from C source files.
+$(OBJDIR)/%.o : %.c
+	@echo
+	@echo $(MSG_COMPILING) $<
+	$(CC) -c $(ALL_CFLAGS) $< -o $@ 
+
+
+# Compile: create object files from C++ source files.
+$(OBJDIR)/%.o : %.cpp
+	@echo
+	@echo $(MSG_COMPILING_CPP) $<
+	$(CC) -c $(ALL_CPPFLAGS) $< -o $@ 
+
+
+# Compile: create assembler files from C source files.
+%.s : %.c
+	$(CC) -S $(ALL_CFLAGS) $< -o $@
+
+
+# Compile: create assembler files from C++ source files.
+%.s : %.cpp
+	$(CC) -S $(ALL_CPPFLAGS) $< -o $@
+
+
+# Assemble: create object files from assembler source files.
+$(OBJDIR)/%.o : %.S
+	@echo
+	@echo $(MSG_ASSEMBLING) $<
+	$(CC) -c $(ALL_ASFLAGS) $< -o $@
+
+
+# Create preprocessed source for use in sending a bug report.
+%.i : %.c
+	$(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@ 
+	
+
+# Target: clean project.
+clean: begin clean_list clean_binary end
+
+clean_binary:
+	$(REMOVE) $(TARGET).hex
+	
+clean_list:
+	@echo $(MSG_CLEANING)
+	$(REMOVE) $(TARGET).hex
+	$(REMOVE) $(TARGET).eep
+	$(REMOVE) $(TARGET).cof
+	$(REMOVE) $(TARGET).elf
+	$(REMOVE) $(TARGET).map
+	$(REMOVE) $(TARGET).sym
+	$(REMOVE) $(TARGET).lss
+	$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.o)
+	$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.lst)
+	$(REMOVE) $(SRC:.c=.s)
+	$(REMOVE) $(SRC:.c=.d)
+	$(REMOVE) $(SRC:.c=.i)
+	$(REMOVEDIR) .dep
+
+doxygen:
+	@echo Generating Project Documentation...
+	@doxygen Doxygen.conf
+	@echo Documentation Generation Complete.
+
+clean_doxygen:
+	rm -rf Documentation
+
+# Create object files directory
+$(shell mkdir $(OBJDIR) 2>/dev/null)
+
+
+# Include the dependency files.
+-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
+
+
+# Listing of phony targets.
+.PHONY : all begin finish end sizebefore sizeafter gccversion \
+build elf hex eep lss sym coff extcoff doxygen clean          \
+clean_list clean_doxygen program dfu flip flip-ee dfu-ee      \
+debug gdb-config
diff --git a/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/readme.txt b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/readme.txt
new file mode 100644
index 000000000..ca9f0221b
--- /dev/null
+++ b/hardware/arduino/sam/firmwares/atmega16u2/arduino-usbserial/readme.txt
@@ -0,0 +1,14 @@
+To setup the project and upload the Arduino usbserial application firmware to an ATMEGA32U2 using the Arduino USB DFU bootloader:
+1. unpack the source into LUFA's Projects directory
+2. set ARDUINO_MODEL_PID in the makefile as appropriate
+3. do "make clean; make"
+4. put the 32U2 into USB DFU mode:
+4.a. assert and hold the 32U2's RESET line
+4.b. assert and hold the 32U2's HWB line
+4.c. release the 32U2's RESET line
+4.d. release the 32U2's HWB line
+5. confirm that the board enumerates as "ATmega32u2"
+6. do "make dfu" (OS X or Linux - dfu-programmer must be installed first) or "make flip" (Windows - Flip must be installed first)
+
+Check that the board enumerates as "Arduino Mega 2560".
+Test by uploading a new Arduino sketch from the Arduino IDE.