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
1dfde891
Commit
1dfde891
authored
Mar 25, 2014
by
Damien George
Browse files
Options
Downloads
Plain Diff
Merge pull request #373 from iabdalkader/module_register
Add mp_obj_module_register
parents
24d527bf
89d45248
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
py/obj.h
+1
-0
1 addition, 0 deletions
py/obj.h
py/objmodule.c
+5
-0
5 additions, 0 deletions
py/objmodule.c
stm/main.c
+2
-3
2 additions, 3 deletions
stm/main.c
with
8 additions
and
3 deletions
py/obj.h
+
1
−
0
View file @
1dfde891
...
...
@@ -456,6 +456,7 @@ typedef struct _mp_obj_module_t {
extern
const
mp_obj_type_t
mp_type_module
;
mp_obj_t
mp_obj_new_module
(
qstr
module_name
);
mp_obj_t
mp_obj_module_get
(
qstr
module_name
);
void
mp_obj_module_register
(
qstr
qstr
,
mp_obj_t
module
);
//use for loading statically allocated modules
struct
_mp_map_t
*
mp_obj_module_get_globals
(
mp_obj_t
self_in
);
// staticmethod and classmethod types; defined here so we can make const versions
...
...
This diff is collapsed.
Click to expand it.
py/objmodule.c
+
5
−
0
View file @
1dfde891
...
...
@@ -82,6 +82,11 @@ mp_obj_t mp_obj_module_get(qstr module_name) {
return
MP_OBJ_NULL
;
}
void
mp_obj_module_register
(
qstr
qstr
,
mp_obj_t
module
)
{
mp_map_lookup
(
rt_loaded_modules_get
(),
MP_OBJ_NEW_QSTR
(
qstr
),
MP_MAP_LOOKUP_ADD_IF_NOT_FOUND
)
->
value
=
module
;
}
mp_map_t
*
mp_obj_module_get_globals
(
mp_obj_t
self_in
)
{
assert
(
MP_OBJ_IS_TYPE
(
self_in
,
&
mp_type_module
));
mp_obj_module_t
*
self
=
self_in
;
...
...
This diff is collapsed.
Click to expand it.
stm/main.c
+
2
−
3
View file @
1dfde891
...
...
@@ -272,9 +272,8 @@ soft_reset:
rt_store_name
(
MP_QSTR_help
,
rt_make_function_n
(
0
,
pyb_help
));
rt_store_name
(
MP_QSTR_open
,
rt_make_function_n
(
2
,
pyb_io_open
));
// we pre-import the pyb module
// probably shouldn't do this, so we are compatible with CPython
rt_store_name
(
MP_QSTR_pyb
,
(
mp_obj_t
)
&
pyb_module
);
// load the pyb module
mp_obj_module_register
(
MP_QSTR_pyb
,
(
mp_obj_t
)
&
pyb_module
);
// check if user switch held (initiates reset of filesystem)
bool
reset_filesystem
=
false
;
...
...
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