forked from micropython/micropython
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Add USB MIDI support for SAMD and nRF. #1449
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule tinyusb
updated
1018 files
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| /* | ||
| * This file is part of the Micro Python project, http://micropython.org/ | ||
| * | ||
| * The MIT License (MIT) | ||
| * | ||
| * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| #include <stdint.h> | ||
|
|
||
| #include "shared-bindings/usb_midi/PortIn.h" | ||
| #include "shared-bindings/util.h" | ||
|
|
||
| #include "py/ioctl.h" | ||
| #include "py/objproperty.h" | ||
| #include "py/runtime.h" | ||
| #include "py/stream.h" | ||
| #include "supervisor/shared/translate.h" | ||
|
|
||
|
|
||
| //| .. currentmodule:: usb_midi | ||
| //| | ||
| //| :class:`PortIn` -- receives midi commands over USB | ||
| //| =================================================== | ||
| //| | ||
| //| .. class:: PortIn() | ||
| //| | ||
| //| Not currently dynamically supported. | ||
| //| | ||
| //| PortIn objects are constructed for every corresponding entry in the USB descriptor and added | ||
| //| to the `usb_midi.ports` tuple. | ||
| //| | ||
|
|
||
| STATIC mp_obj_t usb_midi_portin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *pos_args) { | ||
| return mp_const_none; | ||
| } | ||
|
|
||
| // These are standard stream methods. Code is in py/stream.c. | ||
| // | ||
| //| .. method:: read(nbytes=None) | ||
| //| | ||
| //| Read characters. If ``nbytes`` is specified then read at most that many | ||
| //| bytes. Otherwise, read everything that arrives until the connection | ||
| //| times out. Providing the number of bytes expected is highly recommended | ||
| //| because it will be faster. | ||
| //| | ||
| //| :return: Data read | ||
| //| :rtype: bytes or None | ||
| //| | ||
| //| .. method:: readinto(buf, nbytes=None) | ||
| //| | ||
| //| Read bytes into the ``buf``. If ``nbytes`` is specified then read at most | ||
| //| that many bytes. Otherwise, read at most ``len(buf)`` bytes. | ||
| //| | ||
| //| :return: number of bytes read and stored into ``buf`` | ||
| //| :rtype: bytes or None | ||
| //| | ||
|
|
||
| // These three methods are used by the shared stream methods. | ||
| STATIC mp_uint_t usb_midi_portin_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) { | ||
| usb_midi_portin_obj_t *self = MP_OBJ_TO_PTR(self_in); | ||
| byte *buf = buf_in; | ||
|
|
||
| // make sure we want at least 1 char | ||
| if (size == 0) { | ||
| return 0; | ||
| } | ||
|
|
||
| return common_hal_usb_midi_portin_read(self, buf, size, errcode); | ||
| } | ||
|
|
||
| STATIC mp_uint_t usb_midi_portin_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { | ||
| usb_midi_portin_obj_t *self = MP_OBJ_TO_PTR(self_in); | ||
| mp_uint_t ret; | ||
| if (request == MP_IOCTL_POLL) { | ||
| mp_uint_t flags = arg; | ||
| ret = 0; | ||
| if ((flags & MP_IOCTL_POLL_RD) && common_hal_usb_midi_portin_bytes_available(self) > 0) { | ||
| ret |= MP_IOCTL_POLL_RD; | ||
| } | ||
| } else { | ||
| *errcode = MP_EINVAL; | ||
| ret = MP_STREAM_ERROR; | ||
| } | ||
| return ret; | ||
| } | ||
|
|
||
| STATIC const mp_rom_map_elem_t usb_midi_portin_locals_dict_table[] = { | ||
| // Standard stream methods. | ||
| { MP_OBJ_NEW_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) }, | ||
| { MP_OBJ_NEW_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) }, | ||
| }; | ||
| STATIC MP_DEFINE_CONST_DICT(usb_midi_portin_locals_dict, usb_midi_portin_locals_dict_table); | ||
|
|
||
| STATIC const mp_stream_p_t usb_midi_portin_stream_p = { | ||
| .read = usb_midi_portin_read, | ||
| .write = NULL, | ||
| .ioctl = usb_midi_portin_ioctl, | ||
| .is_text = false, | ||
| }; | ||
|
|
||
| const mp_obj_type_t usb_midi_portin_type = { | ||
| { &mp_type_type }, | ||
| .name = MP_QSTR_PortIn, | ||
| .make_new = usb_midi_portin_make_new, | ||
| .getiter = mp_identity_getiter, | ||
| .iternext = mp_stream_unbuffered_iter, | ||
| .protocol = &usb_midi_portin_stream_p, | ||
| .locals_dict = (mp_obj_dict_t*)&usb_midi_portin_locals_dict, | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * This file is part of the Micro Python project, http://micropython.org/ | ||
| * | ||
| * The MIT License (MIT) | ||
| * | ||
| * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| #ifndef MICROPY_INCLUDED_SHARED_BINDINGS_USB_MIDI_PORTIN_H | ||
| #define MICROPY_INCLUDED_SHARED_BINDINGS_USB_MIDI_PORTIN_H | ||
|
|
||
| #include "shared-module/usb_midi/PortIn.h" | ||
|
|
||
| extern const mp_obj_type_t usb_midi_portin_type; | ||
|
|
||
| // Construct an underlying UART object. | ||
| extern void common_hal_usb_midi_portin_construct(usb_midi_portin_obj_t *self, | ||
| uint8_t receiver_buffer_size); | ||
| // Read characters. | ||
| extern size_t common_hal_usb_midi_portin_read(usb_midi_portin_obj_t *self, | ||
| uint8_t *data, size_t len, int *errcode); | ||
|
|
||
| extern uint32_t common_hal_usb_midi_portin_bytes_available(usb_midi_portin_obj_t *self); | ||
| extern void common_hal_usb_midi_portin_clear_buffer(usb_midi_portin_obj_t *self); | ||
|
|
||
| #endif // MICROPY_INCLUDED_SHARED_BINDINGS_USB_MIDI_PORTIN_H |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| * This file is part of the Micro Python project, http://micropython.org/ | ||
| * | ||
| * The MIT License (MIT) | ||
| * | ||
| * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| #include <stdint.h> | ||
|
|
||
| #include "shared-bindings/usb_midi/PortOut.h" | ||
| #include "shared-bindings/util.h" | ||
|
|
||
| #include "py/ioctl.h" | ||
| #include "py/objproperty.h" | ||
| #include "py/runtime.h" | ||
| #include "py/stream.h" | ||
| #include "supervisor/shared/translate.h" | ||
|
|
||
|
|
||
| //| .. currentmodule:: usb_midi | ||
| //| | ||
| //| :class:`PortOut` -- sends midi messages to a computer over USB | ||
| //| ============================================================== | ||
| //| | ||
| //| .. class:: PortOut() | ||
| //| | ||
| //| Not currently dynamically supported. | ||
|
tannewt marked this conversation as resolved.
|
||
| //| | ||
| //| PortOut objects are constructed for every corresponding entry in the USB descriptor and added | ||
| //| to the `usb_midi.ports` tuple. | ||
| //| | ||
|
|
||
| STATIC mp_obj_t usb_midi_portout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *pos_args) { | ||
| return mp_const_none; | ||
| } | ||
|
|
||
| // These are standard stream methods. Code is in py/stream.c. | ||
| // | ||
| //| .. method:: write(buf) | ||
| //| | ||
| //| Write the buffer of bytes to the bus. | ||
| //| | ||
| //| :return: the number of bytes written | ||
| //| :rtype: int or None | ||
| //| | ||
|
|
||
| STATIC mp_uint_t usb_midi_portout_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) { | ||
| usb_midi_portout_obj_t *self = MP_OBJ_TO_PTR(self_in); | ||
| const byte *buf = buf_in; | ||
|
|
||
| return common_hal_usb_midi_portout_write(self, buf, size, errcode); | ||
| } | ||
|
|
||
| STATIC mp_uint_t usb_midi_portout_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { | ||
| usb_midi_portout_obj_t *self = MP_OBJ_TO_PTR(self_in); | ||
| mp_uint_t ret; | ||
| if (request == MP_IOCTL_POLL) { | ||
| mp_uint_t flags = arg; | ||
| ret = 0; | ||
| if ((flags & MP_IOCTL_POLL_WR) && common_hal_usb_midi_portout_ready_to_tx(self)) { | ||
| ret |= MP_IOCTL_POLL_WR; | ||
| } | ||
| } else { | ||
| *errcode = MP_EINVAL; | ||
| ret = MP_STREAM_ERROR; | ||
| } | ||
| return ret; | ||
| } | ||
|
|
||
| STATIC const mp_rom_map_elem_t usb_midi_portout_locals_dict_table[] = { | ||
| // Standard stream methods. | ||
| { MP_OBJ_NEW_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) }, | ||
| }; | ||
| STATIC MP_DEFINE_CONST_DICT(usb_midi_portout_locals_dict, usb_midi_portout_locals_dict_table); | ||
|
|
||
| STATIC const mp_stream_p_t usb_midi_portout_stream_p = { | ||
| .read = NULL, | ||
| .write = usb_midi_portout_write, | ||
| .ioctl = usb_midi_portout_ioctl, | ||
| .is_text = false, | ||
| }; | ||
|
|
||
| const mp_obj_type_t usb_midi_portout_type = { | ||
| { &mp_type_type }, | ||
| .name = MP_QSTR_PortOut, | ||
| .make_new = usb_midi_portout_make_new, | ||
| .getiter = mp_identity_getiter, | ||
| .iternext = mp_stream_unbuffered_iter, | ||
| .protocol = &usb_midi_portout_stream_p, | ||
| .locals_dict = (mp_obj_dict_t*)&usb_midi_portout_locals_dict, | ||
| }; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.