diff --git a/BuildTests/BoardDriverTest/BoardDeviceMap.cfg b/BuildTests/BoardDriverTest/BoardDeviceMap.cfg index 28062ef2bf..0d4f16b461 100644 --- a/BuildTests/BoardDriverTest/BoardDeviceMap.cfg +++ b/BuildTests/BoardDriverTest/BoardDeviceMap.cfg @@ -74,6 +74,7 @@ BOARD_STANGE_ISP = AVR8 : at90usb162 : # ----------------- XMEGA Boards ----------------- BOARD_A3BU_XPLAINED = XMEGA : atxmega256a3bu : BOARD_B1_XPLAINED = XMEGA : atxmega128b1 : +BOARD_C3_XPLAINED = XMEGA : atxmega384c3 : # # ------------------ UC3 Boards ------------------ BOARD_EVK1100 = UC3 : uc3a0512 : diff --git a/LUFA/Common/BoardTypes.h b/LUFA/Common/BoardTypes.h index 7928d9afd7..44aa769e07 100644 --- a/LUFA/Common/BoardTypes.h +++ b/LUFA/Common/BoardTypes.h @@ -206,28 +206,31 @@ /** Selects the DorkbotPDX Duce specific board drivers, including the driver for the board LEDs. */ #define BOARD_DUCE 47 - + /** Selects the Olimex AVR-USB-32U4 specific board drivers, including the Button and LED drivers. */ #define BOARD_OLIMEX32U4 48 - + /** Selects the Olimex AVR-USB-T32U4 specific board drivers, including the Button and LED drivers. */ #define BOARD_OLIMEXT32U4 49 - + /** Selects the Olimex AVR-ISP-MK2 specific board drivers, including the Button and LED drivers. */ #define BOARD_OLIMEXISPMK2 50 /** Selects the Arduino Leonardo specific board drivers, including the driver for the board LEDs. */ #define BOARD_LEONARDO 51 - + /** Selects the UC3-A3 Xplained specific board drivers, including the Button and LED drivers. */ #define BOARD_UC3A3_XPLAINED 52 - + /** Selects the USB2AX version 3.1 specific board drivers, including the Button and LEDs drivers. */ #define BOARD_USB2AX_V31 53 /** Selects the Stange-ISP specific board drivers, including the Button and LEDs drivers. */ #define BOARD_STANGE_ISP 54 - + + /** Selects the XMEGA C3 XPLAINED specific board drivers, including the Button and LEDs drivers. */ + #define BOARD_C3_XPLAINED 55 + #if !defined(__DOXYGEN__) #define BOARD_ BOARD_NONE diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt index 16d3fe676c..b147384396 100644 --- a/LUFA/DoxygenPages/ChangeLog.txt +++ b/LUFA/DoxygenPages/ChangeLog.txt @@ -12,6 +12,7 @@ * - Added additional MIDI command definitions to the MIDI class driver (thanks to Daniel Dreibrodt) * - Added new CONCAT() and CONCAT_EXPANDED() convenience macros * - Added new Printer Device Class driver + * - Added support for the XMEGA C3 Xplained board * - Library Applications: * - Added new Printer class bootloader * - Added new Mass Storage class bootloader diff --git a/LUFA/DoxygenPages/DeviceSupport.txt b/LUFA/DoxygenPages/DeviceSupport.txt index ac95831e51..74d789563b 100644 --- a/LUFA/DoxygenPages/DeviceSupport.txt +++ b/LUFA/DoxygenPages/DeviceSupport.txt @@ -410,6 +410,7 @@ * Currently supported Atmel XMEGA boards (see \ref Group_BoardTypes): * - XMEGA A3BU Xplained * - XMEGA B1 Xplained + * - XMEGA C3 Xplained * * \section Sec_XMEGASupport_ThirdParty Supported Third Party Boards * Currently supported third-party boards (see \ref Group_BoardTypes for makefile \c BOARD constant names): diff --git a/LUFA/Drivers/Board/Board.h b/LUFA/Drivers/Board/Board.h index d837dc68a4..1f36470d28 100644 --- a/LUFA/Drivers/Board/Board.h +++ b/LUFA/Drivers/Board/Board.h @@ -149,6 +149,8 @@ #include "UC3/UC3A3_XPLAINED/Board.h" #elif (BOARD == BOARD_STANGE_ISP) #include "AVR8/STANGE_ISP/Board.h" + #elif (BOARD == BOARD_C3_XPLAINED) + #include "XMEGA/C3_XPLAINED/Board.h" #else #include "Board/Board.h" #endif diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h index 5c9cd75d51..8727507dad 100644 --- a/LUFA/Drivers/Board/Buttons.h +++ b/LUFA/Drivers/Board/Buttons.h @@ -68,13 +68,13 @@ * \code * // Initialize the button driver before first use * Buttons_Init(); - * + * * printf("Waiting for button press...\r\n"); - * + * * // Loop until a board button has been pressed * uint8_t ButtonPress; * while (!(ButtonPress = Buttons_GetStatus())) {}; - * + * * // Display which button was pressed (assuming two board buttons) * printf("Button pressed: %s\r\n", (ButtonPress == BUTTONS_BUTTON1) ? "Button 1" : "Button 2"); * \endcode @@ -153,6 +153,8 @@ #include "UC3/UC3A3_XPLAINED/Buttons.h" #elif (BOARD == BOARD_STANGE_ISP) #include "AVR8/STANGE_ISP/Buttons.h" + #elif (BOARD == BOARD_C3_XPLAINED) + #include "XMEGA/C3_XPLAINED/Buttons.h" #else #include "Board/Buttons.h" #endif diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h index 09c9cc50e6..3c5ceefa38 100644 --- a/LUFA/Drivers/Board/LEDs.h +++ b/LUFA/Drivers/Board/LEDs.h @@ -199,6 +199,8 @@ #include "UC3/UC3A3_XPLAINED/LEDs.h" #elif (BOARD == BOARD_STANGE_ISP) #include "AVR8/STANGE_ISP/LEDs.h" + #elif (BOARD == BOARD_C3_XPLAINED) + #include "XMEGA/C3_XPLAINED/LEDs.h" #else #include "Board/LEDs.h" #endif diff --git a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h index 82713247ba..143fbbffcf 100644 --- a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h +++ b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h @@ -29,18 +29,18 @@ */ /** \file - * \brief Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained. - * \copydetails Group_Dataflash_B1_XPLAINED + * \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained. + * \copydetails Group_Dataflash_A3BU_XPLAINED * * \note This file should not be included directly. It is automatically included as needed by the dataflash driver * dispatch header located in LUFA/Drivers/Board/Dataflash.h. */ /** \ingroup Group_Dataflash - * \defgroup Group_Dataflash_B1_XPLAINED B1_XPLAINED - * \brief Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained. + * \defgroup Group_Dataflash_A3BU_XPLAINED A3BU_XPLAINED + * \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained. * - * Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained board. + * Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained board. * * * @@ -50,8 +50,8 @@ * @{ */ -#ifndef __DATAFLASH_B1_XPLAINED_H__ -#define __DATAFLASH_B1_XPLAINED_H__ +#ifndef __DATAFLASH_A3BU_XPLAINED_H__ +#define __DATAFLASH_A3BU_XPLAINED_H__ /* Includes: */ #include "../../../../Common/Common.h" @@ -94,9 +94,9 @@ static inline void Dataflash_Init(void) { DATAFLASH_CHIPCS_PORT.DIRSET = DATAFLASH_CHIPCS_MASK; - + PORTCFG.MPCMASK = DATAFLASH_CHIPCS_MASK; - DATAFLASH_CHIPCS_PORT.PIN0CTRL = PORT_INVEN_bm; + DATAFLASH_CHIPCS_PORT.PIN0CTRL = PORT_INVEN_bm; } /** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash. diff --git a/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h index 7a9c03ebe9..28c79f1977 100644 --- a/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h +++ b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h @@ -29,29 +29,29 @@ */ /** \file - * \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained. - * \copydetails Group_Dataflash_A3BU_XPLAINED + * \brief Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained. + * \copydetails Group_Dataflash_B1_XPLAINED * * \note This file should not be included directly. It is automatically included as needed by the dataflash driver * dispatch header located in LUFA/Drivers/Board/Dataflash.h. */ /** \ingroup Group_Dataflash - * \defgroup Group_Dataflash_A3BU_XPLAINED A3BU_XPLAINED - * \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained. + * \defgroup Group_Dataflash_B1_XPLAINED B1_XPLAINED + * \brief Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained. * - * Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained board. + * Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained board. * *
NameInfoSelect PinSPI Port
* * - *
NameInfoSelect PinSPI Port
DATAFLASH_CHIP1AT45DB642D (8MB)PORTD.2USARTC0 (In SPI Mode, Remapped)
+ * * * @{ */ -#ifndef __DATAFLASH_A3BU_XPLAINED_H__ -#define __DATAFLASH_A3BU_XPLAINED_H__ +#ifndef __DATAFLASH_B1_XPLAINED_H__ +#define __DATAFLASH_B1_XPLAINED_H__ /* Includes: */ #include "../../../../Common/Common.h" @@ -94,10 +94,10 @@ static inline void Dataflash_Init(void) { DATAFLASH_CHIPCS_PORT.DIRSET = DATAFLASH_CHIPCS_MASK; - + PORTCFG.MPCMASK = DATAFLASH_CHIPCS_MASK; - DATAFLASH_CHIPCS_PORT.PIN0CTRL = PORT_INVEN_bm; - + DATAFLASH_CHIPCS_PORT.PIN0CTRL = PORT_INVEN_bm; + PORTC.REMAP |= PORT_USART0_bm; } diff --git a/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Board.h b/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Board.h new file mode 100644 index 0000000000..be11c59c96 --- /dev/null +++ b/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Board.h @@ -0,0 +1,83 @@ +/* + LUFA Library + Copyright (C) Dean Camera, 2013. + + dean [at] fourwalledcubicle [dot] com + www.lufa-lib.org +*/ + +/* + Copyright 2013 Dean Camera (dean [at] fourwalledcubicle [dot] com) + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + The author disclaims all warranties with regard to this + software, including all implied warranties of merchantability + and fitness. In no event shall the author be liable for any + special, indirect or consequential damages or any damages + whatsoever resulting from loss of use, data or profits, whether + in an action of contract, negligence or other tortious action, + arising out of or in connection with the use or performance of + this software. +*/ + +/** \file + * \brief Board specific information header for the Atmel XMEGA C3 Xplained. + * \copydetails Group_BoardInfo_C3_XPLAINED + * + * \note This file should not be included directly. It is automatically included as needed by the Board driver + * dispatch header located in LUFA/Drivers/Board/Board.h. + */ + +/** \ingroup Group_BoardInfo + * \defgroup Group_BoardInfo_C3_XPLAINED C3_XPLAINED + * \brief Board specific information header for the Atmel XMEGA C3 Xplained. + * + * Board specific information header for the Atmel XMEGA C3 Xplained. + * + * @{ + */ + +#ifndef __BOARD_C3_XPLAINED_H__ +#define __BOARD_C3_XPLAINED_H__ + + /* Includes: */ + #include "../../../../Common/Common.h" + #include "../../Buttons.h" + #include "../../Dataflash.h" + #include "../../LEDs.h" + + /* Enable C linkage for C++ Compilers: */ + #if defined(__cplusplus) + extern "C" { + #endif + + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_BOARD_H) + #error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead. + #endif + + /* Public Interface - May be used in end-application: */ + /* Macros: */ + /** Indicates the board has hardware Buttons mounted. */ + #define BOARD_HAS_BUTTONS + + /** Indicates the board has hardware LEDs mounted. */ + #define BOARD_HAS_LEDS + + /* Disable C linkage for C++ Compilers: */ + #if defined(__cplusplus) + } + #endif + +#endif + +/** @} */ + diff --git a/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Buttons.h b/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Buttons.h new file mode 100644 index 0000000000..11c7956664 --- /dev/null +++ b/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Buttons.h @@ -0,0 +1,109 @@ +/* + LUFA Library + Copyright (C) Dean Camera, 2013. + + dean [at] fourwalledcubicle [dot] com + www.lufa-lib.org +*/ + +/* + Copyright 2013 Dean Camera (dean [at] fourwalledcubicle [dot] com) + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + The author disclaims all warranties with regard to this + software, including all implied warranties of merchantability + and fitness. In no event shall the author be liable for any + special, indirect or consequential damages or any damages + whatsoever resulting from loss of use, data or profits, whether + in an action of contract, negligence or other tortious action, + arising out of or in connection with the use or performance of + this software. +*/ + +/** \file + * \brief Board specific Buttons driver header for the Atmel XMEGA C3 Xplained. + * \copydetails Group_Buttons_C3_XPLAINED + * + * \note This file should not be included directly. It is automatically included as needed by the Buttons driver + * dispatch header located in LUFA/Drivers/Board/Buttons.h. + */ + +/** \ingroup Group_Buttons + * \defgroup Group_Buttons_C3_XPLAINED C3_XPLAINED + * \brief Board specific Buttons driver header for the Atmel XMEGA C3 Xplained. + * + * Board specific Buttons driver header for the Atmel XMEGA C3 Xplained. + * + * + * + * + * + *
NameInfoActive LevelPort Pin
BUTTONS_BUTTON1SW0 ButtonLowPORTF.1
BUTTONS_BUTTON2SW1 ButtonLowPORTF.2
+ * + * @{ + */ + +#ifndef __BUTTONS_C3_XPLAINED_H__ +#define __BUTTONS_C3_XPLAINED_H__ + + /* Includes: */ + #include + + /* Enable C linkage for C++ Compilers: */ + #if defined(__cplusplus) + extern "C" { + #endif + + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_BUTTONS_H) + #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. + #endif + + /* Public Interface - May be used in end-application: */ + /* Macros: */ + /** Button mask for the first button on the board. */ + #define BUTTONS_BUTTON1 (1 << 1) + + /** Button mask for the second button on the board. */ + #define BUTTONS_BUTTON2 (1 << 2) + + /* Inline Functions: */ + #if !defined(__DOXYGEN__) + static inline void Buttons_Init(void) + { + PORTF.OUTCLR = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2); + PORTF.PIN1CTRL = (PORT_OPC_PULLUP_gc | PORT_INVEN_bm); + PORTF.PIN2CTRL = (PORT_OPC_PULLUP_gc | PORT_INVEN_bm); + } + + static inline void Buttons_Disable(void) + { + PORTF.OUTCLR = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2); + PORTF.PIN1CTRL = 0; + PORTF.PIN2CTRL = 0; + } + + static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT; + static inline uint8_t Buttons_GetStatus(void) + { + return (PORTF_IN & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2)); + } + #endif + + /* Disable C linkage for C++ Compilers: */ + #if defined(__cplusplus) + } + #endif + +#endif + +/** @} */ + diff --git a/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h b/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h new file mode 100644 index 0000000000..333d541193 --- /dev/null +++ b/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h @@ -0,0 +1,144 @@ +/* + LUFA Library + Copyright (C) Dean Camera, 2013. + + dean [at] fourwalledcubicle [dot] com + www.lufa-lib.org +*/ + +/* + Copyright 2013 Dean Camera (dean [at] fourwalledcubicle [dot] com) + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + The author disclaims all warranties with regard to this + software, including all implied warranties of merchantability + and fitness. In no event shall the author be liable for any + special, indirect or consequential damages or any damages + whatsoever resulting from loss of use, data or profits, whether + in an action of contract, negligence or other tortious action, + arising out of or in connection with the use or performance of + this software. +*/ + +/** \file + * \brief Board specific LED driver header for the Atmel XMEGA C3 Xplained. + * \copydetails Group_LEDs_C3_XPLAINED + * + * \note This file should not be included directly. It is automatically included as needed by the LEDs driver + * dispatch header located in LUFA/Drivers/Board/LEDs.h. + */ + +/** \ingroup Group_LEDs + * \defgroup Group_LEDs_C3_XPLAINED C3_XPLAINED + * \brief Board specific LED driver header for the Atmel XMEGA C3 Xplained. + * + * Board specific LED driver header for the Atmel XMEGA C3 Xplained. + * + * + * + * + * + *
NameColorInfoActive LevelPort Pin
LEDS_LED1YellowLED0 LEDLowPORTR.0
LEDS_LED2YellowLED1 LEDLowPORTR.1
+ * + * @{ + */ + +#ifndef __LEDS_C3_XPLAINED_H__ +#define __LEDS_C3_XPLAINED_H__ + + /* Includes: */ + #include + + /* 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 << 0) + + /** LED mask for the second LED on the board. */ + #define LEDS_LED2 (1 << 1) + + /** LED mask for all the LEDs on the board. */ + #define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2) + + /** LED mask for none of the board LEDs. */ + #define LEDS_NO_LEDS 0 + + /* Inline Functions: */ + #if !defined(__DOXYGEN__) + static inline void LEDs_Init(void) + { + PORTR.DIRSET = LEDS_ALL_LEDS; + PORTR.OUTCLR = LEDS_ALL_LEDS; + + PORTCFG.MPCMASK = LEDS_ALL_LEDS; + PORTR.PIN0CTRL = PORT_INVEN_bm; + } + + static inline void LEDs_Disable(void) + { + PORTR.DIRCLR = LEDS_ALL_LEDS; + PORTR.OUTCLR = LEDS_ALL_LEDS; + + PORTCFG.MPCMASK = 0; + PORTR.PIN0CTRL = LEDS_ALL_LEDS; + } + + static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) + { + PORTR_OUTSET = LEDMask; + } + + static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) + { + PORTR_OUTCLR = LEDMask; + } + + static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) + { + PORTR_OUT = (PORTR.OUT & ~LEDS_ALL_LEDS) | LEDMask; + } + + static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask) + { + PORTR_OUT = (PORTR.OUT & ~LEDMask) | ActiveMask; + } + + static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) + { + PORTR_OUTTGL = LEDMask; + } + + static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; + static inline uint8_t LEDs_GetLEDs(void) + { + return (PORTR_OUT & LEDS_ALL_LEDS); + } + #endif + + /* Disable C linkage for C++ Compilers: */ + #if defined(__cplusplus) + } + #endif + +#endif + +/** @} */ +