Minor formatting updates to the SerialToLCD project - remove unused variable.

[pub/USBasp.git] / Demos / Host / LowLevel / MIDIHost / MIDIHost.c

diff --git a/Demos/Host/LowLevel/MIDIHost/MIDIHost.c b/Demos/Host/LowLevel/MIDIHost/MIDIHost.c
index 5ff3baa..060761f 100644 (file)
--- a/Demos/Host/LowLevel/MIDIHost/MIDIHost.c
+++ b/Demos/Host/LowLevel/MIDIHost/MIDIHost.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2012.

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

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  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


@@ -50,7 +50,8 @@ int main(void)
 
        for (;;)
        {
 
        for (;;)
        {

-               MIDI_Host_Task();
+               MIDIHost_Task();
+

                USB_USBTask();
        }
 }
                USB_USBTask();
        }
 }


@@ -66,11 +67,14 @@ void SetupHardware(void)
        clock_prescale_set(clock_div_1);
 
        /* Hardware Initialization */
        clock_prescale_set(clock_div_1);
 
        /* Hardware Initialization */

-       SerialStream_Init(9600, false);
+       Serial_Init(9600, false);

        LEDs_Init();
        Buttons_Init();
        Joystick_Init();
        USB_Init();
        LEDs_Init();
        Buttons_Init();
        Joystick_Init();
        USB_Init();

+
+       /* Create a stdio stream for the serial port for stdin and stdout */
+       Serial_CreateStream(NULL);

 }
 
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
 }
 
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and


