Changed AudioOutput demos to explicitly use timer 3 - the smaller USB AVRs where...

[pub/USBasp.git] / Demos / Device / ClassDriver / AudioOutput / AudioOutput.c

diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
index 129fca5..bbcd2fd 100644 (file)
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
@@ -108,19 +108,19 @@ void ProcessNextSample(void)
 \r
 #if defined(AUDIO_OUT_MONO)\r
                /* Load the sample into the PWM timer channel */\r
-               OCRxA = ((uint8_t)MixedSample_8Bit ^ (1 << 7));\r
+               OCR3A = ((uint8_t)MixedSample_8Bit ^ (1 << 7));\r
 #elif defined(AUDIO_OUT_STEREO)\r
                /* Load the dual 8-bit samples into the PWM timer channels */\r
-               OCRxA = ((uint8_t)LeftSample_8Bit  ^ (1 << 7));\r
-               OCRxB = ((uint8_t)RightSample_8Bit ^ (1 << 7));\r
+               OCR3A = ((uint8_t)LeftSample_8Bit  ^ (1 << 7));\r
+               OCR3B = ((uint8_t)RightSample_8Bit ^ (1 << 7));\r
 #elif defined(AUDIO_OUT_PORTC)\r
+               /* Load the 8-bit mixed sample into PORTC */\r
                PORTC = MixedSample_8Bit;\r
 #else\r
                uint8_t LEDMask = LEDS_NO_LEDS;\r
 \r
                /* Make mixed sample value positive (absolute) */\r
-               if (MixedSample_8Bit < 0)\r
-                 MixedSample_8Bit = -MixedSample_8Bit;\r
+               MixedSample_8Bit = abs(MixedSample_8Bit);\r
 \r
                if (MixedSample_8Bit > ((128 / 8) * 1))\r
                  LEDMask |= LEDS_LED1;\r
@@ -162,9 +162,9 @@ void EVENT_USB_Connect(void)
 \r
 #if (defined(AUDIO_OUT_MONO) || defined(AUDIO_OUT_STEREO))\r
        /* PWM speaker timer initialization */\r
-       TCCRxA  = ((1 << WGMx0) | (1 << COMxA1) | (1 << COMxA0)\r
-               | (1 << COMxB1) | (1 << COMxB0)); // Set on match, clear on TOP\r
-       TCCRxB  = ((1 << WGMx2) | (1 << CSx0));  // Fast 8-Bit PWM, Fcpu speed\r
+       TCCR3A  = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)\r
+               | (1 << COM3B1) | (1 << COM3B0)); // Set on match, clear on TOP\r
+       TCCR3B  = ((1 << WGM32) | (1 << CS30));  // Fast 8-Bit PWM, Fcpu speed\r
 #endif\r
 }\r
 \r
@@ -178,7 +178,7 @@ void EVENT_USB_Disconnect(void)
 \r
 #if (defined(AUDIO_OUT_MONO) || defined(AUDIO_OUT_STEREO))\r
        /* Stop the PWM generation timer */\r
-       TCCRxB = 0;\r
+       TCCR3B = 0;\r
 #endif\r
 \r
 #if defined(AUDIO_OUT_MONO)\r