aboutsummaryrefslogtreecommitdiff
path: root/Demos/Device
diff options
context:
space:
mode:
authorDean Camera <[email protected]>2009-10-12 05:59:55 +0000
committerDean Camera <[email protected]>2009-10-12 05:59:55 +0000
commitdc68de15b69c2064b1b14d00659aa91054cccbe1 (patch)
tree36e3ac322537017ae61ae9d70ba56efddad8fc02 /Demos/Device
parentbe9d0a5aa97c84cc8723f69f2b88576965e386aa (diff)
downloadqmk_firmware-dc68de15b69c2064b1b14d00659aa91054cccbe1.tar.gz
qmk_firmware-dc68de15b69c2064b1b14d00659aa91054cccbe1.zip
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.
Diffstat (limited to 'Demos/Device')
-rw-r--r--Demos/Device/ClassDriver/AudioInput/AudioInput.c4
-rw-r--r--Demos/Device/ClassDriver/AudioInput/AudioInput.txt10
-rw-r--r--Demos/Device/ClassDriver/AudioOutput/AudioOutput.c4
-rw-r--r--Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt10
-rw-r--r--Demos/Device/ClassDriver/CDC/CDC.txt15
-rw-r--r--Demos/Device/ClassDriver/DualCDC/DualCDC.txt15
-rw-r--r--Demos/Device/ClassDriver/GenericHID/GenericHID.txt15
-rw-r--r--Demos/Device/ClassDriver/Joystick/Joystick.txt15
-rw-r--r--Demos/Device/ClassDriver/Keyboard/Keyboard.txt15
-rw-r--r--Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.txt15
-rw-r--r--Demos/Device/ClassDriver/MIDI/MIDI.txt15
-rw-r--r--Demos/Device/ClassDriver/MassStorage/MassStorage.txt15
-rw-r--r--Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.txt15
-rw-r--r--Demos/Device/ClassDriver/Mouse/Mouse.txt15
-rw-r--r--Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.txt8
-rw-r--r--Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.txt15
-rw-r--r--Demos/Device/LowLevel/AudioInput/AudioInput.c4
-rw-r--r--Demos/Device/LowLevel/AudioInput/AudioInput.txt9
-rw-r--r--Demos/Device/LowLevel/AudioOutput/AudioOutput.c4
-rw-r--r--Demos/Device/LowLevel/AudioOutput/AudioOutput.txt10
-rw-r--r--Demos/Device/LowLevel/CDC/CDC.txt15
-rw-r--r--Demos/Device/LowLevel/DualCDC/DualCDC.txt15
-rw-r--r--Demos/Device/LowLevel/GenericHID/GenericHID.txt15
-rw-r--r--Demos/Device/LowLevel/Joystick/Joystick.txt15
-rw-r--r--Demos/Device/LowLevel/Keyboard/Keyboard.txt15
-rw-r--r--Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt15
-rw-r--r--Demos/Device/LowLevel/MIDI/MIDI.txt15
-rw-r--r--Demos/Device/LowLevel/MassStorage/MassStorage.txt15
-rw-r--r--Demos/Device/LowLevel/Mouse/Mouse.txt15
-rw-r--r--Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.txt8
-rw-r--r--Demos/Device/LowLevel/USBtoSerial/USBtoSerial.txt15
31 files changed, 135 insertions, 251 deletions
diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.c b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
index 3aa26ae856..cf9d3b47e5 100644
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.c
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
@@ -117,9 +117,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 library USB Disconnection event. */
diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.txt b/Demos/Device/ClassDriver/AudioInput/AudioInput.txt
index b6649cca0a..585faec1b5 100644
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.txt
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.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/ClassDriver/AudioOutput/AudioOutput.c b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
index a95e43fd57..3648b6ea78 100644
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
@@ -136,9 +136,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/ClassDriver/AudioOutput/AudioOutput.txt b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt
index 96d241c57d..c305f9c9db 100644
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt
+++ b/Demos/Device/ClassDriver/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/ClassDriver/CDC/CDC.txt b/Demos/Device/ClassDriver/CDC/CDC.txt
index 93924c8949..d0d60e26af 100644
--- a/Demos/Device/ClassDriver/CDC/CDC.txt
+++ b/Demos/Device/ClassDriver/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/ClassDriver/DualCDC/DualCDC.txt b/Demos/Device/ClassDriver/DualCDC/DualCDC.txt
index eece70614a..ba16b7044f 100644
--- a/Demos/Device/ClassDriver/DualCDC/DualCDC.txt
+++ b/Demos/Device/ClassDriver/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/ClassDriver/GenericHID/GenericHID.txt b/Demos/Device/ClassDriver/GenericHID/GenericHID.txt
index 226b007cf7..f8176e69fb 100644
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.txt
+++ b/Demos/Device/ClassDriver/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/ClassDriver/Joystick/Joystick.txt b/Demos/Device/ClassDriver/Joystick/Joystick.txt
index d2fdaafd9d..4584cf964f 100644
--- a/Demos/Device/ClassDriver/Joystick/Joystick.txt
+++ b/Demos/Device/ClassDriver/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/ClassDriver/Keyboard/Keyboard.txt b/Demos/Device/ClassDriver/Keyboard/Keyboard.txt
index 17018a8132..b1f5c2b537 100644
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.txt
+++ b/Demos/Device/ClassDriver/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/ClassDriver/KeyboardMouse/KeyboardMouse.txt b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.txt
index ca08602b7a..0d4f8113ee 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.txt
+++ b/Demos/Device/ClassDriver/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/ClassDriver/MIDI/MIDI.txt b/Demos/Device/ClassDriver/MIDI/MIDI.txt
index 30f5c7d13d..7f68e5b871 100644
--- a/Demos/Device/ClassDriver/MIDI/MIDI.txt
+++ b/Demos/Device/ClassDriver/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/ClassDriver/MassStorage/MassStorage.txt b/Demos/Device/ClassDriver/MassStorage/MassStorage.txt
index 7046b704e7..6b0a327335 100644
--- a/Demos/Device/ClassDriver/MassStorage/MassStorage.txt
+++ b/Demos/Device/ClassDriver/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/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.txt b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.txt
index 0fb5989668..bed44f81de 100644
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.txt
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.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/ClassDriver/Mouse/Mouse.txt b/Demos/Device/ClassDriver/Mouse/Mouse.txt
index 6171866bdb..4d55bbf2bd 100644
--- a/Demos/Device/ClassDriver/Mouse/Mouse.txt
+++ b/Demos/Device/ClassDriver/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/ClassDriver/RNDISEthernet/RNDISEthernet.txt b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.txt
index 9725b04f8c..b897f1bb59 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.txt
+++ b/Demos/Device/ClassDriver/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/ClassDriver/USBtoSerial/USBtoSerial.txt b/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.txt
index 17f64522ba..065b329673 100644
--- a/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.txt
+++ b/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.txt
@@ -8,17 +8,12 @@
*
* \section SSec_Compat Demo Compatibility:
*
- * This demo is known to be compatible with the following microcontrollers:
+ * 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/AudioInput/AudioInput.c b/Demos/Device/LowLevel/AudioInput/AudioInput.c
index a01c6729cc..572e307b02 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 ca7fe1fa5a..b36892d7a5 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 28e57c48c5..b9c306cc1a 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 96d241c57d..c305f9c9db 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 93924c8949..d0d60e26af 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 eece70614a..ba16b7044f 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 226b007cf7..f8176e69fb 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 d2fdaafd9d..4584cf964f 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 e1f6785f76..1aa1675ab7 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 ca08602b7a..0d4f8113ee 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 30f5c7d13d..7f68e5b871 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 7046b704e7..6b0a327335 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 54bf9000ac..15ab39b0e2 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 9725b04f8c..b897f1bb59 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 bdca6f9472..065b329673 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:
*