@@ -96,13 +100,42 @@ void EVENT_USB_Host_DeviceUnattached(void)
  */
 void EVENT_USB_Host_DeviceEnumerationComplete(void)
 {
  */
 void EVENT_USB_Host_DeviceEnumerationComplete(void)
 {

+       puts_P(PSTR("Getting Config Data.\r\n"));
+
+       uint8_t ErrorCode;
+
+       /* Get and process the configuration descriptor data */
+       if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)
+       {
+               if (ErrorCode == ControlError)
+                 puts_P(PSTR(ESC_FG_RED "Control Error (Get Configuration).\r\n"));
+               else
+                 puts_P(PSTR(ESC_FG_RED "Invalid Device.\r\n"));
+
+               printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
+
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+               return;
+       }
+
+       /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */
+       if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)
+       {
+               printf_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n"
+                                        " -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
+
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+               return;
+       }
+
+       puts_P(PSTR("MIDI Device Enumerated.\r\n"));

        LEDs_SetAllLEDs(LEDMASK_USB_READY);
 }
 
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
 void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 {
        LEDs_SetAllLEDs(LEDMASK_USB_READY);
 }
 
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
 void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 {

-       USB_ShutDown();
+       USB_Disable();

 
        printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
                                 " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
 
        printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
                                 " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);


@@ -125,147 +158,102 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
 
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
 

-/** Task to set the configuration of the attached device after it has been enumerated, and to read in
- *  note on/off messages from the attached MIDI device and print it to the serial port. When the board
- *  joystick or buttons are pressed, note on/off messages are sent to the attached device.
+/** Task to read in note on/off messages from the attached MIDI device and print it to the serial port.
+ *  When the board joystick or buttons are pressed, note on/off messages are sent to the attached device.

  */
  */

-void MIDI_Host_Task(void)
+void MIDIHost_Task(void)

 {
 {

-       uint8_t ErrorCode;
-
-       switch (USB_HostState)
-       {
-               case HOST_STATE_Addressed:
-                       puts_P(PSTR("Getting Config Data.\r\n"));
-
-                       /* Get and process the configuration descriptor data */
-                       if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)
-                       {
-                               if (ErrorCode == ControlError)
-                                 puts_P(PSTR(ESC_FG_RED "Control Error (Get Configuration).\r\n"));
-                               else
-                                 puts_P(PSTR(ESC_FG_RED "Invalid Device.\r\n"));
-
-                               printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
+       if (USB_HostState != HOST_STATE_Configured)
+         return;

 
 

-                               /* Indicate error via status LEDs */
-                               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+       Pipe_SelectPipe(MIDI_DATA_IN_PIPE);

 
 

-                               /* Wait until USB device disconnected */
-                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-                               break;
-                       }
-
-                       /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */
-                       if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)
-                       {
-                               printf_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n"
-                                                        " -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
-
-                               /* Indicate error via status LEDs */
-                               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-
-                               /* Wait until USB device disconnected */
-                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-                               break;
-                       }
-
-                       puts_P(PSTR("MIDI Device Enumerated.\r\n"));
-
-                       USB_HostState = HOST_STATE_Configured;
-                       break;
-               case HOST_STATE_Configured:
-                       Pipe_SelectPipe(MIDI_DATA_IN_PIPE);
-
-                       if (Pipe_IsINReceived())
-                       {
-                               MIDI_EventPacket_t MIDIEvent;
-
-                               Pipe_Read_Stream_LE(&MIDIEvent, sizeof(MIDIEvent));
-
-                               bool NoteOnEvent  = ((MIDIEvent.Command & 0x0F) == (MIDI_COMMAND_NOTE_ON  >> 4));
-                               bool NoteOffEvent = ((MIDIEvent.Command & 0x0F) == (MIDI_COMMAND_NOTE_OFF >> 4));
+       if (Pipe_IsINReceived())
+       {
+               MIDI_EventPacket_t MIDIEvent;

 
 

-                               if (NoteOnEvent || NoteOffEvent)
-                               {
-                                       printf_P(PSTR("MIDI Note %s - Channel %d, Pitch %d, Velocity %d\r\n"), NoteOnEvent ? "On" : "Off",
-                                                                                                          ((MIDIEvent.Data1 & 0x0F) + 1),
-                                                                                                          MIDIEvent.Data2, MIDIEvent.Data3);
-                               }
-                               
-                               if (!(Pipe_BytesInPipe()))
-                                 Pipe_ClearIN();
-                       }
-
-                       Pipe_SelectPipe(MIDI_DATA_OUT_PIPE);
-
-                       if (Pipe_IsOUTReady())
-                       {
-                               uint8_t MIDICommand = 0;
-                               uint8_t MIDIPitch;
-
-                               static uint8_t PrevJoystickStatus;
-                               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));
-
-                               if (JoystickChanges & JOY_LEFT)
-                               {
-                                       MIDICommand = ((JoystickStatus & JOY_LEFT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
-                                       MIDIPitch   = 0x3C;
-                               }
+               Pipe_Read_Stream_LE(&MIDIEvent, sizeof(MIDIEvent), NULL);

 
 

-                               if (JoystickChanges & JOY_UP)
-                               {
-                                       MIDICommand = ((JoystickStatus & JOY_UP)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
-                                       MIDIPitch   = 0x3D;
-                               }
+               if (!(Pipe_BytesInPipe()))
+                 Pipe_ClearIN();

 
 

-                               if (JoystickChanges & JOY_RIGHT)
-                               {
-                                       MIDICommand = ((JoystickStatus & JOY_RIGHT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
-                                       MIDIPitch   = 0x3E;
-                               }
+               bool NoteOnEvent  = ((MIDIEvent.Command & 0x0F) == (MIDI_COMMAND_NOTE_ON  >> 4));
+               bool NoteOffEvent = ((MIDIEvent.Command & 0x0F) == (MIDI_COMMAND_NOTE_OFF >> 4));

 
 

-                               if (JoystickChanges & JOY_DOWN)
-                               {
-                                       MIDICommand = ((JoystickStatus & JOY_DOWN)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
-                                       MIDIPitch   = 0x3F;
-                               }
+               if (NoteOnEvent || NoteOffEvent)
+               {
+                       printf_P(PSTR("MIDI Note %s - Channel %d, Pitch %d, Velocity %d\r\n"), NoteOnEvent ? "On" : "Off",
+                                                                                                                                                                  ((MIDIEvent.Data1 & 0x0F) + 1),
+                                                                                                                                                                  MIDIEvent.Data2, MIDIEvent.Data3);
+               }
+       }

 
 

-                               if (JoystickChanges & JOY_PRESS)
-                               {
-                                       MIDICommand = ((JoystickStatus & JOY_PRESS)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
-                                       MIDIPitch   = 0x3B;
-                               }
+       Pipe_SelectPipe(MIDI_DATA_OUT_PIPE);

 
 

-                               /* Check if a MIDI command is to be sent */
-                               if (MIDICommand)
+       if (Pipe_IsOUTReady())
+       {
+               uint8_t MIDICommand = 0;
+               uint8_t MIDIPitch;
+
+               static uint8_t PrevJoystickStatus;
+               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));
+
+               if (JoystickChanges & JOY_LEFT)
+               {
+                       MIDICommand = ((JoystickStatus & JOY_LEFT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
+                       MIDIPitch   = 0x3C;
+               }
+
+               if (JoystickChanges & JOY_UP)
+               {
+                       MIDICommand = ((JoystickStatus & JOY_UP)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
+                       MIDIPitch   = 0x3D;
+               }
+
+               if (JoystickChanges & JOY_RIGHT)
+               {
+                       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);
+                       MIDIPitch   = 0x3F;
+               }
+
+               if (JoystickChanges & JOY_PRESS)
+               {
+                       MIDICommand = ((JoystickStatus & JOY_PRESS)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
+                       MIDIPitch   = 0x3B;
+               }
+
+               /* Check if a MIDI command is to be sent */
+               if (MIDICommand)
+               {
+                       MIDI_EventPacket_t MIDIEvent = (MIDI_EventPacket_t)

                                {
                                {

-                                       MIDI_EventPacket_t MIDIEvent = (MIDI_EventPacket_t)
-                                               {
-                                                       .CableNumber = 0,
-                                                       .Command     = (MIDICommand >> 4),
-
-                                                       .Data1       = MIDICommand | Channel,
-                                                       .Data2       = MIDIPitch,
-                                                       .Data3       = MIDI_STANDARD_VELOCITY,
-                                               };
+                                       .CableNumber = 0,
+                                       .Command     = (MIDICommand >> 4),

 
 

-                                       /* Write the MIDI event packet to the pipe */
-                                       Pipe_Write_Stream_LE(&MIDIEvent, sizeof(MIDIEvent));
+                                       .Data1       = MIDICommand | Channel,
+                                       .Data2       = MIDIPitch,
+                                       .Data3       = MIDI_STANDARD_VELOCITY,
+                               };

 
 

-                                       /* Send the data in the pipe to the device */
-                                       Pipe_ClearOUT();
-                               }
+                       /* Write the MIDI event packet to the pipe */
+                       Pipe_Write_Stream_LE(&MIDIEvent, sizeof(MIDIEvent), NULL);

 
 

-                               /* Save previous joystick value for next joystick change detection */
-                               PrevJoystickStatus = JoystickStatus;
-                       }
+                       /* Send the data in the pipe to the device */
+                       Pipe_ClearOUT();
+               }

 
 

-                       break;
+               /* Save previous joystick value for next joystick change detection */
+               PrevJoystickStatus = JoystickStatus;

        }
 }
 
        }
 }