diff options
| author | Damien George <damien@micropython.org> | 2021-06-23 14:37:33 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2021-06-23 16:11:37 +1000 |
| commit | 63b8b796103327cdaf61936ef25046a696e92db6 (patch) | |
| tree | 5c34a707f5e0863eb5a0e2e82b61cfb0261e839e | |
| parent | 6ed5b843cf55a96156328b08b011ba919af22fb4 (diff) | |
stm32/usb: Make irq's default trigger enable all events.
Following how other .irq() methods work on other objects.
Signed-off-by: Damien George <damien@micropython.org>
| -rw-r--r-- | docs/library/pyb.USB_VCP.rst | 2 | ||||
| -rw-r--r-- | ports/stm32/usb.c | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/docs/library/pyb.USB_VCP.rst b/docs/library/pyb.USB_VCP.rst index 1e44e53fd..1cca8dcad 100644 --- a/docs/library/pyb.USB_VCP.rst +++ b/docs/library/pyb.USB_VCP.rst @@ -109,7 +109,7 @@ Methods Return value: number of bytes sent. -.. method:: USB_VCP.irq(handler=None, trigger=0, hard=False) +.. method:: USB_VCP.irq(handler=None, trigger=IRQ_RX, hard=False) Register *handler* to be called whenever an event specified by *trigger* occurs. The *handler* function must take exactly one argument, which will diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c index eba95de49..5e3802651 100644 --- a/ports/stm32/usb.c +++ b/ports/stm32/usb.c @@ -829,11 +829,17 @@ STATIC mp_obj_t pyb_usb_vcp_recv(size_t n_args, const mp_obj_t *args, mp_map_t * } STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_recv_obj, 1, pyb_usb_vcp_recv); -// irq(handler=None, trigger=0, hard=False) +// irq(handler=None, trigger=IRQ_RX, hard=False) STATIC mp_obj_t pyb_usb_vcp_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { - mp_arg_val_t args[MP_IRQ_ARG_INIT_NUM_ARGS]; - mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_IRQ_ARG_INIT_NUM_ARGS, mp_irq_init_args, args); + enum { ARG_handler, ARG_trigger, ARG_hard }; + static const mp_arg_t allowed_args[] = { + { MP_QSTR_handler, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} }, + { MP_QSTR_trigger, MP_ARG_INT, {.u_int = USBD_CDC_IRQ_RX} }, + { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} }, + }; pyb_usb_vcp_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); + mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; + mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); if (n_args > 1 || kw_args->used != 0) { // Check the handler. |