projects / pub / USBasp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Re-add in old Endpoint/Pipe workaround for unordered pipes - add new ORDERED_EP_CONFI...
[pub/USBasp.git] / Demos / Host / ClassDriver / MIDIHost / MIDIHost.c
diff --git a/Demos/Host/ClassDriver/MIDIHost/MIDIHost.c b/Demos/Host/ClassDriver/MIDIHost/MIDIHost.c
index faaebdd..eda8272 100644 (file)
--- a/Demos/Host/ClassDriver/MIDIHost/MIDIHost.c
+++ b/Demos/Host/ClassDriver/MIDIHost/MIDIHost.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
-              
+
   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
 */
 
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in
   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -33,7 +33,7 @@
  *  Main source file for the MIDIHost demo. This file contains the main tasks of
  *  the demo and is responsible for the initial application hardware configuration.
  */
  *  Main source file for the MIDIHost demo. This file contains the main tasks of
  *  the demo and is responsible for the initial application hardware configuration.
  */
- 
+
 #include "MIDIHost.h"
 
 /** LUFA MIDI Class driver interface configuration and state information. This structure is
 #include "MIDIHost.h"
 
 /** LUFA MIDI Class driver interface configuration and state information. This structure is
@@ -46,13 +46,13 @@ USB_ClassInfo_MIDI_Host_t Keyboard_MIDI_Interface =
                        {
                                .DataINPipeNumber       = 1,
                                .DataINPipeDoubleBank   = false,
                        {
                                .DataINPipeNumber       = 1,
                                .DataINPipeDoubleBank   = false,
-                               
+
                                .DataOUTPipeNumber      = 2,
                                .DataOUTPipeDoubleBank  = false,
                        },
        };
 
                                .DataOUTPipeNumber      = 2,
                                .DataOUTPipeDoubleBank  = false,
                        },
        };
 
-       
+
 /** Main program entry point. This routine configures the hardware required by the application, then
  *  enters a loop to run the application tasks in sequence.
  */
 /** Main program entry point. This routine configures the hardware required by the application, then
  *  enters a loop to run the application tasks in sequence.
  */
@@ -71,7 +71,7 @@ int main(void)
                {
                        case HOST_STATE_Addressed:
                                LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
                {
                        case HOST_STATE_Addressed:
                                LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
-                       
+
                                uint16_t ConfigDescriptorSize;
                                uint8_t  ConfigDescriptorData[512];
 
                                uint16_t ConfigDescriptorSize;
                                uint8_t  ConfigDescriptorData[512];
 
@@ -92,7 +92,7 @@ int main(void)
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                        break;
                                }
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                        break;
                                }
-                               
+
                                if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
                                {
                                        puts_P(PSTR("Error Setting Device Configuration.\r\n"));
                                if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
                                {
                                        puts_P(PSTR("Error Setting Device Configuration.\r\n"));
@@ -100,20 +100,20 @@ int main(void)
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                        break;
                                }
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                        break;
                                }
-                               
+
                                puts_P(PSTR("MIDI Device Enumerated.\r\n"));
                                LEDs_SetAllLEDs(LEDMASK_USB_READY);
                                USB_HostState = HOST_STATE_Configured;
                                break;
                        case HOST_STATE_Configured:
                                CheckJoystickMovement();
                                puts_P(PSTR("MIDI Device Enumerated.\r\n"));
                                LEDs_SetAllLEDs(LEDMASK_USB_READY);
                                USB_HostState = HOST_STATE_Configured;
                                break;
                        case HOST_STATE_Configured:
                                CheckJoystickMovement();
-                               
+
                                MIDI_EventPacket_t MIDIEvent;
                                MIDI_EventPacket_t MIDIEvent;
-                               if (MIDI_Host_ReceiveEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent))
+                               while (MIDI_Host_ReceiveEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent))
                                {
                                        bool NoteOnEvent  = ((MIDIEvent.Command & 0x0F) == (MIDI_COMMAND_NOTE_ON  >> 4));
                                        bool NoteOffEvent = ((MIDIEvent.Command & 0x0F) == (MIDI_COMMAND_NOTE_OFF >> 4));
                                {
                                        bool NoteOnEvent  = ((MIDIEvent.Command & 0x0F) == (MIDI_COMMAND_NOTE_ON  >> 4));
                                        bool NoteOffEvent = ((MIDIEvent.Command & 0x0F) == (MIDI_COMMAND_NOTE_OFF >> 4));
-                                       
+
                                        if (NoteOnEvent || NoteOffEvent)
                                        {
                                                printf_P(PSTR("MIDI Note %s - Channel %d, Pitch %d, Velocity %d\r\n"), NoteOnEvent ? "On" : "Off",
                                        if (NoteOnEvent || NoteOffEvent)
                                        {
                                                printf_P(PSTR("MIDI Note %s - Channel %d, Pitch %d, Velocity %d\r\n"), NoteOnEvent ? "On" : "Off",
@@ -121,10 +121,10 @@ int main(void)
                                                                                                                                                                                       MIDIEvent.Data2, MIDIEvent.Data3);
                                        }
                                }
                                                                                                                                                                                       MIDIEvent.Data2, MIDIEvent.Data3);
                                        }
                                }
