midi
This commit is contained in:
parent
04885a3b44
commit
b191f8c60f
|
@ -492,7 +492,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
||||||
{
|
{
|
||||||
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
|
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
|
||||||
|
|
||||||
.InterfaceNumber = (NKRO_INTERFACE + 1),
|
.InterfaceNumber = MIDI_INTERFACE,
|
||||||
.AlternateSetting = 0,
|
.AlternateSetting = 0,
|
||||||
|
|
||||||
.TotalEndpoints = 0,
|
.TotalEndpoints = 0,
|
||||||
|
@ -513,14 +513,14 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
||||||
.TotalLength = sizeof(USB_Audio_Descriptor_Interface_AC_t),
|
.TotalLength = sizeof(USB_Audio_Descriptor_Interface_AC_t),
|
||||||
|
|
||||||
.InCollection = 1,
|
.InCollection = 1,
|
||||||
.InterfaceNumber = (NKRO_INTERFACE + 2),
|
.InterfaceNumber = MIDI2_INTERFACE,
|
||||||
},
|
},
|
||||||
|
|
||||||
.Audio_StreamInterface =
|
.Audio_StreamInterface =
|
||||||
{
|
{
|
||||||
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
|
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
|
||||||
|
|
||||||
.InterfaceNumber = (NKRO_INTERFACE + 2),
|
.InterfaceNumber = MIDI2_INTERFACE,
|
||||||
.AlternateSetting = 0,
|
.AlternateSetting = 0,
|
||||||
|
|
||||||
.TotalEndpoints = 2,
|
.TotalEndpoints = 2,
|
||||||
|
|
|
@ -136,12 +136,13 @@ typedef struct
|
||||||
|
|
||||||
#ifdef MIDI_ENABLE
|
#ifdef MIDI_ENABLE
|
||||||
# define MIDI_INTERFACE (NKRO_INTERFACE + 1)
|
# define MIDI_INTERFACE (NKRO_INTERFACE + 1)
|
||||||
|
# define MIDI2_INTERFACE (NKRO_INTERFACE + 2)
|
||||||
#else
|
#else
|
||||||
# define MIDI_INTERFACE NKRO_INTERFACE
|
# define MIDI2_INTERFACE NKRO_INTERFACE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* nubmer of interfaces */
|
/* nubmer of interfaces */
|
||||||
#define TOTAL_INTERFACES (MIDI_INTERFACE + 1)
|
#define TOTAL_INTERFACES MIDI2_INTERFACE + 1
|
||||||
|
|
||||||
|
|
||||||
// Endopoint number and size
|
// Endopoint number and size
|
||||||
|
|
|
@ -94,7 +94,7 @@ USB_ClassInfo_MIDI_Device_t USB_MIDI_Interface =
|
||||||
{
|
{
|
||||||
.Config =
|
.Config =
|
||||||
{
|
{
|
||||||
.StreamingInterfaceNumber = (NKRO_INTERFACE + 2),
|
.StreamingInterfaceNumber = MIDI2_INTERFACE,
|
||||||
.DataINEndpoint =
|
.DataINEndpoint =
|
||||||
{
|
{
|
||||||
.Address = (ENDPOINT_DIR_IN | MIDI_STREAM_IN_EPNUM),
|
.Address = (ENDPOINT_DIR_IN | MIDI_STREAM_IN_EPNUM),
|
||||||
|
@ -289,12 +289,12 @@ void EVENT_USB_Device_ConfigurationChanged(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef MIDI_ENABLE
|
#ifdef MIDI_ENABLE
|
||||||
// ConfigSuccess &= MIDI_Device_ConfigureEndpoints(&USB_MIDI_Interface);
|
ConfigSuccess &= MIDI_Device_ConfigureEndpoints(&USB_MIDI_Interface);
|
||||||
|
|
||||||
ConfigSuccess &= ENDPOINT_CONFIG(MIDI_STREAM_IN_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_IN,
|
// ConfigSuccess &= ENDPOINT_CONFIG(MIDI_STREAM_IN_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_IN,
|
||||||
MIDI_STREAM_EPSIZE, ENDPOINT_BANK_SINGLE);
|
// MIDI_STREAM_EPSIZE, ENDPOINT_BANK_SINGLE);
|
||||||
ConfigSuccess &= ENDPOINT_CONFIG(MIDI_STREAM_OUT_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_OUT,
|
// ConfigSuccess &= ENDPOINT_CONFIG(MIDI_STREAM_OUT_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_OUT,
|
||||||
MIDI_STREAM_EPSIZE, ENDPOINT_BANK_SINGLE);
|
// MIDI_STREAM_EPSIZE, ENDPOINT_BANK_SINGLE);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -614,7 +614,7 @@ void usb_send_func(MidiDevice * device, uint16_t cnt, uint8_t byte0, uint8_t byt
|
||||||
|
|
||||||
uint8_t cable = 0;
|
uint8_t cable = 0;
|
||||||
|
|
||||||
Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);
|
// Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);
|
||||||
|
|
||||||
//if the length is undefined we assume it is a SYSEX message
|
//if the length is undefined we assume it is a SYSEX message
|
||||||
if (midi_packet_length(byte0) == UNDEFINED) {
|
if (midi_packet_length(byte0) == UNDEFINED) {
|
||||||
|
@ -657,8 +657,8 @@ Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Endpoint_Write_Stream_LE(&event, sizeof(event), NULL);
|
// Endpoint_Write_Stream_LE(&event, sizeof(event), NULL);
|
||||||
Endpoint_ClearIN();
|
// Endpoint_ClearIN();
|
||||||
|
|
||||||
MIDI_Device_SendEventPacket(&USB_MIDI_Interface, &event);
|
MIDI_Device_SendEventPacket(&USB_MIDI_Interface, &event);
|
||||||
MIDI_Device_Flush(&USB_MIDI_Interface);
|
MIDI_Device_Flush(&USB_MIDI_Interface);
|
||||||
|
|
Loading…
Reference in a new issue