Skip to content

Commit e6fd513

Browse files
tannewttannewt
authored
Merge pull request adafruit#2418 from tannewt/remove_re_from_cpx_displayio
Remove `re` from CPX Displayio build to make space.
2 parents 5fc2014 + f60b648 commit e6fd513

4 files changed

Lines changed: 7 additions & 2 deletions

File tree

‎ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
1313
# Turn off features and optimizations for Crickit build to make room for additional frozen libs.
1414
LONGINT_IMPL = NONE
1515
CIRCUITPY_DISPLAYIO = 0
16-
CIRCUITPY_PIXELBUF = 0
1716
CIRCUITPY_FREQUENCYIO = 0
17+
CIRCUITPY_GAMEPAD = 0
1818
CIRCUITPY_I2CSLAVE = 0
19+
CIRCUITPY_PIXELBUF = 0
1920

2021
SUPEROPT_GC = 0
2122
CFLAGS_INLINE_LIMIT = 55

‎ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,5 @@
4343
// USB is always used internally so skip the pin objects for it.
4444
#define IGNORE_PIN_PA24 1
4545
#define IGNORE_PIN_PA25 1
46+
47+
#define MICROPY_PY_URE 0

‎ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ CIRCUITPY_GAMEPAD = 0
2020
CIRCUITPY_RTC = 0
2121

2222
SUPEROPT_GC = 0
23-
CFLAGS_INLINE_LIMIT = 35
23+
CFLAGS_INLINE_LIMIT = 55
2424

2525
# Include these Python libraries in firmware.
2626
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice

‎py/circuitpy_mpconfig.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,9 @@ typedef long mp_off_t;
193193
#define MICROPY_PY_UERRNO (CIRCUITPY_FULL_BUILD)
194194
// Opposite setting is deliberate.
195195
#define MICROPY_PY_UERRNO_ERRORCODE (!CIRCUITPY_FULL_BUILD)
196+
#ifndef MICROPY_PY_URE
196197
#define MICROPY_PY_URE (CIRCUITPY_FULL_BUILD)
198+
#endif
197199
#define MICROPY_PY_URE_MATCH_GROUPS (CIRCUITPY_FULL_BUILD)
198200
#define MICROPY_PY_URE_MATCH_SPAN_START_END (CIRCUITPY_FULL_BUILD)
199201
#define MICROPY_PY_URE_SUB (CIRCUITPY_FULL_BUILD)

0 commit comments

Comments
 (0)