mirror of
https://github.com/smittix/intercept.git
synced 2026-07-09 18:18:12 -07:00
Add live waterfall during pager and sensor decoding via IQ pipeline
Replace rtl_fm/rtl_433 with rtl_sdr for raw IQ capture when available, enabling a Python IQ processor to compute FFT for the waterfall while simultaneously feeding decoded data to multimon-ng (pager) or rtl_433 (sensor). Falls back to the legacy pipeline when rtl_sdr is unavailable. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -232,6 +232,13 @@ cleanup_manager.register(ais_vessels)
|
|||||||
cleanup_manager.register(dsc_messages)
|
cleanup_manager.register(dsc_messages)
|
||||||
cleanup_manager.register(deauth_alerts)
|
cleanup_manager.register(deauth_alerts)
|
||||||
|
|
||||||
|
# ============================================
|
||||||
|
# WATERFALL SOURCE TRACKING
|
||||||
|
# ============================================
|
||||||
|
# Tracks whether waterfall data is being produced by a decoder's IQ pipeline
|
||||||
|
# None = no active source, 'rtl_power' = standalone, 'pager'/'sensor' = decoder-driven
|
||||||
|
waterfall_source: str | None = None
|
||||||
|
|
||||||
# ============================================
|
# ============================================
|
||||||
# SDR DEVICE REGISTRY
|
# SDR DEVICE REGISTRY
|
||||||
# ============================================
|
# ============================================
|
||||||
@@ -659,7 +666,7 @@ def kill_all() -> Response:
|
|||||||
"""Kill all decoder, WiFi, and Bluetooth processes."""
|
"""Kill all decoder, WiFi, and Bluetooth processes."""
|
||||||
global current_process, sensor_process, wifi_process, adsb_process, ais_process, acars_process
|
global current_process, sensor_process, wifi_process, adsb_process, ais_process, acars_process
|
||||||
global aprs_process, aprs_rtl_process, dsc_process, dsc_rtl_process, bt_process
|
global aprs_process, aprs_rtl_process, dsc_process, dsc_rtl_process, bt_process
|
||||||
global dmr_process, dmr_rtl_process
|
global dmr_process, dmr_rtl_process, waterfall_source
|
||||||
|
|
||||||
# Import adsb and ais modules to reset their state
|
# Import adsb and ais modules to reset their state
|
||||||
from routes import adsb as adsb_module
|
from routes import adsb as adsb_module
|
||||||
@@ -668,7 +675,7 @@ def kill_all() -> Response:
|
|||||||
|
|
||||||
killed = []
|
killed = []
|
||||||
processes_to_kill = [
|
processes_to_kill = [
|
||||||
'rtl_fm', 'multimon-ng', 'rtl_433',
|
'rtl_fm', 'multimon-ng', 'rtl_433', 'rtl_sdr',
|
||||||
'airodump-ng', 'aireplay-ng', 'airmon-ng',
|
'airodump-ng', 'aireplay-ng', 'airmon-ng',
|
||||||
'dump1090', 'acarsdec', 'direwolf', 'AIS-catcher',
|
'dump1090', 'acarsdec', 'direwolf', 'AIS-catcher',
|
||||||
'hcitool', 'bluetoothctl', 'dsd',
|
'hcitool', 'bluetoothctl', 'dsd',
|
||||||
@@ -741,9 +748,10 @@ def kill_all() -> Response:
|
|||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# Clear SDR device registry
|
# Clear SDR device registry and waterfall source
|
||||||
with sdr_device_registry_lock:
|
with sdr_device_registry_lock:
|
||||||
sdr_device_registry.clear()
|
sdr_device_registry.clear()
|
||||||
|
waterfall_source = None
|
||||||
|
|
||||||
return jsonify({'status': 'killed', 'processes': killed})
|
return jsonify({'status': 'killed', 'processes': killed})
|
||||||
|
|
||||||
|
|||||||
@@ -1725,6 +1725,16 @@ def start_waterfall() -> Response:
|
|||||||
"""Start the waterfall/spectrogram display."""
|
"""Start the waterfall/spectrogram display."""
|
||||||
global waterfall_thread, waterfall_running, waterfall_config, waterfall_active_device
|
global waterfall_thread, waterfall_running, waterfall_config, waterfall_active_device
|
||||||
|
|
||||||
|
# Check if a decoder is already producing FFT data via IQ pipeline
|
||||||
|
if app_module.waterfall_source in ('pager', 'sensor'):
|
||||||
|
# Decoder-driven waterfall: data is already flowing into waterfall_queue
|
||||||
|
waterfall_running = True
|
||||||
|
return jsonify({
|
||||||
|
'status': 'started',
|
||||||
|
'source': 'decoder',
|
||||||
|
'decoder': app_module.waterfall_source,
|
||||||
|
})
|
||||||
|
|
||||||
with waterfall_lock:
|
with waterfall_lock:
|
||||||
if waterfall_running:
|
if waterfall_running:
|
||||||
return jsonify({'status': 'error', 'message': 'Waterfall already running'}), 409
|
return jsonify({'status': 'error', 'message': 'Waterfall already running'}), 409
|
||||||
@@ -1779,6 +1789,13 @@ def start_waterfall() -> Response:
|
|||||||
@listening_post_bp.route('/waterfall/stop', methods=['POST'])
|
@listening_post_bp.route('/waterfall/stop', methods=['POST'])
|
||||||
def stop_waterfall() -> Response:
|
def stop_waterfall() -> Response:
|
||||||
"""Stop the waterfall display."""
|
"""Stop the waterfall display."""
|
||||||
|
global waterfall_running
|
||||||
|
|
||||||
|
# If waterfall is decoder-driven, just disconnect (don't stop the decoder)
|
||||||
|
if app_module.waterfall_source in ('pager', 'sensor'):
|
||||||
|
waterfall_running = False
|
||||||
|
return jsonify({'status': 'stopped', 'source': 'decoder'})
|
||||||
|
|
||||||
_stop_waterfall_internal()
|
_stop_waterfall_internal()
|
||||||
|
|
||||||
return jsonify({'status': 'stopped'})
|
return jsonify({'status': 'stopped'})
|
||||||
|
|||||||
+200
-89
@@ -32,6 +32,8 @@ pager_bp = Blueprint('pager', __name__)
|
|||||||
|
|
||||||
# Track which device is being used
|
# Track which device is being used
|
||||||
pager_active_device: int | None = None
|
pager_active_device: int | None = None
|
||||||
|
# IQ pipeline stop event (set to signal IQ processor thread to exit)
|
||||||
|
pager_iq_stop_event: threading.Event | None = None
|
||||||
|
|
||||||
|
|
||||||
def parse_multimon_output(line: str) -> dict[str, str] | None:
|
def parse_multimon_output(line: str) -> dict[str, str] | None:
|
||||||
@@ -147,12 +149,18 @@ def stream_decoder(master_fd: int, process: subprocess.Popen[bytes]) -> None:
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
app_module.output_queue.put({'type': 'error', 'text': str(e)})
|
app_module.output_queue.put({'type': 'error', 'text': str(e)})
|
||||||
finally:
|
finally:
|
||||||
global pager_active_device
|
global pager_active_device, pager_iq_stop_event
|
||||||
try:
|
try:
|
||||||
os.close(master_fd)
|
os.close(master_fd)
|
||||||
except OSError:
|
except OSError:
|
||||||
pass
|
pass
|
||||||
# Cleanup companion rtl_fm process and decoder
|
# Stop IQ pipeline if running
|
||||||
|
if pager_iq_stop_event is not None:
|
||||||
|
pager_iq_stop_event.set()
|
||||||
|
pager_iq_stop_event = None
|
||||||
|
if app_module.waterfall_source == 'pager':
|
||||||
|
app_module.waterfall_source = None
|
||||||
|
# Cleanup companion rtl_sdr/rtl_fm process and decoder
|
||||||
with app_module.process_lock:
|
with app_module.process_lock:
|
||||||
rtl_proc = getattr(app_module.current_process, '_rtl_process', None)
|
rtl_proc = getattr(app_module.current_process, '_rtl_process', None)
|
||||||
for proc in [rtl_proc, process]:
|
for proc in [rtl_proc, process]:
|
||||||
@@ -175,6 +183,28 @@ def stream_decoder(master_fd: int, process: subprocess.Popen[bytes]) -> None:
|
|||||||
pager_active_device = None
|
pager_active_device = None
|
||||||
|
|
||||||
|
|
||||||
|
def _cleanup_failed_start(rtl_process: subprocess.Popen | None) -> None:
|
||||||
|
"""Clean up after a failed start attempt."""
|
||||||
|
global pager_active_device, pager_iq_stop_event
|
||||||
|
if rtl_process:
|
||||||
|
try:
|
||||||
|
rtl_process.terminate()
|
||||||
|
rtl_process.wait(timeout=2)
|
||||||
|
except Exception:
|
||||||
|
try:
|
||||||
|
rtl_process.kill()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
if pager_iq_stop_event is not None:
|
||||||
|
pager_iq_stop_event.set()
|
||||||
|
pager_iq_stop_event = None
|
||||||
|
if app_module.waterfall_source == 'pager':
|
||||||
|
app_module.waterfall_source = None
|
||||||
|
if pager_active_device is not None:
|
||||||
|
app_module.release_sdr_device(pager_active_device)
|
||||||
|
pager_active_device = None
|
||||||
|
|
||||||
|
|
||||||
@pager_bp.route('/start', methods=['POST'])
|
@pager_bp.route('/start', methods=['POST'])
|
||||||
def start_decoding() -> Response:
|
def start_decoding() -> Response:
|
||||||
global pager_active_device
|
global pager_active_device
|
||||||
@@ -272,115 +302,196 @@ def start_decoding() -> Response:
|
|||||||
|
|
||||||
builder = SDRFactory.get_builder(sdr_device.sdr_type)
|
builder = SDRFactory.get_builder(sdr_device.sdr_type)
|
||||||
|
|
||||||
# Build FM demodulation command
|
|
||||||
bias_t = data.get('bias_t', False)
|
|
||||||
rtl_cmd = builder.build_fm_demod_command(
|
|
||||||
device=sdr_device,
|
|
||||||
frequency_mhz=freq,
|
|
||||||
sample_rate=22050,
|
|
||||||
gain=float(gain) if gain and gain != '0' else None,
|
|
||||||
ppm=int(ppm) if ppm and ppm != '0' else None,
|
|
||||||
modulation='fm',
|
|
||||||
squelch=squelch if squelch and squelch != 0 else None,
|
|
||||||
bias_t=bias_t
|
|
||||||
)
|
|
||||||
|
|
||||||
multimon_path = get_tool_path('multimon-ng')
|
multimon_path = get_tool_path('multimon-ng')
|
||||||
if not multimon_path:
|
if not multimon_path:
|
||||||
|
if pager_active_device is not None:
|
||||||
|
app_module.release_sdr_device(pager_active_device)
|
||||||
|
pager_active_device = None
|
||||||
return jsonify({'status': 'error', 'message': 'multimon-ng not found'}), 400
|
return jsonify({'status': 'error', 'message': 'multimon-ng not found'}), 400
|
||||||
multimon_cmd = [multimon_path, '-t', 'raw'] + decoders + ['-f', 'alpha', '-']
|
multimon_cmd = [multimon_path, '-t', 'raw'] + decoders + ['-f', 'alpha', '-']
|
||||||
|
|
||||||
full_cmd = ' '.join(rtl_cmd) + ' | ' + ' '.join(multimon_cmd)
|
bias_t = data.get('bias_t', False)
|
||||||
logger.info(f"Running: {full_cmd}")
|
gain_val = float(gain) if gain and gain != '0' else None
|
||||||
|
ppm_val = int(ppm) if ppm and ppm != '0' else None
|
||||||
|
|
||||||
try:
|
# Determine if we can use IQ pipeline for live waterfall
|
||||||
# Create pipe: rtl_fm | multimon-ng
|
use_iq_pipeline = (
|
||||||
rtl_process = subprocess.Popen(
|
sdr_type == SDRType.RTL_SDR
|
||||||
rtl_cmd,
|
and not rtl_tcp_host
|
||||||
stdout=subprocess.PIPE,
|
and get_tool_path('rtl_sdr') is not None
|
||||||
stderr=subprocess.PIPE
|
)
|
||||||
|
|
||||||
|
if use_iq_pipeline:
|
||||||
|
# IQ pipeline: rtl_sdr -> Python IQ processor -> multimon-ng
|
||||||
|
iq_sample_rate = 220500 # 22050 * 10 for exact decimation
|
||||||
|
rtl_cmd = builder.build_raw_capture_command(
|
||||||
|
device=sdr_device,
|
||||||
|
frequency_mhz=freq,
|
||||||
|
sample_rate=iq_sample_rate,
|
||||||
|
gain=gain_val,
|
||||||
|
ppm=ppm_val,
|
||||||
|
bias_t=bias_t,
|
||||||
)
|
)
|
||||||
register_process(rtl_process)
|
|
||||||
|
|
||||||
# Start a thread to monitor rtl_fm stderr for errors
|
full_cmd = ' '.join(rtl_cmd) + ' | [iq_processor] | ' + ' '.join(multimon_cmd)
|
||||||
def monitor_rtl_stderr():
|
logger.info(f"Running (IQ pipeline): {full_cmd}")
|
||||||
for line in rtl_process.stderr:
|
|
||||||
err_text = line.decode('utf-8', errors='replace').strip()
|
|
||||||
if err_text:
|
|
||||||
logger.debug(f"[RTL_FM] {err_text}")
|
|
||||||
app_module.output_queue.put({'type': 'raw', 'text': f'[rtl_fm] {err_text}'})
|
|
||||||
|
|
||||||
rtl_stderr_thread = threading.Thread(target=monitor_rtl_stderr)
|
try:
|
||||||
rtl_stderr_thread.daemon = True
|
rtl_process = subprocess.Popen(
|
||||||
rtl_stderr_thread.start()
|
rtl_cmd,
|
||||||
|
stdout=subprocess.PIPE,
|
||||||
|
stderr=subprocess.PIPE,
|
||||||
|
)
|
||||||
|
register_process(rtl_process)
|
||||||
|
|
||||||
# Create a pseudo-terminal for multimon-ng output
|
# Monitor rtl_sdr stderr
|
||||||
master_fd, slave_fd = pty.openpty()
|
def monitor_rtl_stderr():
|
||||||
|
for line in rtl_process.stderr:
|
||||||
|
err_text = line.decode('utf-8', errors='replace').strip()
|
||||||
|
if err_text:
|
||||||
|
logger.debug(f"[rtl_sdr] {err_text}")
|
||||||
|
app_module.output_queue.put({'type': 'raw', 'text': f'[rtl_sdr] {err_text}'})
|
||||||
|
|
||||||
multimon_process = subprocess.Popen(
|
rtl_stderr_thread = threading.Thread(target=monitor_rtl_stderr, daemon=True)
|
||||||
multimon_cmd,
|
rtl_stderr_thread.start()
|
||||||
stdin=rtl_process.stdout,
|
|
||||||
stdout=slave_fd,
|
# Create PTY for multimon-ng output
|
||||||
stderr=slave_fd,
|
master_fd, slave_fd = pty.openpty()
|
||||||
close_fds=True
|
|
||||||
|
multimon_process = subprocess.Popen(
|
||||||
|
multimon_cmd,
|
||||||
|
stdin=subprocess.PIPE,
|
||||||
|
stdout=slave_fd,
|
||||||
|
stderr=slave_fd,
|
||||||
|
close_fds=True,
|
||||||
|
)
|
||||||
|
register_process(multimon_process)
|
||||||
|
|
||||||
|
os.close(slave_fd)
|
||||||
|
|
||||||
|
# Start IQ processor thread
|
||||||
|
from routes.listening_post import waterfall_queue
|
||||||
|
from utils.iq_processor import run_fm_iq_pipeline
|
||||||
|
|
||||||
|
stop_event = threading.Event()
|
||||||
|
pager_iq_stop_event = stop_event
|
||||||
|
app_module.waterfall_source = 'pager'
|
||||||
|
|
||||||
|
iq_thread = threading.Thread(
|
||||||
|
target=run_fm_iq_pipeline,
|
||||||
|
args=(
|
||||||
|
rtl_process.stdout,
|
||||||
|
multimon_process.stdin,
|
||||||
|
waterfall_queue,
|
||||||
|
freq,
|
||||||
|
iq_sample_rate,
|
||||||
|
stop_event,
|
||||||
|
),
|
||||||
|
daemon=True,
|
||||||
|
)
|
||||||
|
iq_thread.start()
|
||||||
|
|
||||||
|
app_module.current_process = multimon_process
|
||||||
|
app_module.current_process._rtl_process = rtl_process
|
||||||
|
app_module.current_process._master_fd = master_fd
|
||||||
|
|
||||||
|
# Start decoder output thread
|
||||||
|
thread = threading.Thread(target=stream_decoder, args=(master_fd, multimon_process), daemon=True)
|
||||||
|
thread.start()
|
||||||
|
|
||||||
|
app_module.output_queue.put({'type': 'info', 'text': f'Command: {full_cmd}'})
|
||||||
|
return jsonify({'status': 'started', 'command': full_cmd, 'waterfall_source': 'pager'})
|
||||||
|
|
||||||
|
except FileNotFoundError as e:
|
||||||
|
_cleanup_failed_start(rtl_process)
|
||||||
|
return jsonify({'status': 'error', 'message': f'Tool not found: {e.filename}'})
|
||||||
|
except Exception as e:
|
||||||
|
_cleanup_failed_start(rtl_process)
|
||||||
|
return jsonify({'status': 'error', 'message': str(e)})
|
||||||
|
|
||||||
|
else:
|
||||||
|
# Legacy pipeline: rtl_fm | multimon-ng
|
||||||
|
rtl_cmd = builder.build_fm_demod_command(
|
||||||
|
device=sdr_device,
|
||||||
|
frequency_mhz=freq,
|
||||||
|
sample_rate=22050,
|
||||||
|
gain=gain_val,
|
||||||
|
ppm=ppm_val,
|
||||||
|
modulation='fm',
|
||||||
|
squelch=squelch if squelch and squelch != 0 else None,
|
||||||
|
bias_t=bias_t,
|
||||||
)
|
)
|
||||||
register_process(multimon_process)
|
|
||||||
|
|
||||||
os.close(slave_fd)
|
full_cmd = ' '.join(rtl_cmd) + ' | ' + ' '.join(multimon_cmd)
|
||||||
rtl_process.stdout.close()
|
logger.info(f"Running: {full_cmd}")
|
||||||
|
|
||||||
app_module.current_process = multimon_process
|
|
||||||
app_module.current_process._rtl_process = rtl_process
|
|
||||||
app_module.current_process._master_fd = master_fd
|
|
||||||
|
|
||||||
# Start output thread with PTY master fd
|
|
||||||
thread = threading.Thread(target=stream_decoder, args=(master_fd, multimon_process))
|
|
||||||
thread.daemon = True
|
|
||||||
thread.start()
|
|
||||||
|
|
||||||
app_module.output_queue.put({'type': 'info', 'text': f'Command: {full_cmd}'})
|
|
||||||
|
|
||||||
return jsonify({'status': 'started', 'command': full_cmd})
|
|
||||||
|
|
||||||
except FileNotFoundError as e:
|
|
||||||
# Kill orphaned rtl_fm process
|
|
||||||
try:
|
try:
|
||||||
rtl_process.terminate()
|
rtl_process = subprocess.Popen(
|
||||||
rtl_process.wait(timeout=2)
|
rtl_cmd,
|
||||||
except Exception:
|
stdout=subprocess.PIPE,
|
||||||
try:
|
stderr=subprocess.PIPE,
|
||||||
rtl_process.kill()
|
)
|
||||||
except Exception:
|
register_process(rtl_process)
|
||||||
pass
|
|
||||||
# Release device on failure
|
# Start a thread to monitor rtl_fm stderr for errors
|
||||||
if pager_active_device is not None:
|
def monitor_rtl_stderr():
|
||||||
app_module.release_sdr_device(pager_active_device)
|
for line in rtl_process.stderr:
|
||||||
pager_active_device = None
|
err_text = line.decode('utf-8', errors='replace').strip()
|
||||||
return jsonify({'status': 'error', 'message': f'Tool not found: {e.filename}'})
|
if err_text:
|
||||||
except Exception as e:
|
logger.debug(f"[RTL_FM] {err_text}")
|
||||||
# Kill orphaned rtl_fm process if it was started
|
app_module.output_queue.put({'type': 'raw', 'text': f'[rtl_fm] {err_text}'})
|
||||||
try:
|
|
||||||
rtl_process.terminate()
|
rtl_stderr_thread = threading.Thread(target=monitor_rtl_stderr, daemon=True)
|
||||||
rtl_process.wait(timeout=2)
|
rtl_stderr_thread.start()
|
||||||
except Exception:
|
|
||||||
try:
|
# Create a pseudo-terminal for multimon-ng output
|
||||||
rtl_process.kill()
|
master_fd, slave_fd = pty.openpty()
|
||||||
except Exception:
|
|
||||||
pass
|
multimon_process = subprocess.Popen(
|
||||||
# Release device on failure
|
multimon_cmd,
|
||||||
if pager_active_device is not None:
|
stdin=rtl_process.stdout,
|
||||||
app_module.release_sdr_device(pager_active_device)
|
stdout=slave_fd,
|
||||||
pager_active_device = None
|
stderr=slave_fd,
|
||||||
return jsonify({'status': 'error', 'message': str(e)})
|
close_fds=True,
|
||||||
|
)
|
||||||
|
register_process(multimon_process)
|
||||||
|
|
||||||
|
os.close(slave_fd)
|
||||||
|
rtl_process.stdout.close()
|
||||||
|
|
||||||
|
app_module.current_process = multimon_process
|
||||||
|
app_module.current_process._rtl_process = rtl_process
|
||||||
|
app_module.current_process._master_fd = master_fd
|
||||||
|
|
||||||
|
# Start output thread with PTY master fd
|
||||||
|
thread = threading.Thread(target=stream_decoder, args=(master_fd, multimon_process), daemon=True)
|
||||||
|
thread.start()
|
||||||
|
|
||||||
|
app_module.output_queue.put({'type': 'info', 'text': f'Command: {full_cmd}'})
|
||||||
|
return jsonify({'status': 'started', 'command': full_cmd})
|
||||||
|
|
||||||
|
except FileNotFoundError as e:
|
||||||
|
_cleanup_failed_start(rtl_process)
|
||||||
|
return jsonify({'status': 'error', 'message': f'Tool not found: {e.filename}'})
|
||||||
|
except Exception as e:
|
||||||
|
_cleanup_failed_start(rtl_process)
|
||||||
|
return jsonify({'status': 'error', 'message': str(e)})
|
||||||
|
|
||||||
|
|
||||||
@pager_bp.route('/stop', methods=['POST'])
|
@pager_bp.route('/stop', methods=['POST'])
|
||||||
def stop_decoding() -> Response:
|
def stop_decoding() -> Response:
|
||||||
global pager_active_device
|
global pager_active_device, pager_iq_stop_event
|
||||||
|
|
||||||
with app_module.process_lock:
|
with app_module.process_lock:
|
||||||
if app_module.current_process:
|
if app_module.current_process:
|
||||||
# Kill rtl_fm process first
|
# Stop IQ pipeline if running
|
||||||
|
if pager_iq_stop_event is not None:
|
||||||
|
pager_iq_stop_event.set()
|
||||||
|
pager_iq_stop_event = None
|
||||||
|
if app_module.waterfall_source == 'pager':
|
||||||
|
app_module.waterfall_source = None
|
||||||
|
|
||||||
|
# Kill rtl_sdr/rtl_fm process first
|
||||||
if hasattr(app_module.current_process, '_rtl_process'):
|
if hasattr(app_module.current_process, '_rtl_process'):
|
||||||
try:
|
try:
|
||||||
app_module.current_process._rtl_process.terminate()
|
app_module.current_process._rtl_process.terminate()
|
||||||
|
|||||||
+212
-48
@@ -22,11 +22,16 @@ from utils.sse import format_sse
|
|||||||
from utils.event_pipeline import process_event
|
from utils.event_pipeline import process_event
|
||||||
from utils.process import safe_terminate, register_process, unregister_process
|
from utils.process import safe_terminate, register_process, unregister_process
|
||||||
from utils.sdr import SDRFactory, SDRType
|
from utils.sdr import SDRFactory, SDRType
|
||||||
|
from utils.dependencies import get_tool_path
|
||||||
|
|
||||||
sensor_bp = Blueprint('sensor', __name__)
|
sensor_bp = Blueprint('sensor', __name__)
|
||||||
|
|
||||||
# Track which device is being used
|
# Track which device is being used
|
||||||
sensor_active_device: int | None = None
|
sensor_active_device: int | None = None
|
||||||
|
# IQ pipeline stop event
|
||||||
|
sensor_iq_stop_event: threading.Event | None = None
|
||||||
|
# Companion rtl_sdr process when using IQ pipeline
|
||||||
|
sensor_rtl_process: subprocess.Popen | None = None
|
||||||
|
|
||||||
|
|
||||||
def stream_sensor_output(process: subprocess.Popen[bytes]) -> None:
|
def stream_sensor_output(process: subprocess.Popen[bytes]) -> None:
|
||||||
@@ -60,8 +65,26 @@ def stream_sensor_output(process: subprocess.Popen[bytes]) -> None:
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
app_module.sensor_queue.put({'type': 'error', 'text': str(e)})
|
app_module.sensor_queue.put({'type': 'error', 'text': str(e)})
|
||||||
finally:
|
finally:
|
||||||
global sensor_active_device
|
global sensor_active_device, sensor_iq_stop_event, sensor_rtl_process
|
||||||
# Ensure process is terminated
|
# Stop IQ pipeline if running
|
||||||
|
if sensor_iq_stop_event is not None:
|
||||||
|
sensor_iq_stop_event.set()
|
||||||
|
sensor_iq_stop_event = None
|
||||||
|
if app_module.waterfall_source == 'sensor':
|
||||||
|
app_module.waterfall_source = None
|
||||||
|
# Terminate companion rtl_sdr process
|
||||||
|
if sensor_rtl_process is not None:
|
||||||
|
try:
|
||||||
|
sensor_rtl_process.terminate()
|
||||||
|
sensor_rtl_process.wait(timeout=2)
|
||||||
|
except Exception:
|
||||||
|
try:
|
||||||
|
sensor_rtl_process.kill()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
unregister_process(sensor_rtl_process)
|
||||||
|
sensor_rtl_process = None
|
||||||
|
# Ensure decoder process is terminated
|
||||||
try:
|
try:
|
||||||
process.terminate()
|
process.terminate()
|
||||||
process.wait(timeout=2)
|
process.wait(timeout=2)
|
||||||
@@ -80,9 +103,32 @@ def stream_sensor_output(process: subprocess.Popen[bytes]) -> None:
|
|||||||
sensor_active_device = None
|
sensor_active_device = None
|
||||||
|
|
||||||
|
|
||||||
|
def _cleanup_sensor_failed_start(rtl_process: subprocess.Popen | None) -> None:
|
||||||
|
"""Clean up after a failed sensor start attempt."""
|
||||||
|
global sensor_active_device, sensor_iq_stop_event, sensor_rtl_process
|
||||||
|
if rtl_process:
|
||||||
|
try:
|
||||||
|
rtl_process.terminate()
|
||||||
|
rtl_process.wait(timeout=2)
|
||||||
|
except Exception:
|
||||||
|
try:
|
||||||
|
rtl_process.kill()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
if sensor_iq_stop_event is not None:
|
||||||
|
sensor_iq_stop_event.set()
|
||||||
|
sensor_iq_stop_event = None
|
||||||
|
if app_module.waterfall_source == 'sensor':
|
||||||
|
app_module.waterfall_source = None
|
||||||
|
sensor_rtl_process = None
|
||||||
|
if sensor_active_device is not None:
|
||||||
|
app_module.release_sdr_device(sensor_active_device)
|
||||||
|
sensor_active_device = None
|
||||||
|
|
||||||
|
|
||||||
@sensor_bp.route('/start_sensor', methods=['POST'])
|
@sensor_bp.route('/start_sensor', methods=['POST'])
|
||||||
def start_sensor() -> Response:
|
def start_sensor() -> Response:
|
||||||
global sensor_active_device
|
global sensor_active_device, sensor_iq_stop_event, sensor_rtl_process
|
||||||
|
|
||||||
with app_module.sensor_lock:
|
with app_module.sensor_lock:
|
||||||
if app_module.sensor_process:
|
if app_module.sensor_process:
|
||||||
@@ -144,69 +190,187 @@ def start_sensor() -> Response:
|
|||||||
sdr_device = SDRFactory.create_default_device(sdr_type, index=device)
|
sdr_device = SDRFactory.create_default_device(sdr_type, index=device)
|
||||||
|
|
||||||
builder = SDRFactory.get_builder(sdr_device.sdr_type)
|
builder = SDRFactory.get_builder(sdr_device.sdr_type)
|
||||||
|
|
||||||
# Build ISM band decoder command
|
|
||||||
bias_t = data.get('bias_t', False)
|
bias_t = data.get('bias_t', False)
|
||||||
cmd = builder.build_ism_command(
|
gain_val = float(gain) if gain and gain != 0 else None
|
||||||
device=sdr_device,
|
ppm_val = int(ppm) if ppm and ppm != 0 else None
|
||||||
frequency_mhz=freq,
|
|
||||||
gain=float(gain) if gain and gain != 0 else None,
|
# Determine if we can use IQ pipeline for live waterfall
|
||||||
ppm=int(ppm) if ppm and ppm != 0 else None,
|
use_iq_pipeline = (
|
||||||
bias_t=bias_t
|
sdr_type == SDRType.RTL_SDR
|
||||||
|
and not rtl_tcp_host
|
||||||
|
and get_tool_path('rtl_sdr') is not None
|
||||||
)
|
)
|
||||||
|
|
||||||
full_cmd = ' '.join(cmd)
|
if use_iq_pipeline:
|
||||||
logger.info(f"Running: {full_cmd}")
|
# IQ pipeline: rtl_sdr -> Python IQ tee -> rtl_433 -r -
|
||||||
|
iq_sample_rate = 250000 # rtl_433 default
|
||||||
|
|
||||||
try:
|
rtl_cmd = builder.build_raw_capture_command(
|
||||||
app_module.sensor_process = subprocess.Popen(
|
device=sdr_device,
|
||||||
cmd,
|
frequency_mhz=freq,
|
||||||
stdout=subprocess.PIPE,
|
sample_rate=iq_sample_rate,
|
||||||
stderr=subprocess.PIPE
|
gain=gain_val,
|
||||||
|
ppm=ppm_val,
|
||||||
|
bias_t=bias_t,
|
||||||
)
|
)
|
||||||
register_process(app_module.sensor_process)
|
|
||||||
|
|
||||||
# Start output thread
|
rtl_433_path = get_tool_path('rtl_433') or 'rtl_433'
|
||||||
thread = threading.Thread(target=stream_sensor_output, args=(app_module.sensor_process,))
|
decoder_cmd = [rtl_433_path, '-r', '-', '-s', str(iq_sample_rate), '-F', 'json']
|
||||||
thread.daemon = True
|
|
||||||
thread.start()
|
|
||||||
|
|
||||||
# Monitor stderr
|
full_cmd = ' '.join(rtl_cmd) + ' | [iq_processor] | ' + ' '.join(decoder_cmd)
|
||||||
def monitor_stderr():
|
logger.info(f"Running (IQ pipeline): {full_cmd}")
|
||||||
for line in app_module.sensor_process.stderr:
|
|
||||||
err = line.decode('utf-8', errors='replace').strip()
|
|
||||||
if err:
|
|
||||||
logger.debug(f"[rtl_433] {err}")
|
|
||||||
app_module.sensor_queue.put({'type': 'info', 'text': f'[rtl_433] {err}'})
|
|
||||||
|
|
||||||
stderr_thread = threading.Thread(target=monitor_stderr)
|
try:
|
||||||
stderr_thread.daemon = True
|
rtl_process = subprocess.Popen(
|
||||||
stderr_thread.start()
|
rtl_cmd,
|
||||||
|
stdout=subprocess.PIPE,
|
||||||
|
stderr=subprocess.PIPE,
|
||||||
|
)
|
||||||
|
register_process(rtl_process)
|
||||||
|
sensor_rtl_process = rtl_process
|
||||||
|
|
||||||
app_module.sensor_queue.put({'type': 'info', 'text': f'Command: {full_cmd}'})
|
# Monitor rtl_sdr stderr
|
||||||
|
def monitor_rtl_stderr():
|
||||||
|
for line in rtl_process.stderr:
|
||||||
|
err = line.decode('utf-8', errors='replace').strip()
|
||||||
|
if err:
|
||||||
|
logger.debug(f"[rtl_sdr] {err}")
|
||||||
|
app_module.sensor_queue.put({'type': 'info', 'text': f'[rtl_sdr] {err}'})
|
||||||
|
|
||||||
return jsonify({'status': 'started', 'command': full_cmd})
|
threading.Thread(target=monitor_rtl_stderr, daemon=True).start()
|
||||||
|
|
||||||
except FileNotFoundError:
|
# Start rtl_433 reading from stdin
|
||||||
# Release device on failure
|
decoder_process = subprocess.Popen(
|
||||||
if sensor_active_device is not None:
|
decoder_cmd,
|
||||||
app_module.release_sdr_device(sensor_active_device)
|
stdin=subprocess.PIPE,
|
||||||
sensor_active_device = None
|
stdout=subprocess.PIPE,
|
||||||
return jsonify({'status': 'error', 'message': 'rtl_433 not found. Install with: brew install rtl_433'})
|
stderr=subprocess.PIPE,
|
||||||
except Exception as e:
|
)
|
||||||
# Release device on failure
|
register_process(decoder_process)
|
||||||
if sensor_active_device is not None:
|
|
||||||
app_module.release_sdr_device(sensor_active_device)
|
# Start IQ processor thread
|
||||||
sensor_active_device = None
|
from routes.listening_post import waterfall_queue
|
||||||
return jsonify({'status': 'error', 'message': str(e)})
|
from utils.iq_processor import run_passthrough_iq_pipeline
|
||||||
|
|
||||||
|
stop_event = threading.Event()
|
||||||
|
sensor_iq_stop_event = stop_event
|
||||||
|
app_module.waterfall_source = 'sensor'
|
||||||
|
|
||||||
|
iq_thread = threading.Thread(
|
||||||
|
target=run_passthrough_iq_pipeline,
|
||||||
|
args=(
|
||||||
|
rtl_process.stdout,
|
||||||
|
decoder_process.stdin,
|
||||||
|
waterfall_queue,
|
||||||
|
freq,
|
||||||
|
iq_sample_rate,
|
||||||
|
stop_event,
|
||||||
|
),
|
||||||
|
daemon=True,
|
||||||
|
)
|
||||||
|
iq_thread.start()
|
||||||
|
|
||||||
|
app_module.sensor_process = decoder_process
|
||||||
|
|
||||||
|
# Monitor rtl_433 stderr
|
||||||
|
def monitor_decoder_stderr():
|
||||||
|
for line in decoder_process.stderr:
|
||||||
|
err = line.decode('utf-8', errors='replace').strip()
|
||||||
|
if err:
|
||||||
|
logger.debug(f"[rtl_433] {err}")
|
||||||
|
app_module.sensor_queue.put({'type': 'info', 'text': f'[rtl_433] {err}'})
|
||||||
|
|
||||||
|
threading.Thread(target=monitor_decoder_stderr, daemon=True).start()
|
||||||
|
|
||||||
|
# Start output thread
|
||||||
|
thread = threading.Thread(target=stream_sensor_output, args=(decoder_process,), daemon=True)
|
||||||
|
thread.start()
|
||||||
|
|
||||||
|
app_module.sensor_queue.put({'type': 'info', 'text': f'Command: {full_cmd}'})
|
||||||
|
return jsonify({'status': 'started', 'command': full_cmd, 'waterfall_source': 'sensor'})
|
||||||
|
|
||||||
|
except FileNotFoundError:
|
||||||
|
_cleanup_sensor_failed_start(rtl_process)
|
||||||
|
return jsonify({'status': 'error', 'message': 'rtl_sdr or rtl_433 not found'})
|
||||||
|
except Exception as e:
|
||||||
|
_cleanup_sensor_failed_start(rtl_process)
|
||||||
|
return jsonify({'status': 'error', 'message': str(e)})
|
||||||
|
|
||||||
|
else:
|
||||||
|
# Legacy pipeline: rtl_433 directly
|
||||||
|
cmd = builder.build_ism_command(
|
||||||
|
device=sdr_device,
|
||||||
|
frequency_mhz=freq,
|
||||||
|
gain=gain_val,
|
||||||
|
ppm=ppm_val,
|
||||||
|
bias_t=bias_t,
|
||||||
|
)
|
||||||
|
|
||||||
|
full_cmd = ' '.join(cmd)
|
||||||
|
logger.info(f"Running: {full_cmd}")
|
||||||
|
|
||||||
|
try:
|
||||||
|
app_module.sensor_process = subprocess.Popen(
|
||||||
|
cmd,
|
||||||
|
stdout=subprocess.PIPE,
|
||||||
|
stderr=subprocess.PIPE,
|
||||||
|
)
|
||||||
|
register_process(app_module.sensor_process)
|
||||||
|
|
||||||
|
# Start output thread
|
||||||
|
thread = threading.Thread(target=stream_sensor_output, args=(app_module.sensor_process,), daemon=True)
|
||||||
|
thread.start()
|
||||||
|
|
||||||
|
# Monitor stderr
|
||||||
|
def monitor_stderr():
|
||||||
|
for line in app_module.sensor_process.stderr:
|
||||||
|
err = line.decode('utf-8', errors='replace').strip()
|
||||||
|
if err:
|
||||||
|
logger.debug(f"[rtl_433] {err}")
|
||||||
|
app_module.sensor_queue.put({'type': 'info', 'text': f'[rtl_433] {err}'})
|
||||||
|
|
||||||
|
threading.Thread(target=monitor_stderr, daemon=True).start()
|
||||||
|
|
||||||
|
app_module.sensor_queue.put({'type': 'info', 'text': f'Command: {full_cmd}'})
|
||||||
|
return jsonify({'status': 'started', 'command': full_cmd})
|
||||||
|
|
||||||
|
except FileNotFoundError:
|
||||||
|
if sensor_active_device is not None:
|
||||||
|
app_module.release_sdr_device(sensor_active_device)
|
||||||
|
sensor_active_device = None
|
||||||
|
return jsonify({'status': 'error', 'message': 'rtl_433 not found. Install with: brew install rtl_433'})
|
||||||
|
except Exception as e:
|
||||||
|
if sensor_active_device is not None:
|
||||||
|
app_module.release_sdr_device(sensor_active_device)
|
||||||
|
sensor_active_device = None
|
||||||
|
return jsonify({'status': 'error', 'message': str(e)})
|
||||||
|
|
||||||
|
|
||||||
@sensor_bp.route('/stop_sensor', methods=['POST'])
|
@sensor_bp.route('/stop_sensor', methods=['POST'])
|
||||||
def stop_sensor() -> Response:
|
def stop_sensor() -> Response:
|
||||||
global sensor_active_device
|
global sensor_active_device, sensor_iq_stop_event, sensor_rtl_process
|
||||||
|
|
||||||
with app_module.sensor_lock:
|
with app_module.sensor_lock:
|
||||||
if app_module.sensor_process:
|
if app_module.sensor_process:
|
||||||
|
# Stop IQ pipeline if running
|
||||||
|
if sensor_iq_stop_event is not None:
|
||||||
|
sensor_iq_stop_event.set()
|
||||||
|
sensor_iq_stop_event = None
|
||||||
|
if app_module.waterfall_source == 'sensor':
|
||||||
|
app_module.waterfall_source = None
|
||||||
|
|
||||||
|
# Kill companion rtl_sdr process
|
||||||
|
if sensor_rtl_process is not None:
|
||||||
|
try:
|
||||||
|
sensor_rtl_process.terminate()
|
||||||
|
sensor_rtl_process.wait(timeout=2)
|
||||||
|
except (subprocess.TimeoutExpired, OSError):
|
||||||
|
try:
|
||||||
|
sensor_rtl_process.kill()
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
sensor_rtl_process = None
|
||||||
|
|
||||||
app_module.sensor_process.terminate()
|
app_module.sensor_process.terminate()
|
||||||
try:
|
try:
|
||||||
app_module.sensor_process.wait(timeout=2)
|
app_module.sensor_process.wait(timeout=2)
|
||||||
|
|||||||
@@ -3589,7 +3589,8 @@ async function startWaterfall(options = {}) {
|
|||||||
lastWaterfallDraw = 0;
|
lastWaterfallDraw = 0;
|
||||||
initWaterfallCanvas();
|
initWaterfallCanvas();
|
||||||
connectWaterfallSSE();
|
connectWaterfallSSE();
|
||||||
if (typeof reserveDevice === 'function') {
|
// Only reserve device if not decoder-driven (decoder already owns the device)
|
||||||
|
if (data.source !== 'decoder' && typeof reserveDevice === 'function') {
|
||||||
reserveDevice(parseInt(device), 'waterfall');
|
reserveDevice(parseInt(device), 'waterfall');
|
||||||
}
|
}
|
||||||
if (resume || resumeRfWaterfallAfterListening) {
|
if (resume || resumeRfWaterfallAfterListening) {
|
||||||
@@ -3618,11 +3619,14 @@ async function stopWaterfall() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await fetch('/listening/waterfall/stop', { method: 'POST' });
|
const resp = await fetch('/listening/waterfall/stop', { method: 'POST' });
|
||||||
|
let stopData = {};
|
||||||
|
try { stopData = await resp.json(); } catch (e) {}
|
||||||
isWaterfallRunning = false;
|
isWaterfallRunning = false;
|
||||||
if (waterfallEventSource) { waterfallEventSource.close(); waterfallEventSource = null; }
|
if (waterfallEventSource) { waterfallEventSource.close(); waterfallEventSource = null; }
|
||||||
setWaterfallControlButtons(false);
|
setWaterfallControlButtons(false);
|
||||||
if (typeof releaseDevice === 'function') {
|
// Only release device if it was a standalone waterfall (not decoder-driven)
|
||||||
|
if (stopData.source !== 'decoder' && typeof releaseDevice === 'function') {
|
||||||
releaseDevice('waterfall');
|
releaseDevice('waterfall');
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|||||||
@@ -121,6 +121,15 @@ TOOL_DEPENDENCIES = {
|
|||||||
'manual': 'https://github.com/EliasOenal/multimon-ng'
|
'manual': 'https://github.com/EliasOenal/multimon-ng'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
'rtl_sdr': {
|
||||||
|
'required': False,
|
||||||
|
'description': 'Raw IQ capture for live waterfall during decoding',
|
||||||
|
'install': {
|
||||||
|
'apt': 'sudo apt install rtl-sdr',
|
||||||
|
'brew': 'brew install librtlsdr',
|
||||||
|
'manual': 'https://osmocom.org/projects/rtl-sdr/wiki'
|
||||||
|
}
|
||||||
|
},
|
||||||
'rtl_test': {
|
'rtl_test': {
|
||||||
'required': False,
|
'required': False,
|
||||||
'description': 'RTL-SDR device detection',
|
'description': 'RTL-SDR device detection',
|
||||||
@@ -143,6 +152,15 @@ TOOL_DEPENDENCIES = {
|
|||||||
'brew': 'brew install rtl_433',
|
'brew': 'brew install rtl_433',
|
||||||
'manual': 'https://github.com/merbanan/rtl_433'
|
'manual': 'https://github.com/merbanan/rtl_433'
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
'rtl_sdr': {
|
||||||
|
'required': False,
|
||||||
|
'description': 'Raw IQ capture for live waterfall during decoding',
|
||||||
|
'install': {
|
||||||
|
'apt': 'sudo apt install rtl-sdr',
|
||||||
|
'brew': 'brew install librtlsdr',
|
||||||
|
'manual': 'https://osmocom.org/projects/rtl-sdr/wiki'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1,230 @@
|
|||||||
|
"""IQ processing pipelines for live waterfall during SDR decoding.
|
||||||
|
|
||||||
|
Provides two pipeline functions:
|
||||||
|
- run_fm_iq_pipeline: FM demodulates IQ for pager decoding + FFT for waterfall
|
||||||
|
- run_passthrough_iq_pipeline: Passes raw IQ to rtl_433 + FFT for waterfall
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import struct
|
||||||
|
import threading
|
||||||
|
import queue
|
||||||
|
from datetime import datetime
|
||||||
|
from typing import IO, Optional
|
||||||
|
|
||||||
|
import numpy as np
|
||||||
|
|
||||||
|
logger = logging.getLogger('intercept.iq_processor')
|
||||||
|
|
||||||
|
# FFT parameters
|
||||||
|
FFT_SIZE = 2048
|
||||||
|
FFT_INTERVAL_SECONDS = 0.1 # ~10 updates/sec
|
||||||
|
|
||||||
|
|
||||||
|
def iq_to_complex(buf: bytes) -> np.ndarray:
|
||||||
|
"""Convert raw uint8 IQ bytes to complex float samples.
|
||||||
|
|
||||||
|
RTL-SDR outputs interleaved uint8 I/Q pairs centered at 127.5.
|
||||||
|
"""
|
||||||
|
raw = np.frombuffer(buf, dtype=np.uint8).astype(np.float32)
|
||||||
|
raw = (raw - 127.5) / 127.5
|
||||||
|
return raw[0::2] + 1j * raw[1::2]
|
||||||
|
|
||||||
|
|
||||||
|
def compute_fft_bins(samples: np.ndarray, fft_size: int = FFT_SIZE) -> list[float]:
|
||||||
|
"""Compute power spectral density in dB from complex IQ samples.
|
||||||
|
|
||||||
|
Returns a list of power values (dB) for each frequency bin.
|
||||||
|
"""
|
||||||
|
if len(samples) < fft_size:
|
||||||
|
# Pad with zeros if not enough samples
|
||||||
|
padded = np.zeros(fft_size, dtype=np.complex64)
|
||||||
|
padded[:len(samples)] = samples[:fft_size]
|
||||||
|
samples = padded
|
||||||
|
else:
|
||||||
|
samples = samples[:fft_size]
|
||||||
|
|
||||||
|
# Apply Hanning window to reduce spectral leakage
|
||||||
|
window = np.hanning(fft_size).astype(np.float32)
|
||||||
|
windowed = samples * window
|
||||||
|
|
||||||
|
# FFT and shift DC to center
|
||||||
|
spectrum = np.fft.fftshift(np.fft.fft(windowed))
|
||||||
|
|
||||||
|
# Power in dB (avoid log of zero)
|
||||||
|
power = np.abs(spectrum) ** 2
|
||||||
|
power = np.maximum(power, 1e-20)
|
||||||
|
power_db = 10.0 * np.log10(power)
|
||||||
|
|
||||||
|
return power_db.tolist()
|
||||||
|
|
||||||
|
|
||||||
|
def _push_waterfall(waterfall_queue: queue.Queue, bins: list[float],
|
||||||
|
center_freq_mhz: float, sample_rate: int) -> None:
|
||||||
|
"""Push a waterfall sweep message to the queue."""
|
||||||
|
half_span = (sample_rate / 1e6) / 2.0
|
||||||
|
msg = {
|
||||||
|
'type': 'waterfall_sweep',
|
||||||
|
'start_freq': center_freq_mhz - half_span,
|
||||||
|
'end_freq': center_freq_mhz + half_span,
|
||||||
|
'bins': bins,
|
||||||
|
'timestamp': datetime.now().isoformat(),
|
||||||
|
}
|
||||||
|
try:
|
||||||
|
waterfall_queue.put_nowait(msg)
|
||||||
|
except queue.Full:
|
||||||
|
# Drop oldest and retry
|
||||||
|
try:
|
||||||
|
waterfall_queue.get_nowait()
|
||||||
|
except queue.Empty:
|
||||||
|
pass
|
||||||
|
try:
|
||||||
|
waterfall_queue.put_nowait(msg)
|
||||||
|
except queue.Full:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def run_fm_iq_pipeline(
|
||||||
|
iq_stdout: IO[bytes],
|
||||||
|
audio_stdin: IO[bytes],
|
||||||
|
waterfall_queue: queue.Queue,
|
||||||
|
center_freq_mhz: float,
|
||||||
|
sample_rate: int,
|
||||||
|
stop_event: threading.Event,
|
||||||
|
) -> None:
|
||||||
|
"""FM demodulation pipeline: IQ -> FFT + FM demod -> 22050 Hz PCM.
|
||||||
|
|
||||||
|
Reads raw uint8 IQ from rtl_sdr stdout, computes FFT for waterfall,
|
||||||
|
FM demodulates, decimates to 22050 Hz, and writes 16-bit PCM to
|
||||||
|
multimon-ng stdin.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
iq_stdout: rtl_sdr stdout (raw uint8 IQ)
|
||||||
|
audio_stdin: multimon-ng stdin (16-bit PCM)
|
||||||
|
waterfall_queue: Queue for waterfall sweep messages
|
||||||
|
center_freq_mhz: Center frequency in MHz
|
||||||
|
sample_rate: IQ sample rate (should be 220500 for 10x decimation to 22050)
|
||||||
|
stop_event: Threading event to signal shutdown
|
||||||
|
"""
|
||||||
|
from scipy.signal import decimate as scipy_decimate
|
||||||
|
|
||||||
|
# Decimation factor: sample_rate / 22050
|
||||||
|
decim_factor = sample_rate // 22050
|
||||||
|
if decim_factor < 1:
|
||||||
|
decim_factor = 1
|
||||||
|
|
||||||
|
# Read in chunks: ~100ms worth of IQ data (2 bytes per sample: I + Q)
|
||||||
|
chunk_bytes = int(sample_rate * FFT_INTERVAL_SECONDS) * 2
|
||||||
|
# Align to even number of bytes (I/Q pairs)
|
||||||
|
chunk_bytes = (chunk_bytes // 2) * 2
|
||||||
|
|
||||||
|
# Previous sample for FM demod continuity
|
||||||
|
prev_sample = np.complex64(0)
|
||||||
|
|
||||||
|
logger.info(f"FM IQ pipeline started: {center_freq_mhz} MHz, "
|
||||||
|
f"sr={sample_rate}, decim={decim_factor}")
|
||||||
|
|
||||||
|
try:
|
||||||
|
while not stop_event.is_set():
|
||||||
|
raw = iq_stdout.read(chunk_bytes)
|
||||||
|
if not raw:
|
||||||
|
break
|
||||||
|
|
||||||
|
# Convert to complex IQ
|
||||||
|
iq = iq_to_complex(raw)
|
||||||
|
if len(iq) == 0:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Compute FFT for waterfall
|
||||||
|
bins = compute_fft_bins(iq, FFT_SIZE)
|
||||||
|
_push_waterfall(waterfall_queue, bins, center_freq_mhz, sample_rate)
|
||||||
|
|
||||||
|
# FM demodulation via instantaneous phase difference
|
||||||
|
# Prepend previous sample for continuity
|
||||||
|
iq_with_prev = np.concatenate(([prev_sample], iq))
|
||||||
|
prev_sample = iq[-1]
|
||||||
|
|
||||||
|
phase_diff = np.angle(iq_with_prev[1:] * np.conj(iq_with_prev[:-1]))
|
||||||
|
|
||||||
|
# Decimate to 22050 Hz
|
||||||
|
if decim_factor > 1:
|
||||||
|
audio = scipy_decimate(phase_diff, decim_factor, ftype='fir')
|
||||||
|
else:
|
||||||
|
audio = phase_diff
|
||||||
|
|
||||||
|
# Scale to 16-bit PCM range
|
||||||
|
audio = np.clip(audio * 10000, -32767, 32767).astype(np.int16)
|
||||||
|
|
||||||
|
# Write to multimon-ng
|
||||||
|
try:
|
||||||
|
audio_stdin.write(audio.tobytes())
|
||||||
|
audio_stdin.flush()
|
||||||
|
except (BrokenPipeError, OSError):
|
||||||
|
break
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"FM IQ pipeline error: {e}")
|
||||||
|
finally:
|
||||||
|
logger.info("FM IQ pipeline stopped")
|
||||||
|
try:
|
||||||
|
audio_stdin.close()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def run_passthrough_iq_pipeline(
|
||||||
|
iq_stdout: IO[bytes],
|
||||||
|
decoder_stdin: IO[bytes],
|
||||||
|
waterfall_queue: queue.Queue,
|
||||||
|
center_freq_mhz: float,
|
||||||
|
sample_rate: int,
|
||||||
|
stop_event: threading.Event,
|
||||||
|
) -> None:
|
||||||
|
"""Passthrough pipeline: IQ -> FFT + raw bytes to decoder.
|
||||||
|
|
||||||
|
Reads raw uint8 IQ from rtl_sdr stdout, computes FFT for waterfall,
|
||||||
|
and writes raw IQ bytes unchanged to rtl_433 stdin.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
iq_stdout: rtl_sdr stdout (raw uint8 IQ)
|
||||||
|
decoder_stdin: rtl_433 stdin (raw cu8 IQ)
|
||||||
|
waterfall_queue: Queue for waterfall sweep messages
|
||||||
|
center_freq_mhz: Center frequency in MHz
|
||||||
|
sample_rate: IQ sample rate (should be 250000 for rtl_433)
|
||||||
|
stop_event: Threading event to signal shutdown
|
||||||
|
"""
|
||||||
|
# Read in chunks: ~100ms worth of IQ data
|
||||||
|
chunk_bytes = int(sample_rate * FFT_INTERVAL_SECONDS) * 2
|
||||||
|
chunk_bytes = (chunk_bytes // 2) * 2
|
||||||
|
|
||||||
|
logger.info(f"Passthrough IQ pipeline started: {center_freq_mhz} MHz, sr={sample_rate}")
|
||||||
|
|
||||||
|
try:
|
||||||
|
while not stop_event.is_set():
|
||||||
|
raw = iq_stdout.read(chunk_bytes)
|
||||||
|
if not raw:
|
||||||
|
break
|
||||||
|
|
||||||
|
# Compute FFT for waterfall
|
||||||
|
iq = iq_to_complex(raw)
|
||||||
|
if len(iq) > 0:
|
||||||
|
bins = compute_fft_bins(iq, FFT_SIZE)
|
||||||
|
_push_waterfall(waterfall_queue, bins, center_freq_mhz, sample_rate)
|
||||||
|
|
||||||
|
# Pass raw bytes unchanged to decoder
|
||||||
|
try:
|
||||||
|
decoder_stdin.write(raw)
|
||||||
|
decoder_stdin.flush()
|
||||||
|
except (BrokenPipeError, OSError):
|
||||||
|
break
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Passthrough IQ pipeline error: {e}")
|
||||||
|
finally:
|
||||||
|
logger.info("Passthrough IQ pipeline stopped")
|
||||||
|
try:
|
||||||
|
decoder_stdin.close()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
@@ -186,6 +186,36 @@ class CommandBuilder(ABC):
|
|||||||
"""Return hardware capabilities for this SDR type."""
|
"""Return hardware capabilities for this SDR type."""
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
def build_raw_capture_command(
|
||||||
|
self,
|
||||||
|
device: SDRDevice,
|
||||||
|
frequency_mhz: float,
|
||||||
|
sample_rate: int,
|
||||||
|
gain: Optional[float] = None,
|
||||||
|
ppm: Optional[int] = None,
|
||||||
|
bias_t: bool = False
|
||||||
|
) -> list[str]:
|
||||||
|
"""
|
||||||
|
Build raw IQ capture command (for IQ-based waterfall during decoding).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
device: The SDR device to use
|
||||||
|
frequency_mhz: Center frequency in MHz
|
||||||
|
sample_rate: Sample rate in Hz
|
||||||
|
gain: Gain in dB (None for auto)
|
||||||
|
ppm: PPM frequency correction
|
||||||
|
bias_t: Enable bias-T power (for active antennas)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Command as list of strings for subprocess
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
NotImplementedError: If the SDR type does not support raw capture
|
||||||
|
"""
|
||||||
|
raise NotImplementedError(
|
||||||
|
f"Raw IQ capture not supported for {self.get_sdr_type().value}"
|
||||||
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
@abstractmethod
|
@abstractmethod
|
||||||
def get_sdr_type(cls) -> SDRType:
|
def get_sdr_type(cls) -> SDRType:
|
||||||
|
|||||||
@@ -197,6 +197,43 @@ class RTLSDRCommandBuilder(CommandBuilder):
|
|||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
|
|
||||||
|
def build_raw_capture_command(
|
||||||
|
self,
|
||||||
|
device: SDRDevice,
|
||||||
|
frequency_mhz: float,
|
||||||
|
sample_rate: int,
|
||||||
|
gain: Optional[float] = None,
|
||||||
|
ppm: Optional[int] = None,
|
||||||
|
bias_t: bool = False
|
||||||
|
) -> list[str]:
|
||||||
|
"""
|
||||||
|
Build rtl_sdr command for raw IQ capture.
|
||||||
|
|
||||||
|
Outputs raw uint8 IQ to stdout for processing by IQ pipelines.
|
||||||
|
"""
|
||||||
|
rtl_sdr_path = get_tool_path('rtl_sdr') or 'rtl_sdr'
|
||||||
|
freq_hz = int(frequency_mhz * 1e6)
|
||||||
|
cmd = [
|
||||||
|
rtl_sdr_path,
|
||||||
|
'-d', self._get_device_arg(device),
|
||||||
|
'-f', str(freq_hz),
|
||||||
|
'-s', str(sample_rate),
|
||||||
|
]
|
||||||
|
|
||||||
|
if gain is not None and gain > 0:
|
||||||
|
cmd.extend(['-g', str(gain)])
|
||||||
|
|
||||||
|
if ppm is not None and ppm != 0:
|
||||||
|
cmd.extend(['-p', str(ppm)])
|
||||||
|
|
||||||
|
if bias_t:
|
||||||
|
cmd.extend(['-T'])
|
||||||
|
|
||||||
|
# Output to stdout
|
||||||
|
cmd.append('-')
|
||||||
|
|
||||||
|
return cmd
|
||||||
|
|
||||||
def build_ais_command(
|
def build_ais_command(
|
||||||
self,
|
self,
|
||||||
device: SDRDevice,
|
device: SDRDevice,
|
||||||
|
|||||||
Reference in New Issue
Block a user