diff --git a/README.md b/README.md index c5b9866..8ba1c3f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# USBH_MIDI v0.6.0 +# USBH_MIDI v0.6.1 USB-MIDI 1.0 class driver for Arduino [USB Host Shield 2.0 Library][UHS2] @@ -78,6 +78,9 @@ If your device does not work, please report this information. Get the USB device address. ## ChangeLog +2022.1.6 (0.6.1) +* Fix for RecvData(uint8_t) does not work when CableNumber(CN) is non-zero. + 2021.5.9 (0.6.0) * Change configuration descriptor parser. Supports large descriptors. * Fixed an issue when the endpoint size exceeded 64 bytes diff --git a/usbh_midi.cpp b/usbh_midi.cpp index e7bfcaf..e9f3d87 100644 --- a/usbh_midi.cpp +++ b/usbh_midi.cpp @@ -1,7 +1,7 @@ /* ******************************************************************************* * USB-MIDI class driver for USB Host Shield 2.0 Library - * Copyright (c) 2012-2021 Yuuichi Akagawa + * Copyright (c) 2012-2022 Yuuichi Akagawa * * Idea from LPK25 USB-MIDI to Serial MIDI converter * by Collin Cunningham - makezine.com, narbotic.com @@ -359,7 +359,7 @@ uint8_t USBH_MIDI::RecvData(uint8_t *outBuf, bool isRaw) *(outBuf++) = recvBuf[readPtr++]; *(outBuf++) = recvBuf[readPtr++]; - return getMsgSizeFromCin(cin); + return getMsgSizeFromCin(cin & 0x0f); } /* Send data to MIDI device */ diff --git a/usbh_midi.h b/usbh_midi.h index 5309a18..c6784d0 100644 --- a/usbh_midi.h +++ b/usbh_midi.h @@ -1,7 +1,7 @@ /* ******************************************************************************* * USB-MIDI class driver for USB Host Shield 2.0 Library - * Copyright (c) 2012-2021 Yuuichi Akagawa + * Copyright (c) 2012-2022 Yuuichi Akagawa * * Idea from LPK25 USB-MIDI to Serial MIDI converter * by Collin Cunningham - makezine.com, narbotic.com @@ -28,7 +28,7 @@ #define _USBH_MIDI_H_ #include "Usb.h" -#define USBH_MIDI_VERSION 600 +#define USBH_MIDI_VERSION 601 #define MIDI_MAX_ENDPOINTS 3 //endpoint 0, bulk_IN(MIDI), bulk_OUT(MIDI) #define USB_SUBCLASS_MIDISTREAMING 3 #define MIDI_EVENT_PACKET_SIZE 64