esp32: fix read-flash

Signed-off-by: Benny Zlotnik <[email protected]>

Author: bennyz

packages/jumpstarter-driver-esp32/jumpstarter_driver_esp32/client.py

@@ -57,12 +57,16 @@ def read_flash(self, address: int, size: int) -> bytes:
             address: Flash address to read from
             size: Number of bytes to read
         """
+        import base64
+
         if address < 0:
             raise ArgumentError("Flash address must be non-negative")
         if size <= 0:
             raise ArgumentError("Size must be positive")
 
-        return self.call("read_flash", address, size)
+        encoded_data = self.call("read_flash", address, size)
+
+        return base64.b64decode(encoded_data)
 
     def enter_bootloader(self) -> str:
         """Enter bootloader mode"""

packages/jumpstarter-driver-esp32/jumpstarter_driver_esp32/driver.py

@@ -124,8 +124,10 @@ def _flash_firmware():
             return await to_thread.run_sync(_flash_firmware)
 
     @export
-    def read_flash(self, address: int, size: int) -> bytes:
+    def read_flash(self, address: int, size: int) -> str:
         """Read flash contents from specified address"""
+        import base64
+
         address = int(address)
         size = int(size)
         if address < 0:
@@ -135,7 +137,14 @@ def read_flash(self, address: int, size: int) -> bytes:
 
         esp = self._connect_esp()
         try:
-            return esp.read_flash(address, size)
+            if not esp.IS_STUB:
+                esp = esp.run_stub()
+
+            data = esp.read_flash(address, size)
+
+            esp.hard_reset()
+
+            return base64.b64encode(data).decode('ascii')
         finally:
             if hasattr(esp, "_port") and esp._port:
                 esp._port.close()