diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2018-11-15 12:52:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-15 12:52:54 -0800 |
| commit | 0ea31ec15dc212b5238f2ca6009ac206abe9e034 (patch) | |
| tree | 8f87648977c541995c9a3c62476d5e4003f66468 /ports | |
| parent | 7e2a3bf52edbf7c94939bdb82da7f6f9e0889268 (diff) | |
| parent | 11de8fdca76da455ce52ca0fdd46fb70ce237dd9 (diff) | |
Merge pull request #1339 from dhalbert/3.x-frozen-swap4.0.0-alpha.3
Merge 3.x .frozen and /lib swap on sys.path; update frozen libs
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk | 3 | ||||
| -rw-r--r-- | ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk | 2 | ||||
| -rwxr-xr-x | ports/atmel-samd/common-hal/supervisor/Runtime.c | 2 | ||||
| -rw-r--r-- | ports/esp8266/main.c | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk index e5665afb6..f701ef173 100644 --- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk @@ -19,3 +19,6 @@ FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Thermistor + +#Adding per @danh to reduce memory usage and get the latest changes in +CFLAGS_INLINE_LIMIT = 55 diff --git a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk index 0f8d0f9ca..ddc262a57 100644 --- a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk +++ b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk @@ -10,6 +10,8 @@ LONGINT_IMPL = NONE CHIP_VARIANT = SAMD21E18A CHIP_FAMILY = samd21 +CFLAGS_INLINE_LIMIT = 45 + # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID diff --git a/ports/atmel-samd/common-hal/supervisor/Runtime.c b/ports/atmel-samd/common-hal/supervisor/Runtime.c index ea663f897..6be38f216 100755 --- a/ports/atmel-samd/common-hal/supervisor/Runtime.c +++ b/ports/atmel-samd/common-hal/supervisor/Runtime.c @@ -33,5 +33,5 @@ bool common_hal_get_serial_connected(void) { } bool common_hal_get_serial_bytes_available(void) { - return (bool) serial_bytes_available(); + return (bool) serial_bytes_available(); } diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c index 4882bf599..969d35bbf 100644 --- a/ports/esp8266/main.c +++ b/ports/esp8266/main.c @@ -95,10 +95,11 @@ STATIC void mp_reset(void) { mp_init(); mp_obj_list_init(mp_sys_path, 0); mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script) - mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib)); mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_)); // Frozen modules are in their own pseudo-dir, e.g., ".frozen". + // Prioritize .frozen over /lib. mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_FROZEN_FAKE_DIR_QSTR)); + mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib)); mp_obj_list_init(mp_sys_argv, 0); |