Skip to content

Commit d5ec336

Browse files
author
Daniel Campora
committed
cc3200: Replace Pin.PULL_NONE with None.
1 parent f38d164 commit d5ec336

6 files changed

Lines changed: 34 additions & 23 deletions

File tree

‎cc3200/mods/pybpin.c‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ STATIC void EXTI_Handler(uint port) {
475475

476476
STATIC const mp_arg_t pin_init_args[] = {
477477
{ MP_QSTR_mode, MP_ARG_REQUIRED | MP_ARG_INT },
478-
{ MP_QSTR_pull, MP_ARG_INT, {.u_int = PIN_TYPE_STD} },
478+
{ MP_QSTR_pull, MP_ARG_OBJ, {.u_obj = mp_const_none} },
479479
{ MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
480480
{ MP_QSTR_drive, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = PIN_STRENGTH_4MA} },
481481
{ 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_
492492
pin_validate_mode(mode);
493493

494494
// get the pull type
495-
uint pull = args[1].u_int;
496-
pin_validate_pull(pull);
495+
uint pull;
496+
if (args[1].u_obj == mp_const_none) {
497+
pull = PIN_TYPE_STD;
498+
} else {
499+
pull = mp_obj_get_int(args[1].u_obj);
500+
pin_validate_pull (pull);
501+
}
497502

498503
// get the value
499504
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
562567
// pin pull
563568
qstr pull_qst;
564569
if (pull == PIN_TYPE_STD) {
565-
pull_qst = MP_QSTR_PULL_NONE;
566-
} else if (pull == PIN_TYPE_STD_PU) {
567-
pull_qst = MP_QSTR_PULL_UP;
570+
mp_printf(print, ", pull=%q", MP_QSTR_None);
568571
} else {
569-
pull_qst = MP_QSTR_PULL_DOWN;
572+
if (pull == PIN_TYPE_STD_PU) {
573+
pull_qst = MP_QSTR_PULL_UP;
574+
} else {
575+
pull_qst = MP_QSTR_PULL_DOWN;
576+
}
577+
mp_printf(print, ", pull=Pin.%q", pull_qst);
570578
}
571-
mp_printf(print, ", pull=Pin.%q", pull_qst);
572579

573580
// pin drive
574581
qstr drv_qst;
@@ -656,10 +663,18 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_mode_obj, 1, 2, pin_mode);
656663
STATIC mp_obj_t pin_pull(mp_uint_t n_args, const mp_obj_t *args) {
657664
pin_obj_t *self = args[0];
658665
if (n_args == 1) {
666+
if (self->pull == PIN_TYPE_STD) {
667+
return mp_const_none;
668+
}
659669
return mp_obj_new_int(self->pull);
660670
} else {
661-
uint32_t pull = mp_obj_get_int(args[1]);
662-
pin_validate_pull (pull);
671+
uint32_t pull;
672+
if (args[1] == mp_const_none) {
673+
pull = PIN_TYPE_STD;
674+
} else {
675+
pull = mp_obj_get_int(args[1]);
676+
pin_validate_pull (pull);
677+
}
663678
self->pull = pull;
664679
pin_obj_configure(self);
665680
return mp_const_none;
@@ -853,7 +868,6 @@ STATIC const mp_map_elem_t pin_locals_dict_table[] = {
853868
{ MP_OBJ_NEW_QSTR(MP_QSTR_OPEN_DRAIN), MP_OBJ_NEW_SMALL_INT(PIN_TYPE_OD) },
854869
{ MP_OBJ_NEW_QSTR(MP_QSTR_ALT), MP_OBJ_NEW_SMALL_INT(GPIO_DIR_MODE_ALT) },
855870
{ MP_OBJ_NEW_QSTR(MP_QSTR_ALT_OPEN_DRAIN), MP_OBJ_NEW_SMALL_INT(GPIO_DIR_MODE_ALT_OD) },
856-
{ MP_OBJ_NEW_QSTR(MP_QSTR_PULL_NONE), MP_OBJ_NEW_SMALL_INT(PIN_TYPE_STD) },
857871
{ MP_OBJ_NEW_QSTR(MP_QSTR_PULL_UP), MP_OBJ_NEW_SMALL_INT(PIN_TYPE_STD_PU) },
858872
{ MP_OBJ_NEW_QSTR(MP_QSTR_PULL_DOWN), MP_OBJ_NEW_SMALL_INT(PIN_TYPE_STD_PD) },
859873
{ MP_OBJ_NEW_QSTR(MP_QSTR_LOW_POWER), MP_OBJ_NEW_SMALL_INT(PIN_STRENGTH_2MA) },

‎cc3200/qstrdefsport.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ Q(ALT)
128128
Q(ALT_OPEN_DRAIN)
129129
Q(PULL_UP)
130130
Q(PULL_DOWN)
131-
Q(PULL_NONE)
132131
Q(LOW_POWER)
133132
Q(MED_POWER)
134133
Q(HIGH_POWER)

‎docs/library/pyb.Pin.rst‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Usage Model:
6767

6868
Board pins are identified by their string id::
6969

70-
g = pyb.Pin('GP9', mode=pyb.Pin.OUT, pull=pyb.Pin.PULL_NONE, drive=pyb.Pin.MED_POWER, alt=-1)
70+
g = pyb.Pin('GP9', mode=pyb.Pin.OUT, pull=None, drive=pyb.Pin.MED_POWER, alt=-1)
7171

7272
You can also configure the Pin to generate interrupts. For instance::
7373

@@ -165,7 +165,7 @@ Methods
165165

166166
- ``pull`` can be one of:
167167

168-
- ``Pin.PULL_NONE`` - no pull up or down resistor.
168+
- ``None`` - no pull up or down resistor.
169169
- ``Pin.PULL_UP`` - pull up resistor enabled.
170170
- ``Pin.PULL_DOWN`` - pull down resitor enabled.
171171

@@ -349,13 +349,11 @@ Constants
349349

350350
Selects the pin mode.
351351

352-
.. data:: Pin.PULL_NONE
353-
354352
.. data:: Pin.PULL_UP
355353

356354
.. data:: Pin.PULL_DOWN
357355

358-
Selectes the wether there's pull up/down resistor, or none.
356+
Selectes the wether there's pull up/down resistor.
359357

360358
.. data:: Pin.LOW_POWER
361359

‎tests/wipy/pin.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_pin_af():
4747
pin = Pin(pin_map[0], mode=Pin.IN, pull=Pin.PULL_UP)
4848
pin = Pin(pin_map[0], mode=Pin.OPEN_DRAIN, pull=Pin.PULL_UP)
4949
pin = Pin(pin_map[0], mode=Pin.OUT, pull=Pin.PULL_DOWN)
50-
pin = Pin(pin_map[0], mode=Pin.OUT, pull=Pin.PULL_NONE)
50+
pin = Pin(pin_map[0], mode=Pin.OUT, pull=None)
5151
pin = Pin(pin_map[0], mode=Pin.OUT, pull=Pin.PULL_UP)
5252
pin = Pin(pin_map[0], mode=Pin.OUT, pull=Pin.PULL_UP, drive=pin.LOW_POWER)
5353
pin = Pin(pin_map[0], mode=Pin.OUT, pull=Pin.PULL_UP, drive=pin.MED_POWER)
@@ -93,8 +93,8 @@ def test_pin_af():
9393
pin.mode(Pin.IN)
9494
print(pin.mode() == Pin.IN)
9595
# pull
96-
pin.pull(Pin.PULL_NONE)
97-
print(pin.pull() == Pin.PULL_NONE)
96+
pin.pull(None)
97+
print(pin.pull() == None)
9898
pin.pull(Pin.PULL_DOWN)
9999
print(pin.pull() == Pin.PULL_DOWN)
100100
# drive

‎tests/wipy/pin.py.exp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
0
2929
0
3030
0
31-
Pin('GP23', mode=Pin.IN, pull=Pin.PULL_NONE, drive=Pin.MED_POWER, alt=-1)
31+
Pin('GP23', mode=Pin.IN, pull=None, drive=Pin.MED_POWER, alt=-1)
3232
Pin('GP23', mode=Pin.IN, pull=Pin.PULL_DOWN, drive=Pin.MED_POWER, alt=-1)
3333
Pin('GP23', mode=Pin.OUT, pull=Pin.PULL_UP, drive=Pin.LOW_POWER, alt=-1)
3434
Pin('GP23', mode=Pin.OUT, pull=Pin.PULL_UP, drive=Pin.HIGH_POWER, alt=-1)

‎tests/wipy/uart.py.exp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ True
3737
True
3838
True
3939
True
40-
Pin('GP12', mode=Pin.IN, pull=Pin.PULL_NONE, drive=Pin.MED_POWER, alt=-1)
41-
Pin('GP13', mode=Pin.IN, pull=Pin.PULL_NONE, drive=Pin.MED_POWER, alt=-1)
40+
Pin('GP12', mode=Pin.IN, pull=None, drive=Pin.MED_POWER, alt=-1)
41+
Pin('GP13', mode=Pin.IN, pull=None, drive=Pin.MED_POWER, alt=-1)
4242
Exception
4343
Exception
4444
Exception

0 commit comments

Comments
 (0)