oep-client-python 0.0.37__tar.gz → 0.0.39__tar.gz

{oep_client_python-0.0.37 → oep_client_python-0.0.39}/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## Unreleased
 
+## 0.0.39
+- (EN) No user-facing changes recorded.
+- (JA) ユーザー向け変更の記録はありません。
+
+## 0.0.38
+- (JA) 名前と初期値（oep-spec cc82b5e）に合わせた:
+  - 設定の値は出どころを持たない。get の値は fn number key len data で、`Value.origin` と `show()` の 4 つ目を無くした。書き出しは全部の値、
+    入れ直しは unset を先に、全部の値と比べる。`unset_all` は全部の値を消す。`changeable()`（set / unset があるか。初期値だけの probe は get だけ）。
+  - 口と線（host ガイド §5.3）: label `S.N` が口 S の線 N（S は英字で始まる英字・数字・`-` の 16 文字まで、N は英字・数字・`-`・`_`）。
+    大小文字を区別せずに比べ、書いたとおりに見せる。裸の `nrst` は口の線にならない。`find_line(source, name, port=None)`（口を省くと名付けられた
+    口が 1 つのときだけ）、`ports_named`、`port_line`。`core.firmware_labels` / `probe_labels` は無くした（固定の label が無いため）。
+  - `oep pins` は `<口>.nrst` / `<口>.power_hi` を勧める（口は `--name`、無ければ probe にある 1 つの口）。
+  - 仮想ベンチ: 出どころを無くし、profile の label は初期値（保存の無い起動で入る。`x035.swdio`、`v003.swio` などの `S.N` の形）。label は
+    大小文字を区別せずに一意（重なる set は unavailable cause 5、保存に 2 つあれば channel の小さい方）。`with_settings(changeable=False)` で get だけ。
+
 ## 0.0.37
 - (JA) 設定を core（oep-spec core §13、9fc6ad9 / c4fbd6e）に合わせた。`oep_client.config`（`oep.probe.config`）を無くし、
   `oep_client.settings` を足した:

