Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
micropython
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
card10
micropython
Commits
8a3e9036
Commit
8a3e9036
authored
9 years ago
by
Damien George
Browse files
Options
Downloads
Patches
Plain Diff
esp8266/modpybpin: Use None instead of PULL_NONE for no-pull config.
parent
9df6b3a2
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
esp8266/modpybpin.c
+6
-4
6 additions, 4 deletions
esp8266/modpybpin.c
with
6 additions
and
4 deletions
esp8266/modpybpin.c
+
6
−
4
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
...
@@ -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
);
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
)
{
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
};
enum
{
ARG_mode
,
ARG_pull
,
ARG_value
};
static
const
mp_arg_t
allowed_args
[]
=
{
static
const
mp_arg_t
allowed_args
[]
=
{
{
MP_QSTR_mode
,
MP_ARG_REQUIRED
|
MP_ARG_INT
},
{
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
}},
{
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
...
@@ -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
;
uint
mode
=
args
[
ARG_mode
].
u_int
;
// get pull mode
// 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
// get initial value
int
value
;
int
value
;
...
@@ -343,7 +346,6 @@ STATIC const mp_map_elem_t pyb_pin_locals_dict_table[] = {
...
@@ -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_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_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_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_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) },
//{ MP_OBJ_NEW_QSTR(MP_QSTR_PULL_DOWN), MP_OBJ_NEW_SMALL_INT(GPIO_PULL_DOWN) },
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment