diff options
| author | Hierophect <hierophect@gmail.com> | 2020-01-08 17:11:50 -0500 |
|---|---|---|
| committer | Hierophect <hierophect@gmail.com> | 2020-01-08 17:11:50 -0500 |
| commit | b74e78d2c049388f5cb17bf27cbef16379241f3d (patch) | |
| tree | 2a7c1ce73d4e5287cbaf0a3f53ff326c351970c5 /py | |
| parent | b778aee21d7facb8ced147086a2bc5225a319d80 (diff) | |
| parent | a10cd8580c3227f64cc0b0a7762f37732e31b91b (diff) | |
Merge remote-tracking branch 'upstream/master' into stm32-cpython-compat
Diffstat (limited to 'py')
| -rw-r--r-- | py/circuitpy_defns.mk | 3 | ||||
| -rw-r--r-- | py/circuitpy_mpconfig.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 8dd4fc6b1..1f2d6c73e 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -236,6 +236,7 @@ SRC_COMMON_HAL_ALL = \ _bleio/CharacteristicBuffer.c \ _bleio/Connection.c \ _bleio/Descriptor.c \ + _bleio/PacketBuffer.c \ _bleio/Service.c \ _bleio/UUID.c \ analogio/AnalogIn.c \ @@ -322,7 +323,7 @@ SRC_SHARED_MODULE_ALL = \ audiomixer/Mixer.c \ audiomixer/MixerVoice.c \ audiomp3/__init__.c \ - audiomp3/MP3File.c \ + audiomp3/MP3Decoder.c \ bitbangio/I2C.c \ bitbangio/OneWire.c \ bitbangio/SPI.c \ diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 932d4f855..8c7454cf2 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -328,7 +328,9 @@ extern const struct _mp_obj_module_t terminalio_module; #define DISPLAYIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_displayio), (mp_obj_t)&displayio_module }, #define FONTIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_fontio), (mp_obj_t)&fontio_module }, #define TERMINALIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_terminalio), (mp_obj_t)&terminalio_module }, +#ifndef CIRCUITPY_DISPLAY_LIMIT #define CIRCUITPY_DISPLAY_LIMIT (1) +#endif #else #define DISPLAYIO_MODULE #define FONTIO_MODULE |