Skip to content

Commit 4fc189b

Browse files
dhalbertdhalbert
committed
Merge latest 4.0.x fixes into master
2 parents c85e111 + 036e7a3 commit 4fc189b

28 files changed

Lines changed: 342 additions & 21 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ git:
2121
# that SDK is shortest and add it there. In the case of major re-organizations,
2222
# just try to make the builds "about equal in run time"
2323
env:
24-
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="circuitplayground_express mini_sam_m4 grandcentral_m4_express capablerobot_usbhub pygamer pca10056 pca10059 feather_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini electronut_labs_papyr" TRAVIS_SDK=arm:nrf
24+
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="circuitplayground_express mini_sam_m4 grandcentral_m4_express capablerobot_usbhub pygamer pca10056 pca10059 feather_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini electronut_labs_papyr electronut_labs_blip" TRAVIS_SDK=arm:nrf
2525
- TRAVIS_BOARDS="metro_m0_express metro_m4_express metro_m4_airlift_lite pirkey_m0 trellis_m4_express trinket_m0 sparkfun_lumidrive sparkfun_redboard_turbo bast_pro_mini_m0" TRAVIS_SDK=arm
2626
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32 uchip escornabot_makech" TRAVIS_SDK=arm
2727
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10 kicksat-sprite ugame10 robohatmm1" TRAVIS_SDK=arm

‎Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile for Sphinx documentation
1+
# Top-level Makefile for documentation builds and miscellaneous tasks.
22
#
33

44
# You can set these variables from the command line.
@@ -215,3 +215,7 @@ check-translate: locale/circuitpython.pot $(wildcard locale/*.po)
215215
stubs:
216216
rst2pyi $(VALIDATE) shared-bindings/ $(STUBDIR)
217217
python setup.py sdist
218+
219+
update-frozen-libraries:
220+
@echo "Updating all frozen libraries to latest tagged version."
221+
cd frozen; for library in *; do cd $$library; ../../tools/git-checkout-latest-tag.sh; cd ..; done

‎main.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,11 @@ void gc_collect(void) {
455455
// This collects root pointers from the VFS mount table. Some of them may
456456
// have lost their references in the VM even though they are mounted.
457457
gc_collect_root((void**)&MP_STATE_VM(vfs_mount_table), sizeof(mp_vfs_mount_t) / sizeof(mp_uint_t));
458+
459+
#if CIRCUITPY_DISPLAYIO
460+
displayio_gc_collect();
461+
#endif
462+
458463
// This naively collects all object references from an approximate stack
459464
// range.
460465
gc_collect_root((void**)sp, ((uint32_t)&_estack - sp) / sizeof(uint32_t));

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Thermistor
2828
# Tweak inlining depending on language.
2929
ifeq ($(TRANSLATION), zh_Latn_pinyin)
3030
CFLAGS_INLINE_LIMIT = 25
31+
RELEASE_NEEDS_CLEAN_BUILD = 1
3132
else
3233
CFLAGS_INLINE_LIMIT = 55
3334
endif

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ CHIP_FAMILY = samd21
2020

2121
# Tweak inlining depending on language.
2222
ifeq ($(TRANSLATION), zh_Latn_pinyin)
23-
CFLAGS_INLINE_LIMIT = 35
23+
CFLAGS_INLINE_LIMIT = 23
24+
RELEASE_NEEDS_CLEAN_BUILD = 1
2425
else
2526
CFLAGS_INLINE_LIMIT = 55
2627
endif

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ CHIP_FAMILY = samd21
1515
# Tweak inlining depending on language.
1616
ifeq ($(TRANSLATION), zh_Latn_pinyin)
1717
CFLAGS_INLINE_LIMIT = 60
18+
RELEASE_NEEDS_CLEAN_BUILD = 1
1819
endif

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ CHIP_FAMILY = samd21
1515
# Tweak inlining depending on language.
1616
ifeq ($(TRANSLATION), zh_Latn_pinyin)
1717
CFLAGS_INLINE_LIMIT = 45
18+
RELEASE_NEEDS_CLEAN_BUILD = 1
1819
else
1920
CFLAGS_INLINE_LIMIT = 70
2021
endif

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ CHIP_FAMILY = samd21
1616
# Tweak inlining depending on language.
1717
ifeq ($(TRANSLATION), zh_Latn_pinyin)
1818
CFLAGS_INLINE_LIMIT = 50
19+
RELEASE_NEEDS_CLEAN_BUILD = 1
1920
endif

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ CIRCUITPY_SMALL_BUILD = 1
2525
# Tweak inlining depending on language.
2626
ifeq ($(TRANSLATION), zh_Latn_pinyin)
2727
CFLAGS_INLINE_LIMIT = 40
28+
RELEASE_NEEDS_CLEAN_BUILD = 1
2829
endif

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ EXTERNAL_FLASH_DEVICES = "W25Q32FV"
1616
# Tweak inlining depending on language.
1717
ifeq ($(TRANSLATION), zh_Latn_pinyin)
1818
CFLAGS_INLINE_LIMIT = 50
19+
RELEASE_NEEDS_CLEAN_BUILD = 1
1920
endif

0 commit comments

Comments
 (0)