From b8db5fc1e7a49c0b91a67570e11edf90f985cd00 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 24 Mar 2010 08:06:23 +0000 Subject: Added new Relay Controller Board project (thanks to OBinou). Added hardware board driver support for the PJRC Teensy line of USB AVR boards. --- LUFA/Common/BoardTypes.h | 3 + LUFA/Drivers/Board/LEDs.h | 8 +-- LUFA/Drivers/Board/TEENSY/LEDs.h | 126 +++++++++++++++++++++++++++++++++++++++ LUFA/ManPages/ChangeLog.txt | 2 + LUFA/ManPages/DeviceSupport.txt | 10 ++-- 5 files changed, 140 insertions(+), 9 deletions(-) create mode 100644 LUFA/Drivers/Board/TEENSY/LEDs.h (limited to 'LUFA') diff --git a/LUFA/Common/BoardTypes.h b/LUFA/Common/BoardTypes.h index 10e31ac1b..38ea5c912 100644 --- a/LUFA/Common/BoardTypes.h +++ b/LUFA/Common/BoardTypes.h @@ -94,6 +94,9 @@ * such as the Joystick driver, where the removal would adversely affect the code's operation is still disallowed. */ #define BOARD_NONE 10 + /** Selects the Teensy (all versions) specific board drivers, including the driver for the board LEDs. */ + #define BOARD_TEENSY 11 + #if !defined(__DOXYGEN__) #define BOARD_ BOARD_NONE diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h index 94fbf3cf7..ce4ba54f4 100644 --- a/LUFA/Drivers/Board/LEDs.h +++ b/LUFA/Drivers/Board/LEDs.h @@ -95,14 +95,14 @@ #include "RZUSBSTICK/LEDs.h" #elif (BOARD == BOARD_ATAVRUSBRF01) #include "ATAVRUSBRF01/LEDs.h" - #elif (BOARD == BOARD_XPLAIN) - #include "XPLAIN/LEDs.h" - #elif (BOARD == BOARD_XPLAIN_REV1) + #elif ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1)) #include "XPLAIN/LEDs.h" #elif (BOARD == BOARD_BUMBLEB) #include "BUMBLEB/LEDs.h" #elif (BOARD == BOARD_EVK527) - #include "EVK527/LEDs.h" + #include "EVK527/LEDs.h" + #elif (BOARD == BOARD_TEENSY) + #include "TEENSY/LEDs.h" #elif (BOARD == BOARD_USER) #include "Board/LEDs.h" #endif diff --git a/LUFA/Drivers/Board/TEENSY/LEDs.h b/LUFA/Drivers/Board/TEENSY/LEDs.h new file mode 100644 index 000000000..755d578ed --- /dev/null +++ b/LUFA/Drivers/Board/TEENSY/LEDs.h @@ -0,0 +1,126 @@ +/* + 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 + * + * Board specific LED driver header for the PJRC Teensy series boards. + * + * \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_TEENSY TEENSY + * + * Board specific LED driver header for the PJRC Teensy boards. + * + * \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. + * + * @{ + */ + +#ifndef __LEDS_TEENSY_H__ +#define __LEDS_TEENSY_H__ + + /* Includes: */ + #include + + #include "../../../Common/Common.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 << 6) + + /** LED mask for all the LEDs on the board. */ + #define LEDS_ALL_LEDS (1 << 6) + + /** 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 | LEDMask) & ~ActiveMask); + } + + 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/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt index ecb83bbd3..3be0bdc4f 100644 --- a/LUFA/ManPages/ChangeLog.txt +++ b/LUFA/ManPages/ChangeLog.txt @@ -10,6 +10,8 @@ * * New: * - Added incomplete MIDIToneGenerator project + * - Added board hardware driver support for the PJRC Teensy line of USB AVR boards + * - Added new Relay Controller Board project (thanks to OBinou) * * Changed: * - AVRISP programmer project now has a more robust timeout system, allowing for an increse of the software USART speed diff --git a/LUFA/ManPages/DeviceSupport.txt b/LUFA/ManPages/DeviceSupport.txt index 0902b90a2..77054d56e 100644 --- a/LUFA/ManPages/DeviceSupport.txt +++ b/LUFA/ManPages/DeviceSupport.txt @@ -21,18 +21,18 @@ * - AT90USB1286 (USB Device Only) * - AT90USB1287 (USB Host and Device) * - * Currently supported Atmel boards: + * Currently supported Atmel boards (see \ref Group_BoardTypes): * - AT90USBKEY * - ATAVRUSBRF01 * - EVK527 * - RZUSBSTICK * - STK525 * - STK526 - * - XPLAIN Revision 1 (Board AT90USB1287 only, original 45DB041D Dataflash IC) - * - XPLAIN Revision 2 onwards (Board AT90USB1287 only, newer 45DB642D Dataflash IC) + * - XPLAIN (Both original first revision board, and newer boards with a different Dataflash model) * - * Currently supported third-party boards (via hardware drivers): - * - BUMBLEB (using officially recommended peripheral layout) + * Currently supported third-party boards (see \ref Group_BoardTypes): + * - Bumble-B (using officially recommended peripheral layout) + * - Teensy (all revisions and versions) * - Any Other Custom User Boards (with Board Drivers if desired, see \ref Page_WritingBoardDrivers) */ \ No newline at end of file -- cgit v1.2.3