From 1191da7b7b10c9d90ebe7c22d698d560f35cbc4a Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 9 Jun 2011 04:23:19 +0000 Subject: [PATCH] Add missing AS4 and project description files to the new Audio Host demos. Correct errors in the existing Audio demo description files due to the new demo features (variable sampling rate vs. a fixed sampling rate). --- .../ClassDriver/AudioInput/AudioInput.txt | 5 -- .../ClassDriver/AudioOutput/AudioOutput.txt | 5 -- .../Device/LowLevel/AudioInput/AudioInput.txt | 5 -- .../LowLevel/AudioOutput/AudioOutput.txt | 5 -- .../AudioInputHost/AudioInputHost.aps | 1 + .../AudioInputHost/AudioInputHost.txt | 66 ++++++++++++++++ .../AudioOutputHost/AudioOutputHost.aps | 1 + .../AudioOutputHost/AudioOutputHost.txt | 78 +++++++++++++++++++ .../Host/ClassDriver/AudioOutputHost/makefile | 3 + Demos/Host/ClassDriver/makefile | 8 ++ .../AudioInputHost/AudioInputHost.txt | 66 ++++++++++++++++ .../AudioOutputHost/AudioOutputHost.txt | 78 +++++++++++++++++++ Demos/Host/LowLevel/AudioOutputHost/makefile | 3 + LUFA.pnproj | 2 +- 14 files changed, 305 insertions(+), 21 deletions(-) create mode 100644 Demos/Host/ClassDriver/AudioInputHost/AudioInputHost.aps create mode 100644 Demos/Host/ClassDriver/AudioInputHost/AudioInputHost.txt create mode 100644 Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.aps create mode 100644 Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.txt create mode 100644 Demos/Host/LowLevel/AudioInputHost/AudioInputHost.txt create mode 100644 Demos/Host/LowLevel/AudioOutputHost/AudioOutputHost.txt diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.txt b/Demos/Device/ClassDriver/AudioInput/AudioInput.txt index fd94748d60..dd3f6e682f 100644 --- a/Demos/Device/ClassDriver/AudioInput/AudioInput.txt +++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.txt @@ -82,11 +82,6 @@ * Makefile LUFA_OPTS * When defined, this alters the demo so that the half VCC bias of the microphone input is subtracted. * - * - * AUDIO_SAMPLE_FREQUENCY - * Descriptors.h - * Gives the audio sample rate per channel for the audio stream, in Hz. - * * */ diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt index 9e496ebb65..090f8bed90 100644 --- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt +++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt @@ -87,11 +87,6 @@ * When defined, this outputs the audio samples in mono to port C of the microcontroller, for connection to an * external DAC. * - * - * AUDIO_SAMPLE_FREQUENCY - * Descriptors.h - * Gives the audio sample rate per channel for the audio stream, in Hz. - * * */ diff --git a/Demos/Device/LowLevel/AudioInput/AudioInput.txt b/Demos/Device/LowLevel/AudioInput/AudioInput.txt index fd94748d60..dd3f6e682f 100644 --- a/Demos/Device/LowLevel/AudioInput/AudioInput.txt +++ b/Demos/Device/LowLevel/AudioInput/AudioInput.txt @@ -82,11 +82,6 @@ * Makefile LUFA_OPTS * When defined, this alters the demo so that the half VCC bias of the microphone input is subtracted. * - * - * AUDIO_SAMPLE_FREQUENCY - * Descriptors.h - * Gives the audio sample rate per channel for the audio stream, in Hz. - * * */ diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt b/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt index 9e496ebb65..090f8bed90 100644 --- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt +++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt @@ -87,11 +87,6 @@ * When defined, this outputs the audio samples in mono to port C of the microcontroller, for connection to an * external DAC. * - * - * AUDIO_SAMPLE_FREQUENCY - * Descriptors.h - * Gives the audio sample rate per channel for the audio stream, in Hz. - * * */ diff --git a/Demos/Host/ClassDriver/AudioInputHost/AudioInputHost.aps b/Demos/Host/ClassDriver/AudioInputHost/AudioInputHost.aps new file mode 100644 index 0000000000..eff46d3fa4 --- /dev/null +++ b/Demos/Host/ClassDriver/AudioInputHost/AudioInputHost.aps @@ -0,0 +1 @@ +AudioInputHost09-Jun-2011 14:10:1009-Jun-2011 14:10:10241009-Jun-2011 14:10:1044, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Host\ClassDriver\AudioInputHost\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000AudioInputHost.cAudioInputHost.hmakefiledefaultYESmakefileatmega128111AudioInputHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe diff --git a/Demos/Host/ClassDriver/AudioInputHost/AudioInputHost.txt b/Demos/Host/ClassDriver/AudioInputHost/AudioInputHost.txt new file mode 100644 index 0000000000..329448af04 --- /dev/null +++ b/Demos/Host/ClassDriver/AudioInputHost/AudioInputHost.txt @@ -0,0 +1,66 @@ +/** \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 Audio Input 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:Audio Class
USB Subclass:Standard Audio Device
Relevant Standards:USBIF Audio 1.0 Class Specification \n + * USBIF Audio 1.0 Class Terminal Types Specification \n + * USBIF Audio 1.0 Data Formats Specification
Usable Speeds:Full Speed Mode
+ * + * \section Sec_Description Project Description: + * + * Audio Input host demonstration application. This gives a simple reference + * application for implementing a USB Audio host, for USB Audio devices using + * the USB Audio 1.0 class profile. + * + * Incoming audio will output in 8-bit PWM onto the timer 3 output compare + * channel A, and will also be indicated on the board LEDs. Decouple the PWM + * output with a capacitor and attach to a speaker to hear the audio. + * + * \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/ClassDriver/AudioOutputHost/AudioOutputHost.aps b/Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.aps new file mode 100644 index 0000000000..03478506f4 --- /dev/null +++ b/Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.aps @@ -0,0 +1 @@ +AudioOutputHost09-Jun-2011 14:10:1009-Jun-2011 14:10:10241009-Jun-2011 14:10:1044, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Host\ClassDriver\AudioOutputHost\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000AudioOutputHost.cAudioOutputHost.hmakefiledefaultYESmakefileatmega128111AudioOutputHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe diff --git a/Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.txt b/Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.txt new file mode 100644 index 0000000000..7004053c41 --- /dev/null +++ b/Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.txt @@ -0,0 +1,78 @@ +/** \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 Audio Output 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:Audio Class
USB Subclass:Standard Audio Device
Relevant Standards:USBIF Audio 1.0 Class Specification \n + * USBIF Audio 1.0 Class Terminal Types Specification \n + * USBIF Audio 1.0 Data Formats Specification
Usable Speeds:Full Speed Mode
+ * + * \section Sec_Description Project Description: + * + * Audio Output host demonstration application. This gives a simple reference + * application for implementing a USB Audio host, for USB Audio devices using + * the USB Audio 1.0 class profile. + * + * By default, the demo will produce a square wave test tone when the board + * button is pressed. If USE_TEST_TONE is not defined in the project makefile, + * incoming audio from the ADC channel 1 will be sampled and sent to the attached + * USB audio device instead. + * + * \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. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
Define Name:Location:Description:
USE_TEST_TONEMakefile LUFA_OPTSWhen defined, this alters the demo to produce a square wave test tone when the first board button is pressed + * instead of sampling the board microphone.
MICROPHONE_BIASED_TO_HALF_RAILMakefile LUFA_OPTSWhen defined, this alters the demo so that the half VCC bias of the microphone input is subtracted.
+ */ + diff --git a/Demos/Host/ClassDriver/AudioOutputHost/makefile b/Demos/Host/ClassDriver/AudioOutputHost/makefile index 338590c976..76bf2cada8 100644 --- a/Demos/Host/ClassDriver/AudioOutputHost/makefile +++ b/Demos/Host/ClassDriver/AudioOutputHost/makefile @@ -123,6 +123,9 @@ LUFA_PATH = ../../../.. LUFA_OPTS = -D USB_HOST_ONLY LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS += -D MICROPHONE_BIASED_TO_HALF_RAIL +LUFA_OPTS += -D USE_TEST_TONE + # Create the LUFA source path variables by including the LUFA root makefile include $(LUFA_PATH)/LUFA/makefile diff --git a/Demos/Host/ClassDriver/makefile b/Demos/Host/ClassDriver/makefile index a69c6c31b1..6bce1fd380 100644 --- a/Demos/Host/ClassDriver/makefile +++ b/Demos/Host/ClassDriver/makefile @@ -14,6 +14,12 @@ # code. all: + $(MAKE) -C AudioInputHost clean + $(MAKE) -C AudioInputHost all + + $(MAKE) -C AudioOutputHost clean + $(MAKE) -C AudioOutputHost all + $(MAKE) -C JoystickHostWithParser clean $(MAKE) -C JoystickHostWithParser all @@ -48,6 +54,8 @@ all: $(MAKE) -C VirtualSerialHost all %: + $(MAKE) -C AudioInputHost $@ + $(MAKE) -C AudioOutputHost $@ $(MAKE) -C JoystickHostWithParser $@ $(MAKE) -C KeyboardHost $@ $(MAKE) -C KeyboardHostWithParser $@ diff --git a/Demos/Host/LowLevel/AudioInputHost/AudioInputHost.txt b/Demos/Host/LowLevel/AudioInputHost/AudioInputHost.txt new file mode 100644 index 0000000000..329448af04 --- /dev/null +++ b/Demos/Host/LowLevel/AudioInputHost/AudioInputHost.txt @@ -0,0 +1,66 @@ +/** \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 Audio Input 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:Audio Class
USB Subclass:Standard Audio Device
Relevant Standards:USBIF Audio 1.0 Class Specification \n + * USBIF Audio 1.0 Class Terminal Types Specification \n + * USBIF Audio 1.0 Data Formats Specification
Usable Speeds:Full Speed Mode
+ * + * \section Sec_Description Project Description: + * + * Audio Input host demonstration application. This gives a simple reference + * application for implementing a USB Audio host, for USB Audio devices using + * the USB Audio 1.0 class profile. + * + * Incoming audio will output in 8-bit PWM onto the timer 3 output compare + * channel A, and will also be indicated on the board LEDs. Decouple the PWM + * output with a capacitor and attach to a speaker to hear the audio. + * + * \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/AudioOutputHost/AudioOutputHost.txt b/Demos/Host/LowLevel/AudioOutputHost/AudioOutputHost.txt new file mode 100644 index 0000000000..7004053c41 --- /dev/null +++ b/Demos/Host/LowLevel/AudioOutputHost/AudioOutputHost.txt @@ -0,0 +1,78 @@ +/** \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 Audio Output 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:Audio Class
USB Subclass:Standard Audio Device
Relevant Standards:USBIF Audio 1.0 Class Specification \n + * USBIF Audio 1.0 Class Terminal Types Specification \n + * USBIF Audio 1.0 Data Formats Specification
Usable Speeds:Full Speed Mode
+ * + * \section Sec_Description Project Description: + * + * Audio Output host demonstration application. This gives a simple reference + * application for implementing a USB Audio host, for USB Audio devices using + * the USB Audio 1.0 class profile. + * + * By default, the demo will produce a square wave test tone when the board + * button is pressed. If USE_TEST_TONE is not defined in the project makefile, + * incoming audio from the ADC channel 1 will be sampled and sent to the attached + * USB audio device instead. + * + * \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. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
Define Name:Location:Description:
USE_TEST_TONEMakefile LUFA_OPTSWhen defined, this alters the demo to produce a square wave test tone when the first board button is pressed + * instead of sampling the board microphone.
MICROPHONE_BIASED_TO_HALF_RAILMakefile LUFA_OPTSWhen defined, this alters the demo so that the half VCC bias of the microphone input is subtracted.
+ */ + diff --git a/Demos/Host/LowLevel/AudioOutputHost/makefile b/Demos/Host/LowLevel/AudioOutputHost/makefile index 2a9e8d03a1..487c7d7e7f 100644 --- a/Demos/Host/LowLevel/AudioOutputHost/makefile +++ b/Demos/Host/LowLevel/AudioOutputHost/makefile @@ -123,6 +123,9 @@ LUFA_PATH = ../../../.. LUFA_OPTS = -D USB_HOST_ONLY LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS += -D MICROPHONE_BIASED_TO_HALF_RAIL +LUFA_OPTS += -D USE_TEST_TONE + # Create the LUFA source path variables by including the LUFA root makefile include $(LUFA_PATH)/LUFA/makefile diff --git a/LUFA.pnproj b/LUFA.pnproj index 00ef1f5aac..3cf71c5922 100644 --- a/LUFA.pnproj +++ b/LUFA.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file