From d5ec336eefc8d892a1182da747d825155fcecb15 Mon Sep 17 00:00:00 2001 From: Daniel Campora Date: Sun, 13 Sep 2015 15:31:17 +0200 Subject: [PATCH] cc3200: Replace Pin.PULL_NONE with None. --- cc3200/mods/pybpin.c | 36 +++++++++++++++++++++++++----------- cc3200/qstrdefsport.h | 1 - docs/library/pyb.Pin.rst | 8 +++----- tests/wipy/pin.py | 6 +++--- tests/wipy/pin.py.exp | 2 +- tests/wipy/uart.py.exp | 4 ++-- 6 files changed, 34 insertions(+), 23 deletions(-) diff --git a/cc3200/mods/pybpin.c b/cc3200/mods/pybpin.c index faf81273f4..de125a66d4 100644 --- a/cc3200/mods/pybpin.c +++ b/cc3200/mods/pybpin.c @@ -475,7 +475,7 @@ STATIC void EXTI_Handler(uint port) { STATIC const mp_arg_t pin_init_args[] = { { MP_QSTR_mode, MP_ARG_REQUIRED | MP_ARG_INT }, - { MP_QSTR_pull, MP_ARG_INT, {.u_int = PIN_TYPE_STD} }, + { MP_QSTR_pull, MP_ARG_OBJ, {.u_obj = mp_const_none} }, { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, { MP_QSTR_drive, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = PIN_STRENGTH_4MA} }, { MP_QSTR_alt, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} }, @@ -492,8 +492,13 @@ STATIC mp_obj_t pin_obj_init_helper(pin_obj_t *self, mp_uint_t n_args, const mp_ pin_validate_mode(mode); // get the pull type - uint pull = args[1].u_int; - pin_validate_pull(pull); + uint pull; + if (args[1].u_obj == mp_const_none) { + pull = PIN_TYPE_STD; + } else { + pull = mp_obj_get_int(args[1].u_obj); + pin_validate_pull (pull); + } // get the value int value = -1; @@ -562,13 +567,15 @@ STATIC void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t // pin pull qstr pull_qst; if (pull == PIN_TYPE_STD) { - pull_qst = MP_QSTR_PULL_NONE; - } else if (pull == PIN_TYPE_STD_PU) { - pull_qst = MP_QSTR_PULL_UP; + mp_printf(print, ", pull=%q", MP_QSTR_None); } else { - pull_qst = MP_QSTR_PULL_DOWN; + if (pull == PIN_TYPE_STD_PU) { + pull_qst = MP_QSTR_PULL_UP; + } else { + pull_qst = MP_QSTR_PULL_DOWN; + } + mp_printf(print, ", pull=Pin.%q", pull_qst); } - mp_printf(print, ", pull=Pin.%q", pull_qst); // pin drive qstr drv_qst; @@ -656,10 +663,18 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_mode_obj, 1, 2, pin_mode); STATIC mp_obj_t pin_pull(mp_uint_t n_args, const mp_obj_t *args) { pin_obj_t *self = args[0]; if (n_args == 1) { + if (self->pull == PIN_TYPE_STD) { + return mp_const_none; + } return mp_obj_new_int(self->pull); } else { - uint32_t pull = mp_obj_get_int(args[1]); - pin_validate_pull (pull); + uint32_t pull; + if (args[1] == mp_const_none) { + pull = PIN_TYPE_STD; + } else { + pull = mp_obj_get_int(args[1]); + pin_validate_pull (pull); + } self->pull = pull; pin_obj_configure(self); return mp_const_none; @@ -853,7 +868,6 @@ STATIC const mp_map_elem_t pin_locals_dict_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_OPEN_DRAIN), MP_OBJ_NEW_SMALL_INT(PIN_TYPE_OD) }, { MP_OBJ_NEW_QSTR(MP_QSTR_ALT), MP_OBJ_NEW_SMALL_INT(GPIO_DIR_MODE_ALT) }, { MP_OBJ_NEW_QSTR(MP_QSTR_ALT_OPEN_DRAIN), MP_OBJ_NEW_SMALL_INT(GPIO_DIR_MODE_ALT_OD) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_PULL_NONE), MP_OBJ_NEW_SMALL_INT(PIN_TYPE_STD) }, { MP_OBJ_NEW_QSTR(MP_QSTR_PULL_UP), MP_OBJ_NEW_SMALL_INT(PIN_TYPE_STD_PU) }, { MP_OBJ_NEW_QSTR(MP_QSTR_PULL_DOWN), MP_OBJ_NEW_SMALL_INT(PIN_TYPE_STD_PD) }, { MP_OBJ_NEW_QSTR(MP_QSTR_LOW_POWER), MP_OBJ_NEW_SMALL_INT(PIN_STRENGTH_2MA) }, diff --git a/cc3200/qstrdefsport.h b/cc3200/qstrdefsport.h index c73038f68f..c0c8069b3c 100644 --- a/cc3200/qstrdefsport.h +++ b/cc3200/qstrdefsport.h @@ -128,7 +128,6 @@ Q(ALT) Q(ALT_OPEN_DRAIN) Q(PULL_UP) Q(PULL_DOWN) -Q(PULL_NONE) Q(LOW_POWER) Q(MED_POWER) Q(HIGH_POWER) diff --git a/docs/library/pyb.Pin.rst b/docs/library/pyb.Pin.rst index bfe8ab8cef..01bd54fcee 100644 --- a/docs/library/pyb.Pin.rst +++ b/docs/library/pyb.Pin.rst @@ -67,7 +67,7 @@ Usage Model: Board pins are identified by their string id:: - g = pyb.Pin('GP9', mode=pyb.Pin.OUT, pull=pyb.Pin.PULL_NONE, drive=pyb.Pin.MED_POWER, alt=-1) + g = pyb.Pin('GP9', mode=pyb.Pin.OUT, pull=None, drive=pyb.Pin.MED_POWER, alt=-1) You can also configure the Pin to generate interrupts. For instance:: @@ -165,7 +165,7 @@ Methods - ``pull`` can be one of: - - ``Pin.PULL_NONE`` - no pull up or down resistor. + - ``None`` - no pull up or down resistor. - ``Pin.PULL_UP`` - pull up resistor enabled. - ``Pin.PULL_DOWN`` - pull down resitor enabled. @@ -349,13 +349,11 @@ Constants Selects the pin mode. - .. data:: Pin.PULL_NONE - .. data:: Pin.PULL_UP .. data:: Pin.PULL_DOWN - Selectes the wether there's pull up/down resistor, or none. + Selectes the wether there's pull up/down resistor. .. data:: Pin.LOW_POWER diff --git a/tests/wipy/pin.py b/tests/wipy/pin.py index ae0fa82b19..a768da0975 100644 --- a/tests/wipy/pin.py +++ b/tests/wipy/pin.py @@ -47,7 +47,7 @@ pin = Pin(pin_map[0], mode=Pin.IN, pull=Pin.PULL_DOWN) pin = Pin(pin_map[0], mode=Pin.IN, pull=Pin.PULL_UP) pin = Pin(pin_map[0], mode=Pin.OPEN_DRAIN, pull=Pin.PULL_UP) pin = Pin(pin_map[0], mode=Pin.OUT, pull=Pin.PULL_DOWN) -pin = Pin(pin_map[0], mode=Pin.OUT, pull=Pin.PULL_NONE) +pin = Pin(pin_map[0], mode=Pin.OUT, pull=None) pin = Pin(pin_map[0], mode=Pin.OUT, pull=Pin.PULL_UP) pin = Pin(pin_map[0], mode=Pin.OUT, pull=Pin.PULL_UP, drive=pin.LOW_POWER) pin = Pin(pin_map[0], mode=Pin.OUT, pull=Pin.PULL_UP, drive=pin.MED_POWER) @@ -93,8 +93,8 @@ print(pin.mode() == Pin.OUT) pin.mode(Pin.IN) print(pin.mode() == Pin.IN) # pull -pin.pull(Pin.PULL_NONE) -print(pin.pull() == Pin.PULL_NONE) +pin.pull(None) +print(pin.pull() == None) pin.pull(Pin.PULL_DOWN) print(pin.pull() == Pin.PULL_DOWN) # drive diff --git a/tests/wipy/pin.py.exp b/tests/wipy/pin.py.exp index 4fc60b5d79..7ca85ebdfc 100644 --- a/tests/wipy/pin.py.exp +++ b/tests/wipy/pin.py.exp @@ -28,7 +28,7 @@ 0 0 0 -Pin('GP23', mode=Pin.IN, pull=Pin.PULL_NONE, drive=Pin.MED_POWER, alt=-1) +Pin('GP23', mode=Pin.IN, pull=None, drive=Pin.MED_POWER, alt=-1) Pin('GP23', mode=Pin.IN, pull=Pin.PULL_DOWN, drive=Pin.MED_POWER, alt=-1) Pin('GP23', mode=Pin.OUT, pull=Pin.PULL_UP, drive=Pin.LOW_POWER, alt=-1) Pin('GP23', mode=Pin.OUT, pull=Pin.PULL_UP, drive=Pin.HIGH_POWER, alt=-1) diff --git a/tests/wipy/uart.py.exp b/tests/wipy/uart.py.exp index 6f0ea80bec..c8aeb77eff 100644 --- a/tests/wipy/uart.py.exp +++ b/tests/wipy/uart.py.exp @@ -37,8 +37,8 @@ True True True True -Pin('GP12', mode=Pin.IN, pull=Pin.PULL_NONE, drive=Pin.MED_POWER, alt=-1) -Pin('GP13', mode=Pin.IN, pull=Pin.PULL_NONE, drive=Pin.MED_POWER, alt=-1) +Pin('GP12', mode=Pin.IN, pull=None, drive=Pin.MED_POWER, alt=-1) +Pin('GP13', mode=Pin.IN, pull=None, drive=Pin.MED_POWER, alt=-1) Exception Exception Exception