Add mpos.partitions.get_next_update_partition() helper that alternates between ota_0 and ota_1 only

ThomasFarstrike · ThomasFarstrike · commit 8408f46849c8 · 2026-05-13T22:26:37.000+02:00
And use it from About and OSUpdate app.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,11 @@ Future release (next version)
 Add changes that have been made to the code but haven't made it into a release here.
 
 Builtin Apps:
-- OSUpdate: fix get_next_update() partition returning higher, non-OS partitions (only toggle between ota_0 and ota_1)
+- OSUpdate: restrict OTA update target to ota_0/ota_1 instead of all ota_N partitions (via shared partition helper)
+- About: show correct next update partition instead of always using get_next_update()
+
+Framework:
+- Add mpos.partitions.get_next_update_partition() helper that alternates between ota_0 and ota_1 only
 
 Frameworks:
 - SettingActivity: support slider UI for integer settings
diff --git a/internal_filesystem/builtin/apps/com.micropythonos.about/assets/about.py b/internal_filesystem/builtin/apps/com.micropythonos.about/assets/about.py
@@ -95,10 +95,11 @@ def onCreate(self):
             # Partition info (ESP32 only)
             try:
                 self._add_label(screen, f"{lv.SYMBOL.SD_CARD} Partition Info", is_header=True)
+                from mpos.partitions import get_next_update_partition
                 from esp32 import Partition
                 current = Partition(Partition.RUNNING)
                 self._add_label(screen, f"Partition.RUNNING: {current}")
-                next_partition = current.get_next_update()
+                next_partition = get_next_update_partition()
                 self._add_label(screen, f"Next update partition: {next_partition}")
             except Exception as e:
                 error = f"Could not find partition info because: {e}\nIt's normal to get this error on desktop."
diff --git a/internal_filesystem/builtin/apps/com.micropythonos.osupdate/assets/osupdate.py b/internal_filesystem/builtin/apps/com.micropythonos.osupdate/assets/osupdate.py
@@ -463,16 +463,10 @@ def __init__(self, partition_module=None, connectivity_manager=None, download_ma
     def _setup_partition(self):
         """Initialize the OTA partition for writing."""
         if not self.simulate and self._current_partition is None:
-            current = self.partition_module(self.partition_module.RUNNING)
-            current_label = current.info()[4]
-            next_label = "ota_0" if current_label == "ota_1" else "ota_1"
-            partitions = self.partition_module.find(
-                self.partition_module.TYPE_APP,
-                label=next_label
+            from mpos.partitions import get_next_update_partition
+            self._current_partition = get_next_update_partition(
+                partition_module=self.partition_module
             )
-            if not partitions:
-                raise Exception(f"UpdateDownloader: Could not find partition: {next_label}")
-            self._current_partition = partitions[0]
             print(f"UpdateDownloader: Writing to partition: {self._current_partition}")
 
     async def _process_chunk(self, chunk):
@@ -690,16 +684,10 @@ def set_boot_partition_and_restart(self):
             return
 
         try:
-            current = self.partition_module(self.partition_module.RUNNING)
-            current_label = current.info()[4]
-            next_label = "ota_0" if current_label == "ota_1" else "ota_1"
-            partitions = self.partition_module.find(
-                self.partition_module.TYPE_APP,
-                label=next_label
+            from mpos.partitions import get_next_update_partition
+            next_partition = get_next_update_partition(
+                partition_module=self.partition_module
             )
-            if not partitions:
-                raise Exception(f"Could not find partition: {next_label}")
-            next_partition = partitions[0]
             next_partition.set_boot()
             print("UpdateDownloader: Boot partition set, restarting...")
 
diff --git a/internal_filesystem/lib/mpos/partitions.py b/internal_filesystem/lib/mpos/partitions.py
@@ -0,0 +1,15 @@
+def get_next_update_partition(partition_module=None):
+    if partition_module is None:
+        from esp32 import Partition
+        partition_module = Partition
+
+    current = partition_module(partition_module.RUNNING)
+    current_label = current.info()[4]
+    next_label = "ota_0" if current_label == "ota_1" else "ota_1"
+    partitions = partition_module.find(
+        partition_module.TYPE_APP,
+        label=next_label
+    )
+    if not partitions:
+        raise Exception(f"Could not find partition: {next_label}")
+    return partitions[0]
