Merge pull request #491 from shorepine/mipweb

MIP
shorepine · Feb 5, 2025 · f3590a4 · f3590a4
2 parents 78985eb + c096bc5
commit f3590a4
Show file tree

Hide file tree

Showing 23 changed files with 300 additions and 197 deletions.
diff --git a/tulip/esp32s3/boards/manifest.py b/tulip/esp32s3/boards/manifest.py
@@ -3,6 +3,7 @@
 freeze("$(PORT_DIR)/modules", "inisetup.py")
 freeze("$(PORT_DIR)/modules", "espnow.py")
 freeze("$(PORT_DIR)/modules", "flashbdev.py")
+require("bundle-networking")
 
 include("$(MPY_DIR)/extmod/asyncio")
 

diff --git a/tulip/linux/mpconfigport.h b/tulip/linux/mpconfigport.h
@@ -64,7 +64,7 @@
 #endif
 
 #ifndef MICROPY_PY_SYS_PATH_DEFAULT
-#define MICROPY_PY_SYS_PATH_DEFAULT ".frozen:~/.micropython/lib:/usr/lib/micropython"
+#define MICROPY_PY_SYS_PATH_DEFAULT ".frozen"
 #endif
 
 #define MP_STATE_PORT MP_STATE_VM

diff --git a/tulip/linux/variants/manifest.py b/tulip/linux/variants/manifest.py
@@ -4,4 +4,5 @@
 freeze("$(MPY_DIR)/../amy", "juno.py")
 freeze("$(MPY_DIR)/../amy", "amy_wave.py")
 freeze("$(MPY_DIR)/../amy", "amy_constants.py")
+require("bundle-networking")
 
diff --git a/tulip/macos/mpconfigport.h b/tulip/macos/mpconfigport.h
@@ -65,7 +65,7 @@
 #endif
 
 #ifndef MICROPY_PY_SYS_PATH_DEFAULT
-#define MICROPY_PY_SYS_PATH_DEFAULT ".frozen:~/.micropython/lib:/usr/lib/micropython"
+#define MICROPY_PY_SYS_PATH_DEFAULT ".frozen"
 #endif
 
 #define MP_STATE_PORT MP_STATE_VM

diff --git a/tulip/macos/variants/manifest.py b/tulip/macos/variants/manifest.py
@@ -1,7 +1,9 @@
+
 include("$(MPY_DIR)/extmod/asyncio")
 freeze("$(MPY_DIR)/../tulip/shared/py")
 freeze("$(MPY_DIR)/../amy", "amy.py")
 freeze("$(MPY_DIR)/../amy", "juno.py")
 freeze("$(MPY_DIR)/../amy", "amy_wave.py")
 freeze("$(MPY_DIR)/../amy", "amy_constants.py")
+require("bundle-networking")
 
diff --git a/tulip/shared/py/_boot.py b/tulip/shared/py/_boot.py
@@ -66,6 +66,22 @@ def webnyi():
         # Probably iOS
         cd(tulip.app_path())
 
+# Make sure user/lib exists and add it to sys.path
+libdir = tulip.root_dir()+"user/lib"
+if(not tulip.exists(libdir)):
+    mkdir(libdir)
+sys.path.append(libdir)
+
+# Remove other ones
+try:
+    sys.path.remove('/lib')
+except ValueError:
+    pass
+try:
+    sys.path.remove('~/.micropython/lib')
+except ValueError:
+    pass
+
 gc.collect()
 
 # Set up audio/midi. 

diff --git a/tulip/shared/py/tulip.py b/tulip/shared/py/tulip.py
@@ -340,7 +340,8 @@ def get_latest_release():
     return (None, None, None, None)
 
 def upgrade():
-    import time, sys, os, urequests
+    import time, sys, os
+    import tuliprequests as urequests
     try:
         import esp32, machine
         from esp32 import Partition
@@ -602,7 +603,7 @@ def next(x):
             return "OK"
         return world_web.grab_bytes_direct(url, headers=headers).then(lambda x: next(x))
     else:
-        import urequests
+        import tuliprequests as urequests
         d = urequests.get(url, headers = headers).save(filename,mode)
         return d
 
@@ -611,15 +612,16 @@ def url_get(url, headers={"User-Agent":"TulipCC/4.0"}):
         import world_web
         return world_web.grab_bytes_direct(url, headers=headers)
     else:
-        import urequests
+        import tuliprequests as urequests
         c = urequests.get(url, headers = headers)
         return c
 
 
 def url_put(url, filename, headers={"User-Agent":"TulipCC/4.0"}):
     if(board()=="WEB"):
         return webnyi()
-    import urequests, os
+    import os
+    import tuliprequests as urequests
     filesize = os.stat(filename)[6]
     f = open(filename, 'rb')
     put_response = urequests.put(

diff --git a/tulip/shared/py/urequests.py → tulip/shared/py/tuliprequests.py b/tulip/shared/py/urequests.py → tulip/shared/py/tuliprequests.py
diff --git a/tulip/shared/py/webrequests.py b/tulip/shared/py/webrequests.py
diff --git a/tulip/shared/py/world.py b/tulip/shared/py/world.py
@@ -5,7 +5,7 @@
 import os
 import tulip
 if(tulip.board()!="WEB"):
-    import urequests as requests
+    import tuliprequests as urequests
 
 MAX_DESCRIPTION_SIZE=50
 MAX_USERNAME_SIZE=10

diff --git a/tulip/web/mipweb/manifest.py b/tulip/web/mipweb/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.3.1", description="On-device package installer for network-capable boards")
+
+package("mipweb", opt=3)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		metadata(version="0.3.1", description="On-device package installer for network-capable boards")

		package("mipweb", opt=3)