projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix incomplete StandaloneProgrammer project code not compiling due to the recent...
[pub/USBasp.git]
/
Demos
/
Host
/
LowLevel
/
MIDIHost
/
MIDIHost.h
diff --git
a/Demos/Host/LowLevel/MIDIHost/MIDIHost.h
b/Demos/Host/LowLevel/MIDIHost/MIDIHost.h
index
2be4d4e
..
f7fb57a
100644
(file)
--- a/
Demos/Host/LowLevel/MIDIHost/MIDIHost.h
+++ b/
Demos/Host/LowLevel/MIDIHost/MIDIHost.h
@@
-1,7
+1,7
@@
/*
LUFA Library
Copyright (C) Dean Camera, 2010.
/*
LUFA Library
Copyright (C) Dean Camera, 2010.
-
+
dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com
*/
dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com
*/
@@
-9,13
+9,13
@@
/*
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
@@
-51,19
+51,19
@@
#include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Drivers/Board/Buttons.h>
#include <LUFA/Drivers/Board/Joystick.h>
#include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Drivers/Board/Buttons.h>
#include <LUFA/Drivers/Board/Joystick.h>
-
+
#include "ConfigDescriptor.h"
#include "ConfigDescriptor.h"
-
+
/* Macros: */
/* Macros: */
- /** MIDI command for a note on (activation) event */
+ /** MIDI command for a note on (activation) event
.
*/
#define MIDI_COMMAND_NOTE_ON 0x90
#define MIDI_COMMAND_NOTE_ON 0x90
- /** MIDI command for a note off (deactivation) event */
+ /** MIDI command for a note off (deactivation) event
.
*/
#define MIDI_COMMAND_NOTE_OFF 0x80
#define MIDI_COMMAND_NOTE_OFF 0x80
-
- /** Standard key press velocity value used for all note events, as no pressure sensor is mounted */
+
+ /** Standard key press velocity value used for all note events, as no pressure sensor is mounted
.
*/
#define MIDI_STANDARD_VELOCITY 64
#define MIDI_STANDARD_VELOCITY 64
-
+
/** Convenience macro. MIDI channels are numbered from 1-10 (natural numbers) however the logical channel
* addresses are zero-indexed. This converts a natural MIDI channel number into the logical channel address.
*
/** Convenience macro. MIDI channels are numbered from 1-10 (natural numbers) however the logical channel
* addresses are zero-indexed. This converts a natural MIDI channel number into the logical channel address.
*
@@
-71,12
+71,6
@@
*/
#define MIDI_CHANNEL(channel) (channel - 1)
*/
#define MIDI_CHANNEL(channel) (channel - 1)
- /** Pipe number for the MIDI data IN pipe */
- #define MIDI_DATAPIPE_IN 1
-
- /** Pipe number for the MIDI data OUT pipe */
- #define MIDI_DATAPIPE_OUT 2
-
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
#define LEDMASK_USB_NOTREADY LEDS_LED1
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
#define LEDMASK_USB_NOTREADY LEDS_LED1
@@
-95,20
+89,22
@@
{
unsigned char Command : 4; /**< MIDI command being sent or received in the event packet */
unsigned char CableNumber : 4; /**< Virtual cable number of the event being sent or received in the given MIDI interface */
{
unsigned char Command : 4; /**< MIDI command being sent or received in the event packet */
unsigned char CableNumber : 4; /**< Virtual cable number of the event being sent or received in the given MIDI interface */
-
+
uint8_t Data1; /**< First byte of data in the MIDI event */
uint8_t Data2; /**< Second byte of data in the MIDI event */
uint8_t Data1; /**< First byte of data in the MIDI event */
uint8_t Data2; /**< Second byte of data in the MIDI event */
- uint8_t Data3; /**< Third byte of data in the MIDI event */
+ uint8_t Data3; /**< Third byte of data in the MIDI event */
} USB_MIDI_EventPacket_t;
/* Function Prototypes: */
void SetupHardware(void);
void MIDI_Host_Task(void);
} USB_MIDI_EventPacket_t;
/* Function Prototypes: */
void SetupHardware(void);
void MIDI_Host_Task(void);
-
+
void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
void EVENT_USB_Host_DeviceAttached(void);
void EVENT_USB_Host_DeviceUnattached(void);
void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
void EVENT_USB_Host_DeviceAttached(void);
void EVENT_USB_Host_DeviceUnattached(void);
- void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
+ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
+ const uint8_t SubErrorCode);
void EVENT_USB_Host_DeviceEnumerationComplete(void);
void EVENT_USB_Host_DeviceEnumerationComplete(void);
-
+
#endif
#endif
+
projects / pub / USBasp.git / blobdiff