added USBtoSerial Example Project to avr utils

git-svn-id: https://svn.spreadspace.org/avr/trunk@38 aa12f405-d877-488e-9caf-2d797e2a1cc7

8 files changed, 641 insertions, 19 deletions

diff --git a/defines.mk b/defines.mk
index ca29d50..8cb5cfc 100644
--- a/defines.mk
+++ b/defines.mk
@@ -26,6 +26,7 @@ ifeq ($(BOARD_TYPE),teensy1)
   F_CPU := 16000000
   F_USB = $(F_CPU)
   PROG := teensy
+  LUFA_BOARD = TEENSY
 endif
 ifeq ($(BOARD_TYPE),teensy2)
   MCU := atmega32u4
@@ -33,6 +34,7 @@ ifeq ($(BOARD_TYPE),teensy2)
   F_CPU := 16000000
   F_USB = $(F_CPU)
   PROG := teensy
+  LUFA_BOARD = TEENSY2
 endif
 ifeq ($(BOARD_TYPE),teensy1pp)
   MCU := at90usb646
@@ -40,6 +42,7 @@ ifeq ($(BOARD_TYPE),teensy1pp)
   F_CPU := 16000000
   F_USB = $(F_CPU)
   PROG := teensy
+  LUFA_BOARD = TEENSY
 endif
 ifeq ($(BOARD_TYPE),teensy2pp)
   MCU := at90usb1286
@@ -47,6 +50,7 @@ ifeq ($(BOARD_TYPE),teensy2pp)
   F_CPU := 16000000
   F_USB = $(F_CPU)
   PROG := teensy
+  LUFA_BOARD = TEENSY2
 endif
 ifeq ($(BOARD_TYPE),hhd70dongle)
   MCU := atmega32u4
@@ -145,6 +149,8 @@ CFLAGS += -Wstrict-prototypes
 CFLAGS += -I$(LIB_DIR)
 CFLAGS += -DF_CPU=$(F_CPU)UL
 CFLAGS += -D__BOARD_$(BOARD_TYPE)__
+CFLAGS += -std=c99
+
 
 ## Linker flags
 LDFLAGS = $(COMMON)
diff --git a/include.mk b/include.mk
index 9b02076..6933a06 100644
--- a/include.mk
+++ b/include.mk
@@ -22,8 +22,6 @@
 
 include ../defines.mk
 
-LDFLAGS += -L./
-
 ## project-specific objects
 SRC := $(OBJ:%.o=%.c)
 DEP := $(SRC:%.c=%.d)
@@ -40,8 +38,13 @@ all: prepare $(HEXFILE)
 
 
 ## external Libs
-ifndef LUFA_PATH
-LUFA_PATH := ../contrib/LUFA
+LDFLAGS += -L./
+
+ifdef LUFA_PATH
+CFLAGS += -I$(LUFA_PATH)
+CFLAGS += -DF_USB=$(F_USB)UL
+CFLAGS += -DBOARD=BOARD_$(LUFA_BOARD) -DARCH=ARCH_$(ARCH)
+CFLAGS += $(LUFA_OPTS)
 endif
 
 prepare: $(EXTERNAL_LIBS:%=build-%)
diff --git a/lib/util.c b/lib/util.c
index 76f5104..d927f8e 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -37,6 +37,21 @@ void cpu_init(void)
   CPU_PRESCALE(0);
 }
 
+#if defined(__BOARD_teensy1__)
+  #define BOOTLOADER_VEC 0x3E00
+#elif defined(__BOARD_teensy2__)
+  #define BOOTLOADER_VEC 0x7E00
+#elif defined(__BOARD_teensy1pp__)
+  #define BOOTLOADER_VEC 0xFC00
+#elif defined(__BOARD_teensy2pp__)
+  #define BOOTLOADER_VEC 0x1FC00
+#elif defined(__BOARD_hhd70dongle__)
+  #define BOOTLOADER_VEC 0x3800
+#endif
+
+typedef void (*f_ptr_type)(void);
+f_ptr_type start_bootloader = (f_ptr_type)BOOTLOADER_VEC;
+
 void reset2bootloader(void)
 {
 #if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) || defined(__BOARD_hhd70dongle__)
@@ -52,31 +67,27 @@ void reset2bootloader(void)
     TIMSK0 = 0; TIMSK1 = 0; UCSR1B = 0;
     DDRB = 0; DDRC = 0; DDRD = 0;
     PORTB = 0; PORTC = 0; PORTD = 0;
-    asm volatile("jmp 0x3E00");
   #elif defined(__BOARD_teensy2__)
     EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
     TIMSK0 = 0; TIMSK1 = 0; TIMSK3 = 0; TIMSK4 = 0; UCSR1B = 0; TWCR = 0;
     DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0; TWCR = 0;
     PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
-    asm volatile("jmp 0x7E00");
-  #elif defined(__BOARD_teensy2pp__)
+  #elif defined(__BOARD_teensy1pp__)
     EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
     TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0; TIMSK3 = 0; UCSR1B = 0; TWCR = 0;
     DDRA = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0;
     PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
-    asm volatile("jmp 0xFC00");
   #elif defined(__BOARD_teensy2pp__)
     EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
     TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0; TIMSK3 = 0; UCSR1B = 0; TWCR = 0;
     DDRA = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0;
     PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
-    asm volatile("jmp 0x1FC00");
   #elif defined(__BOARD_hhd70dongle__)
     EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
     TIMSK0 = 0; TIMSK1 = 0; TIMSK3 = 0; TIMSK4 = 0; UCSR1B = 0; TWCR = 0;
     DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0; TWCR = 0;
     PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
-    asm volatile("jmp 0x3800");
   #endif
+  start_bootloader();
 #endif
 }
diff --git a/lufa.mk b/lufa.mk
index 709f9be..a2c7eb9 100644
--- a/lufa.mk
+++ b/lufa.mk
@@ -23,12 +23,9 @@
 include ../defines.mk

 

 ## TODO: change BOARD names for our tools too???

-LUFA_BOARD = TEENSY2

-

 include $(LUFA_PATH)/LUFA/makefile

 SRC = $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)

 

-CFLAGS += -std=c99

 CFLAGS += -DF_USB=$(F_USB)UL

 CFLAGS += -DBOARD=BOARD_$(LUFA_BOARD) -DARCH=ARCH_$(ARCH)

 CFLAGS += $(LUFA_OPTS)

diff --git a/usb-serial/Descriptors.c b/usb-serial/Descriptors.c
new file mode 100644
index 0000000..4f62cd5
--- /dev/null
+++ b/usb-serial/Descriptors.c
@@ -0,0 +1,271 @@
+/*

+             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 "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.

+ */

+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 =

+{

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

+

+	.UnicodeString          = L"Dean Camera"

+};

+

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

+{

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

+

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

+};

+

+/** 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/usb-serial/Descriptors.h b/usb-serial/Descriptors.h
new file mode 100644
index 0000000..0146524
--- /dev/null
+++ b/usb-serial/Descriptors.h
@@ -0,0 +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

+

diff --git a/usb-serial/Makefile b/usb-serial/Makefile
index 868b51d..bdd5fec 100644
--- a/usb-serial/Makefile
+++ b/usb-serial/Makefile
@@ -22,7 +22,7 @@
 

 NAME := usb-serial

 BOARD_TYPE := teensy2

-OBJ := $(NAME).o

+OBJ := $(NAME).o Descriptors.o

 LIBS := util led

 EXTERNAL_LIBS := lufa

 

diff --git a/usb-serial/usb-serial.c b/usb-serial/usb-serial.c
index e5a67e0..700d8eb 100644
--- a/usb-serial/usb-serial.c
+++ b/usb-serial/usb-serial.c
@@ -20,20 +20,265 @@
  *  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 there 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 <util/delay.h>

+#include <avr/wdt.h>

+#include <avr/interrupt.h>

+#include <avr/power.h>

+

+#include "Descriptors.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)

+{

+	bool ConfigSuccess = true;

+

+	ConfigSuccess &= 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);

 

-  for(;;) {

-    _delay_ms(42);

-    led_toggle();

-  }

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

 }