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

Don't double-list modules that MP_REGISTER_MODULE

Browse Source 
Closes: #5154
This commit is contained in:
Jeff Epler 2021-08-16 08:50:31 -05:00
parent 0553561975
commit ccc371ed53
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
py/circuitpy_mpconfig.h
View File

@ -635,12 +635,7 @@ extern const struct _mp_obj_module_t pwmio_module;
#define PWMIO_MODULE #define PWMIO_MODULE
#endif #endif
#if CIRCUITPY_QRIO // CIRCUITPY_QRIO uses MP_REGISTER_MODULE
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
#if CIRCUITPY_RAINBOWIO #if CIRCUITPY_RAINBOWIO
extern const struct _mp_obj_module_t rainbowio_module; extern const struct _mp_obj_module_t rainbowio_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_builtins), MP_ROM_PTR(&mp_module_builtins) },
{ MP_ROM_QSTR(MP_QSTR_micropython), MP_ROM_PTR(&mp_module_micropython) }, { 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 MICROPY_PY_IO
#if CIRCUITPY #if CIRCUITPY
{ MP_ROM_QSTR(MP_QSTR_io), MP_ROM_PTR(&mp_module_io) }, { MP_ROM_QSTR(MP_QSTR_io), MP_ROM_PTR(&mp_module_io) },