standalone verifier: require pairs to match configured delay and C1 airtime
This commit is contained in:
@@ -35,8 +35,11 @@ from correlate import SDR_RE # noqa: E402
|
|||||||
ap = argparse.ArgumentParser()
|
ap = argparse.ArgumentParser()
|
||||||
ap.add_argument("--iq", required=True)
|
ap.add_argument("--iq", required=True)
|
||||||
ap.add_argument("--decodes", required=True)
|
ap.add_argument("--decodes", required=True)
|
||||||
ap.add_argument("--min-ms", type=float, default=20.0)
|
ap.add_argument("--delay-ms", type=float, default=50.0,
|
||||||
ap.add_argument("--max-ms", type=float, default=400.0)
|
help="configured repeat delay; pairs must match this")
|
||||||
|
ap.add_argument("--delay-tol-ms", type=float, default=25.0)
|
||||||
|
ap.add_argument("--max-frame-ms", type=float, default=20.0,
|
||||||
|
help="longest plausible C1 frame airtime (100 kbps)")
|
||||||
ap.add_argument("--rate", type=int, default=1_600_000)
|
ap.add_argument("--rate", type=int, default=1_600_000)
|
||||||
ap.add_argument("--json", action="store_true")
|
ap.add_argument("--json", action="store_true")
|
||||||
args = ap.parse_args()
|
args = ap.parse_args()
|
||||||
@@ -126,9 +129,16 @@ for i, a in enumerate(binfo):
|
|||||||
a_end = a["t_ms"] + a["dur_ms"]
|
a_end = a["t_ms"] + a["dur_ms"]
|
||||||
for b in binfo[i + 1:]:
|
for b in binfo[i + 1:]:
|
||||||
gap = b["t_ms"] - a_end
|
gap = b["t_ms"] - a_end
|
||||||
if gap > args.max_ms:
|
if gap > args.delay_ms + args.delay_tol_ms:
|
||||||
break
|
break
|
||||||
if (args.min_ms <= gap <= args.max_ms
|
# A repeat re-sends the SAME frame, so it must (a) sit at the
|
||||||
|
# configured delay, (b) have an airtime consistent with a C1 frame,
|
||||||
|
# and (c) match the original's duration closely. Pairs that merely
|
||||||
|
# fall in a wide window are usually unrelated 868 MHz traffic --
|
||||||
|
# burst trains of 23 ms at 32 ms spacing were seen at this site.
|
||||||
|
if (abs(gap - args.delay_ms) <= args.delay_tol_ms
|
||||||
|
and a["dur_ms"] <= args.max_frame_ms
|
||||||
|
and b["dur_ms"] <= args.max_frame_ms
|
||||||
and abs(b["dur_ms"] - a["dur_ms"]) <= max(3, a["dur_ms"] * 0.35)
|
and abs(b["dur_ms"] - a["dur_ms"]) <= max(3, a["dur_ms"] * 0.35)
|
||||||
and b["peak_db"] >= a["peak_db"] - 3.0):
|
and b["peak_db"] >= a["peak_db"] - 3.0):
|
||||||
pairs.append({"orig_t_ms": a["t_ms"], "gap_ms": int(gap),
|
pairs.append({"orig_t_ms": a["t_ms"], "gap_ms": int(gap),
|
||||||
@@ -147,6 +157,7 @@ result = {
|
|||||||
"unique_meters": len(meters),
|
"unique_meters": len(meters),
|
||||||
"decoded_repeats": decoded_repeats,
|
"decoded_repeats": decoded_repeats,
|
||||||
"rf_repeat_pairs": len(pairs),
|
"rf_repeat_pairs": len(pairs),
|
||||||
|
"expected_delay_ms": args.delay_ms,
|
||||||
"gap_ms": {"min": gaps[0] if gaps else None,
|
"gap_ms": {"min": gaps[0] if gaps else None,
|
||||||
"median": gaps[len(gaps) // 2] if gaps else None,
|
"median": gaps[len(gaps) // 2] if gaps else None,
|
||||||
"max": gaps[-1] if gaps else None},
|
"max": gaps[-1] if gaps else None},
|
||||||
|
|||||||
Reference in New Issue
Block a user