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

merge 3.x swap of /lib and .frozen; update frozen libs

This commit is contained in:
Dan Halbert 2018-11-15 15:00:23 -05:00
parent 7e2a3bf52e 3ace9ea9ea
commit 11de8fdca7
14 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frozen/Adafruit_CircuitPython_BusDevice

@ -1 +1 @@
Subproject commit 97d4129b8117d177df2675839ec4081b3570838d Subproject commit d86fc7e81d51465ca1eae6f8c1141f81f065f5aa

2
frozen/Adafruit_CircuitPython_CircuitPlayground

@ -1 +1 @@
Subproject commit 36ec7b371f1751961de6d2c910533618d931f109 Subproject commit f4ee725fb93fd1a31666d3f71d10c94eb96df7c8

2
frozen/Adafruit_CircuitPython_Crickit

@ -1 +1 @@
Subproject commit bbf2d897ae116531bfa15af3bcb32b0123acc435 Subproject commit 412392c8bdb6b4378e007eb7974c76b92fa9ff1d

2
frozen/Adafruit_CircuitPython_HID

@ -1 +1 @@
Subproject commit 99c71a6c1ea00bc14f0a4507116ff216beafafbd Subproject commit f5e70e09250f2a25ebb6487a30a763041644c5d3

2
frozen/Adafruit_CircuitPython_LIS3DH

@ -1 +1 @@
Subproject commit 377910d5a9bfbf833dfd3064f80c5b2ae0c78c9a Subproject commit 6298cd363811ad6ac10d4325c898be87a70d7bb2

2
frozen/Adafruit_CircuitPython_Motor

@ -1 +1 @@
Subproject commit 00326214fc2ece8b31c07a654b192797e6a08043 Subproject commit 4421e79661002ff8da6c0c4f22940ec843ee300b

2
frozen/Adafruit_CircuitPython_NeoPixel

@ -1 +1 @@
Subproject commit 4b9563d6a74c6089d0ef5466975d11ef52851bca Subproject commit 72e8f3855ecd136641d536a49311c38ee4f76f33

2
frozen/Adafruit_CircuitPython_Thermistor

@ -1 +1 @@
Subproject commit 1570b23f7a6d62e169d2fd15969e507a1da05374 Subproject commit eae584918e72ff5fa323825470f276b31829ef9f

2
frozen/Adafruit_CircuitPython_seesaw

@ -1 +1 @@
Subproject commit e3e3021d8578fde450511b47a085d9d56ab46741 Subproject commit c92c22ff029ee05bd392299cf25887e9af48903a

3
main.c
View File

@ -108,9 +108,10 @@ void start_mp(supervisor_allocation* heap) {
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);

3
ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
View File

@ -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_LIS3DH
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Thermistor 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

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

2
ports/atmel-samd/common-hal/supervisor/Runtime.c
View File

@ -33,5 +33,5 @@ bool common_hal_get_serial_connected(void) {
} }
bool common_hal_get_serial_bytes_available(void) { bool common_hal_get_serial_bytes_available(void) {
return (bool) serial_bytes_available(); return (bool) serial_bytes_available();
} }

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);