Skip to content

Commit

Permalink
Merge branch 'midi'
Browse files Browse the repository at this point in the history
  • Loading branch information
Lauszus committed Mar 15, 2018
2 parents b78da9c + 8ef3db2 commit 88fe28f
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions usbh_midi.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ class USBH_MIDI : public USBDeviceConfig
public:
uint16_t pid, vid;
USBH_MIDI(USB *p);
operator bool() { return (pUsb->getUsbTaskState()==USB_STATE_RUNNING && isMidiFound); }
uint16_t idVendor() { return vid; }
uint16_t idProduct() { return pid; }
// Methods for recieving and sending data
uint8_t RecvData(uint16_t *bytes_rcvd, uint8_t *dataptr);
uint8_t RecvData(uint8_t *outBuf, bool isRaw=false);
Expand All @@ -76,8 +79,8 @@ class USBH_MIDI : public USBDeviceConfig
uint8_t extractSysExData(uint8_t *p, uint8_t *buf);
uint8_t SendRawData(uint16_t bytes_send, uint8_t *dataptr);
// backward compatibility functions
inline uint8_t RcvData(uint16_t *bytes_rcvd, uint8_t *dataptr){ return RecvData(bytes_rcvd, dataptr); };
inline uint8_t RcvData(uint8_t *outBuf){ return RecvData(outBuf); };
inline uint8_t RcvData(uint16_t *bytes_rcvd, uint8_t *dataptr) { return RecvData(bytes_rcvd, dataptr); };
inline uint8_t RcvData(uint8_t *outBuf) { return RecvData(outBuf); };

// USBDeviceConfig implementation
virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
Expand Down

0 comments on commit 88fe28f

Please sign in to comment.