-               
+
                                break;
                }
                                break;
                }
-       
+
                MIDI_Host_USBTask(&Keyboard_MIDI_Interface);
                USB_USBTask();
        }
                MIDI_Host_USBTask(&Keyboard_MIDI_Interface);
                USB_USBTask();
        }
@@ -154,11 +154,11 @@ void CheckJoystickMovement(void)
 
        uint8_t MIDICommand = 0;
        uint8_t MIDIPitch;
 
        uint8_t MIDICommand = 0;
        uint8_t MIDIPitch;
-       
+
        /* Get current joystick mask, XOR with previous to detect joystick changes */
        uint8_t JoystickStatus  = Joystick_GetStatus();
        uint8_t JoystickChanges = (JoystickStatus ^ PrevJoystickStatus);
        /* Get current joystick mask, XOR with previous to detect joystick changes */
        uint8_t JoystickStatus  = Joystick_GetStatus();
        uint8_t JoystickChanges = (JoystickStatus ^ PrevJoystickStatus);
-               
+
        /* Get board button status - if pressed use channel 10 (percussion), otherwise use channel 1 */
        uint8_t Channel = ((Buttons_GetStatus() & BUTTONS_BUTTON1) ? MIDI_CHANNEL(10) : MIDI_CHANNEL(1));
 
        /* Get board button status - if pressed use channel 10 (percussion), otherwise use channel 1 */
        uint8_t Channel = ((Buttons_GetStatus() & BUTTONS_BUTTON1) ? MIDI_CHANNEL(10) : MIDI_CHANNEL(1));
 
@@ -179,7 +179,7 @@ void CheckJoystickMovement(void)
                MIDICommand = ((JoystickStatus & JOY_RIGHT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
                MIDIPitch   = 0x3E;
        }
                MIDICommand = ((JoystickStatus & JOY_RIGHT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
                MIDIPitch   = 0x3E;
        }
-       
+
        if (JoystickChanges & JOY_DOWN)
        {
                MIDICommand = ((JoystickStatus & JOY_DOWN)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
        if (JoystickChanges & JOY_DOWN)
        {
                MIDICommand = ((JoystickStatus & JOY_DOWN)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
@@ -191,19 +191,19 @@ void CheckJoystickMovement(void)
                MIDICommand = ((JoystickStatus & JOY_PRESS)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
                MIDIPitch   = 0x3B;
        }
                MIDICommand = ((JoystickStatus & JOY_PRESS)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
                MIDIPitch   = 0x3B;
        }
-       
+
        if (MIDICommand)
        {
                MIDI_EventPacket_t MIDIEvent = (MIDI_EventPacket_t)
                        {
                                .CableNumber = 0,
                                .Command     = (MIDICommand >> 4),
        if (MIDICommand)
        {
                MIDI_EventPacket_t MIDIEvent = (MIDI_EventPacket_t)
                        {
                                .CableNumber = 0,
                                .Command     = (MIDICommand >> 4),
-                               
+
                                .Data1       = MIDICommand | Channel,
                                .Data2       = MIDIPitch,
                                .Data1       = MIDICommand | Channel,
                                .Data2       = MIDIPitch,
-                               .Data3       = MIDI_STANDARD_VELOCITY,                  
+                               .Data3       = MIDI_STANDARD_VELOCITY,
                        };
                        };
-                       
+
                MIDI_Host_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);
                MIDI_Host_Flush(&Keyboard_MIDI_Interface);
        }
                MIDI_Host_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);
                MIDI_Host_Flush(&Keyboard_MIDI_Interface);
        }
@@ -259,6 +259,7 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
                                 " -- Error Code %d\r\n"
                                 " -- Sub Error Code %d\r\n"
                                 " -- In State %d\r\n" ESC_FG_WHITE), ErrorCode, SubErrorCode, USB_HostState);
                                 " -- Error Code %d\r\n"
                                 " -- Sub Error Code %d\r\n"
                                 " -- In State %d\r\n" ESC_FG_WHITE), ErrorCode, SubErrorCode, USB_HostState);
-       
+
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
+
USB isp AVR programmer