Make Audio device demos compatible with AVRs running at 16MHz instead of 8MHz.

Fix up demo documentation device compatibility list to be as general as possible to reduce changes required as Atmel releases more devices within the same USB AVR series.

15 files changed, 65 insertions, 120 deletions

diff --git a/Demos/Device/LowLevel/AudioInput/AudioInput.c b/Demos/Device/LowLevel/AudioInput/AudioInput.c
index a01c6729c..572e307b0 100644
--- a/Demos/Device/LowLevel/AudioInput/AudioInput.c
+++ b/Demos/Device/LowLevel/AudioInput/AudioInput.c
@@ -84,9 +84,9 @@ void EVENT_USB_Device_Connect(void)
 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 

 	/* Sample reload timer initialization */

-	OCR0A   = (F_CPU / AUDIO_SAMPLE_FREQUENCY) - 1;

+	OCR0A   = (F_CPU / 8 / AUDIO_SAMPLE_FREQUENCY) - 1;

 	TCCR0A  = (1 << WGM01);  // CTC mode

-	TCCR0B  = (1 << CS00);   // Fcpu speed	

+	TCCR0B  = (1 << CS01);   // Fcpu/8 speed

 }

 

 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via

diff --git a/Demos/Device/LowLevel/AudioInput/AudioInput.txt b/Demos/Device/LowLevel/AudioInput/AudioInput.txt
index ca7fe1fa5..b36892d7a 100644
--- a/Demos/Device/LowLevel/AudioInput/AudioInput.txt
+++ b/Demos/Device/LowLevel/AudioInput/AudioInput.txt
@@ -8,12 +8,11 @@
  *

  *  \section SSec_Compat Demo Compatibility:

  *

- *  The following table indicates what microcontrollers are compatible with this demo.

+ *  The following list indicates what microcontrollers are compatible with this demo.

  *

- *  - AT90USB1287

- *  - AT90USB1286

- *  - AT90USB647

- *  - AT90USB646

+ *  - Series 7 USB AVRs

+ *  - Series 6 USB AVRs

+ *  - Series 4 USB AVRs

  *

  *  \section SSec_Info USB Information:

  *

diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
index 28e57c48c..b9c306cc1 100644
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
@@ -79,9 +79,9 @@ void EVENT_USB_Device_Connect(void)
 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 	

 	/* Sample reload timer initialization */

-	OCR0A   = (F_CPU / AUDIO_SAMPLE_FREQUENCY) - 1;

+	OCR0A   = (F_CPU / 8 / AUDIO_SAMPLE_FREQUENCY) - 1;

 	TCCR0A  = (1 << WGM01);  // CTC mode

-	TCCR0B  = (1 << CS00);   // Fcpu speed

+	TCCR0B  = (1 << CS01);   // Fcpu/8 speed

 			

 #if defined(AUDIO_OUT_MONO)

 	/* Set speaker as output */

diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt b/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
index 96d241c57..c305f9c9d 100644
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
@@ -8,13 +8,11 @@
  *

  *  \section SSec_Compat Demo Compatibility:

  *

- *  The following table indicates what microcontrollers are compatible with this demo.

+ *  The following list indicates what microcontrollers are compatible with this demo.

  *

- *  - AT90USB1287

- *  - AT90USB1286

- *  - AT90USB647

- *  - AT90USB646

- *  - ATMEGA32U6

+ *  - Series 7 USB AVRs

+ *  - Series 6 USB AVRs

+ *  - Series 4 USB AVRs

  *

  *  \section SSec_Info USB Information:

  *

diff --git a/Demos/Device/LowLevel/CDC/CDC.txt b/Demos/Device/LowLevel/CDC/CDC.txt
index 93924c894..d0d60e26a 100644
--- a/Demos/Device/LowLevel/CDC/CDC.txt
+++ b/Demos/Device/LowLevel/CDC/CDC.txt
@@ -8,17 +8,12 @@
  *

  *  \section SSec_Compat Demo Compatibility:

  *

- *  The following table indicates what microcontrollers are compatible with this demo.

+ *  The following list indicates what microcontrollers are compatible with this demo.

  *

- *  - AT90USB1287

- *  - AT90USB1286

- *  - AT90USB647

- *  - AT90USB646

- *  - ATMEGA32U6

- *  - ATMEGA32U4

- *  - ATMEGA16U4

- *  - AT90USB162

- *  - AT90USB82

+ *  - Series 7 USB AVRs

+ *  - Series 6 USB AVRs

+ *  - Series 4 USB AVRs

+ *  - Series 2 USB AVRs

  *

  *  \section SSec_Info USB Information:

  *

diff --git a/Demos/Device/LowLevel/DualCDC/DualCDC.txt b/Demos/Device/LowLevel/DualCDC/DualCDC.txt
index eece70614..ba16b7044 100644
--- a/Demos/Device/LowLevel/DualCDC/DualCDC.txt
+++ b/Demos/Device/LowLevel/DualCDC/DualCDC.txt
@@ -8,17 +8,12 @@
  *

  *  \section SSec_Compat Demo Compatibility:

  *

