Make Postgres data path configurable for ADS-B history

Allow users to override the pgdata volume mount via PGDATA_PATH env var,
enabling external storage (e.g. USB) for ADS-B history. Defaults to
./pgdata for backwards compatibility.

Based on PR #88 by JamesIOmete, rebased cleanly onto main.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

.gitignore

@@ -55,12 +55,6 @@ intercept_agent_*.cfg
 /tmp/
 *.tmp
 
-# Weather satellite runtime data (decoded images, samples, SatDump output)
-data/weather_sat/
-
-# SDR capture files (large IQ recordings)
-data/subghz/captures/
-
 # Env files
 .env
 .env.*

CHANGELOG.md

@@ -2,39 +2,6 @@
 
 All notable changes to iNTERCEPT will be documented in this file.
 
-## [2.15.0] - 2026-02-09
-
-### Added
-- **Real-time WebSocket Waterfall** - I/Q capture with server-side FFT
-  - Click-to-tune, zoom controls, and auto-scaling quantization
-  - Shared waterfall UI across SDR modes with function bar controls
-  - WebSocket frame serialization and connection reuse
-- **Cross-Module Frequency Routing** - Tune from Listening Post directly to decoders
-- **Pure Python SSTV Decoder** - Replaces broken slowrx C dependency
-  - Real-time decode progress with partial image streaming
-  - VIS detector state in signal monitor diagnostics
-  - Image gallery with delete and download functionality
-- **Real-time Signal Scope** - Live signal visualization for pager, sensor, and SSTV modes
-- **SSTV Image Gallery** - Delete and download decoded images
-- **USB Device Probe** - Detect broken SDR devices before rtl_fm crashes
-
-### Fixed
-- DMR dsd-fme protocol flags, device label, and tuning controls
-- DMR frontend/backend state desync causing 409 on start
-- Digital voice decoder producing no output due to wrong dsd-fme flags
-- SDR device lock-up from unreleased device registry on process crash
-- APRS crash on large station count and station list overflow
-- Settings modal overflowing viewport on smaller screens
-- Waterfall crash on zoom by reusing WebSocket and adding USB release retry
-- PD120 SSTV decode hang and false leader tone detection
-- WebSocket waterfall blocked by login redirect
-- TSCM sweep KeyError on RiskLevel.NEEDS_REVIEW
-
-### Removed
-- GSM Spy functionality removed for legal compliance
-
----
-
 ## [2.14.0] - 2026-02-06
 
 ### Added

CLAUDE.md

@@ -4,26 +4,11 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 ## Project Overview
 
-INTERCEPT is a web-based Signal Intelligence (SIGINT) platform providing a unified Flask interface for software-defined radio (SDR) tools. It supports pager decoding, 433MHz sensors, ADS-B aircraft tracking, ACARS messaging, WiFi/Bluetooth scanning, satellite tracking, ISS SSTV decoding, AIS vessel tracking, weather satellite imagery (NOAA APT & Meteor LRPT), and Meshtastic mesh networking.
+INTERCEPT is a web-based Signal Intelligence (SIGINT) platform providing a unified Flask interface for software-defined radio (SDR) tools. It supports pager decoding, 433MHz sensors, ADS-B aircraft tracking, ACARS messaging, WiFi/Bluetooth scanning, and satellite tracking.
 
 ## Common Commands
 
-### Docker (Primary)
+### Setup and Running
-```bash
-# Build and run (basic profile)
-docker compose --profile basic up -d
-
-# Build and run with ADS-B history (Postgres)
-docker compose --profile history up -d
-
-# Rebuild after code changes
-docker compose --profile basic up -d --build
-
-# Multi-arch build (amd64 + arm64 for RPi)
-./build-multiarch.sh
-```
-
-### Local Setup (Alternative)
 ```bash
 # Initial setup (installs dependencies and configures SDR tools)
 ./setup.sh
@@ -81,12 +66,8 @@ Each signal type has its own Flask blueprint:
 - `wifi.py`, `wifi_v2.py` - WiFi scanning (legacy and unified APIs)
 - `bluetooth.py`, `bluetooth_v2.py` - Bluetooth scanning (legacy and unified APIs)
 - `satellite.py` - Pass prediction using TLE data
-- `sstv.py` - ISS SSTV image decoding via slowrx
-- `weather_sat.py` - NOAA APT & Meteor LRPT via SatDump
-- `ais.py` - AIS vessel tracking and VHF DSC distress monitoring
 - `aprs.py` - Amateur packet radio via direwolf
 - `rtlamr.py` - Utility meter reading
-- `meshtastic_routes.py` - Meshtastic LoRa mesh networking
 
 ### Core Utilities (utils/)
 
@@ -110,15 +91,6 @@ Each signal type has its own Flask blueprint:
 - Platform-agnostic scanner with parsers for airodump-ng, nmcli, iw, iwlist, airport (macOS)
 - `channel_analyzer.py` - Frequency band analysis
 
-**Weather Satellite** (`utils/weather_sat.py`):
-- Singleton `WeatherSatDecoder` using SatDump CLI for NOAA APT and Meteor LRPT
-- Subprocess management with stdout parsing, image watcher via rglob
-- Pass prediction using skyfield TLE data
-
-**SSTV Decoder** (`utils/sstv.py`):
-- ISS SSTV reception via slowrx with Doppler tracking
-- Singleton pattern, image gallery with timestamped filenames
-
 ### Key Patterns
 
 **Server-Sent Events (SSE)**: All real-time features stream via SSE endpoints (`/stream_pager`, `/stream_sensor`, etc.). Pattern uses `queue.Queue` with timeout and keepalive messages.
@@ -140,25 +112,9 @@ Each signal type has its own Flask blueprint:
 | acarsdec | ACARS messages | Output parsing |
 | airmon-ng/airodump-ng | WiFi scanning | Monitor mode, CSV parsing |
 | bluetoothctl/hcitool | Bluetooth | Fallback when DBus unavailable |
-| slowrx | SSTV decoding | Subprocess with audio pipe |
-| SatDump | Weather satellites | CLI live mode, NOAA APT + Meteor LRPT |
-| AIS-catcher | AIS vessel tracking | JSON output parsing |
-| direwolf | APRS | TNC modem for packet radio |
-
-### Frontend Structure
-- **Templates**: `templates/index.html` (main SPA), `templates/partials/modes/*.html` (sidebar panels), `templates/partials/nav.html` (global nav)
-- **JS Modules**: `static/js/modes/*.js` - IIFE pattern per mode (e.g., `WeatherSat`, `SSTV`, `Meshtastic`)
-- **CSS**: `static/css/modes/*.css` - scoped styles per mode, CSS variables for theming (`--bg-card`, `--accent-cyan`, `--font-mono`)
-- **Mode Integration**: Each mode needs entries in `index.html` at ~12 points: CSS include, welcome card, partial include, visuals container, JS include, `validModes` set, `modeGroups` map, classList toggle, `modeNames`, visuals display toggle, titles, and init call in `switchMode()`
-
-### Docker
-- `Dockerfile` - Single-stage build with all SDR tools compiled from source (dump1090, AIS-catcher, slowrx, SatDump, etc.)
-- `docker-compose.yml` - Two profiles: `basic` (standalone) and `history` (with Postgres for ADS-B)
-- `build-multiarch.sh` - Multi-arch build script for amd64 + arm64 (RPi5)
-- Data persisted via `./data:/app/data` volume mount
 
 ### Configuration
-- `config.py` - Environment variable support with `INTERCEPT_` prefix (e.g., `INTERCEPT_PORT`, `INTERCEPT_WEATHER_SAT_GAIN`)
+- `config.py` - Environment variable support with `INTERCEPT_` prefix
 - Database: SQLite in `instance/` directory for settings, baselines, history
 
 ## Testing Notes

Dockerfile

@@ -9,9 +9,6 @@ LABEL description="Signal Intelligence Platform for SDR monitoring"
 # Set working directory
 WORKDIR /app
 
-# Pre-accept tshark non-root capture prompt for non-interactive install
-RUN echo 'wireshark-common wireshark-common/install-setuid boolean true' | debconf-set-selections
-
 # Install system dependencies for SDR tools
 RUN apt-get update && apt-get install -y --no-install-recommends \
     # RTL-SDR tools
@@ -24,15 +21,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     multimon-ng \
     # Audio tools for Listening Post
     ffmpeg \
-    # SSTV decoder runtime libs
-    libsndfile1 \
-    # SatDump runtime libs (weather satellite decoding)
-    libpng16-16 \
-    libtiff6 \
-    libjemalloc2 \
-    libvolk-bin \
-    libnng1 \
-    libzstd1 \
     # WiFi tools (aircrack-ng suite)
     aircrack-ng \
     iw \
@@ -41,7 +29,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     bluez \
     bluetooth \
     # GPS support
-    gpsd \
     gpsd-clients \
     # Utilities
     # APRS
@@ -54,8 +41,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     soapysdr-module-rtlsdr \
     soapysdr-module-hackrf \
     soapysdr-module-lms7 \
-    soapysdr-module-airspy \
-    airspy \
     limesuite \
     hackrf \
     # Utilities
@@ -71,22 +56,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     cmake \
     libncurses-dev \
     libsndfile1-dev \
-    # GTK is required for slowrx (SSTV decoder GUI dependency).
-    # Note: slowrx is kept for backwards compatibility, but the pure Python
-    # SSTV decoder in utils/sstv/ is now the primary implementation.
-    # GTK can be removed if slowrx is deprecated in future releases.
-    libgtk-3-dev \
-    libasound2-dev \
     libsoapysdr-dev \
     libhackrf-dev \
     liblimesuite-dev \
-    libfftw3-dev \
-    libpng-dev \
-    libtiff-dev \
-    libjemalloc-dev \
-    libvolk-dev \
-    libnng-dev \
-    libzstd-dev \
     libsqlite3-dev \
     libcurl4-openssl-dev \
     zlib1g-dev \
@@ -141,43 +113,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && make \
     && cp acarsdec /usr/bin/acarsdec \
     && rm -rf /tmp/acarsdec \
-    # Build slowrx (SSTV decoder) — pinned to known-good commit
-    && cd /tmp \
-    && git clone https://github.com/windytan/slowrx.git \
-    && cd slowrx \
-    && git checkout ca6d7012 \
-    && make \
-    && install -m 0755 slowrx /usr/local/bin/slowrx \
-    && rm -rf /tmp/slowrx \
-    # Build SatDump (weather satellite decoder - NOAA APT & Meteor LRPT) — pinned to v1.2.2
-    && cd /tmp \
-    && git clone --depth 1 --branch 1.2.2 https://github.com/SatDump/SatDump.git \
-    && cd SatDump \
-    && mkdir build && cd build \
-    && cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=OFF -DCMAKE_INSTALL_LIBDIR=lib .. \
-    && make -j$(nproc) \
-    && make install \
-    && ldconfig \
-    # Ensure SatDump plugins are in the expected path (handles multiarch differences)
-    && mkdir -p /usr/local/lib/satdump/plugins \
-    && if [ -z "$(ls /usr/local/lib/satdump/plugins/*.so 2>/dev/null)" ]; then \
-        for dir in /usr/local/lib/*/satdump/plugins /usr/lib/*/satdump/plugins /usr/lib/satdump/plugins; do \
-            if [ -d "$dir" ] && [ -n "$(ls "$dir"/*.so 2>/dev/null)" ]; then \
-                ln -sf "$dir"/*.so /usr/local/lib/satdump/plugins/; \
-                break; \
-            fi; \
-        done; \
-    fi \
-    && cd /tmp \
-    && rm -rf /tmp/SatDump \
-    # Build rtlamr (utility meter decoder - requires Go)
-    && cd /tmp \
-    && curl -fsSL "https://go.dev/dl/go1.22.5.linux-$(dpkg --print-architecture).tar.gz" | tar -C /usr/local -xz \
-    && export PATH="$PATH:/usr/local/go/bin" \
-    && export GOPATH=/tmp/gopath \
-    && go install github.com/bemasher/rtlamr@latest \
-    && cp /tmp/gopath/bin/rtlamr /usr/bin/rtlamr \
-    && rm -rf /usr/local/go /tmp/gopath \
     # Build mbelib (required by DSD)
     && cd /tmp \
     && git clone https://github.com/lwvmobile/mbelib.git \
@@ -200,7 +135,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && ldconfig \
     && rm -rf /tmp/dsd-fme \
     # Cleanup build tools to reduce image size
-    # libgtk-3-dev is explicitly removed; runtime GTK libs remain for slowrx
     && apt-get remove -y \
     build-essential \
     git \
@@ -208,14 +142,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     cmake \
     libncurses-dev \
     libsndfile1-dev \
-    libgtk-3-dev \
-    libasound2-dev \
-    libpng-dev \
-    libtiff-dev \
-    libjemalloc-dev \
-    libvolk-dev \
-    libnng-dev \
-    libzstd-dev \
     libsoapysdr-dev \
     libhackrf-dev \
     liblimesuite-dev \
@@ -238,7 +164,7 @@ RUN pip install --no-cache-dir -r requirements.txt
 COPY . .
 
 # Create data directory for persistence
-RUN mkdir -p /app/data /app/data/weather_sat
+RUN mkdir -p /app/data
 
 # Expose web interface port
 EXPOSE 5050

LICENSE

@@ -1,200 +1,21 @@
+MIT License
 
-                                 Apache License
+Copyright (c) 2025 smittix
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-   1. Definitions.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-      "License" shall mean the terms and conditions for use, reproduction,
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-      and distribution as defined by Sections 1 through 9 of this document.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-      "Licensor" shall mean the copyright owner or entity authorized by
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-      the copyright owner that is granting the License.
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-      "Legal Entity" shall mean the union of the acting entity and all
+SOFTWARE.
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to the Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by the Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding any notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. Please also get an OpenPGP
-      key and encrypt outgoing communications.
-
-   Copyright 2025 smittix
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

README.md

@@ -28,23 +28,18 @@ Support the developer of this open-source project
 
 - **Pager Decoding** - POCSAG/FLEX via rtl_fm + multimon-ng
 - **433MHz Sensors** - Weather stations, TPMS, IoT devices via rtl_433
-- **Sub-GHz Analyzer** - RF capture and protocol decoding for 300-928 MHz ISM bands via HackRF
 - **Aircraft Tracking** - ADS-B via dump1090 with real-time map and radar
 - **Vessel Tracking** - AIS ship tracking with VHF DSC distress monitoring
 - **ACARS Messaging** - Aircraft datalink messages via acarsdec
-- **Listening Post** - Wideband frequency scanner with real-time audio monitoring
+- **DMR Digital Voice** - DMR/P25/NXDN/D-STAR decoding via dsd-fme with visual synthesizer
-- **Weather Satellites** - NOAA APT and Meteor LRPT image decoding via SatDump with auto-scheduler
+- **Listening Post** - Frequency scanner with audio monitoring
-- **WebSDR** - Remote HF/shortwave listening via KiwiSDR network
+- **WebSDR** - Remote HF/shortwave listening via WebSDR servers
-- **ISS SSTV** - Slow-scan TV image reception from the International Space Station
+- **ISS SSTV** - Receive slow-scan TV from the International Space Station
-- **HF SSTV** - Terrestrial SSTV on shortwave frequencies (80m-10m, VHF, UHF)
+- **HF SSTV** - Terrestrial SSTV on shortwave frequencies
-- **APRS** - Amateur packet radio position reports and telemetry via direwolf
+- **Satellite Tracking** - Pass prediction using TLE data
-- **Satellite Tracking** - Pass prediction with polar plot and ground track map
-- **Utility Meters** - Electric, gas, and water meter reading via rtl_amr
 - **ADS-B History** - Persistent aircraft history with reporting dashboard (Postgres optional)
 - **WiFi Scanning** - Monitor mode reconnaissance via aircrack-ng
 - **Bluetooth Scanning** - Device discovery and tracker detection (with Ubertooth support)
-- **BT Locate** - SAR Bluetooth device location with GPS-tagged signal trail mapping and proximity alerts
-- **GPS** - Real-time GPS position tracking with live map, speed, altitude, and satellite info
 - **TSCM** - Counter-surveillance with RF baseline comparison and threat detection
 - **Meshtastic** - LoRa mesh network integration
 - **Spy Stations** - Number stations and diplomatic HF network database
@@ -65,54 +60,15 @@ cd intercept
 sudo -E venv/bin/python intercept.py
 ```
 
-### Docker
+### Docker (Alternative)
 
 ```bash
 git clone https://github.com/smittix/intercept.git
 cd intercept
-docker compose --profile basic up -d --build
+docker compose up -d
 ```
 
-> **Note:** Docker requires privileged mode for USB SDR access. SDR devices are passed through via `/dev/bus/usb`.
+> **Note:** Docker requires privileged mode for USB SDR access. See `docker-compose.yml` for configuration options.
-
-#### Multi-Architecture Builds (amd64 + arm64)
-
-Cross-compile on an x64 machine and push to a registry. This is much faster than building natively on an RPi.
-
-```bash
-# One-time setup on your x64 build machine
-docker run --privileged --rm tonistiigi/binfmt --install all
-docker buildx create --name intercept-builder --use --bootstrap
-
-# Build and push for both architectures
-REGISTRY=ghcr.io/youruser ./build-multiarch.sh --push
-
-# On the RPi5, just pull and run
-INTERCEPT_IMAGE=ghcr.io/youruser/intercept:latest docker compose --profile basic up -d
-```
-
-Build script options:
-
-| Flag | Description |
-|------|-------------|
-| `--push` | Push to container registry |
-| `--load` | Load into local Docker (single platform only) |
-| `--arm64-only` | Build arm64 only (for RPi deployment) |
-| `--amd64-only` | Build amd64 only |
-
-Environment variables: `REGISTRY`, `IMAGE_NAME`, `IMAGE_TAG`
-
-#### Using a Pre-built Image
-
-If you've pushed to a registry, you can skip building entirely on the target machine:
-
-```bash
-# Set in .env or export
-INTERCEPT_IMAGE=ghcr.io/youruser/intercept:latest
-
-# Then just run
-docker compose --profile basic up -d
-```
 
 ### ADS-B History (Optional)
 
@@ -228,7 +184,7 @@ This project was developed using AI as a coding partner, combining human directi
 
 ## License
 
-Apache 2.0 License - see [LICENSE](LICENSE)
+MIT License - see [LICENSE](LICENSE)
 
 ## Author
 
@@ -242,11 +198,8 @@ Created by **smittix** - [GitHub](https://github.com/smittix)
 [dump1090](https://github.com/flightaware/dump1090) |
 [AIS-catcher](https://github.com/jvde-github/AIS-catcher) |
 [acarsdec](https://github.com/TLeconte/acarsdec) |
-[direwolf](https://github.com/wb2osz/direwolf) |
-[rtl_amr](https://github.com/bemasher/rtlamr) |
 [aircrack-ng](https://www.aircrack-ng.org/) |
 [Leaflet.js](https://leafletjs.com/) |
-[SatDump](https://github.com/SatDump/SatDump) |
 [Celestrak](https://celestrak.org/) |
 [Priyom.org](https://priyom.org/)
 
@@ -258,4 +211,3 @@ Created by **smittix** - [GitHub](https://github.com/smittix)
 
 
 
-

app.py

@@ -27,9 +27,9 @@ from typing import Any
 
 from flask import Flask, render_template, jsonify, send_file, Response, request,redirect, url_for, flash, session
 from werkzeug.security import check_password_hash
-from config import VERSION, CHANGELOG, SHARED_OBSERVER_LOCATION_ENABLED, DEFAULT_LATITUDE, DEFAULT_LONGITUDE
+from config import VERSION, CHANGELOG, SHARED_OBSERVER_LOCATION_ENABLED
 from utils.dependencies import check_tool, check_all_dependencies, TOOL_DEPENDENCIES
-from utils.process import cleanup_stale_processes, cleanup_stale_dump1090
+from utils.process import cleanup_stale_processes
 from utils.sdr import SDRFactory
 from utils.cleanup import DataStore, cleanup_manager
 from utils.constants import (
@@ -182,10 +182,6 @@ dmr_lock = threading.Lock()
 tscm_queue = queue.Queue(maxsize=QUEUE_MAX_SIZE)
 tscm_lock = threading.Lock()
 
-# SubGHz Transceiver (HackRF)
-subghz_queue = queue.Queue(maxsize=QUEUE_MAX_SIZE)
-subghz_lock = threading.Lock()
-
 # Deauth Attack Detection
 deauth_detector = None
 deauth_detector_queue = queue.Queue(maxsize=QUEUE_MAX_SIZE)
@@ -248,10 +244,6 @@ sdr_device_registry_lock = threading.Lock()
 def claim_sdr_device(device_index: int, mode_name: str) -> str | None:
     """Claim an SDR device for a mode.
 
-    Checks the in-app registry first, then probes the USB device to
-    catch stale handles held by external processes (e.g. a leftover
-    rtl_fm from a previous crash).
-
     Args:
         device_index: The SDR device index to claim
         mode_name: Name of the mode claiming the device (e.g., 'sensor', 'rtlamr')
@@ -263,16 +255,6 @@ def claim_sdr_device(device_index: int, mode_name: str) -> str | None:
         if device_index in sdr_device_registry:
             in_use_by = sdr_device_registry[device_index]
             return f'SDR device {device_index} is in use by {in_use_by}. Stop {in_use_by} first or use a different device.'
-
-        # Probe the USB device to catch external processes holding the handle
-        try:
-            from utils.sdr.detection import probe_rtlsdr_device
-            usb_error = probe_rtlsdr_device(device_index)
-            if usb_error:
-                return usb_error
-        except Exception:
-            pass  # If probe fails, let the caller proceed normally
-
         sdr_device_registry[device_index] = mode_name
         return None
 
@@ -310,10 +292,6 @@ def require_login():
     if request.path.startswith('/listening/audio/'):
         return None
 
-    # Allow WebSocket upgrade requests (page load already required auth)
-    if request.path.startswith('/ws/'):
-        return None
-
     # Controller API endpoints use API key auth, not session auth
     # Allow agent push/pull endpoints without session login
     if request.path.startswith('/controller/'):
@@ -374,8 +352,6 @@ def index() -> str:
         version=VERSION,
         changelog=CHANGELOG,
         shared_observer_location=SHARED_OBSERVER_LOCATION_ENABLED,
-        default_latitude=DEFAULT_LATITUDE,
-        default_longitude=DEFAULT_LONGITUDE,
     )
 
 
@@ -647,25 +623,6 @@ def export_bluetooth() -> Response:
         })
 
 
-def _get_subghz_active() -> bool:
-    """Check if SubGHz manager has an active process."""
-    try:
-        from utils.subghz import get_subghz_manager
-        return get_subghz_manager().active_mode != 'idle'
-    except Exception:
-        return False
-
-
-def _get_dmr_active() -> bool:
-    """Check if Digital Voice decoder has an active process."""
-    try:
-        from routes import dmr as dmr_module
-        proc = dmr_module.dmr_dsd_process
-        return bool(dmr_module.dmr_running and proc and proc.poll() is None)
-    except Exception:
-        return False
-
-
 @app.route('/health')
 def health_check() -> Response:
     """Health check endpoint for monitoring."""
@@ -684,8 +641,7 @@ def health_check() -> Response:
             'wifi': wifi_process is not None and (wifi_process.poll() is None if wifi_process else False),
             'bluetooth': bt_process is not None and (bt_process.poll() is None if bt_process else False),
             'dsc': dsc_process is not None and (dsc_process.poll() is None if dsc_process else False),
-            'dmr': _get_dmr_active(),
+            'dmr': dmr_process is not None and (dmr_process.poll() is None if dmr_process else False),
-            'subghz': _get_subghz_active(),
         },
         'data': {
             'aircraft_count': len(adsb_aircraft),
@@ -715,9 +671,8 @@ def kill_all() -> Response:
         'rtl_fm', 'multimon-ng', 'rtl_433',
         'airodump-ng', 'aireplay-ng', 'airmon-ng',
         'dump1090', 'acarsdec', 'direwolf', 'AIS-catcher',
-        'hcitool', 'bluetoothctl', 'satdump', 'dsd',
+        'hcitool', 'bluetoothctl', 'dsd',
         'rtl_tcp', 'rtl_power', 'rtlamr', 'ffmpeg',
-        'hackrf_transfer', 'hackrf_sweep'
     ]
 
     for proc in processes_to_kill:
@@ -782,14 +737,7 @@ def kill_all() -> Response:
     # Reset Bluetooth v2 scanner
     try:
         reset_bluetooth_scanner()
-        killed.append('bluetooth')
+        killed.append('bluetooth_scanner')
-    except Exception:
-        pass
-
-    # Reset SubGHz state
-    try:
-        from utils.subghz import get_subghz_manager
-        get_subghz_manager().stop_all()
     except Exception:
         pass
 
@@ -877,24 +825,11 @@ def main() -> None:
 
     # Clean up any stale processes from previous runs
     cleanup_stale_processes()
-    cleanup_stale_dump1090()
 
     # Initialize database for settings storage
     from utils.database import init_db
     init_db()
 
-    # Register database cleanup functions
-    from utils.database import (
-        cleanup_old_signal_history,
-        cleanup_old_timeline_entries,
-        cleanup_old_dsc_alerts,
-        cleanup_old_payloads
-    )
-    cleanup_manager.register_db_cleanup(cleanup_old_signal_history, interval_multiplier=1440)  # Every 24 hours
-    cleanup_manager.register_db_cleanup(cleanup_old_timeline_entries, interval_multiplier=1440)  # Every 24 hours
-    cleanup_manager.register_db_cleanup(cleanup_old_dsc_alerts, interval_multiplier=1440)  # Every 24 hours
-    cleanup_manager.register_db_cleanup(cleanup_old_payloads, interval_multiplier=1440)  # Every 24 hours
-
     # Start automatic cleanup of stale data entries
     cleanup_manager.start()
 
@@ -902,15 +837,6 @@ def main() -> None:
     from routes import register_blueprints
     register_blueprints(app)
 
-    # Initialize TLE auto-refresh (must be after blueprint registration)
-    try:
-        from routes.satellite import init_tle_auto_refresh
-        import os
-        if not os.environ.get('TESTING'):
-            init_tle_auto_refresh()
-    except Exception as e:
-        logger.warning(f"Failed to initialize TLE auto-refresh: {e}")
-
     # Update TLE data in background thread (non-blocking)
     def update_tle_background():
         try:
@@ -943,14 +869,6 @@ def main() -> None:
     except ImportError as e:
         print(f"KiwiSDR audio proxy disabled: {e}")
 
-    # Initialize WebSocket for waterfall streaming
-    try:
-        from routes.waterfall_websocket import init_waterfall_websocket
-        init_waterfall_websocket(app)
-        print("WebSocket waterfall streaming enabled")
-    except ImportError as e:
-        print(f"WebSocket waterfall disabled: {e}")
-
     print(f"Open http://localhost:{args.port} in your browser")
     print()
     print("Press Ctrl+C to stop")

build-multiarch.sh

@@ -1,139 +0,0 @@
-#!/bin/bash
-# INTERCEPT - Multi-architecture Docker image builder
-#
-# Builds for both linux/amd64 and linux/arm64 using Docker buildx.
-# Run this on your x64 machine to cross-compile the arm64 image
-# instead of building natively on the RPi5.
-#
-# Prerequisites (one-time setup):
-#   docker run --privileged --rm tonistiigi/binfmt --install all
-#   docker buildx create --name intercept-builder --use --bootstrap
-#
-# Usage:
-#   ./build-multiarch.sh                    # Build both platforms, load locally
-#   ./build-multiarch.sh --push             # Build and push to registry
-#   ./build-multiarch.sh --arm64-only       # Build arm64 only (for RPi)
-#   REGISTRY=ghcr.io/user ./build-multiarch.sh --push
-#
-# Environment variables:
-#   REGISTRY    - Container registry (default: docker.io/library)
-#   IMAGE_NAME  - Image name (default: intercept)
-#   IMAGE_TAG   - Image tag (default: latest)
-
-set -euo pipefail
-
-# Configuration
-REGISTRY="${REGISTRY:-}"
-IMAGE_NAME="${IMAGE_NAME:-intercept}"
-IMAGE_TAG="${IMAGE_TAG:-latest}"
-BUILDER_NAME="intercept-builder"
-PLATFORMS="linux/amd64,linux/arm64"
-
-# Parse arguments
-PUSH=false
-LOAD=false
-ARM64_ONLY=false
-
-for arg in "$@"; do
-    case $arg in
-        --push)     PUSH=true ;;
-        --load)     LOAD=true ;;
-        --arm64-only)
-            ARM64_ONLY=true
-            PLATFORMS="linux/arm64"
-            ;;
-        --amd64-only)
-            PLATFORMS="linux/amd64"
-            ;;
-        --help|-h)
-            echo "Usage: $0 [--push] [--load] [--arm64-only] [--amd64-only]"
-            echo ""
-            echo "Options:"
-            echo "  --push        Push to container registry"
-            echo "  --load        Load into local Docker (single platform only)"
-            echo "  --arm64-only  Build arm64 only (for RPi5 deployment)"
-            echo "  --amd64-only  Build amd64 only"
-            echo ""
-            echo "Environment variables:"
-            echo "  REGISTRY    Container registry (e.g. ghcr.io/username)"
-            echo "  IMAGE_NAME  Image name (default: intercept)"
-            echo "  IMAGE_TAG   Image tag (default: latest)"
-            echo ""
-            echo "Examples:"
-            echo "  $0 --push                                    # Build both, push"
-            echo "  REGISTRY=ghcr.io/myuser $0 --push            # Push to GHCR"
-            echo "  $0 --arm64-only --load                       # Build arm64, load locally"
-            echo "  $0 --arm64-only --push && ssh rpi docker pull # Build + deploy to RPi"
-            exit 0
-            ;;
-        *)
-            echo "Unknown option: $arg"
-            exit 1
-            ;;
-    esac
-done
-
-# Build full image reference
-if [ -n "$REGISTRY" ]; then
-    FULL_IMAGE="${REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}"
-else
-    FULL_IMAGE="${IMAGE_NAME}:${IMAGE_TAG}"
-fi
-
-echo "============================================"
-echo "  INTERCEPT Multi-Architecture Builder"
-echo "============================================"
-echo "  Image:     ${FULL_IMAGE}"
-echo "  Platforms: ${PLATFORMS}"
-echo "  Push:      ${PUSH}"
-echo "============================================"
-echo ""
-
-# Check if buildx builder exists, create if not
-if ! docker buildx inspect "$BUILDER_NAME" >/dev/null 2>&1; then
-    echo "Creating buildx builder: ${BUILDER_NAME}"
-    docker buildx create --name "$BUILDER_NAME" --use --bootstrap
-
-    # Check for QEMU support
-    if ! docker run --rm --privileged tonistiigi/binfmt --install all >/dev/null 2>&1; then
-        echo "WARNING: QEMU binfmt setup may have failed."
-        echo "Run: docker run --privileged --rm tonistiigi/binfmt --install all"
-    fi
-else
-    docker buildx use "$BUILDER_NAME"
-fi
-
-# Build command
-BUILD_CMD="docker buildx build --platform ${PLATFORMS} --tag ${FULL_IMAGE}"
-
-if [ "$PUSH" = true ]; then
-    BUILD_CMD="${BUILD_CMD} --push"
-    echo "Will push to: ${FULL_IMAGE}"
-elif [ "$LOAD" = true ]; then
-    # --load only works with single platform
-    if echo "$PLATFORMS" | grep -q ","; then
-        echo "ERROR: --load only works with a single platform."
-        echo "Use --arm64-only or --amd64-only with --load."
-        exit 1
-    fi
-    BUILD_CMD="${BUILD_CMD} --load"
-    echo "Will load into local Docker"
-fi
-
-echo ""
-echo "Building..."
-echo "Command: ${BUILD_CMD} ."
-echo ""
-
-$BUILD_CMD .
-
-echo ""
-echo "============================================"
-echo "  Build complete!"
-if [ "$PUSH" = true ]; then
-    echo "  Image pushed to: ${FULL_IMAGE}"
-    echo ""
-    echo "  Pull on RPi5:"
-    echo "    docker pull ${FULL_IMAGE}"
-fi
-echo "============================================"

config.py

@@ -7,57 +7,10 @@ import os
 import sys
 
 # Application version
-VERSION = "2.18.0"
+VERSION = "2.14.0"
 
 # Changelog - latest release notes (shown on welcome screen)
 CHANGELOG = [
-    {
-        "version": "2.18.0",
-        "date": "February 2026",
-        "highlights": [
-            "Bluetooth: service data inspector, appearance codes, MAC cluster tracking, and behavioral flags",
-            "Bluetooth: IRK badge display, distance estimation with confidence, and signal stability metrics",
-            "ACARS: SoapySDR device support for SDRplay, LimeSDR, Airspy, and other non-RTL backends",
-            "ADS-B: stale dump1090 process cleanup via PID file tracking",
-            "GPS: error state indicator and UI refinements",
-            "Proximity radar and signal card UI improvements",
-        ]
-    },
-    {
-        "version": "2.17.0",
-        "date": "February 2026",
-        "highlights": [
-            "BT Locate: SAR Bluetooth device location with GPS-tagged signal trail and proximity alerts",
-            "IRK auto-detection: extract Identity Resolving Keys from paired devices (macOS/Linux)",
-            "GPS mode: real-time position tracking with live map, speed, altitude, and satellite info",
-            "Bluetooth scanner lifecycle fix for bleak scan timeout tracking",
-        ]
-    },
-    {
-        "version": "2.16.0",
-        "date": "February 2026",
-        "highlights": [
-            "Sub-GHz analyzer with real-time RF capture and protocol decoding",
-            "Weather satellite auto-scheduler with polar plot and ground track map",
-            "SatDump support for local (non-Docker) installs via setup.sh",
-            "Shared waterfall UI across SDR modes",
-            "Listening post audio stuttering fix and SDR race condition fixes",
-            "Multi-arch Docker build support (amd64 + arm64)",
-        ]
-    },
-    {
-        "version": "2.15.0",
-        "date": "February 2026",
-        "highlights": [
-            "Real-time WebSocket waterfall with I/Q capture and server-side FFT",
-            "Cross-module frequency routing from Listening Post to decoders",
-            "Pure Python SSTV decoder replacing broken slowrx dependency",
-            "Real-time signal scope for pager, sensor, and SSTV modes",
-            "USB-level device probe to prevent cryptic rtl_fm crashes",
-            "DMR dsd-fme protocol fixes, tuning controls, and state sync",
-            "SDR device lock-up fix from unreleased device registry on crash",
-        ]
-    },
     {
         "version": "2.14.0",
         "date": "February 2026",
@@ -245,47 +198,21 @@ ADSB_HISTORY_QUEUE_SIZE = _get_env_int('ADSB_HISTORY_QUEUE_SIZE', 50000)
 
 # Observer location settings
 SHARED_OBSERVER_LOCATION_ENABLED = _get_env_bool('SHARED_OBSERVER_LOCATION', True)
-DEFAULT_LATITUDE = _get_env_float('DEFAULT_LAT', 0.0)
-DEFAULT_LONGITUDE = _get_env_float('DEFAULT_LON', 0.0)
 
 # Satellite settings
 SATELLITE_UPDATE_INTERVAL = _get_env_int('SATELLITE_UPDATE_INTERVAL', 30)
 SATELLITE_TRAJECTORY_POINTS = _get_env_int('SATELLITE_TRAJECTORY_POINTS', 30)
 SATELLITE_ORBIT_MINUTES = _get_env_int('SATELLITE_ORBIT_MINUTES', 45)
 
-# Weather satellite settings
-WEATHER_SAT_DEFAULT_GAIN = _get_env_float('WEATHER_SAT_GAIN', 40.0)
-WEATHER_SAT_SAMPLE_RATE = _get_env_int('WEATHER_SAT_SAMPLE_RATE', 1000000)
-WEATHER_SAT_MIN_ELEVATION = _get_env_float('WEATHER_SAT_MIN_ELEVATION', 15.0)
-WEATHER_SAT_PREDICTION_HOURS = _get_env_int('WEATHER_SAT_PREDICTION_HOURS', 24)
-WEATHER_SAT_SCHEDULE_REFRESH_MINUTES = _get_env_int('WEATHER_SAT_SCHEDULE_REFRESH_MINUTES', 30)
-WEATHER_SAT_CAPTURE_BUFFER_SECONDS = _get_env_int('WEATHER_SAT_CAPTURE_BUFFER_SECONDS', 30)
-
-# SubGHz transceiver settings (HackRF)
-SUBGHZ_DEFAULT_FREQUENCY = _get_env_float('SUBGHZ_FREQUENCY', 433.92)
-SUBGHZ_DEFAULT_SAMPLE_RATE = _get_env_int('SUBGHZ_SAMPLE_RATE', 2000000)
-SUBGHZ_DEFAULT_LNA_GAIN = _get_env_int('SUBGHZ_LNA_GAIN', 32)
-SUBGHZ_DEFAULT_VGA_GAIN = _get_env_int('SUBGHZ_VGA_GAIN', 20)
-SUBGHZ_DEFAULT_TX_GAIN = _get_env_int('SUBGHZ_TX_GAIN', 20)
-SUBGHZ_MAX_TX_DURATION = _get_env_int('SUBGHZ_MAX_TX_DURATION', 10)
-SUBGHZ_SWEEP_START_MHZ = _get_env_float('SUBGHZ_SWEEP_START', 300.0)
-SUBGHZ_SWEEP_END_MHZ = _get_env_float('SUBGHZ_SWEEP_END', 928.0)
-
 # Update checking
 GITHUB_REPO = _get_env('GITHUB_REPO', 'smittix/intercept')
 UPDATE_CHECK_ENABLED = _get_env_bool('UPDATE_CHECK_ENABLED', True)
 UPDATE_CHECK_INTERVAL_HOURS = _get_env_int('UPDATE_CHECK_INTERVAL_HOURS', 6)
 
-# Alerting
-ALERT_WEBHOOK_URL = _get_env('ALERT_WEBHOOK_URL', '')
-ALERT_WEBHOOK_SECRET = _get_env('ALERT_WEBHOOK_SECRET', '')
-ALERT_WEBHOOK_TIMEOUT = _get_env_int('ALERT_WEBHOOK_TIMEOUT', 5)
-
 # Admin credentials
 ADMIN_USERNAME = _get_env('ADMIN_USERNAME', 'admin')
 ADMIN_PASSWORD = _get_env('ADMIN_PASSWORD', 'admin')
 
-
 def configure_logging() -> None:
     """Configure application logging."""
     logging.basicConfig(

docker-compose.yml

@@ -1,31 +1,27 @@
 # INTERCEPT - Signal Intelligence Platform
 # Docker Compose configuration for easy deployment
 #
-# Basic usage (build locally):
+# Basic usage:
-#   docker compose --profile basic up -d --build
+#   docker compose up -d
-#
-# Basic usage (pre-built image from registry):
-#   INTERCEPT_IMAGE=ghcr.io/user/intercept:latest docker compose --profile basic up -d
 #
 # With ADS-B history (Postgres):
 #   docker compose --profile history up -d
 
 services:
   intercept:
-    # When INTERCEPT_IMAGE is set, use that pre-built image; otherwise build locally
-    image: ${INTERCEPT_IMAGE:-intercept:latest}
     build: .
     container_name: intercept
     ports:
       - "5050:5050"
     # Privileged mode required for USB SDR device access
+    # Alternatively, use device mapping (see below)
     privileged: true
-    # USB device mapping for all USB devices
+    # USB device mapping (alternative to privileged mode)
-    devices:
+    # devices:
-      - /dev/bus/usb:/dev/bus/usb
+    #   - /dev/bus/usb:/dev/bus/usb
-    volumes:
+    # volumes:
-      # Persist decoded images and database across container rebuilds
+      # Persist data directory
-      - ./data:/app/data
+      # - ./data:/app/data
       # Optional: mount logs directory
       # - ./logs:/app/logs
     environment:
@@ -44,9 +40,6 @@ services:
       - INTERCEPT_ADSB_AUTO_START=${INTERCEPT_ADSB_AUTO_START:-false}
       # Shared observer location across modules
       - INTERCEPT_SHARED_OBSERVER_LOCATION=${INTERCEPT_SHARED_OBSERVER_LOCATION:-true}
-      # Default observer coordinates (set to your location to skip the GPS prompt)
-      # - INTERCEPT_DEFAULT_LAT=${INTERCEPT_DEFAULT_LAT:-0}
-      # - INTERCEPT_DEFAULT_LON=${INTERCEPT_DEFAULT_LON:-0}
     # Network mode for WiFi scanning (requires host network)
     # network_mode: host
     restart: unless-stopped
@@ -60,23 +53,15 @@ services:
   # ADS-B history with Postgres persistence
   # Enable with: docker compose --profile history up -d
   intercept-history:
-    # Same image/build fallback pattern as above
-    image: ${INTERCEPT_IMAGE:-intercept:latest}
     build: .
-    container_name: intercept-history
+    container_name: intercept
     profiles:
       - history
     depends_on:
       - adsb_db
     ports:
       - "5050:5050"
-    # Privileged mode required for USB SDR device access
     privileged: true
-    # USB device mapping for all USB devices
-    devices:
-      - /dev/bus/usb:/dev/bus/usb
-    volumes:
-      - ./data:/app/data
     environment:
       - INTERCEPT_HOST=0.0.0.0
       - INTERCEPT_PORT=5050
@@ -91,9 +76,6 @@ services:
       - INTERCEPT_ADSB_AUTO_START=${INTERCEPT_ADSB_AUTO_START:-false}
       # Shared observer location across modules
       - INTERCEPT_SHARED_OBSERVER_LOCATION=${INTERCEPT_SHARED_OBSERVER_LOCATION:-true}
-      # Default observer coordinates (set to your location to skip the GPS prompt)
-      # - INTERCEPT_DEFAULT_LAT=${INTERCEPT_DEFAULT_LAT:-0}
-      # - INTERCEPT_DEFAULT_LON=${INTERCEPT_DEFAULT_LON:-0}
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "curl", "-sf", "http://localhost:5050/health"]

docs/FEATURES.md

@@ -16,14 +16,6 @@ Complete feature list for all modules.
 - **Doorbells, remotes, and IoT devices**
 - **Smart meters** and utility monitors
 
-## Sub-GHz Analyzer
-
-- **HackRF-based** signal capture and analysis for 300-928 MHz ISM bands
-- **Protocol decoding** - identify and decode common Sub-GHz protocols
-- **Signal replay/transmit** capabilities for authorized testing
-- **Wideband spectrum analysis** with real-time visualization
-- **I/Q capture** - record raw samples for offline analysis
-
 ## AIS Vessel Tracking
 
 - **Real-time vessel tracking** via AIS-catcher on 161.975/162.025 MHz
@@ -92,55 +84,6 @@ Digital Selective Calling (DSC) monitoring on the international maritime distres
 - **SDR conflict detection** - Prevents device collisions with AIS tracking
 - **Alert summary** - Dashboard counts for unacknowledged distress/urgency
 
-## ACARS Messaging
-
-- **Real-time ACARS decoding** via acarsdec
-- **Aircraft datalink messages** - operational, weather, and position reports
-- **Multi-SDR support** - RTL-SDR, HackRF, LimeSDR, Airspy, SDRplay
-- **Message filtering** - filter by message type, flight, or registration
-
-## Listening Post
-
-- **Wideband frequency scanning** via rtl_power sweep with SNR filtering
-- **Real-time audio monitoring** with FM and SSB demodulation
-- **Cross-module frequency routing** from scanner to decoders
-- **Customizable frequency presets** and band bookmarks
-- **Multi-SDR support** - RTL-SDR, LimeSDR, HackRF, Airspy, SDRplay
-
-## Weather Satellites
-
-- **NOAA APT** and **Meteor LRPT** image decoding via SatDump
-- **Auto-scheduler** with pass prediction and automatic capture
-- **Polar plot** - real-time satellite position on azimuth/elevation display
-- **Ground track map** - orbit path with past/future trajectory
-- **Image gallery** with timestamped decoded imagery
-
-## WebSDR
-
-- **KiwiSDR network integration** for remote HF/shortwave listening
-- **WebSocket audio streaming** from remote receivers
-- **Receiver discovery** with automatic caching
-- **Frequency tuning** with band presets
-
-## HF SSTV
-
-- **Terrestrial SSTV decoding** across HF (80m-10m), VHF (6m, 2m), and UHF (70cm) bands
-- **Predefined frequency lookup** for active SSTV calling frequencies
-- **Image gallery** with decoded transmissions
-
-## APRS
-
-- **Amateur packet radio** position reports and telemetry via direwolf
-- **Region-specific frequencies** - 144.390 MHz (North America), 144.800 MHz (Europe), and more
-- **Real-time position tracking** on interactive map
-- **Message and telemetry display** from APRS network
-
-## Utility Meter Reading
-
-- **Smart meter monitoring** via rtl_amr for electric, gas, and water meters
-- **Real-time JSON output** with meter ID, consumption, and signal data
-- **Multiple meter protocol support** via rtl_tcp integration
-
 ## Satellite Tracking
 
 - **Full-screen dashboard** - dedicated popout with polar plot and ground track
@@ -188,52 +131,6 @@ Digital Selective Calling (DSC) monitoring on the international maritime distres
 - **Proximity radar** visualization
 - **Device type breakdown** chart
 
-## BT Locate (SAR Bluetooth Device Location)
-
-Search and rescue Bluetooth device location with GPS-tagged signal trail mapping.
-
-### Core Features
-- **Target tracking** - Locate devices by MAC address, name pattern, or IRK (Identity Resolving Key)
-- **RPA resolution** - Resolve BLE Resolvable Private Addresses using IRK for tracking devices with randomized addresses
-- **IRK auto-detection** - Extract IRKs from paired devices on macOS and Linux
-- **GPS-tagged signal trail** - Every detection is tagged with GPS coordinates for trail mapping
-- **Proximity bands** - IMMEDIATE (<1m), NEAR (1-5m), FAR (>5m) with color-coded HUD
-- **RSSI history chart** - Real-time signal strength sparkline for trend analysis
-- **Distance estimation** - Log-distance path loss model with environment presets
-- **Audio proximity alerts** - Web Audio API tones that increase in pitch as signal strengthens
-- **Hand-off from Bluetooth mode** - One-click transfer of a device from BT scanner to BT Locate
-
-### Environment Presets
-- **Open Field** (n=2.0) - Free space path loss
-- **Outdoor** (n=2.2) - Typical outdoor environment
-- **Indoor** (n=3.0) - Indoor with walls and obstacles
-
-### Map & Trail
-- Interactive Leaflet map with GPS trail visualization
-- Trail points color-coded by proximity band
-- Polyline connecting detection points for path visualization
-- Supports user-configured tile providers
-
-### Requirements
-- Bluetooth adapter (built-in or USB)
-- GPS receiver (optional, falls back to manual coordinates)
-
-## GPS Mode
-
-Real-time GPS position tracking with live map visualization.
-
-### Features
-- **Live position tracking** - Real-time latitude, longitude, altitude display
-- **Interactive map** - Current position on Leaflet map with track history
-- **Speed and heading** - Real-time speed (km/h) and compass heading
-- **Satellite info** - Number of satellites in view and fix quality
-- **Track recording** - Record GPS tracks with export capability
-- **Accuracy display** - Horizontal and vertical position accuracy (EPX/EPY)
-
-### Requirements
-- USB GPS receiver connected via gpsd
-- gpsd daemon running (`sudo gpsd /dev/ttyUSB0 -F /var/run/gpsd.sock`)
-
 ## TSCM Counter-Surveillance Mode
 
 Technical Surveillance Countermeasures (TSCM) screening for detecting wireless surveillance indicators.

docs/USAGE.md

@@ -57,32 +57,6 @@ INTERCEPT automatically detects known trackers:
 - Samsung SmartTag
 - Chipolo
 
-## Sub-GHz Analyzer
-
-1. **Connect HackRF** - Plug in your HackRF One device
-2. **Set Frequency** - Enter a frequency in the 300-928 MHz ISM range or use a preset
-3. **Start Capture** - Click "Start Capture" to begin signal analysis
-4. **View Spectrum** - Real-time spectrum visualization of the selected band
-5. **Protocol Decoding** - Identified protocols are displayed with decoded data
-
-### Supported Protocols
-
-Common ISM band protocols including garage doors, key fobs, weather stations, and IoT devices in the 300-928 MHz range.
-
-## Listening Post
-
-1. **Select Hardware** - Choose your SDR type
-2. **Set Frequency Range** - Define start and end frequencies for scanning
-3. **Start Scanning** - Click "Start Scan" for wideband sweep
-4. **View Signals** - Discovered signals are listed with frequency and SNR
-5. **Tune In** - Click a signal to tune the audio demodulator
-6. **Listen** - Real-time audio plays in your browser
-
-### Demodulation Modes
-
-- **FM** - Narrowband and wideband FM
-- **SSB** - Upper and lower sideband for amateur radio and shortwave
-
 ## Aircraft Mode (ADS-B)
 
 1. **Select Hardware** - Choose your SDR type (RTL-SDR uses dump1090, others use readsb)
@@ -170,8 +144,6 @@ PGDATA_PATH=/mnt/usbpi1/intercept/pgdata
 3. View aircraft history and timelines
 4. Stop tracking when desired (session history is recorded)
 
-If the History dashboard shows **HISTORY DISABLED**, enable `INTERCEPT_ADSB_HISTORY_ENABLED=true` and ensure Postgres is running.
-
 ## Satellite Mode
 
 1. **Set Location** - Choose location source:
@@ -191,106 +163,6 @@ If the History dashboard shows **HISTORY DISABLED**, enable `INTERCEPT_ADSB_HIST
 3. Choose a category (Amateur, Weather, ISS, Starlink, etc.)
 4. Select satellites to add
 
-## Weather Satellites
-
-1. **Set Location** - Enter observer coordinates or use GPS
-2. **Select Satellite** - Choose NOAA (APT) or Meteor (LRPT)
-3. **View Passes** - Upcoming passes shown with polar plot and ground track
-4. **Start Capture** - Click "Start Capture" when a satellite is overhead, or enable auto-scheduler
-5. **View Images** - Decoded imagery appears in the gallery
-
-### Auto-Scheduler
-
-Enable the auto-scheduler to automatically capture passes:
-- Calculates upcoming NOAA and Meteor passes for your location
-- Starts SatDump at the correct time and frequency
-- Decoded images are saved with timestamps
-
-## AIS Vessel Tracking
-
-1. **Select Hardware** - Choose your SDR type
-2. **Start Tracking** - Click "Start Tracking" to monitor AIS frequencies (161.975/162.025 MHz)
-3. **View Map** - Vessels appear on the interactive maritime map
-4. **Click Vessels** - View name, MMSI, callsign, destination, speed, heading
-5. **Full Dashboard** - Click "Full Screen Dashboard" for dedicated maritime view
-
-### VHF DSC Channel 70
-
-Digital Selective Calling monitoring runs alongside AIS:
-- Distress, Urgency, Safety, and Routine messages
-- Distress positions plotted with pulsing alert markers
-- Audio alerts for critical messages
-
-## APRS
-
-1. **Select Hardware** - Choose your SDR type
-2. **Set Frequency** - Defaults to regional APRS frequency (144.390 MHz NA, 144.800 MHz EU)
-3. **Start Decoding** - Click "Start Decoding" to begin packet radio reception via direwolf
-4. **View Map** - Station positions appear on the interactive map
-5. **View Messages** - Position reports, telemetry, and messages displayed in real time
-
-## Utility Meters
-
-1. **Start Monitoring** - Click "Start" to begin meter broadcast reception via rtl_amr
-2. **View Meters** - Decoded meter data appears with meter ID, type, and consumption
-3. **Filter** - Filter by meter type (electric, gas, water) or meter ID
-
-## BT Locate (SAR Device Location)
-
-1. **Set Target** - Enter one or more target identifiers:
-   - **MAC Address** - Exact Bluetooth address (AA:BB:CC:DD:EE:FF)
-   - **Name Pattern** - Substring match (e.g., "iPhone", "Galaxy")
-   - **IRK** - 32-character hex Identity Resolving Key for RPA resolution
-   - **Detect IRKs** - Click "Detect" to auto-extract IRKs from paired devices
-2. **Choose Environment** - Select the RF environment preset:
-   - **Open Field** (n=2.0) - Best for open areas with line-of-sight
-   - **Outdoor** (n=2.2) - Default, works well in most outdoor settings
-   - **Indoor** (n=3.0) - For buildings with walls and obstacles
-3. **Start Locate** - Click "Start Locate" to begin tracking
-4. **Monitor HUD** - The proximity display shows:
-   - Proximity band (IMMEDIATE / NEAR / FAR)
-   - Estimated distance in meters
-   - Raw RSSI and smoothed RSSI average
-   - Detection count and GPS-tagged points
-5. **Follow the Signal** - Move towards stronger signal (higher RSSI / closer distance)
-6. **Audio Alerts** - Enable audio for proximity tones that increase in pitch as you get closer
-7. **Review Trail** - Check the map for GPS-tagged detection trail
-
-### Hand-off from Bluetooth Mode
-
-1. Open Bluetooth scanning mode and find the target device
-2. Click the "Locate" button on the device card
-3. BT Locate opens with the device pre-filled
-4. Click "Start Locate" to begin tracking
-
-### Tips
-
-- For devices with address randomization (iPhones, modern Android), use the IRK method
-- Click "Detect" next to the IRK field to auto-extract IRKs from paired devices
-- The RSSI chart shows signal trend over time — use it to determine if you're getting closer
-- Clear the trail when starting a new search area
-
-## GPS Mode
-
-1. **Start GPS** - Click "Start" to connect to gpsd and begin position tracking
-2. **View Map** - Your position appears on the interactive map with a track trail
-3. **Monitor Stats** - Speed, heading, altitude, and satellite count displayed in real-time
-4. **Record Track** - Enable track recording to save your path
-
-### Tips
-
-- Ensure gpsd is running: `sudo gpsd /dev/ttyUSB0 -F /var/run/gpsd.sock`
-- GPS fix may take 30-60 seconds after cold start
-- Accuracy improves with more satellites in view
-
-## Meshtastic
-
-1. **Connect Device** - Plug in a Meshtastic device via USB or connect via TCP
-2. **Start** - Click "Start" to connect to the mesh network
-3. **View Messages** - Real-time message stream from the mesh
-4. **View Nodes** - Connected nodes displayed with signal metrics (RSSI, SNR)
-5. **Send Messages** - Type messages to broadcast on the mesh
-
 ## Remote Agents (Distributed SIGINT)
 
 Deploy lightweight sensor nodes across multiple locations and aggregate data to a central controller.

docs/index.html

@@ -35,7 +35,7 @@
             </div>
             <div class="hero-stats">
                 <div class="stat">
-                    <span class="stat-value">20+</span>
+                    <span class="stat-value">15+</span>
                     <span class="stat-label">Modes</span>
                 </div>
                 <div class="stat">
@@ -77,12 +77,6 @@
                     <p>Decode 200+ protocols including weather stations, TPMS, smart home devices, and IoT sensors via rtl_433.</p>
                 </div>
 
-                <div class="feature-card">
-                    <div class="feature-icon">📻</div>
-                    <h3>Sub-GHz Analyzer</h3>
-                    <p>HackRF-based signal capture and protocol decoding for 300-928 MHz ISM bands with spectrum analysis and replay.</p>
-                </div>
-
                 <div class="feature-card">
                     <div class="feature-icon">📻</div>
                     <h3>Listening Post</h3>
@@ -107,18 +101,6 @@
                     <p>Device discovery with tracker detection for AirTags, Tile, Samsung SmartTag, and other Bluetooth devices.</p>
                 </div>
 
-                <div class="feature-card">
-                    <div class="feature-icon">📍</div>
-                    <h3>BT Locate</h3>
-                    <p>SAR Bluetooth device location with GPS-tagged signal trail mapping, IRK-based RPA resolution, and proximity audio alerts.</p>
-                </div>
-
-                <div class="feature-card">
-                    <div class="feature-icon">🛰️</div>
-                    <h3>GPS Tracking</h3>
-                    <p>Real-time GPS position tracking with live map, speed, heading, altitude, satellite info, and track recording.</p>
-                </div>
-
                 <div class="feature-card">
                     <div class="feature-icon">🛡️</div>
                     <h3>TSCM</h3>
@@ -161,47 +143,11 @@
                     <p>LoRa mesh network integration. Connect to Meshtastic devices for decentralized, long-range communication monitoring.</p>
                 </div>
 
-                <div class="feature-card">
-                    <div class="feature-icon">🌧️</div>
-                    <h3>Weather Satellites</h3>
-                    <p>NOAA APT and Meteor LRPT image decoding via SatDump with auto-scheduler, polar plot, and ground track map.</p>
-                </div>
-
                 <div class="feature-card">
                     <div class="feature-icon">🖼️</div>
                     <h3>ISS SSTV</h3>
                     <p>Receive Slow Scan Television from the ISS. Real-time tracking globe, pass predictions, and image decoding.</p>
                 </div>
-
-                <div class="feature-card">
-                    <div class="feature-icon">🖼️</div>
-                    <h3>HF SSTV</h3>
-                    <p>Terrestrial SSTV on shortwave frequencies. Decode amateur radio image transmissions across HF, VHF, and UHF bands.</p>
-                </div>
-
-                <div class="feature-card">
-                    <div class="feature-icon">✈️</div>
-                    <h3>ACARS</h3>
-                    <p>Aircraft datalink messages via acarsdec. Decode operational, weather, and position reports from commercial flights.</p>
-                </div>
-
-                <div class="feature-card">
-                    <div class="feature-icon">📍</div>
-                    <h3>APRS</h3>
-                    <p>Amateur packet radio position reports and telemetry via direwolf. Track amateur radio operators on an interactive map.</p>
-                </div>
-
-                <div class="feature-card">
-                    <div class="feature-icon">🌐</div>
-                    <h3>WebSDR</h3>
-                    <p>Remote HF/shortwave listening via the KiwiSDR network. Access receivers worldwide with real-time audio streaming.</p>
-                </div>
-
-                <div class="feature-card">
-                    <div class="feature-icon">⚡</div>
-                    <h3>Utility Meters</h3>
-                    <p>Smart meter monitoring via rtl_amr. Receive electric, gas, and water meter broadcasts in real time.</p>
-                </div>
             </div>
         </div>
     </section>
@@ -248,10 +194,6 @@
                     <img src="images/ais.png" alt="AIS Vessel Tracking">
                     <span class="screenshot-label">AIS Vessel Tracking</span>
                 </div>
-                <div class="screenshot-item">
-                    <img src="images/bt-locate.png" alt="BT Locate SAR Tracker">
-                    <span class="screenshot-label">BT Locate — SAR Tracker</span>
-                </div>
             </div>
         </div>
     </section>

download-weather-sat-samples.sh

@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-# Download sample NOAA APT recordings for testing the weather satellite
-# test-decode feature. These are FM-demodulated audio WAV files.
-#
-# Usage:
-#   ./download-weather-sat-samples.sh
-#   docker exec intercept /app/download-weather-sat-samples.sh
-
-set -euo pipefail
-
-SAMPLE_DIR="$(dirname "$0")/data/weather_sat/samples"
-mkdir -p "$SAMPLE_DIR"
-
-echo "Downloading NOAA APT sample files to $SAMPLE_DIR ..."
-
-# Full satellite pass recorded over Argentina (NOAA, 11025 Hz mono WAV)
-# Source: https://github.com/martinber/noaa-apt
-if [ ! -f "$SAMPLE_DIR/noaa_apt_argentina.wav" ]; then
-    echo "  -> noaa_apt_argentina.wav (18 MB) ..."
-    curl -fSL -o "$SAMPLE_DIR/noaa_apt_argentina.wav" \
-        "https://noaa-apt.mbernardi.com.ar/examples/argentina.wav"
-else
-    echo "  -> noaa_apt_argentina.wav (already exists)"
-fi
-
-echo ""
-echo "Done. Test decode with:"
-echo "  Satellite:    NOAA-18"
-echo "  File path:    data/weather_sat/samples/noaa_apt_argentina.wav"
-echo "  Sample rate:  11025 Hz"

gp.php

@@ -1,210 +0,0 @@
-DMSP 5D-3 F16 (USA 172) 
-1 28054U 03048A   26037.66410905  .00000171  00000+0  11311-3 0  9991
-2 28054  99.0018  60.5544 0007736 150.6435 318.8272 14.14449870151032
-METEOSAT-9 (MSG-2)      
-1 28912U 05049B   26037.20698824  .00000122  00000+0  00000+0 0  9990
-2 28912   9.0646  55.4438 0001292 220.3216 340.7358  1.00280364  5681
-DMSP 5D-3 F17 (USA 191) 
-1 29522U 06050A   26037.63495522  .00000221  00000+0  13641-3 0  9997
-2 29522  98.7406  46.8646 0011088  71.3269 288.9107 14.14949568993957
-FENGYUN 3A              
-1 32958U 08026A   26037.29889977  .00000162  00000+0  97205-4 0  9995
-2 32958  98.6761 340.6748 0009336 139.4536 220.7337 14.19536323916838
-GOES 14                 
-1 35491U 09033A   26037.59737599  .00000128  00000+0  00000+0 0  9998
-2 35491   1.3510  84.7861 0001663 279.3774 203.6871  1.00112472  5283
-DMSP 5D-3 F18 (USA 210) 
-1 35951U 09057A   26037.59574243  .00000344  00000+0  20119-3 0  9997
-2 35951  98.8912  18.7405 0010014 262.2671  97.7365 14.14814612841124
-EWS-G2 (GOES 15)        
-1 36411U 10008A   26037.42417604  .00000037  00000+0  00000+0 0  9998
-2 36411   0.9477  85.6904 0004764 200.6178  64.5237  1.00275731 58322
-COMS 1                  
-1 36744U 10032A   26037.66884865 -.00000343  00000+0  00000+0 0  9998
-2 36744   4.4730  77.2684 0001088 239.9858 188.4845  1.00274368 49786
-FENGYUN 3B              
-1 37214U 10059A   26037.62488625  .00000510  00000+0  28715-3 0  9992
-2 37214  98.9821  82.9728 0021838 194.4193 280.6049 14.14810700788968
-SUOMI NPP               
-1 37849U 11061A   26037.58885771  .00000151  00000+0  92735-4 0  9993
-2 37849  98.7835 339.4455 0001677  23.1332 336.9919 14.19534335739918
-METEOSAT-10 (MSG-3)     
-1 38552U 12035B   26037.34062893 -.00000007  00000+0  00000+0 0  9993
-2 38552   4.3618  61.5789 0002324 286.1065 271.3938  1.00272839 49549
-METOP-B                 
-1 38771U 12049A   26037.61376690  .00000161  00000+0  93652-4 0  9994
-2 38771  98.6708  91.6029 0002456  28.4142 331.7169 14.21434029694718
-INSAT-3D                
-1 39216U 13038B   26037.58021591 -.00000338  00000+0  00000+0 0  9998
-2 39216   1.5890  84.3012 0001719 220.0673 170.6954  1.00273812 45771
-FENGYUN 3C              
-1 39260U 13052A   26037.57879946  .00000181  00000+0  11337-3 0  9991
-2 39260  98.4839  17.5531 0015475  42.6626 317.5748 14.15718213640089
-METEOR-M 2              
-1 40069U 14037A   26037.57010537  .00000364  00000+0  18579-3 0  9995
-2 40069  98.4979  18.0359 0006835  60.5067 299.6792 14.21415164600761
-HIMAWARI-8              
-1 40267U 14060A   26037.58238259 -.00000273  00000+0  00000+0 0  9991
-2 40267   0.0457 252.0286 0000958  31.3580 203.5957  1.00278490 41450
-FENGYUN 2G              
-1 40367U 14090A   26037.64556289 -.00000299  00000+0  00000+0 0  9996
-2 40367   5.3089  74.4184 0001565 198.1345 195.9683  1.00263067 40698
-METEOSAT-11 (MSG-4)     
-1 40732U 15034A   26037.62779616  .00000065  00000+0  00000+0 0  9990
-2 40732   2.8728  71.8294 0001180 241.7344  58.8290  1.00268087  5909
-ELEKTRO-L 2             
-1 41105U 15074A   26037.40900929 -.00000118  00000+0  00000+0 0  9998
-2 41105   6.3653  72.1489 0003612 229.0998 328.0297  1.00272232 37198
-INSAT-3DR               
-1 41752U 16054A   26037.65505200 -.00000075  00000+0  00000+0 0  9997
-2 41752   0.0554  93.8053 0013744 184.8269 167.9427  1.00271627 34504
-HIMAWARI-9              
-1 41836U 16064A   26037.58238259 -.00000273  00000+0  00000+0 0  9990
-2 41836   0.0124 137.0088 0001068 210.1850 139.9064  1.00271322 33905
-GOES 16                 
-1 41866U 16071A   26037.60517604 -.00000089  00000+0  00000+0 0  9993
-2 41866   0.1490  94.1417 0002832 199.6896 316.0413  1.00271854 33798
-FENGYUN 4A              
-1 41882U 16077A   26037.65041625 -.00000356  00000+0  00000+0 0  9994
-2 41882   1.9907  81.7886 0006284 132.9819 279.8453  1.00276098 33627
-CYGFM05                 
-1 41884U 16078A   26037.42561482  .00027408  00000+0  46309-3 0  9992
-2 41884  34.9596  42.6579 0007295 332.2973  27.7361 15.50585086508404
-CYGFM04                 
-1 41885U 16078B   26037.34428483  .00032519  00000+0  49575-3 0  9994
-2 41885  34.9348  16.2836 0005718 359.2189   0.8525 15.53424088508589
-CYGFM02                 
-1 41886U 16078C   26037.35007768  .00035591  00000+0  50564-3 0  9998
-2 41886  34.9436  13.7490 0006836   2.8379 357.2383 15.55324468508720
-CYGFM01                 
-1 41887U 16078D   26037.39685921  .00028560  00000+0  47572-3 0  9999
-2 41887  34.9425  44.8029 0007415 323.1915  36.8298 15.50976884508344
-CYGFM08                 
-1 41888U 16078E   26037.34185185  .00031327  00000+0  49606-3 0  9997
-2 41888  34.9457  27.4597 0008083 350.5361   9.5208 15.52364941508578
-CYGFM07                 
-1 41890U 16078G   26037.32199955  .00032204  00000+0  49829-3 0  9990
-2 41890  34.9475  16.2411 0005914   7.0804 353.0002 15.53017084508593
-CYGFM03                 
-1 41891U 16078H   26037.35550653  .00031487  00000+0  48940-3 0  9995
-2 41891  34.9430  17.9804 0005939 349.1458  10.9136 15.52895386508574
-FENGYUN 3D              
-1 43010U 17072A   26037.62659924  .00000092  00000+0  65298-4 0  9990
-2 43010  98.9980   9.7978 0002479  69.6779 290.4663 14.19704535426460
-NOAA 20 (JPSS-1)        
-1 43013U 17073A   26037.60336371  .00000124  00000+0  79520-4 0  9999
-2 43013  98.7658 338.3064 0000377  14.6433 345.4754 14.19527655425942
-GOES 17                 
-1 43226U 18022A   26037.60794939 -.00000180  00000+0  00000+0 0  9993
-2 43226   0.6016  88.1527 0002754 213.0089 324.8756  1.00269924 29115
-FENGYUN 2H              
-1 43491U 18050A   26037.66161282 -.00000125  00000+0  00000+0 0  9992
-2 43491   2.6948  80.6967 0002145 171.8276 201.3055  1.00274855 28134
-METOP-C                 
-1 43689U 18087A   26037.63948662  .00000167  00000+0  96262-4 0  9998
-2 43689  98.6834  99.5280 0001629 143.8933 216.2355 14.21510040376280
-GEO-KOMPSAT-2A          
-1 43823U 18100A   26037.57995591  .00000000  00000+0  00000+0 0  9996
-2 43823   0.0152  95.1913 0001141 313.4173  65.1318  1.00271011 26327
-METEOR-M2 2             
-1 44387U 19038A   26037.58492015  .00000244  00000+0  12531-3 0  9993
-2 44387  98.9044  23.0180 0002141  55.2566 304.8814 14.24320728342700
-ARKTIKA-M 1             
-1 47719U 21016A   26035.90384421 -.00000136  00000+0  00000+0 0  9994
-2 47719  63.1930  76.4940 7230705 269.3476  15.2984  2.00623094 36131
-FENGYUN 3E              
-1 49008U 21062A   26037.62586080  .00000245  00000+0  13631-3 0  9992
-2 49008  98.7499  42.4910 0002627  96.2819 263.8657 14.19890127238058
-GOES 18                 
-1 51850U 22021A   26037.59876267  .00000098  00000+0  00000+0 0  9999
-2 51850   0.0198  91.3546 0000843 290.2366 193.6737  1.00273310  5288
-NOAA 21 (JPSS-2)        
-1 54234U 22150A   26037.56792604  .00000152  00000+0  92800-4 0  9995
-2 54234  98.7521 338.1972 0001388 169.8161 190.3044 14.19543641168012
-METEOSAT-12 (MTG-I1)    
-1 54743U 22170C   26037.62580281 -.00000006  00000+0  00000+0 0  9990
-2 54743   0.7119  25.1556 0002027 273.4388  63.0828  1.00270670 11667
-TIANMU-1 03             
-1 55973U 23039A   26037.63298084  .00025307  00000+0  57478-3 0  9994
-2 55973  97.5143 206.9374 0002852 198.5193 161.5950 15.43014921160671
-TIANMU-1 04             
-1 55974U 23039B   26037.59957323  .00027172  00000+0  60888-3 0  9999
-2 55974  97.5075 206.0729 0003605 196.0743 164.0390 15.43399931160675
-TIANMU-1 05             
-1 55975U 23039C   26037.60840428  .00024975  00000+0  56836-3 0  9995
-2 55975  97.5122 206.5750 0002421 224.3240 135.7814 15.42959696160653
-TIANMU-1 06             
-1 55976U 23039D   26037.60004198  .00024821  00000+0  55598-3 0  9996
-2 55976  97.5133 207.0788 0002810 218.0193 142.0857 15.43432906160673
-FENGYUN 3G              
-1 56232U 23055A   26037.30935013  .00046475  00000+0  74423-3 0  9993
-2 56232  49.9940 300.8928 0009962 237.3703 122.6303 15.52544991159665
-METEOR-M2 3             
-1 57166U 23091A   26037.62090481  .00000022  00000+0  28455-4 0  9999
-2 57166  98.6282  95.1607 0004003 174.5474 185.5750 14.24034408135931
-TIANMU-1 07             
-1 57399U 23101A   26037.63242936  .00011510  00000+0  41012-3 0  9991
-2 57399  97.2786  91.2606 0002747 218.4597 141.6448 15.29074661141694
-TIANMU-1 08             
-1 57400U 23101B   26037.66743594  .00011474  00000+0  41016-3 0  9996
-2 57400  97.2774  91.0783 0004440 227.8102 132.2762 15.28966110141699
-TIANMU-1 09             
-1 57401U 23101C   26037.65072558  .00011360  00000+0  40433-3 0  9997
-2 57401  97.2732  90.5514 0003773 229.5297 130.5615 15.29113177141698
-TIANMU-1 10             
-1 57402U 23101D   26037.61974057  .00011836  00000+0  42113-3 0  9994
-2 57402  97.2810  91.4302 0005461 233.7620 126.3116 15.29106286141685
-FENGYUN 3F              
-1 57490U 23111A   26037.61228373  .00000135  00000+0  84019-4 0  9997
-2 57490  98.6988 109.9815 0001494  99.6638 260.4707 14.19912110130332
-ARKTIKA-M 2             
-1 58584U 23198A   26037.15964049  .00000160  00000+0  00000+0 0  9994
-2 58584  63.2225 168.8508 6872222 267.8808  18.8364  2.00612776 15698
-TIANMU-1 11             
-1 58645U 23205A   26037.58628093  .00009545  00000+0  37951-3 0  9999
-2 58645  97.3574  61.2485 0010997 103.8713 256.3749 15.25445149117601
-TIANMU-1 12             
-1 58646U 23205B   26037.61705312  .00010066  00000+0  40129-3 0  9995
-2 58646  97.3561  61.0663 0009308  89.8253 270.4052 15.25355570117590
-TIANMU-1 13             
-1 58647U 23205C   26037.64894829  .00010029  00000+0  39925-3 0  9992
-2 58647  97.3589  61.3229 0009456  74.8265 285.4018 15.25403883117592
-TIANMU-1 14             
-1 58648U 23205D   26037.63305929  .00009719  00000+0  38718-3 0  9993
-2 58648  97.3523  60.6045 0010314  77.9995 282.2399 15.25381326117592
-TIANMU-1 19             
-1 58660U 23208A   26037.58812600  .00016491  00000+0  58449-3 0  9991
-2 58660  97.4377 153.5627 0006125  66.0574 294.1307 15.29155961117352
-TIANMU-1 20             
-1 58661U 23208B   26037.59661536  .00016638  00000+0  56823-3 0  9990
-2 58661  97.4315 154.0738 0008420  72.4906 287.7255 15.30347593117439
-TIANMU-1 21             
-1 58662U 23208C   26037.56944589  .00017161  00000+0  55253-3 0  9998
-2 58662  97.4367 156.2063 0008160  67.8039 292.4068 15.32247056117540
-TIANMU-1 22             
-1 58663U 23208D   26037.59847459  .00015396  00000+0  55169-3 0  9994
-2 58663  97.4371 153.6033 0005010  87.2275 272.9538 15.28818503117364
-TIANMU-1 15             
-1 58700U 24004A   26037.63062994  .00009739  00000+0  38850-3 0  9991
-2 58700  97.4651 223.9243 0008449  88.7599 271.4607 15.25356935115862
-TIANMU-1 16             
-1 58701U 24004B   26037.61474986  .00010691  00000+0  42590-3 0  9993
-2 58701  97.4590 223.2544 0006831  91.0928 269.1093 15.25387104115863
-TIANMU-1 17             
-1 58702U 24004C   26037.59783649  .00011079  00000+0  44078-3 0  9994
-2 58702  97.4624 223.6760 0006020  92.0871 268.1056 15.25425175115852
-TIANMU-1 18             
-1 58703U 24004D   26037.64767373  .00010786  00000+0  42976-3 0  9996
-2 58703  97.4642 223.9320 0005432  91.0134 269.1726 15.25387870115860
-INSAT-3DS               
-1 58990U 24033A   26037.64159978 -.00000153  00000+0  00000+0 0  9998
-2 58990   0.0277 242.2492 0001855  99.2205 108.3003  1.00271452 45758
-METEOR-M2 4             
-1 59051U 24039A   26037.62796654  .00000070  00000+0  51194-4 0  9991
-2 59051  98.6849 358.6843 0006923 178.9165 181.2029 14.22412185100701
-GOES 19                 
-1 60133U 24119A   26037.61098274 -.00000246  00000+0  00000+0 0  9996
-2 60133   0.0027 288.6290 0001204  74.2636 278.5881  1.00270967  5651
-FENGYUN 3H              
-1 65815U 25219A   26037.60879211  .00000151  00000+0  91464-4 0  9990
-2 65815  98.6649 341.0050 0001596  86.5100 273.6260 14.19924132 18857

intercept_agent.py

@@ -843,7 +843,6 @@ class ModeManager:
                 'anomalies': getattr(self, 'tscm_anomalies', []),
                 'baseline': getattr(self, 'tscm_baseline', {}),
                 'wifi_devices': list(self.wifi_networks.values()),
-                'wifi_clients': list(getattr(self, 'tscm_wifi_clients', {}).values()),
                 'bt_devices': list(self.bluetooth_devices.values()),
                 'rf_signals': getattr(self, 'tscm_rf_signals', []),
             }
@@ -1117,7 +1116,6 @@ class ModeManager:
             self.tscm_anomalies = []
             self.tscm_baseline = {}
             self.tscm_rf_signals = []
-            self.tscm_wifi_clients = {}
             # Clear reported threat tracking sets
             if hasattr(self, '_tscm_reported_wifi'):
                 self._tscm_reported_wifi.clear()
@@ -1543,7 +1541,6 @@ class ModeManager:
         """Start WiFi scanning using Intercept's UnifiedWiFiScanner."""
         interface = params.get('interface')
         channel = params.get('channel')
-        channels = params.get('channels')
         band = params.get('band', 'abg')
         scan_type = params.get('scan_type', 'deep')
 
@@ -1574,21 +1571,8 @@ class ModeManager:
             else:
                 scan_band = 'all'
 
-            channel_list = None
-            if channels:
-                if isinstance(channels, str):
-                    channel_list = [c.strip() for c in channels.split(',') if c.strip()]
-                elif isinstance(channels, (list, tuple, set)):
-                    channel_list = list(channels)
-                else:
-                    channel_list = [channels]
-                try:
-                    channel_list = [int(c) for c in channel_list]
-                except (TypeError, ValueError):
-                    return {'status': 'error', 'message': 'Invalid channels'}
-
             # Start deep scan
-            if scanner.start_deep_scan(interface=interface, band=scan_band, channel=channel, channels=channel_list):
+            if scanner.start_deep_scan(interface=interface, band=scan_band, channel=channel):
                 # Start thread to sync data to agent's dictionaries
                 thread = threading.Thread(
                     target=self._wifi_data_sync,
@@ -1609,7 +1593,7 @@ class ModeManager:
 
         except ImportError:
             # Fallback to direct airodump-ng
-            return self._start_wifi_fallback(interface, channel, band, channels)
+            return self._start_wifi_fallback(interface, channel, band)
         except Exception as e:
             logger.error(f"WiFi scanner error: {e}")
             return {'status': 'error', 'message': str(e)}
@@ -1646,13 +1630,7 @@ class ModeManager:
         if hasattr(self, '_wifi_scanner_instance') and self._wifi_scanner_instance:
             self._wifi_scanner_instance.stop_deep_scan()
 
-    def _start_wifi_fallback(
+    def _start_wifi_fallback(self, interface: str | None, channel: int | None, band: str) -> dict:
-        self,
-        interface: str | None,
-        channel: int | None,
-        band: str,
-        channels: list[int] | str | None = None,
-    ) -> dict:
         """Fallback WiFi deep scan using airodump-ng directly."""
         if not interface:
             return {'status': 'error', 'message': 'WiFi interface required'}
@@ -1680,22 +1658,7 @@ class ModeManager:
         cmd = [airodump_path, '-w', csv_path, '--output-format', output_formats, '--band', band]
         if gps_manager.is_running:
             cmd.append('--gpsd')
-        channel_list = None
+        if channel:
-        if channels:
-            if isinstance(channels, str):
-                channel_list = [c.strip() for c in channels.split(',') if c.strip()]
-            elif isinstance(channels, (list, tuple, set)):
-                channel_list = list(channels)
-            else:
-                channel_list = [channels]
-            try:
-                channel_list = [int(c) for c in channel_list]
-            except (TypeError, ValueError):
-                return {'status': 'error', 'message': 'Invalid channels'}
-
-        if channel_list:
-            cmd.extend(['-c', ','.join(str(c) for c in channel_list)])
-        elif channel:
             cmd.extend(['-c', str(channel)])
         cmd.append(interface)
 
@@ -2022,7 +1985,7 @@ class ModeManager:
                     'agent_gps': gps_manager.position
                 }
 
-            scanner.add_device_callback(on_device_updated)
+            scanner.set_on_device_updated(on_device_updated)
 
             # Start scanning
             if scanner.start_scan(mode=mode_param, duration_s=duration):
@@ -3150,10 +3113,7 @@ class ModeManager:
             self.tscm_anomalies = []
         if not hasattr(self, 'tscm_rf_signals'):
             self.tscm_rf_signals = []
-        if not hasattr(self, 'tscm_wifi_clients'):
-            self.tscm_wifi_clients = {}
         self.tscm_anomalies.clear()
-        self.tscm_wifi_clients.clear()
 
         # Get params for what to scan
         scan_wifi = params.get('wifi', True)
@@ -3208,7 +3168,7 @@ class ModeManager:
         stop_event = self.stop_events.get(mode)
 
         # Import existing Intercept TSCM functions
-        from routes.tscm import _scan_wifi_networks, _scan_wifi_clients, _scan_bluetooth_devices, _scan_rf_signals
+        from routes.tscm import _scan_wifi_networks, _scan_bluetooth_devices, _scan_rf_signals
         logger.info("TSCM imports successful")
 
         sweep_ranges = None
@@ -3243,7 +3203,6 @@ class ModeManager:
 
         # Track devices seen during this sweep (like local mode's all_wifi/all_bt dicts)
         seen_wifi = {}
-        seen_wifi_clients = {}
         seen_bt = {}
 
         last_rf_scan = 0
@@ -3304,47 +3263,6 @@ class ModeManager:
                                     enriched['recommended_action'] = profile.recommended_action
 
                                 self.wifi_networks[bssid] = enriched
-
-                        # WiFi clients (monitor mode only)
-                        try:
-                            wifi_clients = _scan_wifi_clients(wifi_interface or '')
-                            for client in wifi_clients:
-                                mac = (client.get('mac') or '').upper()
-                                if not mac or mac in seen_wifi_clients:
-                                    continue
-                                seen_wifi_clients[mac] = client
-
-                                rssi_val = client.get('rssi_current')
-                                if rssi_val is None:
-                                    rssi_val = client.get('rssi_median') or client.get('rssi_ema')
-
-                                client_device = {
-                                    'mac': mac,
-                                    'vendor': client.get('vendor'),
-                                    'name': client.get('vendor') or 'WiFi Client',
-                                    'rssi': rssi_val,
-                                    'associated_bssid': client.get('associated_bssid'),
-                                    'probed_ssids': client.get('probed_ssids', []),
-                                    'probe_count': client.get('probe_count', len(client.get('probed_ssids', []))),
-                                    'is_client': True,
-                                }
-
-                                if self._tscm_correlation:
-                                    profile = self._tscm_correlation.analyze_wifi_device(client_device)
-                                    client_device['classification'] = profile.risk_level.value
-                                    client_device['score'] = profile.total_score
-                                    client_device['score_modifier'] = profile.score_modifier
-                                    client_device['known_device'] = profile.known_device
-                                    client_device['known_device_name'] = profile.known_device_name
-                                    client_device['indicators'] = [
-                                        {'type': i.type.value, 'desc': i.description}
-                                        for i in profile.indicators
-                                    ]
-                                    client_device['recommended_action'] = profile.recommended_action
-
-                                self.tscm_wifi_clients[mac] = client_device
-                        except Exception as e:
-                            logger.debug(f"WiFi client scan error: {e}")
                     except Exception as e:
                         logger.debug(f"WiFi scan error: {e}")
 

pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "intercept"
-version = "2.18.0"
+version = "2.14.0"
 description = "Signal Intelligence Platform - Pager/433MHz/ADS-B/Satellite/WiFi/Bluetooth"
 readme = "README.md"
 requires-python = ">=3.9"
-license = {text = "Apache-2.0"}
+license = {text = "MIT"}
 authors = [
     {name = "Intercept Contributors"}
 ]
@@ -14,7 +14,7 @@ classifiers = [
     "Environment :: Web Environment",
     "Framework :: Flask",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: Apache Software License",
+    "License :: OSI Approved :: MIT License",
     "Operating System :: POSIX :: Linux",
     "Operating System :: MacOS",
     "Programming Language :: Python :: 3",

requirements.txt

@@ -32,9 +32,6 @@ scapy>=2.4.5
 # QR code generation for Meshtastic channels (optional)
 qrcode[pil]>=7.4
 
-# BLE RPA resolution for BT Locate (optional - for SAR device tracking)
-cryptography>=41.0.0
-
 # Development dependencies (install with: pip install -r requirements-dev.txt)
 # pytest>=7.0.0
 # pytest-cov>=4.0.0

routes/__init__.py

@@ -26,14 +26,9 @@ def register_blueprints(app):
     from .offline import offline_bp
     from .updater import updater_bp
     from .sstv import sstv_bp
-    from .weather_sat import weather_sat_bp
     from .sstv_general import sstv_general_bp
     from .dmr import dmr_bp
     from .websdr import websdr_bp
-    from .alerts import alerts_bp
-    from .recordings import recordings_bp
-    from .subghz import subghz_bp
-    from .bt_locate import bt_locate_bp
 
     app.register_blueprint(pager_bp)
     app.register_blueprint(sensor_bp)
@@ -59,14 +54,9 @@ def register_blueprints(app):
     app.register_blueprint(offline_bp)  # Offline mode settings
     app.register_blueprint(updater_bp)  # GitHub update checking
     app.register_blueprint(sstv_bp)  # ISS SSTV decoder
-    app.register_blueprint(weather_sat_bp)  # NOAA/Meteor weather satellite decoder
     app.register_blueprint(sstv_general_bp)  # General terrestrial SSTV
     app.register_blueprint(dmr_bp)  # DMR / P25 / Digital Voice
     app.register_blueprint(websdr_bp)  # HF/Shortwave WebSDR
-    app.register_blueprint(alerts_bp)  # Cross-mode alerts
-    app.register_blueprint(recordings_bp)  # Session recordings
-    app.register_blueprint(subghz_bp)  # SubGHz transceiver (HackRF)
-    app.register_blueprint(bt_locate_bp)  # BT Locate SAR device tracking
 
     # Initialize TSCM state with queue and lock from app
     import app as app_module

routes/acars.py

@@ -20,9 +20,7 @@ from flask import Blueprint, jsonify, request, Response
 import app as app_module
 from utils.logging import sensor_logger as logger
 from utils.validation import validate_device_index, validate_gain, validate_ppm
-from utils.sdr import SDRFactory, SDRType
 from utils.sse import format_sse
-from utils.event_pipeline import process_event
 from utils.constants import (
     PROCESS_TERMINATE_TIMEOUT,
     SSE_KEEPALIVE_INTERVAL,
@@ -251,22 +249,12 @@ def start_acars() -> Response:
     acars_message_count = 0
     acars_last_message_time = None
 
-    # Resolve SDR type for device selection
-    sdr_type_str = data.get('sdr_type', 'rtlsdr')
-    try:
-        sdr_type = SDRType(sdr_type_str)
-    except ValueError:
-        sdr_type = SDRType.RTL_SDR
-
-    is_soapy = sdr_type not in (SDRType.RTL_SDR,)
-
     # Build acarsdec command
     # Different forks have different syntax:
     # - TLeconte v4+: acarsdec -j -g <gain> -p <ppm> -r <device> <freq1> <freq2> ...
     # - TLeconte v3: acarsdec -o 4 -g <gain> -p <ppm> -r <device> <freq1> <freq2> ...
     # - f00b4r0 (DragonOS): acarsdec --output json:file:- -g <gain> -p <ppm> -r <device> <freq1> ...
-    # SoapySDR devices: TLeconte uses -d <device_string>, f00b4r0 uses --soapysdr <device_string>
+    # Note: gain/ppm must come BEFORE -r
-    # Note: gain/ppm must come BEFORE -r/-d
     json_flag = get_acarsdec_json_flag(acarsdec_path)
     cmd = [acarsdec_path]
     if json_flag == '--output':
@@ -277,33 +265,21 @@ def start_acars() -> Response:
     else:
         cmd.extend(['-o', '4'])  # JSON output (TLeconte v3.x)
 
-    # Add gain if not auto (must be before -r/-d)
+    # Add gain if not auto (must be before -r)
     if gain and str(gain) != '0':
         cmd.extend(['-g', str(gain)])
 
-    # Add PPM correction if specified (must be before -r/-d)
+    # Add PPM correction if specified (must be before -r)
     if ppm and str(ppm) != '0':
         cmd.extend(['-p', str(ppm)])
 
     # Add device and frequencies
-    if is_soapy:
+    # f00b4r0 uses --rtlsdr <device>, TLeconte uses -r <device>
-        # SoapySDR device (SDRplay, LimeSDR, Airspy, etc.)
-        sdr_device = SDRFactory.create_default_device(sdr_type, index=device_int)
-        # Build SoapySDR driver string (e.g., "driver=sdrplay,serial=...")
-        builder = SDRFactory.get_builder(sdr_type)
-        device_str = builder._build_device_string(sdr_device)
     if json_flag == '--output':
-            cmd.extend(['-m', '256'])
-            cmd.extend(['--soapysdr', device_str])
-        else:
-            cmd.extend(['-d', device_str])
-    elif json_flag == '--output':
-        # f00b4r0 fork RTL-SDR: --rtlsdr <device>
         # Use 3.2 MS/s sample rate for wider bandwidth (handles NA frequency span)
         cmd.extend(['-m', '256'])
         cmd.extend(['--rtlsdr', str(device)])
     else:
-        # TLeconte fork RTL-SDR: -r <device>
         cmd.extend(['-r', str(device)])
     cmd.extend(frequencies)
 
@@ -417,10 +393,6 @@ def stream_acars() -> Response:
             try:
                 msg = app_module.acars_queue.get(timeout=SSE_QUEUE_TIMEOUT)
                 last_keepalive = time.time()
-                try:
-                    process_event('acars', msg, msg.get('type'))
-                except Exception:
-                    pass
                 yield format_sse(msg)
             except queue.Empty:
                 now = time.time()

routes/adsb.py

@@ -38,13 +38,11 @@ from config import (
     SHARED_OBSERVER_LOCATION_ENABLED,
 )
 from utils.logging import adsb_logger as logger
-from utils.process import write_dump1090_pid, clear_dump1090_pid, cleanup_stale_dump1090
 from utils.validation import (
     validate_device_index, validate_gain,
     validate_rtl_tcp_host, validate_rtl_tcp_port
 )
 from utils.sse import format_sse
-from utils.event_pipeline import process_event
 from utils.sdr import SDRFactory, SDRType
 from utils.constants import (
     ADSB_SBS_PORT,
@@ -634,9 +632,6 @@ def start_adsb():
             'session': session
         })
 
-    # Kill any stale app-spawned dump1090 from a previous run before checking the port
-    cleanup_stale_dump1090()
-
     # Check if dump1090 is already running externally (e.g., user started it manually)
     existing_service = check_dump1090_service()
     if existing_service:
@@ -689,7 +684,6 @@ def start_adsb():
             except (ProcessLookupError, OSError):
                 pass
         app_module.adsb_process = None
-        clear_dump1090_pid()
         logger.info("Killed stale ADS-B process")
 
     # Check if device is available before starting local dump1090
@@ -726,7 +720,6 @@ def start_adsb():
             stderr=subprocess.PIPE,
             start_new_session=True  # Create new process group for clean shutdown
         )
-        write_dump1090_pid(app_module.adsb_process.pid)
 
         time.sleep(DUMP1090_START_WAIT)
 
@@ -825,7 +818,6 @@ def stop_adsb():
                 except (ProcessLookupError, OSError):
                     pass
             app_module.adsb_process = None
-            clear_dump1090_pid()
             logger.info("ADS-B process stopped")
 
         # Release device from registry
@@ -851,10 +843,6 @@ def stream_adsb():
             try:
                 msg = app_module.adsb_queue.get(timeout=SSE_QUEUE_TIMEOUT)
                 last_keepalive = time.time()
-                try:
-                    process_event('adsb', msg, msg.get('type'))
-                except Exception:
-                    pass
                 yield format_sse(msg)
             except queue.Empty:
                 now = time.time()

routes/ais.py

@@ -19,7 +19,6 @@ from config import SHARED_OBSERVER_LOCATION_ENABLED
 from utils.logging import get_logger
 from utils.validation import validate_device_index, validate_gain
 from utils.sse import format_sse
-from utils.event_pipeline import process_event
 from utils.sdr import SDRFactory, SDRType
 from utils.constants import (
     AIS_TCP_PORT,
@@ -485,10 +484,6 @@ def stream_ais():
             try:
                 msg = app_module.ais_queue.get(timeout=SSE_QUEUE_TIMEOUT)
                 last_keepalive = time.time()
-                try:
-                    process_event('ais', msg, msg.get('type'))
-                except Exception:
-                    pass
                 yield format_sse(msg)
             except queue.Empty:
                 now = time.time()

routes/alerts.py

@@ -1,76 +0,0 @@
-"""Alerting API endpoints."""
-
-from __future__ import annotations
-
-import queue
-import time
-from typing import Generator
-
-from flask import Blueprint, Response, jsonify, request
-
-from utils.alerts import get_alert_manager
-from utils.sse import format_sse
-
-alerts_bp = Blueprint('alerts', __name__, url_prefix='/alerts')
-
-
-@alerts_bp.route('/rules', methods=['GET'])
-def list_rules():
-    manager = get_alert_manager()
-    include_disabled = request.args.get('all') in ('1', 'true', 'yes')
-    return jsonify({'status': 'success', 'rules': manager.list_rules(include_disabled=include_disabled)})
-
-
-@alerts_bp.route('/rules', methods=['POST'])
-def create_rule():
-    data = request.get_json() or {}
-    if not isinstance(data.get('match', {}), dict):
-        return jsonify({'status': 'error', 'message': 'match must be a JSON object'}), 400
-
-    manager = get_alert_manager()
-    rule_id = manager.add_rule(data)
-    return jsonify({'status': 'success', 'rule_id': rule_id})
-
-
-@alerts_bp.route('/rules/<int:rule_id>', methods=['PUT', 'PATCH'])
-def update_rule(rule_id: int):
-    data = request.get_json() or {}
-    manager = get_alert_manager()
-    ok = manager.update_rule(rule_id, data)
-    if not ok:
-        return jsonify({'status': 'error', 'message': 'Rule not found or no changes'}), 404
-    return jsonify({'status': 'success'})
-
-
-@alerts_bp.route('/rules/<int:rule_id>', methods=['DELETE'])
-def delete_rule(rule_id: int):
-    manager = get_alert_manager()
-    ok = manager.delete_rule(rule_id)
-    if not ok:
-        return jsonify({'status': 'error', 'message': 'Rule not found'}), 404
-    return jsonify({'status': 'success'})
-
-
-@alerts_bp.route('/events', methods=['GET'])
-def list_events():
-    manager = get_alert_manager()
-    limit = request.args.get('limit', default=100, type=int)
-    mode = request.args.get('mode')
-    severity = request.args.get('severity')
-    events = manager.list_events(limit=limit, mode=mode, severity=severity)
-    return jsonify({'status': 'success', 'events': events})
-
-
-@alerts_bp.route('/stream', methods=['GET'])
-def stream_alerts() -> Response:
-    manager = get_alert_manager()
-
-    def generate() -> Generator[str, None, None]:
-        for event in manager.stream_events(timeout=1.0):
-            yield format_sse(event)
-
-    response = Response(generate(), mimetype='text/event-stream')
-    response.headers['Cache-Control'] = 'no-cache'
-    response.headers['X-Accel-Buffering'] = 'no'
-    response.headers['Connection'] = 'keep-alive'
-    return response

routes/aprs.py

@@ -22,8 +22,6 @@ import app as app_module
 from utils.logging import sensor_logger as logger
 from utils.validation import validate_device_index, validate_gain, validate_ppm
 from utils.sse import format_sse
-from utils.event_pipeline import process_event
-from utils.sdr import SDRFactory, SDRType
 from utils.constants import (
     PROCESS_TERMINATE_TIMEOUT,
     SSE_KEEPALIVE_INTERVAL,
@@ -54,7 +52,6 @@ aprs_packet_count = 0
 aprs_station_count = 0
 aprs_last_packet_time = None
 aprs_stations = {}  # callsign -> station data
-APRS_MAX_STATIONS = 500  # Limit tracked stations to prevent memory growth
 
 # Meter rate limiting
 _last_meter_time = 0.0
@@ -78,11 +75,6 @@ def find_rtl_fm() -> Optional[str]:
     return shutil.which('rtl_fm')
 
 
-def find_rx_fm() -> Optional[str]:
-    """Find SoapySDR rx_fm binary."""
-    return shutil.which('rx_fm')
-
-
 def find_rtl_power() -> Optional[str]:
     """Find rtl_power binary for spectrum scanning."""
     return shutil.which('rtl_power')
@@ -1378,13 +1370,6 @@ def stream_aprs_output(rtl_process: subprocess.Popen, decoder_process: subproces
                         'last_seen': packet.get('timestamp'),
                         'packet_type': packet.get('packet_type'),
                     }
-                    # Evict oldest stations when limit is exceeded
-                    if len(aprs_stations) > APRS_MAX_STATIONS:
-                        oldest = min(
-                            aprs_stations,
-                            key=lambda k: aprs_stations[k].get('last_seen', ''),
-                        )
-                        del aprs_stations[oldest]
 
                 app_module.aprs_queue.put(packet)
 
@@ -1423,17 +1408,14 @@ def stream_aprs_output(rtl_process: subprocess.Popen, decoder_process: subproces
 def check_aprs_tools() -> Response:
     """Check for APRS decoding tools."""
     has_rtl_fm = find_rtl_fm() is not None
-    has_rx_fm = find_rx_fm() is not None
     has_direwolf = find_direwolf() is not None
     has_multimon = find_multimon_ng() is not None
-    has_fm_demod = has_rtl_fm or has_rx_fm
 
     return jsonify({
         'rtl_fm': has_rtl_fm,
-        'rx_fm': has_rx_fm,
         'direwolf': has_direwolf,
         'multimon_ng': has_multimon,
-        'ready': has_fm_demod and (has_direwolf or has_multimon),
+        'ready': has_rtl_fm and (has_direwolf or has_multimon),
         'decoder': 'direwolf' if has_direwolf else ('multimon-ng' if has_multimon else None)
     })
 
@@ -1476,6 +1458,14 @@ def start_aprs() -> Response:
                 'message': 'APRS decoder already running'
             }), 409
 
+    # Check for required tools
+    rtl_fm_path = find_rtl_fm()
+    if not rtl_fm_path:
+        return jsonify({
+            'status': 'error',
+            'message': 'rtl_fm not found. Install with: sudo apt install rtl-sdr'
+        }), 400
+
     # Check for decoder (prefer direwolf, fallback to multimon-ng)
     direwolf_path = find_direwolf()
     multimon_path = find_multimon_ng()
@@ -1496,25 +1486,6 @@ def start_aprs() -> Response:
     except ValueError as e:
         return jsonify({'status': 'error', 'message': str(e)}), 400
 
-    sdr_type_str = str(data.get('sdr_type', 'rtlsdr')).lower()
-    try:
-        sdr_type = SDRType(sdr_type_str)
-    except ValueError:
-        sdr_type = SDRType.RTL_SDR
-
-    if sdr_type == SDRType.RTL_SDR:
-        if find_rtl_fm() is None:
-            return jsonify({
-                'status': 'error',
-                'message': 'rtl_fm not found. Install with: sudo apt install rtl-sdr'
-            }), 400
-    else:
-        if find_rx_fm() is None:
-            return jsonify({
-                'status': 'error',
-                'message': f'rx_fm not found. Install SoapySDR tools for {sdr_type.value}.'
-            }), 400
-
     # Reserve SDR device to prevent conflicts with other modes
     error = app_module.claim_sdr_device(device, 'aprs')
     if error:
@@ -1545,29 +1516,28 @@ def start_aprs() -> Response:
     aprs_last_packet_time = None
     aprs_stations = {}
 
-    # Build FM demod command for APRS (AFSK1200 @ 22050 Hz) via SDR abstraction.
+    # Build rtl_fm command for APRS (narrowband FM at 22050 Hz for AFSK1200)
-    try:
+    freq_hz = f"{float(frequency)}M"
-        sdr_device = SDRFactory.create_default_device(sdr_type, index=device)
+    rtl_cmd = [
-        builder = SDRFactory.get_builder(sdr_type)
+        rtl_fm_path,
-        rtl_cmd = builder.build_fm_demod_command(
+        '-f', freq_hz,
-            device=sdr_device,
+        '-M', 'nfm',             # Narrowband FM for APRS
-            frequency_mhz=float(frequency),
+        '-s', '22050',           # Sample rate matching direwolf -r 22050
-            sample_rate=22050,
+        '-E', 'dc',              # Enable DC blocking filter for cleaner audio
-            gain=float(gain) if gain and str(gain) != '0' else None,
+        '-A', 'fast',            # Fast AGC for packet bursts
-            ppm=int(ppm) if ppm and str(ppm) != '0' else None,
+        '-d', str(device),
-            modulation='nfm' if sdr_type == SDRType.RTL_SDR else 'fm',
+    ]
-            squelch=None,
-            bias_t=bool(data.get('bias_t', False)),
-        )
 
-        if sdr_type == SDRType.RTL_SDR and rtl_cmd and rtl_cmd[-1] == '-':
+    # Gain: 0 means auto, otherwise set specific gain
-            # APRS benefits from DC blocking + fast AGC on rtl_fm.
+    if gain and str(gain) != '0':
-            rtl_cmd = rtl_cmd[:-1] + ['-E', 'dc', '-A', 'fast', '-']
+        rtl_cmd.extend(['-g', str(gain)])
-    except Exception as e:
+
-        if aprs_active_device is not None:
+    # PPM frequency correction
-            app_module.release_sdr_device(aprs_active_device)
+    if ppm and str(ppm) != '0':
-            aprs_active_device = None
+        rtl_cmd.extend(['-p', str(ppm)])
-        return jsonify({'status': 'error', 'message': f'Failed to build SDR command: {e}'}), 500
+
+    # Output raw audio to stdout
+    rtl_cmd.append('-')
 
     # Build decoder command
     if direwolf_path:
@@ -1695,7 +1665,6 @@ def start_aprs() -> Response:
             'frequency': frequency,
             'region': region,
             'device': device,
-            'sdr_type': sdr_type.value,
             'decoder': decoder_name
         })
 
@@ -1758,10 +1727,6 @@ def stream_aprs() -> Response:
             try:
                 msg = app_module.aprs_queue.get(timeout=SSE_QUEUE_TIMEOUT)
                 last_keepalive = time.time()
-                try:
-                    process_event('aprs', msg, msg.get('type'))
-                except Exception:
-                    pass
                 yield format_sse(msg)
             except queue.Empty:
                 now = time.time()

routes/audio_websocket.py

@@ -1,11 +1,10 @@
 """WebSocket-based audio streaming for SDR."""
 
-import json
-import shutil
-import socket
 import subprocess
 import threading
 import time
+import shutil
+import json
 from flask import Flask
 
 # Try to import flask-sock
@@ -41,12 +40,6 @@ def find_ffmpeg():
     return shutil.which('ffmpeg')
 
 
-def _rtl_fm_demod_mode(modulation):
-    """Map UI modulation names to rtl_fm demod tokens."""
-    mod = str(modulation or '').lower().strip()
-    return 'wbfm' if mod == 'wfm' else mod
-
-
 def kill_audio_processes():
     """Kill any running audio processes."""
     global audio_process, rtl_process
@@ -112,7 +105,7 @@ def start_audio_stream(config):
 
     rtl_cmd = [
         rtl_fm,
-        '-M', _rtl_fm_demod_mode(mod),
+        '-M', mod,
         '-f', str(freq_hz),
         '-s', str(sample_rate),
         '-r', str(resample_rate),
@@ -258,19 +251,4 @@ def init_audio_websocket(app: Flask):
         finally:
             with process_lock:
                 kill_audio_processes()
-            # Complete WebSocket close handshake, then shut down the
-            # raw socket so Werkzeug cannot write its HTTP 200 response
-            # on top of the WebSocket stream.
-            try:
-                ws.close()
-            except Exception:
-                pass
-            try:
-                ws.sock.shutdown(socket.SHUT_RDWR)
-            except Exception:
-                pass
-            try:
-                ws.sock.close()
-            except Exception:
-                pass
             logger.info("WebSocket audio client disconnected")

routes/bluetooth.py

@@ -21,7 +21,6 @@ import app as app_module
 from utils.dependencies import check_tool
 from utils.logging import bluetooth_logger as logger
 from utils.sse import format_sse
-from utils.event_pipeline import process_event
 from utils.validation import validate_bluetooth_interface
 from data.oui import OUI_DATABASE, load_oui_database, get_manufacturer
 from data.patterns import AIRTAG_PREFIXES, TILE_PREFIXES, SAMSUNG_TRACKER
@@ -564,10 +563,6 @@ def stream_bt():
             try:
                 msg = app_module.bt_queue.get(timeout=1)
                 last_keepalive = time.time()
-                try:
-                    process_event('bluetooth', msg, msg.get('type'))
-                except Exception:
-                    pass
                 yield format_sse(msg)
             except queue.Empty:
                 now = time.time()

routes/bluetooth_v2.py

@@ -11,8 +11,6 @@ import csv
 import io
 import json
 import logging
-import threading
-import time
 from datetime import datetime
 from typing import Generator
 
@@ -30,18 +28,12 @@ from utils.bluetooth import (
 )
 from utils.database import get_db
 from utils.sse import format_sse
-from utils.event_pipeline import process_event
 
 logger = logging.getLogger('intercept.bluetooth_v2')
 
 # Blueprint
 bluetooth_v2_bp = Blueprint('bluetooth_v2', __name__, url_prefix='/api/bluetooth')
 
-# Seen-before tracking
-_bt_seen_cache: set[str] = set()
-_bt_session_seen: set[str] = set()
-_bt_seen_lock = threading.Lock()
-
 # =============================================================================
 # DATABASE FUNCTIONS
 # =============================================================================
@@ -181,13 +173,6 @@ def save_observation_history(device: BTDeviceAggregate) -> None:
         ''', (device.device_id, device.rssi_current, device.seen_count))
 
 
-def load_seen_device_ids() -> set[str]:
-    """Load distinct device IDs from history for seen-before tracking."""
-    with get_db() as conn:
-        cursor = conn.execute('SELECT DISTINCT device_id FROM bt_observation_history')
-        return {row['device_id'] for row in cursor}
-
-
 # =============================================================================
 # API ENDPOINTS
 # =============================================================================
@@ -229,35 +214,13 @@ def start_scan():
     rssi_threshold = data.get('rssi_threshold', -100)
 
     # Validate mode
-    valid_modes = ('auto', 'dbus', 'bleak', 'hcitool', 'bluetoothctl', 'ubertooth')
+    valid_modes = ('auto', 'dbus', 'bleak', 'hcitool', 'bluetoothctl')
     if mode not in valid_modes:
         return jsonify({'error': f'Invalid mode. Must be one of: {valid_modes}'}), 400
 
     # Get scanner instance
     scanner = get_bluetooth_scanner(adapter_id)
 
-    # Initialize database tables if needed
-    init_bt_tables()
-
-    def _handle_seen_before(device: BTDeviceAggregate) -> None:
-        try:
-            with _bt_seen_lock:
-                device.seen_before = device.device_id in _bt_seen_cache
-                if device.device_id not in _bt_session_seen:
-                    save_observation_history(device)
-                    _bt_session_seen.add(device.device_id)
-        except Exception as e:
-            logger.debug(f"BT seen-before update failed: {e}")
-
-    # Setup seen-before callback
-    if _handle_seen_before not in scanner._on_device_updated_callbacks:
-        scanner.add_device_callback(_handle_seen_before)
-
-    # Ensure cache is initialized
-    with _bt_seen_lock:
-        if not _bt_seen_cache:
-            _bt_seen_cache.update(load_seen_device_ids())
-
     # Check if already scanning
     if scanner.is_scanning:
         return jsonify({
@@ -265,11 +228,8 @@ def start_scan():
             'scan_status': scanner.get_status().to_dict()
         })
 
-    # Refresh seen-before cache and reset session set for a new scan
+    # Initialize database tables if needed
-    with _bt_seen_lock:
+    init_bt_tables()
-        _bt_seen_cache.clear()
-        _bt_seen_cache.update(load_seen_device_ids())
-        _bt_session_seen.clear()
 
     # Load active baseline if exists
     baseline_id = get_active_baseline_id()
@@ -900,10 +860,6 @@ def stream_events():
         """Generate SSE events from scanner."""
         for event in scanner.stream_events(timeout=1.0):
             event_name, event_data = map_event_type(event)
-            try:
-                process_event('bluetooth', event_data, event_name)
-            except Exception:
-                pass
             yield format_sse(event_data, event=event_name)
 
     return Response(
@@ -991,17 +947,6 @@ def get_tscm_bluetooth_snapshot(duration: int = 8) -> list[dict]:
     # Convert to TSCM format with tracker detection data
     tscm_devices = []
     for device in devices:
-        manufacturer_name = device.manufacturer_name
-        if (not manufacturer_name) or str(manufacturer_name).lower().startswith('unknown'):
-            if device.address and not device.is_randomized_mac:
-                try:
-                    from data.oui import get_manufacturer
-                    oui_vendor = get_manufacturer(device.address)
-                    if oui_vendor and oui_vendor != 'Unknown':
-                        manufacturer_name = oui_vendor
-                except Exception:
-                    pass
-
         device_data = {
             'mac': device.address,
             'address_type': device.address_type,
@@ -1011,7 +956,7 @@ def get_tscm_bluetooth_snapshot(duration: int = 8) -> list[dict]:
             'rssi_median': device.rssi_median,
             'rssi_ema': round(device.rssi_ema, 1) if device.rssi_ema else None,
             'type': _classify_device_type(device),
-            'manufacturer': manufacturer_name,
+            'manufacturer': device.manufacturer_name,
             'manufacturer_id': device.manufacturer_id,
             'manufacturer_data': device.manufacturer_bytes.hex() if device.manufacturer_bytes else None,
             'protocol': device.protocol,
@@ -1233,30 +1178,6 @@ def _classify_device_type(device: BTDeviceAggregate) -> str:
     """Classify device type from available data."""
     name_lower = (device.name or '').lower()
     manufacturer_lower = (device.manufacturer_name or '').lower()
-    service_uuids = device.service_uuids or []
-
-    if (not manufacturer_lower) or manufacturer_lower.startswith('unknown'):
-        if device.address and not device.is_randomized_mac:
-            try:
-                from data.oui import get_manufacturer
-                oui_vendor = get_manufacturer(device.address)
-                if oui_vendor and oui_vendor != 'Unknown':
-                    manufacturer_lower = oui_vendor.lower()
-            except Exception:
-                pass
-
-    def normalize_uuid(uuid: str) -> str:
-        if not uuid:
-            return ''
-        value = str(uuid).lower().strip()
-        if value.startswith('0x'):
-            value = value[2:]
-        # Bluetooth Base UUID normalization (16-bit UUIDs)
-        if value.endswith('-0000-1000-8000-00805f9b34fb') and len(value) >= 8:
-            return value[4:8]
-        if len(value) == 4:
-            return value
-        return value
 
     # Check by name patterns
     if any(x in name_lower for x in ['airpods', 'headphone', 'earbuds', 'buds', 'beats']):
@@ -1276,29 +1197,6 @@ def _classify_device_type(device: BTDeviceAggregate) -> str:
     if any(x in name_lower for x in ['tv', 'chromecast', 'roku', 'firestick']):
         return 'media'
 
-    # Tracker signals (metadata or Find My service)
-    if getattr(device, 'is_tracker', False) or getattr(device, 'tracker_type', None):
-        return 'tracker'
-
-    normalized_uuids = {normalize_uuid(u) for u in service_uuids if u}
-    if 'fd6f' in normalized_uuids:
-        return 'tracker'
-
-    # Service UUIDs (GATT / classic)
-    audio_uuids = {'110b', '110a', '111e', '111f', '1108', '1203'}
-    wearable_uuids = {'180d', '1814', '1816'}
-    hid_uuids = {'1812'}
-    beacon_uuids = {'feaa', 'feab', 'feb1', 'febe'}
-
-    if normalized_uuids & audio_uuids:
-        return 'audio'
-    if normalized_uuids & hid_uuids:
-        return 'peripheral'
-    if normalized_uuids & wearable_uuids:
-        return 'wearable'
-    if normalized_uuids & beacon_uuids:
-        return 'beacon'
-
     # Check by manufacturer
     if 'apple' in manufacturer_lower:
         return 'apple_device'

routes/bt_locate.py

@@ -1,284 +0,0 @@
-"""
-BT Locate — Bluetooth SAR Device Location Flask Blueprint.
-
-Provides endpoints for managing locate sessions, streaming detection events,
-and retrieving GPS-tagged signal trails.
-"""
-
-from __future__ import annotations
-
-import logging
-from collections.abc import Generator
-
-from flask import Blueprint, Response, jsonify, request
-
-from utils.bluetooth.irk_extractor import get_paired_irks
-from utils.bt_locate import (
-    Environment,
-    LocateTarget,
-    get_locate_session,
-    resolve_rpa,
-    start_locate_session,
-    stop_locate_session,
-)
-from utils.sse import format_sse
-
-logger = logging.getLogger('intercept.bt_locate')
-
-bt_locate_bp = Blueprint('bt_locate', __name__, url_prefix='/bt_locate')
-
-
-@bt_locate_bp.route('/start', methods=['POST'])
-def start_session():
-    """
-    Start a locate session.
-
-    Request JSON:
-        - mac_address: Target MAC address (optional)
-        - name_pattern: Target name substring (optional)
-        - irk_hex: Identity Resolving Key hex string (optional)
-        - device_id: Device ID from Bluetooth scanner (optional)
-        - known_name: Hand-off device name (optional)
-        - known_manufacturer: Hand-off manufacturer (optional)
-        - last_known_rssi: Hand-off last RSSI (optional)
-        - environment: 'FREE_SPACE', 'OUTDOOR', 'INDOOR', 'CUSTOM' (default: OUTDOOR)
-        - custom_exponent: Path loss exponent for CUSTOM environment (optional)
-
-    Returns:
-        JSON with session status.
-    """
-    data = request.get_json() or {}
-
-    # Build target
-    target = LocateTarget(
-        mac_address=data.get('mac_address'),
-        name_pattern=data.get('name_pattern'),
-        irk_hex=data.get('irk_hex'),
-        device_id=data.get('device_id'),
-        known_name=data.get('known_name'),
-        known_manufacturer=data.get('known_manufacturer'),
-        last_known_rssi=data.get('last_known_rssi'),
-    )
-
-    # At least one identifier required
-    if not any([target.mac_address, target.name_pattern, target.irk_hex, target.device_id]):
-        return jsonify({'error': 'At least one target identifier required (mac_address, name_pattern, irk_hex, or device_id)'}), 400
-
-    # Parse environment
-    env_str = data.get('environment', 'OUTDOOR').upper()
-    try:
-        environment = Environment[env_str]
-    except KeyError:
-        return jsonify({'error': f'Invalid environment: {env_str}'}), 400
-
-    custom_exponent = data.get('custom_exponent')
-    if custom_exponent is not None:
-        try:
-            custom_exponent = float(custom_exponent)
-        except (ValueError, TypeError):
-            return jsonify({'error': 'custom_exponent must be a number'}), 400
-
-    # Fallback coordinates when GPS is unavailable (from user settings)
-    fallback_lat = None
-    fallback_lon = None
-    if data.get('fallback_lat') is not None and data.get('fallback_lon') is not None:
-        try:
-            fallback_lat = float(data['fallback_lat'])
-            fallback_lon = float(data['fallback_lon'])
-        except (ValueError, TypeError):
-            pass
-
-    logger.info(
-        f"Starting locate session: target={target.to_dict()}, "
-        f"env={environment.name}, fallback=({fallback_lat}, {fallback_lon})"
-    )
-
-    session = start_locate_session(
-        target, environment, custom_exponent, fallback_lat, fallback_lon
-    )
-
-    return jsonify({
-        'status': 'started',
-        'session': session.get_status(),
-    })
-
-
-@bt_locate_bp.route('/stop', methods=['POST'])
-def stop_session():
-    """Stop the active locate session."""
-    session = get_locate_session()
-    if not session:
-        return jsonify({'status': 'no_session'})
-
-    stop_locate_session()
-    return jsonify({'status': 'stopped'})
-
-
-@bt_locate_bp.route('/status', methods=['GET'])
-def get_status():
-    """Get locate session status."""
-    session = get_locate_session()
-    if not session:
-        return jsonify({
-            'active': False,
-            'target': None,
-        })
-
-    return jsonify(session.get_status())
-
-
-@bt_locate_bp.route('/trail', methods=['GET'])
-def get_trail():
-    """Get detection trail data."""
-    session = get_locate_session()
-    if not session:
-        return jsonify({'trail': [], 'gps_trail': []})
-
-    return jsonify({
-        'trail': session.get_trail(),
-        'gps_trail': session.get_gps_trail(),
-    })
-
-
-@bt_locate_bp.route('/stream', methods=['GET'])
-def stream_detections():
-    """SSE stream of detection events."""
-
-    def event_generator() -> Generator[str, None, None]:
-        while True:
-            # Re-fetch session each iteration in case it changes
-            s = get_locate_session()
-            if not s:
-                yield format_sse({'type': 'session_ended'}, event='session_ended')
-                return
-
-            try:
-                event = s.event_queue.get(timeout=2.0)
-                yield format_sse(event, event='detection')
-            except Exception:
-                yield format_sse({}, event='ping')
-
-    return Response(
-        event_generator(),
-        mimetype='text/event-stream',
-        headers={
-            'Cache-Control': 'no-cache',
-            'Connection': 'keep-alive',
-            'X-Accel-Buffering': 'no',
-        }
-    )
-
-
-@bt_locate_bp.route('/resolve_rpa', methods=['POST'])
-def test_resolve_rpa():
-    """
-    Test if an IRK resolves to a given address.
-
-    Request JSON:
-        - irk_hex: 16-byte IRK as hex string
-        - address: BLE address string
-
-    Returns:
-        JSON with resolution result.
-    """
-    data = request.get_json() or {}
-    irk_hex = data.get('irk_hex', '')
-    address = data.get('address', '')
-
-    if not irk_hex or not address:
-        return jsonify({'error': 'irk_hex and address are required'}), 400
-
-    try:
-        irk = bytes.fromhex(irk_hex)
-    except ValueError:
-        return jsonify({'error': 'Invalid IRK hex string'}), 400
-
-    if len(irk) != 16:
-        return jsonify({'error': 'IRK must be exactly 16 bytes (32 hex characters)'}), 400
-
-    result = resolve_rpa(irk, address)
-    return jsonify({
-        'resolved': result,
-        'irk_hex': irk_hex,
-        'address': address,
-    })
-
-
-@bt_locate_bp.route('/environment', methods=['POST'])
-def set_environment():
-    """Update the environment on the active session."""
-    session = get_locate_session()
-    if not session:
-        return jsonify({'error': 'no active session'}), 400
-
-    data = request.get_json() or {}
-    env_str = data.get('environment', '').upper()
-    try:
-        environment = Environment[env_str]
-    except KeyError:
-        return jsonify({'error': f'Invalid environment: {env_str}'}), 400
-
-    custom_exponent = data.get('custom_exponent')
-    if custom_exponent is not None:
-        try:
-            custom_exponent = float(custom_exponent)
-        except (ValueError, TypeError):
-            custom_exponent = None
-
-    session.set_environment(environment, custom_exponent)
-    return jsonify({
-        'status': 'updated',
-        'environment': environment.name,
-        'path_loss_exponent': session.estimator.n,
-    })
-
-
-@bt_locate_bp.route('/debug', methods=['GET'])
-def debug_matching():
-    """Debug endpoint showing scanner devices and match results."""
-    session = get_locate_session()
-    if not session:
-        return jsonify({'error': 'no session'})
-
-    scanner = session._scanner
-    if not scanner:
-        return jsonify({'error': 'no scanner'})
-
-    devices = scanner.get_devices(max_age_seconds=30)
-    return jsonify({
-        'target': session.target.to_dict(),
-        'device_count': len(devices),
-        'devices': [
-            {
-                'device_id': d.device_id,
-                'address': d.address,
-                'name': d.name,
-                'rssi': d.rssi_current,
-                'matches': session.target.matches(d),
-            }
-            for d in devices
-        ],
-    })
-
-
-@bt_locate_bp.route('/paired_irks', methods=['GET'])
-def paired_irks():
-    """Return paired Bluetooth devices that have IRKs."""
-    try:
-        devices = get_paired_irks()
-    except Exception as e:
-        logger.exception("Failed to read paired IRKs")
-        return jsonify({'devices': [], 'error': str(e)})
-
-    return jsonify({'devices': devices})
-
-
-@bt_locate_bp.route('/clear_trail', methods=['POST'])
-def clear_trail():
-    """Clear the detection trail."""
-    session = get_locate_session()
-    if not session:
-        return jsonify({'status': 'no_session'})
-
-    session.clear_trail()
-    return jsonify({'status': 'cleared'})

routes/dmr.py

@@ -18,10 +18,7 @@ from flask import Blueprint, jsonify, request, Response
 import app as app_module
 from utils.logging import get_logger
 from utils.sse import format_sse
-from utils.event_pipeline import process_event
 from utils.process import register_process, unregister_process
-from utils.validation import validate_frequency, validate_gain, validate_device_index, validate_ppm
-from utils.sdr import SDRFactory, SDRType
 from utils.constants import (
     SSE_QUEUE_TIMEOUT,
     SSE_KEEPALIVE_INTERVAL,
@@ -40,18 +37,10 @@ dmr_rtl_process: Optional[subprocess.Popen] = None
 dmr_dsd_process: Optional[subprocess.Popen] = None
 dmr_thread: Optional[threading.Thread] = None
 dmr_running = False
-dmr_has_audio = False  # True when ffmpeg available and dsd outputs audio
 dmr_lock = threading.Lock()
 dmr_queue: queue.Queue = queue.Queue(maxsize=QUEUE_MAX_SIZE)
 dmr_active_device: Optional[int] = None
 
-# Audio mux: the sole reader of dsd-fme stdout.  Fans out bytes to all
-# active ffmpeg stdin sinks when streaming clients are connected.
-# This prevents dsd-fme from blocking on stdout (which would also
-# freeze stderr / text data output).
-_ffmpeg_sinks: set[object] = set()
-_ffmpeg_sinks_lock = threading.Lock()
-
 VALID_PROTOCOLS = ['auto', 'dmr', 'p25', 'nxdn', 'dstar', 'provoice']
 
 # Classic dsd flags
@@ -64,25 +53,14 @@ _DSD_PROTOCOL_FLAGS = {
     'provoice': ['-fv'],
 }
 
-# dsd-fme remapped several flags from classic DSD:
+# dsd-fme uses different flag names
-#   -fs = DMR Simplex (NOT -fd which is D-STAR!),
-#   -fd = D-STAR (NOT DMR!), -fp = ProVoice (NOT P25),
-#   -fi = NXDN48 (NOT D-Star), -f1 = P25 Phase 1,
-#   -ft = XDMA multi-protocol decoder
 _DSD_FME_PROTOCOL_FLAGS = {
-    'auto': ['-fa'],       # Broad auto: P25 (P1/P2), DMR, D-STAR, YSF, X2-TDMA
+    'auto': ['-ft'],
-    'dmr': ['-fs'],        # DMR Simplex (-fd is D-STAR in dsd-fme!)
+    'dmr': ['-fs'],
-    'p25': ['-ft'],        # P25 P1/P2 coverage (also includes DMR in dsd-fme)
+    'p25': ['-f1'],
-    'nxdn': ['-fn'],       # NXDN96
+    'nxdn': ['-fi'],
-    'dstar': ['-fd'],      # D-STAR (-fd in dsd-fme, NOT DMR!)
+    'dstar': [],
-    'provoice': ['-fp'],   # ProVoice (-fp in dsd-fme, not -fv)
+    'provoice': ['-fp'],
-}
-
-# Modulation hints: force C4FM for protocols that use it, improving
-# sync reliability vs letting dsd-fme auto-detect modulation type.
-_DSD_FME_MODULATION = {
-    'dmr': ['-mc'],        # C4FM
-    'nxdn': ['-mc'],       # C4FM
 }
 
 # ============================================
@@ -110,16 +88,6 @@ def find_rtl_fm() -> str | None:
     return shutil.which('rtl_fm')
 
 
-def find_rx_fm() -> str | None:
-    """Find SoapySDR rx_fm binary."""
-    return shutil.which('rx_fm')
-
-
-def find_ffmpeg() -> str | None:
-    """Find ffmpeg for audio encoding."""
-    return shutil.which('ffmpeg')
-
-
 def parse_dsd_output(line: str) -> dict | None:
     """Parse a line of DSD stderr output into a structured event.
 
@@ -131,11 +99,8 @@ def parse_dsd_output(line: str) -> dict | None:
         return None
 
     # Skip DSD/dsd-fme startup banner lines (ASCII art, version info, etc.)
-    # Only filter lines that are purely decorative — dsd-fme uses box-drawing
+    # These contain box-drawing characters or are pure decoration.
-    # characters (│, ─) as column separators in DATA lines, so we must not
+    if re.search(r'[╔╗╚╝║═██▀▄╗╝╩╦╠╣╬│┤├┘└┐┌─┼█▓▒░]', line):
-    # discard lines that also contain alphanumeric content.
-    stripped_of_box = re.sub(r'[╔╗╚╝║═██▀▄╗╝╩╦╠╣╬│┤├┘└┐┌─┼█▓▒░\s]', '', line)
-    if not stripped_of_box:
         return None
     if re.match(r'^\s*(Build Version|MBElib|CODEC2|Audio (Out|In)|Decoding )', line):
         return None
@@ -155,9 +120,8 @@ def parse_dsd_output(line: str) -> dict | None:
     # is captured as a call event rather than a bare slot event.
     # Classic dsd:   "TG: 12345  Src: 67890"
     # dsd-fme:       "TG: 12345, Src: 67890"  or  "Talkgroup: 12345, Source: 67890"
-    #                "TGT: 12345 | SRC: 67890" (pipe-delimited variant)
     tg_match = re.search(
-        r'(?:TGT?|Talkgroup)[:\s]+(\d+)[,|│\s]+(?:Src|Source|SRC)[:\s]+(\d+)', line, re.IGNORECASE
+        r'(?:TG|Talkgroup)[:\s]+(\d+)[,\s]+(?:Src|Source)[:\s]+(\d+)', line, re.IGNORECASE
     )
     if tg_match:
         result = {
@@ -216,97 +180,6 @@ def parse_dsd_output(line: str) -> dict | None:
 
 _HEARTBEAT_INTERVAL = 3.0  # seconds between heartbeats when decoder is idle
 
-# 100ms of silence at 8kHz 16-bit mono = 1600 bytes
-_SILENCE_CHUNK = b'\x00' * 1600
-
-
-def _register_audio_sink(sink: object) -> None:
-    """Register an ffmpeg stdin sink for mux fanout."""
-    with _ffmpeg_sinks_lock:
-        _ffmpeg_sinks.add(sink)
-
-
-def _unregister_audio_sink(sink: object) -> None:
-    """Remove an ffmpeg stdin sink from mux fanout."""
-    with _ffmpeg_sinks_lock:
-        _ffmpeg_sinks.discard(sink)
-
-
-def _get_audio_sinks() -> tuple[object, ...]:
-    """Snapshot current audio sinks for lock-free iteration."""
-    with _ffmpeg_sinks_lock:
-        return tuple(_ffmpeg_sinks)
-
-
-def _stop_process(proc: Optional[subprocess.Popen]) -> None:
-    """Terminate and unregister a subprocess if present."""
-    if not proc:
-        return
-    if proc.poll() is None:
-        try:
-            proc.terminate()
-            proc.wait(timeout=2)
-        except Exception:
-            try:
-                proc.kill()
-            except Exception:
-                pass
-    unregister_process(proc)
-
-
-def _reset_runtime_state(*, release_device: bool) -> None:
-    """Reset process + runtime state and optionally release SDR ownership."""
-    global dmr_rtl_process, dmr_dsd_process
-    global dmr_running, dmr_has_audio, dmr_active_device
-
-    _stop_process(dmr_dsd_process)
-    _stop_process(dmr_rtl_process)
-    dmr_rtl_process = None
-    dmr_dsd_process = None
-    dmr_running = False
-    dmr_has_audio = False
-    with _ffmpeg_sinks_lock:
-        _ffmpeg_sinks.clear()
-
-    if release_device and dmr_active_device is not None:
-        app_module.release_sdr_device(dmr_active_device)
-        dmr_active_device = None
-
-
-def _dsd_audio_mux(dsd_stdout):
-    """Mux thread: sole reader of dsd-fme stdout.
-
-    Always drains dsd-fme's audio output to prevent the process from
-    blocking on stdout writes (which would also freeze stderr / text
-    data). When streaming clients are connected, forwards data to all
-    active ffmpeg stdin sinks with silence fill during voice gaps.
-    """
-    try:
-        while dmr_running:
-            ready, _, _ = select.select([dsd_stdout], [], [], 0.1)
-            if ready:
-                data = os.read(dsd_stdout.fileno(), 4096)
-                if not data:
-                    break
-                sinks = _get_audio_sinks()
-                for sink in sinks:
-                    try:
-                        sink.write(data)
-                        sink.flush()
-                    except (BrokenPipeError, OSError, ValueError):
-                        _unregister_audio_sink(sink)
-            else:
-                # No audio from decoder — feed silence if client connected
-                sinks = _get_audio_sinks()
-                for sink in sinks:
-                    try:
-                        sink.write(_SILENCE_CHUNK)
-                        sink.flush()
-                    except (BrokenPipeError, OSError, ValueError):
-                        _unregister_audio_sink(sink)
-    except (OSError, ValueError):
-        pass
-
 
 def _queue_put(event: dict):
     """Put an event on the DMR queue, dropping oldest if full."""
@@ -354,7 +227,6 @@ def stream_dsd_output(rtl_process: subprocess.Popen, dsd_process: subprocess.Pop
                 if not text:
                     continue
 
-                logger.debug("DSD raw: %s", text)
                 parsed = parse_dsd_output(text)
                 if parsed:
                     _queue_put(parsed)
@@ -374,11 +246,7 @@ def stream_dsd_output(rtl_process: subprocess.Popen, dsd_process: subprocess.Pop
         logger.error(f"DSD stream error: {e}")
     finally:
         global dmr_active_device, dmr_rtl_process, dmr_dsd_process
-        global dmr_has_audio
         dmr_running = False
-        dmr_has_audio = False
-        with _ffmpeg_sinks_lock:
-            _ffmpeg_sinks.clear()
         # Capture exit info for diagnostics
         rc = dsd_process.poll()
         reason = 'stopped'
@@ -392,9 +260,19 @@ def stream_dsd_output(rtl_process: subprocess.Popen, dsd_process: subprocess.Pop
             except Exception:
                 pass
             logger.warning(f"DSD process exited with code {rc}: {detail}")
-        # Cleanup decoder + demod processes
+        # Cleanup both processes
-        _stop_process(dsd_process)
+        for proc in [dsd_process, rtl_process]:
-        _stop_process(rtl_process)
+            if proc and proc.poll() is None:
+                try:
+                    proc.terminate()
+                    proc.wait(timeout=2)
+                except Exception:
+                    try:
+                        proc.kill()
+                    except Exception:
+                        pass
+            if proc:
+                unregister_process(proc)
         dmr_rtl_process = None
         dmr_dsd_process = None
         _queue_put({'type': 'status', 'text': reason, 'exit_code': rc, 'detail': detail})
@@ -414,14 +292,10 @@ def check_tools() -> Response:
     """Check for required tools."""
     dsd_path, _ = find_dsd()
     rtl_fm = find_rtl_fm()
-    rx_fm = find_rx_fm()
-    ffmpeg = find_ffmpeg()
     return jsonify({
         'dsd': dsd_path is not None,
         'rtl_fm': rtl_fm is not None,
-        'rx_fm': rx_fm is not None,
+        'available': dsd_path is not None and rtl_fm is not None,
-        'ffmpeg': ffmpeg is not None,
-        'available': dsd_path is not None and (rtl_fm is not None or rx_fm is not None),
         'protocols': VALID_PROTOCOLS,
     })
 
@@ -429,43 +303,36 @@ def check_tools() -> Response:
 @dmr_bp.route('/start', methods=['POST'])
 def start_dmr() -> Response:
     """Start digital voice decoding."""
-    global dmr_rtl_process, dmr_dsd_process, dmr_thread
+    global dmr_rtl_process, dmr_dsd_process, dmr_thread, dmr_running, dmr_active_device
-    global dmr_running, dmr_has_audio, dmr_active_device
+
+    with dmr_lock:
+        if dmr_running:
+            return jsonify({'status': 'error', 'message': 'Already running'}), 409
 
     dsd_path, is_fme = find_dsd()
     if not dsd_path:
         return jsonify({'status': 'error', 'message': 'dsd not found. Install dsd-fme or dsd.'}), 503
 
+    rtl_fm_path = find_rtl_fm()
+    if not rtl_fm_path:
+        return jsonify({'status': 'error', 'message': 'rtl_fm not found. Install rtl-sdr tools.'}), 503
+
     data = request.json or {}
 
     try:
-        frequency = validate_frequency(data.get('frequency', 462.5625))
+        frequency = float(data.get('frequency', 462.5625))
-        gain = int(validate_gain(data.get('gain', 40)))
+        gain = int(data.get('gain', 40))
-        device = validate_device_index(data.get('device', 0))
+        device = int(data.get('device', 0))
         protocol = str(data.get('protocol', 'auto')).lower()
-        ppm = validate_ppm(data.get('ppm', 0))
     except (ValueError, TypeError) as e:
         return jsonify({'status': 'error', 'message': f'Invalid parameter: {e}'}), 400
 
-    sdr_type_str = str(data.get('sdr_type', 'rtlsdr')).lower()
+    if frequency <= 0:
-    try:
+        return jsonify({'status': 'error', 'message': 'Frequency must be positive'}), 400
-        sdr_type = SDRType(sdr_type_str)
-    except ValueError:
-        sdr_type = SDRType.RTL_SDR
 
     if protocol not in VALID_PROTOCOLS:
         return jsonify({'status': 'error', 'message': f'Invalid protocol. Use: {", ".join(VALID_PROTOCOLS)}'}), 400
 
-    if sdr_type == SDRType.RTL_SDR:
-        if not find_rtl_fm():
-            return jsonify({'status': 'error', 'message': 'rtl_fm not found. Install rtl-sdr tools.'}), 503
-    else:
-        if not find_rx_fm():
-            return jsonify({
-                'status': 'error',
-                'message': f'rx_fm not found. Install SoapySDR tools for {sdr_type.value}.'
-            }), 503
-
     # Clear stale queue
     try:
         while True:
@@ -473,67 +340,32 @@ def start_dmr() -> Response:
     except queue.Empty:
         pass
 
-    # Reserve running state before we start claiming resources/processes
+    # Claim SDR device
-    # so concurrent /start requests cannot race each other.
+    error = app_module.claim_sdr_device(device, 'dmr')
-    with dmr_lock:
-        if dmr_running:
-            return jsonify({'status': 'error', 'message': 'Already running'}), 409
-        dmr_running = True
-        dmr_has_audio = False
-
-    # Claim SDR device — use protocol name so the device panel shows
-    # "D-STAR", "P25", etc. instead of always "DMR"
-    mode_label = protocol.upper() if protocol != 'auto' else 'DMR'
-    error = app_module.claim_sdr_device(device, mode_label)
     if error:
-        with dmr_lock:
-            dmr_running = False
         return jsonify({'status': 'error', 'error_type': 'DEVICE_BUSY', 'message': error}), 409
 
     dmr_active_device = device
 
-    # Build FM demodulation command via SDR abstraction.
+    freq_hz = int(frequency * 1e6)
-    try:
+
-        sdr_device = SDRFactory.create_default_device(sdr_type, index=device)
+    # Build rtl_fm command (48kHz sample rate for DSD)
-        builder = SDRFactory.get_builder(sdr_type)
+    rtl_cmd = [
-        rtl_cmd = builder.build_fm_demod_command(
+        rtl_fm_path,
-            device=sdr_device,
+        '-M', 'fm',
-            frequency_mhz=frequency,
+        '-f', str(freq_hz),
-            sample_rate=48000,
+        '-s', '48000',
-            gain=float(gain) if gain > 0 else None,
+        '-g', str(gain),
-            ppm=int(ppm) if ppm != 0 else None,
+        '-d', str(device),
-            modulation='fm',
+        '-l', '1',  # squelch level
-            squelch=None,
+    ]
-            bias_t=bool(data.get('bias_t', False)),
-        )
-        if sdr_type == SDRType.RTL_SDR:
-            # Keep squelch fully open for digital bitstreams.
-            rtl_cmd.extend(['-l', '0'])
-    except Exception as e:
-        _reset_runtime_state(release_device=True)
-        return jsonify({'status': 'error', 'message': f'Failed to build SDR command: {e}'}), 500
 
     # Build DSD command
-    # Audio output: pipe decoded audio (8kHz s16le PCM) to stdout for
+    # Use -o - to send decoded audio to stdout (piped to DEVNULL)
-    # ffmpeg transcoding.  Both dsd-fme and classic dsd support '-o -'.
+    # instead of PulseAudio which may not be available under sudo
-    # If ffmpeg is unavailable, fall back to discarding audio.
+    dsd_cmd = [dsd_path, '-i', '-', '-o', '-']
-    ffmpeg_path = find_ffmpeg()
-    if ffmpeg_path:
-        audio_out = '-'
-    else:
-        audio_out = 'null' if is_fme else '-'
-        logger.warning("ffmpeg not found — audio streaming disabled, data-only mode")
-    dsd_cmd = [dsd_path, '-i', '-', '-o', audio_out]
     if is_fme:
         dsd_cmd.extend(_DSD_FME_PROTOCOL_FLAGS.get(protocol, []))
-        dsd_cmd.extend(_DSD_FME_MODULATION.get(protocol, []))
-        # Event log to stderr so we capture TG/Source/Voice data that
-        # dsd-fme may not output on stderr by default.
-        dsd_cmd.extend(['-J', '/dev/stderr'])
-        # Relax CRC checks for marginal signals — lets more frames
-        # through at the cost of occasional decode errors.
-        if data.get('relaxCrc', False):
-            dsd_cmd.append('-F')
     else:
         dsd_cmd.extend(_DSD_PROTOCOL_FLAGS.get(protocol, []))
 
@@ -545,13 +377,10 @@ def start_dmr() -> Response:
         )
         register_process(dmr_rtl_process)
 
-        # DSD stdout → PIPE when ffmpeg available (audio pipeline),
-        # otherwise DEVNULL (data-only mode)
-        dsd_stdout = subprocess.PIPE if ffmpeg_path else subprocess.DEVNULL
         dmr_dsd_process = subprocess.Popen(
             dsd_cmd,
             stdin=dmr_rtl_process.stdout,
-            stdout=dsd_stdout,
+            stdout=subprocess.DEVNULL,
             stderr=subprocess.PIPE,
         )
         register_process(dmr_dsd_process)
@@ -559,17 +388,6 @@ def start_dmr() -> Response:
         # Allow rtl_fm to send directly to dsd
         dmr_rtl_process.stdout.close()
 
-        # Start mux thread: always drains dsd-fme stdout to prevent the
-        # process from blocking (which would freeze stderr / text data).
-        # ffmpeg is started lazily per-client in /dmr/audio/stream.
-        if ffmpeg_path and dmr_dsd_process.stdout:
-            dmr_has_audio = True
-            threading.Thread(
-                target=_dsd_audio_mux,
-                args=(dmr_dsd_process.stdout,),
-                daemon=True,
-            ).start()
-
         time.sleep(0.3)
 
         rtl_rc = dmr_rtl_process.poll()
@@ -583,8 +401,9 @@ def start_dmr() -> Response:
             if dmr_dsd_process.stderr:
                 dsd_err = dmr_dsd_process.stderr.read().decode('utf-8', errors='replace')[:500]
             logger.error(f"DSD pipeline died: rtl_fm rc={rtl_rc} err={rtl_err!r}, dsd rc={dsd_rc} err={dsd_err!r}")
-            # Terminate surviving processes and release resources.
+            if dmr_active_device is not None:
-            _reset_runtime_state(release_device=True)
+                app_module.release_sdr_device(dmr_active_device)
+                dmr_active_device = None
             # Surface a clear error to the user
             detail = rtl_err.strip() or dsd_err.strip()
             if 'usb_claim_interface' in rtl_err or 'Failed to open' in rtl_err:
@@ -605,6 +424,7 @@ def start_dmr() -> Response:
 
         threading.Thread(target=_drain_rtl_stderr, args=(dmr_rtl_process,), daemon=True).start()
 
+        dmr_running = True
         dmr_thread = threading.Thread(
             target=stream_dsd_output,
             args=(dmr_rtl_process, dmr_dsd_process),
@@ -616,21 +436,43 @@ def start_dmr() -> Response:
             'status': 'started',
             'frequency': frequency,
             'protocol': protocol,
-            'sdr_type': sdr_type.value,
-            'has_audio': dmr_has_audio,
         })
 
     except Exception as e:
         logger.error(f"Failed to start DMR: {e}")
-        _reset_runtime_state(release_device=True)
+        if dmr_active_device is not None:
+            app_module.release_sdr_device(dmr_active_device)
+            dmr_active_device = None
         return jsonify({'status': 'error', 'message': str(e)}), 500
 
 
 @dmr_bp.route('/stop', methods=['POST'])
 def stop_dmr() -> Response:
     """Stop digital voice decoding."""
+    global dmr_rtl_process, dmr_dsd_process, dmr_running, dmr_active_device
+
     with dmr_lock:
-        _reset_runtime_state(release_device=True)
+        dmr_running = False
+
+        for proc in [dmr_dsd_process, dmr_rtl_process]:
+            if proc and proc.poll() is None:
+                try:
+                    proc.terminate()
+                    proc.wait(timeout=2)
+                except Exception:
+                    try:
+                        proc.kill()
+                    except Exception:
+                        pass
+            if proc:
+                unregister_process(proc)
+
+        dmr_rtl_process = None
+        dmr_dsd_process = None
+
+    if dmr_active_device is not None:
+        app_module.release_sdr_device(dmr_active_device)
+        dmr_active_device = None
 
     return jsonify({'status': 'stopped'})
 
@@ -641,97 +483,9 @@ def dmr_status() -> Response:
     return jsonify({
         'running': dmr_running,
         'device': dmr_active_device,
-        'has_audio': dmr_has_audio,
     })
 
 
-@dmr_bp.route('/audio/stream')
-def stream_dmr_audio() -> Response:
-    """Stream decoded digital voice audio as WAV.
-
-    Starts a per-client ffmpeg encoder.  The global mux thread
-    (_dsd_audio_mux) forwards DSD audio to this ffmpeg's stdin while
-    the client is connected, and discards audio otherwise.  This avoids
-    the pipe-buffer deadlock that occurs when ffmpeg is started at
-    decoder launch (its stdout fills up before any HTTP client reads
-    it, back-pressuring the entire pipeline and freezing stderr/text
-    data output).
-    """
-    if not dmr_running or not dmr_has_audio:
-        return Response(b'', mimetype='audio/wav', status=204)
-
-    ffmpeg_path = find_ffmpeg()
-    if not ffmpeg_path:
-        return Response(b'', mimetype='audio/wav', status=503)
-
-    encoder_cmd = [
-        ffmpeg_path, '-hide_banner', '-loglevel', 'error',
-        '-fflags', 'nobuffer', '-flags', 'low_delay',
-        '-probesize', '32', '-analyzeduration', '0',
-        '-f', 's16le', '-ar', '8000', '-ac', '1', '-i', 'pipe:0',
-        '-acodec', 'pcm_s16le', '-ar', '44100', '-f', 'wav', 'pipe:1',
-    ]
-    audio_proc = subprocess.Popen(
-        encoder_cmd,
-        stdin=subprocess.PIPE,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-    )
-    # Drain ffmpeg stderr to prevent blocking
-    threading.Thread(
-        target=lambda p: [None for _ in p.stderr],
-        args=(audio_proc,), daemon=True,
-    ).start()
-
-    if audio_proc.stdin:
-        _register_audio_sink(audio_proc.stdin)
-
-    def generate():
-        try:
-            while dmr_running and audio_proc.poll() is None:
-                ready, _, _ = select.select([audio_proc.stdout], [], [], 2.0)
-                if ready:
-                    chunk = audio_proc.stdout.read(4096)
-                    if chunk:
-                        yield chunk
-                    else:
-                        break
-                else:
-                    if audio_proc.poll() is not None:
-                        break
-        except GeneratorExit:
-            pass
-        except Exception as e:
-            logger.error(f"DMR audio stream error: {e}")
-        finally:
-            # Disconnect mux → ffmpeg, then clean up
-            if audio_proc.stdin:
-                _unregister_audio_sink(audio_proc.stdin)
-            try:
-                audio_proc.stdin.close()
-            except Exception:
-                pass
-            try:
-                audio_proc.terminate()
-                audio_proc.wait(timeout=2)
-            except Exception:
-                try:
-                    audio_proc.kill()
-                except Exception:
-                    pass
-
-    return Response(
-        generate(),
-        mimetype='audio/wav',
-        headers={
-            'Content-Type': 'audio/wav',
-            'Cache-Control': 'no-cache, no-store',
-            'X-Accel-Buffering': 'no',
-            'Transfer-Encoding': 'chunked',
-        },
-    )
-
-
 @dmr_bp.route('/stream')
 def stream_dmr() -> Response:
     """SSE stream for DMR decoder events."""
@@ -741,10 +495,6 @@ def stream_dmr() -> Response:
             try:
                 msg = dmr_queue.get(timeout=SSE_QUEUE_TIMEOUT)
                 last_keepalive = time.time()
-                try:
-                    process_event('dmr', msg, msg.get('type'))
-                except Exception:
-                    pass
                 yield format_sse(msg)
             except queue.Empty:
                 now = time.time()

routes/dsc.py

@@ -36,7 +36,6 @@ from utils.database import (
 )
 from utils.dsc.parser import parse_dsc_message
 from utils.sse import format_sse
-from utils.event_pipeline import process_event
 from utils.validation import validate_device_index, validate_gain
 from utils.sdr import SDRFactory, SDRType
 from utils.dependencies import get_tool_path
@@ -526,10 +525,6 @@ def stream() -> Response:
             try:
                 msg = app_module.dsc_queue.get(timeout=1)
                 last_keepalive = time.time()
-                try:
-                    process_event('dsc', msg, msg.get('type'))
-                except Exception:
-                    pass
                 yield format_sse(msg)
             except queue.Empty:
                 now = time.time()

routes/gps.py

@@ -4,24 +4,19 @@ from __future__ import annotations
 
 import queue
 import time
-from collections.abc import Generator
+from typing import Generator
 
-from flask import Blueprint, Response, jsonify
+from flask import Blueprint, jsonify, request, Response
 
-from utils.gps import (
-    GPSPosition,
-    GPSSkyData,
-    detect_gps_devices,
-    get_current_position,
-    get_gps_reader,
-    is_gpsd_running,
-    start_gpsd,
-    start_gpsd_daemon,
-    stop_gps,
-    stop_gpsd_daemon,
-)
 from utils.logging import get_logger
 from utils.sse import format_sse
+from utils.gps import (
+    get_gps_reader,
+    start_gpsd,
+    stop_gps,
+    get_current_position,
+    GPSPosition,
+)
 
 logger = get_logger('intercept.gps')
 
@@ -34,24 +29,12 @@ _gps_queue: queue.Queue = queue.Queue(maxsize=100)
 def _position_callback(position: GPSPosition) -> None:
     """Callback to queue position updates for SSE stream."""
     try:
-        _gps_queue.put_nowait({'type': 'position', **position.to_dict()})
+        _gps_queue.put_nowait(position.to_dict())
     except queue.Full:
         # Discard oldest if queue is full
         try:
             _gps_queue.get_nowait()
-            _gps_queue.put_nowait({'type': 'position', **position.to_dict()})
+            _gps_queue.put_nowait(position.to_dict())
-        except queue.Empty:
-            pass
-
-
-def _sky_callback(sky: GPSSkyData) -> None:
-    """Callback to queue sky data updates for SSE stream."""
-    try:
-        _gps_queue.put_nowait({'type': 'sky', **sky.to_dict()})
-    except queue.Full:
-        try:
-            _gps_queue.get_nowait()
-            _gps_queue.put_nowait({'type': 'sky', **sky.to_dict()})
         except queue.Empty:
             pass
 
@@ -62,45 +45,37 @@ def auto_connect_gps():
     Automatically connect to gpsd if available.
 
     Called on page load to seamlessly enable GPS if gpsd is running.
-    If gpsd is not running, attempts to detect GPS devices and start gpsd.
     Returns current status if already connected.
     """
+    import socket
+
     # Check if already running
     reader = get_gps_reader()
     if reader and reader.is_running:
         position = reader.position
-        sky = reader.sky
         return jsonify({
             'status': 'connected',
             'source': 'gpsd',
             'has_fix': position is not None,
-            'position': position.to_dict() if position else None,
+            'position': position.to_dict() if position else None
-            'sky': sky.to_dict() if sky else None,
         })
 
+    # Try to connect to gpsd on localhost:2947
     host = 'localhost'
     port = 2947
 
-    # If gpsd isn't running, try to detect a device and start it
+    # First check if gpsd is reachable
-    if not is_gpsd_running(host, port):
+    try:
-        devices = detect_gps_devices()
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        if not devices:
+        sock.settimeout(1.0)
+        sock.connect((host, port))
+        sock.close()
+    except Exception:
         return jsonify({
             'status': 'unavailable',
-                'message': 'No GPS device detected'
+            'message': 'gpsd not running'
         })
 
-        # Try to start gpsd with the first detected device
-        device_path = devices[0]['path']
-        success, msg = start_gpsd_daemon(device_path, host, port)
-        if not success:
-            return jsonify({
-                'status': 'unavailable',
-                'message': msg,
-                'devices': devices,
-            })
-        logger.info(f"Auto-started gpsd on {device_path}")
-
     # Clear the queue
     while not _gps_queue.empty():
         try:
@@ -109,17 +84,14 @@ def auto_connect_gps():
             break
 
     # Start the gpsd client
-    success = start_gpsd(host, port,
+    success = start_gpsd(host, port, callback=_position_callback)
-                         callback=_position_callback,
-                         sky_callback=_sky_callback)
 
     if success:
         return jsonify({
             'status': 'connected',
             'source': 'gpsd',
             'has_fix': False,
-            'position': None,
+            'position': None
-            'sky': None,
         })
     else:
         return jsonify({
@@ -128,26 +100,14 @@ def auto_connect_gps():
         })
 
 
-@gps_bp.route('/devices')
-def list_gps_devices():
-    """List detected GPS serial devices."""
-    devices = detect_gps_devices()
-    return jsonify({
-        'devices': devices,
-        'gpsd_running': is_gpsd_running(),
-    })
-
-
 @gps_bp.route('/stop', methods=['POST'])
 def stop_gps_reader():
-    """Stop GPS client and gpsd daemon if we started it."""
+    """Stop GPS client."""
     reader = get_gps_reader()
     if reader:
         reader.remove_callback(_position_callback)
-        reader.remove_sky_callback(_sky_callback)
 
     stop_gps()
-    stop_gpsd_daemon()
 
     return jsonify({'status': 'stopped'})
 
@@ -162,18 +122,15 @@ def get_gps_status():
             'running': False,
             'device': None,
             'position': None,
-            'sky': None,
             'error': None,
             'message': 'GPS client not started'
         })
 
     position = reader.position
-    sky = reader.sky
     return jsonify({
         'running': reader.is_running,
         'device': reader.device_path,
         'position': position.to_dict() if position else None,
-        'sky': sky.to_dict() if sky else None,
         'last_update': reader.last_update.isoformat() if reader.last_update else None,
         'error': reader.error,
         'message': 'Waiting for GPS fix - ensure GPS has clear view of sky' if reader.is_running and not position else None
@@ -204,42 +161,18 @@ def get_position():
             })
 
 
-@gps_bp.route('/satellites')
-def get_satellites():
-    """Get current satellite sky view data."""
-    reader = get_gps_reader()
-
-    if not reader or not reader.is_running:
-        return jsonify({
-            'status': 'error',
-            'message': 'GPS client not running'
-        }), 400
-
-    sky = reader.sky
-    if sky:
-        return jsonify({
-            'status': 'ok',
-            'sky': sky.to_dict()
-        })
-    else:
-        return jsonify({
-            'status': 'waiting',
-            'message': 'Waiting for satellite data'
-        })
-
-
 @gps_bp.route('/stream')
 def stream_gps():
-    """SSE stream of GPS position and sky updates."""
+    """SSE stream of GPS position updates."""
     def generate() -> Generator[str, None, None]:
         last_keepalive = time.time()
         keepalive_interval = 30.0
 
         while True:
             try:
-                data = _gps_queue.get(timeout=1)
+                position = _gps_queue.get(timeout=1)
                 last_keepalive = time.time()
-                yield format_sse(data)
+                yield format_sse({'type': 'position', **position})
             except queue.Empty:
                 now = time.time()
                 if now - last_keepalive >= keepalive_interval:

routes/listening_post.py

@@ -20,7 +20,6 @@ from flask import Blueprint, jsonify, request, Response
 import app as app_module
 from utils.logging import get_logger
 from utils.sse import format_sse
-from utils.event_pipeline import process_event
 from utils.constants import (
     SSE_QUEUE_TIMEOUT,
     SSE_KEEPALIVE_INTERVAL,
@@ -113,12 +112,6 @@ def normalize_modulation(value: str) -> str:
     return mod
 
 
-def _rtl_fm_demod_mode(modulation: str) -> str:
-    """Map UI modulation names to rtl_fm demod tokens."""
-    mod = str(modulation or '').lower().strip()
-    return 'wbfm' if mod == 'wfm' else mod
-
-
 
 
 def add_activity_log(event_type: str, frequency: float, details: str = ''):
@@ -215,7 +208,7 @@ def scanner_loop():
             # Don't use squelch in rtl_fm - we want to analyze raw audio
             rtl_cmd = [
                 rtl_fm_path,
-                '-M', _rtl_fm_demod_mode(mod),
+                '-M', mod,
                 '-f', str(freq_hz),
                 '-s', str(sample_rate),
                 '-r', str(resample_rate),
@@ -687,7 +680,7 @@ def _start_audio_stream(frequency: float, modulation: str):
             freq_hz = int(frequency * 1e6)
             sdr_cmd = [
                 rtl_fm_path,
-                '-M', _rtl_fm_demod_mode(modulation),
+                '-M', modulation,
                 '-f', str(freq_hz),
                 '-s', str(sample_rate),
                 '-r', str(resample_rate),
@@ -846,13 +839,9 @@ def _start_audio_stream(frequency: float, modulation: str):
             try:
                 ready, _, _ = select.select([audio_process.stdout], [], [], 4.0)
                 if not ready:
-                    logger.warning("Audio pipeline produced no data in startup window — killing stalled pipeline")
+                    logger.warning("Audio pipeline produced no data in startup window")
-                    _stop_audio_stream_internal()
-                    return
             except Exception as e:
                 logger.warning(f"Audio startup check failed: {e}")
-                _stop_audio_stream_internal()
-                return
 
             audio_running = True
             audio_frequency = frequency
@@ -877,8 +866,6 @@ def _stop_audio_stream_internal():
     audio_running = False
     audio_frequency = 0.0
 
-    had_processes = audio_process is not None or audio_rtl_process is not None
-
     # Kill the pipeline processes and their groups
     if audio_process:
         try:
@@ -905,7 +892,6 @@ def _stop_audio_stream_internal():
     audio_rtl_process = None
 
     # Pause for SDR device USB interface to be released by kernel
-    if had_processes:
     time.sleep(1.0)
 
 
@@ -1189,10 +1175,6 @@ def stream_scanner_events() -> Response:
             try:
                 msg = scanner_queue.get(timeout=SSE_QUEUE_TIMEOUT)
                 last_keepalive = time.time()
-                try:
-                    process_event('listening_scanner', msg, msg.get('type'))
-                except Exception:
-                    pass
                 yield format_sse(msg)
             except queue.Empty:
                 now = time.time()
@@ -1311,40 +1293,11 @@ def start_audio() -> Response:
     scanner_config['device'] = device
     scanner_config['sdr_type'] = sdr_type
 
-    # Stop waterfall if it's using the same SDR (SSE path)
+    # Claim device for listening audio
-    if waterfall_running and waterfall_active_device == device:
-        _stop_waterfall_internal()
-        time.sleep(0.2)
-
-    # Claim device for listening audio.  The WebSocket waterfall handler
-    # may still be tearing down its IQ capture process (thread join +
-    # safe_terminate can take several seconds), so we retry with back-off
-    # to give the USB device time to be fully released.
     if listening_active_device is None or listening_active_device != device:
         if listening_active_device is not None:
             app_module.release_sdr_device(listening_active_device)
-            listening_active_device = None
-
-        error = None
-        max_claim_attempts = 6
-        for attempt in range(max_claim_attempts):
-            # Force-release a stale waterfall registry entry on each
-            # attempt — the WebSocket handler may not have finished
-            # cleanup yet.
-            device_status = app_module.get_sdr_device_status()
-            if device_status.get(device) == 'waterfall':
-                app_module.release_sdr_device(device)
-
         error = app_module.claim_sdr_device(device, 'listening')
-            if not error:
-                break
-            if attempt < max_claim_attempts - 1:
-                logger.debug(
-                    f"Device claim attempt {attempt + 1}/{max_claim_attempts} "
-                    f"failed, retrying in 0.5s: {error}"
-                )
-                time.sleep(0.5)
-
         if error:
             return jsonify({
                 'status': 'error',
@@ -1447,6 +1400,13 @@ def audio_probe() -> Response:
 @listening_post_bp.route('/audio/stream')
 def stream_audio() -> Response:
     """Stream WAV audio."""
+    # Optionally restart pipeline so the stream starts with a fresh header
+    if request.args.get('fresh') == '1' and audio_running:
+        try:
+            _start_audio_stream(audio_frequency or 0.0, audio_modulation or 'fm')
+        except Exception as e:
+            logger.error(f"Audio stream restart failed: {e}")
+
     # Wait for audio to be ready (up to 2 seconds for modulation/squelch changes)
     for _ in range(40):
         if audio_running and audio_process:
@@ -1462,30 +1422,13 @@ def stream_audio() -> Response:
         if not proc or not proc.stdout:
             return
         try:
-            # Drain stale audio that accumulated in the pipe buffer
+            # First byte timeout to avoid hanging clients forever
-            # between pipeline start and stream connection.  Keep the
-            # first chunk (contains WAV header) and discard the rest
-            # so the browser starts close to real-time.
-            header_chunk = None
-            while True:
-                ready, _, _ = select.select([proc.stdout], [], [], 0)
-                if not ready:
-                    break
-                chunk = proc.stdout.read(8192)
-                if not chunk:
-                    break
-                if header_chunk is None:
-                    header_chunk = chunk
-            if header_chunk:
-                yield header_chunk
-
-            # Stream real-time audio
             first_chunk_deadline = time.time() + 3.0
             while audio_running and proc.poll() is None:
                 # Use select to avoid blocking forever
                 ready, _, _ = select.select([proc.stdout], [], [], 2.0)
                 if ready:
-                    chunk = proc.stdout.read(8192)
+                    chunk = proc.stdout.read(4096)
                     if chunk:
                         yield chunk
                     else:
@@ -1578,51 +1521,9 @@ waterfall_config = {
     'bin_size': 10000,
     'gain': 40,
     'device': 0,
-    'max_bins': 1024,
-    'interval': 0.4,
 }
 
 
-def _parse_rtl_power_line(line: str) -> tuple[str | None, float | None, float | None, list[float]]:
-    """Parse a single rtl_power CSV line into bins."""
-    if not line or line.startswith('#'):
-        return None, None, None, []
-
-    parts = [p.strip() for p in line.split(',')]
-    if len(parts) < 6:
-        return None, None, None, []
-
-    # Timestamp in first two fields (YYYY-MM-DD, HH:MM:SS)
-    timestamp = f"{parts[0]} {parts[1]}" if len(parts) >= 2 else parts[0]
-
-    start_idx = None
-    for i, tok in enumerate(parts):
-        try:
-            val = float(tok)
-        except ValueError:
-            continue
-        if val > 1e5:
-            start_idx = i
-            break
-    if start_idx is None or len(parts) < start_idx + 4:
-        return timestamp, None, None, []
-
-    try:
-        seg_start = float(parts[start_idx])
-        seg_end = float(parts[start_idx + 1])
-        raw_values = []
-        for v in parts[start_idx + 3:]:
-            try:
-                raw_values.append(float(v))
-            except ValueError:
-                continue
-        if raw_values and raw_values[0] >= 0 and any(val < 0 for val in raw_values[1:]):
-            raw_values = raw_values[1:]
-        return timestamp, seg_start, seg_end, raw_values
-    except ValueError:
-        return timestamp, None, None, []
-
-
 def _waterfall_loop():
     """Continuous rtl_power sweep loop emitting waterfall data."""
     global waterfall_running, waterfall_process
@@ -1633,59 +1534,84 @@ def _waterfall_loop():
         waterfall_running = False
         return
 
+    try:
+        while waterfall_running:
             start_hz = int(waterfall_config['start_freq'] * 1e6)
             end_hz = int(waterfall_config['end_freq'] * 1e6)
             bin_hz = int(waterfall_config['bin_size'])
             gain = waterfall_config['gain']
             device = waterfall_config['device']
-    interval = float(waterfall_config.get('interval', 0.4))
 
             cmd = [
                 rtl_power_path,
                 '-f', f'{start_hz}:{end_hz}:{bin_hz}',
-        '-i', str(interval),
+                '-i', '0.5',
+                '-1',
                 '-g', str(gain),
                 '-d', str(device),
             ]
 
             try:
-        waterfall_process = subprocess.Popen(
+                proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
-            cmd,
+                waterfall_process = proc
-            stdout=subprocess.PIPE,
+                stdout, _ = proc.communicate(timeout=15)
-            stderr=subprocess.DEVNULL,
+            except subprocess.TimeoutExpired:
-            bufsize=1,
+                proc.kill()
-            text=True,
+                stdout = b''
-        )
+            finally:
+                waterfall_process = None
 
-        current_ts = None
-        all_bins: list[float] = []
-        sweep_start_hz = start_hz
-        sweep_end_hz = end_hz
-
-        if not waterfall_process.stdout:
-            return
-
-        for line in waterfall_process.stdout:
             if not waterfall_running:
                 break
 
-            ts, seg_start, seg_end, bins = _parse_rtl_power_line(line)
+            if not stdout:
-            if ts is None or not bins:
+                time.sleep(0.2)
                 continue
 
-            if current_ts is None:
+            # Parse rtl_power CSV output
-                current_ts = ts
+            all_bins = []
+            sweep_start_hz = start_hz
+            sweep_end_hz = end_hz
 
-            if ts != current_ts and all_bins:
+            for line in stdout.decode(errors='ignore').splitlines():
-                max_bins = int(waterfall_config.get('max_bins') or 0)
+                if not line or line.startswith('#'):
-                bins_to_send = all_bins
+                    continue
-                if max_bins > 0 and len(bins_to_send) > max_bins:
+                parts = [p.strip() for p in line.split(',')]
-                    bins_to_send = _downsample_bins(bins_to_send, max_bins)
+                start_idx = None
+                for i, tok in enumerate(parts):
+                    try:
+                        val = float(tok)
+                    except ValueError:
+                        continue
+                    if val > 1e5:
+                        start_idx = i
+                        break
+                if start_idx is None or len(parts) < start_idx + 4:
+                    continue
+                try:
+                    seg_start = float(parts[start_idx])
+                    seg_end = float(parts[start_idx + 1])
+                    seg_bin = float(parts[start_idx + 2])
+                    raw_values = []
+                    for v in parts[start_idx + 3:]:
+                        try:
+                            raw_values.append(float(v))
+                        except ValueError:
+                            continue
+                    if raw_values and raw_values[0] >= 0 and any(val < 0 for val in raw_values[1:]):
+                        raw_values = raw_values[1:]
+                    all_bins.extend(raw_values)
+                    sweep_start_hz = min(sweep_start_hz, seg_start)
+                    sweep_end_hz = max(sweep_end_hz, seg_end)
+                except ValueError:
+                    continue
+
+            if all_bins:
                 msg = {
                     'type': 'waterfall_sweep',
                     'start_freq': sweep_start_hz / 1e6,
                     'end_freq': sweep_end_hz / 1e6,
-                    'bins': bins_to_send,
+                    'bins': all_bins,
                     'timestamp': datetime.now().isoformat(),
                 }
                 try:
@@ -1700,73 +1626,15 @@ def _waterfall_loop():
                     except queue.Full:
                         pass
 
-                all_bins = []
+            time.sleep(0.1)
-                sweep_start_hz = start_hz
-                sweep_end_hz = end_hz
-                current_ts = ts
-
-            all_bins.extend(bins)
-            if seg_start is not None:
-                sweep_start_hz = min(sweep_start_hz, seg_start)
-            if seg_end is not None:
-                sweep_end_hz = max(sweep_end_hz, seg_end)
-
-        # Flush any remaining bins
-        if all_bins and waterfall_running:
-            max_bins = int(waterfall_config.get('max_bins') or 0)
-            bins_to_send = all_bins
-            if max_bins > 0 and len(bins_to_send) > max_bins:
-                bins_to_send = _downsample_bins(bins_to_send, max_bins)
-            msg = {
-                'type': 'waterfall_sweep',
-                'start_freq': sweep_start_hz / 1e6,
-                'end_freq': sweep_end_hz / 1e6,
-                'bins': bins_to_send,
-                'timestamp': datetime.now().isoformat(),
-            }
-            try:
-                waterfall_queue.put_nowait(msg)
-            except queue.Full:
-                pass
 
     except Exception as e:
         logger.error(f"Waterfall loop error: {e}")
     finally:
         waterfall_running = False
-        if waterfall_process and waterfall_process.poll() is None:
-            try:
-                waterfall_process.terminate()
-                waterfall_process.wait(timeout=1)
-            except Exception:
-                try:
-                    waterfall_process.kill()
-                except Exception:
-                    pass
-        waterfall_process = None
         logger.info("Waterfall loop stopped")
 
 
-def _stop_waterfall_internal() -> None:
-    """Stop the waterfall display and release resources."""
-    global waterfall_running, waterfall_process, waterfall_active_device
-
-    waterfall_running = False
-    if waterfall_process and waterfall_process.poll() is None:
-        try:
-            waterfall_process.terminate()
-            waterfall_process.wait(timeout=1)
-        except Exception:
-            try:
-                waterfall_process.kill()
-            except Exception:
-                pass
-        waterfall_process = None
-
-    if waterfall_active_device is not None:
-        app_module.release_sdr_device(waterfall_active_device)
-        waterfall_active_device = None
-
-
 @listening_post_bp.route('/waterfall/start', methods=['POST'])
 def start_waterfall() -> Response:
     """Start the waterfall/spectrogram display."""
@@ -1787,16 +1655,6 @@ def start_waterfall() -> Response:
         waterfall_config['bin_size'] = int(data.get('bin_size', 10000))
         waterfall_config['gain'] = int(data.get('gain', 40))
         waterfall_config['device'] = int(data.get('device', 0))
-        if data.get('interval') is not None:
-            interval = float(data.get('interval', waterfall_config['interval']))
-            if interval < 0.1 or interval > 5:
-                return jsonify({'status': 'error', 'message': 'interval must be between 0.1 and 5 seconds'}), 400
-            waterfall_config['interval'] = interval
-        if data.get('max_bins') is not None:
-            max_bins = int(data.get('max_bins', waterfall_config['max_bins']))
-            if max_bins < 64 or max_bins > 4096:
-                return jsonify({'status': 'error', 'message': 'max_bins must be between 64 and 4096'}), 400
-            waterfall_config['max_bins'] = max_bins
     except (ValueError, TypeError) as e:
         return jsonify({'status': 'error', 'message': f'Invalid parameter: {e}'}), 400
 
@@ -1826,7 +1684,23 @@ def start_waterfall() -> Response:
 @listening_post_bp.route('/waterfall/stop', methods=['POST'])
 def stop_waterfall() -> Response:
     """Stop the waterfall display."""
-    _stop_waterfall_internal()
+    global waterfall_running, waterfall_process, waterfall_active_device
+
+    waterfall_running = False
+    if waterfall_process and waterfall_process.poll() is None:
+        try:
+            waterfall_process.terminate()
+            waterfall_process.wait(timeout=1)
+        except Exception:
+            try:
+                waterfall_process.kill()
+            except Exception:
+                pass
+        waterfall_process = None
+
+    if waterfall_active_device is not None:
+        app_module.release_sdr_device(waterfall_active_device)
+        waterfall_active_device = None
 
     return jsonify({'status': 'stopped'})
 
@@ -1840,10 +1714,6 @@ def stream_waterfall() -> Response:
             try:
                 msg = waterfall_queue.get(timeout=SSE_QUEUE_TIMEOUT)
                 last_keepalive = time.time()
-                try:
-                    process_event('waterfall', msg, msg.get('type'))
-                except Exception:
-                    pass
                 yield format_sse(msg)
             except queue.Empty:
                 now = time.time()
@@ -1855,20 +1725,3 @@ def stream_waterfall() -> Response:
     response.headers['Cache-Control'] = 'no-cache'
     response.headers['X-Accel-Buffering'] = 'no'
     return response
-def _downsample_bins(values: list[float], target: int) -> list[float]:
-    """Downsample bins to a target length using simple averaging."""
-    if target <= 0 or len(values) <= target:
-        return values
-
-    out: list[float] = []
-    step = len(values) / target
-    for i in range(target):
-        start = int(i * step)
-        end = int((i + 1) * step)
-        if end <= start:
-            end = min(start + 1, len(values))
-        chunk = values[start:end]
-        if not chunk:
-            continue
-        out.append(sum(chunk) / len(chunk))
-    return out

routes/offline.py

@@ -44,9 +44,6 @@ ASSET_PATHS = {
         'static/vendor/leaflet/images/marker-shadow.png',
         'static/vendor/leaflet/images/layers.png',
         'static/vendor/leaflet/images/layers-2x.png'
-    ],
-    'leaflet_heat': [
-        'static/vendor/leaflet-heat/leaflet-heat.js'
     ]
 }
 

routes/pager.py

@@ -2,14 +2,12 @@
 
 from __future__ import annotations
 
-import math
 import os
 import pathlib
 import re
 import pty
 import queue
 import select
-import struct
 import subprocess
 import threading
 import time
@@ -25,7 +23,6 @@ from utils.validation import (
     validate_rtl_tcp_host, validate_rtl_tcp_port
 )
 from utils.sse import format_sse
-from utils.event_pipeline import process_event
 from utils.process import safe_terminate, register_process, unregister_process
 from utils.sdr import SDRFactory, SDRType, SDRValidationError
 from utils.dependencies import get_tool_path
@@ -108,62 +105,6 @@ def log_message(msg: dict[str, Any]) -> None:
         logger.error(f"Failed to log message: {e}")
 
 
-def audio_relay_thread(
-    rtl_stdout,
-    multimon_stdin,
-    output_queue: queue.Queue,
-    stop_event: threading.Event,
-) -> None:
-    """Relay audio from rtl_fm to multimon-ng while computing signal levels.
-
-    Reads raw 16-bit LE PCM from *rtl_stdout*, writes every chunk straight
-    through to *multimon_stdin*, and every ~100 ms pushes an RMS / peak scope
-    event onto *output_queue*.
-    """
-    CHUNK = 4096  # bytes – 2048 samples at 16-bit mono
-    INTERVAL = 0.1  # seconds between scope updates
-    last_scope = time.monotonic()
-
-    try:
-        while not stop_event.is_set():
-            data = rtl_stdout.read(CHUNK)
-            if not data:
-                break
-
-            # Forward audio untouched
-            try:
-                multimon_stdin.write(data)
-                multimon_stdin.flush()
-            except (BrokenPipeError, OSError):
-                break
-
-            # Compute scope levels every ~100 ms
-            now = time.monotonic()
-            if now - last_scope >= INTERVAL:
-                last_scope = now
-                try:
-                    n_samples = len(data) // 2
-                    if n_samples == 0:
-                        continue
-                    samples = struct.unpack(f'<{n_samples}h', data[:n_samples * 2])
-                    peak = max(abs(s) for s in samples)
-                    rms = int(math.sqrt(sum(s * s for s in samples) / n_samples))
-                    output_queue.put_nowait({
-                        'type': 'scope',
-                        'rms': rms,
-                        'peak': peak,
-                    })
-                except (struct.error, ValueError, queue.Full):
-                    pass
-    except Exception as e:
-        logger.debug(f"Audio relay error: {e}")
-    finally:
-        try:
-            multimon_stdin.close()
-        except OSError:
-            pass
-
-
 def stream_decoder(master_fd: int, process: subprocess.Popen[bytes]) -> None:
     """Stream decoder output to queue using PTY for unbuffered output."""
     try:
@@ -210,11 +151,6 @@ def stream_decoder(master_fd: int, process: subprocess.Popen[bytes]) -> None:
             os.close(master_fd)
         except OSError:
             pass
-        # Signal relay thread to stop
-        with app_module.process_lock:
-            stop_relay = getattr(app_module.current_process, '_stop_relay', None)
-        if stop_relay:
-            stop_relay.set()
         # Cleanup companion rtl_fm process and decoder
         with app_module.process_lock:
             rtl_proc = getattr(app_module.current_process, '_rtl_process', None)
@@ -382,7 +318,7 @@ def start_decoding() -> Response:
 
             multimon_process = subprocess.Popen(
                 multimon_cmd,
-                stdin=subprocess.PIPE,
+                stdin=rtl_process.stdout,
                 stdout=slave_fd,
                 stderr=slave_fd,
                 close_fds=True
@@ -390,22 +326,11 @@ def start_decoding() -> Response:
             register_process(multimon_process)
 
             os.close(slave_fd)
-
+            rtl_process.stdout.close()
-            # Spawn audio relay thread between rtl_fm and multimon-ng
-            stop_relay = threading.Event()
-            relay = threading.Thread(
-                target=audio_relay_thread,
-                args=(rtl_process.stdout, multimon_process.stdin,
-                      app_module.output_queue, stop_relay),
-            )
-            relay.daemon = True
-            relay.start()
 
             app_module.current_process = multimon_process
             app_module.current_process._rtl_process = rtl_process
             app_module.current_process._master_fd = master_fd
-            app_module.current_process._stop_relay = stop_relay
-            app_module.current_process._relay_thread = relay
 
             # Start output thread with PTY master fd
             thread = threading.Thread(target=stream_decoder, args=(master_fd, multimon_process))
@@ -454,10 +379,6 @@ def stop_decoding() -> Response:
 
     with app_module.process_lock:
         if app_module.current_process:
-            # Signal audio relay thread to stop
-            if hasattr(app_module.current_process, '_stop_relay'):
-                app_module.current_process._stop_relay.set()
-
             # Kill rtl_fm process first
             if hasattr(app_module.current_process, '_rtl_process'):
                 try:
@@ -550,10 +471,6 @@ def stream() -> Response:
             try:
                 msg = app_module.output_queue.get(timeout=1)
                 last_keepalive = time.time()
-                try:
-                    process_event('pager', msg, msg.get('type'))
-                except Exception:
-                    pass
                 yield format_sse(msg)
             except queue.Empty:
                 now = time.time()

routes/recordings.py

@@ -1,109 +0,0 @@
-"""Session recording API endpoints."""
-
-from __future__ import annotations
-
-from pathlib import Path
-
-from flask import Blueprint, jsonify, request, send_file
-
-from utils.recording import get_recording_manager, RECORDING_ROOT
-
-recordings_bp = Blueprint('recordings', __name__, url_prefix='/recordings')
-
-
-@recordings_bp.route('/start', methods=['POST'])
-def start_recording():
-    data = request.get_json() or {}
-    mode = (data.get('mode') or '').strip()
-    if not mode:
-        return jsonify({'status': 'error', 'message': 'mode is required'}), 400
-
-    label = data.get('label')
-    metadata = data.get('metadata') if isinstance(data.get('metadata'), dict) else {}
-
-    manager = get_recording_manager()
-    session = manager.start_recording(mode=mode, label=label, metadata=metadata)
-
-    return jsonify({
-        'status': 'success',
-        'session': {
-            'id': session.id,
-            'mode': session.mode,
-            'label': session.label,
-            'started_at': session.started_at.isoformat(),
-            'file_path': str(session.file_path),
-        }
-    })
-
-
-@recordings_bp.route('/stop', methods=['POST'])
-def stop_recording():
-    data = request.get_json() or {}
-    mode = data.get('mode')
-    session_id = data.get('id')
-
-    manager = get_recording_manager()
-    session = manager.stop_recording(mode=mode, session_id=session_id)
-    if not session:
-        return jsonify({'status': 'error', 'message': 'No active recording found'}), 404
-
-    return jsonify({
-        'status': 'success',
-        'session': {
-            'id': session.id,
-            'mode': session.mode,
-            'label': session.label,
-            'started_at': session.started_at.isoformat(),
-            'stopped_at': session.stopped_at.isoformat() if session.stopped_at else None,
-            'event_count': session.event_count,
-            'size_bytes': session.size_bytes,
-            'file_path': str(session.file_path),
-        }
-    })
-
-
-@recordings_bp.route('', methods=['GET'])
-def list_recordings():
-    manager = get_recording_manager()
-    limit = request.args.get('limit', default=50, type=int)
-    return jsonify({
-        'status': 'success',
-        'recordings': manager.list_recordings(limit=limit),
-        'active': manager.get_active(),
-    })
-
-
-@recordings_bp.route('/<session_id>', methods=['GET'])
-def get_recording(session_id: str):
-    manager = get_recording_manager()
-    rec = manager.get_recording(session_id)
-    if not rec:
-        return jsonify({'status': 'error', 'message': 'Recording not found'}), 404
-    return jsonify({'status': 'success', 'recording': rec})
-
-
-@recordings_bp.route('/<session_id>/download', methods=['GET'])
-def download_recording(session_id: str):
-    manager = get_recording_manager()
-    rec = manager.get_recording(session_id)
-    if not rec:
-        return jsonify({'status': 'error', 'message': 'Recording not found'}), 404
-
-    file_path = Path(rec['file_path'])
-    try:
-        resolved_root = RECORDING_ROOT.resolve()
-        resolved_file = file_path.resolve()
-        if resolved_root not in resolved_file.parents:
-            return jsonify({'status': 'error', 'message': 'Invalid recording path'}), 400
-    except Exception:
-        return jsonify({'status': 'error', 'message': 'Invalid recording path'}), 400
-
-    if not file_path.exists():
-        return jsonify({'status': 'error', 'message': 'Recording file missing'}), 404
-
-    return send_file(
-        file_path,
-        mimetype='application/x-ndjson',
-        as_attachment=True,
-        download_name=file_path.name,
-    )

routes/rtlamr.py

@@ -18,7 +18,6 @@ from utils.validation import (
     validate_frequency, validate_device_index, validate_gain, validate_ppm
 )
 from utils.sse import format_sse
-from utils.event_pipeline import process_event
 from utils.process import safe_terminate, register_process, unregister_process
 
 rtlamr_bp = Blueprint('rtlamr', __name__)
@@ -296,10 +295,6 @@ def stream_rtlamr() -> Response:
             try:
                 msg = app_module.rtlamr_queue.get(timeout=1)
                 last_keepalive = time.time()
-                try:
-                    process_event('rtlamr', msg, msg.get('type'))
-                except Exception:
-                    pass
                 yield format_sse(msg)
             except queue.Empty:
                 now = time.time()

routes/satellite.py

@@ -16,13 +16,6 @@ from flask import Blueprint, jsonify, request, render_template, Response
 from config import SHARED_OBSERVER_LOCATION_ENABLED
 
 from data.satellites import TLE_SATELLITES
-from utils.database import (
-    get_tracked_satellites,
-    add_tracked_satellite,
-    bulk_add_tracked_satellites,
-    update_tracked_satellite,
-    remove_tracked_satellite,
-)
 from utils.logging import satellite_logger as logger
 from utils.validation import validate_latitude, validate_longitude, validate_hours, validate_elevation
 
@@ -38,43 +31,6 @@ ALLOWED_TLE_HOSTS = ['celestrak.org', 'celestrak.com', 'www.celestrak.org', 'www
 _tle_cache = dict(TLE_SATELLITES)
 
 
-def _load_db_satellites_into_cache():
-    """Load user-tracked satellites from DB into the TLE cache."""
-    global _tle_cache
-    try:
-        db_sats = get_tracked_satellites()
-        loaded = 0
-        for sat in db_sats:
-            if sat['tle_line1'] and sat['tle_line2']:
-                # Use a cache key derived from name (sanitised)
-                cache_key = sat['name'].replace(' ', '-').upper()
-                if cache_key not in _tle_cache:
-                    _tle_cache[cache_key] = (sat['name'], sat['tle_line1'], sat['tle_line2'])
-                    loaded += 1
-        if loaded:
-            logger.info(f"Loaded {loaded} user-tracked satellites into TLE cache")
-    except Exception as e:
-        logger.warning(f"Failed to load DB satellites into TLE cache: {e}")
-
-
-def init_tle_auto_refresh():
-    """Initialize TLE auto-refresh. Called by app.py after initialization."""
-    import threading
-
-    def _auto_refresh_tle():
-        try:
-            _load_db_satellites_into_cache()
-            updated = refresh_tle_data()
-            if updated:
-                logger.info(f"Auto-refreshed TLE data for: {', '.join(updated)}")
-        except Exception as e:
-            logger.warning(f"Auto TLE refresh failed: {e}")
-
-    # Start auto-refresh in background
-    threading.Timer(2.0, _auto_refresh_tle).start()
-    logger.info("TLE auto-refresh scheduled")
-
-
 def _fetch_iss_realtime(observer_lat: Optional[float] = None, observer_lon: Optional[float] = None) -> Optional[dict]:
     """
     Fetch real-time ISS position from external APIs.
@@ -197,11 +153,15 @@ def predict_passes():
 
     norad_to_name = {
         25544: 'ISS',
+        25338: 'NOAA-15',
+        28654: 'NOAA-18',
+        33591: 'NOAA-19',
+        43013: 'NOAA-20',
         40069: 'METEOR-M2',
         57166: 'METEOR-M2-3'
     }
 
-    sat_input = data.get('satellites', ['ISS', 'METEOR-M2', 'METEOR-M2-3'])
+    sat_input = data.get('satellites', ['ISS', 'NOAA-15', 'NOAA-18', 'NOAA-19'])
     satellites = []
     for sat in sat_input:
         if isinstance(sat, int) and sat in norad_to_name:
@@ -212,6 +172,10 @@ def predict_passes():
     passes = []
     colors = {
         'ISS': '#00ffff',
+        'NOAA-15': '#00ff00',
+        'NOAA-18': '#ff6600',
+        'NOAA-19': '#ff3366',
+        'NOAA-20': '#00ffaa',
         'METEOR-M2': '#9370DB',
         'METEOR-M2-3': '#ff00ff'
     }
@@ -348,6 +312,10 @@ def get_satellite_position():
 
     norad_to_name = {
         25544: 'ISS',
+        25338: 'NOAA-15',
+        28654: 'NOAA-18',
+        33591: 'NOAA-19',
+        43013: 'NOAA-20',
         40069: 'METEOR-M2',
         57166: 'METEOR-M2-3'
     }
@@ -513,8 +481,7 @@ def update_tle():
             'updated': updated
         })
     except Exception as e:
-        logger.error(f"Error updating TLE data: {e}")
+        return jsonify({'status': 'error', 'message': str(e)})
-        return jsonify({'status': 'error', 'message': 'TLE update failed'})
 
 
 @satellite_bp.route('/celestrak/<category>')
@@ -568,77 +535,4 @@ def fetch_celestrak(category):
         })
 
     except Exception as e:
-        logger.error(f"Error fetching CelesTrak data: {e}")
+        return jsonify({'status': 'error', 'message': str(e)})
-        return jsonify({'status': 'error', 'message': 'Failed to fetch satellite data'})
-
-
-# =============================================================================
-# Tracked Satellites CRUD
-# =============================================================================
-
-@satellite_bp.route('/tracked', methods=['GET'])
-def list_tracked_satellites():
-    """Return all tracked satellites from the database."""
-    enabled_only = request.args.get('enabled', '').lower() == 'true'
-    sats = get_tracked_satellites(enabled_only=enabled_only)
-    return jsonify({'status': 'success', 'satellites': sats})
-
-
-@satellite_bp.route('/tracked', methods=['POST'])
-def add_tracked_satellites_endpoint():
-    """Add one or more tracked satellites."""
-    global _tle_cache
-    data = request.json
-    if not data:
-        return jsonify({'status': 'error', 'message': 'No data provided'}), 400
-
-    # Accept a single satellite dict or a list
-    sat_list = data if isinstance(data, list) else [data]
-
-    added = 0
-    for sat in sat_list:
-        norad_id = str(sat.get('norad_id', sat.get('norad', '')))
-        name = sat.get('name', '')
-        if not norad_id or not name:
-            continue
-        tle1 = sat.get('tle_line1', sat.get('tle1'))
-        tle2 = sat.get('tle_line2', sat.get('tle2'))
-        enabled = sat.get('enabled', True)
-
-        if add_tracked_satellite(norad_id, name, tle1, tle2, enabled):
-            added += 1
-
-        # Also inject into TLE cache if we have TLE data
-        if tle1 and tle2:
-            cache_key = name.replace(' ', '-').upper()
-            _tle_cache[cache_key] = (name, tle1, tle2)
-
-    return jsonify({
-        'status': 'success',
-        'added': added,
-        'satellites': get_tracked_satellites(),
-    })
-
-
-@satellite_bp.route('/tracked/<norad_id>', methods=['PUT'])
-def update_tracked_satellite_endpoint(norad_id):
-    """Update the enabled state of a tracked satellite."""
-    data = request.json or {}
-    enabled = data.get('enabled')
-    if enabled is None:
-        return jsonify({'status': 'error', 'message': 'Missing enabled field'}), 400
-
-    ok = update_tracked_satellite(str(norad_id), bool(enabled))
-    if ok:
-        return jsonify({'status': 'success'})
-    return jsonify({'status': 'error', 'message': 'Satellite not found'}), 404
-
-
-@satellite_bp.route('/tracked/<norad_id>', methods=['DELETE'])
-def delete_tracked_satellite_endpoint(norad_id):
-    """Remove a tracked satellite by NORAD ID."""
-    ok, msg = remove_tracked_satellite(str(norad_id))
-    if ok:
-        return jsonify({'status': 'success', 'message': msg})
-    status_code = 403 if 'builtin' in msg.lower() else 404
-    return jsonify({'status': 'error', 'message': msg}), status_code

routes/sensor.py

@@ -19,7 +19,6 @@ from utils.validation import (
     validate_rtl_tcp_host, validate_rtl_tcp_port
 )
 from utils.sse import format_sse
-from utils.event_pipeline import process_event
 from utils.process import safe_terminate, register_process, unregister_process
 from utils.sdr import SDRFactory, SDRType
 
@@ -45,21 +44,6 @@ def stream_sensor_output(process: subprocess.Popen[bytes]) -> None:
                 data['type'] = 'sensor'
                 app_module.sensor_queue.put(data)
 
-                # Push scope event when signal level data is present
-                rssi = data.get('rssi')
-                snr = data.get('snr')
-                noise = data.get('noise')
-                if rssi is not None or snr is not None:
-                    try:
-                        app_module.sensor_queue.put_nowait({
-                            'type': 'scope',
-                            'rssi': rssi if rssi is not None else 0,
-                            'snr': snr if snr is not None else 0,
-                            'noise': noise if noise is not None else 0,
-                        })
-                    except queue.Full:
-                        pass
-
                 # Log if enabled
                 if app_module.logging_enabled:
                     try:
@@ -95,14 +79,6 @@ def stream_sensor_output(process: subprocess.Popen[bytes]) -> None:
             sensor_active_device = None
 
 
-@sensor_bp.route('/sensor/status')
-def sensor_status() -> Response:
-    """Check if sensor decoder is currently running."""
-    with app_module.sensor_lock:
-        running = app_module.sensor_process is not None and app_module.sensor_process.poll() is None
-    return jsonify({'running': running})
-
-
 @sensor_bp.route('/start_sensor', methods=['POST'])
 def start_sensor() -> Response:
     global sensor_active_device
@@ -181,10 +157,6 @@ def start_sensor() -> Response:
         full_cmd = ' '.join(cmd)
         logger.info(f"Running: {full_cmd}")
 
-        # Add signal level metadata so the frontend scope can display RSSI/SNR
-        # Disable stats reporting to suppress "row count limit 50 reached" warnings
-        cmd.extend(['-M', 'level', '-M', 'stats:0'])
-
         try:
             app_module.sensor_process = subprocess.Popen(
                 cmd,
@@ -199,16 +171,10 @@ def start_sensor() -> Response:
             thread.start()
 
             # Monitor stderr
-            # Filter noisy rtl_433 diagnostics that aren't useful to display
-            _stderr_noise = (
-                'bitbuffer_add_bit',
-                'row count limit',
-            )
-
             def monitor_stderr():
                 for line in app_module.sensor_process.stderr:
                     err = line.decode('utf-8', errors='replace').strip()
-                    if err and not any(noise in err for noise in _stderr_noise):
+                    if err:
                         logger.debug(f"[rtl_433] {err}")
                         app_module.sensor_queue.put({'type': 'info', 'text': f'[rtl_433] {err}'})
 
@@ -267,10 +233,6 @@ def stream_sensor() -> Response:
             try:
                 msg = app_module.sensor_queue.get(timeout=1)
                 last_keepalive = time.time()
-                try:
-                    process_event('sensor', msg, msg.get('type'))
-                except Exception:
-                    pass
                 yield format_sse(msg)
             except queue.Empty:
                 now = time.time()

routes/sstv.py

@@ -16,11 +16,12 @@ from flask import Blueprint, jsonify, request, Response, send_file
 import app as app_module
 from utils.logging import get_logger
 from utils.sse import format_sse
-from utils.event_pipeline import process_event
 from utils.sstv import (
     get_sstv_decoder,
     is_sstv_available,
     ISS_SSTV_FREQ,
+    DecodeProgress,
+    DopplerInfo,
 )
 
 logger = get_logger('intercept.sstv')
@@ -34,14 +35,14 @@ _sstv_queue: queue.Queue = queue.Queue(maxsize=100)
 sstv_active_device: int | None = None
 
 
-def _progress_callback(data: dict) -> None:
+def _progress_callback(progress: DecodeProgress) -> None:
-    """Callback to queue progress/scope updates for SSE stream."""
+    """Callback to queue progress updates for SSE stream."""
     try:
-        _sstv_queue.put_nowait(data)
+        _sstv_queue.put_nowait(progress.to_dict())
     except queue.Full:
         try:
             _sstv_queue.get_nowait()
-            _sstv_queue.put_nowait(data)
+            _sstv_queue.put_nowait(progress.to_dict())
         except queue.Empty:
             pass
 
@@ -400,10 +401,6 @@ def stream_progress():
             try:
                 progress = _sstv_queue.get(timeout=1)
                 last_keepalive = time.time()
-                try:
-                    process_event('sstv', progress, progress.get('type'))
-                except Exception:
-                    pass
                 yield format_sse(progress)
             except queue.Empty:
                 now = time.time()

routes/sstv_general.py

@@ -15,8 +15,8 @@ from flask import Blueprint, Response, jsonify, request, send_file
 
 from utils.logging import get_logger
 from utils.sse import format_sse
-from utils.event_pipeline import process_event
 from utils.sstv import (
+    DecodeProgress,
     get_general_sstv_decoder,
 )
 
@@ -48,14 +48,14 @@ SSTV_FREQUENCIES = [
 _FREQ_MODULATION_MAP = {entry['frequency']: entry['modulation'] for entry in SSTV_FREQUENCIES}
 
 
-def _progress_callback(data: dict) -> None:
+def _progress_callback(progress: DecodeProgress) -> None:
-    """Callback to queue progress/scope updates for SSE stream."""
+    """Callback to queue progress updates for SSE stream."""
     try:
-        _sstv_general_queue.put_nowait(data)
+        _sstv_general_queue.put_nowait(progress.to_dict())
     except queue.Full:
         try:
             _sstv_general_queue.get_nowait()
-            _sstv_general_queue.put_nowait(data)
+            _sstv_general_queue.put_nowait(progress.to_dict())
         except queue.Empty:
             pass
 
@@ -274,10 +274,6 @@ def stream_progress():
             try:
                 progress = _sstv_general_queue.get(timeout=1)
                 last_keepalive = time.time()
-                try:
-                    process_event('sstv_general', progress, progress.get('type'))
-                except Exception:
-                    pass
                 yield format_sse(progress)
             except queue.Empty:
                 now = time.time()

routes/subghz.py

@@ -1,424 +0,0 @@
-"""SubGHz transceiver routes.
-
-Provides endpoints for HackRF-based SubGHz signal capture, protocol decoding,
-signal replay/transmit, and wideband spectrum analysis.
-"""
-
-from __future__ import annotations
-
-import queue
-
-from flask import Blueprint, jsonify, request, Response, send_file
-
-from utils.logging import get_logger
-from utils.sse import sse_stream
-from utils.subghz import get_subghz_manager
-from utils.constants import (
-    SUBGHZ_FREQ_MIN_MHZ,
-    SUBGHZ_FREQ_MAX_MHZ,
-    SUBGHZ_LNA_GAIN_MAX,
-    SUBGHZ_VGA_GAIN_MAX,
-    SUBGHZ_TX_VGA_GAIN_MAX,
-    SUBGHZ_TX_MAX_DURATION,
-    SUBGHZ_SAMPLE_RATES,
-    SUBGHZ_PRESETS,
-)
-
-logger = get_logger('intercept.subghz')
-
-subghz_bp = Blueprint('subghz', __name__, url_prefix='/subghz')
-
-# SSE queue for streaming events to frontend
-_subghz_queue: queue.Queue = queue.Queue(maxsize=200)
-
-
-def _event_callback(event: dict) -> None:
-    """Forward SubGhzManager events to the SSE queue."""
-    try:
-        _subghz_queue.put_nowait(event)
-    except queue.Full:
-        try:
-            _subghz_queue.get_nowait()
-            _subghz_queue.put_nowait(event)
-        except queue.Empty:
-            pass
-
-
-def _validate_frequency_hz(data: dict, key: str = 'frequency_hz') -> tuple[int | None, str | None]:
-    """Validate frequency in Hz from request data. Returns (freq_hz, error_msg)."""
-    raw = data.get(key)
-    if raw is None:
-        return None, f'{key} is required'
-    try:
-        freq_hz = int(raw)
-        freq_mhz = freq_hz / 1_000_000
-        if not (SUBGHZ_FREQ_MIN_MHZ <= freq_mhz <= SUBGHZ_FREQ_MAX_MHZ):
-            return None, f'Frequency must be between {SUBGHZ_FREQ_MIN_MHZ}-{SUBGHZ_FREQ_MAX_MHZ} MHz'
-        return freq_hz, None
-    except (ValueError, TypeError):
-        return None, f'Invalid {key}'
-
-
-def _validate_serial(data: dict) -> str | None:
-    """Extract and validate optional HackRF device serial."""
-    serial = data.get('device_serial', '')
-    if not serial or not isinstance(serial, str):
-        return None
-    # HackRF serials are hex strings
-    serial = serial.strip()
-    if serial and all(c in '0123456789abcdefABCDEF' for c in serial):
-        return serial
-    return None
-
-
-def _validate_int(data: dict, key: str, default: int, min_val: int, max_val: int) -> int:
-    """Validate integer parameter with bounds clamping."""
-    try:
-        val = int(data.get(key, default))
-        return max(min_val, min(max_val, val))
-    except (ValueError, TypeError):
-        return default
-
-
-def _validate_decode_profile(data: dict, default: str = 'weather') -> str:
-    profile = data.get('decode_profile', default)
-    if not isinstance(profile, str):
-        return default
-    profile = profile.strip().lower()
-    if profile in {'weather', 'all'}:
-        return profile
-    return default
-
-
-def _validate_optional_float(data: dict, key: str) -> tuple[float | None, str | None]:
-    raw = data.get(key)
-    if raw is None or raw == '':
-        return None, None
-    try:
-        return float(raw), None
-    except (ValueError, TypeError):
-        return None, f'Invalid {key}'
-
-
-def _validate_bool(data: dict, key: str, default: bool = False) -> bool:
-    raw = data.get(key, default)
-    if isinstance(raw, bool):
-        return raw
-    if isinstance(raw, (int, float)):
-        return bool(raw)
-    if isinstance(raw, str):
-        return raw.strip().lower() in {'1', 'true', 'yes', 'on', 'enabled'}
-    return default
-
-
-# ------------------------------------------------------------------
-# STATUS
-# ------------------------------------------------------------------
-
-@subghz_bp.route('/status')
-def get_status():
-    manager = get_subghz_manager()
-    return jsonify(manager.get_status())
-
-
-@subghz_bp.route('/presets')
-def get_presets():
-    return jsonify({'presets': SUBGHZ_PRESETS, 'sample_rates': SUBGHZ_SAMPLE_RATES})
-
-
-# ------------------------------------------------------------------
-# RECEIVE
-# ------------------------------------------------------------------
-
-@subghz_bp.route('/receive/start', methods=['POST'])
-def start_receive():
-    data = request.get_json(silent=True) or {}
-
-    freq_hz, err = _validate_frequency_hz(data)
-    if err:
-        return jsonify({'status': 'error', 'message': err}), 400
-
-    sample_rate = _validate_int(data, 'sample_rate', 2000000, 2000000, 20000000)
-    lna_gain = _validate_int(data, 'lna_gain', 32, 0, SUBGHZ_LNA_GAIN_MAX)
-    vga_gain = _validate_int(data, 'vga_gain', 20, 0, SUBGHZ_VGA_GAIN_MAX)
-    trigger_enabled = _validate_bool(data, 'trigger_enabled', False)
-    trigger_pre_ms = _validate_int(data, 'trigger_pre_ms', 350, 50, 5000)
-    trigger_post_ms = _validate_int(data, 'trigger_post_ms', 700, 100, 10000)
-    device_serial = _validate_serial(data)
-
-    manager = get_subghz_manager()
-    manager.set_callback(_event_callback)
-
-    result = manager.start_receive(
-        frequency_hz=freq_hz,
-        sample_rate=sample_rate,
-        lna_gain=lna_gain,
-        vga_gain=vga_gain,
-        trigger_enabled=trigger_enabled,
-        trigger_pre_ms=trigger_pre_ms,
-        trigger_post_ms=trigger_post_ms,
-        device_serial=device_serial,
-    )
-
-    status_code = 200 if result.get('status') != 'error' else 409
-    return jsonify(result), status_code
-
-
-@subghz_bp.route('/receive/stop', methods=['POST'])
-def stop_receive():
-    manager = get_subghz_manager()
-    result = manager.stop_receive()
-    return jsonify(result)
-
-
-# ------------------------------------------------------------------
-# DECODE
-# ------------------------------------------------------------------
-
-@subghz_bp.route('/decode/start', methods=['POST'])
-def start_decode():
-    data = request.get_json(silent=True) or {}
-
-    freq_hz, err = _validate_frequency_hz(data)
-    if err:
-        return jsonify({'status': 'error', 'message': err}), 400
-
-    sample_rate = _validate_int(data, 'sample_rate', 2000000, 2000000, 20000000)
-    lna_gain = _validate_int(data, 'lna_gain', 32, 0, SUBGHZ_LNA_GAIN_MAX)
-    vga_gain = _validate_int(data, 'vga_gain', 20, 0, SUBGHZ_VGA_GAIN_MAX)
-    decode_profile = _validate_decode_profile(data)
-    device_serial = _validate_serial(data)
-
-    manager = get_subghz_manager()
-    manager.set_callback(_event_callback)
-
-    result = manager.start_decode(
-        frequency_hz=freq_hz,
-        sample_rate=sample_rate,
-        lna_gain=lna_gain,
-        vga_gain=vga_gain,
-        decode_profile=decode_profile,
-        device_serial=device_serial,
-    )
-
-    status_code = 200 if result.get('status') != 'error' else 409
-    return jsonify(result), status_code
-
-
-@subghz_bp.route('/decode/stop', methods=['POST'])
-def stop_decode():
-    manager = get_subghz_manager()
-    result = manager.stop_decode()
-    return jsonify(result)
-
-
-# ------------------------------------------------------------------
-# TRANSMIT
-# ------------------------------------------------------------------
-
-@subghz_bp.route('/transmit', methods=['POST'])
-def start_transmit():
-    data = request.get_json(silent=True) or {}
-
-    capture_id = data.get('capture_id')
-    if not capture_id or not isinstance(capture_id, str):
-        return jsonify({'status': 'error', 'message': 'capture_id is required'}), 400
-
-    # Sanitize capture_id
-    if not capture_id.isalnum():
-        return jsonify({'status': 'error', 'message': 'Invalid capture_id'}), 400
-
-    tx_gain = _validate_int(data, 'tx_gain', 20, 0, SUBGHZ_TX_VGA_GAIN_MAX)
-    max_duration = _validate_int(data, 'max_duration', 10, 1, SUBGHZ_TX_MAX_DURATION)
-    start_seconds, start_err = _validate_optional_float(data, 'start_seconds')
-    if start_err:
-        return jsonify({'status': 'error', 'message': start_err}), 400
-    duration_seconds, duration_err = _validate_optional_float(data, 'duration_seconds')
-    if duration_err:
-        return jsonify({'status': 'error', 'message': duration_err}), 400
-    device_serial = _validate_serial(data)
-
-    manager = get_subghz_manager()
-    manager.set_callback(_event_callback)
-
-    result = manager.transmit(
-        capture_id=capture_id,
-        tx_gain=tx_gain,
-        max_duration=max_duration,
-        start_seconds=start_seconds,
-        duration_seconds=duration_seconds,
-        device_serial=device_serial,
-    )
-
-    status_code = 200 if result.get('status') != 'error' else 400
-    return jsonify(result), status_code
-
-
-@subghz_bp.route('/transmit/stop', methods=['POST'])
-def stop_transmit():
-    manager = get_subghz_manager()
-    result = manager.stop_transmit()
-    return jsonify(result)
-
-
-# ------------------------------------------------------------------
-# SWEEP
-# ------------------------------------------------------------------
-
-@subghz_bp.route('/sweep/start', methods=['POST'])
-def start_sweep():
-    data = request.get_json(silent=True) or {}
-
-    try:
-        freq_start = float(data.get('freq_start_mhz', 300))
-        freq_end = float(data.get('freq_end_mhz', 928))
-        if freq_start >= freq_end:
-            return jsonify({'status': 'error', 'message': 'freq_start must be less than freq_end'}), 400
-        if freq_start < SUBGHZ_FREQ_MIN_MHZ or freq_end > SUBGHZ_FREQ_MAX_MHZ:
-            return jsonify({'status': 'error', 'message': f'Frequency range: {SUBGHZ_FREQ_MIN_MHZ}-{SUBGHZ_FREQ_MAX_MHZ} MHz'}), 400
-    except (ValueError, TypeError):
-        return jsonify({'status': 'error', 'message': 'Invalid frequency range'}), 400
-
-    bin_width = _validate_int(data, 'bin_width', 100000, 10000, 5000000)
-    device_serial = _validate_serial(data)
-
-    manager = get_subghz_manager()
-    manager.set_callback(_event_callback)
-
-    result = manager.start_sweep(
-        freq_start_mhz=freq_start,
-        freq_end_mhz=freq_end,
-        bin_width=bin_width,
-        device_serial=device_serial,
-    )
-
-    status_code = 200 if result.get('status') != 'error' else 409
-    return jsonify(result), status_code
-
-
-@subghz_bp.route('/sweep/stop', methods=['POST'])
-def stop_sweep():
-    manager = get_subghz_manager()
-    result = manager.stop_sweep()
-    return jsonify(result)
-
-
-# ------------------------------------------------------------------
-# CAPTURES LIBRARY
-# ------------------------------------------------------------------
-
-@subghz_bp.route('/captures')
-def list_captures():
-    manager = get_subghz_manager()
-    captures = manager.list_captures()
-    return jsonify({
-        'status': 'ok',
-        'captures': [c.to_dict() for c in captures],
-        'count': len(captures),
-    })
-
-
-@subghz_bp.route('/captures/<capture_id>')
-def get_capture(capture_id: str):
-    if not capture_id.isalnum():
-        return jsonify({'status': 'error', 'message': 'Invalid capture_id'}), 400
-
-    manager = get_subghz_manager()
-    capture = manager.get_capture(capture_id)
-    if not capture:
-        return jsonify({'status': 'error', 'message': 'Capture not found'}), 404
-
-    return jsonify({'status': 'ok', 'capture': capture.to_dict()})
-
-
-@subghz_bp.route('/captures/<capture_id>/download')
-def download_capture(capture_id: str):
-    if not capture_id.isalnum():
-        return jsonify({'status': 'error', 'message': 'Invalid capture_id'}), 400
-
-    manager = get_subghz_manager()
-    path = manager.get_capture_path(capture_id)
-    if not path:
-        return jsonify({'status': 'error', 'message': 'Capture not found'}), 404
-
-    return send_file(
-        path,
-        mimetype='application/octet-stream',
-        as_attachment=True,
-        download_name=path.name,
-    )
-
-
-@subghz_bp.route('/captures/<capture_id>/trim', methods=['POST'])
-def trim_capture(capture_id: str):
-    if not capture_id.isalnum():
-        return jsonify({'status': 'error', 'message': 'Invalid capture_id'}), 400
-
-    data = request.get_json(silent=True) or {}
-    start_seconds, start_err = _validate_optional_float(data, 'start_seconds')
-    if start_err:
-        return jsonify({'status': 'error', 'message': start_err}), 400
-    duration_seconds, duration_err = _validate_optional_float(data, 'duration_seconds')
-    if duration_err:
-        return jsonify({'status': 'error', 'message': duration_err}), 400
-
-    label = data.get('label', '')
-    if label is None:
-        label = ''
-    if not isinstance(label, str) or len(label) > 100:
-        return jsonify({'status': 'error', 'message': 'Label must be a string (max 100 chars)'}), 400
-
-    manager = get_subghz_manager()
-    result = manager.trim_capture(
-        capture_id=capture_id,
-        start_seconds=start_seconds,
-        duration_seconds=duration_seconds,
-        label=label,
-    )
-
-    if result.get('status') == 'ok':
-        return jsonify(result), 200
-    message = str(result.get('message') or 'Trim failed')
-    status_code = 404 if 'not found' in message.lower() else 400
-    return jsonify(result), status_code
-
-
-@subghz_bp.route('/captures/<capture_id>', methods=['DELETE'])
-def delete_capture(capture_id: str):
-    if not capture_id.isalnum():
-        return jsonify({'status': 'error', 'message': 'Invalid capture_id'}), 400
-
-    manager = get_subghz_manager()
-    if manager.delete_capture(capture_id):
-        return jsonify({'status': 'deleted', 'id': capture_id})
-    return jsonify({'status': 'error', 'message': 'Capture not found'}), 404
-
-
-@subghz_bp.route('/captures/<capture_id>', methods=['PATCH'])
-def update_capture(capture_id: str):
-    if not capture_id.isalnum():
-        return jsonify({'status': 'error', 'message': 'Invalid capture_id'}), 400
-
-    data = request.get_json(silent=True) or {}
-    label = data.get('label', '')
-
-    if not isinstance(label, str) or len(label) > 100:
-        return jsonify({'status': 'error', 'message': 'Label must be a string (max 100 chars)'}), 400
-
-    manager = get_subghz_manager()
-    if manager.update_capture_label(capture_id, label):
-        return jsonify({'status': 'updated', 'id': capture_id, 'label': label})
-    return jsonify({'status': 'error', 'message': 'Capture not found'}), 404
-
-
-# ------------------------------------------------------------------
-# SSE STREAM
-# ------------------------------------------------------------------
-
-@subghz_bp.route('/stream')
-def stream():
-    response = Response(sse_stream(_subghz_queue), mimetype='text/event-stream')
-    response.headers['Cache-Control'] = 'no-cache'
-    response.headers['X-Accel-Buffering'] = 'no'
-    response.headers['Connection'] = 'keep-alive'
-    return response

routes/tscm.py

@@ -60,7 +60,6 @@ from utils.tscm.device_identity import (
     ingest_ble_dict,
     ingest_wifi_dict,
 )
-from utils.event_pipeline import process_event
 
 # Import unified Bluetooth scanner helper for TSCM integration
 try:
@@ -551,12 +550,6 @@ def _start_sweep_internal(
     }
 
 
-@tscm_bp.route('/status')
-def tscm_status():
-    """Check if any TSCM operation is currently running."""
-    return jsonify({'running': _sweep_running})
-
-
 @tscm_bp.route('/sweep/start', methods=['POST'])
 def start_sweep():
     """Start a TSCM sweep."""
@@ -634,10 +627,6 @@ def sweep_stream():
             try:
                 if tscm_queue:
                     msg = tscm_queue.get(timeout=1)
-                    try:
-                        process_event('tscm', msg, msg.get('type'))
-                    except Exception:
-                        pass
                     yield f"data: {json.dumps(msg)}\n\n"
                 else:
                     time.sleep(1)
@@ -1083,32 +1072,6 @@ def _scan_wifi_networks(interface: str) -> list[dict]:
         return []
 
 
-def _scan_wifi_clients(interface: str) -> list[dict]:
-    """
-    Get WiFi client observations from the unified WiFi scanner.
-
-    Clients are only available when monitor-mode scanning is active.
-    """
-    try:
-        from utils.wifi import get_wifi_scanner
-
-        scanner = get_wifi_scanner()
-        if interface:
-            try:
-                if not scanner._is_monitor_mode_interface(interface):
-                    return []
-            except Exception:
-                return []
-
-        return [client.to_dict() for client in scanner.clients]
-    except ImportError as e:
-        logger.error(f"Failed to import wifi scanner: {e}")
-        return []
-    except Exception as e:
-        logger.exception(f"WiFi client scan failed: {e}")
-        return []
-
-
 def _scan_bluetooth_devices(interface: str, duration: int = 10) -> list[dict]:
     """
     Scan for Bluetooth devices with manufacturer data detection.
@@ -1643,7 +1606,6 @@ def _run_sweep(
         threats_found = 0
         severity_counts = {'critical': 0, 'high': 0, 'medium': 0, 'low': 0}
         all_wifi = {}  # Use dict for deduplication by BSSID
-        all_wifi_clients = {}  # Use dict for deduplication by client MAC
         all_bt = {}    # Use dict for deduplication by MAC
         all_rf = []
 
@@ -1740,7 +1702,6 @@ def _run_sweep(
                                     'channel': network.get('channel', ''),
                                     'signal': network.get('power', ''),
                                     'security': network.get('privacy', ''),
-                                    'vendor': network.get('vendor'),
                                     'is_threat': is_threat,
                                     'is_new': not classification.get('in_baseline', False),
                                     'classification': profile.risk_level.value,
@@ -1754,77 +1715,6 @@ def _run_sweep(
                                 })
                         except Exception as e:
                             logger.error(f"WiFi device processing error for {network.get('bssid', '?')}: {e}")
-
-                    # WiFi clients (monitor mode only)
-                    try:
-                        wifi_clients = _scan_wifi_clients(wifi_interface)
-                        for client in wifi_clients:
-                            mac = (client.get('mac') or '').upper()
-                            if not mac or mac in all_wifi_clients:
-                                continue
-                            all_wifi_clients[mac] = client
-
-                            rssi_val = client.get('rssi_current')
-                            if rssi_val is None:
-                                rssi_val = client.get('rssi_median') or client.get('rssi_ema')
-
-                            client_device = {
-                                'mac': mac,
-                                'vendor': client.get('vendor'),
-                                'name': client.get('vendor') or 'WiFi Client',
-                                'rssi': rssi_val,
-                                'associated_bssid': client.get('associated_bssid'),
-                                'probed_ssids': client.get('probed_ssids', []),
-                                'probe_count': client.get('probe_count', len(client.get('probed_ssids', []))),
-                                'is_client': True,
-                            }
-
-                            try:
-                                timeline_manager.add_observation(
-                                    identifier=mac,
-                                    protocol='wifi',
-                                    rssi=rssi_val,
-                                    name=client_device.get('vendor') or f'WiFi Client {mac[-5:]}',
-                                    attributes={'client': True, 'associated_bssid': client_device.get('associated_bssid')}
-                                )
-                            except Exception as e:
-                                logger.debug(f"WiFi client timeline observation error: {e}")
-                            _maybe_store_timeline(
-                                identifier=mac,
-                                protocol='wifi',
-                                rssi=rssi_val,
-                                attributes={'client': True, 'associated_bssid': client_device.get('associated_bssid')}
-                            )
-
-                            profile = correlation.analyze_wifi_device(client_device)
-                            client_device['classification'] = profile.risk_level.value
-                            client_device['score'] = profile.total_score
-                            client_device['score_modifier'] = profile.score_modifier
-                            client_device['known_device'] = profile.known_device
-                            client_device['known_device_name'] = profile.known_device_name
-                            client_device['indicators'] = [
-                                {'type': i.type.value, 'desc': i.description}
-                                for i in profile.indicators
-                            ]
-                            client_device['recommended_action'] = profile.recommended_action
-
-                            # Feed to identity engine for MAC-randomization resistant clustering
-                            try:
-                                wifi_obs = {
-                                    'timestamp': datetime.now().isoformat(),
-                                    'src_mac': mac,
-                                    'bssid': client_device.get('associated_bssid'),
-                                    'rssi': rssi_val,
-                                    'frame_type': 'probe_request',
-                                    'probed_ssids': client_device.get('probed_ssids', []),
-                                }
-                                ingest_wifi_dict(wifi_obs)
-                            except Exception as e:
-                                logger.debug(f"Identity engine WiFi client ingest error: {e}")
-
-                            _emit_event('wifi_client', client_device)
-                    except Exception as e:
-                        logger.debug(f"WiFi client scan error: {e}")
                 except Exception as e:
                     last_wifi_scan = current_time
                     logger.error(f"WiFi scan error: {e}")
@@ -1903,9 +1793,6 @@ def _run_sweep(
                                     'name': device.get('name', 'Unknown'),
                                     'device_type': device.get('type', ''),
                                     'rssi': device.get('rssi', ''),
-                                    'manufacturer': device.get('manufacturer'),
-                                    'tracker': device.get('tracker'),
-                                    'tracker_type': device.get('tracker_type'),
                                     'is_threat': is_threat,
                                     'is_new': not classification.get('in_baseline', False),
                                     'classification': profile.risk_level.value,
@@ -2034,7 +1921,6 @@ def _run_sweep(
                 comparator = BaselineComparator(baseline)
                 baseline_comparison = comparator.compare_all(
                     wifi_devices=list(all_wifi.values()),
-                    wifi_clients=list(all_wifi_clients.values()),
                     bt_devices=list(all_bt.values()),
                     rf_signals=all_rf
                 )
@@ -2050,7 +1936,6 @@ def _run_sweep(
 
             if verbose_results:
                 wifi_payload = list(all_wifi.values())
-                wifi_client_payload = list(all_wifi_clients.values())
                 bt_payload = list(all_bt.values())
                 rf_payload = list(all_rf)
             else:
@@ -2066,28 +1951,6 @@ def _run_sweep(
                     }
                     for d in all_wifi.values()
                 ]
-                wifi_client_payload = []
-                for client in all_wifi_clients.values():
-                    mac = client.get('mac') or client.get('address')
-                    if isinstance(mac, str):
-                        mac = mac.upper()
-                    probed_ssids = client.get('probed_ssids') or []
-                    rssi = client.get('rssi')
-                    if rssi is None:
-                        rssi = client.get('rssi_current')
-                    if rssi is None:
-                        rssi = client.get('rssi_median')
-                    if rssi is None:
-                        rssi = client.get('rssi_ema')
-                    wifi_client_payload.append({
-                        'mac': mac,
-                        'vendor': client.get('vendor'),
-                        'rssi': rssi,
-                        'associated_bssid': client.get('associated_bssid'),
-                        'is_associated': client.get('is_associated'),
-                        'probed_ssids': probed_ssids,
-                        'probe_count': client.get('probe_count', len(probed_ssids)),
-                    })
                 bt_payload = [
                     {
                         'mac': d.get('mac') or d.get('address'),
@@ -2112,11 +1975,9 @@ def _run_sweep(
                 status='completed',
                 results={
                     'wifi_devices': wifi_payload,
-                    'wifi_clients': wifi_client_payload,
                     'bt_devices': bt_payload,
                     'rf_signals': rf_payload,
                     'wifi_count': len(all_wifi),
-                    'wifi_client_count': len(all_wifi_clients),
                     'bt_count': len(all_bt),
                     'rf_count': len(all_rf),
                     'severity_counts': severity_counts,
@@ -2144,7 +2005,6 @@ def _run_sweep(
                     'total_new': baseline_comparison['total_new'],
                     'total_missing': baseline_comparison['total_missing'],
                     'wifi': baseline_comparison.get('wifi'),
-                    'wifi_clients': baseline_comparison.get('wifi_clients'),
                     'bluetooth': baseline_comparison.get('bluetooth'),
                     'rf': baseline_comparison.get('rf'),
                 })
@@ -2162,7 +2022,6 @@ def _run_sweep(
                 'sweep_id': _current_sweep_id,
                 'threats_found': threats_found,
                 'wifi_count': len(all_wifi),
-                'wifi_client_count': len(all_wifi_clients),
                 'bt_count': len(all_bt),
                 'rf_count': len(all_rf),
                 'severity_counts': severity_counts,
@@ -2310,7 +2169,6 @@ def compare_against_baseline():
 
     Expects JSON body with:
     - wifi_devices: list of WiFi devices (optional)
-    - wifi_clients: list of WiFi clients (optional)
     - bt_devices: list of Bluetooth devices (optional)
     - rf_signals: list of RF signals (optional)
 
@@ -2319,14 +2177,12 @@ def compare_against_baseline():
     data = request.get_json() or {}
 
     wifi_devices = data.get('wifi_devices')
-    wifi_clients = data.get('wifi_clients')
     bt_devices = data.get('bt_devices')
     rf_signals = data.get('rf_signals')
 
     # Use the convenience function that gets active baseline
     comparison = get_comparison_for_active_baseline(
         wifi_devices=wifi_devices,
-        wifi_clients=wifi_clients,
         bt_devices=bt_devices,
         rf_signals=rf_signals
     )
@@ -2420,9 +2276,6 @@ def feed_wifi():
     """Feed WiFi device data for baseline recording."""
     data = request.get_json()
     if data:
-        if data.get('is_client'):
-            _baseline_recorder.add_wifi_client(data)
-        else:
         _baseline_recorder.add_wifi_device(data)
     return jsonify({'status': 'success'})
 
@@ -3075,14 +2928,12 @@ def get_baseline_diff(baseline_id: int, sweep_id: int):
             results = json.loads(results)
 
         current_wifi = results.get('wifi_devices', [])
-        current_wifi_clients = results.get('wifi_clients', [])
         current_bt = results.get('bt_devices', [])
         current_rf = results.get('rf_signals', [])
 
         diff = calculate_baseline_diff(
             baseline=baseline,
             current_wifi=current_wifi,
-            current_wifi_clients=current_wifi_clients,
             current_bt=current_bt,
             current_rf=current_rf,
             sweep_id=sweep_id

routes/waterfall_websocket.py

@@ -1,386 +0,0 @@
-"""WebSocket-based waterfall streaming with I/Q capture and server-side FFT."""
-
-import json
-import queue
-import socket
-import subprocess
-import threading
-import time
-
-from flask import Flask
-
-try:
-    from flask_sock import Sock
-    WEBSOCKET_AVAILABLE = True
-except ImportError:
-    WEBSOCKET_AVAILABLE = False
-    Sock = None
-
-from utils.logging import get_logger
-from utils.process import safe_terminate, register_process, unregister_process
-from utils.waterfall_fft import (
-    build_binary_frame,
-    compute_power_spectrum,
-    cu8_to_complex,
-    quantize_to_uint8,
-)
-from utils.sdr import SDRFactory, SDRType
-from utils.sdr.base import SDRCapabilities, SDRDevice
-
-logger = get_logger('intercept.waterfall_ws')
-
-# Maximum bandwidth per SDR type (Hz)
-MAX_BANDWIDTH = {
-    SDRType.RTL_SDR: 2400000,
-    SDRType.HACKRF: 20000000,
-    SDRType.LIME_SDR: 20000000,
-    SDRType.AIRSPY: 10000000,
-    SDRType.SDRPLAY: 2000000,
-}
-
-
-def _resolve_sdr_type(sdr_type_str: str) -> SDRType:
-    """Convert client sdr_type string to SDRType enum."""
-    mapping = {
-        'rtlsdr': SDRType.RTL_SDR,
-        'rtl_sdr': SDRType.RTL_SDR,
-        'hackrf': SDRType.HACKRF,
-        'limesdr': SDRType.LIME_SDR,
-        'lime_sdr': SDRType.LIME_SDR,
-        'airspy': SDRType.AIRSPY,
-        'sdrplay': SDRType.SDRPLAY,
-    }
-    return mapping.get(sdr_type_str.lower(), SDRType.RTL_SDR)
-
-
-def _build_dummy_device(device_index: int, sdr_type: SDRType) -> SDRDevice:
-    """Build a minimal SDRDevice for command building."""
-    builder = SDRFactory.get_builder(sdr_type)
-    caps = builder.get_capabilities()
-    return SDRDevice(
-        sdr_type=sdr_type,
-        index=device_index,
-        name=f'{sdr_type.value}-{device_index}',
-        serial='N/A',
-        driver=sdr_type.value,
-        capabilities=caps,
-    )
-
-
-def init_waterfall_websocket(app: Flask):
-    """Initialize WebSocket waterfall streaming."""
-    if not WEBSOCKET_AVAILABLE:
-        logger.warning("flask-sock not installed, WebSocket waterfall disabled")
-        return
-
-    sock = Sock(app)
-
-    @sock.route('/ws/waterfall')
-    def waterfall_stream(ws):
-        """WebSocket endpoint for real-time waterfall streaming."""
-        logger.info("WebSocket waterfall client connected")
-
-        # Import app module for device claiming
-        import app as app_module
-
-        iq_process = None
-        reader_thread = None
-        stop_event = threading.Event()
-        claimed_device = None
-        # Queue for outgoing messages — only the main loop touches ws.send()
-        send_queue = queue.Queue(maxsize=120)
-
-        try:
-            while True:
-                # Drain send queue first (non-blocking)
-                while True:
-                    try:
-                        outgoing = send_queue.get_nowait()
-                    except queue.Empty:
-                        break
-                    try:
-                        ws.send(outgoing)
-                    except Exception:
-                        stop_event.set()
-                        break
-
-                try:
-                    msg = ws.receive(timeout=0.1)
-                except Exception as e:
-                    err = str(e).lower()
-                    if "closed" in err:
-                        break
-                    if "timed out" not in err:
-                        logger.error(f"WebSocket receive error: {e}")
-                    continue
-
-                if msg is None:
-                    # simple-websocket returns None on timeout AND on
-                    # close; check ws.connected to tell them apart.
-                    if not ws.connected:
-                        break
-                    if stop_event.is_set():
-                        break
-                    continue
-
-                try:
-                    data = json.loads(msg)
-                except (json.JSONDecodeError, TypeError):
-                    continue
-
-                cmd = data.get('cmd')
-
-                if cmd == 'start':
-                    # Stop any existing capture
-                    was_restarting = iq_process is not None
-                    stop_event.set()
-                    if reader_thread and reader_thread.is_alive():
-                        reader_thread.join(timeout=2)
-                    if iq_process:
-                        safe_terminate(iq_process)
-                        unregister_process(iq_process)
-                        iq_process = None
-                    if claimed_device is not None:
-                        app_module.release_sdr_device(claimed_device)
-                        claimed_device = None
-                    stop_event.clear()
-                    # Flush stale frames from previous capture
-                    while not send_queue.empty():
-                        try:
-                            send_queue.get_nowait()
-                        except queue.Empty:
-                            break
-                    # Allow USB device to be released by the kernel
-                    if was_restarting:
-                        time.sleep(0.5)
-
-                    # Parse config
-                    center_freq = float(data.get('center_freq', 100.0))
-                    span_mhz = float(data.get('span_mhz', 2.0))
-                    gain = data.get('gain')
-                    if gain is not None:
-                        gain = float(gain)
-                    device_index = int(data.get('device', 0))
-                    sdr_type_str = data.get('sdr_type', 'rtlsdr')
-                    fft_size = int(data.get('fft_size', 1024))
-                    fps = int(data.get('fps', 25))
-                    avg_count = int(data.get('avg_count', 4))
-                    ppm = data.get('ppm')
-                    if ppm is not None:
-                        ppm = int(ppm)
-                    bias_t = bool(data.get('bias_t', False))
-
-                    # Clamp FFT size to valid powers of 2
-                    fft_size = max(256, min(8192, fft_size))
-
-                    # Resolve SDR type and bandwidth
-                    sdr_type = _resolve_sdr_type(sdr_type_str)
-                    max_bw = MAX_BANDWIDTH.get(sdr_type, 2400000)
-                    span_hz = int(span_mhz * 1e6)
-                    sample_rate = min(span_hz, max_bw)
-
-                    # Compute effective frequency range
-                    effective_span_mhz = sample_rate / 1e6
-                    start_freq = center_freq - effective_span_mhz / 2
-                    end_freq = center_freq + effective_span_mhz / 2
-
-                    # Claim the device
-                    claim_err = app_module.claim_sdr_device(device_index, 'waterfall')
-                    if claim_err:
-                        ws.send(json.dumps({
-                            'status': 'error',
-                            'message': claim_err,
-                            'error_type': 'DEVICE_BUSY',
-                        }))
-                        continue
-                    claimed_device = device_index
-
-                    # Build I/Q capture command
-                    try:
-                        builder = SDRFactory.get_builder(sdr_type)
-                        device = _build_dummy_device(device_index, sdr_type)
-                        iq_cmd = builder.build_iq_capture_command(
-                            device=device,
-                            frequency_mhz=center_freq,
-                            sample_rate=sample_rate,
-                            gain=gain,
-                            ppm=ppm,
-                            bias_t=bias_t,
-                        )
-                    except NotImplementedError as e:
-                        app_module.release_sdr_device(device_index)
-                        claimed_device = None
-                        ws.send(json.dumps({
-                            'status': 'error',
-                            'message': str(e),
-                        }))
-                        continue
-
-                    # Spawn I/Q capture process (retry to handle USB release lag)
-                    max_attempts = 3 if was_restarting else 1
-                    try:
-                        for attempt in range(max_attempts):
-                            logger.info(
-                                f"Starting I/Q capture: {center_freq} MHz, "
-                                f"span={effective_span_mhz:.1f} MHz, "
-                                f"sr={sample_rate}, fft={fft_size}"
-                            )
-                            iq_process = subprocess.Popen(
-                                iq_cmd,
-                                stdout=subprocess.PIPE,
-                                stderr=subprocess.DEVNULL,
-                                bufsize=0,
-                            )
-                            register_process(iq_process)
-
-                            # Brief check that process started
-                            time.sleep(0.3)
-                            if iq_process.poll() is not None:
-                                unregister_process(iq_process)
-                                iq_process = None
-                                if attempt < max_attempts - 1:
-                                    logger.info(
-                                        f"I/Q process exited immediately, "
-                                        f"retrying ({attempt + 1}/{max_attempts})..."
-                                    )
-                                    time.sleep(0.5)
-                                    continue
-                                raise RuntimeError(
-                                    "I/Q capture process exited immediately"
-                                )
-                            break  # Process started successfully
-                    except Exception as e:
-                        logger.error(f"Failed to start I/Q capture: {e}")
-                        if iq_process:
-                            safe_terminate(iq_process)
-                            unregister_process(iq_process)
-                            iq_process = None
-                        app_module.release_sdr_device(device_index)
-                        claimed_device = None
-                        ws.send(json.dumps({
-                            'status': 'error',
-                            'message': f'Failed to start I/Q capture: {e}',
-                        }))
-                        continue
-
-                    # Send started confirmation
-                    ws.send(json.dumps({
-                        'status': 'started',
-                        'start_freq': start_freq,
-                        'end_freq': end_freq,
-                        'fft_size': fft_size,
-                        'sample_rate': sample_rate,
-                    }))
-
-                    # Start reader thread — puts frames on queue, never calls ws.send()
-                    def fft_reader(
-                        proc, _send_q, stop_evt,
-                        _fft_size, _avg_count, _fps,
-                        _start_freq, _end_freq,
-                    ):
-                        """Read I/Q from subprocess, compute FFT, enqueue binary frames."""
-                        bytes_per_frame = _fft_size * _avg_count * 2
-                        frame_interval = 1.0 / _fps
-
-                        try:
-                            while not stop_evt.is_set():
-                                if proc.poll() is not None:
-                                    break
-
-                                frame_start = time.monotonic()
-
-                                # Read raw I/Q bytes
-                                raw = b''
-                                remaining = bytes_per_frame
-                                while remaining > 0 and not stop_evt.is_set():
-                                    chunk = proc.stdout.read(min(remaining, 65536))
-                                    if not chunk:
-                                        break
-                                    raw += chunk
-                                    remaining -= len(chunk)
-
-                                if len(raw) < _fft_size * 2:
-                                    break
-
-                                # Process FFT pipeline
-                                samples = cu8_to_complex(raw)
-                                power_db = compute_power_spectrum(
-                                    samples,
-                                    fft_size=_fft_size,
-                                    avg_count=_avg_count,
-                                )
-                                quantized = quantize_to_uint8(power_db)
-                                frame = build_binary_frame(
-                                    _start_freq, _end_freq, quantized,
-                                )
-
-                                try:
-                                    _send_q.put_nowait(frame)
-                                except queue.Full:
-                                    # Drop frame if main loop can't keep up
-                                    pass
-
-                                # Pace to target FPS
-                                elapsed = time.monotonic() - frame_start
-                                sleep_time = frame_interval - elapsed
-                                if sleep_time > 0:
-                                    stop_evt.wait(sleep_time)
-
-                        except Exception as e:
-                            logger.debug(f"FFT reader stopped: {e}")
-
-                    reader_thread = threading.Thread(
-                        target=fft_reader,
-                        args=(
-                            iq_process, send_queue, stop_event,
-                            fft_size, avg_count, fps,
-                            start_freq, end_freq,
-                        ),
-                        daemon=True,
-                    )
-                    reader_thread.start()
-
-                elif cmd == 'stop':
-                    stop_event.set()
-                    if reader_thread and reader_thread.is_alive():
-                        reader_thread.join(timeout=2)
-                        reader_thread = None
-                    if iq_process:
-                        safe_terminate(iq_process)
-                        unregister_process(iq_process)
-                        iq_process = None
-                    if claimed_device is not None:
-                        app_module.release_sdr_device(claimed_device)
-                        claimed_device = None
-                    stop_event.clear()
-                    ws.send(json.dumps({'status': 'stopped'}))
-
-        except Exception as e:
-            logger.info(f"WebSocket waterfall closed: {e}")
-        finally:
-            # Cleanup
-            stop_event.set()
-            if reader_thread and reader_thread.is_alive():
-                reader_thread.join(timeout=2)
-            if iq_process:
-                safe_terminate(iq_process)
-                unregister_process(iq_process)
-            if claimed_device is not None:
-                app_module.release_sdr_device(claimed_device)
-            # Complete WebSocket close handshake, then shut down the
-            # raw socket so Werkzeug cannot write its HTTP 200 response
-            # on top of the WebSocket stream (which browsers see as
-            # "Invalid frame header").
-            try:
-                ws.close()
-            except Exception:
-                pass
-            try:
-                ws.sock.shutdown(socket.SHUT_RDWR)
-            except Exception:
-                pass
-            try:
-                ws.sock.close()
-            except Exception:
-                pass
-            logger.info("WebSocket waterfall client disconnected")

routes/weather_sat.py

@@ -1,626 +0,0 @@
-"""Weather Satellite decoder routes.
-
-Provides endpoints for capturing and decoding weather satellite images
-from NOAA (APT) and Meteor (LRPT) satellites using SatDump.
-"""
-
-from __future__ import annotations
-
-import queue
-
-from flask import Blueprint, jsonify, request, Response, send_file
-
-from utils.logging import get_logger
-from utils.sse import sse_stream
-from utils.validation import validate_device_index, validate_gain, validate_latitude, validate_longitude, validate_elevation
-from utils.weather_sat import (
-    get_weather_sat_decoder,
-    is_weather_sat_available,
-    CaptureProgress,
-    WEATHER_SATELLITES,
-)
-
-logger = get_logger('intercept.weather_sat')
-
-weather_sat_bp = Blueprint('weather_sat', __name__, url_prefix='/weather-sat')
-
-# Queue for SSE progress streaming
-_weather_sat_queue: queue.Queue = queue.Queue(maxsize=100)
-
-
-def _progress_callback(progress: CaptureProgress) -> None:
-    """Callback to queue progress updates for SSE stream."""
-    try:
-        _weather_sat_queue.put_nowait(progress.to_dict())
-    except queue.Full:
-        try:
-            _weather_sat_queue.get_nowait()
-            _weather_sat_queue.put_nowait(progress.to_dict())
-        except queue.Empty:
-            pass
-
-
-@weather_sat_bp.route('/status')
-def get_status():
-    """Get weather satellite decoder status.
-
-    Returns:
-        JSON with decoder availability and current status.
-    """
-    decoder = get_weather_sat_decoder()
-    return jsonify(decoder.get_status())
-
-
-@weather_sat_bp.route('/satellites')
-def list_satellites():
-    """Get list of supported weather satellites with frequencies.
-
-    Returns:
-        JSON with satellite definitions.
-    """
-    satellites = []
-    for key, info in WEATHER_SATELLITES.items():
-        satellites.append({
-            'key': key,
-            'name': info['name'],
-            'frequency': info['frequency'],
-            'mode': info['mode'],
-            'description': info['description'],
-            'active': info['active'],
-        })
-
-    return jsonify({
-        'status': 'ok',
-        'satellites': satellites,
-    })
-
-
-@weather_sat_bp.route('/start', methods=['POST'])
-def start_capture():
-    """Start weather satellite capture and decode.
-
-    JSON body:
-        {
-            "satellite": "NOAA-18",    // Required: satellite key
-            "device": 0,               // RTL-SDR device index (default: 0)
-            "gain": 40.0,              // SDR gain in dB (default: 40)
-            "bias_t": false            // Enable bias-T for LNA (default: false)
-        }
-
-    Returns:
-        JSON with start status.
-    """
-    if not is_weather_sat_available():
-        return jsonify({
-            'status': 'error',
-            'message': 'SatDump not installed. Build from source: https://github.com/SatDump/SatDump'
-        }), 400
-
-    decoder = get_weather_sat_decoder()
-
-    if decoder.is_running:
-        return jsonify({
-            'status': 'already_running',
-            'satellite': decoder.current_satellite,
-            'frequency': decoder.current_frequency,
-        })
-
-    data = request.get_json(silent=True) or {}
-
-    # Validate satellite
-    satellite = data.get('satellite')
-    if not satellite or satellite not in WEATHER_SATELLITES:
-        return jsonify({
-            'status': 'error',
-            'message': f'Invalid satellite. Must be one of: {", ".join(WEATHER_SATELLITES.keys())}'
-        }), 400
-
-    # Validate device index and gain
-    try:
-        device_index = validate_device_index(data.get('device', 0))
-        gain = validate_gain(data.get('gain', 40.0))
-    except ValueError as e:
-        logger.warning('Invalid parameter in start_capture: %s', e)
-        return jsonify({
-            'status': 'error',
-            'message': 'Invalid parameter value'
-        }), 400
-
-    bias_t = bool(data.get('bias_t', False))
-
-    # Claim SDR device
-    try:
-        import app as app_module
-        error = app_module.claim_sdr_device(device_index, 'weather_sat')
-        if error:
-            return jsonify({
-                'status': 'error',
-                'error_type': 'DEVICE_BUSY',
-                'message': error,
-            }), 409
-    except ImportError:
-        pass
-
-    # Clear queue
-    while not _weather_sat_queue.empty():
-        try:
-            _weather_sat_queue.get_nowait()
-        except queue.Empty:
-            break
-
-    # Set callback and on-complete handler for SDR release
-    decoder.set_callback(_progress_callback)
-
-    def _release_device():
-        try:
-            import app as app_module
-            app_module.release_sdr_device(device_index)
-        except ImportError:
-            pass
-
-    decoder.set_on_complete(_release_device)
-
-    success = decoder.start(
-        satellite=satellite,
-        device_index=device_index,
-        gain=gain,
-        bias_t=bias_t,
-    )
-
-    if success:
-        sat_info = WEATHER_SATELLITES[satellite]
-        return jsonify({
-            'status': 'started',
-            'satellite': satellite,
-            'frequency': sat_info['frequency'],
-            'mode': sat_info['mode'],
-            'device': device_index,
-        })
-    else:
-        # Release device on failure
-        _release_device()
-        return jsonify({
-            'status': 'error',
-            'message': 'Failed to start capture'
-        }), 500
-
-
-@weather_sat_bp.route('/test-decode', methods=['POST'])
-def test_decode():
-    """Start weather satellite decode from a pre-recorded file.
-
-    No SDR hardware is required — decodes an IQ baseband or WAV file
-    using SatDump offline mode.
-
-    JSON body:
-        {
-            "satellite": "NOAA-18",       // Required: satellite key
-            "input_file": "/path/to/file", // Required: server-side file path
-            "sample_rate": 1000000         // Sample rate in Hz (default: 1000000)
-        }
-
-    Returns:
-        JSON with start status.
-    """
-    if not is_weather_sat_available():
-        return jsonify({
-            'status': 'error',
-            'message': 'SatDump not installed. Build from source: https://github.com/SatDump/SatDump'
-        }), 400
-
-    decoder = get_weather_sat_decoder()
-
-    if decoder.is_running:
-        return jsonify({
-            'status': 'already_running',
-            'satellite': decoder.current_satellite,
-            'frequency': decoder.current_frequency,
-        })
-
-    data = request.get_json(silent=True) or {}
-
-    # Validate satellite
-    satellite = data.get('satellite')
-    if not satellite or satellite not in WEATHER_SATELLITES:
-        return jsonify({
-            'status': 'error',
-            'message': f'Invalid satellite. Must be one of: {", ".join(WEATHER_SATELLITES.keys())}'
-        }), 400
-
-    # Validate input file
-    input_file = data.get('input_file')
-    if not input_file:
-        return jsonify({
-            'status': 'error',
-            'message': 'input_file is required'
-        }), 400
-
-    from pathlib import Path
-    input_path = Path(input_file)
-
-    # Security: restrict to data directory (anchored to app root, not CWD)
-    allowed_base = Path(__file__).resolve().parent.parent / 'data'
-    try:
-        resolved = input_path.resolve()
-        if not resolved.is_relative_to(allowed_base):
-            return jsonify({
-                'status': 'error',
-                'message': 'input_file must be under the data/ directory'
-            }), 403
-    except (OSError, ValueError):
-        return jsonify({
-            'status': 'error',
-            'message': 'Invalid file path'
-        }), 400
-
-    if not input_path.is_file():
-        logger.warning("Test-decode file not found")
-        return jsonify({
-            'status': 'error',
-            'message': 'File not found'
-        }), 404
-
-    # Validate sample rate
-    sample_rate = data.get('sample_rate', 1000000)
-    try:
-        sample_rate = int(sample_rate)
-        if sample_rate < 1000 or sample_rate > 20000000:
-            raise ValueError
-    except (TypeError, ValueError):
-        return jsonify({
-            'status': 'error',
-            'message': 'Invalid sample_rate (1000-20000000)'
-        }), 400
-
-    # Clear queue
-    while not _weather_sat_queue.empty():
-        try:
-            _weather_sat_queue.get_nowait()
-        except queue.Empty:
-            break
-
-    # Set callback — no on_complete needed (no SDR to release)
-    decoder.set_callback(_progress_callback)
-    decoder.set_on_complete(None)
-
-    success = decoder.start_from_file(
-        satellite=satellite,
-        input_file=input_file,
-        sample_rate=sample_rate,
-    )
-
-    if success:
-        sat_info = WEATHER_SATELLITES[satellite]
-        return jsonify({
-            'status': 'started',
-            'satellite': satellite,
-            'frequency': sat_info['frequency'],
-            'mode': sat_info['mode'],
-            'source': 'file',
-            'input_file': str(input_file),
-        })
-    else:
-        return jsonify({
-            'status': 'error',
-            'message': 'Failed to start file decode'
-        }), 500
-
-
-@weather_sat_bp.route('/stop', methods=['POST'])
-def stop_capture():
-    """Stop weather satellite capture.
-
-    Returns:
-        JSON confirmation.
-    """
-    decoder = get_weather_sat_decoder()
-    device_index = decoder.device_index
-
-    decoder.stop()
-
-    # Release SDR device
-    try:
-        import app as app_module
-        app_module.release_sdr_device(device_index)
-    except ImportError:
-        pass
-
-    return jsonify({'status': 'stopped'})
-
-
-@weather_sat_bp.route('/images')
-def list_images():
-    """Get list of decoded weather satellite images.
-
-    Query parameters:
-        limit: Maximum number of images (default: all)
-        satellite: Filter by satellite key (optional)
-
-    Returns:
-        JSON with list of decoded images.
-    """
-    decoder = get_weather_sat_decoder()
-    images = decoder.get_images()
-
-    # Filter by satellite if specified
-    satellite_filter = request.args.get('satellite')
-    if satellite_filter:
-        images = [img for img in images if img.satellite == satellite_filter]
-
-    # Apply limit
-    limit = request.args.get('limit', type=int)
-    if limit and limit > 0:
-        images = images[-limit:]
-
-    return jsonify({
-        'status': 'ok',
-        'images': [img.to_dict() for img in images],
-        'count': len(images),
-    })
-
-
-@weather_sat_bp.route('/images/<filename>')
-def get_image(filename: str):
-    """Serve a decoded weather satellite image file.
-
-    Args:
-        filename: Image filename
-
-    Returns:
-        Image file or 404.
-    """
-    decoder = get_weather_sat_decoder()
-
-    # Security: only allow safe filenames
-    if not filename.replace('_', '').replace('-', '').replace('.', '').isalnum():
-        return jsonify({'status': 'error', 'message': 'Invalid filename'}), 400
-
-    if not (filename.endswith('.png') or filename.endswith('.jpg') or filename.endswith('.jpeg')):
-        return jsonify({'status': 'error', 'message': 'Only PNG/JPG files supported'}), 400
-
-    image_path = decoder._output_dir / filename
-
-    if not image_path.exists():
-        return jsonify({'status': 'error', 'message': 'Image not found'}), 404
-
-    mimetype = 'image/png' if filename.endswith('.png') else 'image/jpeg'
-    return send_file(image_path, mimetype=mimetype)
-
-
-@weather_sat_bp.route('/images/<filename>', methods=['DELETE'])
-def delete_image(filename: str):
-    """Delete a decoded image.
-
-    Args:
-        filename: Image filename
-
-    Returns:
-        JSON confirmation.
-    """
-    decoder = get_weather_sat_decoder()
-
-    if not filename.replace('_', '').replace('-', '').replace('.', '').isalnum():
-        return jsonify({'status': 'error', 'message': 'Invalid filename'}), 400
-
-    if decoder.delete_image(filename):
-        return jsonify({'status': 'deleted', 'filename': filename})
-    else:
-        return jsonify({'status': 'error', 'message': 'Image not found'}), 404
-
-
-@weather_sat_bp.route('/images', methods=['DELETE'])
-def delete_all_images():
-    """Delete all decoded weather satellite images.
-
-    Returns:
-        JSON with count of deleted images.
-    """
-    decoder = get_weather_sat_decoder()
-    count = decoder.delete_all_images()
-    return jsonify({'status': 'ok', 'deleted': count})
-
-
-@weather_sat_bp.route('/stream')
-def stream_progress():
-    """SSE stream of capture/decode progress.
-
-    Returns:
-        SSE stream (text/event-stream)
-    """
-    response = Response(sse_stream(_weather_sat_queue), mimetype='text/event-stream')
-    response.headers['Cache-Control'] = 'no-cache'
-    response.headers['X-Accel-Buffering'] = 'no'
-    response.headers['Connection'] = 'keep-alive'
-    return response
-
-
-@weather_sat_bp.route('/passes')
-def get_passes():
-    """Get upcoming weather satellite passes for observer location.
-
-    Query parameters:
-        latitude: Observer latitude (required)
-        longitude: Observer longitude (required)
-        hours: Hours to predict ahead (default: 24, max: 72)
-        min_elevation: Minimum elevation in degrees (default: 15)
-        trajectory: Include az/el trajectory points (default: false)
-        ground_track: Include lat/lon ground track points (default: false)
-
-    Returns:
-        JSON with upcoming passes for all weather satellites.
-    """
-    include_trajectory = request.args.get('trajectory', 'false').lower() in ('true', '1')
-    include_ground_track = request.args.get('ground_track', 'false').lower() in ('true', '1')
-
-    raw_lat = request.args.get('latitude')
-    raw_lon = request.args.get('longitude')
-
-    if raw_lat is None or raw_lon is None:
-        return jsonify({
-            'status': 'error',
-            'message': 'latitude and longitude parameters required'
-        }), 400
-
-    try:
-        lat = validate_latitude(raw_lat)
-        lon = validate_longitude(raw_lon)
-    except ValueError as e:
-        logger.warning('Invalid coordinates in get_passes: %s', e)
-        return jsonify({'status': 'error', 'message': 'Invalid coordinates'}), 400
-
-    hours = max(1, min(request.args.get('hours', 24, type=int), 72))
-    min_elevation = max(0, min(request.args.get('min_elevation', 15, type=float), 90))
-
-    try:
-        from utils.weather_sat_predict import predict_passes
-
-        all_passes = predict_passes(
-            lat=lat,
-            lon=lon,
-            hours=hours,
-            min_elevation=min_elevation,
-            include_trajectory=include_trajectory,
-            include_ground_track=include_ground_track,
-        )
-
-        return jsonify({
-            'status': 'ok',
-            'passes': all_passes,
-            'count': len(all_passes),
-            'observer': {'latitude': lat, 'longitude': lon},
-            'prediction_hours': hours,
-            'min_elevation': min_elevation,
-        })
-
-    except ImportError:
-        return jsonify({
-            'status': 'error',
-            'message': 'skyfield library not installed'
-        }), 503
-
-    except Exception as e:
-        logger.error(f"Error predicting passes: {e}")
-        return jsonify({
-            'status': 'error',
-            'message': 'Pass prediction failed'
-        }), 500
-
-
-# ========================
-# Auto-Scheduler Endpoints
-# ========================
-
-
-def _scheduler_event_callback(event: dict) -> None:
-    """Forward scheduler events to the SSE queue."""
-    try:
-        _weather_sat_queue.put_nowait(event)
-    except queue.Full:
-        try:
-            _weather_sat_queue.get_nowait()
-            _weather_sat_queue.put_nowait(event)
-        except queue.Empty:
-            pass
-
-
-@weather_sat_bp.route('/schedule/enable', methods=['POST'])
-def enable_schedule():
-    """Enable auto-scheduling of weather satellite captures.
-
-    JSON body:
-        {
-            "latitude": 51.5,         // Required
-            "longitude": -0.1,        // Required
-            "min_elevation": 15,      // Minimum pass elevation (default: 15)
-            "device": 0,              // RTL-SDR device index (default: 0)
-            "gain": 40.0,             // SDR gain (default: 40)
-            "bias_t": false           // Enable bias-T (default: false)
-        }
-
-    Returns:
-        JSON with scheduler status.
-    """
-    from utils.weather_sat_scheduler import get_weather_sat_scheduler
-
-    data = request.get_json(silent=True) or {}
-
-    if data.get('latitude') is None or data.get('longitude') is None:
-        return jsonify({
-            'status': 'error',
-            'message': 'latitude and longitude required'
-        }), 400
-
-    try:
-        lat = validate_latitude(data.get('latitude'))
-        lon = validate_longitude(data.get('longitude'))
-        min_elev = validate_elevation(data.get('min_elevation', 15))
-        device = validate_device_index(data.get('device', 0))
-        gain_val = validate_gain(data.get('gain', 40.0))
-    except ValueError as e:
-        logger.warning('Invalid parameter in enable_schedule: %s', e)
-        return jsonify({
-            'status': 'error',
-            'message': 'Invalid parameter value'
-        }), 400
-
-    scheduler = get_weather_sat_scheduler()
-    scheduler.set_callbacks(_progress_callback, _scheduler_event_callback)
-
-    result = scheduler.enable(
-        lat=lat,
-        lon=lon,
-        min_elevation=min_elev,
-        device=device,
-        gain=gain_val,
-        bias_t=bool(data.get('bias_t', False)),
-    )
-
-    return jsonify({'status': 'ok', **result})
-
-
-@weather_sat_bp.route('/schedule/disable', methods=['POST'])
-def disable_schedule():
-    """Disable auto-scheduling."""
-    from utils.weather_sat_scheduler import get_weather_sat_scheduler
-
-    scheduler = get_weather_sat_scheduler()
-    result = scheduler.disable()
-    return jsonify(result)
-
-
-@weather_sat_bp.route('/schedule/status')
-def schedule_status():
-    """Get current scheduler state."""
-    from utils.weather_sat_scheduler import get_weather_sat_scheduler
-
-    scheduler = get_weather_sat_scheduler()
-    return jsonify(scheduler.get_status())
-
-
-@weather_sat_bp.route('/schedule/passes')
-def schedule_passes():
-    """List scheduled passes."""
-    from utils.weather_sat_scheduler import get_weather_sat_scheduler
-
-    scheduler = get_weather_sat_scheduler()
-    passes = scheduler.get_passes()
-    return jsonify({
-        'status': 'ok',
-        'passes': passes,
-        'count': len(passes),
-    })
-
-
-@weather_sat_bp.route('/schedule/skip/<pass_id>', methods=['POST'])
-def skip_pass(pass_id: str):
-    """Skip a scheduled pass."""
-    from utils.weather_sat_scheduler import get_weather_sat_scheduler
-
-    if not pass_id.replace('_', '').replace('-', '').isalnum():
-        return jsonify({'status': 'error', 'message': 'Invalid pass ID'}), 400
-
-    scheduler = get_weather_sat_scheduler()
-    if scheduler.skip_pass(pass_id):
-        return jsonify({'status': 'skipped', 'pass_id': pass_id})
-    else:
-        return jsonify({'status': 'error', 'message': 'Pass not found or already processed'}), 404

routes/wifi.py

@@ -21,7 +21,6 @@ from utils.logging import wifi_logger as logger
 from utils.process import is_valid_mac, is_valid_channel
 from utils.validation import validate_wifi_channel, validate_mac_address, validate_network_interface
 from utils.sse import format_sse
-from utils.event_pipeline import process_event
 from data.oui import get_manufacturer
 from utils.constants import (
     WIFI_TERMINATE_TIMEOUT,
@@ -51,31 +50,6 @@ pmkid_process = None
 pmkid_lock = threading.Lock()
 
 
-def _parse_channel_list(raw_channels: Any) -> list[int] | None:
-    """Parse a channel list from string/list input."""
-    if raw_channels in (None, '', []):
-        return None
-
-    if isinstance(raw_channels, str):
-        parts = [p.strip() for p in re.split(r'[\s,]+', raw_channels) if p.strip()]
-    elif isinstance(raw_channels, (list, tuple, set)):
-        parts = list(raw_channels)
-    else:
-        parts = [raw_channels]
-
-    channels: list[int] = []
-    seen = set()
-    for part in parts:
-        if part in (None, ''):
-            continue
-        ch = validate_wifi_channel(part)
-        if ch not in seen:
-            channels.append(ch)
-            seen.add(ch)
-
-    return channels or None
-
-
 def detect_wifi_interfaces():
     """Detect available WiFi interfaces."""
     interfaces = []
@@ -634,7 +608,6 @@ def start_wifi_scan():
 
         data = request.json
         channel = data.get('channel')
-        channels = data.get('channels')
         band = data.get('band', 'abg')
 
         # Use provided interface or fall back to stored monitor interface
@@ -685,16 +658,7 @@ def start_wifi_scan():
             interface
         ]
 
-        channel_list = None
+        if channel:
-        if channels:
-            try:
-                channel_list = _parse_channel_list(channels)
-            except ValueError as e:
-                return jsonify({'status': 'error', 'message': str(e)}), 400
-
-        if channel_list:
-            cmd.extend(['-c', ','.join(str(c) for c in channel_list)])
-        elif channel:
             cmd.extend(['-c', str(channel)])
 
         logger.info(f"Running: {' '.join(cmd)}")
@@ -888,9 +852,6 @@ def check_handshake_status():
 
     file_size = os.path.getsize(capture_file)
     handshake_found = False
-    handshake_valid: bool | None = None
-    handshake_checked = False
-    handshake_reason: str | None = None
 
     try:
         if target_bssid and is_valid_mac(target_bssid):
@@ -901,38 +862,20 @@ def check_handshake_status():
                     capture_output=True, text=True, timeout=10
                 )
                 output = result.stdout + result.stderr
-                output_lower = output.lower()
+                if '1 handshake' in output or ('handshake' in output.lower() and 'wpa' in output.lower()):
-                handshake_checked = True
+                    if '0 handshake' not in output:
-
+                        handshake_found = True
-                if 'no valid wpa handshakes found' in output_lower:
-                    handshake_valid = False
-                    handshake_reason = 'No valid WPA handshake found'
-                elif '0 handshake' in output_lower:
-                    handshake_valid = False
-                elif '1 handshake' in output_lower or ('handshake' in output_lower and 'wpa' in output_lower):
-                    handshake_valid = True
-                else:
-                    handshake_valid = False
     except subprocess.TimeoutExpired:
         pass
     except Exception as e:
         logger.error(f"Error checking handshake: {e}")
 
-    if handshake_valid:
-        handshake_found = True
-        normalized_bssid = target_bssid.upper() if target_bssid else None
-        if normalized_bssid and normalized_bssid not in app_module.wifi_handshakes:
-            app_module.wifi_handshakes.append(normalized_bssid)
-
     return jsonify({
         'status': 'running' if app_module.wifi_process and app_module.wifi_process.poll() is None else 'stopped',
         'file_exists': True,
         'file_size': file_size,
         'file': capture_file,
-        'handshake_found': handshake_found,
+        'handshake_found': handshake_found
-        'handshake_valid': handshake_valid,
-        'handshake_checked': handshake_checked,
-        'handshake_reason': handshake_reason
     })
 
 
@@ -1143,10 +1086,6 @@ def stream_wifi():
             try:
                 msg = app_module.wifi_queue.get(timeout=1)
                 last_keepalive = time.time()
-                try:
-                    process_event('wifi', msg, msg.get('type'))
-                except Exception:
-                    pass
                 yield format_sse(msg)
             except queue.Empty:
                 now = time.time()

routes/wifi_v2.py

@@ -24,8 +24,6 @@ from utils.wifi import (
     SCAN_MODE_DEEP,
 )
 from utils.sse import format_sse
-from utils.validation import validate_wifi_channel
-from utils.event_pipeline import process_event
 
 logger = logging.getLogger(__name__)
 
@@ -91,30 +89,15 @@ def start_deep_scan():
         interface: Monitor mode interface (e.g., 'wlan0mon')
         band: Band to scan ('2.4', '5', 'all')
         channel: Optional specific channel to monitor
-        channels: Optional list or comma-separated channels to monitor
     """
     data = request.get_json() or {}
     interface = data.get('interface')
     band = data.get('band', 'all')
     channel = data.get('channel')
-    channels = data.get('channels')
-
-    channel_list = None
-    if channels:
-        if isinstance(channels, str):
-            channel_list = [c.strip() for c in channels.split(',') if c.strip()]
-        elif isinstance(channels, (list, tuple, set)):
-            channel_list = list(channels)
-        else:
-            channel_list = [channels]
-        try:
-            channel_list = [validate_wifi_channel(c) for c in channel_list]
-        except (TypeError, ValueError):
-            return jsonify({'error': 'Invalid channels'}), 400
 
     if channel:
         try:
-            channel = validate_wifi_channel(channel)
+            channel = int(channel)
         except ValueError:
             return jsonify({'error': 'Invalid channel'}), 400
 
@@ -123,7 +106,6 @@ def start_deep_scan():
         interface=interface,
         band=band,
         channel=channel,
-        channels=channel_list,
     )
 
     if success:
@@ -409,10 +391,6 @@ def event_stream():
         scanner = get_wifi_scanner()
 
         for event in scanner.get_event_stream():
-            try:
-                process_event('wifi', event, event.get('type'))
-            except Exception:
-                pass
             yield format_sse(event)
 
     response = Response(generate(), mimetype='text/event-stream')

setup.sh

@@ -137,14 +137,6 @@ need_sudo() {
   fi
 }
 
-# Refresh sudo credential cache so long-running builds don't trigger
-# mid-compilation password prompts (which can fail due to TTY issues
-# inside subshells). Safe to call multiple times.
-refresh_sudo() {
-  [[ -z "${SUDO:-}" ]] && return 0
-  sudo -v 2>/dev/null || true
-}
-
 detect_os() {
   if [[ "${OSTYPE:-}" == "darwin"* ]]; then
     OS="macos"
@@ -173,7 +165,6 @@ detect_dragonos() {
 # Required tool checks (with alternates)
 # ----------------------------
 missing_required=()
-missing_recommended=()
 
 check_required() {
   local label="$1"; shift
@@ -187,18 +178,6 @@ check_required() {
   fi
 }
 
-check_recommended() {
-  local label="$1"; shift
-  local desc="$1"; shift
-
-  if have_any "$@"; then
-    ok "${label} - ${desc}"
-  else
-    warn "${label} - ${desc} (missing, recommended)"
-    missing_recommended+=("$label")
-  fi
-}
-
 check_optional() {
   local label="$1"; shift
   local desc="$1"; shift
@@ -222,12 +201,9 @@ check_tools() {
   check_required "multimon-ng" "Pager decoder" multimon-ng
   check_required "rtl_433"     "433MHz sensor decoder" rtl_433 rtl433
   check_optional "rtlamr"      "Utility meter decoder (requires Go)" rtlamr
-  check_optional "hackrf_transfer" "HackRF SubGHz transceiver" hackrf_transfer
-  check_optional "hackrf_sweep"    "HackRF spectrum analyzer" hackrf_sweep
   check_required "dump1090"    "ADS-B decoder" dump1090
   check_required "acarsdec"    "ACARS decoder" acarsdec
   check_required "AIS-catcher" "AIS vessel decoder" AIS-catcher aiscatcher
-  check_optional "satdump" "Weather satellite decoder (NOAA/Meteor)" satdump
   echo
   info "GPS:"
   check_required "gpsd" "GPS daemon" gpsd
@@ -396,7 +372,7 @@ install_rtlamr_from_source() {
         if [[ -w /usr/local/bin ]]; then
           ln -sf "$GOPATH/bin/rtlamr" /usr/local/bin/rtlamr
         else
-          $SUDO ln -sf "$GOPATH/bin/rtlamr" /usr/local/bin/rtlamr
+          sudo ln -sf "$GOPATH/bin/rtlamr" /usr/local/bin/rtlamr
         fi
       else
         $SUDO ln -sf "$GOPATH/bin/rtlamr" /usr/local/bin/rtlamr
@@ -438,8 +414,7 @@ install_multimon_ng_from_source_macos() {
     if [[ -w /usr/local/bin ]]; then
       install -m 0755 multimon-ng /usr/local/bin/multimon-ng
     else
-      refresh_sudo
+      sudo install -m 0755 multimon-ng /usr/local/bin/multimon-ng
-      $SUDO install -m 0755 multimon-ng /usr/local/bin/multimon-ng
     fi
     ok "multimon-ng installed successfully from source"
   )
@@ -480,8 +455,7 @@ install_dsd_from_source() {
         if [[ -w /usr/local/lib ]]; then
           make install >/dev/null 2>&1
         else
-          refresh_sudo
+          sudo make install >/dev/null 2>&1
-          $SUDO make install >/dev/null 2>&1
         fi
       else
         $SUDO make install >/dev/null 2>&1
@@ -517,8 +491,7 @@ install_dsd_from_source() {
         if [[ -w /usr/local/bin ]]; then
           install -m 0755 dsd-fme /usr/local/bin/dsd 2>/dev/null || install -m 0755 dsd /usr/local/bin/dsd 2>/dev/null || true
         else
-          refresh_sudo
+          sudo install -m 0755 dsd-fme /usr/local/bin/dsd 2>/dev/null || sudo install -m 0755 dsd /usr/local/bin/dsd 2>/dev/null || true
-          $SUDO install -m 0755 dsd-fme /usr/local/bin/dsd 2>/dev/null || $SUDO install -m 0755 dsd /usr/local/bin/dsd 2>/dev/null || true
         fi
       else
         $SUDO make install >/dev/null 2>&1 \
@@ -556,8 +529,7 @@ install_dump1090_from_source_macos() {
       if [[ -w /usr/local/bin ]]; then
         install -m 0755 dump1090 /usr/local/bin/dump1090
       else
-        refresh_sudo
+        sudo install -m 0755 dump1090 /usr/local/bin/dump1090
-        $SUDO install -m 0755 dump1090 /usr/local/bin/dump1090
       fi
       ok "dump1090 installed successfully from source"
     else
@@ -583,54 +555,18 @@ install_acarsdec_from_source_macos() {
       || { warn "Failed to clone acarsdec"; exit 1; }
 
     cd "$tmp_dir/acarsdec"
-
-    # Fix compiler flags for macOS Apple Silicon (ARM64)
-    # -march=native can fail with Apple Clang on M-series chips
-    # -Ofast is deprecated in modern Clang
-    if [[ "$(uname -m)" == "arm64" ]]; then
-      sed -i '' 's/-Ofast -march=native/-O3 -ffast-math/g' CMakeLists.txt
-      info "Patched compiler flags for Apple Silicon (arm64)"
-    fi
-
-    # Fix pthread_tryjoin_np (Linux-only GNU extension) for macOS
-    # Replace with pthread_join which provides equivalent behavior
-    if grep -q 'pthread_tryjoin_np' rtl.c 2>/dev/null; then
-      sed -i '' 's/pthread_tryjoin_np(\([^,]*\), NULL)/pthread_join(\1, NULL)/g' rtl.c
-      info "Patched pthread_tryjoin_np for macOS compatibility"
-    fi
-
-    # Fix libacars linking on macOS (upstream issue #112)
-    # Use LIBACARS_LINK_LIBRARIES (full path) instead of LIBACARS_LIBRARIES (name only)
-    if grep -q 'LIBACARS_LIBRARIES' CMakeLists.txt 2>/dev/null; then
-      sed -i '' 's/${LIBACARS_LIBRARIES}/${LIBACARS_LINK_LIBRARIES}/g' CMakeLists.txt
-      info "Patched libacars linking for macOS"
-    fi
-
     mkdir -p build && cd build
 
-    # Set Homebrew paths for Apple Silicon (/opt/homebrew) or Intel (/usr/local)
-    HOMEBREW_PREFIX="$(brew --prefix)"
-    export PKG_CONFIG_PATH="${HOMEBREW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
-    export CMAKE_PREFIX_PATH="${HOMEBREW_PREFIX}"
-
     info "Compiling acarsdec..."
-    build_log="$tmp_dir/acarsdec-build.log"
+    if cmake .. -Drtl=ON >/dev/null 2>&1 && make >/dev/null 2>&1; then
-    if cmake .. -Drtl=ON \
-         -DCMAKE_C_FLAGS="-I${HOMEBREW_PREFIX}/include" \
-         -DCMAKE_EXE_LINKER_FLAGS="-L${HOMEBREW_PREFIX}/lib" \
-         >"$build_log" 2>&1 \
-       && make >>"$build_log" 2>&1; then
       if [[ -w /usr/local/bin ]]; then
         install -m 0755 acarsdec /usr/local/bin/acarsdec
       else
-        refresh_sudo
+        sudo install -m 0755 acarsdec /usr/local/bin/acarsdec
-        $SUDO install -m 0755 acarsdec /usr/local/bin/acarsdec
       fi
       ok "acarsdec installed successfully from source"
     else
       warn "Failed to build acarsdec. ACARS decoding will not be available."
-      warn "Build log (last 30 lines):"
-      tail -30 "$build_log" | while IFS= read -r line; do warn "  $line"; done
     fi
   )
 }
@@ -659,8 +595,7 @@ install_aiscatcher_from_source_macos() {
       if [[ -w /usr/local/bin ]]; then
         install -m 0755 AIS-catcher /usr/local/bin/AIS-catcher
       else
-        refresh_sudo
+        sudo install -m 0755 AIS-catcher /usr/local/bin/AIS-catcher
-        $SUDO install -m 0755 AIS-catcher /usr/local/bin/AIS-catcher
       fi
       ok "AIS-catcher installed successfully from source"
     else
@@ -669,138 +604,8 @@ install_aiscatcher_from_source_macos() {
   )
 }
 
-install_satdump_from_source_debian() {
-  info "Building SatDump v1.2.2 from source (weather satellite decoder)..."
-
-  apt_install build-essential git cmake pkg-config \
-    libpng-dev libtiff-dev libjemalloc-dev libvolk-dev libnng-dev \
-    libzstd-dev libsoapysdr-dev libhackrf-dev liblimesuite-dev \
-    libsqlite3-dev libcurl4-openssl-dev zlib1g-dev libzmq3-dev libfftw3-dev
-
-  # Run in subshell to isolate EXIT trap
-  (
-    tmp_dir="$(mktemp -d)"
-    trap 'rm -rf "$tmp_dir"' EXIT
-
-    info "Cloning SatDump v1.2.2..."
-    git clone --depth 1 --branch 1.2.2 https://github.com/SatDump/SatDump.git "$tmp_dir/SatDump" >/dev/null 2>&1 \
-      || { warn "Failed to clone SatDump"; exit 1; }
-
-    cd "$tmp_dir/SatDump"
-    mkdir -p build && cd build
-
-    info "Compiling SatDump (this is a large C++ project and may take 10-30 minutes)..."
-    build_log="$tmp_dir/satdump-build.log"
-
-    # Show periodic progress while building so the user knows it's not hung
-    (
-      while true; do
-        sleep 30
-        if [ -f "$build_log" ]; then
-          local_lines=$(wc -l < "$build_log" 2>/dev/null || echo 0)
-          printf "  [*] Still compiling SatDump... (%s lines of build output so far)\n" "$local_lines"
-        fi
-      done
-    ) &
-    progress_pid=$!
-
-    if cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=OFF -DCMAKE_INSTALL_LIBDIR=lib .. >"$build_log" 2>&1 \
-        && make -j "$(nproc)" >>"$build_log" 2>&1; then
-      kill $progress_pid 2>/dev/null; wait $progress_pid 2>/dev/null
-      $SUDO make install >/dev/null 2>&1
-      $SUDO ldconfig
-
-      # Ensure plugins are in the expected path (handles multiarch differences)
-      $SUDO mkdir -p /usr/local/lib/satdump/plugins
-      if [ -z "$(ls /usr/local/lib/satdump/plugins/*.so 2>/dev/null)" ]; then
-        for dir in /usr/local/lib/*/satdump/plugins /usr/lib/*/satdump/plugins /usr/lib/satdump/plugins; do
-          if [ -d "$dir" ] && [ -n "$(ls "$dir"/*.so 2>/dev/null)" ]; then
-            $SUDO ln -sf "$dir"/*.so /usr/local/lib/satdump/plugins/
-            break
-          fi
-        done
-      fi
-
-      ok "SatDump installed successfully."
-    else
-      kill $progress_pid 2>/dev/null; wait $progress_pid 2>/dev/null
-      warn "Failed to build SatDump from source. Weather satellite decoding will not be available."
-      warn "Build log (last 30 lines):"
-      tail -30 "$build_log" | while IFS= read -r line; do warn "  $line"; done
-    fi
-  )
-}
-
-install_satdump_from_source_macos() {
-  info "Building SatDump v1.2.2 from source (weather satellite decoder)..."
-
-  brew_install cmake
-  brew_install libpng
-  brew_install libtiff
-  brew_install jemalloc
-  brew_install libvolk
-  brew_install nng
-  brew_install zstd
-  brew_install soapysdr
-  brew_install hackrf
-  brew_install fftw
-
-  # Run in subshell to isolate EXIT trap
-  (
-    tmp_dir="$(mktemp -d)"
-    trap 'rm -rf "$tmp_dir"' EXIT
-
-    info "Cloning SatDump v1.2.2..."
-    git clone --depth 1 --branch 1.2.2 https://github.com/SatDump/SatDump.git "$tmp_dir/SatDump" >/dev/null 2>&1 \
-      || { warn "Failed to clone SatDump"; exit 1; }
-
-    cd "$tmp_dir/SatDump"
-    mkdir -p build && cd build
-
-    info "Compiling SatDump (this is a large C++ project and may take 10-30 minutes)..."
-    build_log="$tmp_dir/satdump-build.log"
-
-    # Show periodic progress while building so the user knows it's not hung
-    (
-      while true; do
-        sleep 30
-        if [ -f "$build_log" ]; then
-          local_lines=$(wc -l < "$build_log" 2>/dev/null || echo 0)
-          printf "  [*] Still compiling SatDump... (%s lines of build output so far)\n" "$local_lines"
-        fi
-      done
-    ) &
-    progress_pid=$!
-
-    if cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=OFF .. >"$build_log" 2>&1 \
-        && make -j "$(sysctl -n hw.ncpu)" >>"$build_log" 2>&1; then
-      kill $progress_pid 2>/dev/null; wait $progress_pid 2>/dev/null
-      if [[ -w /usr/local/bin ]]; then
-        make install >/dev/null 2>&1
-      else
-        refresh_sudo
-        $SUDO make install >/dev/null 2>&1
-      fi
-      ok "SatDump installed successfully."
-    else
-      kill $progress_pid 2>/dev/null; wait $progress_pid 2>/dev/null
-      warn "Failed to build SatDump from source. Weather satellite decoding will not be available."
-      warn "Build log (last 30 lines):"
-      tail -30 "$build_log" | while IFS= read -r line; do warn "  $line"; done
-    fi
-  )
-}
-
 install_macos_packages() {
-  need_sudo
+  TOTAL_STEPS=17
-
-  # Prime sudo credentials upfront so builds don't prompt mid-compilation
-  if [[ -n "${SUDO:-}" ]]; then
-    info "Some tools require sudo to install. You may be prompted for your password."
-    sudo -v || { fail "sudo authentication failed"; exit 1; }
-  fi
-
-  TOTAL_STEPS=19
   CURRENT_STEP=0
 
   progress "Checking Homebrew"
@@ -842,9 +647,6 @@ install_macos_packages() {
   progress "Installing rtl_433"
   brew_install rtl_433
 
-  progress "Installing HackRF tools"
-  brew_install hackrf
-
   progress "Installing rtlamr (optional)"
   # rtlamr is optional - used for utility meter monitoring
   if ! cmd_exists rtlamr; then
@@ -880,19 +682,6 @@ install_macos_packages() {
     ok "AIS-catcher already installed"
   fi
 
-  progress "Installing SatDump (optional)"
-  if ! cmd_exists satdump; then
-    echo
-    info "SatDump is used for weather satellite imagery (NOAA APT & Meteor LRPT)."
-    if ask_yes_no "Do you want to install SatDump?"; then
-      install_satdump_from_source_macos || warn "SatDump build failed. Weather satellite decoding will not be available."
-    else
-      warn "Skipping SatDump installation. You can install it later if needed."
-    fi
-  else
-    ok "SatDump already installed"
-  fi
-
   progress "Installing aircrack-ng"
   brew_install aircrack-ng
 
@@ -1190,7 +979,7 @@ install_debian_packages() {
     export NEEDRESTART_MODE=a
   fi
 
-  TOTAL_STEPS=26
+  TOTAL_STEPS=22
   CURRENT_STEP=0
 
   progress "Updating APT package lists"
@@ -1268,9 +1057,6 @@ install_debian_packages() {
   progress "Installing rtl_433"
   apt_try_install_any rtl-433 rtl433 || warn "rtl-433 not available"
 
-  progress "Installing HackRF tools"
-  apt_install hackrf || warn "hackrf tools not available"
-
   progress "Installing rtlamr (optional)"
   # rtlamr is optional - used for utility meter monitoring
   if ! cmd_exists rtlamr; then
@@ -1350,19 +1136,6 @@ install_debian_packages() {
     ok "AIS-catcher already installed"
   fi
 
-  progress "Installing SatDump (optional)"
-  if ! cmd_exists satdump; then
-    echo
-    info "SatDump is used for weather satellite imagery (NOAA APT & Meteor LRPT)."
-    if ask_yes_no "Do you want to install SatDump?"; then
-      install_satdump_from_source_debian || warn "SatDump build failed. Weather satellite decoding will not be available."
-    else
-      warn "Skipping SatDump installation. You can install it later if needed."
-    fi
-  else
-    ok "SatDump already installed"
-  fi
-
   progress "Configuring udev rules"
   setup_udev_rules_debian
 
@@ -1412,14 +1185,6 @@ final_summary_and_hard_fail() {
       exit 1
     fi
   fi
-
-  if [[ "${#missing_recommended[@]}" -gt 0 ]]; then
-    echo
-    warn "Missing RECOMMENDED tools (some features will not work):"
-    for t in "${missing_recommended[@]}"; do echo "  - $t"; done
-    echo
-    warn "Install these for full functionality"
-  fi
 }
 
 # ----------------------------
@@ -1466,19 +1231,6 @@ main() {
   fi
 
   install_python_deps
-
-  # Download leaflet-heat plugin (offline mode)
-  if [ ! -f "static/vendor/leaflet-heat/leaflet-heat.js" ]; then
-    info "Downloading leaflet-heat plugin..."
-    mkdir -p static/vendor/leaflet-heat
-    if curl -sL "https://unpkg.com/leaflet.heat@0.2.0/dist/leaflet-heat.js" \
-        -o static/vendor/leaflet-heat/leaflet-heat.js; then
-      ok "leaflet-heat plugin downloaded"
-    else
-      warn "Failed to download leaflet-heat plugin. Heatmap will use CDN."
-    fi
-  fi
-
   final_summary_and_hard_fail
 }
 

static/css/components/function-strip.css

@@ -19,17 +19,6 @@
     min-width: max-content;
 }
 
-/* Strip title badge */
-.function-strip .strip-title {
-    font-size: 9px;
-    font-weight: 700;
-    letter-spacing: 1.5px;
-    text-transform: uppercase;
-    color: var(--text-muted);
-    white-space: nowrap;
-    padding: 4px 0;
-}
-
 /* Stats */
 .function-strip .strip-stat {
     display: flex;

static/css/index.css

@@ -1448,7 +1448,6 @@ header h1 .tagline {
     height: calc(100dvh - 96px);
     height: calc(100vh - 96px); /* Fallback */
     overflow: hidden;
-    position: relative;
 }
 
 @media (min-width: 1024px) {
@@ -1458,18 +1457,6 @@ header h1 .tagline {
         height: calc(100dvh - 96px);
         height: calc(100vh - 96px); /* Fallback */
     }
-
-    .main-content.sidebar-collapsed {
-        grid-template-columns: 0 1fr;
-    }
-
-    .main-content.sidebar-collapsed > .sidebar {
-        width: 0;
-        min-width: 0;
-        padding: 0;
-        border-right: 0;
-        overflow: hidden;
-    }
 }
 
 .sidebar {
@@ -1493,63 +1480,6 @@ header h1 .tagline {
     display: none;
 }
 
-.sidebar-collapse-btn {
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 6px;
-    padding: 8px 10px;
-    margin-bottom: 6px;
-    border: 1px solid var(--border-color);
-    background: var(--bg-tertiary);
-    color: var(--text-secondary);
-    border-radius: 6px;
-    cursor: pointer;
-    font-family: var(--font-mono);
-    font-size: 10px;
-    text-transform: uppercase;
-    letter-spacing: 0.06em;
-}
-
-.sidebar-collapse-btn:hover {
-    border-color: var(--accent-cyan);
-    color: var(--accent-cyan);
-}
-
-.sidebar-expand-handle {
-    display: none;
-    position: absolute;
-    top: 12px;
-    left: 10px;
-    z-index: 12;
-    width: 28px;
-    height: 28px;
-    align-items: center;
-    justify-content: center;
-    border: 1px solid var(--border-color);
-    background: var(--bg-tertiary);
-    color: var(--accent-cyan);
-    border-radius: 6px;
-    cursor: pointer;
-}
-
-.main-content.sidebar-collapsed .sidebar-expand-handle {
-    display: inline-flex;
-}
-
-/* Reserve space for the expand handle so it doesn't overlap mode titles */
-.main-content.sidebar-collapsed .output-header {
-    padding-left: 48px;
-}
-
-@media (max-width: 1023px) {
-    .sidebar-collapse-btn,
-    .sidebar-expand-handle {
-        display: none !important;
-    }
-}
-
 .section {
     background: var(--bg-tertiary);
     border: 1px solid var(--border-color);
@@ -1598,10 +1528,8 @@ header h1 .tagline {
 
 .section.collapsed h3 {
     border-bottom: none;
-    margin-bottom: 0 !important;
+    margin-bottom: 0;
-    min-height: 0 !important;
+    padding-bottom: 10px;
-    padding-top: 10px !important;
-    padding-bottom: 10px !important;
 }
 
 .section.collapsed h3::after {
@@ -1610,8 +1538,7 @@ header h1 .tagline {
 }
 
 .section.collapsed {
-    padding-bottom: 0 !important;
+    padding-bottom: 0;
-    min-height: 0;
 }
 
 .section.collapsed>*:not(h3) {
@@ -2386,45 +2313,6 @@ header h1 .tagline {
     display: block;
 }
 
-/* Normalize spacing for all sidebar mode panels */
-.sidebar .mode-content.active:not(#meshtasticMode) {
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-}
-
-.sidebar .mode-content.active:not(#meshtasticMode) > * {
-    margin: 0 !important;
-}
-
-.sidebar .mode-content.active:not(#meshtasticMode) > .section {
-    margin: 0 !important;
-}
-
-.mode-actions-bottom {
-    display: flex;
-    flex-direction: column;
-    gap: 8px;
-}
-
-.sidebar .mode-content.active:not(#meshtasticMode) > .mode-actions-bottom {
-    margin-top: auto !important;
-}
-
-#btMessageContainer:empty {
-    display: none;
-}
-
-.alpha-mode-notice {
-    padding: 8px 10px;
-    border: 1px solid rgba(245, 158, 11, 0.45);
-    background: rgba(245, 158, 11, 0.12);
-    color: var(--accent-yellow);
-    border-radius: 6px;
-    font-size: 10px;
-    line-height: 1.45;
-}
-
 /* Aircraft (ADS-B) Styles */
 .aircraft-card {
     padding: 12px;
@@ -4119,7 +4007,7 @@ header h1 .tagline {
     border: 1px solid var(--border-color);
     border-radius: 6px;
     flex-shrink: 0;
-    max-height: 340px;
+    height: 140px;
     overflow: hidden;
 }
 
@@ -4140,9 +4028,7 @@ header h1 .tagline {
 
 .bt-detail-body {
     padding: 8px 10px;
-    height: auto;
+    height: calc(100% - 30px);
-    max-height: calc(100% - 30px);
-    overflow-y: auto;
 }
 
 .bt-detail-placeholder {
@@ -4315,116 +4201,6 @@ header h1 .tagline {
     color: #000;
 }
 
-.bt-detail-btn.active {
-    background: rgba(34, 197, 94, 0.2);
-    border-color: rgba(34, 197, 94, 0.6);
-    color: #9fffd1;
-}
-
-/* Service Data Inspector */
-.bt-detail-service-inspector {
-    margin-bottom: 6px;
-}
-
-.bt-inspector-toggle {
-    font-size: 10px;
-    color: var(--accent-cyan);
-    cursor: pointer;
-    padding: 3px 0;
-    user-select: none;
-}
-
-.bt-inspector-toggle:hover {
-    color: #fff;
-}
-
-.bt-inspector-arrow {
-    display: inline-block;
-    transition: transform 0.2s;
-    font-size: 9px;
-}
-
-.bt-inspector-arrow.open {
-    transform: rotate(90deg);
-}
-
-.bt-inspector-content {
-    background: var(--bg-secondary);
-    border-radius: 3px;
-    padding: 6px 8px;
-    margin-top: 4px;
-    font-family: var(--font-mono);
-    font-size: 9px;
-    color: var(--text-dim);
-    max-height: 100px;
-    overflow-y: auto;
-    word-break: break-all;
-}
-
-.bt-inspector-row {
-    display: flex;
-    justify-content: space-between;
-    gap: 8px;
-    padding: 2px 0;
-    border-bottom: 1px solid rgba(255,255,255,0.04);
-}
-
-.bt-inspector-row:last-child {
-    border-bottom: none;
-}
-
-.bt-inspector-label {
-    color: var(--text-dim);
-    flex-shrink: 0;
-}
-
-.bt-inspector-value {
-    color: var(--text-primary);
-    text-align: right;
-    min-width: 0;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-/* MAC Cluster Badge */
-.bt-mac-cluster-badge {
-    display: inline-block;
-    background: rgba(245, 158, 11, 0.2);
-    color: #f59e0b;
-    font-size: 8px;
-    font-weight: 600;
-    padding: 1px 4px;
-    border-radius: 3px;
-    margin-left: 6px;
-    vertical-align: middle;
-}
-
-/* Behavioral Flag Badges */
-.bt-flag-badge {
-    display: inline-block;
-    font-size: 8px;
-    font-weight: 600;
-    padding: 1px 4px;
-    border-radius: 3px;
-    margin-left: 3px;
-    vertical-align: middle;
-}
-
-.bt-flag-badge.persistent {
-    background: rgba(245, 158, 11, 0.15);
-    color: #f59e0b;
-}
-
-.bt-flag-badge.beacon-like {
-    background: rgba(59, 130, 246, 0.15);
-    color: #3b82f6;
-}
-
-.bt-flag-badge.strong-stable {
-    background: rgba(34, 197, 94, 0.15);
-    color: #22c55e;
-}
-
 /* Selected device highlight */
 .bt-device-row.selected {
     background: rgba(0, 212, 255, 0.1);
@@ -4575,15 +4351,14 @@ header h1 .tagline {
 .bt-row-main {
     display: flex;
     justify-content: space-between;
-    align-items: flex-start;
+    align-items: center;
     gap: 12px;
 }
 
 .bt-row-left {
     display: flex;
-    align-items: baseline;
+    align-items: center;
-    flex-wrap: wrap;
+    gap: 8px;
-    gap: 4px 8px;
     min-width: 0;
     flex: 1;
 }
@@ -4617,36 +4392,13 @@ header h1 .tagline {
     border: 1px solid rgba(139, 92, 246, 0.3);
 }
 
-.bt-history-badge {
-    display: inline-block;
-    padding: 1px 4px;
-    border-radius: 3px;
-    font-size: 8px;
-    font-weight: 600;
-    letter-spacing: 0.2px;
-    background: rgba(34, 197, 94, 0.15);
-    color: #22c55e;
-}
-
-.bt-irk-badge {
-    display: inline-block;
-    padding: 1px 4px;
-    border-radius: 3px;
-    font-size: 9px;
-    font-weight: 600;
-    letter-spacing: 0.3px;
-    background: rgba(168, 85, 247, 0.15);
-    color: #a855f7;
-    border: 1px solid rgba(168, 85, 247, 0.3);
-}
-
 .bt-device-name {
     font-size: 13px;
     font-weight: 600;
     color: var(--text-primary);
-    overflow-wrap: break-word;
+    white-space: nowrap;
-    word-break: break-word;
+    overflow: hidden;
-    min-width: 0;
+    text-overflow: ellipsis;
 }
 
 .bt-rssi-container {
@@ -4703,12 +4455,6 @@ header h1 .tagline {
     text-overflow: ellipsis;
 }
 
-.bt-row-actions {
-    display: flex;
-    justify-content: flex-end;
-    padding: 4px 4px 0 42px;
-}
-
 /* Bluetooth Device Modal */
 .bt-modal-overlay {
     position: fixed;

static/css/modes/aprs.css

@@ -326,50 +326,3 @@
 .aprs-meter-status.no-signal {
     color: var(--accent-yellow);
 }
-
-/* APRS map markers (flat SVG icons) */
-.aprs-map-marker-wrap {
-    background: transparent;
-    border: none;
-}
-
-.aprs-map-marker {
-    display: inline-flex;
-    align-items: center;
-    gap: 5px;
-    padding: 2px 7px 2px 5px;
-    border-radius: 999px;
-    border: 1px solid rgba(74, 158, 255, 0.35);
-    background: rgba(10, 18, 28, 0.88);
-    color: var(--text-primary);
-    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.35);
-}
-
-.aprs-map-marker-icon {
-    display: inline-flex;
-    width: 14px;
-    height: 14px;
-    color: var(--accent-cyan);
-}
-
-.aprs-map-marker-icon svg {
-    width: 14px;
-    height: 14px;
-    display: block;
-    fill: currentColor;
-}
-
-.aprs-map-marker-label {
-    font-size: 9px;
-    font-weight: 600;
-    line-height: 1;
-    letter-spacing: 0.02em;
-}
-
-.aprs-map-marker.vehicle .aprs-map-marker-icon {
-    color: var(--accent-green);
-}
-
-.aprs-map-marker.tower .aprs-map-marker-icon {
-    color: var(--accent-cyan);
-}

static/css/modes/bt_locate.css

@@ -1,430 +0,0 @@
-/* BT Locate Mode Styles */
-
-/* Environment preset grid */
-.btl-env-grid {
-    display: grid;
-    grid-template-columns: 1fr 1fr 1fr;
-    gap: 6px;
-}
-
-.btl-env-btn {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    gap: 2px;
-    padding: 8px 4px;
-    background: rgba(255, 255, 255, 0.03);
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    border-radius: 6px;
-    cursor: pointer;
-    transition: all 0.2s;
-    color: var(--text-secondary);
-}
-
-.btl-env-btn:hover {
-    background: rgba(255, 255, 255, 0.06);
-    border-color: rgba(255, 255, 255, 0.2);
-}
-
-.btl-env-btn.active {
-    background: rgba(0, 255, 136, 0.1);
-    border-color: var(--accent-green, #00ff88);
-    color: var(--text-primary);
-}
-
-.btl-env-icon {
-    font-size: 18px;
-    line-height: 1;
-}
-
-.btl-env-label {
-    font-size: 10px;
-    font-weight: 600;
-    text-transform: uppercase;
-}
-
-.btl-env-n {
-    font-size: 9px;
-    font-family: var(--font-mono);
-    color: var(--text-dim);
-}
-
-/* ============================================
-   PROXIMITY HUD — main visuals area
-   ============================================ */
-
-.btl-hud {
-    display: flex;
-    flex-direction: column;
-    gap: 0;
-    background: rgba(0, 0, 0, 0.5);
-    border: 1px solid rgba(255, 255, 255, 0.08);
-    border-radius: 8px;
-    flex-shrink: 0;
-    overflow: hidden;
-}
-
-.btl-hud-top {
-    display: flex;
-    align-items: center;
-    gap: 20px;
-    padding: 14px 20px;
-}
-
-.btl-hud-band {
-    font-size: 22px;
-    font-weight: 800;
-    font-family: var(--font-mono);
-    letter-spacing: 2px;
-    padding: 14px 20px;
-    border-radius: 8px;
-    background: rgba(255, 255, 255, 0.03);
-    border: 2px solid rgba(255, 255, 255, 0.1);
-    color: var(--text-dim);
-    text-align: center;
-    min-width: 130px;
-    transition: all 0.3s;
-    flex-shrink: 0;
-}
-
-.btl-hud-band.immediate {
-    color: #ef4444;
-    border-color: #ef4444;
-    background: rgba(239, 68, 68, 0.15);
-    box-shadow: 0 0 20px rgba(239, 68, 68, 0.2);
-    animation: btl-pulse 1s ease-in-out infinite;
-}
-
-.btl-hud-band.near {
-    color: #f97316;
-    border-color: #f97316;
-    background: rgba(249, 115, 22, 0.12);
-    box-shadow: 0 0 15px rgba(249, 115, 22, 0.15);
-    animation: btl-pulse 2s ease-in-out infinite;
-}
-
-.btl-hud-band.far {
-    color: #eab308;
-    border-color: #eab308;
-    background: rgba(234, 179, 8, 0.1);
-    box-shadow: 0 0 10px rgba(234, 179, 8, 0.1);
-}
-
-@keyframes btl-pulse {
-    0%, 100% { opacity: 1; }
-    50% { opacity: 0.6; }
-}
-
-.btl-hud-metrics {
-    display: flex;
-    gap: 20px;
-    flex: 1;
-    align-items: flex-start;
-}
-
-.btl-hud-separator {
-    width: 1px;
-    height: 40px;
-    background: rgba(255, 255, 255, 0.08);
-    align-self: center;
-    flex-shrink: 0;
-}
-
-.btl-hud-metric {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    min-width: 60px;
-}
-
-.btl-hud-metric-lg .btl-hud-value {
-    font-size: 28px;
-}
-
-.btl-hud-value {
-    font-size: 22px;
-    font-weight: 700;
-    font-family: var(--font-mono);
-    color: var(--text-primary);
-    line-height: 1.1;
-}
-
-.btl-hud-unit {
-    font-size: 10px;
-    color: var(--text-dim);
-    font-family: var(--font-mono);
-}
-
-.btl-hud-label {
-    font-size: 9px;
-    color: var(--text-dim);
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    margin-top: 2px;
-}
-
-.btl-hud-controls {
-    display: flex;
-    flex-direction: column;
-    gap: 6px;
-    flex-shrink: 0;
-}
-
-.btl-hud-audio-toggle {
-    display: flex;
-    align-items: center;
-    gap: 5px;
-    font-size: 11px;
-    color: var(--text-secondary);
-    cursor: pointer;
-    white-space: nowrap;
-}
-
-.btl-hud-audio-toggle input[type="checkbox"] {
-    margin: 0;
-}
-
-.btl-hud-clear-btn {
-    padding: 4px 10px;
-    font-size: 10px;
-    background: rgba(255, 255, 255, 0.05);
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    border-radius: 4px;
-    color: var(--text-dim);
-    cursor: pointer;
-    transition: all 0.2s;
-}
-
-.btl-hud-clear-btn:hover {
-    background: rgba(255, 255, 255, 0.1);
-    color: var(--text-secondary);
-}
-
-/* Bottom info bar */
-.btl-hud-bottom {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 6px 20px;
-    background: rgba(0, 0, 0, 0.3);
-    border-top: 1px solid rgba(255, 255, 255, 0.05);
-}
-
-.btl-hud-info {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    flex-wrap: wrap;
-}
-
-.btl-hud-info-item {
-    font-size: 10px;
-    font-family: var(--font-mono);
-    color: var(--text-dim);
-}
-
-.btl-hud-info-sep {
-    color: rgba(255, 255, 255, 0.15);
-    font-size: 10px;
-}
-
-.btl-hud-diag {
-    display: none;
-    font-size: 9px;
-    color: var(--text-dim);
-    font-family: var(--font-mono);
-    opacity: 0.5;
-    white-space: nowrap;
-}
-
-.btl-hud-diag:not(:empty) {
-    display: block;
-}
-
-/* ============================================
-   VISUALS AREA — map + chart
-   ============================================ */
-
-.btl-visuals-container {
-    display: flex;
-    flex-direction: column;
-    gap: 8px;
-    height: 100%;
-    padding: 8px;
-}
-
-.btl-map-container {
-    flex: 1;
-    min-height: 250px;
-    border-radius: 8px;
-    overflow: hidden;
-    border: 1px solid rgba(255, 255, 255, 0.1);
-}
-
-#btLocateMap {
-    width: 100%;
-    height: 100%;
-    background: #1a1a2e;
-}
-
-.btl-rssi-chart-container {
-    height: 100px;
-    background: rgba(0, 0, 0, 0.3);
-    border-radius: 8px;
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    padding: 8px;
-    position: relative;
-    flex-shrink: 0;
-}
-
-.btl-rssi-chart-container .btl-chart-label {
-    position: absolute;
-    top: 4px;
-    left: 8px;
-    font-size: 9px;
-    color: var(--text-dim);
-    text-transform: uppercase;
-    letter-spacing: 1px;
-}
-
-#btLocateRssiChart {
-    width: 100%;
-    height: 100%;
-}
-
-/* ============================================
-   LOCATE BUTTON — Bluetooth device cards
-   ============================================ */
-
-.bt-locate-btn {
-    display: inline-flex;
-    align-items: center;
-    gap: 4px;
-    padding: 3px 8px;
-    font-size: 10px;
-    font-weight: 600;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    color: var(--accent-green, #00ff88);
-    background: rgba(0, 255, 136, 0.1);
-    border: 1px solid rgba(0, 255, 136, 0.3);
-    border-radius: 3px;
-    cursor: pointer;
-    transition: all 0.2s;
-}
-
-.bt-locate-btn:hover {
-    background: rgba(0, 255, 136, 0.2);
-    border-color: var(--accent-green, #00ff88);
-}
-
-.bt-locate-btn svg {
-    width: 10px;
-    height: 10px;
-}
-
-/* ============================================
-   IRK DETECT BUTTON + DEVICE PICKER
-   ============================================ */
-
-.btl-detect-irk-btn {
-    padding: 5px 10px;
-    font-size: 10px;
-    font-weight: 600;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    color: var(--accent-cyan, #00d4ff);
-    background: rgba(0, 212, 255, 0.1);
-    border: 1px solid rgba(0, 212, 255, 0.3);
-    border-radius: 4px;
-    cursor: pointer;
-    transition: all 0.2s;
-    white-space: nowrap;
-    flex-shrink: 0;
-}
-
-.btl-detect-irk-btn:hover {
-    background: rgba(0, 212, 255, 0.2);
-    border-color: var(--accent-cyan, #00d4ff);
-}
-
-.btl-detect-irk-btn:disabled {
-    opacity: 0.5;
-    cursor: wait;
-}
-
-.btl-irk-picker {
-    margin-top: 6px;
-    background: rgba(0, 0, 0, 0.3);
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    border-radius: 6px;
-    overflow: hidden;
-}
-
-.btl-irk-picker-status {
-    padding: 8px 10px;
-    font-size: 10px;
-    color: var(--text-dim);
-    text-align: center;
-}
-
-.btl-irk-picker-list {
-    max-height: 160px;
-    overflow-y: auto;
-}
-
-.btl-irk-picker-item {
-    padding: 7px 10px;
-    cursor: pointer;
-    transition: background 0.15s;
-    border-top: 1px solid rgba(255, 255, 255, 0.05);
-}
-
-.btl-irk-picker-item:first-child {
-    border-top: none;
-}
-
-.btl-irk-picker-item:hover {
-    background: rgba(0, 255, 136, 0.08);
-}
-
-.btl-irk-picker-name {
-    font-size: 11px;
-    font-weight: 600;
-    color: var(--text-primary);
-}
-
-.btl-irk-picker-meta {
-    font-size: 9px;
-    font-family: var(--font-mono);
-    color: var(--text-dim);
-    margin-top: 1px;
-}
-
-/* ============================================
-   RESPONSIVE — stack HUD vertically on narrow
-   ============================================ */
-
-@media (max-width: 900px) {
-    .btl-hud {
-        flex-wrap: wrap;
-        gap: 10px;
-    }
-
-    .btl-hud-band {
-        min-width: unset;
-        width: 100%;
-        font-size: 20px;
-    }
-
-    .btl-hud-metrics {
-        width: 100%;
-        justify-content: space-around;
-    }
-
-    .btl-hud-controls {
-        flex-direction: row;
-        width: 100%;
-        justify-content: center;
-    }
-}

static/css/modes/gps.css

@@ -1,337 +0,0 @@
-/* GPS Mode Styles */
-
-/* Sidebar info grid */
-.gps-info-grid {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 6px;
-}
-
-.gps-info-item {
-    display: flex;
-    flex-direction: column;
-    gap: 2px;
-    padding: 4px 6px;
-    background: var(--bg-primary);
-    border: 1px solid var(--border-color);
-    border-radius: 3px;
-}
-
-.gps-info-label {
-    font-size: 9px;
-    color: var(--text-dim);
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-}
-
-.gps-info-value {
-    font-size: 12px;
-    color: var(--text-primary);
-    font-weight: 600;
-}
-
-.gps-mono {
-    font-family: var(--font-mono);
-}
-
-/* Connection status */
-.gps-connection-status {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-}
-
-.gps-status-dot {
-    width: 8px;
-    height: 8px;
-    border-radius: 50%;
-    background: var(--text-dim);
-    flex-shrink: 0;
-}
-
-.gps-status-dot.connected {
-    background: #00ff88;
-    box-shadow: 0 0 6px rgba(0, 255, 136, 0.4);
-}
-
-.gps-status-dot.waiting {
-    background: #ffaa00;
-    box-shadow: 0 0 6px rgba(255, 170, 0, 0.4);
-}
-
-.gps-status-dot.error {
-    background: #ff4444;
-    box-shadow: 0 0 6px rgba(255, 68, 68, 0.4);
-}
-
-.gps-status-text {
-    font-size: 11px;
-    color: var(--text-secondary);
-    font-family: var(--font-mono);
-}
-
-/* Fix badge */
-.gps-fix-badge {
-    display: inline-block;
-    padding: 1px 6px;
-    border-radius: 3px;
-    font-size: 10px;
-    font-weight: 700;
-    font-family: var(--font-mono);
-}
-
-.gps-fix-badge.no-fix {
-    background: rgba(255, 68, 68, 0.2);
-    color: #ff4444;
-    border: 1px solid rgba(255, 68, 68, 0.3);
-}
-
-.gps-fix-badge.fix-2d {
-    background: rgba(255, 170, 0, 0.2);
-    color: #ffaa00;
-    border: 1px solid rgba(255, 170, 0, 0.3);
-}
-
-.gps-fix-badge.fix-3d {
-    background: rgba(0, 255, 136, 0.2);
-    color: #00ff88;
-    border: 1px solid rgba(0, 255, 136, 0.3);
-}
-
-/* DOP quality indicators */
-.gps-dop-good { color: #00ff88; }
-.gps-dop-moderate { color: #ffaa00; }
-.gps-dop-poor { color: #ff4444; }
-
-/* ===== Visuals Panel ===== */
-
-.gps-visuals-container {
-    display: flex;
-    flex-direction: column;
-    gap: 16px;
-    padding: 16px;
-    height: 100%;
-    overflow-y: auto;
-}
-
-/* Top row: sky view + position info */
-.gps-visuals-top {
-    display: flex;
-    gap: 16px;
-    flex-wrap: wrap;
-}
-
-/* Sky View */
-.gps-skyview-panel {
-    flex: 1;
-    min-width: 320px;
-    background: var(--bg-card);
-    border: 1px solid var(--border-color);
-    border-radius: 6px;
-    padding: 12px;
-}
-
-.gps-skyview-panel h4 {
-    margin: 0 0 8px 0;
-    font-size: 11px;
-    color: var(--text-dim);
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-}
-
-.gps-skyview-canvas-wrap {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-#gpsSkyCanvas {
-    max-width: 100%;
-    height: auto;
-}
-
-/* Position info panel */
-.gps-position-panel {
-    flex: 1;
-    min-width: 280px;
-    background: var(--bg-card);
-    border: 1px solid var(--border-color);
-    border-radius: 6px;
-    padding: 12px;
-    display: flex;
-    flex-direction: column;
-    gap: 12px;
-}
-
-.gps-position-panel h4 {
-    margin: 0;
-    font-size: 11px;
-    color: var(--text-dim);
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-}
-
-.gps-pos-big {
-    font-family: var(--font-mono);
-    font-size: 20px;
-    font-weight: 700;
-    color: var(--accent-cyan);
-    line-height: 1.3;
-}
-
-.gps-pos-row {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 4px 0;
-    border-bottom: 1px solid var(--border-color);
-}
-
-.gps-pos-row:last-child {
-    border-bottom: none;
-}
-
-.gps-pos-label {
-    font-size: 10px;
-    color: var(--text-dim);
-    text-transform: uppercase;
-}
-
-.gps-pos-value {
-    font-family: var(--font-mono);
-    font-size: 13px;
-    color: var(--text-primary);
-    font-weight: 600;
-}
-
-/* Signal Strength Bars */
-.gps-signal-panel {
-    background: var(--bg-card);
-    border: 1px solid var(--border-color);
-    border-radius: 6px;
-    padding: 12px;
-}
-
-.gps-signal-panel h4 {
-    margin: 0 0 8px 0;
-    font-size: 11px;
-    color: var(--text-dim);
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-}
-
-.gps-signal-bars {
-    display: flex;
-    align-items: flex-end;
-    gap: 3px;
-    height: 140px;
-    padding: 0 4px;
-    overflow-x: auto;
-}
-
-.gps-signal-bar-wrap {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    gap: 2px;
-    min-width: 18px;
-    height: 100%;
-    justify-content: flex-end;
-}
-
-.gps-signal-bar {
-    width: 14px;
-    border-radius: 2px 2px 0 0;
-    min-height: 2px;
-    transition: height 0.3s ease;
-}
-
-.gps-signal-bar.unused {
-    opacity: 0.4;
-}
-
-.gps-signal-prn {
-    font-size: 8px;
-    font-family: var(--font-mono);
-    color: var(--text-dim);
-    writing-mode: horizontal-tb;
-}
-
-.gps-signal-snr {
-    font-size: 7px;
-    font-family: var(--font-mono);
-    color: var(--text-secondary);
-}
-
-/* Constellation colors */
-.gps-const-gps { background-color: #00d4ff; }
-.gps-const-glonass { background-color: #00ff88; }
-.gps-const-galileo { background-color: #ff8800; }
-.gps-const-beidou { background-color: #ff4466; }
-.gps-const-sbas { background-color: #ffdd00; }
-.gps-const-qzss { background-color: #cc66ff; }
-
-/* Legend */
-.gps-legend {
-    display: flex;
-    gap: 12px;
-    flex-wrap: wrap;
-    margin-top: 8px;
-    padding-top: 8px;
-    border-top: 1px solid var(--border-color);
-}
-
-.gps-legend-item {
-    display: flex;
-    align-items: center;
-    gap: 4px;
-    font-size: 9px;
-    color: var(--text-dim);
-}
-
-.gps-legend-dot {
-    width: 8px;
-    height: 8px;
-    border-radius: 50%;
-    flex-shrink: 0;
-}
-
-/* Empty state */
-.gps-empty-state {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    gap: 12px;
-    padding: 40px;
-    color: var(--text-dim);
-    text-align: center;
-}
-
-.gps-empty-state svg {
-    width: 48px;
-    height: 48px;
-    opacity: 0.3;
-}
-
-.gps-empty-state p {
-    font-size: 12px;
-    max-width: 300px;
-    line-height: 1.5;
-}
-
-/* Responsive */
-@media (max-width: 768px) {
-    .gps-visuals-top {
-        flex-direction: column;
-    }
-
-    .gps-skyview-panel,
-    .gps-position-panel {
-        min-width: unset;
-    }
-
-    .gps-pos-big {
-        font-size: 16px;
-    }
-}

static/css/modes/spy-stations.css

@@ -340,9 +340,7 @@
    MODE VISIBILITY - Ensure sidebar shows when active
    ============================================ */
 #spystationsMode.active {
-    display: flex !important;
+    display: block !important;
-    flex-direction: column;
-    gap: 10px;
 }
 
 /* ============================================

static/css/modes/sstv-general.css

@@ -7,9 +7,7 @@
    MODE VISIBILITY
    ============================================ */
 #sstvGeneralMode.active {
-    display: flex !important;
+    display: block !important;
-    flex-direction: column;
-    gap: 10px;
 }
 
 /* ============================================

static/css/modes/sstv.css

@@ -7,9 +7,7 @@
    MODE VISIBILITY
    ============================================ */
 #sstvMode.active {
-    display: flex !important;
+    display: block !important;
-    flex-direction: column;
-    gap: 10px;
 }
 
 /* ============================================

static/css/modes/tscm.css

@@ -196,28 +196,6 @@
     margin-left: 6px;
     font-size: 10px;
 }
-.tracker-badge {
-    margin-left: 6px;
-    font-size: 9px;
-    padding: 1px 4px;
-    border-radius: 3px;
-    background: rgba(255, 51, 102, 0.2);
-    color: #ff3366;
-    border: 1px solid rgba(255, 51, 102, 0.4);
-    text-transform: uppercase;
-    letter-spacing: 0.4px;
-}
-.client-badge {
-    margin-left: 6px;
-    font-size: 9px;
-    padding: 1px 4px;
-    border-radius: 3px;
-    background: rgba(74, 158, 255, 0.2);
-    color: #4a9eff;
-    border: 1px solid rgba(74, 158, 255, 0.4);
-    text-transform: uppercase;
-    letter-spacing: 0.4px;
-}
 .known-badge {
     margin-left: 6px;
     font-size: 9px;

static/css/responsive.css

@@ -114,7 +114,7 @@
     position: fixed;
     top: 0;
     left: 0;
-    width: min(360px, 100vw);
+    width: min(320px, 85vw);
     height: 100dvh;
     height: 100vh; /* Fallback */
     background: var(--bg-secondary, #0f1218);
@@ -381,33 +381,6 @@
         -webkit-overflow-scrolling: touch;
     }
 
-    .sidebar {
-        padding: 10px;
-        gap: 10px;
-    }
-
-    .output-panel {
-        min-height: 58vh;
-    }
-
-    .output-header {
-        flex-direction: column;
-        align-items: flex-start;
-        gap: 8px;
-    }
-
-    .header-controls {
-        width: 100%;
-        gap: 8px;
-        overflow-x: auto;
-        -webkit-overflow-scrolling: touch;
-        padding-bottom: 2px;
-    }
-
-    .header-controls .stats {
-        min-width: max-content;
-    }
-
     /* Container should not clip content */
     .container {
         overflow: visible;

static/css/settings.css

@@ -24,11 +24,8 @@
     background: var(--bg-dark, #0a0a0f);
     border: 1px solid var(--border-color, #1a1a2e);
     border-radius: 8px;
-    max-width: 900px;
+    max-width: 600px;
     width: 100%;
-    max-height: calc(100vh - 80px);
-    display: flex;
-    flex-direction: column;
     position: relative;
     box-shadow: 0 20px 60px rgba(0, 0, 0, 0.5);
 }
@@ -74,28 +71,22 @@
 
 /* Settings Tabs */
 .settings-tabs {
-    display: grid;
+    display: flex;
-    grid-template-columns: repeat(8, minmax(0, 1fr));
     border-bottom: 1px solid var(--border-color, #1a1a2e);
     padding: 0 20px;
-    gap: 0;
+    gap: 4px;
 }
 
 .settings-tab {
     background: none;
     border: none;
-    padding: 12px 10px;
+    padding: 12px 16px;
     color: var(--text-muted, #666);
     font-size: 13px;
     font-weight: 500;
     cursor: pointer;
     position: relative;
     transition: color 0.2s;
-    min-width: 0;
-    text-align: center;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
 }
 
 .settings-tab:hover {
@@ -124,9 +115,6 @@
 
 .settings-section.active {
     display: block;
-    overflow-y: auto;
-    flex: 1;
-    min-height: 0;
 }
 
 .settings-group {
@@ -175,47 +163,6 @@
     color: var(--text-muted, #666);
 }
 
-/* Settings Feed Lists */
-.settings-feed {
-    background: var(--bg-tertiary, #12121f);
-    border: 1px solid var(--border-color, #1a1a2e);
-    border-radius: 6px;
-    padding: 8px;
-    max-height: 240px;
-    overflow-y: auto;
-}
-
-.settings-feed-item {
-    padding: 8px;
-    border-bottom: 1px solid rgba(255, 255, 255, 0.05);
-    font-size: 11px;
-}
-
-.settings-feed-item:last-child {
-    border-bottom: none;
-}
-
-.settings-feed-title {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    font-weight: 600;
-    color: var(--text-primary, #e0e0e0);
-    margin-bottom: 4px;
-}
-
-.settings-feed-meta {
-    color: var(--text-muted, #666);
-    font-size: 10px;
-}
-
-.settings-feed-empty {
-    color: var(--text-dim, #666);
-    text-align: center;
-    padding: 20px 10px;
-    font-size: 11px;
-}
-
 /* Toggle Switch */
 .toggle-switch {
     position: relative;
@@ -480,12 +427,6 @@
 }
 
 /* Responsive */
-@media (max-width: 960px) {
-    .settings-tabs {
-        grid-template-columns: repeat(4, minmax(0, 1fr));
-    }
-}
-
 @media (max-width: 640px) {
     .settings-modal.active {
         padding: 20px 10px;
@@ -495,18 +436,6 @@
         max-width: 100%;
     }
 
-    .settings-tabs {
-        padding: 0 10px;
-        grid-template-columns: repeat(2, minmax(0, 1fr));
-    }
-
-    .settings-tab {
-        padding: 10px 6px;
-        font-size: 11px;
-        white-space: normal;
-        line-height: 1.2;
-    }
-
     .settings-row {
         flex-direction: column;
         align-items: flex-start;

static/js/components/proximity-radar.js

@@ -36,7 +36,6 @@ const ProximityRadar = (function() {
     let isHovered = false;
     let renderPending = false;
     let renderTimer = null;
-    let interactionLockUntil = 0; // timestamp: suppress renders briefly after click
 
     /**
      * Initialize the radar component
@@ -120,36 +119,6 @@ const ProximityRadar = (function() {
 
         svg = container.querySelector('svg');
 
-        // Event delegation on the devices group (survives innerHTML rebuilds)
-        const devicesGroup = svg.querySelector('.radar-devices');
-
-        devicesGroup.addEventListener('click', (e) => {
-            const deviceEl = e.target.closest('.radar-device');
-            if (!deviceEl) return;
-            const deviceKey = deviceEl.getAttribute('data-device-key');
-            if (onDeviceClick && deviceKey) {
-                // Lock out re-renders briefly so the DOM stays stable after click
-                interactionLockUntil = Date.now() + 500;
-                onDeviceClick(deviceKey);
-            }
-        });
-
-        devicesGroup.addEventListener('mouseenter', (e) => {
-            if (e.target.closest('.radar-device')) {
-                isHovered = true;
-            }
-        }, true); // capture phase so we catch enter on child elements
-
-        devicesGroup.addEventListener('mouseleave', (e) => {
-            if (e.target.closest('.radar-device')) {
-                isHovered = false;
-                if (renderPending) {
-                    renderPending = false;
-                    renderDevices();
-                }
-            }
-        }, true);
-
         // Add sweep animation
         animateSweep();
     }
@@ -196,8 +165,8 @@ const ProximityRadar = (function() {
             devices.set(device.device_key, device);
         });
 
-        // Defer render while user is hovering or interacting to prevent DOM rebuild flicker
+        // Defer render while user is hovering to prevent DOM rebuild flicker
-        if (isHovered || Date.now() < interactionLockUntil) {
+        if (isHovered) {
             renderPending = true;
             return;
         }
@@ -260,7 +229,7 @@ const ProximityRadar = (function() {
                        style="cursor: pointer;">
                         <!-- Invisible hit area to prevent hover flicker -->
                         <circle class="radar-device-hitarea" r="${hitAreaSize}" fill="transparent" />
-                        ${isSelected ? `<circle class="radar-select-ring" r="${dotSize + 8}" fill="none" stroke="#00d4ff" stroke-width="2" stroke-opacity="0.8">
+                        ${isSelected ? `<circle r="${dotSize + 8}" fill="none" stroke="#00d4ff" stroke-width="2" stroke-opacity="0.8">
                             <animate attributeName="r" values="${dotSize + 6};${dotSize + 10};${dotSize + 6}" dur="1.5s" repeatCount="indefinite"/>
                             <animate attributeName="stroke-opacity" values="0.8;0.4;0.8" dur="1.5s" repeatCount="indefinite"/>
                         </circle>` : ''}
@@ -275,6 +244,24 @@ const ProximityRadar = (function() {
         }).join('');
 
         devicesGroup.innerHTML = dots;
+
+        // Attach event handlers
+        devicesGroup.querySelectorAll('.radar-device').forEach(el => {
+            el.addEventListener('click', (e) => {
+                const deviceKey = el.getAttribute('data-device-key');
+                if (onDeviceClick && deviceKey) {
+                    onDeviceClick(deviceKey);
+                }
+            });
+            el.addEventListener('mouseenter', () => { isHovered = true; });
+            el.addEventListener('mouseleave', () => {
+                isHovered = false;
+                if (renderPending) {
+                    renderPending = false;
+                    renderDevices();
+                }
+            });
+        });
     }
 
     /**
@@ -358,125 +345,19 @@ const ProximityRadar = (function() {
     }
 
     /**
-     * Highlight a specific device on the radar (in-place update, no full re-render)
+     * Highlight a specific device on the radar
      */
     function highlightDevice(deviceKey) {
-        const prev = selectedDeviceKey;
         selectedDeviceKey = deviceKey;
-
-        if (!svg) { return; }
-        const devicesGroup = svg.querySelector('.radar-devices');
-        if (!devicesGroup) { return; }
-
-        // Remove highlight from previously selected node
-        if (prev && prev !== deviceKey) {
-            const oldEl = devicesGroup.querySelector(`.radar-device[data-device-key="${CSS.escape(prev)}"]`);
-            if (oldEl) {
-                oldEl.classList.remove('selected');
-                // Remove animated selection ring
-                const ring = oldEl.querySelector('.radar-select-ring');
-                if (ring) ring.remove();
-                // Restore dot opacity
-                const dot = oldEl.querySelector('circle:not(.radar-device-hitarea):not(.radar-select-ring)');
-                if (dot && dot.getAttribute('fill') !== 'none' && dot.getAttribute('fill') !== 'transparent') {
-                    const device = devices.get(prev);
-                    const confidence = device ? (device.distance_confidence || 0.5) : 0.5;
-                    dot.setAttribute('fill-opacity', 0.4 + confidence * 0.5);
-                    dot.setAttribute('stroke', dot.getAttribute('fill'));
-                    dot.setAttribute('stroke-width', '1');
-                }
-            }
-        }
-
-        // Add highlight to newly selected node
-        if (deviceKey) {
-            const newEl = devicesGroup.querySelector(`.radar-device[data-device-key="${CSS.escape(deviceKey)}"]`);
-            if (newEl) {
-                applySelectionToElement(newEl, deviceKey);
-            } else {
-                // Node not in DOM yet; full render needed on next cycle
         renderDevices();
     }
-        }
-    }
 
     /**
-     * Apply selection styling to a radar device element in-place
+     * Clear device highlighting
-     */
-    function applySelectionToElement(el, deviceKey) {
-        el.classList.add('selected');
-        const device = devices.get(deviceKey);
-        const confidence = device ? (device.distance_confidence || 0.5) : 0.5;
-        const dotSize = CONFIG.dotMinSize + (CONFIG.dotMaxSize - CONFIG.dotMinSize) * confidence;
-
-        // Update dot styling
-        const dot = el.querySelector('circle:not(.radar-device-hitarea):not(.radar-select-ring)');
-        if (dot && dot.getAttribute('fill') !== 'none' && dot.getAttribute('fill') !== 'transparent') {
-            dot.setAttribute('fill-opacity', '1');
-            dot.setAttribute('stroke', '#00d4ff');
-            dot.setAttribute('stroke-width', '2');
-        }
-
-        // Add animated selection ring if not already present
-        if (!el.querySelector('.radar-select-ring')) {
-            const ns = 'http://www.w3.org/2000/svg';
-            const ring = document.createElementNS(ns, 'circle');
-            ring.classList.add('radar-select-ring');
-            ring.setAttribute('r', dotSize + 8);
-            ring.setAttribute('fill', 'none');
-            ring.setAttribute('stroke', '#00d4ff');
-            ring.setAttribute('stroke-width', '2');
-            ring.setAttribute('stroke-opacity', '0.8');
-
-            const animR = document.createElementNS(ns, 'animate');
-            animR.setAttribute('attributeName', 'r');
-            animR.setAttribute('values', `${dotSize + 6};${dotSize + 10};${dotSize + 6}`);
-            animR.setAttribute('dur', '1.5s');
-            animR.setAttribute('repeatCount', 'indefinite');
-            ring.appendChild(animR);
-
-            const animO = document.createElementNS(ns, 'animate');
-            animO.setAttribute('attributeName', 'stroke-opacity');
-            animO.setAttribute('values', '0.8;0.4;0.8');
-            animO.setAttribute('dur', '1.5s');
-            animO.setAttribute('repeatCount', 'indefinite');
-            ring.appendChild(animO);
-
-            // Insert after the hit area
-            const hitArea = el.querySelector('.radar-device-hitarea');
-            if (hitArea && hitArea.nextSibling) {
-                el.insertBefore(ring, hitArea.nextSibling);
-            } else {
-                el.insertBefore(ring, el.firstChild);
-            }
-        }
-    }
-
-    /**
-     * Clear device highlighting (in-place update, no full re-render)
      */
     function clearHighlight() {
-        const prev = selectedDeviceKey;
         selectedDeviceKey = null;
-
+        renderDevices();
-        if (!svg || !prev) { return; }
-        const devicesGroup = svg.querySelector('.radar-devices');
-        if (!devicesGroup) { return; }
-
-        const oldEl = devicesGroup.querySelector(`.radar-device[data-device-key="${CSS.escape(prev)}"]`);
-        if (oldEl) {
-            oldEl.classList.remove('selected');
-            const ring = oldEl.querySelector('.radar-select-ring');
-            if (ring) ring.remove();
-            const dot = oldEl.querySelector('circle:not(.radar-device-hitarea):not(.radar-select-ring)');
-            if (dot && dot.getAttribute('fill') !== 'none' && dot.getAttribute('fill') !== 'transparent') {
-                const device = devices.get(prev);
-                const confidence = device ? (device.distance_confidence || 0.5) : 0.5;
-                dot.setAttribute('fill-opacity', 0.4 + confidence * 0.5);
-                dot.setAttribute('stroke', dot.getAttribute('fill'));
-                dot.setAttribute('stroke-width', '1');
-            }
-        }
     }
 
     /**

static/js/components/signal-cards.js

@@ -302,13 +302,7 @@ const SignalCards = (function() {
      */
     function formatRelativeTime(timestamp) {
         if (!timestamp) return '';
-        let date = new Date(timestamp);
+        const date = new Date(timestamp);
-        // Handle time-only strings like "HH:MM:SS" (from pager/sensor backends)
-        if (isNaN(date.getTime()) && /^\d{1,2}:\d{2}(:\d{2})?$/.test(timestamp)) {
-            const today = new Date();
-            date = new Date(today.toDateString() + ' ' + timestamp);
-        }
-        if (isNaN(date.getTime())) return timestamp;
         const now = new Date();
         const diff = Math.floor((now - date) / 1000);
 

static/js/core/alerts.js

@@ -1,194 +0,0 @@
-const AlertCenter = (function() {
-    'use strict';
-
-    let alerts = [];
-    let rules = [];
-    let eventSource = null;
-
-    const TRACKER_RULE_NAME = 'Tracker Detected';
-
-    function init() {
-        loadRules();
-        loadFeed();
-        connect();
-    }
-
-    function connect() {
-        if (eventSource) {
-            eventSource.close();
-        }
-        eventSource = new EventSource('/alerts/stream');
-        eventSource.onmessage = function(e) {
-            try {
-                const data = JSON.parse(e.data);
-                if (data.type === 'keepalive') return;
-                handleAlert(data);
-            } catch (err) {
-                console.error('[Alerts] SSE parse error', err);
-            }
-        };
-        eventSource.onerror = function() {
-            console.warn('[Alerts] SSE connection error');
-        };
-    }
-
-    function handleAlert(alert) {
-        alerts.unshift(alert);
-        alerts = alerts.slice(0, 50);
-        updateFeedUI();
-
-        if (typeof showNotification === 'function') {
-            const severity = (alert.severity || '').toLowerCase();
-            if (['high', 'critical'].includes(severity)) {
-                showNotification(alert.title || 'Alert', alert.message || 'Alert triggered');
-            }
-        }
-    }
-
-    function updateFeedUI() {
-        const list = document.getElementById('alertsFeedList');
-        const countEl = document.getElementById('alertsFeedCount');
-        if (countEl) countEl.textContent = `(${alerts.length})`;
-        if (!list) return;
-
-        if (alerts.length === 0) {
-            list.innerHTML = '<div class="settings-feed-empty">No alerts yet</div>';
-            return;
-        }
-
-        list.innerHTML = alerts.map(alert => {
-            const title = escapeHtml(alert.title || 'Alert');
-            const message = escapeHtml(alert.message || '');
-            const severity = escapeHtml(alert.severity || 'medium');
-            const createdAt = alert.created_at ? new Date(alert.created_at).toLocaleString() : '';
-            return `
-                <div class="settings-feed-item">
-                    <div class="settings-feed-title">
-                        <span>${title}</span>
-                        <span style="color: var(--text-dim);">${severity.toUpperCase()}</span>
-                    </div>
-                    <div class="settings-feed-meta">${message}</div>
-                    <div class="settings-feed-meta" style="margin-top: 4px;">${createdAt}</div>
-                </div>
-            `;
-        }).join('');
-    }
-
-    function loadFeed() {
-        fetch('/alerts/events?limit=20')
-            .then(r => r.json())
-            .then(data => {
-                if (data.status === 'success') {
-                    alerts = data.events || [];
-                    updateFeedUI();
-                }
-            })
-            .catch(err => console.error('[Alerts] Load feed failed', err));
-    }
-
-    function loadRules() {
-        fetch('/alerts/rules?all=1')
-            .then(r => r.json())
-            .then(data => {
-                if (data.status === 'success') {
-                    rules = data.rules || [];
-                }
-            })
-            .catch(err => console.error('[Alerts] Load rules failed', err));
-    }
-
-    function enableTrackerAlerts() {
-        ensureTrackerRule(true);
-    }
-
-    function disableTrackerAlerts() {
-        ensureTrackerRule(false);
-    }
-
-    function ensureTrackerRule(enabled) {
-        loadRules();
-        setTimeout(() => {
-            const existing = rules.find(r => r.name === TRACKER_RULE_NAME);
-            if (existing) {
-                fetch(`/alerts/rules/${existing.id}`, {
-                    method: 'PATCH',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ enabled })
-                }).then(() => loadRules());
-            } else if (enabled) {
-                fetch('/alerts/rules', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({
-                        name: TRACKER_RULE_NAME,
-                        mode: 'bluetooth',
-                        event_type: 'device_update',
-                        match: { is_tracker: true },
-                        severity: 'high',
-                        enabled: true,
-                        notify: { webhook: true }
-                    })
-                }).then(() => loadRules());
-            }
-        }, 150);
-    }
-
-    function addBluetoothWatchlist(address, name) {
-        if (!address) return;
-        const existing = rules.find(r => r.mode === 'bluetooth' && r.match && r.match.address === address);
-        if (existing) {
-            return;
-        }
-        fetch('/alerts/rules', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({
-                name: name ? `Watchlist ${name}` : `Watchlist ${address}`,
-                mode: 'bluetooth',
-                event_type: 'device_update',
-                match: { address: address },
-                severity: 'medium',
-                enabled: true,
-                notify: { webhook: true }
-            })
-        }).then(() => loadRules());
-    }
-
-    function removeBluetoothWatchlist(address) {
-        if (!address) return;
-        const existing = rules.find(r => r.mode === 'bluetooth' && r.match && r.match.address === address);
-        if (!existing) return;
-        fetch(`/alerts/rules/${existing.id}`, { method: 'DELETE' })
-            .then(() => loadRules());
-    }
-
-    function isWatchlisted(address) {
-        return rules.some(r => r.mode === 'bluetooth' && r.match && r.match.address === address && r.enabled);
-    }
-
-    function escapeHtml(str) {
-        if (!str) return '';
-        return String(str)
-            .replace(/&/g, '&amp;')
-            .replace(/</g, '&lt;')
-            .replace(/>/g, '&gt;')
-            .replace(/"/g, '&quot;')
-            .replace(/'/g, '&#039;');
-    }
-
-    return {
-        init,
-        loadFeed,
-        enableTrackerAlerts,
-        disableTrackerAlerts,
-        addBluetoothWatchlist,
-        removeBluetoothWatchlist,
-        isWatchlisted,
-    };
-})();
-
-document.addEventListener('DOMContentLoaded', () => {
-    if (typeof AlertCenter !== 'undefined') {
-        AlertCenter.init();
-    }
-});

static/js/core/app.js

@@ -488,12 +488,10 @@ function initApp() {
         });
     });
 
-    // Collapse sidebar menu sections by default, but skip headerless utility blocks.
+    // Collapse all sections by default (except SDR Device which is first)
-    document.querySelectorAll('.sidebar .section').forEach((section) => {
+    document.querySelectorAll('.section').forEach((section, index) => {
-        if (section.querySelector('h3')) {
+        if (index > 0) {
             section.classList.add('collapsed');
-        } else {
-            section.classList.remove('collapsed');
         }
     });
 

static/js/core/observer-location.js

@@ -1,9 +1,7 @@
 // Shared observer location helper for map-based modules.
 // Default: shared location enabled unless explicitly disabled via config.
 window.ObserverLocation = (function() {
-    const DEFAULT_LOCATION = (window.INTERCEPT_DEFAULT_LAT && window.INTERCEPT_DEFAULT_LON)
+    const DEFAULT_LOCATION = { lat: 51.5074, lon: -0.1278 };
-        ? { lat: window.INTERCEPT_DEFAULT_LAT, lon: window.INTERCEPT_DEFAULT_LON }
-        : { lat: 51.5074, lon: -0.1278 };
     const SHARED_KEY = 'observerLocation';
     const AIS_KEY = 'ais_observerLocation';
     const LEGACY_LAT_KEY = 'observerLat';
@@ -43,10 +41,6 @@ window.ObserverLocation = (function() {
         return normalize(lat, lon);
     }
 
-    function hasStoredLocation() {
-        return !!(readKey(SHARED_KEY) || readKey(AIS_KEY) || readLegacyLatLon());
-    }
-
     function getShared() {
         const current = readKey(SHARED_KEY);
         if (current) return current;
@@ -99,7 +93,6 @@ window.ObserverLocation = (function() {
 
     return {
         isSharedEnabled,
-        hasStoredLocation,
         getShared,
         setShared,
         getForModule,

static/js/core/recordings.js

@@ -1,136 +0,0 @@
-const RecordingUI = (function() {
-    'use strict';
-
-    let recordings = [];
-    let active = [];
-
-    function init() {
-        refresh();
-    }
-
-    function refresh() {
-        fetch('/recordings')
-            .then(r => r.json())
-            .then(data => {
-                if (data.status !== 'success') return;
-                recordings = data.recordings || [];
-                active = data.active || [];
-                renderActive();
-                renderRecordings();
-            })
-            .catch(err => console.error('[Recording] Load failed', err));
-    }
-
-    function start() {
-        const modeSelect = document.getElementById('recordingModeSelect');
-        const labelInput = document.getElementById('recordingLabelInput');
-        const mode = modeSelect ? modeSelect.value : '';
-        const label = labelInput ? labelInput.value : '';
-        if (!mode) return;
-
-        fetch('/recordings/start', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ mode, label })
-        })
-            .then(r => r.json())
-            .then(() => {
-                refresh();
-            })
-            .catch(err => console.error('[Recording] Start failed', err));
-    }
-
-    function stop() {
-        const modeSelect = document.getElementById('recordingModeSelect');
-        const mode = modeSelect ? modeSelect.value : '';
-        if (!mode) return;
-
-        fetch('/recordings/stop', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ mode })
-        })
-            .then(r => r.json())
-            .then(() => refresh())
-            .catch(err => console.error('[Recording] Stop failed', err));
-    }
-
-    function stopById(sessionId) {
-        fetch('/recordings/stop', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ id: sessionId })
-        }).then(() => refresh());
-    }
-
-    function renderActive() {
-        const container = document.getElementById('recordingActiveList');
-        if (!container) return;
-        if (!active.length) {
-            container.innerHTML = '<div class="settings-feed-empty">No active recordings</div>';
-            return;
-        }
-        container.innerHTML = active.map(session => {
-            return `
-                <div class="settings-feed-item">
-                    <div class="settings-feed-title">
-                        <span>${escapeHtml(session.mode)}</span>
-                        <button class="preset-btn" style="font-size: 9px; padding: 2px 6px;" onclick="RecordingUI.stopById('${session.id}')">Stop</button>
-                    </div>
-                    <div class="settings-feed-meta">Started: ${new Date(session.started_at).toLocaleString()}</div>
-                    <div class="settings-feed-meta">Events: ${session.event_count || 0}</div>
-                </div>
-            `;
-        }).join('');
-    }
-
-    function renderRecordings() {
-        const container = document.getElementById('recordingList');
-        if (!container) return;
-        if (!recordings.length) {
-            container.innerHTML = '<div class="settings-feed-empty">No recordings yet</div>';
-            return;
-        }
-        container.innerHTML = recordings.map(rec => {
-            return `
-                <div class="settings-feed-item">
-                    <div class="settings-feed-title">
-                        <span>${escapeHtml(rec.mode)}${rec.label ? ` • ${escapeHtml(rec.label)}` : ''}</span>
-                        <button class="preset-btn" style="font-size: 9px; padding: 2px 6px;" onclick="RecordingUI.download('${rec.id}')">Download</button>
-                    </div>
-                    <div class="settings-feed-meta">${new Date(rec.started_at).toLocaleString()}${rec.stopped_at ? ` → ${new Date(rec.stopped_at).toLocaleString()}` : ''}</div>
-                    <div class="settings-feed-meta">Events: ${rec.event_count || 0} • ${(rec.size_bytes || 0) / 1024.0 > 0 ? (rec.size_bytes / 1024).toFixed(1) + ' KB' : '0 KB'}</div>
-                </div>
-            `;
-        }).join('');
-    }
-
-    function download(sessionId) {
-        window.open(`/recordings/${sessionId}/download`, '_blank');
-    }
-
-    function escapeHtml(str) {
-        if (!str) return '';
-        return String(str)
-            .replace(/&/g, '&amp;')
-            .replace(/</g, '&lt;')
-            .replace(/>/g, '&gt;')
-            .replace(/"/g, '&quot;')
-            .replace(/'/g, '&#039;');
-    }
-
-    return {
-        init,
-        refresh,
-        start,
-        stop,
-        stopById,
-        download,
-    };
-})();
-
-document.addEventListener('DOMContentLoaded', () => {
-    if (typeof RecordingUI !== 'undefined') {
-        RecordingUI.init();
-    }
-});

static/js/core/settings-manager.js

@@ -922,64 +922,5 @@ function switchSettingsTab(tabName) {
         loadUpdateStatus();
     } else if (tabName === 'location') {
         loadObserverLocation();
-    } else if (tabName === 'alerts') {
-        if (typeof AlertCenter !== 'undefined') {
-            AlertCenter.loadFeed();
-        }
-    } else if (tabName === 'recording') {
-        if (typeof RecordingUI !== 'undefined') {
-            RecordingUI.refresh();
-        }
-    } else if (tabName === 'apikeys') {
-        loadApiKeyStatus();
     }
 }
-
-/**
- * Load API key status into the API Keys settings tab
- */
-function loadApiKeyStatus() {
-    const badge = document.getElementById('apiKeyStatusBadge');
-    const desc = document.getElementById('apiKeyStatusDesc');
-    const usage = document.getElementById('apiKeyUsageCount');
-    const bar = document.getElementById('apiKeyUsageBar');
-
-    if (!badge) return;
-
-    badge.textContent = 'Not available';
-        badge.className = 'asset-badge missing';
-        desc.textContent = 'GSM feature removed';
-}
-
-/**
- * Save API key from the settings input
- */
-function saveApiKey() {
-    const input = document.getElementById('apiKeyInput');
-    const result = document.getElementById('apiKeySaveResult');
-    if (!input || !result) return;
-
-    const key = input.value.trim();
-    if (!key) {
-        result.style.display = 'block';
-        result.style.color = 'var(--accent-red)';
-        result.textContent = 'Please enter an API key.';
-        return;
-    }
-
-    result.style.display = 'block';
-    result.style.color = 'var(--text-dim)';
-    result.textContent = 'Saving...';
-
-    result.style.color = 'var(--accent-red)';
-    result.textContent = 'GSM feature has been removed.';
-}
-
-/**
- * Toggle API key input visibility
- */
-function toggleApiKeyVisibility() {
-    const input = document.getElementById('apiKeyInput');
-    if (!input) return;
-    input.type = input.type === 'password' ? 'text' : 'password';
-}

static/js/modes/bluetooth.js

@@ -356,9 +356,7 @@ const BluetoothMode = (function() {
 
         // Update panel elements
         document.getElementById('btDetailName').textContent = device.name || formatDeviceId(device.address);
-        document.getElementById('btDetailAddress').textContent = isUuidAddress(device)
+        document.getElementById('btDetailAddress').textContent = device.address;
-            ? 'CB: ' + device.address
-            : device.address;
 
         // RSSI
         const rssiEl = document.getElementById('btDetailRssi');
@@ -369,9 +367,6 @@ const BluetoothMode = (function() {
         const badgesEl = document.getElementById('btDetailBadges');
         let badgesHtml = `<span class="bt-detail-badge ${protocol}">${protocol.toUpperCase()}</span>`;
         badgesHtml += `<span class="bt-detail-badge ${device.in_baseline ? 'baseline' : 'new'}">${device.in_baseline ? '✓ KNOWN' : '● NEW'}</span>`;
-        if (device.seen_before) {
-            badgesHtml += `<span class="bt-detail-badge flag">SEEN BEFORE</span>`;
-        }
 
         // Tracker badge
         if (device.is_tracker) {
@@ -460,98 +455,6 @@ const BluetoothMode = (function() {
             ? new Date(device.last_seen).toLocaleTimeString()
             : '--';
 
-        // New stat cells
-        document.getElementById('btDetailTxPower').textContent = device.tx_power != null
-            ? device.tx_power + ' dBm' : '--';
-        document.getElementById('btDetailSeenRate').textContent = device.seen_rate != null
-            ? device.seen_rate.toFixed(1) + '/min' : '--';
-
-        // Stability from variance
-        const stabilityEl = document.getElementById('btDetailStability');
-        if (device.rssi_variance != null) {
-            let stabLabel, stabColor;
-            if (device.rssi_variance <= 5) { stabLabel = 'Stable'; stabColor = '#22c55e'; }
-            else if (device.rssi_variance <= 25) { stabLabel = 'Moderate'; stabColor = '#eab308'; }
-            else { stabLabel = 'Unstable'; stabColor = '#ef4444'; }
-            stabilityEl.textContent = stabLabel;
-            stabilityEl.style.color = stabColor;
-        } else {
-            stabilityEl.textContent = '--';
-            stabilityEl.style.color = '';
-        }
-
-        // Distance with confidence
-        const distEl = document.getElementById('btDetailDistance');
-        if (device.estimated_distance_m != null) {
-            const confPct = Math.round((device.distance_confidence || 0) * 100);
-            distEl.textContent = device.estimated_distance_m.toFixed(1) + 'm ±' + confPct + '%';
-        } else {
-            distEl.textContent = '--';
-        }
-
-        // Appearance badge
-        if (device.appearance_name) {
-            badgesHtml += '<span class="bt-detail-badge flag">' + escapeHtml(device.appearance_name) + '</span>';
-            badgesEl.innerHTML = badgesHtml;
-        }
-
-        // MAC cluster indicator
-        const macClusterEl = document.getElementById('btDetailMacCluster');
-        if (macClusterEl) {
-            if (device.mac_cluster_count > 1) {
-                macClusterEl.textContent = device.mac_cluster_count + ' MACs';
-                macClusterEl.style.display = '';
-            } else {
-                macClusterEl.style.display = 'none';
-            }
-        }
-
-        // Service data inspector
-        const inspectorEl = document.getElementById('btDetailServiceInspector');
-        const inspectorContent = document.getElementById('btInspectorContent');
-        if (inspectorEl && inspectorContent) {
-            const hasData = device.manufacturer_bytes || device.appearance != null ||
-                (device.service_data && Object.keys(device.service_data).length > 0);
-            if (hasData) {
-                inspectorEl.style.display = '';
-                let inspHtml = '';
-                if (device.appearance != null) {
-                    const name = device.appearance_name || '';
-                    inspHtml += '<div class="bt-inspector-row"><span class="bt-inspector-label">Appearance</span><span class="bt-inspector-value">0x' + device.appearance.toString(16).toUpperCase().padStart(4, '0') + (name ? ' (' + escapeHtml(name) + ')' : '') + '</span></div>';
-                }
-                if (device.manufacturer_bytes) {
-                    inspHtml += '<div class="bt-inspector-row"><span class="bt-inspector-label">Mfr Data</span><span class="bt-inspector-value">' + escapeHtml(device.manufacturer_bytes) + '</span></div>';
-                }
-                if (device.service_data) {
-                    Object.entries(device.service_data).forEach(([uuid, hex]) => {
-                        inspHtml += '<div class="bt-inspector-row"><span class="bt-inspector-label">' + escapeHtml(uuid) + '</span><span class="bt-inspector-value">' + escapeHtml(hex) + '</span></div>';
-                    });
-                }
-                inspectorContent.innerHTML = inspHtml;
-            } else {
-                inspectorEl.style.display = 'none';
-            }
-        }
-
-        updateWatchlistButton(device);
-
-        // IRK
-        const irkContainer = document.getElementById('btDetailIrk');
-        if (irkContainer) {
-            if (device.has_irk) {
-                irkContainer.style.display = 'block';
-                const irkVal = document.getElementById('btDetailIrkValue');
-                if (irkVal) {
-                    const label = device.irk_source_name
-                        ? device.irk_source_name + ' — ' + device.irk_hex
-                        : device.irk_hex;
-                    irkVal.textContent = label;
-                }
-            } else {
-                irkContainer.style.display = 'none';
-            }
-        }
-
         // Services
         const servicesContainer = document.getElementById('btDetailServices');
         const servicesList = document.getElementById('btDetailServicesList');
@@ -570,22 +473,6 @@ const BluetoothMode = (function() {
         highlightSelectedDevice(deviceId);
     }
 
-    /**
-     * Update watchlist button state
-     */
-    function updateWatchlistButton(device) {
-        const btn = document.getElementById('btDetailWatchBtn');
-        if (!btn) return;
-        if (typeof AlertCenter === 'undefined') {
-            btn.style.display = 'none';
-            return;
-        }
-        btn.style.display = '';
-        const watchlisted = AlertCenter.isWatchlisted(device.address);
-        btn.textContent = watchlisted ? 'Watching' : 'Watchlist';
-        btn.classList.toggle('active', watchlisted);
-    }
-
     /**
      * Clear device selection
      */
@@ -644,7 +531,7 @@ const BluetoothMode = (function() {
         if (!device) return;
 
         navigator.clipboard.writeText(device.address).then(() => {
-            const btn = document.getElementById('btDetailCopyBtn');
+            const btn = document.querySelector('.bt-detail-btn');
             if (btn) {
                 const originalText = btn.textContent;
                 btn.textContent = 'Copied!';
@@ -657,25 +544,6 @@ const BluetoothMode = (function() {
         });
     }
 
-    /**
-     * Toggle Bluetooth watchlist for selected device
-     */
-    function toggleWatchlist() {
-        if (!selectedDeviceId) return;
-        const device = devices.get(selectedDeviceId);
-        if (!device || typeof AlertCenter === 'undefined') return;
-
-        if (AlertCenter.isWatchlisted(device.address)) {
-            AlertCenter.removeBluetoothWatchlist(device.address);
-            showInfo('Removed from watchlist');
-        } else {
-            AlertCenter.addBluetoothWatchlist(device.address, device.name || device.address);
-            showInfo('Added to watchlist');
-        }
-
-        setTimeout(() => updateWatchlistButton(device), 200);
-    }
-
     /**
      * Select a device - opens modal with details
      */
@@ -692,25 +560,9 @@ const BluetoothMode = (function() {
         if (parts.length === 6) {
             return parts[0] + ':' + parts[1] + ':...:' + parts[4] + ':' + parts[5];
         }
-        // CoreBluetooth UUID format (8-4-4-4-12)
-        if (/^[0-9A-F]{8}-[0-9A-F]{4}-/i.test(address)) {
-            return address.substring(0, 8) + '...';
-        }
         return address;
     }
 
-    function isUuidAddress(device) {
-        return device.address_type === 'uuid';
-    }
-
-    function formatAddress(device) {
-        if (!device || !device.address) return '--';
-        if (isUuidAddress(device)) {
-            return device.address.substring(0, 8) + '-...' + device.address.slice(-4);
-        }
-        return device.address;
-    }
-
     /**
      * Check system capabilities
      */
@@ -768,12 +620,6 @@ const BluetoothMode = (function() {
                 hideCapabilityWarning();
             }
 
-            // Show/hide Ubertooth option based on capabilities
-            const ubertoothOption = document.getElementById('btScanModeUbertooth');
-            if (ubertoothOption) {
-                ubertoothOption.style.display = data.has_ubertooth ? '' : 'none';
-            }
-
             if (scanModeSelect && data.preferred_backend) {
                 const option = scanModeSelect.querySelector(`option[value="${data.preferred_backend}"]`);
                 if (option) option.selected = true;
@@ -1199,7 +1045,7 @@ const BluetoothMode = (function() {
                             '</div>' +
                         '</div>' +
                         '<div style="display:flex;justify-content:space-between;margin-top:3px;">' +
-                            '<span style="font-size:9px;color:#888;font-family:monospace;">' + (t.address_type === 'uuid' ? formatAddress(t) : t.address) + '</span>' +
+                            '<span style="font-size:9px;color:#888;font-family:monospace;">' + t.address + '</span>' +
                             '<span style="font-size:9px;color:#666;">Seen ' + (t.seen_count || 0) + 'x</span>' +
                         '</div>' +
                         evidenceHtml +
@@ -1248,7 +1094,6 @@ const BluetoothMode = (function() {
         const trackerConfidence = device.tracker_confidence;
         const riskScore = device.risk_score || 0;
         const agentName = device._agent || 'Local';
-        const seenBefore = device.seen_before === true;
 
         // Calculate RSSI bar width (0-100%)
         // RSSI typically ranges from -100 (weak) to -30 (very strong)
@@ -1256,7 +1101,7 @@ const BluetoothMode = (function() {
 
         const displayName = device.name || formatDeviceId(device.address);
         const name = escapeHtml(displayName);
-        const addr = escapeHtml(isUuidAddress(device) ? formatAddress(device) : (device.address || 'Unknown'));
+        const addr = escapeHtml(device.address || 'Unknown');
         const mfr = device.manufacturer_name ? escapeHtml(device.manufacturer_name) : '';
         const seenCount = device.seen_count || 0;
         const deviceIdEscaped = escapeHtml(device.device_id).replace(/'/g, "\\'");
@@ -1281,12 +1126,6 @@ const BluetoothMode = (function() {
             trackerBadge = '<span class="bt-tracker-badge" style="background:' + confBg + ';color:' + confColor + ';font-size:9px;padding:1px 4px;border-radius:3px;margin-left:4px;font-weight:600;">' + typeLabel + '</span>';
         }
 
-        // IRK badge - show if paired IRK is available
-        let irkBadge = '';
-        if (device.has_irk) {
-            irkBadge = '<span class="bt-irk-badge">IRK</span>';
-        }
-
         // Risk badge - show if risk score is significant
         let riskBadge = '';
         if (riskScore >= 0.3) {
@@ -1304,38 +1143,10 @@ const BluetoothMode = (function() {
             statusDot = '<span class="bt-status-dot known"></span>';
         }
 
-        // Distance display
-        const distM = device.estimated_distance_m;
-        let distStr = '';
-        if (distM != null) {
-            distStr = '~' + distM.toFixed(1) + 'm';
-        }
-
-        // Behavioral flag badges
-        const hFlags = device.heuristic_flags || [];
-        let flagBadges = '';
-        if (device.is_persistent || hFlags.includes('persistent')) {
-            flagBadges += '<span class="bt-flag-badge persistent">PERSIST</span>';
-        }
-        if (device.is_beacon_like || hFlags.includes('beacon_like')) {
-            flagBadges += '<span class="bt-flag-badge beacon-like">BEACON</span>';
-        }
-        if (device.is_strong_stable || hFlags.includes('strong_stable')) {
-            flagBadges += '<span class="bt-flag-badge strong-stable">STABLE</span>';
-        }
-
-        // MAC cluster badge
-        let clusterBadge = '';
-        if (device.mac_cluster_count > 1) {
-            clusterBadge = '<span class="bt-mac-cluster-badge">' + device.mac_cluster_count + ' MACs</span>';
-        }
-
         // Build secondary info line
         let secondaryParts = [addr];
         if (mfr) secondaryParts.push(mfr);
-        if (distStr) secondaryParts.push(distStr);
         secondaryParts.push('Seen ' + seenCount + '×');
-        if (seenBefore) secondaryParts.push('<span class="bt-history-badge">SEEN BEFORE</span>');
         // Add agent name if not Local
         if (agentName !== 'Local') {
             secondaryParts.push('<span class="agent-badge agent-remote" style="font-size:8px;padding:1px 4px;">' + escapeHtml(agentName) + '</span>');
@@ -1352,10 +1163,7 @@ const BluetoothMode = (function() {
                     protoBadge +
                     '<span class="bt-device-name">' + name + '</span>' +
                     trackerBadge +
-                    irkBadge +
                     riskBadge +
-                    flagBadges +
-                    clusterBadge +
                 '</div>' +
                 '<div class="bt-row-right">' +
                     '<div class="bt-rssi-container">' +
@@ -1366,11 +1174,6 @@ const BluetoothMode = (function() {
                 '</div>' +
             '</div>' +
             '<div class="bt-row-secondary">' + secondaryInfo + '</div>' +
-            '<div class="bt-row-actions">' +
-                '<button class="bt-locate-btn" data-locate-id="' + escapeHtml(device.device_id) + '" onclick="event.stopPropagation(); BluetoothMode.locateById(this.dataset.locateId)">' +
-                    '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="10" r="3"/><path d="M12 21.7C17.3 17 20 13 20 10a8 8 0 1 0-16 0c0 3 2.7 7 8 11.7z"/></svg>' +
-                    'Locate</button>' +
-            '</div>' +
         '</div>';
     }
 
@@ -1450,18 +1253,6 @@ const BluetoothMode = (function() {
         }
     }
 
-    /**
-     * Toggle the service data inspector panel
-     */
-    function toggleServiceInspector() {
-        const content = document.getElementById('btInspectorContent');
-        const arrow = document.getElementById('btInspectorArrow');
-        if (!content) return;
-        const open = content.style.display === 'none';
-        content.style.display = open ? '' : 'none';
-        if (arrow) arrow.classList.toggle('open', open);
-    }
-
     // ==========================================================================
     // Agent Handling
     // ==========================================================================
@@ -1558,48 +1349,6 @@ const BluetoothMode = (function() {
         updateRadar();
     }
 
-    /**
-     * Hand off a device to BT Locate mode by device_id lookup.
-     */
-    function locateById(deviceId) {
-        console.log('[BT] locateById called with:', deviceId);
-        const device = devices.get(deviceId);
-        if (!device) {
-            console.warn('[BT] Device not found in map for id:', deviceId);
-            return;
-        }
-        doLocateHandoff(device);
-    }
-
-    /**
-     * Hand off the currently selected device to BT Locate mode.
-     */
-    function locateDevice() {
-        if (!selectedDeviceId) return;
-        const device = devices.get(selectedDeviceId);
-        if (!device) return;
-        doLocateHandoff(device);
-    }
-
-    function doLocateHandoff(device) {
-        console.log('[BT] doLocateHandoff, BtLocate defined:', typeof BtLocate !== 'undefined');
-        if (typeof BtLocate !== 'undefined') {
-            BtLocate.handoff({
-                device_id: device.device_id,
-                mac_address: device.address,
-                address_type: device.address_type || null,
-                irk_hex: device.irk_hex || null,
-                known_name: device.name || null,
-                known_manufacturer: device.manufacturer_name || null,
-                last_known_rssi: device.rssi_current,
-                tx_power: device.tx_power || null,
-                appearance_name: device.appearance_name || null,
-                fingerprint_id: device.fingerprint_id || null,
-                mac_cluster_count: device.mac_cluster_count || 0
-            });
-        }
-    }
-
     // Public API
     return {
         init,
@@ -1612,10 +1361,6 @@ const BluetoothMode = (function() {
         selectDevice,
         clearSelection,
         copyAddress,
-        toggleWatchlist,
-        locateDevice,
-        locateById,
-        toggleServiceInspector,
 
         // Agent handling
         handleAgentChange,

static/js/modes/bt_locate.js

@@ -1,749 +0,0 @@
-/**
- * BT Locate — Bluetooth SAR Device Location Mode
- * GPS-tagged signal trail mapping with proximity audio alerts.
- */
-const BtLocate = (function() {
-    'use strict';
-
-    let eventSource = null;
-    let map = null;
-    let mapMarkers = [];
-    let trailLine = null;
-    let rssiHistory = [];
-    const MAX_RSSI_POINTS = 60;
-    let chartCanvas = null;
-    let chartCtx = null;
-    let currentEnvironment = 'OUTDOOR';
-    let audioCtx = null;
-    let audioEnabled = false;
-    let beepTimer = null;
-    let initialized = false;
-    let handoffData = null;
-    let pollTimer = null;
-    let durationTimer = null;
-    let sessionStartedAt = null;
-    let lastDetectionCount = 0;
-
-    function init() {
-        if (initialized) {
-            // Re-invalidate map on re-entry and ensure tiles are present
-            if (map) {
-                setTimeout(() => {
-                    map.invalidateSize();
-                    // Re-apply user's tile layer if tiles were lost
-                    let hasTiles = false;
-                    map.eachLayer(layer => {
-                        if (layer instanceof L.TileLayer) hasTiles = true;
-                    });
-                    if (!hasTiles && typeof Settings !== 'undefined' && Settings.createTileLayer) {
-                        Settings.createTileLayer().addTo(map);
-                    }
-                }, 150);
-            }
-            checkStatus();
-            return;
-        }
-
-        // Init map
-        const mapEl = document.getElementById('btLocateMap');
-        if (mapEl && typeof L !== 'undefined') {
-            map = L.map('btLocateMap', {
-                center: [0, 0],
-                zoom: 2,
-                zoomControl: true,
-            });
-            // Use tile provider from user settings
-            if (typeof Settings !== 'undefined' && Settings.createTileLayer) {
-                Settings.createTileLayer().addTo(map);
-                Settings.registerMap(map);
-            } else {
-                L.tileLayer('https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png', {
-                    maxZoom: 19,
-                    attribution: '© OSM © CARTO'
-                }).addTo(map);
-            }
-            setTimeout(() => map.invalidateSize(), 100);
-        }
-
-        // Init RSSI chart canvas
-        chartCanvas = document.getElementById('btLocateRssiChart');
-        if (chartCanvas) {
-            chartCtx = chartCanvas.getContext('2d');
-        }
-
-        checkStatus();
-        initialized = true;
-    }
-
-    function checkStatus() {
-        fetch('/bt_locate/status')
-            .then(r => r.json())
-            .then(data => {
-                if (data.active) {
-                    sessionStartedAt = data.started_at ? new Date(data.started_at).getTime() : Date.now();
-                    showActiveUI();
-                    updateScanStatus(data);
-                    if (!eventSource) connectSSE();
-                    // Restore trail from server
-                    fetch('/bt_locate/trail')
-                        .then(r => r.json())
-                        .then(trail => {
-                            if (trail.gps_trail) {
-                                trail.gps_trail.forEach(p => addMapMarker(p));
-                            }
-                            updateStats(data.detection_count, data.gps_trail_count);
-                        });
-                }
-            })
-            .catch(() => {});
-    }
-
-    function start() {
-        const mac = document.getElementById('btLocateMac')?.value.trim();
-        const namePattern = document.getElementById('btLocateNamePattern')?.value.trim();
-        const irk = document.getElementById('btLocateIrk')?.value.trim();
-
-        const body = { environment: currentEnvironment };
-        if (mac) body.mac_address = mac;
-        if (namePattern) body.name_pattern = namePattern;
-        if (irk) body.irk_hex = irk;
-        if (handoffData?.device_id) body.device_id = handoffData.device_id;
-        if (handoffData?.known_name) body.known_name = handoffData.known_name;
-        if (handoffData?.known_manufacturer) body.known_manufacturer = handoffData.known_manufacturer;
-        if (handoffData?.last_known_rssi) body.last_known_rssi = handoffData.last_known_rssi;
-
-        // Include user location as fallback when GPS unavailable
-        const userLat = localStorage.getItem('observerLat');
-        const userLon = localStorage.getItem('observerLon');
-        if (userLat && userLon) {
-            body.fallback_lat = parseFloat(userLat);
-            body.fallback_lon = parseFloat(userLon);
-        }
-
-        console.log('[BtLocate] Starting with body:', body);
-
-        if (!body.mac_address && !body.name_pattern && !body.irk_hex && !body.device_id) {
-            alert('Please provide at least a MAC address, name pattern, IRK, or use hand-off from Bluetooth mode.');
-            return;
-        }
-
-        fetch('/bt_locate/start', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(body),
-        })
-            .then(r => r.json())
-            .then(data => {
-                if (data.status === 'started') {
-                    sessionStartedAt = data.session?.started_at ? new Date(data.session.started_at).getTime() : Date.now();
-                    showActiveUI();
-                    connectSSE();
-                    rssiHistory = [];
-                    updateScanStatus(data.session);
-                    // Restore any existing trail (e.g. from a stop/start cycle)
-                    restoreTrail();
-                }
-            })
-            .catch(err => console.error('[BtLocate] Start error:', err));
-    }
-
-    function stop() {
-        fetch('/bt_locate/stop', { method: 'POST' })
-            .then(r => r.json())
-            .then(() => {
-                showIdleUI();
-                disconnectSSE();
-                stopAudio();
-            })
-            .catch(err => console.error('[BtLocate] Stop error:', err));
-    }
-
-    function showActiveUI() {
-        const startBtn = document.getElementById('btLocateStartBtn');
-        const stopBtn = document.getElementById('btLocateStopBtn');
-        if (startBtn) startBtn.style.display = 'none';
-        if (stopBtn) stopBtn.style.display = 'inline-block';
-        show('btLocateHud');
-    }
-
-    function showIdleUI() {
-        const startBtn = document.getElementById('btLocateStartBtn');
-        const stopBtn = document.getElementById('btLocateStopBtn');
-        if (startBtn) startBtn.style.display = 'inline-block';
-        if (stopBtn) stopBtn.style.display = 'none';
-        hide('btLocateHud');
-        hide('btLocateScanStatus');
-    }
-
-    function updateScanStatus(statusData) {
-        const el = document.getElementById('btLocateScanStatus');
-        const dot = document.getElementById('btLocateScanDot');
-        const text = document.getElementById('btLocateScanText');
-        if (!el) return;
-
-        el.style.display = '';
-        if (statusData && statusData.scanner_running) {
-            if (dot) dot.style.background = '#22c55e';
-            if (text) text.textContent = 'BT scanner active';
-        } else {
-            if (dot) dot.style.background = '#f97316';
-            if (text) text.textContent = 'BT scanner not running — waiting...';
-        }
-    }
-
-    function show(id) { const el = document.getElementById(id); if (el) el.style.display = ''; }
-    function hide(id) { const el = document.getElementById(id); if (el) el.style.display = 'none'; }
-
-    function connectSSE() {
-        if (eventSource) eventSource.close();
-        console.log('[BtLocate] Connecting SSE stream');
-        eventSource = new EventSource('/bt_locate/stream');
-
-        eventSource.addEventListener('detection', function(e) {
-            try {
-                const event = JSON.parse(e.data);
-                console.log('[BtLocate] Detection event:', event);
-                handleDetection(event);
-            } catch (err) {
-                console.error('[BtLocate] Parse error:', err);
-            }
-        });
-
-        eventSource.addEventListener('session_ended', function() {
-            showIdleUI();
-            disconnectSSE();
-        });
-
-        eventSource.onerror = function() {
-            console.warn('[BtLocate] SSE error, polling fallback active');
-        };
-
-        // Start polling fallback (catches data even if SSE fails)
-        startPolling();
-    }
-
-    function disconnectSSE() {
-        if (eventSource) {
-            eventSource.close();
-            eventSource = null;
-        }
-        stopPolling();
-    }
-
-    function startPolling() {
-        stopPolling();
-        lastDetectionCount = 0;
-        pollTimer = setInterval(pollStatus, 3000);
-        startDurationTimer();
-    }
-
-    function stopPolling() {
-        if (pollTimer) {
-            clearInterval(pollTimer);
-            pollTimer = null;
-        }
-        stopDurationTimer();
-    }
-
-    function startDurationTimer() {
-        stopDurationTimer();
-        durationTimer = setInterval(updateDuration, 1000);
-    }
-
-    function stopDurationTimer() {
-        if (durationTimer) {
-            clearInterval(durationTimer);
-            durationTimer = null;
-        }
-    }
-
-    function updateDuration() {
-        if (!sessionStartedAt) return;
-        const elapsed = Math.round((Date.now() - sessionStartedAt) / 1000);
-        const mins = Math.floor(elapsed / 60);
-        const secs = elapsed % 60;
-        const timeEl = document.getElementById('btLocateSessionTime');
-        if (timeEl) timeEl.textContent = mins + ':' + String(secs).padStart(2, '0');
-    }
-
-    function pollStatus() {
-        fetch('/bt_locate/status')
-            .then(r => r.json())
-            .then(data => {
-                if (!data.active) {
-                    showIdleUI();
-                    disconnectSSE();
-                    return;
-                }
-
-                updateScanStatus(data);
-                updateHudInfo(data);
-
-                // Show diagnostics
-                const diagEl = document.getElementById('btLocateDiag');
-                if (diagEl) {
-                    let diag = 'Polls: ' + (data.poll_count || 0) +
-                        (data.poll_thread_alive === false ? ' DEAD' : '') +
-                        ' | Scan: ' + (data.scanner_running ? 'Y' : 'N') +
-                        ' | Devices: ' + (data.scanner_device_count || 0) +
-                        ' | Det: ' + (data.detection_count || 0);
-                    // Show debug device sample if no detections
-                    if (data.detection_count === 0 && data.debug_devices && data.debug_devices.length > 0) {
-                        const matched = data.debug_devices.filter(d => d.match);
-                        const sample = data.debug_devices.slice(0, 3).map(d =>
-                            (d.name || '?') + '|' + (d.id || '').substring(0, 12) + ':' + (d.match ? 'Y' : 'N')
-                        ).join(', ');
-                        diag += ' | Match:' + matched.length + '/' + data.debug_devices.length + ' [' + sample + ']';
-                    }
-                    diagEl.textContent = diag;
-                }
-
-                // If detection count increased, fetch new trail points
-                if (data.detection_count > lastDetectionCount) {
-                    lastDetectionCount = data.detection_count;
-                    fetch('/bt_locate/trail')
-                        .then(r => r.json())
-                        .then(trail => {
-                            if (trail.trail && trail.trail.length > 0) {
-                                const latest = trail.trail[trail.trail.length - 1];
-                                handleDetection({ data: latest });
-                            }
-                            updateStats(data.detection_count, data.gps_trail_count);
-                        });
-                }
-            })
-            .catch(() => {});
-    }
-
-    function updateHudInfo(data) {
-        // Target info
-        const targetEl = document.getElementById('btLocateTargetInfo');
-        if (targetEl && data.target) {
-            const t = data.target;
-            const name = t.known_name || t.name_pattern || '';
-            const addr = t.mac_address || t.device_id || '';
-            const addrDisplay = formatAddr(addr);
-            targetEl.textContent = name ? (name + (addrDisplay ? ' (' + addrDisplay + ')' : '')) : addrDisplay || '--';
-        }
-
-        // Environment info
-        const envEl = document.getElementById('btLocateEnvInfo');
-        if (envEl) {
-            const envNames = { FREE_SPACE: 'Open Field', OUTDOOR: 'Outdoor', INDOOR: 'Indoor', CUSTOM: 'Custom' };
-            envEl.textContent = (envNames[data.environment] || data.environment) + ' n=' + (data.path_loss_exponent || '?');
-        }
-
-        // GPS status
-        const gpsEl = document.getElementById('btLocateGpsStatus');
-        if (gpsEl) {
-            const src = data.gps_source || 'none';
-            if (src === 'live') gpsEl.textContent = 'GPS: Live';
-            else if (src === 'manual') gpsEl.textContent = 'GPS: Manual';
-            else gpsEl.textContent = 'GPS: None';
-        }
-
-        // Last seen
-        const lastEl = document.getElementById('btLocateLastSeen');
-        if (lastEl) {
-            if (data.last_detection) {
-                const ago = Math.round((Date.now() - new Date(data.last_detection).getTime()) / 1000);
-                lastEl.textContent = 'Last: ' + (ago < 60 ? ago + 's ago' : Math.floor(ago / 60) + 'm ago');
-            } else {
-                lastEl.textContent = 'Last: --';
-            }
-        }
-
-        // Session start time (duration handled by 1s timer)
-        if (data.started_at && !sessionStartedAt) {
-            sessionStartedAt = new Date(data.started_at).getTime();
-        }
-    }
-
-    function handleDetection(event) {
-        const d = event.data;
-        if (!d) return;
-
-        // Update proximity UI
-        const bandEl = document.getElementById('btLocateBand');
-        const distEl = document.getElementById('btLocateDistance');
-        const rssiEl = document.getElementById('btLocateRssi');
-        const rssiEmaEl = document.getElementById('btLocateRssiEma');
-
-        if (bandEl) {
-            bandEl.textContent = d.proximity_band;
-            bandEl.className = 'btl-hud-band ' + d.proximity_band.toLowerCase();
-        }
-        if (distEl) distEl.textContent = d.estimated_distance.toFixed(1);
-        if (rssiEl) rssiEl.textContent = d.rssi;
-        if (rssiEmaEl) rssiEmaEl.textContent = d.rssi_ema.toFixed(1);
-
-        // RSSI sparkline
-        rssiHistory.push(d.rssi);
-        if (rssiHistory.length > MAX_RSSI_POINTS) rssiHistory.shift();
-        drawRssiChart();
-
-        // Map marker
-        if (d.lat != null && d.lon != null) {
-            addMapMarker(d);
-        }
-
-        // Update stats
-        const detCountEl = document.getElementById('btLocateDetectionCount');
-        const gpsCountEl = document.getElementById('btLocateGpsCount');
-        if (detCountEl) {
-            const cur = parseInt(detCountEl.textContent) || 0;
-            detCountEl.textContent = cur + 1;
-        }
-        if (gpsCountEl && d.lat != null) {
-            const cur = parseInt(gpsCountEl.textContent) || 0;
-            gpsCountEl.textContent = cur + 1;
-        }
-
-        // Audio
-        if (audioEnabled) playProximityTone(d.rssi);
-    }
-
-    function updateStats(detections, gpsPoints) {
-        const detCountEl = document.getElementById('btLocateDetectionCount');
-        const gpsCountEl = document.getElementById('btLocateGpsCount');
-        if (detCountEl) detCountEl.textContent = detections || 0;
-        if (gpsCountEl) gpsCountEl.textContent = gpsPoints || 0;
-    }
-
-    function addMapMarker(point) {
-        if (!map || point.lat == null || point.lon == null) return;
-
-        const band = (point.proximity_band || 'FAR').toLowerCase();
-        const colors = { immediate: '#ef4444', near: '#f97316', far: '#eab308' };
-        const sizes = { immediate: 8, near: 6, far: 5 };
-        const color = colors[band] || '#eab308';
-        const radius = sizes[band] || 5;
-
-        const marker = L.circleMarker([point.lat, point.lon], {
-            radius: radius,
-            fillColor: color,
-            color: '#fff',
-            weight: 1,
-            opacity: 0.9,
-            fillOpacity: 0.8,
-        }).addTo(map);
-
-        marker.bindPopup(
-            '<div style="font-family:monospace;font-size:11px;">' +
-            '<b>' + point.proximity_band + '</b><br>' +
-            'RSSI: ' + point.rssi + ' dBm<br>' +
-            'Distance: ~' + point.estimated_distance.toFixed(1) + ' m<br>' +
-            'Time: ' + new Date(point.timestamp).toLocaleTimeString() +
-            '</div>'
-        );
-
-        mapMarkers.push(marker);
-        map.panTo([point.lat, point.lon]);
-
-        // Update trail line
-        const latlngs = mapMarkers.map(m => m.getLatLng());
-        if (trailLine) {
-            trailLine.setLatLngs(latlngs);
-        } else if (latlngs.length >= 2) {
-            trailLine = L.polyline(latlngs, {
-                color: 'rgba(0,255,136,0.5)',
-                weight: 2,
-                dashArray: '4 4',
-            }).addTo(map);
-        }
-    }
-
-    function restoreTrail() {
-        fetch('/bt_locate/trail')
-            .then(r => r.json())
-            .then(trail => {
-                if (trail.gps_trail && trail.gps_trail.length > 0) {
-                    clearMapMarkers();
-                    trail.gps_trail.forEach(p => addMapMarker(p));
-                }
-                if (trail.trail && trail.trail.length > 0) {
-                    // Restore RSSI history from trail
-                    rssiHistory = trail.trail.map(p => p.rssi).slice(-MAX_RSSI_POINTS);
-                    drawRssiChart();
-                    // Update HUD with latest detection
-                    const latest = trail.trail[trail.trail.length - 1];
-                    handleDetection({ data: latest });
-                }
-            })
-            .catch(() => {});
-    }
-
-    function clearMapMarkers() {
-        mapMarkers.forEach(m => map?.removeLayer(m));
-        mapMarkers = [];
-        if (trailLine) {
-            map?.removeLayer(trailLine);
-            trailLine = null;
-        }
-    }
-
-    function drawRssiChart() {
-        if (!chartCtx || !chartCanvas) return;
-
-        const w = chartCanvas.width = chartCanvas.parentElement.clientWidth - 16;
-        const h = chartCanvas.height = chartCanvas.parentElement.clientHeight - 24;
-        chartCtx.clearRect(0, 0, w, h);
-
-        if (rssiHistory.length < 2) return;
-
-        // RSSI range: -100 to -20
-        const minR = -100, maxR = -20;
-        const range = maxR - minR;
-
-        // Grid lines
-        chartCtx.strokeStyle = 'rgba(255,255,255,0.05)';
-        chartCtx.lineWidth = 1;
-        [-30, -50, -70, -90].forEach(v => {
-            const y = h - ((v - minR) / range) * h;
-            chartCtx.beginPath();
-            chartCtx.moveTo(0, y);
-            chartCtx.lineTo(w, y);
-            chartCtx.stroke();
-        });
-
-        // Draw RSSI line
-        const step = w / (MAX_RSSI_POINTS - 1);
-        chartCtx.beginPath();
-        chartCtx.strokeStyle = '#00ff88';
-        chartCtx.lineWidth = 2;
-
-        rssiHistory.forEach((rssi, i) => {
-            const x = i * step;
-            const y = h - ((rssi - minR) / range) * h;
-            if (i === 0) chartCtx.moveTo(x, y);
-            else chartCtx.lineTo(x, y);
-        });
-        chartCtx.stroke();
-
-        // Fill under
-        const lastIdx = rssiHistory.length - 1;
-        chartCtx.lineTo(lastIdx * step, h);
-        chartCtx.lineTo(0, h);
-        chartCtx.closePath();
-        chartCtx.fillStyle = 'rgba(0,255,136,0.08)';
-        chartCtx.fill();
-    }
-
-    // Audio proximity tone (Web Audio API)
-    function playTone(freq, duration) {
-        if (!audioCtx || audioCtx.state !== 'running') return;
-        const osc = audioCtx.createOscillator();
-        const gain = audioCtx.createGain();
-        osc.connect(gain);
-        gain.connect(audioCtx.destination);
-        osc.frequency.value = freq;
-        osc.type = 'sine';
-        gain.gain.value = 0.2;
-        gain.gain.exponentialRampToValueAtTime(0.001, audioCtx.currentTime + duration);
-        osc.start();
-        osc.stop(audioCtx.currentTime + duration);
-    }
-
-    function playProximityTone(rssi) {
-        if (!audioCtx || audioCtx.state !== 'running') return;
-        // Stronger signal = higher pitch and shorter beep
-        const strength = Math.max(0, Math.min(1, (rssi + 100) / 70));
-        const freq = 400 + strength * 800;  // 400-1200 Hz
-        const duration = 0.06 + (1 - strength) * 0.12;
-        playTone(freq, duration);
-    }
-
-    function toggleAudio() {
-        const cb = document.getElementById('btLocateAudioEnable');
-        audioEnabled = cb?.checked || false;
-        if (audioEnabled) {
-            // Create AudioContext on user gesture (required by browser policy)
-            if (!audioCtx) {
-                try {
-                    audioCtx = new (window.AudioContext || window.webkitAudioContext)();
-                } catch (e) {
-                    console.error('[BtLocate] AudioContext creation failed:', e);
-                    return;
-                }
-            }
-            // Resume must happen within a user gesture handler
-            const ctx = audioCtx;
-            ctx.resume().then(() => {
-                console.log('[BtLocate] AudioContext state:', ctx.state);
-                // Confirmation beep so user knows audio is working
-                playTone(600, 0.08);
-            });
-        } else {
-            stopAudio();
-        }
-    }
-
-    function stopAudio() {
-        audioEnabled = false;
-        const cb = document.getElementById('btLocateAudioEnable');
-        if (cb) cb.checked = false;
-    }
-
-    function setEnvironment(env) {
-        currentEnvironment = env;
-        document.querySelectorAll('.btl-env-btn').forEach(btn => {
-            btn.classList.toggle('active', btn.dataset.env === env);
-        });
-        // Push to running session if active
-        fetch('/bt_locate/status').then(r => r.json()).then(data => {
-            if (data.active) {
-                fetch('/bt_locate/environment', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ environment: env }),
-                }).then(r => r.json()).then(res => {
-                    console.log('[BtLocate] Environment updated:', res);
-                });
-            }
-        }).catch(() => {});
-    }
-
-    function isUuid(addr) {
-        return addr && /^[0-9A-F]{8}-[0-9A-F]{4}-/i.test(addr);
-    }
-
-    function formatAddr(addr) {
-        if (!addr) return '';
-        if (isUuid(addr)) return addr.substring(0, 8) + '-...' + addr.slice(-4);
-        return addr;
-    }
-
-    function handoff(deviceInfo) {
-        console.log('[BtLocate] Handoff received:', deviceInfo);
-        handoffData = deviceInfo;
-
-        // Populate fields
-        if (deviceInfo.mac_address) {
-            const macInput = document.getElementById('btLocateMac');
-            if (macInput) macInput.value = deviceInfo.mac_address;
-        }
-
-        // Show handoff card
-        const card = document.getElementById('btLocateHandoffCard');
-        const nameEl = document.getElementById('btLocateHandoffName');
-        const metaEl = document.getElementById('btLocateHandoffMeta');
-        if (card) card.style.display = '';
-        if (nameEl) nameEl.textContent = deviceInfo.known_name || formatAddr(deviceInfo.mac_address) || 'Unknown';
-        if (metaEl) {
-            const parts = [];
-            if (deviceInfo.mac_address) parts.push(formatAddr(deviceInfo.mac_address));
-            if (deviceInfo.known_manufacturer) parts.push(deviceInfo.known_manufacturer);
-            if (deviceInfo.last_known_rssi != null) parts.push(deviceInfo.last_known_rssi + ' dBm');
-            metaEl.textContent = parts.join(' \u00b7 ');
-        }
-
-        // Auto-fill IRK if available from scanner
-        if (deviceInfo.irk_hex) {
-            const irkInput = document.getElementById('btLocateIrk');
-            if (irkInput) irkInput.value = deviceInfo.irk_hex;
-        }
-
-        // Switch to bt_locate mode
-        if (typeof switchMode === 'function') {
-            switchMode('bt_locate');
-        }
-    }
-
-    function clearHandoff() {
-        handoffData = null;
-        const card = document.getElementById('btLocateHandoffCard');
-        if (card) card.style.display = 'none';
-    }
-
-    function fetchPairedIrks() {
-        const picker = document.getElementById('btLocateIrkPicker');
-        const status = document.getElementById('btLocateIrkPickerStatus');
-        const list = document.getElementById('btLocateIrkPickerList');
-        const btn = document.getElementById('btLocateDetectIrkBtn');
-        if (!picker || !status || !list) return;
-
-        // Toggle off if already visible
-        if (picker.style.display !== 'none') {
-            picker.style.display = 'none';
-            return;
-        }
-
-        picker.style.display = '';
-        list.innerHTML = '';
-        status.textContent = 'Scanning paired devices...';
-        status.style.display = '';
-        if (btn) btn.disabled = true;
-
-        fetch('/bt_locate/paired_irks')
-            .then(r => r.json())
-            .then(data => {
-                if (btn) btn.disabled = false;
-                const devices = data.devices || [];
-
-                if (devices.length === 0) {
-                    status.textContent = 'No paired devices with IRKs found';
-                    return;
-                }
-
-                status.style.display = 'none';
-                list.innerHTML = '';
-
-                devices.forEach(dev => {
-                    const item = document.createElement('div');
-                    item.className = 'btl-irk-picker-item';
-                    item.innerHTML =
-                        '<div class="btl-irk-picker-name">' + (dev.name || 'Unknown Device') + '</div>' +
-                        '<div class="btl-irk-picker-meta">' + dev.address + ' \u00b7 ' + (dev.address_type || '') + '</div>';
-                    item.addEventListener('click', function() {
-                        selectPairedIrk(dev);
-                    });
-                    list.appendChild(item);
-                });
-            })
-            .catch(err => {
-                if (btn) btn.disabled = false;
-                console.error('[BtLocate] Failed to fetch paired IRKs:', err);
-                status.textContent = 'Failed to read paired devices';
-            });
-    }
-
-    function selectPairedIrk(dev) {
-        const irkInput = document.getElementById('btLocateIrk');
-        const nameInput = document.getElementById('btLocateNamePattern');
-        const picker = document.getElementById('btLocateIrkPicker');
-
-        if (irkInput) irkInput.value = dev.irk_hex;
-        if (nameInput && dev.name && !nameInput.value) nameInput.value = dev.name;
-        if (picker) picker.style.display = 'none';
-    }
-
-    function clearTrail() {
-        fetch('/bt_locate/clear_trail', { method: 'POST' })
-            .then(r => r.json())
-            .then(() => {
-                clearMapMarkers();
-                rssiHistory = [];
-                drawRssiChart();
-                updateStats(0, 0);
-            })
-            .catch(err => console.error('[BtLocate] Clear trail error:', err));
-    }
-
-    function invalidateMap() {
-        if (map) map.invalidateSize();
-    }
-
-    return {
-        init,
-        start,
-        stop,
-        handoff,
-        clearHandoff,
-        setEnvironment,
-        toggleAudio,
-        clearTrail,
-        handleDetection,
-        invalidateMap,
-        fetchPairedIrks,
-    };
-})();

static/js/modes/dmr.js

@@ -10,14 +10,6 @@ let dmrCallCount = 0;
 let dmrSyncCount = 0;
 let dmrCallHistory = [];
 let dmrCurrentProtocol = '--';
-let dmrModeLabel = 'dmr';  // Protocol label for device reservation
-let dmrHasAudio = false;
-
-// ============== BOOKMARKS ==============
-let dmrBookmarks = [];
-const DMR_BOOKMARKS_KEY = 'dmrBookmarks';
-const DMR_SETTINGS_KEY = 'dmrSettings';
-const DMR_BOOKMARK_PROTOCOLS = new Set(['auto', 'dmr', 'p25', 'nxdn', 'dstar', 'provoice']);
 
 // ============== SYNTHESIZER STATE ==============
 let dmrSynthCanvas = null;
@@ -45,17 +37,9 @@ function checkDmrTools() {
             const warningText = document.getElementById('dmrToolsWarningText');
             if (!warning) return;
 
-            const selectedType = (typeof getSelectedSDRType === 'function')
-                ? getSelectedSDRType()
-                : 'rtlsdr';
             const missing = [];
             if (!data.dsd) missing.push('dsd (Digital Speech Decoder)');
-            if (selectedType === 'rtlsdr') {
             if (!data.rtl_fm) missing.push('rtl_fm (RTL-SDR)');
-            } else if (!data.rx_fm) {
-                missing.push('rx_fm (SoapySDR demodulator)');
-            }
-            if (!data.ffmpeg) missing.push('ffmpeg (audio output — optional)');
 
             if (missing.length > 0) {
                 warning.style.display = 'block';
@@ -63,9 +47,6 @@ function checkDmrTools() {
             } else {
                 warning.style.display = 'none';
             }
-
-            // Update audio panel availability
-            updateDmrAudioStatus(data.ffmpeg ? 'OFF' : 'UNAVAILABLE');
         })
         .catch(() => {});
 }
@@ -76,30 +57,17 @@ function startDmr() {
     const frequency = parseFloat(document.getElementById('dmrFrequency')?.value || 462.5625);
     const protocol = document.getElementById('dmrProtocol')?.value || 'auto';
     const gain = parseInt(document.getElementById('dmrGain')?.value || 40);
-    const ppm = parseInt(document.getElementById('dmrPPM')?.value || 0);
-    const relaxCrc = document.getElementById('dmrRelaxCrc')?.checked || false;
     const device = typeof getSelectedDevice === 'function' ? getSelectedDevice() : 0;
-    const sdrType = (typeof getSelectedSDRType === 'function') ? getSelectedSDRType() : 'rtlsdr';
-
-    // Use protocol name for device reservation so panel shows "D-STAR", "P25", etc.
-    dmrModeLabel = protocol !== 'auto' ? protocol : 'dmr';
 
     // Check device availability before starting
-    if (typeof checkDeviceAvailability === 'function' && !checkDeviceAvailability(dmrModeLabel)) {
+    if (typeof checkDeviceAvailability === 'function' && !checkDeviceAvailability('dmr')) {
         return;
     }
 
-    // Save settings to localStorage for persistence
-    try {
-        localStorage.setItem(DMR_SETTINGS_KEY, JSON.stringify({
-            frequency, protocol, gain, ppm, relaxCrc
-        }));
-    } catch (e) { /* localStorage unavailable */ }
-
     fetch('/dmr/start', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ frequency, protocol, gain, device, ppm, relaxCrc, sdr_type: sdrType })
+        body: JSON.stringify({ frequency, protocol, gain, device })
     })
     .then(r => r.json())
     .then(data => {
@@ -118,29 +86,10 @@ function startDmr() {
             const statusEl = document.getElementById('dmrStatus');
             if (statusEl) statusEl.textContent = 'DECODING';
             if (typeof reserveDevice === 'function') {
-                reserveDevice(parseInt(device), dmrModeLabel);
+                reserveDevice(parseInt(device), 'dmr');
             }
-            // Start audio if available
-            dmrHasAudio = !!data.has_audio;
-            if (dmrHasAudio) startDmrAudio();
-            updateDmrAudioStatus(dmrHasAudio ? 'STREAMING' : 'UNAVAILABLE');
             if (typeof showNotification === 'function') {
-                showNotification('Digital Voice', `Decoding ${frequency} MHz (${protocol.toUpperCase()})`);
+                showNotification('DMR', `Decoding ${frequency} MHz (${protocol.toUpperCase()})`);
-            }
-        } else if (data.status === 'error' && data.message === 'Already running') {
-            // Backend has an active session the frontend lost track of — resync
-            isDmrRunning = true;
-            updateDmrUI();
-            connectDmrSSE();
-            if (!dmrSynthInitialized) initDmrSynthesizer();
-            dmrEventType = 'idle';
-            dmrActivityTarget = 0.1;
-            dmrLastEventTime = Date.now();
-            updateDmrSynthStatus();
-            const statusEl = document.getElementById('dmrStatus');
-            if (statusEl) statusEl.textContent = 'DECODING';
-            if (typeof showNotification === 'function') {
-                showNotification('DMR', 'Reconnected to active session');
             }
         } else {
             if (typeof showNotification === 'function') {
@@ -152,7 +101,6 @@ function startDmr() {
 }
 
 function stopDmr() {
-    stopDmrAudio();
     fetch('/dmr/stop', { method: 'POST' })
     .then(r => r.json())
     .then(() => {
@@ -162,11 +110,10 @@ function stopDmr() {
         dmrEventType = 'stopped';
         dmrActivityTarget = 0;
         updateDmrSynthStatus();
-        updateDmrAudioStatus('OFF');
         const statusEl = document.getElementById('dmrStatus');
         if (statusEl) statusEl.textContent = 'STOPPED';
         if (typeof releaseDevice === 'function') {
-            releaseDevice(dmrModeLabel);
+            releaseDevice('dmr');
         }
     })
     .catch(err => console.error('[DMR] Stop error:', err));
@@ -263,28 +210,24 @@ function handleDmrMessage(msg) {
             if (statusEl) statusEl.textContent = 'DECODING';
         } else if (msg.text === 'crashed') {
             isDmrRunning = false;
-            stopDmrAudio();
             updateDmrUI();
             dmrEventType = 'stopped';
             dmrActivityTarget = 0;
             updateDmrSynthStatus();
-            updateDmrAudioStatus('OFF');
             if (statusEl) statusEl.textContent = 'CRASHED';
-            if (typeof releaseDevice === 'function') releaseDevice(dmrModeLabel);
+            if (typeof releaseDevice === 'function') releaseDevice('dmr');
             const detail = msg.detail || `Decoder exited (code ${msg.exit_code})`;
             if (typeof showNotification === 'function') {
                 showNotification('DMR Error', detail);
             }
         } else if (msg.text === 'stopped') {
             isDmrRunning = false;
-            stopDmrAudio();
             updateDmrUI();
             dmrEventType = 'stopped';
             dmrActivityTarget = 0;
             updateDmrSynthStatus();
-            updateDmrAudioStatus('OFF');
             if (statusEl) statusEl.textContent = 'STOPPED';
-            if (typeof releaseDevice === 'function') releaseDevice(dmrModeLabel);
+            if (typeof releaseDevice === 'function') releaseDevice('dmr');
         }
     }
 }
@@ -363,12 +306,10 @@ function drawDmrSynthesizer() {
     dmrSynthCtx.fillStyle = 'rgba(0, 0, 0, 0.3)';
     dmrSynthCtx.fillRect(0, 0, width, height);
 
-    // Decay activity toward target.  Window must exceed the backend
+    // Decay activity toward target
-    // heartbeat interval (3s) so the status doesn't flip-flop between
-    // LISTENING and IDLE on every heartbeat cycle.
     const timeSinceEvent = now - dmrLastEventTime;
-    if (timeSinceEvent > 5000) {
+    if (timeSinceEvent > 2000) {
-        // No events for 5s — decay target toward idle
+        // No events for 2s — decay target toward idle
         dmrActivityTarget = Math.max(0, dmrActivityTarget - DMR_DECAY_RATE);
         if (dmrActivityTarget < 0.1 && dmrEventType !== 'stopped') {
             dmrEventType = 'idle';
@@ -555,298 +496,9 @@ function stopDmrSynthesizer() {
 
 window.addEventListener('resize', resizeDmrSynthesizer);
 
-// ============== AUDIO ==============
-
-function startDmrAudio() {
-    const audioPlayer = document.getElementById('dmrAudioPlayer');
-    if (!audioPlayer) return;
-    const streamUrl = `/dmr/audio/stream?t=${Date.now()}`;
-    audioPlayer.src = streamUrl;
-    const volSlider = document.getElementById('dmrAudioVolume');
-    if (volSlider) audioPlayer.volume = volSlider.value / 100;
-
-    audioPlayer.onplaying = () => updateDmrAudioStatus('STREAMING');
-    audioPlayer.onerror = () => {
-        // Retry if decoder is still running (stream may have dropped)
-        if (isDmrRunning && dmrHasAudio) {
-            console.warn('[DMR] Audio stream error, retrying in 2s...');
-            updateDmrAudioStatus('RECONNECTING');
-            setTimeout(() => {
-                if (isDmrRunning && dmrHasAudio) startDmrAudio();
-            }, 2000);
-        } else {
-            updateDmrAudioStatus('OFF');
-        }
-    };
-
-    audioPlayer.play().catch(e => {
-        console.warn('[DMR] Audio autoplay blocked:', e);
-        if (typeof showNotification === 'function') {
-            showNotification('Audio Ready', 'Click the page or interact to enable audio playback');
-        }
-    });
-}
-
-function stopDmrAudio() {
-    const audioPlayer = document.getElementById('dmrAudioPlayer');
-    if (audioPlayer) {
-        audioPlayer.pause();
-        audioPlayer.src = '';
-    }
-    dmrHasAudio = false;
-}
-
-function setDmrAudioVolume(value) {
-    const audioPlayer = document.getElementById('dmrAudioPlayer');
-    if (audioPlayer) audioPlayer.volume = value / 100;
-}
-
-function updateDmrAudioStatus(status) {
-    const el = document.getElementById('dmrAudioStatus');
-    if (!el) return;
-    el.textContent = status;
-    const colors = {
-        'OFF': 'var(--text-muted)',
-        'STREAMING': 'var(--accent-green)',
-        'ERROR': 'var(--accent-red)',
-        'UNAVAILABLE': 'var(--text-muted)',
-    };
-    el.style.color = colors[status] || 'var(--text-muted)';
-}
-
-// ============== SETTINGS PERSISTENCE ==============
-
-function restoreDmrSettings() {
-    try {
-        const saved = localStorage.getItem(DMR_SETTINGS_KEY);
-        if (!saved) return;
-        const s = JSON.parse(saved);
-        const freqEl = document.getElementById('dmrFrequency');
-        const protoEl = document.getElementById('dmrProtocol');
-        const gainEl = document.getElementById('dmrGain');
-        const ppmEl = document.getElementById('dmrPPM');
-        const crcEl = document.getElementById('dmrRelaxCrc');
-        if (freqEl && s.frequency != null) freqEl.value = s.frequency;
-        if (protoEl && s.protocol) protoEl.value = s.protocol;
-        if (gainEl && s.gain != null) gainEl.value = s.gain;
-        if (ppmEl && s.ppm != null) ppmEl.value = s.ppm;
-        if (crcEl && s.relaxCrc != null) crcEl.checked = s.relaxCrc;
-    } catch (e) { /* localStorage unavailable */ }
-}
-
-// ============== BOOKMARKS ==============
-
-function loadDmrBookmarks() {
-    try {
-        const saved = localStorage.getItem(DMR_BOOKMARKS_KEY);
-        const parsed = saved ? JSON.parse(saved) : [];
-        if (!Array.isArray(parsed)) {
-            dmrBookmarks = [];
-        } else {
-            dmrBookmarks = parsed
-                .map((entry) => {
-                    const freq = Number(entry?.freq);
-                    if (!Number.isFinite(freq) || freq <= 0) return null;
-                    const protocol = sanitizeDmrBookmarkProtocol(entry?.protocol);
-                    const rawLabel = String(entry?.label || '').trim();
-                    const label = rawLabel || `${freq.toFixed(4)} MHz`;
-                    return {
-                        freq,
-                        protocol,
-                        label,
-                        added: entry?.added,
-                    };
-                })
-                .filter(Boolean);
-        }
-    } catch (e) {
-        dmrBookmarks = [];
-    }
-    renderDmrBookmarks();
-}
-
-function saveDmrBookmarks() {
-    try {
-        localStorage.setItem(DMR_BOOKMARKS_KEY, JSON.stringify(dmrBookmarks));
-    } catch (e) { /* localStorage unavailable */ }
-}
-
-function sanitizeDmrBookmarkProtocol(protocol) {
-    const value = String(protocol || 'auto').toLowerCase();
-    return DMR_BOOKMARK_PROTOCOLS.has(value) ? value : 'auto';
-}
-
-function addDmrBookmark() {
-    const freqInput = document.getElementById('dmrBookmarkFreq');
-    const labelInput = document.getElementById('dmrBookmarkLabel');
-    if (!freqInput) return;
-
-    const freq = parseFloat(freqInput.value);
-    if (isNaN(freq) || freq <= 0) {
-        if (typeof showNotification === 'function') {
-            showNotification('Invalid Frequency', 'Enter a valid frequency');
-        }
-        return;
-    }
-
-    const protocol = sanitizeDmrBookmarkProtocol(document.getElementById('dmrProtocol')?.value || 'auto');
-    const label = (labelInput?.value || '').trim() || `${freq.toFixed(4)} MHz`;
-
-    // Duplicate check
-    if (dmrBookmarks.some(b => b.freq === freq && b.protocol === protocol)) {
-        if (typeof showNotification === 'function') {
-            showNotification('Duplicate', 'This frequency/protocol is already bookmarked');
-        }
-        return;
-    }
-
-    dmrBookmarks.push({ freq, protocol, label, added: new Date().toISOString() });
-    saveDmrBookmarks();
-    renderDmrBookmarks();
-    freqInput.value = '';
-    if (labelInput) labelInput.value = '';
-
-    if (typeof showNotification === 'function') {
-        showNotification('Bookmark Added', `${freq.toFixed(4)} MHz saved`);
-    }
-}
-
-function addCurrentDmrFreqBookmark() {
-    const freqEl = document.getElementById('dmrFrequency');
-    const freqInput = document.getElementById('dmrBookmarkFreq');
-    if (freqEl && freqInput) {
-        freqInput.value = freqEl.value;
-    }
-    addDmrBookmark();
-}
-
-function removeDmrBookmark(index) {
-    dmrBookmarks.splice(index, 1);
-    saveDmrBookmarks();
-    renderDmrBookmarks();
-}
-
-function dmrQuickTune(freq, protocol) {
-    const freqEl = document.getElementById('dmrFrequency');
-    const protoEl = document.getElementById('dmrProtocol');
-    if (freqEl && Number.isFinite(freq)) freqEl.value = freq;
-    if (protoEl) protoEl.value = sanitizeDmrBookmarkProtocol(protocol);
-}
-
-function renderDmrBookmarks() {
-    const container = document.getElementById('dmrBookmarksList');
-    if (!container) return;
-
-    container.replaceChildren();
-
-    if (dmrBookmarks.length === 0) {
-        const emptyEl = document.createElement('div');
-        emptyEl.style.color = 'var(--text-muted)';
-        emptyEl.style.textAlign = 'center';
-        emptyEl.style.padding = '10px';
-        emptyEl.style.fontSize = '11px';
-        emptyEl.textContent = 'No bookmarks saved';
-        container.appendChild(emptyEl);
-        return;
-    }
-
-    dmrBookmarks.forEach((b, i) => {
-        const row = document.createElement('div');
-        row.style.display = 'flex';
-        row.style.justifyContent = 'space-between';
-        row.style.alignItems = 'center';
-        row.style.padding = '4px 6px';
-        row.style.background = 'rgba(0,0,0,0.2)';
-        row.style.borderRadius = '3px';
-        row.style.marginBottom = '3px';
-
-        const tuneBtn = document.createElement('button');
-        tuneBtn.type = 'button';
-        tuneBtn.style.cursor = 'pointer';
-        tuneBtn.style.color = 'var(--accent-cyan)';
-        tuneBtn.style.fontSize = '11px';
-        tuneBtn.style.flex = '1';
-        tuneBtn.style.background = 'none';
-        tuneBtn.style.border = 'none';
-        tuneBtn.style.textAlign = 'left';
-        tuneBtn.style.padding = '0';
-        tuneBtn.textContent = b.label;
-        tuneBtn.title = `${b.freq.toFixed(4)} MHz (${b.protocol.toUpperCase()})`;
-        tuneBtn.addEventListener('click', () => dmrQuickTune(b.freq, b.protocol));
-
-        const protocolEl = document.createElement('span');
-        protocolEl.style.color = 'var(--text-muted)';
-        protocolEl.style.fontSize = '9px';
-        protocolEl.style.margin = '0 6px';
-        protocolEl.textContent = b.protocol.toUpperCase();
-
-        const deleteBtn = document.createElement('button');
-        deleteBtn.type = 'button';
-        deleteBtn.style.background = 'none';
-        deleteBtn.style.border = 'none';
-        deleteBtn.style.color = 'var(--accent-red)';
-        deleteBtn.style.cursor = 'pointer';
-        deleteBtn.style.fontSize = '12px';
-        deleteBtn.style.padding = '0 4px';
-        deleteBtn.textContent = '\u00d7';
-        deleteBtn.addEventListener('click', () => removeDmrBookmark(i));
-
-        row.appendChild(tuneBtn);
-        row.appendChild(protocolEl);
-        row.appendChild(deleteBtn);
-        container.appendChild(row);
-    });
-}
-
-// ============== STATUS SYNC ==============
-
-function checkDmrStatus() {
-    fetch('/dmr/status')
-        .then(r => r.json())
-        .then(data => {
-            if (data.running && !isDmrRunning) {
-                // Backend is running but frontend lost track — resync
-                isDmrRunning = true;
-                updateDmrUI();
-                connectDmrSSE();
-                if (!dmrSynthInitialized) initDmrSynthesizer();
-                dmrEventType = 'idle';
-                dmrActivityTarget = 0.1;
-                dmrLastEventTime = Date.now();
-                updateDmrSynthStatus();
-                const statusEl = document.getElementById('dmrStatus');
-                if (statusEl) statusEl.textContent = 'DECODING';
-            } else if (!data.running && isDmrRunning) {
-                // Backend stopped but frontend didn't know
-                isDmrRunning = false;
-                if (dmrEventSource) { dmrEventSource.close(); dmrEventSource = null; }
-                updateDmrUI();
-                dmrEventType = 'stopped';
-                dmrActivityTarget = 0;
-                updateDmrSynthStatus();
-                const statusEl = document.getElementById('dmrStatus');
-                if (statusEl) statusEl.textContent = 'STOPPED';
-            }
-        })
-        .catch(() => {});
-}
-
-// ============== INIT ==============
-
-document.addEventListener('DOMContentLoaded', () => {
-    restoreDmrSettings();
-    loadDmrBookmarks();
-});
-
 // ============== EXPORTS ==============
 
 window.startDmr = startDmr;
 window.stopDmr = stopDmr;
 window.checkDmrTools = checkDmrTools;
-window.checkDmrStatus = checkDmrStatus;
 window.initDmrSynthesizer = initDmrSynthesizer;
-window.setDmrAudioVolume = setDmrAudioVolume;
-window.addDmrBookmark = addDmrBookmark;
-window.addCurrentDmrFreqBookmark = addCurrentDmrFreqBookmark;
-window.removeDmrBookmark = removeDmrBookmark;
-window.dmrQuickTune = dmrQuickTune;

static/js/modes/gps.js

@@ -1,406 +0,0 @@
-/**
- * GPS Mode
- * Live GPS data display with satellite sky view, signal strength bars,
- * position/velocity/DOP readout. Connects to gpsd via backend SSE stream.
- */
-
-const GPS = (function() {
-    let connected = false;
-    let lastPosition = null;
-    let lastSky = null;
-
-    // Constellation color map
-    const CONST_COLORS = {
-        'GPS':     '#00d4ff',
-        'GLONASS': '#00ff88',
-        'Galileo': '#ff8800',
-        'BeiDou':  '#ff4466',
-        'SBAS':    '#ffdd00',
-        'QZSS':    '#cc66ff',
-    };
-
-    function init() {
-        drawEmptySkyView();
-        connect();
-    }
-
-    function connect() {
-        updateConnectionUI(false, false, 'connecting');
-        fetch('/gps/auto-connect', { method: 'POST' })
-            .then(r => r.json())
-            .then(data => {
-                if (data.status === 'connected') {
-                    connected = true;
-                    updateConnectionUI(true, data.has_fix);
-                    if (data.position) {
-                        lastPosition = data.position;
-                        updatePositionUI(data.position);
-                    }
-                    if (data.sky) {
-                        lastSky = data.sky;
-                        updateSkyUI(data.sky);
-                    }
-                    subscribeToStream();
-                    // Ensure the global GPS stream is running
-                    if (typeof startGpsStream === 'function' && !gpsEventSource) {
-                        startGpsStream();
-                    }
-                } else {
-                    connected = false;
-                    updateConnectionUI(false, false, 'error', data.message || 'gpsd not available');
-                }
-            })
-            .catch(() => {
-                connected = false;
-                updateConnectionUI(false, false, 'error', 'Connection failed — is the server running?');
-            });
-    }
-
-    function disconnect() {
-        unsubscribeFromStream();
-        fetch('/gps/stop', { method: 'POST' })
-            .then(() => {
-                connected = false;
-                updateConnectionUI(false);
-            });
-    }
-
-    function onGpsStreamData(data) {
-        if (!connected) return;
-        if (data.type === 'position') {
-            lastPosition = data;
-            updatePositionUI(data);
-            updateConnectionUI(true, true);
-        } else if (data.type === 'sky') {
-            lastSky = data;
-            updateSkyUI(data);
-        }
-    }
-
-    function subscribeToStream() {
-        // Subscribe to the global GPS stream instead of opening a separate SSE connection
-        if (typeof addGpsStreamSubscriber === 'function') {
-            addGpsStreamSubscriber(onGpsStreamData);
-        }
-    }
-
-    function unsubscribeFromStream() {
-        if (typeof removeGpsStreamSubscriber === 'function') {
-            removeGpsStreamSubscriber(onGpsStreamData);
-        }
-    }
-
-    // ========================
-    // UI Updates
-    // ========================
-
-    function updateConnectionUI(isConnected, hasFix, state, message) {
-        const dot = document.getElementById('gpsStatusDot');
-        const text = document.getElementById('gpsStatusText');
-        const connectBtn = document.getElementById('gpsConnectBtn');
-        const disconnectBtn = document.getElementById('gpsDisconnectBtn');
-        const devicePath = document.getElementById('gpsDevicePath');
-
-        if (dot) {
-            dot.className = 'gps-status-dot';
-            if (state === 'connecting') dot.classList.add('waiting');
-            else if (state === 'error') dot.classList.add('error');
-            else if (isConnected && hasFix) dot.classList.add('connected');
-            else if (isConnected) dot.classList.add('waiting');
-        }
-        if (text) {
-            if (state === 'connecting') text.textContent = 'Connecting...';
-            else if (state === 'error') text.textContent = message || 'Connection failed';
-            else if (isConnected && hasFix) text.textContent = 'Connected (Fix)';
-            else if (isConnected) text.textContent = 'Connected (No Fix)';
-            else text.textContent = 'Disconnected';
-        }
-        if (connectBtn) {
-            connectBtn.style.display = isConnected ? 'none' : '';
-            connectBtn.disabled = state === 'connecting';
-        }
-        if (disconnectBtn) disconnectBtn.style.display = isConnected ? '' : 'none';
-        if (devicePath) devicePath.textContent = isConnected ? 'gpsd://localhost:2947' : '';
-    }
-
-    function updatePositionUI(pos) {
-        // Sidebar fields
-        setText('gpsLat', pos.latitude != null ? pos.latitude.toFixed(6) + '\u00b0' : '---');
-        setText('gpsLon', pos.longitude != null ? pos.longitude.toFixed(6) + '\u00b0' : '---');
-        setText('gpsAlt', pos.altitude != null ? pos.altitude.toFixed(1) + ' m' : '---');
-        setText('gpsSpeed', pos.speed != null ? (pos.speed * 3.6).toFixed(1) + ' km/h' : '---');
-        setText('gpsHeading', pos.heading != null ? pos.heading.toFixed(1) + '\u00b0' : '---');
-        setText('gpsClimb', pos.climb != null ? pos.climb.toFixed(2) + ' m/s' : '---');
-
-        // Fix type
-        const fixEl = document.getElementById('gpsFixType');
-        if (fixEl) {
-            const fq = pos.fix_quality;
-            if (fq === 3) fixEl.innerHTML = '<span class="gps-fix-badge fix-3d">3D FIX</span>';
-            else if (fq === 2) fixEl.innerHTML = '<span class="gps-fix-badge fix-2d">2D FIX</span>';
-            else fixEl.innerHTML = '<span class="gps-fix-badge no-fix">NO FIX</span>';
-        }
-
-        // Error estimates
-        const eph = (pos.epx != null && pos.epy != null) ? Math.sqrt(pos.epx * pos.epx + pos.epy * pos.epy) : null;
-        setText('gpsEph', eph != null ? eph.toFixed(1) + ' m' : '---');
-        setText('gpsEpv', pos.epv != null ? pos.epv.toFixed(1) + ' m' : '---');
-        setText('gpsEps', pos.eps != null ? pos.eps.toFixed(2) + ' m/s' : '---');
-
-        // GPS time
-        if (pos.timestamp) {
-            const t = new Date(pos.timestamp);
-            setText('gpsTime', t.toISOString().replace('T', ' ').replace(/\.\d+Z$/, ' UTC'));
-        }
-
-        // Visuals: position panel
-        setText('gpsVisPosLat', pos.latitude != null ? pos.latitude.toFixed(6) + '\u00b0' : '---');
-        setText('gpsVisPosLon', pos.longitude != null ? pos.longitude.toFixed(6) + '\u00b0' : '---');
-        setText('gpsVisPosAlt', pos.altitude != null ? pos.altitude.toFixed(1) + ' m' : '---');
-        setText('gpsVisPosSpeed', pos.speed != null ? (pos.speed * 3.6).toFixed(1) + ' km/h' : '---');
-        setText('gpsVisPosHeading', pos.heading != null ? pos.heading.toFixed(1) + '\u00b0' : '---');
-        setText('gpsVisPosClimb', pos.climb != null ? pos.climb.toFixed(2) + ' m/s' : '---');
-
-        // Visuals: fix badge
-        const visFixEl = document.getElementById('gpsVisFixBadge');
-        if (visFixEl) {
-            const fq = pos.fix_quality;
-            if (fq === 3) { visFixEl.textContent = '3D FIX'; visFixEl.className = 'gps-fix-badge fix-3d'; }
-            else if (fq === 2) { visFixEl.textContent = '2D FIX'; visFixEl.className = 'gps-fix-badge fix-2d'; }
-            else { visFixEl.textContent = 'NO FIX'; visFixEl.className = 'gps-fix-badge no-fix'; }
-        }
-
-        // Visuals: GPS time
-        if (pos.timestamp) {
-            const t = new Date(pos.timestamp);
-            setText('gpsVisTime', t.toISOString().replace('T', ' ').replace(/\.\d+Z$/, ' UTC'));
-        }
-    }
-
-    function updateSkyUI(sky) {
-        // Sidebar sat counts
-        setText('gpsSatUsed', sky.usat != null ? sky.usat : '-');
-        setText('gpsSatTotal', sky.nsat != null ? sky.nsat : '-');
-
-        // DOP values
-        setDop('gpsHdop', sky.hdop);
-        setDop('gpsVdop', sky.vdop);
-        setDop('gpsPdop', sky.pdop);
-        setDop('gpsTdop', sky.tdop);
-        setDop('gpsGdop', sky.gdop);
-
-        // Visuals
-        drawSkyView(sky.satellites || []);
-        drawSignalBars(sky.satellites || []);
-    }
-
-    function setDop(id, val) {
-        const el = document.getElementById(id);
-        if (!el) return;
-        if (val == null) { el.textContent = '---'; el.className = 'gps-info-value gps-mono'; return; }
-        el.textContent = val.toFixed(1);
-        let cls = 'gps-info-value gps-mono ';
-        if (val <= 2) cls += 'gps-dop-good';
-        else if (val <= 5) cls += 'gps-dop-moderate';
-        else cls += 'gps-dop-poor';
-        el.className = cls;
-    }
-
-    function setText(id, val) {
-        const el = document.getElementById(id);
-        if (el) el.textContent = val;
-    }
-
-    // ========================
-    // Sky View Polar Plot
-    // ========================
-
-    function drawEmptySkyView() {
-        const canvas = document.getElementById('gpsSkyCanvas');
-        if (!canvas) return;
-        drawSkyViewBase(canvas);
-    }
-
-    function drawSkyView(satellites) {
-        const canvas = document.getElementById('gpsSkyCanvas');
-        if (!canvas) return;
-
-        const ctx = canvas.getContext('2d');
-        const w = canvas.width;
-        const h = canvas.height;
-        const cx = w / 2;
-        const cy = h / 2;
-        const r = Math.min(cx, cy) - 24;
-
-        drawSkyViewBase(canvas);
-
-        // Plot satellites
-        satellites.forEach(sat => {
-            if (sat.elevation == null || sat.azimuth == null) return;
-
-            const elRad = (90 - sat.elevation) / 90;
-            const azRad = (sat.azimuth - 90) * Math.PI / 180; // N = up
-            const px = cx + r * elRad * Math.cos(azRad);
-            const py = cy + r * elRad * Math.sin(azRad);
-
-            const color = CONST_COLORS[sat.constellation] || CONST_COLORS['GPS'];
-            const dotSize = sat.used ? 6 : 4;
-
-            // Draw dot
-            ctx.beginPath();
-            ctx.arc(px, py, dotSize, 0, Math.PI * 2);
-            if (sat.used) {
-                ctx.fillStyle = color;
-                ctx.fill();
-            } else {
-                ctx.strokeStyle = color;
-                ctx.lineWidth = 1.5;
-                ctx.stroke();
-            }
-
-            // PRN label
-            ctx.fillStyle = color;
-            ctx.font = '8px JetBrains Mono, monospace';
-            ctx.textAlign = 'center';
-            ctx.textBaseline = 'bottom';
-            ctx.fillText(sat.prn, px, py - dotSize - 2);
-
-            // SNR value
-            if (sat.snr != null) {
-                ctx.fillStyle = 'rgba(255,255,255,0.4)';
-                ctx.font = '7px JetBrains Mono, monospace';
-                ctx.textBaseline = 'top';
-                ctx.fillText(Math.round(sat.snr), px, py + dotSize + 1);
-            }
-        });
-    }
-
-    function drawSkyViewBase(canvas) {
-        const ctx = canvas.getContext('2d');
-        const w = canvas.width;
-        const h = canvas.height;
-        const cx = w / 2;
-        const cy = h / 2;
-        const r = Math.min(cx, cy) - 24;
-
-        ctx.clearRect(0, 0, w, h);
-
-        // Background
-        const bgStyle = getComputedStyle(document.documentElement).getPropertyValue('--bg-card').trim();
-        ctx.fillStyle = bgStyle || '#0d1117';
-        ctx.fillRect(0, 0, w, h);
-
-        // Elevation rings (0, 30, 60, 90)
-        ctx.strokeStyle = '#2a3040';
-        ctx.lineWidth = 0.5;
-        [90, 60, 30].forEach(el => {
-            const gr = r * (1 - el / 90);
-            ctx.beginPath();
-            ctx.arc(cx, cy, gr, 0, Math.PI * 2);
-            ctx.stroke();
-            // Label
-            ctx.fillStyle = '#555';
-            ctx.font = '9px JetBrains Mono, monospace';
-            ctx.textAlign = 'left';
-            ctx.textBaseline = 'middle';
-            ctx.fillText(el + '\u00b0', cx + gr + 3, cy - 2);
-        });
-
-        // Horizon circle
-        ctx.strokeStyle = '#3a4050';
-        ctx.lineWidth = 1;
-        ctx.beginPath();
-        ctx.arc(cx, cy, r, 0, Math.PI * 2);
-        ctx.stroke();
-
-        // Cardinal directions
-        ctx.fillStyle = '#888';
-        ctx.font = 'bold 11px JetBrains Mono, monospace';
-        ctx.textAlign = 'center';
-        ctx.textBaseline = 'middle';
-        ctx.fillText('N', cx, cy - r - 12);
-        ctx.fillText('S', cx, cy + r + 12);
-        ctx.fillText('E', cx + r + 12, cy);
-        ctx.fillText('W', cx - r - 12, cy);
-
-        // Crosshairs
-        ctx.strokeStyle = '#2a3040';
-        ctx.lineWidth = 0.5;
-        ctx.beginPath();
-        ctx.moveTo(cx, cy - r);
-        ctx.lineTo(cx, cy + r);
-        ctx.moveTo(cx - r, cy);
-        ctx.lineTo(cx + r, cy);
-        ctx.stroke();
-
-        // Zenith dot
-        ctx.fillStyle = '#333';
-        ctx.beginPath();
-        ctx.arc(cx, cy, 2, 0, Math.PI * 2);
-        ctx.fill();
-    }
-
-    // ========================
-    // Signal Strength Bars
-    // ========================
-
-    function drawSignalBars(satellites) {
-        const container = document.getElementById('gpsSignalBars');
-        if (!container) return;
-
-        container.innerHTML = '';
-
-        if (satellites.length === 0) return;
-
-        // Sort: used first, then by PRN
-        const sorted = [...satellites].sort((a, b) => {
-            if (a.used !== b.used) return a.used ? -1 : 1;
-            return a.prn - b.prn;
-        });
-
-        const maxSnr = 50; // dB-Hz typical max for display
-
-        sorted.forEach(sat => {
-            const snr = sat.snr || 0;
-            const heightPct = Math.min(snr / maxSnr * 100, 100);
-            const color = CONST_COLORS[sat.constellation] || CONST_COLORS['GPS'];
-            const constClass = 'gps-const-' + (sat.constellation || 'GPS').toLowerCase();
-
-            const wrap = document.createElement('div');
-            wrap.className = 'gps-signal-bar-wrap';
-
-            const snrLabel = document.createElement('span');
-            snrLabel.className = 'gps-signal-snr';
-            snrLabel.textContent = snr > 0 ? Math.round(snr) : '';
-
-            const bar = document.createElement('div');
-            bar.className = 'gps-signal-bar ' + constClass + (sat.used ? '' : ' unused');
-            bar.style.height = Math.max(heightPct, 2) + '%';
-            bar.title = `PRN ${sat.prn} (${sat.constellation}) - ${Math.round(snr)} dB-Hz${sat.used ? ' [USED]' : ''}`;
-
-            const prn = document.createElement('span');
-            prn.className = 'gps-signal-prn';
-            prn.textContent = sat.prn;
-
-            wrap.appendChild(snrLabel);
-            wrap.appendChild(bar);
-            wrap.appendChild(prn);
-            container.appendChild(wrap);
-        });
-    }
-
-    // ========================
-    // Cleanup
-    // ========================
-
-    function destroy() {
-        unsubscribeFromStream();
-    }
-
-    return {
-        init: init,
-        connect: connect,
-        disconnect: disconnect,
-        destroy: destroy,
-    };
-})();

static/js/modes/sstv-general.js

@@ -11,18 +11,6 @@ const SSTVGeneral = (function() {
     let currentMode = null;
     let progress = 0;
 
-    // Signal scope state
-    let sstvGeneralScopeCtx = null;
-    let sstvGeneralScopeAnim = null;
-    let sstvGeneralScopeHistory = [];
-    const SSTV_GENERAL_SCOPE_LEN = 200;
-    let sstvGeneralScopeRms = 0;
-    let sstvGeneralScopePeak = 0;
-    let sstvGeneralScopeTargetRms = 0;
-    let sstvGeneralScopeTargetPeak = 0;
-    let sstvGeneralScopeMsgBurst = 0;
-    let sstvGeneralScopeTone = null;
-
     /**
      * Initialize the SSTV General mode
      */
@@ -202,136 +190,6 @@ const SSTVGeneral = (function() {
         `;
     }
 
-    /**
-     * Initialize signal scope canvas
-     */
-    function initSstvGeneralScope() {
-        const canvas = document.getElementById('sstvGeneralScopeCanvas');
-        if (!canvas) return;
-        const rect = canvas.getBoundingClientRect();
-        canvas.width = rect.width * (window.devicePixelRatio || 1);
-        canvas.height = rect.height * (window.devicePixelRatio || 1);
-        sstvGeneralScopeCtx = canvas.getContext('2d');
-        sstvGeneralScopeHistory = new Array(SSTV_GENERAL_SCOPE_LEN).fill(0);
-        sstvGeneralScopeRms = 0;
-        sstvGeneralScopePeak = 0;
-        sstvGeneralScopeTargetRms = 0;
-        sstvGeneralScopeTargetPeak = 0;
-        sstvGeneralScopeMsgBurst = 0;
-        sstvGeneralScopeTone = null;
-        drawSstvGeneralScope();
-    }
-
-    /**
-     * Draw signal scope animation frame
-     */
-    function drawSstvGeneralScope() {
-        const ctx = sstvGeneralScopeCtx;
-        if (!ctx) return;
-        const W = ctx.canvas.width;
-        const H = ctx.canvas.height;
-        const midY = H / 2;
-
-        // Phosphor persistence
-        ctx.fillStyle = 'rgba(5, 5, 16, 0.3)';
-        ctx.fillRect(0, 0, W, H);
-
-        // Smooth towards target
-        sstvGeneralScopeRms += (sstvGeneralScopeTargetRms - sstvGeneralScopeRms) * 0.25;
-        sstvGeneralScopePeak += (sstvGeneralScopeTargetPeak - sstvGeneralScopePeak) * 0.15;
-
-        // Push to history
-        sstvGeneralScopeHistory.push(Math.min(sstvGeneralScopeRms / 32768, 1.0));
-        if (sstvGeneralScopeHistory.length > SSTV_GENERAL_SCOPE_LEN) sstvGeneralScopeHistory.shift();
-
-        // Grid lines
-        ctx.strokeStyle = 'rgba(60, 40, 80, 0.4)';
-        ctx.lineWidth = 0.5;
-        for (let i = 1; i < 4; i++) {
-            const y = (H / 4) * i;
-            ctx.beginPath(); ctx.moveTo(0, y); ctx.lineTo(W, y); ctx.stroke();
-        }
-        for (let i = 1; i < 8; i++) {
-            const x = (W / 8) * i;
-            ctx.beginPath(); ctx.moveTo(x, 0); ctx.lineTo(x, H); ctx.stroke();
-        }
-
-        // Waveform
-        const stepX = W / (SSTV_GENERAL_SCOPE_LEN - 1);
-        ctx.strokeStyle = '#c080ff';
-        ctx.lineWidth = 1.5;
-        ctx.shadowColor = '#c080ff';
-        ctx.shadowBlur = 4;
-
-        // Upper half
-        ctx.beginPath();
-        for (let i = 0; i < sstvGeneralScopeHistory.length; i++) {
-            const x = i * stepX;
-            const amp = sstvGeneralScopeHistory[i] * midY * 0.9;
-            const y = midY - amp;
-            if (i === 0) ctx.moveTo(x, y); else ctx.lineTo(x, y);
-        }
-        ctx.stroke();
-
-        // Lower half (mirror)
-        ctx.beginPath();
-        for (let i = 0; i < sstvGeneralScopeHistory.length; i++) {
-            const x = i * stepX;
-            const amp = sstvGeneralScopeHistory[i] * midY * 0.9;
-            const y = midY + amp;
-            if (i === 0) ctx.moveTo(x, y); else ctx.lineTo(x, y);
-        }
-        ctx.stroke();
-        ctx.shadowBlur = 0;
-
-        // Peak indicator
-        const peakNorm = Math.min(sstvGeneralScopePeak / 32768, 1.0);
-        if (peakNorm > 0.01) {
-            const peakY = midY - peakNorm * midY * 0.9;
-            ctx.strokeStyle = 'rgba(255, 68, 68, 0.6)';
-            ctx.lineWidth = 1;
-            ctx.setLineDash([4, 4]);
-            ctx.beginPath(); ctx.moveTo(0, peakY); ctx.lineTo(W, peakY); ctx.stroke();
-            ctx.setLineDash([]);
-        }
-
-        // Image decode flash
-        if (sstvGeneralScopeMsgBurst > 0.01) {
-            ctx.fillStyle = `rgba(0, 255, 100, ${sstvGeneralScopeMsgBurst * 0.15})`;
-            ctx.fillRect(0, 0, W, H);
-            sstvGeneralScopeMsgBurst *= 0.88;
-        }
-
-        // Update labels
-        const rmsLabel = document.getElementById('sstvGeneralScopeRmsLabel');
-        const peakLabel = document.getElementById('sstvGeneralScopePeakLabel');
-        const toneLabel = document.getElementById('sstvGeneralScopeToneLabel');
-        const statusLabel = document.getElementById('sstvGeneralScopeStatusLabel');
-        if (rmsLabel) rmsLabel.textContent = Math.round(sstvGeneralScopeRms);
-        if (peakLabel) peakLabel.textContent = Math.round(sstvGeneralScopePeak);
-        if (toneLabel) {
-            if (sstvGeneralScopeTone === 'leader') { toneLabel.textContent = 'LEADER'; toneLabel.style.color = '#0f0'; }
-            else if (sstvGeneralScopeTone === 'sync') { toneLabel.textContent = 'SYNC'; toneLabel.style.color = '#0ff'; }
-            else if (sstvGeneralScopeTone === 'decoding') { toneLabel.textContent = 'DECODING'; toneLabel.style.color = '#fa0'; }
-            else if (sstvGeneralScopeTone === 'noise') { toneLabel.textContent = 'NOISE'; toneLabel.style.color = '#555'; }
-            else { toneLabel.textContent = 'QUIET'; toneLabel.style.color = '#444'; }
-        }
-        if (statusLabel) {
-            if (sstvGeneralScopeRms > 500) { statusLabel.textContent = 'SIGNAL'; statusLabel.style.color = '#0f0'; }
-            else { statusLabel.textContent = 'MONITORING'; statusLabel.style.color = '#555'; }
-        }
-
-        sstvGeneralScopeAnim = requestAnimationFrame(drawSstvGeneralScope);
-    }
-
-    /**
-     * Stop signal scope
-     */
-    function stopSstvGeneralScope() {
-        if (sstvGeneralScopeAnim) { cancelAnimationFrame(sstvGeneralScopeAnim); sstvGeneralScopeAnim = null; }
-        sstvGeneralScopeCtx = null;
-    }
-
     /**
      * Start SSE stream
      */
@@ -340,11 +198,6 @@ const SSTVGeneral = (function() {
             eventSource.close();
         }
 
-        // Show and init scope
-        const scopePanel = document.getElementById('sstvGeneralScopePanel');
-        if (scopePanel) scopePanel.style.display = 'block';
-        initSstvGeneralScope();
-
         eventSource = new EventSource('/sstv-general/stream');
 
         eventSource.onmessage = (e) => {
@@ -352,10 +205,6 @@ const SSTVGeneral = (function() {
                 const data = JSON.parse(e.data);
                 if (data.type === 'sstv_progress') {
                     handleProgress(data);
-                } else if (data.type === 'sstv_scope') {
-                    sstvGeneralScopeTargetRms = data.rms;
-                    sstvGeneralScopeTargetPeak = data.peak;
-                    if (data.tone !== undefined) sstvGeneralScopeTone = data.tone;
                 }
             } catch (err) {
                 console.error('Failed to parse SSE message:', err);
@@ -378,9 +227,6 @@ const SSTVGeneral = (function() {
             eventSource.close();
             eventSource = null;
         }
-        stopSstvGeneralScope();
-        const scopePanel = document.getElementById('sstvGeneralScopePanel');
-        if (scopePanel) scopePanel.style.display = 'none';
     }
 
     /**
@@ -399,7 +245,6 @@ const SSTVGeneral = (function() {
             renderGallery();
             showNotification('SSTV', 'New image decoded!');
             updateStatusUI('listening', 'Listening...');
-            sstvGeneralScopeMsgBurst = 1.0;
             // Clear decode progress so signal monitor can take over
             const liveContent = document.getElementById('sstvGeneralLiveContent');
             if (liveContent) liveContent.innerHTML = '';

static/js/modes/sstv.js

@@ -21,18 +21,6 @@ const SSTV = (function() {
     // ISS frequency
     const ISS_FREQ = 145.800;
 
-    // Signal scope state
-    let sstvScopeCtx = null;
-    let sstvScopeAnim = null;
-    let sstvScopeHistory = [];
-    const SSTV_SCOPE_LEN = 200;
-    let sstvScopeRms = 0;
-    let sstvScopePeak = 0;
-    let sstvScopeTargetRms = 0;
-    let sstvScopeTargetPeak = 0;
-    let sstvScopeMsgBurst = 0;
-    let sstvScopeTone = null;
-
     /**
      * Initialize the SSTV mode
      */
@@ -646,136 +634,6 @@ const SSTV = (function() {
         `;
     }
 
-    /**
-     * Initialize signal scope canvas
-     */
-    function initSstvScope() {
-        const canvas = document.getElementById('sstvScopeCanvas');
-        if (!canvas) return;
-        const rect = canvas.getBoundingClientRect();
-        canvas.width = rect.width * (window.devicePixelRatio || 1);
-        canvas.height = rect.height * (window.devicePixelRatio || 1);
-        sstvScopeCtx = canvas.getContext('2d');
-        sstvScopeHistory = new Array(SSTV_SCOPE_LEN).fill(0);
-        sstvScopeRms = 0;
-        sstvScopePeak = 0;
-        sstvScopeTargetRms = 0;
-        sstvScopeTargetPeak = 0;
-        sstvScopeMsgBurst = 0;
-        sstvScopeTone = null;
-        drawSstvScope();
-    }
-
-    /**
-     * Draw signal scope animation frame
-     */
-    function drawSstvScope() {
-        const ctx = sstvScopeCtx;
-        if (!ctx) return;
-        const W = ctx.canvas.width;
-        const H = ctx.canvas.height;
-        const midY = H / 2;
-
-        // Phosphor persistence
-        ctx.fillStyle = 'rgba(5, 5, 16, 0.3)';
-        ctx.fillRect(0, 0, W, H);
-
-        // Smooth towards target
-        sstvScopeRms += (sstvScopeTargetRms - sstvScopeRms) * 0.25;
-        sstvScopePeak += (sstvScopeTargetPeak - sstvScopePeak) * 0.15;
-
-        // Push to history
-        sstvScopeHistory.push(Math.min(sstvScopeRms / 32768, 1.0));
-        if (sstvScopeHistory.length > SSTV_SCOPE_LEN) sstvScopeHistory.shift();
-
-        // Grid lines
-        ctx.strokeStyle = 'rgba(60, 40, 80, 0.4)';
-        ctx.lineWidth = 0.5;
-        for (let i = 1; i < 4; i++) {
-            const y = (H / 4) * i;
-            ctx.beginPath(); ctx.moveTo(0, y); ctx.lineTo(W, y); ctx.stroke();
-        }
-        for (let i = 1; i < 8; i++) {
-            const x = (W / 8) * i;
-            ctx.beginPath(); ctx.moveTo(x, 0); ctx.lineTo(x, H); ctx.stroke();
-        }
-
-        // Waveform
-        const stepX = W / (SSTV_SCOPE_LEN - 1);
-        ctx.strokeStyle = '#c080ff';
-        ctx.lineWidth = 1.5;
-        ctx.shadowColor = '#c080ff';
-        ctx.shadowBlur = 4;
-
-        // Upper half
-        ctx.beginPath();
-        for (let i = 0; i < sstvScopeHistory.length; i++) {
-            const x = i * stepX;
-            const amp = sstvScopeHistory[i] * midY * 0.9;
-            const y = midY - amp;
-            if (i === 0) ctx.moveTo(x, y); else ctx.lineTo(x, y);
-        }
-        ctx.stroke();
-
-        // Lower half (mirror)
-        ctx.beginPath();
-        for (let i = 0; i < sstvScopeHistory.length; i++) {
-            const x = i * stepX;
-            const amp = sstvScopeHistory[i] * midY * 0.9;
-            const y = midY + amp;
-            if (i === 0) ctx.moveTo(x, y); else ctx.lineTo(x, y);
-        }
-        ctx.stroke();
-        ctx.shadowBlur = 0;
-
-        // Peak indicator
-        const peakNorm = Math.min(sstvScopePeak / 32768, 1.0);
-        if (peakNorm > 0.01) {
-            const peakY = midY - peakNorm * midY * 0.9;
-            ctx.strokeStyle = 'rgba(255, 68, 68, 0.6)';
-            ctx.lineWidth = 1;
-            ctx.setLineDash([4, 4]);
-            ctx.beginPath(); ctx.moveTo(0, peakY); ctx.lineTo(W, peakY); ctx.stroke();
-            ctx.setLineDash([]);
-        }
-
-        // Image decode flash
-        if (sstvScopeMsgBurst > 0.01) {
-            ctx.fillStyle = `rgba(0, 255, 100, ${sstvScopeMsgBurst * 0.15})`;
-            ctx.fillRect(0, 0, W, H);
-            sstvScopeMsgBurst *= 0.88;
-        }
-
-        // Update labels
-        const rmsLabel = document.getElementById('sstvScopeRmsLabel');
-        const peakLabel = document.getElementById('sstvScopePeakLabel');
-        const toneLabel = document.getElementById('sstvScopeToneLabel');
-        const statusLabel = document.getElementById('sstvScopeStatusLabel');
-        if (rmsLabel) rmsLabel.textContent = Math.round(sstvScopeRms);
-        if (peakLabel) peakLabel.textContent = Math.round(sstvScopePeak);
-        if (toneLabel) {
-            if (sstvScopeTone === 'leader') { toneLabel.textContent = 'LEADER'; toneLabel.style.color = '#0f0'; }
-            else if (sstvScopeTone === 'sync') { toneLabel.textContent = 'SYNC'; toneLabel.style.color = '#0ff'; }
-            else if (sstvScopeTone === 'decoding') { toneLabel.textContent = 'DECODING'; toneLabel.style.color = '#fa0'; }
-            else if (sstvScopeTone === 'noise') { toneLabel.textContent = 'NOISE'; toneLabel.style.color = '#555'; }
-            else { toneLabel.textContent = 'QUIET'; toneLabel.style.color = '#444'; }
-        }
-        if (statusLabel) {
-            if (sstvScopeRms > 500) { statusLabel.textContent = 'SIGNAL'; statusLabel.style.color = '#0f0'; }
-            else { statusLabel.textContent = 'MONITORING'; statusLabel.style.color = '#555'; }
-        }
-
-        sstvScopeAnim = requestAnimationFrame(drawSstvScope);
-    }
-
-    /**
-     * Stop signal scope
-     */
-    function stopSstvScope() {
-        if (sstvScopeAnim) { cancelAnimationFrame(sstvScopeAnim); sstvScopeAnim = null; }
-        sstvScopeCtx = null;
-    }
-
     /**
      * Start SSE stream
      */
@@ -784,11 +642,6 @@ const SSTV = (function() {
             eventSource.close();
         }
 
-        // Show and init scope
-        const scopePanel = document.getElementById('sstvScopePanel');
-        if (scopePanel) scopePanel.style.display = 'block';
-        initSstvScope();
-
         eventSource = new EventSource('/sstv/stream');
 
         eventSource.onmessage = (e) => {
@@ -796,10 +649,6 @@ const SSTV = (function() {
                 const data = JSON.parse(e.data);
                 if (data.type === 'sstv_progress') {
                     handleProgress(data);
-                } else if (data.type === 'sstv_scope') {
-                    sstvScopeTargetRms = data.rms;
-                    sstvScopeTargetPeak = data.peak;
-                    if (data.tone !== undefined) sstvScopeTone = data.tone;
                 }
             } catch (err) {
                 console.error('Failed to parse SSE message:', err);
@@ -822,9 +671,6 @@ const SSTV = (function() {
             eventSource.close();
             eventSource = null;
         }
-        stopSstvScope();
-        const scopePanel = document.getElementById('sstvScopePanel');
-        if (scopePanel) scopePanel.style.display = 'none';
     }
 
     /**
@@ -845,7 +691,6 @@ const SSTV = (function() {
             renderGallery();
             showNotification('SSTV', 'New image decoded!');
             updateStatusUI('listening', 'Listening...');
-            sstvScopeMsgBurst = 1.0;
             // Clear decode progress so signal monitor can take over
             const liveContent = document.getElementById('sstvLiveContent');
             if (liveContent) liveContent.innerHTML = '';

static/js/modes/wifi.js

@@ -69,40 +69,6 @@ const WiFiMode = (function() {
         return true;
     }
 
-    function getChannelPresetList(preset) {
-        switch (preset) {
-            case '2.4-common':
-                return '1,6,11';
-            case '2.4-all':
-                return '1,2,3,4,5,6,7,8,9,10,11,12,13';
-            case '5-low':
-                return '36,40,44,48';
-            case '5-mid':
-                return '52,56,60,64';
-            case '5-high':
-                return '149,153,157,161,165';
-            default:
-                return '';
-        }
-    }
-
-    function buildChannelConfig() {
-        const preset = document.getElementById('wifiChannelPreset')?.value || '';
-        const listInput = document.getElementById('wifiChannelList')?.value || '';
-        const singleInput = document.getElementById('wifiChannel')?.value || '';
-
-        const listValue = listInput.trim();
-        const presetValue = getChannelPresetList(preset);
-
-        const channels = listValue || presetValue || '';
-        const channel = channels ? null : (singleInput.trim() ? parseInt(singleInput.trim()) : null);
-
-        return {
-            channels: channels || null,
-            channel: Number.isFinite(channel) ? channel : null,
-        };
-    }
-
     // ==========================================================================
     // State
     // ==========================================================================
@@ -497,7 +463,7 @@ const WiFiMode = (function() {
         try {
             const iface = elements.interfaceSelect?.value || null;
             const band = document.getElementById('wifiBand')?.value || 'all';
-            const channelConfig = buildChannelConfig();
+            const channel = document.getElementById('wifiChannel')?.value || null;
             const isAgentMode = typeof currentAgent !== 'undefined' && currentAgent !== 'local';
 
             let response;
@@ -510,8 +476,7 @@ const WiFiMode = (function() {
                         interface: iface,
                         scan_type: 'deep',
                         band: band === 'abg' ? 'all' : band === 'bg' ? '2.4' : '5',
-                        channel: channelConfig.channel,
+                        channel: channel ? parseInt(channel) : null,
-                        channels: channelConfig.channels,
                     }),
                 });
             } else {
@@ -521,8 +486,7 @@ const WiFiMode = (function() {
                     body: JSON.stringify({
                         interface: iface,
                         band: band === 'abg' ? 'all' : band === 'bg' ? '2.4' : '5',
-                        channel: channelConfig.channel,
+                        channel: channel ? parseInt(channel) : null,
-                        channels: channelConfig.channels,
                     }),
                 });
             }

static/vendor/leaflet-heat/leaflet-heat.js

@@ -1,11 +0,0 @@
-/*
- (c) 2014, Vladimir Agafonkin
- simpleheat, a tiny JavaScript library for drawing heatmaps with Canvas
- https://github.com/mourner/simpleheat
-*/
-!function(){"use strict";function t(i){return this instanceof t?(this._canvas=i="string"==typeof i?document.getElementById(i):i,this._ctx=i.getContext("2d"),this._width=i.width,this._height=i.height,this._max=1,void this.clear()):new t(i)}t.prototype={defaultRadius:25,defaultGradient:{.4:"blue",.6:"cyan",.7:"lime",.8:"yellow",1:"red"},data:function(t,i){return this._data=t,this},max:function(t){return this._max=t,this},add:function(t){return this._data.push(t),this},clear:function(){return this._data=[],this},radius:function(t,i){i=i||15;var a=this._circle=document.createElement("canvas"),s=a.getContext("2d"),e=this._r=t+i;return a.width=a.height=2*e,s.shadowOffsetX=s.shadowOffsetY=200,s.shadowBlur=i,s.shadowColor="black",s.beginPath(),s.arc(e-200,e-200,t,0,2*Math.PI,!0),s.closePath(),s.fill(),this},gradient:function(t){var i=document.createElement("canvas"),a=i.getContext("2d"),s=a.createLinearGradient(0,0,0,256);i.width=1,i.height=256;for(var e in t)s.addColorStop(e,t[e]);return a.fillStyle=s,a.fillRect(0,0,1,256),this._grad=a.getImageData(0,0,1,256).data,this},draw:function(t){this._circle||this.radius(this.defaultRadius),this._grad||this.gradient(this.defaultGradient);var i=this._ctx;i.clearRect(0,0,this._width,this._height);for(var a,s=0,e=this._data.length;e>s;s++)a=this._data[s],i.globalAlpha=Math.max(a[2]/this._max,t||.05),i.drawImage(this._circle,a[0]-this._r,a[1]-this._r);var n=i.getImageData(0,0,this._width,this._height);return this._colorize(n.data,this._grad),i.putImageData(n,0,0),this},_colorize:function(t,i){for(var a,s=3,e=t.length;e>s;s+=4)a=4*t[s],a&&(t[s-3]=i[a],t[s-2]=i[a+1],t[s-1]=i[a+2])}},window.simpleheat=t}(),/*
- (c) 2014, Vladimir Agafonkin
- Leaflet.heat, a tiny and fast heatmap plugin for Leaflet.
- https://github.com/Leaflet/Leaflet.heat
-*/
-L.HeatLayer=(L.Layer?L.Layer:L.Class).extend({initialize:function(t,i){this._latlngs=t,L.setOptions(this,i)},setLatLngs:function(t){return this._latlngs=t,this.redraw()},addLatLng:function(t){return this._latlngs.push(t),this.redraw()},setOptions:function(t){return L.setOptions(this,t),this._heat&&this._updateOptions(),this.redraw()},redraw:function(){return!this._heat||this._frame||this._map._animating||(this._frame=L.Util.requestAnimFrame(this._redraw,this)),this},onAdd:function(t){this._map=t,this._canvas||this._initCanvas(),t._panes.overlayPane.appendChild(this._canvas),t.on("moveend",this._reset,this),t.options.zoomAnimation&&L.Browser.any3d&&t.on("zoomanim",this._animateZoom,this),this._reset()},onRemove:function(t){t.getPanes().overlayPane.removeChild(this._canvas),t.off("moveend",this._reset,this),t.options.zoomAnimation&&t.off("zoomanim",this._animateZoom,this)},addTo:function(t){return t.addLayer(this),this},_initCanvas:function(){var t=this._canvas=L.DomUtil.create("canvas","leaflet-heatmap-layer leaflet-layer"),i=L.DomUtil.testProp(["transformOrigin","WebkitTransformOrigin","msTransformOrigin"]);t.style[i]="50% 50%";var a=this._map.getSize();t.width=a.x,t.height=a.y;var s=this._map.options.zoomAnimation&&L.Browser.any3d;L.DomUtil.addClass(t,"leaflet-zoom-"+(s?"animated":"hide")),this._heat=simpleheat(t),this._updateOptions()},_updateOptions:function(){this._heat.radius(this.options.radius||this._heat.defaultRadius,this.options.blur),this.options.gradient&&this._heat.gradient(this.options.gradient),this.options.max&&this._heat.max(this.options.max)},_reset:function(){var t=this._map.containerPointToLayerPoint([0,0]);L.DomUtil.setPosition(this._canvas,t);var i=this._map.getSize();this._heat._width!==i.x&&(this._canvas.width=this._heat._width=i.x),this._heat._height!==i.y&&(this._canvas.height=this._heat._height=i.y),this._redraw()},_redraw:function(){var t,i,a,s,e,n,h,o,r,d=[],_=this._heat._r,l=this._map.getSize(),m=new L.Bounds(L.point([-_,-_]),l.add([_,_])),c=void 0===this.options.max?1:this.options.max,u=void 0===this.options.maxZoom?this._map.getMaxZoom():this.options.maxZoom,f=1/Math.pow(2,Math.max(0,Math.min(u-this._map.getZoom(),12))),g=_/2,p=[],v=this._map._getMapPanePos(),w=v.x%g,y=v.y%g;for(t=0,i=this._latlngs.length;i>t;t++)if(a=this._map.latLngToContainerPoint(this._latlngs[t]),m.contains(a)){e=Math.floor((a.x-w)/g)+2,n=Math.floor((a.y-y)/g)+2;var x=void 0!==this._latlngs[t].alt?this._latlngs[t].alt:void 0!==this._latlngs[t][2]?+this._latlngs[t][2]:1;r=x*f,p[n]=p[n]||[],s=p[n][e],s?(s[0]=(s[0]*s[2]+a.x*r)/(s[2]+r),s[1]=(s[1]*s[2]+a.y*r)/(s[2]+r),s[2]+=r):p[n][e]=[a.x,a.y,r]}for(t=0,i=p.length;i>t;t++)if(p[t])for(h=0,o=p[t].length;o>h;h++)s=p[t][h],s&&d.push([Math.round(s[0]),Math.round(s[1]),Math.min(s[2],c)]);this._heat.data(d).draw(this.options.minOpacity),this._frame=null},_animateZoom:function(t){var i=this._map.getZoomScale(t.zoom),a=this._map._getCenterOffset(t.center)._multiplyBy(-i).subtract(this._map._getMapPanePos());L.DomUtil.setTransform?L.DomUtil.setTransform(this._canvas,a,i):this._canvas.style[L.DomUtil.TRANSFORM]=L.DomUtil.getTranslateString(a)+" scale("+i+")"}}),L.heatLayer=function(t,i){return new L.HeatLayer(t,i)};

templates/adsb_dashboard.html

@@ -223,88 +223,6 @@
                     </div>
                 </div>
             </div>
-
-            <!-- Antenna Guide Panel -->
-            <div class="panel" id="antennaGuidePanel">
-                <div class="panel-header" style="cursor: pointer;" onclick="document.getElementById('antennaGuideContent').style.display = document.getElementById('antennaGuideContent').style.display === 'none' ? 'block' : 'none'; this.querySelector('.panel-toggle').textContent = document.getElementById('antennaGuideContent').style.display === 'none' ? '&#9654;' : '&#9660;';">
-                    <span>ANTENNA GUIDE</span>
-                    <span class="panel-toggle" style="font-size: 10px; color: var(--text-muted);">&#9654;</span>
-                </div>
-                <div id="antennaGuideContent" style="display: none; padding: 10px; font-size: 11px; color: var(--text-secondary); line-height: 1.5;">
-                    <p style="margin-bottom: 8px; color: var(--accent-cyan); font-weight: 600;">
-                        1090 MHz &mdash; stock SDR antenna can work but is not ideal
-                    </p>
-
-                    <div style="background: rgba(0,0,0,0.3); border: 1px solid var(--border-color); border-radius: 4px; padding: 8px; margin-bottom: 8px;">
-                        <strong style="color: var(--accent-cyan); font-size: 11px;">Stock Telescopic Antenna</strong>
-                        <ul style="margin: 4px 0 0 14px; padding: 0; font-size: 10px;">
-                            <li><strong style="color: var(--text-primary);">1090 MHz:</strong> Collapse to ~6.9 cm (quarter-wave). It works for nearby aircraft</li>
-                            <li><strong style="color: var(--text-primary);">Range:</strong> Expect ~50 NM (90 km) indoors, ~100 NM outdoors</li>
-                        </ul>
-                    </div>
-
-                    <div style="background: rgba(0,0,0,0.3); border: 1px solid var(--border-color); border-radius: 4px; padding: 8px; margin-bottom: 8px;">
-                        <strong style="color: #00ff88; font-size: 11px;">Recommended: 1090 MHz Collinear (~$10-20 DIY)</strong>
-                        <ul style="margin: 4px 0 0 14px; padding: 0; font-size: 10px;">
-                            <li><strong style="color: var(--text-primary);">Design:</strong> 8 coaxial collinear elements from RG-6 coax cable</li>
-                            <li><strong style="color: var(--text-primary);">Element length:</strong> ~6.9 cm segments soldered alternating center/shield</li>
-                            <li><strong style="color: var(--text-primary);">Gain:</strong> ~5&ndash;7 dBi omnidirectional, ideal for 360&deg; coverage</li>
-                            <li><strong style="color: var(--text-primary);">Range:</strong> 150&ndash;250+ NM depending on height and LOS</li>
-                        </ul>
-                    </div>
-
-                    <div style="background: rgba(0,0,0,0.3); border: 1px solid var(--border-color); border-radius: 4px; padding: 8px; margin-bottom: 8px;">
-                        <strong style="color: var(--accent-cyan); font-size: 11px;">Commercial Options</strong>
-                        <ul style="margin: 4px 0 0 14px; padding: 0; font-size: 10px;">
-                            <li><strong style="color: var(--text-primary);">FlightAware antenna:</strong> ~$35, 1090 MHz tuned, 66cm fiberglass whip</li>
-                            <li><strong style="color: var(--text-primary);">ADSBexchange whip:</strong> ~$40, similar performance</li>
-                            <li><strong style="color: var(--text-primary);">Jetvision A3:</strong> ~$50, high-gain 1090 MHz collinear</li>
-                        </ul>
-                    </div>
-
-                    <div style="background: rgba(0,0,0,0.3); border: 1px solid var(--border-color); border-radius: 4px; padding: 8px; margin-bottom: 8px;">
-                        <strong style="color: var(--accent-cyan); font-size: 11px;">Placement & LNA</strong>
-                        <ul style="margin: 4px 0 0 14px; padding: 0; font-size: 10px;">
-                            <li><strong style="color: var(--text-primary);">Location:</strong> OUTDOORS, as high as possible. Roof or mast mount</li>
-                            <li><strong style="color: var(--text-primary);">Height:</strong> Every 3m higher adds ~10 NM range (line-of-sight)</li>
-                            <li><strong style="color: var(--text-primary);">LNA:</strong> 1090 MHz filtered LNA at antenna feed (e.g. Uputronics, ~$30)</li>
-                            <li><strong style="color: var(--text-primary);">Filter:</strong> A 1090 MHz bandpass filter removes cell/FM interference</li>
-                            <li><strong style="color: var(--text-primary);">Coax:</strong> Keep short. At 1090 MHz, RG-58 loses ~10 dB per 10m</li>
-                            <li><strong style="color: var(--text-primary);">Bias-T:</strong> Enable Bias-T in controls above if LNA is powered via coax</li>
-                        </ul>
-                    </div>
-
-                    <div style="background: rgba(0,0,0,0.3); border: 1px solid var(--border-color); border-radius: 4px; padding: 8px;">
-                        <strong style="color: var(--accent-cyan); font-size: 11px;">Quick Reference</strong>
-                        <table style="width: 100%; margin-top: 4px; font-size: 10px; border-collapse: collapse;">
-                            <tr style="border-bottom: 1px solid var(--border-color);">
-                                <td style="padding: 2px 4px; color: var(--text-dim);">ADS-B frequency</td>
-                                <td style="padding: 2px 4px; color: var(--text-primary); text-align: right;">1090 MHz</td>
-                            </tr>
-                            <tr style="border-bottom: 1px solid var(--border-color);">
-                                <td style="padding: 2px 4px; color: var(--text-dim);">Quarter-wave length</td>
-                                <td style="padding: 2px 4px; color: var(--text-primary); text-align: right;">6.9 cm</td>
-                            </tr>
-                            <tr style="border-bottom: 1px solid var(--border-color);">
-                                <td style="padding: 2px 4px; color: var(--text-dim);">Modulation</td>
-                                <td style="padding: 2px 4px; color: var(--text-primary); text-align: right;">PPM (pulse)</td>
-                            </tr>
-                            <tr style="border-bottom: 1px solid var(--border-color);">
-                                <td style="padding: 2px 4px; color: var(--text-dim);">Polarization</td>
-                                <td style="padding: 2px 4px; color: var(--text-primary); text-align: right;">Vertical</td>
-                            </tr>
-                            <tr style="border-bottom: 1px solid var(--border-color);">
-                                <td style="padding: 2px 4px; color: var(--text-dim);">Bandwidth</td>
-                                <td style="padding: 2px 4px; color: var(--text-primary); text-align: right;">~2 MHz</td>
-                            </tr>
-                            <tr>
-                                <td style="padding: 2px 4px; color: var(--text-dim);">Typical range (outdoor)</td>
-                                <td style="padding: 2px 4px; color: var(--text-primary); text-align: right;">100&ndash;250 NM</td>
-                            </tr>
-                        </table>
-                    </div>
-                </div>
-            </div>
         </div>
 
         <!-- Controls Bar - Reorganized -->
@@ -2537,6 +2455,7 @@ sudo make install</code>
                 // Check for remote dump1090 config (only for local mode)
                 const remoteConfig = !useAgent ? getRemoteDump1090Config() : null;
                 if (remoteConfig === false) return;
+
                 // Check for agent SDR conflicts
                 if (useAgent && typeof checkAgentModeConflict === 'function') {
                     if (!checkAgentModeConflict('adsb')) {
@@ -2555,6 +2474,7 @@ sudo make install</code>
                     requestBody.remote_sbs_host = remoteConfig.host;
                     requestBody.remote_sbs_port = remoteConfig.port;
                 }
+
                 try {
                     // Route through agent proxy if using remote agent
                     const url = useAgent
@@ -3869,9 +3789,7 @@ sudo make install</code>
         }
 
         function startAcars() {
-            const acarsSelect = document.getElementById('acarsDeviceSelect');
+            const device = document.getElementById('acarsDeviceSelect').value;
-            const device = acarsSelect.value;
-            const sdr_type = acarsSelect.selectedOptions[0]?.dataset.sdrType || 'rtlsdr';
             const frequencies = getAcarsRegionFreqs();
 
             // Check if using agent mode
@@ -3897,7 +3815,7 @@ sudo make install</code>
             fetch(endpoint, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ device, frequencies, gain: '40', sdr_type })
+                body: JSON.stringify({ device, frequencies, gain: '40' })
             })
             .then(r => r.json())
             .then(data => {
@@ -4103,7 +4021,6 @@ sudo make install</code>
                         devices.forEach((d, i) => {
                             const opt = document.createElement('option');
                             opt.value = d.index || i;
-                            opt.dataset.sdrType = d.sdr_type || 'rtlsdr';
                             opt.textContent = `SDR ${d.index || i}: ${d.name || d.type || 'SDR'}`;
                             select.appendChild(opt);
                         });
@@ -4883,7 +4800,6 @@ sudo make install</code>
                     devices.forEach(device => {
                         const opt = document.createElement('option');
                         opt.value = device.index;
-                        opt.dataset.sdrType = device.sdr_type || 'rtlsdr';
                         opt.textContent = `SDR ${device.index}: ${device.name || device.type || 'SDR'}`;
                         select.appendChild(opt);
                     });

templates/partials/modes/ais.html

@@ -26,75 +26,6 @@
         </div>
     </div>
 
-    <!-- Antenna Guide -->
-    <div class="section">
-        <h3>Antenna Guide</h3>
-        <div style="font-size: 11px; color: var(--text-dim); line-height: 1.5;">
-            <p style="margin-bottom: 8px; color: var(--accent-cyan); font-weight: 600;">
-                Marine VHF band (162 MHz) &mdash; stock SDR antenna will NOT work well
-            </p>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Simple Dipole (Cheapest)</strong>
-                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                    <li><strong style="color: var(--text-primary);">Element length:</strong> ~46 cm each (quarter-wave at 162 MHz)</li>
-                    <li><strong style="color: var(--text-primary);">Material:</strong> Wire, coat hanger, or copper rod</li>
-                    <li><strong style="color: var(--text-primary);">Orientation:</strong> Vertical (AIS is vertically polarized)</li>
-                    <li><strong style="color: var(--text-primary);">Placement:</strong> As high as possible with clear view of the water/harbor</li>
-                </ul>
-            </div>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Commercial Options</strong>
-                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                    <li><strong style="color: var(--text-primary);">Marine VHF whip:</strong> ~$20&ndash;50, designed for 156&ndash;163 MHz band</li>
-                    <li><strong style="color: var(--text-primary);">Discone:</strong> ~$30&ndash;50, wideband coverage including marine VHF</li>
-                    <li><strong style="color: var(--text-primary);">Collinear:</strong> Higher gain (~6 dBi), best for coastal monitoring</li>
-                </ul>
-            </div>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Placement Tips</strong>
-                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                    <li><strong style="color: var(--text-primary);">Height is critical:</strong> AIS is line-of-sight. Roof or mast mount is ideal</li>
-                    <li><strong style="color: var(--text-primary);">Range:</strong> At 10m height, expect ~25 NM (46 km) range over water</li>
-                    <li><strong style="color: var(--text-primary);">LNA:</strong> Nooelec Lana or similar broadband LNA, mount at antenna</li>
-                    <li><strong style="color: var(--text-primary);">Coax:</strong> Keep cable short. RG-58 loses ~4 dB per 10m at 162 MHz</li>
-                </ul>
-            </div>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Quick Reference</strong>
-                <table style="width: 100%; margin-top: 6px; font-size: 10px; border-collapse: collapse;">
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">AIS Channel A</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">161.975 MHz</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">AIS Channel B</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">162.025 MHz</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Quarter-wave length</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">46 cm</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Modulation</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">GMSK 9600 baud</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Bandwidth</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">25 kHz</td>
-                    </tr>
-                    <tr>
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Polarization</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">Vertical</td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </div>
-
     <button class="run-btn" id="startAisBtn" onclick="startAisTracking()">
         Start AIS Tracking
     </button>

templates/partials/modes/aprs.html

@@ -13,59 +13,4 @@
                             <span style="color: var(--accent-cyan);">Controls in function bar above map</span>
                         </div>
                     </div>
-
-                    <!-- Antenna Guide -->
-                    <div class="section">
-                        <h3>Antenna Guide</h3>
-                        <div style="font-size: 11px; color: var(--text-dim); line-height: 1.5;">
-                            <p style="margin-bottom: 8px; color: var(--accent-cyan); font-weight: 600;">
-                                2m band (144&ndash;148 MHz) &mdash; stock SDR antenna will NOT work
-                            </p>
-
-                            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                                <strong style="color: var(--accent-cyan); font-size: 12px;">Simple Dipole (Easiest)</strong>
-                                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                                    <li><strong style="color: var(--text-primary);">Element length:</strong> ~51.5 cm each (quarter-wave at 144.39 MHz)</li>
-                                    <li><strong style="color: var(--text-primary);">Material:</strong> Wire, coat hanger, or copper rod</li>
-                                    <li><strong style="color: var(--text-primary);">Orientation:</strong> Vertical (APRS is FM, vertically polarized)</li>
-                                    <li><strong style="color: var(--text-primary);">Connection:</strong> Center conductor to one element, shield to the other</li>
-                                </ul>
-                            </div>
-
-                            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                                <strong style="color: var(--accent-cyan); font-size: 12px;">Commercial Options</strong>
-                                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                                    <li><strong style="color: var(--text-primary);">Mag-mount 2m whip:</strong> ~$15&ndash;25, good mobile/portable option</li>
-                                    <li><strong style="color: var(--text-primary);">2m/70cm dual-band:</strong> ~$20&ndash;40, also covers 70cm ham band</li>
-                                    <li><strong style="color: var(--text-primary);">Discone:</strong> ~$30&ndash;50, wideband but lower gain on 2m</li>
-                                </ul>
-                            </div>
-
-                            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px;">
-                                <strong style="color: var(--accent-cyan); font-size: 12px;">Quick Reference</strong>
-                                <table style="width: 100%; margin-top: 6px; font-size: 10px; border-collapse: collapse;">
-                                    <tr style="border-bottom: 1px solid var(--border-color);">
-                                        <td style="padding: 3px 4px; color: var(--text-dim);">APRS freq (N. America)</td>
-                                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">144.390 MHz</td>
-                                    </tr>
-                                    <tr style="border-bottom: 1px solid var(--border-color);">
-                                        <td style="padding: 3px 4px; color: var(--text-dim);">APRS freq (Europe)</td>
-                                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">144.800 MHz</td>
-                                    </tr>
-                                    <tr style="border-bottom: 1px solid var(--border-color);">
-                                        <td style="padding: 3px 4px; color: var(--text-dim);">Quarter-wave length</td>
-                                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">51.5 cm</td>
-                                    </tr>
-                                    <tr style="border-bottom: 1px solid var(--border-color);">
-                                        <td style="padding: 3px 4px; color: var(--text-dim);">Modulation</td>
-                                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">FM 1200 baud</td>
-                                    </tr>
-                                    <tr>
-                                        <td style="padding: 3px 4px; color: var(--text-dim);">Polarization</td>
-                                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">Vertical</td>
-                                    </tr>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
                 </div>

templates/partials/modes/bluetooth.html

@@ -1,18 +1,20 @@
 <!-- BLUETOOTH MODE -->
                 <div id="bluetoothMode" class="mode-content">
-                    <div class="section">
+                    <!-- Capability Status -->
-                        <h3>Scanner Configuration</h3>
+                    <div id="btCapabilityStatus" class="section" style="display: none;">
                         <!-- Populated by JavaScript with capability warnings -->
-                        <div id="btCapabilityStatus" style="display: none; margin-bottom: 8px;"></div>
+                    </div>
 
                     <!-- Show All Agents option (visible when agents are available) -->
-                        <div id="btShowAllAgentsContainer" style="display: none; margin-bottom: 8px;">
+                    <div id="btShowAllAgentsContainer" class="section" style="display: none; padding: 8px;">
                         <label class="inline-checkbox" style="font-size: 10px;">
                             <input type="checkbox" id="btShowAllAgents" onchange="if(typeof BluetoothMode !== 'undefined') BluetoothMode.toggleShowAllAgents(this.checked)">
                             Show devices from all agents
                         </label>
                     </div>
 
+                    <div class="section">
+                        <h3>Scanner Configuration</h3>
                         <div class="form-group">
                             <label>Adapter</label>
                             <select id="btAdapterSelect">
@@ -26,7 +28,6 @@
                                 <option value="bleak">Bleak Library</option>
                                 <option value="hcitool">hcitool (Linux)</option>
                                 <option value="bluetoothctl">bluetoothctl (Linux)</option>
-                                <option value="ubertooth" id="btScanModeUbertooth" style="display:none;">Ubertooth One</option>
                             </select>
                         </div>
                         <div class="form-group">
@@ -60,7 +61,7 @@
                         Stop Scanning
                     </button>
 
-                    <div class="section">
+                    <div class="section" style="margin-top: 10px;">
                         <h3>Export</h3>
                         <div style="display: flex; gap: 8px;">
                             <button class="preset-btn" onclick="btExport('csv')" style="flex: 1;">

templates/partials/modes/bt_locate.html

@@ -1,72 +0,0 @@
-<!-- BT LOCATE MODE -->
-<div id="btLocateMode" class="mode-content">
-    <div class="section">
-        <h3>BT Locate</h3>
-        <p class="info-text" style="font-size: 11px; color: var(--text-dim); margin-bottom: 12px;">
-            SAR Bluetooth device location &mdash; GPS-tagged signal trail mapping with proximity alerts for locating missing persons' devices.
-        </p>
-    </div>
-
-    <!-- Target Lock -->
-    <div class="section">
-        <h3>Target</h3>
-        <div id="btLocateHandoffCard" style="display: none; background: rgba(0,255,136,0.08); border: 1px solid rgba(0,255,136,0.3); border-radius: 6px; padding: 8px; margin-bottom: 8px;">
-            <div style="display: flex; justify-content: space-between; align-items: center;">
-                <span style="font-size: 10px; color: var(--accent-green); text-transform: uppercase; font-weight: 600;">Handed off from BT</span>
-                <button onclick="BtLocate.clearHandoff()" style="background: none; border: none; color: var(--text-dim); cursor: pointer; font-size: 10px;">&times;</button>
-            </div>
-            <div id="btLocateHandoffName" style="font-size: 12px; font-weight: 600; color: var(--text-primary); margin-top: 4px;"></div>
-            <div id="btLocateHandoffMeta" style="font-size: 10px; color: var(--text-dim); font-family: var(--font-mono);"></div>
-        </div>
-
-        <label class="input-label">MAC Address</label>
-        <input type="text" id="btLocateMac" class="text-input" placeholder="AA:BB:CC:DD:EE:FF" style="font-family: var(--font-mono); font-size: 11px;">
-
-        <label class="input-label" style="margin-top: 6px;">Name Pattern</label>
-        <input type="text" id="btLocateNamePattern" class="text-input" placeholder="iPhone, Galaxy, etc.">
-
-        <label class="input-label" style="margin-top: 6px;">IRK (hex, optional)</label>
-        <div style="display: flex; gap: 4px; align-items: center;">
-            <input type="text" id="btLocateIrk" class="text-input" placeholder="32 hex chars for RPA resolution" style="font-family: var(--font-mono); font-size: 10px; flex: 1;">
-            <button class="btl-detect-irk-btn" id="btLocateDetectIrkBtn" onclick="BtLocate.fetchPairedIrks()" title="Detect IRKs from paired devices">Detect</button>
-        </div>
-        <div id="btLocateIrkPicker" class="btl-irk-picker" style="display: none;">
-            <div id="btLocateIrkPickerStatus" class="btl-irk-picker-status"></div>
-            <div id="btLocateIrkPickerList" class="btl-irk-picker-list"></div>
-        </div>
-    </div>
-
-    <!-- Environment Preset -->
-    <div class="section">
-        <h3>Environment</h3>
-        <div class="btl-env-grid">
-            <button class="btl-env-btn" data-env="FREE_SPACE" onclick="BtLocate.setEnvironment('FREE_SPACE')">
-                <span class="btl-env-icon">&#127968;</span>
-                <span class="btl-env-label">Open Field</span>
-                <span class="btl-env-n">n=2.0</span>
-            </button>
-            <button class="btl-env-btn active" data-env="OUTDOOR" onclick="BtLocate.setEnvironment('OUTDOOR')">
-                <span class="btl-env-icon">&#127795;</span>
-                <span class="btl-env-label">Outdoor</span>
-                <span class="btl-env-n">n=2.2</span>
-            </button>
-            <button class="btl-env-btn" data-env="INDOOR" onclick="BtLocate.setEnvironment('INDOOR')">
-                <span class="btl-env-icon">&#127970;</span>
-                <span class="btl-env-label">Indoor</span>
-                <span class="btl-env-n">n=3.0</span>
-            </button>
-        </div>
-    </div>
-
-    <!-- Controls -->
-    <div class="section">
-        <div style="display: flex; gap: 6px;">
-            <button class="run-btn" id="btLocateStartBtn" onclick="BtLocate.start()">Start Locate</button>
-            <button class="stop-btn" id="btLocateStopBtn" onclick="BtLocate.stop()" style="display: none;">Stop</button>
-        </div>
-        <div id="btLocateScanStatus" style="display: none; margin-top: 6px; font-size: 10px; color: var(--text-dim);">
-            <span id="btLocateScanDot" style="display: inline-block; width: 6px; height: 6px; border-radius: 50%; background: #22c55e; margin-right: 4px; vertical-align: middle;"></span>
-            <span id="btLocateScanText">BT scanner active</span>
-        </div>
-    </div>
-</div>

templates/partials/modes/dmr.html

@@ -2,9 +2,6 @@
                 <div id="dmrMode" class="mode-content">
                     <div class="section">
                         <h3>Digital Voice</h3>
-                        <div class="alpha-mode-notice">
-                            ALPHA: Digital Voice decoding is still in active development. Expect occasional decode instability and false protocol locks.
-                        </div>
 
                         <!-- Dependency Warning -->
                         <div id="dmrToolsWarning" style="display: none; background: rgba(255, 100, 100, 0.1); border: 1px solid var(--accent-red); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
@@ -22,59 +19,28 @@
                         <div class="form-group">
                             <label>Protocol</label>
                             <select id="dmrProtocol">
-                                <option value="auto" selected>Auto Detect (DMR/P25/D-STAR)</option>
+                                <option value="auto" selected>Auto Detect</option>
                                 <option value="dmr">DMR</option>
                                 <option value="p25">P25</option>
                                 <option value="nxdn">NXDN</option>
                                 <option value="dstar">D-STAR</option>
                                 <option value="provoice">ProVoice</option>
                             </select>
-                            <span style="font-size: 0.75em; color: var(--text-muted); display: block; margin-top: 2px;">
-                                For NXDN and ProVoice, use manual protocol selection for best lock reliability
-                            </span>
                         </div>
 
                         <div class="form-group">
                             <label>Gain</label>
                             <input type="number" id="dmrGain" value="40" min="0" max="50" style="width: 100%;">
                         </div>
-
-                        <div class="form-group">
-                            <label>PPM Correction</label>
-                            <input type="number" id="dmrPPM" value="0" min="-200" max="200" step="1" style="width: 100%;"
-                                   title="Frequency error correction for your RTL-SDR dongle. Digital voice is very sensitive to frequency offset.">
                     </div>
 
-                        <div class="form-group" style="margin-top: 4px;">
+                    <!-- Actions -->
-                            <label style="display: flex; align-items: center; gap: 8px; cursor: pointer;">
+                    <button class="run-btn" id="startDmrBtn" onclick="startDmr()" style="margin-top: 12px;">
-                                <input type="checkbox" id="dmrRelaxCrc" style="width: auto; accent-color: var(--accent-cyan);">
+                        Start Decoder
-                                <span>Relax CRC (weak signals)</span>
+                    </button>
-                            </label>
+                    <button class="stop-btn" id="stopDmrBtn" onclick="stopDmr()" style="display: none; margin-top: 12px;">
-                            <span style="font-size: 0.75em; color: var(--text-muted); display: block; margin-top: 2px;">
+                        Stop Decoder
-                                Allows more frames through on marginal signals at the cost of occasional errors
+                    </button>
-                            </span>
-                        </div>
-                    </div>
-
-                    <!-- Bookmarks -->
-                    <div class="section" style="margin-top: 8px;">
-                        <h3>Bookmarks</h3>
-                        <div style="display: flex; gap: 4px; margin-bottom: 6px;">
-                            <input type="number" id="dmrBookmarkFreq" placeholder="Freq MHz" step="0.0001"
-                                   style="flex: 1; font-size: 11px; padding: 4px 6px;">
-                            <button class="preset-btn" onclick="addDmrBookmark()" style="font-size: 10px; padding: 4px 8px;"
-                                    title="Add bookmark">+</button>
-                        </div>
-                        <div style="display: flex; gap: 4px; margin-bottom: 6px;">
-                            <input type="text" id="dmrBookmarkLabel" placeholder="Label (optional)"
-                                   style="flex: 1; font-size: 11px; padding: 4px 6px;">
-                            <button class="preset-btn" onclick="addCurrentDmrFreqBookmark()" style="font-size: 9px; padding: 4px 6px;"
-                                    title="Save current frequency">Save current</button>
-                        </div>
-                        <div id="dmrBookmarksList" style="max-height: 150px; overflow-y: auto;">
-                            <div style="color: var(--text-muted); text-align: center; padding: 10px; font-size: 11px;">No bookmarks saved</div>
-                        </div>
-                    </div>
 
                     <!-- Current Call -->
                     <div class="section" style="margin-top: 12px;">
@@ -102,13 +68,4 @@
                             </div>
                         </div>
                     </div>
-
-                    <div class="mode-actions-bottom">
-                        <button class="run-btn" id="startDmrBtn" onclick="startDmr()">
-                            Start Decoder
-                        </button>
-                        <button class="stop-btn" id="stopDmrBtn" onclick="stopDmr()" style="display: none;">
-                            Stop Decoder
-                        </button>
-                    </div>
                 </div>

templates/partials/modes/gps.html

@@ -1,126 +0,0 @@
-<!-- GPS MODE -->
-<div id="gpsMode" class="mode-content">
-    <div class="section">
-        <h3>GPS Receiver</h3>
-        <p class="info-text" style="font-size: 11px; color: var(--text-dim); margin-bottom: 12px;">
-            Display live GPS data from gpsd &mdash; satellite sky view, signal strengths, position, velocity, DOP values, and timing.
-        </p>
-    </div>
-
-    <!-- Connection -->
-    <div class="section">
-        <h3>Connection</h3>
-        <div class="gps-connection-status">
-            <span class="gps-status-dot" id="gpsStatusDot"></span>
-            <span class="gps-status-text" id="gpsStatusText">Disconnected</span>
-        </div>
-        <div id="gpsDevicePath" style="font-size: 10px; color: var(--text-dim); margin-top: 4px; font-family: var(--font-mono);"></div>
-        <div style="display: flex; gap: 6px; margin-top: 8px;">
-            <button class="run-btn" id="gpsConnectBtn" onclick="GPS.connect()">Connect</button>
-            <button class="stop-btn" id="gpsDisconnectBtn" onclick="GPS.disconnect()" style="display: none;">Disconnect</button>
-        </div>
-    </div>
-
-    <!-- Fix Info -->
-    <div class="section">
-        <h3>Fix</h3>
-        <div class="gps-info-grid">
-            <div class="gps-info-item">
-                <span class="gps-info-label">Fix Type</span>
-                <span class="gps-info-value" id="gpsFixType">---</span>
-            </div>
-            <div class="gps-info-item">
-                <span class="gps-info-label">Satellites</span>
-                <span class="gps-info-value"><span id="gpsSatUsed">-</span> / <span id="gpsSatTotal">-</span></span>
-            </div>
-        </div>
-    </div>
-
-    <!-- Position -->
-    <div class="section">
-        <h3>Position</h3>
-        <div class="gps-info-grid">
-            <div class="gps-info-item">
-                <span class="gps-info-label">Latitude</span>
-                <span class="gps-info-value gps-mono" id="gpsLat">---</span>
-            </div>
-            <div class="gps-info-item">
-                <span class="gps-info-label">Longitude</span>
-                <span class="gps-info-value gps-mono" id="gpsLon">---</span>
-            </div>
-            <div class="gps-info-item">
-                <span class="gps-info-label">Altitude</span>
-                <span class="gps-info-value gps-mono" id="gpsAlt">---</span>
-            </div>
-            <div class="gps-info-item">
-                <span class="gps-info-label">Speed</span>
-                <span class="gps-info-value gps-mono" id="gpsSpeed">---</span>
-            </div>
-            <div class="gps-info-item">
-                <span class="gps-info-label">Heading</span>
-                <span class="gps-info-value gps-mono" id="gpsHeading">---</span>
-            </div>
-            <div class="gps-info-item">
-                <span class="gps-info-label">Climb</span>
-                <span class="gps-info-value gps-mono" id="gpsClimb">---</span>
-            </div>
-        </div>
-    </div>
-
-    <!-- DOP Values -->
-    <div class="section">
-        <h3>Dilution of Precision</h3>
-        <div class="gps-info-grid">
-            <div class="gps-info-item">
-                <span class="gps-info-label">HDOP</span>
-                <span class="gps-info-value gps-mono" id="gpsHdop">---</span>
-            </div>
-            <div class="gps-info-item">
-                <span class="gps-info-label">VDOP</span>
-                <span class="gps-info-value gps-mono" id="gpsVdop">---</span>
-            </div>
-            <div class="gps-info-item">
-                <span class="gps-info-label">PDOP</span>
-                <span class="gps-info-value gps-mono" id="gpsPdop">---</span>
-            </div>
-            <div class="gps-info-item">
-                <span class="gps-info-label">TDOP</span>
-                <span class="gps-info-value gps-mono" id="gpsTdop">---</span>
-            </div>
-            <div class="gps-info-item">
-                <span class="gps-info-label">GDOP</span>
-                <span class="gps-info-value gps-mono" id="gpsGdop">---</span>
-            </div>
-        </div>
-    </div>
-
-    <!-- Error Estimates -->
-    <div class="section">
-        <h3>Error Estimates</h3>
-        <div class="gps-info-grid">
-            <div class="gps-info-item">
-                <span class="gps-info-label">EPH (horiz)</span>
-                <span class="gps-info-value gps-mono" id="gpsEph">---</span>
-            </div>
-            <div class="gps-info-item">
-                <span class="gps-info-label">EPV (vert)</span>
-                <span class="gps-info-value gps-mono" id="gpsEpv">---</span>
-            </div>
-            <div class="gps-info-item">
-                <span class="gps-info-label">EPS (speed)</span>
-                <span class="gps-info-value gps-mono" id="gpsEps">---</span>
-            </div>
-        </div>
-    </div>
-
-    <!-- Timing -->
-    <div class="section">
-        <h3>GPS Time</h3>
-        <div class="gps-info-grid">
-            <div class="gps-info-item" style="grid-column: 1 / -1;">
-                <span class="gps-info-label">UTC</span>
-                <span class="gps-info-value gps-mono" id="gpsTime" style="font-size: 14px;">---</span>
-            </div>
-        </div>
-    </div>
-</div>

templates/partials/modes/listening-post.html

@@ -61,8 +61,35 @@
                             <div id="signalGuessExplanation" style="color: var(--text-muted); font-size: 10px; margin-bottom: 6px;"></div>
                             <div id="signalGuessTags" style="display: flex; flex-wrap: wrap; gap: 3px;"></div>
                             <div id="signalGuessAlternatives" style="margin-top: 6px; font-size: 10px; color: var(--text-muted);"></div>
-                            <div id="signalGuessSendTo" style="margin-top: 8px; display: none;"></div>
                         </div>
                     </div>
 
+                    <!-- Waterfall Controls -->
+                    <div class="section">
+                        <h3>Waterfall</h3>
+                        <div class="form-group" style="margin-bottom: 6px;">
+                            <label style="font-size: 10px;">Start (MHz)</label>
+                            <input type="number" id="waterfallStartFreq" value="88" step="0.1" style="width: 100%; padding: 5px; background: var(--bg-secondary); border: 1px solid var(--border-color); color: var(--text-primary); border-radius: 4px; font-size: 11px;">
+                        </div>
+                        <div class="form-group" style="margin-bottom: 6px;">
+                            <label style="font-size: 10px;">End (MHz)</label>
+                            <input type="number" id="waterfallEndFreq" value="108" step="0.1" style="width: 100%; padding: 5px; background: var(--bg-secondary); border: 1px solid var(--border-color); color: var(--text-primary); border-radius: 4px; font-size: 11px;">
+                        </div>
+                        <div class="form-group" style="margin-bottom: 6px;">
+                            <label style="font-size: 10px;">Bin Size</label>
+                            <select id="waterfallBinSize" style="width: 100%; padding: 5px; background: var(--bg-secondary); border: 1px solid var(--border-color); color: var(--text-primary); border-radius: 4px; font-size: 11px;">
+                                <option value="5000">5 kHz</option>
+                                <option value="10000" selected>10 kHz</option>
+                                <option value="25000">25 kHz</option>
+                                <option value="100000">100 kHz</option>
+                            </select>
+                        </div>
+                        <div class="form-group" style="margin-bottom: 8px;">
+                            <label style="font-size: 10px;">Gain</label>
+                            <input type="number" id="waterfallGain" value="40" min="0" max="50" style="width: 100%; padding: 5px; background: var(--bg-secondary); border: 1px solid var(--border-color); color: var(--text-primary); border-radius: 4px; font-size: 11px;">
+                        </div>
+                        <button class="run-btn" id="startWaterfallBtn" onclick="startWaterfall()" style="width: 100%; padding: 8px;">Start Waterfall</button>
+                        <button class="stop-btn" id="stopWaterfallBtn" onclick="stopWaterfall()" style="display: none; width: 100%; padding: 8px; margin-top: 4px;">Stop Waterfall</button>
+                    </div>
+
                 </div>

templates/partials/modes/meshtastic.html

@@ -55,74 +55,6 @@
                 </a>
             </div>
         </div>
-
-        <!-- Antenna Guide -->
-        <div class="section">
-            <h3>Antenna Guide</h3>
-            <div style="font-size: 11px; color: var(--text-dim); line-height: 1.5;">
-                <p style="margin-bottom: 8px; color: var(--accent-cyan); font-weight: 600;">
-                    LoRa ISM band &mdash; frequency depends on region
-                </p>
-
-                <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                    <strong style="color: var(--accent-cyan); font-size: 12px;">Stock Device Antenna</strong>
-                    <ul style="margin: 6px 0 0 14px; padding: 0;">
-                        <li><strong style="color: var(--text-primary);">Most devices:</strong> Ship with a small 915/868 MHz stubby antenna</li>
-                        <li><strong style="color: var(--text-primary);">Works for:</strong> Short range (&lt; 1 km) urban, indoor testing</li>
-                        <li><strong style="color: var(--text-primary);">Upgrade:</strong> Replace with tuned antenna for 5&ndash;20x range improvement</li>
-                    </ul>
-                </div>
-
-                <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                    <strong style="color: #00ff88; font-size: 12px;">Recommended Upgrades</strong>
-                    <ul style="margin: 6px 0 0 14px; padding: 0;">
-                        <li><strong style="color: var(--text-primary);">Whip antenna:</strong> ~$8&ndash;15, tuned 915/868 MHz, SMA connector</li>
-                        <li><strong style="color: var(--text-primary);">Ground plane:</strong> 8.2 cm vertical + 4 radials (915 MHz) on SMA</li>
-                        <li><strong style="color: var(--text-primary);">Yagi:</strong> ~$15&ndash;30, directional, great for point-to-point links</li>
-                        <li><strong style="color: var(--text-primary);">Collinear:</strong> ~$20&ndash;40, omnidirectional with higher gain (~5&ndash;8 dBi)</li>
-                    </ul>
-                </div>
-
-                <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                    <strong style="color: var(--accent-cyan); font-size: 12px;">Placement Tips</strong>
-                    <ul style="margin: 6px 0 0 14px; padding: 0;">
-                        <li><strong style="color: var(--text-primary);">Height wins:</strong> Elevating antenna 10m can double or triple range</li>
-                        <li><strong style="color: var(--text-primary);">Line of sight:</strong> LoRa works best with clear LOS to other nodes</li>
-                        <li><strong style="color: var(--text-primary);">Connector:</strong> Most devices use SMA or RP-SMA &mdash; check before buying</li>
-                    </ul>
-                </div>
-
-                <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px;">
-                    <strong style="color: var(--accent-cyan); font-size: 12px;">Quick Reference</strong>
-                    <table style="width: 100%; margin-top: 6px; font-size: 10px; border-collapse: collapse;">
-                        <tr style="border-bottom: 1px solid var(--border-color);">
-                            <td style="padding: 3px 4px; color: var(--text-dim);">US / Americas</td>
-                            <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">915 MHz</td>
-                        </tr>
-                        <tr style="border-bottom: 1px solid var(--border-color);">
-                            <td style="padding: 3px 4px; color: var(--text-dim);">EU / UK / India</td>
-                            <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">868 MHz</td>
-                        </tr>
-                        <tr style="border-bottom: 1px solid var(--border-color);">
-                            <td style="padding: 3px 4px; color: var(--text-dim);">915 MHz &lambda;/4</td>
-                            <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">8.2 cm</td>
-                        </tr>
-                        <tr style="border-bottom: 1px solid var(--border-color);">
-                            <td style="padding: 3px 4px; color: var(--text-dim);">868 MHz &lambda;/4</td>
-                            <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">8.6 cm</td>
-                        </tr>
-                        <tr style="border-bottom: 1px solid var(--border-color);">
-                            <td style="padding: 3px 4px; color: var(--text-dim);">Modulation</td>
-                            <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">LoRa (CSS)</td>
-                        </tr>
-                        <tr>
-                            <td style="padding: 3px 4px; color: var(--text-dim);">Typical range</td>
-                            <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">1&ndash;15 km</td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-        </div>
     </div>
 </div>
 

templates/partials/modes/pager.html

@@ -75,62 +75,6 @@
         </div>
     </div>
 
-    <!-- Antenna Guide -->
-    <div class="section">
-        <h3>Antenna Guide</h3>
-        <div style="font-size: 11px; color: var(--text-dim); line-height: 1.5;">
-            <p style="margin-bottom: 8px; color: var(--accent-cyan); font-weight: 600;">
-                Pager frequencies vary by region (130&ndash;930 MHz)
-            </p>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Stock Telescopic Antenna</strong>
-                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                    <li><strong style="color: var(--text-primary);">Works for:</strong> UHF pager bands (~900 MHz) &mdash; the stock antenna is tuned near 1 GHz</li>
-                    <li><strong style="color: var(--text-primary);">Extend to:</strong> ~8 cm for 929 MHz (quarter-wave)</li>
-                    <li><strong style="color: var(--text-primary);">For VHF (~150 MHz):</strong> Stock antenna is too short. Build a dipole (see below)</li>
-                </ul>
-            </div>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Simple Dipole (Best for VHF Pagers)</strong>
-                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                    <li><strong style="color: var(--text-primary);">For 153 MHz:</strong> Two elements, each ~49 cm (quarter-wave)</li>
-                    <li><strong style="color: var(--text-primary);">For 929 MHz:</strong> Two elements, each ~8 cm</li>
-                    <li><strong style="color: var(--text-primary);">Formula:</strong> Element length (cm) = 7500 / frequency (MHz)</li>
-                    <li><strong style="color: var(--text-primary);">Material:</strong> Any wire, coat hanger, or copper rod</li>
-                    <li><strong style="color: var(--text-primary);">Orientation:</strong> Vertical (pager signals are vertically polarized)</li>
-                </ul>
-            </div>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Quick Reference</strong>
-                <table style="width: 100%; margin-top: 6px; font-size: 10px; border-collapse: collapse;">
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Common UHF freq</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">929 MHz</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Common VHF freq</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">153.350 MHz</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Modulation</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">FM (NFM)</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Bandwidth</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">~12.5 kHz</td>
-                    </tr>
-                    <tr>
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Polarization</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">Vertical</td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </div>
-
     <button class="run-btn" id="startBtn" onclick="startDecoding()">
         Start Decoding
     </button>

templates/partials/modes/rtlamr.html

@@ -58,59 +58,6 @@
         </div>
     </div>
 
-    <!-- Antenna Guide -->
-    <div class="section">
-        <h3>Antenna Guide</h3>
-        <div style="font-size: 11px; color: var(--text-dim); line-height: 1.5;">
-            <p style="margin-bottom: 8px; color: var(--accent-cyan); font-weight: 600;">
-                ISM 900 MHz band &mdash; stock antenna is close but not optimal
-            </p>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Stock Telescopic Antenna</strong>
-                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                    <li><strong style="color: var(--text-primary);">912 MHz:</strong> Extend to ~8.2 cm (quarter-wave). The stock antenna is close enough to work</li>
-                    <li><strong style="color: var(--text-primary);">Range:</strong> Most meters transmit at ~100 mW, expect 50&ndash;200 m range with stock antenna</li>
-                </ul>
-            </div>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Upgraded Options</strong>
-                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                    <li><strong style="color: var(--text-primary);">Ground Plane:</strong> 8.2 cm vertical + four 8.2 cm radials at 45&deg; on SMA connector</li>
-                    <li><strong style="color: var(--text-primary);">Yagi:</strong> Directional for targeting specific meters at distance (~$15&ndash;25)</li>
-                    <li><strong style="color: var(--text-primary);">Placement:</strong> Near a window facing the meters. Line-of-sight matters most</li>
-                </ul>
-            </div>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Quick Reference</strong>
-                <table style="width: 100%; margin-top: 6px; font-size: 10px; border-collapse: collapse;">
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Frequency (NA)</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">912 MHz</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Frequency (EU)</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">868 MHz</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">912 MHz &lambda;/4</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">8.2 cm</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Meter TX power</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">~100 mW</td>
-                    </tr>
-                    <tr>
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Polarization</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">Vertical</td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </div>
-
     <button class="run-btn" id="startRtlamrBtn" onclick="startRtlamrDecoding()">
         Start Listening
     </button>

templates/partials/modes/sensor.html

@@ -39,61 +39,6 @@
         </div>
     </div>
 
-    <!-- Antenna Guide -->
-    <div class="section">
-        <h3>Antenna Guide</h3>
-        <div style="font-size: 11px; color: var(--text-dim); line-height: 1.5;">
-            <p style="margin-bottom: 8px; color: var(--accent-cyan); font-weight: 600;">
-                ISM band devices (433 / 868 / 915 MHz)
-            </p>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Stock Telescopic Antenna</strong>
-                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                    <li><strong style="color: var(--text-primary);">433 MHz:</strong> Extend to ~17 cm (quarter-wave). Stock antenna works but isn't ideal</li>
-                    <li><strong style="color: var(--text-primary);">868/915 MHz:</strong> Extend to ~8 cm. Stock antenna is nearly tuned for this</li>
-                </ul>
-            </div>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Quarter-Wave Ground Plane (Best)</strong>
-                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                    <li><strong style="color: var(--text-primary);">433 MHz:</strong> Vertical element 17.3 cm + four 17.3 cm radials at 45&deg;</li>
-                    <li><strong style="color: var(--text-primary);">868 MHz:</strong> Vertical element 8.6 cm + four 8.6 cm radials</li>
-                    <li><strong style="color: var(--text-primary);">915 MHz:</strong> Vertical element 8.2 cm + four 8.2 cm radials</li>
-                    <li><strong style="color: var(--text-primary);">Material:</strong> Stiff copper wire soldered to an SMA connector</li>
-                    <li><strong style="color: var(--text-primary);">Placement:</strong> Outdoors or near a window. Higher is better for range</li>
-                </ul>
-            </div>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Quick Reference</strong>
-                <table style="width: 100%; margin-top: 6px; font-size: 10px; border-collapse: collapse;">
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">433 MHz &lambda;/4</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">17.3 cm</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">868 MHz &lambda;/4</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">8.6 cm</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">915 MHz &lambda;/4</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">8.2 cm</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Typical range</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">50&ndash;300 m</td>
-                    </tr>
-                    <tr>
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Polarization</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">Vertical</td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </div>
-
     <button class="run-btn" id="startSensorBtn" onclick="startSensorDecoding()">
         Start Listening
     </button>

templates/partials/modes/sstv.html

@@ -39,64 +39,4 @@
             Common modes: PD120, PD180, Martin1, Scottie1
         </p>
     </div>
-
-    <!-- Antenna Guide -->
-    <div class="section">
-        <h3>Antenna Guide</h3>
-        <div style="font-size: 11px; color: var(--text-dim); line-height: 1.5;">
-            <p style="margin-bottom: 8px; color: var(--accent-cyan); font-weight: 600;">
-                2m band (145.800 MHz) &mdash; stock SDR antenna will NOT work
-            </p>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">V-Dipole (Easiest &mdash; ~$5)</strong>
-                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                    <li><strong style="color: var(--text-primary);">Element length:</strong> ~51 cm each (quarter-wave at 145.8 MHz)</li>
-                    <li><strong style="color: var(--text-primary);">Angle:</strong> 120&deg; between elements for partial RHCP</li>
-                    <li><strong style="color: var(--text-primary);">Orientation:</strong> Lay flat, angled toward the ISS pass direction</li>
-                    <li><strong style="color: var(--text-primary);">Material:</strong> Wire, coat hanger, or copper rod</li>
-                </ul>
-                <p style="margin-top: 6px; color: var(--text-dim); font-style: italic;">
-                    Same antenna as weather satellites (similar frequency). A QFH or turnstile for 137 MHz also works well here.
-                </p>
-            </div>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Tips for ISS Reception</strong>
-                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                    <li><strong style="color: var(--text-primary);">ISS altitude:</strong> ~420 km, overhead passes last 5&ndash;10 minutes</li>
-                    <li><strong style="color: var(--text-primary);">Best passes:</strong> Elevation &gt; 30&deg; for clear signal</li>
-                    <li><strong style="color: var(--text-primary);">Outdoors:</strong> Clear sky view is essential. Roof or open field</li>
-                    <li><strong style="color: var(--text-primary);">LNA:</strong> Optional but helps &mdash; 2m filtered LNA at antenna feed</li>
-                    <li><strong style="color: var(--text-primary);">Doppler:</strong> ISS moves fast &mdash; signal shifts &plusmn;3.5 kHz during pass</li>
-                </ul>
-            </div>
-
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Quick Reference</strong>
-                <table style="width: 100%; margin-top: 6px; font-size: 10px; border-collapse: collapse;">
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">ISS SSTV frequency</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">145.800 MHz</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Quarter-wave length</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">51 cm</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Modulation</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">FM (25 kHz)</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Polarization</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">RHCP (circular)</td>
-                    </tr>
-                    <tr>
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Typical pass duration</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">5&ndash;10 min</td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </div>
 </div>

templates/partials/modes/subghz.html

@@ -1,175 +0,0 @@
-<!-- SUBGHZ TRANSCEIVER MODE -->
-<div id="subghzMode" class="mode-content">
-    <div class="section">
-        <h3>SubGHz Transceiver</h3>
-        <p class="info-text" style="font-size: 11px; color: var(--text-dim); margin-bottom: 12px;">
-            HackRF One SubGHz transceiver. Capture raw signals, replay saved bursts,
-            and scan wideband activity with frequency analysis.
-        </p>
-    </div>
-
-    <!-- Device -->
-    <div class="section">
-        <h3>HackRF Device</h3>
-        <div class="subghz-device-status" id="subghzDeviceStatus">
-            <div class="subghz-device-row">
-                <span class="subghz-device-dot" id="subghzDeviceDot"></span>
-                <span class="subghz-device-label" id="subghzDeviceLabel">Checking...</span>
-            </div>
-            <div class="subghz-device-tools" id="subghzDeviceTools">
-                <span class="subghz-tool-badge" id="subghzToolHackrf" title="hackrf_transfer">HackRF</span>
-                <span class="subghz-tool-badge" id="subghzToolSweep" title="hackrf_sweep">Sweep</span>
-            </div>
-        </div>
-        <div class="form-group" style="margin-top: 8px;">
-            <label>Device Serial <span style="color: var(--text-dim); font-weight: normal;">(optional)</span></label>
-            <input type="text" id="subghzDeviceSerial" placeholder="auto-detect" style="font-family: 'JetBrains Mono', monospace; font-size: 11px;">
-        </div>
-    </div>
-
-    <!-- Status -->
-    <div class="subghz-status-row" id="subghzStatusRow">
-        <div class="subghz-status-dot" id="subghzStatusDot"></div>
-        <span class="subghz-status-text" id="subghzStatusText">Idle</span>
-        <span class="subghz-status-timer" id="subghzStatusTimer"></span>
-    </div>
-
-    <!-- Frequency -->
-    <div class="section">
-        <h3>Frequency</h3>
-        <div class="form-group">
-            <label>Frequency (MHz)</label>
-            <input type="number" id="subghzFrequency" value="433.92" step="0.001" min="1" max="6000">
-        </div>
-        <div class="subghz-preset-btns">
-            <button class="subghz-preset-btn" onclick="SubGhz.setFreq(315)">315M</button>
-            <button class="subghz-preset-btn" onclick="SubGhz.setFreq(433.92)">433.92M</button>
-            <button class="subghz-preset-btn" onclick="SubGhz.setFreq(868)">868M</button>
-            <button class="subghz-preset-btn" onclick="SubGhz.setFreq(915)">915M</button>
-        </div>
-    </div>
-
-    <!-- Gain -->
-    <div class="section">
-        <h3>Gain</h3>
-        <div class="form-group">
-            <label>LNA Gain (0-40 dB)</label>
-            <input type="range" id="subghzLnaGain" min="0" max="40" value="24" step="8" oninput="document.getElementById('subghzLnaVal').textContent=this.value">
-            <span id="subghzLnaVal" style="font-family: 'JetBrains Mono', monospace; font-size: 11px; color: var(--text-secondary);">24</span>
-        </div>
-        <div class="form-group">
-            <label>VGA Gain (0-62 dB)</label>
-            <input type="range" id="subghzVgaGain" min="0" max="62" value="20" step="2" oninput="document.getElementById('subghzVgaVal').textContent=this.value">
-            <span id="subghzVgaVal" style="font-family: 'JetBrains Mono', monospace; font-size: 11px; color: var(--text-secondary);">20</span>
-        </div>
-        <div class="form-group">
-            <label>Sample Rate</label>
-            <select id="subghzSampleRate" class="mode-select">
-                <option value="2000000" selected>2 MHz</option>
-                <option value="4000000">4 MHz</option>
-                <option value="8000000">8 MHz</option>
-                <option value="10000000">10 MHz</option>
-                <option value="20000000">20 MHz</option>
-            </select>
-        </div>
-    </div>
-
-    <!-- Tabs: Receive RAW / Sweep -->
-    <div class="section">
-        <div class="subghz-tabs">
-            <button class="subghz-tab active" data-tab="rx" onclick="SubGhz.switchTab('rx')">Read RAW</button>
-            <button class="subghz-tab" data-tab="sweep" onclick="SubGhz.switchTab('sweep')">Sweep</button>
-        </div>
-
-        <!-- RX Tab -->
-        <div class="subghz-tab-content active" id="subghzTabRx">
-            <p style="font-size: 11px; color: var(--text-dim); margin-bottom: 10px;">
-                Capture raw IQ data to file. Saved captures can be replayed or analyzed.
-            </p>
-            <div class="subghz-trigger-box">
-                <label class="subghz-trigger-toggle">
-                    <input type="checkbox" id="subghzTriggerEnabled" onchange="SubGhz.syncTriggerControls()">
-                    Smart Trigger Capture
-                </label>
-                <div class="subghz-trigger-grid">
-                    <label>Pre-roll (ms)</label>
-                    <input type="number" id="subghzTriggerPreMs" min="50" max="5000" step="50" value="350">
-                    <label>Post-roll (ms)</label>
-                    <input type="number" id="subghzTriggerPostMs" min="100" max="10000" step="50" value="700">
-                </div>
-                <p class="subghz-trigger-help">Auto-stops after burst + post-roll and trims capture window.</p>
-            </div>
-            <div class="subghz-btn-row">
-                <button class="subghz-btn start" id="subghzRxStartBtn" onclick="SubGhz.startRx()">Start Capture</button>
-                <button class="subghz-btn stop" id="subghzRxStopBtn" onclick="SubGhz.stopRx()" disabled>Stop Capture</button>
-            </div>
-        </div>
-
-        <!-- Sweep Tab -->
-        <div class="subghz-tab-content" id="subghzTabSweep">
-            <p style="font-size: 11px; color: var(--text-dim); margin-bottom: 10px;">
-                Wideband spectrum analyzer using hackrf_sweep.
-            </p>
-            <div class="form-group">
-                <label>Frequency Range (MHz)</label>
-                <div class="subghz-sweep-range">
-                    <input type="number" id="subghzSweepStart" value="300" min="1" max="6000" step="1">
-                    <span>to</span>
-                    <input type="number" id="subghzSweepEnd" value="928" min="1" max="6000" step="1">
-                </div>
-            </div>
-            <div class="subghz-btn-row">
-                <button class="subghz-btn start" id="subghzSweepStartBtn" onclick="SubGhz.startSweep()">Start Sweep</button>
-                <button class="subghz-btn stop" id="subghzSweepStopBtn" onclick="SubGhz.stopSweep()" disabled>Stop Sweep</button>
-            </div>
-            <div style="margin-top: 10px;">
-                <label style="font-size: 10px; color: var(--text-dim); text-transform: uppercase; letter-spacing: 0.5px;">Detected Peaks</label>
-                <div class="subghz-peak-list" id="subghzPeakList"></div>
-            </div>
-        </div>
-    </div>
-
-    <!-- TX Settings (collapsible) -->
-    <div class="section">
-        <h3 style="cursor: pointer;" onclick="document.getElementById('subghzTxSection').classList.toggle('active')">
-            Transmit Settings <span style="font-size: 10px; color: var(--text-dim);">&#9660;</span>
-        </h3>
-        <div id="subghzTxSection" style="display: none;">
-            <div class="subghz-tx-warning">
-                WARNING: Transmitting radio signals may be illegal without proper authorization.
-                Only transmit on frequencies you are licensed for and within ISM band limits.
-                TX is restricted to ISM bands: 300-348, 387-464, 779-928 MHz.
-            </div>
-            <div class="form-group">
-                <label>TX VGA Gain (0-47 dB)</label>
-                <input type="range" id="subghzTxGain" min="0" max="47" value="20" step="1" oninput="document.getElementById('subghzTxGainVal').textContent=this.value">
-                <span id="subghzTxGainVal" style="font-family: 'JetBrains Mono', monospace; font-size: 11px; color: var(--text-secondary);">20</span>
-            </div>
-            <div class="form-group">
-                <label>Max Duration (seconds)</label>
-                <input type="number" id="subghzTxMaxDuration" value="10" min="1" max="30" step="1">
-            </div>
-        </div>
-    </div>
-
-    <!-- Saved Signals Library -->
-    <div class="section">
-        <h3>Saved Signals</h3>
-        <div class="subghz-captures-list" id="subghzSidebarCaptures" style="max-height: 220px; overflow-y: auto;">
-            <div class="subghz-empty" id="subghzSidebarCapturesEmpty">No saved captures yet</div>
-        </div>
-    </div>
-</div>
-
-<script>
-    // Toggle TX section visibility
-    document.addEventListener('DOMContentLoaded', function() {
-        const h3 = document.querySelector('#subghzTxSection')?.previousElementSibling;
-        if (h3) {
-            h3.addEventListener('click', function() {
-                const section = document.getElementById('subghzTxSection');
-                if (section) section.style.display = section.style.display === 'none' ? 'block' : 'none';
-            });
-        }
-    });
-</script>

templates/partials/modes/tscm.html

@@ -2,7 +2,7 @@
                 <div id="tscmMode" class="mode-content">
                     <!-- Configuration -->
                     <div class="section">
-                        <h3>TSCM Sweep <span style="font-size: 9px; font-weight: normal; background: var(--accent-orange); color: #000; padding: 2px 6px; border-radius: 3px; text-transform: uppercase; letter-spacing: 0.5px;">Alpha</span></h3>
+                        <h3 style="display: flex; align-items: center; gap: 8px; margin-bottom: 12px;">TSCM Sweep <span style="font-size: 9px; font-weight: normal; background: var(--accent-orange); color: #000; padding: 2px 6px; border-radius: 3px; text-transform: uppercase; letter-spacing: 0.5px;">Alpha</span></h3>
 
                         <div class="form-group">
                             <label>Sweep Type</label>
@@ -65,6 +65,14 @@
                         </div>
                     </div>
 
+                    <!-- Actions -->
+                    <button class="run-btn" id="startTscmBtn" onclick="startTscmSweep()" style="margin-top: 12px;">
+                        Start Sweep
+                    </button>
+                    <button class="stop-btn" id="stopTscmBtn" onclick="stopTscmSweep()" style="display: none; margin-top: 12px;">
+                        Stop Sweep
+                    </button>
+
                     <!-- Futuristic Scanner Progress -->
                     <div id="tscmProgress" class="tscm-scanner-progress" style="display: none; margin-top: 12px;">
                         <div class="scanner-ring">
@@ -107,8 +115,8 @@
                     </div>
 
                     <!-- Advanced -->
-                    <div class="section">
+                    <div class="section" style="margin-top: 12px;">
-                        <h3>Advanced</h3>
+                        <h3 style="margin-bottom: 12px;">Advanced</h3>
 
                         <div style="margin-bottom: 16px;">
                             <label style="display: block; font-size: 11px; font-weight: 600; margin-bottom: 6px; color: var(--text-secondary);">Baseline Recording</label>
@@ -148,8 +156,8 @@
                     </div>
 
                     <!-- Tools -->
-                    <div class="section">
+                    <div class="section" style="margin-top: 12px;">
-                        <h3>Tools</h3>
+                        <h3 style="margin-bottom: 10px;">Tools</h3>
                         <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 6px;">
                             <button class="preset-btn" onclick="tscmShowCapabilities()" style="font-size: 10px; padding: 8px;">
                                 Capabilities
@@ -174,13 +182,4 @@
 
                     <!-- Device Warnings -->
                     <div id="tscmDeviceWarnings" style="display: none; margin-top: 8px; padding: 8px; background: rgba(255,153,51,0.1); border: 1px solid rgba(255,153,51,0.3); border-radius: 4px;"></div>
-
-                    <div class="mode-actions-bottom">
-                        <button class="run-btn" id="startTscmBtn" onclick="startTscmSweep()">
-                            Start Sweep
-                        </button>
-                        <button class="stop-btn" id="stopTscmBtn" onclick="stopTscmSweep()" style="display: none;">
-                            Stop Sweep
-                        </button>
-                    </div>
                 </div>

templates/partials/modes/weather-satellite.html

@@ -1,249 +0,0 @@
-<!-- WEATHER SATELLITE MODE -->
-<div id="weatherSatMode" class="mode-content">
-    <div class="section">
-        <h3>Weather Satellite Decoder</h3>
-        <div class="alpha-mode-notice">
-            ALPHA: Weather Satellite capture is experimental and may fail depending on SatDump version, SDR driver support, and pass conditions.
-        </div>
-        <p class="info-text" style="font-size: 11px; color: var(--text-dim); margin-bottom: 12px;">
-            Receive and decode weather images from NOAA and Meteor satellites.
-            Uses SatDump for live SDR capture and image processing.
-        </p>
-    </div>
-
-    <div class="section">
-        <h3>Satellite</h3>
-        <div class="form-group">
-            <label>Select Satellite</label>
-            <select id="weatherSatSelect" class="mode-select">
-                <option value="METEOR-M2-3" selected>Meteor-M2-3 (137.900 MHz LRPT)</option>
-                <option value="METEOR-M2-4">Meteor-M2-4 (137.900 MHz LRPT)</option>
-                <option value="NOAA-15" disabled>NOAA-15 (137.620 MHz APT) [DEFUNCT]</option>
-                <option value="NOAA-18" disabled>NOAA-18 (137.9125 MHz APT) [DEFUNCT]</option>
-                <option value="NOAA-19" disabled>NOAA-19 (137.100 MHz APT) [DEFUNCT]</option>
-            </select>
-        </div>
-        <div class="form-group">
-            <label>Gain (dB)</label>
-            <input type="number" id="weatherSatGain" value="40" step="0.1" min="0" max="50">
-        </div>
-        <div class="form-group">
-            <label style="display: flex; align-items: center; gap: 6px;">
-                <input type="checkbox" id="weatherSatBiasT" style="width: auto;">
-                Bias-T (power LNA)
-            </label>
-        </div>
-    </div>
-
-    <!-- Antenna Guide - detailed -->
-    <div class="section">
-        <h3>Antenna Guide</h3>
-        <div style="font-size: 11px; color: var(--text-dim); line-height: 1.5;">
-
-            <p style="margin-bottom: 10px; color: var(--accent-cyan); font-weight: 600;">
-                137 MHz band &mdash; your stock SDR antenna will NOT work.
-            </p>
-            <p style="margin-bottom: 10px;">
-                Weather satellites transmit at 137.1&ndash;137.9 MHz. The quarter-wave
-                at this frequency is <strong style="color: var(--text-primary);">~53 cm</strong>,
-                far longer than the small telescopic antenna shipped with most SDRs
-                (tuned for ~1 GHz). You need a purpose-built antenna.
-            </p>
-
-            <!-- V-Dipole -->
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">V-Dipole (Easiest &mdash; ~$5)</strong>
-
-                <div style="margin: 8px 0; padding: 8px; background: var(--bg-tertiary); border-radius: 3px; font-family: 'JetBrains Mono', monospace; font-size: 10px; color: var(--text-secondary); white-space: pre; line-height: 1.3; text-align: center;">   coax to SDR
-       |
-    ===+===  feed point
-   /       \
-  /  120    \
- /           \
-/     deg     \
-53.4cm    53.4cm</div>
-
-                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                    <li><strong style="color: var(--text-primary);">Element length:</strong> 53.4 cm each (quarter wavelength at 137 MHz)</li>
-                    <li><strong style="color: var(--text-primary);">Angle:</strong> 120&deg; between elements (not 180&deg;)</li>
-                    <li><strong style="color: var(--text-primary);">Material:</strong> Any stiff wire, coat hanger, or copper rod</li>
-                    <li><strong style="color: var(--text-primary);">Orientation:</strong> Lay flat or tilt 30&deg; toward expected pass direction</li>
-                    <li><strong style="color: var(--text-primary);">Polarization:</strong> The 120&deg; angle gives partial RHCP match to satellite signal</li>
-                    <li><strong style="color: var(--text-primary);">Connection:</strong> Solder elements to coax center + shield, connect to SDR via SMA</li>
-                </ul>
-                <p style="margin-top: 6px; color: var(--text-dim); font-style: italic;">
-                    Best starter antenna. Good enough for clear NOAA images with a direct overhead pass.
-                </p>
-            </div>
-
-            <!-- Turnstile -->
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Turnstile / Crossed Dipole (~$10-15)</strong>
-
-                <div style="margin: 8px 0; padding: 8px; background: var(--bg-tertiary); border-radius: 3px; font-family: 'JetBrains Mono', monospace; font-size: 10px; color: var(--text-secondary); white-space: pre; line-height: 1.3; text-align: center;">       53.4cm
-    &lt;---------&gt;
-    ====+====  dipole 1
-        |
-    ====+====  dipole 2
-    &lt;---------&gt;
-     90 deg rotated
-     + reflector below</div>
-
-                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                    <li><strong style="color: var(--text-primary);">Elements:</strong> Two crossed dipoles, each 53.4 cm per side (4 elements total)</li>
-                    <li><strong style="color: var(--text-primary);">Angle:</strong> 90&deg; between the two dipole pairs</li>
-                    <li><strong style="color: var(--text-primary);">Phasing:</strong> Feed dipole 2 with a 90&deg; delay (quarter-wave coax section ~37 cm of RG-58)</li>
-                    <li><strong style="color: var(--text-primary);">Reflector:</strong> Place ~52 cm below elements (ground plane or wire grid)</li>
-                    <li><strong style="color: var(--text-primary);">Polarization:</strong> Circular (RHCP) &mdash; matches satellite transmission</li>
-                </ul>
-                <p style="margin-top: 6px; color: var(--text-dim); font-style: italic;">
-                    Better than V-dipole. The reflector rejects ground noise and the RHCP phasing matches the satellite signal.
-                </p>
-            </div>
-
-            <!-- QFH -->
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                <strong style="color: #00ff88; font-size: 12px;">QFH &mdash; Quadrifilar Helix (Best &mdash; ~$20-30)</strong>
-
-                <div style="margin: 8px 0; padding: 8px; background: var(--bg-tertiary); border-radius: 3px; font-family: 'JetBrains Mono', monospace; font-size: 10px; color: var(--text-secondary); white-space: pre; line-height: 1.3; text-align: center;">     ___
-    /   \   two helix loops
-   |  |  |  twisted 90 deg
-   |  |  |  around a mast
-    \___/
-      |
-    coax</div>
-
-                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                    <li><strong style="color: var(--text-primary);">Design:</strong> Two bifilar helical loops, offset 90&deg;</li>
-                    <li><strong style="color: var(--text-primary);">Material:</strong> Copper pipe (10mm), copper wire, or coax outer shield</li>
-                    <li><strong style="color: var(--text-primary);">Total height:</strong> ~46 cm (for 137 MHz)</li>
-                    <li><strong style="color: var(--text-primary);">Loop dimensions:</strong> Use a QFH calculator for exact bending measurements</li>
-                    <li><strong style="color: var(--text-primary);">Polarization:</strong> True RHCP omnidirectional &mdash; ideal for overhead satellite passes</li>
-                    <li><strong style="color: var(--text-primary);">Gain pattern:</strong> Hemispherical upward coverage, rejects ground interference</li>
-                </ul>
-                <p style="margin-top: 6px; color: var(--text-dim); font-style: italic;">
-                    Gold standard for weather satellite reception. No tracking needed &mdash; covers the whole sky.
-                </p>
-            </div>
-
-            <!-- Placement & LNA -->
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px; margin-bottom: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Placement & LNA</strong>
-                <ul style="margin: 6px 0 0 14px; padding: 0;">
-                    <li><strong style="color: var(--text-primary);">Location:</strong> OUTDOORS with clear sky view is critical. Roof/balcony/open field.</li>
-                    <li><strong style="color: var(--text-primary);">Height:</strong> Higher is better but not critical &mdash; clear horizon line matters more</li>
-                    <li><strong style="color: var(--text-primary);">Antenna up:</strong> Point the antenna straight UP (zenith) for best overhead coverage</li>
-                    <li><strong style="color: var(--text-primary);">Avoid:</strong> Metal roofs, power lines, buildings blocking the sky</li>
-                    <li><strong style="color: var(--text-primary);">Coax length:</strong> Keep short (&lt;10m). Signal loss at 137 MHz is ~3 dB per 10m of RG-58</li>
-                    <li><strong style="color: var(--text-primary);">LNA:</strong> Mount at the antenna feed point, NOT at the SDR end.
-                        Recommended: Nooelec SAWbird+ NOAA (137 MHz filtered LNA, ~$30)</li>
-                    <li><strong style="color: var(--text-primary);">Bias-T:</strong> Enable the Bias-T checkbox above if your LNA is powered via the coax from the SDR</li>
-                </ul>
-            </div>
-
-            <!-- Quick reference -->
-            <div style="background: var(--bg-primary); border: 1px solid var(--border-color); border-radius: 4px; padding: 10px;">
-                <strong style="color: var(--accent-cyan); font-size: 12px;">Quick Reference</strong>
-                <table style="width: 100%; margin-top: 6px; font-size: 10px; border-collapse: collapse;">
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Wavelength (137 MHz)</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">218.8 cm</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Quarter wave (element length)</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">53.4 cm</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Best pass elevation</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">&gt; 30&deg;</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Typical pass duration</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">10-15 min</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Polarization</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">RHCP</td>
-                    </tr>
-                    <tr style="border-bottom: 1px solid var(--border-color);">
-                        <td style="padding: 3px 4px; color: var(--text-dim);">NOAA (APT) bandwidth</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">~40 kHz</td>
-                    </tr>
-                    <tr>
-                        <td style="padding: 3px 4px; color: var(--text-dim);">Meteor (LRPT) bandwidth</td>
-                        <td style="padding: 3px 4px; color: var(--text-primary); text-align: right;">~140 kHz</td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </div>
-
-    <div class="section">
-        <h3 onclick="this.parentElement.querySelector('.wxsat-test-decode-body').classList.toggle('collapsed'); this.querySelector('.wxsat-collapse-icon').classList.toggle('collapsed')" style="cursor: pointer; display: flex; align-items: center; justify-content: space-between; user-select: none;">
-            Test Decode (File)
-            <span class="wxsat-collapse-icon collapsed" style="font-size: 10px; transition: transform 0.2s; display: inline-block;">&#9660;</span>
-        </h3>
-        <div class="wxsat-test-decode-body collapsed" style="overflow: hidden;">
-            <p class="info-text" style="font-size: 11px; color: var(--text-dim); margin-bottom: 8px;">
-                Decode a pre-recorded IQ or WAV file without SDR hardware.
-                Run <code style="font-size: 10px;">./download-weather-sat-samples.sh</code> to fetch sample files.
-            </p>
-            <div class="form-group">
-                <label>Satellite</label>
-                <select id="wxsatTestSatSelect" class="mode-select">
-                    <option value="METEOR-M2-3" selected>Meteor-M2-3 (LRPT)</option>
-                    <option value="METEOR-M2-4">Meteor-M2-4 (LRPT)</option>
-                    <option value="NOAA-15">NOAA-15 (APT)</option>
-                    <option value="NOAA-18">NOAA-18 (APT)</option>
-                    <option value="NOAA-19">NOAA-19 (APT)</option>
-                </select>
-            </div>
-            <div class="form-group">
-                <label>File Path (server-side)</label>
-                <input type="text" id="wxsatTestFilePath" value="data/weather_sat/samples/noaa_apt_argentina.wav" style="font-family: 'JetBrains Mono', monospace; font-size: 11px;">
-            </div>
-            <div class="form-group">
-                <label>Sample Rate</label>
-                <select id="wxsatTestSampleRate" class="mode-select">
-                    <option value="11025">11025 Hz (WAV audio APT)</option>
-                    <option value="48000">48000 Hz (WAV audio APT)</option>
-                    <option value="500000">500 kHz (IQ LRPT)</option>
-                    <option value="1000000" selected>1 MHz (IQ default)</option>
-                    <option value="2000000">2 MHz (IQ wideband)</option>
-                </select>
-            </div>
-            <button class="mode-btn" onclick="WeatherSat.testDecode()" style="width: 100%; margin-top: 4px;">
-                Test Decode
-            </button>
-        </div>
-    </div>
-
-    <div class="section">
-        <h3>Auto-Scheduler</h3>
-        <p class="info-text" style="font-size: 11px; color: var(--text-dim); margin-bottom: 8px;">
-            Automatically capture satellite passes based on predictions.
-            Set your location above and toggle AUTO in the strip bar.
-        </p>
-        <div class="form-group">
-            <label style="display: flex; align-items: center; gap: 6px;">
-                <input type="checkbox" id="wxsatSidebarAutoSchedule" onchange="WeatherSat.toggleScheduler()" style="width: auto;">
-                Enable Auto-Capture
-            </label>
-        </div>
-        <div id="wxsatSchedulerStatus" style="font-size: 11px; color: var(--text-dim); font-family: 'JetBrains Mono', monospace; margin-top: 4px;">
-            Disabled
-        </div>
-    </div>
-
-    <div class="section">
-        <h3>Resources</h3>
-        <div style="display: flex; flex-direction: column; gap: 6px;">
-            <a href="https://github.com/SatDump/SatDump" target="_blank" rel="noopener" class="preset-btn" style="text-decoration: none; text-align: center;">
-                SatDump Documentation
-            </a>
-            <a href="https://www.rtl-sdr.com/rtl-sdr-tutorial-receiving-noaa-weather-satellite-images/" target="_blank" rel="noopener" class="preset-btn" style="text-decoration: none; text-align: center;">
-                NOAA Reception Guide
-            </a>
-        </div>
-    </div>
-</div>

templates/partials/modes/wifi.html

@@ -1,8 +1,7 @@
 <!-- WiFi MODE -->
                 <div id="wifiMode" class="mode-content">
                     <!-- Scan Mode Tabs -->
-                    <div class="section">
+                    <div class="section" style="padding: 8px;">
-                        <h3>Signal Source</h3>
                         <div class="wifi-scan-mode-tabs" style="display: flex; gap: 4px;">
                             <button id="wifiScanModeQuick" class="wifi-mode-tab active" style="flex: 1; padding: 8px; font-size: 11px; background: var(--accent-green); color: #000; border: none; border-radius: 4px; cursor: pointer;">
                                 Quick Scan
@@ -70,22 +69,7 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label>Channel Preset</label>
+                            <label>Channel (empty = hop)</label>
-                            <select id="wifiChannelPreset">
-                                <option value="">Auto hop (all)</option>
-                                <option value="2.4-common">2.4 GHz Common (1,6,11)</option>
-                                <option value="2.4-all">2.4 GHz All (1-13)</option>
-                                <option value="5-low">5 GHz Low (36-48)</option>
-                                <option value="5-mid">5 GHz Mid/DFS (52-64)</option>
-                                <option value="5-high">5 GHz High (149-165)</option>
-                            </select>
-                        </div>
-                        <div class="form-group">
-                            <label>Channel List (overrides preset)</label>
-                            <input type="text" id="wifiChannelList" placeholder="e.g., 1,6,11 or 36,40,44,48">
-                        </div>
-                        <div class="form-group">
-                            <label>Channel (single)</label>
                             <input type="text" id="wifiChannel" placeholder="e.g., 6 or 36">
                         </div>
                     </div>
@@ -169,22 +153,8 @@
                         </div>
                     </div>
 
-                    <!-- Export Section -->
-                    <div class="section">
-                        <h3>Export</h3>
-                        <div style="display: flex; gap: 8px;">
-                            <button class="preset-btn" onclick="WiFiMode.exportData('csv')" style="flex: 1;">
-                                Export CSV
-                            </button>
-                            <button class="preset-btn" onclick="WiFiMode.exportData('json')" style="flex: 1;">
-                                Export JSON
-                            </button>
-                        </div>
-                    </div>
-
-                    <div class="mode-actions-bottom">
                     <!-- v2 Scan Buttons -->
-                        <div style="display: flex; gap: 8px;">
+                    <div style="display: flex; gap: 8px; margin-bottom: 8px;">
                         <button class="run-btn" id="wifiQuickScanBtn" onclick="WiFiMode.startQuickScan()" style="flex: 1;">
                             Quick Scan
                         </button>
@@ -203,5 +173,17 @@
                     <button class="stop-btn" id="stopWifiBtn" onclick="stopWifiScan()" style="display: none;">
                         Stop Scanning (Legacy)
                     </button>
+
+                    <!-- Export Section -->
+                    <div class="section" style="margin-top: 10px;">
+                        <h3>Export</h3>
+                        <div style="display: flex; gap: 8px;">
+                            <button class="preset-btn" onclick="WiFiMode.exportData('csv')" style="flex: 1;">
+                                Export CSV
+                            </button>
+                            <button class="preset-btn" onclick="WiFiMode.exportData('json')" style="flex: 1;">
+                                Export JSON
+                            </button>
+                        </div>
                     </div>
                 </div>

templates/partials/nav.html

@@ -71,8 +71,8 @@
             {{ mode_item('listening', 'Listening Post', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M3 9h18"/><path d="M9 21V9"/></svg>') }}
             {{ mode_item('spystations', 'Spy Stations', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4.9 19.1C1 15.2 1 8.8 4.9 4.9"/><path d="M7.8 16.2c-2.3-2.3-2.3-6.1 0-8.5"/><circle cx="12" cy="12" r="2"/><path d="M16.2 7.8c2.3 2.3 2.3 6.1 0 8.5"/><path d="M19.1 4.9C23 8.8 23 15.1 19.1 19"/></svg>') }}
             {{ mode_item('meshtastic', 'Meshtastic', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><circle cx="12" cy="12" r="3"/><path d="M12 2v4m0 12v4M2 12h4m12 0h4"/></svg>') }}
+            {{ mode_item('dmr', 'Digital Voice', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 2a3 3 0 0 0-3 3v7a3 3 0 0 0 6 0V5a3 3 0 0 0-3-3Z"/><path d="M19 10v2a7 7 0 0 1-14 0v-2"/><line x1="12" y1="19" x2="12" y2="22"/></svg>') }}
             {{ mode_item('websdr', 'WebSDR', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="2" y1="12" x2="22" y2="12"/><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"/></svg>') }}
-            {{ mode_item('subghz', 'SubGHz', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 12h6l3-9 3 18 3-9h5"/></svg>') }}
         </div>
     </div>
 
@@ -87,7 +87,6 @@
         <div class="mode-nav-dropdown-menu">
             {{ mode_item('wifi', 'WiFi', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M5 12.55a11 11 0 0 1 14.08 0"/><path d="M1.42 9a16 16 0 0 1 21.16 0"/><path d="M8.53 16.11a6 6 0 0 1 6.95 0"/><circle cx="12" cy="20" r="1" fill="currentColor" stroke="none"/></svg>') }}
             {{ mode_item('bluetooth', 'Bluetooth', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="6.5 6.5 17.5 17.5 12 22 12 2 17.5 6.5 6.5 17.5"/></svg>') }}
-            {{ mode_item('bt_locate', 'BT Locate', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="10" r="3"/><path d="M12 21.7C17.3 17 20 13 20 10a8 8 0 1 0-16 0c0 3 2.7 7 8 11.7z"/><path d="M9.5 8.5l3 3 2-4-2 4-3 3"/></svg>') }}
         </div>
     </div>
 
@@ -119,9 +118,7 @@
             {{ mode_item('satellite', 'Satellite', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M13 7L9 3 5 7l4 4"/><path d="m17 11 4 4-4 4-4-4"/><path d="m8 12 4 4 6-6-4-4-6 6"/><path d="m16 8 3-3"/><path d="M9 21a6 6 0 0 0-6-6"/></svg>', '/satellite/dashboard') }}
             {% endif %}
             {{ mode_item('sstv', 'ISS SSTV', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="12" cy="12" r="3"/><path d="M3 9h2"/><path d="M19 9h2"/><path d="M3 15h2"/><path d="M19 15h2"/></svg>') }}
-            {{ mode_item('weathersat', 'Weather Sat', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"/></svg>') }}
             {{ mode_item('sstv_general', 'HF SSTV', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="12" cy="12" r="3"/><path d="M16.24 7.76a6 6 0 0 1 0 8.49m-8.48-.01a6 6 0 0 1 0-8.49"/></svg>') }}
-            {{ mode_item('gps', 'GPS', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="10" r="3"/><path d="M12 21.7C17.3 17 20 13 20 10a8 8 0 1 0-16 0c0 3 2.7 7 8 11.7z"/></svg>') }}
         </div>
     </div>
 
@@ -181,7 +178,6 @@
     {{ mobile_item('aprs', 'APRS', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M20 10c0 6-8 12-8 12s-8-6-8-12a8 8 0 0 1 16 0Z"/><circle cx="12" cy="10" r="3"/></svg>') }}
     {{ mobile_item('wifi', 'WiFi', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 12.55a11 11 0 0 1 14.08 0"/><path d="M8.53 16.11a6 6 0 0 1 6.95 0"/><circle cx="12" cy="20" r="1" fill="currentColor"/></svg>') }}
     {{ mobile_item('bluetooth', 'BT', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="6.5 6.5 17.5 17.5 12 22 12 2 17.5 6.5 6.5 17.5"/></svg>') }}
-    {{ mobile_item('bt_locate', 'Locate', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="10" r="3"/><path d="M12 21.7C17.3 17 20 13 20 10a8 8 0 1 0-16 0c0 3 2.7 7 8 11.7z"/></svg>') }}
     {{ mobile_item('tscm', 'TSCM', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg>') }}
     {% if is_index_page %}
     {{ mobile_item('satellite', 'Sat', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M13 7L9 3 5 7l4 4"/><path d="m17 11 4 4-4 4-4-4"/><path d="m8 12 4 4 6-6-4-4-6 6"/></svg>') }}
@@ -189,14 +185,12 @@
     {{ mobile_item('satellite', 'Sat', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M13 7L9 3 5 7l4 4"/><path d="m17 11 4 4-4 4-4-4"/><path d="m8 12 4 4 6-6-4-4-6 6"/></svg>', '/satellite/dashboard') }}
     {% endif %}
     {{ mobile_item('sstv', 'SSTV', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="12" cy="12" r="3"/></svg>') }}
-    {{ mobile_item('weathersat', 'WxSat', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"/></svg>') }}
     {{ mobile_item('sstv_general', 'HF SSTV', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="12" cy="12" r="3"/></svg>') }}
-    {{ mobile_item('gps', 'GPS', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="10" r="3"/><path d="M12 21.7C17.3 17 20 13 20 10a8 8 0 1 0-16 0c0 3 2.7 7 8 11.7z"/></svg>') }}
     {{ mobile_item('listening', 'Scanner', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M3 9h18"/><path d="M9 21V9"/></svg>') }}
     {{ mobile_item('spystations', 'Spy', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M4.9 19.1C1 15.2 1 8.8 4.9 4.9"/><circle cx="12" cy="12" r="2"/><path d="M19.1 4.9C23 8.8 23 15.1 19.1 19"/></svg>') }}
     {{ mobile_item('meshtastic', 'Mesh', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10"/><circle cx="12" cy="12" r="3"/><path d="M12 2v4m0 12v4M2 12h4m12 0h4"/></svg>') }}
+    {{ mobile_item('dmr', 'DMR', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 2a3 3 0 0 0-3 3v7a3 3 0 0 0 6 0V5a3 3 0 0 0-3-3Z"/><path d="M19 10v2a7 7 0 0 1-14 0v-2"/><line x1="12" y1="19" x2="12" y2="22"/></svg>') }}
     {{ mobile_item('websdr', 'WebSDR', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10"/><line x1="2" y1="12" x2="22" y2="12"/><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"/></svg>') }}
-    {{ mobile_item('subghz', 'SubGHz', '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M2 12h6l3-9 3 18 3-9h5"/></svg>') }}
 </nav>
 
 {# JavaScript stub for pages that don't have switchMode defined #}

templates/partials/settings-modal.html

@@ -15,8 +15,6 @@
             <button class="settings-tab" data-tab="display" onclick="switchSettingsTab('display')">Display</button>
             <button class="settings-tab" data-tab="updates" onclick="switchSettingsTab('updates')">Updates</button>
             <button class="settings-tab" data-tab="tools" onclick="switchSettingsTab('tools')">Tools</button>
-            <button class="settings-tab" data-tab="alerts" onclick="switchSettingsTab('alerts')">Alerts</button>
-            <button class="settings-tab" data-tab="recording" onclick="switchSettingsTab('recording')">Recording</button>
             <button class="settings-tab" data-tab="about" onclick="switchSettingsTab('about')">About</button>
         </div>
 
@@ -282,82 +280,6 @@
             </div>
         </div>
 
-        <!-- Alerts Section -->
-        <div id="settings-alerts" class="settings-section">
-            <div class="settings-group">
-                <div class="settings-group-title">Alert Feed <span id="alertsFeedCount" style="color: var(--text-dim); font-weight: 500;"></span></div>
-                <div id="alertsFeedList" class="settings-feed">
-                    <div class="settings-feed-empty">No alerts yet</div>
-                </div>
-            </div>
-
-            <div class="settings-group">
-                <div class="settings-group-title">Quick Rules</div>
-                <div style="display: flex; gap: 10px; flex-wrap: wrap;">
-                    <button class="check-assets-btn" onclick="AlertCenter.enableTrackerAlerts()">Enable Tracker Alerts</button>
-                    <button class="check-assets-btn" onclick="AlertCenter.disableTrackerAlerts()">Disable Tracker Alerts</button>
-                </div>
-                <div class="settings-info" style="margin-top: 10px;">
-                    Use Bluetooth device details to add specific device watchlist alerts.
-                </div>
-            </div>
-        </div>
-
-        <!-- Recording Section -->
-        <div id="settings-recording" class="settings-section">
-            <div class="settings-group">
-                <div class="settings-group-title">Start Recording</div>
-                <div class="settings-row" style="border-bottom: none; padding-top: 0;">
-                    <div class="settings-label">
-                        <span class="settings-label-text">Mode</span>
-                        <span class="settings-label-desc">Record live events for a mode</span>
-                    </div>
-                    <select id="recordingModeSelect" class="settings-select" style="width: 200px;">
-                        <option value="pager">Pager</option>
-                        <option value="sensor">433 Sensors</option>
-                        <option value="wifi">WiFi</option>
-                        <option value="bluetooth">Bluetooth</option>
-                        <option value="adsb">ADS-B</option>
-                        <option value="ais">AIS</option>
-                        <option value="dsc">DSC</option>
-                        <option value="acars">ACARS</option>
-                        <option value="aprs">APRS</option>
-                        <option value="rtlamr">RTLAMR</option>
-                        <option value="tscm">TSCM</option>
-                        <option value="sstv">SSTV</option>
-                        <option value="sstv_general">SSTV General</option>
-                        <option value="listening_scanner">Listening Post</option>
-                        <option value="waterfall">Waterfall</option>
-                    </select>
-                </div>
-                <div class="settings-row" style="border-bottom: none;">
-                    <div class="settings-label">
-                        <span class="settings-label-text">Label</span>
-                        <span class="settings-label-desc">Optional note for the session</span>
-                    </div>
-                    <input type="text" id="recordingLabelInput" class="settings-input" placeholder="Morning sweep" style="width: 200px;">
-                </div>
-                <div style="display: flex; gap: 10px; margin-top: 10px;">
-                    <button class="check-assets-btn" onclick="RecordingUI.start()">Start</button>
-                    <button class="check-assets-btn" onclick="RecordingUI.stop()">Stop</button>
-                </div>
-            </div>
-
-            <div class="settings-group">
-                <div class="settings-group-title">Active Sessions</div>
-                <div id="recordingActiveList" class="settings-feed">
-                    <div class="settings-feed-empty">No active recordings</div>
-                </div>
-            </div>
-
-            <div class="settings-group">
-                <div class="settings-group-title">Recent Recordings</div>
-                <div id="recordingList" class="settings-feed">
-                    <div class="settings-feed-empty">No recordings yet</div>
-                </div>
-            </div>
-        </div>
-
         <!-- About Section -->
         <div id="settings-about" class="settings-section">
             <div class="settings-group">

templates/satellite_dashboard.html

@@ -107,8 +107,12 @@
                 <label>TARGET:</label>
                 <select id="satSelect" onchange="onSatelliteChange()">
                     <option value="25544">ISS (ZARYA)</option>
+                    <option value="25338">NOAA 15</option>
+                    <option value="28654">NOAA 18</option>
+                    <option value="33591">NOAA 19</option>
                     <option value="40069">METEOR-M2</option>
-                    <option value="57166">METEOR-M2-3</option>
+                    <option value="43013">NOAA 20</option>
+                    <option value="54234">METEOR-M2-3</option>
                 </select>
             </div>
 
@@ -269,42 +273,16 @@
         let currentLocationSource = 'local';
         let agents = [];
 
-        let satellites = {
+        const satellites = {
             25544: { name: 'ISS (ZARYA)', color: '#00ffff' },
+            25338: { name: 'NOAA 15', color: '#00ff00' },
+            28654: { name: 'NOAA 18', color: '#ff6600' },
+            33591: { name: 'NOAA 19', color: '#ff3366' },
             40069: { name: 'METEOR-M2', color: '#9370DB' },
-            57166: { name: 'METEOR-M2-3', color: '#ff00ff' }
+            43013: { name: 'NOAA 20', color: '#00ffaa' },
+            54234: { name: 'METEOR-M2-3', color: '#ff00ff' }
         };
 
-        const satColors = ['#00ffff', '#9370DB', '#ff00ff', '#00ff00', '#ff6600', '#ffff00', '#ff69b4', '#7b68ee'];
-
-        function loadDashboardSatellites() {
-            fetch('/satellite/tracked?enabled=true')
-                .then(r => r.json())
-                .then(data => {
-                    if (data.status === 'success' && data.satellites && data.satellites.length > 0) {
-                        const newSats = {};
-                        const select = document.getElementById('satSelect');
-                        select.innerHTML = '';
-                        data.satellites.forEach((sat, i) => {
-                            const norad = parseInt(sat.norad_id);
-                            newSats[norad] = {
-                                name: sat.name,
-                                color: satellites[norad]?.color || satColors[i % satColors.length]
-                            };
-                            const opt = document.createElement('option');
-                            opt.value = norad;
-                            opt.textContent = sat.name;
-                            select.appendChild(opt);
-                        });
-                        satellites = newSats;
-                        // Default to ISS if available
-                        if (newSats[25544]) select.value = '25544';
-                        selectedSatellite = parseInt(select.value);
-                    }
-                })
-                .catch(() => {});
-        }
-
         function onSatelliteChange() {
             const select = document.getElementById('satSelect');
             selectedSatellite = parseInt(select.value);
@@ -361,7 +339,6 @@
         }
 
         document.addEventListener('DOMContentLoaded', () => {
-            loadDashboardSatellites();
             setupEmbeddedMode();
             const usedShared = applySharedObserverLocation();
             initGroundMap();