Skip to content

Commit 9ee4641

Browse files
committed
esp8266/machine_pin: Make pin.irq arguments positional.
All arguments to pin.irq are converted from keyword-only to positional, and can still be specified by keyword so it's a backwards compatible change. The default value for the "trigger" arg is changed from 0 (no trigger) to rising+falling edge.
1 parent 2507c83 commit 9ee4641

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

esp8266/machine_pin.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -352,13 +352,13 @@ STATIC mp_obj_t pyb_pin_high(mp_obj_t self_in) {
352352
}
353353
STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_pin_high_obj, pyb_pin_high);
354354

355-
// pin.irq(*, trigger, handler=None)
355+
// pin.irq(handler=None, trigger=IRQ_FALLING|IRQ_RISING, hard=False)
356356
STATIC mp_obj_t pyb_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
357-
enum { ARG_trigger, ARG_handler, ARG_hard };
357+
enum { ARG_handler, ARG_trigger, ARG_hard };
358358
static const mp_arg_t allowed_args[] = {
359-
{ MP_QSTR_trigger, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
360-
{ MP_QSTR_handler, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
361-
{ MP_QSTR_hard, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
359+
{ MP_QSTR_handler, MP_ARG_OBJ, {.u_obj = mp_const_none} },
360+
{ MP_QSTR_trigger, MP_ARG_INT, {.u_int = GPIO_PIN_INTR_POSEDGE | GPIO_PIN_INTR_NEGEDGE} },
361+
{ MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
362362
};
363363
pyb_pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
364364
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -368,16 +368,18 @@ STATIC mp_obj_t pyb_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
368368
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "pin does not have IRQ capabilities"));
369369
}
370370

371-
if (args[ARG_trigger].u_int != 0) {
371+
if (n_args > 1) {
372372
// configure irq
373373
mp_obj_t handler = args[ARG_handler].u_obj;
374+
uint32_t trigger = args[ARG_trigger].u_int;
374375
if (handler == mp_const_none) {
375376
handler = MP_OBJ_NULL;
377+
trigger = 0;
376378
}
377379
ETS_GPIO_INTR_DISABLE();
378380
MP_STATE_PORT(pin_irq_handler)[self->phys_port] = handler;
379381
pin_irq_is_hard[self->phys_port] = args[ARG_hard].u_bool;
380-
SET_TRIGGER(self->phys_port, args[ARG_trigger].u_int);
382+
SET_TRIGGER(self->phys_port, trigger);
381383
GPIO_REG_WRITE(GPIO_STATUS_W1TC_ADDRESS, 1 << self->phys_port);
382384
ETS_GPIO_INTR_ENABLE();
383385
}

0 commit comments

Comments
 (0)