Merge pull request SHA2017-badge#228 from SHA2017-badge/basvs-apps-on-bpp-and-sdcard

basvs · web-flow · commit ed470e49e878 · 2017-08-20T13:43:00.000+02:00
Run applications from bpp and sdcard as well.
diff --git a/esp32/main.c b/esp32/main.c
@@ -88,7 +88,9 @@ mp_import_stat_t
 mp_import_stat(const char *path) {
 	if (in_safe_mode) {
 		// be more strict in which modules we would like to load
-		if (strncmp(path, "/lib/", 5) != 0) {
+		if (strncmp(path, "/lib/", 5) != 0
+				&& strncmp(path, "/bpp/lib/", 9) != 0
+				&& strncmp(path, "/sdcard/lib/", 12) != 0) {
 			return MP_IMPORT_STAT_NO_EXIST;
 		}
 
@@ -129,8 +131,11 @@ void mp_task(void *pvParameter) {
     gc_init(mp_task_heap, mp_task_heap + sizeof(mp_task_heap));
     mp_init();
     mp_obj_list_init(mp_sys_path, 0);
+    // library-path '' is needed for the internal modules.
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
     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_bpp_slash_lib));
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_sdcard_slash_lib));
     mp_obj_list_init(mp_sys_argv, 0);
     readline_init0();
 
diff --git a/esp32/modules/boot.py b/esp32/modules/boot.py
@@ -27,6 +27,12 @@
 
 try:
     if not splash=="shell":
+        if splash.startswith('bpp '):
+            splash = splash[4:len(splash)]
+            badge.mount_bpp()
+        elif splash.startswith('sdcard '):
+            splash = splash[7:len(splash)]
+            badge.mount_sdcard()
         __import__(splash)
     else:
         ugfx.clear(ugfx.WHITE)
diff --git a/esp32/qstrdefsport.h b/esp32/qstrdefsport.h
@@ -28,3 +28,5 @@
 
 // Entries for sys.path
 Q(/lib)
+Q(/bpp/lib)
+Q(/sdcard/lib)
