mirror of
https://github.com/ruvnet/RuView
synced 2026-06-18 11:43:19 +00:00
17471e93ff
* feat(calibration): NodeGeometry transceiver-geometry recording (ADR-152 §2.1.1) PerceptAlign-motivated geometry capture at enrollment: per-node optional records (position, antenna orientation, inter-node distances, acquisition method) — recorded when known, never required. Event-sourced via EnrollmentEvent::GeometryRecorded (latest recording wins); persisted on SpecialistBank with serde defaults so pre-ADR-152 bank JSON loads cleanly (fixture-proven, and geometry-free banks serialize byte-shape-identical to the old schema); threaded through MultiNodeMixture as data only — the learned geometry embeddings and algorithmic fusion use are §2.1.2, deliberately deferred until the ADR-151 P6 LoRA heads exist. Geometry recorded from now on means banks captured today remain usable for layout-conditioned training later — you can't retroactively add geometry to data you didn't record. 8 new tests (3 geometry, 2 anchor, 2 bank, 1 multistatic) + full-loop extension (2-node geometry, one tape-measured + one unknown, surviving the bank JSON round-trip the runtime loads from). 50/50 calibration (both feature configs) + 23 CLI tests green. Co-Authored-By: RuFlo <ruv@ruv.net> * feat(training): two-checkerboard camera↔room calibration for ADR-079 labels (ADR-152 §2.1.3) Defends the camera-supervised pipeline against PerceptAlign's "coordinate overfitting": MediaPipe keypoints were emitted in raw camera coordinates with no shared frame and no transceiver-geometry metadata — the exact label shape that memorizes deployment layout and collapses cross-layout. - scripts/calibrate-camera-room.py + calibration_lib.py: OpenCV two-checkerboard calibration → versioned bundle JSON (intrinsics, camera→room extrinsics, checkerboard spec, transceiver geometry, sha256 calibration_id). Intrinsics resolve from file > cache > multi-view computation > loud-warning 2-view fallback. - collect-ground-truth.py --calibration <bundle>: every sample gains keypoints_room (unit bearing rays from the camera center in the room frame — documented projective alignment; raw image coords preserved so training chooses), camera_origin_room, calibration_id, and the transceiver geometry stamp. Without the flag, output is byte-identical to before (tested) + a one-line ADR-152 warning. Design finding (recorded for ADR-152): a single planar checkerboard's corner grid is centrosymmetric — the reversed corner ordering fits a ghost camera pose with IDENTICAL reprojection error, so per-board flip disambiguation is mathematically ill-posed. solve_two_board_extrinsics solves the joint wall+floor set over all 4 flip combinations, where the minimum is unique — an independent reason the TWO-checkerboard method is required, beyond what PerceptAlign states. 15 headless pytest tests green (synthetic corners: extrinsics recovery incl. ghost resolution, bundle round-trip + hash stability, ray transforms w/ distortion + cross-resolution, no-calibration byte identity). Co-Authored-By: RuFlo <ruv@ruv.net> * feat(benchmarks): WiFlow-STD reproduction harness + measurement (a) results (ADR-152 §2.2) Shipped checkpoint REFUTED (0.08% PCK@20, wrong keypoint normalization); 6 reproducibility defects documented (broken imports, corrupted dataset tail with float32-max garbage that NaN-poisons fp16 BatchNorm, unreachable test phase). After repairs, retraining with upstream defaults reproduces 96.09% PCK@20 full-test / 96.61% corruption-free (published 97.25%) on RTX 5080. Claims graded MEASURED-EQUIVALENT; 2.23M params + ~0.055 GFLOPs verified. Third-party code/weights/data stay out of tree (gitignored). Co-Authored-By: claude-flow <ruv@ruv.net> * feat: ADR-152 Rust integrations + ADR-153 802.11bf protocol model - calibration: GeometryEmbedding — 32-slot permutation-invariant NodeGeometry featurization for future LoRA-head conditioning (ADR-152 §2.1.2); derived SpecialistBank::geometry_embedding() accessor; 59 tests - train: MaePretrainConfig + patchify/random-mask with UNSW measured recipe (80% masking, (30,3) patches; ADR-152 §2.3, arXiv 2511.18792); strict no-truncate/no-NaN policy; proptest properties - train: WiFlowStdModel — tch-gated port of the verified ~96%-PCK@20 WiFlow-STD architecture (ADR-152 §2.2 beyond-SOTA); ungated param formula pinned to 2,225,042; 15/17-keypoint support; 239 crate tests - hardware: ieee80211bf forward-compatibility protocol model (ADR-153): SpecProfile gates, SensingCapabilities negotiation, required ConsentMode, session FSM, SensingTransport + SimTransport + OpportunisticCsiBridge; full acceptance checklist covered; 156+4 tests - deps: ruvector bumps per ADR-152 §2.6 survey (mincut/solver 2.0.6, attention 2.1.0, gnn 2.2.0); vendor/ruvector synced to a083bd77f - docs: ADR-153 accepted; ADR-152 §2.2 status, §2.4 amendment, §2.6 added Workspace: 162 test suites green (--no-default-features); Python proof PASS. Known pre-existing flake: homecore-api env_empty_falls_back_to_defaults (unserialized env-var mutation) — untouched, follow-up. Co-Authored-By: claude-flow <ruv@ruv.net> * docs: CHANGELOG + CLAUDE.md entries for ADR-152 integrations and ADR-153 Co-Authored-By: claude-flow <ruv@ruv.net> * fix(train): repair tch-backend bit-rot — gated path compiles and tests run again Mechanical API refresh against current tch: Vec::from(Tensor) -> try_from (+ explicit flatten), numel() usize cast, Rem/div ops -> remainder() / divide_scalar_mode(floor) — the latter fixed a silent true-division bug in heatmap argmax decoding; clamp(1.0, f64::MAX) -> clamp_min (torch 2.x scalar overflow panic); petgraph EdgeRef import; missing EvalMetrics and verify_checkpoint_dir APIs that tests documented. wiflow_std roundtrip test uses safetensors (.pt _save_parameters roundtrip broken in torch 2.11 Windows). Gated: 349 passed (incl. all 20 wiflow_std); ungated: unchanged. Known pre-existing: gaussian-heatmap convention mismatch (2 tests), proof seed race under parallel threads — documented, deliberate follow-ups. Co-Authored-By: claude-flow <ruv@ruv.net> * feat(train): WiFlow-STD PyTorch->tch weight import + numerical parity proof export_to_safetensors.py maps the retrained checkpoint (295 tensors -> 248 mapped, param sum exactly 2,225,042; num_batches_tracked dropped) into a tch-loadable safetensors plus a deterministic parity fixture. Gated #[ignore] integration test loads it strictly and asserts forward-pass agreement: max abs diff 1.192e-7 on the seed-42 fixture. dump_variable_names test makes the tch name layout authoritative. Zero architecture discrepancies found. Co-Authored-By: claude-flow <ruv@ruv.net> * fix: workflow-review findings — BN gamma init, ThresholdParams serde, init docs Concurrent validation workflow (2 review lanes + adversarial verification, 13 agents): 5 confirmed findings, 3 refuted. Fixes: - wiflow_std: pin BatchNorm gamma to 1.0 (tch default draws Uniform(0,1) — silently halves activations in from-scratch training; loaded checkpoints unaffected, parity re-verified after the change) - wiflow_std: document the conv-init divergences vs the reference's effective kaiming_normal(fan_out) re-init (from-scratch dynamics only) - ieee80211bf: ThresholdParams deserialization validates via try_from so the <=100 invariant holds for untrusted payloads (+ rejection test) Benchmarks (release, ruvzen): GeometryEmbedding 1.84us/call (542k/s), MAE tokenization 7.38us/window (135k/s), 802.11bf FSM 8.9M events/s — nothing suspicious. Co-Authored-By: claude-flow <ruv@ruv.net> * docs(adr): ADR-152 §2.1.4 gate resolved — PerceptAlign repo MIT, dataset on HF Co-Authored-By: claude-flow <ruv@ruv.net> * feat(benchmarks): edge optimization measured + measurement (b) blocked + 92.9% retraction Edge optimization (ADR-152 optimize track): ONNX Runtime fp32 is the CPU latency win (3.2 ms/window, ~3.4x faster than torch, parity 2.4e-7); ORT dynamic int8 reaches 2.44 MB (paper's ~2.2 MB claim plausible only via conv-capable toolchains; -0.16pt PCK@20, +18% MPJPE, 2x slower); torch dynamic quant converts 0% of this conv-only model; fp16 halves storage free but is slower on CPU. Measurement (b) BLOCKED-ON-DATA: only 1,077 paired ESP32 windows exist (stop rule <2k). Forensic recheck of the surviving April holdout RETRACTS the ADR-079 '92.9% PCK@20' figure: constant-output model, absolute (not torso) threshold, 69 near-static frames — mean predictor scores 100% under that protocol; torso-PCK@20 is 19.1%. Corroborates PR #535. Stale citations removed from user-guide, readme-details, ADR-152 §2.1.3; no-citation rule extended to ADR-079 accuracy claims. Unblock: >=2k-window multi-pose paired session + torso-PCK re-baseline. Co-Authored-By: claude-flow <ruv@ruv.net> * docs(user-guide): corrected camera-supervised collection tutorial Step 0 CSI-rate check + session-length math (window yield = frames/20 — the May session's 8x under-delivery was a ~12 Hz CSI rate, not an aligner bug); two-checkerboard calibration step (ADR-152 §2.1.3); pose-variety and confidence guidance; torso-normalized PCK + temporal-split + pred-variance eval protocol (lessons from the 92.9% retraction); scale presets re-keyed to realistic window counts. Co-Authored-By: claude-flow <ruv@ruv.net> * feat(benchmarks): static PTQ int8 (calibrated) results + overnight capture script Conv-only static QDQ beats dynamic int8 on accuracy (PCK@20 96.61-96.63% vs 96.52%, MPJPE +10% vs +18% over fp32) at ~equal size/latency; all-ops QDQ strictly worse (int8 activations through attention glue). Entropy calibration verified bit-identical to MinMax on this data. Deployment: ONNX fp32 for speed (3.2ms), static conv-only QDQ for smallest (2.53MB). Also: scripts/overnight-empty-capture.py — segmented UDP CSI recorder for empty-room baselines (no glob collisions, detach-safe). Co-Authored-By: claude-flow <ruv@ruv.net> * feat(benchmarks): measurement (b) MEASURED — optimization transfer only, mean-pose baseline wins WiFlow-STD fine-tuned on 2,046 fresh single-room ESP32 paired windows (temporal 70/15/15, 70->540 adapter, K=17): pretrained-init 65% PCK@20 vs scratch 0% (optimization transfer) but frozen-trunk ~0% (no feature transfer), and NOTHING beats the mean-pose baseline (95.9% PCK@20 — single subject, near-static normalized coords). Honesty gates held: pred std 0.0113 (non-constant model) but mean-baseline dominance means no citable CSI->pose capability from this data. ADR-152 open question 1 answered partially; definitive answer needs multi-subject/position data. Two new aligner findings: heterogeneous csi_shape with silent zero-padding (~20%), and extractCsiMatrix's transposed shape label (frame-major data, [nSc, nFrames] label) — fixes pending. Co-Authored-By: claude-flow <ruv@ruv.net> * feat(benchmarks): efficiency sweep MEASURED — half model dominates full reference Compact WiFlow-STD variants on the same data/split/protocol: half (843,834 params, 0.38x) strictly dominates the 2.23M reference (PCK@20 96.62 vs 96.61, PCK@50 99.47 vs 99.11, MPJPE 0.00898 vs 0.0094) — the published architecture is over-parameterized for its own benchmark. quarter (338k) 96.05%; tiny (56,290 params, 1/39.5) holds 94.11% — a ~220KB fp32 edge candidate. In-domain caveats recorded; cross-domain untested. Co-Authored-By: claude-flow <ruv@ruv.net> * feat(train): compact WiFlow-STD presets in Rust + tiny edge artifact (ADR-152) WiFlowStdConfig gains half()/quarter()/tiny() mirroring the overnight sweep exactly: TcnGroupsMode (Fixed/Gcd/Depthwise), input_pw_groups, derived stride schedule and decoder-mid (all default to upstream behavior; legacy serde JSON unaffected). Param formulas pin to trained ground truth first try: 843,834 / 338,600 / 56,290; default 2,225,042 pin and 1.192e-7 parity unchanged. 248 tests green. Tiny edge artifact (tiny_edge_bench.py): ONNX fp32 = 295 KB, 0.66 ms/win (~1,500/s CPU), 94.11% PCK@20 (matches sweep clean-test exactly; parity 1.49e-7). Static int8 is a bad trade at this scale (-1.43pt, +19% MPJPE, -16% size, slower) — recorded as negative result. Export note: width-16 breaks AdaptiveAvgPool((15,1)) TorchScript export; replaced by exact mean+matmul equivalent, proven by parity. Co-Authored-By: claude-flow <ruv@ruv.net> * fix: resolve all 10 confirmed code-review findings (7-angle review, 20/20 verified) wiflow_std: min_feature_width (default 15) replaces the keypoints->stride coupling — for_keypoints(17) now provably builds the trained [2,2,2,2] graph and pools 15->17, matching the validated Python protocol (pinned by tests); param_count() total on invalid configs; random_mask returns Result and rejects non-finite/out-of-range ratios; trainer checkpoints switched to safetensors (.pt VarStore roundtrip broken on Windows torch 2.11). ieee80211bf: SBP proxy now re-triggers instances and relays reports via Action::RelaySbpReport -> SensingFrame::SbpReport (clients consume via their existing path); missed_instances reset on success = consecutive semantics; SessionTable gains a guarded SBP entry point + unknown-id drop counter; initiator-role sessions reject inbound setup/SBP requests (RejectedNotSupported) closing the idle hijack; StartSetup/StartSbp outside Idle return InvalidStateForCommand; SBP validation unified through evaluate_setup with a 1:1 SetupStatus->SbpStatus mapping. events.rs split out to honor the 500-line cap. calibration/cli: enrollment geometry now actually reaches trained banks — both production call sites attach .with_geometry; --geometry flag on train-room and POST /enroll/geometry + train-body geometry on calibrate-serve give production a recording surface; geometry-free banks log the ADR-152 §2.1.2 note. benchmarks: corruption masks committed as ground truth (unregenerable after in-place cleaning; verified bit-identical regeneration from the pristine copy) + generate_corruption_masks.py producer; _bench_common.py dedups the 5x-copied shim/evaluate/seed/remap (post-refactor PCK@20 re-verified equal to the last digit); remote scripts get the mmap patch; tiny_edge --calib validated multiple-of-64; onnx_bench --help no longer executes (and overwrote) the export — artifact restored byte-exact. Workspace: 2,963 tests passed, 0 failed; Python proof PASS. Co-Authored-By: claude-flow <ruv@ruv.net> * ci: build workspace tests without debuginfo — runner disk exhaustion The combined 38-crate debug target exceeds the GitHub runner's disk ('final link failed: No space left on device'); the same tree measured 151GB locally with full debuginfo. CARGO_PROFILE_{DEV,TEST}_DEBUG=0 shrinks the target ~5-10x; debuginfo serves no purpose in CI test runs. Co-Authored-By: claude-flow <ruv@ruv.net>
301 lines
13 KiB
Python
301 lines
13 KiB
Python
#!/usr/bin/env python3
|
|
"""Two-checkerboard camera-room calibration for WiFi pose training (ADR-152 S2.1.3).
|
|
|
|
Aligns the ADR-079 ground-truth camera and the ESP32 WiFi transceivers in
|
|
one shared 3D room frame -- the PerceptAlign (arXiv 2601.12252) defense
|
|
against "coordinate overfitting", where CSI-to-camera-coordinate regression
|
|
memorizes the deployment layout and collapses cross-layout.
|
|
|
|
Procedure (<5 minutes):
|
|
1. Print a checkerboard (default 9x6 inner corners, 25 mm squares).
|
|
2. Tape one board flat on the ORIGIN WALL, tape-measure its top-left inner
|
|
corner position in room coordinates (+x along wall, +y into room, +z up).
|
|
3. Lay the second board flat on the FLOOR, measure its near-left inner corner.
|
|
4. With the collection camera in its final position, photograph each board.
|
|
5. Run this script; tape-measure each ESP32 node position when prompted
|
|
(or pass --geometry nodes.json).
|
|
|
|
Output: a calibration bundle JSON consumed by
|
|
scripts/collect-ground-truth.py --calibration <bundle.json>
|
|
|
|
Usage:
|
|
python scripts/calibrate-camera-room.py \\
|
|
--wall-image photos/wall.jpg --wall-origin 0.50,0.0,1.60 \\
|
|
--floor-image photos/floor.jpg --floor-origin 1.00,1.00,0.0 \\
|
|
--calib-images "photos/intrinsics/*.jpg" \\
|
|
--geometry config/transceivers.json \\
|
|
--output data/calibration/camera-room.json
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import argparse
|
|
import glob
|
|
import json
|
|
import sys
|
|
from datetime import datetime
|
|
from pathlib import Path
|
|
|
|
import cv2
|
|
import numpy as np
|
|
|
|
sys.path.insert(0, str(Path(__file__).resolve().parent))
|
|
import calibration_lib as cal # noqa: E402
|
|
|
|
INTRINSICS_CACHE = Path("data") / ".cache" / "camera_intrinsics.json"
|
|
|
|
|
|
def parse_vec3(text: str) -> np.ndarray:
|
|
parts = [float(p) for p in text.replace(",", " ").split()]
|
|
if len(parts) != 3:
|
|
raise argparse.ArgumentTypeError(f"Expected 3 comma-separated numbers, got {text!r}")
|
|
return np.array(parts, dtype=np.float64)
|
|
|
|
|
|
def detect_corners(image_path: Path, cols: int, rows: int) -> tuple[np.ndarray, tuple[int, int]]:
|
|
image = cv2.imread(str(image_path))
|
|
if image is None:
|
|
print(f"ERROR: Cannot read image {image_path}", file=sys.stderr)
|
|
sys.exit(1)
|
|
corners = cal.find_board_corners(image, cols, rows)
|
|
if corners is None:
|
|
print(
|
|
f"ERROR: No {cols}x{rows} checkerboard found in {image_path}. "
|
|
"Check lighting, focus, and the --board-cols/--board-rows flags.",
|
|
file=sys.stderr,
|
|
)
|
|
sys.exit(1)
|
|
h, w = image.shape[:2]
|
|
return corners, (w, h)
|
|
|
|
|
|
def resolve_intrinsics(args, repo_root: Path, board_args: tuple[int, int, float]) -> dict:
|
|
"""Pre-computed file > cached > computed from --calib-images >
|
|
last-resort 2-view estimate from the wall+floor photos themselves."""
|
|
cols, rows, square_m = board_args
|
|
|
|
if args.intrinsics:
|
|
print(f"Intrinsics: loading {args.intrinsics}")
|
|
return cal.load_intrinsics(Path(args.intrinsics))
|
|
|
|
cache_path = repo_root / INTRINSICS_CACHE
|
|
if cache_path.exists() and not args.recalibrate_intrinsics:
|
|
print(f"Intrinsics: using cached {cache_path} (pass --recalibrate-intrinsics to redo)")
|
|
intr = cal.load_intrinsics(cache_path)
|
|
intr["source"] = "cached"
|
|
return intr
|
|
|
|
if args.calib_images:
|
|
paths = sorted(glob.glob(args.calib_images))
|
|
if len(paths) < 3:
|
|
print(
|
|
f"ERROR: --calib-images matched only {len(paths)} file(s); "
|
|
"need >= 3 checkerboard views for stable intrinsics.",
|
|
file=sys.stderr,
|
|
)
|
|
sys.exit(1)
|
|
corner_sets, image_size = [], None
|
|
for p in paths:
|
|
corners, size = detect_corners(Path(p), cols, rows)
|
|
if image_size is None:
|
|
image_size = size
|
|
elif size != image_size:
|
|
print(f"ERROR: {p} has size {size}, expected {image_size}.", file=sys.stderr)
|
|
sys.exit(1)
|
|
corner_sets.append(corners)
|
|
print(f" corners found: {p}")
|
|
intr = cal.compute_intrinsics(corner_sets, image_size, cols, rows, square_m)
|
|
print(f"Intrinsics: computed from {len(paths)} views, "
|
|
f"reprojection RMS {intr['reprojection_error_px']:.3f} px")
|
|
cal.save_bundle(intr, cache_path) # plain JSON write; reused on next run
|
|
print(f" cached to {cache_path}")
|
|
return intr
|
|
|
|
# Last resort: 2-view calibration from the extrinsic photos. Workable but
|
|
# weak -- warn loudly and recommend a proper multi-view pass.
|
|
print(
|
|
"WARNING: no --intrinsics / cache / --calib-images; estimating intrinsics "
|
|
"from the wall+floor photos alone (2 views, low quality). Prefer "
|
|
"--calib-images with 5-10 varied board views.",
|
|
file=sys.stderr,
|
|
)
|
|
corner_sets, image_size = [], None
|
|
for p in (args.wall_image, args.floor_image):
|
|
corners, size = detect_corners(Path(p), cols, rows)
|
|
image_size = image_size or size
|
|
corner_sets.append(corners)
|
|
intr = cal.compute_intrinsics(corner_sets, image_size, cols, rows, square_m)
|
|
intr["source"] = "two-view-fallback"
|
|
return intr
|
|
|
|
|
|
def prompt_transceiver_geometry() -> dict:
|
|
"""Tape-measure entry of ESP32 node positions in room coordinates."""
|
|
print()
|
|
print("Transceiver geometry -- enter one node per line:")
|
|
print(" <node-id> <x> <y> <z> [yaw_deg] (meters, room frame; blank line to finish)")
|
|
print(" example: esp32-s3-a 0.10 2.40 1.10 180")
|
|
nodes = []
|
|
while True:
|
|
try:
|
|
line = input("node> ").strip()
|
|
except EOFError:
|
|
break
|
|
if not line:
|
|
break
|
|
parts = line.split()
|
|
if len(parts) not in (4, 5):
|
|
print(" expected: <node-id> <x> <y> <z> [yaw_deg]", file=sys.stderr)
|
|
continue
|
|
try:
|
|
node = {"id": parts[0], "position_m": [float(parts[1]), float(parts[2]), float(parts[3])]}
|
|
if len(parts) == 5:
|
|
node["antenna_yaw_deg"] = float(parts[4])
|
|
except ValueError:
|
|
print(" positions must be numeric", file=sys.stderr)
|
|
continue
|
|
nodes.append(node)
|
|
if not nodes:
|
|
print("WARNING: no transceiver nodes entered; bundle will carry empty geometry.",
|
|
file=sys.stderr)
|
|
return {"nodes": nodes, "units": "meters", "source": "tape-measure-prompt"}
|
|
|
|
|
|
def load_geometry_file(path: Path) -> dict:
|
|
with open(path, "r", encoding="utf-8") as f:
|
|
data = json.load(f)
|
|
nodes = data.get("nodes", data if isinstance(data, list) else None)
|
|
if nodes is None:
|
|
raise ValueError(f"{path}: expected {{'nodes': [...]}} or a top-level list")
|
|
for node in nodes:
|
|
if "id" not in node or "position_m" not in node:
|
|
raise ValueError(f"{path}: each node needs 'id' and 'position_m' [x,y,z]")
|
|
return {"nodes": nodes, "units": "meters", "source": "file"}
|
|
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser(
|
|
description="Two-checkerboard camera-room calibration (ADR-152 S2.1.3 / ADR-079)."
|
|
)
|
|
parser.add_argument("--wall-image", required=True,
|
|
help="Photo of the checkerboard on the origin wall")
|
|
parser.add_argument("--floor-image", required=True,
|
|
help="Photo of the checkerboard on the floor (camera NOT moved)")
|
|
parser.add_argument("--wall-origin", type=parse_vec3, default="0.5,0.0,1.6",
|
|
help="Room xyz (m) of the wall board's first inner corner "
|
|
"(default: 0.5,0.0,1.6)")
|
|
parser.add_argument("--floor-origin", type=parse_vec3, default="1.0,1.0,0.0",
|
|
help="Room xyz (m) of the floor board's first inner corner "
|
|
"(default: 1.0,1.0,0.0)")
|
|
parser.add_argument("--wall-axes", default="+x,-z",
|
|
help="Wall board column,row directions in room frame (default: +x,-z)")
|
|
parser.add_argument("--floor-axes", default="+x,+y",
|
|
help="Floor board column,row directions in room frame (default: +x,+y)")
|
|
parser.add_argument("--board-cols", type=int, default=cal.DEFAULT_BOARD_COLS,
|
|
help=f"Inner corners per row (default: {cal.DEFAULT_BOARD_COLS})")
|
|
parser.add_argument("--board-rows", type=int, default=cal.DEFAULT_BOARD_ROWS,
|
|
help=f"Inner corners per column (default: {cal.DEFAULT_BOARD_ROWS})")
|
|
parser.add_argument("--square-size-mm", type=float, default=cal.DEFAULT_SQUARE_SIZE_MM,
|
|
help=f"Checkerboard square size in mm (default: {cal.DEFAULT_SQUARE_SIZE_MM})")
|
|
parser.add_argument("--intrinsics", help="Pre-computed intrinsics JSON (skips computation)")
|
|
parser.add_argument("--calib-images",
|
|
help="Glob of >=3 checkerboard photos for intrinsics computation")
|
|
parser.add_argument("--recalibrate-intrinsics", action="store_true",
|
|
help="Ignore the cached intrinsics and recompute")
|
|
parser.add_argument("--geometry",
|
|
help="Transceiver geometry JSON ({nodes:[{id,position_m,[antenna_yaw_deg]}]}); "
|
|
"omit to be prompted for tape-measure entry")
|
|
parser.add_argument("--output", default=None,
|
|
help="Bundle output path (default: data/calibration/camera-room-<ts>.json)")
|
|
args = parser.parse_args()
|
|
|
|
if isinstance(args.wall_origin, str):
|
|
args.wall_origin = parse_vec3(args.wall_origin)
|
|
if isinstance(args.floor_origin, str):
|
|
args.floor_origin = parse_vec3(args.floor_origin)
|
|
|
|
repo_root = Path(__file__).resolve().parent.parent
|
|
cols, rows = args.board_cols, args.board_rows
|
|
square_m = args.square_size_mm / 1000.0
|
|
|
|
# --- Intrinsics ---
|
|
intrinsics = resolve_intrinsics(args, repo_root, (cols, rows, square_m))
|
|
camera_matrix = np.asarray(intrinsics["camera_matrix"], dtype=np.float64)
|
|
dist_coeffs = np.asarray(intrinsics["dist_coeffs"], dtype=np.float64)
|
|
|
|
# --- Corner detection on the two placed boards ---
|
|
wall_corners, wall_size = detect_corners(Path(args.wall_image), cols, rows)
|
|
floor_corners, floor_size = detect_corners(Path(args.floor_image), cols, rows)
|
|
if wall_size != floor_size:
|
|
print(f"ERROR: wall image {wall_size} and floor image {floor_size} differ in size; "
|
|
"both must come from the fixed collection camera.", file=sys.stderr)
|
|
sys.exit(1)
|
|
print(f"Corners detected: wall + floor boards ({cols}x{rows}, {args.square_size_mm} mm)")
|
|
|
|
# Re-scale intrinsics if they were computed at a different resolution
|
|
# than the extrinsic photos (the bundle always stores K at wall_size).
|
|
intr_size = tuple(intrinsics["image_size"])
|
|
if intr_size != wall_size:
|
|
sx, sy = wall_size[0] / intr_size[0], wall_size[1] / intr_size[1]
|
|
camera_matrix[0, 0] *= sx
|
|
camera_matrix[0, 2] *= sx
|
|
camera_matrix[1, 1] *= sy
|
|
camera_matrix[1, 2] *= sy
|
|
print(f" intrinsics scaled {intr_size} -> {wall_size}")
|
|
intrinsics = {**intrinsics, "camera_matrix": camera_matrix.tolist(),
|
|
"image_size": list(wall_size)}
|
|
|
|
# --- Room-frame corner positions from the measured placements ---
|
|
wall_u, wall_v = (cal.parse_axis(t) for t in args.wall_axes.split(","))
|
|
floor_u, floor_v = (cal.parse_axis(t) for t in args.floor_axes.split(","))
|
|
wall_room = cal.board_room_points(cols, rows, square_m, args.wall_origin, wall_u, wall_v)
|
|
floor_room = cal.board_room_points(cols, rows, square_m, args.floor_origin, floor_u, floor_v)
|
|
|
|
# --- Extrinsics: joint two-board solve (resolves per-board corner-order
|
|
# ambiguity -- a single planar board is centrosymmetric; the pair is not) ---
|
|
extrinsics = cal.solve_two_board_extrinsics(
|
|
wall_room, wall_corners, floor_room, floor_corners, camera_matrix, dist_coeffs
|
|
)
|
|
wall_rmse = extrinsics["per_board"]["wall"]["rmse_px"]
|
|
floor_rmse = extrinsics["per_board"]["floor"]["rmse_px"]
|
|
print(f" joint solve: RMSE {extrinsics['rmse_px']:.3f} px "
|
|
f"(wall {wall_rmse:.3f} / floor {floor_rmse:.3f})")
|
|
print(f" camera at room {np.round(extrinsics['translation_m'], 3).tolist()} m")
|
|
if max(wall_rmse, floor_rmse) > 3.0:
|
|
print(
|
|
"WARNING: high per-board reprojection error -- re-check the measured "
|
|
"board origins/axes and that the camera did not move between photos.",
|
|
file=sys.stderr,
|
|
)
|
|
|
|
# --- Transceiver geometry ---
|
|
if args.geometry:
|
|
geometry = load_geometry_file(Path(args.geometry))
|
|
print(f"Transceiver geometry: {len(geometry['nodes'])} node(s) from {args.geometry}")
|
|
else:
|
|
geometry = prompt_transceiver_geometry()
|
|
|
|
# --- Bundle ---
|
|
bundle = cal.make_bundle(
|
|
camera_intrinsics=intrinsics,
|
|
camera_to_room_extrinsics=extrinsics,
|
|
checkerboard_spec={"cols": cols, "rows": rows, "square_size_mm": args.square_size_mm},
|
|
transceiver_geometry=geometry,
|
|
)
|
|
if args.output:
|
|
out_path = Path(args.output)
|
|
else:
|
|
ts = datetime.now().strftime("%Y%m%d_%H%M%S")
|
|
out_path = repo_root / "data" / "calibration" / f"camera-room-{ts}.json"
|
|
cal.save_bundle(bundle, out_path)
|
|
|
|
print()
|
|
print("=== Calibration bundle written ===")
|
|
print(f" path: {out_path}")
|
|
print(f" calibration_id: {cal.calibration_id(bundle)}")
|
|
print(f" next: python scripts/collect-ground-truth.py --calibration {out_path}")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|