eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added board hardware driver support for Tom's USBTINY MKII programmer.

This commit is contained in:
Dean Camera 2010-03-30 08:32:46 +00:00
parent 9257f4ab8e
commit a8cbe3466b
10 changed files with 146 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LUFA.pnproj
View File

File diff suppressed because one or more lines are too long

5
LUFA/Common/BoardTypes.h
View File

@ -95,9 +95,12 @@
* such as the Joystick driver, where the removal would adversely affect the code's operation is still disallowed. */ * such as the Joystick driver, where the removal would adversely affect the code's operation is still disallowed. */
#define BOARD_NONE 10 #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 #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__) #if !defined(__DOXYGEN__)
#define BOARD_ BOARD_NONE #define BOARD_ BOARD_NONE

7
LUFA/Drivers/Board/BUMBLEB/Buttons.h
View File

@ -31,7 +31,7 @@
/** \file /** \file
* \brief Board specific Buttons driver header for the BUMBLEB. * \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 * 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. * external peripheral layout for buttons, LEDs and a Joystick.
@ -43,8 +43,9 @@
/** \ingroup Group_Buttons /** \ingroup Group_Buttons
* @defgroup Group_Buttons_BUMBLEB BUMBLEB * @defgroup Group_Buttons_BUMBLEB BUMBLEB
* *
* Board specific Buttons driver header for the BUMBLEB. The BUMBLEB third-party board does not include any on-board * Board specific buttons driver header for the BUMBLEB (http://fletchtronics.net/bumble-b). The BUMBLEB third-party
* peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick. * 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 * \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. * dispatch header located in LUFA/Drivers/Board/Buttons.h.

7
LUFA/Drivers/Board/BUMBLEB/Joystick.h
View File

@ -31,7 +31,7 @@
/** \file /** \file
* \brief Board specific joystick driver header for the BUMLEB. * \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 * 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. * external peripheral layout for buttons, LEDs and a Joystick.
@ -43,8 +43,9 @@
/** \ingroup Group_Joystick /** \ingroup Group_Joystick
* @defgroup Group_Joystick_BUMBLEB BUMBLEB * @defgroup Group_Joystick_BUMBLEB BUMBLEB
* *
* Board specific joystick driver header for the BUMBLEB. The BUMBLEB third-party board does not include any on-board * Board specific joystick driver header for the BUMBLEB (http://fletchtronics.net/bumble-b). The BUMBLEB third-party
* peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick. * 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 * \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. * dispatch header located in LUFA/Drivers/Board/Joystick.h.

7
LUFA/Drivers/Board/BUMBLEB/LEDs.h
View File

@ -31,7 +31,7 @@
/** \file /** \file
* \brief Board specific LED driver header for the BUMBLEB. * \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 * 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. * external peripheral layout for buttons, LEDs and a Joystick.
@ -43,8 +43,9 @@
/** \ingroup Group_LEDs /** \ingroup Group_LEDs
* @defgroup Group_LEDs_BUMBLEB BUMBLEB * @defgroup Group_LEDs_BUMBLEB BUMBLEB
* *
* Board specific LED driver header for the BUMBLEB. The BUMBLEB third-party board does not include any on-board * Board specific LED driver header for the BUMBLEB (http://fletchtronics.net/bumble-b). The BUMBLEB third-party board
* peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick. * 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 * \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. * dispatch header located in LUFA/Drivers/Board/LEDs.h.

2
LUFA/Drivers/Board/LEDs.h
View File

@ -104,6 +104,8 @@
#include "EVK527/LEDs.h" #include "EVK527/LEDs.h"
#elif (BOARD == BOARD_TEENSY) #elif (BOARD == BOARD_TEENSY)
#include "TEENSY/LEDs.h" #include "TEENSY/LEDs.h"
#elif (BOARD == BOARD_USBTINYMKII)
#include "USBTINYMKII/LEDs.h"
#elif (BOARD == BOARD_USER) #elif (BOARD == BOARD_USER)
#include "Board/LEDs.h" #include "Board/LEDs.h"
#endif #endif

4
LUFA/Drivers/Board/TEENSY/LEDs.h
View File

@ -31,7 +31,7 @@
/** \file /** \file
* \brief Board specific LED driver header for the PJRC Teensy boards. * \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 * \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. * dispatch header located in LUFA/Drivers/Board/LEDs.h.
@ -40,7 +40,7 @@
/** \ingroup Group_LEDs /** \ingroup Group_LEDs
* @defgroup Group_LEDs_TEENSY TEENSY * @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 * \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. * dispatch header located in LUFA/Drivers/Board/LEDs.h.

123
LUFA/Drivers/Board/USBTINYMKII/LEDs.h Normal file
View File

@ -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 <avr/io.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 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
/** @} */

1
LUFA/ManPages/ChangeLog.txt
View File

@ -12,6 +12,7 @@
* - Added incomplete MIDIToneGenerator project * - Added incomplete MIDIToneGenerator project
* - Added board hardware driver support for the PJRC Teensy line of USB AVR boards * - Added board hardware driver support for the PJRC Teensy line of USB AVR boards
* - Added new Relay Controller Board project (thanks to OBinou) * - Added new Relay Controller Board project (thanks to OBinou)
* - Added board hardware driver support for Tom's USBTINY MKII programmer
* *
* <b>Changed:</b> * <b>Changed:</b>
* - AVRISP programmer project now has a more robust timeout system, allowing for an increase of the software USART speed * - AVRISP programmer project now has a more robust timeout system, allowing for an increase of the software USART speed

1
LUFA/ManPages/DeviceSupport.txt
View File

@ -33,6 +33,7 @@
* Currently supported third-party boards (see \ref Group_BoardTypes): * Currently supported third-party boards (see \ref Group_BoardTypes):
* - Bumble-B (using officially recommended peripheral layout) * - Bumble-B (using officially recommended peripheral layout)
* - Teensy (all revisions and versions) * - 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) * - Any Other Custom User Boards (with Board Drivers if desired, see \ref Page_WritingBoardDrivers)
*/ */