diff options
Diffstat (limited to 'Demos/Device/ClassDriver')
| -rw-r--r-- | Demos/Device/ClassDriver/AudioOutput/AudioOutput.c | 18 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/AudioOutput/AudioOutput.h | 49 |
2 files changed, 10 insertions, 57 deletions
diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c index 129fca5f1..bbcd2fd7c 100644 --- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c +++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c @@ -108,19 +108,19 @@ void ProcessNextSample(void) #if defined(AUDIO_OUT_MONO)
/* Load the sample into the PWM timer channel */
- OCRxA = ((uint8_t)MixedSample_8Bit ^ (1 << 7));
+ OCR3A = ((uint8_t)MixedSample_8Bit ^ (1 << 7));
#elif defined(AUDIO_OUT_STEREO)
/* Load the dual 8-bit samples into the PWM timer channels */
- OCRxA = ((uint8_t)LeftSample_8Bit ^ (1 << 7));
- OCRxB = ((uint8_t)RightSample_8Bit ^ (1 << 7));
+ OCR3A = ((uint8_t)LeftSample_8Bit ^ (1 << 7));
+ OCR3B = ((uint8_t)RightSample_8Bit ^ (1 << 7));
#elif defined(AUDIO_OUT_PORTC)
+ /* Load the 8-bit mixed sample into PORTC */
PORTC = MixedSample_8Bit;
#else
uint8_t LEDMask = LEDS_NO_LEDS;
/* Make mixed sample value positive (absolute) */
- if (MixedSample_8Bit < 0)
- MixedSample_8Bit = -MixedSample_8Bit;
+ MixedSample_8Bit = abs(MixedSample_8Bit);
if (MixedSample_8Bit > ((128 / 8) * 1))
LEDMask |= LEDS_LED1;
@@ -162,9 +162,9 @@ void EVENT_USB_Connect(void) #if (defined(AUDIO_OUT_MONO) || defined(AUDIO_OUT_STEREO))
/* PWM speaker timer initialization */
- TCCRxA = ((1 << WGMx0) | (1 << COMxA1) | (1 << COMxA0)
- | (1 << COMxB1) | (1 << COMxB0)); // Set on match, clear on TOP
- TCCRxB = ((1 << WGMx2) | (1 << CSx0)); // Fast 8-Bit PWM, Fcpu speed
+ TCCR3A = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)
+ | (1 << COM3B1) | (1 << COM3B0)); // Set on match, clear on TOP
+ TCCR3B = ((1 << WGM32) | (1 << CS30)); // Fast 8-Bit PWM, Fcpu speed
#endif
}
@@ -178,7 +178,7 @@ void EVENT_USB_Disconnect(void) #if (defined(AUDIO_OUT_MONO) || defined(AUDIO_OUT_STEREO))
/* Stop the PWM generation timer */
- TCCRxB = 0;
+ TCCR3B = 0;
#endif
#if defined(AUDIO_OUT_MONO)
diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h index ecc4e6fae..ea897c954 100644 --- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h +++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h @@ -50,54 +50,7 @@ #include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/USB/Class/Audio.h>
- /* Macros: */
- #if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
- #define TCCRxA TCCR3A
- #define TCCRxB TCCR3B
- #define OCRxA OCR3A
- #define OCRxB OCR3B
- #define WGMx0 WGM30
- #define WGMx2 WGM32
- #define COMxA1 COM3A1
- #define COMxA0 COM3A0
- #define COMxB1 COM3B1
- #define COMxB0 COM3B0
- #define CSx0 CS30
- #else
- /** Timer count register used for left channel PWM audio output (or mixed output in mono output mode) */
- #define TCCRxA TCCR1A
-
- /** Timer count register used for right channel PWM audio output */
- #define TCCRxB TCCR1B
-
- /** Timer compare register used for left channel PWM audio output (or mixed output in mono output mode) */
- #define OCRxA OCR1A
-
- /** Timer compare register used for right channel PWM audio output */
- #define OCRxB OCR1B
-
- /** Timer control register mask used to select PWM mode */
- #define WGMx0 WGM10
-
- /** Timer control register mask used to select PWM mode */
- #define WGMx2 WGM12
-
- /** Timer control register mask used to set, clear or toggle channel output pin on match */
- #define COMxA1 COM1A1
-
- /** Timer control register mask used to set, clear or toggle channel output pin on match */
- #define COMxA0 COM1A0
-
- /** Timer control register mask used to set, clear or toggle channel output pin on match */
- #define COMxB1 COM1B1
-
- /** Timer control register mask used to set, clear or toggle channel output pin on match */
- #define COMxB0 COM1B0
-
- /** Timer control register mask used to start the timer at Fcpu clock rate */
- #define CSx0 CS10
- #endif
-
+ /* Macros: */
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
#define LEDMASK_USB_NOTREADY LEDS_LED1
|