diff --git a/Demos/Host/LowLevel/AndroidAccessoryHost/AndroidAccessoryHost.c b/Demos/Host/LowLevel/AndroidAccessoryHost/AndroidAccessoryHost.c index 723cf505a0..52ca9101f3 100644 --- a/Demos/Host/LowLevel/AndroidAccessoryHost/AndroidAccessoryHost.c +++ b/Demos/Host/LowLevel/AndroidAccessoryHost/AndroidAccessoryHost.c @@ -93,7 +93,7 @@ void AndroidHost_Task(void) /* Check if data is in the pipe */ if (Pipe_IsReadWriteAllowed()) { - uint8_t NextReceivedByte = Pipe_BytesInPipe(); + uint8_t NextReceivedByte = Pipe_Read_8(); uint8_t LEDMask = LEDS_NO_LEDS; if (NextReceivedByte & 0x01) diff --git a/Demos/Host/LowLevel/AndroidAccessoryHost/AndroidAccessoryHost.txt b/Demos/Host/LowLevel/AndroidAccessoryHost/AndroidAccessoryHost.txt new file mode 100644 index 0000000000..ba6290a517 --- /dev/null +++ b/Demos/Host/LowLevel/AndroidAccessoryHost/AndroidAccessoryHost.txt @@ -0,0 +1,62 @@ +/** \file + * + * This file contains special DoxyGen information for the generation of the main page and other special + * documentation pages. It is not a project source file. + */ + +/** \mainpage Android Accessory Host Demo + * + * \section Sec_Compat Demo Compatibility: + * + * The following list indicates what microcontrollers are compatible with this demo. + * + * - Series 7 USB AVRs (AT90USBxxx7) + * + * \section Sec_Info USB Information: + * + * The following table gives a rundown of the USB utilization of this demo. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
USB Mode:Host
USB Class:Android Accessory Host Class
USB Subclass:N/A
Relevant Standards:Android Accessory Host Specification
Usable Speeds:Full Speed Mode
+ * + * \section Sec_Description Project Description: + * + * Android Accessory Host demonstration application. This gives a simple reference + * application for implementing an Android Accessory Host device capable of hosting + * Android powered mobile devices to send and receive data. + * + * Sent data from the Android device will be indicated onto the board's LEDs. + * + * \section Sec_Options Project Options + * + * The following defines can be found in this demo, which can control the demo behaviour when defined, or changed in value. + * + * + * + * + * + *
+ * None + *
+ */ + diff --git a/Demos/Host/LowLevel/makefile b/Demos/Host/LowLevel/makefile index 08abaa560e..b3aca12886 100644 --- a/Demos/Host/LowLevel/makefile +++ b/Demos/Host/LowLevel/makefile @@ -14,6 +14,9 @@ # code. all: + $(MAKE) -C AndroidAccessoryHost clean + $(MAKE) -C AndroidAccessoryHost all + $(MAKE) -C AudioInputHost clean $(MAKE) -C AudioInputHost all diff --git a/LUFA.pnproj b/LUFA.pnproj index b310434794..0e237e725c 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/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt index fc843089f3..a6876520e9 100644 --- a/LUFA/DoxygenPages/ChangeLog.txt +++ b/LUFA/DoxygenPages/ChangeLog.txt @@ -11,10 +11,11 @@ * - Core: * - Added support for the XMEGA A3BU Xplained board * - Added support for the new B series XMEGA devices - * - Added support for version 2 of the Teensy boards (thanks to Christoph Redecker). + * - Added support for version 2 of the Teensy boards (thanks to Christoph Redecker) * - Library Applications: * - Added User Application APIs to the CDC and DFU class bootloaders * - Added INVERTED_ISP_MISO compile time option to the AVRISP-MKII clone project (thanks to Chuck Rohs) + * - Added new Android Accessory Host demo (thanks to Opendous Inc.) * * Changed: * - Core: diff --git a/LUFA/DoxygenPages/FutureChanges.txt b/LUFA/DoxygenPages/FutureChanges.txt index 83c48805bf..438e14a47a 100644 --- a/LUFA/DoxygenPages/FutureChanges.txt +++ b/LUFA/DoxygenPages/FutureChanges.txt @@ -40,8 +40,10 @@ * -# Add class driver support for Test and Measurement class * -# Add class driver support for EEM class * -# Add class driver support for ECM class + * -# Port all demos to multiple architectures * - Ports - * -# Complete AVR32 port for existing devices, add UC3C support + * -# Finish USB XMEGA port + * -# Add AVR32 UC3C support * -# Atmel ARM7 series microcontrollers * -# Other (commercial) C compilers */ diff --git a/LUFA/DoxygenPages/LibraryApps.txt b/LUFA/DoxygenPages/LibraryApps.txt index 43e7660c57..68c84a914c 100644 --- a/LUFA/DoxygenPages/LibraryApps.txt +++ b/LUFA/DoxygenPages/LibraryApps.txt @@ -79,6 +79,7 @@ * - StillImageHost - Still Image Camera host demo, using the library USB Still Image Class driver framework * - VirtualSerialHost - Virtual Serial Port host demo, using the library USB CDC Class driver framework * - LowLevel + * - AndroidAccessoryHost - Android Accessory host demo, using the low level LUFA APIs to implement the Android Accessory Host class * - AudioInputHost - Audio Input host demo, using the low level LUFA APIs to implement the USB Audio class * - AudioOutputHost - Audio Output host demo, using the low level LUFA APIs to implement the USB Audio class * - GenericHIDHost - Generic HID host demo, using the low level LUFA APIs to implement the USB HID class