{oep_client_python-0.0.37 → oep_client_python-0.0.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: oep-client-python
-Version: 0.0.37
+Version: 0.0.39
 Summary: Open Embedded Probe (OEP) v1 host: serial / USB / TCP transports, the session rules, the standard interfaces, and a virtual bench
 Project-URL: Homepage, https://github.com/Open-Embedded-Probe/oep-client-python
 Project-URL: Repository, https://github.com/Open-Embedded-Probe/oep-client-python
@@ -84,7 +84,7 @@ names starting with `_`, may change. Check probe/client compatibility using the
 | `pins` | `oep pins`: classify the channels, hold-low search, scan, identify, confirm the reset line, suggest the connection profile and the labels (`PinFinder`) |
 | `console` | `oep.target.console` (position streams: read answers carry their length; marks carry `time_ns`, the common kinds lost / clear / host and the console's reset 0x40 / restart 0x41; the lock-free `streams()` list of stream, connection and mechanism; `open(conn, mechanism)` always makes a new stream (u32) on the connection - a second on a connection with a live one is unavailable cause 6 -; a stream is the session's - close, its connection's release and the session's end release it with its buffer, and its number answers no_resource after that; a write goes into the stream's send queue - its size is the probe's own, not declared -, accepted = min(count, its free space), 0 only when full; an SDI stream's write is unsupported; marks, clear, mark and write are optional) and `ConsoleIO`, read as bytes and written in chunks of at most one frame, on from each answer's accepted (`stall_s`: TimeoutError when nothing is taken for that long) |
 | `fixture` | `oep.fixture.gpio` (`set([(ch, mode)])` applied in order in one request, `read(channels)` the levels; the output strength is the probe's own - there is no drive selection) / `uart` (its stream is the plan's; nothing is received until `configure(baud, fmt)`; `status()` = `UartStatus(baud, format)` in force, baud 0 and format 0 while not configured; a configure the probe could not bring up raises `Failed` and leaves it not configured) / `i2c-target` (one form: `configure(address)` - the target made anew -, every controller write with data one frame for `read_rx`, reads answered from `preload_tx(data)` slots or 0xFF, `status()` = `I2cStatus(state, queued, rx_frames, tx_slots, errors)`, `stretch` when the ops offer it, `internal_pullups`: whether it enables pull-ups of its own; the reserved addresses 0x00-0x07 / 0x78-0x7F refused before sending) / `spi-target` (no reset: configure again; `cs_setup_ns`: how long after CS the first bit is sure; `oep dump` shows it) |
-| `settings` | the core's settings (oep-spec core §13): fn 0's get / set / unset / save / state / network. `Settings(hst)`: `catalog()` = the names of this boot (each fn's category `core` / `name/instance`, items, choices, channel / route / netif names), `show()` = every value as (category, flat name, value, origin), `set_named(category, {flat: value})` / `unset_named` / `unset_all`, raw `set` / `unset` by (fn, number, key), `save()`, `state()`, `network()`; `export()` / `plan_import(doc)` / `apply_import(plan)` = the settings file (oep-spec docs/oep-settings-file.ja.md; secrets never read); `find_line(source, "nrst", profile=None)` = host guide §5.3's line lookup over every channel label |
+| `settings` | the core's settings (oep-spec core §13): fn 0's get / set / unset / save / state / network. `Settings(hst)`: `catalog()` = the names of this boot (each fn's category `core` / `name/instance`, items, choices, channel / route / netif names), `show()` = every value as (category, flat name, value) (no origin: the firmware's initial values are values like any other, core §13.4), `changeable()` (set / unset offered), `set_named(category, {flat: value})` / `unset_named` / `unset_all`, raw `set` / `unset` by (fn, number, key), `save()`, `state()`, `network()`; `export()` / `plan_import(doc)` / `apply_import(plan)` = the settings file (oep-spec docs/oep-settings-file.ja.md; secrets never read); `find_line(source, "nrst", port=None)` = host guide §5.3's line lookup: port S's line N is the label `S.N` (ignoring ASCII case; without a port the one port named), `ports_named(labels)` the ports as written |
 | `capture` | `oep.fixture.logic` / `analog` / `capture-group` (revision 1, oep-spec oep-if-capture). configure's TLVs follow core §2.3: a value the probe cannot honour is refused unsupported with the tag as sent (the table's TLVs go without the critical bit); the answer holds the actual values, its samples among them (analog: a scale for every role, a skew left out read as 0). Every `start()` returns a new generation (`LogicCapture.generation`, never re-used within a boot: past 0xFFFFFFFF a start is refused until a reboot) that read and release name - `read_segment(segment)` passes the segment's own - and every event carries (`events()` drops an earlier start's); streaming data frames carry their generation and their segment (segment_info, never crossing a segment: `Received.segments`); `status()` returns a `Status`. A capture-group binds configured tracks with an immediate trigger, all in one mode, and starts them at once (`CaptureGroup.start` -> the group's start_ns; the group's and each track's generation). Every segment read goes to the `Host.on_capture` callbacks as a `CaptureRecord` (the hook for run recorders; no wireskein dependency) |
 | `decode` | decoding capture channels (I2C) |
 | `registry` | generated from oep-spec's number table (never edited; copied again from oep-spec). The public way to reach an interface by name is `registry.INTERFACES[name]` (`.revision`, `.op`, `.tlv`, `.enum`, e.g. `INTERFACES["oep.fixture.uart"].enum["role"]`); the module-level names (`FIXTURE_UART`, ...) are the same objects |
@@ -135,12 +135,12 @@ A probe's CDC ports (`/dev/ttyACM*`) need no rule beyond the usual `dialout` gro
 
 ```sh
 oep dump --port <probe>                      # what the probe offers (--virtual p4-x035: no hardware)
-oep settings show <probe>                    # every value with its origin, and the storage state
+oep settings show <probe>                    # every value, and the storage state
 oep settings items <probe>                   # what each owner declares (names, forms, choices)
-oep settings set <probe> core channel.GPIO23.label=nrst channel.GPIO20.idle=pull-up [--save]
+oep settings set <probe> core channel.GPIO23.label=v003.nrst channel.GPIO20.idle=pull-up [--save]
 oep settings unset <probe> core channel.GPIO20.idle [--save]     # or --all (then --save empties the storage)
 oep settings save <probe>                    # kept over a restart
-oep settings export <probe> jig.oep-settings.json                # the user's values by name (secrets left out)
+oep settings export <probe> jig.oep-settings.json                # every value by name (secrets as present only)
 oep settings import <probe> jig.oep-settings.json [--save]       # shows the changes, asks, then sets / unsets
 oep speed <probe> [921600,500000] [--verify] [--flows out:2]  # port_speed: raise a UART bridge (default 500000), print the report (below)
 oep pins <probe> --power 5 --wire swio       # where the target is wired: debug pins, reset line, labels (below)
@@ -223,8 +223,8 @@ option-byte reader for the reset line, max_speed / idle_clock).
    NRST exists (read only, never written); then resume.
 5. **reset**: attach under reset through each candidate - the real line stops the hart at the reset vector.
 6. **labels**: the connection profile the host keeps (wire, pins, line settings: the probe keeps no wiring) and the
-   labels `nrst` / `power_hi` (`<name>.nrst` / `<name>.power_hi` with `--name`, a probe serving several targets),
-   checked with `config.find_line` against the probe's settings (a note when another channel already carries the name:
+   labels `<port>.nrst` / `<port>.power_hi` (the port: `--name`, else the one port the probe's labels name; neither:
+   a note asks for `--name`), checked with `settings.find_line` against the probe's settings (a note when another channel already carries the name:
    the line would not be found); `--save` writes the labels (set + save). Nothing is written without `--save`.
 
 Safety: a driven or active channel is never driven, scanned or held; the power channel is touched only with `--power`;
@@ -236,7 +236,7 @@ pulls; its "pulled-up" row (channel 4, the reset line's weak pull-up) is left ou
 alone that channel reads floating:
 
 ```
-$ oep pins /run/board-identify/by-id/esp32-series-30eda0ea068b --power 5 --wire swio
+$ oep pins /run/board-identify/by-id/esp32-series-30eda0ea068b --power 5 --wire swio --name v003
 power: channel 5 low 300 ms (target off: read), then high 400 ms before the reads
 classify: 52 channels, 16 reads each under pull-up, pull-down
   floating     0-3,6,9-20,26-34,36-50,52-54
@@ -252,8 +252,8 @@ attach swio 19: target_id 00310510 (WCH DMI 0x7F) -> ch32v00x, halted at dpc 0x1
   option bytes (read only): RST_MODE 10 (USER 0xf7): NRST on PD7, 12 ms ignore window
   attach under reset through 4 (held 20 ms): dpc 0x0 -> the reset line
 profile: wire swio, pins 19   (the host's to keep: the probe keeps no wiring)
-label: oep settings set ... core channel.GPIO4.label=nrst   (not written)
-label: oep settings set ... core channel.GPIO5.label=power_hi   (not written)
+label: oep settings set ... core channel.GPIO4.label=v003.nrst   (not written)
+label: oep settings set ... core channel.GPIO5.label=v003.power_hi   (not written)
 idle:  oep settings set ... core channel.GPIO5.idle=high   (keeps the target powered while no plan holds channel 5; not written by this tool)
 released every plan (channel 5 is back to its idle state: the target is powered only while something drives it)
 done in 7.3 s
@@ -398,7 +398,8 @@ lines outside through `gpio_world`); uart receives nothing until configured, sta
 (a write with data one frame, cut at max_length; reads from preload_tx slots, else 0xFF); spi-target without reset.
 Capture: configure's TLVs follow core §2.3 alone; a bound track's start / configure is unavailable cause 4, a bind short
 of resources cause 2 with the fn; a read at or past the write position answers write_pos and len 0. The settings (core §13): each fn's items from its
-describe, values with their origin (the firmware's fixed / default ones from the profile); a value of another length
+describe, values without origin (the profile's initial values in on a boot without a save; labels unique but for ASCII
+case, a probe of get alone with `changeable=False`); a value of another length
 malformed; the generation counts the changes of a boot from 1; state is storage_state, saved_generation, reason; at boot
 the saved values (by category and item name) are checked one by one, disable first, and what fails is left out (partial). port_speed: baud / step / verify_ms on the UART bridge the request came in on, within
 port_speed_tolerance_pct, phases 0-3 read by port_state; the virtual bench goes back after verify_ms, after

{oep_client_python-0.0.37 → oep_client_python-0.0.39}/README.ja.md

@@ -52,7 +52,7 @@ GitHub Release、PyPI（Trusted Publishing）へ出す。変更は CHANGELOG.md
 | `pins` | `oep pins`: channel の分類、low に保つ探索、scan、識別、リセットの線の確かめ、接続プロファイルと label の提案（`PinFinder`） |
 | `console` | `oep.target.console`（位置つきのストリーム: read の応答は長さを持ち、マークは `time_ns` と、共通の kind の lost / clear / host、コンソールの reset 0x40 / restart 0x41 を持つ。ロック不要の `streams()` は stream、connection、mechanism の並び。`open(conn, mechanism)` はいつもその connection に新しいストリーム（u32）を作る - 生きているストリームのある connection への 2 つ目は unavailable cause 6 -。ストリームはセッションのもので、close、connection の解放、セッションの終わりでバッファごと解放され、その番号はその後 no_resource。write はストリームの送りの列に入る - 列の大きさは probe が決め、宣言しない -。accepted = count と列の空きの小さい方で、0 は列が満ちたときだけ。SDI のストリームへの write は unsupported。marks、clear、mark、write は任意）と、バイト列として読み、多くても 1 フレームずつ、応答の accepted の続きから書く `ConsoleIO`（`stall_s`: その間何も受けなければ TimeoutError） |
 | `fixture` | `oep.fixture.gpio`（`set([(ch, mode)])` は 1 つの要求で順に当て、`read(channels)` は level を返す。出力の強さは probe 自身のもので、選ぶ手段は無い）/ `uart`（ストリームは plan が作る。`configure(baud, fmt)` までは何も受けない。`status()` = いま効いている `UartStatus(baud, format)` で、configure していなければ baud 0、format 0。probe が立ち上げられなかった configure は `Failed` を上げ、configure していない状態に戻る）/ `i2c-target`（1 つの形: `configure(address)` - target を作り直す -、データのある controller の書き込み 1 回が `read_rx` の 1 フレーム、読み出しには `preload_tx(data)` の置き場か 0xFF で答える、`status()` = `I2cStatus(state, queued, rx_frames, tx_slots, errors)`、ops にあれば `stretch`、`internal_pullups`: 自分の pull-up を入れるか。予約のアドレス 0x00〜0x07 / 0x78〜0x7F は送る前に断る）/ `spi-target`（reset は無く、configure し直す。`cs_setup_ns`: CS の後、最初のビットが確かになるまでの時間。`oep dump` が出す） |
-| `settings` | core の設定（oep-spec core §13）: fn 0 の get / set / unset / save / state / network。`Settings(hst)`: `catalog()` = その起動の名前（各 fn のカテゴリ `core` / `name/instance`、項目、選択肢、channel・経路・netif の名前）、`show()` = 全部の値を（カテゴリ、平らな名前、値、出どころ）で、`set_named(category, {平らな名前: 値})` / `unset_named` / `unset_all`、番号での `set` / `unset`、`save()`、`state()`、`network()`。`export()` / `plan_import(doc)` / `apply_import(plan)` = 設定のファイル（oep-spec docs/oep-settings-file.ja.md。secret は読まない）。`find_line(source, "nrst", profile=None)` = host ガイド §5.3 の線の探し方（全部の channel の label から） |
+| `settings` | core の設定（oep-spec core §13）: fn 0 の get / set / unset / save / state / network。`Settings(hst)`: `catalog()` = その起動の名前（各 fn のカテゴリ `core` / `name/instance`、項目、選択肢、channel・経路・netif の名前）、`show()` = 全部の値を（カテゴリ、平らな名前、値）で（出どころは無い。firmware の初期値もほかの値と同じ、core §13.4）、`changeable()`（set / unset があるか）、`set_named(category, {平らな名前: 値})` / `unset_named` / `unset_all`、番号での `set` / `unset`、`save()`、`state()`、`network()`。`export()` / `plan_import(doc)` / `apply_import(plan)` = 設定のファイル（oep-spec docs/oep-settings-file.ja.md。secret は読まない）。`find_line(source, "nrst", port=None)` = host ガイド §5.3 の線の探し方（口 S の線 N は label `S.N`、ASCII の大小文字を区別しない。口を省くと名付けられた口が 1 つのときだけそれ）、`ports_named(labels)` は口の名前を書いたとおりに |
 | `capture` | `oep.fixture.logic` / `analog` / `capture-group`（revision 1、oep-spec の oep-if-capture）。configure の TLV は core §2.3 に従う: probe が守れない値は送ったままの tag で unsupported で断られる（表の TLV は critical を付けずに送る）。応答が実際の値で、samples もそれが正しい（アナログ: scale は役割ごとに必ずあり、省かれた skew は 0 と読む）。`start()` はそのたびに新しい世代を返す（`LogicCapture.generation`。同じ起動の間は使い回さず、0xFFFFFFFF の後の start は再起動まで断られる）。read と release はその世代を付け（`read_segment(segment)` は区画自身の世代を付ける）、どの出来事も世代を持つ（`events()` は前の start のものを捨てる）。ストリーミングのデータフレームは世代と自分の区画を持ち、区画をまたがない（segment_info、`Received.segments`）。`status()` は `Status` を返す。capture-group は configure 済みで即時のトリガの、同じ mode のトラックを束ね、一度に始める（`CaptureGroup.start` -> group の start_ns。group と各トラックの世代）。読んだ区画は `Host.on_capture` の callback に `CaptureRecord` で渡る（記録の受け口。wireskein には依存しない） |
 | `decode` | キャプチャのチャネルの復号（I2C） |
 | `registry` | oep-spec の番号の表から生成したモジュール（編集しない。oep-spec から写し直す）。名前からインターフェースの番号を引く公開の入口は `registry.INTERFACES[name]`（`.revision`、`.op`、`.tlv`、`.enum`。例 `INTERFACES["oep.fixture.uart"].enum["role"]`）。`FIXTURE_UART` などのモジュールの名前は同じもの |
@@ -102,12 +102,12 @@ probe の CDC の口（`/dev/ttyACM*`）は、いつもの `dialout` グルー
 
 ```sh
 oep dump --port <probe>                      # 能力の一覧（--virtual p4-x035 でハードウェアなし）
-oep settings show <probe>                    # 全部の値と出どころ、保存の状態
+oep settings show <probe>                    # 全部の値と、保存の状態
 oep settings items <probe>                   # 各持ち主が宣言する項目（名前、形、選択肢）
-oep settings set <probe> core channel.GPIO23.label=nrst channel.GPIO20.idle=pull-up [--save]
+oep settings set <probe> core channel.GPIO23.label=v003.nrst channel.GPIO20.idle=pull-up [--save]
 oep settings unset <probe> core channel.GPIO20.idle [--save]     # --all なら全部（その後の --save で保存も空に）
 oep settings save <probe>                    # 再起動の後も残す
-oep settings export <probe> jig.oep-settings.json                # 利用者の値を名前で書き出す（secret は入らない）
+oep settings export <probe> jig.oep-settings.json                # 全部の値を名前で書き出す（secret はあることだけ）
 oep settings import <probe> jig.oep-settings.json [--save]       # 変わる所を見せ、確かめてから set / unset
 oep speed <probe> [921600,500000] [--verify] [--flows out:2]  # port_speed: UART bridge を速くし（既定 500000）、結果を出す（下）
 oep pins <probe> --power 5 --wire swio       # target のつながり方: debug のピン、リセットの線、label（下）
@@ -183,9 +183,9 @@ TCP で OEP を運ぶ probe は DNS-SD で見つける（ネットワークの
 4. **identify**: 答えた線に attach（halt）し、target_id で系統を見る。CH32V00x は option bytes で NRST の有無を見る（読むだけ、
    書かない）。その後 resume。
 5. **reset**: 候補ごとにリセットをかけながら attach する。本物の線なら hart はリセットのベクタで止まる。
-6. **labels**: host が持つ接続プロファイル（線、ピン、線の設定。probe は配線を持たない）と、label `nrst` / `power_hi`
-   （`--name` を付けると `<名前>.nrst` / `<名前>.power_hi`。複数の target を受ける probe 向け）を勧める。label は probe の設定に
-   対して `config.find_line` で確かめる（別の channel がもうその名前を持っていれば、線が見つからなくなるので note で言う）。
+6. **labels**: host が持つ接続プロファイル（線、ピン、線の設定。probe は配線を持たない）と、label `<口>.nrst` / `<口>.power_hi`
+   （口は `--name`、無ければ probe の label が名付ける口が 1 つのときその口。どちらも無ければ note で `--name` を求める）を勧める。label は probe の設定に
+   対して `settings.find_line` で確かめる（別の channel がもうその名前を持っていれば、線が見つからなくなるので note で言う）。
    `--save` で label を書く（set + save）。`--save` が無ければ何も書かない。
 
 安全: driven / active の channel は駆動も scan も保持もしない。電源の channel は `--power` のときだけ触る。low に保つのは
@@ -196,7 +196,7 @@ ESP32-P4 と CH32V003（電源は GPIO5）、2026-10-02。2026-10-07 の変更
 "pulled-up" の行（channel 4、リセットの線の弱い pull-up）はここでは除いた - pull-up と pull-down だけなら floating と読める:
 
 ```
-$ oep pins /run/board-identify/by-id/esp32-series-30eda0ea068b --power 5 --wire swio
+$ oep pins /run/board-identify/by-id/esp32-series-30eda0ea068b --power 5 --wire swio --name v003
 power: channel 5 low 300 ms (target off: read), then high 400 ms before the reads
 classify: 52 channels, 16 reads each under pull-up, pull-down
   floating     0-3,6,9-20,26-34,36-50,52-54
@@ -212,8 +212,8 @@ attach swio 19: target_id 00310510 (WCH DMI 0x7F) -> ch32v00x, halted at dpc 0x1
   option bytes (read only): RST_MODE 10 (USER 0xf7): NRST on PD7, 12 ms ignore window
   attach under reset through 4 (held 20 ms): dpc 0x0 -> the reset line
 profile: wire swio, pins 19   (the host's to keep: the probe keeps no wiring)
-label: oep settings set ... core channel.GPIO4.label=nrst   (not written)
-label: oep settings set ... core channel.GPIO5.label=power_hi   (not written)
+label: oep settings set ... core channel.GPIO4.label=v003.nrst   (not written)
+label: oep settings set ... core channel.GPIO5.label=v003.power_hi   (not written)
 idle:  oep settings set ... core channel.GPIO5.idle=high   (keeps the target powered while no plan holds channel 5; not written by this tool)
 released every plan (channel 5 is back to its idle state: the target is powered only while something drives it)
 done in 7.3 s
@@ -334,8 +334,8 @@ restart 0x41。DMDATA / dmseq のストリームの送りの列は poll ごと
 （外の線は `gpio_world`）。uart は configure するまで何も受けず、status は baud と format。i2c-target は 1 つの形（データのある書き込み
 1 回が 1 フレームで max_length で切る。読み出しは preload_tx の置き場から、無ければ 0xFF）。spi-target に reset は無い。capture:
 configure の TLV は core §2.3 だけに従う。bind されたトラックの start / configure は unavailable cause 4、資源の足りない bind は cause 2 と
-fn。書き込み位置以降の read は write_pos と len 0 を答える。設定（core §13）: 各 fn の項目は describe から、値は出どころつき（firmware の固定・既定は
-profile から）。長さが形と違う値は malformed。generation は起動から 1 で数える変更の回数。state は storage_state、saved_generation、reason。
+fn。書き込み位置以降の read は write_pos と len 0 を答える。設定（core §13）: 各 fn の項目は describe から、値は出どころを持たない（profile の初期値は保存の無い起動で入る。label は
+ASCII の大小文字を区別せずに一意。`changeable=False` で get だけの probe）。長さが形と違う値は malformed。generation は起動から 1 で数える変更の回数。state は storage_state、saved_generation、reason。
 起動時は保存した値（カテゴリと項目の名前で）を 1 つずつ確かめ、disable を先に当て、当てられないものは外す（部分適用）。port_speed: 要求が来た UART bridge の口への
 baud / step / verify_ms で、port_speed_tolerance_pct の内、phase 0〜3 は port_state で読める。仮想ベンチが戻るのは verify_ms の後、正常な
 フレームの無い port_speed_idle_ms の後、セッションの終わり - 壊れたフレームでは戻らない。

{oep_client_python-0.0.37 → oep_client_python-0.0.39}/README.md

@@ -59,7 +59,7 @@ names starting with `_`, may change. Check probe/client compatibility using the
 | `pins` | `oep pins`: classify the channels, hold-low search, scan, identify, confirm the reset line, suggest the connection profile and the labels (`PinFinder`) |
 | `console` | `oep.target.console` (position streams: read answers carry their length; marks carry `time_ns`, the common kinds lost / clear / host and the console's reset 0x40 / restart 0x41; the lock-free `streams()` list of stream, connection and mechanism; `open(conn, mechanism)` always makes a new stream (u32) on the connection - a second on a connection with a live one is unavailable cause 6 -; a stream is the session's - close, its connection's release and the session's end release it with its buffer, and its number answers no_resource after that; a write goes into the stream's send queue - its size is the probe's own, not declared -, accepted = min(count, its free space), 0 only when full; an SDI stream's write is unsupported; marks, clear, mark and write are optional) and `ConsoleIO`, read as bytes and written in chunks of at most one frame, on from each answer's accepted (`stall_s`: TimeoutError when nothing is taken for that long) |
 | `fixture` | `oep.fixture.gpio` (`set([(ch, mode)])` applied in order in one request, `read(channels)` the levels; the output strength is the probe's own - there is no drive selection) / `uart` (its stream is the plan's; nothing is received until `configure(baud, fmt)`; `status()` = `UartStatus(baud, format)` in force, baud 0 and format 0 while not configured; a configure the probe could not bring up raises `Failed` and leaves it not configured) / `i2c-target` (one form: `configure(address)` - the target made anew -, every controller write with data one frame for `read_rx`, reads answered from `preload_tx(data)` slots or 0xFF, `status()` = `I2cStatus(state, queued, rx_frames, tx_slots, errors)`, `stretch` when the ops offer it, `internal_pullups`: whether it enables pull-ups of its own; the reserved addresses 0x00-0x07 / 0x78-0x7F refused before sending) / `spi-target` (no reset: configure again; `cs_setup_ns`: how long after CS the first bit is sure; `oep dump` shows it) |
-| `settings` | the core's settings (oep-spec core §13): fn 0's get / set / unset / save / state / network. `Settings(hst)`: `catalog()` = the names of this boot (each fn's category `core` / `name/instance`, items, choices, channel / route / netif names), `show()` = every value as (category, flat name, value, origin), `set_named(category, {flat: value})` / `unset_named` / `unset_all`, raw `set` / `unset` by (fn, number, key), `save()`, `state()`, `network()`; `export()` / `plan_import(doc)` / `apply_import(plan)` = the settings file (oep-spec docs/oep-settings-file.ja.md; secrets never read); `find_line(source, "nrst", profile=None)` = host guide §5.3's line lookup over every channel label |
+| `settings` | the core's settings (oep-spec core §13): fn 0's get / set / unset / save / state / network. `Settings(hst)`: `catalog()` = the names of this boot (each fn's category `core` / `name/instance`, items, choices, channel / route / netif names), `show()` = every value as (category, flat name, value) (no origin: the firmware's initial values are values like any other, core §13.4), `changeable()` (set / unset offered), `set_named(category, {flat: value})` / `unset_named` / `unset_all`, raw `set` / `unset` by (fn, number, key), `save()`, `state()`, `network()`; `export()` / `plan_import(doc)` / `apply_import(plan)` = the settings file (oep-spec docs/oep-settings-file.ja.md; secrets never read); `find_line(source, "nrst", port=None)` = host guide §5.3's line lookup: port S's line N is the label `S.N` (ignoring ASCII case; without a port the one port named), `ports_named(labels)` the ports as written |
 | `capture` | `oep.fixture.logic` / `analog` / `capture-group` (revision 1, oep-spec oep-if-capture). configure's TLVs follow core §2.3: a value the probe cannot honour is refused unsupported with the tag as sent (the table's TLVs go without the critical bit); the answer holds the actual values, its samples among them (analog: a scale for every role, a skew left out read as 0). Every `start()` returns a new generation (`LogicCapture.generation`, never re-used within a boot: past 0xFFFFFFFF a start is refused until a reboot) that read and release name - `read_segment(segment)` passes the segment's own - and every event carries (`events()` drops an earlier start's); streaming data frames carry their generation and their segment (segment_info, never crossing a segment: `Received.segments`); `status()` returns a `Status`. A capture-group binds configured tracks with an immediate trigger, all in one mode, and starts them at once (`CaptureGroup.start` -> the group's start_ns; the group's and each track's generation). Every segment read goes to the `Host.on_capture` callbacks as a `CaptureRecord` (the hook for run recorders; no wireskein dependency) |
 | `decode` | decoding capture channels (I2C) |
 | `registry` | generated from oep-spec's number table (never edited; copied again from oep-spec). The public way to reach an interface by name is `registry.INTERFACES[name]` (`.revision`, `.op`, `.tlv`, `.enum`, e.g. `INTERFACES["oep.fixture.uart"].enum["role"]`); the module-level names (`FIXTURE_UART`, ...) are the same objects |
@@ -110,12 +110,12 @@ A probe's CDC ports (`/dev/ttyACM*`) need no rule beyond the usual `dialout` gro
 
 ```sh
 oep dump --port <probe>                      # what the probe offers (--virtual p4-x035: no hardware)
-oep settings show <probe>                    # every value with its origin, and the storage state
+oep settings show <probe>                    # every value, and the storage state
 oep settings items <probe>                   # what each owner declares (names, forms, choices)
-oep settings set <probe> core channel.GPIO23.label=nrst channel.GPIO20.idle=pull-up [--save]
+oep settings set <probe> core channel.GPIO23.label=v003.nrst channel.GPIO20.idle=pull-up [--save]
 oep settings unset <probe> core channel.GPIO20.idle [--save]     # or --all (then --save empties the storage)
 oep settings save <probe>                    # kept over a restart
-oep settings export <probe> jig.oep-settings.json                # the user's values by name (secrets left out)
+oep settings export <probe> jig.oep-settings.json                # every value by name (secrets as present only)
 oep settings import <probe> jig.oep-settings.json [--save]       # shows the changes, asks, then sets / unsets
 oep speed <probe> [921600,500000] [--verify] [--flows out:2]  # port_speed: raise a UART bridge (default 500000), print the report (below)
 oep pins <probe> --power 5 --wire swio       # where the target is wired: debug pins, reset line, labels (below)
@@ -198,8 +198,8 @@ option-byte reader for the reset line, max_speed / idle_clock).
    NRST exists (read only, never written); then resume.
 5. **reset**: attach under reset through each candidate - the real line stops the hart at the reset vector.
 6. **labels**: the connection profile the host keeps (wire, pins, line settings: the probe keeps no wiring) and the
-   labels `nrst` / `power_hi` (`<name>.nrst` / `<name>.power_hi` with `--name`, a probe serving several targets),
-   checked with `config.find_line` against the probe's settings (a note when another channel already carries the name:
+   labels `<port>.nrst` / `<port>.power_hi` (the port: `--name`, else the one port the probe's labels name; neither:
+   a note asks for `--name`), checked with `settings.find_line` against the probe's settings (a note when another channel already carries the name:
    the line would not be found); `--save` writes the labels (set + save). Nothing is written without `--save`.
 
 Safety: a driven or active channel is never driven, scanned or held; the power channel is touched only with `--power`;
@@ -211,7 +211,7 @@ pulls; its "pulled-up" row (channel 4, the reset line's weak pull-up) is left ou
 alone that channel reads floating:
 
 ```
-$ oep pins /run/board-identify/by-id/esp32-series-30eda0ea068b --power 5 --wire swio
+$ oep pins /run/board-identify/by-id/esp32-series-30eda0ea068b --power 5 --wire swio --name v003
 power: channel 5 low 300 ms (target off: read), then high 400 ms before the reads
 classify: 52 channels, 16 reads each under pull-up, pull-down
   floating     0-3,6,9-20,26-34,36-50,52-54
@@ -227,8 +227,8 @@ attach swio 19: target_id 00310510 (WCH DMI 0x7F) -> ch32v00x, halted at dpc 0x1
   option bytes (read only): RST_MODE 10 (USER 0xf7): NRST on PD7, 12 ms ignore window
   attach under reset through 4 (held 20 ms): dpc 0x0 -> the reset line
 profile: wire swio, pins 19   (the host's to keep: the probe keeps no wiring)
-label: oep settings set ... core channel.GPIO4.label=nrst   (not written)
-label: oep settings set ... core channel.GPIO5.label=power_hi   (not written)
+label: oep settings set ... core channel.GPIO4.label=v003.nrst   (not written)
+label: oep settings set ... core channel.GPIO5.label=v003.power_hi   (not written)
 idle:  oep settings set ... core channel.GPIO5.idle=high   (keeps the target powered while no plan holds channel 5; not written by this tool)
 released every plan (channel 5 is back to its idle state: the target is powered only while something drives it)
 done in 7.3 s
@@ -373,7 +373,8 @@ lines outside through `gpio_world`); uart receives nothing until configured, sta
 (a write with data one frame, cut at max_length; reads from preload_tx slots, else 0xFF); spi-target without reset.
 Capture: configure's TLVs follow core §2.3 alone; a bound track's start / configure is unavailable cause 4, a bind short
 of resources cause 2 with the fn; a read at or past the write position answers write_pos and len 0. The settings (core §13): each fn's items from its
-describe, values with their origin (the firmware's fixed / default ones from the profile); a value of another length
+describe, values without origin (the profile's initial values in on a boot without a save; labels unique but for ASCII
+case, a probe of get alone with `changeable=False`); a value of another length
 malformed; the generation counts the changes of a boot from 1; state is storage_state, saved_generation, reason; at boot
 the saved values (by category and item name) are checked one by one, disable first, and what fails is left out (partial). port_speed: baud / step / verify_ms on the UART bridge the request came in on, within
 port_speed_tolerance_pct, phases 0-3 read by port_state; the virtual bench goes back after verify_ms, after

{oep_client_python-0.0.37 → oep_client_python-0.0.39}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "oep-client-python"
-version = "0.0.37"
+version = "0.0.39"
 description = "Open Embedded Probe (OEP) v1 host: serial / USB / TCP transports, the session rules, the standard interfaces, and a virtual bench"
 readme = "README.md"
 license = "MIT"

{oep_client_python-0.0.37 → oep_client_python-0.0.39}/src/oep_client/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.0.37"
+__version__ = "0.0.39"

{oep_client_python-0.0.37 → oep_client_python-0.0.39}/src/oep_client/__main__.py

@@ -1,9 +1,9 @@
 """The oep command: what a probe offers (dump) and its settings (settings, core §13).
 
   oep dump --port /run/board-identify/by-id/<probe>        oep dump --virtual p4-x035 --prefix oep.target --json
-  oep settings show <probe>               (every value with its origin, the storage state; lock-free)
+  oep settings show <probe>               (every value, the storage state; lock-free)
   oep settings items <probe>              (what each owner declares: names, forms, choices)
-  oep settings set <probe> core channel.GPIO23.label=nrst channel.GPIO20.idle=pull-up [--save]
+  oep settings set <probe> core channel.GPIO23.label=v003.nrst channel.GPIO20.idle=pull-up [--save]
   oep settings unset <probe> core channel.GPIO20.idle     oep settings unset --all <probe> --save   (empties the storage)
   oep settings save <probe>     oep settings state <probe>     oep settings network <probe>
   oep settings export <probe> jig.oep-settings.json       oep settings import <probe> jig.oep-settings.json [--save]
@@ -336,18 +336,18 @@ def _settings_parser(sub) -> None:
     c = sub.add_parser("settings", help="the probe's settings (core §13): show, set / unset by name, save, export / "
                                         "import a settings file, the network")
     cs = c.add_subparsers(dest="action", required=True)
-    show = cs.add_parser("show", help="every value (category, name, value, origin) and the storage state (lock-free)")
+    show = cs.add_parser("show", help="every value (category, name, value) and the storage state (lock-free)")
     show.add_argument("probe")
     show.add_argument("--json", action="store_true")
     items = cs.add_parser("items", help="what the probe declares: each category's items, forms and choices")
     items.add_argument("probe")
     items.add_argument("--json", action="store_true")
-    st = cs.add_parser("set", help="values by name in one category: NAME=VALUE ... (core channel.GPIO2.label=nrst)")
+    st = cs.add_parser("set", help="values by name in one category: NAME=VALUE ... (core channel.GPIO2.label=v003.nrst)")
     st.add_argument("probe")
     st.add_argument("category", help="core, or an interface's name/instance (oep.fixture.uart/0)")
     st.add_argument("values", nargs="+", metavar="NAME=VALUE")
     st.add_argument("--save", action="store_true")
-    un = cs.add_parser("unset", help="values by name back to their default (or none)")
+    un = cs.add_parser("unset", help="remove values by name (the item has none after)")
     un.add_argument("probe")
     un.add_argument("category", nargs="?")
     un.add_argument("names", nargs="*")
@@ -360,10 +360,10 @@ def _settings_parser(sub) -> None:
     net = cs.add_parser("network", help="the network now: the TCP port, each netif's state and address (lock-free)")
     net.add_argument("probe")
     net.add_argument("--json", action="store_true")
-    ex = cs.add_parser("export", help="write the user's values to a settings file (JSON; secrets left out)")
+    ex = cs.add_parser("export", help="write every value to a settings file (JSON; a secret as present only)")
     ex.add_argument("probe")
     ex.add_argument("file", help="the file to write, - for stdout")
-    im = cs.add_parser("import", help="make the probe's user values a settings file's (shows what changes first)")
+    im = cs.add_parser("import", help="make the probe's values a settings file's (shows what changes first)")
     im.add_argument("probe")
     im.add_argument("file")
     im.add_argument("--yes", action="store_true", help="apply without asking")
@@ -520,16 +520,16 @@ def _show(st, as_json: bool) -> int:
     state = st.state() if st.offers("state") else None
     if as_json:
         print(json.dumps({"generation": gen, "state": vars(state) if state else None,
-                          "values": [dict(category=c, name=n, value=v, origin=o) for c, n, v, o in rows]}, indent=2))
+                          "values": [dict(category=c, name=n, value=v) for c, n, v in rows]}, indent=2))
         return 0
     if state is not None:
         why = f" ({state.reason})" if state.reason else ""
         print(f"storage: {state.storage}{why}, saved generation {state.saved_generation}; now {gen}")
     else:
         print(f"no storage; generation {gen}")
-    for c, n, v, o in rows:
+    for c, n, v in rows:
         shown = "(secret)" if isinstance(v, dict) else json.dumps(v)
-        print(f"  {c} {n} = {shown}" + ("" if o == "user" else f"   ({o})"))
+        print(f"  {c} {n} = {shown}")
     return 0
 
 

{oep_client_python-0.0.37 → oep_client_python-0.0.39}/src/oep_client/core.py

@@ -170,23 +170,6 @@ def require(hst: h.Host, fn: int, op: int) -> None:
         raise not_offered(fn, op)
 
 
-def firmware_labels(hst: h.Host) -> list[tuple[int, str]]:
-    """The labels the firmware fixes (channel.{}.label of origin fixed, core §13.4) as (channel, text), in get's order.
-    A probe without the settings: none."""
-    from . import settings
-    if not offers(hst, 0, settings.OP["get"]):
-        return []
-    st = settings.Settings(hst)
-    cat = st.catalog()
-    return [(v.key, m.shown(v.data)) for v in st.get()[1] if v.fn == 0 and v.origin == "fixed"
-            and (cat.item(0, v.number) or settings.Item(0, 0, "", "", "", 0, 0, 0)).name == settings.LABEL]
-
-
-def probe_labels(hst: h.Host) -> dict[str, int]:
-    """The firmware's fixed channel labels: {"NRST": 23, ...}."""
-    return {text: ch for ch, text in firmware_labels(hst)}
-
-
 def max_op_ms(hst: h.Host) -> int:
     """The longest one request may take on this probe (fn 0's describe max_op_ms, core §7.5): the ceiling of run's
     timeout_ms, a dmi list's waits, an attach's hold_ms, and the argument time of attach, scan and riscv-dm's reset

{oep_client_python-0.0.37 → oep_client_python-0.0.39}/src/oep_client/endpoint.py

@@ -77,7 +77,8 @@ define (oep-spec a09fa45):
   oep.fixture.spi-target (§4: configure, arm, read_rx, status; errors at most 1 a transfer; `spi_transfer`),
   oep.fixture.logic / analog / capture-group (`virtual_bench_capture`)
 - the settings (core §13), fn 0's get / set / unset / save / state / network: each fn's items from its describe, the
-  user's values by (fn, item, key), the firmware's fixed / default ones beside them (`firm`); a set checked whole (forms
+  values by (fn, item, key) with no origin, the initial values put in on a boot without a save (`initial`, core §13.4),
+  the labels unique but for ASCII case (§13.8); a set checked whole (forms
   malformed, what this probe cannot take unsupported with the value's item index, the whole against what runs); the
   generation counts the changes of one boot from 1; the save by category and item name, applied at boot one value at a
   time (disable first, then idle): what fails is left out (partial, reason 2); a disabled channel is refused everywhere
@@ -118,7 +119,7 @@ READ_FROM = reg.COMMON.enum["read_from"]                  # position, oldest, no
 STEP_LEFT = _RV.tlv["step_answer"]["step_left"]            # step's answer: the hart could not be halted again (§4.2)
 # the settings (core §13): fn 0's ops, the items' forms, key kinds and origins, the core's and the wires' choices
 _SET_OP = reg.CORE.op
-FORM, KEY_KIND, ORIGIN = reg.CORE.enum["setting_form"], reg.CORE.enum["setting_key_kind"], reg.CORE.enum["setting_origin"]
+FORM, KEY_KIND = reg.CORE.enum["setting_form"], reg.CORE.enum["setting_key_kind"]
 SETTING_SECRET = reg.CORE.enum["setting_flag"]["secret"]
 ITEM_TLV = reg.CORE.tlv["unsupported_payload"]["item"]
 IDLE_MODE = reg.CORE.enum["channel_idle"]
@@ -736,10 +737,10 @@ class Endpoint:
         # i2c-target internal pull-ups (fixture §3): features bit2, else none
         self.i2c_pullups = {fn: bool(self.target_decl[fn][1] & I2C_FEATURES["internal_pullups"])
                             for fn, name in self.names.items() if name == _I2C.name}
-        # the settings (core §13): each fn's items (its describe), the firmware's values (fixed / default), the netifs
+        # the settings (core §13): each fn's items (its describe), the firmware's initial values (§13.4), the netifs
         self.setting_items = {fn: setting_items(decl) for fn, decl in self.decl.items() if setting_items(decl)}
-        self.firm: dict[tuple[int, str, int], tuple[int, bytes]] = {
-            (fn, name, key): (origin, bytes(d)) for fn, name, key, origin, d in self.inner.get(0, {}).get("firmware_values", ())}
+        self.initial: dict[tuple[int, str, int], bytes] = {
+            (fn, name, key): bytes(d) for fn, name, key, d in self.inner.get(0, {}).get("initial_values", ())}
         # the network (transports §7): the netifs, a named list (numbers from 1); around the bench: Wi-Fi access points
         # (ssid -> passphrase), the Ethernet cable, what DHCP gives; every drop and reconnect of a netif (a value in use changed)
         self.netif_names = [v.decode() for tag, v in self.decl.get(0, ()) if tag == virtual_bench.NETIF]
@@ -858,8 +859,10 @@ class Endpoint:
         self.speed_frame_busy = False                  # TEST HOOK: a frame on the raised port is not finished yet
         if self.saved is not None:
             self._apply_saved()                        # disable before idle (core §13.7)
-        elif self.saved_unreadable:
-            self.storage_state, self.storage_reason = 2, 1   # nothing applied: state 2, reason 1 at the next boot (§3)
+        else:
+            if self.saved_unreadable:
+                self.storage_state, self.storage_reason = 2, 1   # nothing applied: state 2, reason 1 at the next boot (§3)
+            self._initial_values()                     # no save to use: the initial values (core §13.4)
         self._park(self._boot_channels())              # every free pin's idle state before the first answer (core §8)
 
     def _own(self, fn: int, tag: int, fmt: str, default: int) -> int:
@@ -3263,8 +3266,8 @@ class Endpoint:
         return (tx + bytes(n))[:n]
 
     # ---- the settings (core §13) ----------------------------------------------------------------------
-    # The items each fn's describe declares (setting, setting_choice); the user's values as (fn, item, key) -> data,
-    # the firmware's (fixed / default) beside them; fn 0's ops get / set / unset / save / state / network.
+    # The items each fn's describe declares (setting, setting_choice); the values as (fn, item, key) -> data (no origin,
+    # §13.4: the initial values go in on a boot without a save); fn 0's ops get / set / unset / save / state / network.
     def _items(self, fn: int) -> list[SettingItem]:
         return self.setting_items.get(fn, [])
 
@@ -3273,18 +3276,43 @@ class Endpoint:
         return next((k for k, it in enumerate(self._items(fn), 1) if it.name == name), 0)
 
     def _value(self, fn: int, name: str, key: int) -> bytes | None:
-        """The value now of an item (the user's, else the firmware's)."""
-        v = self.config.get((fn, name, key))
-        if v is None and (fn, name, key) in self.firm:
-            v = self.firm[(fn, name, key)][1]
-        return v
+        """The value now of an item."""
+        return self.config.get((fn, name, key))
 
     def _values_of(self, name: str, fn: int | None = None, config: dict | None = None) -> dict[tuple[int, int], bytes]:
-        """Every value of item `name` (of fn `fn`, else of any fn): (fn, key) -> data, the user's over the firmware's."""
-        out = {(f, k): v for (f, n, k), (_, v) in self.firm.items() if n == name and fn in (None, f)}
-        out.update({(f, k): v for (f, n, k), v in (self.config if config is None else config).items()
-                    if n == name and fn in (None, f)})
-        return out
+        """Every value of item `name` (of fn `fn`, else of any fn): (fn, key) -> data."""
+        return {(f, k): v for (f, n, k), v in (self.config if config is None else config).items() if n == name and fn in (None, f)}
+
+    @staticmethod
+    def _fold(d: bytes) -> bytes:
+        return d.translate(bytes.maketrans(b"ABCDEFGHIJKLMNOPQRSTUVWXYZ", b"abcdefghijklmnopqrstuvwxyz"))
+
+    def _label_clash(self, config: dict) -> int | None:
+        """The later channel of two whose labels are equal but for ASCII case (core §13.8), else None."""
+        seen: dict[bytes, int] = {}
+        for (_, ch), d in sorted(self._values_of("channel.{}.label", 0, config).items()):
+            if self._fold(d) in seen:
+                return ch
+            seen[self._fold(d)] = ch
+        return None
+
+    def _initial_values(self) -> None:
+        """A boot without a save (core §13.4): the initial values, checked as a set's; ones that do not pass (the
+        firmware's mistake) stay out."""
+        values = {}
+        for (fn, name, key), d in self.initial.items():
+            number = self._item_number(fn, name)
+            if not number:
+                continue
+            it = self._items(fn)[number - 1]
+            try:
+                self._value_form(it, key, fn, d)
+            except Reject:
+                continue
+            if not self._value_refused(fn, it, key, d):
+                values[(fn, name, key)] = d
+        if self._label_clash(values) is None:
+            self.config = values
 
     def _key_ok(self, fn: int, it: SettingItem, key: int) -> bool:
         kind = it.key_kind
@@ -3325,12 +3353,10 @@ class Endpoint:
             raise Reject(m.MALFORMED)
 
     def _value_refused(self, fn: int, it: SettingItem, key: int, d: bytes) -> bool:
-        """Whether this probe cannot take the value (unsupported, core §13.3): a key it has no value for, a fixed value
-        (§13.4), a choice it does not declare, a channel or fn it does not have, and what the item's owner refuses."""
+        """Whether this probe cannot take the value (unsupported, core §13.3): a key it has no value for, a choice it does
+        not declare, a channel or fn it does not have, and what the item's owner refuses."""
         if not self._key_ok(fn, it, key):
             return True
-        if (fn, it.name, key) in self.firm and self.firm[(fn, it.name, key)][0] == ORIGIN["fixed"]:
-            return True
         if not d:
             return False                                           # a secret kept
         if it.form == FORM["enum"] and d[0] not in it.choices:
@@ -3390,14 +3416,9 @@ class Endpoint:
             rows = []
             for fn in sorted(self.setting_items):
                 for number, it in enumerate(self._items(fn), 1):
-                    keys = sorted({k for (f, n, k) in self.config if f == fn and n == it.name}
-                                  | {k for (f, n, k) in self.firm if f == fn and n == it.name})
-                    for k in keys:
-                        user = self.config.get((fn, it.name, k))
-                        origin, d = (ORIGIN["user"], user) if user is not None else self.firm[(fn, it.name, k)]
-                        if it.flags & SETTING_SECRET:
-                            d = b""                                # a secret is never read (§13.5)
-                        rows.append(struct.pack("<HBHBH", fn, number, k, origin, len(d)) + d)
+                    for k in sorted(k for (f, n, k) in self.config if f == fn and n == it.name):
+                        d = b"" if it.flags & SETTING_SECRET else self.config[(fn, it.name, k)]   # a secret is never read
+                        rows.append(struct.pack("<HBHH", fn, number, k, len(d)) + d)          # fn number key len data
             budget = self.probe.max_frame - m.RESULT_HEADER - 6
             out, sent = b"", 0
             for row in rows[first:]:
@@ -3432,7 +3453,7 @@ class Endpoint:
             values = self._resolve(self._read_values(t, t.take("B"), False))
             t.tail()
             for i, (fn, it, key, _) in enumerate(values):
-                if it is None or ((fn, it.name, key) in self.firm and self.firm[(fn, it.name, key)][0] == ORIGIN["fixed"]):
+                if it is None:
                     raise self._unsupported_item(i)
             new = dict(self.config)
             for fn, it, key, _ in values:
@@ -3553,6 +3574,9 @@ class Endpoint:
             return
         if self.generation == 0xFFFFFFFF:
             raise unavailable("limit")                             # no generation left before a restart (§13.5)
+        clash = self._label_clash(new)
+        if clash is not None:
+            raise unavailable("held_by_settings", clash)           # two labels equal but for case (§13.8)
         disabled = {k for (f, k), v in self._values_of("channel.{}.disable", 0, new).items() if v == b"\x01"}
         idles = self._values_of("channel.{}.idle", 0, new)
         outputs = (IDLE_MODE["low"], IDLE_MODE["high"])
@@ -3604,7 +3628,8 @@ class Endpoint:
 
     def _apply_saved(self) -> None:
         """At boot (core §13.7): every saved value, by name, checked by itself against this firmware - disable first,
-        then idle (a channel with both keeps the disable), then the rest; one it cannot take (a category or item it does
+        then idle (a channel with both keeps the disable), then the rest; of two labels equal but for case the lower
+        channel's; one it cannot take (a category or item it does
         not have, a form or value it refuses) is left out and the rest applied (storage_state 3 partial, reason 2)."""
         def rank(kv):
             (ident, name, key), _ = kv
@@ -3626,6 +3651,8 @@ class Endpoint:
                     ok = False
             if ok and name == "channel.{}.idle" and applied.get((0, "channel.{}.disable", key)) == b"\x01":
                 ok = False                                         # disable wins over idle on one channel
+            if ok and name == "channel.{}.label" and self._label_clash({**applied, (fn, name, key): d}) is not None:
+                ok = False                                         # labels in key order: the lower channel's stays
             if ok:
                 applied[(fn, name, key)] = d
             bad |= not ok