支持 HI13/H32 主机 UTC 桥接对齐、多会话联合标定与 CAD 平移先验。
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -15,7 +15,7 @@ and horizontal channel offsets default to 0.
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import dataclass
|
||||
from typing import Iterable
|
||||
from typing import Iterable, Sequence
|
||||
|
||||
import numpy as np
|
||||
|
||||
@@ -66,6 +66,8 @@ class LidarFrameExport:
|
||||
t_start_s: float
|
||||
t_end_s: float
|
||||
points_xyz: np.ndarray # (N, 3) metres
|
||||
host_receive_utc_ticks_start: int = 0
|
||||
host_receive_utc_ticks_end: int = 0
|
||||
|
||||
|
||||
def decode_packet_points(
|
||||
@@ -144,6 +146,7 @@ def _block_points(
|
||||
def iter_h32_frames_from_packets(
|
||||
packets: Iterable[bytes],
|
||||
*,
|
||||
host_utc_ticks: Sequence[int] | None = None,
|
||||
min_frame_points: int = MIN_FRAME_POINTS_DEFAULT,
|
||||
frame_stride: int = 1,
|
||||
min_range_m: float = 0.3,
|
||||
@@ -152,31 +155,49 @@ def iter_h32_frames_from_packets(
|
||||
vertical_deg: np.ndarray | None = None,
|
||||
horizontal_deg: np.ndarray | None = None,
|
||||
) -> list[LidarFrameExport]:
|
||||
"""Assemble raw MSOP packets into frames using the 270°→90° azimuth wrap."""
|
||||
"""Assemble raw MSOP packets into frames using the 270°→90° azimuth wrap.
|
||||
|
||||
``host_utc_ticks`` is optional per-packet ``HostReceiveUtcTicks`` from the
|
||||
MSOP DLog payload (UTC DateTime ticks). When provided, each emitted frame
|
||||
carries host receive start/end ticks from the first/last contributing packet.
|
||||
"""
|
||||
|
||||
vertical = default_vertical_deg() if vertical_deg is None else np.asarray(vertical_deg, dtype=np.float64)
|
||||
horizontal = default_horizontal_deg() if horizontal_deg is None else np.asarray(horizontal_deg, dtype=np.float64)
|
||||
if vertical.shape != (CHANNELS,) or horizontal.shape != (CHANNELS,):
|
||||
raise ValueError(f"vertical/horizontal must have shape ({CHANNELS},)")
|
||||
|
||||
packet_list = list(packets)
|
||||
host_list = list(host_utc_ticks) if host_utc_ticks is not None else None
|
||||
if host_list is not None and len(host_list) != len(packet_list):
|
||||
raise ValueError(
|
||||
f"host_utc_ticks length {len(host_list)} != packets length {len(packet_list)}"
|
||||
)
|
||||
|
||||
frames: list[LidarFrameExport] = []
|
||||
point_chunks: list[np.ndarray] = []
|
||||
t_start: float | None = None
|
||||
t_end: float | None = None
|
||||
host_start: int | None = None
|
||||
host_end: int | None = None
|
||||
prev_az: float | None = None
|
||||
kept = 0
|
||||
stride = max(1, int(frame_stride))
|
||||
|
||||
def emit() -> None:
|
||||
nonlocal point_chunks, t_start, t_end, kept
|
||||
nonlocal point_chunks, t_start, t_end, host_start, host_end, kept
|
||||
if not point_chunks or t_start is None or t_end is None:
|
||||
point_chunks = []
|
||||
t_start = t_end = None
|
||||
host_start = host_end = None
|
||||
return
|
||||
points = np.vstack(point_chunks)
|
||||
point_chunks = []
|
||||
start_s, end_s = t_start, t_end
|
||||
h0 = int(host_start or 0)
|
||||
h1 = int(host_end or 0)
|
||||
t_start = t_end = None
|
||||
host_start = host_end = None
|
||||
if points.shape[0] < min_frame_points:
|
||||
return
|
||||
if kept % stride != 0:
|
||||
@@ -188,12 +209,21 @@ def iter_h32_frames_from_packets(
|
||||
points = points[select]
|
||||
if end_s <= start_s:
|
||||
end_s = start_s + 0.1
|
||||
frames.append(LidarFrameExport(t_start_s=start_s, t_end_s=end_s, points_xyz=points))
|
||||
frames.append(
|
||||
LidarFrameExport(
|
||||
t_start_s=start_s,
|
||||
t_end_s=end_s,
|
||||
points_xyz=points,
|
||||
host_receive_utc_ticks_start=h0,
|
||||
host_receive_utc_ticks_end=h1,
|
||||
)
|
||||
)
|
||||
|
||||
for packet in packets:
|
||||
for index, packet in enumerate(packet_list):
|
||||
if len(packet) != PACKET_LENGTH:
|
||||
continue
|
||||
packet_t = device_timestamp_ms(packet) * 1e-3
|
||||
packet_host = int(host_list[index]) if host_list is not None else 0
|
||||
unit = distance_unit_mm(packet)
|
||||
idx = DATA_START
|
||||
for _block in range(BLOCKS):
|
||||
@@ -216,7 +246,9 @@ def iter_h32_frames_from_packets(
|
||||
if pts.shape[0]:
|
||||
if t_start is None:
|
||||
t_start = packet_t
|
||||
host_start = packet_host
|
||||
t_end = packet_t
|
||||
host_end = packet_host
|
||||
point_chunks.append(pts)
|
||||
idx += BLOCK_LENGTH
|
||||
|
||||
@@ -237,8 +269,11 @@ def iter_h32_frames(
|
||||
) -> list[LidarFrameExport]:
|
||||
"""Assemble MSOP packets from a V2 .rscap capture into frames."""
|
||||
|
||||
packets = [chunk.raw for chunk in capture.chunks]
|
||||
host_ticks = [chunk.receive_utc_ticks for chunk in capture.chunks]
|
||||
return iter_h32_frames_from_packets(
|
||||
(chunk.raw for chunk in capture.chunks),
|
||||
packets,
|
||||
host_utc_ticks=host_ticks,
|
||||
min_frame_points=min_frame_points,
|
||||
frame_stride=frame_stride,
|
||||
min_range_m=min_range_m,
|
||||
|
||||
Reference in New Issue
Block a user