djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5166 from jepler/issue5154

Browse Source 
Don't double-list modules that MP_REGISTER_MODULE
This commit is contained in:
microDev 2021-08-20 09:25:03 +05:30 committed by GitHub
commit dd5b711dc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
py/circuitpy_mpconfig.h
View File

@ -637,12 +637,7 @@ extern const struct _mp_obj_module_t pwmio_module;
#define PWMIO_MODULE
#endif
#if CIRCUITPY_QRIO
extern const struct _mp_obj_module_t qrio_module;
#define QRIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_qrio), (mp_obj_t)&qrio_module },
#else
#define QRIO_MODULE
#endif
// CIRCUITPY_QRIO uses MP_REGISTER_MODULE
#if CIRCUITPY_RAINBOWIO
extern const struct _mp_obj_module_t rainbowio_module;
@ -930,7 +925,6 @@ extern const struct _mp_obj_module_t msgpack_module;
PS2IO_MODULE \
PULSEIO_MODULE \
PWMIO_MODULE \
QRIO_MODULE \
RAINBOWIO_MODULE \
RANDOM_MODULE \
RE_MODULE \

3
py/objmodule.c
View File

@ -161,9 +161,6 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
{ MP_ROM_QSTR(MP_QSTR_builtins), MP_ROM_PTR(&mp_module_builtins) },
{ MP_ROM_QSTR(MP_QSTR_micropython), MP_ROM_PTR(&mp_module_micropython) },
#if MICROPY_PY_ARRAY
{ MP_ROM_QSTR(MP_QSTR_array), MP_ROM_PTR(&mp_module_array) },
#endif
#if MICROPY_PY_IO
#if CIRCUITPY
{ MP_ROM_QSTR(MP_QSTR_io), MP_ROM_PTR(&mp_module_io) },