OSUpdate: fix get_next_update() partition returning higher, non-OS partitions (only toggle between ota_0 and ota_1)

ThomasFarstrike · ThomasFarstrike · commit 216b47174b6c · 2026-05-13T22:01:39.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@ 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)
+
+Frameworks:
+- SettingActivity: support slider UI for integer settings
+
 Board Support:
 - Fri3d 2026: access expander.analog as property instead of function
 
diff --git a/internal_filesystem/builtin/apps/com.micropythonos.osupdate/assets/osupdate.py b/internal_filesystem/builtin/apps/com.micropythonos.osupdate/assets/osupdate.py
@@ -464,7 +464,15 @@ 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)
-            self._current_partition = current.get_next_update()
+            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
+            )
+            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):
@@ -683,7 +691,15 @@ def set_boot_partition_and_restart(self):
 
         try:
             current = self.partition_module(self.partition_module.RUNNING)
-            next_partition = current.get_next_update()
+            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
+            )
+            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/tests/test_osupdate.py b/tests/test_osupdate.py
@@ -17,15 +17,24 @@ class MockPartition:
     """Mock ESP32 Partition for testing UpdateDownloader."""
 
     RUNNING = 0
+    TYPE_APP = 0
+    TYPE_DATA = 1
 
-    def __init__(self, partition_type=None):
+    def __init__(self, partition_type=None, label="ota_0"):
         self.partition_type = partition_type
         self.blocks = {}  # Store written blocks
         self.boot_set = False
+        self._label = label
 
-    def get_next_update(self):
-        """Return a mock OTA partition."""
-        return MockPartition()
+    def info(self):
+        """Return mock partition info tuple: (type, subtype, addr, size, label, encrypted)."""
+        subtype = 0x10 if self._label == "ota_0" else 0x11
+        return (0, subtype, 0, 0x400000, self._label, False)
+
+    @classmethod
+    def find(cls, type=-1, subtype=-1, label=None):
+        """Return a list with a mock partition matching the given label."""
+        return [cls(label=label)]
 
     def writeblocks(self, block_num, data):
         """Mock writing blocks."""
