micropython · M-D-777 · May 25, 2022 · Jun 1, 2022 · Jun 3, 2022 · Nov 26, 2022
diff --git a/ports/esp32/boards/GENERIC_S2/manifest.py b/ports/esp32/boards/GENERIC_S2/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/GENERIC_S2/modules/_boot_fat.py b/ports/esp32/boards/GENERIC_S2/modules/_boot_fat.py
@@ -0,0 +1,13 @@
+import gc
+import uos
+from flashbdev import bdev
+
+try:
+    if bdev:
+        uos.mount(bdev, "/")
+except OSError:
+    import inisetup_fat
+
+    vfs = inisetup_fat.setup()
+
+gc.collect()
diff --git a/ports/esp32/boards/GENERIC_S2/modules/inisetup_fat.py b/ports/esp32/boards/GENERIC_S2/modules/inisetup_fat.py
@@ -0,0 +1,49 @@
+import uos
+from flashbdev import bdev
+
+
+def check_bootsec():
+    buf = bytearray(bdev.ioctl(5, 0))  # 5 is SEC_SIZE
+    bdev.readblocks(0, buf)
+    empty = True
+    for b in buf:
+        if b != 0xFF:
+            empty = False
+    <
67ED
span class='blob-code-inner blob-code-marker ' data-code-marker="+">            break
+    if empty:
+        return True
+    fs_corrupted()
+
+
+def fs_corrupted():
+    import time
+
+    while 1:
+        print(
+            """\
+The filesystem appears to be corrupted. If you had important data there, you
+may want to make a flash snapshot to try to recover it. Otherwise, perform
+factory reprogramming of MicroPython firmware (completely erase flash, followed
+by firmware programming).
+"""
+        )
+        time.sleep(3)
+
+
+def setup():
+    check_bootsec()
+    print("Performing initial setup")
+    uos.VfsFat.mkfs(bdev)
+    vfs = uos.VfsFat(bdev)
+    uos.mount(vfs, "/")
+    with open("boot.py", "w") as f:
+        f.write(
+            """\
+# This file is executed on every boot (including wake-boot from deepsleep)
+#import esp
+#esp.osdebug(None)
+#import webrepl
+#webrepl.start()
+"""
+        )
+    return vfs
diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
@@ -3,4 +3,7 @@ set(IDF_TARGET esp32s2)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.usb
+    #boards/sdkconfig.usb_msc
 )
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/GENERIC_S3/manifest.py b/ports/esp32/boards/GENERIC_S3/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/GENERIC_S3/modules/_boot_fat.py b/ports/esp32/boards/GENERIC_S3/modules/_boot_fat.py
@@ -0,0 +1,13 @@
+import gc
+import uos
+from flashbdev import bdev
+
+try:
+    if bdev:
+        uos.mount(bdev, "/")
+except OSError:
+    impor
F438
t inisetup_fat
+
+    vfs = inisetup_fat.setup()
+
+gc.collect()
diff --git a/ports/esp32/boards/GENERIC_S3/modules/inisetup_fat.py b/ports/esp32/boards/GENERIC_S3/modules/inisetup_fat.py
@@ -0,0 +1,49 @@
+import uos
+from flashbdev import bdev
+
+
+def check_bootsec():
+    buf = bytearray(bdev.ioctl(5, 0))  # 5 is SEC_SIZE
+    bdev.readblocks(0, buf)
+    empty = True
+    for b in buf:
+        if b != 0xFF:
+            empty = False
+            break
+    if empty:
+        return True
+    fs_corrupted()
+
+
+def fs_corrupted():
+    import time
+
+    while 1:
+        print(
+            """\
+The filesystem appears to be corrupted. If you had important data there, you
+may want to make a flash snapshot to try to recover it. Otherwise, perform
+factory reprogramming of MicroPython firmware (completely erase flash, followed
+by firmware programming).
+"""
+        )
+        time.sleep(3)
+
+
+def setup():
+    check_bootsec()
+    print("Performing initial setup")
+    uos.VfsFat.mkfs(bdev)
+    vfs = uos.VfsFat(bdev)
+    uos.mount(vfs, "/")
+    with open("boot.py", "w") as f:
+        f.write(
+            """\
+# This file is executed on every boot (including wake-boot from deepsleep)
+#import esp
+#esp.osdebug(None)
+#import webrepl
+#webrepl.start()
+"""
+        )
+    return vfs
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
@@ -3,6 +3,9 @@ set(IDF_TARGET esp32s3)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.usb
+    #boards/sdkconfig.usb_msc
     boards/sdkconfig.ble
     boards/GENERIC_S3/sdkconfig.board
 )
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/manifest.py b/ports/esp32/boards/GENERIC_S3_SPIRAM/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/modules/_boot_fat.py b/ports/esp32/boards/GENERIC_S3_SPIRAM/modules/_boot_fat.py
@@ -0,0 +1,13 @@
+import gc
+import uos
+from flashbdev import bdev
+
+try:
+    if bdev:
+        uos.mount(bdev, "/")
+except OSError:
+    import inisetup_fat
+
+    vfs = inisetup_fat.setup()
+
+gc.collect()
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/modules/inisetup_fat.py b/ports/esp32/boards/GENERIC_S3_SPIRAM/modules/inisetup_fat.py
@@ -0,0 +1,49 @@
+import uos
+from flashbdev import bdev
+
+
+def check_bootsec():
+    buf = bytearray(bdev.ioctl(5, 0))  # 5 is SEC_SIZE
+    bdev.readblocks(0, buf)
+    empty = True
+    for b in buf:
+        if b != 0xFF:
+            empty = False
+            break
+    if empty:
+        return True
+    fs_corrupted()
+
+
+def fs_corrupted():
+    import time
+
+    while 1:
+        print(
+            """\
+The filesystem appears to be corrupted. If you had important data there, you
+may want to make a flash snapshot to try to recover it. Otherwise, perform
+factory reprogramming of MicroPython firmware (completely erase flash, followed
+by firmware programming).
+"""
+        )
+        time.sleep(3)
+
+
+def setup():
+    check_bootsec()
+    print("Performing initial setup")
+    uos.VfsFat.mkfs(bdev)
+    vfs = uos.VfsFat(bdev)
+    uos.mount(vfs, "/")
+    with open("boot.py", "w") as f:
+        f.write(
+            """\
+# This file is executed on every boot (including wake-boot from deepsleep)
+#import esp
+#esp.osdebug(None)
+#import webrepl
+#webrepl.start()
+"""
+        )
+    return vfs
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake
@@ -3,7 +3,10 @@ set(IDF_TARGET esp32s3)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.usb
+    #boards/sdkconfig.usb_msc
     boards/sdkconfig.ble
     boards/sdkconfig.spiram_sx
     boards/GENERIC_S3_SPIRAM/sdkconfig.board
 )
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/modules/_boot_fat.py b/ports/esp32/boards/LOLIN_S2_MINI/modules/_boot_fat.py
@@ -0,0 +1,13 @@
+import gc
+import uos
+from flashbdev import bdev
+
+try:
+    if bdev:
+        uos.mount(bdev, "/")
+except OSError:
+    import inisetup_fat
+
+    vfs = inisetup_fat.setup()
+
+gc.collect()
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/modules/inisetup_fat.py b/ports/esp32/boards/LOLIN_S2_MINI/modules/inisetup_fat.py
@@ -0,0 +1,49 @@
+import uos
+from flashbdev import bdev
+
+
+def check_bootsec():
+    buf = bytearray(bdev.ioctl(5, 0))  # 5 is SEC_SIZE
+    bdev.readblocks(0, buf)
+    empty = True
+    for b in buf:
+        if b != 0xFF:
+            empty = False
+            break
+    if empty:
+        return True
+    fs_corrupted()
+
+
+def fs_corrupted():
+    import time
+
+    while 1:
+        print(
+            """\
+The filesystem appears to be corrupted. If you had important data there, you
+may want to make a flash snapshot to try to recover it. Otherwise, perform
+factory reprogramming of MicroPython firmware (completely erase flash, followed
+by firmware programming).
+"""
+        )
+        time.sleep(3)
+
+
+def setup():
+    check_bootsec()
+    print("Performing initial setup")
+    uos.VfsFat.mkfs(bdev)
+    vfs = uos.VfsFat(bdev)
+    uos.mount(vfs, "/")
+    with open("boot.py", "w") as f:
+        f.write(
+            """\
+# This file is executed on every boot (including wake-boot from deepsleep)
+#import esp
+#esp.osdebug(None)
+#import webrepl
+#webrepl.start()
+"""
+        )
+    return vfs
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
@@ -4,6 +4,7 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
+    #boards/sdkconfig.usb_msc
 )
 
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/modules/_boot_fat.py b/ports/esp32/boards/LOLIN_S2_PICO/modules/_boot_fat.py
@@ -0,0 +1,13 @@
+import gc
+import uos
+from flashbdev import bdev
+
+try:
+    if bdev:
+        uos.mount(bdev, "/")
+except OSError:
+    import inisetup_fat
+
+    vfs = inisetup_fat.setup()
+
+gc.collect()
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/modules/inisetup_fat.py b/ports/esp32/boards/LOLIN_S2_PICO/modules/inisetup_fat.py
@@ -0,0 +1,49 @@
+import uos
+from flashbdev import bdev
+
+
+def check_bootsec():
+    buf = bytearray(bdev.ioctl(5, 0))  # 5 is SEC_SIZE
+    bdev.readblocks(0, buf)
+    empty = True
+    for b in buf:
+        if b != 0xFF:
+            empty = False
+            break
+    if empty:
+        return True
+    fs_corrupted()
+
+
+def fs_corrupted():
+    import time
+
+    while 1:
+        print(
+            """\
+The filesystem appears to be corrupted. If you had important data there, you
+may want to make a flash snapshot to try to recover it. Otherwise, perform
+factory reprogramming of MicroPython firmware (completely erase flash, followed
+by firmware programming).
+"""
+        )
+        time.sleep(3)
+
+
+def setup():
+    check_bootsec()
+    print("Performing initial setup")
+    uos.VfsFat.mkfs(bdev)
+    vfs = uos.VfsFat(bdev)
+    uos.mount(vfs, "/")
+    with open("boot.py", "w") as f:
+        f.write(
+            """\
+# This file is executed on every boot (including wake-boot from deepsleep)
+#import esp
+#esp.osdebug(None)
+#import webrepl
+#webrepl.start()
+"""
+        )
+    return vfs
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
@@ -4,6 +4,7 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
+    #boards/sdkconfig.usb_msc
 )
 
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/UM_FEATHERS2/modules/_boot_fat.py b/ports/esp32/boards/UM_FEATHERS2/modules/_boot_fat.py
@@ -0,0 +1,13 @@
+import gc
+import uos
+from flashbdev import bdev
+
+try:
+    if bdev:
+        uos.mount(bdev, "/")
+except OSError:
+    import inisetup_fat
+
+    vfs = inisetup_fat.setup()
+
+gc.collect()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		include("$(PORT_DIR)/boards/manifest.py")
		freeze("modules")