djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

put .frozen before /lib in sys.path; update frozen libraries

This commit is contained in:
Dan Halbert 2018-11-01 17:14:11 -04:00
parent af7a0eedf0
commit 4dfba2f8ac
15 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frozen/Adafruit_CircuitPython_BusDevice

@ -1 +1 @@
Subproject commit 07919641470edb602585c6a91f7b8eacf17e664b Subproject commit d86fc7e81d51465ca1eae6f8c1141f81f065f5aa

2
frozen/Adafruit_CircuitPython_CircuitPlayground

@ -1 +1 @@
Subproject commit d0aa6dc56d66decfae92daced7384c1e3518a666 Subproject commit f4ee725fb93fd1a31666d3f71d10c94eb96df7c8

2
frozen/Adafruit_CircuitPython_Crickit

@ -1 +1 @@
Subproject commit 44f52c5dacd9fc605565e5794e95c9a785aaf693 Subproject commit 412392c8bdb6b4378e007eb7974c76b92fa9ff1d

2
frozen/Adafruit_CircuitPython_DotStar

@ -1 +1 @@
Subproject commit af25424ee7dbebea3e5d77390c017018ffa52d36 Subproject commit 03c24157d46672c723021686f7a838cfeb2db2ba

2
frozen/Adafruit_CircuitPython_HID

@ -1 +1 @@
Subproject commit 5c2f6ef1ed80f24b6a3878067d40350d3725e198 Subproject commit f5e70e09250f2a25ebb6487a30a763041644c5d3

2
frozen/Adafruit_CircuitPython_IRRemote

@ -1 +1 @@
Subproject commit c29e10b590efbdf06163897b49cd0c2bea82ad6e Subproject commit ec11164ec6682094a48d0f9848d2c4c89c08f3bc

2
frozen/Adafruit_CircuitPython_LIS3DH

@ -1 +1 @@
Subproject commit c4152a0d87a04903ae0e612eb381af440c9e28b3 Subproject commit 6298cd363811ad6ac10d4325c898be87a70d7bb2

2
frozen/Adafruit_CircuitPython_Motor

@ -1 +1 @@
Subproject commit e0b709f1710555da67705360870ba0d14ced7e06 Subproject commit 4421e79661002ff8da6c0c4f22940ec843ee300b

2
frozen/Adafruit_CircuitPython_NeoPixel

@ -1 +1 @@
Subproject commit e9f50cb6678a1684591ee021b95a3c4b51786fee Subproject commit 72e8f3855ecd136641d536a49311c38ee4f76f33

2
frozen/Adafruit_CircuitPython_Thermistor

@ -1 +1 @@
Subproject commit 00f4ebca6c740b76c1c464f83d514ac20b0600e1 Subproject commit eae584918e72ff5fa323825470f276b31829ef9f

2
frozen/Adafruit_CircuitPython_seesaw

@ -1 +1 @@
Subproject commit 340cd17fad0c29d3a70d6e298a30ecc753df054e Subproject commit e3e3021d8578fde450511b47a085d9d56ab46741

3
main.c
View File

@ -92,9 +92,10 @@ void reset_mp(void) {
mp_obj_list_init(mp_sys_path, 0); 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_)); // current dir (or base dir of the script)
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_)); mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_));
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
// Frozen modules are in their own pseudo-dir, e.g., ".frozen". // 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_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); mp_obj_list_init(mp_sys_argv, 0);
} }

2
ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
View File

@ -10,6 +10,8 @@ LONGINT_IMPL = NONE
CHIP_VARIANT = SAMD21E18A CHIP_VARIANT = SAMD21E18A
CHIP_FAMILY = samd21 CHIP_FAMILY = samd21
CFLAGS_INLINE_LIMIT = 45
# Include these Python libraries in firmware. # Include these Python libraries in firmware.
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID

3
ports/esp8266/main.c
View File

@ -95,10 +95,11 @@ STATIC void mp_reset(void) {
mp_init(); mp_init();
mp_obj_list_init(mp_sys_path, 0); 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_)); // 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_)); 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". // 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_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); mp_obj_list_init(mp_sys_argv, 0);

2
tools/preprocess_frozen_modules.py
View File

@ -33,7 +33,7 @@ def copy_and_process(in_dir, out_dir):
for root, subdirs, files in os.walk(in_dir): for root, subdirs, files in os.walk(in_dir):
# Skip library examples directories. # Skip library examples directories.
if Path(root).name in ['examples', 'docs']: if Path(root).name in ['examples', 'tests', 'docs']:
continue continue
for file in files: for file in files: