Author SHA1 Message Date
awe 428ba2a9e0 new mode --bin24 2026-08-17 14:06:49 +03:00
test1 2cf7543bbe fix 2026-07-13 17:58:40 +01:00
awe 5050574e4a fix 2026-07-13 19:19:21 +03:00
awe d1c475b870 fix 2026-07-13 19:10:49 +03:00
awe d13f3140c1 fix 2026-07-13 19:04:13 +03:00
awe 445b15608a fix 2026-07-13 18:40:45 +03:00
7 changed files with 604 additions and 63 deletions
+23
View File
@@ -37,6 +37,16 @@ def build_parser() -> argparse.ArgumentParser:
"в водопаде спектров (0 — отключить)" "в водопаде спектров (0 — отключить)"
), ),
) )
parser.add_argument(
"--bscan-db-range",
dest="bscan_db_range",
default="auto",
help=(
"Фиксированный диапазон цветовой шкалы B-scan в дБ (min,max). "
"Напр. 80,150. 'auto' — подобрать один раз по первому кадру. "
"Применяется к обычному виду (без вычитания фона)."
),
)
parser.add_argument("--title", default="ADC Sweeps", help="Заголовок окна") parser.add_argument("--title", default="ADC Sweeps", help="Заголовок окна")
parser.add_argument( parser.add_argument(
"--fancy", "--fancy",
@@ -82,6 +92,19 @@ def build_parser() -> argparse.ArgumentParser:
"Для 0x001A: code_i16 переводится в В, raw = V, FFT вход = exp(V)" "Для 0x001A: code_i16 переводится в В, raw = V, FFT вход = exp(V)"
), ),
) )
parser.add_argument(
"--bin24",
dest="bin24_mode",
action="store_true",
help=(
"Как --bin, но каждый отсчет I/Q — знаковый 24-битный (3 байта), little-endian. "
"Запись 10 байт: marker(u16), step(u16), ch1_i24(3б), ch2_i24(3б). "
"Маркеры те же: 0x000A (точка), 0x00A8 (secondary), "
"0x00A3/0x00A4 (DO1 LOW/HIGH tagged). "
"Математика как у --bin: сырая кривая = ch1^2+ch2^2, FFT вход = ch1+i*ch2. "
"Полная шкала для пересчета в В = 2^23-1."
),
)
parser.add_argument( parser.add_argument(
"--tty-range-v", "--tty-range-v",
type=float, type=float,
+212 -60
View File
@@ -31,7 +31,12 @@ from rfg_adc_plotter.processing.calibration import (
save_complex_calibration, save_complex_calibration,
set_calibration_base_value, set_calibration_base_value,
) )
from rfg_adc_plotter.processing.fft import compute_fft_complex_row, compute_fft_mag_row, fft_mag_to_db from rfg_adc_plotter.processing.fft import (
compute_distance_axis,
compute_fft_complex_row,
compute_fft_mag_row,
fft_mag_to_db,
)
from rfg_adc_plotter.processing.formatting import compute_auto_ylim, format_status_kv, parse_spec_clip from rfg_adc_plotter.processing.formatting import compute_auto_ylim, format_status_kv, parse_spec_clip
from rfg_adc_plotter.processing.normalization import ( from rfg_adc_plotter.processing.normalization import (
normalize_by_complex_calibration, normalize_by_complex_calibration,
@@ -49,6 +54,7 @@ from rfg_adc_plotter.types import SweepAuxCurves, SweepInfo, SweepPacket
RAW_PLOT_MAX_POINTS = 2048 RAW_PLOT_MAX_POINTS = 2048
RAW_WATERFALL_MAX_POINTS = 2048 RAW_WATERFALL_MAX_POINTS = 2048
BSCAN_MAX_POINTS = 256 BSCAN_MAX_POINTS = 256
BSCAN_DB_RANGE_DEFAULT: Tuple[float, float] = (80.0, 150.0)
UI_QUEUE_MAXSIZE = 128 UI_QUEUE_MAXSIZE = 128
UI_MAX_PACKETS_PER_TICK = 8 UI_MAX_PACKETS_PER_TICK = 8
DEBUG_FRAME_LOG_EVERY = 10 DEBUG_FRAME_LOG_EVERY = 10
@@ -69,6 +75,7 @@ DEFAULT_MAIN_WINDOW_HEIGHT = 680
MIN_MAIN_WINDOW_WIDTH = 640 MIN_MAIN_WINDOW_WIDTH = 640
MIN_MAIN_WINDOW_HEIGHT = 420 MIN_MAIN_WINDOW_HEIGHT = 420
TTY_CODE_SCALE_DENOM = 32767.0 TTY_CODE_SCALE_DENOM = 32767.0
TTY_CODE_SCALE_DENOM_24 = 8388607.0
TTY_RANGE_DEFAULT_V = 5.0 TTY_RANGE_DEFAULT_V = 5.0
TTY_RANGE_MIN_V = 1e-6 TTY_RANGE_MIN_V = 1e-6
TTY_RANGE_MAX_V = 1_000_000.0 TTY_RANGE_MAX_V = 1_000_000.0
@@ -634,13 +641,18 @@ def sanitize_tty_voltage_range(range_v: float, default: float = TTY_RANGE_DEFAUL
return float(np.clip(abs(value), TTY_RANGE_MIN_V, TTY_RANGE_MAX_V)) return float(np.clip(abs(value), TTY_RANGE_MIN_V, TTY_RANGE_MAX_V))
def convert_tty_i16_to_voltage(codes: np.ndarray, range_v: float) -> np.ndarray: def convert_tty_i16_to_voltage(
"""Convert signed tty int16 code array to clipped voltage values in ``[-range_v, +range_v]``.""" codes: np.ndarray, range_v: float, *, denom: float = TTY_CODE_SCALE_DENOM
) -> np.ndarray:
"""Convert signed tty code array to clipped voltage values in ``[-range_v, +range_v]``.
``denom`` is the code full-scale magnitude (2^15-1 for int16, 2^23-1 for int24).
"""
code_arr = np.asarray(codes, dtype=np.float32).reshape(-1) code_arr = np.asarray(codes, dtype=np.float32).reshape(-1)
if code_arr.size <= 0: if code_arr.size <= 0:
return np.zeros((0,), dtype=np.float32) return np.zeros((0,), dtype=np.float32)
range_abs_v = sanitize_tty_voltage_range(range_v) range_abs_v = sanitize_tty_voltage_range(range_v)
scale_v = range_abs_v / float(TTY_CODE_SCALE_DENOM) scale_v = range_abs_v / float(denom)
volt = code_arr * np.float32(scale_v) volt = code_arr * np.float32(scale_v)
return np.clip(volt, -range_abs_v, range_abs_v).astype(np.float32, copy=False) return np.clip(volt, -range_abs_v, range_abs_v).astype(np.float32, copy=False)
@@ -650,9 +662,10 @@ def build_logdet_voltage_fft_input(
range_v: float, range_v: float,
*, *,
exp_input_limit: float = LOGDET_EXP_INPUT_LIMIT, exp_input_limit: float = LOGDET_EXP_INPUT_LIMIT,
denom: float = TTY_CODE_SCALE_DENOM,
) -> Tuple[np.ndarray, np.ndarray]: ) -> Tuple[np.ndarray, np.ndarray]:
"""Convert 1a00 log-detector codes to raw volts and a real FFT input ``exp(V)``.""" """Convert 1a00 log-detector codes to raw volts and a real FFT input ``exp(V)``."""
volts = convert_tty_i16_to_voltage(codes, range_v) volts = convert_tty_i16_to_voltage(codes, range_v, denom=denom)
if volts.size <= 0: if volts.size <= 0:
empty = np.zeros((0,), dtype=np.float32) empty = np.zeros((0,), dtype=np.float32)
return empty, empty return empty, empty
@@ -821,6 +834,31 @@ def _db_to_linear_amplitude(values: np.ndarray) -> np.ndarray:
return np.maximum(out, 0.0).astype(np.float32, copy=False) return np.maximum(out, 0.0).astype(np.float32, copy=False)
def try_parse_bscan_db_range(spec: Optional[str]) -> Optional[Tuple[float, float]]:
"""Parse an explicit B-scan dB window 'min,max'. Returns None if not explicit.
'auto' (or empty/invalid) returns None, meaning "seed once from the first frame".
"""
if not spec:
return None
if str(spec).strip().lower() == "auto":
return None
try:
p0, p1 = str(spec).strip().replace(";", ",").split(",")
lo, hi = float(p0), float(p1)
if np.isfinite(lo) and np.isfinite(hi) and lo < hi:
return (lo, hi)
except Exception:
pass
return None
def parse_bscan_db_range(spec: Optional[str]) -> Tuple[float, float]:
"""Parse a fixed B-scan dB color window 'min,max'. Falls back to the default."""
parsed = try_parse_bscan_db_range(spec)
return parsed if parsed is not None else BSCAN_DB_RANGE_DEFAULT
def compute_background_subtracted_bscan_levels( def compute_background_subtracted_bscan_levels(
disp_fft_lin: np.ndarray, disp_fft_lin: np.ndarray,
disp_fft: np.ndarray, disp_fft: np.ndarray,
@@ -858,15 +896,18 @@ def run_pyqtgraph(args) -> None:
peak_calibrate_mode = bool(getattr(args, "calibrate", False)) peak_calibrate_mode = bool(getattr(args, "calibrate", False))
peak_search_enabled = bool(getattr(args, "peak_search", False)) peak_search_enabled = bool(getattr(args, "peak_search", False))
bin_mode = bool(getattr(args, "bin_mode", False)) bin_mode = bool(getattr(args, "bin_mode", False))
bin24_mode = bool(getattr(args, "bin24_mode", False))
tty_range_v = sanitize_tty_voltage_range(getattr(args, "tty_range_v", TTY_RANGE_DEFAULT_V)) tty_range_v = sanitize_tty_voltage_range(getattr(args, "tty_range_v", TTY_RANGE_DEFAULT_V))
tty_code_denom = TTY_CODE_SCALE_DENOM_24 if bin24_mode else TTY_CODE_SCALE_DENOM
complex_ascii_mode = bool(getattr(args, "parser_complex_ascii", False)) complex_ascii_mode = bool(getattr(args, "parser_complex_ascii", False))
complex_sweep_mode = bool( complex_sweep_mode = bool(
bin_mode bin_mode
or bin24_mode
or complex_ascii_mode or complex_ascii_mode
or getattr(args, "parser_16_bit_x2", False) or getattr(args, "parser_16_bit_x2", False)
or getattr(args, "parser_test", False) or getattr(args, "parser_test", False)
) )
bin_iq_power_mode = bool(bin_mode) bin_iq_power_mode = bool(bin_mode or bin24_mode)
if not sys.platform.startswith("win"): if not sys.platform.startswith("win"):
display_name = os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY") display_name = os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY")
if not display_name: if not display_name:
@@ -890,6 +931,7 @@ def run_pyqtgraph(args) -> None:
stop_event, stop_event,
fancy=bool(args.fancy), fancy=bool(args.fancy),
bin_mode=bin_mode, bin_mode=bin_mode,
bin24_mode=bin24_mode,
logscale=bool(args.logscale), logscale=bool(args.logscale),
parser_16_bit_x2=bool(args.parser_16_bit_x2), parser_16_bit_x2=bool(args.parser_16_bit_x2),
parser_test=bool(args.parser_test), parser_test=bool(args.parser_test),
@@ -903,6 +945,10 @@ def run_pyqtgraph(args) -> None:
fft_bins = FFT_LEN // 2 + 1 fft_bins = FFT_LEN // 2 + 1
spec_clip = parse_spec_clip(getattr(args, "spec_clip", None)) spec_clip = parse_spec_clip(getattr(args, "spec_clip", None))
spec_mean_sec = float(getattr(args, "spec_mean_sec", 0.0)) spec_mean_sec = float(getattr(args, "spec_mean_sec", 0.0))
bscan_db_explicit_range = try_parse_bscan_db_range(getattr(args, "bscan_db_range", None))
bscan_db_vmin, bscan_db_vmax = (
bscan_db_explicit_range if bscan_db_explicit_range is not None else BSCAN_DB_RANGE_DEFAULT
)
runtime = RuntimeState( runtime = RuntimeState(
ring=RingBuffer(max_sweeps), ring=RingBuffer(max_sweeps),
range_min_ghz=float(SWEEP_FREQ_MIN_GHZ), range_min_ghz=float(SWEEP_FREQ_MIN_GHZ),
@@ -1156,6 +1202,24 @@ def run_pyqtgraph(args) -> None:
range_max_spin.setValue(runtime.range_max_ghz) range_max_spin.setValue(runtime.range_max_ghz)
range_group_layout.addRow("f min", range_min_spin) range_group_layout.addRow("f min", range_min_spin)
range_group_layout.addRow("f max", range_max_spin) range_group_layout.addRow("f max", range_max_spin)
bscan_db_group = QtWidgets.QGroupBox("B-scan дБ шкала")
bscan_db_group_layout = QtWidgets.QFormLayout(bscan_db_group)
bscan_db_group_layout.setContentsMargins(6, 6, 6, 6)
bscan_db_group_layout.setSpacing(6)
bscan_db_min_spin = QtWidgets.QDoubleSpinBox()
bscan_db_max_spin = QtWidgets.QDoubleSpinBox()
for spin in (bscan_db_min_spin, bscan_db_max_spin):
spin.setDecimals(1)
spin.setRange(-100.0, 400.0)
spin.setSingleStep(1.0)
try:
spin.setSuffix(" dB")
except Exception:
pass
bscan_db_min_spin.setValue(bscan_db_vmin)
bscan_db_max_spin.setValue(bscan_db_vmax)
bscan_db_group_layout.addRow("дБ мин", bscan_db_min_spin)
bscan_db_group_layout.addRow("дБ макс", bscan_db_max_spin)
fft_mode_label = QtWidgets.QLabel("IFFT режим") fft_mode_label = QtWidgets.QLabel("IFFT режим")
fft_mode_combo = QtWidgets.QComboBox() fft_mode_combo = QtWidgets.QComboBox()
fft_mode_combo.addItem("Обычный", "direct") fft_mode_combo.addItem("Обычный", "direct")
@@ -1305,6 +1369,7 @@ def run_pyqtgraph(args) -> None:
except Exception: except Exception:
pass pass
settings_layout.addWidget(range_group) settings_layout.addWidget(range_group)
settings_layout.addWidget(bscan_db_group)
settings_layout.addWidget(calib_group) settings_layout.addWidget(calib_group)
settings_layout.addWidget(complex_calib_group) settings_layout.addWidget(complex_calib_group)
settings_layout.addWidget(tty_range_group) settings_layout.addWidget(tty_range_group)
@@ -1346,6 +1411,17 @@ def run_pyqtgraph(args) -> None:
last_packet_processed_at: Optional[float] = None last_packet_processed_at: Optional[float] = None
axis_range_cache: Dict[str, Tuple[float, ...]] = {} axis_range_cache: Dict[str, Tuple[float, ...]] = {}
image_rect_cache: Dict[str, Tuple[float, ...]] = {} image_rect_cache: Dict[str, Tuple[float, ...]] = {}
bscan_axis_cache: Dict[Tuple, np.ndarray] = {}
# Fixed manual dB color window for the normal (no-background) B-scan view.
# Never recomputed per frame; only changed by the user via the spin boxes.
bscan_manual_levels: Dict[str, float] = {"vmin": bscan_db_vmin, "vmax": bscan_db_vmax}
# Seed the manual window once from the first real frame (unless the user set an
# explicit --bscan-db-range) so the signal is visible out of the box; it stays
# fixed/manual afterwards.
bscan_levels_seeded: Dict[str, bool] = {"done": bscan_db_explicit_range is not None}
# Frozen levels for the background-subtracted residual view (different scale):
# computed once when background is active, held until a reset event clears it.
bscan_bg_levels_frozen: Dict[str, Optional[Tuple[float, float]]] = {"held": None}
curve_has_data_cache: Dict[str, bool] = {} curve_has_data_cache: Dict[str, bool] = {}
item_visibility_cache: Dict[str, bool] = {} item_visibility_cache: Dict[str, bool] = {}
text_value_cache: Dict[str, str] = {} text_value_cache: Dict[str, str] = {}
@@ -1441,6 +1517,43 @@ def run_pyqtgraph(args) -> None:
image_rect_cache[key] = values image_rect_cache[key] = values
return True return True
def stable_full_scale_distance_axis() -> Optional[np.ndarray]:
"""Full-scale B-scan distance axis, computed once per (range, mode).
The per-sweep ``runtime.ring.distance_axis`` jitters when the reported
``f_max`` varies between sweeps, which rescales the B-scan y-axis every
frame. Deriving the axis from the configured range keeps it stable and
only recomputes when the operator changes ``f min``/``f max`` or the mode.
"""
key = (
round(float(runtime.range_min_ghz), 9),
round(float(runtime.range_max_ghz), 9),
str(fft_mode),
)
cached = bscan_axis_cache.get(key)
if cached is not None:
return cached
if display_distance_transform_enabled(fft_mode):
# positive_only_exact derives its step from real sweep geometry, so a
# synthetic 2-point freq array would be wrong. Hold the first valid
# real axis instead (still keyed by mode, so it re-seeds on switch).
real_axis = runtime.ring.distance_axis
if real_axis is None:
return None
axis = np.asarray(real_axis, dtype=np.float64).reshape(-1)
if axis.size <= 0 or not np.all(np.isfinite(axis)):
return None
else:
synth_freqs = np.asarray(
[runtime.range_min_ghz, runtime.range_max_ghz], dtype=np.float64
)
axis = compute_distance_axis(synth_freqs, fft_bins, mode=fft_mode)
if axis is None or axis.size <= 0 or not np.all(np.isfinite(axis)):
return None
bscan_axis_cache.clear()
bscan_axis_cache[key] = axis
return axis
def set_item_visible_if_changed(key: str, item, visible: bool) -> bool: def set_item_visible_if_changed(key: str, item, visible: bool) -> bool:
visible_value = bool(visible) visible_value = bool(visible)
if item_visibility_cache.get(key) == visible_value: if item_visibility_cache.get(key) == visible_value:
@@ -1538,6 +1651,7 @@ def run_pyqtgraph(args) -> None:
changed = runtime.ring.ensure_init(sweep_width) changed = runtime.ring.ensure_init(sweep_width)
if not changed: if not changed:
return return
log_debug_event("ring_resize", f"ring resized to width {int(sweep_width)}", every=1)
f_min = float(runtime.range_min_ghz) f_min = float(runtime.range_min_ghz)
f_max = float(runtime.range_max_ghz) f_max = float(runtime.range_max_ghz)
freq_bounds = resolve_axis_bounds(runtime.current_freqs) freq_bounds = resolve_axis_bounds(runtime.current_freqs)
@@ -1555,18 +1669,11 @@ def run_pyqtgraph(args) -> None:
padding=0, padding=0,
) )
set_x_range_if_changed("line_x", p_line, f_min, f_max, padding=0) set_x_range_if_changed("line_x", p_line, f_min, f_max, padding=0)
disp_fft = fft_bscan_image_to_db(runtime.ring.get_display_fft_linear()) # NOTE: do NOT reset the B-scan (fft_waterfall) rect/range to a (0,1)
if disp_fft is not None: # placeholder here. The real distance geometry (0..~12 m) is applied every
img_fft.setImage(disp_fft, autoLevels=False) # frame by update_physical_axes() and the B-scan draw block using the stable
set_image_rect_if_changed("fft_waterfall_rect", img_fft, 0.0, 0.0, float(max_sweeps), 1.0) # axis. Writing the placeholder on every ring resize made the B-scan y-axis
set_xy_range_if_changed( # thrash between height 1 and 12 → the flicker.
"fft_waterfall_range",
p_spec,
x_bounds=(0, max_sweeps - 1),
y_bounds=(0.0, 1.0),
padding=0,
)
set_x_range_if_changed("fft_x", p_fft, 0.0, 1.0, padding=0)
def _active_distance_axis() -> Optional[np.ndarray]: def _active_distance_axis() -> Optional[np.ndarray]:
if runtime.current_distances is not None and runtime.current_distances.size > 0: if runtime.current_distances is not None and runtime.current_distances.size > 0:
@@ -1608,9 +1715,15 @@ def run_pyqtgraph(args) -> None:
) )
set_x_range_if_changed("line_x", p_line, f_min, f_max, padding=0) set_x_range_if_changed("line_x", p_line, f_min, f_max, padding=0)
distance_bounds = resolve_axis_bounds(runtime.ring.distance_axis) # Use the SAME stable full-scale axis as the B-scan update block so both
if distance_bounds is not None: # write identical bounds to the shared fft_waterfall cache. Using the
display_axis_full = display_distance_axis_for_mode(runtime.ring.distance_axis, fft_mode) # per-frame runtime.ring.distance_axis here made the two thrash the cache
# and the B-scan y-axis jumped every frame.
bscan_axis = stable_full_scale_distance_axis()
if bscan_axis is None:
bscan_axis = runtime.ring.distance_axis
if bscan_axis is not None:
display_axis_full = display_distance_axis_for_mode(bscan_axis, fft_mode)
display_bounds = resolve_axis_bounds(display_axis_full) display_bounds = resolve_axis_bounds(display_axis_full)
if display_bounds is not None: if display_bounds is not None:
d_min_display, d_max_display = display_bounds d_min_display, d_max_display = display_bounds
@@ -1802,8 +1915,8 @@ def run_pyqtgraph(args) -> None:
width = min(code_1_arr.size, code_2_arr.size) width = min(code_1_arr.size, code_2_arr.size)
if width <= 0: if width <= 0:
return False return False
ch_1_v = convert_tty_i16_to_voltage(code_1_arr[:width], tty_range_v) ch_1_v = convert_tty_i16_to_voltage(code_1_arr[:width], tty_range_v, denom=tty_code_denom)
ch_2_v = convert_tty_i16_to_voltage(code_2_arr[:width], tty_range_v) ch_2_v = convert_tty_i16_to_voltage(code_2_arr[:width], tty_range_v, denom=tty_code_denom)
runtime.full_do1_tagged_raw_low = None runtime.full_do1_tagged_raw_low = None
runtime.full_do1_tagged_raw_high = None runtime.full_do1_tagged_raw_high = None
runtime.full_do1_tagged_aux_low = None runtime.full_do1_tagged_aux_low = None
@@ -1834,10 +1947,10 @@ def run_pyqtgraph(args) -> None:
if width <= 0: if width <= 0:
return False return False
low_ch_1_v = convert_tty_i16_to_voltage(low_code_1_arr[:width], tty_range_v) low_ch_1_v = convert_tty_i16_to_voltage(low_code_1_arr[:width], tty_range_v, denom=tty_code_denom)
low_ch_2_v = convert_tty_i16_to_voltage(low_code_2_arr[:width], tty_range_v) low_ch_2_v = convert_tty_i16_to_voltage(low_code_2_arr[:width], tty_range_v, denom=tty_code_denom)
high_ch_1_v = convert_tty_i16_to_voltage(high_code_1_arr[:width], tty_range_v) high_ch_1_v = convert_tty_i16_to_voltage(high_code_1_arr[:width], tty_range_v, denom=tty_code_denom)
high_ch_2_v = convert_tty_i16_to_voltage(high_code_2_arr[:width], tty_range_v) high_ch_2_v = convert_tty_i16_to_voltage(high_code_2_arr[:width], tty_range_v, denom=tty_code_denom)
low_ch_1_v_f64 = low_ch_1_v.astype(np.float64, copy=False) low_ch_1_v_f64 = low_ch_1_v.astype(np.float64, copy=False)
low_ch_2_v_f64 = low_ch_2_v.astype(np.float64, copy=False) low_ch_2_v_f64 = low_ch_2_v.astype(np.float64, copy=False)
@@ -1862,7 +1975,7 @@ def run_pyqtgraph(args) -> None:
code_arr = np.asarray(runtime.full_current_sweep_codes, dtype=np.float32).reshape(-1) code_arr = np.asarray(runtime.full_current_sweep_codes, dtype=np.float32).reshape(-1)
if code_arr.size <= 0: if code_arr.size <= 0:
return False return False
sweep_raw_v, fft_input = build_logdet_voltage_fft_input(code_arr, tty_range_v) sweep_raw_v, fft_input = build_logdet_voltage_fft_input(code_arr, tty_range_v, denom=tty_code_denom)
runtime.full_do1_tagged_raw_low = None runtime.full_do1_tagged_raw_low = None
runtime.full_do1_tagged_raw_high = None runtime.full_do1_tagged_raw_high = None
runtime.full_do1_tagged_aux_low = None runtime.full_do1_tagged_aux_low = None
@@ -1887,6 +2000,9 @@ def run_pyqtgraph(args) -> None:
runtime.background_buffer.reset() runtime.background_buffer.reset()
if clear_profile: if clear_profile:
runtime.background_profile = None runtime.background_profile = None
# Re-freeze the background-subtracted B-scan levels so contrast doesn't
# drag an old residual scale across the background on/off transition.
bscan_bg_levels_frozen["held"] = None
runtime.current_fft_complex = None runtime.current_fft_complex = None
runtime.current_fft_mag = None runtime.current_fft_mag = None
runtime.current_fft_db = None runtime.current_fft_db = None
@@ -1905,6 +2021,8 @@ def run_pyqtgraph(args) -> None:
runtime.ring.reset() runtime.ring.reset()
axis_range_cache.clear() axis_range_cache.clear()
image_rect_cache.clear() image_rect_cache.clear()
bscan_axis_cache.clear()
bscan_bg_levels_frozen["held"] = None
runtime.current_distances = None runtime.current_distances = None
runtime.current_fft_complex = None runtime.current_fft_complex = None
runtime.current_fft_mag = None runtime.current_fft_mag = None
@@ -2043,8 +2161,13 @@ def run_pyqtgraph(args) -> None:
runtime.current_secondary_phase = None runtime.current_secondary_phase = None
if runtime.current_sweep_raw.size == 0: if runtime.current_sweep_raw.size == 0:
if push_to_ring: # A single empty/partial sweep (no points in the working range) must NOT
reset_ring_buffers() # wipe the whole waterfall — that made the B-scan flash to zero and back
# (the "мерцание"/jumping max). Skip this frame and keep the existing ring
# history intact. Deliberate resets come through reset_ring=True (handled
# at the top of this function), so nothing to clear here.
if push_to_ring and not reset_ring:
log_debug_event("empty_sweep_skipped", "ui empty sweep skipped (ring preserved)")
runtime.current_freqs = None runtime.current_freqs = None
runtime.current_sweep_raw = None runtime.current_sweep_raw = None
runtime.current_fft_source = None runtime.current_fft_source = None
@@ -2238,6 +2361,20 @@ def run_pyqtgraph(args) -> None:
finally: finally:
range_change_in_progress = False range_change_in_progress = False
def set_bscan_db_range() -> None:
try:
new_min = float(bscan_db_min_spin.value())
new_max = float(bscan_db_max_spin.value())
except Exception:
return
if (not np.isfinite(new_min)) or (not np.isfinite(new_max)) or new_min >= new_max:
set_status_note("B-scan дБ: мин должен быть меньше макс")
return
bscan_manual_levels["vmin"] = new_min
bscan_manual_levels["vmax"] = new_max
set_status_note(f"B-scan дБ: {new_min:.1f}..{new_max:.1f}")
runtime.mark_dirty()
def set_working_range() -> None: def set_working_range() -> None:
nonlocal range_change_in_progress nonlocal range_change_in_progress
if range_change_in_progress: if range_change_in_progress:
@@ -2506,6 +2643,8 @@ def run_pyqtgraph(args) -> None:
background_enabled = False background_enabled = False
if background_enabled and runtime.background_profile is None: if background_enabled and runtime.background_profile is None:
set_status_note("фон: профиль не загружен") set_status_note("фон: профиль не загружен")
# Re-freeze residual levels so toggling background recomputes them once.
bscan_bg_levels_frozen["held"] = None
runtime.mark_dirty() runtime.mark_dirty()
def set_fft_low_cut_percent() -> None: def set_fft_low_cut_percent() -> None:
@@ -2526,6 +2665,7 @@ def run_pyqtgraph(args) -> None:
except Exception: except Exception:
fft_mode = "symmetric" fft_mode = "symmetric"
runtime.ring.set_fft_mode(fft_mode) runtime.ring.set_fft_mode(fft_mode)
bscan_axis_cache.clear()
reset_background_state(clear_profile=True) reset_background_state(clear_profile=True)
runtime.current_distances = runtime.ring.distance_axis runtime.current_distances = runtime.ring.distance_axis
runtime.current_fft_mag = None runtime.current_fft_mag = None
@@ -2559,6 +2699,8 @@ def run_pyqtgraph(args) -> None:
try: try:
range_min_spin.valueChanged.connect(lambda _v: set_working_range()) range_min_spin.valueChanged.connect(lambda _v: set_working_range())
range_max_spin.valueChanged.connect(lambda _v: set_working_range()) range_max_spin.valueChanged.connect(lambda _v: set_working_range())
bscan_db_min_spin.valueChanged.connect(lambda _v: set_bscan_db_range())
bscan_db_max_spin.valueChanged.connect(lambda _v: set_bscan_db_range())
tty_range_spin.valueChanged.connect(lambda _v: set_tty_range()) tty_range_spin.valueChanged.connect(lambda _v: set_tty_range())
calib_cb.stateChanged.connect(lambda _v: set_calib_enabled()) calib_cb.stateChanged.connect(lambda _v: set_calib_enabled())
complex_calib_cb.stateChanged.connect(lambda _v: set_complex_calib_enabled()) complex_calib_cb.stateChanged.connect(lambda _v: set_complex_calib_enabled())
@@ -2958,13 +3100,13 @@ def run_pyqtgraph(args) -> None:
calibrate_freqs({"F": base_freqs, "I": sec_ch1})["I"], calibrate_freqs({"F": base_freqs, "I": sec_ch1})["I"],
dtype=np.float32, dtype=np.float32,
) )
runtime.full_secondary_ch1 = convert_tty_i16_to_voltage(sec_ch1_calibrated, tty_range_v) runtime.full_secondary_ch1 = convert_tty_i16_to_voltage(sec_ch1_calibrated, tty_range_v, denom=tty_code_denom)
if sec_ch2 is not None: if sec_ch2 is not None:
sec_ch2_calibrated = np.asarray( sec_ch2_calibrated = np.asarray(
calibrate_freqs({"F": base_freqs, "I": sec_ch2})["I"], calibrate_freqs({"F": base_freqs, "I": sec_ch2})["I"],
dtype=np.float32, dtype=np.float32,
) )
runtime.full_secondary_ch2 = convert_tty_i16_to_voltage(sec_ch2_calibrated, tty_range_v) runtime.full_secondary_ch2 = convert_tty_i16_to_voltage(sec_ch2_calibrated, tty_range_v, denom=tty_code_denom)
if runtime.full_secondary_ch1 is not None and runtime.full_secondary_ch2 is not None: if runtime.full_secondary_ch1 is not None and runtime.full_secondary_ch2 is not None:
w = min(runtime.full_secondary_ch1.size, runtime.full_secondary_ch2.size) w = min(runtime.full_secondary_ch1.size, runtime.full_secondary_ch2.size)
v1 = runtime.full_secondary_ch1[:w] v1 = runtime.full_secondary_ch1[:w]
@@ -3729,42 +3871,52 @@ def run_pyqtgraph(args) -> None:
log_debug_event("invalid_fft_image", "ui invalid FFT waterfall suppressed") log_debug_event("invalid_fft_image", "ui invalid FFT waterfall suppressed")
return return
levels = None # Fixed color scale — never recomputed per frame, so the image no
# longer "changes"/flickers as new sweeps roll in.
if active_background is not None: if active_background is not None:
levels = compute_background_subtracted_bscan_levels(disp_fft_lin, disp_fft) # Residuals are on a different scale than absolute dB; use the
# dedicated bg-subtracted levels, computed ONCE and frozen.
levels = bscan_bg_levels_frozen["held"]
if levels is None: if levels is None:
levels = compute_background_subtracted_bscan_levels(disp_fft_lin, disp_fft)
if levels is not None:
bscan_bg_levels_frozen["held"] = levels
else:
# Normal view: seed the manual window once from the first real
# frame (unless the user gave an explicit --bscan-db-range), then
# hold it fixed so the image never flickers.
if not bscan_levels_seeded["done"]:
try: try:
finite_rows = np.any(np.isfinite(disp_fft), axis=1) lo = float(np.nanpercentile(disp_fft, 2.0))
if np.any(finite_rows): hi = float(np.nanpercentile(disp_fft, 98.0))
mean_spec = np.nanmean(disp_fft[finite_rows], axis=1) if np.isfinite(lo) and np.isfinite(hi) and lo < hi:
if mean_spec.size > 0: bscan_manual_levels["vmin"] = lo
vmin_v = float(np.nanmin(mean_spec)) bscan_manual_levels["vmax"] = hi
vmax_v = float(np.nanmax(mean_spec)) for _spin, _val in (
if np.isfinite(vmin_v) and np.isfinite(vmax_v) and vmin_v != vmax_v: (bscan_db_min_spin, lo),
levels = (vmin_v, vmax_v) (bscan_db_max_spin, hi),
except Exception:
levels = None
if levels is None and spec_clip is not None:
try:
vmin_v = float(np.nanpercentile(disp_fft, spec_clip[0]))
vmax_v = float(np.nanpercentile(disp_fft, spec_clip[1]))
if np.isfinite(vmin_v) and np.isfinite(vmax_v) and vmin_v != vmax_v:
levels = (vmin_v, vmax_v)
except Exception:
levels = None
if (
levels is None
and runtime.ring.y_min_fft is not None
and runtime.ring.y_max_fft is not None
and np.isfinite(runtime.ring.y_min_fft)
and np.isfinite(runtime.ring.y_max_fft)
and runtime.ring.y_min_fft != runtime.ring.y_max_fft
): ):
levels = (runtime.ring.y_min_fft, runtime.ring.y_max_fft) _spin.blockSignals(True)
_spin.setValue(_val)
_spin.blockSignals(False)
bscan_levels_seeded["done"] = True
except Exception:
pass
# Constant manual dB window from the spin boxes.
levels = (bscan_manual_levels["vmin"], bscan_manual_levels["vmax"])
disp_fft_display_axis = display_distance_axis_for_mode(disp_fft_axis, fft_mode) disp_fft_display_axis = display_distance_axis_for_mode(disp_fft_axis, fft_mode)
if display_distance_transform_enabled(fft_mode) and disp_fft_display_axis.size == disp_fft.shape[0]: if display_distance_transform_enabled(fft_mode) and disp_fft_display_axis.size == disp_fft.shape[0]:
disp_fft = disp_fft[::-1, :] disp_fft = disp_fft[::-1, :]
disp_fft_display_axis = disp_fft_display_axis[::-1] disp_fft_display_axis = disp_fft_display_axis[::-1]
# Use a stable full-scale distance axis for the y-range/rect so the
# B-scan always spans ~0..12 m and never rescales per sweep. Fall
# back to the per-frame axis only until a stable axis is available.
stable_axis = stable_full_scale_distance_axis()
if stable_axis is not None:
distance_bounds = resolve_axis_bounds(
display_distance_axis_for_mode(stable_axis, fft_mode)
)
else:
distance_bounds = resolve_axis_bounds(disp_fft_display_axis) distance_bounds = resolve_axis_bounds(disp_fft_display_axis)
if distance_bounds is not None: if distance_bounds is not None:
d_min, d_max = distance_bounds d_min, d_max = distance_bounds
+146
View File
@@ -31,6 +31,10 @@ def u16_to_i16(value: int) -> int:
return value - 0x1_0000 if (value & 0x8000) else value return value - 0x1_0000 if (value & 0x8000) else value
def u24_to_i24(value: int) -> int:
return value - 0x100_0000 if (value & 0x80_0000) else value
def log_value_to_linear(value: int) -> float: def log_value_to_linear(value: int) -> float:
exponent = max(-LOG_EXP_LIMIT, min(LOG_EXP_LIMIT, float(value) * LOG_SCALER)) exponent = max(-LOG_EXP_LIMIT, min(LOG_EXP_LIMIT, float(value) * LOG_SCALER))
return float(LOG_BASE ** exponent) return float(LOG_BASE ** exponent)
@@ -606,6 +610,148 @@ class LegacyBinaryParser:
return events return events
class LegacyBinaryParser24(LegacyBinaryParser):
"""Byte-resynchronizing parser for 10-byte tty records with 24-bit I/Q values.
Same protocol as ``LegacyBinaryParser``'s tty family (markers 0x000A primary,
0x00A8 secondary, 0x00A3/0x00A4 DO1 low/high tagged), but each channel value
is a signed 24-bit little-endian integer, so a record is 10 bytes:
``marker(u16) | step(u16) | ch1_i24(3B) | ch2_i24(3B)``. The legacy 8-byte
(byte6==0x0A) and logdet (0x001A) record shapes do not exist here and are
omitted so int24 payload bytes cannot be mistaken for them.
"""
RECORD_SIZE = 10
def __init__(self):
super().__init__(batch_events=False)
@staticmethod
def _i24_at(buf: bytearray, offset: int) -> int:
u = int(buf[offset]) | (int(buf[offset + 1]) << 8) | (int(buf[offset + 2]) << 16)
return u24_to_i24(u)
def _try_emit_tty_batch(self, events: List[ParserEvent], *, require_not_legacy: bool) -> bool:
# int24 has no native numpy dtype; the scalar per-record path handles it.
return False
def _emit_tty_point24(self, events: List[ParserEvent], step: int, ch_1: int, ch_2: int) -> None:
self._prepare_bin_point(events, step=int(step), signal_kind="bin_iq")
ch_1 = int(ch_1)
ch_2 = int(ch_2)
events.append(
PointEvent(
ch=0,
x=int(step),
y=tty_ch_pair_to_sweep(ch_1, ch_2),
aux=(float(ch_1), float(ch_2)),
signal_kind="bin_iq",
)
)
def _emit_tty_tagged_point24(
self,
events: List[ParserEvent],
step: int,
ch_1: int,
ch_2: int,
do1_level: Do1Level,
) -> None:
self._prepare_bin_point(
events,
step=int(step),
signal_kind="bin_iq_do1_tagged",
do1_level=do1_level,
)
ch_1 = int(ch_1)
ch_2 = int(ch_2)
events.append(
PointEvent(
ch=0,
x=int(step),
y=tty_ch_pair_to_sweep(ch_1, ch_2),
aux=(float(ch_1), float(ch_2)),
signal_kind="bin_iq_do1_tagged",
do1_level=do1_level,
)
)
def _emit_secondary_point24(self, events: List[ParserEvent], step: int, ch_1: int, ch_2: int) -> None:
self._mode = "bin"
self._current_signal_kind = self._current_signal_kind or "bin_iq"
ch_1 = int(ch_1)
ch_2 = int(ch_2)
events.append(
PointEvent(
ch=0,
x=int(step),
y=0.0,
aux=(float(ch_1), float(ch_2)),
signal_kind="bin_iq",
is_secondary=True,
)
)
def feed(self, data: bytes) -> List[ParserEvent]:
if data:
self._buf += data
events: List[ParserEvent] = []
while len(self._buf) >= self.RECORD_SIZE:
w0 = self._u16_at(self._buf, 0)
w1 = self._u16_at(self._buf, 2)
is_tty_start = w0 == 0x000A and all(b == 0xFF for b in self._buf[2:10])
is_tty_point = w0 == 0x000A and w1 != 0xFFFF
is_tty_tagged_low_point = w0 == 0x00A3 and w1 != 0xFFFF
is_tty_tagged_high_point = w0 == 0x00A4 and w1 != 0xFFFF
is_secondary_point = w0 == 0x00A8 and w1 != 0xFFFF
if is_tty_start:
self._emit_tty_start(events)
del self._buf[:10]
continue
if is_tty_point:
self._emit_tty_point24(
events,
step=int(w1),
ch_1=self._i24_at(self._buf, 4),
ch_2=self._i24_at(self._buf, 7),
)
del self._buf[:10]
continue
if is_tty_tagged_low_point:
self._emit_tty_tagged_point24(
events,
step=int(w1),
ch_1=self._i24_at(self._buf, 4),
ch_2=self._i24_at(self._buf, 7),
do1_level="low",
)
del self._buf[:10]
continue
if is_tty_tagged_high_point:
self._emit_tty_tagged_point24(
events,
step=int(w1),
ch_1=self._i24_at(self._buf, 4),
ch_2=self._i24_at(self._buf, 7),
do1_level="high",
)
del self._buf[:10]
continue
if is_secondary_point:
self._emit_secondary_point24(
events,
step=int(w1),
ch_1=self._i24_at(self._buf, 4),
ch_2=self._i24_at(self._buf, 7),
)
del self._buf[:10]
continue
del self._buf[:1]
return events
class LogScaleBinaryParser32: class LogScaleBinaryParser32:
"""Byte-resynchronizing parser for 32-bit logscale pair records.""" """Byte-resynchronizing parser for 32-bit logscale pair records."""
+7
View File
@@ -12,6 +12,7 @@ from rfg_adc_plotter.io.sweep_parser_core import (
AsciiSweepParser, AsciiSweepParser,
ComplexAsciiSweepParser, ComplexAsciiSweepParser,
LegacyBinaryParser, LegacyBinaryParser,
LegacyBinaryParser24,
LogScale16BitX2BinaryParser, LogScale16BitX2BinaryParser,
LogScaleBinaryParser32, LogScaleBinaryParser32,
ParserTestStreamParser, ParserTestStreamParser,
@@ -113,6 +114,7 @@ class SweepReader(threading.Thread):
stop_event: threading.Event, stop_event: threading.Event,
fancy: bool = False, fancy: bool = False,
bin_mode: bool = False, bin_mode: bool = False,
bin24_mode: bool = False,
logscale: bool = False, logscale: bool = False,
parser_16_bit_x2: bool = False, parser_16_bit_x2: bool = False,
parser_test: bool = False, parser_test: bool = False,
@@ -125,6 +127,7 @@ class SweepReader(threading.Thread):
self._stop_event = stop_event self._stop_event = stop_event
self._fancy = bool(fancy) self._fancy = bool(fancy)
self._bin_mode = bool(bin_mode) self._bin_mode = bool(bin_mode)
self._bin24_mode = bool(bin24_mode)
self._logscale = bool(logscale) self._logscale = bool(logscale)
self._parser_16_bit_x2 = bool(parser_16_bit_x2) self._parser_16_bit_x2 = bool(parser_16_bit_x2)
self._parser_test = bool(parser_test) self._parser_test = bool(parser_test)
@@ -143,6 +146,8 @@ class SweepReader(threading.Thread):
return "parser_16_bit_x2" return "parser_16_bit_x2"
if self._logscale: if self._logscale:
return "logscale_32" return "logscale_32"
if self._bin24_mode:
return "legacy_10byte_i24"
if self._bin_mode: if self._bin_mode:
return "legacy_8byte" return "legacy_8byte"
return "ascii" return "ascii"
@@ -156,6 +161,8 @@ class SweepReader(threading.Thread):
return LogScale16BitX2BinaryParser(), SweepAssembler(fancy=self._fancy, apply_inversion=False) return LogScale16BitX2BinaryParser(), SweepAssembler(fancy=self._fancy, apply_inversion=False)
if self._logscale: if self._logscale:
return LogScaleBinaryParser32(), SweepAssembler(fancy=self._fancy, apply_inversion=False) return LogScaleBinaryParser32(), SweepAssembler(fancy=self._fancy, apply_inversion=False)
if self._bin24_mode:
return LegacyBinaryParser24(), SweepAssembler(fancy=self._fancy, apply_inversion=True)
if self._bin_mode: if self._bin_mode:
return LegacyBinaryParser(batch_events=True), SweepAssembler(fancy=self._fancy, apply_inversion=True) return LegacyBinaryParser(batch_events=True), SweepAssembler(fancy=self._fancy, apply_inversion=True)
return AsciiSweepParser(), SweepAssembler(fancy=self._fancy, apply_inversion=True) return AsciiSweepParser(), SweepAssembler(fancy=self._fancy, apply_inversion=True)
+13 -1
View File
@@ -10,6 +10,13 @@ import numpy as np
from rfg_adc_plotter.constants import FFT_LEN, SWEEP_FREQ_MAX_GHZ, SWEEP_FREQ_MIN_GHZ from rfg_adc_plotter.constants import FFT_LEN, SWEEP_FREQ_MAX_GHZ, SWEEP_FREQ_MIN_GHZ
from rfg_adc_plotter.processing.fft import compute_distance_axis, compute_fft_mag_row, fft_mag_to_db from rfg_adc_plotter.processing.fft import compute_distance_axis, compute_fft_mag_row, fft_mag_to_db
# The device sweep length jitters by a few percent (e.g. 896..920). Only treat a
# shrink as real when the new width drops below this fraction of the current width;
# genuine format changes (e.g. 2048 -> 256, or halving) fall well below it. This
# stops the ring from reallocating every frame — which churned the buffer and made
# the B-scan flicker.
RING_WIDTH_SHRINK_FRACTION = 0.8
class RingBuffer: class RingBuffer:
"""Store raw sweeps, FFT rows, and matching time markers.""" """Store raw sweeps, FFT rows, and matching time markers."""
@@ -103,7 +110,12 @@ class RingBuffer:
self.ring_fft_input = np.full((self.max_sweeps, self.width), np.nan + 0j, dtype=np.complex64) self.ring_fft_input = np.full((self.max_sweeps, self.width), np.nan + 0j, dtype=np.complex64)
self.head = 0 self.head = 0
changed = True changed = True
elif target_width != self.width: elif target_width > self.width or target_width < int(self.width * RING_WIDTH_SHRINK_FRACTION):
# Resize when the sweep grows, or shrinks by a meaningful fraction (a real
# format change). Ignore small shrinks: the device sweep length jitters by
# a few percent (e.g. 896 vs 920). Resizing on every such shrink churned
# the ring every frame and made the B-scan flicker. A shorter sweep just
# fills fewer columns (the rest stays NaN); the width converges to the max.
new_ring = np.full((self.max_sweeps, target_width), np.nan, dtype=np.float32) new_ring = np.full((self.max_sweeps, target_width), np.nan, dtype=np.float32)
new_fft_input = np.full((self.max_sweeps, target_width), np.nan + 0j, dtype=np.complex64) new_fft_input = np.full((self.max_sweeps, target_width), np.nan + 0j, dtype=np.complex64)
take = min(self.width, target_width) take = min(self.width, target_width)
+21
View File
@@ -13,6 +13,7 @@ from rfg_adc_plotter.gui.pyqtgraph_backend import (
build_logdet_voltage_fft_input, build_logdet_voltage_fft_input,
build_main_window_layout, build_main_window_layout,
coalesce_packets_for_ui, coalesce_packets_for_ui,
TTY_CODE_SCALE_DENOM_24,
compute_background_subtracted_bscan_levels, compute_background_subtracted_bscan_levels,
compute_aux_phase_curve, compute_aux_phase_curve,
compute_do1_tagged_aggregate, compute_do1_tagged_aggregate,
@@ -87,6 +88,26 @@ class ProcessingTests(unittest.TestCase):
self.assertTrue(np.all(volts >= -5.0)) self.assertTrue(np.all(volts >= -5.0))
self.assertTrue(np.all(volts <= 5.0)) self.assertTrue(np.all(volts <= 5.0))
def test_convert_tty_i16_to_voltage_int24_denominator_maps_full_scale(self):
full_scale = float(TTY_CODE_SCALE_DENOM_24)
codes = np.asarray([-full_scale - 1.0, 0.0, full_scale], dtype=np.float32)
volts = convert_tty_i16_to_voltage(codes, 5.0, denom=TTY_CODE_SCALE_DENOM_24)
self.assertAlmostEqual(float(volts[0]), -5.0, places=4)
self.assertAlmostEqual(float(volts[1]), 0.0, places=6)
self.assertAlmostEqual(float(volts[2]), 5.0, places=4)
# A quarter-scale 24-bit code must yield ~1.25 V with the int24 denom, but the
# default int16 denom over-scales it ~256x and clips to the ±5 V range. This
# guards that --bin24 uses the wider full-scale rather than the int16 one.
quarter = np.asarray([full_scale / 4.0], dtype=np.float32)
self.assertAlmostEqual(
float(convert_tty_i16_to_voltage(quarter, 5.0, denom=TTY_CODE_SCALE_DENOM_24)[0]),
1.25,
places=4,
)
self.assertAlmostEqual(float(convert_tty_i16_to_voltage(quarter, 5.0)[0]), 5.0, places=6)
def test_build_logdet_voltage_fft_input_converts_codes_and_exponentiates(self): def test_build_logdet_voltage_fft_input_converts_codes_and_exponentiates(self):
codes = np.asarray([-32768.0, 0.0, 32767.0], dtype=np.float32) codes = np.asarray([-32768.0, 0.0, 32767.0], dtype=np.float32)
volts, fft_input = build_logdet_voltage_fft_input(codes, 5.0) volts, fft_input = build_logdet_voltage_fft_input(codes, 5.0)
+180
View File
@@ -10,6 +10,7 @@ from rfg_adc_plotter.io.sweep_parser_core import (
BatchPointEvent, BatchPointEvent,
ComplexAsciiSweepParser, ComplexAsciiSweepParser,
LegacyBinaryParser, LegacyBinaryParser,
LegacyBinaryParser24,
LogScale16BitX2BinaryParser, LogScale16BitX2BinaryParser,
LogScaleBinaryParser32, LogScaleBinaryParser32,
ParserTestStreamParser, ParserTestStreamParser,
@@ -17,6 +18,7 @@ from rfg_adc_plotter.io.sweep_parser_core import (
StartEvent, StartEvent,
SweepAssembler, SweepAssembler,
log_pair_to_sweep, log_pair_to_sweep,
u24_to_i24,
) )
@@ -120,6 +122,35 @@ def _pack_logdet_point(step: int, value: int) -> bytes:
) )
def _i24le(value: int) -> bytes:
v = int(value) & 0xFFFFFF
return bytes((v & 0xFF, (v >> 8) & 0xFF, (v >> 16) & 0xFF))
def _pack_tty24_start() -> bytes:
return _u16le(0x000A) + b"\xff" * 8
def _pack_tty24_point(step: int, ch1: int, ch2: int) -> bytes:
return _u16le(0x000A) + _u16le(step) + _i24le(ch1) + _i24le(ch2)
def _pack_tty24_tagged_point(marker_word0: int, step: int, ch1: int, ch2: int) -> bytes:
return _u16le(marker_word0) + _u16le(step) + _i24le(ch1) + _i24le(ch2)
def _pack_tty24_tagged_low_point(step: int, ch1: int, ch2: int) -> bytes:
return _pack_tty24_tagged_point(0x00A3, step, ch1, ch2)
def _pack_tty24_tagged_high_point(step: int, ch1: int, ch2: int) -> bytes:
return _pack_tty24_tagged_point(0x00A4, step, ch1, ch2)
def _pack_tty24_secondary_point(step: int, ch1: int, ch2: int) -> bytes:
return _u16le(0x00A8) + _u16le(step) + _i24le(ch1) + _i24le(ch2)
class SweepParserCoreTests(unittest.TestCase): class SweepParserCoreTests(unittest.TestCase):
def test_ascii_parser_emits_start_and_points(self): def test_ascii_parser_emits_start_and_points(self):
parser = AsciiSweepParser() parser = AsciiSweepParser()
@@ -697,5 +728,154 @@ class SweepParserCoreTests(unittest.TestCase):
self.assertNotIn("_secondary_payload", info) self.assertNotIn("_secondary_payload", info)
class LegacyBinaryParser24Tests(unittest.TestCase):
def test_u24_to_i24_sign_extension_boundaries(self):
self.assertEqual(u24_to_i24(0x000000), 0)
self.assertEqual(u24_to_i24(0x000001), 1)
self.assertEqual(u24_to_i24(0x7FFFFF), 8388607)
self.assertEqual(u24_to_i24(0x800000), -8388608)
self.assertEqual(u24_to_i24(0xFFFFFF), -1)
def test_accepts_tty24_ch1_ch2_stream(self):
parser = LegacyBinaryParser24()
stream = b"".join(
[
_pack_tty24_start(),
_pack_tty24_point(1, 100, 90),
_pack_tty24_point(2, 120, 95),
]
)
events = parser.feed(stream)
self.assertIsInstance(events[0], StartEvent)
self.assertEqual(events[0].ch, 0)
self.assertIsInstance(events[1], PointEvent)
self.assertEqual(events[1].x, 1)
self.assertEqual(events[1].y, 18100.0)
self.assertEqual(events[1].aux, (100.0, 90.0))
self.assertEqual(events[1].signal_kind, "bin_iq")
self.assertEqual(events[2].x, 2)
self.assertEqual(events[2].y, 23425.0)
self.assertEqual(events[2].aux, (120.0, 95.0))
def test_decodes_negative_int24_values(self):
parser = LegacyBinaryParser24()
stream = _pack_tty24_start() + _pack_tty24_point(1, -8388608, 8388607)
events = parser.feed(stream)
point = events[1]
self.assertEqual(point.aux, (-8388608.0, 8388607.0))
self.assertEqual(point.y, float(8388608 ** 2 + 8388607 ** 2))
def test_never_emits_batch_event(self):
parser = LegacyBinaryParser24()
stream = _pack_tty24_start() + b"".join(
_pack_tty24_point(i, i * 10, -i * 5) for i in range(1, 6)
)
events = parser.feed(stream)
self.assertFalse(any(isinstance(e, BatchPointEvent) for e in events))
self.assertFalse(parser._try_emit_tty_batch(events, require_not_legacy=False))
def test_resynchronizes_after_garbage(self):
parser = LegacyBinaryParser24()
stream = b"\x11\x22\x33" + _pack_tty24_start() + _pack_tty24_point(5, 7, -3)
events = parser.feed(stream)
points = [e for e in events if isinstance(e, PointEvent)]
self.assertEqual(len(points), 1)
self.assertEqual(points[0].x, 5)
self.assertEqual(points[0].aux, (7.0, -3.0))
def test_detects_new_sweep_on_step_reset(self):
parser = LegacyBinaryParser24()
stream = _pack_tty24_start() + b"".join(
[
_pack_tty24_point(5, 1, 1),
_pack_tty24_point(6, 2, 2),
_pack_tty24_point(1, 3, 3),
]
)
events = parser.feed(stream)
start_count = sum(1 for e in events if isinstance(e, StartEvent))
self.assertEqual(start_count, 2)
def test_do1_tagged_routing(self):
parser = LegacyBinaryParser24()
stream = b"".join(
[
_pack_tty24_tagged_low_point(1, 10, 20),
_pack_tty24_tagged_high_point(1, 30, 40),
]
)
events = parser.feed(stream)
points = [e for e in events if isinstance(e, PointEvent)]
self.assertEqual(points[0].signal_kind, "bin_iq_do1_tagged")
self.assertEqual(points[0].do1_level, "low")
self.assertEqual(points[0].aux, (10.0, 20.0))
self.assertEqual(points[1].do1_level, "high")
self.assertEqual(points[1].aux, (30.0, 40.0))
def test_secondary_point(self):
parser = LegacyBinaryParser24()
stream = _pack_tty24_start() + _pack_tty24_secondary_point(3, -51, -36)
events = parser.feed(stream)
secondary = [e for e in events if isinstance(e, PointEvent) and e.is_secondary]
self.assertEqual(len(secondary), 1)
self.assertEqual(secondary[0].x, 3)
self.assertEqual(secondary[0].y, 0.0)
self.assertEqual(secondary[0].aux, (-51.0, -36.0))
def test_assembles_sweep_packet(self):
parser = LegacyBinaryParser24()
assembler = SweepAssembler(fancy=False, apply_inversion=True)
stream = _pack_tty24_start() + b"".join(
_pack_tty24_point(i, i * 10, -i * 5) for i in range(1, 20)
)
packets = []
for event in parser.feed(stream):
packet = assembler.consume(event)
if packet is not None:
packets.append(packet)
final = assembler.finalize_current()
if final is not None:
packets.append(final)
self.assertTrue(packets)
sweep, info, _aux = packets[-1]
self.assertEqual(info["signal_kind"], "bin_iq")
self.assertTrue(np.isfinite(info["mean"]))
class SweepReaderBin24Tests(unittest.TestCase):
def test_build_parser_selects_int24_parser(self):
from queue import Queue
import threading
from rfg_adc_plotter.io.sweep_reader import SweepReader
reader = SweepReader(
"unused",
115200,
Queue(),
threading.Event(),
bin24_mode=True,
)
parser, _assembler = reader._build_parser()
self.assertIsInstance(parser, LegacyBinaryParser24)
self.assertEqual(reader._resolve_parser_mode_label(), "legacy_10byte_i24")
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()