- *  The following table indicates what microcontrollers are compatible with this demo.

+ *  The following list indicates what microcontrollers are compatible with this demo.

  *

- *  - AT90USB1287

- *  - AT90USB1286

- *  - AT90USB647

- *  - AT90USB646

- *  - ATMEGA32U6

- *  - ATMEGA32U4

- *  - ATMEGA16U4

- *  - AT90USB162

- *  - AT90USB82

+ *  - Series 7 USB AVRs

+ *  - Series 6 USB AVRs

+ *  - Series 4 USB AVRs

+ *  - Series 2 USB AVRs

  *

  *  \section SSec_Info USB Information:

  *

diff --git a/Demos/Device/LowLevel/GenericHID/GenericHID.txt b/Demos/Device/LowLevel/GenericHID/GenericHID.txt
index 226b007cf..f8176e69f 100644
--- a/Demos/Device/LowLevel/GenericHID/GenericHID.txt
+++ b/Demos/Device/LowLevel/GenericHID/GenericHID.txt
@@ -8,17 +8,12 @@
  *

  *  \section SSec_Compat Demo Compatibility:

  *

- *  The following table indicates what microcontrollers are compatible with this demo.

+ *  The following list indicates what microcontrollers are compatible with this demo.

  *

- *  - AT90USB1287

- *  - AT90USB1286

- *  - AT90USB647

- *  - AT90USB646

- *  - ATMEGA32U6

- *  - ATMEGA32U4

- *  - ATMEGA16U4

- *  - AT90USB162

- *  - AT90USB82

+ *  - Series 7 USB AVRs

+ *  - Series 6 USB AVRs

+ *  - Series 4 USB AVRs

+ *  - Series 2 USB AVRs

  *

  *  \section SSec_Info USB Information:

  *

diff --git a/Demos/Device/LowLevel/Joystick/Joystick.txt b/Demos/Device/LowLevel/Joystick/Joystick.txt
index d2fdaafd9..4584cf964 100644
--- a/Demos/Device/LowLevel/Joystick/Joystick.txt
+++ b/Demos/Device/LowLevel/Joystick/Joystick.txt
@@ -8,17 +8,12 @@
  *

  *  \section SSec_Compat Demo Compatibility:

  *

- *  The following table indicates what microcontrollers are compatible with this demo.

+ *  The following list indicates what microcontrollers are compatible with this demo.

  *

- *  - AT90USB1287

- *  - AT90USB1286

- *  - AT90USB647

- *  - AT90USB646

- *  - ATMEGA32U6

- *  - ATMEGA32U4

- *  - ATMEGA16U4

- *  - AT90USB162

- *  - AT90USB82

+ *  - Series 7 USB AVRs

+ *  - Series 6 USB AVRs

+ *  - Series 4 USB AVRs

+ *  - Series 2 USB AVRs

  *

  *  \section SSec_Info USB Information:

  *

diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.txt b/Demos/Device/LowLevel/Keyboard/Keyboard.txt
index e1f6785f7..1aa1675ab 100644
--- a/Demos/Device/LowLevel/Keyboard/Keyboard.txt
+++ b/Demos/Device/LowLevel/Keyboard/Keyboard.txt
@@ -8,17 +8,12 @@
  *

  *  \section SSec_Compat Demo Compatibility:

  *

- *  The following table indicates what microcontrollers are compatible with this demo.

+ *  The following list indicates what microcontrollers are compatible with this demo.

  *

- *  - AT90USB1287

- *  - AT90USB1286

- *  - AT90USB647

- *  - AT90USB646

- *  - ATMEGA32U6

- *  - ATMEGA32U4

- *  - ATMEGA16U4

- *  - AT90USB162

- *  - AT90USB82

+ *  - Series 7 USB AVRs

+ *  - Series 6 USB AVRs

+ *  - Series 4 USB AVRs

+ *  - Series 2 USB AVRs

  *

  *  \section SSec_Info USB Information:

  *

diff --git a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt
index ca08602b7..0d4f8113e 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt
+++ b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt
@@ -8,17 +8,12 @@
  *

  *  \section SSec_Compat Demo Compatibility:

  *

- *  The following table indicates what microcontrollers are compatible with this demo.

+ *  The following list indicates what microcontrollers are compatible with this demo.

  *

- *  - AT90USB1287

- *  - AT90USB1286

- *  - AT90USB647

- *  - AT90USB646

- *  - ATMEGA32U6

- *  - ATMEGA32U4

- *  - ATMEGA16U4

- *  - AT90USB162

- *  - AT90USB82

+ *  - Series 7 USB AVRs

+ *  - Series 6 USB AVRs

+ *  - Series 4 USB AVRs

