diff options
| author | Daniel Campora <daniel@wipy.io> | 2015-05-17 14:49:17 +0200 |
|---|---|---|
| committer | Daniel Campora <daniel@wipy.io> | 2015-05-17 14:49:17 +0200 |
| commit | c27dc38e8535400bd6e8b021e4932e4bb1b00b0b (patch) | |
| tree | 6dab15a48c90ada42fdf6836c0cdb0d253340591 | |
| parent | cd3f2523f10605873369e973743e2f8a95c6b808 (diff) | |
| download | micropython-c27dc38e8535400bd6e8b021e4932e4bb1b00b0b.tar.gz micropython-c27dc38e8535400bd6e8b021e4932e4bb1b00b0b.zip | |
cc3200: Re-name 'intmode' to 'mode' in the callback API.
| -rw-r--r-- | cc3200/misc/mpcallback.c | 2 | ||||
| -rw-r--r-- | cc3200/mods/pybpin.c | 6 | ||||
| -rw-r--r-- | cc3200/qstrdefsport.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cc3200/misc/mpcallback.c b/cc3200/misc/mpcallback.c index 6ca4f49d20..5c23abe66c 100644 --- a/cc3200/misc/mpcallback.c +++ b/cc3200/misc/mpcallback.c @@ -41,7 +41,7 @@ DEFINE PUBLIC DATA ******************************************************************************/ const mp_arg_t mpcallback_init_args[] = { - { MP_QSTR_intmode, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, + { MP_QSTR_mode, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, { MP_QSTR_handler, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} }, { MP_QSTR_priority, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} }, { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, diff --git a/cc3200/mods/pybpin.c b/cc3200/mods/pybpin.c index 9022b1cd52..e4661641f1 100644 --- a/cc3200/mods/pybpin.c +++ b/cc3200/mods/pybpin.c @@ -72,7 +72,7 @@ /// print(pin.get_config().name) /// /// extint = pyb.Pin('GPIO10', 0, pyb.Pin.INT_RISING, pyb.GPIO.STD_PD, pyb.S2MA) -/// extint.callback (intmode=pyb.Pin.INT_RISING, handler=pincb) +/// extint.callback (mode=pyb.Pin.INT_RISING, handler=pincb) /// # the callback can be triggered manually /// extint.callback()() /// # to disable the callback @@ -543,9 +543,9 @@ STATIC mp_obj_t pin_get_config(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_get_config_obj, pin_get_config); -/// \method callback(method, intmode, priority, pwrmode) +/// \method callback(method, mode, priority, pwrmode) /// Creates a callback object associated to a pin -/// min num of arguments is 1 (intmode) +/// min num of arguments is 1 (mode) STATIC mp_obj_t pin_callback (mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { mp_arg_val_t args[mpcallback_INIT_NUM_ARGS]; mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, mpcallback_INIT_NUM_ARGS, mpcallback_init_args, args); diff --git a/cc3200/qstrdefsport.h b/cc3200/qstrdefsport.h index 3a8fb55dea..bb60a88c43 100644 --- a/cc3200/qstrdefsport.h +++ b/cc3200/qstrdefsport.h @@ -287,7 +287,7 @@ Q(enable) Q(disable) Q(callback) Q(handler) -Q(intmode) +Q(mode) Q(value) Q(priority) Q(wakes) |