Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
8a3e9036
Commit
8a3e9036
authored
May 03, 2016
by
Damien George
Browse files
esp8266/modpybpin: Use None instead of PULL_NONE for no-pull config.
parent
9df6b3a2
Changes
1
Hide whitespace changes
Inline
Side-by-side
esp8266/modpybpin.c
View file @
8a3e9036
...
...
@@ -180,12 +180,12 @@ STATIC void pyb_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
mp_printf
(
print
,
"Pin(%u)"
,
self
->
phys_port
);
}
// pin.init(mode, pull=
Pin.PULL_NONE, af=-1
)
// pin.init(mode, pull=
None, *, value
)
STATIC
mp_obj_t
pyb_pin_obj_init_helper
(
pyb_pin_obj_t
*
self
,
mp_uint_t
n_args
,
const
mp_obj_t
*
pos_args
,
mp_map_t
*
kw_args
)
{
enum
{
ARG_mode
,
ARG_pull
,
ARG_value
};
static
const
mp_arg_t
allowed_args
[]
=
{
{
MP_QSTR_mode
,
MP_ARG_REQUIRED
|
MP_ARG_INT
},
{
MP_QSTR_pull
,
MP_ARG_
INT
,
{.
u_
int
=
GPIO_PULL_NONE
}},
{
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
}},
};
...
...
@@ -197,7 +197,10 @@ STATIC mp_obj_t pyb_pin_obj_init_helper(pyb_pin_obj_t *self, mp_uint_t n_args, c
uint
mode
=
args
[
ARG_mode
].
u_int
;
// get pull mode
uint
pull
=
args
[
ARG_pull
].
u_int
;
uint
pull
=
GPIO_PULL_NONE
;
if
(
args
[
ARG_pull
].
u_obj
!=
mp_const_none
)
{
pull
=
mp_obj_get_int
(
args
[
ARG_pull
].
u_obj
);
}
// get initial value
int
value
;
...
...
@@ -343,7 +346,6 @@ STATIC const mp_map_elem_t pyb_pin_locals_dict_table[] = {
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_IN
),
MP_OBJ_NEW_SMALL_INT
(
GPIO_MODE_INPUT
)
},
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_OUT
),
MP_OBJ_NEW_SMALL_INT
(
GPIO_MODE_OUTPUT
)
},
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_OPEN_DRAIN
),
MP_OBJ_NEW_SMALL_INT
(
GPIO_MODE_OPEN_DRAIN
)
},
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_PULL_NONE
),
MP_OBJ_NEW_SMALL_INT
(
GPIO_PULL_NONE
)
},
{
MP_OBJ_NEW_QSTR
(
MP_QSTR_PULL_UP
),
MP_OBJ_NEW_SMALL_INT
(
GPIO_PULL_UP
)
},
//{ MP_OBJ_NEW_QSTR(MP_QSTR_PULL_DOWN), MP_OBJ_NEW_SMALL_INT(GPIO_PULL_DOWN) },
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment