d3f77d1d96
Decoded the structural framing of the Blastware waveform body — the bytes between the 21-byte STRT record and the 26-byte file footer. The body is a sequence of tagged variable-length blocks, NOT raw int16 LE. Five tag types (10/20/00/30/40 NN) and their lengths are now confirmed against the 4-event May 2026 fixture bundle. Body splits cleanly into ~16 segments (for a 1280-sample event) separated by 40 02 segment headers carrying a monotonically incrementing uint32 LE counter at bytes [8:12]. What's done: - minimateplus/waveform_codec.py — block walker, segment splitter, segment header parser. decode_waveform_v2 is a stub returning None until the byte-to-sample mapping is solved; client.py is unchanged. - tests/test_waveform_codec.py — 31 tests covering block detection, lengths, contiguous-walk, segment splitting, segment-header parsing, and counter monotonicity. All pass. - tests/fixtures/decode-re-5-8-26/ — bundled fixtures (4 events, BW binary + Blastware ASCII export each). - docs/instantel_protocol_reference.md §7.6.1 — replaced retraction box with the verified structural decoding plus an explicit list of what's still open. What's still open: the per-byte mapping inside 10 NN / 20 NN blocks. 96 channel-permutation × nibble-order × sign-convention combinations were brute-force tested; none match BW's ASCII export to within ±1 ADC count. The codec is more elaborate than uniform 4-bit deltas — likely a hybrid variable-bit-width scheme with segment-anchor resync points. Next recommended step: capture an event with a known calibration tone to pin down magnitude scaling. Walker also bails out partway through event-b (open issue documented in both the module and the protocol reference).
69 lines
2.3 KiB
Python
69 lines
2.3 KiB
Python
"""
|
|
Walker v6: handle 40 02 blocks correctly (length 20).
|
|
|
|
Block formats:
|
|
- [10 NN]: 4-bit nibble delta data, length = NN/2 + 2
|
|
- [20 NN]: int8 literal data, length = NN + 2
|
|
- [00 NN]: 2-byte marker
|
|
- [30 NN]: trailer/summary block, length = NN*4
|
|
- [40 02]: segment header, fixed length 20
|
|
"""
|
|
import sys
|
|
sys.path.insert(0, ".")
|
|
from analysis.load_bundle import load_bundle
|
|
from collections import Counter
|
|
|
|
|
|
def walk(body, start, max_blocks=10000):
|
|
i = start
|
|
blocks = []
|
|
while i + 1 < len(body) and len(blocks) < max_blocks:
|
|
t0 = body[i]
|
|
t1 = body[i + 1]
|
|
if t0 == 0x10 and t1 % 4 == 0 and 0 < t1 <= 0xFC:
|
|
length = t1 // 2 + 2
|
|
elif t0 == 0x20 and t1 % 4 == 0 and 0 < t1 <= 0xFC:
|
|
length = t1 + 2
|
|
elif t0 == 0x00 and t1 % 4 == 0:
|
|
length = 2
|
|
elif t0 == 0x30 and t1 % 4 == 0 and 0 < t1 <= 0x10:
|
|
length = t1 * 4
|
|
elif t0 == 0x40 and t1 == 0x02:
|
|
length = 20
|
|
else:
|
|
blocks.append((i, "??", t0, bytes(body[i:i+8]), 0))
|
|
break
|
|
if i + length > len(body):
|
|
break
|
|
data = bytes(body[i + 2 : i + length])
|
|
blocks.append((i, f"{t0:02x}", t1, data, length))
|
|
i += length
|
|
return blocks, i
|
|
|
|
|
|
def main():
|
|
for name in ("event-c", "event-d", "event-a", "event-b"):
|
|
b = load_bundle(name)
|
|
body = b.body
|
|
for s in range(15):
|
|
if body[s] == 0x10 and body[s+1] % 4 == 0 and 0 < body[s+1] <= 0xFC:
|
|
start = s; break
|
|
else:
|
|
start = 7
|
|
blocks, end = walk(body, start)
|
|
types = Counter(bb[1] for bb in blocks)
|
|
print(f"\n=== {name} === body={len(body)} N={len(b.samples['Tran'])} start={start}")
|
|
print(f" total blocks: {len(blocks)}, walk ended at {end}/{len(body)}")
|
|
print(f" type counts: {dict(types)}")
|
|
if blocks and blocks[-1][1] == "??":
|
|
print(f" stopped at byte: 0x{blocks[-1][2]:02x} at offset {blocks[-1][0]}")
|
|
print(f" prev 5 blocks: {[(bb[0], bb[1], bb[2]) for bb in blocks[-6:-1]]}")
|
|
print(f" bytes around stop: {body[end-4:end+24].hex(' ')}")
|
|
# Sum
|
|
payload_sizes = {t: sum(len(bb[3]) for bb in blocks if bb[1] == t) for t in types}
|
|
print(f" payload bytes by type: {payload_sizes}")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|