From 423d4018f0be89a703832669c3d65b162fc437f3 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 23 Nov 2010 06:56:24 +0000 Subject: [PATCH] Fixed Benito project discarding incoming data from the USB virtual serial port when the USART is busy. Minor documentation improvements. --- LUFA/ManPages/ChangeLog.txt | 18 +++++++++++++++++- LUFA/ManPages/DeviceSupport.txt | 1 + LUFA/ManPages/LUFAPoweredProjects.txt | 5 +++++ Projects/Benito/Benito.c | 5 ++--- .../StandaloneProgrammer.c | 2 +- Projects/LEDNotifier/LEDNotifier.c | 2 +- Projects/USBtoSerial/USBtoSerial.c | 2 +- Projects/XPLAINBridge/XPLAINBridge.c | 2 +- 8 files changed, 29 insertions(+), 8 deletions(-) diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt index b2aa4bb80b..b5d36c9b7d 100644 --- a/LUFA/ManPages/ChangeLog.txt +++ b/LUFA/ManPages/ChangeLog.txt @@ -7,7 +7,23 @@ /** \page Page_ChangeLog Project Changelog * * \section Sec_ChangeLogXXXXXX Version XXXXXX - * None yet. + * New: + * - Core: + * - None + * - Library Applications: + * - None + * + * Changed: + * - Core: + * - None + * - Library Applications: + * - None + * + * Fixed: + * - Core: + * - None + * - Library Applications: + * - Fixed Benito project discarding incoming data from the USB virtual serial port when the USART is busy * * \section Sec_ChangeLog101122 Version 101122 * New: diff --git a/LUFA/ManPages/DeviceSupport.txt b/LUFA/ManPages/DeviceSupport.txt index dac4a36259..7e641016b1 100644 --- a/LUFA/ManPages/DeviceSupport.txt +++ b/LUFA/ManPages/DeviceSupport.txt @@ -40,6 +40,7 @@ * - Linnix UDIP * - MattairTech JM-DB-U2 * - Maximus USB + * - Microsin AVR-USB162 * - Minimus USB * - Olimex AVR-USB-162 * - PJRC Teensy (all revisions and versions) diff --git a/LUFA/ManPages/LUFAPoweredProjects.txt b/LUFA/ManPages/LUFAPoweredProjects.txt index 7227ede75c..ac83a24e4e 100644 --- a/LUFA/ManPages/LUFAPoweredProjects.txt +++ b/LUFA/ManPages/LUFAPoweredProjects.txt @@ -92,4 +92,9 @@ * - Elektor Magazine, "USB is Cool/Sucks" by Jerry Jacobs and Chris Vossen (minor mention), January 2010 Issue * - Elektor Magazine, "20 x Open Source" by Jens Nickel, March 2010 Issue * - Circuit Cellar Magazine, "Advanced USB Design Debugging" by Collin O'Flynn, August 2010 Issue + * + * \section Sec_LUFANotableMentions Other Notable Mentions of LUFA + * - Adafruit "Ask an Engineer", 7th November 2010 + * - Arduino 2010 Keynote speech + * - The Amp Hour podcast blog #11 */ diff --git a/Projects/Benito/Benito.c b/Projects/Benito/Benito.c index 0e6eacb482..fbb81840f3 100644 --- a/Projects/Benito/Benito.c +++ b/Projects/Benito/Benito.c @@ -92,10 +92,9 @@ int main(void) for (;;) { /* Echo bytes from the host to the target via the hardware USART */ - int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface); - if (!(ReceivedByte < 0) && (UCSR1A & (1 << UDRE1))) + if ((UCSR1A & (1 << UDRE1)) && CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface)) { - UDR1 = ReceivedByte; + UDR1 = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface); LEDs_TurnOnLEDs(LEDMASK_TX); PulseMSRemaining.TxLEDPulse = TX_RX_LED_PULSE_MS; diff --git a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c index c1d1d23850..35be12c0af 100644 --- a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c +++ b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c @@ -31,7 +31,7 @@ /** \file * * Main source file for the Standalone Programmer project. This file contains the main tasks of - * the demo and is responsible for the initial application hardware configuration. + * the project and is responsible for the initial application hardware configuration. */ #define INCLUDE_FROM_STANDALONEPROG_C diff --git a/Projects/LEDNotifier/LEDNotifier.c b/Projects/LEDNotifier/LEDNotifier.c index 4ebfb7a2b3..2001c5f782 100644 --- a/Projects/LEDNotifier/LEDNotifier.c +++ b/Projects/LEDNotifier/LEDNotifier.c @@ -31,7 +31,7 @@ /** \file * * Main source file for the LEDNotfier project. This file contains the main tasks of - * the demo and is responsible for the initial application hardware configuration. + * the project and is responsible for the initial application hardware configuration. */ #include "LEDNotifier.h" diff --git a/Projects/USBtoSerial/USBtoSerial.c b/Projects/USBtoSerial/USBtoSerial.c index 7f3474af8e..1dfd70896d 100644 --- a/Projects/USBtoSerial/USBtoSerial.c +++ b/Projects/USBtoSerial/USBtoSerial.c @@ -31,7 +31,7 @@ /** \file * * Main source file for the USBtoSerial project. This file contains the main tasks of - * the demo and is responsible for the initial application hardware configuration. + * the project and is responsible for the initial application hardware configuration. */ #include "USBtoSerial.h" diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c index 15cb87dc45..7c824ec93e 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.c +++ b/Projects/XPLAINBridge/XPLAINBridge.c @@ -31,7 +31,7 @@ /** \file * * Main source file for the XPLAINBridge project. This file contains the main tasks of - * the demo and is responsible for the initial application hardware configuration. + * the project and is responsible for the initial application hardware configuration. */ #include "XPLAINBridge.h"