Commit of new class abstraction APIs for all device demos other than the MIDI demo - not documented yet.

Removed scheduler and memory allocation libraries.

Added new EVENT_USB_StartOfFrame event in the library to indicate the start of each USB frame (when generated).

Removed Tx interrupt from the USBtoSerial demo; now sends characters via polling to ensure more time for the Rx interrupt.

1 files changed, 15 insertions, 127 deletions

diff --git a/Demos/Device/USBtoSerial/USBtoSerial.h b/Demos/Device/USBtoSerial/USBtoSerial.h
index 8e7e8aed8..7ff796e70 100644
--- a/Demos/Device/USBtoSerial/USBtoSerial.h
+++ b/Demos/Device/USBtoSerial/USBtoSerial.h
@@ -46,140 +46,28 @@
 

 		#include "Lib/RingBuff.h"

 

-		#include <LUFA/Version.h>                         // Library Version Information

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

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

-		#include <LUFA/Drivers/Board/LEDs.h>              // LEDs driver

-		#include <LUFA/Scheduler/Scheduler.h>             // Simple scheduler for task management

+		#include <LUFA/Version.h>

+		#include <LUFA/Drivers/Board/LEDs.h>

+		#include <LUFA/Drivers/Board/Joystick.h>

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

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

+		#include <LUFA/Drivers/USB/Class/Device/CDC.h>

 

 	/* Macros: */

-		/** CDC Class specific request to get the current virtual serial port configuration settings. */

-		#define REQ_GetLineEncoding          0x21

-

-		/** CDC Class specific request to set the current virtual serial port configuration settings. */

-		#define REQ_SetLineEncoding          0x20

-

-		/** CDC Class specific request to set the current virtual serial port handshake line states. */

-		#define REQ_SetControlLineState      0x22

-		

-		/** Notification type constant for a change in the virtual serial port handshake line states, for

-		 *  use with a USB_Notification_Header_t notification structure when sent to the host via the CDC 

-		 *  notification endpoint.

-		 */

-		#define NOTIF_SerialState            0x20

-

-		/** Mask for the DTR handshake line for use with the REQ_SetControlLineState class specific request

-		 *  from the host, to indicate that the DTR line state should be high.

-		 */

-		#define CONTROL_LINE_OUT_DTR         (1 << 0)

-

-		/** Mask for the RTS handshake line for use with the REQ_SetControlLineState class specific request

-		 *  from the host, to indicate that theRTS line state should be high.

-		 */

-		#define CONTROL_LINE_OUT_RTS         (1 << 1)

+		#define LEDMASK_USB_NOTREADY      LEDS_LED1

+		#define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)

+		#define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)

+		#define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)

 		

-		/** Mask for the DCD handshake line for use with the a NOTIF_SerialState class specific notification

-		 *  from the device to the host, to indicate that the DCD line state is currently high.

-		 */

-		#define CONTROL_LINE_IN_DCD          (1 << 0)

-

-		/** Mask for the DSR handshake line for use with the a NOTIF_SerialState class specific notification

-		 *  from the device to the host, to indicate that the DSR line state is currently high.

-		 */

-		#define CONTROL_LINE_IN_DSR          (1 << 1)

-

-		/** Mask for the BREAK handshake line for use with the a NOTIF_SerialState class specific notification

-		 *  from the device to the host, to indicate that the BREAK line state is currently high.

-		 */

-		#define CONTROL_LINE_IN_BREAK        (1 << 2)

-

-		/** Mask for the RING handshake line for use with the a NOTIF_SerialState class specific notification

-		 *  from the device to the host, to indicate that the RING line state is currently high.

-		 */

-		#define CONTROL_LINE_IN_RING         (1 << 3)

-

-		/** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,

-		 *  to indicate that a framing error has occurred on the virtual serial port.

-		 */

-		#define CONTROL_LINE_IN_FRAMEERROR   (1 << 4)

-

