Sync with upstream (#14)

Bootloaders/HID/HostLoaderApp/hid_bootloader_cli.c

@@ -1118,6 +1118,8 @@ static const struct {
 
 	// Add duplicates that match friendly Teensy Names
 	// Match board names in boards.txt
+	{"TEENSY",      15872,   128},
+	{"TEENSYPP",    64512,   256},
 	{"TEENSY2",     32256,   128},
 	{"TEENSY2PP",  130048,   256},
 	{"TEENSYLC",    63488,   512},

BuildTests/BoardDriverTest/BoardDeviceMap.cfg

@@ -56,7 +56,9 @@ BOARD_SPARKFUN8U2       = AVR8  : atmega8u2      :
 BOARD_STK525            = AVR8  : at90usb647     :
 BOARD_STK526            = AVR8  : at90usb162     :
 BOARD_TEENSY            = AVR8  : at90usb162     :
-BOARD_TEENSY2           = AVR8  : at90usb646     :
+BOARD_TEENSYPP          = AVR8  : at90usb646     :
+BOARD_TEENSY2           = AVR8  : atmega32u4     :
+BOARD_TEENSY2PP         = AVR8  : at90usb1286    :
 BOARD_TUL               = AVR8  : atmega32u4     :
 BOARD_UDIP              = AVR8  : atmega32u2     :
 BOARD_UNO               = AVR8  : atmega8u2      :

LUFA/Common/BoardTypes.h

@@ -246,8 +246,14 @@
 			/** Selects the Atmel Xplained-MINI specific board drivers, including the driver for the board LEDs. */
 			#define BOARD_XPLAINED_MINI        60
 
-			/** Selects the QMK specific board drivres, including the driver for the board LEDs. */
-			#define BOARD_QMK                  61
+			/** Selects the Teensy version 1.x ++ specific board drivers, including the driver for the board LEDs. */
+			#define BOARD_TEENSYPP             61
+
+			/** Selects the Teensy version 2.x ++ specific board drivers, including the driver for the board LEDs. */
+			#define BOARD_TEENSY2PP            62
+
+			/** Selects the QMK specific board drivers, including the driver for the board LEDs. */
+			#define BOARD_QMK                  63
 
 			#if !defined(__DOXYGEN__)
 				#define BOARD_                 BOARD_NONE

LUFA/DoxygenPages/ChangeLog.txt

@@ -11,9 +11,11 @@
   *  - Core:
   *   - RNDIS_Device_ReadPacket() now takes in an explicit destination buffer length, rather than assuming it is ETHERNET_MAX_FRAME_SIZE in length.
   *   - RNDIS_Host_ReadPacket() now takes in an explicit destination buffer length, rather than assuming it is ETHERNET_MAX_FRAME_SIZE in length.
+  *   - New board definitions have been added for the Teensy 1.0++ and Teensy 2.0++ board variants (thanks to Osamu Aoki)
   *  - Library Applications:
   *   - The hand-rolled TCP/IP stack has been removed from the LowLevel and ClassDriver RNDIS examples, as it is incomplete and should be replaced
   *     with a proper network stack anyway.
+  *   - AVRISP MKII Clone now checks the device EEPROM for magic values to determine if the stored settings are valid (thanks to Sergey Vlasov)
   *
   *  \section Sec_ChangeLog210130 Version 210130
   *  <b>New:</b>

LUFA/DoxygenPages/LUFAPoweredProjects.txt

@@ -151,6 +151,7 @@
  *  \li USB MIDI to DMX controller: http://github.com/hanshuebner/miDiMX
  *  \li USB Mood Light: https://github.com/hsbp/usb_moodlight
  *  \li USB powered Geiger Counter: http://uhrheber.wordpress.com/2011/04/28/a-usb-powered-geiger-counter-for-the-z2-and-other-computers/
+ *  \li USB Userport, a USB HID GPIO interface: https://github.com/Zapfenkiller/USB-Userport
  *  \li Userial, a USB to Serial converter with SPI, I2C and other protocols: http://www.tty1.net/userial/
  *  \li Wii Classic Controller to USB converter: https://github.com/crazyiop/wii-classic-2-usb
  *  \li Wireless MIDI Guitar system: http://www.ise.pw.edu.pl/~wzab/wireless_guitar_system/

LUFA/Drivers/Board/AVR8/TEENSY/Board.h

@@ -36,18 +36,32 @@
  *        dispatch header located in LUFA/Drivers/Board/Board.h.
  */
 
+/** \ingroup Group_BoardInfo
+ *  \defgroup Group_BoardInfo_TEENSY2PP TEENSY2PP
+ *  \brief Board specific information header for the PJRC Teensy 2++ boards.
+ *
+ *  See \ref Group_BoardInfo_TEENSY for more details.
+ */
+
 /** \ingroup Group_BoardInfo
  *  \defgroup Group_BoardInfo_TEENSY2 TEENSY2
  *  \brief Board specific information header for the PJRC Teensy 2 boards.
  *
  *  See \ref Group_BoardInfo_TEENSY for more details.
  */
 
+/** \ingroup Group_BoardInfo
+ *  \defgroup Group_BoardInfo_TEENSYPP TEENSYPP
+ *  \brief Board specific information header for the PJRC Teensy 1++ boards.
+ *
+ *  See \ref Group_BoardInfo_TEENSY for more details.
+ */
+
 /** \ingroup Group_BoardInfo
  *  \defgroup Group_BoardInfo_TEENSY TEENSY
- *  \brief Board specific information header for the PJRC Teensy 1.x/2.x boards.
+ *  \brief Board specific information header for the PJRC Teensy 1 boards.
  *
- *  Board specific information header for the PJRC Teensy boards (http://www.pjrc.com/teensy/index.html).
+ *  Board specific information header for the PJRC Teensy 1, 1++, 2, 2++ boards (http://www.pjrc.com/teensy/index.html).
  *
  *  @{
  */

LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h

@@ -36,28 +36,48 @@
  *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
  */
 
+/** \ingroup Group_LEDs
+ *  \defgroup Group_LEDs_TEENSY2PP TEENSY2PP
+ *  \brief Board specific LED driver header for the PJRC Teensy 2 ++ boards.
+ *
+ *  See \ref Group_LEDs_TEENSY for more details.
+ */
+
 /** \ingroup Group_LEDs
  *  \defgroup Group_LEDs_TEENSY2 TEENSY2
  *  \brief Board specific LED driver header for the PJRC Teensy 2 boards.
  *
  *  See \ref Group_LEDs_TEENSY for more details.
  */
 
+/** \ingroup Group_LEDs
+ *  \defgroup Group_LEDs_TEENSYPP TEENSYPP
+ *  \brief Board specific LED driver header for the PJRC Teensy 1 ++ boards.
+ *
+ *  See \ref Group_LEDs_TEENSY for more details.
+ */
+
 /** \ingroup Group_LEDs
  *  \defgroup Group_LEDs_TEENSY TEENSY
  *  \brief Board specific LED driver header for the PJRC Teensy 1.x/2.x boards.
  *
+ *  \note For version 2 ++ Teensy boards, compile with <code>BOARD = TEENSY2PP</code>.
+ *
  *  \note For version 2 Teensy boards, compile with <code>BOARD = TEENSY2</code>.
  *
+ *  \note For version 1 ++  Teensy boards, compile with <code>BOARD = TEENSYPP</code>.
+ *
+ *  \note For version 1 Teensy boards, compile with <code>BOARD = TEENSY</code>.
+ *
  *  Board specific LED driver header for the PJRC Teensy boards (http://www.pjrc.com/teensy/index.html).
  *
- *  <b>TEENSY</b>:
+ *  <b>TEENSY</b>, <b>TEENSYPP</b>:
  *  <table>
  *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
  *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.6</td></tr>
  *  </table>
  *
- *  <b>TEENSY2</b>:
+ *  <b>TEENSY2</b>, <b>TEENSY2PP</b>:
  *  <table>
  *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
  *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>Low</td><td>PORTD.6</td></tr>
@@ -99,7 +119,7 @@
 			{
 				DDRD  |= LEDS_ALL_LEDS;
 
-				#if (BOARD == BOARD_TEENSY2)
+				#if (BOARD == BOARD_TEENSY2) || (BOARD == BOARD_TEENSY2PP)
 				PORTD &= ~LEDS_ALL_LEDS;
 				#else
 				PORTD |=  LEDS_ALL_LEDS;
@@ -114,7 +134,7 @@
 
 			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
 			{
-				#if (BOARD == BOARD_TEENSY2)
+				#if (BOARD == BOARD_TEENSY2) || (BOARD == BOARD_TEENSY2PP)
 				PORTD |=  LEDMask;
 				#else
 				PORTD &= ~LEDMask;
@@ -123,7 +143,7 @@
 
 			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
 			{
-				#if (BOARD == BOARD_TEENSY2)
+				#if (BOARD == BOARD_TEENSY2) || (BOARD == BOARD_TEENSY2PP)
 				PORTD &= ~LEDMask;
 				#else
 				PORTD |=  LEDMask;
@@ -132,7 +152,7 @@
 
 			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
 			{
-				#if (BOARD == BOARD_TEENSY2)
+				#if (BOARD == BOARD_TEENSY2) || (BOARD == BOARD_TEENSY2PP)
 				PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
 				#else
 				PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask);
@@ -142,7 +162,7 @@
 			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
 			                                   const uint8_t ActiveMask)
 			{
-				#if (BOARD == BOARD_TEENSY2)
+				#if (BOARD == BOARD_TEENSY2) || (BOARD == BOARD_TEENSY2PP)
 				PORTD = ((PORTD & ~LEDMask) | ActiveMask);
 				#else
 				PORTD = ((PORTD | LEDMask) & ~ActiveMask);
@@ -157,7 +177,7 @@
 			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
 			static inline uint8_t LEDs_GetLEDs(void)
 			{
-				#if (BOARD == BOARD_TEENSY2)
+				#if (BOARD == BOARD_TEENSY2) || (BOARD == BOARD_TEENSY2PP)
 				return (PORTD & LEDS_ALL_LEDS);
 				#else
 				return (~PORTD & LEDS_ALL_LEDS);

LUFA/Drivers/Board/Board.h

@@ -79,7 +79,8 @@
 			#include "AVR8/BUMBLEB/Board.h"
 		#elif (BOARD == BOARD_EVK527)
 			#include "AVR8/EVK527/Board.h"
-		#elif ((BOARD == BOARD_TEENSY) || (BOARD == BOARD_TEENSY2))
+		#elif ((BOARD == BOARD_TEENSY) || (BOARD == BOARD_TEENSYPP)) || \
+		      ((BOARD == BOARD_TEENSY2) || (BOARD == BOARD_TEENSY2PP))
 			#include "AVR8/TEENSY/Board.h"
 		#elif ((BOARD == BOARD_QMK))
 			#include "AVR8/QMK/Board.h"

LUFA/Drivers/Board/LEDs.h

@@ -132,7 +132,8 @@
 			#include "AVR8/BUMBLEB/LEDs.h"
 		#elif (BOARD == BOARD_EVK527)
 			#include "AVR8/EVK527/LEDs.h"
-		#elif ((BOARD == BOARD_TEENSY) || (BOARD == BOARD_TEENSY2))
+		#elif ((BOARD == BOARD_TEENSY) || (BOARD == BOARD_TEENSYPP)) || \
+		      ((BOARD == BOARD_TEENSY2) || (BOARD == BOARD_TEENSY2PP))
 			#include "AVR8/TEENSY/LEDs.h"
 		#elif ((BOARD == BOARD_QMK))
 			#include "AVR8/QMK/LEDs.h"

LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c

@@ -81,7 +81,7 @@ void RNDIS_Device_ProcessControlRequest(USB_ClassInfo_RNDIS_Device_t* const RNDI
 		case RNDIS_REQ_SendEncapsulatedCommand:
 			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
 			{
-				if (USB_ControlRequest.wLength >= sizeof(RNDISInterfaceInfo->Config.MessageBuffer))
+				if (USB_ControlRequest.wLength > RNDISInterfaceInfo->Config.MessageBufferLength)
 					break;
 
 				Endpoint_ClearSETUP();

LUFA/Version.h

@@ -54,10 +54,10 @@
 				#define LUFA_VERSION_RELEASE_TYPE_FULL          2
 			/**@}*/
 
-			/** Indicates the version number of the library, as an integer. \note This value is only updates in non-development releases. */
+			/** Indicates the version number of the library, as an integer. \note This value is only updated in non-development releases. */
 			#define LUFA_VERSION_INTEGER              0x210130
 
-			/** Indicates the version number of the library, as a string. \note This value is only updates in non-development releases. */
+			/** Indicates the version number of the library, as a string. \note This value is only updated in non-development releases. */
 			#define LUFA_VERSION_STRING               "210130"
 
 			/** Indicates the release type of the library. */