diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2013-05-20 16:40:26 +0200 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-05-20 16:40:26 +0200 |
| commit | f8353236821c2194f3fffd38c26f77d056e66555 (patch) | |
| tree | a17706597917aa8ea3f5b22ce93dc4b1afa3fced /Projects/MIDIToneGenerator | |
| parent | b37bde56753fc19bcab04ab4e24d5922b65026a4 (diff) | |
| parent | 10448970e5c4c5ad374f0887532fedc0daf97c42 (diff) | |
| download | lufa-f8353236821c2194f3fffd38c26f77d056e66555.tar.gz lufa-f8353236821c2194f3fffd38c26f77d056e66555.tar.bz2 lufa-f8353236821c2194f3fffd38c26f77d056e66555.zip | |
Merge branch 'XMEGA-Demo-Ports-ClockOnly'
Diffstat (limited to 'Projects/MIDIToneGenerator')
| -rw-r--r-- | Projects/MIDIToneGenerator/MIDIToneGenerator.c | 2 | ||||
| -rw-r--r-- | Projects/MIDIToneGenerator/MIDIToneGenerator.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Projects/MIDIToneGenerator/MIDIToneGenerator.c b/Projects/MIDIToneGenerator/MIDIToneGenerator.c index 2505a3eeb..662c815bc 100644 --- a/Projects/MIDIToneGenerator/MIDIToneGenerator.c +++ b/Projects/MIDIToneGenerator/MIDIToneGenerator.c @@ -185,12 +185,14 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK) /** Configures the board hardware and chip peripherals for the demo's functionality. */ void SetupHardware(void) { +#if (ARCH == ARCH_AVR8) /* Disable watchdog if enabled by bootloader/fuses */ MCUSR &= ~(1 << WDRF); wdt_disable(); /* Disable clock division */ clock_prescale_set(clock_div_1); +#endif /* Hardware Initialization */ LEDs_Init(); diff --git a/Projects/MIDIToneGenerator/MIDIToneGenerator.h b/Projects/MIDIToneGenerator/MIDIToneGenerator.h index 27ee34bed..ab434f30e 100644 --- a/Projects/MIDIToneGenerator/MIDIToneGenerator.h +++ b/Projects/MIDIToneGenerator/MIDIToneGenerator.h @@ -49,6 +49,7 @@ #include <LUFA/Drivers/Board/LEDs.h> #include <LUFA/Drivers/USB/USB.h> + #include <LUFA/Platform/Platform.h> /* Macros: */ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ |