Compare commits
81
Commits
+183
@@ -4,6 +4,189 @@ All notable changes to seismo-relay are documented here.
|
||||
|
||||
---
|
||||
|
||||
## Unreleased
|
||||
|
||||
### Fixed
|
||||
|
||||
- **Waveform event times were the monitoring-session start, not the trigger
|
||||
(~hours off).** `read_blastware_file` stamped events with footer `ts1`, which
|
||||
for a waveform is the session start a unit shares across every event that day
|
||||
(a unit arming at 06:00 stamped 06:00 on all of them — the modal and PDF both
|
||||
showed it, since it's the stored value). The event time is footer `ts2` (the
|
||||
recording stop), and Blastware's trigger = `ts2 - record time`. The record
|
||||
time is a big-endian float32 in the recording-setup config block (30 bytes
|
||||
before the `Standard Recording Setup` marker), so the **exact trigger is now
|
||||
recovered from the binary alone** — all 7 BE12844 oracle events decode to
|
||||
their exact Blastware time (e.g. N844LQHB 10:33:29), no paired `.TXT` needed.
|
||||
Histograms keep `ts1` (the ~24 h window start). A paired report's
|
||||
`event_datetime` stays authoritative (unit-clock drift).
|
||||
⚠ **Needs a re-decode backfill** to correct existing stored events' timestamps.
|
||||
|
||||
### Added
|
||||
|
||||
- **Diagnostics tab in the SFM standalone webapp.** Surfaces the device
|
||||
endpoints that previously existed only as `curl`: `events/storage_range` and
|
||||
`events/index` alongside `monitor/status`, then stop monitoring, disable ACH
|
||||
(`rescue?erase=false`, so stored events survive), and erase. The wedged-unit
|
||||
ladder — slow drip and blind stop — sits under its own heading pointing at
|
||||
`docs/runbooks/wedged_unit_recovery.md`, with the reminder that `slow_drip`'s
|
||||
success signal is `bytes_received > 0` and not a clean duration. Erase is
|
||||
guarded by typing the unit's serial: auth answers *who*, not *did you mean
|
||||
it*, and Swagger's try-it-out button on `/device/events/erase` is live on
|
||||
`:8200/docs`.
|
||||
|
||||
- **`docs/sfm_tool_status.md`** — an honest per-capability maturity assessment:
|
||||
what is production-grade (the codec library, the data side), what is
|
||||
emergency-grade (the device side), what is a research artifact, the
|
||||
known-issues table, and the gap to a real tool. Also records the **5A
|
||||
page-boundary bug** as known: `parse_strt_end_offset()` discards the key's
|
||||
page byte, so once a unit has recorded more than 64 KB since its last erase,
|
||||
an event spanning the boundary reads an `end_offset` *behind* its own start —
|
||||
the chunk loop fetches nothing and TERM packs a negative `offset_word`, which
|
||||
500s. Reproduced on BE12599. Production is unaffected: it ingests complete
|
||||
files via the watcher path and never runs this walk.
|
||||
|
||||
### Changed
|
||||
|
||||
- **Connecting to a unit no longer walks its event chain.** `/device/events`
|
||||
reads every event header over the cellular link; on a unit with a large or
|
||||
wrapped chain that takes minutes or fails outright, and it fired
|
||||
automatically on every connect. Connect now uses only ~2 s probes —
|
||||
`/device/info` (which already carried the compliance config the walk was
|
||||
re-reading) plus `events/storage_range` — and the Device tab gains an Event
|
||||
Chain card. The walk moved behind a **Load events** button in the Events
|
||||
toolbar. Knowing whether a unit's ACH is on no longer requires reading every
|
||||
event it has stored.
|
||||
|
||||
### Migration
|
||||
|
||||
**None.** Frontend and documentation only — no codec, waveform-store or DB
|
||||
change, no schema change, and no `TOOL_VERSION` bump. The webapp is served
|
||||
from the image, so the change appears after the next `sfm` rebuild.
|
||||
|
||||
---
|
||||
|
||||
## v0.31.0 — 2026-09-18
|
||||
|
||||
**Report parity, and a second way to rescue a runaway unit.** Two threads.
|
||||
|
||||
The first closes out Blastware Event/FFT-Report parity: the FFT, the USBM
|
||||
RI8507 compliance chart and the sensor self-check now render on the event
|
||||
report, reverse-engineered against BE12844 (MiniMate Plus) and UM (Thor)
|
||||
events. The sensor check is decoded for **both** series and standardized into
|
||||
the `.h5` (schema **v2**, a new `/sensor_check` group), so SFM serves it
|
||||
device-agnostically rather than decoding at report time. The Inspector — an
|
||||
annotated hex reader for series-3 binaries — is what made the trailing-block
|
||||
structure findable, and it earned its keep by *ruling out* a stored FFT block
|
||||
and proving Blastware computes it from the samples.
|
||||
|
||||
The second came out of a field emergency. BE12599's connector fault drove its
|
||||
Tran channel to its trigger level, so the unit recorded back-to-back and dialed
|
||||
the office ACH server every ~75 s, unreachable the whole time.
|
||||
`bridges/ach_server.py` gained `--stop-monitoring` / `--disable-ach` /
|
||||
`--rescue`, which **invert** the recovery: instead of racing a Stop into the
|
||||
gaps between dial-outs, point the modem's Destination at our own ACH server and
|
||||
answer the call. Proven in production the same night — the stop landed on the
|
||||
first call-in and held. See `docs/runbooks/wedged_unit_recovery.md`.
|
||||
|
||||
⚠ **This release owes prod a backfill** — see Migration below.
|
||||
|
||||
### Added
|
||||
- **Rescue-on-connect for `bridges/ach_server.py`** — `--stop-monitoring`
|
||||
(SUB 0x97), `--disable-ach` (SUB 0x2C read → 0x7E write → 0x7F confirm) and
|
||||
`--rescue` (both). They fire immediately after the startup handshake and
|
||||
**before** the event walk, so a unit that is recording back-to-back on a
|
||||
stuck-triggered geophone is quieted as early in the session as possible.
|
||||
Each action is independently guarded — a failure does not abort the download
|
||||
— and the outcome is written to `rescue.json` in the session directory.
|
||||
|
||||
This inverts the `docs/runbooks/wedged_unit_recovery.md` approach. That
|
||||
runbook reaches the unit *inbound* and clears the modem's Destination Address
|
||||
to stop it dialing. When the device is instead wedged mid-modem-init — ALEOS
|
||||
logs `tcpmode trying to send to invalid socket` and re-runs `Initialize Auto
|
||||
answer` every ~75 s, orphaning any held inbound session — inbound cannot win.
|
||||
Pointing the modem's Destination at an `ach_server` and letting the unit call
|
||||
*us* gives a device-initiated session the modem bridges properly.
|
||||
|
||||
⚠ Prefer `--stop-monitoring` alone on first contact. `--disable-ach` stops
|
||||
the unit calling, which is the only channel to a unit in this state; stopping
|
||||
the recording ends the call-home loop on its own when ACH is
|
||||
"after event recorded".
|
||||
|
||||
- **Blastware-compatible channel FFT (`waveform_fft`).** Reproduces Blastware's
|
||||
FFT Report: DC-removed, no window, zero-padded to 4096 (0.25 Hz bins at
|
||||
1024 sps), single-sided `2/N` amplitude. Matches Blastware's dominant
|
||||
frequency to the exact bin and the amplitude to report precision across all
|
||||
28 channels of the 7-event BE12844 oracle set. `channel_spectrum()` /
|
||||
`dominant_frequency()`; tests in `tests/test_waveform_fft.py`.
|
||||
|
||||
- **USBM RI8507 / OSMRE compliance chart on the event-report PDF
|
||||
(`sfm/compliance.py`).** The velocity-vs-frequency blasting-compliance
|
||||
scatter Blastware draws in the upper-right of its Event Report: each channel's
|
||||
significant cycles as `(frequency, peak velocity)` points (zero-crossing
|
||||
method, so each channel's cloud tops out at its PPV) plotted against the
|
||||
RI8507 Drywall (0.75 in/s) and plaster (0.50 in/s) limit curves, drawn
|
||||
continuous (constant-displacement bounds meeting the plateaus — no vertical
|
||||
steps). Sized and positioned to match a Blastware report, measured off the
|
||||
reference PDF. A technical breakdown of the curve is in
|
||||
`docs/ri8507_compliance_curve.md`.
|
||||
|
||||
- **Sensor self-check waveforms decoded and drawn — both series.** The little
|
||||
"Sensor Check" traces (geophone ring-downs — the transducer's damped impulse
|
||||
response — plus a MicL pulse train, the mic's known-signal gain check) are the
|
||||
unit's proof its sensors were healthy when it recorded the event.
|
||||
- **Series-3** (`minimateplus.sensor_check`): four records (`0x3c`–`0x3f`) in
|
||||
the binary's trailing block, same delta-block codec as the main waveform.
|
||||
Verified against all 7 BE12844 reports (mic zero-crossing = 20.1 Hz exact;
|
||||
geophone ring-downs ~7.5 Hz, overswing ~3.5).
|
||||
- **Series-4** (`micromate.sensor_check`): the same self-test in the Thor IDFW
|
||||
fixed header — four `01 0e 3c/3d/3e/3f` records (same channel ids) storing
|
||||
raw int16 traces; three-channel (mic-disabled) units carry only the three
|
||||
geophones. Validated by shape + cross-event consistency.
|
||||
- **Standardized into the `.h5`** (`/sensor_check`, schema v2): each series'
|
||||
decoder attaches the traces to the event at decode, the writer persists
|
||||
them, and `gather_report_data` reads them back — so SFM renders the strip
|
||||
(flush against the waveform panel) plus the **Sensor Check → Frequency /
|
||||
Overswing Ratio** sub-rows without knowing the source instrument.
|
||||
- Tests: `tests/test_sensor_check.py`, `tests/test_sensor_check_idf.py`,
|
||||
`tests/test_event_hdf5_sensor_check.py`.
|
||||
|
||||
- **Inspector tab in `seismo_lab.py` — annotated hex reader for series-3
|
||||
binaries (`minimateplus/binary_annotate.py`).** Tiles a raw Blastware file
|
||||
into labeled spans (header / STRT / body record-chain / trailing metadata +
|
||||
calibration + sensor-check records / footer) so a binary can be combed by eye.
|
||||
|
||||
### Fixed
|
||||
- **Event-report waveform panel — stacked-lane y-tick collision.** The lanes
|
||||
touch, so each lane's bottom `-1.0` overprinted the next lane's top `1.0` at
|
||||
the shared boundary. Prune the extreme ticks so each lane shows clean interior
|
||||
ticks only.
|
||||
- **Event-report header — serial+firmware line ran off the page.** The long
|
||||
`BE##### V ##.##-#.## MiniMate Plus` string overflowed the right margin;
|
||||
tighter right-column indent + BW's slightly smaller header size so it fits.
|
||||
|
||||
---
|
||||
|
||||
### Migration
|
||||
|
||||
⚠ **The sensor-check needs a backfill.** Existing `.h5` files are schema v1
|
||||
and carry no `/sensor_check` group, so their reports show no sensor-check strip
|
||||
until regenerated. `TOOL_VERSION` is bumped to **0.31.0**, so the standard
|
||||
backfill regenerates every event and picks up the traces with **no `--force`**:
|
||||
`scripts/backfill_thor_events.py` for series-4 (it already owed a v0.30.0 Thor
|
||||
backfill — this rides along) and the series-3 sidecar/shape backfill for
|
||||
MiniMate events. Purely additive — no decoded value changes, and v1 `.h5`
|
||||
files read fine until then (empty strip). DB backup first, as always.
|
||||
|
||||
⚠ Budget **~2 h on the NAS** — ~1.5 files/sec there versus ~85/sec on the dev
|
||||
box (gzip-4 in `sfm/event_hdf5.py` against a Synology CPU).
|
||||
|
||||
Everything else in this release owes nothing: the FFT, the USBM compliance
|
||||
chart and the `ach_server` rescue flags are additive and read data already on
|
||||
disk — no schema change, no DB migration.
|
||||
|
||||
---
|
||||
|
||||
## v0.30.0 — 2026-09-12
|
||||
|
||||
**The series-4 correctness release** — the Thor / Micromate counterpart to
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
Ground-up Python replacement for **Blastware**, Instantel's Windows-only software for
|
||||
managing MiniMate Plus seismographs. Connects over direct RS-232 or cellular modem
|
||||
(Sierra Wireless RV50 / RV55). Current version: **v0.30.0**.
|
||||
(Sierra Wireless RV50 / RV55). Current version: **v0.31.0**.
|
||||
|
||||
Stack-level context — which repo owns what, and how the three project versions
|
||||
pair — lives in `../terra-view/docs/tmi-stack.md`, which is also loaded as
|
||||
@@ -10,10 +10,38 @@ pair — lives in `../terra-view/docs/tmi-stack.md`, which is also loaded as
|
||||
|
||||
---
|
||||
|
||||
## Where things stand (updated 2026-08-28)
|
||||
## Where things stand (updated 2026-09-26)
|
||||
|
||||
Read this first when picking the project back up.
|
||||
|
||||
- **The Series-4 LIVE wire protocol is reverse-engineered end to end
|
||||
(2026-09-25).** `docs/micromate_protocol_reference.md` is the Series-4
|
||||
Rosetta Stone, sibling to `instantel_protocol_reference.md`. **A Micromate
|
||||
answers Series III command frames** — three framing differences: responses
|
||||
have **no leading `DLE`** (a bare `STX`), `payload[1]` is `0xC5` (Blastware
|
||||
firmware) or `0x03` (Thor firmware) rather than `0x10`, and the data length
|
||||
is a **uint16 BE at `payload[8:10]`** (as a byte it under-reads `SUB 0x1A`
|
||||
by 47x). Read path, event chain, setups, scheduler, monitoring control and
|
||||
per-event delete are all mapped; **the inbound call-home session is the only
|
||||
protocol unknown left.**
|
||||
⚠ **No command has ever been originated against a unit by this project.**
|
||||
Every write was performed by THOR while we recorded. That line is worth
|
||||
keeping.
|
||||
⚠ `micromate/` still has **no live client** — it is codec-only. The
|
||||
`minimateplus/` stack (transport/framing/protocol/client) has no Series-4
|
||||
counterpart yet. `minimateplus.transport` is protocol-agnostic and reusable.
|
||||
- **Bench tooling for device diagnosis (2026-09-25).** `bridges/mm_probe.py`
|
||||
distinguishes the four faults THOR reports identically as "disconnected"
|
||||
(refused / connect timeout / **connected but no reply** / replied) and names
|
||||
what to try next. `bridges/mm_link.py` is a stand-in for a cellular modem
|
||||
with a decoded log and fault injection. `scratch/mm_frame_parse.py` exists
|
||||
because **`S3FrameParser` cannot see Micromate responses at all** — it scans
|
||||
for `DLE+STX`, which never appears in Series-4 traffic.
|
||||
- **A Micromate's USB-A host port drives FTDI and CDC-ACM only** — no Prolific,
|
||||
in either firmware line. TMI buys both Sabrent (FTDI) and Benfei (PL2303)
|
||||
cables and they are indistinguishable by eye. A PL2303 cable leaves a unit
|
||||
with **no working modem port at all**; identify by `lsusb` VID, `0403` vs
|
||||
`067b`. This accounted for a unit that could not be deployed.
|
||||
- **Series-3 decode is verified per-sample at scale (v0.27.0).** The full DL2
|
||||
archive decodes **14,338 / 14,338** paired files exactly against their
|
||||
preserved Blastware ASCII exports — 1,249 waveform + 13,089 histogram, 45
|
||||
@@ -61,6 +89,24 @@ Read this first when picking the project back up.
|
||||
4th-decimal tick and are Thor's own rounding — no single linear LSB can
|
||||
reproduce every printed value (the constraints are infeasible by 7e-5
|
||||
relative), so do NOT retune `_GEO_LSB_IPS`.
|
||||
- **⚠ KNOWN BUG — the 5A walk breaks once a unit's buffer crosses 64 KB.**
|
||||
`parse_strt_end_offset()` returns only `(end_key[2] << 8) | end_key[3]`,
|
||||
discarding the key's page byte. An event starting at `0x0111F2A2` and ending
|
||||
at `0x0112_1010` therefore reads `end_offset = 0x1010` — *behind* its own
|
||||
start. The chunk loop then exits before fetching anything and TERM computes
|
||||
a negative `offset_word`, which `struct.pack(">H", ...)` rejects: the
|
||||
`/device/events` walk 500s. Reproduced on BE12599 (2026-09-19), which had
|
||||
78 KB stored and had rolled into page `0x12`.
|
||||
**Why it hid so long:** every 5A capture the walk was verified against came
|
||||
from a freshly-erased BE11529 — all three confirmed TERM examples in
|
||||
`framing.py` (`0x1ABE`, `0x21F2`, `0x417E`) sit inside page `0x11`. Prod is
|
||||
unaffected: it ingests complete files via BW ACH, never this walk.
|
||||
**Fixing it has two layers** — the arithmetic (`if end < start: end +=
|
||||
0x10000`) stops the crash and bounds the loop correctly; carrying the page
|
||||
byte through the chunk requests (`params[1]` 0x11 -> 0x12, counter rolling
|
||||
over) needs a BW capture of a spanning event first. Do not ship layer one
|
||||
alone without a loud truncation warning — a silently short event is the
|
||||
failure mode this codec has been bitten by repeatedly.
|
||||
- **Open, not blocking:** 14 sensitive-range files show an exact 8x
|
||||
(= 10.0/1.25) units discrepancy; `scripts/backfill_sidecars.py --force` also
|
||||
inserts DB rows for store files that have none (one-time per store) and the
|
||||
@@ -74,6 +120,9 @@ Read this first when picking the project back up.
|
||||
**v0.27.0 does NOT owe prod a backfill** — verified: the partial-final-block
|
||||
fix changes 0 of the 10,215 histograms in the prod store (the 4 recovered
|
||||
files are archive-only and were never ingested).
|
||||
✅ **The v0.30.0 Series-4 backfill HAS been run on prod (2026-09-25).** Every
|
||||
stored Series-4 geophone value was ~3.3% low until then; that is corrected and
|
||||
the job does not need repeating.
|
||||
- **The "offset" hardware fault has its own journal** --
|
||||
`docs/offset_investigation.md`. **5 of 45 units (11%)**, and the fault is
|
||||
**persistent** — it stays until the geophone is serviced. Detect it with
|
||||
@@ -85,7 +134,59 @@ Read this first when picking the project back up.
|
||||
`SUB 0x0E` (unimplemented), which may carry those very numbers.
|
||||
|
||||
|
||||
When new information about the protocol is discovered, please update the instantel_protocol_reference.md with the findings in addition to this document
|
||||
When new information about a protocol is discovered, record it in the matching
|
||||
reference **in addition to** this document:
|
||||
|
||||
| series | document |
|
||||
|---|---|
|
||||
| Series III (MiniMate Plus / BlastMate) | `docs/instantel_protocol_reference.md` |
|
||||
| **Series IV (Micromate / THOR)** | **`docs/micromate_protocol_reference.md`** |
|
||||
| Thor IDF file format | `docs/idf_protocol_reference.md` |
|
||||
|
||||
Both protocol references carry retractions in place rather than deleting what
|
||||
turned out to be wrong — that convention has already saved re-deriving the same
|
||||
mistakes twice, so keep it.
|
||||
|
||||
---
|
||||
|
||||
## Changelog & release convention
|
||||
|
||||
**Feature branches do NOT touch `CHANGELOG.md`. Write the entry on `dev`, as
|
||||
part of finishing the merge, under `## Unreleased`. Cut the version on `dev` in a
|
||||
dedicated release commit when you are ready to ship to `main`.**
|
||||
|
||||
- **The changelog is written on `dev`, never on a feature branch.** With
|
||||
several branches in flight they all edit the same few lines at the top of
|
||||
the file and conflict every time. Writing it once, after the merge, also
|
||||
lets it describe what actually *landed* — including anything that changed
|
||||
during conflict resolution.
|
||||
- ⚠ **The merge is not finished until `## Unreleased` is updated.** Same sitting,
|
||||
not "later" — that is the one failure mode of writing it after the fact.
|
||||
Reconstruct from the branch's own commit messages:
|
||||
`git log --oneline dev..<branch>` before you merge, or
|
||||
`git log --oneline <merge-base>..<branch>` after.
|
||||
- **No preamble under `## Unreleased`** — just the `### Added` / `### Changed` /
|
||||
`### Fixed` lists. The themed opening paragraph gets written at release
|
||||
time, when the whole release is visible and can be named honestly. A theme
|
||||
written when the first item landed is stale by the third.
|
||||
- ⚠ **State the operational consequence** on any entry touching the codec, the
|
||||
waveform store, or the DB — **including when it is "none."** "requires
|
||||
`backfill_sidecars.py` + `backfill_event_shape.py`, ~2 h on the NAS",
|
||||
"`TOOL_VERSION` bumped", "no schema change, no migration". Silence is
|
||||
ambiguous; "none" is information. This repo's changelog is how future-you
|
||||
learns whether a deploy costs two hours.
|
||||
- **Releases are cut on judgement, not on a schedule or a merge.** `Unreleased`
|
||||
is the staging area for whatever is going into the next release; when enough
|
||||
has accumulated to be worth shipping, it gets a number and a date. Nothing
|
||||
about a merge to `dev` triggers a release.
|
||||
- **Cutting a release** is its own `chore(release): vX.Y.Z — <theme>` commit on
|
||||
`dev`, renaming `## Unreleased` → `## vX.Y.Z — YYYY-MM-DD` and touching:
|
||||
`CHANGELOG.md`, `pyproject.toml`, the version line in `CLAUDE.md` and
|
||||
`README.md`, and `minimateplus/event_file_io.py` (`TOOL_VERSION`) **when the
|
||||
codec changed** — that constant gates `.h5` regeneration.
|
||||
- **`main` carries only released versions.** No `## Unreleased` section there;
|
||||
it lands via the `dev` → `main` PR. `main` lagging `dev` by a version is
|
||||
normal.
|
||||
|
||||
---
|
||||
|
||||
@@ -217,8 +318,15 @@ minimateplus/ ← Python client library (primary focus)
|
||||
|
||||
sfm/server.py ← FastAPI REST server exposing device data over HTTP
|
||||
seismo_lab.py ← Tkinter GUI (Bridge + Analyzer + Console tabs)
|
||||
bridges/
|
||||
mm_probe.py ← name the fault behind a dead unit (4 verdicts, read-only)
|
||||
mm_link.py ← bench stand-in for a cellular modem, with fault injection
|
||||
ach_mitm.py ← TCP relay for recording a Series-3 ACH session
|
||||
|
||||
docs/
|
||||
instantel_protocol_reference.md ← reverse-engineered protocol spec ("the Rosetta Stone")
|
||||
instantel_protocol_reference.md ← Series III protocol spec ("the Rosetta Stone")
|
||||
micromate_protocol_reference.md ← Series IV protocol spec + THOR's measured behaviour
|
||||
idf_protocol_reference.md ← Thor IDF file format
|
||||
CHANGELOG.md ← version history
|
||||
```
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# seismo-relay `v0.30.0`
|
||||
# seismo-relay `v0.31.0`
|
||||
|
||||
A ground-up replacement for **Blastware** — Instantel's aging Windows-only
|
||||
software for managing seismographs. Supports both the **MiniMate Plus
|
||||
@@ -496,6 +496,11 @@ Use **com0com** or **VSPD** to create the virtual COM pair on Windows.
|
||||
|
||||
## Roadmap (Future)
|
||||
|
||||
> **Where it stands *today*** — an honest per-capability maturity assessment,
|
||||
> what to rely on, known issues, and the gap to a real tool:
|
||||
> [`docs/sfm_tool_status.md`](docs/sfm_tool_status.md). This section covers
|
||||
> where it is *going*.
|
||||
|
||||
### Strategic direction — where this is going
|
||||
|
||||
seismo-relay is being built as a **suite of cooperating components**
|
||||
|
||||
@@ -177,6 +177,8 @@ class AchSession:
|
||||
store: "WaveformStore",
|
||||
clear_after_download: bool = False,
|
||||
restart_monitoring: bool = False,
|
||||
rescue_stop_monitoring: bool = False,
|
||||
rescue_disable_ach: bool = False,
|
||||
force_redownload: bool = False,
|
||||
) -> None:
|
||||
self.sock = sock
|
||||
@@ -190,6 +192,9 @@ class AchSession:
|
||||
self.store = store
|
||||
self.clear_after_download = clear_after_download
|
||||
self.restart_monitoring = restart_monitoring
|
||||
# Rescue actions for a runaway unit — fired before the event walk.
|
||||
self.rescue_stop_monitoring = rescue_stop_monitoring
|
||||
self.rescue_disable_ach = rescue_disable_ach
|
||||
# `force_redownload` tells this session to ignore ach_state and
|
||||
# re-download every event currently on the device, regardless of any
|
||||
# (key, timestamp) match. Useful as a manual override when state has
|
||||
@@ -290,6 +295,41 @@ class AchSession:
|
||||
root_logger.addHandler(fh)
|
||||
|
||||
try:
|
||||
# ── Step 1.5: rescue actions ──────────────────────────────────────
|
||||
# Fired BEFORE the event walk so a runaway unit is quieted as early
|
||||
# in the session as possible. A unit whose geophone sits above the
|
||||
# trigger threshold records back-to-back and, with ACH set to "after
|
||||
# event recorded", re-dials every time — saturating its own firmware
|
||||
# so it never services inbound requests. See
|
||||
# docs/runbooks/wedged_unit_recovery.md.
|
||||
#
|
||||
# Each action is independently guarded: a failure here must not
|
||||
# abort the download that follows.
|
||||
if self.rescue_stop_monitoring or self.rescue_disable_ach:
|
||||
rescue: dict = {"peer": self.peer, "ts": ts}
|
||||
|
||||
if self.rescue_stop_monitoring:
|
||||
log.info("Step 1.5: RESCUE — stop monitoring (SUB 0x97)")
|
||||
try:
|
||||
client.stop_monitoring()
|
||||
rescue["stop_monitoring"] = "ok"
|
||||
log.info(" stop monitoring OK — device should stop recording")
|
||||
except Exception as exc:
|
||||
rescue["stop_monitoring"] = f"failed: {exc}"
|
||||
log.error(" stop monitoring FAILED: %s", exc)
|
||||
|
||||
if self.rescue_disable_ach:
|
||||
log.info("Step 1.5: RESCUE — disable auto call home (SUB 0x2C/0x7E/0x7F)")
|
||||
try:
|
||||
client.set_call_home_config(auto_call_home_enabled=False)
|
||||
rescue["disable_ach"] = "ok"
|
||||
log.info(" disable ACH OK — unit should stop calling home")
|
||||
except Exception as exc:
|
||||
rescue["disable_ach"] = f"failed: {exc}"
|
||||
log.error(" disable ACH FAILED: %s", exc)
|
||||
|
||||
_save_json(session_dir / "rescue.json", rescue)
|
||||
|
||||
# ── Step 2: device info ───────────────────────────────────────────
|
||||
device_info = None
|
||||
if not self.events_only:
|
||||
@@ -747,6 +787,13 @@ def serve(args: argparse.Namespace) -> None:
|
||||
print(f" Max events per session: {max_ev if max_ev else 'unlimited'}")
|
||||
print(f" Clear device after download: {'YES' if args.clear_after_download else 'no'}")
|
||||
print(f" Restart monitoring after download: {'YES' if args.restart_monitoring else 'no'}")
|
||||
_stop_mon = args.stop_monitoring or args.rescue
|
||||
_dis_ach = args.disable_ach or args.rescue
|
||||
print(f" RESCUE stop monitoring on connect: {'YES' if _stop_mon else 'no'}")
|
||||
print(f" RESCUE disable auto call home: {'YES' if _dis_ach else 'no'}")
|
||||
if _stop_mon and args.restart_monitoring:
|
||||
print(" !! --restart-monitoring will re-start the unit after download,")
|
||||
print(" undoing --stop-monitoring. Drop one of them.")
|
||||
print(f" Force re-download all (ignore state): {'YES' if args.force_redownload_all else 'no'}")
|
||||
print(f"{'='*60}")
|
||||
print(f"\n Point your test unit's ACEmanager call-home settings to:")
|
||||
@@ -788,6 +835,8 @@ def serve(args: argparse.Namespace) -> None:
|
||||
store=store,
|
||||
clear_after_download=args.clear_after_download,
|
||||
restart_monitoring=args.restart_monitoring,
|
||||
rescue_stop_monitoring=args.stop_monitoring or args.rescue,
|
||||
rescue_disable_ach=args.disable_ach or args.rescue,
|
||||
force_redownload=args.force_redownload_all,
|
||||
)
|
||||
t = threading.Thread(target=session.run, daemon=True, name=f"ach-{peer}")
|
||||
@@ -862,6 +911,32 @@ def parse_args() -> argparse.Namespace:
|
||||
"DCD on disconnect — without this the unit stays idle after a call-home."
|
||||
),
|
||||
)
|
||||
p.add_argument(
|
||||
"--stop-monitoring",
|
||||
action="store_true",
|
||||
default=False,
|
||||
help=(
|
||||
"RESCUE: send SUB 0x97 (stop monitoring) immediately after the "
|
||||
"handshake, before any event download. Use on a unit that is "
|
||||
"recording back-to-back because of a stuck-triggered geophone."
|
||||
),
|
||||
)
|
||||
p.add_argument(
|
||||
"--disable-ach",
|
||||
action="store_true",
|
||||
default=False,
|
||||
help=(
|
||||
"RESCUE: disable Auto Call Home on the device (SUB 0x2C read → "
|
||||
"0x7E write → 0x7F confirm) immediately after the handshake. The "
|
||||
"unit stops dialing out until ACH is explicitly re-enabled."
|
||||
),
|
||||
)
|
||||
p.add_argument(
|
||||
"--rescue",
|
||||
action="store_true",
|
||||
default=False,
|
||||
help="Shorthand for --stop-monitoring --disable-ach.",
|
||||
)
|
||||
p.add_argument(
|
||||
"--clear-after-download",
|
||||
action="store_true",
|
||||
|
||||
@@ -0,0 +1,280 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
mm_client_check.py — exercise the Micromate read client against a real unit.
|
||||
|
||||
**Read-only.** It sends POLL, SERIAL, state, monitor status, the setup walk and
|
||||
(optionally) one event download. It never writes, never erases, never starts or
|
||||
stops monitoring.
|
||||
|
||||
Why it exists
|
||||
-------------
|
||||
`micromate/{framing,protocol,client}.py` are verified against captures taken
|
||||
**over USB**, on **one firmware line** (`11.0CB`). Two things that cannot be
|
||||
verified that way:
|
||||
|
||||
* **the modem path.** An RX55/RV55 bridges serial to TCP transparently, but
|
||||
it buffers up to ~1 s before forwarding, so a single logical response can
|
||||
arrive as many small reads. The client reads to frame completion rather
|
||||
than using idle-gap detection, which should be strictly more robust — but
|
||||
"should be" is the point of this script.
|
||||
* **the other firmware line.** `11.0BD` reports `flags = 0x03`, a shorter
|
||||
model string, and a `SUB 0x1C` block 4 bytes longer. Everything about that
|
||||
is currently inference from one 2026-09-23 sweep whose captures never
|
||||
landed in the repo.
|
||||
|
||||
Run it over both paths and diff the two reports. Anything that differs beyond
|
||||
timings is a finding.
|
||||
|
||||
Usage
|
||||
-----
|
||||
# over the modem
|
||||
python3 bridges/mm_client_check.py 63.45.161.30:9034
|
||||
|
||||
# over USB / direct serial
|
||||
python3 bridges/mm_client_check.py /dev/ttyACM0 --baud 115200
|
||||
|
||||
# include one event download (still read-only)
|
||||
python3 bridges/mm_client_check.py <target> --download
|
||||
|
||||
⚠ These modems bridge ONE TCP session to serial at a time. If THOR holds the
|
||||
unit, this will connect and then see nothing — that is contention, not a fault.
|
||||
`bridges/mm_probe.py` explains that case; disconnect THOR first.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import errno
|
||||
import os
|
||||
import select
|
||||
import sys
|
||||
import termios
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
||||
|
||||
from micromate.client import MicromateClient, _content # noqa: E402
|
||||
from micromate.protocol import ProtocolError # noqa: E402
|
||||
from minimateplus.transport import TcpTransport # noqa: E402
|
||||
|
||||
|
||||
class StdlibSerial:
|
||||
"""Raw serial on stdlib `termios` — no pyserial.
|
||||
|
||||
`minimateplus.SerialTransport` needs pyserial, and a bench host is whatever
|
||||
is to hand. On a PEP 668 distro (Mint 22, Ubuntu 24.04, Debian 12) a plain
|
||||
`pip install pyserial` is refused outright, so a diagnostic that depends on
|
||||
it is one you cannot run at the moment you need it. `bridges/mm_link.py`
|
||||
and `scratch/fake_unit.py` already take this approach; this is the same
|
||||
~30 lines, and it means the tool runs on a stock Python 3 anywhere.
|
||||
|
||||
Not a general replacement for SerialTransport — no flow control, no
|
||||
parity options, Linux/macOS only. Enough for a Micromate, which is 8N1
|
||||
with no handshaking.
|
||||
"""
|
||||
|
||||
_BAUD = {9600: termios.B9600, 19200: termios.B19200, 38400: termios.B38400,
|
||||
57600: termios.B57600, 115200: termios.B115200}
|
||||
|
||||
def __init__(self, path: str, baud: int = 115200) -> None:
|
||||
if baud not in self._BAUD:
|
||||
raise ValueError(f"unsupported baud {baud}; pick from {sorted(self._BAUD)}")
|
||||
self.path, self.baud, self.fd = path, baud, None
|
||||
|
||||
def connect(self) -> None:
|
||||
if self.fd is not None:
|
||||
return
|
||||
self.fd = os.open(self.path, os.O_RDWR | os.O_NOCTTY | os.O_NONBLOCK)
|
||||
a = termios.tcgetattr(self.fd)
|
||||
a[0] = a[1] = a[3] = 0 # raw in/out, non-canonical
|
||||
a[2] = termios.CS8 | termios.CREAD | termios.CLOCAL # 8N1, ignore modem lines
|
||||
a[4] = a[5] = self._BAUD[self.baud]
|
||||
a[6] = list(a[6])
|
||||
a[6][termios.VMIN] = 0
|
||||
a[6][termios.VTIME] = 0
|
||||
termios.tcsetattr(self.fd, termios.TCSANOW, a)
|
||||
termios.tcflush(self.fd, termios.TCIOFLUSH)
|
||||
|
||||
def disconnect(self) -> None:
|
||||
if self.fd is not None:
|
||||
os.close(self.fd)
|
||||
self.fd = None
|
||||
|
||||
def is_connected(self) -> bool:
|
||||
return self.fd is not None
|
||||
|
||||
def read(self, n: int) -> bytes:
|
||||
if self.fd is None:
|
||||
return b""
|
||||
r, _, _ = select.select([self.fd], [], [], 0.05)
|
||||
if not r:
|
||||
return b""
|
||||
try:
|
||||
return os.read(self.fd, n)
|
||||
except OSError as e:
|
||||
if e.errno in (errno.EAGAIN, errno.EWOULDBLOCK):
|
||||
return b""
|
||||
raise
|
||||
|
||||
def write(self, data: bytes) -> None:
|
||||
if self.fd is None:
|
||||
raise OSError("port is not open")
|
||||
while data:
|
||||
data = data[os.write(self.fd, data):]
|
||||
|
||||
|
||||
class _Timed:
|
||||
"""Count bytes and time each read, so the two transports can be compared."""
|
||||
|
||||
def __init__(self, inner) -> None:
|
||||
self._inner = inner
|
||||
self.reads = 0
|
||||
self.bytes_in = 0
|
||||
self.bytes_out = 0
|
||||
|
||||
def connect(self):
|
||||
return self._inner.connect()
|
||||
|
||||
def disconnect(self):
|
||||
return self._inner.disconnect()
|
||||
|
||||
def is_connected(self):
|
||||
return self._inner.is_connected()
|
||||
|
||||
def write(self, data: bytes):
|
||||
self.bytes_out += len(data)
|
||||
return self._inner.write(data)
|
||||
|
||||
def read(self, n: int) -> bytes:
|
||||
chunk = self._inner.read(n)
|
||||
if chunk:
|
||||
self.reads += 1
|
||||
self.bytes_in += len(chunk)
|
||||
return chunk
|
||||
|
||||
|
||||
def step(label: str, fn):
|
||||
"""Run one read, report how long it took and what it returned."""
|
||||
t0 = time.monotonic()
|
||||
try:
|
||||
value = fn()
|
||||
except Exception as e:
|
||||
print(f" {label:.<26} FAILED {type(e).__name__}: {e}")
|
||||
return None
|
||||
ms = 1000 * (time.monotonic() - t0)
|
||||
shown = value if isinstance(value, str) else repr(value)
|
||||
if isinstance(value, list):
|
||||
shown = f"{len(value)} entries"
|
||||
print(f" {label:.<26} {ms:7.0f} ms {shown}")
|
||||
return value
|
||||
|
||||
|
||||
def main() -> int:
|
||||
ap = argparse.ArgumentParser(
|
||||
description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
|
||||
)
|
||||
ap.add_argument("target", help="host:port for TCP, or a serial device path")
|
||||
ap.add_argument("--baud", type=int, default=115200,
|
||||
help="serial only; the USB-A/FTDI path runs at 115200. "
|
||||
"Ignored by the USB-B 'PC' port, which is CDC-ACM "
|
||||
"and negotiates its own rate.")
|
||||
ap.add_argument("--timeout", type=float, default=10.0)
|
||||
ap.add_argument("--download", action="store_true",
|
||||
help="also download the first stored event (read-only)")
|
||||
ap.add_argument("--lenient", action="store_true",
|
||||
help="do not raise on a bad checksum — for diagnosis only")
|
||||
a = ap.parse_args()
|
||||
|
||||
if ":" in a.target and not Path(a.target).exists():
|
||||
host, _, port = a.target.rpartition(":")
|
||||
inner = TcpTransport(host, int(port), connect_timeout=a.timeout)
|
||||
path = f"TCP {host}:{port}"
|
||||
else:
|
||||
inner = StdlibSerial(a.target, baud=a.baud)
|
||||
path = f"serial {a.target} @ {a.baud}"
|
||||
|
||||
transport = _Timed(inner)
|
||||
mm = MicromateClient(transport, recv_timeout=a.timeout,
|
||||
strict_checksums=not a.lenient)
|
||||
|
||||
print(f"\n{path} (read-only: POLL, SERIAL, state, status, setups)\n")
|
||||
t0 = time.monotonic()
|
||||
try:
|
||||
mm.open()
|
||||
except OSError as e:
|
||||
print(f" connect.................... FAILED {e}")
|
||||
return 2
|
||||
print(f" {'connect':.<26} {1000*(time.monotonic()-t0):7.0f} ms")
|
||||
|
||||
try:
|
||||
info = step("connect() identity", mm.connect)
|
||||
if info:
|
||||
print(f" serial={info.serial} model={info.model} "
|
||||
f"fw={info.firmware_line} monitoring={info.monitoring}")
|
||||
print(f" active setup={info.active_setup!r}")
|
||||
if info.firmware_line == "thor":
|
||||
print(" *** 11.0BD unit — the FIRST one this code has met. ***")
|
||||
print(" *** Check the battery and clock below carefully: ***")
|
||||
print(" *** its 0x1C block is 4 bytes longer. ***")
|
||||
|
||||
state = step("get_state()", mm.get_state)
|
||||
if state:
|
||||
print(f" {state}")
|
||||
if state.battery_volts and not 2.5 < state.battery_volts < 9.0:
|
||||
print(f" *** battery {state.battery_volts} V is impossible — "
|
||||
f"this is the from-the-end offset bug. ***")
|
||||
if state.device_time is None:
|
||||
print(" *** device clock did not decode — dump raw below. ***")
|
||||
print(f" raw 0x1C content: {_content(state.raw).hex(' ')}")
|
||||
|
||||
setups = step("list_setups()", mm.list_setups)
|
||||
if setups:
|
||||
print(f" first={setups[0]!r} last={setups[-1]!r}")
|
||||
|
||||
if a.download:
|
||||
print("\n event chain (read-only):")
|
||||
proto = mm.protocol
|
||||
proto.arm_event()
|
||||
hdr = _content(proto.read_event_first())
|
||||
key, size = hdr[0:4], int.from_bytes(hdr[4:8], "big")
|
||||
if not size:
|
||||
print(" no events stored")
|
||||
else:
|
||||
print(f" first event key={key.hex()} size={size} B")
|
||||
t1 = time.monotonic()
|
||||
blob = proto.read_event_file(key, size)
|
||||
dt = time.monotonic() - t1
|
||||
print(f" downloaded {len(blob)} B in {dt:.1f} s "
|
||||
f"({len(blob)/dt/1024:.1f} KiB/s)")
|
||||
assert len(blob) == size
|
||||
# Decode it with the existing codec to prove the bytes are real.
|
||||
try:
|
||||
from micromate.idf_file import read_idf_file
|
||||
import tempfile
|
||||
with tempfile.NamedTemporaryFile(suffix=".IDFW", delete=False) as f:
|
||||
f.write(blob)
|
||||
tmp = f.name
|
||||
ev = read_idf_file(tmp)
|
||||
print(f" decoded OK: {ev}")
|
||||
except Exception as e:
|
||||
print(f" decode failed: {type(e).__name__}: {e}")
|
||||
out = Path(f"./{key.hex()}.IDFW")
|
||||
out.write_bytes(blob)
|
||||
print(f" saved to {out} for offline analysis")
|
||||
|
||||
except ProtocolError as e:
|
||||
print(f"\n ABORTED {type(e).__name__}: {e}")
|
||||
return 3
|
||||
finally:
|
||||
mm.close()
|
||||
|
||||
print(f"\n transport: {transport.reads} reads, "
|
||||
f"{transport.bytes_in} B in, {transport.bytes_out} B out")
|
||||
print(" A modem path should show MORE reads for the same bytes than USB —")
|
||||
print(" that is the buffering, and it is exactly what needed proving.\n")
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,338 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
mm_link.py — a "perfect modem" between THOR and a Micromate, with a readable
|
||||
log and deliberate fault injection.
|
||||
|
||||
Why
|
||||
---
|
||||
THOR gives almost no visibility into a connection: a refresh button, two poll
|
||||
intervals, and no way to see whether a check succeeded, timed out, or was never
|
||||
sent. When a unit "won't stay connected" there is nothing to look at.
|
||||
|
||||
This sits where the cellular modem would sit and answers the question directly:
|
||||
|
||||
* **What is THOR actually doing?** Every frame is decoded and timestamped —
|
||||
`POLL`, `MONITOR_STATUS`, `SETUP_NAME_READ` — not a hex dump.
|
||||
* **Is it even trying?** Silence is visible: the log shows gaps.
|
||||
* **How does it behave when the link misbehaves?** Faults can be injected on
|
||||
demand, which a real cell link will not do on cue.
|
||||
|
||||
Point THOR at this host and port exactly as if it were a modem (Communication:
|
||||
TCP, IP: <this host>, Port: <--listen>).
|
||||
|
||||
Fault injection
|
||||
---------------
|
||||
Write a mode into the control file (default `mm_link.ctl`) and it takes effect
|
||||
on the next byte:
|
||||
|
||||
echo pass > mm_link.ctl # normal relay
|
||||
echo blackhole > mm_link.ctl # TCP stays up, bytes are swallowed
|
||||
echo drop > mm_link.ctl # close the connection abruptly (RST-ish)
|
||||
echo delay:2.0 > mm_link.ctl # forward, but 2 s late in both directions
|
||||
echo onewaydev > mm_link.ctl # THOR->unit passes, unit->THOR is swallowed
|
||||
|
||||
**`blackhole` is the one that matters.** It reproduces the classic cellular
|
||||
failure: the socket is still open as far as both ends are concerned, but nothing
|
||||
crosses. A client that relies on TCP to tell it the peer is gone will sit there
|
||||
until the OS keepalive fires — which by default is about two hours.
|
||||
|
||||
Usage
|
||||
-----
|
||||
python3 bridges/mm_link.py --serial /dev/ttyACM0 --baud 115200 \\
|
||||
--listen 12345 --logdir ~/mm-captures
|
||||
|
||||
Writes, per session:
|
||||
<logdir>/mmlink_<ts>/session.log decoded, timestamped, human-readable
|
||||
<logdir>/mmlink_<ts>/raw_bw.bin THOR -> unit, raw
|
||||
<logdir>/mmlink_<ts>/raw_s3.bin unit -> THOR, raw
|
||||
|
||||
The raw pair loads straight into `scratch/mm_frame_parse.py`.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import datetime
|
||||
import os
|
||||
import socket
|
||||
import sys
|
||||
import threading
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent / "scratch"))
|
||||
try:
|
||||
from mm_frame_parse import SUBNAME, destuff # noqa: F401
|
||||
except Exception: # pragma: no cover
|
||||
SUBNAME = {}
|
||||
|
||||
import errno
|
||||
import select
|
||||
import termios
|
||||
|
||||
DLE, STX, ETX, ACK = 0x10, 0x02, 0x03, 0x41
|
||||
|
||||
_BAUD = {9600: termios.B9600, 19200: termios.B19200, 38400: termios.B38400,
|
||||
57600: termios.B57600, 115200: termios.B115200}
|
||||
|
||||
|
||||
class SerialPort:
|
||||
"""Minimal raw serial port on stdlib termios — no pyserial dependency.
|
||||
|
||||
The bench hosts are whatever is to hand; requiring a pip install on someone
|
||||
else's machine is a poor trade for the ~30 lines this saves.
|
||||
"""
|
||||
|
||||
def __init__(self, path: str, baud: int):
|
||||
if baud not in _BAUD:
|
||||
raise ValueError(f"unsupported baud {baud}; pick one of {sorted(_BAUD)}")
|
||||
self.fd = os.open(path, os.O_RDWR | os.O_NOCTTY | os.O_NONBLOCK)
|
||||
a = termios.tcgetattr(self.fd)
|
||||
a[0] = 0 # iflag: no translation
|
||||
a[1] = 0 # oflag: raw
|
||||
a[2] = termios.CS8 | termios.CREAD | termios.CLOCAL # cflag: 8N1, ignore modem lines
|
||||
a[3] = 0 # lflag: non-canonical, no echo
|
||||
a[4] = a[5] = _BAUD[baud]
|
||||
a[6] = list(a[6])
|
||||
a[6][termios.VMIN] = 0
|
||||
a[6][termios.VTIME] = 0
|
||||
termios.tcsetattr(self.fd, termios.TCSANOW, a)
|
||||
termios.tcflush(self.fd, termios.TCIOFLUSH)
|
||||
|
||||
def read(self, n: int) -> bytes:
|
||||
r, _, _ = select.select([self.fd], [], [], 0.2)
|
||||
if not r:
|
||||
return b""
|
||||
try:
|
||||
return os.read(self.fd, n)
|
||||
except OSError as e:
|
||||
if e.errno in (errno.EAGAIN, errno.EWOULDBLOCK):
|
||||
return b""
|
||||
raise
|
||||
|
||||
def write(self, data: bytes) -> None:
|
||||
while data:
|
||||
try:
|
||||
data = data[os.write(self.fd, data):]
|
||||
except OSError as e:
|
||||
if e.errno in (errno.EAGAIN, errno.EWOULDBLOCK):
|
||||
select.select([], [self.fd], [], 0.2)
|
||||
continue
|
||||
raise
|
||||
|
||||
def close(self) -> None:
|
||||
try:
|
||||
os.close(self.fd)
|
||||
except OSError:
|
||||
pass
|
||||
|
||||
|
||||
def name_of(sub: int, is_request: bool) -> str:
|
||||
if is_request:
|
||||
return SUBNAME.get(sub, f"SUB_{sub:02X}")
|
||||
return "rsp " + SUBNAME.get(0xFF - sub, f"SUB_{0xFF - sub:02X}")
|
||||
|
||||
|
||||
class FrameSniffer:
|
||||
"""Accumulate bytes and report complete frames, without altering the stream."""
|
||||
|
||||
def __init__(self, is_request: bool):
|
||||
self.is_request = is_request
|
||||
self.buf = bytearray()
|
||||
|
||||
def feed(self, data: bytes):
|
||||
"""Yield (sub, payload_len) for each complete frame seen."""
|
||||
self.buf.extend(data)
|
||||
while True:
|
||||
start = -1
|
||||
for i, b in enumerate(self.buf):
|
||||
if self.is_request and b == ACK and i + 1 < len(self.buf) and self.buf[i + 1] == STX:
|
||||
start = i
|
||||
break
|
||||
if not self.is_request and b == STX:
|
||||
start = i
|
||||
break
|
||||
if start < 0:
|
||||
if len(self.buf) > 8192:
|
||||
del self.buf[:-16]
|
||||
return
|
||||
j = start + (2 if self.is_request else 1)
|
||||
end = -1
|
||||
while j < len(self.buf):
|
||||
if self.buf[j] == DLE and j + 1 < len(self.buf):
|
||||
j += 2
|
||||
continue
|
||||
if self.buf[j] == ETX:
|
||||
end = j
|
||||
break
|
||||
j += 1
|
||||
if end < 0:
|
||||
return # wait for more bytes
|
||||
body = self.buf[start:end + 1]
|
||||
del self.buf[:end + 1]
|
||||
# SUB sits at a fixed spot past the leading framing -- but it is
|
||||
# DLE-escaped when its own value is 0x02/0x03/0x04/0x10, so a raw
|
||||
# read reports 0x10 for those. SUB 0x02 was being logged as
|
||||
# "SUB_10" until this was handled.
|
||||
off = 5 if self.is_request else 3
|
||||
if len(body) > off:
|
||||
sub = body[off]
|
||||
if sub == DLE and len(body) > off + 1:
|
||||
sub = body[off + 1]
|
||||
yield sub, len(body)
|
||||
|
||||
|
||||
class Link:
|
||||
def __init__(self, args):
|
||||
self.args = args
|
||||
self.mode = "pass"
|
||||
self.delay = 0.0
|
||||
self.ctl = Path(args.control)
|
||||
self.session: Path | None = None
|
||||
self.log_fh = None
|
||||
self.raw = {}
|
||||
self.t0 = time.time()
|
||||
self.counts = {}
|
||||
|
||||
# ── logging ────────────────────────────────────────────────────────────
|
||||
def open_session(self):
|
||||
ts = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
|
||||
self.session = Path(self.args.logdir) / f"mmlink_{ts}"
|
||||
self.session.mkdir(parents=True, exist_ok=True)
|
||||
self.log_fh = open(self.session / "session.log", "a", buffering=1)
|
||||
self.raw = {
|
||||
"bw": open(self.session / "raw_bw.bin", "ab"),
|
||||
"s3": open(self.session / "raw_s3.bin", "ab"),
|
||||
}
|
||||
self.say(f"=== session {ts} — serial {self.args.serial} @ {self.args.baud} ===")
|
||||
|
||||
def say(self, text: str):
|
||||
line = f"{datetime.datetime.now().strftime('%H:%M:%S.%f')[:-3]} {text}"
|
||||
print(line, flush=True)
|
||||
if self.log_fh:
|
||||
self.log_fh.write(line + "\n")
|
||||
|
||||
# ── control file ───────────────────────────────────────────────────────
|
||||
def poll_control(self):
|
||||
while True:
|
||||
try:
|
||||
if self.ctl.exists():
|
||||
want = self.ctl.read_text().strip().lower()
|
||||
if want.startswith("delay:"):
|
||||
d = float(want.split(":", 1)[1])
|
||||
if ("delay", d) != (self.mode, self.delay):
|
||||
self.mode, self.delay = "delay", d
|
||||
self.say(f"*** MODE -> delay {d}s ***")
|
||||
elif want and want != self.mode:
|
||||
self.mode, self.delay = want, 0.0
|
||||
self.say(f"*** MODE -> {want} ***")
|
||||
except Exception:
|
||||
pass
|
||||
time.sleep(0.25)
|
||||
|
||||
# ── the relay ──────────────────────────────────────────────────────────
|
||||
def pump(self, src, dst, tag: str, is_request: bool, stop: threading.Event):
|
||||
sniff = FrameSniffer(is_request)
|
||||
arrow = "THOR->unit" if is_request else "unit->THOR"
|
||||
last = time.time()
|
||||
while not stop.is_set():
|
||||
timed_out = False
|
||||
try:
|
||||
data = src.recv(4096) if isinstance(src, socket.socket) else src.read(4096)
|
||||
except TimeoutError:
|
||||
timed_out = True
|
||||
# socket.timeout subclasses OSError, so it MUST be caught first.
|
||||
# Treating it as a dead socket closes the connection after 200 ms
|
||||
# of quiet -- which is exactly what `blackhole` produces, so the
|
||||
# relay killed the link it was supposed to be faking a fault on.
|
||||
data = b""
|
||||
except OSError:
|
||||
break
|
||||
if isinstance(src, socket.socket) and data == b"" and not timed_out:
|
||||
self.say(f"{arrow}: peer closed the connection")
|
||||
break
|
||||
if not data:
|
||||
if time.time() - last > self.args.quiet_after and self.counts:
|
||||
self.say(f"--- {self.args.quiet_after:.0f}s with no traffic ---")
|
||||
last = time.time()
|
||||
continue
|
||||
last = time.time()
|
||||
|
||||
self.raw[tag].write(data)
|
||||
self.raw[tag].flush()
|
||||
for sub, ln in sniff.feed(data):
|
||||
label = name_of(sub, is_request)
|
||||
self.counts[label] = self.counts.get(label, 0) + 1
|
||||
self.say(f"{arrow} {label:<20} ({ln} B)"
|
||||
+ ("" if self.mode == "pass" else f" [mode={self.mode}]"))
|
||||
|
||||
mode = self.mode
|
||||
if mode == "drop":
|
||||
self.say(f"{arrow}: DROPPING the connection (fault injection)")
|
||||
stop.set()
|
||||
break
|
||||
if mode == "blackhole":
|
||||
continue # swallow, keep the socket open
|
||||
if mode == "onewaydev" and not is_request:
|
||||
continue # unit's replies never reach THOR
|
||||
if mode == "delay" and self.delay:
|
||||
time.sleep(self.delay)
|
||||
try:
|
||||
if isinstance(dst, socket.socket):
|
||||
dst.sendall(data)
|
||||
else:
|
||||
dst.write(data)
|
||||
except OSError:
|
||||
break
|
||||
stop.set()
|
||||
|
||||
def serve(self):
|
||||
srv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
srv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
srv.bind(("0.0.0.0", self.args.listen))
|
||||
srv.listen(5)
|
||||
self.open_session()
|
||||
self.say(f"listening on 0.0.0.0:{self.args.listen} control file: {self.ctl}")
|
||||
self.say("point THOR at this host/port as Communication=TCP")
|
||||
threading.Thread(target=self.poll_control, daemon=True).start()
|
||||
|
||||
while True:
|
||||
conn, addr = srv.accept()
|
||||
conn.settimeout(0.2)
|
||||
self.say(f"+++ THOR connected from {addr[0]}:{addr[1]} +++")
|
||||
try:
|
||||
ser = SerialPort(self.args.serial, self.args.baud)
|
||||
except OSError as e:
|
||||
self.say(f"!!! cannot open {self.args.serial}: {e}")
|
||||
conn.close()
|
||||
continue
|
||||
stop = threading.Event()
|
||||
ts = [
|
||||
threading.Thread(target=self.pump, args=(conn, ser, "bw", True, stop), daemon=True),
|
||||
threading.Thread(target=self.pump, args=(ser, conn, "s3", False, stop), daemon=True),
|
||||
]
|
||||
for t in ts:
|
||||
t.start()
|
||||
for t in ts:
|
||||
t.join()
|
||||
conn.close()
|
||||
ser.close()
|
||||
summary = ", ".join(f"{k}x{v}" for k, v in sorted(self.counts.items()))
|
||||
self.say(f"--- connection closed. frames this session: {summary or 'none'} ---")
|
||||
|
||||
|
||||
def main():
|
||||
ap = argparse.ArgumentParser(description=__doc__,
|
||||
formatter_class=argparse.RawDescriptionHelpFormatter)
|
||||
ap.add_argument("--serial", default="/dev/ttyACM0")
|
||||
ap.add_argument("--baud", type=int, default=115200)
|
||||
ap.add_argument("--listen", type=int, default=12345)
|
||||
ap.add_argument("--logdir", default=os.path.expanduser("~/mm-captures"))
|
||||
ap.add_argument("--control", default="mm_link.ctl")
|
||||
ap.add_argument("--quiet-after", type=float, default=30.0,
|
||||
help="log a marker after this many seconds of silence")
|
||||
Link(ap.parse_args()).serve()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -0,0 +1,239 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
mm_probe.py — answer "why can't we reach this unit?" in one command.
|
||||
|
||||
THOR reports a failed connection as "disconnected" and nothing else. That single
|
||||
word covers at least four completely different faults with four different fixes,
|
||||
and telling them apart is the difference between a modem reboot and a site visit:
|
||||
|
||||
* **connection refused** something answered and said no — wrong port, or the
|
||||
modem is refusing a further session
|
||||
* **connect timed out** nothing answered at all — trusted-IP whitelist,
|
||||
firewall, or the modem is off the network
|
||||
* **connected, no reply** the MODEM answered but the unit did not. The TCP
|
||||
path is fine; the modem is not forwarding to serial.
|
||||
This is the signature of a wedged transparent-TCP
|
||||
session, and it is the one THOR cannot distinguish
|
||||
from any of the others
|
||||
* **replied** the unit is alive; the problem is upstream software
|
||||
|
||||
Read-only. It sends `POLL`, then optionally `SERIAL` and the state read — the
|
||||
same three commands THOR's own connection check uses — and never writes.
|
||||
|
||||
Usage
|
||||
-----
|
||||
python3 bridges/mm_probe.py 63.45.161.30:9034
|
||||
python3 bridges/mm_probe.py 10.0.0.8:12345 --timeout 5
|
||||
python3 bridges/mm_probe.py <host:port> --slots 3
|
||||
|
||||
`--slots N` opens N connections at once and reports how many the far end accepts.
|
||||
A transparent-TCP modem typically serves **one** session; if the first succeeds
|
||||
and the rest are refused or hang, that confirms the single-slot behaviour and
|
||||
explains why a leaked session takes a unit offline until the slot frees.
|
||||
|
||||
Works for both series: a Series III reply opens `DLE STX`, a Micromate reply
|
||||
opens with a bare `STX`, so the probe also tells you which one answered.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import socket
|
||||
import sys
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
||||
from minimateplus.framing import build_bw_frame # noqa: E402
|
||||
|
||||
DLE, STX, ETX = 0x10, 0x02, 0x03
|
||||
|
||||
|
||||
def destuff(raw: bytes) -> bytes:
|
||||
"""Strip framing and DLE escapes; return the payload without its checksum."""
|
||||
i = 1 if raw and raw[0] == STX else (2 if len(raw) > 1 and raw[1] == STX else 0)
|
||||
out = bytearray()
|
||||
while i < len(raw):
|
||||
b = raw[i]
|
||||
if b == DLE and i + 1 < len(raw):
|
||||
out.append(raw[i + 1])
|
||||
i += 2
|
||||
continue
|
||||
if b == ETX:
|
||||
break
|
||||
out.append(b)
|
||||
i += 1
|
||||
return bytes(out[:-1]) if len(out) > 1 else b""
|
||||
|
||||
|
||||
# Reads are two-step on Series III: a probe at offset 0, then a data read at the
|
||||
# block's length. THOR sends these offsets, and they also work on a Micromate.
|
||||
OFFSETS = {0x5B: 0x0030, 0x15: 0x000A, 0x49: 0xFFFF}
|
||||
|
||||
|
||||
def exchange(sock: socket.socket, sub: int, timeout: float) -> tuple[bytes, float]:
|
||||
sock.sendall(build_bw_frame(sub, OFFSETS.get(sub, 0)))
|
||||
t0 = time.time()
|
||||
buf, deadline = b"", t0 + timeout
|
||||
sock.settimeout(0.3)
|
||||
while time.time() < deadline:
|
||||
try:
|
||||
chunk = sock.recv(4096)
|
||||
if not chunk:
|
||||
break
|
||||
buf += chunk
|
||||
if buf.endswith(bytes([ETX])) and len(buf) > 8:
|
||||
break
|
||||
except TimeoutError:
|
||||
continue
|
||||
except OSError:
|
||||
break
|
||||
return buf, time.time() - t0
|
||||
|
||||
|
||||
def step(n: int, label: str, result: str) -> None:
|
||||
print(f" [{n}] {label:.<28} {result}")
|
||||
|
||||
|
||||
def probe(host: str, port: int, timeout: float) -> int:
|
||||
print(f"\ntarget {host}:{port} (read-only: POLL, SERIAL, state)\n")
|
||||
|
||||
# ── 1. TCP ────────────────────────────────────────────────────────────
|
||||
t0 = time.time()
|
||||
try:
|
||||
sock = socket.create_connection((host, port), timeout=timeout)
|
||||
except ConnectionRefusedError:
|
||||
step(1, "TCP connect", f"REFUSED after {1000*(time.time()-t0):.0f} ms")
|
||||
print("\nverdict: something answered and actively refused.")
|
||||
print(" Not a silent firewall drop — the host is reachable.")
|
||||
print(" Wrong port, the service is down, or the modem is refusing")
|
||||
print(" an additional session because its one slot is in use.")
|
||||
return 2
|
||||
except (TimeoutError, socket.timeout):
|
||||
step(1, "TCP connect", f"TIMED OUT after {time.time()-t0:.1f} s")
|
||||
print("\nverdict: nothing answered at all.")
|
||||
print(" A silent drop, which is what a trusted-IP whitelist looks")
|
||||
print(" like — it discards rather than refuses. Check the modem's")
|
||||
print(" Trusted IPs (and note a VPN changes the IP you arrive from),")
|
||||
print(" the firewall, and whether the modem is on the network.")
|
||||
return 3
|
||||
except OSError as e:
|
||||
step(1, "TCP connect", f"FAILED: {e}")
|
||||
return 4
|
||||
step(1, "TCP connect", f"ok ({1000*(time.time()-t0):.0f} ms)")
|
||||
|
||||
# ── 2. POLL ───────────────────────────────────────────────────────────
|
||||
try:
|
||||
raw, dt = exchange(sock, 0x5B, timeout)
|
||||
except OSError as e:
|
||||
step(2, "POLL", f"send failed: {e}")
|
||||
sock.close()
|
||||
return 4
|
||||
|
||||
if not raw:
|
||||
step(2, "POLL", f"NO REPLY in {timeout:.1f} s")
|
||||
print("\nverdict: the MODEM answered but the unit did not.")
|
||||
print(" TCP is fine end to end — something accepted the connection.")
|
||||
print(" What is missing is the serial side. Two quite different")
|
||||
print(" causes produce this, and they are NOT distinguishable from")
|
||||
print(" here:")
|
||||
print("\n 1. SOMEONE ELSE HOLDS THE SESSION. These modems bridge ONE")
|
||||
print(" TCP session to serial at a time. A second connection is")
|
||||
print(" accepted and then simply not forwarded. Confirmed 2026-09-26:")
|
||||
print(" with THOR connected this probe saw exactly this; the moment")
|
||||
print(" THOR disconnected the same probe returned the serial number.")
|
||||
print(" ** Check whether THOR (or anything else) has the unit first. **")
|
||||
print("\n 2. The serial path is genuinely broken — a stale session the")
|
||||
print(" modem never released, a cable the unit cannot enumerate, or")
|
||||
print(" a unit that is off.")
|
||||
print("\n Try, in order:")
|
||||
print(" 1. Disconnect any other client and re-probe. If it answers,")
|
||||
print(" it was contention, not a fault.")
|
||||
print(" 2. The cable's chipset. A Micromate drives FTDI and CDC-ACM")
|
||||
print(" only — a Prolific PL2303 gives it no serial port at all.")
|
||||
print(" lsusb: FTDI is 0403, Prolific 067b.")
|
||||
print(" 3. Power-cycle the UNIT with the cable attached (hold power")
|
||||
print(" 5 s, through the two-stage prompt). Its USB host rescans")
|
||||
print(" on cold boot; it may not on hot-swap.")
|
||||
print(" 4. AirLink OS -> TCP Idle Timeout. If 0/disabled, a stale")
|
||||
print(" session holds the slot indefinitely. 2 minutes is the")
|
||||
print(" value this project standardised on.")
|
||||
sock.close()
|
||||
return 5
|
||||
|
||||
series = "Series III (DLE STX)" if raw[0] == DLE else "Micromate (bare STX)"
|
||||
step(2, "POLL", f"reply {len(raw)} B in {1000*dt:.0f} ms")
|
||||
p = destuff(raw)
|
||||
ok = len(p) > 3 and p[2] == 0xFF - 0x5B
|
||||
step(3, "frame", f"{'valid' if ok else 'MALFORMED'}, {series}")
|
||||
if not ok:
|
||||
print("\nverdict: something replied, but not a seismograph.")
|
||||
print(" Another service is on this port, or the modem is in a mode")
|
||||
print(" that injects its own text (check Quiet Mode / AT echo).")
|
||||
print(f" first bytes: {raw[:16].hex(' ')}")
|
||||
sock.close()
|
||||
return 6
|
||||
|
||||
# ── 3. identity + state ───────────────────────────────────────────────
|
||||
for n, (sub, label) in enumerate(((0x15, "serial"), (0x49, "state")), start=4):
|
||||
try:
|
||||
r, dt = exchange(sock, sub, timeout)
|
||||
d = destuff(r)[5:]
|
||||
if sub == 0x15:
|
||||
# serial is a null-terminated run; a further field follows it
|
||||
serial = bytes(d[11:]).split(b"\x00")[0]
|
||||
step(n, label, serial.decode("ascii", "replace") or "(empty)")
|
||||
else:
|
||||
step(n, label, "MONITORING" if len(d) > 11 and d[11] else "idle")
|
||||
except OSError:
|
||||
step(n, label, "no reply")
|
||||
|
||||
sock.close()
|
||||
print("\nverdict: the unit is alive and answering.")
|
||||
print(" If THOR still shows it disconnected, the fault is in THOR, not")
|
||||
print(" the network or the device.")
|
||||
return 0
|
||||
|
||||
|
||||
def slots(host: str, port: int, n: int, timeout: float) -> None:
|
||||
print(f"\nopening {n} simultaneous connections to {host}:{port}\n")
|
||||
held = []
|
||||
for i in range(n):
|
||||
try:
|
||||
s = socket.create_connection((host, port), timeout=timeout)
|
||||
held.append(s)
|
||||
step(i + 1, f"connection {i+1}", "accepted")
|
||||
except ConnectionRefusedError:
|
||||
step(i + 1, f"connection {i+1}", "REFUSED")
|
||||
except (TimeoutError, socket.timeout):
|
||||
step(i + 1, f"connection {i+1}", "timed out")
|
||||
except OSError as e:
|
||||
step(i + 1, f"connection {i+1}", f"failed: {e}")
|
||||
print(f"\n{len(held)} of {n} accepted.")
|
||||
if len(held) == 1:
|
||||
print(" Single-slot behaviour confirmed — this far end serves ONE")
|
||||
print(" session at a time. A connection that is never closed takes")
|
||||
print(" the unit offline until the idle timeout frees the slot.")
|
||||
for s in held:
|
||||
s.close()
|
||||
|
||||
|
||||
def main() -> int:
|
||||
ap = argparse.ArgumentParser(description=__doc__,
|
||||
formatter_class=argparse.RawDescriptionHelpFormatter)
|
||||
ap.add_argument("target", help="host:port, e.g. 63.45.161.30:9034")
|
||||
ap.add_argument("--timeout", type=float, default=10.0)
|
||||
ap.add_argument("--slots", type=int, metavar="N",
|
||||
help="open N simultaneous connections to test single-slot behaviour")
|
||||
a = ap.parse_args()
|
||||
host, _, port = a.target.rpartition(":")
|
||||
if not host:
|
||||
ap.error("target must be host:port")
|
||||
if a.slots:
|
||||
slots(host, int(port), a.slots, a.timeout)
|
||||
return 0
|
||||
return probe(host, int(port), a.timeout)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,408 @@
|
||||
# Spec — a live client for Series IV (Micromate)
|
||||
|
||||
Drafted 2026-09-26, ahead of implementation. The protocol work is finished; this
|
||||
is the plan for turning `docs/micromate_protocol_reference.md` into code SFM can
|
||||
run.
|
||||
|
||||
**Read that document first.** Everything here assumes it, and every constant
|
||||
below is sourced from it rather than restated with justification.
|
||||
|
||||
---
|
||||
|
||||
## Goal and scope
|
||||
|
||||
`micromate/` is codec-only today — `idf_file.py`, `models.py`, the report
|
||||
writers. There is no way to talk to a unit. This adds the live half, mirroring
|
||||
`minimateplus/`.
|
||||
|
||||
**In scope, first pass:**
|
||||
|
||||
- connect over TCP (a field modem) or serial/USB (a bench unit)
|
||||
- identify a unit, read its state, clock, memory and setups
|
||||
- walk the event chain and download events
|
||||
- return `Event` objects the existing codec already understands
|
||||
|
||||
**Explicitly out of scope, first pass:**
|
||||
|
||||
- ⚠ **Any write.** Setups, schedules, call-home config, monitoring start/stop,
|
||||
and per-event delete are all mapped, and none of them will be implemented
|
||||
here. **No command has ever been originated against a unit by this project**
|
||||
— every write observed was performed by THOR while we recorded. Keeping that
|
||||
true through the read client is deliberate: it means the first thing we ever
|
||||
send to a customer's instrument is a decision someone made on purpose, not a
|
||||
side effect of a client that happened to grow a method.
|
||||
- the inbound call-home session — still the one protocol unknown
|
||||
|
||||
---
|
||||
|
||||
## Layout
|
||||
|
||||
```
|
||||
micromate/
|
||||
framing.py NEW frame building, response parsing, checksum
|
||||
protocol.py NEW one method per wire command, returns raw payloads
|
||||
client.py NEW high-level API, returns models
|
||||
idf_file.py (existing — decodes what 0x5A returns, unchanged)
|
||||
models.py (existing — extend, do not fork)
|
||||
```
|
||||
|
||||
**Transport is reused, not rewritten.** `minimateplus/transport.py` is
|
||||
byte-level and protocol-agnostic — `BaseTransport`, `SerialTransport`,
|
||||
`TcpTransport`, plus `read_until_idle()` which already handles the RV50/RV55
|
||||
habit of emitting `\r\nRING\r\n\r\nCONNECT\r\n` to a caller. Import it.
|
||||
|
||||
⚠ Do **not** import `minimateplus.framing`. The two framings differ in ways
|
||||
that look small and are not, and a shared module would accumulate `if series ==`
|
||||
branches until neither case is readable.
|
||||
|
||||
---
|
||||
|
||||
## `micromate/framing.py` — ✅ BUILT 2026-09-27
|
||||
|
||||
Implemented, with `tests/test_micromate_framing.py` (31 tests, all passing).
|
||||
**Two things in this section as originally drafted were wrong**, and both were
|
||||
caught by measuring against the captures before writing code rather than after.
|
||||
They are left in place below, struck through, because both are the kind of
|
||||
mistake that would be made again.
|
||||
|
||||
### Requests
|
||||
|
||||
~~Series IV accepts Series III request frames unmodified. The simplest correct
|
||||
implementation re-exports the builder rather than duplicating it:~~
|
||||
|
||||
```python
|
||||
from minimateplus.framing import build_bw_frame # ✗ WRONG — 161/218
|
||||
```
|
||||
|
||||
⚠ **`build_bw_frame` reproduces only 161 of Thor's 218 captured read frames.**
|
||||
The payload layout is identical; the stuffing is not. A Micromate escapes
|
||||
**four** byte values — `0x02`, `0x03`, `0x04`, `0x10` — where Series III
|
||||
escapes one. The frames this breaks are **every `SUB 0x5A` download**
|
||||
(`offset = 0x0400` → a literal `0x04` in `offset_hi`) and the scheduler enable.
|
||||
An unescaped `0x03`/`0x04` terminates the frame early, so the unit just does not
|
||||
answer.
|
||||
|
||||
`build_request()` with the correct escape set reproduces **218/218**.
|
||||
|
||||
✅ **Settled: `0x10` inside params needs no special handling.** The planned
|
||||
`NotImplementedError` guard is unnecessary — Thor sends
|
||||
`params = 00 00 10 00 …` on `SUB 0x5A` in five captured frames and the wire
|
||||
carries an ordinary doubled `10 10`. One rule covers the whole payload.
|
||||
|
||||
### Responses — where Series III's parser cannot follow
|
||||
|
||||
| | Series III | Micromate |
|
||||
|---|---|---|
|
||||
| frame start | `DLE STX` | **bare `STX`** |
|
||||
| `payload[1]` | `0x10` | `0xC5` (Blastware fw) / `0x03` (Thor fw) |
|
||||
| destuffing | `DLE+ETX` kept as literal inner-frame data | **`10 XX` → `XX`, uniformly** |
|
||||
|
||||
The first row is why `S3FrameParser` returns nothing at all on Series IV traffic:
|
||||
it scans for `DLE+STX`, which never appears.
|
||||
|
||||
The third is a genuine **simplification** — no inner-frame carve-out. Validated
|
||||
by checksum across every capture in `bridges/captures/9-24-26 - micromate2/`:
|
||||
four candidate destuffing rules were tried, and only this one makes all frames
|
||||
validate.
|
||||
|
||||
### Checksum
|
||||
|
||||
```python
|
||||
def checksum(payload: bytes) -> int:
|
||||
return sum(payload) & 0xFF # payload already de-stuffed
|
||||
```
|
||||
|
||||
~~The DLE-aware variant, same as Series III's `5A` and write frames.~~
|
||||
|
||||
⚠ **Plain SUM8, not the DLE-aware variant** — 251/251 both directions. The
|
||||
DLE-aware form is the right answer paired with *Series III* de-stuffing, which
|
||||
leaves an escaped byte in the payload as two bytes. De-stuffing `10 XX → XX`
|
||||
already removes the `0x10`, so excluding it again subtracts the correction
|
||||
twice, and the result disagrees with the wire on **55 of 251** captured
|
||||
responses — every frame holding a literal `0x10`.
|
||||
|
||||
`scratch/mm_frame_parse.py` shipped with exactly that pairing. It looked clean
|
||||
only because it accepts a frame matching *either* rule, so it labelled those 55
|
||||
`SUM8` and never flagged one bad. "Zero bad checksums" was true and carried no
|
||||
information. Fixed there too.
|
||||
|
||||
### ⚠ The SUB byte can be escaped
|
||||
|
||||
When a SUB's value is `0x02`, `0x03`, `0x04` or `0x10` it arrives as `10 XX`.
|
||||
Reading it positionally without destuffing reports `0x10`. This bit once
|
||||
already — `SUB 0x02` was logged as `SUB_10` for an afternoon. Destuff first,
|
||||
then index.
|
||||
|
||||
### Response shape
|
||||
|
||||
```python
|
||||
@dataclass
|
||||
class MicromateFrame:
|
||||
sub: int # response SUB; request = 0xFF - sub
|
||||
flags: int # 0xC5 Blastware line, 0x03 Thor line
|
||||
page_hi: int
|
||||
page_lo: int
|
||||
data: bytes # payload[5:], checksum stripped
|
||||
checksum_valid: bool
|
||||
|
||||
@property
|
||||
def request_sub(self) -> int: # 0xFF - sub
|
||||
@property
|
||||
def page_key(self) -> int: # uint16 BE at payload[3:5]
|
||||
@property
|
||||
def firmware_line(self) -> str: # "blastware" | "thor" | "unknown"
|
||||
@property
|
||||
def probe_length(self) -> int | None: # uint16 BE at data[3:5] (= payload[8:10])
|
||||
```
|
||||
|
||||
⚠ **`probe_length` is a uint16 BE.** Read as a single byte it under-reads
|
||||
`SUB 0x1A` by 47x — 44 against a true 2092. This is the single most expensive
|
||||
mistake available in this protocol and it has already been made once.
|
||||
|
||||
Renamed from `declared_length`, because it is **only meaningful in the reply to
|
||||
an `offset = 0` probe** — and Thor never probes. Across all 251 captured
|
||||
responses the field reads 0 or a page count, never a length, precisely because
|
||||
that session is single-step reads throughout. `page_key` is the field that
|
||||
carries meaning there. The only genuine probe reply we hold is the POLL one
|
||||
preserved in `scratch/fake_unit.py`.
|
||||
|
||||
`MicromateFrameParser` mirrors `S3FrameParser`: `feed(bytes) -> list[frame]`,
|
||||
accumulates in `.frames`, `reset()`, and keeps the `bytes_fed` counter (it is
|
||||
what distinguishes "no bytes at all" from "bytes but no complete frame" on a
|
||||
timeout, and that distinction earned its keep during the Series III work).
|
||||
|
||||
---
|
||||
|
||||
## `micromate/protocol.py` — ✅ BUILT 2026-09-27
|
||||
|
||||
Implemented, with `tests/test_micromate_protocol.py` (35 tests). Reads only;
|
||||
nothing here writes, erases or changes monitoring state.
|
||||
|
||||
The tests replay Thor's captured responses through a scripted transport and
|
||||
assert **the bytes we emit are the bytes Thor emits** — including a full replay
|
||||
of the six-event download session, all 56 `0x5A` frames byte-for-byte. That is
|
||||
a stronger guarantee than "our parser understands the device": a passing test
|
||||
means a real unit has already answered exactly that frame.
|
||||
|
||||
One method per command, returning raw payload bytes. No interpretation — that
|
||||
belongs in `client.py`.
|
||||
|
||||
**Reads use `offset = 0xFFFF`** and return the whole block in one response;
|
||||
Series III's two-step probe/data dance is unnecessary. `POLL` is the exception,
|
||||
taking its data length. Per-command offsets, all observed:
|
||||
|
||||
| command | SUB | rsp | offset | returns |
|
||||
|---|---|---|---|---|
|
||||
| poll | `0x5B` | `0xA4` | `0x0030` | device string, model |
|
||||
| serial | `0x15` | `0xEA` | `0x000A` | `UM12947` |
|
||||
| device info | `0x01` | `0xFE` | `0xFFFF` | firmware, calibration |
|
||||
| state | `0x49` | `0xB6` | `0xFFFF` | `data[11]`: non-zero = monitoring |
|
||||
| monitor status | `0x1C` | `0xE3` | `0xFFFF` | flag, **device clock**, battery, memory |
|
||||
| storage range | `0x06` | `0xF9` | `0xFFFF` | event storage extent |
|
||||
| active setup name | `0x41` | `0xBE` | `0xFFFF` | `TEST1.mmb` |
|
||||
| first setup | `0x3F` | `0xC0` | `0xFFFF` | setup-list walk head |
|
||||
| next setup | `0x40` | `0xBF` | `0xFFFF` | …until an empty name |
|
||||
| compliance config | `0x1A` | `0xE5` | `0xFFFF` | ~2103 B setup block |
|
||||
| call-home config | `0x2C` | `0xD3` | `0xFFFF` | 137 B |
|
||||
| arm event | `0x93` | `0x6C` | — | before every event |
|
||||
| first event | `0x1E` | `0xE1` | `0xFFFF` | key + size |
|
||||
| next event | `0x1F` | `0xE0` | `0xFFFF` | key + size |
|
||||
| event record | `0x0C` | `0xF3` | `0xFFFF` | 221 B — project, location, peaks |
|
||||
| ~~event header~~ **monitor log** | `0x0A` | `0xF5` | `0xFFFF` | ⚠ 297 B, a **walk** — see below |
|
||||
| bulk download | `0x5A` | `0xA5` | computed | **the `.IDFW` verbatim**, 1024 B at a time |
|
||||
|
||||
⚠ **Corrected 2026-09-27, from Thor's frames.** Three rows of the table above
|
||||
were wrong or incomplete, and the last one is a different command than labelled:
|
||||
|
||||
- **`0x0A` is the monitor-log walk**, not a keyed "30 B list record" read. The
|
||||
*same request repeated* returns successive 297-byte records — serial, mode,
|
||||
thresholds — until an 11-byte ack ends the list. The device holds the cursor;
|
||||
nothing in the request selects a record. Series III reaches this data through
|
||||
a record-type discriminator on its event chain; here it has its own cursor and
|
||||
the event chain never sees it.
|
||||
- **`0x1E`/`0x1F` carry token `0xFE` at `params[7]`.** The reference documents
|
||||
all-zero params (our own probing, which also worked). Thor's form is the one
|
||||
with mileage.
|
||||
- **`0x01` has no Thor frame behind it** — it is never read in any captured
|
||||
session. Its `0xFFFF` comes from our probes.
|
||||
|
||||
And one useful negative: **no `SESSION_RESET` (`41 03`)**. Series III needs that
|
||||
2-byte signal or a monitoring unit will not answer `POLL` over TCP. Thor never
|
||||
sends it — zero occurrences across 8 sessions, including 40 frames exchanged
|
||||
with a unit that *was* monitoring.
|
||||
|
||||
⚠ **`SUB 0x1C` is 4 bytes longer on the Thor firmware line** (`0x30` vs `0x2C`).
|
||||
Parse **forward** from `declared_length`, never backward from the end — Series
|
||||
III reads battery and memory from the end of that block, and doing so on a BD
|
||||
unit yields a battery voltage of **577.92 V**.
|
||||
|
||||
⚠ **Test the monitoring flag for non-zero**, never against a constant. It has
|
||||
read both `0x0E` and `0x0C` while monitoring.
|
||||
|
||||
### `0x5A` — a bounded chunk loop, and much simpler than Series III
|
||||
|
||||
⚠ **Corrected 2026-09-27.** This section said "no chunk loop — one request
|
||||
returns the whole event", with `offset_word = 0x1000 + 2 * ceil(size / 512)`.
|
||||
That describes our own 2026-09-23 probes, which set `offset_hi = 0x10`. **Thor
|
||||
chunks**, and Thor's form is the one verified from bytes on disk:
|
||||
|
||||
```python
|
||||
n = ceil(size / 1024) # size from the chain walk
|
||||
for i in range(n):
|
||||
offset = min(1024, size - 1024 * i) # a BYTE COUNT
|
||||
params = key4 + bytes(6) if i == 0 else bytes(2) + pack(">H", 1024*i) + bytes(6)
|
||||
file_bytes += response.data[11:] # response data is exactly offset + 11
|
||||
```
|
||||
|
||||
Verified on all six bench events (4,076 → 13,424 B): `sum(offsets) == size`
|
||||
exactly, with the predicted chunk count and final offset every time.
|
||||
|
||||
Still no arming ritual for `0x5A` itself, no `STRT` end-offset parsing and no
|
||||
`TERM` frame — the simplification the original claim celebrated is real, it just
|
||||
is not single-shot. (`SUB 0x93` arms the *chain walk*, before `1E`/`1F`, not
|
||||
the download.)
|
||||
|
||||
The concatenated payload **is** the `.IDFW` file, byte for byte — so it feeds
|
||||
`micromate.idf_file.read_idf_file()` and `/db/import/idf_file` unchanged.
|
||||
|
||||
⚠ Do not port the Series III `5A` walk. Its address arithmetic caused a 5x
|
||||
over-read and a `> 64 KB` page-boundary bug that is *still open* on the Series
|
||||
III side. None of that applies here: the chunk index is a byte offset into the
|
||||
file, bounded by a size the device told us, and it cannot run past the event.
|
||||
|
||||
⚠ **`assert sum(len(chunk) - 11 for chunk in chunks) == size`.** A silently
|
||||
short event is the failure mode this project has been bitten by repeatedly on
|
||||
the Series III side, and here the check is free because the size is known up
|
||||
front.
|
||||
|
||||
---
|
||||
|
||||
## `micromate/client.py` — ✅ BUILT (read half) 2026-09-27
|
||||
|
||||
`connect()`, `get_state()`, `get_active_setup()`, `list_setups()` plus
|
||||
`MicromateDeviceInfo` / `MicromateState` in `models.py`. 26 tests, every
|
||||
response constant a real captured data section.
|
||||
|
||||
⚠ **`connect()` is deliberately narrower than this spec asked for.** The spec
|
||||
said to mirror Thor's `POLL → SERIAL → 0x49 → POLL` "because it is known-good".
|
||||
Measurement showed the four-command form is Thor's *connection check*, present
|
||||
in 3 of 8 sessions, and its fourth frame repeats its first — so `connect()`
|
||||
sends the three reads that gather something. `0x01` is not read at all: Thor
|
||||
never reads it, its layout is unmapped, and `firmware_line` comes free from any
|
||||
response's flags byte.
|
||||
|
||||
Event-chain methods (`list_events`, `download_event`, `get_event`) are step 4
|
||||
and not yet written; `MicromateProtocol.read_event_file()` already does the
|
||||
download.
|
||||
|
||||
```python
|
||||
class MicromateClient:
|
||||
def __init__(self, transport: BaseTransport): ...
|
||||
def open(self) / close(self) / is_open(self)
|
||||
|
||||
# identity and state
|
||||
def connect(self) -> DeviceInfo # poll → serial → device info → state
|
||||
def get_state(self) -> UnitState # monitoring?, clock, battery, memory
|
||||
def get_active_setup(self) -> str
|
||||
def list_setups(self) -> list[str] # 0x3F → 0x40… until empty
|
||||
|
||||
# events
|
||||
def list_events(self) -> list[EventRef] # 0x93 → 0x1E → 0x1F… (key + size)
|
||||
def download_event(self, ref) -> bytes # raw .IDFW/.IDFH
|
||||
def get_event(self, ref) -> Event # download + decode via idf_file
|
||||
```
|
||||
|
||||
`connect()` should mirror THOR's preamble (`POLL → SERIAL → 0x49 → POLL`) —
|
||||
⚠ but note the reference records that **whether the unit requires it is
|
||||
untested**. Do it because it is known-good, not because it is known-necessary,
|
||||
and say so in the docstring.
|
||||
|
||||
`list_events()` returns the key *and* the size, because `download_event()` needs
|
||||
the size to compute its offset word.
|
||||
|
||||
---
|
||||
|
||||
## Tests
|
||||
|
||||
**Offline, from captured bytes — no hardware.** This is the part worth doing
|
||||
first, because it can be fully verified tonight's-captures-style before any unit
|
||||
is involved.
|
||||
|
||||
```
|
||||
tests/test_micromate_framing.py
|
||||
```
|
||||
|
||||
⚠ `bridges/captures/` and `tests/fixtures/` are both gitignored, so tests must
|
||||
not depend on files being present. **Embed the frames as hex constants** — they
|
||||
are 19–138 bytes each. ✅ Done; what actually landed:
|
||||
|
||||
| case | source | why |
|
||||
|---|---|---|
|
||||
| POLL probe reply, 19 B | captured (via `fake_unit.py`) | shortest valid frame; the only real probe reply we hold |
|
||||
| `0x5A` chunk, 138 B | captured | holds literal `0x10` **and** literal `0x41` — the checksum case, and proves ACK is not escaped |
|
||||
| `0x49` state reply, 25 B | captured | a literal `0x02`, escaped |
|
||||
| `0x48` file reply, 24 B | captured | escaped `0x04` in `data[0]` — one byte late without destuffing |
|
||||
| 8 Thor request frames | captured | byte-for-byte against `build_request()`, incl. both `0x5A` forms and the scheduler enable |
|
||||
| `probe_length = 0x082C` | **synthesised** | no probe reply for `0x1A` exists on disk — the 9-24-26 session never probes |
|
||||
| Thor-line reply, `flags = 0x03` | **synthesised** | no 11.0BD capture is in the repo; built by flipping one byte of the real POLL reply |
|
||||
| escaped checksum byte | **synthesised** | the shortest real one is 1,070 B, too long to embed for one assertion |
|
||||
| truncated / corrupt / split-across-feeds | derived | parser must return nothing, flag rather than swallow, and survive any split point |
|
||||
|
||||
⚠ Synthesised frames are marked `SYNTH_`-style in the test and each says what it
|
||||
stands in for and why no capture was available. Do not let that set grow
|
||||
quietly: the `flags = 0x03` case in particular is the **only** coverage of half
|
||||
the fleet, and it deserves a real 11.0BD capture the next time UM20147 is on a
|
||||
bench.
|
||||
|
||||
Two corpus-backed tests run when the captures happen to be on the box and skip
|
||||
cleanly otherwise: **251 response frames parse with zero bad checksums**, and
|
||||
**`build_request()` reproduces 218/218 read frames**. The second is the test
|
||||
that would have caught the escape-set error, so it is worth the skip marker.
|
||||
|
||||
⚠ Do **not** assert against `scratch/mm_frame_parse.py`'s output as the original
|
||||
plan proposed. That script accepts either checksum rule and is wrong about
|
||||
which one is right — using it as an oracle would have pinned the bug.
|
||||
|
||||
**Live, second:** against the bench unit on mint-mac via `mm_link.py`.
|
||||
`connect()`, `list_setups()` (should return the 23 known names), `list_events()`,
|
||||
then `download_event()` and assert the bytes decode and match a
|
||||
`/db/import/idf_file` ingest of the same event.
|
||||
|
||||
---
|
||||
|
||||
## Order of work
|
||||
|
||||
1. ✅ `framing.py` + its tests — **done 2026-09-27**, 31 tests, offline
|
||||
2. ✅ `protocol.py` + its tests — **done 2026-09-27**, 35 tests, offline
|
||||
3. ✅ `client.py` + its tests — **done 2026-09-27**, 26 tests, offline
|
||||
4. the event chain and `download_event()`
|
||||
5. decode end-to-end and compare against a store event
|
||||
|
||||
Steps 1–2 need no hardware at all.
|
||||
|
||||
**Worth carrying forward.** Both steps began by measuring against the captures
|
||||
rather than trusting this document, and both found errors in it — three in the
|
||||
framing rules (the escape set, 26% of frames; the checksum, 22%; the `0x5A`
|
||||
chunk model) and three more in the command table (`0x0A`'s meaning, the
|
||||
`1E`/`1F` token, `0x01`'s provenance). All six fail quietly. The captures are on
|
||||
disk and a measure-then-write loop costs about two minutes per rule, so keep
|
||||
doing it for `client.py`'s field offsets — and treat this spec as a plan, not a
|
||||
source.
|
||||
|
||||
---
|
||||
|
||||
## Open questions to settle while implementing
|
||||
|
||||
- ~~**Request param stuffing**~~ — ✅ settled 2026-09-27; no special handling.
|
||||
- **Is the single-request `0x5A` form real?** Our 2026-09-23 probes set
|
||||
`offset_hi = 0x10` and appeared to get a whole 11 KB event back, where Thor
|
||||
chunks at 1024 B. Plausibly a distinct streaming mode that returns several
|
||||
frames. One bench test settles it; implement Thor's form regardless.
|
||||
- **Is THOR's preamble required?** Try one command cold and find out; it is a
|
||||
two-minute test with the bench unit and it removes a ritual if unnecessary.
|
||||
- **`Event` model fit** — Series IV carries fields Series III lacks (setup file
|
||||
name, `LMic`/`SMic` channels). Extend `micromate/models.py`; do not fork the
|
||||
shared `Event`.
|
||||
- **Which `0x0C` fields to trust.** The peak float there runs 2–5% above
|
||||
`max(T,V,L)` and is **not** the vector sum; its offset was inferred, not
|
||||
established. The reference marks it do-not-rely-on — prefer decoded samples.
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,7 @@
|
||||
# Runbook — Recovering a wedged unit stuck in a call-home loop
|
||||
|
||||
**Original incident:** BE9558H at `166.246.130.1:9034`, recovered 2026-05-17.
|
||||
**Incidents:** BE9558H at `166.246.130.1:9034`, 2026-05-17 (Method B) ·
|
||||
BE12599 at `166.246.64.226:9034`, 2026-09-16 (Method A).
|
||||
|
||||
A field unit with a stuck-triggered geophone (or any hardware fault causing
|
||||
constant event triggering) will record events back-to-back, and if Auto Call
|
||||
@@ -14,6 +15,33 @@ This runbook describes how to break the loop and recover control.
|
||||
|
||||
---
|
||||
|
||||
## ⚠ Two cures for one disease — intercept first
|
||||
|
||||
Both incidents below are the **same failure**: a geophone offset crosses the
|
||||
trigger level, the unit records back-to-back, ACH set to "after event
|
||||
recorded" dials continuously, and the unit becomes unreachable because its
|
||||
modem is in client mode almost all of the time.
|
||||
|
||||
There are two ways to get a Stop Monitoring command into it.
|
||||
|
||||
| | **A — intercept the call** (preferred) | **B — catch it between calls** (original) |
|
||||
|---|---|---|
|
||||
| Idea | Be the server it dials. Point the modem's Destination at our own ACH server and answer it. | Clear the Destination so it stops dialing, then race a Stop into the gap. |
|
||||
| Needs inbound? | **No — the unit calls us** | Yes: working inbound TCP to the modem |
|
||||
| Determinism | Deterministic — it dials every ~75 s, we only have to be listening | A race. BE9558H took ~7 h of attempts before one landed. |
|
||||
| Tool | `bridges/ach_server.py --stop-monitoring` | `scripts/slow_drip.sh` |
|
||||
| Proven on | BE12599, 2026-09-16 | BE9558H, 2026-05-17 |
|
||||
|
||||
**Method A is the standard procedure now.** The unit won't answer us because
|
||||
it is on the phone — so stop dialing it and be the one it calls. It rings,
|
||||
we pick up, take its data, and tell it to stop calling here.
|
||||
|
||||
Method B is kept because it is proven, and because A needs a listener the
|
||||
modem can actually reach (public IP + forwarded port). When you have that,
|
||||
don't race it — intercept it.
|
||||
|
||||
---
|
||||
|
||||
## Symptoms
|
||||
|
||||
- Terra-View / SFM `/device/info` either hangs or fails on `count_events()`.
|
||||
@@ -31,9 +59,85 @@ If you see *all* of these, the unit is in this exact failure mode.
|
||||
|
||||
---
|
||||
|
||||
## Quick reference — how to recover
|
||||
## Method A (preferred) — intercept the call
|
||||
|
||||
You need **ACEmanager access** to the unit's modem.
|
||||
You need **ACEmanager access** and a host the modem can dial: public IP with
|
||||
the listener's port forwarded to it.
|
||||
|
||||
### A1 — start the listener BEFORE touching the modem
|
||||
|
||||
```bash
|
||||
cd /home/serversdown/seismo-relay
|
||||
tmux new -s rescue
|
||||
.venv/bin/python -u bridges/ach_server.py --port 12345 \
|
||||
-o bridges/captures/<unit>-diag --stop-monitoring -v
|
||||
```
|
||||
|
||||
⚠ **Listener first, always.** A Destination pointed at a dead port is the
|
||||
worst state available — the device still dials, the modem still flips to
|
||||
client mode, inbound stays blocked, and nothing gets delivered.
|
||||
|
||||
Do **not** add `--events-only` (it silently breaks dedup — see gotchas), and
|
||||
do **not** add `--disable-ach` yet (see A4).
|
||||
|
||||
### A2 — point the modem at it
|
||||
|
||||
ACEmanager → **Serial → Port Configuration**:
|
||||
|
||||
| Field | Set to |
|
||||
|---|---|
|
||||
| **Destination Address** | the listener's public IP |
|
||||
| **Destination Port** | the listener's port (e.g. `12345`) |
|
||||
|
||||
Apply. The modem auto-dials its Destination whenever serial data arrives
|
||||
while the serial port is closed — so the unit's own retry cycle now lands on
|
||||
you instead of nowhere.
|
||||
|
||||
### A3 — answer, and stop the bleeding
|
||||
|
||||
Within ~75 s you should see a call-in. `--stop-monitoring` fires SUB 0x97 at
|
||||
step 1.5 — after the handshake, **before** the event walk — so the recording
|
||||
halts at the earliest possible moment in the session. Confirm via
|
||||
`rescue.json` in the session directory:
|
||||
|
||||
```json
|
||||
{"peer": "166.246.64.226:60921", "stop_monitoring": "ok"}
|
||||
```
|
||||
|
||||
That is the bleeding stopped. Everything after this is cleanup.
|
||||
|
||||
### A4 — drain the backlog, THEN disable ACH
|
||||
|
||||
⚠ **Order matters, and it is counter-intuitive.** Stopping monitoring also
|
||||
removes your call-in trigger: ACH fires on "after event recorded", so with
|
||||
recording stopped the unit has no reason to dial again. The backlog sitting
|
||||
in its memory does **not** re-arm it.
|
||||
|
||||
So if the stored events are worth keeping — and on a fault unit they usually
|
||||
are, they're the evidence — drain them across however many call-ins it takes
|
||||
*before* you silence it. Only then add `--disable-ach` (or use
|
||||
`scripts/rescue_device.sh <host> <port> --no-erase`).
|
||||
|
||||
If the unit has gone quiet and you still need it, cycling the modem produces
|
||||
a call-in, and a unit with a scheduled daily call will dial at its configured
|
||||
time regardless.
|
||||
|
||||
### A5 — restore the Destination, and confirm you did
|
||||
|
||||
Put `Destination Address` back to `0.0.0.0` (or the office Instantel ACH
|
||||
server) once you are finished, and only stop the listener after that is done.
|
||||
|
||||
### A6 — do NOT re-enable ACH until the hardware fault is repaired
|
||||
|
||||
Otherwise the loop restarts the moment monitoring resumes and you run this
|
||||
runbook again.
|
||||
|
||||
---
|
||||
|
||||
## Method B (fallback) — catch it between calls
|
||||
|
||||
The original 2026-05 procedure. Use when you cannot stand up a listener the
|
||||
modem can reach. You need **ACEmanager access** to the unit's modem.
|
||||
|
||||
### Step 1: stop the modem's mode-flipping
|
||||
|
||||
@@ -253,3 +357,223 @@ service).
|
||||
|
||||
Total time from "i was wondering if its possible to" first attempt to
|
||||
recovery: ~7 hours of intermittent debugging across one evening.
|
||||
|
||||
---
|
||||
|
||||
# Second incident — BE12599, 2026-09-16/17
|
||||
|
||||
**Unit:** BE12599 at `166.246.64.226:9034`, RV50, job *I-80 North Fork Bridge
|
||||
— Abut 1 West* (Fay Company). Same job as BE9558H, which is a coincidence.
|
||||
|
||||
**Fault:** the connector fault documented in `docs/offset_investigation.md`
|
||||
§8e progressed until the Tran pedestal reached **0.400 in/s** — its trigger
|
||||
level. Constant triggering → constant recording → ACH "after event recorded"
|
||||
→ continuous dialing. Same disease as BE9558H.
|
||||
|
||||
**Same disease, inverted cure.** Method B's Step 1 *did* work — clearing the
|
||||
Destination stopped the dial-outs, confirmed in the ALEOS log. It was Step 2
|
||||
that didn't land, and rather than keep racing we turned the rescue around:
|
||||
gave the unit a different server to call, and answered it.
|
||||
|
||||
Total time ≈ 5 h, of which ~90 min went to two red herrings documented below.
|
||||
Much of the rest was rediscovering the May procedure, which is why the
|
||||
"two cures" table now sits at the top of this file.
|
||||
|
||||
---
|
||||
|
||||
## Turn on ALEOS_SERIAL debug FIRST
|
||||
|
||||
This is the single highest-value diagnostic and it should be step zero on any
|
||||
future incident. ACEmanager → **Admin → Log → ALEOS_SERIAL log level →
|
||||
DEBUG**, then view the serial log.
|
||||
|
||||
It is the only thing that tells you what the *device* is actually saying.
|
||||
Everything before we did this was guesswork.
|
||||
|
||||
## What the log showed — the unit is on the phone
|
||||
|
||||
Every ~75 seconds, verbatim:
|
||||
|
||||
```
|
||||
ALEOS_SERIAL_HIF: 29 byte(s) in buffer: 'ATQ1^MATE0^MATS0=2^M^MRADIO RING^M'
|
||||
ALEOS_SERIAL_HMC: TCP recvhost fd 65535 len 29 state TCPMode::kClosed
|
||||
ALEOS_SERIAL_HMC: tcpmode trying to send to invalid socket
|
||||
ALEOS_SERIAL_HMC: Connect to IP: 0.0.0.0 Port 0
|
||||
ALEOS_SERIAL_HMC: Initialize Auto answer on port 9034
|
||||
ALEOS_SERIAL_HMC: Cannot connect to 0.0.0.0
|
||||
```
|
||||
|
||||
Read that carefully:
|
||||
|
||||
- `ATQ1` (quiet) / `ATE0` (echo off) / `ATS0=2` (auto-answer after 2 rings).
|
||||
**There is no `ATD`.** The device is not dialing — it is trying to
|
||||
*configure* its modem.
|
||||
- The modem's serial port is in TCP data mode, so it never interprets these
|
||||
as AT commands. It treats them as payload and tries to ship them to a TCP
|
||||
socket that does not exist.
|
||||
- The device therefore never receives `OK`, never progresses, and **retries
|
||||
the identical 29 bytes forever**.
|
||||
|
||||
**While it is in this state it is busy placing a call, not listening for
|
||||
us.** This is almost certainly what BE9558H was doing too — we simply never
|
||||
turned on ALEOS_SERIAL debug in May to look. It is not a different disease;
|
||||
it is the same one, seen properly for the first time.
|
||||
|
||||
It is also the argument for Method A in one picture: the unit is mid-dial
|
||||
every ~75 s, and our inbound Stop has to thread the gaps between those
|
||||
attempts. Give it somewhere to dial and the problem inverts into a
|
||||
deterministic one.
|
||||
|
||||
### Why `slow_drip` lied
|
||||
|
||||
`slow_drip` returned the *success* signature except for the one field that
|
||||
mattered:
|
||||
|
||||
```json
|
||||
{"duration_s":120.0,"drips_sent":38,"bytes_sent":920,
|
||||
"bytes_received":0,"send_error":null}
|
||||
```
|
||||
|
||||
Full duration, no broken pipe — but zero bytes back. Cause is in the log
|
||||
above: each 75 s cycle re-runs `Initialize Auto answer on port 9034`, which
|
||||
orphans the held session (`data in for unknown reason 3 removing from
|
||||
select`, `OnMsg recv error: 107 - Transport endpoint is not connected`). Our
|
||||
local TCP stayed open so `sendall` never raised — but the modem stopped
|
||||
bridging after the first re-init, so every drip after that went into a socket
|
||||
nobody was reading.
|
||||
|
||||
⚠ **`send_error: null` + full duration is NOT success. Only
|
||||
`bytes_received > 0` is success.**
|
||||
|
||||
⚠ **In fairness to slow_drip: it got exactly one attempt here**, run ~90 s
|
||||
after a modem reboot, with a dead session visible in the log at 20:19:17 in
|
||||
that same window. BE9558H took hours of attempts before one landed. Method B
|
||||
was not ruled out on BE12599 so much as abandoned in favour of something that
|
||||
doesn't need luck.
|
||||
|
||||
---
|
||||
|
||||
## ⚠ Two red herrings that cost ~90 minutes
|
||||
|
||||
### 1. The trusted-IP whitelist (this was the real reason inbound never worked)
|
||||
|
||||
The RV50s run with **Security → Trusted IPs (Friends List) enabled**. A
|
||||
source IP that is not on the list is dropped **silently** — inbound presents
|
||||
as `Connection error: timed out`, never a refusal.
|
||||
|
||||
Brian's dev-box public IP is **dynamic** and had changed, so `tmi-dev` was no
|
||||
longer whitelisted. Every inbound attempt failed identically across four
|
||||
different modem and device states, which looked exactly like the BE9558H
|
||||
mode-flipping symptom and sent us chasing modem configuration for over an
|
||||
hour.
|
||||
|
||||
**Check this before diagnosing anything else.** Note that SFM in Docker
|
||||
egresses via the *host's public IP*, not its LAN IP.
|
||||
|
||||
### 2. A 502 from SFM does not mean TCP connected
|
||||
|
||||
`sfm/server.py` raises **502 for both** failure classes:
|
||||
|
||||
```python
|
||||
raise HTTPException(status_code=502, detail=f"Protocol error: {exc}")
|
||||
raise HTTPException(status_code=502, detail=f"Connection error: {exc}")
|
||||
```
|
||||
|
||||
We read an early 502 as "TCP connected, modem bridged, device mute" and built
|
||||
a whole theory on it. It was almost certainly a connect timeout.
|
||||
**Always read the `detail` string** — "connect failed" and "device didn't
|
||||
answer" are completely different problems and the status code will not
|
||||
separate them.
|
||||
|
||||
---
|
||||
|
||||
## What actually worked — invert the direction
|
||||
|
||||
The key observation is in the log above:
|
||||
|
||||
> `TCP recvhost ... state TCPMode::kClosed` → `Connect to IP: 0.0.0.0 Port 0`
|
||||
|
||||
**The modem auto-dials its Destination whenever serial data arrives while
|
||||
closed.** So instead of fighting for inbound, give it somewhere to dial:
|
||||
point `Destination Address` at our own `ach_server` and the device's own
|
||||
75-second attempts become **device-initiated sessions the modem bridges
|
||||
correctly**. No race, no contention, worst case a 75-second wait.
|
||||
|
||||
### Procedure
|
||||
|
||||
1. **Run the rescue server** on a host the modem can reach (public IP +
|
||||
forwarded port):
|
||||
|
||||
```bash
|
||||
cd /home/serversdown/seismo-relay
|
||||
.venv/bin/python -u bridges/ach_server.py --port 12345 \
|
||||
-o bridges/captures/<unit>-diag --stop-monitoring -v
|
||||
```
|
||||
|
||||
2. **Point the modem at it** — ACEmanager → Serial → Port Configuration →
|
||||
`Destination Address` = your public IP, `Destination Port` = 12345.
|
||||
|
||||
3. **Wait for the call-in.** `--stop-monitoring` fires SUB 0x97 at step 1.5,
|
||||
after the handshake and *before* the event walk. Confirm via
|
||||
`rescue.json` in the session directory:
|
||||
|
||||
```json
|
||||
{"peer": "166.246.64.226:60921", "stop_monitoring": "ok"}
|
||||
```
|
||||
|
||||
4. **Restore the modem's Destination** once you are done, then finish the
|
||||
device side (disable ACH, erase) through whichever channel works.
|
||||
|
||||
On BE12599 the first call-in landed at 20:58:11 and reported
|
||||
`stop_monitoring: ok`; a second at 20:58:20 confirmed it. `is_monitoring:
|
||||
false` was still true **6½ hours later** — the fix is durable.
|
||||
|
||||
---
|
||||
|
||||
## Hard-won gotchas (do not re-derive)
|
||||
|
||||
- **Never leave the Destination pointed at a host with nothing listening.**
|
||||
That is the worst state available: the device still dials, the modem still
|
||||
flips, inbound stays blocked, and nothing is delivered. An 8-minute gap
|
||||
with the listener down produced a spurious inbound timeout that cost
|
||||
another round of misdiagnosis.
|
||||
|
||||
- **Stopping monitoring removes your call-in channel.** ACH is "after event
|
||||
recorded"; no new events means no new dials. The backlog sitting in memory
|
||||
does *not* re-arm it. After a successful stop the unit goes quiet and you
|
||||
need the modem cycled (works — produced a call-in), the scheduled daily call
|
||||
(BE12599 calls at **05:00:14 device-local**, per §8e), or working inbound.
|
||||
**Plan the order before you fire the stop.**
|
||||
|
||||
- **`--events-only` silently breaks dedup.** It skips the device-info step,
|
||||
so the serial is never read; `ach_state.json` then keys on
|
||||
`peer:ephemeral_port`, which is unique per connection. Every session looks
|
||||
like a new unit, starts from key 0, and re-downloads the same event. Four
|
||||
sessions on BE12599 downloaded the identical event four times and made zero
|
||||
progress on the backlog. Events also file as `serial=UNKNOWN` with a
|
||||
`M000…` BW filename (serial_numeric 0) instead of `N599…`.
|
||||
**Do not use `--events-only` when you intend to download anything.**
|
||||
|
||||
- **`/device/events/index` reported `lifetime_count: 0`** on a unit with years
|
||||
of history. Suspected decode bug in the SUB 0x08 field offset — do not
|
||||
trust that number. The 88-byte payload is preserved in the `raw_hex` field
|
||||
if someone wants to chase it.
|
||||
|
||||
- **Memory used cross-checks the event keys exactly:**
|
||||
`last_key − buffer_start = memory_total − memory_free`. On BE12599:
|
||||
`0x011230ec − 0x01110000 = 78,060` and `983,028 − 904,968 = 78,060`.
|
||||
Useful sanity check that you are reading the keys right.
|
||||
|
||||
---
|
||||
|
||||
## Final state (2026-09-17 ~01:30 local)
|
||||
|
||||
- `is_monitoring: false`, held 6½ hours
|
||||
- Battery 6.76 V
|
||||
- Memory 78,060 / 983,028 bytes used (8%)
|
||||
- `first_key 01121728`, `last_key 011230ec` — ~6.6 KB of addressable event
|
||||
chain, roughly 3 events
|
||||
- ACH still **enabled** — to be disabled after the backlog is preserved
|
||||
- Modem Destination still pointed at tmi-dev — to be restored
|
||||
- ⚠ **Do not re-enable ACH until the connector is serviced.** Tran is still
|
||||
sitting at 0.400 and the loop restarts the moment monitoring resumes.
|
||||
|
||||
@@ -0,0 +1,150 @@
|
||||
# SFM — where it actually stands as a tool
|
||||
|
||||
**Status as of 2026-09-20 (v0.31.0).** This is the honest assessment, not the
|
||||
roadmap — `README.md § Roadmap` covers where it is *going*. Expect this file to
|
||||
go stale; re-date it when you revise it.
|
||||
|
||||
---
|
||||
|
||||
## The framing
|
||||
|
||||
SFM is **three different things wearing one name**, at three very different
|
||||
levels of maturity:
|
||||
|
||||
| | what it is | maturity |
|
||||
|---|---|---|
|
||||
| **The codec library** | `minimateplus/`, `micromate/` — bytes in, `Event` out | **Production.** Verified per-sample at scale. |
|
||||
| **SDM — the data side** | the DB, waveform store, `/db/*`, ingest | **Production.** Terra-View depends on it daily. |
|
||||
| **SFM — the device side** | `/device/*`, live connections to units | **Emergency-grade.** Works, but manual, unauthenticated, and thinly tested. |
|
||||
| **The lab** | `seismo_lab.py`, `scratch/`, the Inspector | **Research artifacts.** Useful, not products. |
|
||||
|
||||
Brian's own description — *"right now it's an emergency tool and a research
|
||||
project"* — is accurate, and it applies specifically to the **device side**.
|
||||
The data side is not an emergency tool; it has been carrying production for
|
||||
months.
|
||||
|
||||
Most confusion about "is SFM reliable?" comes from answering for the wrong
|
||||
tier.
|
||||
|
||||
---
|
||||
|
||||
## 1. What you can rely on
|
||||
|
||||
### Production-grade — trust it
|
||||
|
||||
- **Series-3 decode.** 14,338 / 14,338 files decode per-sample exact against
|
||||
preserved Blastware ASCII exports, 45 units, files back to 2018.
|
||||
- **Series-4 (Thor) decode.** 1,057,536 / 1,057,536 geo samples exact against
|
||||
Thor's own CSV exports; production IDFW 575/575 with zero truncations.
|
||||
- **Histogram decode.** 1,211 / 1,211 production histograms exact, including
|
||||
842,442 per-interval frequency comparisons with zero mismatches.
|
||||
- **The ingest path.** `/db/import/blastware_file` and `/db/import/idf_file`
|
||||
fed by the watchers — this is how prod actually gets its data, and it has
|
||||
been running unattended for months.
|
||||
- **`/db/*` read API.** Always-on, consumed by Terra-View for every fleet
|
||||
listing, event detail and report.
|
||||
- **The waveform store** — `.h5` + `.sfm.json` sidecars + retained raw
|
||||
binaries, with operator review state preserved across regeneration.
|
||||
- **`bridges/ach_server.py`** — speaks the full BW protocol to calling units.
|
||||
Proven in the field, including as a rescue tool (see the runbook).
|
||||
|
||||
### Emergency-grade — works, but you are the error handling
|
||||
|
||||
- **`/device/*` live endpoints.** They do what they say. But they are
|
||||
synchronous, unauthenticated, and a single cellular download can exceed the
|
||||
60 s timeouts that sit in front of them.
|
||||
- **The rescue ladder** (`rescue`, `stop_monitoring_*`, `events/erase`).
|
||||
Each has worked in a real incident — but each has been used a handful of
|
||||
times, by one person, with the runbook open.
|
||||
- **The standalone webapp.** Perfectly usable, and as of v0.31.0 the cheap
|
||||
probes and rescue actions are reachable without curl. No auth of any kind.
|
||||
|
||||
### Research artifacts — useful, not products
|
||||
|
||||
- **`seismo_lab.py`** — 2,789 lines of Tkinter (Bridge / Analyzer / Query DB /
|
||||
Inspector). Desktop-only, single-user, no tests.
|
||||
- **`scratch/`** — the verification harnesses (`verify_against_ascii.py`,
|
||||
`verify_thor_against_csv.py`) and the offset detector (`offset_scan3.py`).
|
||||
These produced the numbers the production claims rest on, so they matter —
|
||||
but they are analysis scripts, not maintained code.
|
||||
- **`docs/offset_investigation.md`** — an open investigation, not a feature.
|
||||
|
||||
---
|
||||
|
||||
## 2. What to use when
|
||||
|
||||
| you want to… | use | notes |
|
||||
|---|---|---|
|
||||
| Know if a unit is monitoring / its battery / memory | `GET /device/monitor/status?force=true` | ~2 s |
|
||||
| Know whether ACH is on | `GET /device/call_home` | ~2 s. **Not** `/device/events`. |
|
||||
| See how full a unit's buffer is | `GET /device/events/storage_range` | ~2 s, no chain walk |
|
||||
| Stop a runaway unit | Diagnostics tab → Stop Monitoring | see the runbook first |
|
||||
| Reach a unit that will not answer | **point its modem at an `ach_server` and answer its call** | runbook Method A — do not race it |
|
||||
| List a unit's stored events | Events tab → Load events | **slow**, and broken past 64 KB (below) |
|
||||
| Get event data into the DB | the watcher → `/db/import/*` path | not the live walk |
|
||||
|
||||
The single most useful habit: **the cheap probes are cheap and the event walk
|
||||
is not.** Reaching for `/device/events` to answer a yes/no question about a
|
||||
unit is the mistake that motivated the v0.31.0 webapp changes.
|
||||
|
||||
---
|
||||
|
||||
## 3. Known issues
|
||||
|
||||
| issue | impact | status |
|
||||
|---|---|---|
|
||||
| **5A walk dies once a unit's buffer crosses 64 KB** | `/device/events` 500s; event body never downloads | Known, documented in `CLAUDE.md`. Needs a BW capture of a spanning event to fix properly. |
|
||||
| **No auth on SFM at all** | 21 `/device/*` endpoints, including destructive ones, open to anything that reaches the port | Design agreed (Terra-View as authenticated jump host); not built. |
|
||||
| **Swagger try-it-out is live on destructive endpoints** | `POST /device/events/erase` is one click away at `:8200/docs` | Partially mitigated: the webapp's erase now requires typing the serial. `/docs` itself is unguarded. |
|
||||
| **`SUB 0x08` lifetime counter reads 0** | `/device/events/index` returns a meaningless number | Suspected field-offset bug. Surfaced in the UI as "unreliable". |
|
||||
| **Long device operations are synchronous** | 60 s timeouts in `routers/sfm.py` and the reverse proxy; a full download exceeds both | Known design constraint. Must be POST-starts-job / GET-polls before any remote lab. |
|
||||
| **`backfill_sidecars.py --force` silently inserts DB rows** | store files with no DB row get one; the dry-run does not report the count | Known. Avoid `--force` — `TOOL_VERSION` gates regeneration anyway. |
|
||||
| **14 sensitive-range files show an exact 8× discrepancy** | 10.0 / 1.25 — a units problem, not a decode problem | Open, not blocking. |
|
||||
| **16 failing tests on `dev`** | 15 need gitignored fixture bundles; 1 is real (`sc["peak_values"]["transverse"]` returns `None` where `0.0` is expected) | The real one shipped in v0.31.0. |
|
||||
|
||||
---
|
||||
|
||||
## 4. What stands between this and a real tool
|
||||
|
||||
Roughly in dependency order — each unblocks the ones below it.
|
||||
|
||||
**1. Authentication.** Everything else is gated on this. SFM has none, and
|
||||
the modem IP whitelist gives zero protection because SFM *is* the whitelisted
|
||||
origin. The agreed design delegates rather than builds: Terra-View becomes the
|
||||
authenticated jump host (`/api/sfm/*` already inherits deny-by-default operator
|
||||
auth), and the `8200:8200` publish is dropped so Terra-View is the only door.
|
||||
|
||||
**2. Async long operations.** POST starts a job, GET polls. Retrofitting this
|
||||
after building a remote lab on top of synchronous endpoints would be far worse
|
||||
than designing for it now.
|
||||
|
||||
**3. Confirm-guards on the remaining destructive endpoints.** Auth answers
|
||||
*who*, not *did you mean it*. The webapp's erase is guarded; the other seven
|
||||
destructive POSTs and `/docs` are not.
|
||||
|
||||
**4. The 5A page-boundary fix.** Until this lands, live event download is
|
||||
unreliable on exactly the units most likely to need attention — the ones that
|
||||
have been recording heavily. Wants a Blastware capture of an event spanning a
|
||||
page boundary before the chunk-addressing half is trustworthy.
|
||||
|
||||
**5. A live Thor / Micromate client.** The device side is MiniMate-only.
|
||||
Series-4 units can only be read from forwarded files, so half the fleet has no
|
||||
live path at all.
|
||||
|
||||
**6. Test coverage that runs from a clean checkout.** 15 of 16 current
|
||||
failures are missing fixture bundles. A test suite that cannot go green on a
|
||||
fresh clone cannot gate anything.
|
||||
|
||||
**7. The SDM rename.** Cosmetic relative to the above, but the longer `sfm/`
|
||||
holds the data-side code the more the tiers blur. ~30–50 files here, ~10–15 in
|
||||
Terra-View, plus a Docker volume migration. Do it when the codebase is quiet.
|
||||
|
||||
---
|
||||
|
||||
## The short version
|
||||
|
||||
The **data side is a real tool already**. The **device side is a set of sharp
|
||||
instruments** that work in the hands of the person who wrote them, with the
|
||||
runbook open. The gap between those two states is mostly **auth, async, and
|
||||
guardrails** — not protocol work. The protocol is the part that is actually
|
||||
finished.
|
||||
@@ -0,0 +1,134 @@
|
||||
# Plan — "Rescue Listener": a first-class tool for the inverted rescue
|
||||
|
||||
**Status:** proposal, not started. Written 2026-09-17 ~01:40 local, straight
|
||||
off the BE12599 incident. Open questions at the bottom need Brian's answer
|
||||
before anything is built.
|
||||
|
||||
**Background:** `docs/runbooks/wedged_unit_recovery.md`, "Second incident —
|
||||
BE12599". The manual version of this worked; this plan is about making it a
|
||||
tool instead of a sequence of remembered steps at 1 AM.
|
||||
|
||||
---
|
||||
|
||||
## The problem, stated plainly
|
||||
|
||||
When a unit is wedged in the BE12599 mode — geophone offset above trigger,
|
||||
recording back-to-back, ACH dialing constantly, device stuck repeating an AT
|
||||
modem-init string and therefore **deaf to S3 over inbound** — the only channel
|
||||
that works is the one the *device* opens.
|
||||
|
||||
Recovering it currently means:
|
||||
|
||||
1. Remember that `bridges/ach_server.py` exists and takes the right flags
|
||||
2. Start it by hand on a box the modem can reach, with a public port forwarded
|
||||
3. Go into ACEmanager and repoint the modem's Destination
|
||||
4. Watch a terminal for a call-in
|
||||
5. Read `rescue.json` to find out whether it worked
|
||||
6. Go back into ACEmanager and repoint the modem to where it belongs
|
||||
7. **Not forget step 6**, because leaving the Destination pointed at a dead
|
||||
listener is worse than never having started
|
||||
|
||||
That is six manual steps and one landmine, executed under pressure while a
|
||||
unit floods the office server.
|
||||
|
||||
## What the tool should be
|
||||
|
||||
**A "rescue listener" an operator can start for one unit, which handles
|
||||
whatever that unit says when it calls in, and refuses to go away until the
|
||||
operator confirms the modem has been pointed back.**
|
||||
|
||||
Lifecycle:
|
||||
|
||||
1. **Start** — operator names the target unit and starts a rescue listener.
|
||||
The tool reports the exact address/port to enter in ACEmanager, plus the
|
||||
actions it will take.
|
||||
2. **Operator repoints the modem** to that address.
|
||||
3. **Wait** — listener sits there. Live status: "waiting for call-in",
|
||||
elapsed, last-seen.
|
||||
4. **Act** — on call-in, run the configured rescue actions automatically,
|
||||
in a safe order, each independently guarded. Report per-action outcome.
|
||||
5. **Hold** — the listener **stays up** and keeps reporting, because the
|
||||
modem is still pointed at it.
|
||||
6. **Confirm & stop** — the operator explicitly confirms the Destination has
|
||||
been restored (to `0.0.0.0`, or to the office Instantel ACH server).
|
||||
Only then does the listener shut down.
|
||||
|
||||
Step 6 is the whole point of making this a tool. It is the step that is
|
||||
easiest to skip and most expensive to skip.
|
||||
|
||||
## Default action set
|
||||
|
||||
Ordered deliberately — see "order matters" below.
|
||||
|
||||
| # | Action | Default | Why |
|
||||
|---|---|---|---|
|
||||
| 1 | **Stop monitoring** (SUB 0x97) | ✅ on | Halts recording; ends the trigger→record→dial loop at its source. Already implemented as `--stop-monitoring`. |
|
||||
| 2 | **Drain events** to a diagnostics store | ⚙ configurable | The backlog is usually evidence, not garbage — see the BE12599 offset investigation. Must NOT land in the prod SFM DB. |
|
||||
| 3 | **Disable ACH** (SUB 0x2C/0x7E/0x7F) | ❌ off by default | Stops the dialing — **and stops your only channel**. Opt-in, and ideally gated on step 1 having succeeded. |
|
||||
| 4 | **Erase events** | ❌ off by default | Destructive. Only after a verified drain. |
|
||||
|
||||
### Order matters — the lesson from BE12599
|
||||
|
||||
Stopping monitoring *removes the call-in trigger*. ACH fires on "after event
|
||||
recorded"; with recording stopped, the unit has no reason to dial again, even
|
||||
though the backlog is still sitting in its memory. So a naive
|
||||
"stop + disable + erase, all at once" rescue can silence the unit before
|
||||
you've collected anything, leaving you with no channel and a device full of
|
||||
evidence.
|
||||
|
||||
The tool should either sequence around this or warn loudly about it. My
|
||||
instinct is: **stop monitoring immediately** (it's the bleeding), then drain
|
||||
across however many call-ins it takes, and treat disable-ACH/erase as a
|
||||
separate, explicit "finish" action once the operator is satisfied.
|
||||
|
||||
## Where it should live — open question, with a proposal
|
||||
|
||||
The natural tier is **SFM** (device-side, per the three-tier model in
|
||||
CLAUDE.md). But the rescue listener must be reachable *from the cellular
|
||||
network*, which is a deployment constraint SFM's usual profile doesn't have.
|
||||
|
||||
**Proposal worth considering:** run it at the office, beside the real Instantel
|
||||
ACH server, on a **different port** (e.g. 12346 while Instantel holds 12345).
|
||||
Then the ACEmanager change is a **port change, not an IP change** — smaller,
|
||||
faster, less to get wrong, and trivially reversible. It also means the office
|
||||
public IP (already stable and known) is the destination, rather than whatever
|
||||
Brian's dynamic home IP happens to be that week.
|
||||
|
||||
The tmi-dev approach used on BE12599 worked, but required a router forward and
|
||||
ran into the dynamic-IP problem in the same session.
|
||||
|
||||
## Open questions
|
||||
|
||||
1. **Where does it run?** Office beside Instantel ACH (port swap), SFM on the
|
||||
NAS, or ad-hoc on tmi-dev? Affects everything else.
|
||||
2. **What drives it?** Terra-View admin page (fits "operator UI"), an SFM
|
||||
endpoint pair (`POST /device/rescue_listener/start` + `/stop` + `/status`),
|
||||
or a CLI wrapper? A long-lived listener doesn't fit the request/response
|
||||
endpoint shape well — probably needs a background task with a status poll.
|
||||
3. **How does it identify the unit?** It can't know the serial until the
|
||||
device calls in and the handshake reads it. Allowlist by modem IP? Accept
|
||||
anything and report what showed up?
|
||||
4. **Where do drained events go?** A per-incident diagnostics store
|
||||
(`bridges/captures/<unit>-diag`) seems right — explicitly *not* the prod
|
||||
SFM DB. Does that store need to be a first-class thing with its own
|
||||
retention, or is a directory fine?
|
||||
5. **How is "confirm the modem is repointed" verified?** Operator attestation
|
||||
(a button), or can we actually probe it? If the listener stops seeing
|
||||
call-ins that's weak evidence; if inbound to the unit starts working that's
|
||||
stronger.
|
||||
6. **Multi-unit?** One listener per incident, or one listener that handles any
|
||||
unit that dials in? Probably the former for safety.
|
||||
7. **Timeout / abandonment policy.** If nobody ever confirms, does it run
|
||||
forever? Alert after N hours?
|
||||
|
||||
## What already exists
|
||||
|
||||
- `bridges/ach_server.py` — the listener itself, with `--stop-monitoring`,
|
||||
`--disable-ach`, `--rescue` (added on `feat/ach-rescue-on-connect`, commit
|
||||
`9f1050b`), `--clear-after-download`, `--max-events`, `--allow-ip`.
|
||||
- Per-session `rescue.json` recording per-action outcomes.
|
||||
- Isolated per-output-dir SQLite + waveform store, so a diagnostics capture is
|
||||
already separate from prod by construction.
|
||||
|
||||
So the gap is not protocol work — it's lifecycle, operator surface, and the
|
||||
confirmation gate. Most of the risk is in questions 1 and 2.
|
||||
@@ -0,0 +1,294 @@
|
||||
"""
|
||||
client.py — high-level API for a live Micromate (Series IV).
|
||||
|
||||
Owns the transport, turns raw payloads into models. Read-only, like the layer
|
||||
below it: nothing here writes, erases, or changes monitoring state.
|
||||
|
||||
with MicromateClient(TcpTransport("63.45.161.30", 9034)) as mm:
|
||||
info = mm.connect()
|
||||
print(info) # UM12947 MM/ISEE/S/IO blastware fw idle
|
||||
print(mm.get_state()) # idle 2026-09-25 01:14:05 3.80 V memory 0.4% used
|
||||
for name in mm.list_setups():
|
||||
print(name)
|
||||
|
||||
The response layout, measured rather than assumed
|
||||
-------------------------------------------------
|
||||
**Every response carries an 11-byte prefix, and the content starts at
|
||||
``data[11]``.** That one rule covers every command.
|
||||
|
||||
⚠ **``data[0]`` looks like the content length and is only its low byte.** A
|
||||
2,092-byte setup block (`SUB 0x1A`) reports 44, and a 1,024-byte download chunk
|
||||
reports 0. It happens to be right for every response shorter than 256 bytes,
|
||||
which is most of them — so it reads as a working length field right up until it
|
||||
silently loses 2,048 bytes. There is no high byte anywhere in the prefix; it is
|
||||
``length & 0xFF`` and nothing more.
|
||||
|
||||
This is the same trap as ``MicromateFrame.probe_length``, in a different place,
|
||||
and it is now the third time a length in this protocol has been read too narrow.
|
||||
**Take the content as ``data[11:]`` and let the frame's own length bound it.**
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import datetime
|
||||
import logging
|
||||
from typing import Optional
|
||||
|
||||
from minimateplus.transport import BaseTransport
|
||||
|
||||
from .models import MicromateDeviceInfo, MicromateState
|
||||
from .protocol import MicromateProtocol, ProtocolError
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
# The content of every response begins here; the first 11 bytes are a prefix
|
||||
# whose only decoded field is an unreliable low-byte length (see module docstring).
|
||||
CONTENT = 11
|
||||
|
||||
# Field offsets, relative to the start of content. Sources are named because
|
||||
# two of them disagree with docs/micromate_protocol_reference.md.
|
||||
_STATE_FLAG = 0 # 0x49: 0x00 idle, 0x02 monitoring
|
||||
|
||||
_MS_FLAG = 1 # 0x1C: monitoring flag — test NON-ZERO
|
||||
_MS_DAY, _MS_MONTH, _MS_YEAR = 2, 3, slice(4, 6)
|
||||
_MS_UNKNOWN_6 = 6 # ⚠ NOT the hour — see read note below
|
||||
_MS_HOUR, _MS_MIN, _MS_SEC = 7, 8, 9
|
||||
_MS_BATTERY = slice(34, 36) # uint16 BE, volts × 100
|
||||
_MS_MEM_TOTAL = slice(36, 40) # uint32 BE
|
||||
_MS_MEM_FREE = slice(40, 44) # uint32 BE
|
||||
|
||||
# A setup-list walk that does not terminate is a bug, not a big fleet. The
|
||||
# bench unit holds 22 setups; this is a generous ceiling, not a limit.
|
||||
_MAX_SETUPS = 512
|
||||
|
||||
def _content(data: bytes) -> bytes:
|
||||
"""Strip the 11-byte response prefix."""
|
||||
return data[CONTENT:] if len(data) > CONTENT else b""
|
||||
|
||||
|
||||
def _cstring(buf: bytes, offset: int = 0) -> str:
|
||||
"""A null-terminated ASCII run, stripped."""
|
||||
return buf[offset:].split(b"\x00")[0].decode("ascii", "replace").strip()
|
||||
|
||||
|
||||
class MicromateClient:
|
||||
"""High-level read-only client for one Micromate.
|
||||
|
||||
Owns the transport, unlike ``MicromateProtocol``, which borrows it.
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
transport: BaseTransport,
|
||||
recv_timeout: float = 10.0,
|
||||
strict_checksums: bool = True,
|
||||
) -> None:
|
||||
self._transport = transport
|
||||
self._proto = MicromateProtocol(
|
||||
transport, recv_timeout=recv_timeout, strict_checksums=strict_checksums
|
||||
)
|
||||
self._firmware_line: Optional[str] = None
|
||||
|
||||
# ── Lifecycle ─────────────────────────────────────────────────────────────
|
||||
|
||||
def open(self) -> None:
|
||||
self._transport.connect()
|
||||
|
||||
def close(self) -> None:
|
||||
self._transport.disconnect()
|
||||
|
||||
def is_open(self) -> bool:
|
||||
return self._transport.is_connected()
|
||||
|
||||
def __enter__(self) -> "MicromateClient":
|
||||
self.open()
|
||||
return self
|
||||
|
||||
def __exit__(self, *_) -> None:
|
||||
self.close()
|
||||
|
||||
@property
|
||||
def protocol(self) -> MicromateProtocol:
|
||||
"""The wire layer, for anything this class does not wrap yet."""
|
||||
return self._proto
|
||||
|
||||
# ── Identity ──────────────────────────────────────────────────────────────
|
||||
|
||||
def connect(self, *, with_active_setup: bool = True) -> MicromateDeviceInfo:
|
||||
"""`POLL → SERIAL → state`, plus the active setup name.
|
||||
|
||||
⚠ **This is deliberately not Thor's full preamble.** Thor sends
|
||||
`POLL → SERIAL → 0x49 → POLL` and the client spec said to copy it
|
||||
verbatim on the grounds that it is known-good. Measuring all 8 captured
|
||||
sessions showed the only invariant is that a session **opens with
|
||||
POLL** — the four-command form appears in 3 of 8 and is Thor's
|
||||
*connection check*, run where it wants to refresh what it displays. The
|
||||
trailing POLL is a repeat of the first.
|
||||
|
||||
So this sends the three reads that actually gather something. Dropping
|
||||
the fourth is a judgement call on measured evidence, not a proof that
|
||||
nothing depends on it; if a unit ever refuses the next command after a
|
||||
cold connect, put it back and say so in the protocol reference.
|
||||
|
||||
`SUB 0x01` (device info) is **not** read. Thor never reads it in any
|
||||
captured session, its field layout is unmapped beyond eight `1.0f`
|
||||
floats, and `firmware_line` — the one thing we would want from it — comes
|
||||
free from the flags byte of any response.
|
||||
"""
|
||||
poll = self._proto.poll()
|
||||
self._firmware_line = poll.firmware_line
|
||||
|
||||
manufacturer, model = self._parse_poll(poll.data)
|
||||
serial = _cstring(_content(self._proto.read_serial()))
|
||||
monitoring = self._parse_state(self._proto.read_state())
|
||||
|
||||
info = MicromateDeviceInfo(
|
||||
serial=serial,
|
||||
manufacturer=manufacturer,
|
||||
model=model,
|
||||
firmware_line=poll.firmware_line,
|
||||
monitoring=monitoring,
|
||||
)
|
||||
if with_active_setup:
|
||||
try:
|
||||
info.active_setup = self.get_active_setup()
|
||||
except ProtocolError as e:
|
||||
# Not worth failing a connect over: a unit with no setup loaded
|
||||
# is a real state, and the caller can still read everything else.
|
||||
log.warning("active setup unreadable: %s", e)
|
||||
log.info("connected: %s", info)
|
||||
return info
|
||||
|
||||
@staticmethod
|
||||
def _parse_poll(data: bytes) -> tuple[Optional[str], Optional[str]]:
|
||||
"""Manufacturer and model out of the POLL block.
|
||||
|
||||
`Instantel` sits at content[4] and the model at content[26], with 13
|
||||
binary bytes between them.
|
||||
|
||||
⚠ A generic "find the printable runs" scan does **not** work here, which
|
||||
cost a test failure before it cost anything worse. content[3] is `0x50`
|
||||
— printable as `P` — sitting immediately before `Instantel`, so a run
|
||||
scan returns `PInstantel`. Nothing distinguishes a length or tag byte
|
||||
from text by inspection.
|
||||
|
||||
So: the manufacturer comes from a fixed offset, and the model is found by
|
||||
searching for `MM/`. That anchor is structural rather than positional,
|
||||
which matters because the model string **differs by firmware line** —
|
||||
`MM/ISEE/S/IO` on the Blastware build, `MM/ISEE/S` on the Thor build —
|
||||
and only its tail changes.
|
||||
"""
|
||||
c = _content(data)
|
||||
manufacturer = _cstring(c, 4) or None
|
||||
|
||||
idx = c.find(b"MM/")
|
||||
model = _cstring(c, idx) if idx >= 0 else None
|
||||
return manufacturer, model
|
||||
|
||||
@staticmethod
|
||||
def _parse_state(data: bytes) -> Optional[bool]:
|
||||
"""`SUB 0x49` content[0]: 0x00 idle, 0x02 monitoring.
|
||||
|
||||
⚠ Tested for non-zero, never against `0x02`. The sibling flag in
|
||||
`SUB 0x1C` has read both `0x0E` and `0x0C` while monitoring, so this
|
||||
family of flags is not a stable enum.
|
||||
"""
|
||||
c = _content(data)
|
||||
return bool(c[_STATE_FLAG]) if c else None
|
||||
|
||||
# ── State ─────────────────────────────────────────────────────────────────
|
||||
|
||||
def get_state(self) -> MicromateState:
|
||||
"""`SUB 0x1C` — monitoring, device clock, battery, memory.
|
||||
|
||||
⚠ Every offset here is **forward from the start of content**, never
|
||||
backward from the end. Series III reads battery and memory from the end
|
||||
of this block, and this block is **4 bytes longer on the Thor firmware
|
||||
line** — applying from-the-end offsets to a `11.0BD` unit yields a
|
||||
battery voltage of 577.92 V. The four extra bytes are trailing, so
|
||||
from-the-start offsets hold for both lines.
|
||||
|
||||
⚠ Verified on `11.0CB` only. That the same offsets hold on `11.0BD`
|
||||
follows from the extra bytes being trailing, which is documented but not
|
||||
something this code has seen.
|
||||
"""
|
||||
data = self._proto.read_monitor_status()
|
||||
c = _content(data)
|
||||
if len(c) < 44:
|
||||
raise ProtocolError(
|
||||
f"monitor status content is {len(c)} B, need at least 44"
|
||||
)
|
||||
|
||||
battery = int.from_bytes(c[_MS_BATTERY], "big") / 100.0
|
||||
return MicromateState(
|
||||
monitoring=bool(c[_MS_FLAG]),
|
||||
device_time=self._parse_clock(c),
|
||||
battery_volts=battery,
|
||||
memory_total_bytes=int.from_bytes(c[_MS_MEM_TOTAL], "big"),
|
||||
memory_free_bytes=int.from_bytes(c[_MS_MEM_FREE], "big"),
|
||||
raw=data,
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def _parse_clock(c: bytes) -> Optional[datetime.datetime]:
|
||||
"""The unit's own clock, in its own local time.
|
||||
|
||||
⚠ **content[6] is not part of the time.** The layout is day, month,
|
||||
year, *one unidentified byte*, then h/m/s — so the hour is at content[7].
|
||||
The protocol reference's `SUB 0x1C` section has this right and names
|
||||
`data[17]` as unidentified; its one-line summary in the divergences list
|
||||
("day/month/year/h/m/s at `data[13:21]`") reads as six contiguous fields
|
||||
and is the version worth not trusting.
|
||||
|
||||
Re-measured here across three captures: content[6] read 32, 100 and 116,
|
||||
none a valid hour, while content[7:10] gave 19:12:25, 19:13:34 and
|
||||
01:14:05 against capture filenames stamped 19:12:14, 19:12:14 and
|
||||
01:14:03 — each seconds to a minute after its session opened, which is
|
||||
what a device clock should do.
|
||||
|
||||
content[6] is undecoded and deliberately not exposed.
|
||||
"""
|
||||
try:
|
||||
return datetime.datetime(
|
||||
year=int.from_bytes(c[_MS_YEAR], "big"),
|
||||
month=c[_MS_MONTH],
|
||||
day=c[_MS_DAY],
|
||||
hour=c[_MS_HOUR],
|
||||
minute=c[_MS_MIN],
|
||||
second=c[_MS_SEC],
|
||||
)
|
||||
except ValueError as e:
|
||||
# A unit with a dead clock battery reports an impossible date. That
|
||||
# is information, not a reason to fail the whole state read.
|
||||
log.warning("device clock unreadable (%s): %s", e, c[2:10].hex(" "))
|
||||
return None
|
||||
|
||||
# ── Setups ────────────────────────────────────────────────────────────────
|
||||
|
||||
def get_active_setup(self) -> str:
|
||||
"""`SUB 0x41` — the loaded `.MMB` file name, e.g. `TEST1.mmb`."""
|
||||
return _cstring(_content(self._proto.read_active_setup_name()))
|
||||
|
||||
def list_setups(self) -> list[str]:
|
||||
"""`0x3F` then `0x40`… — every setup file stored on the unit.
|
||||
|
||||
A cursor walk: the device holds the position, so the same `0x40` request
|
||||
returns the next name. **An empty name terminates the list** — it is
|
||||
not an error and not a real setup.
|
||||
|
||||
Measured on the bench unit: 23 responses, 22 names then the empty one,
|
||||
`factory.MMB` first through `TEST1.mmb` last.
|
||||
"""
|
||||
names: list[str] = []
|
||||
raw = self._proto.read_first_setup()
|
||||
for _ in range(_MAX_SETUPS):
|
||||
name = _cstring(_content(raw))
|
||||
if not name:
|
||||
return names
|
||||
names.append(name)
|
||||
raw = self._proto.read_next_setup()
|
||||
|
||||
raise ProtocolError(
|
||||
f"setup list did not terminate after {_MAX_SETUPS} entries — the "
|
||||
f"device cursor is not advancing"
|
||||
)
|
||||
@@ -0,0 +1,304 @@
|
||||
"""
|
||||
framing.py — frame codec for the Instantel Micromate (Series IV) wire protocol.
|
||||
|
||||
A Micromate answers Series III *command* frames, so the request side looks
|
||||
familiar. The framing underneath is not the same, and the differences are all
|
||||
of the kind that produce a silently-ignored frame rather than an error:
|
||||
|
||||
Series III response: [DLE 0x10] [STX 0x02] … [chk] [ETX 0x03]
|
||||
Micromate response: [STX 0x02] … [chk] [ETX 0x03]
|
||||
^ no leading DLE
|
||||
|
||||
That missing byte is why `minimateplus.framing.S3FrameParser` returns *nothing*
|
||||
on Micromate traffic — it locates frames by scanning for `DLE STX`, which never
|
||||
occurs. A capture holding 12 acknowledged writes reads as 12 unanswered
|
||||
requests.
|
||||
|
||||
De-stuffed payload layout (both directions):
|
||||
|
||||
request response
|
||||
[0] CMD 0x10 [0] CMD 0x00
|
||||
[1] flags 0x00 [1] flags 0xC5 / 0x03 ← firmware line
|
||||
[2] SUB [2] SUB 0xFF − request_SUB
|
||||
[3] 0x00 [3] PAGE_HI
|
||||
[4] offset_hi [4] PAGE_LO
|
||||
[5] offset_lo [5+] data
|
||||
[6:16] params (10 bytes)
|
||||
|
||||
Everything below was established against the 251 request and 251 response
|
||||
frames in `bridges/captures/9-24-26 - micromate2/` (UM12947, firmware 11.0CB).
|
||||
Where a rule is asserted, the number of frames it was checked on is given — the
|
||||
two rules that look like small details cost 26% and 22% of frames respectively
|
||||
when guessed wrong, so the counts are the point.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import dataclass
|
||||
from typing import Optional
|
||||
|
||||
# ── Protocol byte constants ───────────────────────────────────────────────────
|
||||
|
||||
DLE = 0x10 # Data Link Escape
|
||||
STX = 0x02 # Start of text — begins a frame
|
||||
ETX = 0x03 # End of text — ends a frame
|
||||
ACK = 0x41 # Frame-start marker on the request side
|
||||
|
||||
MM_CMD = 0x10 # payload[0] in a request
|
||||
MM_RSP_CMD = 0x00 # payload[0] in a response
|
||||
|
||||
# payload[1] of a response identifies the firmware line it came from.
|
||||
# ⚠ Two units, one of each — a strong hypothesis, not a proven encoding.
|
||||
FLAGS_BLASTWARE = 0xC5 # the 11.0CB line (UM12947)
|
||||
FLAGS_THOR = 0x03 # the 11.0BD line (UM20147)
|
||||
|
||||
# ⚠ THE ESCAPE SET. A Micromate escapes exactly these four byte values,
|
||||
# prefixing each with a DLE — and nothing else. Established by re-stuffing
|
||||
# every captured frame and comparing to the wire: 251/251 responses and 251/251
|
||||
# requests reproduce byte-for-byte with this set, and no other candidate set
|
||||
# reproduces even 200 of either.
|
||||
#
|
||||
# The two near-misses are worth naming, because both look plausible:
|
||||
# * `{0x10}` alone — the Series III rule — reproduces 130/251 responses and
|
||||
# 177/251 requests.
|
||||
# * adding ACK (0x41) reproduces only 196/251 responses: a literal 0x41 in
|
||||
# the data is NOT escaped.
|
||||
_ESCAPED = frozenset({STX, ETX, 0x04, DLE})
|
||||
|
||||
# A response header is 5 bytes; a frame must also carry its checksum.
|
||||
_MIN_PAYLOAD = 5
|
||||
_REQUEST_PAYLOAD_SIZE = 16
|
||||
|
||||
|
||||
# ── Stuffing ──────────────────────────────────────────────────────────────────
|
||||
|
||||
def stuff(data: bytes) -> bytes:
|
||||
"""Escape every byte the Micromate escapes: `XX` → `10 XX` for the four."""
|
||||
out = bytearray()
|
||||
for b in data:
|
||||
if b in _ESCAPED:
|
||||
out.append(DLE)
|
||||
out.append(b)
|
||||
return bytes(out)
|
||||
|
||||
|
||||
def unstuff(data: bytes) -> bytes:
|
||||
"""Reverse `stuff()`: `10 XX` → `XX`, for any XX.
|
||||
|
||||
Uniform, with no inner-frame carve-out — which is a real simplification
|
||||
over Series III, where `DLE+ETX` inside a frame is literal data that must
|
||||
survive de-stuffing. Since only four byte values are ever escaped, taking
|
||||
*any* `10 XX` as `XX` is exact rather than merely convenient.
|
||||
"""
|
||||
out = bytearray()
|
||||
i = 0
|
||||
while i < len(data):
|
||||
if data[i] == DLE and i + 1 < len(data):
|
||||
out.append(data[i + 1])
|
||||
i += 2
|
||||
else:
|
||||
out.append(data[i])
|
||||
i += 1
|
||||
return bytes(out)
|
||||
|
||||
|
||||
# ── Checksum ──────────────────────────────────────────────────────────────────
|
||||
|
||||
def checksum(payload: bytes) -> int:
|
||||
"""SUM8 of the **de-stuffed** payload, mod 256. 251/251 both directions.
|
||||
|
||||
⚠ Do NOT exclude `0x10` bytes from this sum. The DLE-aware checksum that
|
||||
Series III uses for its `5A` and write frames is the right answer to a
|
||||
*different* question: it pairs with Series III de-stuffing, which leaves
|
||||
escaped bytes in the payload as two bytes. De-stuffing uniformly already
|
||||
removes the DLE, so excluding `0x10` as well subtracts the correction
|
||||
twice.
|
||||
|
||||
That combination — uniform de-stuffing *and* an exclusive sum — is what
|
||||
`scratch/mm_frame_parse.py` shipped with. It disagrees with the wire on
|
||||
**55 of 251** captured response frames, all of them frames whose payload
|
||||
holds a literal `0x10`. The script only ever looked correct because it
|
||||
accepts a frame that matches *either* rule, so it reported those 55 as
|
||||
plain SUM8 and never flagged one bad.
|
||||
"""
|
||||
return sum(payload) & 0xFF
|
||||
|
||||
|
||||
# ── Request builder ───────────────────────────────────────────────────────────
|
||||
|
||||
def build_request(sub: int, offset: int = 0, params: bytes = bytes(10)) -> bytes:
|
||||
"""Build a host→unit command frame.
|
||||
|
||||
⚠ Do **not** substitute `minimateplus.framing.build_bw_frame()` here, even
|
||||
though the payload layout is identical. That builder escapes only `0x10`,
|
||||
so it reproduces just **161 of Thor's 218** captured read frames. The 57 it
|
||||
gets wrong are not edge cases:
|
||||
|
||||
* every `SUB 0x5A` bulk download — `offset = 0x0400` puts a literal
|
||||
`0x04` in `offset_hi`, which must go out as `10 04`
|
||||
* `SUB 0x47` (scheduler enable), whose params carry a `0x03`
|
||||
|
||||
An unescaped `0x03` or `0x04` reads as a frame terminator, so the unit sees
|
||||
a truncated frame and simply does not answer. That is indistinguishable
|
||||
from a dead unit, and event download would have hit it on the first try.
|
||||
|
||||
With the correct escape set this builder reproduces **218/218**.
|
||||
|
||||
Args:
|
||||
sub: command SUB byte.
|
||||
offset: uint16 at payload[4:5]. Micromate reads are single-step —
|
||||
Thor asks for `0xFFFF` and gets the whole block — so this is
|
||||
usually `0xFFFF`, not Series III's probe-then-data pair.
|
||||
params: exactly 10 bytes at payload[6:16].
|
||||
|
||||
A `0x10` inside `params` is fine and needs no special handling: Thor sends
|
||||
`SUB 0x5A` with `params = 00 00 10 00 …` and the wire carries `10 10`.
|
||||
(This was the spec's one open question; five captured frames settle it.)
|
||||
"""
|
||||
if len(params) != 10:
|
||||
raise ValueError(f"params must be exactly 10 bytes, got {len(params)}")
|
||||
if not 0 <= offset <= 0xFFFF:
|
||||
raise ValueError(f"offset must fit in uint16, got {offset:#x}")
|
||||
if not 0 <= sub <= 0xFF:
|
||||
raise ValueError(f"sub must be a single byte, got {sub:#x}")
|
||||
|
||||
payload = bytes([MM_CMD, 0x00, sub, 0x00, (offset >> 8) & 0xFF, offset & 0xFF]) + params
|
||||
body = payload + bytes([checksum(payload)])
|
||||
return bytes([ACK, STX]) + stuff(body) + bytes([ETX])
|
||||
|
||||
|
||||
# ── Response frame ────────────────────────────────────────────────────────────
|
||||
|
||||
@dataclass
|
||||
class MicromateFrame:
|
||||
"""A parsed, de-stuffed unit→host response frame."""
|
||||
|
||||
sub: int # response SUB; the request was 0xFF − this
|
||||
flags: int # payload[1] — 0xC5 Blastware line, 0x03 Thor line
|
||||
page_hi: int
|
||||
page_lo: int
|
||||
data: bytes # payload[5:], checksum stripped
|
||||
checksum_valid: bool
|
||||
chk_byte: int = 0 # the checksum byte as received
|
||||
|
||||
@property
|
||||
def request_sub(self) -> int:
|
||||
"""The SUB this is answering. No known exception to `0xFF − SUB`."""
|
||||
return 0xFF - self.sub
|
||||
|
||||
@property
|
||||
def page_key(self) -> int:
|
||||
"""payload[3:5] as a uint16 BE — a page/address on `0x5A` responses."""
|
||||
return (self.page_hi << 8) | self.page_lo
|
||||
|
||||
@property
|
||||
def firmware_line(self) -> str:
|
||||
return {FLAGS_BLASTWARE: "blastware", FLAGS_THOR: "thor"}.get(self.flags, "unknown")
|
||||
|
||||
@property
|
||||
def probe_length(self) -> Optional[int]:
|
||||
"""Data length declared by a **probe** response: uint16 BE at data[3:5].
|
||||
|
||||
⚠ Only meaningful in the reply to an `offset = 0` probe. Series III
|
||||
hardcodes a `DATA_LENGTHS` table; a Micromate will tell you instead,
|
||||
which already caught one divergence (call-home config is `0x7E`, where
|
||||
Series III has `0x7C`).
|
||||
|
||||
⚠ It is a **uint16 BE**, not a byte. Read as `data[3]` alone it is
|
||||
right only while the high byte is zero, and wrong by 47x for
|
||||
`SUB 0x1A`: a true `0x082C` (2092) reads as 44.
|
||||
|
||||
Returns None on a frame too short to hold the field. Note this reads
|
||||
as 0 on the single-step reads Thor actually uses — those are not probes,
|
||||
and `page_key` is the meaningful field there.
|
||||
"""
|
||||
if len(self.data) < 5:
|
||||
return None
|
||||
return (self.data[3] << 8) | self.data[4]
|
||||
|
||||
|
||||
# ── Streaming parser ──────────────────────────────────────────────────────────
|
||||
|
||||
class MicromateFrameParser:
|
||||
"""Incremental parser for unit→host frames. Mirrors `S3FrameParser`.
|
||||
|
||||
Feed bytes with `feed()`; completed frames are returned and also collected
|
||||
in `.frames`.
|
||||
|
||||
IDLE — scanning for a bare STX
|
||||
IN_FRAME — collecting; bare ETX terminates
|
||||
AFTER_DLE — the next byte is literal, whatever it is
|
||||
|
||||
Request frames are rejected rather than parsed: a frame whose `payload[0]`
|
||||
is not `0x00` is dropped, so feeding a bidirectional capture yields only
|
||||
the responses.
|
||||
"""
|
||||
|
||||
_IDLE, _IN_FRAME, _AFTER_DLE = 0, 1, 2
|
||||
|
||||
def __init__(self) -> None:
|
||||
self._state = self._IDLE
|
||||
self._body = bytearray()
|
||||
self.frames: list[MicromateFrame] = []
|
||||
# Distinguishes "no bytes at all" from "bytes but no complete frame" on
|
||||
# a timeout. That distinction earned its keep during the Series III
|
||||
# work and costs one integer here.
|
||||
self.bytes_fed: int = 0
|
||||
|
||||
def reset(self) -> None:
|
||||
self._state = self._IDLE
|
||||
self._body.clear()
|
||||
self.bytes_fed = 0
|
||||
|
||||
def feed(self, data: bytes) -> list[MicromateFrame]:
|
||||
self.bytes_fed += len(data)
|
||||
completed: list[MicromateFrame] = []
|
||||
for b in data:
|
||||
frame = self._step(b)
|
||||
if frame is not None:
|
||||
completed.append(frame)
|
||||
self.frames.append(frame)
|
||||
return completed
|
||||
|
||||
def _step(self, b: int) -> Optional[MicromateFrame]:
|
||||
if self._state == self._IDLE:
|
||||
if b == STX:
|
||||
self._body.clear()
|
||||
self._state = self._IN_FRAME
|
||||
# Boot strings, modem RING/CONNECT chatter and stray ACKs land here
|
||||
# and are discarded.
|
||||
|
||||
elif self._state == self._IN_FRAME:
|
||||
if b == DLE:
|
||||
self._state = self._AFTER_DLE
|
||||
elif b == ETX:
|
||||
self._state = self._IDLE
|
||||
return self._finalise()
|
||||
else:
|
||||
self._body.append(b)
|
||||
|
||||
elif self._state == self._AFTER_DLE:
|
||||
# Uniform rule: the escaped byte is itself, including 0x03.
|
||||
self._body.append(b)
|
||||
self._state = self._IN_FRAME
|
||||
|
||||
return None
|
||||
|
||||
def _finalise(self) -> Optional[MicromateFrame]:
|
||||
body = bytes(self._body)
|
||||
if len(body) < _MIN_PAYLOAD + 1:
|
||||
return None
|
||||
|
||||
payload, chk_received = body[:-1], body[-1]
|
||||
if payload[0] != MM_RSP_CMD:
|
||||
return None # a request frame, or garbage that framed by accident
|
||||
|
||||
return MicromateFrame(
|
||||
sub = payload[2],
|
||||
flags = payload[1],
|
||||
page_hi = payload[3],
|
||||
page_lo = payload[4],
|
||||
data = payload[5:],
|
||||
checksum_valid = (chk_received == checksum(payload)),
|
||||
chk_byte = chk_received,
|
||||
)
|
||||
@@ -396,3 +396,85 @@ class IdfEvent:
|
||||
)
|
||||
ev._waveform_key = waveform_key
|
||||
return ev
|
||||
|
||||
|
||||
# ── Live-device models (2026-09-27) ───────────────────────────────────────────
|
||||
#
|
||||
# These describe what a unit reports over the wire, not what Thor wrote to a
|
||||
# file. Everything above this line came out of Thor's exports; everything below
|
||||
# came out of Thor's *traffic*. Field offsets are recorded in
|
||||
# ``micromate/client.py`` next to the code that reads them.
|
||||
|
||||
|
||||
@dataclass
|
||||
class MicromateDeviceInfo:
|
||||
"""Identity gathered by ``MicromateClient.connect()``.
|
||||
|
||||
Sourced from three reads:
|
||||
``0x5B`` POLL → manufacturer, model
|
||||
``0x15`` SERIAL → serial
|
||||
``0x49`` STATE → monitoring
|
||||
plus ``firmware_line``, which comes free from the flags byte of any
|
||||
response and needs no read of its own.
|
||||
"""
|
||||
|
||||
serial: str
|
||||
manufacturer: Optional[str] = None # "Instantel"
|
||||
model: Optional[str] = None # "MM/ISEE/S/IO" (CB) / "MM/ISEE/S" (BD)
|
||||
firmware_line: Optional[str] = None # "blastware" | "thor" | "unknown"
|
||||
monitoring: Optional[bool] = None
|
||||
active_setup: Optional[str] = None # e.g. "TEST1.mmb"
|
||||
|
||||
def __str__(self) -> str:
|
||||
bits = [self.serial]
|
||||
if self.model:
|
||||
bits.append(self.model)
|
||||
if self.firmware_line:
|
||||
bits.append(f"{self.firmware_line} fw")
|
||||
if self.monitoring is not None:
|
||||
bits.append("MONITORING" if self.monitoring else "idle")
|
||||
if self.active_setup:
|
||||
bits.append(f"setup={self.active_setup}")
|
||||
return " ".join(bits)
|
||||
|
||||
|
||||
@dataclass
|
||||
class MicromateState:
|
||||
"""A unit's live state, from ``SUB 0x1C``.
|
||||
|
||||
``device_time`` is the unit's own clock, in its own local timezone — it is
|
||||
NOT converted. Nothing else this protocol exposes reports the unit's time,
|
||||
which makes it the only way to detect a drifted clock before it lands in
|
||||
event timestamps.
|
||||
"""
|
||||
|
||||
monitoring: bool
|
||||
device_time: Optional[datetime.datetime] = None
|
||||
battery_volts: Optional[float] = None
|
||||
memory_total_bytes: Optional[int] = None
|
||||
memory_free_bytes: Optional[int] = None
|
||||
raw: Optional[bytes] = field(default=None, repr=False)
|
||||
|
||||
@property
|
||||
def memory_used_bytes(self) -> Optional[int]:
|
||||
if self.memory_total_bytes is None or self.memory_free_bytes is None:
|
||||
return None
|
||||
return self.memory_total_bytes - self.memory_free_bytes
|
||||
|
||||
@property
|
||||
def memory_used_fraction(self) -> Optional[float]:
|
||||
used = self.memory_used_bytes
|
||||
if used is None or not self.memory_total_bytes:
|
||||
return None
|
||||
return used / self.memory_total_bytes
|
||||
|
||||
def __str__(self) -> str:
|
||||
bits = ["MONITORING" if self.monitoring else "idle"]
|
||||
if self.device_time:
|
||||
bits.append(self.device_time.strftime("%Y-%m-%d %H:%M:%S"))
|
||||
if self.battery_volts is not None:
|
||||
bits.append(f"{self.battery_volts:.2f} V")
|
||||
frac = self.memory_used_fraction
|
||||
if frac is not None:
|
||||
bits.append(f"memory {frac * 100:.1f}% used")
|
||||
return " ".join(bits)
|
||||
|
||||
@@ -0,0 +1,501 @@
|
||||
"""
|
||||
protocol.py — one method per Micromate (Series IV) wire command.
|
||||
|
||||
Returns raw payload bytes. Interpretation belongs in ``client.py``; this layer
|
||||
knows frames, offsets and sequencing, and nothing about what a field means.
|
||||
|
||||
Scope: **reads only.** Nothing here writes, erases, or changes monitoring
|
||||
state. That is deliberate and worth keeping — no command has ever been
|
||||
originated against a unit by this project; every write in
|
||||
``docs/micromate_protocol_reference.md`` was performed by THOR while we
|
||||
recorded. The first thing this codebase ever sends to a customer's instrument
|
||||
should be a decision someone made on purpose, not a side effect of a client
|
||||
that grew a method.
|
||||
|
||||
Every offset and params layout below was read off THOR's own frames in
|
||||
``bridges/captures/9-24-26 - micromate2/`` rather than taken from the spec
|
||||
table, because the same exercise during the framing work found three of that
|
||||
table's rules wrong. It found three more here:
|
||||
|
||||
* ``0x0A`` is the **monitor-log walk** — the same request repeated, the
|
||||
device advancing its own cursor, terminated by a short response — not the
|
||||
keyed "event header, 30 B list record" the spec describes.
|
||||
* ``0x1E``/``0x1F`` carry **token 0xFE** at ``params[7]``. The protocol
|
||||
reference documents all-zero params for the browse walk; that was our own
|
||||
probing, and THOR does not do it that way.
|
||||
* There is **no fixed preamble**. Sessions open with ``POLL`` and go
|
||||
straight to the operation. ``POLL → SERIAL → 0x49 → POLL`` appears in 3 of
|
||||
8 captured sessions and is THOR's *connection check*, not a handshake.
|
||||
|
||||
And one useful negative: **no ``SESSION_RESET`` (``41 03``).** Series III
|
||||
needs that 2-byte signal to wake a monitoring unit or it will not answer POLL
|
||||
over TCP. THOR never sends it — 0 occurrences across all 8 sessions, including
|
||||
40 frames exchanged with a unit that *was* monitoring.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
import math
|
||||
import struct
|
||||
import time
|
||||
from typing import Optional
|
||||
|
||||
from minimateplus.transport import BaseTransport
|
||||
|
||||
from .framing import MicromateFrame, MicromateFrameParser, build_request
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
DEFAULT_RECV_TIMEOUT = 10.0
|
||||
|
||||
# An acknowledgement carries an 11-byte data section and nothing else. It is
|
||||
# also how the monitor-log walk says "no more records".
|
||||
ACK_DATA_LEN = 11
|
||||
|
||||
|
||||
# ── Command SUBs ──────────────────────────────────────────────────────────────
|
||||
|
||||
SUB_DEVICE_INFO = 0x01
|
||||
SUB_STORAGE_RANGE = 0x06
|
||||
SUB_EVENT_INDEX = 0x08
|
||||
SUB_MONITOR_LOG = 0x0A
|
||||
SUB_EVENT_RECORD = 0x0C
|
||||
SUB_SERIAL = 0x15
|
||||
SUB_COMPLIANCE_CONFIG = 0x1A
|
||||
SUB_MONITOR_STATUS = 0x1C
|
||||
SUB_EVENT_FIRST = 0x1E
|
||||
SUB_EVENT_NEXT = 0x1F
|
||||
SUB_CALL_HOME_CONFIG = 0x2C
|
||||
SUB_TRIGGER_CONFIG = 0x2E
|
||||
SUB_SETUP_FIRST = 0x3F
|
||||
SUB_SETUP_NEXT = 0x40
|
||||
SUB_SETUP_ACTIVE = 0x41
|
||||
SUB_STATE = 0x49
|
||||
SUB_BULK_DOWNLOAD = 0x5A
|
||||
SUB_POLL = 0x5B
|
||||
SUB_ARM_EVENT = 0x93
|
||||
|
||||
# ⚠ Reads are SINGLE-STEP. Series III probes at offset 0 to learn the length,
|
||||
# then reads again at that length; a Micromate returns the whole block when
|
||||
# asked for 0xFFFF. THOR never probes, which is why `MicromateFrame.probe_length`
|
||||
# reads 0 on live traffic.
|
||||
READ_ALL = 0xFFFF
|
||||
|
||||
# The two commands that do NOT use READ_ALL, and the data length each returned
|
||||
# on UM12947 (firmware 11.0CB).
|
||||
_OFFSETS = {
|
||||
SUB_POLL: 0x0030, # 59 B — the one offset THOR treats as a constant
|
||||
SUB_SERIAL: 0x000A, # 21 B
|
||||
}
|
||||
|
||||
# Data-section lengths observed, for orientation only — deliberately NOT
|
||||
# asserted. `SUB 0x1C` is 4 bytes longer on the Thor firmware line (0x30 vs
|
||||
# 0x2C declared), so a length check here would fire spuriously on half the
|
||||
# fleet. See the protocol reference, "A/B: Blastware build vs Thor build".
|
||||
OBSERVED_DATA_LEN = {
|
||||
SUB_STORAGE_RANGE: 47, SUB_EVENT_INDEX: 101, SUB_MONITOR_LOG: 297,
|
||||
SUB_EVENT_RECORD: 221, SUB_SERIAL: 21, SUB_COMPLIANCE_CONFIG: 2103,
|
||||
SUB_MONITOR_STATUS: 55, SUB_EVENT_FIRST: 19, SUB_EVENT_NEXT: 19,
|
||||
SUB_CALL_HOME_CONFIG: 137, SUB_TRIGGER_CONFIG: 39,
|
||||
SUB_SETUP_FIRST: 266, SUB_SETUP_NEXT: 266, SUB_SETUP_ACTIVE: 266,
|
||||
SUB_STATE: 16, SUB_POLL: 59, SUB_ARM_EVENT: ACK_DATA_LEN,
|
||||
}
|
||||
|
||||
# `1E`/`1F` carry this at params[7]. Series III uses the same value to arm its
|
||||
# bulk stream; here THOR sends it on every chain read, browse or download.
|
||||
EVENT_TOKEN = 0xFE
|
||||
|
||||
# `SUB 0x5A` chunk size, in bytes of file payload per response.
|
||||
CHUNK_SIZE = 1024
|
||||
|
||||
# Every `0x5A` response prefixes the file bytes with 11 bytes of header.
|
||||
_CHUNK_PREFIX = 11
|
||||
|
||||
|
||||
# ── Exceptions ────────────────────────────────────────────────────────────────
|
||||
|
||||
class ProtocolError(Exception):
|
||||
"""The device violated the expected protocol."""
|
||||
|
||||
|
||||
class TimeoutError(ProtocolError):
|
||||
"""No response arrived within the allowed time."""
|
||||
|
||||
|
||||
class ChecksumError(ProtocolError):
|
||||
"""A received frame failed its checksum."""
|
||||
|
||||
|
||||
class UnexpectedResponse(ProtocolError):
|
||||
"""The response SUB did not match the request."""
|
||||
|
||||
|
||||
class ShortRead(ProtocolError):
|
||||
"""A bulk download returned fewer bytes than the device promised."""
|
||||
|
||||
|
||||
# ── Params builders ───────────────────────────────────────────────────────────
|
||||
|
||||
def token_params(token: int = EVENT_TOKEN) -> bytes:
|
||||
"""`1E`/`1F`: the token sits at params[7]."""
|
||||
return bytes(7) + bytes([token]) + bytes(2)
|
||||
|
||||
|
||||
def key_params(key4: bytes) -> bytes:
|
||||
"""`0x0C`: the full 4-byte event key at params[4:8]."""
|
||||
if len(key4) != 4:
|
||||
raise ValueError(f"key4 must be 4 bytes, got {len(key4)}")
|
||||
return bytes(4) + key4 + bytes(2)
|
||||
|
||||
|
||||
def key_lo_params(key4: bytes) -> bytes:
|
||||
"""`0x0A`: only the key's **low two bytes**, at params[6:8].
|
||||
|
||||
⚠ Inferred from a single key value. All nine captured `0x0A` frames carry
|
||||
`4a 81`, and the event key in play was `055d4a81` — so this is consistent
|
||||
with "the low half of the current key" and equally consistent with "a
|
||||
cursor handle that happened to equal it". Both readings produce the same
|
||||
bytes for that key, so one event cannot separate them.
|
||||
|
||||
It does not matter much in practice: the walk works with the same params
|
||||
repeated, so whichever it is, passing the current key is right.
|
||||
"""
|
||||
if len(key4) != 4:
|
||||
raise ValueError(f"key4 must be 4 bytes, got {len(key4)}")
|
||||
return bytes(6) + key4[2:4] + bytes(2)
|
||||
|
||||
|
||||
def chunk_params(key4: bytes, byte_offset: int) -> bytes:
|
||||
"""`0x5A`: the key opens the file, then a byte offset walks it.
|
||||
|
||||
Chunk 0 carries the event key at params[0:4] — that is what says "from the
|
||||
beginning". Later chunks carry a uint16 BE byte offset at params[2:4].
|
||||
"""
|
||||
if byte_offset == 0:
|
||||
if len(key4) != 4:
|
||||
raise ValueError(f"key4 must be 4 bytes, got {len(key4)}")
|
||||
return key4 + bytes(6)
|
||||
if not 0 <= byte_offset <= 0xFFFF:
|
||||
raise ValueError(f"byte_offset must fit in uint16, got {byte_offset}")
|
||||
return bytes(2) + struct.pack(">H", byte_offset) + bytes(6)
|
||||
|
||||
|
||||
# ── Protocol ──────────────────────────────────────────────────────────────────
|
||||
|
||||
class MicromateProtocol:
|
||||
"""Wire-level command set for one open connection to a Micromate.
|
||||
|
||||
Does not own the transport; lifetime belongs to the client.
|
||||
|
||||
proto = MicromateProtocol(transport)
|
||||
proto.poll()
|
||||
serial = proto.read_serial()
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
transport: BaseTransport,
|
||||
recv_timeout: float = DEFAULT_RECV_TIMEOUT,
|
||||
strict_checksums: bool = True,
|
||||
) -> None:
|
||||
"""
|
||||
Args:
|
||||
strict_checksums: raise on a bad checksum. **Defaults to True,
|
||||
unlike the Series III sibling**, which logs and continues
|
||||
because its parser cannot reliably tell an inner-frame
|
||||
delimiter from a checksum byte. That excuse does not apply
|
||||
here: the Micromate rule is plain SUM8 over the de-stuffed
|
||||
payload and it holds on 251 of 251 captured frames, so a
|
||||
mismatch means something real — line noise, a desync, or a rule
|
||||
we have wrong — and all three are worth hearing about.
|
||||
|
||||
The lenient Series III default is instructive: it hid the fact
|
||||
that the documented checksum rule was wrong for two days. Set
|
||||
False only to get a field diagnosis unstuck.
|
||||
"""
|
||||
self._transport = transport
|
||||
self._recv_timeout = recv_timeout
|
||||
self._strict = strict_checksums
|
||||
self._parser = MicromateFrameParser()
|
||||
self._pending: list[MicromateFrame] = []
|
||||
|
||||
# ── Identity and state ────────────────────────────────────────────────────
|
||||
|
||||
def poll(self) -> MicromateFrame:
|
||||
"""`0x5B` → `0xA4`. Handshake; carries the ID block and model string.
|
||||
|
||||
Every captured session opens with this and nothing before it.
|
||||
"""
|
||||
return self._exchange(SUB_POLL)
|
||||
|
||||
def read_serial(self) -> bytes:
|
||||
"""`0x15` → `0xEA`. ASCII, null-terminated — e.g. `UM12947`."""
|
||||
return self._read(SUB_SERIAL)
|
||||
|
||||
def read_device_info(self) -> bytes:
|
||||
"""`0x01` → `0xFE`. Firmware, calibration, per-channel float block.
|
||||
|
||||
⚠ THOR never sends this in any captured session, so the `0xFFFF` offset
|
||||
is from our own 2026-09-23 probes rather than from THOR's behaviour. It
|
||||
answered correctly on both firmware lines, but it is the one read here
|
||||
with no THOR frame behind it.
|
||||
"""
|
||||
return self._read(SUB_DEVICE_INFO)
|
||||
|
||||
def read_state(self) -> bytes:
|
||||
"""`0x49` → `0xB6`. A cheap monitoring check; 16 B.
|
||||
|
||||
⚠ Test `data[11]` for **non-zero**, never against a constant — it has
|
||||
read both `0x0E` and `0x0C` while monitoring.
|
||||
"""
|
||||
return self._read(SUB_STATE)
|
||||
|
||||
def read_monitor_status(self) -> bytes:
|
||||
"""`0x1C` → `0xE3`. Flag, **device clock**, battery, memory.
|
||||
|
||||
⚠ Parse **forward** from the declared length, never backward from the
|
||||
end. This block is 4 bytes longer on the Thor firmware line, and Series
|
||||
III's relative-to-end offsets yield a battery voltage of 577.92 V on a
|
||||
`11.0BD` unit.
|
||||
"""
|
||||
return self._read(SUB_MONITOR_STATUS)
|
||||
|
||||
def read_storage_range(self) -> bytes:
|
||||
"""`0x06` → `0xF9`. Event storage extent; 47 B."""
|
||||
return self._read(SUB_STORAGE_RANGE)
|
||||
|
||||
def read_event_index(self) -> bytes:
|
||||
"""`0x08` → `0xF7`. 101 B. Contents not yet mapped."""
|
||||
return self._read(SUB_EVENT_INDEX)
|
||||
|
||||
def read_trigger_config(self) -> bytes:
|
||||
"""`0x2E` → `0xD1`. 39 B. Series IV only; no Series III equivalent."""
|
||||
return self._read(SUB_TRIGGER_CONFIG)
|
||||
|
||||
def read_compliance_config(self) -> bytes:
|
||||
"""`0x1A` → `0xE5`. The whole active setup — 2103 B on UM12947.
|
||||
|
||||
One response. Series III needs a 4-frame sequence for the same thing.
|
||||
"""
|
||||
return self._read(SUB_COMPLIANCE_CONFIG)
|
||||
|
||||
def read_call_home_config(self) -> bytes:
|
||||
"""`0x2C` → `0xD3`. 137 B — Series III's is 124, so do not reuse its map."""
|
||||
return self._read(SUB_CALL_HOME_CONFIG)
|
||||
|
||||
# ── Setups ────────────────────────────────────────────────────────────────
|
||||
|
||||
def read_active_setup_name(self) -> bytes:
|
||||
"""`0x41` → `0xBE`. 266 B; carries the active `.MMB` name."""
|
||||
return self._read(SUB_SETUP_ACTIVE)
|
||||
|
||||
def read_first_setup(self) -> bytes:
|
||||
"""`0x3F` → `0xC0`. Head of the setup-file list."""
|
||||
return self._read(SUB_SETUP_FIRST)
|
||||
|
||||
def read_next_setup(self) -> bytes:
|
||||
"""`0x40` → `0xBF`. Repeat until the record carries an empty name.
|
||||
|
||||
Stateful: the device holds the cursor, so the same request walks the
|
||||
list. 22 of these appear back to back in one captured session.
|
||||
"""
|
||||
return self._read(SUB_SETUP_NEXT)
|
||||
|
||||
# ── Event chain ───────────────────────────────────────────────────────────
|
||||
|
||||
def arm_event(self) -> MicromateFrame:
|
||||
"""`0x93` → `0x6C`. THOR sends this before **every** `1E`/`1F`.
|
||||
|
||||
It replaces Series III's `1E(token=0xFE)` arming step. No params, no
|
||||
offset payload — an 11-byte ack.
|
||||
|
||||
⚠ Whether a unit actually requires it is untested. Do it because it is
|
||||
known-good, not because it is known-necessary.
|
||||
"""
|
||||
return self._exchange(SUB_ARM_EVENT, offset=READ_ALL)
|
||||
|
||||
def read_event_first(self) -> bytes:
|
||||
"""`0x1E` → `0xE1`. First event key + size; 19 B."""
|
||||
return self._read(SUB_EVENT_FIRST, params=token_params())
|
||||
|
||||
def read_event_next(self) -> bytes:
|
||||
"""`0x1F` → `0xE0`. Next key + size, or the all-zero null sentinel."""
|
||||
return self._read(SUB_EVENT_NEXT, params=token_params())
|
||||
|
||||
def read_event_record(self, key4: bytes) -> bytes:
|
||||
"""`0x0C` → `0xF3`. 221 B — project, client, operator, timestamp, peaks.
|
||||
|
||||
⚠ The peak float in here runs 2–5% above `max(T,V,L)` and is **not** the
|
||||
vector sum; its offset was inferred, not established. Prefer decoded
|
||||
samples.
|
||||
"""
|
||||
return self._read(SUB_EVENT_RECORD, params=key_params(key4))
|
||||
|
||||
def read_monitor_log_next(self, key4: bytes) -> Optional[bytes]:
|
||||
"""`0x0A` → `0xF5`. One monitor-log record, or None at end of list.
|
||||
|
||||
⚠ Not the keyed single read the spec describes. This is a **walk**:
|
||||
the same request repeated, the device advancing its own cursor, each
|
||||
response a 297-byte record carrying serial, mode and thresholds. The
|
||||
list ends with a bare 11-byte ack — nine captured frames, eight records
|
||||
then the terminator.
|
||||
|
||||
Series III reaches the same data through a record-type discriminator on
|
||||
its event walk (`0x2C` partial vs `0x46` full). Here it is a separate
|
||||
cursor and the event chain does not see it at all.
|
||||
"""
|
||||
data = self._read(SUB_MONITOR_LOG, params=key_lo_params(key4))
|
||||
return None if len(data) <= ACK_DATA_LEN else data
|
||||
|
||||
# ── Bulk download ─────────────────────────────────────────────────────────
|
||||
|
||||
def read_event_file(self, key4: bytes, size: int) -> bytes:
|
||||
"""`0x5A` → `0xA5`. The `.IDFW`/`.IDFH` file, byte for byte.
|
||||
|
||||
`size` is the 4 bytes after the key in the `1E`/`1F` response. Returns
|
||||
exactly that many bytes, or raises `ShortRead`.
|
||||
|
||||
A bounded chunk walk — `ceil(size / 1024)` requests, each asking for
|
||||
`min(1024, remaining)` bytes:
|
||||
|
||||
offset = the byte count wanted (NOT an address)
|
||||
params = the key on chunk 0, then a uint16 BE byte offset
|
||||
response = exactly `offset + 11` bytes; file bytes are data[11:]
|
||||
|
||||
Verified against THOR on all six bench events (4,076 → 13,424 B):
|
||||
`sum(offsets) == size` exactly, every time.
|
||||
|
||||
⚠ Do not port the Series III `5A` walk. Its address arithmetic caused a
|
||||
5x over-read and a `>64 KB` page-boundary bug that is *still open* on
|
||||
that side. Neither applies here — the cursor is a byte offset into the
|
||||
file, bounded by a size the device supplied, so it cannot run past the
|
||||
event.
|
||||
|
||||
The result feeds `micromate.idf_file.read_idf_file()` and
|
||||
`/db/import/idf_file` unchanged; no new codec work is needed.
|
||||
"""
|
||||
if size <= 0:
|
||||
raise ValueError(f"size must be positive, got {size}")
|
||||
|
||||
out = bytearray()
|
||||
n_chunks = math.ceil(size / CHUNK_SIZE)
|
||||
for i in range(n_chunks):
|
||||
want = min(CHUNK_SIZE, size - i * CHUNK_SIZE)
|
||||
data = self._read(
|
||||
SUB_BULK_DOWNLOAD,
|
||||
offset=want,
|
||||
params=chunk_params(key4, i * CHUNK_SIZE),
|
||||
)
|
||||
if len(data) < _CHUNK_PREFIX:
|
||||
raise ShortRead(
|
||||
f"chunk {i + 1}/{n_chunks} of {key4.hex()}: "
|
||||
f"{len(data)} B is too short to hold a chunk header"
|
||||
)
|
||||
body = data[_CHUNK_PREFIX:]
|
||||
if len(body) != want:
|
||||
# Worth being loud: a silently short event is the failure mode
|
||||
# this project has been bitten by repeatedly on the Series III
|
||||
# side, and here the expected length is known up front.
|
||||
raise ShortRead(
|
||||
f"chunk {i + 1}/{n_chunks} of {key4.hex()}: asked for "
|
||||
f"{want} B, got {len(body)}"
|
||||
)
|
||||
out += body
|
||||
|
||||
if len(out) != size:
|
||||
raise ShortRead(
|
||||
f"{key4.hex()}: assembled {len(out)} B, device promised {size}"
|
||||
)
|
||||
log.debug("downloaded %s: %d B in %d chunks", key4.hex(), len(out), n_chunks)
|
||||
return bytes(out)
|
||||
|
||||
# ── Plumbing ──────────────────────────────────────────────────────────────
|
||||
|
||||
def _read(
|
||||
self,
|
||||
sub: int,
|
||||
*,
|
||||
params: bytes = bytes(10),
|
||||
offset: Optional[int] = None,
|
||||
timeout: Optional[float] = None,
|
||||
) -> bytes:
|
||||
"""Send one read command, return the response's data section."""
|
||||
return self._exchange(sub, params=params, offset=offset, timeout=timeout).data
|
||||
|
||||
def _exchange(
|
||||
self,
|
||||
sub: int,
|
||||
*,
|
||||
params: bytes = bytes(10),
|
||||
offset: Optional[int] = None,
|
||||
timeout: Optional[float] = None,
|
||||
) -> MicromateFrame:
|
||||
if offset is None:
|
||||
offset = _OFFSETS.get(sub, READ_ALL)
|
||||
# Start every exchange clean: drop any half-frame and any frame left
|
||||
# stashed by the last one. This is a strict request/response protocol,
|
||||
# so anything already buffered when we send is by definition stale, and
|
||||
# `expected_sub` would reject it anyway — better to discard it here than
|
||||
# to raise a confusing UnexpectedResponse one command later.
|
||||
self._parser.reset()
|
||||
self._pending.clear()
|
||||
self._send(build_request(sub, offset, params))
|
||||
return self._recv_one(expected_sub=0xFF - sub, timeout=timeout,
|
||||
reset_parser=False)
|
||||
|
||||
def _send(self, frame: bytes) -> None:
|
||||
log.debug("TX %d bytes: %s", len(frame), frame.hex())
|
||||
self._transport.write(frame)
|
||||
|
||||
def _recv_one(
|
||||
self,
|
||||
expected_sub: Optional[int] = None,
|
||||
timeout: Optional[float] = None,
|
||||
reset_parser: bool = True,
|
||||
) -> MicromateFrame:
|
||||
"""Read until one complete frame is parsed."""
|
||||
deadline = time.monotonic() + (timeout or self._recv_timeout)
|
||||
if reset_parser:
|
||||
self._parser.reset()
|
||||
self._pending.clear()
|
||||
|
||||
if self._pending:
|
||||
return self._validate(self._pending.pop(0), expected_sub)
|
||||
|
||||
while time.monotonic() < deadline:
|
||||
chunk = self._transport.read(4096)
|
||||
if not chunk:
|
||||
time.sleep(0.005)
|
||||
continue
|
||||
log.debug("RX %d bytes", len(chunk))
|
||||
frames = self._parser.feed(chunk)
|
||||
if frames:
|
||||
self._pending.extend(frames[1:])
|
||||
return self._validate(frames[0], expected_sub)
|
||||
|
||||
raise TimeoutError(
|
||||
f"no frame in {timeout or self._recv_timeout:.1f}s"
|
||||
+ (f" (expected SUB 0x{expected_sub:02X})" if expected_sub is not None else "")
|
||||
+ f"; {self._parser.bytes_fed} bytes were received"
|
||||
# That byte count is the whole point: it separates "nothing came
|
||||
# back at all" from "bytes arrived but never framed", and those have
|
||||
# completely different causes. It earned its keep on Series III.
|
||||
)
|
||||
|
||||
def _validate(
|
||||
self, frame: MicromateFrame, expected_sub: Optional[int]
|
||||
) -> MicromateFrame:
|
||||
if not frame.checksum_valid:
|
||||
msg = (
|
||||
f"SUB 0x{frame.sub:02X}: checksum mismatch "
|
||||
f"(got 0x{frame.chk_byte:02X}, {len(frame.data)} B data)"
|
||||
)
|
||||
if self._strict:
|
||||
raise ChecksumError(msg)
|
||||
log.warning("%s — continuing (strict_checksums=False)", msg)
|
||||
if expected_sub is not None and frame.sub != expected_sub:
|
||||
raise UnexpectedResponse(
|
||||
f"expected SUB 0x{expected_sub:02X}, got 0x{frame.sub:02X}"
|
||||
)
|
||||
return frame
|
||||
@@ -0,0 +1,89 @@
|
||||
r"""Decode the Thor / Micromate (series-4) sensor self-check waveforms from an
|
||||
IDFW event binary.
|
||||
|
||||
Reverse-engineered 2026-09-15 against 4 UM (Thor) oracle events. The IDFW
|
||||
binary carries the sensor self-check in its fixed-header region (before the
|
||||
waveform body), as up to four records tagged ``01 0e 3c/3d/3e/3f`` — the SAME
|
||||
channel ids as the series-3 MiniMate Plus (Tran / Vert / Long / MicL), which is
|
||||
the physical self-test:
|
||||
|
||||
* 3c / 3d / 3e = Tran / Vert / Long geophone ring-downs (a damped impulse
|
||||
response — resonant frequency + damping).
|
||||
* 3f = MicL pulse train (the mic's known-signal gain check). Absent
|
||||
on three-channel (mic-disabled) units.
|
||||
|
||||
Record framing (per record)::
|
||||
|
||||
01 0e [id:1] [flags:3] [count:2 BE] [pad:10] [int16-BE samples × count]
|
||||
\___ 18-byte header ___/
|
||||
|
||||
Unlike series-3's delta-coded trailing block, series-4 stores each trace as a
|
||||
raw int16 big-endian array. ``count`` (the 2-byte field at header offset +8)
|
||||
is the sample count; the record is padded to a fixed stride after that.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import struct
|
||||
from typing import Dict, List
|
||||
|
||||
# Record id → channel. Same ids/order as series-3 (minimateplus.sensor_check).
|
||||
_ID_TO_CHANNEL = {0x3C: "Tran", 0x3D: "Vert", 0x3E: "Long", 0x3F: "MicL"}
|
||||
_CHAIN_IDS = (0x3C, 0x3D, 0x3E, 0x3F)
|
||||
|
||||
_MARKER = b"\x01\x0e" # precedes the 1-byte channel id
|
||||
_HEADER_LEN = 18 # bytes from the marker start to the first sample
|
||||
_COUNT_OFF = 8 # 2-byte BE sample count, from the marker start
|
||||
_MAX_COUNT = 4000 # sanity cap (traces are ~70-200 samples)
|
||||
|
||||
|
||||
def _find_chain(raw: bytes):
|
||||
"""Locate the sensor-check record chain. Returns a list of
|
||||
``(offset, id, count)`` for the first run of markers whose ids run
|
||||
3c, 3d, 3e[, 3f] in order, or ``[]``.
|
||||
|
||||
Records are padded to a fixed stride, so the next marker is not at
|
||||
``header + count*2``; instead collect every ``01 0e [id]`` marker with a
|
||||
sane count and take the first id-ordered run. Validating the id sequence
|
||||
(not a lone ``01 0e 3c``) keeps a stray marker in the waveform body from
|
||||
matching — the real chain sits in the fixed header, ahead of the body.
|
||||
"""
|
||||
n = len(raw)
|
||||
markers = []
|
||||
for p in range(n - _HEADER_LEN):
|
||||
if raw[p:p + 2] == _MARKER and raw[p + 2] in _ID_TO_CHANNEL:
|
||||
count = int.from_bytes(raw[p + _COUNT_OFF:p + _COUNT_OFF + 2], "big")
|
||||
if 0 < count <= _MAX_COUNT:
|
||||
markers.append((p, raw[p + 2], count))
|
||||
|
||||
for i, (off, rid, _c) in enumerate(markers):
|
||||
if rid != 0x3C:
|
||||
continue
|
||||
run = [markers[i]]
|
||||
for m in markers[i + 1:]:
|
||||
if len(run) < len(_CHAIN_IDS) and m[1] == _CHAIN_IDS[len(run)]:
|
||||
run.append(m)
|
||||
else:
|
||||
break
|
||||
if len(run) >= 3: # 3-channel (mic-disabled) units are valid
|
||||
return run
|
||||
return []
|
||||
|
||||
|
||||
def decode_idf_sensor_check(raw: bytes) -> Dict[str, List[int]]:
|
||||
"""Decode the sensor self-check traces from a Thor/Micromate IDFW binary.
|
||||
|
||||
Returns ``{"Tran": [...], "Vert": [...], "Long": [...], "MicL": [...]}`` in
|
||||
raw int16 ADC counts (MicL omitted on 3-channel units), or ``{}`` if the
|
||||
binary carries no sensor-check chain (a non-IDF file, or an IDFH histogram).
|
||||
"""
|
||||
chain = _find_chain(raw)
|
||||
if not chain:
|
||||
return {}
|
||||
out: Dict[str, List[int]] = {}
|
||||
for off, rid, count in chain:
|
||||
start = off + _HEADER_LEN
|
||||
blob = raw[start:start + count * 2]
|
||||
if len(blob) < count * 2:
|
||||
continue
|
||||
out[_ID_TO_CHANNEL[rid]] = list(struct.unpack(">%dh" % count, blob))
|
||||
return out
|
||||
@@ -50,7 +50,7 @@ SIDECAR_KIND = "sfm.event"
|
||||
# bumped without a `pip install` re-run — leading to confusing stale
|
||||
# version stamps in sidecars. Bump this constant and CHANGELOG.md
|
||||
# together at release time.
|
||||
TOOL_VERSION = "0.30.0"
|
||||
TOOL_VERSION = "0.31.0" # +/sensor_check group (schema v2); gates the backfill regen
|
||||
|
||||
try:
|
||||
# Best-effort: prefer the installed metadata when it's NEWER than the
|
||||
@@ -296,6 +296,16 @@ def apply_report_to_event(event: Event, report: BwAsciiReport) -> None:
|
||||
event.sample_rate = report.sample_rate_sps
|
||||
if report.record_time_s is not None:
|
||||
event.rectime_seconds = report.record_time_s
|
||||
# The report's event_datetime is Blastware's exact trigger time (parsed
|
||||
# from Event Time + Event Date). Prefer it over the binary footer's stop
|
||||
# time so a report-paired import matches BW to the second.
|
||||
edt = report.event_datetime
|
||||
if edt is not None:
|
||||
event.timestamp = Timestamp(
|
||||
raw=b"", flag=0x10,
|
||||
year=edt.year, unknown_byte=0, month=edt.month, day=edt.day,
|
||||
hour=edt.hour, minute=edt.minute, second=edt.second,
|
||||
)
|
||||
|
||||
|
||||
def apply_bw_report_dict_to_event(event: Event, bw_report: dict) -> None:
|
||||
@@ -808,6 +818,30 @@ def derive_record_type_from_filename(filename, default: str = "Waveform") -> str
|
||||
return _RECORD_TYPE_BY_EXT_SUFFIX.get(ext[-1].upper(), default)
|
||||
|
||||
|
||||
# Marker for the recording-setup config block, and the offset of the record-time
|
||||
# float32 within it. The configured post-trigger record time (seconds) is a
|
||||
# big-endian float32 exactly 30 bytes before the "Standard Recording Setup"
|
||||
# label. Verified across the corpus reading 1.0 / 2.0 / 3.0 s on different
|
||||
# setups — and ts2 - record_time reproduces Blastware's trigger to the second
|
||||
# (N844LQHB: stop 10:33:32 - 3.0 = 10:33:29).
|
||||
_RECSETUP_MARKER = b"Standard Recording Setup"
|
||||
_RECTIME_OFFSET_BEFORE_MARKER = 30
|
||||
|
||||
|
||||
def _parse_record_time_seconds(raw: bytes) -> Optional[float]:
|
||||
"""The configured post-trigger record time in seconds, from the recording-
|
||||
setup config block, or None when absent / implausible."""
|
||||
a = raw.find(_RECSETUP_MARKER)
|
||||
if a < _RECTIME_OFFSET_BEFORE_MARKER:
|
||||
return None
|
||||
off = a - _RECTIME_OFFSET_BEFORE_MARKER
|
||||
try:
|
||||
rt = struct.unpack(">f", raw[off:off + 4])[0]
|
||||
except struct.error:
|
||||
return None
|
||||
return rt if 0.05 <= rt <= 600.0 else None
|
||||
|
||||
|
||||
def read_blastware_file(path: Union[str, Path]) -> Event:
|
||||
"""
|
||||
Parse a Blastware waveform file into an Event.
|
||||
@@ -917,6 +951,10 @@ def read_blastware_file(path: Union[str, Path]) -> Event:
|
||||
# rest of the event (timestamp, waveform_key, project strings) is
|
||||
# still recoverable and useful.
|
||||
decoded = decode_waveform_v2(body)
|
||||
# Discriminator for the timestamp logic below: a waveform (trigger) event
|
||||
# vs a histogram window. Keyed on the codec, not the filename — the
|
||||
# save_imported_bw path passes a tmp ".bw" name whose extension lies.
|
||||
is_waveform_body = decoded is not None
|
||||
if decoded is None:
|
||||
decoded = decode_histogram_body(body)
|
||||
if decoded is None:
|
||||
@@ -948,7 +986,31 @@ def read_blastware_file(path: Union[str, Path]) -> Event:
|
||||
ev.total_samples = strt_fields.get("total_samples")
|
||||
ev.pretrig_samples = strt_fields.get("pretrig_samples")
|
||||
|
||||
if ts1 is not None:
|
||||
# Event timestamp. The footer's two timestamps mean different things by
|
||||
# record type:
|
||||
# * Waveform: ts1 = the monitoring-SESSION start (shared across every
|
||||
# event that day — a unit arming at 06:00 stamps 06:00 on all of them),
|
||||
# ts2 = THIS event's recording STOP. Blastware's Date/Time is the
|
||||
# TRIGGER = ts2 - record time, and the record time is a float32 in the
|
||||
# recording-setup config block (see _parse_record_time_seconds), so the
|
||||
# exact trigger is recoverable from the binary alone. Falls back to ts2
|
||||
# (the stop, within the record duration) if the config block is absent.
|
||||
# (Stamping ts1 showed the session start, hours off.)
|
||||
# * Histogram / undecodable: ts1 = the window start, which IS the event
|
||||
# time — keep it.
|
||||
# Discriminate by ``is_waveform_body`` (the codec), not the filename.
|
||||
if is_waveform_body and ts2 is not None:
|
||||
_stop = datetime.datetime(ts2.year, ts2.month, ts2.day,
|
||||
ts2.hour, ts2.minute, ts2.second)
|
||||
_rt = _parse_record_time_seconds(raw)
|
||||
_trig = _stop - datetime.timedelta(seconds=_rt) if _rt is not None else _stop
|
||||
ev.timestamp = Timestamp(
|
||||
raw=footer[10:18],
|
||||
flag=0x10,
|
||||
year=_trig.year, unknown_byte=0, month=_trig.month, day=_trig.day,
|
||||
hour=_trig.hour, minute=_trig.minute, second=_trig.second,
|
||||
)
|
||||
elif ts1 is not None:
|
||||
ev.timestamp = Timestamp(
|
||||
raw=footer[2:10],
|
||||
flag=0x10,
|
||||
@@ -960,6 +1022,11 @@ def read_blastware_file(path: Union[str, Path]) -> Event:
|
||||
project=project, client=client, operator=user, sensor_location=seisloc,
|
||||
)
|
||||
ev.raw_samples = samples
|
||||
# Sensor self-check traces from the binary's trailing block (waveform
|
||||
# events only; returns {} for histograms / when absent). Carried on the
|
||||
# Event so the .h5 writer persists them device-agnostically.
|
||||
from minimateplus.sensor_check import decode_sensor_check
|
||||
ev.sensor_check = decode_sensor_check(raw) or None
|
||||
# Only compute peaks from samples when we actually have samples.
|
||||
# For events the codec couldn't decode (histogram-mode bodies, until
|
||||
# the §7.6.2 histogram codec is wired in), samples is an empty dict
|
||||
|
||||
@@ -544,6 +544,15 @@ class Event:
|
||||
pretrig_samples: Optional[int] = None # from STRT record: pre-trigger sample count
|
||||
rectime_seconds: Optional[int] = None # from STRT record: record duration (seconds)
|
||||
|
||||
# Sensor self-check traces keyed by channel label — the short diagnostic
|
||||
# waveforms the unit records when it pulses each sensor before monitoring
|
||||
# (geophone ring-downs + a mic pulse train). Decoded from the binary by
|
||||
# the per-series decoder (minimateplus.sensor_check / micromate.sensor_check)
|
||||
# and carried here so the .h5 writer can persist them device-agnostically.
|
||||
# Raw ADC counts; the source series' scale differs but the trace is a
|
||||
# shape diagnostic (rendered fit-to-box). None when absent.
|
||||
sensor_check: Optional[dict] = None # {"Tran": [...], ..., "MicL": [...]}
|
||||
|
||||
# ── Debug / introspection ─────────────────────────────────────────────────
|
||||
# Raw 210-byte waveform record bytes, set when debug mode is active.
|
||||
# Exposed by the SFM server via ?debug=true so field layouts can be verified.
|
||||
|
||||
@@ -0,0 +1,146 @@
|
||||
r"""Decode the Blastware sensor self-check waveforms from a series-3 event binary.
|
||||
|
||||
Reverse-engineered 2026-09-15 against 7 BE12844 (MiniMate Plus) oracle events.
|
||||
After the main waveform record-chain and the trailing metadata / per-channel
|
||||
calibration records, the binary carries four length-prefixed records tagged
|
||||
0x3c-0x3f: the sensor self-check traces the unit records when it pulses each
|
||||
sensor before monitoring. Blastware draws these as the little waveforms in the
|
||||
"Sensor Check" strip on the right of the Event Report.
|
||||
|
||||
* 0x3c / 0x3d / 0x3e = Tran / Vert / Long geophone ring-downs (a damped
|
||||
oscillation at the geophone's resonance, ~7-8 Hz at 1024 sps).
|
||||
* 0x3f = MicL, a pulse train at the mic self-test frequency
|
||||
(~20 Hz), whose zero-crossing frequency is BW's mic "Channel Test" freq.
|
||||
|
||||
Record framing (per record, all four chained by their length prefix)::
|
||||
|
||||
[len:2 BE][id:1][00 00][Nchan:1][12-byte header][delta stream][40 02][6B]
|
||||
\_________________ payload (len bytes) _______________________________/
|
||||
|
||||
The delta stream is ``payload[20 : len-8]`` (the ``40 02`` terminator sits at
|
||||
``len-8``, followed by 6 trailing bytes). It uses the exact same 10/20/30/00
|
||||
delta-block tags as the main waveform codec
|
||||
(:mod:`minimateplus.waveform_codec`), decoded here from an implicit anchor of 0
|
||||
— so the traces come out in the same 16-count raw units as the main waveform
|
||||
(LSB = 0.005 in/s at Normal range for the geophones).
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Dict, List
|
||||
|
||||
from minimateplus.waveform_codec import walk_body
|
||||
|
||||
# Record id → channel. Order mirrors the trailing per-channel calibration
|
||||
# records (Tran / Vert / Long / MicL), confirmed against BW's sensor-check
|
||||
# frequencies on all 7 oracle events.
|
||||
_ID_TO_CHANNEL = {0x3C: "Tran", 0x3D: "Vert", 0x3E: "Long", 0x3F: "MicL"}
|
||||
_CHAIN_IDS = (0x3C, 0x3D, 0x3E, 0x3F)
|
||||
|
||||
_HEADER_LEN = 20 # payload bytes before the delta stream
|
||||
_TRAILER_LEN = 8 # 40 02 terminator + 6 trailing bytes after the stream
|
||||
|
||||
|
||||
def _s4(nib: int) -> int:
|
||||
"""Sign-extend a 4-bit nibble delta."""
|
||||
return nib - 16 if nib >= 8 else nib
|
||||
|
||||
|
||||
def _i8(byte: int) -> int:
|
||||
"""Sign-extend an 8-bit int delta."""
|
||||
return byte - 256 if byte >= 128 else byte
|
||||
|
||||
|
||||
def _decode_delta_stream(buf: bytes) -> List[int]:
|
||||
"""Accumulate a 10/20/30/00 delta-block stream from an anchor of 0,
|
||||
stopping at the 0x40 terminator.
|
||||
|
||||
Mirrors the block semantics in
|
||||
:func:`minimateplus.waveform_codec.decode_waveform_v2` (fully decoded &
|
||||
byte-exact as of 2026-05-11); see that module for the format details.
|
||||
"""
|
||||
out: List[int] = []
|
||||
cur = 0
|
||||
for blk in walk_body(buf, 0):
|
||||
fam = blk.tag_hi & 0xF0
|
||||
if fam == 0x10:
|
||||
# nibble deltas, high nibble first
|
||||
for byte in blk.data:
|
||||
for nib in ((byte >> 4) & 0xF, byte & 0xF):
|
||||
cur += _s4(nib)
|
||||
out.append(cur)
|
||||
elif fam == 0x20:
|
||||
# int8 deltas
|
||||
for byte in blk.data:
|
||||
cur += _i8(byte)
|
||||
out.append(cur)
|
||||
elif fam == 0x30:
|
||||
# 12-bit signed deltas, packed as tag_lo/4 groups of 6 bytes
|
||||
for g in range(blk.tag_lo // 4):
|
||||
grp = blk.data[g * 6:(g + 1) * 6]
|
||||
if len(grp) < 6:
|
||||
break
|
||||
high_word = (grp[0] << 8) | grp[1]
|
||||
for k in range(4):
|
||||
nib = (high_word >> (12 - 4 * k)) & 0xF
|
||||
v = (nib << 8) | grp[2 + k]
|
||||
if v >= 0x800:
|
||||
v -= 0x1000
|
||||
cur += v
|
||||
out.append(cur)
|
||||
elif fam == 0x00:
|
||||
# RLE zero-delta run (wide form carries the high nibble in the tag)
|
||||
run = ((blk.tag_hi & 0x0F) << 8) | blk.tag_lo
|
||||
out.extend([cur] * run)
|
||||
elif fam == 0x40:
|
||||
# segment / record terminator
|
||||
break
|
||||
return out
|
||||
|
||||
|
||||
def _find_chain(body: bytes):
|
||||
"""Locate the four length-prefixed sensor-check records.
|
||||
|
||||
Returns a list of ``(offset, id, length)`` or ``None``. The chain is
|
||||
validated by walking the ids 0x3c → 0x3d → 0x3e → 0x3f via their own length
|
||||
prefixes, so a stray 0x3c byte in the waveform data cannot match.
|
||||
"""
|
||||
for p in range(len(body) - 6):
|
||||
if body[p + 2] == 0x3C and body[p + 3] == 0 and body[p + 4] == 0:
|
||||
q = p
|
||||
recs = []
|
||||
ok = True
|
||||
for expect in _CHAIN_IDS:
|
||||
if q + 3 > len(body) or body[q + 2] != expect:
|
||||
ok = False
|
||||
break
|
||||
length = int.from_bytes(body[q:q + 2], "big")
|
||||
recs.append((q, expect, length))
|
||||
q = q + 2 + length
|
||||
if ok and len(recs) == 4:
|
||||
return recs
|
||||
return None
|
||||
|
||||
|
||||
def decode_sensor_check(raw: bytes) -> Dict[str, List[int]]:
|
||||
"""Decode the four sensor self-check traces from a series-3 event binary.
|
||||
|
||||
Returns ``{"Tran": [...], "Vert": [...], "Long": [...], "MicL": [...]}`` in
|
||||
raw decode units (same 16-count LSB as the main waveform), or ``{}`` if the
|
||||
binary carries no sensor-check block (a histogram event, a non-series-3
|
||||
file, or a unit/firmware that doesn't store it).
|
||||
"""
|
||||
strt = raw.find(b"STRT")
|
||||
if strt < 0 or len(raw) < strt + 21 + 26:
|
||||
return {}
|
||||
body = raw[strt + 21: len(raw) - 26]
|
||||
chain = _find_chain(body)
|
||||
if not chain:
|
||||
return {}
|
||||
out: Dict[str, List[int]] = {}
|
||||
for off, rid, length in chain:
|
||||
payload = body[off + 2: off + 2 + length]
|
||||
if len(payload) < _HEADER_LEN + _TRAILER_LEN:
|
||||
continue
|
||||
stream = payload[_HEADER_LEN: length - _TRAILER_LEN]
|
||||
out[_ID_TO_CHANNEL[rid]] = _decode_delta_stream(stream)
|
||||
return out
|
||||
+1
-1
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "seismo-relay"
|
||||
version = "0.30.0"
|
||||
version = "0.31.0"
|
||||
description = "Python client and REST server for MiniMate Plus seismographs"
|
||||
requires-python = ">=3.10"
|
||||
dependencies = [
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
"""Pretend to be a Micromate on a serial port: log what arrives, reply to POLL.
|
||||
|
||||
Proves the modem's return path (serial -> TCP) independently of the real unit.
|
||||
"""
|
||||
import os, select, sys, termios, time
|
||||
|
||||
path, baud = sys.argv[1], int(sys.argv[2]) if len(sys.argv) > 2 else 115200
|
||||
B = {9600: termios.B9600, 38400: termios.B38400, 115200: termios.B115200}[baud]
|
||||
fd = os.open(path, os.O_RDWR | os.O_NOCTTY | os.O_NONBLOCK)
|
||||
a = termios.tcgetattr(fd)
|
||||
a[0] = a[1] = a[3] = 0
|
||||
a[2] = termios.CS8 | termios.CREAD | termios.CLOCAL
|
||||
a[4] = a[5] = B
|
||||
a[6] = list(a[6]); a[6][termios.VMIN] = 0; a[6][termios.VTIME] = 0
|
||||
termios.tcsetattr(fd, termios.TCSANOW, a)
|
||||
termios.tcflush(fd, termios.TCIOFLUSH)
|
||||
|
||||
# A real POLL probe reply, captured from UM12947 on 2026-09-24.
|
||||
REPLY = bytes.fromhex("0200c5a4000000000000300000000000000099") + b"\x03"
|
||||
|
||||
print(f"fake unit on {path} @ {baud}; will answer any inbound frame", flush=True)
|
||||
while True:
|
||||
r, _, _ = select.select([fd], [], [], 1.0)
|
||||
if not r:
|
||||
continue
|
||||
data = os.read(fd, 4096)
|
||||
if not data:
|
||||
continue
|
||||
ts = time.strftime("%H:%M:%S")
|
||||
print(f"{ts} IN {len(data):3} B {data.hex(' ')}", flush=True)
|
||||
time.sleep(0.02)
|
||||
os.write(fd, REPLY)
|
||||
print(f"{ts} OUT {len(REPLY):3} B {REPLY.hex(' ')} <- canned POLL reply", flush=True)
|
||||
@@ -0,0 +1,223 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
mm_frame_parse.py — parse Micromate (Series IV) frames out of a seismo_lab
|
||||
raw capture pair.
|
||||
|
||||
Why this exists
|
||||
---------------
|
||||
`minimateplus.framing.S3FrameParser` cannot see Micromate traffic. It locates
|
||||
frames by scanning for `DLE STX`, and a Micromate response has **no leading
|
||||
DLE** — it starts at a bare `STX`. It also expects `payload[1] == 0x10`, where
|
||||
the Micromate sends `0xC5` (Blastware firmware) or `0x03` (Thor firmware).
|
||||
|
||||
The practical consequence, seen on the 9-24-26 setup-push capture: the
|
||||
Blastware-side requests parse fine (Thor emits Series III request frames), but
|
||||
**every device response is silently dropped or mis-framed** — so a capture that
|
||||
actually contains 12 acked writes looks like 12 unanswered requests.
|
||||
|
||||
Destuffing
|
||||
----------
|
||||
One rule covers both directions: after the leading doubled `BW_CMD`, every
|
||||
`10 XX` pair on the wire destuffs to `XX`. That includes `10 03` — Thor
|
||||
escapes literal `0x03` bytes in write data so they are not mistaken for ETX,
|
||||
exactly as Blastware does.
|
||||
|
||||
A Micromate escapes exactly four byte values — `0x02 0x03 0x04 0x10` — and
|
||||
nothing else, which is what makes the uniform rule exact rather than merely
|
||||
convenient. Established by re-stuffing all 502 captured frames and comparing
|
||||
to the wire: 251/251 each direction, where `{0x10}` alone gets 130 and 177.
|
||||
|
||||
⚠ Checksum, corrected 2026-09-27
|
||||
--------------------------------
|
||||
With uniform destuffing the checksum is **plain SUM8 of the destuffed
|
||||
payload**. This script used to try SUM8 *and* a "DLE-aware" variant that
|
||||
excludes `0x10` bytes, and report whichever matched — which is why it never
|
||||
flagged a bad frame and why the protocol reference carried the wrong rule for
|
||||
two days. The DLE-aware form belongs with *Series III* destuffing, where an
|
||||
escaped byte survives as two bytes; applying it after uniform destuffing
|
||||
subtracts the correction twice and disagrees with the wire on 55 of 251
|
||||
responses.
|
||||
|
||||
The lesson generalises: a tool that accepts any of N candidate rules cannot
|
||||
falsify any of them. It now validates against SUM8 alone, and reports
|
||||
`DLE-aware` only to name what a mismatch *would* have been — never as a pass.
|
||||
See `docs/micromate_protocol_reference.md` → *Checksum*, and
|
||||
`tests/test_micromate_framing.py`, which pins it.
|
||||
|
||||
`micromate/framing.py` is the production implementation; this stays as the
|
||||
one-shot capture-inspection tool.
|
||||
|
||||
Usage
|
||||
-----
|
||||
python scratch/mm_frame_parse.py <capture-dir>
|
||||
python scratch/mm_frame_parse.py <raw_bw.bin> <raw_s3.bin>
|
||||
python scratch/mm_frame_parse.py <capture-dir> --dump 0x71
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
DLE, STX, ETX, ACK = 0x10, 0x02, 0x03, 0x41
|
||||
|
||||
# Request SUB -> short name. Series III names where they carry over; the
|
||||
# Series IV additions are marked.
|
||||
SUBNAME = {
|
||||
0x01: "DEVICE_INFO",
|
||||
0x06: "STORAGE_RANGE",
|
||||
0x08: "EVENT_INDEX",
|
||||
0x0A: "WAVEFORM_HDR",
|
||||
0x0C: "WAVEFORM_REC",
|
||||
0x15: "SERIAL",
|
||||
0x1A: "COMPLIANCE_CFG",
|
||||
0x1C: "MONITOR_STATUS",
|
||||
0x1E: "EVENT_HDR",
|
||||
0x2C: "CALLHOME_CFG",
|
||||
0x2E: "TRIGGER_CFG_READ", # Series IV
|
||||
0x3E: "OPERATOR",
|
||||
0x41: "SETUP_NAME_READ", # Series IV
|
||||
0x5A: "BULK_DOWNLOAD",
|
||||
0x5B: "POLL",
|
||||
0x68: "EVENT_INDEX_WRITE",
|
||||
0x69: "WAVEFORM_WRITE",
|
||||
0x71: "COMPLIANCE_WRITE",
|
||||
0x72: "CONFIRM_A",
|
||||
0x73: "CONFIRM_B",
|
||||
0x74: "CONFIRM_C",
|
||||
0x82: "TRIGGER_WRITE",
|
||||
0x83: "TRIGGER_CONFIRM",
|
||||
0xDA: "SETUP_FILE_DECL", # Series IV — names the target .MMB
|
||||
0xFE: "FULL_CFG",
|
||||
}
|
||||
|
||||
|
||||
def destuff(blob: bytes, start: int, *, is_request: bool) -> tuple[bytes, int, int]:
|
||||
"""Destuff one frame starting at `start`.
|
||||
|
||||
Returns (payload, checksum, index_of_terminating_ETX). `payload` excludes
|
||||
the trailing checksum byte. A request frame opens `ACK STX 10 10`; a
|
||||
response opens with a bare `STX`.
|
||||
"""
|
||||
i = start + (2 if is_request else 1)
|
||||
out = bytearray()
|
||||
if is_request:
|
||||
# The doubled BW_CMD is the one guaranteed stuffed byte.
|
||||
if blob[i : i + 2] != bytes([DLE, DLE]):
|
||||
raise ValueError(f"@0x{start:04x}: request does not open with 10 10")
|
||||
out.append(DLE)
|
||||
i += 2
|
||||
while i < len(blob):
|
||||
b = blob[i]
|
||||
if b == DLE and i + 1 < len(blob):
|
||||
out.append(blob[i + 1])
|
||||
i += 2
|
||||
continue
|
||||
if b == ETX:
|
||||
break
|
||||
out.append(b)
|
||||
i += 1
|
||||
if len(out) < 2:
|
||||
raise ValueError(f"@0x{start:04x}: frame too short")
|
||||
return bytes(out[:-1]), out[-1], i
|
||||
|
||||
|
||||
def frames(blob: bytes, *, is_request: bool):
|
||||
"""Yield (offset, payload, chk, checksum_kind)."""
|
||||
i, n = 0, len(blob)
|
||||
while i < n:
|
||||
if is_request:
|
||||
if not (blob[i] == ACK and i + 1 < n and blob[i + 1] == STX):
|
||||
i += 1
|
||||
continue
|
||||
elif blob[i] != STX:
|
||||
i += 1
|
||||
continue
|
||||
try:
|
||||
payload, chk, end = destuff(blob, i, is_request=is_request)
|
||||
except ValueError:
|
||||
i += 1
|
||||
continue
|
||||
# SUM8 of the destuffed payload is THE rule -- 502/502 captured frames.
|
||||
# The DLE-aware variant is reported only to name a near-miss; it is
|
||||
# never a pass. See the module docstring.
|
||||
if (sum(payload) & 0xFF) == chk:
|
||||
kind = "ok"
|
||||
elif (sum(b for b in payload if b != DLE) & 0xFF) == chk:
|
||||
kind = "BAD(dle-aware)"
|
||||
else:
|
||||
kind = "BAD"
|
||||
yield i, payload, chk, kind
|
||||
i = end + 1
|
||||
|
||||
|
||||
def describe(payload: bytes, is_request: bool) -> str:
|
||||
if len(payload) < 3:
|
||||
return "??"
|
||||
sub = payload[2]
|
||||
if is_request:
|
||||
return SUBNAME.get(sub, f"SUB_{sub:02X}")
|
||||
req = 0xFF - sub
|
||||
return "rsp<-" + SUBNAME.get(req, f"SUB_{req:02X}")
|
||||
|
||||
|
||||
def report(path: Path, *, is_request: bool, dump_sub: int | None) -> None:
|
||||
blob = path.read_bytes()
|
||||
side = "Thor" if is_request else "unit"
|
||||
print(f"== {side:4} {path.name} ({len(blob)} bytes)")
|
||||
n_bad = 0
|
||||
for idx, (off, p, chk, kind) in enumerate(frames(blob, is_request=is_request)):
|
||||
if kind == "BAD":
|
||||
n_bad += 1
|
||||
sub = p[2] if len(p) > 2 else -1
|
||||
flags = p[1] if len(p) > 1 else -1
|
||||
# Requests carry offset at payload[4:6]; responses page at [3:5].
|
||||
word = int.from_bytes(p[4:6] if is_request else p[3:5], "big")
|
||||
data = len(p) - 16 if is_request else max(len(p) - 5, 0)
|
||||
print(
|
||||
f" [{idx:2}] @0x{off:04x} payload={len(p):5} data={data:5} "
|
||||
f"flags=0x{flags:02x} SUB=0x{sub:02x} {describe(p, is_request):18} "
|
||||
f"{'offset' if is_request else 'page'}=0x{word:04x} chk={kind}"
|
||||
)
|
||||
if dump_sub is not None and sub == dump_sub:
|
||||
body = p[16:] if is_request else p[5:]
|
||||
print(f" ---- data ({len(body)} bytes) ----")
|
||||
for o in range(0, len(body), 16):
|
||||
chunk = body[o : o + 16]
|
||||
txt = "".join(chr(c) if 32 <= c < 127 else "." for c in chunk)
|
||||
print(f" {o:06x} {chunk.hex(' '):<47} |{txt}|")
|
||||
print(f" -- {idx + 1} frames, {n_bad} bad checksum\n")
|
||||
|
||||
|
||||
def main() -> int:
|
||||
ap = argparse.ArgumentParser(description=__doc__,
|
||||
formatter_class=argparse.RawDescriptionHelpFormatter)
|
||||
ap.add_argument("paths", nargs="+",
|
||||
help="a capture directory, or raw_bw.bin and raw_s3.bin")
|
||||
ap.add_argument("--dump", default=None,
|
||||
help="hex-dump the data section of this SUB (e.g. 0x71)")
|
||||
args = ap.parse_args()
|
||||
|
||||
dump_sub = int(args.dump, 0) if args.dump else None
|
||||
|
||||
if len(args.paths) == 1 and Path(args.paths[0]).is_dir():
|
||||
d = Path(args.paths[0])
|
||||
bw = sorted(d.glob("raw_bw_*.bin"))
|
||||
s3 = sorted(d.glob("raw_s3_*.bin"))
|
||||
if not bw or not s3:
|
||||
print(f"{d}: need one raw_bw_*.bin and one raw_s3_*.bin", file=sys.stderr)
|
||||
return 2
|
||||
pairs = [(bw[0], True), (s3[0], False)]
|
||||
elif len(args.paths) == 2:
|
||||
pairs = [(Path(args.paths[0]), True), (Path(args.paths[1]), False)]
|
||||
else:
|
||||
ap.error("pass a capture directory, or exactly two .bin files")
|
||||
|
||||
for path, is_request in pairs:
|
||||
report(path, is_request=is_request, dump_sub=dump_sub)
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
@@ -0,0 +1,119 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
socat_log_split.py — recover a capture pair from a `socat -x` relay log.
|
||||
|
||||
Why this exists
|
||||
---------------
|
||||
The bench relay that puts Thor in front of a USB-attached Micromate is:
|
||||
|
||||
socat -d -d -x TCP-LISTEN:12345,reuseaddr,fork /dev/ttyACM0,raw,echo=0,b115200 \
|
||||
> ~/mm-captures/socat_<ts>.log 2>&1
|
||||
|
||||
`-x` makes socat hex-dump every byte it forwards, in both directions, with
|
||||
timestamps. That log is therefore a **complete second copy of every capture**
|
||||
taken through the relay — independent of whether seismo_lab was recording.
|
||||
|
||||
On 2026-09-25 that mattered: a capture's `.bin` files never made it off the
|
||||
Windows machine, and the session was rebuilt from this log instead. When the
|
||||
real bins turned up later, the reconstruction was **byte-for-byte identical in
|
||||
both directions** (3,595 and 4,004 bytes). So this is a validated fallback, not
|
||||
a lossy approximation.
|
||||
|
||||
Log format
|
||||
----------
|
||||
```
|
||||
> 2026/09/25 00:30:35.000276659 length=21 from=0 to=20
|
||||
41 02 10 10 00 5b 00 00 30 00 ...
|
||||
2026/09/25 00:30:35 socat[32190] N write(5, 0x..., 21) completed
|
||||
< 2026/09/25 00:30:35.000384100 length=64 from=0 to=63
|
||||
02 00 c5 a4 00 00 30 00 ...
|
||||
```
|
||||
|
||||
`>` is data heading toward the serial device (Thor → unit). `<` is data coming
|
||||
back (unit → Thor). Hex lines are space-separated and indented; socat's own
|
||||
status lines start with a date and carry no payload.
|
||||
|
||||
Usage
|
||||
-----
|
||||
# whole log
|
||||
python scratch/socat_log_split.py socat_20260924_181248.log --out-dir ./recovered
|
||||
|
||||
# one session — line numbers from the "accepting connection" markers
|
||||
grep -n "accepting connection" socat_*.log
|
||||
python scratch/socat_log_split.py socat_*.log --from-line 919 --out-dir ./recovered
|
||||
|
||||
Then parse the result as usual:
|
||||
|
||||
python scratch/mm_frame_parse.py recovered/raw_bw.bin recovered/raw_s3.bin
|
||||
|
||||
⚠ A log spanning several sessions concatenates them. Split by line number using
|
||||
the `accepting connection` markers, or the frame walk will run sessions together.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import re
|
||||
from pathlib import Path
|
||||
|
||||
_HEX = re.compile(r"\A[0-9a-f]{2}\Z")
|
||||
_SOCAT_STATUS = re.compile(r"\A\d{4}/\d{2}/\d{2}")
|
||||
|
||||
|
||||
def split(lines) -> tuple[bytes, bytes]:
|
||||
"""Return (to_device, from_device) byte streams."""
|
||||
to_dev, from_dev = bytearray(), bytearray()
|
||||
cur = None
|
||||
for line in lines:
|
||||
if line.startswith(">"):
|
||||
cur = to_dev
|
||||
continue
|
||||
if line.startswith("<"):
|
||||
cur = from_dev
|
||||
continue
|
||||
if _SOCAT_STATUS.match(line):
|
||||
# socat's own status line ends the current dump block.
|
||||
cur = None
|
||||
continue
|
||||
if cur is None or not line.startswith(" "):
|
||||
continue
|
||||
toks = line.split()
|
||||
if toks and all(_HEX.match(t) for t in toks):
|
||||
cur.extend(int(t, 16) for t in toks)
|
||||
return bytes(to_dev), bytes(from_dev)
|
||||
|
||||
|
||||
def main() -> int:
|
||||
ap = argparse.ArgumentParser(
|
||||
description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
|
||||
)
|
||||
ap.add_argument("log", help="a socat -x log file")
|
||||
ap.add_argument("--out-dir", default=".", help="where to write the .bin pair")
|
||||
ap.add_argument("--from-line", type=int, default=1,
|
||||
help="first log line to read (1-based) — use the "
|
||||
"'accepting connection' marker of the session you want")
|
||||
ap.add_argument("--to-line", type=int, default=None,
|
||||
help="last log line to read (1-based, inclusive)")
|
||||
ap.add_argument("--prefix", default="raw", help="output basename prefix")
|
||||
args = ap.parse_args()
|
||||
|
||||
lines = Path(args.log).read_text(errors="replace").splitlines()
|
||||
lo = max(args.from_line - 1, 0)
|
||||
hi = args.to_line if args.to_line is not None else len(lines)
|
||||
to_dev, from_dev = split(lines[lo:hi])
|
||||
|
||||
out = Path(args.out_dir)
|
||||
out.mkdir(parents=True, exist_ok=True)
|
||||
bw = out / f"{args.prefix}_bw.bin"
|
||||
s3 = out / f"{args.prefix}_s3.bin"
|
||||
bw.write_bytes(to_dev)
|
||||
s3.write_bytes(from_dev)
|
||||
print(f"Thor -> unit {len(to_dev):>7} bytes {bw}")
|
||||
print(f"unit -> Thor {len(from_dev):>7} bytes {s3}")
|
||||
if not to_dev or not from_dev:
|
||||
print("⚠ one direction is empty — check --from-line / --to-line")
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -305,6 +305,11 @@ def main(argv=None) -> int:
|
||||
default=0,
|
||||
)
|
||||
ev.total_samples = ev.total_samples or n_samp
|
||||
# Sensor self-check traces from the IDFW fixed
|
||||
# header, so regenerated .h5 files gain the v2
|
||||
# /sensor_check group (mirrors save_imported_idf).
|
||||
from micromate.sensor_check import decode_idf_sensor_check
|
||||
ev.sensor_check = decode_idf_sensor_check(binary_bytes) or None
|
||||
|
||||
event_hdf5.write_event_hdf5(
|
||||
hdf5_path, ev,
|
||||
|
||||
@@ -120,6 +120,7 @@ def draw_compliance_chart(ax, channels: Dict[str, Sequence[float]], sps: float)
|
||||
ax.set_yscale("log")
|
||||
ax.set_xlim(1, 100)
|
||||
ax.set_ylim(0.0394, 10)
|
||||
ax.set_box_aspect(1) # square plot box (log-log compliance charts are square)
|
||||
xt = [1, 2, 5, 10, 20, 50, 100]
|
||||
yt = [0.0394, 0.05, 0.1, 0.2, 0.5, 1, 2, 5, 10]
|
||||
ax.xaxis.set_major_locator(FixedLocator(xt)); ax.xaxis.set_minor_locator(NullLocator())
|
||||
|
||||
+44
-4
@@ -12,8 +12,11 @@ Layout written to `<filename>.h5`:
|
||||
├─ samples_int16/ (optional)
|
||||
│ ├─ Tran (int16, raw ADC counts) shape: (N,)
|
||||
│ └─ ... per channel (only when present in the source)
|
||||
├─ sensor_check/ (optional, schema v2+)
|
||||
│ ├─ Tran (int32, raw counts) shape: (M,) M ≪ N
|
||||
│ └─ ... per channel present in the source (MicL absent on 3-channel units)
|
||||
└─ root attrs (event metadata):
|
||||
schema_version int = 1
|
||||
schema_version int = 2
|
||||
kind str = "sfm.event.hdf5"
|
||||
serial str
|
||||
waveform_key str (8-hex)
|
||||
@@ -64,7 +67,7 @@ from minimateplus.models import Event
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
SCHEMA_VERSION = 1
|
||||
SCHEMA_VERSION = 2 # v2 adds the optional /sensor_check group
|
||||
HDF5_KIND = "sfm.event.hdf5"
|
||||
|
||||
# Geophone full-scale velocity per range (in/s). Confirmed in CLAUDE.md
|
||||
@@ -270,6 +273,22 @@ def write_event_hdf5(
|
||||
)
|
||||
igrp.attrs["mic_psi_per_count"] = float(mic_factor)
|
||||
|
||||
# /sensor_check — optional short diagnostic self-check traces (schema
|
||||
# v2+). Raw ADC counts (a shape diagnostic; the per-series count scale
|
||||
# differs, and the renderer fits each trace to its box). Only channels
|
||||
# the decoder found are written — 3-channel units carry no MicL.
|
||||
sc = event.sensor_check or {}
|
||||
if sc:
|
||||
scgrp = f.create_group("sensor_check")
|
||||
for ch in ("Tran", "Vert", "Long", "MicL"):
|
||||
vals = sc.get(ch)
|
||||
if vals:
|
||||
scgrp.create_dataset(
|
||||
ch, data=np.asarray(vals, dtype=np.int32),
|
||||
compression="gzip", compression_opts=4, shuffle=True,
|
||||
)
|
||||
scgrp.attrs["units"] = "raw_counts"
|
||||
|
||||
import os
|
||||
os.replace(tmp, path)
|
||||
|
||||
@@ -334,6 +353,16 @@ def read_event_hdf5(path: Union[str, Path]) -> dict:
|
||||
if mic_attr is not None:
|
||||
mic_psi = float(mic_attr)
|
||||
|
||||
# /sensor_check — optional (schema v2+); absent on older files.
|
||||
sensor_check = None
|
||||
scgrp = f.get("sensor_check")
|
||||
if scgrp is not None:
|
||||
sensor_check = {}
|
||||
for ch in ("Tran", "Vert", "Long", "MicL"):
|
||||
ds = scgrp.get(ch)
|
||||
if ds is not None:
|
||||
sensor_check[ch] = np.asarray(ds[()])
|
||||
|
||||
return {
|
||||
"schema_version": sv,
|
||||
"kind": attrs.get("kind"),
|
||||
@@ -341,6 +370,7 @@ def read_event_hdf5(path: Union[str, Path]) -> dict:
|
||||
"samples": samples,
|
||||
"samples_int16": samples_int16,
|
||||
"mic_psi_per_count": mic_psi,
|
||||
"sensor_check": sensor_check,
|
||||
}
|
||||
|
||||
|
||||
@@ -431,11 +461,16 @@ def plot_json_from_hdf5(
|
||||
event_id: Optional[str] = None,
|
||||
index: Optional[int] = None,
|
||||
) -> dict:
|
||||
"""Build a `sfm.plot.v1` JSON dict from a stored .h5 file."""
|
||||
"""Build a `sfm.plot.v1` JSON dict from a stored .h5 file.
|
||||
|
||||
The dict also carries a top-level ``sensor_check`` key (the raw self-check
|
||||
traces as ``{ch: [int]}``, or None) beyond the plot schema, so report
|
||||
generation can read the traces from the same single .h5 load.
|
||||
"""
|
||||
data = read_event_hdf5(path)
|
||||
a = data["attrs"]
|
||||
s = data["samples"]
|
||||
return _build_plot_dict(
|
||||
out = _build_plot_dict(
|
||||
n_samples=len(s["Tran"]) if "Tran" in s else 0,
|
||||
sample_rate=int(a.get("sample_rate", 1024) or 1024),
|
||||
pretrig_samples=int(a.get("pretrig_samples", 0) or 0),
|
||||
@@ -463,6 +498,11 @@ def plot_json_from_hdf5(
|
||||
event_id=event_id,
|
||||
index=index,
|
||||
)
|
||||
scd = data.get("sensor_check")
|
||||
out["sensor_check"] = (
|
||||
{ch: v.tolist() for ch, v in scd.items()} if scd else None
|
||||
)
|
||||
return out
|
||||
|
||||
|
||||
def _build_plot_dict(
|
||||
|
||||
+162
-36
@@ -121,6 +121,13 @@ class ReportData:
|
||||
t0_ms: Optional[float] = None
|
||||
dt_ms: Optional[float] = None
|
||||
|
||||
# Sensor self-check traces — {ch: [samples]} in raw counts, read from the
|
||||
# standardized .h5 (/sensor_check group, schema v2+) where the per-series
|
||||
# decoder stored them at ingest. The little diagnostic waveforms BW draws
|
||||
# in its "Sensor Check" strip. Empty when absent (pre-v2 .h5, histogram,
|
||||
# or 3-channel unit's MicL).
|
||||
sensor_check_waveforms: dict = field(default_factory=dict)
|
||||
|
||||
# Record-type discriminator
|
||||
record_type: Optional[str] = None
|
||||
is_histogram: bool = False
|
||||
@@ -246,6 +253,8 @@ def gather_report_data(
|
||||
"peak_accel_g": ch.get("peak_accel_g"),
|
||||
"peak_disp_in": ch.get("peak_disp_in"),
|
||||
"sensor_check": sc_ch.get("result"),
|
||||
"sc_freq_hz": sc_ch.get("freq_hz"),
|
||||
"sc_ratio": sc_ch.get("ratio"),
|
||||
"peak_date": peak_date,
|
||||
"peak_time": peak_time,
|
||||
})
|
||||
@@ -287,6 +296,12 @@ def gather_report_data(
|
||||
rd.pretrig_samples = ta.get("pretrig_samples")
|
||||
rd.t0_ms = ta.get("t0_ms")
|
||||
rd.dt_ms = ta.get("dt_ms")
|
||||
# Sensor self-check traces — read from the standardized .h5 (schema
|
||||
# v2+). Device-agnostic: whichever decoder produced the event
|
||||
# stored them at ingest, so SFM reads them here without knowing or
|
||||
# caring about the source instrument series. Empty on pre-v2 files
|
||||
# (until backfilled) and on 3-channel / histogram events.
|
||||
rd.sensor_check_waveforms = wf.get("sensor_check") or {}
|
||||
except Exception as exc:
|
||||
log.warning("gather_report_data: hdf5 read failed: %s", exc)
|
||||
|
||||
@@ -396,9 +411,34 @@ def _render_waveform_layout(fig, rd: ReportData) -> None:
|
||||
ax_stats = fig.add_subplot(gs[2]); ax_stats.axis("off")
|
||||
_draw_channel_stats_waveform(ax_stats, rd)
|
||||
|
||||
_draw_compliance_panel(fig, rd)
|
||||
_draw_waveform_subplot(fig, gs[3], rd)
|
||||
|
||||
|
||||
# Compliance-chart placement, in figure fractions. Measured directly off a
|
||||
# Blastware Event Report PDF (ref-stuff/n844lqhbzt0w_bw_pdf.pdf) so the chart
|
||||
# matches BW's size and position: it spans from just under the header down
|
||||
# through the stats band, hard against the right page margin. The left edge
|
||||
# leaves room for the y-axis tick labels + "Velocity (in/s)" title, which the
|
||||
# compacted stats table (see _draw_channel_stats_waveform) is sized to clear.
|
||||
_COMPLIANCE_BOX = (0.489, 0.502, 0.951, 0.867) # x0, y0, x1, y1
|
||||
|
||||
|
||||
def _draw_compliance_panel(fig, rd: ReportData) -> None:
|
||||
"""Large USBM RI8507 compliance chart in the upper-right, sized and
|
||||
positioned to match Blastware's Event Report (see _COMPLIANCE_BOX)."""
|
||||
x0, y0, x1, y1 = _COMPLIANCE_BOX
|
||||
fig.text((x0 + x1) / 2, y1 + 0.006, "USBM RI8507 And OSMRE", fontsize=9,
|
||||
weight="bold", color="#333", ha="center", va="bottom")
|
||||
if rd.channels and rd.sample_rate_sps:
|
||||
from sfm.compliance import draw_compliance_chart
|
||||
ax = fig.add_axes([x0, y0, x1 - x0, y1 - y0])
|
||||
draw_compliance_chart(ax, rd.channels, rd.sample_rate_sps)
|
||||
else:
|
||||
fig.text((x0 + x1) / 2, (y0 + y1) / 2, "(no waveform data)", fontsize=8,
|
||||
color="#bbb", ha="center", va="center", style="italic")
|
||||
|
||||
|
||||
def _render_histogram_layout(fig, rd: ReportData) -> None:
|
||||
"""Histogram layout: header / mic-only / per-channel stats / bar plot.
|
||||
|
||||
@@ -477,11 +517,11 @@ def _split_iso_to_date_time(iso: Optional[str]) -> tuple[Optional[str], Optional
|
||||
return (None, None)
|
||||
|
||||
|
||||
def _kv(ax, x, y, label, value, *, label_w=0.18):
|
||||
def _kv(ax, x, y, label, value, *, label_w=0.18, fontsize=8):
|
||||
"""Render a 'Label Value' row at axes-coordinates (x, y)."""
|
||||
ax.text(x, y, label, fontsize=8, color="#555", ha="left", va="top",
|
||||
ax.text(x, y, label, fontsize=fontsize, color="#555", ha="left", va="top",
|
||||
transform=ax.transAxes)
|
||||
ax.text(x + label_w, y, _fmt(value), fontsize=8, ha="left", va="top",
|
||||
ax.text(x + label_w, y, _fmt(value), fontsize=fontsize, ha="left", va="top",
|
||||
transform=ax.transAxes, family="monospace")
|
||||
|
||||
|
||||
@@ -544,14 +584,17 @@ def _draw_header_columns(ax, rows_left, rd: ReportData) -> None:
|
||||
("File Name", rd.file_name),
|
||||
("Post Event Notes", rd.post_event_notes),
|
||||
]
|
||||
# fontsize 7.5 (BW's header is a touch smaller than our body text) + a
|
||||
# tighter right-column value indent so the long serial+firmware line
|
||||
# ("BE##### V ##.##-#.## MiniMate Plus") fits without running off the page.
|
||||
y = 0.95
|
||||
dy = 0.095
|
||||
for label, value in rows_left:
|
||||
_kv(ax, 0.0, y, label, value, label_w=0.18)
|
||||
_kv(ax, 0.0, y, label, value, label_w=0.18, fontsize=7.5)
|
||||
y -= dy
|
||||
y = 0.95
|
||||
for label, value in rows_right:
|
||||
_kv(ax, 0.55, y, label, value, label_w=0.20)
|
||||
_kv(ax, 0.55, y, label, value, label_w=0.14, fontsize=7.5)
|
||||
y -= dy
|
||||
|
||||
|
||||
@@ -574,20 +617,14 @@ def _draw_mic_and_usbm(ax, rd: ReportData) -> None:
|
||||
transform=ax.transAxes, va="top")
|
||||
rows = _mic_rows(rd)
|
||||
y = 0.80
|
||||
# Tighter label indent + slightly smaller font so the long "Channel Test
|
||||
# Passed (Freq = … Amp = … mv)" line clears the enlarged compliance chart's
|
||||
# left edge (_COMPLIANCE_BOX) instead of running behind it.
|
||||
for label, value in rows:
|
||||
_kv(ax, 0.0, y, label, value, label_w=0.18)
|
||||
_kv(ax, 0.0, y, label, value, label_w=0.13, fontsize=7)
|
||||
y -= 0.15
|
||||
|
||||
# USBM RI8507 compliance chart — inset axes in the right half of this band.
|
||||
ax.text(0.74, 1.00, "USBM RI8507", fontsize=9, weight="bold", color="#333",
|
||||
ha="center", va="top", transform=ax.transAxes)
|
||||
if rd.channels and rd.sample_rate_sps:
|
||||
from sfm.compliance import draw_compliance_chart
|
||||
inset = ax.inset_axes([0.52, 0.02, 0.46, 0.82])
|
||||
draw_compliance_chart(inset, rd.channels, rd.sample_rate_sps)
|
||||
else:
|
||||
ax.text(0.74, 0.48, "(no waveform data)", fontsize=8, color="#bbb",
|
||||
ha="center", va="center", transform=ax.transAxes, style="italic")
|
||||
# The USBM compliance chart is drawn as its own large square panel spanning
|
||||
# the mic + stats rows on the right — see _draw_compliance_panel().
|
||||
|
||||
|
||||
def _mic_rows(rd: ReportData) -> list[tuple[str, Optional[str]]]:
|
||||
@@ -637,8 +674,18 @@ def _draw_channel_stats_waveform(ax, rd: ReportData) -> None:
|
||||
("Peak Acceleration", "peak_accel_g", "g"),
|
||||
("Peak Displacement", "peak_disp_in", "in"),
|
||||
("Sensor Check", "sensor_check", ""),
|
||||
# Sensor-check sub-rows (indented under "Sensor Check", like BW): the
|
||||
# geophone ring-down frequency + overswing ratio from the self-check.
|
||||
(" Frequency", "sc_freq_hz", "Hz"),
|
||||
(" Overswing Ratio", "sc_ratio", ""),
|
||||
]
|
||||
_draw_stats_table(ax, rd, rows_spec)
|
||||
# Compacted to the left half so the enlarged compliance chart (BW-sized,
|
||||
# right against the page margin) has room — see _COMPLIANCE_BOX.
|
||||
_draw_stats_table(
|
||||
ax, rd, rows_spec,
|
||||
bbox_width=0.42, fontsize=7.5,
|
||||
col_widths=[0.185, 0.065, 0.065, 0.065, 0.040],
|
||||
)
|
||||
_draw_pvs_summary(ax, rd, n_data_rows=len(rows_spec))
|
||||
|
||||
|
||||
@@ -699,19 +746,39 @@ def _draw_pvs_summary(
|
||||
table_bottom_y = getattr(ax, "_stats_table_bottom", -0.10)
|
||||
pvs_y = table_bottom_y - 0.04 # small gap below the table border
|
||||
|
||||
# Centered for visual balance — looks intentional rather than offset.
|
||||
# The original BW-replica had a "NA: Not Applicable" caption below
|
||||
# this line; dropped because we use "—" for missing values and the
|
||||
# legend was always squished against the PVS line.
|
||||
ax.text(0.5, pvs_y, line, fontsize=9, weight="bold",
|
||||
ha="center", va="top", transform=ax.transAxes)
|
||||
# Centered under the stats table for visual balance — looks intentional
|
||||
# rather than offset. When the table is compacted (waveform layout), it
|
||||
# occupies only the left portion of the axes, so center on the table's
|
||||
# width rather than the full axes (which would push the line under the
|
||||
# compliance chart). The original BW-replica had a "NA: Not Applicable"
|
||||
# caption below this line; dropped because we use "—" for missing values.
|
||||
table_w = getattr(ax, "_stats_table_width", 0.80)
|
||||
if table_w < 0.79:
|
||||
# Compacted (waveform) layout: left-align under the table, one point
|
||||
# smaller, so the line clears the enlarged compliance chart's
|
||||
# bottom-left tick labels on the right.
|
||||
ax.text(0.0, pvs_y, line, fontsize=8, weight="bold",
|
||||
ha="left", va="top", transform=ax.transAxes)
|
||||
else:
|
||||
ax.text(0.5, pvs_y, line, fontsize=9, weight="bold",
|
||||
ha="center", va="top", transform=ax.transAxes)
|
||||
|
||||
|
||||
def _draw_stats_table(ax, rd: ReportData, rows_spec: list[tuple[str, str, str]]) -> None:
|
||||
def _draw_stats_table(
|
||||
ax, rd: ReportData, rows_spec: list[tuple[str, str, str]],
|
||||
*, bbox_width: float = 0.80, fontsize: float = 8,
|
||||
col_widths: Optional[list[float]] = None,
|
||||
) -> None:
|
||||
"""Render a per-channel stats table (Tran/Vert/Long).
|
||||
|
||||
rows_spec: list of (label, field_name_in_channel_stats, unit_string)
|
||||
|
||||
``bbox_width`` / ``col_widths`` / ``fontsize`` let a caller compact the
|
||||
table (the waveform layout packs it into the left half to clear the
|
||||
compliance chart; the histogram layout keeps the wider defaults).
|
||||
"""
|
||||
if col_widths is None:
|
||||
col_widths = [0.28, 0.14, 0.14, 0.14, 0.10]
|
||||
headers = ["", "Tran", "Vert", "Long", ""]
|
||||
ch_lookup = {c["name"]: c for c in rd.channel_stats}
|
||||
|
||||
@@ -727,6 +794,8 @@ def _draw_stats_table(ax, rd: ReportData, rows_spec: list[tuple[str, str, str]])
|
||||
if field == "zc_freq_hz":
|
||||
prefix = ">" if ch_rec.get("zc_freq_above_range") else ""
|
||||
return f"{prefix}{val:.0f}"
|
||||
if field in ("sc_freq_hz", "sc_ratio"):
|
||||
return f"{val:.1f}" # BW shows 1 decimal (7.5 Hz, 3.6)
|
||||
return f"{val:.3f}"
|
||||
return str(val)
|
||||
|
||||
@@ -751,16 +820,17 @@ def _draw_stats_table(ax, rd: ReportData, rows_spec: list[tuple[str, str, str]])
|
||||
table_bottom = 1.0 - table_height
|
||||
tbl = ax.table(
|
||||
cellText=table_data,
|
||||
colWidths=[0.28, 0.14, 0.14, 0.14, 0.10],
|
||||
colWidths=col_widths,
|
||||
cellLoc="left", edges="open",
|
||||
bbox=[0.0, table_bottom, 0.80, table_height],
|
||||
bbox=[0.0, table_bottom, bbox_width, table_height],
|
||||
)
|
||||
tbl.auto_set_font_size(False)
|
||||
tbl.set_fontsize(8)
|
||||
tbl.set_fontsize(fontsize)
|
||||
for j in range(5):
|
||||
tbl[(0, j)].set_text_props(weight="bold", color="#555")
|
||||
# Stash the bottom Y so _draw_pvs_summary can position itself below.
|
||||
# Stash the bottom Y + width so _draw_pvs_summary can position itself.
|
||||
ax._stats_table_bottom = table_bottom
|
||||
ax._stats_table_width = bbox_width
|
||||
|
||||
|
||||
def _channel_axis_color(ch: str) -> str:
|
||||
@@ -770,9 +840,25 @@ def _channel_axis_color(ch: str) -> str:
|
||||
def _draw_waveform_subplot(fig, gridspec_cell, rd: ReportData) -> None:
|
||||
"""4-channel stacked waveform plot — Instantel printout order
|
||||
(MicL on top, Tran on bottom), shared x-axis in SECONDS, trigger
|
||||
triangle markers at t=0, '0.0' baseline label on right of each."""
|
||||
inner = gridspec_cell.subgridspec(4, 1, hspace=0.0)
|
||||
triangle markers at t=0, '0.0' baseline label on right of each.
|
||||
|
||||
When sensor self-check traces are present (rd.sensor_check_waveforms), a
|
||||
narrow "Sensor Check" strip of per-channel mini-plots is drawn to the right,
|
||||
aligned to the lanes — matching Blastware's Event Report.
|
||||
"""
|
||||
from matplotlib.ticker import MaxNLocator
|
||||
|
||||
order = ["MicL", "Long", "Vert", "Tran"]
|
||||
has_sc = bool(rd.sensor_check_waveforms)
|
||||
if has_sc:
|
||||
# main lanes + a narrow sensor-check strip column, flush against the
|
||||
# main panel (BW shares the border — no gap), with the "0.0" baseline
|
||||
# labels moved to the right of the strip. Proportions match BW's
|
||||
# Event Report (main ~0.75 / strip ~0.10 of the panel width).
|
||||
inner = gridspec_cell.subgridspec(4, 2, width_ratios=[1.0, 0.13],
|
||||
wspace=0.0, hspace=0.0)
|
||||
else:
|
||||
inner = gridspec_cell.subgridspec(4, 1, hspace=0.0)
|
||||
sr = rd.sample_rate_sps or 1024
|
||||
# Convert ms-based time axis to seconds for the x-axis
|
||||
dt_s = (rd.dt_ms or (1000.0 / sr)) / 1000.0
|
||||
@@ -791,9 +877,12 @@ def _draw_waveform_subplot(fig, gridspec_cell, rd: ReportData) -> None:
|
||||
_geo_amax = _a
|
||||
geo_shared = max(_geo_amax * 1.10, GEO_FLOOR_INS)
|
||||
|
||||
main_axes = []
|
||||
sc_axes = []
|
||||
last_idx = len(order) - 1
|
||||
for i, ch in enumerate(order):
|
||||
ax = fig.add_subplot(inner[i])
|
||||
ax = fig.add_subplot(inner[i, 0] if has_sc else inner[i])
|
||||
main_axes.append(ax)
|
||||
values = rd.channels.get(ch) or []
|
||||
times = [t0_s + j * dt_s for j in range(len(values))]
|
||||
|
||||
@@ -811,9 +900,12 @@ def _draw_waveform_subplot(fig, gridspec_cell, rd: ReportData) -> None:
|
||||
# Channel label on the LEFT (matches BW)
|
||||
ax.set_ylabel(ch, fontsize=8, rotation=0, ha="right", va="center",
|
||||
color=_channel_axis_color(ch), weight="bold", labelpad=14)
|
||||
# "0.0" on the RIGHT (BW convention)
|
||||
ax.text(1.005, 0.5, "0.0", transform=ax.transAxes,
|
||||
fontsize=7, color="#555", va="center", ha="left")
|
||||
# "0.0" baseline label on the RIGHT (BW convention). With the sensor-
|
||||
# check strip attached, it goes to the right of the STRIP (drawn below);
|
||||
# otherwise just outside the main lane.
|
||||
if not has_sc:
|
||||
ax.text(1.005, 0.5, "0.0", transform=ax.transAxes,
|
||||
fontsize=7, color="#555", va="center", ha="left")
|
||||
|
||||
ax.grid(True, linestyle="--", linewidth=0.3, color="#bbb", alpha=0.6)
|
||||
# Vertical dashed trigger line at t=0
|
||||
@@ -828,12 +920,46 @@ def _draw_waveform_subplot(fig, gridspec_cell, rd: ReportData) -> None:
|
||||
else:
|
||||
ax.tick_params(axis="x", labelsize=7)
|
||||
ax.tick_params(axis="y", labelsize=6)
|
||||
# Stacked lanes touch, so the top/bottom y-tick labels of adjacent lanes
|
||||
# would overprint at the shared boundary. Prune the extreme ticks so
|
||||
# each boundary shows clean interior ticks (0.5 / 0.0 / -0.5) only.
|
||||
ax.yaxis.set_major_locator(MaxNLocator(nbins=4, prune="both"))
|
||||
|
||||
# Sensor self-check mini-plot in the right strip (aligned to this lane).
|
||||
if has_sc:
|
||||
scx = fig.add_subplot(inner[i, 1])
|
||||
sc_axes.append(scx)
|
||||
sc_vals = rd.sensor_check_waveforms.get(ch) or []
|
||||
if sc_vals:
|
||||
_col = _channel_axis_color(ch)
|
||||
# Faint zero baseline (BW draws the channel baseline through the
|
||||
# strip) — reference for the one-sided geophone ring-downs.
|
||||
scx.axhline(0.0, color=_col, linewidth=0.3, alpha=0.4)
|
||||
scx.plot(range(len(sc_vals)), sc_vals, color=_col, linewidth=0.5)
|
||||
# Fit the trace to the box (BW-style) rather than a symmetric
|
||||
# scale: the geo self-checks are one-sided dips, so a symmetric
|
||||
# scale would strand them in the bottom half with an empty top.
|
||||
_lo, _hi = min(sc_vals), max(sc_vals)
|
||||
_pad = 0.10 * ((_hi - _lo) or 1.0)
|
||||
scx.set_ylim(_lo - _pad, _hi + _pad)
|
||||
scx.set_xticks([]); scx.set_yticks([])
|
||||
for _s in scx.spines.values():
|
||||
_s.set_linewidth(0.4); _s.set_color("#999")
|
||||
# "0.0" baseline label to the RIGHT of the strip (BW convention)
|
||||
scx.text(1.10, 0.5, "0.0", transform=scx.transAxes,
|
||||
fontsize=7, color="#555", va="center", ha="left")
|
||||
|
||||
# Trigger triangle marker ▼ above the top channel at t=0
|
||||
top_ax = fig.axes[-4] # MicL is the first added in this gridspec
|
||||
top_ax = main_axes[0] # MicL
|
||||
top_ax.plot([0], [top_ax.get_ylim()[1]], marker="v", color="black",
|
||||
markersize=8, clip_on=False, zorder=10)
|
||||
|
||||
# "Sensor Check" caption under the strip (BW convention)
|
||||
if has_sc and sc_axes:
|
||||
pos = sc_axes[-1].get_position()
|
||||
fig.text((pos.x0 + pos.x1) / 2, pos.y0 - 0.012, "Sensor Check",
|
||||
fontsize=7, color="#555", ha="center", va="top")
|
||||
|
||||
# Compute scale-per-division for the footer (10 divs across the chart)
|
||||
# and find peak geo amplitude for the geo amp/div setting.
|
||||
total_s = times[-1] - times[0] if values else 0
|
||||
|
||||
+295
-20
@@ -108,6 +108,12 @@
|
||||
color: var(--text);
|
||||
}
|
||||
.btn-ghost:hover { border-color: var(--blue-lt); color: var(--blue-lt); }
|
||||
.btn-danger { background: var(--red); color: #fff; }
|
||||
.btn-danger:hover:not(:disabled) { filter: brightness(1.15); }
|
||||
.diag-result { display:block; margin-top:6px; font-size:12px; opacity:.85;
|
||||
white-space:pre-wrap; word-break:break-word; }
|
||||
.diag-result.ok { color: var(--green); }
|
||||
.diag-result.error { color: var(--red); }
|
||||
.btn:disabled { background: var(--surface2) !important; color: var(--text-mute) !important; cursor: not-allowed; border-color: var(--border2) !important; }
|
||||
|
||||
/* #connect-btn styles moved to #live-connect-bar block */
|
||||
@@ -910,6 +916,7 @@
|
||||
<button class="tab-btn" data-tab="events" onclick="switchTab('events')">Events</button>
|
||||
<button class="tab-btn" data-tab="config" onclick="switchTab('config')">Config</button>
|
||||
<button class="tab-btn" data-tab="call-home" onclick="switchTab('call-home')">Call Home</button>
|
||||
<button class="tab-btn" data-tab="diagnostics" onclick="switchTab('diagnostics')">Diagnostics</button>
|
||||
</div>
|
||||
|
||||
<!-- ════════════════════════════════════════════════════════════════
|
||||
@@ -938,6 +945,10 @@
|
||||
<div id="tab-events" class="tab-pane" style="display:flex; flex-direction:column; overflow:hidden;">
|
||||
|
||||
<div class="event-toolbar">
|
||||
<button class="btn btn-ghost" id="load-events-btn" onclick="loadEventList()" disabled
|
||||
title="Walk the device's event chain and list its stored events. This is the slow one — it reads every event header over the cellular link.">
|
||||
⟳ Load events
|
||||
</button>
|
||||
<button class="btn btn-ghost" id="load-btn" onclick="loadWaveform()" disabled>Load Waveform</button>
|
||||
<button class="btn btn-ghost" id="save-btn" onclick="saveEventToDb()" disabled
|
||||
title="Download the full waveform from the device and save it to the SFM database + waveform store. Honors the Force refresh toggle.">
|
||||
@@ -1205,6 +1216,77 @@
|
||||
|
||||
</div><!-- end #tab-call-home -->
|
||||
|
||||
<!-- ════════════════════════════════════════════════════════════════
|
||||
TAB: Diagnostics
|
||||
═══════════════════════════════════════════════════════════════════ -->
|
||||
<div id="tab-diagnostics" class="tab-pane">
|
||||
|
||||
<div class="cfg-grid">
|
||||
|
||||
<div class="cfg-section">
|
||||
<div class="cfg-section-title">Device State</div>
|
||||
<div class="hint" style="margin-bottom:10px">
|
||||
Fast probes — POLL plus one read each, about 2 s. None of these walk the event chain.
|
||||
</div>
|
||||
<div class="dev-table" id="diag-table"></div>
|
||||
<div class="cfg-actions" style="margin-top:12px">
|
||||
<button class="btn btn-ghost" id="diag-refresh-btn" onclick="refreshDiagnostics()" disabled>Refresh</button>
|
||||
<span id="diag-status"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="cfg-section">
|
||||
<div class="cfg-section-title">Actions</div>
|
||||
|
||||
<div class="cfg-field">
|
||||
<label>Stop Monitoring</label>
|
||||
<button class="btn btn-ghost" id="diag-stop-btn" onclick="diagStopMonitoring()" disabled>Send Stop (SUB 0x97)</button>
|
||||
<div class="hint">Halts recording. On a unit triggering continuously, this is what breaks the call-home loop.</div>
|
||||
<span class="diag-result" id="diag-stop-result"></span>
|
||||
</div>
|
||||
|
||||
<div class="cfg-field">
|
||||
<label>Disable Auto Call Home</label>
|
||||
<button class="btn btn-ghost" id="diag-ach-btn" onclick="diagDisableAch()" disabled>Disable ACH</button>
|
||||
<div class="hint">Stored events are left untouched (<code>rescue?erase=false</code>). The unit stops dialing out until ACH is re-enabled.</div>
|
||||
<span class="diag-result" id="diag-ach-result"></span>
|
||||
</div>
|
||||
|
||||
<div class="cfg-field">
|
||||
<label>Erase All Events</label>
|
||||
<input type="text" id="diag-erase-confirm" placeholder="Type the serial to enable"
|
||||
oninput="diagCheckEraseConfirm()" autocomplete="off" />
|
||||
<button class="btn btn-danger" id="diag-erase-btn" onclick="diagEraseEvents()" disabled>Erase Events</button>
|
||||
<div class="hint">⚠ Permanent, and resets the event chain to key <code>0x01110000</code>. Download anything worth keeping first.</div>
|
||||
<span class="diag-result" id="diag-erase-result"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="cfg-section">
|
||||
<div class="cfg-section-title">Unresponsive Unit</div>
|
||||
<div class="hint" style="margin-bottom:10px">
|
||||
The escalation ladder from <code>docs/runbooks/wedged_unit_recovery.md</code>, for a unit too busy
|
||||
to answer normal request/response. Prefer <b>Method A</b> — point the modem at an
|
||||
<code>ach_server</code> and answer its call — before racing it with these.
|
||||
</div>
|
||||
|
||||
<div class="cfg-field">
|
||||
<label>Slow drip <span class="hint" style="display:inline">(one held session, a stop every 3 s)</span></label>
|
||||
<button class="btn btn-ghost" id="diag-drip-btn" onclick="diagSlowDrip()" disabled>Run 120 s drip</button>
|
||||
<div class="hint">Success is <code>bytes_received > 0</code>. A full duration with <code>send_error: null</code> is <b>not</b> success on its own.</div>
|
||||
<span class="diag-result" id="diag-drip-result"></span>
|
||||
</div>
|
||||
|
||||
<div class="cfg-field">
|
||||
<label>Blind stop <span class="hint" style="display:inline">(fire-and-forget, one attempt)</span></label>
|
||||
<button class="btn btn-ghost" id="diag-blind-btn" onclick="diagBlindStop()" disabled>Send blind stop</button>
|
||||
<span class="diag-result" id="diag-blind-result"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div><!-- end #tab-diagnostics -->
|
||||
|
||||
</div><!-- end #section-live -->
|
||||
|
||||
<!-- ════════════════════════════════════════════════════════════════
|
||||
@@ -1361,6 +1443,8 @@
|
||||
// ── State ──────────────────────────────────────────────────────────────────────
|
||||
let unitInfo = null;
|
||||
let eventList = [];
|
||||
let storageInfo = null; // /device/events/storage_range — cheap, read on connect
|
||||
let eventsLoaded = false; // the event chain walk is opt-in; see loadEventList()
|
||||
let currentEvent = 0;
|
||||
let charts = {};
|
||||
let geoAdcScale = 6.206;
|
||||
@@ -1458,6 +1542,7 @@ function switchTab(name) {
|
||||
if (name === 'units') { if (!unitsLoaded) loadUnits(); }
|
||||
if (name === 'monlog') { if (!monlogLoaded) loadMonitorLog(); }
|
||||
if (name === 'sessions') { if (!sessLoaded) loadSessions(); }
|
||||
if (name === 'diagnostics' && devHost() && unitInfo) refreshDiagnostics();
|
||||
}
|
||||
|
||||
// ── Connect ────────────────────────────────────────────────────────────────────
|
||||
@@ -1478,18 +1563,13 @@ async function connectUnit() {
|
||||
btn.disabled = false; btn.textContent = 'Connect'; return;
|
||||
}
|
||||
|
||||
setStatus('Fetching event list…', 'loading');
|
||||
try {
|
||||
const r = await fetch(`${api()}/device/events?${deviceParams()}`);
|
||||
if (!r.ok) { const e = await r.json().catch(() => ({})); throw new Error(e.detail || r.statusText); }
|
||||
const evData = await r.json();
|
||||
eventList = evData.events || [];
|
||||
// Merge compliance from /device/events response (it re-reads it)
|
||||
if (evData.device) unitInfo = { ...unitInfo, ...evData.device };
|
||||
} catch (e) {
|
||||
setStatus(`Event fetch failed: ${e.message}`, 'error');
|
||||
btn.disabled = false; btn.textContent = 'Reconnect'; return;
|
||||
}
|
||||
// Connecting deliberately does NOT walk the event chain. That walk reads
|
||||
// every event header over the cellular link and can take minutes — or fail
|
||||
// outright on a unit whose buffer has wrapped past 0xFFFF. Use the ~2 s
|
||||
// probes instead; the event list is opt-in via loadEventList().
|
||||
eventList = []; eventsLoaded = false;
|
||||
setStatus('Reading device state…', 'loading');
|
||||
storageInfo = await fetchJson(`/device/events/storage_range`).catch(() => null);
|
||||
|
||||
populateDeviceBar();
|
||||
populateDeviceTab();
|
||||
@@ -1498,11 +1578,9 @@ async function connectUnit() {
|
||||
|
||||
document.getElementById('device-bar').style.display = 'flex';
|
||||
document.getElementById('monitor-panel').style.display = 'flex';
|
||||
document.getElementById('load-btn').disabled = eventList.length === 0;
|
||||
document.getElementById('save-btn').disabled = eventList.length === 0;
|
||||
document.getElementById('download-btn').disabled = eventList.length === 0;
|
||||
document.getElementById('prev-btn').disabled = true;
|
||||
document.getElementById('next-btn').disabled = eventList.length <= 1;
|
||||
setEventButtonsEnabled();
|
||||
document.getElementById('load-events-btn').disabled = false;
|
||||
setDiagButtonsEnabled(true);
|
||||
document.getElementById('cfg-read-btn').disabled = false;
|
||||
document.getElementById('cfg-write-btn').disabled = false;
|
||||
document.getElementById('ch-read-btn').disabled = false;
|
||||
@@ -1510,7 +1588,9 @@ async function connectUnit() {
|
||||
|
||||
btn.disabled = false; btn.textContent = 'Reconnect';
|
||||
|
||||
setStatus(`Connected — ${eventList.length} event${eventList.length !== 1 ? 's' : ''} stored.`, 'ok');
|
||||
setStatus(storageInfo && storageInfo.is_empty
|
||||
? 'Connected — no events stored.'
|
||||
: 'Connected. Event list not loaded (Events → Load events).', 'ok');
|
||||
|
||||
// Fetch monitor status in background (non-blocking)
|
||||
refreshMonitorStatus().catch(() => {});
|
||||
@@ -1522,6 +1602,48 @@ async function connectUnit() {
|
||||
}
|
||||
}
|
||||
|
||||
// ── Shared fetch helper ────────────────────────────────────────────────────────
|
||||
async function fetchJson(path, opts) {
|
||||
const sep = path.includes('?') ? '&' : '?';
|
||||
const r = await fetch(`${api()}${path}${sep}${deviceParams()}`, opts);
|
||||
const body = await r.json().catch(() => ({}));
|
||||
if (!r.ok) throw new Error(body.detail || r.statusText);
|
||||
return body;
|
||||
}
|
||||
|
||||
function setEventButtonsEnabled() {
|
||||
const n = eventList.length;
|
||||
document.getElementById('load-btn').disabled = n === 0;
|
||||
document.getElementById('save-btn').disabled = n === 0;
|
||||
document.getElementById('download-btn').disabled = n === 0;
|
||||
document.getElementById('prev-btn').disabled = true;
|
||||
document.getElementById('next-btn').disabled = n <= 1;
|
||||
}
|
||||
|
||||
// ── Event list (opt-in — this is the slow chain walk) ──────────────────────────
|
||||
async function loadEventList() {
|
||||
if (!devHost()) { setStatus('Connect to a device first.', 'error'); return; }
|
||||
const btn = document.getElementById('load-events-btn');
|
||||
btn.disabled = true;
|
||||
setStatus('Walking the event chain — this can take a while…', 'loading');
|
||||
try {
|
||||
const evData = await fetchJson('/device/events');
|
||||
eventList = evData.events || [];
|
||||
eventsLoaded = true;
|
||||
// /device/events re-reads compliance; fold it in.
|
||||
if (evData.device) unitInfo = { ...unitInfo, ...evData.device };
|
||||
} catch (e) {
|
||||
setStatus(`Event fetch failed: ${e.message}`, 'error');
|
||||
btn.disabled = false; return;
|
||||
}
|
||||
populateDeviceBar();
|
||||
populateDeviceTab();
|
||||
populateEventChips();
|
||||
setEventButtonsEnabled();
|
||||
btn.disabled = false;
|
||||
setStatus(`${eventList.length} event${eventList.length !== 1 ? 's' : ''} stored.`, 'ok');
|
||||
}
|
||||
|
||||
// ── Device bar ─────────────────────────────────────────────────────────────────
|
||||
function populateDeviceBar() {
|
||||
qs('di-serial').textContent = unitInfo.serial || '—';
|
||||
@@ -1530,7 +1652,7 @@ function populateDeviceBar() {
|
||||
qs('di-sr').textContent = cc.sample_rate ? `${cc.sample_rate} sps` : '—';
|
||||
qs('di-rt').textContent = cc.record_time != null ? `${cc.record_time.toFixed(1)} s` : '—';
|
||||
qs('di-trig').textContent = cc.trigger_level_geo != null ? `${cc.trigger_level_geo.toFixed(3)} in/s` : '—';
|
||||
qs('di-count').textContent = eventList.length;
|
||||
qs('di-count').textContent = eventsLoaded ? eventList.length : '—';
|
||||
qs('di-project').textContent = cc.project || '—';
|
||||
qs('di-client').textContent = cc.client || '—';
|
||||
qs('di-operator').textContent = cc.operator || '—';
|
||||
@@ -1660,7 +1782,8 @@ function populateDeviceTab() {
|
||||
{ label:'DSP', value: unitInfo.dsp_version || '—' },
|
||||
{ label:'Model', value: unitInfo.model || '—' },
|
||||
{ label:'Manufacturer', value: unitInfo.manufacturer || '—' },
|
||||
{ label:'Stored Events', value: eventList.length },
|
||||
{ label:'Stored Events', value: eventsLoaded ? eventList.length : 'not loaded' },
|
||||
{ label:'Storage Used', value: storageUsedLabel() },
|
||||
];
|
||||
for (const {label, value} of cardData) {
|
||||
const c = document.createElement('div');
|
||||
@@ -1707,6 +1830,158 @@ function renderTable(id, rows) {
|
||||
}
|
||||
}
|
||||
|
||||
// ── Diagnostics ────────────────────────────────────────────────────────────────
|
||||
// Everything here is a cheap probe (POLL + one read) or a single write. None of
|
||||
// it walks the event chain. See docs/runbooks/wedged_unit_recovery.md.
|
||||
|
||||
function storageUsedLabel() {
|
||||
if (!storageInfo) return '—';
|
||||
if (storageInfo.is_empty) return 'empty';
|
||||
const f = storageInfo.first_key, l = storageInfo.last_key;
|
||||
return (f && l) ? `${f} → ${l}` : '—';
|
||||
}
|
||||
|
||||
function setDiagButtonsEnabled(on) {
|
||||
for (const id of ['diag-refresh-btn','diag-stop-btn','diag-ach-btn',
|
||||
'diag-drip-btn','diag-blind-btn']) {
|
||||
const el = document.getElementById(id);
|
||||
if (el) el.disabled = !on;
|
||||
}
|
||||
diagCheckEraseConfirm();
|
||||
}
|
||||
|
||||
// Erase is guarded by typing the serial — auth answers "who", not "did you mean it".
|
||||
function diagCheckEraseConfirm() {
|
||||
const box = document.getElementById('diag-erase-confirm');
|
||||
const btn = document.getElementById('diag-erase-btn');
|
||||
if (!box || !btn) return;
|
||||
const serial = (unitInfo && unitInfo.serial) || '';
|
||||
btn.disabled = !serial || box.value.trim().toUpperCase() !== serial.toUpperCase();
|
||||
}
|
||||
|
||||
function diagResult(id, text, cls) {
|
||||
const el = document.getElementById(id);
|
||||
if (!el) return;
|
||||
el.textContent = text;
|
||||
el.className = 'diag-result' + (cls ? ' ' + cls : '');
|
||||
}
|
||||
|
||||
async function refreshDiagnostics() {
|
||||
if (!devHost()) return;
|
||||
const st = document.getElementById('diag-status');
|
||||
if (st) { st.textContent = 'Reading…'; st.className = 'loading'; }
|
||||
|
||||
const [mon, store, idx] = await Promise.all([
|
||||
fetchJson('/device/monitor/status?force=true').catch(e => ({ _err: e.message })),
|
||||
fetchJson('/device/events/storage_range').catch(e => ({ _err: e.message })),
|
||||
fetchJson('/device/events/index').catch(e => ({ _err: e.message })),
|
||||
]);
|
||||
|
||||
if (!store._err) storageInfo = store;
|
||||
|
||||
const err = v => `<span style="color:var(--red)">${v}</span>`;
|
||||
const rows = [];
|
||||
|
||||
rows.push(['Monitoring', mon._err ? err(mon._err)
|
||||
: (mon.is_monitoring ? '<b>MONITORING</b>' : 'idle')]);
|
||||
if (!mon._err) {
|
||||
rows.push(['Battery', mon.battery_v != null ? `${mon.battery_v.toFixed(2)} V` : '—']);
|
||||
if (mon.memory_total_bytes) {
|
||||
const used = mon.memory_total_bytes - (mon.memory_free_bytes ?? 0);
|
||||
const pct = (used / mon.memory_total_bytes * 100).toFixed(1);
|
||||
rows.push(['Memory used', `${used.toLocaleString()} / ${mon.memory_total_bytes.toLocaleString()} bytes (${pct}%)`]);
|
||||
}
|
||||
}
|
||||
|
||||
rows.push(['Event chain', store._err ? err(store._err) : storageUsedLabel()]);
|
||||
if (!store._err) rows.push(['Chain empty', store.is_empty ? 'yes' : 'no']);
|
||||
|
||||
// SUB 0x08. Known to report 0 on units with years of history — suspected
|
||||
// field-offset bug in the decode, so show it but do not trust it.
|
||||
rows.push(['Lifetime events', idx._err ? err(idx._err)
|
||||
: `${idx.lifetime_count} <span class="hint" style="display:inline">(unreliable — see CHANGELOG)</span>`]);
|
||||
|
||||
renderTable('diag-table', rows);
|
||||
populateDeviceTab();
|
||||
if (st) { st.textContent = ''; st.className = ''; }
|
||||
}
|
||||
|
||||
async function diagStopMonitoring() {
|
||||
const btn = document.getElementById('diag-stop-btn');
|
||||
btn.disabled = true; diagResult('diag-stop-result', 'Sending…');
|
||||
try {
|
||||
await fetchJson('/device/monitor/stop', { method: 'POST' });
|
||||
diagResult('diag-stop-result', 'Stop acknowledged — recording halted.', 'ok');
|
||||
refreshDiagnostics();
|
||||
} catch (e) {
|
||||
diagResult('diag-stop-result', `Failed: ${e.message}`, 'error');
|
||||
}
|
||||
btn.disabled = false;
|
||||
}
|
||||
|
||||
async function diagDisableAch() {
|
||||
const btn = document.getElementById('diag-ach-btn');
|
||||
btn.disabled = true; diagResult('diag-ach-result', 'Writing call-home config…');
|
||||
try {
|
||||
const r = await fetchJson('/device/rescue?erase=false', { method: 'POST' });
|
||||
const steps = (r.steps || []).map(s => s.step).join(' → ') || 'done';
|
||||
diagResult('diag-ach-result', `ACH disabled (${steps}). Events untouched.`, 'ok');
|
||||
} catch (e) {
|
||||
diagResult('diag-ach-result', `Failed: ${e.message}`, 'error');
|
||||
}
|
||||
btn.disabled = false;
|
||||
}
|
||||
|
||||
async function diagEraseEvents() {
|
||||
const serial = (unitInfo && unitInfo.serial) || 'this unit';
|
||||
if (!confirm(`Permanently erase ALL events on ${serial}?\n\nThis cannot be undone.`)) return;
|
||||
const btn = document.getElementById('diag-erase-btn');
|
||||
btn.disabled = true; diagResult('diag-erase-result', 'Erasing…');
|
||||
try {
|
||||
await fetchJson('/device/events/erase', { method: 'POST' });
|
||||
diagResult('diag-erase-result', 'Events erased — chain reset to 0x01110000.', 'ok');
|
||||
document.getElementById('diag-erase-confirm').value = '';
|
||||
eventList = []; eventsLoaded = false;
|
||||
setEventButtonsEnabled(); populateEventChips();
|
||||
refreshDiagnostics();
|
||||
} catch (e) {
|
||||
diagResult('diag-erase-result', `Failed: ${e.message}`, 'error');
|
||||
}
|
||||
diagCheckEraseConfirm();
|
||||
}
|
||||
|
||||
async function diagSlowDrip() {
|
||||
const btn = document.getElementById('diag-drip-btn');
|
||||
btn.disabled = true;
|
||||
diagResult('diag-drip-result', 'Holding a session for 120 s…');
|
||||
try {
|
||||
const r = await fetchJson('/device/stop_monitoring_slow_drip?duration_s=120&interval_s=3',
|
||||
{ method: 'POST' });
|
||||
const good = (r.bytes_received || 0) > 0;
|
||||
diagResult('diag-drip-result',
|
||||
`drips ${r.drips_sent} · held ${r.duration_s}s · bytes back ${r.bytes_received}` +
|
||||
(r.send_error ? ` · ${r.send_error}` : '') +
|
||||
(good ? ' → device responded' : ' → no response; the modem may not be bridging'),
|
||||
good ? 'ok' : 'error');
|
||||
} catch (e) {
|
||||
diagResult('diag-drip-result', `Failed: ${e.message}`, 'error');
|
||||
}
|
||||
btn.disabled = false;
|
||||
}
|
||||
|
||||
async function diagBlindStop() {
|
||||
const btn = document.getElementById('diag-blind-btn');
|
||||
btn.disabled = true; diagResult('diag-blind-result', 'Sending…');
|
||||
try {
|
||||
const r = await fetchJson('/device/stop_monitoring_blind', { method: 'POST' });
|
||||
diagResult('diag-blind-result',
|
||||
`Sent ${r.bytes_sent ?? '?'} bytes, no response read (fire-and-forget).`, 'ok');
|
||||
} catch (e) {
|
||||
diagResult('diag-blind-result', `Failed: ${e.message}`, 'error');
|
||||
}
|
||||
btn.disabled = false;
|
||||
}
|
||||
|
||||
// ── Config form ────────────────────────────────────────────────────────────────
|
||||
function populateConfigFromDeviceInfo() {
|
||||
if (!unitInfo) return;
|
||||
|
||||
@@ -662,6 +662,11 @@ class WaveformStore:
|
||||
ev.raw_samples = idf_samples
|
||||
n_samples = max((len(idf_samples.get(ch, [])) for ch in ("Tran", "Vert", "Long", "MicL")), default=0)
|
||||
ev.total_samples = ev.total_samples or n_samples
|
||||
# Sensor self-check traces from the IDFW fixed header (waveform
|
||||
# events only; {} on histograms / when absent). Carried on the
|
||||
# bridged Event so the .h5 writer persists them like series-3.
|
||||
from micromate.sensor_check import decode_idf_sensor_check
|
||||
ev.sensor_check = decode_idf_sensor_check(idf_bytes) or None
|
||||
|
||||
# For IDFH histograms there are no per-sample waveform arrays — the
|
||||
# device stores one peak ADC count per interval per channel. Synthesise
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Vendored
BIN
Binary file not shown.
@@ -0,0 +1,71 @@
|
||||
"""The event .h5 carries the sensor self-check traces (schema v2).
|
||||
|
||||
The sensor check is decoded by the per-series decoder and attached to the
|
||||
standardized Event, so the .h5 writer persists it device-agnostically and SFM
|
||||
reads it back without knowing which instrument produced it. Old v1 files (no
|
||||
sensor_check group) must still read cleanly.
|
||||
"""
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
|
||||
import numpy as np
|
||||
|
||||
from minimateplus.models import Event
|
||||
from minimateplus.event_file_io import read_blastware_file
|
||||
from sfm import event_hdf5
|
||||
|
||||
S3_FIX = Path(__file__).parent / "fixtures" / "fft-oracle-2026-09-14" / "N844LQHB.ZT0W"
|
||||
|
||||
|
||||
def _write(ev, **kw):
|
||||
d = Path(tempfile.mkdtemp())
|
||||
p = d / "e.h5"
|
||||
event_hdf5.write_event_hdf5(p, ev, serial="BE12844", **kw)
|
||||
return p
|
||||
|
||||
|
||||
def test_sensor_check_roundtrips_through_hdf5():
|
||||
ev = Event(index=0)
|
||||
ev.raw_samples = {"Tran": [1, 2, -3], "Vert": [0, 1], "Long": [2], "MicL": [5, -5]}
|
||||
ev.sample_rate = 1024
|
||||
sc = {"Tran": [0, -990, -500, -100], "Vert": [0, -980, -480],
|
||||
"Long": [0, -986, -470], "MicL": [0, -1800, 1800, -1800]}
|
||||
ev.sensor_check = sc
|
||||
|
||||
r = event_hdf5.read_event_hdf5(_write(ev))
|
||||
assert r["schema_version"] == 2
|
||||
assert set(r["sensor_check"]) == {"Tran", "Vert", "Long", "MicL"}
|
||||
for ch, vals in sc.items():
|
||||
assert r["sensor_check"][ch].tolist() == vals
|
||||
|
||||
|
||||
def test_plot_json_carries_sensor_check():
|
||||
ev = Event(index=0)
|
||||
ev.raw_samples = {"Tran": [1, 2, 3]}
|
||||
ev.sample_rate = 1024
|
||||
ev.sensor_check = {"Tran": [0, -990, -500], "Vert": [0, -980],
|
||||
"Long": [0, -986]} # 3-channel: no MicL
|
||||
pj = event_hdf5.plot_json_from_hdf5(_write(ev))
|
||||
assert pj["sensor_check"] is not None
|
||||
assert "MicL" not in pj["sensor_check"]
|
||||
assert pj["sensor_check"]["Tran"] == [0, -990, -500]
|
||||
|
||||
|
||||
def test_event_without_sensor_check_still_reads_as_v2():
|
||||
ev = Event(index=0)
|
||||
ev.raw_samples = {"Tran": [1, 2, 3]}
|
||||
ev.sample_rate = 1024
|
||||
r = event_hdf5.read_event_hdf5(_write(ev))
|
||||
assert r["schema_version"] == 2
|
||||
assert r["sensor_check"] is None
|
||||
assert event_hdf5.plot_json_from_hdf5(_write(ev))["sensor_check"] is None
|
||||
|
||||
|
||||
def test_series3_decode_populates_event_sensor_check():
|
||||
# The real series-3 decoder attaches the traces to the Event, so the
|
||||
# ingest/backfill .h5 write picks them up with no extra plumbing.
|
||||
ev = read_blastware_file(S3_FIX)
|
||||
assert ev.sensor_check is not None
|
||||
assert set(ev.sensor_check) == {"Tran", "Vert", "Long", "MicL"}
|
||||
tran = np.asarray(ev.sensor_check["Tran"], dtype=float)
|
||||
assert tran.min() < -800 # the geophone ring-down deflection
|
||||
@@ -0,0 +1,54 @@
|
||||
"""Event timestamp decode — waveform trigger/stop vs histogram window start.
|
||||
|
||||
The Blastware footer holds two timestamps: ts1 = footer[2:10], ts2 = footer[10:18].
|
||||
Their meaning depends on record type:
|
||||
|
||||
* Waveform: ts1 is the monitoring-SESSION start (e.g. 06:00 for a unit that
|
||||
arms at 06:00 daily — shared across every event that day), and ts2 is THIS
|
||||
event's recording STOP. read_blastware_file used to stamp events with ts1 →
|
||||
every waveform showed the session start (~4.5 h off). Binary-only, the best
|
||||
estimate is ts2 (the stop); the exact trigger BW displays (= ts2 - record
|
||||
duration) comes from the paired report's event_datetime, since the binary
|
||||
STRT record-time byte is a misparsed record-type marker.
|
||||
* Histogram: ts1/ts2 are the ~24 h window [start, stop]; the event time is the
|
||||
window start = ts1 (unchanged).
|
||||
"""
|
||||
import datetime
|
||||
from pathlib import Path
|
||||
|
||||
from minimateplus.event_file_io import read_blastware_file, apply_report_to_event
|
||||
from minimateplus.bw_ascii_report import BwAsciiReport
|
||||
from minimateplus.models import Event
|
||||
|
||||
FIX = Path(__file__).parent / "fixtures"
|
||||
WAVEFORM = FIX / "fft-oracle-2026-09-14" / "N844LQHB.ZT0W" # footer ts2 = 2026-08-25 10:33:32
|
||||
HISTOGRAM = FIX / "ts-fix" / "K441LKZU.C30H" # window start 2026-05-10 19:04:50
|
||||
|
||||
|
||||
def _tuple(ts):
|
||||
return (ts.year, ts.month, ts.day, ts.hour, ts.minute, ts.second)
|
||||
|
||||
|
||||
def test_waveform_timestamp_is_exact_trigger_from_binary():
|
||||
ev = read_blastware_file(WAVEFORM)
|
||||
# The EXACT Blastware trigger, from the binary alone: ts2 (stop 10:33:32)
|
||||
# minus the config record time (3.0 s) = 10:33:29 — NOT the 06:00:13
|
||||
# monitoring-session start the old decode used.
|
||||
assert _tuple(ev.timestamp) == (2026, 8, 25, 10, 33, 29), _tuple(ev.timestamp)
|
||||
|
||||
|
||||
def test_histogram_timestamp_is_window_start_unchanged():
|
||||
ev = read_blastware_file(HISTOGRAM)
|
||||
# Histogram event time = the window start (ts1); must NOT get the waveform
|
||||
# ts2 treatment (that would land ~24 h off).
|
||||
assert _tuple(ev.timestamp) == (2026, 5, 10, 19, 4, 50), _tuple(ev.timestamp)
|
||||
|
||||
|
||||
def test_report_event_datetime_is_authoritative_over_binary():
|
||||
# The binary already yields the exact trigger, but a paired report stays
|
||||
# authoritative (e.g. if the unit clock had drifted) — applying it wins.
|
||||
ev = read_blastware_file(WAVEFORM)
|
||||
assert _tuple(ev.timestamp) == (2026, 8, 25, 10, 33, 29) # exact, from binary
|
||||
apply_report_to_event(ev, BwAsciiReport(
|
||||
event_datetime=datetime.datetime(2026, 8, 25, 10, 35, 0)))
|
||||
assert _tuple(ev.timestamp) == (2026, 8, 25, 10, 35, 0) # report wins
|
||||
@@ -0,0 +1,396 @@
|
||||
"""Client-layer tests for the Micromate (series-4) live client.
|
||||
|
||||
Every response constant below is a **real data section**, captured from UM12947
|
||||
(firmware 11.0CB) in ``bridges/captures/9-24-26 - micromate2/``. They are
|
||||
embedded as hex because the captures are gitignored.
|
||||
|
||||
Where a decoded value can be checked against something outside the bytes, it is:
|
||||
the device clock against the capture's own filename timestamp, the battery
|
||||
against Thor's event reports (3.8 V), the setup list against what the unit
|
||||
displays.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import datetime
|
||||
import os
|
||||
import sys
|
||||
|
||||
import pytest
|
||||
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
from micromate.client import CONTENT, MicromateClient, _content, _cstring
|
||||
from micromate.framing import ETX, STX, checksum, stuff
|
||||
from micromate.protocol import ProtocolError
|
||||
|
||||
FLAGS_CB, FLAGS_THOR = 0xC5, 0x03
|
||||
|
||||
|
||||
# ── Captured response data sections ───────────────────────────────────────────
|
||||
|
||||
# Generated from the captures by hand-free extraction -- the hex below is
|
||||
# verbatim response data, not reconstructed. The trailing comment on each
|
||||
# names the capture it came from, which is what lets the clock assertions be
|
||||
# checked against a wall-clock timestamp.
|
||||
|
||||
POLL = bytes.fromhex( # 59 B, from_20260924_185113_
|
||||
"300000000000000000000000000050496e7374616e74656c"
|
||||
"000600c3f04a00e4194f0074024d4d2f495345452f532f49"
|
||||
"4f00001f603e7657603e76"
|
||||
)
|
||||
SERIAL = bytes.fromhex( # 21 B, from_20260924_191214_
|
||||
"0a00000000000000000000554d3132393437003100"
|
||||
)
|
||||
STATE_IDLE = bytes.fromhex( # 16 B, from_20260924_191214_
|
||||
"050000000000000000000000e8000b00"
|
||||
)
|
||||
STATE_MONITORING = bytes.fromhex( # 16 B, from_20260924_191214_
|
||||
"050000000000000000000002e8000b00"
|
||||
)
|
||||
MS_MONITORING = bytes.fromhex( # 55 B, from_20260924_191214_
|
||||
"2c00000000000000000000000e180907ea20130c19000000"
|
||||
"000001000000000000000000000000000000000000017c00"
|
||||
"e4e1c000e3f1c0"
|
||||
)
|
||||
MS_IDLE = bytes.fromhex( # 55 B, from_20260924_191214_
|
||||
"2c000000000000000000000000180907ea64130d22000000"
|
||||
"000001000000000000000000000000000000000000017c00"
|
||||
"e4e1c000e3e1c0"
|
||||
)
|
||||
MS_LATE = bytes.fromhex( # 55 B, from_20260925_011403_
|
||||
"2c000000000000000000000000190907ea74010e05000000"
|
||||
"000001000000000000000000000000000000000000017c00"
|
||||
"e4e1c000e3e1c0"
|
||||
)
|
||||
|
||||
_SETUP_PAD = 266 - CONTENT
|
||||
|
||||
|
||||
def setup_response(name: str) -> bytes:
|
||||
"""A 0x41/0x3F/0x40 response: 11-byte prefix then a null-padded name."""
|
||||
body = name.encode("ascii").ljust(_SETUP_PAD, b"\x00")
|
||||
return bytes([0xFF]) + bytes(10) + body
|
||||
|
||||
|
||||
# The real 22 names, in the order the unit walked them.
|
||||
SETUP_NAMES = [
|
||||
"factory.MMB", "TEST.MMB", "BUS TEST.MMB", "Walsh JV 241.mmb",
|
||||
"Walsh JV 008.mmb", "Hawbaker 322.mmb", "Hawbaker 322 blasting.mmb",
|
||||
"min.mmb", "Playhouse Loc 1.mmb", "Valley Rock Solution.MMB",
|
||||
"RecordingSetup.mmb", "UPMC.mmb", "UPMC Loc 3.mmb", "Residence Inn.mmb",
|
||||
"Micromate ext trigger.mmb", "Micromate remort alarm.mmb",
|
||||
"Tree of Life - Loc 1 - 5861 Solway.mmb", "Mele-PWSA-Carroll -Loc 4.mmb",
|
||||
"Micromate min trigger mmb.mmb", "Fay - Layton Bridge Project.mmb",
|
||||
"Default Micromate ISEE.mmb", "TEST1.mmb",
|
||||
]
|
||||
|
||||
|
||||
# ── Test doubles ──────────────────────────────────────────────────────────────
|
||||
|
||||
class ScriptedTransport:
|
||||
def __init__(self, responses: list[bytes]) -> None:
|
||||
self.queue = list(responses)
|
||||
self.written: list[bytes] = []
|
||||
self._connected = False
|
||||
|
||||
def connect(self) -> None:
|
||||
self._connected = True
|
||||
|
||||
def disconnect(self) -> None:
|
||||
self._connected = False
|
||||
|
||||
def is_connected(self) -> bool:
|
||||
return self._connected
|
||||
|
||||
def write(self, data: bytes) -> None:
|
||||
self.written.append(data)
|
||||
|
||||
def read(self, n: int) -> bytes:
|
||||
return self.queue.pop(0) if self.queue else b""
|
||||
|
||||
|
||||
def frame(rsp_sub: int, data: bytes, *, flags: int = FLAGS_CB) -> bytes:
|
||||
payload = bytes([0x00, flags, rsp_sub, 0x00, 0x00]) + data
|
||||
return bytes([STX]) + stuff(payload + bytes([checksum(payload)])) + bytes([ETX])
|
||||
|
||||
|
||||
def client(responses: list[bytes], **kw) -> tuple[MicromateClient, ScriptedTransport]:
|
||||
t = ScriptedTransport(responses)
|
||||
return MicromateClient(t, recv_timeout=0.5, **kw), t
|
||||
|
||||
|
||||
# ── The captured constants are what we think they are ─────────────────────────
|
||||
|
||||
def test_captured_constants_have_the_expected_lengths():
|
||||
assert len(POLL) == 59
|
||||
assert len(SERIAL) == 21
|
||||
assert len(STATE_IDLE) == len(STATE_MONITORING) == 16
|
||||
assert len(MS_MONITORING) == len(MS_IDLE) == len(MS_LATE) == 55
|
||||
|
||||
|
||||
def test_the_prefix_length_byte_is_only_the_low_byte():
|
||||
"""⚠ data[0] is `content_length & 0xFF`, with no high byte anywhere.
|
||||
|
||||
True for every response under 256 bytes, which is why it reads as a working
|
||||
length field -- and then loses 2,048 bytes on a setup block. The client
|
||||
takes content as data[11:] for exactly this reason.
|
||||
"""
|
||||
for data in (POLL, SERIAL, STATE_IDLE, MS_MONITORING):
|
||||
assert data[0] == (len(data) - CONTENT) & 0xFF
|
||||
assert data[1] == 0x00, "no high byte is stored"
|
||||
|
||||
# The two that prove it is not a real length: a 2,092-byte setup block
|
||||
# reports 44, and a 1,024-byte download chunk reports 0.
|
||||
assert (2092 & 0xFF) == 44
|
||||
assert (1024 & 0xFF) == 0
|
||||
|
||||
|
||||
# ── Helpers ───────────────────────────────────────────────────────────────────
|
||||
|
||||
def test_a_printable_byte_precedes_the_manufacturer_string():
|
||||
"""content[2] is 0x50 -- "P". This is why the POLL parse cannot be a scan."""
|
||||
c = _content(POLL)
|
||||
assert c[3] == 0x50 and chr(c[3]) == "P"
|
||||
assert c[4:13] == b"Instantel"
|
||||
|
||||
|
||||
def test_content_strips_exactly_eleven_bytes():
|
||||
assert _content(SERIAL) == bytes.fromhex("554d3132393437003100")
|
||||
assert _content(b"short") == b""
|
||||
|
||||
|
||||
def test_cstring_stops_at_the_null():
|
||||
assert _cstring(bytes.fromhex("554d3132393437003100")) == "UM12947"
|
||||
assert _cstring(b"\x00rest") == ""
|
||||
|
||||
|
||||
# ── connect() ─────────────────────────────────────────────────────────────────
|
||||
|
||||
def test_connect_decodes_identity():
|
||||
mm, t = client([
|
||||
frame(0xA4, POLL), frame(0xEA, SERIAL), frame(0xB6, STATE_IDLE),
|
||||
frame(0xBE, setup_response("TEST1.mmb")),
|
||||
])
|
||||
info = mm.connect()
|
||||
|
||||
assert info.serial == "UM12947"
|
||||
assert info.manufacturer == "Instantel"
|
||||
assert info.model == "MM/ISEE/S/IO"
|
||||
assert info.firmware_line == "blastware"
|
||||
assert info.monitoring is False
|
||||
assert info.active_setup == "TEST1.mmb"
|
||||
assert "UM12947" in str(info) and "idle" in str(info)
|
||||
|
||||
|
||||
def test_connect_sends_three_reads_not_thors_four():
|
||||
"""⚠ Deliberately narrower than Thor's POLL -> SERIAL -> 0x49 -> POLL.
|
||||
|
||||
The trailing POLL repeats the first; measuring all 8 captured sessions
|
||||
showed the four-command form is Thor's connection check (3 of 8 sessions),
|
||||
not a handshake. Only "opens with POLL" is invariant.
|
||||
"""
|
||||
mm, t = client([
|
||||
frame(0xA4, POLL), frame(0xEA, SERIAL), frame(0xB6, STATE_IDLE),
|
||||
frame(0xBE, setup_response("TEST1.mmb")),
|
||||
])
|
||||
mm.connect()
|
||||
subs = [w[5] for w in t.written] # payload[2] lands at wire[5]
|
||||
assert subs == [0x5B, 0x15, 0x49, 0x41]
|
||||
assert 0x01 not in subs, "device info has no Thor precedent; do not read it"
|
||||
|
||||
|
||||
def test_connect_can_skip_the_active_setup():
|
||||
mm, t = client([frame(0xA4, POLL), frame(0xEA, SERIAL), frame(0xB6, STATE_IDLE)])
|
||||
info = mm.connect(with_active_setup=False)
|
||||
assert info.active_setup is None
|
||||
assert len(t.written) == 3
|
||||
|
||||
|
||||
def test_connect_survives_an_unreadable_active_setup():
|
||||
"""A unit with no setup loaded is a real state, not a failed connect."""
|
||||
mm, _ = client([
|
||||
frame(0xA4, POLL), frame(0xEA, SERIAL), frame(0xB6, STATE_IDLE),
|
||||
frame(0x00, bytes(20)), # wrong SUB -> UnexpectedResponse
|
||||
])
|
||||
info = mm.connect()
|
||||
assert info.serial == "UM12947"
|
||||
assert info.active_setup is None
|
||||
|
||||
|
||||
def test_connect_reports_a_monitoring_unit():
|
||||
mm, _ = client([
|
||||
frame(0xA4, POLL), frame(0xEA, SERIAL), frame(0xB6, STATE_MONITORING),
|
||||
frame(0xBE, setup_response("TEST1.mmb")),
|
||||
])
|
||||
assert mm.connect().monitoring is True
|
||||
|
||||
|
||||
def test_the_state_flag_is_tested_for_non_zero():
|
||||
"""⚠ Never compared against 0x02 -- this flag family is not a stable enum.
|
||||
|
||||
Its sibling in SUB 0x1C has read both 0x0E and 0x0C while monitoring.
|
||||
"""
|
||||
for value in (0x01, 0x02, 0x0C, 0x0E, 0xFF):
|
||||
data = bytearray(STATE_IDLE)
|
||||
data[CONTENT] = value
|
||||
mm, _ = client([
|
||||
frame(0xA4, POLL), frame(0xEA, SERIAL), frame(0xB6, bytes(data)),
|
||||
frame(0xBE, setup_response("x.mmb")),
|
||||
])
|
||||
assert mm.connect().monitoring is True, f"0x{value:02x} should read as monitoring"
|
||||
|
||||
|
||||
def test_the_model_string_is_anchored_on_MM_not_on_an_offset():
|
||||
"""The Thor firmware line reports a SHORTER model string, "MM/ISEE/S".
|
||||
|
||||
Anchoring on b"MM/" survives that; a fixed end offset would not. A generic
|
||||
printable-run scan fails for a different reason -- see _parse_poll.
|
||||
"""
|
||||
bd = bytearray(POLL)
|
||||
assert bd[CONTENT + 26:CONTENT + 38] == b"MM/ISEE/S/IO"
|
||||
bd[CONTENT + 26:CONTENT + 38] = b"MM/ISEE/S\x00\x00\x00"
|
||||
mm, _ = client([
|
||||
frame(0xA4, bytes(bd), flags=FLAGS_THOR), frame(0xEA, SERIAL),
|
||||
frame(0xB6, STATE_IDLE), frame(0xBE, setup_response("x.mmb")),
|
||||
])
|
||||
info = mm.connect()
|
||||
assert info.model == "MM/ISEE/S"
|
||||
assert info.manufacturer == "Instantel"
|
||||
assert info.firmware_line == "thor"
|
||||
|
||||
|
||||
# ── get_state() ───────────────────────────────────────────────────────────────
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"data, monitoring, when, free",
|
||||
[
|
||||
(MS_MONITORING, True, datetime.datetime(2026, 9, 24, 19, 12, 25), 0x00E3F1C0),
|
||||
(MS_IDLE, False, datetime.datetime(2026, 9, 24, 19, 13, 34), 0x00E3E1C0),
|
||||
(MS_LATE, False, datetime.datetime(2026, 9, 25, 1, 14, 5), 0x00E3E1C0),
|
||||
],
|
||||
ids=["monitoring", "idle", "after-midnight"],
|
||||
)
|
||||
def test_get_state_decodes_the_real_reads(data, monitoring, when, free):
|
||||
"""⚠ There is an unidentified byte at content[6]; the hour is at content[7].
|
||||
|
||||
The protocol reference's 0x1C section has this right. Its one-line summary
|
||||
in the divergences list reads as six contiguous fields and does not.
|
||||
|
||||
Each expected time is checked against the capture filename that produced the
|
||||
bytes: 19:12:14, 19:12:14 and 01:14:03. All three decode to seconds-to-a-
|
||||
minute after their session opened, which is what a device clock should do.
|
||||
Reading content[6] as the hour gives 32, 100 and 116.
|
||||
"""
|
||||
mm, _ = client([frame(0xE3, data)])
|
||||
st = mm.get_state()
|
||||
|
||||
assert st.monitoring is monitoring
|
||||
assert st.device_time == when
|
||||
assert st.battery_volts == 3.80 # Thor's reports print 3.8 V
|
||||
assert st.memory_total_bytes == 15_000_000
|
||||
assert st.memory_free_bytes == free
|
||||
assert st.raw == data
|
||||
|
||||
|
||||
def test_content_6_is_not_the_hour():
|
||||
"""The byte the reference implies is the hour reads 32, 100 and 116."""
|
||||
for data in (MS_MONITORING, MS_IDLE, MS_LATE):
|
||||
assert _content(data)[6] not in range(24)
|
||||
|
||||
|
||||
def test_memory_derivations():
|
||||
mm, _ = client([frame(0xE3, MS_MONITORING)])
|
||||
st = mm.get_state()
|
||||
assert st.memory_used_bytes == 15_000_000 - 0x00E3F1C0
|
||||
assert 0 < st.memory_used_fraction < 0.02
|
||||
assert "3.80 V" in str(st)
|
||||
|
||||
|
||||
def test_battery_and_memory_are_read_forward_from_content_start():
|
||||
"""⚠ NOT backward from the end.
|
||||
|
||||
This block is 4 bytes longer on the Thor firmware line, and Series III's
|
||||
from-the-end offsets give a 11.0BD unit a battery reading of 577.92 V. The
|
||||
extra bytes are trailing, so appending four does not move anything.
|
||||
"""
|
||||
bd = MS_MONITORING + bytes.fromhex("0fa00000")
|
||||
bd = bytes([0x30]) + bd[1:] # low-byte length becomes 48
|
||||
mm, _ = client([frame(0xE3, bd)])
|
||||
st = mm.get_state()
|
||||
|
||||
assert st.battery_volts == 3.80, "forward offsets must survive the 4 extra bytes"
|
||||
assert st.memory_total_bytes == 15_000_000
|
||||
# What the Series III from-the-end offsets would have produced:
|
||||
assert int.from_bytes(bd[-10:-8], "big") / 100 == pytest.approx(577.92, abs=0.01)
|
||||
|
||||
|
||||
def test_a_dead_clock_battery_does_not_fail_the_whole_read():
|
||||
"""An impossible date is information; the rest of the block is still good."""
|
||||
broken = bytearray(MS_MONITORING)
|
||||
broken[CONTENT + 3] = 0xFF # month 255
|
||||
mm, _ = client([frame(0xE3, bytes(broken))])
|
||||
st = mm.get_state()
|
||||
assert st.device_time is None
|
||||
assert st.battery_volts == 3.80
|
||||
|
||||
|
||||
def test_a_truncated_state_block_raises():
|
||||
mm, _ = client([frame(0xE3, bytes(20))])
|
||||
with pytest.raises(ProtocolError, match="need at least 44"):
|
||||
mm.get_state()
|
||||
|
||||
|
||||
# ── Setups ────────────────────────────────────────────────────────────────────
|
||||
|
||||
def test_list_setups_walks_to_the_empty_terminator():
|
||||
"""22 real names then an empty one, exactly as the unit walked them."""
|
||||
responses = [frame(0xC0, setup_response(SETUP_NAMES[0]))]
|
||||
responses += [frame(0xBF, setup_response(n)) for n in SETUP_NAMES[1:]]
|
||||
responses += [frame(0xBF, setup_response(""))]
|
||||
|
||||
mm, t = client(responses)
|
||||
assert mm.list_setups() == SETUP_NAMES
|
||||
assert len(t.written) == 23, "22 names plus the terminator"
|
||||
assert t.written[0][5] == 0x3F
|
||||
assert {w[5] for w in t.written[1:]} == {0x40}
|
||||
|
||||
|
||||
def test_list_setups_handles_an_empty_unit():
|
||||
mm, _ = client([frame(0xC0, setup_response(""))])
|
||||
assert mm.list_setups() == []
|
||||
|
||||
|
||||
def test_list_setups_refuses_to_loop_forever():
|
||||
"""A cursor that never advances is a bug, and must not hang the caller."""
|
||||
from micromate import client as C
|
||||
|
||||
mm, _ = client([frame(0xC0, setup_response("a.mmb"))]
|
||||
+ [frame(0xBF, setup_response("a.mmb"))] * (C._MAX_SETUPS + 5))
|
||||
with pytest.raises(ProtocolError, match="not advancing"):
|
||||
mm.list_setups()
|
||||
|
||||
|
||||
def test_get_active_setup_handles_a_long_name():
|
||||
long_name = "Tree of Life - Loc 1 - 5861 Solway.mmb"
|
||||
mm, _ = client([frame(0xBE, setup_response(long_name))])
|
||||
assert mm.get_active_setup() == long_name
|
||||
|
||||
|
||||
# ── Lifecycle ─────────────────────────────────────────────────────────────────
|
||||
|
||||
def test_the_client_owns_the_transport():
|
||||
mm, t = client([])
|
||||
assert not mm.is_open()
|
||||
mm.open()
|
||||
assert mm.is_open() and t.is_connected()
|
||||
mm.close()
|
||||
assert not mm.is_open()
|
||||
|
||||
|
||||
def test_context_manager_opens_and_closes():
|
||||
t = ScriptedTransport([frame(0xA4, POLL), frame(0xEA, SERIAL),
|
||||
frame(0xB6, STATE_IDLE), frame(0xBE, setup_response("x.mmb"))])
|
||||
with MicromateClient(t, recv_timeout=0.5) as mm:
|
||||
assert t.is_connected()
|
||||
assert mm.connect().serial == "UM12947"
|
||||
assert not t.is_connected()
|
||||
@@ -0,0 +1,399 @@
|
||||
"""Framing tests for the Micromate (series-4) live protocol.
|
||||
|
||||
Every constant below is a **real frame**, lifted from
|
||||
``bridges/captures/9-24-26 - micromate2/`` (UM12947, firmware 11.0CB) or from
|
||||
``scratch/fake_unit.py``, which preserves a POLL probe reply. Frames are
|
||||
embedded as hex rather than read from disk because both ``bridges/captures/``
|
||||
and ``tests/fixtures/`` are gitignored -- these tests must pass on a fresh
|
||||
clone.
|
||||
|
||||
The few synthesised frames are marked ``SYNTH_`` and each says what it stands
|
||||
in for and why a captured frame was not available.
|
||||
|
||||
Two of these tests exist because the first draft of
|
||||
``docs/micromate_client_spec.md`` got the rule wrong, and both wrong rules
|
||||
fail quietly -- a frame the unit ignores, or a checksum that reads as bad:
|
||||
|
||||
* ``test_builder_matches_thor_byte_for_byte`` -- the escape set. Escaping
|
||||
only 0x10 (the series-3 rule) reproduces 161 of Thor's 218 read frames.
|
||||
* ``test_checksum_is_plain_sum8_over_destuffed_payload`` -- the checksum.
|
||||
The DLE-aware variant disagrees with the wire on 55 of 251 responses.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
from micromate.framing import (
|
||||
ACK,
|
||||
DLE,
|
||||
ETX,
|
||||
FLAGS_BLASTWARE,
|
||||
FLAGS_THOR,
|
||||
STX,
|
||||
MicromateFrame,
|
||||
MicromateFrameParser,
|
||||
build_request,
|
||||
checksum,
|
||||
stuff,
|
||||
unstuff,
|
||||
)
|
||||
|
||||
# ── Captured response frames ──────────────────────────────────────────────────
|
||||
|
||||
# POLL probe reply, 19 B on the wire -- the shortest valid frame there is.
|
||||
# Preserved in scratch/fake_unit.py, captured from UM12947 on 2026-09-24.
|
||||
# Its payload[8:10] is 0x0030, the data length POLL then asks for.
|
||||
RSP_POLL_PROBE = bytes.fromhex("0200c5a400000000000030000000000000009903")
|
||||
|
||||
# SUB 0x49 -> 0xB6, the cheap state read. Carries a literal 0x02, escaped.
|
||||
RSP_STATE = bytes.fromhex("0200c5b6000005000000000000000000001002e8000b007503")
|
||||
|
||||
# SUB 0x48 -> 0xB7, a path-addressed file read. offset_hi 0x04 arrives escaped,
|
||||
# so page_hi is only correct if the parser destuffs before indexing.
|
||||
RSP_FILE_READ = bytes.fromhex("0200c5b70000100400000000000000010000000000018203")
|
||||
|
||||
# An 0x5A download chunk, 138 B on the wire. THE checksum case: its payload
|
||||
# holds literal 0x10 bytes, so plain SUM8 (0xC1, correct) and the DLE-aware
|
||||
# variant (0x91) disagree. Also holds a literal 0x41, which is NOT escaped.
|
||||
RSP_CHUNK_WITH_DLE = bytes.fromhex(
|
||||
"0200c5a500007000003400000000000000e3fd1f10020f0f0e2e1e1fd4f2d4c3d2f00f000"
|
||||
"e003fe03fe200d6e2d12d2e1c4e101011d101f3d0f3e0f2efe23d2b2e3c0d3e0e2c4101e0"
|
||||
"d4d3e21f1d311e202fe2e2f1e3f100210d201002ee2e22d2f2f0f30fd3f0101000f0111f1"
|
||||
"ff01e011010011f0f1002b4d200e0f0302c4010020001fffedb2dc103"
|
||||
)
|
||||
|
||||
# ── Captured request frames (Thor -> unit) ────────────────────────────────────
|
||||
|
||||
REQ_POLL = bytes.fromhex("41021010005b000030000000000000000000009b03")
|
||||
REQ_SERIAL = bytes.fromhex("41021010001500000a000000000000000000002f03")
|
||||
REQ_STATE = bytes.fromhex("41021010004900ffff000000000000000000005703")
|
||||
REQ_COMPLIANCE = bytes.fromhex("41021010001a00ffff000000000000000000002803")
|
||||
REQ_ARM_EVENT = bytes.fromhex("41021010009300ffff00000000000000000000a103")
|
||||
|
||||
# ⚠ The two frames that break a 0x10-only escaper.
|
||||
# Scheduler enable: params[7] = 0x03, on the wire as `10 03`.
|
||||
REQ_SCHED_ON = bytes.fromhex("41021010004700ffff00000000000000100300005803")
|
||||
# Bulk download, first chunk of event 055d4a81: offset 0x0400 puts a literal
|
||||
# 0x04 in offset_hi, on the wire as `10 04`. EVERY download frame needs this.
|
||||
REQ_DOWNLOAD_CHUNK0 = bytes.fromhex(
|
||||
"41021010005a00100400055d4a810000000000009b03"
|
||||
)
|
||||
# A later chunk of the same event: params[2:4] = 0x1000, doubled to `10 10`.
|
||||
REQ_DOWNLOAD_CHUNK4 = bytes.fromhex(
|
||||
"41021010005a0010040000001010000000000000007e03"
|
||||
)
|
||||
|
||||
|
||||
# ── Stuffing ──────────────────────────────────────────────────────────────────
|
||||
|
||||
def test_escape_set_is_exactly_four_bytes():
|
||||
"""0x02, 0x03, 0x04 and 0x10 -- and nothing else.
|
||||
|
||||
ACK (0x41) in particular is NOT escaped; assuming it was reproduced only
|
||||
196 of 251 captured responses.
|
||||
"""
|
||||
assert stuff(bytes([0x02, 0x03, 0x04, 0x10])) == bytes(
|
||||
[DLE, 0x02, DLE, 0x03, DLE, 0x04, DLE, 0x10]
|
||||
)
|
||||
for b in (0x00, 0x01, 0x05, 0x41, 0xC5, 0xFF):
|
||||
assert stuff(bytes([b])) == bytes([b]), f"0x{b:02x} must not be escaped"
|
||||
|
||||
|
||||
def test_unstuff_is_uniform_with_no_inner_frame_carve_out():
|
||||
"""`10 XX` -> `XX` for any XX -- the series-3 DLE+ETX exception is absent."""
|
||||
assert unstuff(bytes.fromhex("1003")) == b"\x03"
|
||||
assert unstuff(bytes.fromhex("1010")) == b"\x10"
|
||||
assert unstuff(bytes.fromhex("001002ff")) == bytes.fromhex("0002ff")
|
||||
|
||||
|
||||
def test_stuff_unstuff_round_trips_over_every_byte_value():
|
||||
data = bytes(range(256))
|
||||
assert unstuff(stuff(data)) == data
|
||||
|
||||
|
||||
def test_a_trailing_dle_is_held_not_dropped():
|
||||
"""A DLE as the last byte of a chunk must not consume nothing and vanish."""
|
||||
assert unstuff(b"\xff\x10") == b"\xff\x10"
|
||||
|
||||
|
||||
# ── Checksum ──────────────────────────────────────────────────────────────────
|
||||
|
||||
def test_checksum_is_plain_sum8_over_destuffed_payload():
|
||||
"""⚠ Plain SUM8 -- do NOT exclude 0x10 bytes.
|
||||
|
||||
RSP_CHUNK_WITH_DLE is a real frame whose payload holds literal 0x10 bytes.
|
||||
The wire says 0xC1; plain SUM8 gives 0xC1 and the DLE-aware variant used by
|
||||
series-3 `5A`/write frames gives 0x91. 55 of 251 captured responses
|
||||
disagree the same way.
|
||||
"""
|
||||
payload = unstuff(RSP_CHUNK_WITH_DLE[1:-1])[:-1]
|
||||
chk_on_wire = unstuff(RSP_CHUNK_WITH_DLE[1:-1])[-1]
|
||||
|
||||
assert DLE in payload, "this frame is only interesting if it holds a 0x10"
|
||||
assert checksum(payload) == chk_on_wire == 0xC1
|
||||
assert (sum(b for b in payload if b != DLE) & 0xFF) == 0x91 # the wrong rule
|
||||
|
||||
|
||||
def test_every_captured_frame_validates():
|
||||
parser = MicromateFrameParser()
|
||||
frames = parser.feed(
|
||||
RSP_POLL_PROBE + RSP_STATE + RSP_FILE_READ + RSP_CHUNK_WITH_DLE
|
||||
)
|
||||
assert len(frames) == 4
|
||||
assert all(f.checksum_valid for f in frames)
|
||||
|
||||
|
||||
# ── Request builder ───────────────────────────────────────────────────────────
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"wire, sub, offset, params",
|
||||
[
|
||||
(REQ_POLL, 0x5B, 0x0030, bytes(10)),
|
||||
(REQ_SERIAL, 0x15, 0x000A, bytes(10)),
|
||||
(REQ_STATE, 0x49, 0xFFFF, bytes(10)),
|
||||
(REQ_COMPLIANCE, 0x1A, 0xFFFF, bytes(10)),
|
||||
(REQ_ARM_EVENT, 0x93, 0xFFFF, bytes(10)),
|
||||
(REQ_SCHED_ON, 0x47, 0xFFFF, bytes.fromhex("00000000000000030000")),
|
||||
(REQ_DOWNLOAD_CHUNK0, 0x5A, 0x0400, bytes.fromhex("055d4a81000000000000")),
|
||||
(REQ_DOWNLOAD_CHUNK4, 0x5A, 0x0400, bytes.fromhex("00001000000000000000")),
|
||||
],
|
||||
ids="poll serial state compliance arm sched_on dl_chunk0 dl_chunk4".split(),
|
||||
)
|
||||
def test_builder_matches_thor_byte_for_byte(wire, sub, offset, params):
|
||||
assert build_request(sub, offset, params) == wire
|
||||
|
||||
|
||||
def test_a_0x10_in_params_needs_no_special_handling():
|
||||
"""The spec's one open question. Thor sends it; the wire doubles it."""
|
||||
frame = build_request(0x5A, 0x0400, bytes.fromhex("00001000000000000000"))
|
||||
assert bytes([DLE, DLE]) in frame
|
||||
assert frame == REQ_DOWNLOAD_CHUNK4
|
||||
|
||||
|
||||
def test_builder_rejects_malformed_arguments():
|
||||
with pytest.raises(ValueError):
|
||||
build_request(0x5B, 0, bytes(9))
|
||||
with pytest.raises(ValueError):
|
||||
build_request(0x5B, 0x10000)
|
||||
with pytest.raises(ValueError):
|
||||
build_request(0x100)
|
||||
|
||||
|
||||
# ── Parsing ───────────────────────────────────────────────────────────────────
|
||||
|
||||
def test_poll_probe_reply_fields():
|
||||
(f,) = MicromateFrameParser().feed(RSP_POLL_PROBE)
|
||||
assert f.sub == 0xA4
|
||||
assert f.request_sub == 0x5B
|
||||
assert f.flags == FLAGS_BLASTWARE
|
||||
assert f.firmware_line == "blastware"
|
||||
assert f.checksum_valid
|
||||
assert f.probe_length == 0x0030
|
||||
|
||||
|
||||
def test_probe_length_is_a_uint16_not_a_byte():
|
||||
"""⚠ Read as data[3] alone, SUB 0x1A's 0x082C (2092) reads as 44 -- 47x low.
|
||||
|
||||
SYNTHESISED: no probe response survives in the captures on disk (the
|
||||
9-24-26 session uses single-step reads at offset 0xFFFF throughout, so it
|
||||
contains no probes at all). The field position is taken from the captured
|
||||
POLL probe reply above, which does exercise it for real.
|
||||
"""
|
||||
payload = bytes([0x00, FLAGS_BLASTWARE, 0xE5, 0x00, 0x00]) + bytes(
|
||||
[0x00, 0x00, 0x00, 0x08, 0x2C]
|
||||
)
|
||||
synth = bytes([STX]) + stuff(payload + bytes([checksum(payload)])) + bytes([ETX])
|
||||
|
||||
(f,) = MicromateFrameParser().feed(synth)
|
||||
assert f.probe_length == 0x082C == 2092
|
||||
assert f.data[3] == 0x08, "the high byte is where a byte-wide read loses 2048"
|
||||
|
||||
|
||||
def test_escaped_bytes_land_in_the_right_field():
|
||||
"""RSP_FILE_READ's first data byte is 0x04, which arrives as `10 04`.
|
||||
|
||||
Without destuffing it reads as 0x10 and every field after it is one byte
|
||||
late -- the failure mode that put `SUB 0x02` in the log as `SUB_10` for an
|
||||
afternoon.
|
||||
"""
|
||||
(f,) = MicromateFrameParser().feed(RSP_FILE_READ)
|
||||
assert f.sub == 0xB7
|
||||
assert f.request_sub == 0x48
|
||||
assert (f.page_hi, f.page_lo) == (0x00, 0x00)
|
||||
assert f.data[0] == 0x04
|
||||
assert len(f.data) == 15, "one byte shorter than the wire suggests"
|
||||
assert f.checksum_valid
|
||||
|
||||
|
||||
def test_thor_firmware_line_survives_destuffing():
|
||||
"""⚠ flags = 0x03 is ETX, so it arrives as `10 03`.
|
||||
|
||||
A parser that does not destuff ends the frame at byte 2 on half the fleet.
|
||||
|
||||
SYNTHESISED: no 11.0BD capture is on disk -- UM20147's sweep was recorded
|
||||
on 2026-09-23 and those bins never landed in the repo. Built by re-stuffing
|
||||
the captured POLL probe reply's payload with flags flipped to 0x03, so the
|
||||
only difference from a real frame is the one byte under test.
|
||||
"""
|
||||
real = unstuff(RSP_POLL_PROBE[1:-1])[:-1]
|
||||
payload = bytes([real[0], FLAGS_THOR]) + real[2:]
|
||||
synth = bytes([STX]) + stuff(payload + bytes([checksum(payload)])) + bytes([ETX])
|
||||
|
||||
assert bytes([DLE, ETX]) in synth, "flags must be escaped on the wire"
|
||||
(f,) = MicromateFrameParser().feed(synth)
|
||||
assert f.flags == FLAGS_THOR
|
||||
assert f.firmware_line == "thor"
|
||||
assert f.sub == 0xA4
|
||||
assert f.checksum_valid
|
||||
|
||||
|
||||
def test_an_escaped_checksum_byte_is_read_correctly():
|
||||
"""SYNTHESISED, but the behaviour is real: three captured responses have a
|
||||
checksum of 0x02/0x03/0x04 and all three escape it on the wire. The
|
||||
shortest is 1,070 B (an 0x5A chunk in
|
||||
raw_s3_20260925_011403_Download_events_then_delete_1_event.bin, chk = 0x03),
|
||||
too long to embed for one byte's worth of assertion.
|
||||
"""
|
||||
payload = bytes([0x00, FLAGS_BLASTWARE, 0xA4, 0x00, 0x00, 0x03])
|
||||
assert checksum(payload) == 0x03 + FLAGS_BLASTWARE + 0xA4 & 0xFF
|
||||
body = payload + bytes([checksum(payload)])
|
||||
synth = bytes([STX]) + stuff(body) + bytes([ETX])
|
||||
|
||||
(f,) = MicromateFrameParser().feed(synth)
|
||||
assert f.chk_byte == checksum(payload)
|
||||
assert f.checksum_valid
|
||||
|
||||
|
||||
def test_a_corrupted_checksum_still_yields_a_frame():
|
||||
"""Flag it, do not swallow it -- a dropped frame looks like a dead unit."""
|
||||
broken = bytearray(RSP_POLL_PROBE)
|
||||
broken[-2] ^= 0xFF
|
||||
(f,) = MicromateFrameParser().feed(bytes(broken))
|
||||
assert f.sub == 0xA4
|
||||
assert not f.checksum_valid
|
||||
|
||||
|
||||
def test_a_truncated_frame_yields_nothing():
|
||||
parser = MicromateFrameParser()
|
||||
assert parser.feed(RSP_POLL_PROBE[:-1]) == []
|
||||
assert parser.frames == []
|
||||
assert parser.bytes_fed == len(RSP_POLL_PROBE) - 1
|
||||
|
||||
|
||||
def test_a_frame_too_short_to_hold_a_header_is_rejected():
|
||||
assert MicromateFrameParser().feed(bytes([STX, 0x00, 0xC5, 0xA4, ETX])) == []
|
||||
|
||||
|
||||
def test_request_frames_are_not_mistaken_for_responses():
|
||||
"""Feeding a bidirectional capture must yield only the unit's side."""
|
||||
parser = MicromateFrameParser()
|
||||
frames = parser.feed(REQ_POLL + RSP_POLL_PROBE + REQ_SERIAL)
|
||||
assert len(frames) == 1
|
||||
assert frames[0].request_sub == 0x5B
|
||||
|
||||
|
||||
def test_leading_noise_is_discarded():
|
||||
"""Cold-boot banners and the RV55's RING/CONNECT chatter precede frames."""
|
||||
noise = b"\r\nRING\r\n\r\nCONNECT\r\n" + bytes([ACK])
|
||||
(f,) = MicromateFrameParser().feed(noise + RSP_POLL_PROBE)
|
||||
assert f.sub == 0xA4
|
||||
assert f.checksum_valid
|
||||
|
||||
|
||||
def test_frames_split_across_feeds_reassemble():
|
||||
"""The transport hands over whatever the socket returned, DLE pairs and all."""
|
||||
whole = RSP_STATE + RSP_CHUNK_WITH_DLE
|
||||
for cut in (1, 2, 5, 17, 24, 25, 40, len(RSP_STATE), len(whole) - 1):
|
||||
parser = MicromateFrameParser()
|
||||
got = parser.feed(whole[:cut]) + parser.feed(whole[cut:])
|
||||
assert len(got) == 2, f"split at {cut} lost a frame"
|
||||
assert all(f.checksum_valid for f in got), f"split at {cut} broke a checksum"
|
||||
|
||||
|
||||
def test_reset_clears_partial_state():
|
||||
parser = MicromateFrameParser()
|
||||
parser.feed(RSP_POLL_PROBE[:6])
|
||||
parser.reset()
|
||||
assert parser.bytes_fed == 0
|
||||
(f,) = parser.feed(RSP_POLL_PROBE)
|
||||
assert f.checksum_valid
|
||||
|
||||
|
||||
def test_firmware_line_of_an_unknown_flags_byte():
|
||||
f = MicromateFrame(sub=0xA4, flags=0x99, page_hi=0, page_lo=0,
|
||||
data=b"", checksum_valid=True)
|
||||
assert f.firmware_line == "unknown"
|
||||
assert f.probe_length is None
|
||||
|
||||
|
||||
# ── Whole-session round trip ──────────────────────────────────────────────────
|
||||
|
||||
_CAPTURES = (
|
||||
Path(__file__).resolve().parents[1]
|
||||
/ "bridges" / "captures" / "9-24-26 - micromate2"
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.skipif(
|
||||
not _CAPTURES.is_dir(),
|
||||
reason="capture directory is gitignored; present only on a dev box",
|
||||
)
|
||||
def test_whole_captured_sessions_parse_with_no_bad_checksums():
|
||||
"""Belt-and-braces against the real bytes when they happen to be here.
|
||||
|
||||
scratch/mm_frame_parse.py reported zero bad checksums on these sessions
|
||||
only because it accepts a frame matching *either* checksum rule. This
|
||||
asserts the single rule holds across all of them.
|
||||
"""
|
||||
total = 0
|
||||
for path in sorted(_CAPTURES.rglob("raw_s3_*.bin")):
|
||||
parser = MicromateFrameParser()
|
||||
frames = parser.feed(path.read_bytes())
|
||||
assert frames, f"{path.name}: no frames parsed"
|
||||
bad = [f for f in frames if not f.checksum_valid]
|
||||
assert not bad, f"{path.name}: {len(bad)} bad checksums"
|
||||
total += len(frames)
|
||||
assert total == 251, f"expected 251 response frames across the corpus, got {total}"
|
||||
|
||||
|
||||
@pytest.mark.skipif(
|
||||
not _CAPTURES.is_dir(),
|
||||
reason="capture directory is gitignored; present only on a dev box",
|
||||
)
|
||||
def test_builder_reproduces_every_captured_read_frame():
|
||||
"""218/218. This is the test that would have caught the escape-set error."""
|
||||
checked = 0
|
||||
for path in sorted(_CAPTURES.rglob("raw_bw_*.bin")):
|
||||
blob = path.read_bytes()
|
||||
i = 0
|
||||
while i < len(blob):
|
||||
if not (blob[i] == ACK and i + 1 < len(blob) and blob[i + 1] == STX):
|
||||
i += 1
|
||||
continue
|
||||
j = i + 2
|
||||
body = bytearray()
|
||||
while j < len(blob):
|
||||
if blob[j] == DLE and j + 1 < len(blob):
|
||||
body.append(blob[j + 1])
|
||||
j += 2
|
||||
continue
|
||||
if blob[j] == ETX:
|
||||
break
|
||||
body.append(blob[j])
|
||||
j += 1
|
||||
payload = bytes(body[:-1])
|
||||
if len(payload) == 16: # a read frame; writes carry a data section
|
||||
sub = payload[2]
|
||||
offset = (payload[4] << 8) | payload[5]
|
||||
assert build_request(sub, offset, payload[6:16]) == blob[i:j + 1], (
|
||||
f"{path.name} @0x{i:04x} SUB=0x{sub:02x} offset=0x{offset:04x}"
|
||||
)
|
||||
checked += 1
|
||||
i = j + 1
|
||||
assert checked == 218, f"expected 218 read frames, checked {checked}"
|
||||
@@ -0,0 +1,402 @@
|
||||
"""Protocol-layer tests for the Micromate (series-4) live client.
|
||||
|
||||
The load-bearing assertion in here is not "our parser understands the device" —
|
||||
it is **"the bytes we put on the wire are the bytes THOR puts on the wire."**
|
||||
Every request constant below is lifted from
|
||||
``bridges/captures/9-24-26 - micromate2/`` (UM12947, firmware 11.0CB), so a
|
||||
passing test means a real unit has already answered exactly that frame.
|
||||
|
||||
Responses are replayed through a scripted transport. No hardware, no network.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
from micromate import protocol as P
|
||||
from micromate.framing import ETX, STX, checksum, stuff
|
||||
from micromate.protocol import (
|
||||
ACK_DATA_LEN,
|
||||
ChecksumError,
|
||||
MicromateProtocol,
|
||||
ShortRead,
|
||||
UnexpectedResponse,
|
||||
chunk_params,
|
||||
key_lo_params,
|
||||
key_params,
|
||||
token_params,
|
||||
)
|
||||
|
||||
FLAGS_CB = 0xC5
|
||||
|
||||
|
||||
# ── Test doubles ──────────────────────────────────────────────────────────────
|
||||
|
||||
class ScriptedTransport:
|
||||
"""Hands back queued responses; records every byte written."""
|
||||
|
||||
def __init__(self, responses: list[bytes] | None = None) -> None:
|
||||
self.queue = list(responses or [])
|
||||
self.written: list[bytes] = []
|
||||
self._connected = True
|
||||
|
||||
# BaseTransport surface actually used by MicromateProtocol
|
||||
def connect(self) -> None:
|
||||
self._connected = True
|
||||
|
||||
def disconnect(self) -> None:
|
||||
self._connected = False
|
||||
|
||||
def is_connected(self) -> bool:
|
||||
return self._connected
|
||||
|
||||
def write(self, data: bytes) -> None:
|
||||
self.written.append(data)
|
||||
|
||||
def read(self, n: int) -> bytes:
|
||||
return self.queue.pop(0) if self.queue else b""
|
||||
|
||||
|
||||
def frame(rsp_sub: int, data: bytes, *, flags: int = FLAGS_CB, page: int = 0) -> bytes:
|
||||
"""Build a response frame the way a unit would."""
|
||||
payload = bytes([0x00, flags, rsp_sub, (page >> 8) & 0xFF, page & 0xFF]) + data
|
||||
return bytes([STX]) + stuff(payload + bytes([checksum(payload)])) + bytes([ETX])
|
||||
|
||||
|
||||
def ack(rsp_sub: int) -> bytes:
|
||||
return frame(rsp_sub, bytes(ACK_DATA_LEN))
|
||||
|
||||
|
||||
def proto(responses: list[bytes], **kw) -> tuple[MicromateProtocol, ScriptedTransport]:
|
||||
t = ScriptedTransport(responses)
|
||||
return MicromateProtocol(t, recv_timeout=0.5, **kw), t
|
||||
|
||||
|
||||
# ── Captured THOR request frames ──────────────────────────────────────────────
|
||||
|
||||
REQ = {
|
||||
"poll": bytes.fromhex("41021010005b000030000000000000000000009b03"),
|
||||
"serial": bytes.fromhex("41021010001500000a000000000000000000002f03"),
|
||||
"state": bytes.fromhex("41021010004900ffff000000000000000000005703"),
|
||||
"compliance": bytes.fromhex("41021010001a00ffff000000000000000000002803"),
|
||||
"arm": bytes.fromhex("41021010009300ffff00000000000000000000a103"),
|
||||
"setup_first": bytes.fromhex("41021010003f00ffff000000000000000000004d03"),
|
||||
"setup_next": bytes.fromhex("41021010004000ffff000000000000000000004e03"),
|
||||
}
|
||||
|
||||
# The complete 0x5A sequence for event 055d4a81 (4,076 bytes → 4 chunks), as
|
||||
# THOR sent it. Chunk 1's params hold a literal 0x04 and chunk 3's offset is
|
||||
# the exact remainder.
|
||||
REQ_CHUNKS_4A81 = [
|
||||
bytes.fromhex("41021010005a00100400055d4a810000000000009b03"),
|
||||
bytes.fromhex("41021010005a0010040000001004000000000000007203"),
|
||||
bytes.fromhex("41021010005a00100400000008000000000000007603"),
|
||||
bytes.fromhex("41021010005a001003ec00000c000000000000006503"),
|
||||
]
|
||||
SIZE_4A81 = 4076
|
||||
|
||||
|
||||
# ── Params builders ───────────────────────────────────────────────────────────
|
||||
|
||||
def test_event_token_sits_at_params_7():
|
||||
"""⚠ THOR sends 0xFE here; the protocol reference documents all-zero params.
|
||||
|
||||
That reference entry describes our own browse probing, not THOR's.
|
||||
"""
|
||||
assert token_params() == bytes.fromhex("00000000000000fe0000")
|
||||
|
||||
|
||||
def test_event_record_takes_the_full_key_at_params_4():
|
||||
assert key_params(bytes.fromhex("055d4a81")) == bytes.fromhex("00000000055d4a810000")
|
||||
|
||||
|
||||
def test_monitor_log_takes_only_the_low_half_of_the_key():
|
||||
"""⚠ Inferred from one key value -- see key_lo_params' docstring."""
|
||||
assert key_lo_params(bytes.fromhex("055d4a81")) == bytes.fromhex("0000000000004a810000")
|
||||
|
||||
|
||||
def test_chunk_params_switch_from_key_to_byte_offset():
|
||||
key = bytes.fromhex("055d4a81")
|
||||
assert chunk_params(key, 0) == bytes.fromhex("055d4a81000000000000")
|
||||
assert chunk_params(key, 1024) == bytes.fromhex("00000400000000000000")
|
||||
assert chunk_params(key, 13312) == bytes.fromhex("00003400000000000000")
|
||||
|
||||
|
||||
@pytest.mark.parametrize("bad", [b"", b"\x01\x02\x03", b"\x01\x02\x03\x04\x05"])
|
||||
def test_params_builders_reject_a_wrong_length_key(bad):
|
||||
for fn in (key_params, key_lo_params):
|
||||
with pytest.raises(ValueError):
|
||||
fn(bad)
|
||||
|
||||
|
||||
# ── Each read emits the frame THOR emits ──────────────────────────────────────
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"name, method, rsp_sub, data_len",
|
||||
[
|
||||
("poll", "poll", 0xA4, 59),
|
||||
("serial", "read_serial", 0xEA, 21),
|
||||
("state", "read_state", 0xB6, 16),
|
||||
("compliance", "read_compliance_config", 0xE5, 2103),
|
||||
("setup_first", "read_first_setup", 0xC0, 266),
|
||||
("setup_next", "read_next_setup", 0xBF, 266),
|
||||
],
|
||||
)
|
||||
def test_reads_match_thors_wire_bytes(name, method, rsp_sub, data_len):
|
||||
p, t = proto([frame(rsp_sub, bytes(data_len))])
|
||||
getattr(p, method)()
|
||||
assert t.written == [REQ[name]]
|
||||
|
||||
|
||||
def test_arm_event_matches_thors_wire_bytes():
|
||||
p, t = proto([ack(0x6C)])
|
||||
p.arm_event()
|
||||
assert t.written == [REQ["arm"]]
|
||||
|
||||
|
||||
def test_poll_is_the_only_read_with_a_non_ffff_offset_besides_serial():
|
||||
"""Reads are single-step at 0xFFFF; POLL and SERIAL are the exceptions."""
|
||||
assert set(P._OFFSETS) == {P.SUB_POLL, P.SUB_SERIAL}
|
||||
assert P._OFFSETS[P.SUB_POLL] == 0x0030
|
||||
assert P._OFFSETS[P.SUB_SERIAL] == 0x000A
|
||||
|
||||
|
||||
# ── The chunk walk ────────────────────────────────────────────────────────────
|
||||
|
||||
def test_download_reproduces_thors_chunk_sequence_byte_for_byte():
|
||||
"""The whole point of step 2. Four chunks, 4,076 bytes, THOR's exact frames."""
|
||||
payload = bytes(range(256)) * 16 # 4096 B, we use the first 4076
|
||||
payload = payload[:SIZE_4A81]
|
||||
responses = []
|
||||
for i in range(4):
|
||||
want = min(P.CHUNK_SIZE, SIZE_4A81 - i * P.CHUNK_SIZE)
|
||||
body = payload[i * P.CHUNK_SIZE: i * P.CHUNK_SIZE + want]
|
||||
responses.append(frame(0xA5, bytes(11) + body, page=want // 256))
|
||||
|
||||
p, t = proto(responses)
|
||||
got = p.read_event_file(bytes.fromhex("055d4a81"), SIZE_4A81)
|
||||
|
||||
assert t.written == REQ_CHUNKS_4A81
|
||||
assert got == payload
|
||||
assert len(got) == SIZE_4A81
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"size, n_chunks, last_offset",
|
||||
[
|
||||
(4076, 4, 0x03EC), (11032, 11, 0x0318), (11502, 12, 0x00EE),
|
||||
(13424, 14, 0x0070), (8746, 9, 0x022A), (6092, 6, 0x03CC),
|
||||
(1024, 1, 0x0400), (1, 1, 0x0001), (1025, 2, 0x0001),
|
||||
],
|
||||
)
|
||||
def test_chunk_count_and_final_offset(size, n_chunks, last_offset):
|
||||
"""The first six rows are the six bench events, with THOR's real offsets."""
|
||||
responses = []
|
||||
for i in range(n_chunks):
|
||||
want = min(P.CHUNK_SIZE, size - i * P.CHUNK_SIZE)
|
||||
responses.append(frame(0xA5, bytes(11) + bytes(want)))
|
||||
|
||||
p, t = proto(responses)
|
||||
p.read_event_file(bytes.fromhex("055d4a81"), size)
|
||||
|
||||
assert len(t.written) == n_chunks
|
||||
# offset is payload[4:5] of the request; recover it from the built frame
|
||||
final = t.written[-1]
|
||||
assert final[7:9] in (
|
||||
bytes([last_offset >> 8, last_offset & 0xFF]),
|
||||
# a 0x02/0x03/0x04/0x10 high byte arrives escaped, shifting the pair
|
||||
bytes([0x10, last_offset >> 8]),
|
||||
)
|
||||
|
||||
|
||||
def test_a_short_chunk_raises_rather_than_truncating():
|
||||
"""A silently short event is the failure mode this codebase keeps hitting."""
|
||||
p, _ = proto([frame(0xA5, bytes(11) + bytes(900))]) # asked for 1024
|
||||
with pytest.raises(ShortRead, match="asked for 1024 B, got 900"):
|
||||
p.read_event_file(bytes.fromhex("055d4a81"), 1024)
|
||||
|
||||
|
||||
def test_a_chunk_too_short_to_hold_its_header_raises():
|
||||
p, _ = proto([frame(0xA5, bytes(4))])
|
||||
with pytest.raises(ShortRead, match="too short to hold a chunk header"):
|
||||
p.read_event_file(bytes.fromhex("055d4a81"), 1024)
|
||||
|
||||
|
||||
def test_download_rejects_a_nonsense_size():
|
||||
p, _ = proto([])
|
||||
with pytest.raises(ValueError):
|
||||
p.read_event_file(bytes.fromhex("055d4a81"), 0)
|
||||
|
||||
|
||||
# ── The monitor-log walk ──────────────────────────────────────────────────────
|
||||
|
||||
def test_monitor_log_walk_ends_on_a_short_response():
|
||||
"""⚠ Not a keyed read -- the same request repeated, device-side cursor.
|
||||
|
||||
Eight records then an 11-byte ack, which is what the capture shows.
|
||||
"""
|
||||
key = bytes.fromhex("055d4a81")
|
||||
responses = [frame(0xF5, bytes(297)) for _ in range(8)] + [ack(0xF5)]
|
||||
p, t = proto(responses)
|
||||
|
||||
records = []
|
||||
while (rec := p.read_monitor_log_next(key)) is not None:
|
||||
records.append(rec)
|
||||
|
||||
assert len(records) == 8
|
||||
assert len(t.written) == 9
|
||||
assert len(set(t.written)) == 1, "every request in the walk is identical"
|
||||
|
||||
|
||||
# ── Error handling ────────────────────────────────────────────────────────────
|
||||
|
||||
def test_a_bad_checksum_raises_by_default():
|
||||
"""⚠ Deliberately stricter than the Series III sibling.
|
||||
|
||||
That one logs and continues because its parser cannot always tell an
|
||||
inner-frame delimiter from a checksum byte. The Micromate rule is exact on
|
||||
251/251 captured frames, so a mismatch here means something real.
|
||||
"""
|
||||
bad = bytearray(frame(0xA4, bytes(59)))
|
||||
bad[-2] ^= 0xFF
|
||||
p, _ = proto([bytes(bad)])
|
||||
with pytest.raises(ChecksumError, match="checksum mismatch"):
|
||||
p.poll()
|
||||
|
||||
|
||||
def test_a_bad_checksum_can_be_downgraded_for_field_diagnosis():
|
||||
bad = bytearray(frame(0xA4, bytes(59)))
|
||||
bad[-2] ^= 0xFF
|
||||
p, _ = proto([bytes(bad)], strict_checksums=False)
|
||||
assert p.poll().sub == 0xA4
|
||||
|
||||
|
||||
def test_the_wrong_response_sub_raises():
|
||||
p, _ = proto([frame(0xE0, bytes(19))]) # 0xE0 answers 0x1F, not 0x1E
|
||||
with pytest.raises(UnexpectedResponse, match="expected SUB 0xE1"):
|
||||
p.read_event_first()
|
||||
|
||||
|
||||
def test_a_timeout_reports_how_many_bytes_arrived():
|
||||
"""Separates "nothing came back" from "bytes arrived but never framed".
|
||||
|
||||
Those have completely different causes -- and on a Micromate the second one
|
||||
is the signature of a modem forwarding a session it should not be.
|
||||
"""
|
||||
p, _ = proto([])
|
||||
with pytest.raises(P.TimeoutError, match="0 bytes were received"):
|
||||
p.poll()
|
||||
|
||||
unframed = b"\x02\x00\xc5\xa4garbage-no-terminator"
|
||||
p2, _ = proto([unframed])
|
||||
with pytest.raises(P.TimeoutError, match=f"{len(unframed)} bytes were received"):
|
||||
p2.poll()
|
||||
|
||||
|
||||
def test_a_leftover_frame_is_discarded_rather_than_answered_with():
|
||||
"""If a read returns two frames, the extra must not answer the NEXT request.
|
||||
|
||||
Every exchange resets the parser before sending, so anything already
|
||||
buffered is treated as stale. Delivering it would be the worse failure:
|
||||
`expected_sub` happens to catch a mismatched SUB, but a same-SUB leftover
|
||||
would sail through and return data for the wrong key.
|
||||
"""
|
||||
# Both frames arrive while answering arm_event(); the 0xE1 is left over.
|
||||
p, _ = proto([ack(0x6C) + frame(0xE1, b"\xaa" * 19)])
|
||||
p.arm_event()
|
||||
|
||||
# The next request gets no bytes of its own, so it must time out rather
|
||||
# than hand back the stale 0xE1.
|
||||
with pytest.raises(P.TimeoutError):
|
||||
p.read_event_first()
|
||||
|
||||
|
||||
# ── Against the real capture, when it happens to be present ───────────────────
|
||||
|
||||
_CAPTURES = (
|
||||
Path(__file__).resolve().parents[1]
|
||||
/ "bridges" / "captures" / "9-24-26 - micromate2"
|
||||
)
|
||||
_DOWNLOAD = "raw_bw_20260925_011403_Download_events_then_delete_1_event.bin"
|
||||
|
||||
|
||||
@pytest.mark.skipif(
|
||||
not (_CAPTURES / _DOWNLOAD).is_file(),
|
||||
reason="capture is gitignored; present only on a dev box",
|
||||
)
|
||||
def test_every_captured_download_frame_is_one_we_would_have_sent():
|
||||
"""Replay the real session: for each event, assert our chunk walk emits
|
||||
exactly the frames THOR emitted -- all 50-odd of them, six events."""
|
||||
from micromate.framing import ACK, DLE
|
||||
|
||||
def destuffed_frames(blob: bytes, is_req: bool):
|
||||
i, n = 0, len(blob)
|
||||
while i < n:
|
||||
if is_req:
|
||||
if not (blob[i] == ACK and i + 1 < n and blob[i + 1] == STX):
|
||||
i += 1
|
||||
continue
|
||||
j = i + 2
|
||||
else:
|
||||
if blob[i] != STX:
|
||||
i += 1
|
||||
continue
|
||||
j = i + 1
|
||||
out = bytearray()
|
||||
while j < n:
|
||||
if blob[j] == DLE and j + 1 < n:
|
||||
out.append(blob[j + 1])
|
||||
j += 2
|
||||
continue
|
||||
if blob[j] == ETX:
|
||||
break
|
||||
out.append(blob[j])
|
||||
j += 1
|
||||
if len(out) >= 6:
|
||||
yield blob[i:j + 1], bytes(out[:-1])
|
||||
i = j + 1
|
||||
|
||||
bw = list(destuffed_frames((_CAPTURES / _DOWNLOAD).read_bytes(), True))
|
||||
s3 = list(
|
||||
destuffed_frames(
|
||||
(_CAPTURES / _DOWNLOAD.replace("raw_bw", "raw_s3")).read_bytes(), False
|
||||
)
|
||||
)
|
||||
|
||||
# Group THOR's 0x5A frames per event, taking each event's key+size from the
|
||||
# 1E/1F that preceded them.
|
||||
events, cur = [], None
|
||||
for (wire, req), (_, rsp) in zip(bw, s3):
|
||||
sub, data = req[2], rsp[5:]
|
||||
if sub in (0x1E, 0x1F) and len(data) >= 19:
|
||||
cur = {"key": data[11:15], "size": int.from_bytes(data[15:19], "big"),
|
||||
"reqs": [], "rsps": []}
|
||||
if cur["size"]:
|
||||
events.append(cur)
|
||||
elif sub == 0x5A and cur is not None:
|
||||
cur["reqs"].append(wire)
|
||||
cur["rsps"].append(rsp)
|
||||
|
||||
# The capture walks the chain twice (it deletes an event on the second
|
||||
# pass), so some 1E/1F hits carry a size but no download behind them.
|
||||
events = [e for e in events if e["reqs"]]
|
||||
assert len(events) == 6, f"expected 6 downloaded events, found {len(events)}"
|
||||
|
||||
total = 0
|
||||
for e in events:
|
||||
p, t = proto([bytes([STX]) + stuff(r + bytes([checksum(r)])) + bytes([ETX])
|
||||
for r in e["rsps"]])
|
||||
got = p.read_event_file(e["key"], e["size"])
|
||||
assert t.written == e["reqs"], (
|
||||
f"event {e['key'].hex()}: our {len(t.written)} frames differ from "
|
||||
f"THOR's {len(e['reqs'])}"
|
||||
)
|
||||
assert len(got) == e["size"]
|
||||
total += len(e["reqs"])
|
||||
|
||||
assert total == 56, f"expected 56 download frames across the 6 events, saw {total}"
|
||||
@@ -0,0 +1,67 @@
|
||||
"""Blastware sensor self-check waveform decode (minimateplus.sensor_check).
|
||||
|
||||
Reverse-engineered 2026-09-15 against 7 BE12844 (MiniMate Plus) oracle events.
|
||||
After the main waveform record-chain and the trailing metadata / per-channel
|
||||
calibration records, a series-3 binary carries four length-prefixed records
|
||||
tagged 0x3c-0x3f: the sensor self-check traces the unit records when it pulses
|
||||
each sensor before monitoring (Blastware draws these as the little waveforms in
|
||||
the "Sensor Check" strip on the right of the Event Report).
|
||||
|
||||
* 0x3c / 0x3d / 0x3e = Tran / Vert / Long geophone ring-downs.
|
||||
* 0x3f = MicL, a pulse train at the mic self-test frequency.
|
||||
|
||||
The self-check injects a fixed pulse, so the response is near-identical across
|
||||
events — asserted here as an invariant shape (damped one-sided ring-down for
|
||||
the geophones, a multi-pulse train for the mic).
|
||||
"""
|
||||
from pathlib import Path
|
||||
|
||||
import numpy as np
|
||||
|
||||
from minimateplus.sensor_check import decode_sensor_check
|
||||
|
||||
FIXDIR = Path(__file__).parent / "fixtures" / "fft-oracle-2026-09-14"
|
||||
EVENTS = sorted(p.name for p in FIXDIR.iterdir()) # 7 BE12844 event binaries
|
||||
|
||||
|
||||
def _decode(name):
|
||||
return decode_sensor_check((FIXDIR / name).read_bytes())
|
||||
|
||||
|
||||
def test_all_four_channels_present():
|
||||
for name in EVENTS:
|
||||
sc = _decode(name)
|
||||
assert set(sc) == {"Tran", "Vert", "Long", "MicL"}, name
|
||||
|
||||
|
||||
def test_geo_channels_are_damped_ringdowns():
|
||||
# Each geophone self-check is a large one-sided deflection (~-990 raw) that
|
||||
# rings back and damps toward a settled value well above the trough.
|
||||
for name in EVENTS:
|
||||
sc = _decode(name)
|
||||
for ch in ("Tran", "Vert", "Long"):
|
||||
tr = np.asarray(sc[ch], dtype=float)
|
||||
assert 240 <= len(tr) <= 260, f"{name}:{ch} n={len(tr)}"
|
||||
assert abs(tr[:3].mean()) < 50, f"{name}:{ch} starts off-baseline"
|
||||
assert tr.min() < -800, f"{name}:{ch} min {tr.min()}"
|
||||
assert tr.max() < 60, f"{name}:{ch} unexpected positive swing {tr.max()}"
|
||||
# damped: settles between the trough and zero, well above the trough
|
||||
assert tr.min() < tr[-1] < 0, f"{name}:{ch} end {tr[-1]} not between trough and 0"
|
||||
assert abs(tr[-1]) < 0.6 * abs(tr.min()), f"{name}:{ch} not damped, end {tr[-1]}"
|
||||
|
||||
|
||||
def test_mic_channel_is_a_pulse_train():
|
||||
for name in EVENTS:
|
||||
tr = np.asarray(_decode(name)["MicL"], dtype=float)
|
||||
assert 235 <= len(tr) <= 255, f"{name} mic n={len(tr)}"
|
||||
# larger dynamic range than the geo ring-down, and swings both ways
|
||||
assert tr.min() < -1500, f"{name} mic min {tr.min()}"
|
||||
assert tr.max() > 100, f"{name} mic max {tr.max()}"
|
||||
# multiple pulses: several deep local minima
|
||||
deep = (tr[1:-1] < tr[:-2]) & (tr[1:-1] < tr[2:]) & (tr[1:-1] < -800)
|
||||
assert int(deep.sum()) >= 4, f"{name} mic pulses {int(deep.sum())}"
|
||||
|
||||
|
||||
def test_returns_empty_when_no_sensor_check_block():
|
||||
assert decode_sensor_check(b"not a blastware file") == {}
|
||||
assert decode_sensor_check(b"") == {}
|
||||
@@ -0,0 +1,67 @@
|
||||
"""Series-4 (Thor / Micromate IDFW) sensor self-check waveform decode.
|
||||
|
||||
Reverse-engineered 2026-09-15 against 4 UM (Thor) oracle events. The IDFW
|
||||
binary carries the sensor self-check in its fixed-header region (before the
|
||||
waveform body) as up to four records tagged ``01 0e 3c/3d/3e/3f`` — the SAME
|
||||
channel ids as series-3 (Tran/Vert/Long/MicL). Unlike series-3's delta-coded
|
||||
trailing block, series-4 stores each trace as a raw int16-BE array after an
|
||||
18-byte record header whose sample count is a 2-byte field at offset +8.
|
||||
|
||||
Three-channel (mic-disabled) Thor units carry only 3c/3d/3e — no MicL record.
|
||||
|
||||
Validated by shape (geophone ring-down / mic pulse train) and cross-event
|
||||
consistency, since there's no Thor Event-Report strip to exact-match against.
|
||||
"""
|
||||
from pathlib import Path
|
||||
|
||||
import numpy as np
|
||||
|
||||
from micromate.sensor_check import decode_idf_sensor_check
|
||||
|
||||
FIXDIR = Path(__file__).parent / "fixtures" / "thor-idf-sc"
|
||||
EVENTS = sorted(p.name for p in FIXDIR.glob("*.IDFW"))
|
||||
|
||||
|
||||
def _decode(name):
|
||||
return decode_idf_sensor_check((FIXDIR / name).read_bytes())
|
||||
|
||||
|
||||
def test_geo_channels_present_and_ringdown_shaped():
|
||||
# Every IDFW event has the three geophone self-checks; each is a large
|
||||
# one-sided deflection (~15000 raw counts) that rings back — the geophone's
|
||||
# damped impulse response.
|
||||
for name in EVENTS:
|
||||
sc = _decode(name)
|
||||
for ch in ("Tran", "Vert", "Long"):
|
||||
assert ch in sc, f"{name} missing {ch}"
|
||||
tr = np.asarray(sc[ch], dtype=float)
|
||||
tr = tr - tr[:4].mean() # reference to the pre-trigger baseline
|
||||
assert 40 <= len(tr) <= 300, f"{name}:{ch} n={len(tr)}"
|
||||
assert tr.min() < -8000, f"{name}:{ch} min {tr.min()}"
|
||||
# deflects one way and rings back toward / past the baseline
|
||||
assert tr.max() < abs(tr.min()), f"{name}:{ch} not one-sided"
|
||||
|
||||
|
||||
def test_mic_present_only_on_four_channel_units():
|
||||
# UM11719 / UM12947 record a mic; UM13981 / UM20147 are 3-channel
|
||||
# (mic-disabled) units and carry no MicL self-check.
|
||||
got = {name: ("MicL" in _decode(name)) for name in EVENTS}
|
||||
assert any(got.values()), "expected at least one 4-channel unit"
|
||||
assert not all(got.values()), "expected at least one 3-channel unit"
|
||||
for name, has_mic in got.items():
|
||||
if has_mic:
|
||||
tr = np.asarray(_decode(name)["MicL"], dtype=float)
|
||||
tr = tr - tr[:4].mean()
|
||||
# mic self-check is a bipolar pulse train — swings both ways, wide range
|
||||
assert tr.max() > 5000 and tr.min() < -5000, f"{name} mic not bipolar"
|
||||
|
||||
|
||||
def test_channel_ids_and_order():
|
||||
# ids decode to the canonical channel names, geo always in Tran/Vert/Long order
|
||||
sc = _decode(EVENTS[0])
|
||||
assert [c for c in ("Tran", "Vert", "Long") if c in sc] == ["Tran", "Vert", "Long"]
|
||||
|
||||
|
||||
def test_returns_empty_on_non_idf_input():
|
||||
assert decode_idf_sensor_check(b"not an IDF file") == {}
|
||||
assert decode_idf_sensor_check(b"") == {}
|
||||
Reference in New Issue
Block a user