OpenShock-AutoFlasher 0.2.1__tar.gz → 0.2.2__tar.gz

{openshock_autoflasher-0.2.1 → openshock_autoflasher-0.2.2/OpenShock_AutoFlasher.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenShock-AutoFlasher
-Version: 0.2.1
+Version: 0.2.2
 Summary: Automatically flash OpenShock firmware to ESP32 devices
 Author: NanashiTheNameless
 Author-email: NanashiTheNameless <NanashiTheNameless@NamelessNanashi.dev>
@@ -144,6 +144,7 @@ OPSH-AutoFlash -C develop --help             # Shows boards for develop channel
 | `--channel`    | `-C`  | Firmware channel: `stable`, `beta`, or `develop`               | `stable` |
 | `--version`    | `-V`  | Use specific firmware version (overrides channel)              | -        |
 | `--board`      | `-B`  | Board type (required)                                          | -        |
+| `--chip`       | -     | Target chip for esptool                                        | `auto`   |
 | `--erase`      | `-E`  | Erase flash before flashing                                    | `false`  |
 | `--no-auto`    | `-N`  | Disable auto-flash (just detect devices)                       | `false`  |
 | `--post-flash` | `-P`  | Serial command to send after flashing (can use multiple times) | -        |
@@ -170,6 +171,12 @@ OPSH-AutoFlash --version 1.5.0 --board Wemos-D1-Mini-ESP32
 OPSH-AutoFlash --channel beta --board Wemos-D1-Mini-ESP32 --erase
 ```
 
+**Flash with an explicit esptool chip:**
+
+```bash
+OPSH-AutoFlash --board Seeed-Xiao-ESP32C3 --chip esp32c3 --erase
+```
+
 **Flash and send post-flash commands to device:**
 
 ```bash

{openshock_autoflasher-0.2.1/OpenShock_AutoFlasher.egg-info → openshock_autoflasher-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenShock-AutoFlasher
-Version: 0.2.1
+Version: 0.2.2
 Summary: Automatically flash OpenShock firmware to ESP32 devices
 Author: NanashiTheNameless
 Author-email: NanashiTheNameless <NanashiTheNameless@NamelessNanashi.dev>
@@ -144,6 +144,7 @@ OPSH-AutoFlash -C develop --help             # Shows boards for develop channel
 | `--channel`    | `-C`  | Firmware channel: `stable`, `beta`, or `develop`               | `stable` |
 | `--version`    | `-V`  | Use specific firmware version (overrides channel)              | -        |
 | `--board`      | `-B`  | Board type (required)                                          | -        |
+| `--chip`       | -     | Target chip for esptool                                        | `auto`   |
 | `--erase`      | `-E`  | Erase flash before flashing                                    | `false`  |
 | `--no-auto`    | `-N`  | Disable auto-flash (just detect devices)                       | `false`  |
 | `--post-flash` | `-P`  | Serial command to send after flashing (can use multiple times) | -        |
@@ -170,6 +171,12 @@ OPSH-AutoFlash --version 1.5.0 --board Wemos-D1-Mini-ESP32
 OPSH-AutoFlash --channel beta --board Wemos-D1-Mini-ESP32 --erase
 ```
 
+**Flash with an explicit esptool chip:**
+
+```bash
+OPSH-AutoFlash --board Seeed-Xiao-ESP32C3 --chip esp32c3 --erase
+```
+
 **Flash and send post-flash commands to device:**
 
 ```bash

{openshock_autoflasher-0.2.1 → openshock_autoflasher-0.2.2}/README.md

@@ -92,6 +92,7 @@ OPSH-AutoFlash -C develop --help             # Shows boards for develop channel
 | `--channel`    | `-C`  | Firmware channel: `stable`, `beta`, or `develop`               | `stable` |
 | `--version`    | `-V`  | Use specific firmware version (overrides channel)              | -        |
 | `--board`      | `-B`  | Board type (required)                                          | -        |
+| `--chip`       | -     | Target chip for esptool                                        | `auto`   |
 | `--erase`      | `-E`  | Erase flash before flashing                                    | `false`  |
 | `--no-auto`    | `-N`  | Disable auto-flash (just detect devices)                       | `false`  |
 | `--post-flash` | `-P`  | Serial command to send after flashing (can use multiple times) | -        |
@@ -118,6 +119,12 @@ OPSH-AutoFlash --version 1.5.0 --board Wemos-D1-Mini-ESP32
 OPSH-AutoFlash --channel beta --board Wemos-D1-Mini-ESP32 --erase
 ```
 
+**Flash with an explicit esptool chip:**
+
+```bash
+OPSH-AutoFlash --board Seeed-Xiao-ESP32C3 --chip esp32c3 --erase
+```
+
 **Flash and send post-flash commands to device:**
 
 ```bash

{openshock_autoflasher-0.2.1 → openshock_autoflasher-0.2.2}/openshock_autoflasher/cli.py

@@ -10,7 +10,7 @@ from typing import List
 import requests
 from rich.style import Style
 
-from .constants import BASE_URL
+from .constants import BASE_URL, SUPPORTED_CHIPS
 from .styles import console
 from .flasher import AutoFlasher
 
@@ -64,6 +64,12 @@ def create_argument_parser(channel: str = "stable") -> argparse.ArgumentParser:
         help="Use specific firmware version (overrides channel selection)",
     )
     parser.add_argument("--board", "-B", required=True, help="Board type (required)")
+    parser.add_argument(
+        "--chip",
+        choices=("auto", *SUPPORTED_CHIPS),
+        default="auto",
+        help="Target chip for esptool (default: auto)",
+    )
     parser.add_argument(
         "--erase",
         "-E",
@@ -146,6 +152,7 @@ def main() -> None:
         post_flash_delay=args.post_flash_delay,
         alert=args.alert,
         version=args.version,
+        chip=args.chip,
     )
 
     flasher.run()

{openshock_autoflasher-0.2.1 → openshock_autoflasher-0.2.2}/openshock_autoflasher/constants.py

@@ -11,6 +11,22 @@ BAUD_RATE: str = "460800"
 FLASH_MODE: str = "dio"
 FLASH_FREQ: str = "80m"
 FLASH_ADDRESS: str = "0x0000"
+SUPPORTED_CHIPS: tuple[str, ...] = (
+    "esp32",
+    "esp32s2",
+    "esp32s3",
+    "esp32c3",
+    "esp32c2",
+    "esp32c6",
+    "esp32c61",
+    "esp32c5",
+    "esp32e22",
+    "esp32h2",
+    "esp32h21",
+    "esp32p4",
+    "esp32h4",
+    "esp32s31",
+)
 
 # Polling settings
 INITIAL_POLL_INTERVAL: float = 0.5  # seconds

{openshock_autoflasher-0.2.1 → openshock_autoflasher-0.2.2}/openshock_autoflasher/flasher.py

@@ -24,6 +24,7 @@ from .constants import (
     FLASH_MODE,
     FLASH_FREQ,
     FLASH_ADDRESS,
+    SUPPORTED_CHIPS,
     INITIAL_POLL_INTERVAL,
     MAX_POLL_INTERVAL,
     POLL_BACKOFF_THRESHOLD,
@@ -32,6 +33,18 @@ from .constants import (
 from .styles import StateColors, console
 
 
+def normalize_chip(chip: Optional[str]) -> str:
+    """Normalize and validate an optional esptool chip value."""
+    if chip is None:
+        return "auto"
+
+    normalized_chip = chip.lower()
+    if normalized_chip != "auto" and normalized_chip not in SUPPORTED_CHIPS:
+        supported = ", ".join(("auto", *SUPPORTED_CHIPS))
+        raise ValueError(f"Unsupported chip '{chip}'. Supported chips: {supported}")
+    return normalized_chip
+
+
 class AutoFlasher:
     """Main auto-flashing controller for OpenShock devices"""
 
@@ -45,6 +58,7 @@ class AutoFlasher:
         post_flash_delay: float = 0.0,
         alert: bool = False,
         version: Optional[str] = None,
+        chip: Optional[str] = None,
     ) -> None:
         self.channel: str = channel
         self.board: Optional[str] = board
@@ -54,6 +68,7 @@ class AutoFlasher:
         self.post_flash_delay: float = post_flash_delay
         self.alert: bool = alert
         self.version: Optional[str] = version
+        self.chip: str = normalize_chip(chip)
         self.base_url: str = BASE_URL
         self.known_ports: Set[str] = set()
         self.state: str = "waiting"
@@ -321,6 +336,7 @@ class AutoFlasher:
             self.log(f"Starting flash process for {board}")
             self.log(f"Port: {port}")
             self.log(f"Version: {version}")
+            self.log(f"Chip: {self.chip}")
             self.log("=" * 60)
 
             # Download firmware
@@ -339,23 +355,23 @@ class AutoFlasher:
             temp_file.close()
 
             # Prepare esptool arguments
-            args = [
+            base_args = [
+                "--chip",
+                self.chip,
                 "--port",
                 port,
                 "--baud",
                 BAUD_RATE,
-                "--chip",
-                "auto",
+            ]
+            args = [
+                *base_args,
                 "write-flash",
             ]
 
             if self.erase_flash:
                 self.log("Erasing flash...")
                 erase_args = [
-                    "--port",
-                    port,
-                    "--baud",
-                    BAUD_RATE,
+                    *base_args,
                     "erase-flash",
                 ]
 

{openshock_autoflasher-0.2.1 → openshock_autoflasher-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "OpenShock-AutoFlasher"
-version = "0.2.1"
+version = "0.2.2"
 description = "Automatically flash OpenShock firmware to ESP32 devices"
 readme = "README.md"
 license = { text = "AGPL-3.0" }

{openshock_autoflasher-0.2.1 → openshock_autoflasher-0.2.2}/tests/test_cli.py

@@ -52,6 +52,7 @@ def test_create_argument_parser():
     assert args.no_auto is False
     assert args.post_flash is None
     assert args.post_flash_delay == 0.0
+    assert args.chip == "auto"
 
 
 def test_argument_parser_all_options():
@@ -102,6 +103,17 @@ def test_argument_parser_channel_choices():
         parser.parse_args(["--channel", "invalid", "--board", "test"])
 
 
+def test_argument_parser_chip_option():
+    """Test parser with explicit esptool chip selection."""
+    parser = create_argument_parser()
+
+    args = parser.parse_args(["--board", "test-board", "--chip", "esp32c3"])
+    assert args.chip == "esp32c3"
+
+    with pytest.raises(SystemExit):
+        parser.parse_args(["--board", "test-board", "--chip", "invalid"])
+
+
 def test_argument_parser_post_flash_single():
     """Test parser with single post-flash command"""
     parser = create_argument_parser()

{openshock_autoflasher-0.2.1 → openshock_autoflasher-0.2.2}/tests/test_constants.py

@@ -9,6 +9,7 @@ from openshock_autoflasher.constants import (
     FLASH_MODE,
     FLASH_FREQ,
     FLASH_ADDRESS,
+    SUPPORTED_CHIPS,
     INITIAL_POLL_INTERVAL,
     MAX_POLL_INTERVAL,
     POLL_BACKOFF_THRESHOLD,
@@ -24,6 +25,7 @@ def test_constants_are_defined():
     assert FLASH_MODE in ["qio", "qout", "dio", "dout"]
     assert FLASH_FREQ.endswith("m")
     assert FLASH_ADDRESS.startswith("0x")
+    assert "esp32" in SUPPORTED_CHIPS
 
 
 def test_polling_intervals():

{openshock_autoflasher-0.2.1 → openshock_autoflasher-0.2.2}/tests/test_flasher.py

@@ -5,6 +5,7 @@ Tests for flasher module
 import pytest
 from unittest.mock import Mock, patch, MagicMock
 
+from openshock_autoflasher.constants import BAUD_RATE
 from openshock_autoflasher.flasher import AutoFlasher
 
 
@@ -337,6 +338,60 @@ def test_flasher_with_version_and_all_options():
     assert flasher.alert is True
 
 
+def test_flasher_defaults_chip_to_auto():
+    """Test AutoFlasher defaults to esptool autodetection."""
+    flasher = AutoFlasher(channel="stable", board="test-board")
+
+    assert flasher.chip == "auto"
+
+
+def test_flasher_with_explicit_chip():
+    """Test AutoFlasher stores explicit chip overrides."""
+    flasher = AutoFlasher(channel="stable", board="test-board", chip="ESP32S3")
+
+    assert flasher.chip == "esp32s3"
+
+
+def test_flasher_rejects_unsupported_chip():
+    """Test unsupported esptool chip values fail early."""
+    with pytest.raises(ValueError, match="Unsupported chip"):
+        AutoFlasher(channel="stable", board="test-board", chip="invalid")
+
+
+def test_flash_device_uses_default_auto_chip_for_erase_and_flash(flasher):
+    """Test erase and write commands both receive the default auto chip."""
+    flasher.erase_flash = True
+
+    with (
+        patch.object(flasher, "download_firmware", return_value=b"firmware"),
+        patch.object(flasher, "_run_esptool") as mock_run_esptool,
+    ):
+        flasher.flash_device("/dev/ttyUSB0", "1.0.0", "Seeed-Xiao-ESP32C3")
+
+    assert mock_run_esptool.call_count == 2
+    erase_args = mock_run_esptool.call_args_list[0][0][0]
+    write_args = mock_run_esptool.call_args_list[1][0][0]
+
+    assert erase_args == [
+        "--chip",
+        "auto",
+        "--port",
+        "/dev/ttyUSB0",
+        "--baud",
+        BAUD_RATE,
+        "erase-flash",
+    ]
+    assert write_args[:7] == [
+        "--chip",
+        "auto",
+        "--port",
+        "/dev/ttyUSB0",
+        "--baud",
+        BAUD_RATE,
+        "write-flash",
+    ]
+
+
 @patch("openshock_autoflasher.flasher.time.sleep")
 @patch("openshock_autoflasher.flasher.esptool.main")
 def test_run_esptool_retries_on_stopiteration(mock_esptool_main, mock_sleep, flasher):