+ *  - Series 2 USB AVRs

  *

  *  \section SSec_Info USB Information:

  *

diff --git a/Demos/Device/LowLevel/MIDI/MIDI.txt b/Demos/Device/LowLevel/MIDI/MIDI.txt
index 30f5c7d13..7f68e5b87 100644
--- a/Demos/Device/LowLevel/MIDI/MIDI.txt
+++ b/Demos/Device/LowLevel/MIDI/MIDI.txt
@@ -8,17 +8,12 @@
  *

  *  \section SSec_Compat Demo Compatibility:

  *

- *  The following table indicates what microcontrollers are compatible with this demo.

+ *  The following list indicates what microcontrollers are compatible with this demo.

  *

- *  - AT90USB1287

- *  - AT90USB1286

- *  - AT90USB647

- *  - AT90USB646

- *  - ATMEGA32U6

- *  - ATMEGA32U4

- *  - ATMEGA16U4

- *  - AT90USB162

- *  - AT90USB82

+ *  - Series 7 USB AVRs

+ *  - Series 6 USB AVRs

+ *  - Series 4 USB AVRs

+ *  - Series 2 USB AVRs

  *

  *  \section SSec_Info USB Information:

  *

diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.txt b/Demos/Device/LowLevel/MassStorage/MassStorage.txt
index 7046b704e..6b0a32733 100644
--- a/Demos/Device/LowLevel/MassStorage/MassStorage.txt
+++ b/Demos/Device/LowLevel/MassStorage/MassStorage.txt
@@ -8,17 +8,12 @@
  *

  *  \section SSec_Compat Demo Compatibility:

  *

- *  The following table indicates what microcontrollers are compatible with this demo.

+ *  The following list indicates what microcontrollers are compatible with this demo.

  *

- *  - AT90USB1287

- *  - AT90USB1286

- *  - AT90USB647

- *  - AT90USB646

- *  - ATMEGA32U6

- *  - ATMEGA32U4

- *  - ATMEGA16U4

- *  - AT90USB162

- *  - AT90USB82

+ *  - Series 7 USB AVRs

+ *  - Series 6 USB AVRs

+ *  - Series 4 USB AVRs

+ *  - Series 2 USB AVRs

  *

  *  \section SSec_Info USB Information:

  *

diff --git a/Demos/Device/LowLevel/Mouse/Mouse.txt b/Demos/Device/LowLevel/Mouse/Mouse.txt
index 54bf9000a..15ab39b0e 100644
--- a/Demos/Device/LowLevel/Mouse/Mouse.txt
+++ b/Demos/Device/LowLevel/Mouse/Mouse.txt
@@ -8,17 +8,12 @@
  *

  *  \section SSec_Compat Demo Compatibility:

  *

- *  The following table indicates what microcontrollers are compatible with this demo.

+ *  The following list indicates what microcontrollers are compatible with this demo.

  *

- *  - AT90USB1287

- *  - AT90USB1286

- *  - AT90USB647

- *  - AT90USB646

- *  - ATMEGA32U6

- *  - ATMEGA32U4

- *  - ATMEGA16U4

- *  - AT90USB162

- *  - AT90USB82

+ *  - Series 7 USB AVRs

+ *  - Series 6 USB AVRs

+ *  - Series 4 USB AVRs

+ *  - Series 2 USB AVRs

  *

  *  \section SSec_Info USB Information:

  *

diff --git a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.txt b/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.txt
index 9725b04f8..b897f1bb5 100644
--- a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.txt
+++ b/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.txt
@@ -8,12 +8,10 @@
  *

  *  \section SSec_Compat Demo Compatibility:

  *

- *  The following table indicates what microcontrollers are compatible with this demo.

+ *  The following list indicates what microcontrollers are compatible with this demo.

  *

- *  - AT90USB1287

- *  - AT90USB1286

- *  - AT90USB647

- *  - AT90USB646

+ *  - Series 7 USB AVRs

+ *  - Series 6 USB AVRs

  *

  *  \section SSec_Info USB Information:

  *

diff --git a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.txt b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.txt
index bdca6f947..065b32967 100644
--- a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.txt
+++ b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.txt
@@ -8,17 +8,12 @@
  *

  *  \section SSec_Compat Demo Compatibility:

  *

- *  The following table indicates what microcontrollers are compatible with this demo.

+ *  The following list indicates what microcontrollers are compatible with this demo.

  *

- *  - AT90USB1287

- *  - AT90USB1286

- *  - AT90USB647

- *  - AT90USB646

- *  - ATMEGA32U6

- *  - ATMEGA32U4

- *  - ATMEGA16U4

- *  - AT90USB162

- *  - AT90USB82

+ *  - Series 7 USB AVRs

+ *  - Series 6 USB AVRs

+ *  - Series 4 USB AVRs

+ *  - Series 2 USB AVRs

  *

  *  \section SSec_Info USB Information:

  *