Merge commit '3718058bfc5726165394febfd75e7bdf94d5ad07'

Author: Josverl

mpflash/cli_flash.py

@@ -115,6 +115,13 @@
     show_default=True,
     help="""How to enter the (MicroPython) bootloader before flashing.""",
 )
+@click.option(
+    "--flash_mode", "-fm",
+    type=click.Choice(["keep", "qio", "qout", "dio", "dout"]),
+    default="keep",
+    show_default=True,
+    help="""Flash mode for ESP boards. (default: keep)""",
+)
 def cli_flash_board(**kwargs) -> int:
     # version to versions, board to boards
     kwargs["versions"] = [kwargs.pop("version")] if kwargs["version"] is not None else []
@@ -201,6 +208,7 @@ def cli_flash_board(**kwargs) -> int:
         params.fw_folder,
         params.erase,
         params.bootloader,
+        flash_mode = params.flash_mode,
     ):
         log.info(f"Flashed {len(flashed)} boards")
         show_mcus(flashed, title="Updated boards after flashing")

mpflash/common.py

@@ -11,6 +11,7 @@
 from serial.tools.list_ports_common import ListPortInfo
 
 
+# from mpflash.flash.esp import FlashMode
 from .logger import log
 
 PORT_FWTYPES = {
@@ -98,6 +99,7 @@ class FlashParams(Params):
     erase: bool = True
     bootloader: BootloaderMethod = BootloaderMethod.NONE
     cpu: str = ""
+    flash_mode: str = "keep"  # keep, qio, qout, dio, dout
 
     def __post_init__(self):
         if isinstance(self.bootloader, str):

mpflash/flash/__init__.py

@@ -19,6 +19,7 @@ def flash_list(
     fw_folder: Path,
     erase: bool,
     bootloader: BootloaderMethod,
+    **kwargs
 ):
     """Flash a list of boards with the specified firmware."""
     UF2_PORTS = [port for port, exts in PORT_FWTYPES.items() if ".uf2" in exts]
@@ -41,7 +42,7 @@ def flash_list(
                 updated = flash_stm32(mcu, fw_file, erase=erase)
             elif mcu.port in ["esp32", "esp8266"]:
                 #  bootloader is handled by esptool for esp32/esp8266
-                updated = flash_esp(mcu, fw_file=fw_file, erase=erase)
+                updated = flash_esp(mcu, fw_file=fw_file, erase=erase, **kwargs)
             else:
                 log.error(f"Don't (yet) know how to flash {mcu.port}-{mcu.board} on {mcu.serialport}")
         except Exception as e:

mpflash/flash/esp.py

@@ -5,16 +5,24 @@
 """
 
 from pathlib import Path
-from typing import List, Optional
+from typing import List, Literal, Optional
 
 import esptool
 from loguru import logger as log
 
 from mpflash.mpboard_id import find_known_board
 from mpflash.mpremoteboard import MPRemoteBoard
 
+FlashMode = Literal["keep", "qio", "qout", "dio", "dout"]
 
-def flash_esp(mcu: MPRemoteBoard, fw_file: Path, *, erase: bool = True) -> Optional[MPRemoteBoard]:
+def flash_esp(
+    mcu: MPRemoteBoard,
+    fw_file: Path,
+    *,
+    erase: bool = True,
+    flash_mode: FlashMode = "keep",  # keep, qio, qout, dio, dout
+    flash_size: str = "detect",
+) -> Optional[MPRemoteBoard]:
     if mcu.port not in ["esp32", "esp8266"] or mcu.board.startswith("ARDUINO_"):
         log.error(f"esptool not supported for {mcu.port} {mcu.board} on {mcu.serialport}")
         return None
@@ -29,6 +37,8 @@ def flash_esp(mcu: MPRemoteBoard, fw_file: Path, *, erase: bool = True) -> Optio
     chip = "auto"
     start_addr = "0x0"
     if mcu.cpu.upper().startswith("ESP32"):
+        start_addr = "0x0"
+
         baud_rate = str(921_600)
         if mcu.cpu.upper() == "ESP32":
             start_addr = "0x1000"
@@ -39,21 +49,29 @@ def flash_esp(mcu: MPRemoteBoard, fw_file: Path, *, erase: bool = True) -> Optio
         elif "S2" in mcu.cpu.upper():
             start_addr = "0x1000"
             chip = "esp32s2"
+            baud_rate = str(460_800)
         elif "S3" in mcu.cpu.upper():
             start_addr = "0x0"
             chip = "esp32s3"
         elif "C3" in mcu.cpu.upper():
             start_addr = "0x0"
             chip = "esp32c3"
+        elif "C6" in mcu.cpu.upper():
+            start_addr = "0x0"
+            chip = "esp32c6"
+            baud_rate = str(460_800)
+
+
         cmds.append(
-            f"esptool --chip {chip} --port {mcu.serialport} -b {baud_rate} write_flash --compress {start_addr}".split() + [str(fw_file)]
+            f"esptool --chip {mcu.cpu} --port {mcu.serialport} -b {baud_rate} write_flash --flash_mode {flash_mode} --flash_size {flash_size} --compress {start_addr}".split()
+            + [str(fw_file)]
         )
     elif mcu.cpu.upper() == "ESP8266":
         baud_rate = str(460_800)
         start_addr = "0x0"
         chip = "esp8266"
         cmds.append(
-            f"esptool --chip {chip} --port {mcu.serialport} -b {baud_rate} write_flash --flash_size=detect {start_addr}".split()
+            f"esptool --chip {chip} --port {mcu.serialport} -b {baud_rate} write_flash --flash_mode {flash_mode} --flash_size=detect {start_addr}".split()
             + [str(fw_file)]
         )
     # now that we have the chip, we can do the erare properly