Update Studio Integration DLL, to include package logging.

[pub/USBasp.git] / Projects / MIDIToneGenerator / MIDIToneGenerator.c

diff --git a/Projects/MIDIToneGenerator/MIDIToneGenerator.c b/Projects/MIDIToneGenerator/MIDIToneGenerator.c
index 2505a3e..98cd596 100644 (file)
--- a/Projects/MIDIToneGenerator/MIDIToneGenerator.c
+++ b/Projects/MIDIToneGenerator/MIDIToneGenerator.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2013.
+     Copyright (C) Dean Camera, 2015.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2015  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -44,7 +44,7 @@ USB_ClassInfo_MIDI_Device_t Keyboard_MIDI_Interface =
        {
                .Config =
                        {
        {
                .Config =
                        {

-                               .StreamingInterfaceNumber = 1,
+                               .StreamingInterfaceNumber = INTERFACE_ID_AudioStream,

                                .DataINEndpoint           =
                                        {
                                                .Address          = MIDI_STREAM_IN_EPADDR,
                                .DataINEndpoint           =
                                        {
                                                .Address          = MIDI_STREAM_IN_EPADDR,


@@ -110,7 +110,7 @@ int main(void)
                                        /* Check if the note is unused */
                                        if (!(NoteData[i].Pitch))
                                        {
                                        /* Check if the note is unused */
                                        if (!(NoteData[i].Pitch))
                                        {

-                                               /* If a note is unused, it's age is essentially infinite - always prefer unused not entries */
+                                               /* If a note is unused, it's age is essentially infinite - always prefer unused note entries */

                                                LRUNoteStruct = &NoteData[i];
                                                break;
                                        }
                                                LRUNoteStruct = &NoteData[i];
                                                break;
                                        }


@@ -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)
 {
 /** 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);
        /* 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();
 
        /* Hardware Initialization */
        LEDs_Init();