-		/** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,

-		 *  to indicate that a parity error has occurred on the virtual serial port.

-		 */

-		#define CONTROL_LINE_IN_PARITYERROR  (1 << 5)

-

-		/** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,

-		 *  to indicate that a data overrun error has occurred on the virtual serial port.

-		 */

-		#define CONTROL_LINE_IN_OVERRUNERROR (1 << 6)

-		

-	/* Type Defines: */

-		/** Type define for the virtual serial port line encoding settings, for storing the current USART configuration

-		 *  as set by the host via a class specific request.

-		 */

-		typedef struct

-		{

-			uint32_t BaudRateBPS; /**< Baud rate of the virtual serial port, in bits per second */

-			uint8_t  CharFormat; /**< Character format of the virtual serial port, a value from the

-			                      *   CDCDevice_CDC_LineCodingFormats_t enum

-			                      */

-			uint8_t  ParityType; /**< Parity setting of the virtual serial port, a value from the

-			                      *   CDCDevice_LineCodingParity_t enum

-			                      */

-			uint8_t  DataBits; /**< Bits of data per character of the virtual serial port */

-		} CDC_Line_Coding_t;

-		

-		/** Type define for a CDC notification, sent to the host via the CDC notification endpoint to indicate a

-		 *  change in the device state asynchronously.

-		 */

-		typedef struct

-		{

-			uint8_t  NotificationType; /**< Notification type, a mask of REQDIR_*, REQTYPE_* and REQREC_* constants

-			                            *   from the library StdRequestType.h header

-			                            */

-			uint8_t  Notification; /**< Notification value, a NOTIF_* constant */

-			uint16_t wValue; /**< Notification wValue, notification-specific */

-			uint16_t wIndex; /**< Notification wIndex, notification-specific */

-			uint16_t wLength; /**< Notification wLength, notification-specific */

-		} USB_Notification_Header_t;

-		

-	/* Enums: */

-		/** Enum for the possible line encoding formats of a virtual serial port. */

-		enum CDCDevice_CDC_LineCodingFormats_t

-		{

-			OneStopBit          = 0, /**< Each frame contains one stop bit */

-			OneAndAHalfStopBits = 1, /**< Each frame contains one and a half stop bits */

-			TwoStopBits         = 2, /**< Each frame contains two stop bits */

-		};

-		

-		/** Enum for the possible line encoding parity settings of a virtual serial port. */

-		enum CDCDevice_LineCodingParity_t

-		{

-			Parity_None         = 0, /**< No parity bit mode on each frame */

-			Parity_Odd          = 1, /**< Odd parity bit mode on each frame */

-			Parity_Even         = 2, /**< Even parity bit mode on each frame */

-			Parity_Mark         = 3, /**< Mark parity bit mode on each frame */

-			Parity_Space        = 4, /**< Space parity bit mode on each frame */

-		};

-

-		/** Enum for the possible status codes for passing to the UpdateStatus() function. */

-		enum USBtoSerial_StatusCodes_t

-		{

-			Status_USBNotReady    = 0, /**< USB is not ready (disconnected from a USB host) */

-			Status_USBEnumerating = 1, /**< USB interface is enumerating */

-			Status_USBReady       = 2, /**< USB interface is connected and ready */

-		};

-		

-	/* Tasks: */

-		TASK(CDC_Task);

-

 	/* Function Prototypes: */

+		void SetupHardware(void);

+

 		void EVENT_USB_Connect(void);

 		void EVENT_USB_Disconnect(void);

 		void EVENT_USB_ConfigurationChanged(void);

 		void EVENT_USB_UnhandledControlPacket(void);

-

-		void ReconfigureUSART(void);

-		void UpdateStatus(uint8_t CurrentStatus);

+		void EVENT_USB_StartOfFrame(void);

+		

+		void EVENT_USB_CDC_LineEncodingChanged(USB_ClassInfo_CDC_t* CDCInterfaceInfo);

 

 #endif