Revert "fix: improve metadata frame detection and update version to v0.12.1"
This reverts commit ad7b064b67.
This commit is contained in:
+5
-36
@@ -76,22 +76,6 @@ _COMPLIANCE_SLOT_SIZE = 64
|
||||
_COMPLIANCE_VALUE_OFFSET = 22
|
||||
_COMPLIANCE_VALUE_MAX = _COMPLIANCE_SLOT_SIZE - _COMPLIANCE_VALUE_OFFSET # 42
|
||||
|
||||
# Needles used to identify the 5A metadata frame in _decode_a5_waveform.
|
||||
# The frame carries compliance-setup ASCII strings embedded in the bulk stream.
|
||||
# Checking multiple needles is required because devices with unconfigured
|
||||
# Project/Client/etc. fields omit those label strings entirely — the sole
|
||||
# reliable anchor then becomes b"Geo: " (always present, geo threshold is
|
||||
# required for monitoring). We also check db (full rsp.data) rather than
|
||||
# db[7:] to avoid any off-by-7 miss if a label landed in the prefix bytes.
|
||||
_METADATA_FRAME_NEEDLES: tuple[bytes, ...] = (
|
||||
b"Project:",
|
||||
b"Client:",
|
||||
b"User Name:",
|
||||
b"Seis Loc:",
|
||||
b"Extended Notes",
|
||||
b"Geo: ",
|
||||
)
|
||||
|
||||
|
||||
# ── MiniMateClient ────────────────────────────────────────────────────────────
|
||||
|
||||
@@ -1472,29 +1456,14 @@ def _decode_a5_waveform(
|
||||
wave[:24].hex(' '),
|
||||
)
|
||||
|
||||
# Metadata frame: contains compliance-setup ASCII strings.
|
||||
# Metadata frame: contains "Project:", "Client:", etc. strings.
|
||||
# Originally assumed to be always fi==7 (A5[7] in 4-2-26 blast capture),
|
||||
# but confirmed variable position — it appears at whatever chunk index the
|
||||
# device places it (observed at fi=6 for desk-thump events 2026-04-14).
|
||||
#
|
||||
# Detection uses MULTIPLE needles against the full frame bytes (db, NOT w)
|
||||
# because:
|
||||
# 1. Devices with no Project/Client/etc. configured omit those label strings
|
||||
# entirely — checking only b"Project:" misses the frame for unconfigured
|
||||
# units (confirmed 2026-04-15: Brian's device had no fields set, so
|
||||
# "Project:" was absent and the frame was decoded as ADC samples, causing
|
||||
# the serial number bytes "BE11529\0" to appear as waveform data).
|
||||
# 2. Checking db (full rsp.data) rather than w (db[7:]) eliminates any
|
||||
# off-by-7 risk if a label were to land in the first 7 bytes.
|
||||
# 3. b"Geo: " is always present (geo threshold is required for monitoring)
|
||||
# and serves as the universal fallback anchor.
|
||||
elif any(needle in db for needle in _METADATA_FRAME_NEEDLES):
|
||||
log.info(
|
||||
"_decode_a5_waveform: fi=%d skipped (metadata frame, "
|
||||
"needle=%r)",
|
||||
fi,
|
||||
next(n for n in _METADATA_FRAME_NEEDLES if n in db),
|
||||
)
|
||||
# Skip ANY frame whose raw bytes contain b"Project:" — this is the same
|
||||
# anchor used by stop_after_metadata in read_bulk_waveform_stream.
|
||||
elif b"Project:" in w:
|
||||
log.info("_decode_a5_waveform: fi=%d skipped (metadata frame)", fi)
|
||||
continue
|
||||
|
||||
# Terminator frames have page_key=0x0000 and are excluded upstream
|
||||
|
||||
Reference in New Issue
Block a user