From a8cbe3466b660470b8a34a05996af199827e092c Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 30 Mar 2010 08:32:46 +0000 Subject: [PATCH] Added board hardware driver support for Tom's USBTINY MKII programmer. --- LUFA.pnproj | 2 +- LUFA/Common/BoardTypes.h | 5 +- LUFA/Drivers/Board/BUMBLEB/Buttons.h | 7 +- LUFA/Drivers/Board/BUMBLEB/Joystick.h | 7 +- LUFA/Drivers/Board/BUMBLEB/LEDs.h | 7 +- LUFA/Drivers/Board/LEDs.h | 2 + LUFA/Drivers/Board/TEENSY/LEDs.h | 4 +- LUFA/Drivers/Board/USBTINYMKII/LEDs.h | 123 ++++++++++++++++++++++++++ LUFA/ManPages/ChangeLog.txt | 1 + LUFA/ManPages/DeviceSupport.txt | 1 + 10 files changed, 146 insertions(+), 13 deletions(-) create mode 100644 LUFA/Drivers/Board/USBTINYMKII/LEDs.h diff --git a/LUFA.pnproj b/LUFA.pnproj index b567faa295..1d20f10237 100644 --- a/LUFA.pnproj +++ b/LUFA.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/LUFA/Common/BoardTypes.h b/LUFA/Common/BoardTypes.h index 7a0dbd62c6..50c397d63d 100644 --- a/LUFA/Common/BoardTypes.h +++ b/LUFA/Common/BoardTypes.h @@ -95,9 +95,12 @@ * 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. */ + /** Selects the Teensy (all versions) specific board drivers, including the driver for the board LEDs. */ #define BOARD_TEENSY 11 + /** Selects the USBTINY MKII specific board drivers, , including the driver for the board LEDs. */ + #define BOARD_USBTINYMKII 12 + #if !defined(__DOXYGEN__) #define BOARD_ BOARD_NONE diff --git a/LUFA/Drivers/Board/BUMBLEB/Buttons.h b/LUFA/Drivers/Board/BUMBLEB/Buttons.h index 32c69f9c13..828c23b4bc 100644 --- a/LUFA/Drivers/Board/BUMBLEB/Buttons.h +++ b/LUFA/Drivers/Board/BUMBLEB/Buttons.h @@ -31,7 +31,7 @@ /** \file * \brief Board specific Buttons driver header for the BUMBLEB. * - * Board specific Buttons driver header for the BUMBLEB. + * Board specific Buttons driver header for the BUMBLEB (http://fletchtronics.net/bumble-b). * * The BUMBLEB third-party board does not include any on-board peripherals, but does have an officially recommended * external peripheral layout for buttons, LEDs and a Joystick. @@ -43,8 +43,9 @@ /** \ingroup Group_Buttons * @defgroup Group_Buttons_BUMBLEB BUMBLEB * - * Board specific Buttons driver header for the BUMBLEB. The BUMBLEB third-party board does not include any on-board - * peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick. + * Board specific buttons driver header for the BUMBLEB (http://fletchtronics.net/bumble-b). The BUMBLEB third-party + * board does not include any on-board peripherals, but does have an officially recommended external peripheral layout + * for buttons, LEDs and a Joystick. * * \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. diff --git a/LUFA/Drivers/Board/BUMBLEB/Joystick.h b/LUFA/Drivers/Board/BUMBLEB/Joystick.h index cecd40536f..184112e277 100644 --- a/LUFA/Drivers/Board/BUMBLEB/Joystick.h +++ b/LUFA/Drivers/Board/BUMBLEB/Joystick.h @@ -31,7 +31,7 @@ /** \file * \brief Board specific joystick driver header for the BUMLEB. * - * Board specific joystick driver header for the BUMLEB. + * Board specific joystick driver header for the BUMBLEB (http://fletchtronics.net/bumble-b). * * The BUMBLEB third-party board does not include any on-board peripherals, but does have an officially recommended * external peripheral layout for buttons, LEDs and a Joystick. @@ -43,8 +43,9 @@ /** \ingroup Group_Joystick * @defgroup Group_Joystick_BUMBLEB BUMBLEB * - * Board specific joystick driver header for the BUMBLEB. The BUMBLEB third-party board does not include any on-board - * peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick. + * Board specific joystick driver header for the BUMBLEB (http://fletchtronics.net/bumble-b). The BUMBLEB third-party + * board does not include any on-board peripherals, but does have an officially recommended external peripheral layout + * for buttons, LEDs and a Joystick. * * \note This file should not be included directly. It is automatically included as needed by the joystick driver * dispatch header located in LUFA/Drivers/Board/Joystick.h. diff --git a/LUFA/Drivers/Board/BUMBLEB/LEDs.h b/LUFA/Drivers/Board/BUMBLEB/LEDs.h index 3943240941..25360c0fac 100644 --- a/LUFA/Drivers/Board/BUMBLEB/LEDs.h +++ b/LUFA/Drivers/Board/BUMBLEB/LEDs.h @@ -31,7 +31,7 @@ /** \file * \brief Board specific LED driver header for the BUMBLEB. * - * Board specific LED driver header for the BUMBLEB. + * Board specific LED driver header for the BUMBLEB (http://fletchtronics.net/bumble-b). * * The BUMBLEB third-party board does not include any on-board peripherals, but does have an officially recommended * external peripheral layout for buttons, LEDs and a Joystick. @@ -43,8 +43,9 @@ /** \ingroup Group_LEDs * @defgroup Group_LEDs_BUMBLEB BUMBLEB * - * Board specific LED driver header for the BUMBLEB. The BUMBLEB third-party board does not include any on-board - * peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick. + * Board specific LED driver header for the BUMBLEB (http://fletchtronics.net/bumble-b). The BUMBLEB third-party board + * does not include any on-board peripherals, but does have an officially recommended external peripheral layout for + * buttons, LEDs and a Joystick. * * \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. diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h index 36ab3e4dc7..9d470a700e 100644 --- a/LUFA/Drivers/Board/LEDs.h +++ b/LUFA/Drivers/Board/LEDs.h @@ -104,6 +104,8 @@ #include "EVK527/LEDs.h" #elif (BOARD == BOARD_TEENSY) #include "TEENSY/LEDs.h" + #elif (BOARD == BOARD_USBTINYMKII) + #include "USBTINYMKII/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 index 763a9f91bc..7f58fc0231 100644 --- a/LUFA/Drivers/Board/TEENSY/LEDs.h +++ b/LUFA/Drivers/Board/TEENSY/LEDs.h @@ -31,7 +31,7 @@ /** \file * \brief Board specific LED driver header for the PJRC Teensy boards. * - * Board specific LED driver header for the PJRC Teensy boards. + * Board specific LED driver header for the PJRC Teensy boards (http://www.pjrc.com/teensy/index.html). * * \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. @@ -40,7 +40,7 @@ /** \ingroup Group_LEDs * @defgroup Group_LEDs_TEENSY TEENSY * - * Board specific LED driver header for the PJRC Teensy boards. + * Board specific LED driver header for the PJRC Teensy boards (http://www.pjrc.com/teensy/index.html). * * \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. diff --git a/LUFA/Drivers/Board/USBTINYMKII/LEDs.h b/LUFA/Drivers/Board/USBTINYMKII/LEDs.h new file mode 100644 index 0000000000..9c2b868161 --- /dev/null +++ b/LUFA/Drivers/Board/USBTINYMKII/LEDs.h @@ -0,0 +1,123 @@ +/* + 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 + * \brief Board specific LED driver header for the USBTINY MKII. + * + * Board specific LED driver header for the USBTINY MKII (http://tom-itx.dyndns.org:81/~webpage/). + * + * \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_USBTINYMKII USBTINYMKII + * + * Board specific LED driver header for the USBTINY MKII (http://tom-itx.dyndns.org:81/~webpage/). + * + * \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_USBTINYMKII_H__ +#define __LEDS_USBTINYMKII_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 << 6) + + /** LED mask for the second LED on the board. */ + #define LEDS_LED2 (1 << 7) + + /** 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) + { + DDRB |= LEDS_ALL_LEDS; + PORTB &= ~LEDS_ALL_LEDS; + } + + static inline void LEDs_TurnOnLEDs(const uint8_t LedMask) + { + PORTB |= LedMask; + } + + static inline void LEDs_TurnOffLEDs(const uint8_t LedMask) + { + PORTB &= ~LedMask; + } + + static inline void LEDs_SetAllLEDs(const uint8_t LedMask) + { + PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LedMask); + } + + static inline void LEDs_ChangeLEDs(const uint8_t LedMask, const uint8_t ActiveMask) + { + PORTB = ((PORTB & ~LedMask) | ActiveMask); + } + + static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; + static inline uint8_t LEDs_GetLEDs(void) + { + return (PORTB & 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 07a7134d55..53268882e1 100644 --- a/LUFA/ManPages/ChangeLog.txt +++ b/LUFA/ManPages/ChangeLog.txt @@ -12,6 +12,7 @@ * - 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) + * - Added board hardware driver support for Tom's USBTINY MKII programmer * * Changed: * - AVRISP programmer project now has a more robust timeout system, allowing for an increase of the software USART speed diff --git a/LUFA/ManPages/DeviceSupport.txt b/LUFA/ManPages/DeviceSupport.txt index 77054d56e3..cf9f537093 100644 --- a/LUFA/ManPages/DeviceSupport.txt +++ b/LUFA/ManPages/DeviceSupport.txt @@ -33,6 +33,7 @@ * Currently supported third-party boards (see \ref Group_BoardTypes): * - Bumble-B (using officially recommended peripheral layout) * - Teensy (all revisions and versions) + * - USBTINY MKII (all revisions and versions) * - Any Other Custom User Boards (with Board Drivers if desired, see \ref Page_WritingBoardDrivers) */ \ No newline at end of file