firestarter 3.2.1b1__tar.gz → 3.2.3__tar.gz

{firestarter-3.2.1b1/firestarter.egg-info → firestarter-3.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: firestarter
-Version: 3.2.1b1
+Version: 3.2.3
 Summary: EPROM programmer software for the Relatively Universal ROM Programmer
 Author-email: Henrik Olsson <henols@gmail.com>
 Project-URL: Homepage, https://github.com/henols/firestarter_app
@@ -37,6 +37,7 @@ Requires-Dist: syrupy<7,>=5.0; extra == "test"
 Requires-Dist: ruff>=0.15.14; extra == "test"
 Requires-Dist: mypy<3,>=2.1.0; extra == "test"
 Requires-Dist: pytest-cov>=7.1.0; extra == "test"
+Requires-Dist: pytest-xdist>=3.6; extra == "test"
 Requires-Dist: types-pyserial>=3.5.0.20260519; extra == "test"
 Dynamic: license-file
 

{firestarter-3.2.1b1 → firestarter-3.2.3}/firestarter/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '3.2.1b1'
-__version_tuple__ = version_tuple = (3, 2, 1, 'b1')
+__version__ = version = '3.2.3'
+__version_tuple__ = version_tuple = (3, 2, 3)
 
-__commit_id__ = commit_id = 'g98e2959'
+__commit_id__ = commit_id = 'g660e8c4'

{firestarter-3.2.1b1 → firestarter-3.2.3}/firestarter/chip_resolver.py

@@ -10,11 +10,50 @@ Single chokepoint between CLI dispatch and the EPROM database lookup/conversion.
 from typing import Any
 
 from firestarter.database import EpromDatabase
-from firestarter.exceptions import ChipNotFoundError, ChipNotImplementedError
+from firestarter.exceptions import (
+    AmbiguousChipNameError,
+    ChipNotFoundError,
+    ChipNotImplementedError,
+)
 
 _NON_ZERO_WIRE_FIELDS = ("memory-size", "pin-count", "vpp_mv")
 
 
+def _qualified_choices(name: str, db: EpromDatabase) -> list[str]:
+    """The row `name` selects first, then each other row it selects that
+    programs differently, all as qualified names. Empty when one row, or rows
+    that program the same, are selected."""
+    alternatives = db.ambiguous_alternatives(name)
+    if not alternatives:
+        return []
+    raw_config, manufacturer = db.get_eprom_config(name)
+    return [db.qualified_chip_name(name, raw_config, manufacturer), *alternatives]
+
+
+def refuse_if_ambiguous(name: str, db: EpromDatabase) -> None:
+    """Refuse a name that selects chips that program differently: guessing
+    one would drive the wrong VPP, algorithm or timing."""
+    choices = _qualified_choices(name, db)
+    if choices:
+        listed = ", ".join(f"'{c}'" for c in choices)
+        raise AmbiguousChipNameError(
+            f"'{name}' names chips that program differently. Name one: {listed}."
+        )
+
+
+def describe_ambiguity(name: str, db: EpromDatabase) -> str | None:
+    """For display commands, which use the first row: the other rows `name`
+    selects, or None."""
+    choices = _qualified_choices(name, db)
+    if not choices:
+        return None
+    others = ", ".join(f"'{c}'" for c in choices[1:])
+    return (
+        f"'{name}' also names chips that program differently: {others}. "
+        f"This shows '{choices[0]}'."
+    )
+
+
 def resolve_chip(name: str, db: EpromDatabase | None = None) -> dict[str, Any]:
     """Resolve a chip name to its programmer-config dict.
 
@@ -26,6 +65,9 @@ def resolve_chip(name: str, db: EpromDatabase | None = None) -> dict[str, Any]:
     conversion (``convert_to_programmer`` returns ``{}``) are treated as the
     not-found condition.
 
+    Raises ``AmbiguousChipNameError`` (a ``ChipNotFoundError``) when the name
+    selects rows that program differently; the message names each of them.
+
     Raises ``ChipNotImplementedError`` when the chip exists in the database but
     its ``support_status`` is not ``"supported"`` (covers protocol-not-implemented,
     adapter-required, and vpp-exceeds-max).  This guard fires BEFORE any wire dict
@@ -49,6 +91,7 @@ def resolve_chip(name: str, db: EpromDatabase | None = None) -> dict[str, Any]:
     # have a support_status, so raise ChipNotFoundError immediately.
     if raw_config is None:
         raise ChipNotFoundError(name)
+    refuse_if_ambiguous(name, db)
 
     # Support-status guard: refuse every program-capable operation
     # for non-supported chips BEFORE convert_to_programmer builds any wire dict.

{firestarter-3.2.1b1 → firestarter-3.2.3}/firestarter/cli_handlers.py

@@ -4,7 +4,6 @@ This module is the production CLI surface; main.py re-exports `cli` as `main`
 for the console-script entry point.
 """
 
-import datetime
 import functools
 import hashlib
 import json
@@ -39,7 +38,11 @@ from firestarter.channel import (
     dev_command_gate_message,
     is_dev_tools_enabled,
 )
-from firestarter.chip_resolver import resolve_chip
+from firestarter.chip_resolver import (
+    describe_ambiguity,
+    refuse_if_ambiguous,
+    resolve_chip,
+)
 from firestarter.chip_test import (
     OP_ID,
     SDP_HOLD_NOT_RUN,
@@ -106,6 +109,7 @@ from firestarter.protection_readability import (
     protection_gate_for_entry,
 )
 from firestarter.sdp_capability import SDP_PROTOCOL_ID, sdp_capability
+from firestarter.timestamps import iso_cet
 
 logger = logging.getLogger("Firestarter")
 
@@ -160,10 +164,17 @@ def _complete_eprom(
     semantics at main.py:39-45.
     """  # noqa: E501
     db = EpromDatabase()
-    return [
-        click.shell_completion.CompletionItem(e["name"])
+    qualified = db.names_needing_qualifier()
+    # A row whose name also names chips that program differently is offered
+    # by the qualified name that selects it.
+    names = (
+        qualified.get((e["manufacturer"], e["name"]), e["name"])
         for e in db.get_eproms()
-        if e["name"].lower().startswith(incomplete.lower())
+    )
+    return [
+        click.shell_completion.CompletionItem(name)
+        for name in names
+        if name.lower().startswith(incomplete.lower())
     ]
 
 
@@ -486,7 +497,11 @@ def _list_cmd(app: AppContext) -> None:
     """List all EPROMs in the database."""
     eprom_data_list = app.db.get_eproms()
     if eprom_data_list:
-        print_eprom_list_table(eprom_data_list, app.eprom_presenter.spec_builder)
+        print_eprom_list_table(
+            eprom_data_list,
+            app.eprom_presenter.spec_builder,
+            app.db.names_needing_qualifier(),
+        )
         sys.exit(0)
     sys.exit(1)
 
@@ -504,6 +519,9 @@ def info(app: AppContext, eprom: str, config: bool, adapter: bool) -> None:
         logger.error(f"EPROM '{eprom}' not found in database.")
         sys.exit(1)
 
+    ambiguity = describe_ambiguity(eprom, app.db)
+    if ambiguity:
+        logger.warning(ambiguity)
     eprom_data_for_programmer = app.db.convert_to_programmer(eprom_details)
     raw_config_data, manufacturer = app.db.get_eprom_config(eprom)
 
@@ -534,7 +552,11 @@ def search(app: AppContext, text: str) -> None:
     """Search for EPROMs in the database."""
     search_results = app.db.search_eprom(text)
     if search_results:
-        print_eprom_list_table(search_results, app.eprom_presenter.spec_builder)
+        print_eprom_list_table(
+            search_results,
+            app.eprom_presenter.spec_builder,
+            app.db.names_needing_qualifier(),
+        )
         sys.exit(0)
     sys.exit(1)
 
@@ -1505,7 +1527,9 @@ def chip_id(app: AppContext, eprom: str, force: bool) -> None:
                 for ic in found_eproms_for_detected_id
             ]
             print_eprom_list_table(
-                mapped_found_eproms, app.eprom_presenter.spec_builder
+                mapped_found_eproms,
+                app.eprom_presenter.spec_builder,
+                app.db.names_needing_qualifier(),
             )
         else:
             logger.warning(
@@ -1908,10 +1932,10 @@ def fw(
 
             print(_json.dumps(releases, indent=2))
         else:
-            print(f"{'Version':<12} {'Channel':<14} {'Published':<22} Asset URL")
+            print(f"{'Version':<12} {'Channel':<14} {'Published':<25} Asset URL")
             for r in releases:
                 print(
-                    f"{r['version']:<12} {r['channel']:<14} {r['published']:<22} {r['asset_url']}"  # noqa: E501
+                    f"{r['version']:<12} {r['channel']:<14} {r['published']:<25} {r['asset_url']}"  # noqa: E501
                 )
             if not releases:
                 print(f"No releases found for board {board}.")
@@ -2638,7 +2662,7 @@ def _write_artifact(
     out_path.mkdir(parents=True, exist_ok=True)
 
     artifact: Dict[str, Any] = {  # noqa: UP006
-        "generated": datetime.datetime.now(datetime.UTC).strftime("%Y-%m-%dT%H:%M:%SZ"),
+        "generated": iso_cet(),
         "harness_version": "71",
         "cells": cells,
     }
@@ -3058,6 +3082,8 @@ def _canonical_part_number(part_number: str | None, raw_token: str) -> str | Non
     def _strip_paren(s: str) -> str:
         return re.sub(r"\([^)]*\)", "", s).strip().lower()
 
+    # A manufacturer qualifier (PART@MANUFACTURER) is not part of the name.
+    raw_token = raw_token.partition("@")[0].strip()
     query = raw_token.lower()
     if query == part_number.lower():
         return part_number
@@ -3166,6 +3192,10 @@ def dev_test(app: "AppContext", chip: str, fast: bool, submit: bool) -> None:
     # still runs the full community-validation sweep below.
     if not app.db.get_eprom(chip):
         raise ChipNotFoundError(f"{chip}: not found in database")
+    # A name that selects chips that program differently is refused here,
+    # not step by step: every step would be SKIPPED and the report would
+    # name no chip.
+    refuse_if_ambiguous(chip, app.db)
 
     # The chip must be known to be in the DB (see above) before its
     # electrical type can be read, so the UV-scope resolution happens here,

{firestarter-3.2.1b1 → firestarter-3.2.3}/firestarter/data/chip_database.json

@@ -190,7 +190,7 @@
         "vpp_mv": 13000
       },
       "part_number": "AM27128A",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -366,7 +366,7 @@
         "vpp_mv": 13000
       },
       "part_number": "AM27C128",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -1478,7 +1478,7 @@
         "vpp_mv": 13000
       },
       "part_number": "SMJ27C128",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -1612,7 +1612,7 @@
         "vpp_mv": 13000
       },
       "part_number": "AT27C011",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27011",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -1700,7 +1700,7 @@
         "vpp_mv": 13000
       },
       "part_number": "AT27C128",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -3331,7 +3331,7 @@
         "vpp_mv": 13000
       },
       "part_number": "CAT27128A",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": false,
@@ -4222,7 +4222,7 @@
         "vpp_mv": 13000
       },
       "part_number": "CY27C128",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": false,
@@ -5403,7 +5403,7 @@
         "vpp_mv": 13000
       },
       "part_number": "NM27C128,NMC27C128B,NMC27C128C",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -5603,7 +5603,7 @@
         "vpp_mv": 21000
       },
       "part_number": "MBM27128",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": false,
@@ -5735,7 +5735,7 @@
         "vpp_mv": 18000
       },
       "part_number": "MBM27C128P",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": false,
@@ -6001,7 +6001,7 @@
         "vpp_mv": 13000
       },
       "part_number": "GR27128",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": false,
@@ -6069,7 +6069,7 @@
         "vpp_mv": 13000
       },
       "part_number": "HN27128AG,HN27128AP",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -7031,7 +7031,7 @@
         "vpp_mv": 13000
       },
       "part_number": "D27011",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27011",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -7053,7 +7053,7 @@
         "vpp_mv": 13000
       },
       "part_number": "D27C011",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27011",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -7141,7 +7141,7 @@
         "vpp_mv": 18000
       },
       "part_number": "27128,D27128",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -7163,7 +7163,7 @@
         "vpp_mv": 12000
       },
       "part_number": "27128A,D27128A,D27128B",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -7339,7 +7339,7 @@
         "vpp_mv": 12000
       },
       "part_number": "27C128",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -8870,7 +8870,7 @@
         "vpp_mv": 13000
       },
       "part_number": "27C128",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -9406,7 +9406,7 @@
         "vpp_mv": 18000
       },
       "part_number": "M5M27C128",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": false,
@@ -9806,7 +9806,7 @@
         "vpp_mv": 12000
       },
       "part_number": "UPD27128",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": false,
@@ -9916,7 +9916,7 @@
         "vpp_mv": 12000
       },
       "part_number": "UPD27C128",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": false,
@@ -10229,7 +10229,7 @@
         "vpp_mv": 13000
       },
       "part_number": "NM27C128,NMC27C128B,NMC27C128C",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -11277,7 +11277,7 @@
         "vpp_mv": 12000
       },
       "part_number": "M27128A",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -11916,7 +11916,7 @@
         "vpp_mv": 12000
       },
       "part_number": "ST27128A",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -13314,7 +13314,7 @@
         "vpp_mv": 12000
       },
       "part_number": "M27128A",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -13997,7 +13997,7 @@
         "vpp_mv": 12000
       },
       "part_number": "ST27128A",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -14889,7 +14889,7 @@
         "vpp_mv": 13000
       },
       "part_number": "SMJ27C128,TMS27C128,TMS27PC128",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -16270,7 +16270,7 @@
         "vpp_mv": 13000
       },
       "part_number": "WS27C128F",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": true,
@@ -16358,7 +16358,7 @@
         "vpp_mv": 13000
       },
       "part_number": "WS57C128FB",
-      "pinout": "DIP28_2764",
+      "pinout": "DIP28_27128",
       "programming": {
         "algorithm": 7,
         "chip_id_check": false,

{firestarter-3.2.1b1 → firestarter-3.2.3}/firestarter/data/pinouts.json

@@ -22,10 +22,33 @@
         }
     },
     "DIP28_2764": {
-        "name": "JEDEC 2764/128",
+        "name": "JEDEC 2764/27C64",
+        "comment": "infoic.xml pin map 21, which leaves pin 26 unbonded: pin 26 NC, and pin 27 PGM. The host sends PGM as the rw line, so the firmware holds it high for read. See datasheets/TMS2764.pdf.",
         "pins": {
             "vcc-pin": [28], "gnd-pin": [14], "vpp-pin": [1],
             "pgm-pin": [27], "nc-pin": [26],
+            "address-bus-pins": [10, 9, 8, 7, 6, 5, 4, 3, 25, 24, 21, 23, 2],
+            "data-bus-pins": [11, 12, 13, 15, 16, 17, 18, 19],
+            "ce-pin": [20], "oe-pin": [22]
+        }
+    },
+    "DIP28_27128": {
+        "name": "JEDEC 27128/27C128",
+        "comment": "infoic.xml pin map 22 (pin_map 0x00000c16), which bonds pin 26 as A13. Pin 27 is PGM; the host sends it as the rw line.",
+        "pins": {
+            "vcc-pin": [28], "gnd-pin": [14], "vpp-pin": [1],
+            "pgm-pin": [27],
+            "address-bus-pins": [10, 9, 8, 7, 6, 5, 4, 3, 25, 24, 21, 23, 2, 26],
+            "data-bus-pins": [11, 12, 13, 15, 16, 17, 18, 19],
+            "ce-pin": [20], "oe-pin": [22]
+        }
+    },
+    "DIP28_27011": {
+        "name": "27011 page-addressed EPROM",
+        "comment": "infoic.xml pin map 22 with pin_map 0x90000c16, which only the 27011 rows carry. Connectivity is <maps> index 22. The pin functions are the 27128 functions these rows had before the split; no 27011 datasheet was found to confirm them. Page selection is not implemented (henols/firestarter#136).",
+        "pins": {
+            "vcc-pin": [28], "gnd-pin": [14], "vpp-pin": [1],
+            "pgm-pin": [27],
             "address-bus-pins": [10, 9, 8, 7, 6, 5, 4, 3, 25, 24, 21, 23, 2, 26],
             "data-bus-pins": [11, 12, 13, 15, 16, 17, 18, 19],
             "ce-pin": [20], "oe-pin": [22]
@@ -33,7 +56,7 @@
     },
     "DIP28_JEDEC_SRAM_8K": {
         "name": "JEDEC 28-pin SRAM/FRAM 8K (6264/FM1608 family)",
-        "comment": "Standard JEDEC parallel SRAM/FRAM 28-pin layout. Same address bus as DIP28_2764 (A0-A12 at pins 10,9,...,2 — 13 address bits for 8K). Differs from DIP28_2764 at: pin 1 = NC (vs VPP), pin 27 = !WE (vs !PGM), pin 26 = NC. Used by 6264-class SRAM and Ramtron FM1608 FRAM. Tentative — bench-validation required for chip-specific layouts.",
+        "comment": "Standard JEDEC parallel SRAM/FRAM 28-pin layout. Same address bus as DIP28_2764 (A0-A12 at pins 10,9,...,2 — 13 address bits for 8K). Differs from DIP28_2764 at: pin 1 = NC (vs VPP), pin 27 = !WE (vs !PGM). Used by 6264-class SRAM and Ramtron FM1608 FRAM. Tentative — bench-validation required for chip-specific layouts.",
         "pins": {
             "vcc-pin": [28], "gnd-pin": [14],
             "rw-pin": [27], "nc-pin": [1, 26],
@@ -164,4 +187,4 @@
             "ce-pin": [22], "oe-pin": [24], "rw-pin": [30]
         }
     }
-}
+}