8000 Merge pull request #1339 from dhalbert/3.x-frozen-swap · sparkfun/circuitpython@0ea31ec · GitHub
[go: up one dir, main page]
Skip to content

Commit 0ea31ec

Browse files
tannewttannewt
authored
Merge pull request adafruit#1339 from dhalbert/3.x-frozen-swap
Merge 3.x .frozen and /lib swap on sys.path; update frozen libs
2 parents 7e2a3bf + 11de8fd commit 0ea31ec

14 files changed

+19
-12
lines changed

‎frozen/Adafruit_CircuitPython_BusDevice

‎frozen/Adafruit_CircuitPython_CircuitPlayground

‎frozen/Adafruit_CircuitPython_Crickit

‎frozen/Adafruit_CircuitPython_HID

‎frozen/Adafruit_CircuitPython_LIS3DH

‎frozen/Adafruit_CircuitPython_Motor

‎frozen/Adafruit_CircuitPython_NeoPixel

‎frozen/Adafruit_CircuitPython_Thermistor

‎frozen/Adafruit_CircuitPython_seesaw

‎main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,10 @@ void start_mp(supervisor_allocation* heap) {
108108
mp_obj_list_init(mp_sys_path, 0);
109109
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
110110
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_));
111-
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
112111
// Frozen modules are in their own pseudo-dir, e.g., ".frozen".
112+
// Prioritize .frozen over /lib.
113113
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_FROZEN_FAKE_DIR_QSTR));
114+
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
114115

115116
mp_obj_list_init(mp_sys_argv, 0);
116117

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
1919
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
2020
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
2121
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Thermistor
22+
23+
#Adding per @danh to reduce memory usage and get the latest changes in
24+
CFLAGS_INLINE_LIMIT = 55

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ LONGINT_IMPL = NONE
1010
CHIP_VARIANT = SAMD21E18A
1111
CHIP_FAMILY = samd21
1212

13+
CFLAGS_INLINE_LIMIT = 45
14+
1315
# Include these Python libraries in firmware.
1416
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
1517
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID

‎ports/atmel-samd/common-hal/supervisor/Runtime.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ bool common_hal_get_serial_connected(void) {
3333
}
3434

3535
bool common_hal_get_serial_bytes_available(void) {
36-
return (bool) serial_bytes_available();
36+
return (bool) serial_bytes_available();
3737
}

‎ports/esp8266/main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,11 @@ STATIC void mp_reset(void) {
9595
mp_init();
9696
mp_obj_list_init(mp_sys_path, 0);
9797
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
98-
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
9998
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_));
10099
// Frozen modules are in their own pseudo-dir, e.g., ".frozen".
100+
// Prioritize .frozen over /lib.
101101
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_FROZEN_FAKE_DIR_QSTR));
102+
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
102103

103104
mp_obj_list_init(mp_sys_argv, 0);
104105

0 commit comments

Comments
 (0)
0