chore(release): bump build number to 464 for the v4.5.7 rebuild

Version name stays 4.5.7 so the release is overwritten in place; the build
number must increase for Android to accept the update. This rebuild carries
the upstream rt-bishop merge (18 commits) on top of the 30 audit fixes.

.github/dependabot.yml

@@ -4,3 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "never"

.gitignore

@@ -40,10 +40,14 @@ captures/
 
 # Keystore files
 *.jks
+*.keystore
 /*.properties
 /keystore.properties
 /app/keystore.jks
 
+# Hermes agent workspace (plans, local notes)
+.hermes/
+
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
 
@@ -66,3 +70,4 @@ fastlane/readme.md
 /app/release/output-metadata.json
 /app/release/
 /.kotlin/sessions/
+.hermes/

AGENTS.md

@@ -8,16 +8,15 @@ All assistant-specific files (`CLAUDE.md`, `.github/copilot-instructions.md`) po
 ## Project Overview
 
 Look4Sat is an open-source, fully offline Android satellite tracker and pass predictor. It tracks 9000+ active
-satellites using TLE/OMM data from Celestrak/SatNOGS, calculates orbital positions via SGP4/SDP4 models, and displays
-passes relative to the user's location. Features include polar radar visualization, SSTV image decoding, satellite
-ground track mapping, and pass predictions up to 10 days ahead. No ads, no tracking, no network required after initial
-data download.
+satellites using Celestrak/SatNOGS orbital data, calculates positions via SGP4/SDP4, and predicts passes relative to
+the user's location. Features include polar radar visualization, SSTV image decoding, and ground track mapping. No ads,
+no tracking, no network required after initial data download.
 
-## Architecture
+## Architecture & Design
 
 **MVI (Model-View-Intent)** with unidirectional data flow:
-- `State` data class → exposed via `StateFlow` from ViewModel
-- `Action` sealed interface → user intents dispatched to ViewModel's `onAction()`
+- `State` data class (named `<Feature>State`) exposed via `StateFlow` from ViewModel
+- `Action` sealed interface (named `<Feature>Action`) dispatched to ViewModel's `onAction()`
 - Jetpack Compose UI observes state and recomposes reactively
 
 **Clean Architecture layers:**
@@ -34,9 +33,11 @@ data download.
 | `feature:satellites` | Satellite list, filtering, selection                                |
 | `feature:settings`   | User preferences                                                    |
 
-- `feature:*` modules depend only on `core:domain` + `core:presentation`. Features never depend on each other.
+**Feature isolation:**
+- `feature:*` modules depend only on `core:domain` and `core:presentation`.
+- No feature-to-feature dependencies; cross-feature communication goes through core layers.
 
-## Build & Run
+## Build & Platform
 
 ```shell
 # Debug build
@@ -50,54 +51,55 @@ data download.
 ```
 
 - **Min SDK**: 24 | **Target SDK**: 36 | **JDK**: 17
-- **Gradle**: Uses version catalog (`gradle/libs.versions.toml`) + convention plugins in `build-logic/`
+- **Gradle**: Version catalog in `gradle/libs.versions.toml` + convention plugins in `build-logic/`
 
-## Key Libraries
+## Tech Stack
 
 - **Compose** (BOM 2026.05.01) + Material3 Adaptive
-- **Navigation3** (type-safe, uses `@Serializable` NavKeys)
-- **Room** (KSP code generation) for local satellite/TLE storage
-- **OkHttp** 5.x for TLE downloads
+- **Navigation3**: Type-safe navigation with `@Serializable` nav keys
+- **Room** (KSP code generation) for local satellite/orbital storage
+- **OkHttp** 5.x for data downloads
 - **OSMDroid** for map rendering
-- **Kotlin Serialization** for navigation args and data parsing
+- **Kotlin Serialization** for navigation args and parsing
 - **Coroutines** + `StateFlow` for async/reactive patterns
-
-## Conventions
-
-- **Minimal dependencies**: Avoid adding libraries when a simple manual solution exists. Fewer deps = less maintenance.
-- **DI**: Manual — ViewModels use companion `factory()` methods with `IMainContainer` interface.
-- **Navigation**: Type-safe Compose Navigation3 with `@Serializable` data classes as nav keys.
-- **State naming**: `<Feature>State` data class + `<Feature>Action` sealed interface per feature.
-- **No feature-to-feature deps**: All cross-feature communication goes through core layers.
-- **Localization**: 7 languages (en, es, ru, si, tr, uk, zh).
+- **Localization**: 7 languages (en, es, ru, si, tr, uk, zh)
 
 ## Data Formats & Migration
 
-**TLE vs. OMM/CSV format:**
+Look4Sat supports both TLE and OMM (Orbit Mean-Elements Message) CSV formats:
 
-Look4Sat supports both TLE and OMM (Orbit Mean-Elements Message) formats for backward compatibility:
+- **TLE format**: Legacy 3-line element format limited by 5-digit NORAD IDs
+- **OMM/CSV format**: Successor format with ISO 8601 timestamps and larger NORAD ID support
+- New 5-digit NORAD IDs are exhausted; TLE is officially deprecated and OMM/CSV is the clear default
+- `DataParser.kt` supports both via `parseTLEStream()` and `parseCSVStream()`
+- Downloads auto-detect format; both produce identical `OrbitalData` objects
+- Existing code already supports transparent source transition without feature changes
+- Refresh orbital data weekly for accurate pass prediction (orbital decay)
 
-- **TLE format**: Traditional 3-line element format (deprecated). NORAD catalog numbers are 5-digit integers, which
-  are running out of space. Celestrak has signaled that TLE format will eventually be phased out.
-- **OMM/CSV format**: The future standard. CSV files contain the same orbital parameters as TLE but use ISO 8601
-  timestamps and support larger NORAD IDs. Celestrak and SatNOGS already provide OMM data in CSV format.
+## Engineering Heuristics (Lazy = Efficient)
 
-**Current implementation:**
-- `DataParser.kt` handles both `parseTLEStream()` and `parseCSVStream()` seamlessly
-- TLE data is downloaded from configured sources and stored in Room database
-- When downloading satellite data, the app automatically detects format and parses accordingly
-- Both formats produce identical `OrbitalData` objects, ensuring transparent format switching
+- Treat "lazy" as efficient, not careless: the best code is the code never written.
+- First understand the task and trace the real flow end-to-end, then climb this ladder:
+  1. Does this need to be built now? (YAGNI)
+  2. Does it already exist in this codebase? Reuse helpers/patterns before rewriting.
+  3. Does Kotlin/Java stdlib already solve it?
+  4. Does the Android/platform API already solve it?
+  5. Does an already-installed dependency solve it?
+  6. Can this be simpler (including one-liner simple)?
+  7. Only then: write the minimum code that works.
+- Prefer deletion to addition, boring over clever, and the fewest touched files.
+- Avoid new abstractions, dependencies, and boilerplate unless explicitly requested.
+- Manual DI only: ViewModels use companion `factory()` methods with `IMainContainer`.
+- Release builds use ProGuard: avoid reflection-heavy libraries unless explicitly approved.
+- When two options are similar in size, choose the edge-case-correct one.
+- If you keep a deliberate simplification (for example O(n^2) scan or global lock), leave a short comment with the ceiling and upgrade path.
+- For complex asks, challenge scope when appropriate: "Do you need X, or does Y already cover it?"
 
-**Migration path:**
-As NORAD catalog space becomes constrained, OMM/CSV will become the primary format. Look4Sat is already positioned
-to handle this transition without code changes — existing users can continue using TLE files while new sources
-transition to OMM/CSV automatically.
+## Bug-Fix Policy
 
-## Code Style
-
-- Prefer **short, focused functions** — single responsibility, easy to read.
-- **Exceptions**: Composable functions and math-heavy algorithms (SGP4/SDP4) may be longer.
-- Strict code style — no dead code, no unused imports, consistent formatting.
+- Fix root cause, not just the reported symptom.
+- If touching a shared function, inspect callers and prefer one shared fix over per-caller patches.
+- The smallest correct diff wins only after behavior is understood.
 
 ## Roadmap
 
@@ -105,12 +107,9 @@ transition to OMM/CSV automatically.
 
 ## Gotchas
 
-- Orbital math lives in `core:domain/predict/` — it's dense vector math (SGP4/SDP4). Tread carefully.
-- TLE/OMM data must be refreshed weekly for accurate predictions (satellite orbits decay). TLE format is legacy and
-  will eventually be deprecated in favor of OMM/CSV as NORAD catalog numbers approach the 5-digit limit.
+- Orbital math lives in `core:domain/predict/` — dense vector math (SGP4/SDP4). Tread carefully.
 - SSTV decoding in `feature:radar` is experimental; image quality depends on signal strength during satellite pass.
-- `build-logic/convention/` contains all shared Gradle configuration — edit there, not in individual modules.
-- ProGuard is enabled for release builds — don't add reflection-based libs or any other dependencies without asking.
+- `build-logic/convention/` contains shared Gradle configuration — edit there, not in individual modules.
 
 ## Copilot Working Mode: Code-Only
 

LICENSE

@@ -1,5 +1,5 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
@@ -7,17 +7,15 @@
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
+our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
+software for all its users.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
 
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -72,7 +60,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU General Public License.
+  "This License" refers to version 3 of the GNU Affero General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Use with the GNU Affero General Public License.
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
+under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
+Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
+GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
   If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
@@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
+    it under the terms of the GNU Affero General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    GNU Affero General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
 
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
+For more information on this, and how to apply and follow the GNU AGPL, see
 <https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

NOTICE

@@ -0,0 +1,24 @@
+LOOK4SAT (MCKERO6423 FORK) — LICENSING NOTICE
+
+This repository combines two separately-licensed components:
+
+  1. Look4Sat application code (all modules except the DeepCW model)
+     — Copyright (C) 2019-2026 Arty Bishop (rt-bishop) and contributors
+     — Licensed under the GNU General Public License v3.0 (GPL-3.0)
+
+  2. The DeepCW neural decoding model in feature/cw/src/main/assets/deepcw/
+     — Copyright (C) e04 (https://github.com/e04/deepcw-engine)
+     — Licensed under the GNU Affero General Public License v3.0 only
+       (AGPL-3.0-only)
+
+Because this combined work incorporates an AGPL-3.0 component, it is
+distributed under the GNU Affero General Public License v3.0. GPL-3.0
+Section 13 permits this combination; AGPL-3.0 Section 13 applies to the
+combined work as a whole.
+
+See feature/cw/licenses/NOTICE.md for model provenance, attribution, and
+the applied int8 quantization. The original GPL-3.0 text for the Look4Sat
+application code is preserved at feature/cw/licenses/Look4Sat-GPL-3.0.txt.
+
+--------------------------------------------------------------------------------
+

README.md

@@ -34,12 +34,27 @@ It is now and always will be completely ad-free and open-source.
 *  Custom TLE satellite data import is available via Three Line Element .txt files
 *  Offline first: calculations are made offline. Weekly TLE data update is recommended.
 
+## License
+
+The Look4Sat application code is licensed under the GNU General Public License v3.0.
+
+The CW decoder in `feature/cw` bundles the [DeepCW](https://github.com/e04/deepcw-engine)
+neural decoding model, licensed under the GNU Affero General Public License v3.0 only
+(AGPL-3.0-only). Because the combined work incorporates an AGPL-3.0 component, the
+combined work is distributed under the
+[GNU Affero General Public License v3.0](LICENSE) — GPL-3.0 Section 13 permits the
+combination, and AGPL-3.0 Section 13 applies to the combined work as a whole.
+Model provenance and attribution are documented in
+[`feature/cw/licenses/NOTICE.md`](feature/cw/licenses/NOTICE.md); the original GPL-3.0
+text is preserved at `feature/cw/licenses/Look4Sat-GPL-3.0.txt`. The CW model runs
+locally on-device and does not provide services over a network.
+
 ## Star History
 
-<a href="https://www.star-history.com/?repos=rt-bishop%2FLook4Sat&type=timeline&legend=top-left">
+<a href="https://star-history.dera.page/#rt-bishop/Look4Sat&type=timeline&legend=top-left">
  <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/chart?repos=rt-bishop/Look4Sat&type=timeline&theme=dark&legend=top-left" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/chart?repos=rt-bishop/Look4Sat&type=timeline&legend=top-left" />
-   <img alt="Star History Chart" src="https://api.star-history.com/chart?repos=rt-bishop/Look4Sat&type=timeline&legend=top-left" />
+   <source media="(prefers-color-scheme: dark)" srcset="https://star-history.dera.page/svg?repos=rt-bishop/Look4Sat&type=timeline&theme=dark&legend=top-left" />
+   <source media="(prefers-color-scheme: light)" srcset="https://star-history.dera.page/svg?repos=rt-bishop/Look4Sat&type=timeline&legend=top-left" />
+   <img alt="Star History Chart" src="https://star-history.dera.page/svg?repos=rt-bishop/Look4Sat&type=timeline&legend=top-left" />
  </picture>
 </a>

app/build.gradle.kts

@@ -11,15 +11,23 @@ val keystoreProperties = Properties().apply {
 }
 
 android {
-    // CW 解码已迁移为纯 Kotlin fldigi 引擎, 不再有 native 库;
-    // 取消 armeabi-v7a 强制, 按设备 ABI 打包(含 x86_64 模拟器)
     defaultConfig {
+        // ONNX Runtime 的 AAR 自带 4 个架构共 115MB 原生库(arm64 28M / armv7 20M /
+        // x86 33M / x86_64 34M)。x86 系列只有模拟器用得到, 全打包会让 APK 从 8MB
+        // 涨到 135MB。仅保留真机需要的两个 ABI。
+        ndk {
+            abiFilters += listOf("arm64-v8a", "armeabi-v7a")
+        }
     }
     androidResources {
         // 显式保留全部语言(防 shrinkResources 丢弃 in/id 印尼语配置); AGP 9 用 localeFilters
         localeFilters += listOf(
             "en", "zh", "tr", "in", "id", "es", "ru", "si", "uk"
         )
+        // DeepCW 模型必须以未压缩形式打包: ONNX Runtime 通过 mmap 直接读取
+        // assets, 压缩后无法映射会导致 createSession 失败。noCompress 只在
+        // 打包 APK 的 app 模块生效, 在 feature 库模块声明无效。
+        noCompress += "onnx"
     }
     signingConfigs {
         if (keystoreProperties["storeFile"] != null) {
@@ -34,6 +42,9 @@ android {
     buildTypes {
         release {
             signingConfig = signingConfigs.findByName("release")
+            // ONNX Runtime 走 JNI, R8 混淆会重命名 ai.onnxruntime.* 类导致 native
+            // 崩溃。convention 插件已开启 isMinifyEnabled, 必须补 keep 规则。
+            proguardFiles("proguard-rules.pro")
         }
     }
 }

app/proguard-rules.pro

@@ -0,0 +1,13 @@
+# ProGuard / R8 rules for the Look4Sat application module.
+#
+# NOTE: release builds enable minification (isMinifyEnabled=true in the
+# convention plugin), so anything whose classes are resolved reflectively or
+# through JNI by name MUST be kept here.
+
+# ONNX Runtime (ai.onnxruntime): the Java binding is backed by JNI. Native code
+# resolves Java methods/classes by their original names; R8 renaming or
+# stripping them causes a hard crash at runtime with no Java stack trace.
+# This rule is required by the ONNX Runtime docs for minified Android builds.
+# https://onnxruntime.ai/docs/get-started/with-java.html
+-keep class ai.onnxruntime.** { *; }
+-dontwarn ai.onnxruntime.**

app/src/main/java/com/rtbishop/look4sat/AprsForegroundService.kt

@@ -64,6 +64,16 @@ class AprsForegroundService : Service() {
     }
 
     private fun startReporting() {
+        // onStartCommand reaches here for every ACTION_START and for the null
+        // intent that START_STICKY delivers on restart. Without this guard each
+        // call built a fresh AprsReporter and overwrote the field, leaving the
+        // previous one running with its own scope and timer: the server then
+        // received one duplicate position report per leaked instance per cycle,
+        // and ACTION_STOP could only ever stop the newest one.
+        reporter?.let { existing ->
+            if (existing.isRunning) return
+            existing.stop()
+        }
         val cfg = AprsStore.loadConfig(this)
         if (!cfg.enabled || cfg.callsign.isBlank()) {
             runCatching {

app/src/main/java/com/rtbishop/look4sat/MainActivity.kt

@@ -49,7 +49,7 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         observeNightFilterState()
         setContent {
-            MainTheme(isDarkTheme = true) { MainScreen() }
+            MainTheme(isDarkTheme = true) { NavRoot() }
         }
     }
 

app/src/main/java/com/rtbishop/look4sat/MainScreen.kt

@@ -20,20 +20,18 @@ package com.rtbishop.look4sat
 import androidx.activity.compose.BackHandler
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateContentSize
-import androidx.compose.animation.core.LinearEasing
-import androidx.compose.animation.core.RepeatMode
-import androidx.compose.animation.core.Spring
-import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.infiniteRepeatable
-import androidx.compose.animation.core.rememberInfiniteTransition
-import androidx.compose.animation.core.spring
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.scaleIn
 import androidx.compose.animation.scaleOut
-import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInHorizontally
 import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.animation.togetherWith
@@ -51,7 +49,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
@@ -67,6 +65,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.TransformOrigin
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -83,6 +82,7 @@ import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
 import com.rtbishop.look4sat.core.domain.repository.IContainerProvider
 import com.rtbishop.look4sat.core.domain.repository.MutualPassData
+import com.rtbishop.look4sat.core.domain.navigation.MenuLayout
 import com.rtbishop.look4sat.core.presentation.DeeplinkResolver
 import com.rtbishop.look4sat.core.presentation.ElevationThresholds
 import com.rtbishop.look4sat.core.presentation.LocalElevationThresholds
@@ -97,41 +97,45 @@ import com.rtbishop.look4sat.feature.mutual.MutualViewModel
 import com.rtbishop.look4sat.feature.passes.PassesDestination
 import com.rtbishop.look4sat.feature.radar.RadarDestination
 import com.rtbishop.look4sat.feature.radar.WavelogLogScreen
-import com.rtbishop.look4sat.feature.status.SatStatusScreen
 import com.rtbishop.look4sat.feature.roaming.RoamingScreen
 import com.rtbishop.look4sat.feature.satellites.SatellitesDestination
 import com.rtbishop.look4sat.feature.settings.SettingsDestination
+import com.rtbishop.look4sat.feature.status.SatStatusDestination
 
 @Composable
 fun NavRoot(deeplink: String? = null) {
     val rootBackStack = rememberNavBackStack(Screen.Passes)
     val deeplinkResolver = DeeplinkResolver()
     LaunchedEffect(deeplink) {
-        deeplink?.let {
-            val destination = deeplinkResolver.resolve(it) // rootBackStack.clear()
-            rootBackStack.add(destination)
-        }
+        deeplink?.let { rootBackStack.add(deeplinkResolver.resolve(it)) }
     }
     val navigateBack: () -> Unit = { rootBackStack.removeLastOrNull() }
-    val slideInTransition = slideInHorizontally(initialOffsetX = { it }) togetherWith scaleOut(targetScale = 0.9f)
-    val slideOutTransition = scaleIn(initialScale = 0.9f) togetherWith slideOutHorizontally(targetOffsetX = { it })
+    val navigateToRadar: () -> Unit = { rootBackStack.add(RadarDestination) }
+    // Incoming screen slides in from the right, outgoing drifts left at 1/3 speed (API35+ style)
+    val pushTransition = slideInHorizontally(tween(300)) { it } togetherWith
+        slideOutHorizontally(tween(300)) { -it / 3 }
+    // Reverse: outgoing slides out to the right, incoming drifts in from the left
+    val popTransition = slideInHorizontally(tween(300)) { -it / 3 } togetherWith
+        slideOutHorizontally(tween(300)) { it }
     NavDisplay(
         modifier = Modifier.fillMaxSize(),
         backStack = rootBackStack,
         onBack = navigateBack,
-        transitionSpec = { slideInTransition },
-        popTransitionSpec = { slideOutTransition },
-        predictivePopTransitionSpec = { slideOutTransition },
+        transitionSpec = { pushTransition },
+        popTransitionSpec = { popTransition },
+        predictivePopTransitionSpec = { popTransition },
         entryDecorators = listOf(
-            rememberSaveableStateHolderNavEntryDecorator(), // Required for saving Compose state per entry
-            rememberViewModelStoreNavEntryDecorator() // Required for ViewModel scoping per entry
+            rememberSaveableStateHolderNavEntryDecorator(),
+            rememberViewModelStoreNavEntryDecorator()
         ),
         entryProvider = entryProvider {
-            entry<Screen.Passes> { MainScreen(navigateToRadar = { rootBackStack.add(RadarDestination) }) }
+            entry<Screen.Passes> { MainScreen() }
             entry<RadarDestination> {
-                Scaffold { innerPadding ->
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colorScheme.background
+                ) {
                     RadarDestination(navigateUp = navigateBack)
-                    innerPadding.calculateTopPadding()
                 }
             }
         }
@@ -139,7 +143,7 @@ fun NavRoot(deeplink: String? = null) {
 }
 
 @Composable
-fun MainScreen(navigateToRadar: () -> Unit = {}) {
+fun MainScreen() {
     val backStack = rememberNavBackStack(Screen.Passes)
     val currentKey = backStack.lastOrNull()
     val navigateBack: () -> Unit = { backStack.removeLastOrNull() }
@@ -148,27 +152,27 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
     val container = (context.applicationContext as IContainerProvider).getMainContainer()
     val trackingState by container.radioTrackingService.state.collectAsStateWithLifecycle()
     val otherSettings by container.settingsRepo.otherSettings.collectAsStateWithLifecycle()
-    // UI settings: sort by screenOrder (empty = default order), then filter by hiddenScreens (Settings always kept)
-    val allNavItems = listOf(Screen.Satellites, Screen.Passes, Screen.Radar, Screen.Mutual, Screen.Roaming, Screen.CwDecode, Screen.WavelogLog, Screen.AmSat, Screen.Map, Screen.Settings)
-        .sortedBy { screen ->
-            // Unknown pages (e.g. CwDecode not in old persisted order): use default-order position (Roaming<->Map), then fall back to last
-            val idx = otherSettings.screenOrder.indexOf(screen.screenId)
-            if (idx != -1) idx
-            else com.rtbishop.look4sat.core.presentation.defaultScreenOrder.indexOf(screen.screenId).let {
-                if (it != -1) it else Int.MAX_VALUE
+    // Menu layout is resolved in core:domain so the bar and the settings editor
+    // cannot disagree, and so Settings can never be pushed out of both menus.
+    val allNavItems = listOf(
+        Screen.Satellites, Screen.Passes, Screen.Radar, Screen.Mutual, Screen.Roaming,
+        Screen.CwDecode, Screen.WavelogLog, Screen.AmSat, Screen.Map, Screen.Settings
+    )
+    val menuLayout = remember(
+        otherSettings.screenOrder, otherSettings.subMenuOrder, otherSettings.hiddenScreens
+    ) {
+        MenuLayout.resolve(
+            allScreenIds = allNavItems.map { it.screenId },
+            screenOrder = otherSettings.screenOrder,
+            subMenuOrder = otherSettings.subMenuOrder,
+            hiddenScreenIds = otherSettings.hiddenScreens
+        )
     }
+    val mainNavItems = remember(menuLayout) {
+        menuLayout.mainIds.mapNotNull { id -> allNavItems.find { it.screenId == id } }
     }
-        .filter { it.screenId !in otherSettings.hiddenScreens || it is Screen.Settings }
-    // 4.5.1 foldable menu: main menu (5 bottom-bar slots) + More menu (overflow page)
-    // Legacy migration: persisted subMenuOrder lacks new pages (WavelogLog) -> append to the sub-menu tail
-    val subOrder = (otherSettings.subMenuOrder.ifEmpty { com.rtbishop.look4sat.core.presentation.defaultSubMenuOrder })
-        .let { list -> if ("WavelogLog" in list) list else list + "WavelogLog" }
-        .let { list -> if ("AMSAT" in list) list else list + "AMSAT" }
-    val mainNavItems = remember(allNavItems, subOrder) {
-        allNavItems.filter { it.screenId !in subOrder }.take(5)
-    }
-    val moreNavItems = remember(allNavItems, subOrder) {
-        subOrder.mapNotNull { id -> allNavItems.find { it.screenId == id } }
+    val moreNavItems = remember(menuLayout) {
+        menuLayout.moreIds.mapNotNull { id -> allNavItems.find { it.screenId == id } }
     }
     var moreExpanded by remember { mutableStateOf(false) }
     // Intercept Back while the More menu is open: close the menu first
@@ -188,20 +192,16 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
         NavigationSuiteScaffold(
             navigationSuiteItems = {
                 mainNavItems.forEach { screen ->
-                    val isSelected = when (currentKey) {
-                        is Screen.Satellites -> screen is Screen.Satellites
-                        is Screen.Passes -> screen is Screen.Passes
-                        is Screen.Radar -> screen is Screen.Radar
-                        is Screen.Mutual -> screen is Screen.Mutual
-                        is Screen.CwDecode -> screen is Screen.CwDecode
-                        is Screen.WavelogLog -> screen is Screen.WavelogLog
-                        is Screen.AmSat -> screen is Screen.AmSat
-                        is Screen.Map -> screen is Screen.Map
-                        is Screen.Settings -> screen is Screen.Settings
-                        else -> false
-                    }
+                    // Screen subclasses are data objects, so identity is enough and
+                    // newly added pages highlight without touching this call site.
+                    val isSelected = currentKey == screen
                     item(
-                        icon = { Icon(painterResource(screen.iconResId), stringResource(screen.titleResId)) },
+                        icon = {
+                            Icon(
+                                painter = painterResource(screen.iconResId),
+                                contentDescription = stringResource(screen.titleResId)
+                            )
+                        },
                         label = { Text(stringResource(screen.titleResId)) },
                         selected = isSelected,
                         onClick = {
@@ -260,7 +260,6 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
                                     container.setMutualPassData(MutualPassData())
                                     container.satelliteRepo.selectPass(catNum, aosTime)
                                     backStack.add(Screen.Radar)
-    //                            navigateToRadar()
                                 }
                             }
                             entry<Screen.Radar> {
@@ -287,7 +286,7 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
                                 CwDecodeScreen()
                             }
                             entry<Screen.AmSat> {
-                                SatStatusScreen(container = container)
+                                SatStatusDestination()
                             }
                             entry<Screen.WavelogLog> {
                                 WavelogLogScreen(queue = container.wavelogQueue)
@@ -346,14 +345,18 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
                         }
                     }
                 }
-                // More-menu popup panel (overlays content above the bottom bar; spring bounce)
+                // More-menu popup panel (slim strip anchored to the bottom-right corner)
                 AnimatedVisibility(
                     visible = moreExpanded,
                     modifier = Modifier.fillMaxSize(),
-                    enter = expandVertically(
-                        animationSpec = spring(dampingRatio = Spring.DampingRatioMediumBouncy)
-                    ) + fadeIn(),
-                    exit = shrinkVertically() + fadeOut()
+                    enter = scaleIn(
+                        animationSpec = tween(150),
+                        transformOrigin = TransformOrigin(1f, 1f)
+                    ) + fadeIn(animationSpec = tween(150)),
+                    exit = scaleOut(
+                        animationSpec = tween(120),
+                        transformOrigin = TransformOrigin(1f, 1f)
+                    ) + fadeOut(animationSpec = tween(120))
                 ) {
                     MoreMenuPopup(
                         items = moreNavItems,

app/src/main/java/com/rtbishop/look4sat/MoreMenuPopup.kt

@@ -1,13 +1,13 @@
 /*
  * MoreMenuPopup.kt - bottom-nav "More" second-level menu popup panel (4.5.1).
  *
- * Overlays the content area (above the bottom bar, right-aligned), vertical menu items (icon+text+arrow),
- * current page highlighted; tap the scrim to close, tap an item to navigate. Open/close animation is driven by the caller
- * (MainScreen's AnimatedVisibility + spring).
+ * A slim right-aligned strip above the bottom bar, vertical menu items (icon+text+arrow),
+ * current page highlighted; tap outside to close, tap an item to navigate. No dimming scrim, so the
+ * page stays readable. Open/close animation is driven by the caller (MainScreen's AnimatedVisibility).
  */
 package com.rtbishop.look4sat
 
-import androidx.compose.foundation.background
+import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
@@ -45,31 +46,30 @@ fun MoreMenuPopup(
     Box(
         modifier = Modifier
             .fillMaxSize()
-            .background(MaterialTheme.colorScheme.scrim.copy(alpha = 0.35f))
+            // Transparent catcher: taps outside the card dismiss the menu without
+            // dimming the page behind it.
             .clickable(onClick = onDismiss)
     ) {
         Card(
             modifier = Modifier
                 .align(Alignment.BottomEnd)
-                .padding(12.dp),
+                .padding(12.dp)
+                .widthIn(max = 232.dp)
+                // Swallow taps on the card so they do not reach the dismiss
+                // catcher underneath.
+                .clickable(enabled = false) {},
             shape = RoundedCornerShape(12.dp),
+            border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.6f)),
             colors = CardDefaults.cardColors(
-                containerColor = MaterialTheme.colorScheme.surfaceContainerHigh
+                containerColor = MaterialTheme.colorScheme.surfaceContainer
             )
         ) {
             Column(modifier = Modifier.padding(vertical = 4.dp)) {
                 items.forEach { screen ->
-                    val isSelected = when (currentKey) {
-                        is Screen.Satellites -> screen is Screen.Satellites
-                        is Screen.Passes -> screen is Screen.Passes
-                        is Screen.Radar -> screen is Screen.Radar
-                        is Screen.Mutual -> screen is Screen.Mutual
-                        is Screen.CwDecode -> screen is Screen.CwDecode
-                        is Screen.WavelogLog -> screen is Screen.WavelogLog
-                        is Screen.Map -> screen is Screen.Map
-                        is Screen.Settings -> screen is Screen.Settings
-                        else -> false
-                    }
+                    // Screen subclasses are data objects, so identity is enough. The
+                    // old per-type when was missing AmSat and Roaming, leaving those
+                    // pages unhighlighted while open.
+                    val isSelected = currentKey == screen
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
                         modifier = Modifier

core/data/build.gradle.kts

@@ -5,3 +5,9 @@ plugins {
 android {
     namespace = "com.rtbishop.look4sat.core.data"
 }
+
+dependencies {
+    // DeepCW 神经网络 CW 解码推理。ONNX 推理属 Android 平台依赖, 放此处而非
+    // core:domain —— 后者须保持纯 Kotlin/JVM 以留 KMP 迁移余地 (见 AGENTS.md)。
+    implementation(libs.other.onnxruntime)
+}

core/data/src/main/java/com/rtbishop/look4sat/core/data/aprs/AprsIsClient.kt

@@ -35,6 +35,7 @@ class AprsIsClient(
     fun connect() {
         disconnect()
         val s = Socket()
+        try {
             s.connect(InetSocketAddress(host, port), 30_000)
             s.soTimeout = timeoutSec * 1000
             s.tcpNoDelay = true
@@ -57,6 +58,14 @@ class AprsIsClient(
                 // Restore timeout
                 s.soTimeout = timeoutSec * 1000
             }
+        } catch (e: Exception) {
+            // Close the local socket before re-throwing, so it does not leak when
+            // an exception is raised after s.connect() but before socket = s.
+            // Otherwise periodic reconnect attempts (AprsReporter every 1–60 min)
+            // accumulate leaked fds until the process cannot open any more files.
+            runCatching { s.close() }
+            throw e
+        }
     }
 
     /**
@@ -68,8 +77,14 @@ class AprsIsClient(
             val w = writer ?: return null
             w.println(packetLine)
             if (w.checkError()) return Pair(false, "write failed")
-        }
-        // Try to read the server response (short 3 s timeout; APRS-IS replies with an error line on bad format)
+            // Read the server response inside the same lock: disconnect() (called
+            // concurrently from stop()/reconnect on another thread) nulls
+            // writer/reader/socket and closes them. Reading outside the lock raced
+            // with that: the response read could hit a just-closed socket and the
+            // swallowing runCatching reported Pair(true,"OK") for a packet that
+            // never left, or read through a stale reference. Serialising keeps
+            // the read on the connection this thread just wrote to. The 3 s read
+            // timeout bounds how long a concurrent disconnect waits.
             return runCatching {
                 val s = socket ?: return@runCatching Pair(true, "OK")
                 val oldTimeout = s.soTimeout
@@ -87,6 +102,7 @@ class AprsIsClient(
                 }
             }.getOrElse { Pair(true, "OK") }
         }
+    }
 
     /** Read one line (server response; throws on timeout) */
     fun readLine(): String? {

core/data/src/main/java/com/rtbishop/look4sat/core/data/cw/CwDeepDecoder.kt

@@ -0,0 +1,350 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.data.cw
+
+import ai.onnxruntime.OnnxTensor
+import ai.onnxruntime.OrtEnvironment
+import ai.onnxruntime.OrtSession
+import android.content.Context
+import android.util.Log
+import com.rtbishop.look4sat.core.domain.cw.CwCtcDecoder
+import com.rtbishop.look4sat.core.domain.cw.CwDeepBuffer
+import com.rtbishop.look4sat.core.domain.cw.CwDeepSpectrogram
+import com.rtbishop.look4sat.core.domain.cw.ICwDecoder
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.withContext
+import org.json.JSONObject
+import java.nio.FloatBuffer
+
+/**
+ * CW decoder backed by the DeepCW neural network (AGPL-3.0, see
+ * `feature/cw/licenses/NOTICE.md`).
+ *
+ * The model classifies a whole audio segment at once rather than streaming
+ * sample by sample, and it revises earlier characters once more context
+ * arrives. Incremental stitching therefore produces duplicated callsigns —
+ * measured character error rates of 67-294% against 0% for whole-segment
+ * decoding. Instead a [CwDeepBuffer] holds the last 20 seconds and the whole
+ * window is re-decoded every 1.5 seconds, replacing [decodedText] outright.
+ *
+ * The model's fixed 400-1200 Hz analysis window means pitch detection is built
+ * in; no spectral peak tracking or squelch gating is needed.
+ */
+class CwDeepDecoder(context: Context) : ICwDecoder {
+
+    private companion object {
+        const val TAG = "CwDeepDecoder"
+        const val MODEL_ASSET = "deepcw/model.onnx"
+        const val METADATA_ASSET = "deepcw/model.onnx.json"
+
+        /** Evicted audio is decoded into permanent history once this much accumulates. */
+        const val ARCHIVE_SECONDS = 15.0
+        val ARCHIVE_THRESHOLD: Int = (CwDeepSpectrogram.SAMPLE_RATE * ARCHIVE_SECONDS).toInt()
+    }
+
+    private val _decodedText = MutableStateFlow("")
+    override val decodedText: StateFlow<String> = _decodedText.asStateFlow()
+
+    private val _historyText = MutableStateFlow("")
+    override val historyText: StateFlow<String> = _historyText.asStateFlow()
+
+    private val _estimatedPitch = MutableStateFlow<Float?>(null)
+    override val estimatedPitch: StateFlow<Float?> = _estimatedPitch.asStateFlow()
+
+    private val _signalStrength = MutableStateFlow(0f)
+    override val signalStrength: StateFlow<Float> = _signalStrength.asStateFlow()
+
+    private val _lastInferenceMs = MutableStateFlow(0)
+    override val lastInferenceMs: StateFlow<Int> = _lastInferenceMs.asStateFlow()
+
+    private val _errorMessage = MutableStateFlow<String?>(null)
+    override val errorMessage: StateFlow<String?> = _errorMessage.asStateFlow()
+
+    private val buffer = CwDeepBuffer()
+
+    /**
+     * Evicted audio accumulates here until it reaches [ARCHIVE_SECONDS], then
+     * is decoded once and appended to [historyText]. Archiving in ~15 s chunks
+     * keeps the extra inference cheap (short window) while long enough to be
+     * decoded accurately — the content has already been through the 20 s window
+     * many times, so a slightly shorter archive decode loses almost nothing.
+     */
+    private val archiveBuffer = FloatArray(CwDeepBuffer.DEFAULT_MAX_SECONDS.toInt() * CwDeepSpectrogram.SAMPLE_RATE)
+    private var archiveSize = 0
+
+    /** Held while inference runs so slow devices skip work instead of queuing it. */
+    private val inferenceLock = Mutex()
+
+    private var environment: OrtEnvironment? = null
+    private var session: OrtSession? = null
+    private var chars: List<String> = emptyList()
+    private var blankIndex = 41
+    private var inputName = "spectrogram"
+    private var outputName = "log_probs"
+
+    private val appContext = context.applicationContext
+    private var loadAttempted = false
+
+    init {
+        CwProbe.init(appContext)
+        CwProbe.step("decoder_constructed")
+    }
+
+    /**
+     * Loads metadata and the ONNX session on first use.
+     *
+     * Deliberately not done in `init`: loading pulls in ONNX Runtime's native
+     * library, and a failure there surfaces as [UnsatisfiedLinkError]. Thrown
+     * from a constructor it would take down the whole composable that created
+     * the decoder, so the work happens here where it can be reported through
+     * [errorMessage] instead.
+     *
+     * @return true when the session is ready to run.
+     */
+    private fun ensureLoaded(): Boolean {
+        if (session != null) return true
+        if (loadAttempted) return false
+        loadAttempted = true
+        CwProbe.step("load_begin")
+        try {
+            val metadata = JSONObject(
+                appContext.assets.open(METADATA_ASSET).bufferedReader().use { it.readText() }
+            )
+            val charArray = metadata.getJSONArray("chars")
+            chars = List(charArray.length()) { charArray.getString(it) }
+            blankIndex = metadata.getInt("blank_index")
+            inputName = metadata.getString("onnx_input_name")
+            outputName = metadata.getString("onnx_output_name")
+
+            val modelBytes = appContext.assets.open(MODEL_ASSET).use { it.readBytes() }
+            val env = OrtEnvironment.getEnvironment()
+            environment = env
+            val options = OrtSession.SessionOptions().apply {
+                // Keep a core free for audio capture and the UI; the default
+                // would spread inference across every core on the device.
+                val threads = (Runtime.getRuntime().availableProcessors() - 1).coerceIn(1, 4)
+                setIntraOpNumThreads(threads)
+            }
+            session = env.createSession(modelBytes, options)
+            CwProbe.step("load_session_ok")
+            Log.i(TAG, "DeepCW ready: ${modelBytes.size} bytes, ${chars.size} classes")
+            return true
+        } catch (t: Throwable) {
+            // Catches UnsatisfiedLinkError (missing/mismatched .so) as well as
+            // asset and session failures.
+            CwProbe.step("load_failed:${t.javaClass.simpleName}")
+            Log.e(TAG, "DeepCW model failed to load", t)
+            _errorMessage.value =
+                "CW model failed to load: ${t.message ?: t.javaClass.simpleName}"
+            // Persist the failure for devices without logcat access.
+            runCatching {
+                val sw = java.io.StringWriter()
+                t.printStackTrace(java.io.PrintWriter(sw))
+                java.io.File(appContext.filesDir, "deepcw_load_error.txt")
+                    .writeText("${t.javaClass.name}: ${t.message}\n${sw}\n")
+            }
+            return false
+        }
+    }
+
+    override suspend fun processBuffer(samples: FloatArray, sampleRate: Int) {
+        if (samples.isEmpty()) return
+        if (!ensureLoaded()) return
+
+        val resampled = CwDeepSpectrogram.resampleLinear(
+            samples, sampleRate, CwDeepSpectrogram.SAMPLE_RATE
+        )
+        val shouldRedecode = buffer.append(resampled)
+
+        // Archive audio that scrolled out of the live window. It is decoded once
+        // when a full archive chunk has accumulated, so old text does not vanish.
+        val overflow = buffer.drainOverflow()
+        if (overflow.isNotEmpty()) {
+            for (v in overflow) {
+                // Flush before appending when the buffer is full, so large batches
+                // (e.g. 47999 samples already accumulated + 64000 new overflow)
+                // do not silently drop audio that scrolled out of the live window.
+                if (archiveSize >= archiveBuffer.size) {
+                    val audio = archiveBuffer.copyOf(archiveSize)
+                    archiveSize = 0
+                    try {
+                        archiveDecode(audio)
+                    } catch (t: Throwable) {
+                        if (t is CancellationException) throw t
+                        Log.e(TAG, "archive decode failed", t)
+                    }
+                }
+                archiveBuffer[archiveSize++] = v
+            }
+            // Final flush when threshold is reached (e.g. exactly 48000 accumulated).
+            if (archiveSize >= ARCHIVE_THRESHOLD) {
+                val audio = archiveBuffer.copyOf(archiveSize)
+                archiveSize = 0
+                try {
+                    archiveDecode(audio)
+                } catch (t: Throwable) {
+                    if (t is CancellationException) throw t
+                    Log.e(TAG, "archive decode failed", t)
+                }
+            }
+        }
+
+        if (!shouldRedecode || !buffer.hasEnoughAudio) return
+
+        // Drop this cycle rather than queue when the previous run is still going.
+        if (!inferenceLock.tryLock()) {
+            Log.d(TAG, "inference still running, skipping this interval")
+            return
+        }
+        try {
+            decodeWindow(buffer.snapshot())
+        } catch (t: Throwable) {
+            // Cancellation is normal when the user pauses: the capture coroutine
+            // is cancelled while an inference is in flight. Never swallow it as
+            // a decode error — rethrow so the coroutine machinery works, and do
+            // not flash a spurious "decode failed" banner.
+            if (t is CancellationException) throw t
+            Log.e(TAG, "inference failed", t)
+            _errorMessage.value = "CW decode failed: ${t.message ?: t.javaClass.simpleName}"
+            runCatching {
+                val sw = java.io.StringWriter()
+                t.printStackTrace(java.io.PrintWriter(sw))
+                java.io.File(appContext.filesDir, "deepcw_infer_error.txt")
+                    .writeText("${t.javaClass.name}: ${t.message}\n${sw}\n")
+            }
+        } finally {
+            inferenceLock.unlock()
+        }
+    }
+
+    private suspend fun decodeWindow(window: FloatArray) = withContext(Dispatchers.Default) {
+        val activeSession = session ?: return@withContext
+        val activeEnvironment = environment ?: return@withContext
+        CwProbe.step("infer_begin frames=${window.size}")
+
+        val spectrogram = CwDeepSpectrogram.compute(window)
+        val text = runInference(activeSession, activeEnvironment, spectrogram)
+
+        // Replace, never append: the model rewrites earlier characters as more
+        // context arrives, so appending would leave stale guesses on screen.
+        _decodedText.value = text
+
+        updateSignalMetrics(spectrogram)
+    }
+
+    /**
+     * Decode a chunk of audio that has scrolled out of the live window and
+     * append it to [historyText]. Unlike the live window this never replaces —
+     * the archived audio is final, so its text is permanent.
+     */
+    private suspend fun archiveDecode(audio: FloatArray) = withContext(Dispatchers.Default) {
+        val activeSession = session ?: return@withContext
+        val activeEnvironment = environment ?: return@withContext
+        if (audio.size < CwDeepSpectrogram.FFT_LENGTH) return@withContext
+        val spectrogram = CwDeepSpectrogram.compute(audio)
+        val text = runInference(activeSession, activeEnvironment, spectrogram)
+        if (text.isNotEmpty()) {
+            _historyText.value += text
+        }
+    }
+
+    /** Run the ONNX model over a pre-computed spectrogram and return the decoded text. */
+    private fun runInference(
+        activeSession: OrtSession,
+        activeEnvironment: OrtEnvironment,
+        spectrogram: Array<FloatArray>
+    ): String {
+        val frames = spectrogram.size
+        val bins = CwDeepSpectrogram.FREQUENCY_BINS
+
+        val flat = FloatBuffer.allocate(frames * bins)
+        for (frame in spectrogram) flat.put(frame)
+        flat.rewind()
+
+        val shape = longArrayOf(1, 1, frames.toLong(), bins.toLong())
+        val startedAt = System.currentTimeMillis()
+        val text: String
+        OnnxTensor.createTensor(activeEnvironment, flat, shape).use { input ->
+            activeSession.run(mapOf(inputName to input)).use { result ->
+                @Suppress("UNCHECKED_CAST")
+                val logits = result[outputName].get().value as Array<Array<FloatArray>>
+                text = CwCtcDecoder.greedy(logits, chars, blankIndex)
+            }
+        }
+        _lastInferenceMs.value = (System.currentTimeMillis() - startedAt).toInt()
+        CwProbe.step("infer_done ms=${_lastInferenceMs.value}")
+        return text
+    }
+
+    /**
+     * Report the loudest bin as the tone pitch and its prominence over the
+     * window mean as a 0..1 strength, purely for the UI readout.
+     */
+    private fun updateSignalMetrics(spectrogram: Array<FloatArray>) {
+        if (spectrogram.isEmpty()) return
+        var bestBin = 0
+        var bestValue = 0f
+        var total = 0f
+        var count = 0
+        for (frame in spectrogram) {
+            for (bin in frame.indices) {
+                val value = frame[bin]
+                total += value
+                count++
+                if (value > bestValue) {
+                    bestValue = value
+                    bestBin = bin
+                }
+            }
+        }
+        if (count == 0 || bestValue <= 0f) return
+
+        val binHz = CwDeepSpectrogram.SAMPLE_RATE.toDouble() / CwDeepSpectrogram.FFT_LENGTH
+        // Relative bin 0 is 400 Hz; absolute bin index is 32 + bestBin.
+        val absoluteBin = 32 + bestBin
+        _estimatedPitch.value = (absoluteBin * binHz).toFloat()
+
+        val mean = total / count
+        _signalStrength.value = ((bestValue - mean) / bestValue).coerceIn(0f, 1f)
+    }
+
+    override fun reset() {
+        buffer.reset()
+        _decodedText.value = ""
+        _historyText.value = ""
+        archiveSize = 0
+        _estimatedPitch.value = null
+        _signalStrength.value = 0f
+        _lastInferenceMs.value = 0
+    }
+
+    override fun close() {
+        try {
+            session?.close()
+        } catch (t: Throwable) {
+            Log.w(TAG, "session close failed", t)
+        }
+        session = null
+        environment = null
+    }
+}

core/data/src/main/java/com/rtbishop/look4sat/core/data/cw/CwProbe.kt

@@ -0,0 +1,53 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.data.cw
+
+import android.content.Context
+import android.util.Log
+
+/**
+ * Minimal crash-probe logger for diagnosing crashes that produce no Java
+ * stack trace (native faults, low-memory kills). Each step appends one line
+ * to `files/probe_cw.txt`; if the process dies mid-way the last line shows
+ * exactly where. No adb or logcat required.
+ */
+internal object CwProbe {
+
+    /** Keep the diagnostic file bounded: the decoder writes two lines per
+     * 1.5 s inference tick (~170 KB/hour), so without a cap it grows without
+     * limit on every release build. Truncate instead of deleting so the
+     * probe keeps the last diagnostics before a crash. */
+    private const val MAX_FILE_BYTES = 1_048_576L // 1 MiB
+
+    private var dir: java.io.File? = null
+
+    fun init(context: Context) {
+        dir = context.filesDir
+    }
+
+    fun step(label: String) {
+        val target = dir ?: return
+        runCatching {
+            val line = "${System.currentTimeMillis()} $label"
+            val file = java.io.File(target, "probe_cw.txt")
+            if (file.length() > MAX_FILE_BYTES) file.delete()
+            file.appendText("$line\n")
+            Log.i("CwProbe", line)
+        }
+    }
+}

core/data/src/main/java/com/rtbishop/look4sat/core/data/database/Look4SatDao.kt

@@ -45,7 +45,12 @@ interface Look4SatDao {
     @Query("DELETE FROM entries")
     suspend fun deleteEntries()
 
-    @Query("SELECT catnum FROM radios WHERE downlinkMode IN (:modes)")
+    @Query(
+        """
+        SELECT DISTINCT catnum FROM radios WHERE isAlive = 1
+        AND (downlinkMode IN (:modes) OR uplinkMode IN (:modes))
+        """
+    )
     suspend fun getIdsWithModes(modes: List<String>): List<Int>
 
     @Query("SELECT COUNT(*) FROM radios")

core/data/src/main/java/com/rtbishop/look4sat/core/data/framework/BluetoothReporter.kt

@@ -76,10 +76,12 @@ class BluetoothReporter(
     private fun ensureRotatorConnected() {
         if (rotatorConnected || rotatorConnecting || rotatorDeviceId.isBlank()) return
         reporterScope.launch {
+            var opened: android.bluetooth.BluetoothSocket? = null
             try {
                 rotatorConnecting = true
                 val device = bluetoothManager.adapter.getRemoteDevice(rotatorDeviceId)
                 val socket = device.createInsecureRfcommSocketToServiceRecord(sppId)
+                opened = socket
                 socket.connect()
                 rotatorSocket = socket
                 rotatorStream = socket.outputStream
@@ -87,6 +89,11 @@ class BluetoothReporter(
                 Log.i(tag, "Rotator connected to $rotatorDeviceId")
             } catch (e: Exception) {
                 Log.e(tag, "Rotator connect error: ${e.message}")
+                // Close the socket we opened, otherwise a failure after connect()
+                // leaks it: nothing else holds a reference once this returns.
+                runCatching { opened?.close() }
+                rotatorSocket = null
+                rotatorStream = null
                 rotatorConnected = false
             } finally {
                 rotatorConnecting = false
@@ -97,10 +104,12 @@ class BluetoothReporter(
     private fun ensureFrequencyConnected() {
         if (frequencyConnected || frequencyConnecting || frequencyDeviceId.isBlank()) return
         reporterScope.launch {
+            var opened: android.bluetooth.BluetoothSocket? = null
             try {
                 frequencyConnecting = true
                 val device = bluetoothManager.adapter.getRemoteDevice(frequencyDeviceId)
                 val socket = device.createInsecureRfcommSocketToServiceRecord(sppId)
+                opened = socket
                 socket.connect()
                 frequencySocket = socket
                 frequencyStream = socket.outputStream
@@ -108,6 +117,11 @@ class BluetoothReporter(
                 Log.i(tag, "Frequency connected to $frequencyDeviceId")
             } catch (e: Exception) {
                 Log.e(tag, "Frequency connect error: ${e.message}")
+                // Close the socket we opened, otherwise a failure after connect()
+                // leaks it: nothing else holds a reference once this returns.
+                runCatching { opened?.close() }
+                frequencySocket = null
+                frequencyStream = null
                 frequencyConnected = false
             } finally {
                 frequencyConnecting = false

core/data/src/main/java/com/rtbishop/look4sat/core/data/framework/Ft817Controller.kt

@@ -42,6 +42,9 @@ class Ft817Controller(
     private val commandDelayMs = 200L
     private val maxAckReadFailures = 3
 
+    /** Largest frequency the 4-byte BCD / 10 Hz CAT field can represent. */
+    private val maxFrequencyHz = 999_999_990L
+
     private var socket: BluetoothSocket? = null
     private var outputStream: OutputStream? = null
     private var inputStream: InputStream? = null
@@ -53,9 +56,11 @@ class Ft817Controller(
     override suspend fun connect(): Boolean = withContext(Dispatchers.IO) {
         if (isConnected) return@withContext true
         if (deviceAddress.isBlank()) return@withContext false
+        var opened: android.bluetooth.BluetoothSocket? = null
         try {
             val device = bluetoothManager.adapter.getRemoteDevice(deviceAddress)
             val btSocket = device.createInsecureRfcommSocketToServiceRecord(sppId)
+            opened = btSocket
             btSocket.connect()
             socket = btSocket
             outputStream = btSocket.outputStream
@@ -66,6 +71,13 @@ class Ft817Controller(
             true
         } catch (e: Exception) {
             Log.e(tag, "Connect error: ${e.message}")
+            // Close the socket we opened. Without this a failure after connect()
+            // (e.g. outputStream throwing) leaks the Bluetooth socket, because
+            // disconnect() only closes what already reached the fields.
+            runCatching { opened?.close() }
+            socket = null
+            outputStream = null
+            inputStream = null
             isConnected = false
             false
         }
@@ -91,6 +103,16 @@ class Ft817Controller(
     }
 
     override suspend fun setFrequency(frequencyHz: Long): Boolean = withContext(Dispatchers.IO) {
+        // The FT-817 CAT frequency field is 4 BCD bytes at 10 Hz resolution,
+        // so the protocol cannot express anything above 999,999,990 Hz. Below
+        // that the encoder is exact; above it, the %08d formatting silently
+        // drops the leading digit and the radio receives a frequency ten
+        // times lower (e.g. 1267.6 MHz becomes 126.76 MHz), and the tracking
+        // loop's read-back then locks onto the wrong band. Reject instead.
+        if (frequencyHz > maxFrequencyHz) {
+            Log.e(tag, "setFrequency rejected: $frequencyHz Hz exceeds FT-817 CAT limit $maxFrequencyHz")
+            return@withContext false
+        }
         ioMutex.withLock {
             sendCommandWithAck(Ft817CatProtocol.buildSetFreqCommand(frequencyHz))
         }

core/data/src/main/java/com/rtbishop/look4sat/core/data/framework/Ic705Controller.kt

@@ -67,9 +67,11 @@ class Ic705Controller(
     override suspend fun connect(): Boolean = withContext(Dispatchers.IO) {
         if (isConnected) return@withContext true
         if (deviceAddress.isBlank()) return@withContext false
+        var opened: android.bluetooth.BluetoothSocket? = null
         try {
             val device  = bluetoothManager.adapter.getRemoteDevice(deviceAddress)
             val btSocket = device.createInsecureRfcommSocketToServiceRecord(sppId)
+            opened = btSocket
             btSocket.connect()
             socket       = btSocket
             outputStream = btSocket.outputStream
@@ -84,6 +86,13 @@ class Ic705Controller(
             true
         } catch (e: Exception) {
             Log.e(tag, "Connect error: ${e.message}")
+            // Close the socket we opened. Without this a failure after connect()
+            // (e.g. outputStream throwing) leaks the Bluetooth socket, because
+            // disconnect() only closes what already reached the fields.
+            runCatching { opened?.close() }
+            socket = null
+            outputStream = null
+            inputStream = null
             isConnected = false
             false
         }

core/data/src/main/java/com/rtbishop/look4sat/core/data/framework/NetworkReporter.kt

@@ -71,14 +71,19 @@ class NetworkReporter(
     private fun ensureRotatorConnected() {
         if (rotatorConnected || rotatorConnecting || rotatorServer.isBlank()) return
         reporterScope.launch {
+            var opened: SocketChannel? = null
             try {
                 rotatorConnecting = true
-                rotatorSocket = SocketChannel.open(InetSocketAddress(rotatorServer, rotatorPort))
+                opened = SocketChannel.open(InetSocketAddress(rotatorServer, rotatorPort))
+                rotatorSocket = opened
                 rotatorConnected = true
                 println("NetworkReporter: Rotator connected to $rotatorServer:$rotatorPort")
             } catch (e: Exception) {
                 println("NetworkReporter rotator connect error: ${e.message}")
                 rotatorConnected = false
+                // Close a socket that connected but failed during setup, so a
+                // broken channel is never left referenced without a closer.
+                opened?.close()
             } finally {
                 rotatorConnecting = false
             }
@@ -88,14 +93,17 @@ class NetworkReporter(
     private fun ensureFrequencyConnected() {
         if (frequencyConnected || frequencyConnecting || frequencyServer.isBlank()) return
         reporterScope.launch {
+            var opened: SocketChannel? = null
             try {
                 frequencyConnecting = true
-                frequencySocket = SocketChannel.open(InetSocketAddress(frequencyServer, frequencyPort))
+                opened = SocketChannel.open(InetSocketAddress(frequencyServer, frequencyPort))
+                frequencySocket = opened
                 frequencyConnected = true
                 println("NetworkReporter: Frequency connected to $frequencyServer:$frequencyPort")
             } catch (e: Exception) {
                 println("NetworkReporter frequency connect error: ${e.message}")
                 frequencyConnected = false
+                opened?.close()
             } finally {
                 frequencyConnecting = false
             }
@@ -111,6 +119,17 @@ class NetworkReporter(
         } catch (e: Exception) {
             println("NetworkReporter write error: ${e.message}")
             onError()
+            // The channel failed a write: drop it and its closure obligation.
+            // Leaving it referenced lets the next connect overwrite the field
+            // and leak the old channel. Only the field the caller passed is
+            // cleared, matching the connected=false the onError sets.
+            if (socket === rotatorSocket) {
+                rotatorSocket?.close()
+                rotatorSocket = null
+            } else if (socket === frequencySocket) {
+                frequencySocket?.close()
+                frequencySocket = null
+            }
         }
     }
 

core/data/src/main/java/com/rtbishop/look4sat/core/data/framework/RadioTrackingService.kt

@@ -267,14 +267,20 @@ class RadioTrackingService(
 
             if (tuningRadio.isEmpty()) {
                 if (txNow != null && txNow.isConnected && txRadioFreq != null) {
-                    txNow.setFrequency(txRadioFreq)
+                    // Only remember the frequency we actually wrote: if the radio
+                    // rejects it (FT-817 CAT limit) or the link dropped, keeping
+                    // lastSetTxFreq updated would make the manual-tuning detector
+                    // see a phantom dial change on the next read-back.
+                    if (txNow.setFrequency(txRadioFreq)) {
                         lastSetTxFreq = txRadioFreq.toDouble()
                     }
+                }
                 if (rxNow != null && rxNow.isConnected && rxRadioFreq != null) {
-                    rxNow.setFrequency(rxRadioFreq)
+                    if (rxNow.setFrequency(rxRadioFreq)) {
                         lastSetRxFreq = rxRadioFreq.toDouble()
                     }
                 }
+            }
 
             _state.update {
                 it.copy(
@@ -450,15 +456,17 @@ class RadioTrackingService(
                 // 0x25/00 = active (RX) VFO, 0x25/01 = inactive (TX) VFO.
                 if (rxRadioFreq != null) {
                     Log.d(tag, "Split loop RX (0x25/00): ${rxRadioFreq}Hz")
-                    radio.setWorkingFrequency(rxRadioFreq)
+                    if (radio.setWorkingFrequency(rxRadioFreq)) {
                         lastSetRxFreq = rxRadioFreq.toDouble()
                     }
+                }
                 if (txRadioFreq != null) {
                     Log.d(tag, "Split loop TX (0x25/01): ${txRadioFreq}Hz")
-                    radio.setTxVfoFrequency(txRadioFreq)
+                    if (radio.setTxVfoFrequency(txRadioFreq)) {
                         lastSetTxFreq = txRadioFreq.toDouble()
                     }
                 }
+            }
 
             _state.update {
                 it.copy(

core/data/src/main/java/com/rtbishop/look4sat/core/data/injection/MainContainer.kt

@@ -30,7 +30,6 @@ import com.rtbishop.look4sat.core.data.framework.Ic705Controller
 import com.rtbishop.look4sat.core.data.framework.NetworkReporter
 import com.rtbishop.look4sat.core.data.framework.RadioTrackingService
 import com.rtbishop.look4sat.core.data.repository.AmSatRepository
-import com.rtbishop.look4sat.core.domain.amsat.AmSatApiClient
 import com.rtbishop.look4sat.core.data.repository.DatabaseRepo
 import com.rtbishop.look4sat.core.data.repository.SatelliteRepo
 import com.rtbishop.look4sat.core.data.repository.SelectionRepo
@@ -83,7 +82,7 @@ class MainContainer(private val context: Context) : IMainContainer {
     override val selectionRepo = provideSelectionRepo()
     override val satelliteRepo = provideSatelliteRepo()
     override val databaseRepo = provideDatabaseRepo()
-    override val amSatRepo = AmSatRepository(com.rtbishop.look4sat.core.domain.amsat.AmSatApiClient())
+    override val amSatRepo by lazy { AmSatRepository(remoteSource) }
     override val radioTrackingService: IRadioTrackingService by lazy {
         val manager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
         RadioTrackingService(appScope, manager, satelliteRepo, settingsRepo)
@@ -98,10 +97,22 @@ class MainContainer(private val context: Context) : IMainContainer {
 
     override fun provideAddToCalendar(): IAddToCalendar = AddToCalendar(context)
 
+    override fun providePairedBluetoothDevices(): List<Pair<String, String>> = buildList {
+        try {
+            val manager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
+            manager.adapter?.bondedDevices?.forEach { add(Pair(it.name ?: "Unknown", it.address ?: "")) }
+        } catch (_: SecurityException) {}
+    }
+
     override fun provideShowToast(): IShowToast = ShowToast(context)
 
     override fun provideAudioCapture(): IAudioCapture = AudioCapture()
 
+    // 每次调用返回新实例: 调用方负责 close() 释放 OrtSession, 且 Radar 内嵌
+    // 面板与独立 CW 页各自持有自己的解码器
+    override fun provideCwDecoder(): com.rtbishop.look4sat.core.domain.cw.ICwDecoder =
+        com.rtbishop.look4sat.core.data.cw.CwDeepDecoder(context)
+
     override fun provideSaveImage(): ISaveImage = SaveImage(context)
 
     // WaveLog logging (4.5.2): local queue + uploader (shared instance)

core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/AmSatRepository.kt

@@ -1,47 +1,110 @@
 package com.rtbishop.look4sat.core.data.repository
 
-import com.rtbishop.look4sat.core.domain.amsat.AmSatApiClient
-import com.rtbishop.look4sat.core.domain.amsat.ApiReport
 import com.rtbishop.look4sat.core.domain.model.SatDay
 import com.rtbishop.look4sat.core.domain.model.SatReport
 import com.rtbishop.look4sat.core.domain.model.SatSlot
 import com.rtbishop.look4sat.core.domain.model.SatStatus
 import com.rtbishop.look4sat.core.domain.model.SatStatusPage
 import com.rtbishop.look4sat.core.domain.repository.IAmSatRepository
+import com.rtbishop.look4sat.core.domain.source.IRemoteSource
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import org.json.JSONObject
+import java.text.SimpleDateFormat
 import java.util.Calendar
+import java.util.Locale
 import java.util.TimeZone
 
-/** AMSAT status repository: official API v1 -> SatStatusPage (replaces the HTML parser). */
-class AmSatRepository(private val apiClient: AmSatApiClient) : IAmSatRepository {
+/** One report from the AMSAT API (data layer model). */
+private data class ApiReport(
+    val id: String,
+    val name: String,
+    val callsign: String,
+    val report: String,
+    val gridSquare: String,
+    val reportedTimeUtcSec: Long
+)
+
+/** AMSAT status repository using RemoteSource (Clean Architecture: data layer handles HTTP). */
+class AmSatRepository(private val remoteSource: IRemoteSource) : IAmSatRepository {
+
+    private val isoUtcFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US).apply {
+        timeZone = TimeZone.getTimeZone("UTC")
+    }
 
     override suspend fun fetchStatus(): SatStatusPage? = withContext(Dispatchers.IO) {
         val nowSec = System.currentTimeMillis() / 1000
-        val names = apiClient.fetchCatalog()
-        val reports = apiClient.fetchAllReports(hours = 168)
+        val catalogJson = remoteSource.getAmSatCatalog() ?: return@withContext null
+        // 72h = 3 days; API hard cap is limit=500 regardless of what we send.
+        // 500 records across ~100 catalog satellites ≈ ~1-5 reports/satellite/day — enough for 3 days.
+        // Upgrade path: paginate or request AMSAT to raise the cap if catalog grows beyond ~200 sats.
+        val reportsJson = remoteSource.getAmSatReports(hours = 72, limit = 500) ?: return@withContext null
+        val names = parseCatalog(catalogJson)
+        val reports = parseReports(reportsJson)
+
         if (names.isEmpty() && reports.isEmpty()) return@withContext null
+
         val statuses = buildStatuses(names, reports, nowSec)
         val reportMap = reports.associate { it.id to toSatReport(it) }
         SatStatusPage(System.currentTimeMillis(), statuses, reportMap)
     }
 
-    /** Build one SatStatus (6 days x 12 slots) per catalog satellite, slotting reports by age. */
+    /** Parse catalog JSON to list of satellite names */
+    private fun parseCatalog(json: String): List<String> {
+        return try {
+            val arr = JSONObject(json).getJSONArray("data")
+            (0 until arr.length()).map { arr.getJSONObject(it).getString("name") }
+        } catch (_: Exception) {
+            emptyList()
+        }
+    }
+
+    /** Parse reports JSON to list of ApiReport domain objects */
+    private fun parseReports(json: String): List<ApiReport> {
+        return try {
+            val arr = JSONObject(json).getJSONArray("data")
+            (0 until arr.length()).mapNotNull { i ->
+                val o = arr.getJSONObject(i)
+                val iso = o.optString("reported_time", "")
+                if (iso.isEmpty()) null else ApiReport(
+                    id = o.optString("id", ""),
+                    name = o.optString("name", ""),
+                    callsign = o.optString("callsign", ""),
+                    report = o.optString("report", ""),
+                    gridSquare = o.optString("grid_square", ""),
+                    reportedTimeUtcSec = parseIsoUtcSec(iso)
+                )
+            }
+        } catch (_: Exception) {
+            emptyList()
+        }
+    }
+
+    /** Parse ISO 8601 UTC timestamp to epoch seconds (e.g., "2026-08-05T07:30:00Z") */
+    private fun parseIsoUtcSec(iso: String): Long {
+        return try {
+            (isoUtcFormat.parse(iso)?.time ?: 0L) / 1000
+        } catch (_: Exception) {
+            0L
+        }
+    }
+
+    /** Build one SatStatus (5 days x 12 slots) per catalog satellite, slotting reports by age. */
     private fun buildStatuses(names: List<String>, reports: List<ApiReport>, nowSec: Long): List<SatStatus> {
         val byName = reports.groupBy { it.name }
         val monthAbbr = arrayOf("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec")
         val utc = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
-        val labels = (0 until 6).map { d ->
+        val labels = (0 until 3).map { d ->
             utc.timeInMillis = (nowSec - d * 86400L) * 1000
             "${monthAbbr[utc.get(Calendar.MONTH)]} ${utc.get(Calendar.DAY_OF_MONTH)}"
         }
         return names.map { name ->
-            val slots = (0 until 72).map { slotIdx ->
+            val slots = (0 until 36).map { slotIdx ->
                 val slotStart = nowSec - (slotIdx + 1) * 7200L
                 val slotEnd = nowSec - slotIdx * 7200L
                 val inSlot = byName[name].orEmpty().filter { it.reportedTimeUtcSec in slotStart until slotEnd }
                 if (inSlot.isEmpty()) {
-                    SatSlot(statusColor = NoReportGray, count = 0)
+                    SatSlot(statusColor = NO_REPORT_GRAY, count = 0)
                 } else {
                     val newest = inSlot.maxByOrNull { it.reportedTimeUtcSec }!!
                     SatSlot(
@@ -51,7 +114,7 @@ class AmSatRepository(private val apiClient: AmSatApiClient) : IAmSatRepository
                     )
                 }
             }
-            val days = (0 until 6).map { d ->
+            val days = (0 until 3).map { d ->
                 SatDay(dateLabel = labels[d], slots = slots.subList(d * 12, (d + 1) * 12))
             }
             SatStatus(name = name, days = days)
@@ -76,18 +139,20 @@ class AmSatRepository(private val apiClient: AmSatApiClient) : IAmSatRepository
         )
     }
 
+    /** Map status text to color value (for UI rendering). */
     private fun statusColorOf(report: String): Long = when (report.lowercase()) {
-        "heard", "crew active" -> ActiveBlue
-        "telemetry only" -> TlmOrange
-        "not heard" -> NotHeardPink
-        else -> ConflictDeepOrange
+        "heard", "crew active" -> ACTIVE_BLUE
+        "telemetry only" -> TLM_ORANGE
+        "not heard" -> NOT_HEARD_PINK
+        else -> CONFLICT_DEEP_ORANGE
     }
 
     companion object {
-        private const val ActiveBlue = 0xFF648FFF
-        private const val TlmOrange = 0xFFFFB000
-        private const val NotHeardPink = 0xFFDC267F
-        private const val ConflictDeepOrange = 0xFFFE6100
-        private const val NoReportGray = 0xFFC0C0C0
+        // AMSAT official status colors (from amsat.org/status)
+        private const val ACTIVE_BLUE = 0xFF648FFF
+        private const val TLM_ORANGE = 0xFFFFB000
+        private const val NOT_HEARD_PINK = 0xFFDC267F
+        private const val CONFLICT_DEEP_ORANGE = 0xFFFE6100
+        private const val NO_REPORT_GRAY = 0xFFC0C0C0
     }
 }

core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SatelliteRepo.kt

@@ -34,9 +34,13 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import java.util.TimeZone
+import kotlin.time.Duration.Companion.milliseconds
 
 class SatelliteRepo(
     private val dispatcher: CoroutineDispatcher,
@@ -50,6 +54,10 @@ class SatelliteRepo(
     private val _isCalculating = MutableStateFlow(false)
     override val isCalculating: StateFlow<Boolean> = _isCalculating
 
+    // Serializes pass calculation. Callers queue instead of being dropped: a
+    // dropped call would silently discard the filter the user just applied.
+    private val calculationMutex = Mutex()
+
     private val _satellites = MutableStateFlow<List<OrbitalObject>>(emptyList())
     override val satellites: StateFlow<List<OrbitalObject>> = _satellites
 
@@ -63,7 +71,11 @@ class SatelliteRepo(
     override suspend fun getRadiosWithId(id: Int) = localStorage.getRadiosWithId(id)
 
     override suspend fun initRepository() = withContext(dispatcher) {
-        settingsRepo.selectedIds.collect { selectedIds ->
+        combine(
+            settingsRepo.selectedIds,
+            settingsRepo.stationPosition
+        ) { selectedIds, _ -> selectedIds }
+            .collect { selectedIds ->
                 _satellites.update { localStorage.getEntriesWithIds(selectedIds) }
                 val settings = settingsRepo.passesSettings.value
                 calculatePasses(
@@ -73,7 +85,7 @@ class SatelliteRepo(
                     aosStartMinute = settings.aosStartMinute,
                     aosEndMinute = settings.aosEndMinute,
                     invertAosTimeWindow = settings.invertAosTimeWindow,
-                modes = settings.selectedModes
+                    modes = settingsRepo.selectedSatModes.value
                 )
             }
     }
@@ -117,7 +129,12 @@ class SatelliteRepo(
         invertAosTimeWindow: Boolean,
         modes: List<String>
     ) {
+        // Queue behind any in-flight calculation rather than dropping this call:
+        // every invocation carries filter settings the user just chose, so a
+        // dropped one leaves the list showing results for the previous filter.
+        calculationMutex.withLock {
             _isCalculating.value = true
+            try {
                 // Normalize to the start of the current minute so that coarse 60-second stepping
                 // in getLeoPass always begins from the same phase, producing stable AOS/LOS times
                 val normalizedTime = time / 60_000L * 60_000L
@@ -155,8 +172,13 @@ class SatelliteRepo(
                     delay(1000) // Simulate loading time for better UX
                     _passes.update { newPasses }
                 }
+            } finally {
+                // finally: a thrown/cancelled calculation must not leave the
+                // progress indicator spinning forever.
                 _isCalculating.value = false
             }
+        }
+    }
 
     private fun isAosInRange(
         aosTime: Long,
@@ -170,7 +192,7 @@ class SatelliteRepo(
         val inRange = if (aosStartMinute <= aosEndMinute) {
             aosMinute in aosStartMinute..aosEndMinute
         } else {
-            aosMinute >= aosStartMinute || aosMinute <= aosEndMinute
+            aosMinute !in (aosEndMinute + 1)..<aosStartMinute
         }
         return if (invertAosTimeWindow) !inRange else inRange
     }

core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SelectionRepo.kt

@@ -38,16 +38,16 @@ class SelectionRepo(
 ) : ISelectionRepo {
 
     private val currentItems = MutableStateFlow<List<SatItem>>(emptyList())
-    private val currentTypes = MutableStateFlow(settingsRepo.selectedTypes.value)
     private val currentQuery = MutableStateFlow("")
 
-    // Resolve type IDs once when types change, then filter items reactively.
+    // Resolve sat IDs once when modes change, then filter items reactively.
     // The HashSet gives O(1) catnum lookups instead of O(n) with a List.
-    private val itemsWithTypes = currentTypes.flatMapLatest { types: List<String> ->
-        val catnumSet: Set<Int>? = if (types.isEmpty()) {
+    // Directly observe settingsRepo.selectedSatModes to ensure real-time sync across screens.
+    private val itemsWithModes = settingsRepo.selectedSatModes.flatMapLatest { list: List<String> ->
+        val catnumSet: Set<Int>? = if (list.isEmpty()) {
             null // null = no filtering
         } else {
-            val ids = settingsRepo.getSatelliteTypesIds(types)
+            val ids = localSource.getIdsWithModes(list)
             if (ids.isEmpty()) null else ids.toHashSet()
         }
         currentItems.map { items ->
@@ -56,14 +56,18 @@ class SelectionRepo(
     }
 
     private val itemsWithQuery = currentQuery.flatMapLatest { query ->
-        itemsWithTypes.map { items -> filterByQuery(items, query) }
+        itemsWithModes.map { items ->
+            filterByQuery(items, query).sortedWith(
+                compareByDescending<SatItem> { it.isSelected }
+                    .thenBy { it.name }
+                    .thenBy { it.catnum }
+            )
+        }
     }
 
-    override fun getCurrentTypes() = currentTypes.value
+    override fun getCurrentModes() = settingsRepo.selectedSatModes.value
 
-    override fun getTypesList() = Sources.satelliteDataUrls.keys.sorted().toMutableList().apply {
-        removeAt(0)
-    }
+    override fun getModesList() = Sources.satelliteModes
 
     override suspend fun getEntriesFlow() = withContext(dispatcher) {
         val selectedIds = settingsRepo.selectedIds.value.toHashSet()
@@ -73,9 +77,8 @@ class SelectionRepo(
         return@withContext itemsWithQuery
     }
 
-    override suspend fun setTypes(types: List<String>) {
-        currentTypes.value = types
-        settingsRepo.setSelectedTypes(types)
+    override suspend fun setModes(modes: List<String>) {
+        settingsRepo.setSelectedSatModes(modes)
     }
 
     override suspend fun setQuery(query: String) {

core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SettingsRepo.kt

@@ -29,15 +29,18 @@ import com.rtbishop.look4sat.core.domain.model.OtherSettings
 import com.rtbishop.look4sat.core.domain.model.PassesSettings
 import com.rtbishop.look4sat.core.domain.model.RCSettings
 import com.rtbishop.look4sat.core.domain.model.RadioControlSettings
-import com.rtbishop.look4sat.core.domain.source.Sources
+import com.rtbishop.look4sat.core.domain.model.Constants
+
 import com.rtbishop.look4sat.core.domain.predict.GeoPos
 import com.rtbishop.look4sat.core.domain.repository.ISettingsRepo
+import com.rtbishop.look4sat.core.domain.source.Sources
 import com.rtbishop.look4sat.core.domain.utility.positionToQth
 import com.rtbishop.look4sat.core.domain.utility.qthToPosition
 import com.rtbishop.look4sat.core.domain.utility.round
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
+import org.json.JSONObject
 
 class SettingsRepo(
     private val context: android.content.Context,
@@ -69,9 +72,9 @@ class SettingsRepo(
     private val keyFrequencyAddress = "frequencyAddress"
     private val keyFrequencyPort = "frequencyPort"
     private val keyFrequencyFormat = "frequencyFormat"
+    private val keyFrequencyOffsetHz = "frequencyOffsetHz"
     private val keySelectedIds = "selectedIds"
-    private val keySelectedTypes = "selectedTypes"
-    private val keySelectedModes = "selectedModes"
+    private val keySelectedSatModes = "selectedSatModes"
     private val keyStateOfAutoUpdate = "stateOfAutoUpdate"
     private val keyStateOfSensors = "stateOfSensors"
     private val keyStateOfSweep = "stateOfSweep"
@@ -100,13 +103,16 @@ class SettingsRepo(
     private val keyWavelogApiKey = "wavelogApiKey"
     private val keyWavelogStationId = "wavelogStationId"
     private val keyWavelogAutoUpload = "wavelogAutoUpload"
+    private val keyRadarCompassOffset = "radarCompassOffset"
+    private val keyRadarCompassOffsetElev = "radarCompassOffsetElev"
+
     private val separatorComma = ","
 
     //region # Satellites selection settings
     private val _satelliteSelection = MutableStateFlow(getSelectedIds())
-    private val _typesSelection = MutableStateFlow(getSelectedTypes())
+    private val _satelliteModeSelection = MutableStateFlow(getSelectedSatModes())
     override val selectedIds: StateFlow<List<Int>> = _satelliteSelection
-    override val selectedTypes: StateFlow<List<String>> = _typesSelection
+    override val selectedSatModes: StateFlow<List<String>> = _satelliteModeSelection
 
     override fun setSelectedIds(ids: List<Int>) {
         val selectionString = ids.joinToString(separatorComma)
@@ -114,10 +120,10 @@ class SettingsRepo(
         _satelliteSelection.value = ids
     }
 
-    override fun setSelectedTypes(types: List<String>) {
-        val typesString = types.joinToString(separatorComma)
-        preferences.edit { putString(keySelectedTypes, typesString) }
-        _typesSelection.value = types
+    override fun setSelectedSatModes(modes: List<String>) {
+        val modesString = modes.joinToString(separatorComma)
+        preferences.edit { putString(keySelectedSatModes, modesString) }
+        _satelliteModeSelection.value = modes
     }
 
     private fun getSelectedIds(): List<Int> {
@@ -126,10 +132,10 @@ class SettingsRepo(
         return selectionString.split(separatorComma).map { it.toInt() }
     }
 
-    private fun getSelectedTypes(): List<String> {
-        val typesString = preferences.getString(keySelectedTypes, "Amateur")
-        if (typesString.isNullOrEmpty()) return emptyList()
-        return typesString.split(separatorComma)
+    private fun getSelectedSatModes(): List<String> {
+        val modesString = preferences.getString(keySelectedSatModes, null)
+        if (modesString.isNullOrEmpty()) return emptyList()
+        return modesString.split(separatorComma).sorted()
     }
     //endregion
 
@@ -144,7 +150,6 @@ class SettingsRepo(
         putInt(keyFilterAosStartMinute, settings.aosStartMinute)
         putInt(keyFilterAosEndMinute, settings.aosEndMinute)
         putBoolean(keyFilterAosInvert, settings.invertAosTimeWindow)
-        putString(keySelectedModes, settings.selectedModes.joinToString(separatorComma))
         _passesSettings.value = settings
     }
 
@@ -155,16 +160,13 @@ class SettingsRepo(
         val aosStartMinute = preferences.getInt(keyFilterAosStartMinute, 0).coerceIn(0, 23 * 60 + 59)
         val aosEndMinute = preferences.getInt(keyFilterAosEndMinute, 23 * 60 + 59).coerceIn(0, 23 * 60 + 59)
         val invertAosTimeWindow = preferences.getBoolean(keyFilterAosInvert, false)
-        val selectedModesString = preferences.getString(keySelectedModes, null)
-        val selectedModes = selectedModesString?.split(separatorComma)?.sorted() ?: emptyList()
         return PassesSettings(
             showDeepSpace,
             hoursAhead,
             minElevation,
             aosStartMinute,
             aosEndMinute,
-            invertAosTimeWindow,
-            selectedModes
+            invertAosTimeWindow
         )
     }
     //endregion
@@ -181,7 +183,10 @@ class SettingsRepo(
     }
 
     override fun setStationPosition(latitude: Double, longitude: Double, altitude: Double): Boolean {
-        val newLongitude = if (longitude > 180.0) longitude - 180 else longitude
+        // Wrap an out-of-range longitude into -180..180. Subtracting 180 (the
+        // previous behaviour) mapped 270 to +90 instead of -90, i.e. the wrong
+        // hemisphere, and 360 to +180 instead of 0.
+        val newLongitude = ((longitude + 180.0).mod(360.0)) - 180.0
         val locator = positionToQth(latitude, newLongitude) ?: return false
         setStationPosition(latitude, newLongitude, altitude, locator)
         return true
@@ -262,6 +267,7 @@ class SettingsRepo(
     private val _databaseState = MutableStateFlow(getDatabaseState())
     override val databaseState: StateFlow<DatabaseState> = _databaseState
 
+
     override fun getSatelliteTypesIds(types: List<String>): List<Int> {
         val idsSet = mutableSetOf<Int>()
         types.forEach { type ->
@@ -325,6 +331,10 @@ class SettingsRepo(
     override val rcSettings: StateFlow<RCSettings> = _rcSettings
 
     override fun updateRCSettings(settings: RCSettings) {
+        val clampedFreqOffsetHz = settings.frequencyOffsetHz.coerceIn(
+            Constants.FREQ_OFFSET_MIN_HZ,
+            Constants.FREQ_OFFSET_MAX_HZ
+        )
         preferences.edit {
             putBoolean(keyRotatorState, settings.rotatorState)
             putString(keyRotatorAddress, settings.rotatorAddress)
@@ -334,6 +344,7 @@ class SettingsRepo(
             putString(keyFrequencyAddress, settings.frequencyAddress)
             putString(keyFrequencyPort, settings.frequencyPort)
             putString(keyFrequencyFormat, settings.frequencyFormat)
+            putLong(keyFrequencyOffsetHz, clampedFreqOffsetHz)
             putBoolean(keyBluetoothRotatorState, settings.bluetoothRotatorState)
             putString(keyBluetoothRotatorFormat, settings.bluetoothRotatorFormat)
             putString(keyBluetoothRotatorName, settings.bluetoothRotatorName)
@@ -342,7 +353,7 @@ class SettingsRepo(
             putString(keyBluetoothFrequencyFormat, settings.bluetoothFrequencyFormat)
             putString(keyBluetoothFrequencyAddress, settings.bluetoothFrequencyAddress)
         }
-        _rcSettings.value = settings
+        _rcSettings.value = settings.copy(frequencyOffsetHz = clampedFreqOffsetHz)
     }
 
     private fun getRCSettings(): RCSettings = RCSettings(
@@ -354,6 +365,8 @@ class SettingsRepo(
         frequencyAddress = preferences.getString(keyFrequencyAddress, null) ?: "127.0.0.1",
         frequencyPort = preferences.getString(keyFrequencyPort, null) ?: "4532",
         frequencyFormat = preferences.getString(keyFrequencyFormat, null) ?: $$"F $FREQ",
+        frequencyOffsetHz = preferences.getLong(keyFrequencyOffsetHz, 0L)
+            .coerceIn(Constants.FREQ_OFFSET_MIN_HZ, Constants.FREQ_OFFSET_MAX_HZ),
         bluetoothRotatorState = preferences.getBoolean(keyBluetoothRotatorState, false),
         bluetoothRotatorFormat = preferences.getString(keyBluetoothRotatorFormat, null) ?: $$"P $AZ $EL",
         bluetoothRotatorName = preferences.getString(keyBluetoothRotatorName, null) ?: "Default",
@@ -390,6 +403,9 @@ class SettingsRepo(
                 putString(keyWavelogApiKey, new.wavelogApiKey)
                 putString(keyWavelogStationId, new.wavelogStationId)
                 putBoolean(keyWavelogAutoUpload, new.wavelogAutoUpload)
+                putFloat(keyRadarCompassOffset, new.radarCompassOffset)
+                putFloat(keyRadarCompassOffsetElev, new.radarCompassOffsetElev)
+
             }
             new
         }
@@ -413,7 +429,9 @@ class SettingsRepo(
         wavelogUrl = preferences.getString(keyWavelogUrl, null) ?: "",
         wavelogApiKey = preferences.getString(keyWavelogApiKey, null) ?: "",
         wavelogStationId = preferences.getString(keyWavelogStationId, null) ?: "",
-        wavelogAutoUpload = preferences.getBoolean(keyWavelogAutoUpload, false)
+        wavelogAutoUpload = preferences.getBoolean(keyWavelogAutoUpload, false),
+        radarCompassOffset = preferences.getFloat(keyRadarCompassOffset, 0f),
+        radarCompassOffsetElev = preferences.getFloat(keyRadarCompassOffsetElev, 0f)
     )
     //endregion
 
@@ -445,6 +463,7 @@ class SettingsRepo(
             transceiversUrl = txUrl
         )
     }
+
     //endregion
 
     //region # Radio control settings
@@ -484,5 +503,27 @@ class SettingsRepo(
         baudRate = preferences.getInt(keyRadioBaudRate, 4800),
         splitMode = preferences.getBoolean(keyRadioSplitMode, false)
     )
-    //endregion
+
+    private val keySatelliteOffsets = "satelliteOffsets"
+
+    override fun getSatelliteOffset(catnum: Int): String {
+        val json = preferences.getString(keySatelliteOffsets, "{}") ?: "{}"
+        return try {
+            JSONObject(json).optString(catnum.toString(), "")
+        } catch (_: Exception) {
+            ""
+        }
+    }
+
+    override fun setSatelliteOffset(catnum: Int, offset: String) {
+        val json = preferences.getString(keySatelliteOffsets, "{}") ?: "{}"
+        val updated = try {
+            val obj = JSONObject(json)
+            if (offset.isEmpty()) obj.remove(catnum.toString()) else obj.put(catnum.toString(), offset)
+            obj.toString()
+        } catch (_: Exception) {
+            """{"$catnum": "$offset"}"""
+        }
+        preferences.edit { putString(keySatelliteOffsets, updated) }
+    }
 }

core/data/src/main/java/com/rtbishop/look4sat/core/data/source/AmSatParser.kt

@@ -1,136 +0,0 @@
-package com.rtbishop.look4sat.core.data.source
-
-import com.rtbishop.look4sat.core.domain.model.SatDay
-import com.rtbishop.look4sat.core.domain.model.SatReport
-import com.rtbishop.look4sat.core.domain.model.SatSlot
-import com.rtbishop.look4sat.core.domain.model.SatStatus
-import com.rtbishop.look4sat.core.domain.model.SatStatusPage
-import java.util.regex.Pattern
-
-/**
- * AMSAT satellite status page parser (https://amsat.org/status/)
- *
- * Page structure (static HTML, verified 2026-08):
- * - Status table: 48 rows in <table>, header = Name + 6 days (each colspan=12)
- *   Data row has 73 cells: [0]=satellite name, [1..72] = 6 days x 12 two-hour slots (new->old)
- *   Each cell: <td width=9 bgcolor="color">count</td>; when reports exist the count carries a
- *   docTips.show('id') link
- * - Report details live in the page's inline JS:
- *   tips.a885153 = new Array(5,5,120,'status<br>callsign<br>grid<br>date<br>time span UTC')
- *
- * Status colors: #648fff=active, #ffb000=telemetry only, #dc267f=not heard, #fe6100=conflicting
- */
-object AmSatParser {
-
-    private val STATUS_COLORS = mapOf(
-        "#648fff" to 0xFF648FFF.toLong(),
-        "#ffb000" to 0xFFFFB000.toLong(),
-        "#dc267f" to 0xFFDC267F.toLong(),
-        "#fe6100" to 0xFFFE6100.toLong()
-    )
-    private val GRAY = 0xFFC0C0C0.toLong()
-
-    private val rowRe = Pattern.compile("<tr>(.*?)</tr>", Pattern.DOTALL)
-    private val cellRe = Pattern.compile("(<t[dh][^>]*>.*?</t[dh]>)", Pattern.DOTALL)
-    private val bgRe = Pattern.compile("bgcolor=\"?(#[0-9a-fA-F]{6}|C0C0C0)\"?")
-    private val linkRe = Pattern.compile("docTips\\.show\\('(a\\d+)'\\)")
-    private val tipRe = Pattern.compile(
-        "tips\\.(a\\d+)\\s*=\\s*new\\s+Array\\(\\s*\\d+,\\s*\\d+,\\s*\\d+,\\s*'([^']*)'"
-    )
-
-    /** Parse the full page */
-    fun parse(html: String, fetchedAtUtcMs: Long): SatStatusPage {
-        val reports = parseReports(html)
-        val statuses = parseStatusTable(html, reports)
-        return SatStatusPage(fetchedAtUtcMs, statuses, reports)
-    }
-
-    /** Extract all reports (tips.* JS arrays) */
-    fun parseReports(html: String): Map<String, SatReport> {
-        val map = mutableMapOf<String, SatReport>()
-        val m = tipRe.matcher(html)
-        while (m.find()) {
-            val id = m.group(1)
-            val parts = m.group(2).split("<br>")
-            map[id] = SatReport(
-                id = id,
-                statusText = parts.getOrElse(0) { "" }.trim(),
-                call = parts.getOrElse(1) { "" }.trim(),
-                grid = parts.getOrElse(2) { "" }.trim(),
-                dateUtc = parts.getOrElse(3) { "" }.trim(),
-                timeUtc = parts.getOrElse(4) { "" }.trim()
-            )
-        }
-        return map
-    }
-
-    /** Parse the status table (48 satellite rows) */
-    fun parseStatusTable(html: String, reports: Map<String, SatReport>): List<SatStatus> {
-        val result = mutableListOf<SatStatus>()
-        val tables = extractTables(html)
-        for (table in tables) {
-            val rows = rowRe.matcher(table)
-            val parsed = mutableListOf<SatStatus>()
-            var rowIndex = 0
-            var dayHeaders: List<String> = emptyList()
-            while (rows.find()) {
-                val rowHtml = rows.group(1)
-                val cells = cellRe.matcher(rowHtml)
-                val cellList = mutableListOf<String>()
-                while (cells.find()) cellList.add(cells.group(1))
-                if (rowIndex == 0) {
-                    // Header: Name + 6 days (each colspan=12)
-                    dayHeaders = cellList.drop(1).take(6).map { stripHtml(it) }
-                    rowIndex++
-                    continue
-                }
-                if (cellList.size < 7) { rowIndex++; continue }
-                val name = stripHtml(cellList[0])
-                if (name.isBlank()) { rowIndex++; continue }
-                val days = mutableListOf<SatDay>()
-                for (d in 0 until 6) {
-                    val start = 1 + d * 12
-                    val end = start + 12
-                    val slots = (start until end).mapNotNull { i ->
-                        cellList.getOrNull(i)?.let { cell ->
-                            val bg = bgRe.matcher(cell)
-                            val color = if (bg.find()) {
-                                STATUS_COLORS[bg.group(1).lowercase()] ?: GRAY
-                            } else GRAY
-                            val link = linkRe.matcher(cell)
-                            val ids = mutableListOf<String>()
-                            while (link.find()) ids.add(link.group(1))
-                            val hasReport = ids.isNotEmpty()
-                            val count = if (hasReport) {
-                                stripHtml(cell).trim().toIntOrNull() ?: ids.size
-                            } else 0
-                            SatSlot(
-                                statusColor = if (hasReport) color else GRAY,
-                                count = count,
-                                reportIds = ids
-                            )
-                        }
-                    }
-                    days.add(SatDay(dayHeaders.getOrElse(d) { "" }, slots))
-                }
-                parsed.add(SatStatus(name, days))
-                rowIndex++
-            }
-            if (parsed.isNotEmpty()) {
-                result.addAll(parsed)
-                break
-            }
-        }
-        return result
-    }
-
-    private fun extractTables(html: String): List<String> {
-        val result = mutableListOf<String>()
-        val m = Pattern.compile("<table.*?</table>", Pattern.DOTALL).matcher(html)
-        while (m.find()) result.add(m.group())
-        return result
-    }
-
-    private fun stripHtml(s: String): String =
-        s.replace(Regex("<[^>]+>"), "").trim()
-}

core/data/src/main/java/com/rtbishop/look4sat/core/data/source/RemoteSource.kt

@@ -20,11 +20,11 @@ package com.rtbishop.look4sat.core.data.source
 import android.content.ContentResolver
 import androidx.core.net.toUri
 import com.rtbishop.look4sat.core.domain.source.IRemoteSource
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import java.io.ByteArrayInputStream
 import java.io.InputStream
 
 class RemoteSource(
@@ -37,38 +37,68 @@ class RemoteSource(
         try {
             val fileUri = uri.toUri()
             contentResolver.openInputStream(fileUri)?.buffered()
+        } catch (exception: CancellationException) {
+            throw exception
         } catch (exception: Exception) {
             println("RemoteSource file stream exception: $exception")
             null
         }
     }
 
-    override suspend fun getStatusHtml(): String? = withContext(dispatcher) {
-        try {
-            val request = Request.Builder()
-                .url("https://amsat.org/status/")
-                .header("User-Agent", "Mozilla/5.0 (Linux; Android 13) Look4Sat/4.5")
-                .build()
-            httpClient.newCall(request).execute().use { response ->
-                if (!response.isSuccessful) return@use null
-                response.body?.string()
-            }
-        } catch (exception: Exception) {
-            println("RemoteSource amsat status exception: $exception")
-            null
-        }
-    }
-
     override suspend fun getNetworkStream(url: String): InputStream? = withContext(dispatcher) {
         try {
             val networkRequest = Request.Builder().url(url).build()
-            httpClient.newCall(networkRequest).execute().use { response ->
-                if (!response.isSuccessful) return@withContext null
-                ByteArrayInputStream(response.body.bytes())
+            val response = httpClient.newCall(networkRequest).execute()
+            if (!response.isSuccessful) {
+                response.close()
+                return@withContext null
             }
+            // Return the body stream directly as the caller is responsible for closing it
+            // That returns the connection to OkHttp's pool
+            response.body.byteStream().buffered()
+        } catch (exception: CancellationException) {
+            throw exception
         } catch (exception: Exception) {
             println("RemoteSource network stream exception: $exception")
             null
         }
     }
+
+    override suspend fun getAmSatCatalog(): String? = withContext(dispatcher) {
+        try {
+            val request = Request.Builder()
+                .url("https://www.amsat.org/status/api/v1/catalog.php")
+                .header("User-Agent", "Look4Sat/4.5.5")
+                .build()
+            httpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) return@use null
+                response.body?.string()
+            }
+        } catch (exception: CancellationException) {
+            throw exception
+        } catch (exception: Exception) {
+            println("RemoteSource amsat catalog exception: $exception")
+
+            null
+        }
+    }
+
+    override suspend fun getAmSatReports(hours: Int, limit: Int): String? = withContext(dispatcher) {
+        try {
+            val request = Request.Builder()
+                .url("https://www.amsat.org/status/api/v1/reports.php?hours=$hours&limit=$limit")
+                .header("User-Agent", "Look4Sat/4.5.5")
+                .build()
+            httpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) return@use null
+                response.body?.string()
+            }
+        } catch (exception: CancellationException) {
+            throw exception
+        } catch (exception: Exception) {
+            println("RemoteSource amsat reports exception: $exception")
+
+            null
+        }
+    }
 }

core/data/src/main/java/com/rtbishop/look4sat/core/data/usecase/AudioCapture.kt

@@ -56,8 +56,14 @@ class AudioCapture : IAudioCapture {
                 if (read > 0) emit(if (read == chunkSize) buffer.copyOf() else buffer.copyOfRange(0, read))
             }
         } finally {
-            recorder.stop()
-            recorder.release()
+            // stop() on a recorder that never started throws
+            // IllegalStateException; wrapping each cleanup step separately
+            // keeps the original error (e.g. a permission denial during
+            // startRecording) intact and guarantees release() still runs.
+            // Without this, a start failure masked the real cause AND leaked
+            // the recorder because release() was skipped.
+            runCatching { recorder.stop() }
+            runCatching { recorder.release() }
         }
     }.flowOn(Dispatchers.IO)
 }

core/data/src/test/java/com/rtbishop/look4sat/core/data/repository/DatabaseRepoTest.kt

@@ -125,6 +125,10 @@ private class FakeRemoteSource : IRemoteSource {
     override suspend fun getFileStream(uri: String): InputStream? = fileStreams[uri]?.invoke()
 
     override suspend fun getNetworkStream(url: String): InputStream? = networkStreams[url]?.invoke()
+
+    override suspend fun getAmSatCatalog(): String? = null
+
+    override suspend fun getAmSatReports(hours: Int, limit: Int): String? = null
 }
 
 private class FakeLocalSource : ILocalSource {
@@ -166,10 +170,10 @@ private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSou
 
     override val selectedIds: StateFlow<List<Int>> = MutableStateFlow(emptyList())
 
-    override val selectedTypes: StateFlow<List<String>> = MutableStateFlow(emptyList())
+    override val selectedSatModes: StateFlow<List<String>> = MutableStateFlow(emptyList())
 
     override val passesSettings: StateFlow<PassesSettings> = MutableStateFlow(
-        PassesSettings(hoursAhead = 24, minElevation = 0.0, selectedModes = emptyList())
+        PassesSettings(hoursAhead = 24, minElevation = 0.0)
     )
 
     override val stationPosition: StateFlow<GeoPos> = MutableStateFlow(GeoPos(0.0, 0.0))
@@ -177,7 +181,7 @@ private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSou
     override val databaseState: MutableStateFlow<DatabaseState> = MutableStateFlow(DatabaseState(0, 0, 0L))
 
     override val rcSettings: StateFlow<RCSettings> = MutableStateFlow(
-        RCSettings(false, "", "", "", false, "", "", "", false, "", "", "", false, "", "")
+        RCSettings(false, "", "", "", false, "", "", "", 0L, false, "", "", "", false, "", "")
     )
 
     override val otherSettings: StateFlow<OtherSettings> = MutableStateFlow(
@@ -194,13 +198,13 @@ private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSou
 
     override fun setSelectedIds(ids: List<Int>) = Unit
 
-    override fun setSelectedTypes(types: List<String>) = Unit
+    override fun setSelectedSatModes(modes: List<String>) = Unit
 
     override fun setPassesSettings(settings: PassesSettings) = Unit
 
     override fun setStationPosition(latitude: Double, longitude: Double, altitude: Double): Boolean = true
 
-    override fun setStationPosition(): Boolean = true
+    override suspend fun setStationPosition(): Boolean = true
 
     override fun setStationPosition(locator: String): Boolean = true
 
@@ -223,6 +227,10 @@ private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSou
     }
 
     override fun updateRadioControlSettings(settings: RadioControlSettings) = Unit
+
+    override fun getSatelliteOffset(catnum: Int): String = ""
+
+    override fun setSatelliteOffset(catnum: Int, offset: String) = Unit
 }
 
 private fun defaultDataSourcesSettings(): DataSourcesSettings {

core/data/src/test/java/com/rtbishop/look4sat/core/data/repository/SelectionRepoTest.kt

@@ -0,0 +1,181 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.data.repository
+
+import com.rtbishop.look4sat.core.domain.model.DataSourcesSettings
+import com.rtbishop.look4sat.core.domain.model.DatabaseState
+import com.rtbishop.look4sat.core.domain.model.OtherSettings
+import com.rtbishop.look4sat.core.domain.model.PassesSettings
+import com.rtbishop.look4sat.core.domain.model.RCSettings
+import com.rtbishop.look4sat.core.domain.model.RadioControlSettings
+import com.rtbishop.look4sat.core.domain.model.SatItem
+import com.rtbishop.look4sat.core.domain.model.SatRadio
+import com.rtbishop.look4sat.core.domain.predict.GeoPos
+import com.rtbishop.look4sat.core.domain.predict.OrbitalObject
+import com.rtbishop.look4sat.core.domain.repository.ISettingsRepo
+import com.rtbishop.look4sat.core.domain.source.ILocalSource
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class SelectionRepoTest {
+
+    private val dispatcher = StandardTestDispatcher()
+
+    @Test
+    fun `unknown mode values do not crash and do not filter out entries`() = runTest(dispatcher) {
+        val localSource = FakeLocalSource(
+            entries = listOf(
+                SatItem(25544, "ISS (ZARYA)", false),
+                SatItem(40967, "TIANGONG", false)
+            )
+        )
+        val settingsRepo = FakeSettingsRepo(selectedModes = listOf("REMOVED_MODE"))
+        val repository = SelectionRepo(dispatcher, localSource, settingsRepo)
+
+        val flow = repository.getEntriesFlow()
+        repository.setModes(listOf("REMOVED_MODE"))
+
+        val items = flow.first()
+
+        assertEquals(listOf(25544, 40967), items.map { it.catnum })
+        assertEquals(listOf("REMOVED_MODE"), repository.getCurrentModes())
+    }
+
+    @Test
+    fun `selected satellites are shown first`() = runTest(dispatcher) {
+        val localSource = FakeLocalSource(
+            entries = listOf(
+                SatItem(44444, "Zeta", false),
+                SatItem(25544, "Alpha", false),
+                SatItem(40967, "Beta", false)
+            )
+        )
+        val settingsRepo = FakeSettingsRepo(selectedModes = emptyList())
+        val repository = SelectionRepo(dispatcher, localSource, settingsRepo)
+
+        val flow = repository.getEntriesFlow()
+        repository.setSelection(listOf(40967), true)
+
+        val items = flow.first()
+
+        assertEquals(listOf(40967, 25544, 44444), items.map { it.catnum })
+        assertEquals(listOf(true, false, false), items.map { it.isSelected })
+    }
+
+    private class FakeLocalSource(
+        private val entries: List<SatItem>
+    ) : ILocalSource {
+        override suspend fun getEntriesTotal(): Int = entries.size
+
+        override suspend fun getEntriesList(): List<SatItem> = entries
+
+        override suspend fun getEntriesWithIds(ids: List<Int>): List<OrbitalObject> = emptyList()
+
+        override suspend fun insertEntries(entries: List<com.rtbishop.look4sat.core.domain.predict.OrbitalData>) = Unit
+
+        override suspend fun deleteEntries() = Unit
+
+        override suspend fun getIdsWithModes(modes: List<String>): List<Int> = emptyList()
+
+        override suspend fun getRadiosTotal(): Int = 0
+
+        override suspend fun getRadiosWithId(id: Int): List<SatRadio> = emptyList()
+
+        override suspend fun insertRadios(radios: List<SatRadio>) = Unit
+
+        override suspend fun deleteRadios() = Unit
+    }
+
+    private class FakeSettingsRepo(
+        selectedModes: List<String>
+    ) : ISettingsRepo {
+
+        override val appVersionName: String = "test"
+
+        override val selectedIds: StateFlow<List<Int>> = MutableStateFlow(emptyList())
+
+        override val selectedSatModes: MutableStateFlow<List<String>> = MutableStateFlow(selectedModes)
+
+        override val passesSettings: StateFlow<PassesSettings> = MutableStateFlow(
+            PassesSettings(hoursAhead = 24, minElevation = 0.0)
+        )
+
+        override val stationPosition: StateFlow<GeoPos> = MutableStateFlow(GeoPos(0.0, 0.0))
+
+        override val databaseState: MutableStateFlow<DatabaseState> = MutableStateFlow(DatabaseState(0, 0, 0L))
+
+        override val rcSettings: StateFlow<RCSettings> = MutableStateFlow(
+            RCSettings(false, "", "", "", false, "", "", "", 0L, false, "", "", "", false, "", "")
+        )
+
+        override val otherSettings: StateFlow<OtherSettings> = MutableStateFlow(
+            OtherSettings(false, false, false, false, false, false, false, false)
+        )
+
+        override val dataSourcesSettings: StateFlow<DataSourcesSettings> = MutableStateFlow(
+            DataSourcesSettings(false, false, "", "")
+        )
+
+        override val radioControlSettings: StateFlow<RadioControlSettings> = MutableStateFlow(
+            RadioControlSettings(false, RadioControlSettings.MODEL_YAESU_FT817, "", "", "", "", 9600)
+        )
+
+        override fun setSelectedIds(ids: List<Int>) = Unit
+
+        override fun setSelectedSatModes(modes: List<String>) {
+            selectedSatModes.value = modes
+        }
+
+        override fun setPassesSettings(settings: PassesSettings) = Unit
+
+        override fun setStationPosition(latitude: Double, longitude: Double, altitude: Double): Boolean = true
+
+        override suspend fun setStationPosition(): Boolean = true
+
+        override fun setStationPosition(locator: String): Boolean = true
+
+        override fun getSatelliteTypesIds(types: List<String>): List<Int> = emptyList()
+
+        override fun setSatelliteTypeIds(type: String, ids: List<Int>) = Unit
+
+        override fun updateDatabaseState(state: DatabaseState) {
+            databaseState.value = state
+        }
+
+        override fun updateRCSettings(settings: RCSettings) = Unit
+
+        override fun updateOtherSettings(transform: (OtherSettings) -> OtherSettings) = Unit
+
+        override fun updateDataSourcesSettings(settings: DataSourcesSettings) = Unit
+
+        override fun updateRadioControlSettings(settings: RadioControlSettings) = Unit
+
+        override fun getSatelliteOffset(catnum: Int): String = ""
+
+        override fun setSatelliteOffset(catnum: Int, offset: String) = Unit
+    }
+}
+
+

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/amsat/AmSatApiClient.kt

@@ -1,98 +0,0 @@
-/* AmSatApiClient.kt - AMSAT official status API v1 client (pure JVM).
- * Endpoints (verified 2026-08):
- *   GET https://www.amsat.org/status/api/v1/catalog.php          -> satellite list
- *   GET https://www.amsat.org/status/api/v1/reports.php?hours=N&limit=500 -> reports
- * Report fields: id, name ("SO-50_[FM]"), callsign, report, grid_square, reported_time (ISO 8601 UTC).
- * Status values: Heard / Telemetry Only / Not Heard / Crew Active.
- */
-package com.rtbishop.look4sat.core.domain.amsat
-
-import org.json.JSONObject
-import org.json.JSONArray
-import java.io.BufferedReader
-import java.net.HttpURLConnection
-import java.net.URL
-
-/** One report from the AMSAT API. */
-data class ApiReport(
-    val id: String,
-    val name: String,        // "SO-50_[FM]" (API name, includes mode suffix)
-    val callsign: String,
-    val report: String,      // Heard / Telemetry Only / Not Heard / Crew Active
-    val gridSquare: String,
-    val reportedTimeUtcSec: Long
-)
-
-/** AMSAT official satellite status API v1 client. */
-class AmSatApiClient(private val baseUrl: String = "https://www.amsat.org/status/api/v1") {
-
-    /** Fetch the full satellite catalog. Returns API names (e.g. "SO-50_[FM]"). */
-    fun fetchCatalog(): List<String> {
-        val body = httpGet("$baseUrl/catalog.php") ?: return emptyList()
-        return try {
-            val arr = JSONObject(body).getJSONArray("data")
-            (0 until arr.length()).map { arr.getJSONObject(it).getString("name") }
-        } catch (e: Exception) {
-            emptyList()
-        }
-    }
-
-    /** Fetch reports for a rolling UTC window. Empty on failure. */
-    fun fetchAllReports(hours: Int = 168): List<ApiReport> {
-        val body = httpGet("$baseUrl/reports.php?hours=$hours&limit=500") ?: return emptyList()
-        return try {
-            val arr = JSONObject(body).getJSONArray("data")
-            (0 until arr.length()).mapNotNull { i ->
-                val o = arr.getJSONObject(i)
-                val iso = o.optString("reported_time", "")
-                if (iso.isEmpty()) null else ApiReport(
-                    id = o.optString("id", ""),
-                    name = o.optString("name", ""),
-                    callsign = o.optString("callsign", ""),
-                    report = o.optString("report", ""),
-                    gridSquare = o.optString("grid_square", ""),
-                    reportedTimeUtcSec = parseIsoUtcSec(iso)
-                )
-            }
-        } catch (e: Exception) {
-            emptyList()
-        }
-    }
-
-    /** Parse "2026-08-05T07:30:00Z" to epoch seconds (minSdk 24: no java.time). */
-    fun parseIsoUtcSec(iso: String): Long {
-        val m = Regex("""(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})""").find(iso) ?: return 0L
-        val (y, mo, d, h, mi, s) = m.destructured
-        val days = daysFromCivil(y.toInt(), mo.toInt(), d.toInt())
-        return days * 86400L + h.toInt() * 3600L + mi.toInt() * 60L + s.toInt()
-    }
-
-    /** Days since 1970-01-01 (civil calendar, proleptic Gregorian). */
-    private fun daysFromCivil(year: Int, month: Int, day: Int): Long {
-        val y = if (month <= 2) year - 1 else year
-        val era = (if (y >= 0) y else y - 399) / 400
-        val yoe = y - era * 400
-        val doy = (153 * (if (month > 2) month - 3 else month + 9) + 2) / 5 + day - 1
-        val doe = yoe * 365 + yoe / 4 - yoe / 100 + doy
-        return era * 146097L + doe - 719468
-    }
-
-    private fun httpGet(url: String): String? {
-        return try {
-            val conn = URL(url).openConnection() as HttpURLConnection
-            conn.requestMethod = "GET"
-            conn.connectTimeout = 15000
-            conn.readTimeout = 20000
-            conn.setRequestProperty("User-Agent", "Look4Sat/4.5.5")
-            if (conn.responseCode !in 200..299) {
-                conn.disconnect()
-                return null
-            }
-            val text = conn.inputStream.bufferedReader().use(BufferedReader::readText)
-            conn.disconnect()
-            text
-        } catch (e: Exception) {
-            null
-        }
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/aprs/AprsPacket.kt

@@ -2,6 +2,7 @@ package com.rtbishop.look4sat.core.domain.aprs
 
 import kotlin.math.abs
 import kotlin.math.round
+import java.util.Locale
 
 /**
  * APRS-IS protocol core (pure Kotlin, no Android dependencies).
@@ -35,20 +36,31 @@ object AprsPacket {
 
     /** Optional distance filter: filter r/lat/lon/dist */
     fun formatRangeFilter(latitude: Double, longitude: Double, distKm: Int): String {
-        return String.format("r/%.3f/%.3f/%d", latitude, longitude, distKm)
+        return String.format(Locale.ROOT, "r/%.3f/%.3f/%d", latitude, longitude, distKm)
     }
 
-    /** Altitude extension /A=00000 (feet) */
+    /**
+     * Altitude extension /A=000000 (feet). The field is a fixed six-digit
+     * decimal, so a negative altitude (below sea level, or a bad GPS fix) must
+     * be clamped: "%06d" of -164 yields "/A=-00164", which is not a valid
+     * extension and corrupts the rest of the comment field.
+     */
     fun formatAltitude(altitudeMeters: Double?): String {
         if (altitudeMeters == null) return ""
-        return String.format("/A=%06d", (altitudeMeters * 3.2808399).toInt())
+        val feet = (altitudeMeters * 3.2808399).toInt().coerceIn(0, 999999)
+        return String.format(Locale.ROOT, "/A=%06d", feet)
     }
 
-    /** Speed/course extension (knots/degrees) */
+    /**
+     * Speed/course extension /CCC/SSS (degrees/knots). Course wraps into
+     * 0..359 and speed is clamped to three digits, because "%03d" of an
+     * out-of-range value widens the field and breaks the fixed-width format.
+     */
     fun formatCourseSpeed(speedMps: Double?, bearing: Float?): String {
         if (speedMps == null || bearing == null) return ""
-        val knots = (speedMps * 1.94384449).toInt()
-        return String.format("/%03d/%03d", bearing.toInt(), knots)
+        val knots = (speedMps * 1.94384449).toInt().coerceIn(0, 999)
+        val course = ((bearing.toInt() % 360) + 360) % 360
+        return String.format(Locale.ROOT, "/%03d/%03d", course, knots)
     }
 }
 
@@ -100,17 +112,17 @@ class AprsPosition(
         val hundredths = iRound % 100
         val frac = when (positionAmbiguity) {
             1 -> "  .  "
-            2 -> String.format("%d .  ", minutes / 10)
-            3 -> String.format("%02d.  ", minutes)
-            4 -> String.format("%02d.%d ", minutes, hundredths / 10)
-            else -> String.format("%02d.%02d", minutes, hundredths)
+            2 -> String.format(Locale.ROOT, "%d .  ", minutes / 10)
+            3 -> String.format(Locale.ROOT, "%02d.  ", minutes)
+            4 -> String.format(Locale.ROOT, "%02d.%d ", minutes, hundredths / 10)
+            else -> String.format(Locale.ROOT, "%02d.%02d", minutes, hundredths)
         }
         return if (isLat) {
             val ns = if (value >= 0) 'N' else 'S'
-            String.format("%02d%s%c", degrees, frac, ns)
+            String.format(Locale.ROOT, "%02d%s%c", degrees, frac, ns)
         } else {
             val ew = if (value >= 0) 'E' else 'W'
-            String.format("%03d%s%c", degrees, frac, ew)
+            String.format(Locale.ROOT, "%03d%s%c", degrees, frac, ew)
         }
     }
 }

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwBayesianDecoder.kt

@@ -1,154 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * Bayesian Morse timing decoder.
- * Replaces hard thresholds with probability-based decision making.
- *
- * Inspired by VE3NEA's CW Skimmer approach:
- * "Instead of making a hard decision at every input sample whether the signal
- * is present or not, compute the probability that the signal is present."
- *
- * Uses Gaussian probability density centered on expected durations:
- *   P(dit | duration) = exp(-(duration - dotMs)^2 / (2 * variance^2))
- *   P(dash | duration) = exp(-(duration - 3*dotMs)^2 / (2 * variance^2))
- */
-internal class CwBayesianDecoder {
-
-    // Morse timing parameters
-    private var dotDurationMs = 60f // initial 20 WPM
-    private var speedWpm = 20f
-
-    // Current symbol being accumulated
-    private var currentSymbol = StringBuilder()
-    private var textBuffer = StringBuilder()
-
-    // Recent dit lengths for speed estimation
-    private val recentDits = mutableListOf<Float>()
-
-    // Output
-    private var _decodedText = ""
-    val decodedText: String get() = _decodedText
-
-    /** Gaussian probability. */
-    private fun gaussianProb(durationMs: Float, expectedMs: Float, varianceMs: Float): Float {
-        if (varianceMs <= 0f) return 0f
-        val diff = durationMs - expectedMs
-        return kotlin.math.exp(-(diff * diff) / (2 * varianceMs * varianceMs))
-    }
-
-    /** Process a tone duration. Returns the symbol type with highest probability. */
-    fun processTone(durationMs: Float): ToneResult {
-        val ditProb = gaussianProb(durationMs, dotDurationMs, dotDurationMs * 0.4f)
-        val dashProb = gaussianProb(durationMs, dotDurationMs * 3f, dotDurationMs * 0.6f)
-
-        return if (ditProb > dashProb && ditProb > 0.05f) {
-            currentSymbol.append('0')
-            recentDits.add(durationMs)
-            updateSpeed()
-            ToneResult('0', ditProb)
-        } else if (dashProb > 0.05f) {
-            currentSymbol.append('1')
-            ToneResult('1', dashProb)
-        } else {
-            ToneResult(null, 0f)
-        }
-    }
-
-    /** Process a gap duration. Returns decoded character or null. */
-    fun processGap(durationMs: Float): Char? {
-        if (currentSymbol.isEmpty()) {
-            val wordProb = gaussianProb(durationMs, dotDurationMs * 7f, dotDurationMs * 1.2f)
-            if (wordProb > 0.2f) {
-                textBuffer.append(' ')
-                _decodedText = textBuffer.toString()
-                return ' '
-            }
-            return null
-        }
-
-        val interCharProb = gaussianProb(durationMs, dotDurationMs * 3f, dotDurationMs * 0.6f)
-        val wordProb = gaussianProb(durationMs, dotDurationMs * 7f, dotDurationMs * 1.2f)
-
-        if (wordProb > interCharProb && wordProb > 0.2f) {
-            val char = flushSymbol()
-            textBuffer.append(' ')
-            _decodedText = textBuffer.toString()
-            return char
-        }
-        if (interCharProb > 0.15f) {
-            val char = flushSymbol()
-            _decodedText = textBuffer.toString()
-            return char
-        }
-        return null
-    }
-
-    private fun flushSymbol(): Char? {
-        if (currentSymbol.isEmpty()) return null
-        val morse = currentSymbol.toString()
-        currentSymbol.clear()
-        val char = morseToChar(morse)
-        if (char != null) textBuffer.append(char)
-        return char
-    }
-
-    private fun updateSpeed() {
-        if (recentDits.size < 3) return
-        val sorted = recentDits.sorted()
-        val median = sorted[sorted.size / 2]
-        if (median > 0f) {
-            dotDurationMs = dotDurationMs * 0.7f + median * 0.3f
-            val wpm = 60.0f / (50.0f * dotDurationMs / 1000.0f)
-            if (wpm in 5f..55f) speedWpm = wpm
-        }
-    }
-
-    fun getSpeed(): Float = speedWpm
-
-    fun reset() {
-        dotDurationMs = 60f
-        speedWpm = 20f
-        recentDits.clear()
-        currentSymbol.clear()
-        textBuffer.clear()
-        _decodedText = ""
-    }
-
-    companion object {
-        private val MORSE_TABLE = mapOf(
-            "01" to 'A', "1000" to 'B', "1010" to 'C', "100" to 'D', "0" to 'E',
-            "0010" to 'F', "110" to 'G', "0000" to 'H', "00" to 'I', "0111" to 'J',
-            "101" to 'K', "0100" to 'L', "11" to 'M', "10" to 'N', "111" to 'O',
-            "0110" to 'P', "1101" to 'Q', "010" to 'R', "000" to 'S', "1" to 'T',
-            "001" to 'U', "0001" to 'V', "011" to 'W', "1001" to 'X', "1011" to 'Y',
-            "1100" to 'Z', "01111" to '1', "00111" to '2', "00011" to '3',
-            "00001" to '4', "00000" to '5', "10000" to '6', "11000" to '7',
-            "11100" to '8', "11110" to '9', "11111" to '0',
-            "010101" to '.', "110011" to ',', "001100" to '?', "011110" to '\'',
-            "101011" to '!', "10010" to '/', "10110" to '(', "101101" to ')',
-            "01000" to '&', "111000" to ':', "101010" to ';', "10001" to '=',
-            "01010" to '+', "100001" to '-', "001101" to '_', "010010" to '"',
-            "0001001" to '$', "011010" to '@'
-        )
-        fun morseToChar(morse: String): Char? = MORSE_TABLE[morse]
-    }
-}
-
-data class ToneResult(val symbol: Char?, val probability: Float)

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwChannelTracker.kt

@@ -1,114 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * Multi-channel CW signal tracker.
- * Monitors the spectrogram for active frequency bins and extracts
- * energy envelopes for each detected signal.
- *
- * Inspired by CW Skimmer's multi-channel approach:
- * tracks all active signals in the passband simultaneously,
- * selects the best one for decoded output.
- */
-internal class CwChannelTracker(
-    private val spectrogram: CwSpectrogram,
-    private val maxChannels: Int = 3
-) {
-    data class Channel(
-        val bin: Int,
-        val frequency: Float,
-        var active: Boolean = false,
-        var energy: Float = 0f,
-        val history: MutableList<Float> = mutableListOf(),
-        var confidence: Float = 0f
-    )
-
-    private val channels = Array(maxChannels) { Channel(0, 0f) }
-
-    /** Scan the current spectrogram column and update channel tracking. */
-    fun update(): List<Channel> {
-        val col = spectrogram.getCurrentColumn()
-        val peaks = findPeaks(col, threshold = 0.3f, minDistance = 2)
-
-        // Update existing channels
-        for (ch in channels) {
-            if (ch.active) {
-                if (peaks.contains(ch.bin)) {
-                    ch.energy = col[ch.bin]
-                    ch.history.add(ch.energy)
-                    if (ch.history.size > 40) ch.history.removeAt(0)
-                    ch.confidence = computeConfidence(ch.history)
-                } else {
-                    // Signal lost — decay confidence
-                    ch.history.add(0f)
-                    if (ch.history.size > 40) ch.history.removeAt(0)
-                    ch.confidence *= 0.9f
-                    if (ch.confidence < 0.1f) ch.active = false
-                }
-            }
-        }
-
-        // Assign new peaks to inactive channels
-        var peakIdx = 0
-        for (ch in channels) {
-            if (!ch.active && peakIdx < peaks.size) {
-                val bin = peaks[peakIdx]
-                val freq = spectrogram.binToFreq(bin)
-                // Re-initialize channel
-                channels[peakIdx] = Channel(bin, freq, true, col[bin], mutableListOf(), 0.5f)
-                peakIdx++
-            }
-        }
-
-        return channels.filter { it.active }
-    }
-
-    /** Find peak bins in the spectrum. */
-    private fun findPeaks(spectrum: FloatArray, threshold: Float, minDistance: Int): List<Int> {
-        val peaks = mutableListOf<Int>()
-        for (i in 1 until spectrum.size - 1) {
-            if (spectrum[i] > spectrum[i - 1] && spectrum[i] > spectrum[i + 1] && spectrum[i] > threshold) {
-                if (peaks.isEmpty() || i - peaks.last() >= minDistance) {
-                    peaks.add(i)
-                }
-            }
-        }
-        return peaks.sortedByDescending { spectrum[it] }
-    }
-
-    /** Compute confidence from energy history. Lower variance = higher confidence. */
-    private fun computeConfidence(history: List<Float>): Float {
-        if (history.size < 10) return 0.3f
-        val recent = history.takeLast(10)
-        val mean = recent.average().toFloat()
-        val variance = recent.map { (it - mean) * (it - mean) }.average().toFloat()
-        return if (mean > 0f) (mean / (mean + variance + 0.1f)).coerceIn(0f, 1f) else 0f
-    }
-
-    /** Get the channel with highest confidence. */
-    fun getBestChannel(): Channel? {
-        return channels.filter { it.active }.maxByOrNull { it.confidence }
-    }
-
-    fun reset() {
-        for (i in channels.indices) {
-            channels[i] = Channel(0, 0f)
-        }
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwCtcDecoder.kt

@@ -0,0 +1,61 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.domain.cw
+
+/**
+ * Turns the model's `log_probs` output into text.
+ *
+ * Mirrors the reference `greedy_ctc_decode`: take the best class per frame,
+ * drop blanks, and collapse runs of the same label. A blank between two
+ * identical labels is what keeps a genuine double letter (for example the
+ * two N's in "5NN") from collapsing into one.
+ */
+object CwCtcDecoder {
+
+    /**
+     * @param logProbs `[batch, time, class]`; only batch 0 is read.
+     * @param chars class index to symbol, excluding the blank.
+     * @param blankIndex the CTC blank class (41 for this model).
+     */
+    fun greedy(
+        logProbs: Array<Array<FloatArray>>,
+        chars: List<String>,
+        blankIndex: Int
+    ): String {
+        if (logProbs.isEmpty()) return ""
+        val frames = logProbs[0]
+        val builder = StringBuilder()
+        var previous = -1
+
+        for (frame in frames) {
+            var best = 0
+            for (i in 1 until frame.size) {
+                if (frame[i] > frame[best]) best = i
+            }
+            if (best == blankIndex) {
+                previous = -1
+                continue
+            }
+            if (best != previous && best < chars.size) {
+                builder.append(chars[best])
+            }
+            previous = best
+        }
+        return builder.toString()
+    }
+}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwDecoder.kt

@@ -1,165 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-
-/**
- * CW (Morse code) decoder v3 — Spectrogram-based multi-channel Bayesian decoder.
- *
- * Architecture inspired by Morse Expert / CW Skimmer (VE3NEA):
- *   1. FFT spectrogram creates a frequency×time matrix
- *   2. Multi-channel peak detector finds all active signals
- *   3. Per-channel energy envelope extraction
- *   4. Bayesian probability for symbol timing (Gaussian likelihood)
- *   5. Best channel selected for output
- *
- * Timing analysis is performed per spectrogram column (hop).
- * Each column represents hopSize/sampleRate seconds of audio.
- */
-class CwDecoder(
-    val sampleRate: Int = 8000,
-    cwToneFreq: Float = -1f // ignored in v3 (auto-detect via spectrogram)
-) {
-    companion object {
-        private const val FFT_SIZE = 256
-        private const val HOP_SIZE = 64
-    }
-
-    private val spectrogram = CwSpectrogram(
-        fftSize = FFT_SIZE,
-        hopSize = HOP_SIZE,
-        sampleRate = sampleRate,
-        minBin = 6,
-        maxBin = 38,
-        historyCols = 40
-    )
-    private val channelTracker = CwChannelTracker(spectrogram, maxChannels = 3)
-    private val bayesianDecoder = CwBayesianDecoder()
-
-    // Timing state per channel
-    private data class ChannelTiming(
-        var isSignal: Boolean = false,
-        var toneTicks: Int = 0,
-        var gapTicks: Int = 0
-    )
-    private val timingStates = Array(3) { ChannelTiming() }
-
-    // Time per spectrogram column in milliseconds
-    private val tickMs = 1000f * HOP_SIZE / sampleRate
-
-    // Output flows
-    private val _decodedTextFlow = MutableStateFlow("")
-    val decodedTextFlow: StateFlow<String> = _decodedTextFlow
-
-    private val _signalStrength = MutableStateFlow(0f)
-    val signalStrength: StateFlow<Float> = _signalStrength
-
-    private val _estimatedPitch = MutableStateFlow<Float?>(null)
-    val estimatedPitch: StateFlow<Float?> = _estimatedPitch
-
-    private val _estimatedSpeed = MutableStateFlow<Float?>(null)
-    val estimatedSpeed: StateFlow<Float?> = _estimatedSpeed
-
-    private var frameCount = 0
-
-    init {
-        if (cwToneFreq > 0f) {
-            _estimatedPitch.value = cwToneFreq
-        }
-    }
-
-    fun processBuffer(buffer: FloatArray) {
-        // 1. Feed samples to spectrogram
-        spectrogram.addSamples(buffer)
-
-        // 2. Get number of new columns generated
-        val newCols = spectrogram.getNewColumns()
-        if (newCols == 0) return
-
-        // 3. Update channel tracker (uses latest column for peak detection)
-        val activeChannels = channelTracker.update()
-
-        // 4. Process each new column for timing analysis
-        //    Columns are indexed 0..historyCols-1, where historyCols-1 is the newest
-        val baseIdx = (spectrogram.historyCols - newCols).coerceAtLeast(0)
-        for (colOffset in 0 until newCols) {
-            val col = spectrogram.getColumn(baseIdx + colOffset)
-
-            for ((idx, channel) in activeChannels.withIndex()) {
-                if (idx >= timingStates.size) break
-                val state = timingStates[idx]
-                val energy = if (channel.bin in col.indices) col[channel.bin] else 0f
-
-                // Adaptive threshold
-                val threshold = 0.3f + (energy - 0.3f) * 0.3f
-
-                if (energy > threshold) {
-                    if (!state.isSignal) {
-                        if (state.gapTicks > 0) {
-                            val gapMs = state.gapTicks * tickMs
-                            bayesianDecoder.processGap(gapMs)
-                        }
-                        state.gapTicks = 0
-                        state.isSignal = true
-                    }
-                    state.toneTicks++
-                } else {
-                    if (state.isSignal) {
-                        if (state.toneTicks > 0) {
-                            val toneMs = state.toneTicks * tickMs
-                            bayesianDecoder.processTone(toneMs)
-                        }
-                        state.toneTicks = 0
-                        state.isSignal = false
-                    }
-                    state.gapTicks++
-                }
-            }
-        }
-
-        // 5. Update outputs
-        frameCount++
-        if (frameCount % 5 == 0) {
-            val bestChannel = channelTracker.getBestChannel()
-            if (bestChannel != null) {
-                _estimatedPitch.value = bestChannel.frequency
-                _signalStrength.value = bestChannel.confidence
-                _estimatedSpeed.value = bayesianDecoder.getSpeed()
-            }
-            _decodedTextFlow.value = bayesianDecoder.decodedText
-        }
-    }
-
-    fun resetDecoder() {
-        spectrogram.reset()
-        channelTracker.reset()
-        bayesianDecoder.reset()
-        for (state in timingStates) {
-            state.isSignal = false
-            state.toneTicks = 0
-            state.gapTicks = 0
-        }
-        frameCount = 0
-        _decodedTextFlow.value = ""
-        _signalStrength.value = 0f
-        _estimatedPitch.value = null
-        _estimatedSpeed.value = null
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwDeepBuffer.kt

@@ -0,0 +1,140 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.domain.cw
+
+/**
+ * Bounded rolling audio buffer that drives periodic full re-decodes.
+ *
+ * DeepCW is a whole-segment CTC model. It rewrites earlier output as more
+ * context arrives — measured on one clip, 6 of 11 progressively longer reads
+ * revised the prefix (`BM` -> `BG7` -> `BG7NTI` -> `BG7NTA`). Appending only
+ * the newest fragment therefore leaves those intermediate guesses on screen
+ * forever; measured character error rate for sliding-window stitching ranged
+ * from 67% to 294%, against 0% for decoding the whole segment at once.
+ *
+ * So we keep a fixed window, re-run the model over all of it every
+ * [redecodeIntervalMs], and replace the displayed text outright.
+ *
+ * Defaults come from measurement: 20 s is the smallest window that reaches
+ * 0.0% CER (16 s still errs at 5.9%), while inference cost grows
+ * super-linearly — 60 s of audio needs roughly 13x longer to decode than
+ * 20 s does, leaving too little real-time headroom.
+ */
+class CwDeepBuffer(
+    sampleRate: Int = CwDeepSpectrogram.SAMPLE_RATE,
+    maxSeconds: Double = DEFAULT_MAX_SECONDS,
+    private val redecodeIntervalMs: Int = DEFAULT_REDECODE_INTERVAL_MS
+) {
+    companion object {
+        const val DEFAULT_MAX_SECONDS = 20.0
+        const val DEFAULT_REDECODE_INTERVAL_MS = 1500
+    }
+
+    /** Maximum number of samples retained. */
+    val capacity: Int = (sampleRate * maxSeconds).toInt()
+
+    private val samplesPerInterval: Int = sampleRate * redecodeIntervalMs / 1000
+    private val ring = FloatArray(capacity)
+    private var writeIndex = 0
+    private var filled = 0
+    private var sinceLastRedecode = 0
+
+    /**
+     * Samples evicted from the ring once it is full. They are the audio that
+     * has scrolled out of the 20 s window, and are handed off (via
+     * [drainOverflow]) so the decoder can archive them into permanent history
+     * instead of silently dropping the corresponding text. Pre-allocated to
+     * [capacity]: overflow never exceeds one window before it is drained.
+     */
+    private val overflow = FloatArray(capacity)
+    private var overflowSize = 0
+
+    /** Samples currently buffered, never above [capacity]. */
+    val size: Int get() = filled
+
+    /** Samples currently held in the overflow (awaiting archival). */
+    val overflowCount: Int get() = overflowSize
+
+    /** True once there is enough audio for the spectrogram to yield a frame. */
+    val hasEnoughAudio: Boolean get() = filled >= CwDeepSpectrogram.FFT_LENGTH
+
+    /**
+     * Append captured audio, overwriting the oldest samples when full.
+     *
+     * @return true when [redecodeIntervalMs] of audio has accumulated since
+     *   the last time this returned true, meaning the caller should re-decode.
+     */
+    fun append(chunk: FloatArray): Boolean {
+        if (chunk.isNotEmpty()) {
+            // A chunk longer than the window can only contribute its tail.
+            val start = maxOf(0, chunk.size - capacity)
+            for (i in start until chunk.size) {
+                if (filled == capacity) {
+                    // The slot we are about to overwrite holds the oldest
+                    // sample — move it to the overflow for archival.
+                    overflow[overflowSize++] = ring[writeIndex]
+                }
+                ring[writeIndex] = chunk[i]
+                writeIndex = (writeIndex + 1) % capacity
+                if (filled < capacity) filled++
+            }
+        }
+
+        sinceLastRedecode += chunk.size
+        if (sinceLastRedecode >= samplesPerInterval) {
+            sinceLastRedecode -= samplesPerInterval
+            return true
+        }
+        return false
+    }
+
+    /** Buffered audio in chronological order, as a copy safe to hand off. */
+    fun snapshot(): FloatArray {
+        val out = FloatArray(filled)
+        if (filled == 0) return out
+        val start = (writeIndex - filled + capacity) % capacity
+        val firstRun = minOf(filled, capacity - start)
+        ring.copyInto(out, 0, start, start + firstRun)
+        if (firstRun < filled) {
+            ring.copyInto(out, firstRun, 0, filled - firstRun)
+        }
+        return out
+    }
+
+    /**
+     * Return the evicted samples (chronological order) and clear the overflow.
+     * Safe to call every append; returns an empty array when nothing has been
+     * evicted yet.
+     */
+    fun drainOverflow(): FloatArray {
+        if (overflowSize == 0) return FloatArray(0)
+        val out = overflow.copyOf(overflowSize)
+        overflowSize = 0
+        return out
+    }
+
+    /** Drop all audio (including pending overflow) and restart the interval. */
+    fun reset() {
+        writeIndex = 0
+        filled = 0
+        sinceLastRedecode = 0
+        overflowSize = 0
+        ring.fill(0f)
+        overflow.fill(0f)
+    }
+}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwDeepSpectrogram.kt

@@ -0,0 +1,208 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.domain.cw
+
+import kotlin.math.PI
+import kotlin.math.ceil
+import kotlin.math.cos
+import kotlin.math.floor
+import kotlin.math.ln1p
+import kotlin.math.roundToInt
+import kotlin.math.sqrt
+
+/**
+ * Audio front-end for the DeepCW model: turns PCM samples into the
+ * `[time, frequency]` log-magnitude spectrogram the network expects.
+ *
+ * Mirrors the upstream Python reference (deepcw-engine
+ * `examples/python/decode_morse.py`) step for step:
+ *
+ *   resample -> 3200 Hz, reflect-pad by fft/2, periodic Hann window of 256,
+ *   real FFT, keep bins [32, 97) i.e. 400-1200 Hz, then log1p.
+ *
+ * The model's fixed 400-1200 Hz window means pitch detection is built in —
+ * no spectral peak tracking or squelch gating is needed on our side.
+ */
+object CwDeepSpectrogram {
+
+    /** Model input sample rate, from `model.onnx.json`. */
+    const val SAMPLE_RATE = 3200
+
+    /** FFT window length in samples. */
+    const val FFT_LENGTH = 256
+
+    /** Hop between consecutive frames; 48/3200 = 15.0 ms per frame. */
+    const val HOP_LENGTH = 48
+
+    private const val MIN_FREQ_HZ = 400.0
+    private const val MAX_FREQ_HZ = 1200.0
+
+    /** Number of frequency bins the model expects. */
+    const val FREQUENCY_BINS = 65
+
+    /** Milliseconds of audio represented by one output frame. */
+    const val MS_PER_FRAME = 1000.0 * HOP_LENGTH / SAMPLE_RATE
+
+    private val hannWindow: FloatArray = FloatArray(FFT_LENGTH) { i ->
+        // numpy: np.hanning(N + 1)[:-1] — the periodic (not symmetric) variant.
+        (0.5 - 0.5 * cos(2.0 * PI * i / FFT_LENGTH)).toFloat()
+    }
+
+    /**
+     * Inclusive-exclusive bin range covering [minHz, maxHz].
+     * Returns `start to stop`, matching the reference's `frequency_bin_range`.
+     */
+    fun frequencyBinRange(
+        sampleRate: Int,
+        fftLength: Int,
+        minHz: Double,
+        maxHz: Double
+    ): Pair<Int, Int> {
+        val binHz = sampleRate.toDouble() / fftLength
+        val start = ceil(minHz / binHz).toInt()
+        val stop = floor(maxHz / binHz).toInt() + 1
+        return start to stop
+    }
+
+    /**
+     * Linear-interpolation resampler. Deliberately dependency-light and
+     * identical to the reference implementation so spectrograms match.
+     */
+    fun resampleLinear(audio: FloatArray, sourceRate: Int, targetRate: Int): FloatArray {
+        if (sourceRate == targetRate || audio.isEmpty()) return audio
+        val targetLength = (audio.size.toDouble() * targetRate / sourceRate).roundToInt()
+        val out = FloatArray(targetLength)
+        val ratio = sourceRate.toDouble() / targetRate
+        for (i in 0 until targetLength) {
+            val position = i * ratio
+            val left = floor(position).toInt()
+            val right = minOf(left + 1, audio.size - 1)
+            val fraction = (position - left).toFloat()
+            out[i] = audio[left] * (1f - fraction) + audio[right] * fraction
+        }
+        return out
+    }
+
+    /**
+     * Build the log-magnitude spectrogram. Input must already be at
+     * [SAMPLE_RATE]; use [resampleLinear] first when it is not.
+     *
+     * @return `[frames][FREQUENCY_BINS]` values, all non-negative.
+     */
+    fun compute(audio: FloatArray): Array<FloatArray> {
+        require(audio.size >= FFT_LENGTH) {
+            "audio is too short for fftLength=$FFT_LENGTH, got ${audio.size}"
+        }
+
+        val (startBin, stopBin) = frequencyBinRange(
+            SAMPLE_RATE, FFT_LENGTH, MIN_FREQ_HZ, MAX_FREQ_HZ
+        )
+        val bins = stopBin - startBin
+        require(bins == FREQUENCY_BINS) {
+            "expected $FREQUENCY_BINS bins, computed $bins"
+        }
+
+        val padded = reflectPad(audio, FFT_LENGTH / 2)
+        val frames = 1 + (padded.size - FFT_LENGTH) / HOP_LENGTH
+        val result = Array(frames) { FloatArray(bins) }
+
+        val real = FloatArray(FFT_LENGTH)
+        val imag = FloatArray(FFT_LENGTH)
+        for (frame in 0 until frames) {
+            val offset = frame * HOP_LENGTH
+            for (i in 0 until FFT_LENGTH) {
+                real[i] = padded[offset + i] * hannWindow[i]
+                imag[i] = 0f
+            }
+            fftInPlace(real, imag)
+            val row = result[frame]
+            for (bin in startBin until stopBin) {
+                val magnitude = sqrt(real[bin] * real[bin] + imag[bin] * imag[bin])
+                row[bin - startBin] = ln1p(magnitude.toDouble()).toFloat()
+            }
+        }
+        return result
+    }
+
+    /**
+     * numpy `mode="reflect"`: mirrors around the edge samples without
+     * repeating them, so [1,2,3] padded by 2 becomes [3,2,1,2,3,2,1].
+     */
+    private fun reflectPad(audio: FloatArray, pad: Int): FloatArray {
+        if (pad == 0) return audio
+        val out = FloatArray(audio.size + 2 * pad)
+        for (i in 0 until pad) out[i] = audio[pad - i]
+        audio.copyInto(out, pad)
+        val last = audio.size - 1
+        for (i in 0 until pad) out[pad + audio.size + i] = audio[last - 1 - i]
+        return out
+    }
+
+    /**
+     * Iterative radix-2 Cooley-Tukey FFT. [FFT_LENGTH] is a power of two, so
+     * no padding case is needed. Only the first half of the output is read by
+     * [compute], which is the real-input equivalent of numpy's `rfft`.
+     */
+    private fun fftInPlace(real: FloatArray, imag: FloatArray) {
+        val n = real.size
+
+        // Bit-reversal permutation.
+        var j = 0
+        for (i in 1 until n) {
+            var bit = n shr 1
+            while (j and bit != 0) {
+                j = j xor bit
+                bit = bit shr 1
+            }
+            j = j or bit
+            if (i < j) {
+                var tmp = real[i]; real[i] = real[j]; real[j] = tmp
+                tmp = imag[i]; imag[i] = imag[j]; imag[j] = tmp
+            }
+        }
+
+        var length = 2
+        while (length <= n) {
+            val angle = -2.0 * PI / length
+            val wReal = cos(angle).toFloat()
+            val wImag = kotlin.math.sin(angle).toFloat()
+            var i = 0
+            while (i < n) {
+                var curReal = 1f
+                var curImag = 0f
+                for (k in 0 until length / 2) {
+                    val evenReal = real[i + k]
+                    val evenImag = imag[i + k]
+                    val oddReal = real[i + k + length / 2]
+                    val oddImag = imag[i + k + length / 2]
+                    val mulReal = oddReal * curReal - oddImag * curImag
+                    val mulImag = oddReal * curImag + oddImag * curReal
+                    real[i + k] = evenReal + mulReal
+                    imag[i + k] = evenImag + mulImag
+                    real[i + k + length / 2] = evenReal - mulReal
+                    imag[i + k + length / 2] = evenImag - mulImag
+                    val nextReal = curReal * wReal - curImag * wImag
+                    curImag = curReal * wImag + curImag * wReal
+                    curReal = nextReal
+                }
+                i += length
+            }
+            length = length shl 1
+        }
+    }
+}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwDsp.kt

@@ -1,102 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import kotlin.math.PI
-import kotlin.math.cos
-import kotlin.math.sin
-import kotlin.math.sqrt
-
-/**
- * DSP utilities for CW (Morse code) decoding.
- * Pure Kotlin, no NDK required.
- */
-internal object CwDsp {
-
-    /**
-     * Design a simple bandpass FIR filter coefficients using windowed sinc method.
-     * @param lowCutoff  lower cutoff frequency (Hz) as fraction of sampleRate
-     * @param highCutoff upper cutoff frequency (Hz) as fraction of sampleRate
-     * @param taps       filter length (must be odd)
-     */
-    fun bandpassFir(lowCutoff: Double, highCutoff: Double, taps: Int): FloatArray {
-        val n = if (taps % 2 == 0) taps + 1 else taps
-        val half = n / 2
-        val coeffs = FloatArray(n)
-        for (i in 0 until n) {
-            val idx = i - half
-            if (idx == 0) {
-                coeffs[i] = (2.0 * (highCutoff - lowCutoff)).toFloat()
-            } else {
-                val x = PI * idx
-                coeffs[i] = ((sin(2 * highCutoff * x) - sin(2 * lowCutoff * x)) / x).toFloat()
-            }
-            // Hamming window
-            coeffs[i] = (coeffs[i] * (0.54 - 0.46 * cos(2 * PI * i / (n - 1)))).toFloat()
-        }
-        // Normalize
-        val sum = coeffs.sum()
-        if (sum != 0f) for (i in 0 until n) coeffs[i] /= sum
-        return coeffs
-    }
-
-    /** Apply FIR filter to a buffer. */
-    fun applyFir(buffer: FloatArray, coeffs: FloatArray): FloatArray {
-        val out = FloatArray(buffer.size)
-        for (i in buffer.indices) {
-            var sum = 0f
-            for (j in coeffs.indices) {
-                val idx = i - j
-                if (idx >= 0) sum += buffer[idx] * coeffs[j]
-            }
-            out[i] = sum
-        }
-        return out
-    }
-
-    /** Simple envelope detector: abs + low-pass smoothing. */
-    fun envelope(signal: FloatArray, alpha: Float = 0.1f): FloatArray {
-        val env = FloatArray(signal.size)
-        var s = 0f
-        for (i in signal.indices) {
-            s = alpha * kotlin.math.abs(signal[i]) + (1 - alpha) * s
-            env[i] = s
-        }
-        return env
-    }
-
-    /** Estimate noise floor from envelope for adaptive thresholding. */
-    fun noiseFloor(env: FloatArray, fraction: Float = 0.3f): Float {
-        val sorted = env.sortedArray()
-        val median = sorted[sorted.size / 2]
-        return median + (sorted[sorted.size * 9 / 10] - median) * fraction
-    }
-
-    /** Simple Goertzel to detect a specific tone frequency. */
-    fun goertzel(buffer: FloatArray, targetFreq: Float, sampleRate: Int): Float {
-        val omega = 2.0 * PI * targetFreq / sampleRate
-        val coeff = 2.0 * cos(omega)
-        var s0 = 0.0; var s1 = 0.0; var s2 = 0.0
-        for (sample in buffer) {
-            s0 = sample.toDouble() + coeff * s1 - s2
-            s2 = s1; s1 = s0
-        }
-        val power = s2 * s2 + s1 * s1 - coeff * s1 * s2
-        return sqrt(kotlin.math.abs(power)).toFloat()
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwFFT.kt

@@ -1,87 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import kotlin.math.cos
-import kotlin.math.sqrt
-
-/**
- * Radix-2 FFT for real-valued input.
- * Produces magnitude spectrum for the first N/2+1 bins.
- * Used by CwSpectrogram for time-frequency analysis.
- */
-internal class CwFFT(private val n: Int) {
-    init {
-        require(n > 0 && n and (n - 1) == 0) { "FFT size must be power of 2, got $n" }
-    }
-
-    private val cosTable = FloatArray(n / 2)
-    private val sinTable = FloatArray(n / 2)
-
-    init {
-        for (i in 0 until n / 2) {
-            val angle = -2.0 * kotlin.math.PI * i / n
-            cosTable[i] = cos(angle).toFloat()
-            sinTable[i] = kotlin.math.sin(angle).toFloat()
-        }
-    }
-
-    /** Compute magnitude spectrum for real input. Returns array of size n/2+1. */
-    fun magnitudeSpectrum(input: FloatArray): FloatArray {
-        require(input.size == n) { "Input size must be $n, got ${input.size}" }
-
-        val real = input.copyOf()
-        val imag = FloatArray(n)
-
-        // Bit-reversal permutation
-        var j = 0
-        for (i in 1 until n) {
-            var bit = n shr 1
-            while (j and bit != 0) { j = j xor bit; bit = bit shr 1 }
-            j = j xor bit
-            if (i < j) {
-                var tmp = real[i]; real[i] = real[j]; real[j] = tmp
-            }
-        }
-
-        // Radix-2 Cooley-Tukey FFT
-        var len = 2
-        while (len <= n) {
-            val half = len / 2
-            val step = n / len
-            for (i in 0 until n step len) {
-                for (k in 0 until half) {
-                    val tReal = real[i + k + half] * cosTable[k * step] - imag[i + k + half] * sinTable[k * step]
-                    val tImag = real[i + k + half] * sinTable[k * step] + imag[i + k + half] * cosTable[k * step]
-                    real[i + k + half] = real[i + k] - tReal
-                    imag[i + k + half] = imag[i + k] - tImag
-                    real[i + k] += tReal
-                    imag[i + k] += tImag
-                }
-            }
-            len = len shl 1
-        }
-
-        // Magnitude spectrum (first N/2+1 bins)
-        val mag = FloatArray(n / 2 + 1)
-        for (i in 0..n / 2) {
-            mag[i] = sqrt(real[i] * real[i] + imag[i] * imag[i]) / n
-        }
-        return mag
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwFftFilt.kt

@@ -1,139 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import kotlin.math.PI
-import kotlin.math.abs
-import kotlin.math.cos
-import kotlin.math.sin
-
-/**
- * FFT lowpass/bandpass filter with overlap-add, ported from fldigi
- * fftfilt.cxx (fftfilt class). Used by the CW decoder for the
- * matched receive filter.
- */
-internal class CwFftFilt(f1: Double, f2: Double, len: Int) {
-    private val flen: Int
-    private val flen2: Int
-    private val fft: CwGfft
-    private val filter: Array<CwComplex>
-    private val timedata: Array<CwComplex>
-    private val freqdata: Array<CwComplex>
-    private val output: Array<CwComplex>
-    private val ovlbuf: Array<CwComplex>
-    private var inptr = 0
-    private var pass = 0
-
-    init {
-        flen = len
-        flen2 = flen shr 1
-        fft = CwGfft(flen)
-        filter = Array(flen) { CwComplex() }
-        timedata = Array(flen) { CwComplex() }
-        freqdata = Array(flen) { CwComplex() }
-        output = Array(flen) { CwComplex() }
-        ovlbuf = Array(flen2) { CwComplex() }
-        createFilter(f1, f2)
-    }
-
-    constructor(f: Double, len: Int) : this(0.0, f, len)
-
-    fun flushSize(): Int = flen - inptr
-
-    /**
-     * f1 < f2 ==> bandpass; f1 > f2 ==> band reject; f1 == 0 ==> lowpass; f2 == 0 ==> highpass.
-     */
-    private fun createFilter(f1: Double, f2: Double) {
-        for (i in 0 until flen) {
-            filter[i] = CwComplex()
-        }
-        val bLowpass = f2 != 0.0
-        val bHighpass = f1 != 0.0
-
-        for (i in 0 until flen2) {
-            var h = 0.0
-            if (bLowpass) h += fsinc(f2, i, flen2)
-            if (bHighpass) h -= fsinc(f1, i, flen2)
-            if (bHighpass && f2 < f1 && i == flen2 / 2) h += 1.0
-            filter[i] = CwComplex(h * blackman(i, flen2), 0.0)
-        }
-
-        // forward FFT of the impulse response
-        fft.forward(filter)
-
-        // normalize unity gain
-        var scale = 0.0
-        for (i in 0 until flen2) {
-            val mag = kotlin.math.sqrt(filter[i].re * filter[i].re + filter[i].im * filter[i].im)
-            if (mag > scale) scale = mag
-        }
-        if (scale != 0.0) {
-            for (i in 0 until flen) {
-                filter[i] = CwComplex(filter[i].re / scale, filter[i].im / scale)
-            }
-        }
-        pass = 1
-    }
-
-    fun createLpf(f: Double) = createFilter(0.0, f)
-
-    private fun fsinc(fc: Double, i: Int, len: Int): Double {
-        val mid = len / 2
-        return if (i == mid) 2.0 * fc
-        else sin(2.0 * PI * fc * (i - mid)) / (PI * (i - mid))
-    }
-
-    private fun blackman(i: Int, len: Int): Double =
-        0.42 - 0.50 * cos(2.0 * PI * i / len) + 0.08 * cos(4.0 * PI * i / len)
-
-    /**
-     * Feed one complex input sample. Returns output array + count when flen/2
-     * samples are ready, otherwise null.
-     */
-    fun run(input: CwComplex): Array<CwComplex>? {
-        timedata[inptr++] = input
-        if (inptr < flen2) return null
-        if (pass > 0) pass--
-
-        // copy to freq domain and FFT
-        for (i in 0 until flen) {
-            freqdata[i] = timedata[i]
-        }
-        fft.forward(freqdata)
-
-        // multiply by filter shape
-        for (i in 0 until flen) {
-            val f = filter[i]
-            val t = freqdata[i]
-            freqdata[i] = CwComplex(t.re * f.re - t.im * f.im, t.re * f.im + t.im * f.re)
-        }
-
-        // inverse FFT
-        fft.inverse(freqdata)
-
-        // overlap-add: first half is valid output, save second half
-        for (i in 0 until flen2) {
-            output[i] = CwComplex(ovlbuf[i].re + freqdata[i].re, ovlbuf[i].im + freqdata[i].im)
-            ovlbuf[i] = freqdata[i + flen2]
-        }
-
-        inptr = 0
-        if (pass > 0) return null
-        return output
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwFilter.kt

@@ -1,48 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * First-order IIR filters.
- * Ported from ggmorse/src/filter.h
- */
-internal class CwFilter {
-    private var z1 = 0f
-
-    companion object {
-        private const val PI_F = 3.141592653589793f
-    }
-
-    fun highPass(sample: Float, cutoffHz: Float, sampleRate: Float): Float {
-        val rc = 1.0f / (2f * PI_F * cutoffHz)
-        val dt = 1.0f / sampleRate
-        val alpha = dt / (rc + dt)
-        z1 = alpha * (z1 + sample - z1)
-        return sample - z1
-    }
-
-    fun lowPass(sample: Float, cutoffHz: Float, sampleRate: Float): Float {
-        val rc = 1.0f / (2f * PI_F * cutoffHz)
-        val dt = 1.0f / sampleRate
-        val alpha = dt / (rc + dt)
-        z1 += alpha * (sample - z1)
-        return z1
-    }
-
-    fun reset() { z1 = 0f }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwFldigiDecoder.kt

@@ -1,426 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlin.math.abs
-import kotlin.math.log10
-import kotlin.math.roundToInt
-
-/**
- * CW decoder ported from fldigi (w1hkj/fldigi) cw.cxx — full receive
- * chain: NCO down-conversion, FFT lowpass filter, decimation, AGC,
- * hysteresis keying detection, element timing state machine, adaptive
- * speed tracking, SOM codebook matching and morse table lookup.
- *
- * Drop-in replacement for the reverse-engineered Morse Expert decoder:
- * same processBuffer(FloatArray) entry point, same StateFlow outputs.
- */
-class CwFldigiDecoder(
-    val sampleRate: Int = CwFldigiConstants.CW_SAMPLERATE,
-    private val frequency: Double = 600.0,
-    private val useSom: Boolean = true,
-    private val initialWpm: Int = CwFldigiConstants.DEFAULT_SPEED
-) {
-    private companion object {
-        const val CW_DOT = '.'
-        const val CW_DASH = '-'
-        const val CW_RESET = 0
-        const val CW_KEYDOWN = 1
-        const val CW_KEYUP = 2
-        const val CW_QUERY = 3
-        const val CW_SUCCESS = 0
-        const val CW_ERROR = -1
-    }
-
-    private enum class CwRxState { IDLE, IN_TONE, AFTER_TONE }
-
-    // Outputs (API-compatible with the old CwDecoder)
-    private val _decodedTextFlow = MutableStateFlow("")
-    val decodedTextFlow: StateFlow<String> = _decodedTextFlow
-
-    private val _signalStrength = MutableStateFlow(0f)
-    val signalStrength: StateFlow<Float> = _signalStrength
-
-    private val _estimatedPitch = MutableStateFlow<Float?>(frequency.toFloat())
-    val estimatedPitch: StateFlow<Float?> = _estimatedPitch
-
-    private val _estimatedSpeed = MutableStateFlow<Float?>(null)
-    val estimatedSpeed: StateFlow<Float?> = _estimatedSpeed
-
-    // --- fldigi cw state ---
-    private var phaseacc = 0.0
-    private var FFTphase = 0.0
-    private var FFTvalue = 0.0
-    private var smpl_ctr = 0
-
-    private var agc_peak = 1.0
-    private var noise_floor = 1.0
-    private var sig_avg = 0.0
-    private var metric = 0.0
-    private var siglevel = 0.0
-
-    private var upper_threshold = CwFldigiConstants.CW_UPPER_THRESHOLD
-    private var lower_threshold = CwFldigiConstants.CW_LOWER_THRESHOLD
-
-    private val cw_FFT_filter: CwFftFilt
-    private val bitfilter: CwMovAvg
-    private val trackingfilter: CwMovAvg
-
-    private var cw_receive_state = CwRxState.IDLE
-    private var old_cw_receive_state = CwRxState.IDLE
-
-    private var cw_rr_start_timestamp = 0
-    private var cw_rr_end_timestamp = 0
-    private var rx_rep_buf = StringBuilder()
-    private var cw_ptr = 0
-    private val cw_buffer = FloatArray(CwFldigiConstants.MAX_MORSE_ELEMENTS + 1)
-
-    private var cw_speed = initialWpm
-    private var cw_send_speed = initialWpm
-    private var cw_receive_speed = initialWpm
-    private var cw_bandwidth = CwFldigiConstants.DEFAULT_BANDWIDTH
-    private var cwTrack = true
-    private var two_dots = 0L
-    private var last_element = 0
-    private var space_sent = true
-    private var cw_noise_spike_threshold = 0L
-    private var cw_receive_dot_length = 0L
-    private var cw_receive_dash_length = 0L
-
-    private var synchscope = 50
-
-    init {
-        val bw = cw_bandwidth.toDouble() / sampleRate
-        cw_FFT_filter = CwFftFilt(bw, CwFldigiConstants.CW_FFT_SIZE)
-        val bfv = (symbollen() / (2 * CwFldigiConstants.DEC_RATIO)).coerceAtLeast(1)
-        bitfilter = CwMovAvg(bfv)
-        trackingfilter = CwMovAvg(CwFldigiConstants.TRACKING_FILTER_SIZE)
-
-        two_dots = (2 * CwFldigiConstants.KWPM / cw_speed).toLong()
-        cw_noise_spike_threshold = two_dots / 4
-        cw_receive_dot_length = (CwFldigiConstants.KWPM / cw_receive_speed).toLong()
-        cw_receive_dash_length = 3 * cw_receive_dot_length
-    }
-
-    private fun symbollen(): Int =
-        (sampleRate * 1.2 / cw_speed).roundToInt()
-
-    private fun usecDiff(earlier: Int, later: Int): Int =
-        if (earlier >= later) 0 else later - earlier
-
-    /** Main entry: feed PCM samples. */
-    fun processBuffer(buffer: FloatArray) {
-        for (sample in buffer) {
-            rxSample(sample.toDouble())
-        }
-    }
-
-    private fun rxSample(value: Double) {
-        // NCO down-conversion (fldigi rx_FFTprocess)
-        val z = CwComplex(
-            value * kotlin.math.cos(FFTphase),
-            value * kotlin.math.sin(FFTphase)
-        )
-        FFTphase += 2.0 * Math.PI * frequency / sampleRate
-        if (FFTphase > 2.0 * Math.PI) FFTphase -= 2.0 * Math.PI
-
-        val out = cw_FFT_filter.run(z) ?: return
-        for (i in 0 until CwFldigiConstants.CW_FFT_SIZE / 2) {
-            ++smpl_ctr
-            if (smpl_ctr % CwFldigiConstants.DEC_RATIO != 0) continue
-            FFTvalue = out[i].abs()
-            FFTvalue = bitfilter.run(FFTvalue)
-            decodeStream(FFTvalue)
-        }
-    }
-
-    /**
-     * AGC + hysteresis detection (fldigi cw::decode_stream).
-     */
-    private fun decodeStream(value: Double) {
-        var v = value
-        val attack: Int
-        val decay: Int
-        when (CwFldigiConstants.CWRX_ATTACK_DEFAULT) {
-            0 -> attack = 400
-            2 -> attack = 100
-            else -> attack = 200
-        }
-        when (CwFldigiConstants.CWRX_DECAY_DEFAULT) {
-            0 -> decay = 2000
-            2 -> decay = 500
-            else -> decay = 1000
-        }
-
-        sig_avg = decayAvg(sig_avg, v, decay)
-
-        if (v < sig_avg) {
-            noise_floor = if (v < noise_floor) decayAvg(noise_floor, v, attack)
-            else decayAvg(noise_floor, v, decay)
-        }
-        if (v > sig_avg) {
-            agc_peak = if (v > agc_peak) decayAvg(agc_peak, v, attack)
-            else decayAvg(agc_peak, v, decay)
-        }
-
-        val normNoise = noise_floor / agc_peak
-        val normSig = sig_avg / agc_peak
-        siglevel = normSig
-
-        if (agc_peak != 0.0) v /= agc_peak else v = 0.0
-
-        metric = 0.8 * metric
-        if ((noise_floor > 1e-4) && (noise_floor < sig_avg)) {
-            val db = 20.0 * log10(sig_avg / noise_floor)
-            metric += 0.2 * clamp(2.5 * db, 0.0, 100.0)
-        }
-
-        val diff = normSig - normNoise
-        upper_threshold = normSig - 0.2 * diff
-        lower_threshold = normNoise + 0.7 * diff
-
-        // Squelch gate (fldigi: !progStatus.sqlonoff || metric > sldrSquelchValue).
-        // Default sqlonoff=true, sldrSquelchValue=5.0. Without this gate, noise
-        // spikes false-trigger KEYDOWN and lock the state machine in IN_TONE.
-        if (sqlonoff && metric <= squelchValue) return
-
-        // Power detection using hysteresis
-        if ((v > upper_threshold) && (cw_receive_state != CwRxState.IN_TONE)) {
-            handleEvent(CW_KEYDOWN)
-        }
-        if ((v < lower_threshold) && (cw_receive_state == CwRxState.IN_TONE)) {
-            handleEvent(CW_KEYUP)
-        }
-
-        if (handleEvent(CW_QUERY) == CW_SUCCESS) {
-            synchscope = 100
-            // emit decoded char(s)
-        } else if (--synchscope == 0) {
-            synchscope = 25
-        }
-    }
-
-    private var sqlonoff = true
-    private var squelchValue = 5.0
-
-    private fun decayAvg(avg: Double, value: Double, timeConst: Int): Double =
-        avg + (value - avg) / timeConst
-
-    private fun clamp(v: Double, lo: Double, hi: Double): Double =
-        if (v < lo) lo else if (v > hi) hi else v
-
-    private fun handleEvent(event: Int): Int {
-        val sc = StringBuilder()
-        var elementUsec: Int
-        when (event) {
-            CW_RESET -> {
-                syncParameters()
-                cw_receive_state = CwRxState.IDLE
-                cw_ptr = 0
-                smpl_ctr = 0
-                rx_rep_buf.clear()
-            }
-            CW_KEYDOWN -> {
-                if (cw_receive_state == CwRxState.IN_TONE) return CW_ERROR
-                if (cw_receive_state == CwRxState.IDLE) {
-                    smpl_ctr = 0
-                    rx_rep_buf.clear()
-                    cw_ptr = 0
-                }
-                cw_rr_start_timestamp = smpl_ctr
-                old_cw_receive_state = cw_receive_state
-                cw_receive_state = CwRxState.IN_TONE
-                return CW_ERROR
-            }
-            CW_KEYUP -> {
-                if (cw_receive_state != CwRxState.IN_TONE) return CW_ERROR
-                cw_rr_end_timestamp = smpl_ctr
-                elementUsec = usecDiff(cw_rr_start_timestamp, cw_rr_end_timestamp)
-                syncParameters()
-                if (cw_noise_spike_threshold > 0 && elementUsec < cw_noise_spike_threshold) {
-                    cw_receive_state = CwRxState.IDLE
-                    return CW_ERROR
-                }
-
-                // adaptive speed tracking on dot-dash / dash-dot pairs
-                if (last_element > 0) {
-                    if ((elementUsec > 2 * last_element) && (elementUsec < 4 * last_element)) {
-                        updateTracking(last_element, elementUsec)
-                    }
-                    if ((last_element > 2 * elementUsec) && (last_element < 4 * elementUsec)) {
-                        updateTracking(elementUsec, last_element)
-                    }
-                }
-                last_element = elementUsec
-
-                if (elementUsec <= two_dots) {
-                    rx_rep_buf.append(CW_DOT)
-                    cw_buffer[cw_ptr++] = last_element.toFloat()
-                } else {
-                    rx_rep_buf.append(CW_DASH)
-                    cw_buffer[cw_ptr++] = last_element.toFloat()
-                }
-
-                if (rx_rep_buf.length > CwFldigiConstants.MAX_MORSE_ELEMENTS) {
-                    cw_receive_state = CwRxState.IDLE
-                    cw_ptr = 0
-                    smpl_ctr = 0
-                    return CW_ERROR
-                } else {
-                    if (cw_ptr < cw_buffer.size) cw_buffer[cw_ptr] = 0.0f
-                }
-                cw_receive_state = CwRxState.AFTER_TONE
-                return CW_ERROR
-            }
-            CW_QUERY -> {
-                if (cw_receive_state == CwRxState.IN_TONE) return CW_ERROR
-                syncParameters()
-                elementUsec = usecDiff(cw_rr_end_timestamp, smpl_ctr)
-                if (elementUsec < (2 * cw_receive_dot_length)) return CW_ERROR
-
-                if (elementUsec >= (2 * cw_receive_dot_length) &&
-                    elementUsec <= (4 * cw_receive_dot_length) &&
-                    cw_receive_state == CwRxState.AFTER_TONE
-                ) {
-                    val pattern = rx_rep_buf.toString()
-                    val decoded = if (useSom) {
-                        findWinner(cw_buffer, two_dots)
-                    } else {
-                        MorseTable.rxLookup(pattern)
-                    }
-                    if (decoded.isNotEmpty()) {
-                        appendDecoded(decoded)
-                    }
-                    rx_rep_buf.clear()
-                    cw_receive_state = CwRxState.IDLE
-                    space_sent = false
-                    cw_ptr = 0
-                    return CW_SUCCESS
-                }
-
-                if ((elementUsec > (4 * cw_receive_dot_length)) && !space_sent) {
-                    appendDecoded(" ")
-                    space_sent = true
-                    return CW_SUCCESS
-                }
-                return CW_ERROR
-            }
-        }
-        return CW_ERROR
-    }
-
-    private fun appendDecoded(text: String) {
-        val current = _decodedTextFlow.value
-        _decodedTextFlow.value = if (current.length > 2000) {
-            current.drop(current.length - 1500) + text
-        } else {
-            current + text
-        }
-        _signalStrength.value = metric.toFloat() / 100f
-        _estimatedSpeed.value = (CwFldigiConstants.KWPM.toDouble() / (two_dots / 2.0)).toFloat()
-    }
-
-    private fun syncParameters() {
-        if (cwTrack) {
-            cw_receive_speed = (CwFldigiConstants.KWPM / (two_dots / 2)).toInt()
-        } else {
-            cw_receive_speed = cw_send_speed
-            two_dots = 2 * (CwFldigiConstants.KWPM / cw_send_speed).toLong()
-        }
-
-        if (cw_receive_speed > 0) {
-            cw_receive_dot_length = (CwFldigiConstants.KWPM / cw_receive_speed).toLong()
-        } else {
-            cw_receive_dot_length = (CwFldigiConstants.KWPM / 5).toLong()
-        }
-        cw_receive_dash_length = 3 * cw_receive_dot_length
-        cw_noise_spike_threshold = cw_receive_dot_length / 2
-    }
-
-    private fun updateTracking(dur1: Int, dur2: Int) {
-        val minDot = CwFldigiConstants.KWPM / 200
-        val maxDash = 3 * CwFldigiConstants.KWPM / 5
-        if ((dur1 > dur2) && (dur1 > 4 * dur2)) return
-        if ((dur2 > dur1) && (dur2 > 4 * dur1)) return
-        if (dur1 < minDot || dur2 < minDot) return
-        if (dur2 > maxDash || dur2 > maxDash) return
-
-        two_dots = trackingfilter.run(((dur1 + dur2) / 2).toDouble()).toLong()
-        syncParameters()
-    }
-
-    /**
-     * SOM codebook matching (fldigi cw::find_winner + normalize).
-     */
-    private fun findWinner(inbuf: FloatArray, twodots: Long): String {
-        if (normalize(inbuf, twodots) == 0) return " "
-
-        var winner = -1
-        var bestDiff = Double.MAX_VALUE
-        for ((idx, entry) in SomTable.table.withIndex()) {
-            var difference = 0.0
-            for (i in 0 until CwFldigiConstants.WGT_SIZE) {
-                val diff = inbuf[i] - entry.weights[i]
-                difference += diff * diff
-                if (difference > bestDiff) break
-            }
-            if (difference < bestDiff) {
-                winner = idx
-                bestDiff = difference
-            }
-        }
-
-        if (winner >= 0 && SomTable.table[winner].pattern.isNotEmpty()) {
-            val sc = MorseTable.rxLookup(SomTable.table[winner].pattern)
-            return if (sc.isNotEmpty()) sc else CwFldigiConstants.DEFAULT_NOISE_CHAR.toString()
-        }
-        return CwFldigiConstants.DEFAULT_NOISE_CHAR.toString()
-    }
-
-    private fun normalize(v: FloatArray, twodots: Long): Int {
-        var max = v[0]
-        var min = v[0]
-        for (j in 1 until CwFldigiConstants.WGT_SIZE) {
-            if (v[j] > max) max = v[j]
-            else if (v[j] < min) min = v[j]
-        }
-        if (max == 0.0f) return 0
-
-        val ratio = if (max > twodots) 1.0f else 0.33f
-        val scale = ratio / max
-        for (j in 0 until CwFldigiConstants.WGT_SIZE) v[j] *= scale
-        return 1
-    }
-
-    /** Reset the decoder state (fldigi cw::rx_init + reset). */
-    fun resetDecoder() {
-        cw_receive_state = CwRxState.IDLE
-        smpl_ctr = 0
-        cw_ptr = 0
-        rx_rep_buf.clear()
-        last_element = 0
-        space_sent = true
-        _decodedTextFlow.value = ""
-        _signalStrength.value = 0f
-        _estimatedSpeed.value = null
-        FFTphase = 0.0
-        phaseacc = 0.0
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwFldigiDsp.kt

@@ -1,183 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * Constants and primitives ported from fldigi (w1hkj/fldigi),
- * GPL v3, cw.h / cw.cxx / filters.cxx / fftfilt.cxx.
- *
- * Faithful port: identifiers and formulas mirror the C++ original so
- * behaviour matches the desktop decoder bit-for-bit.
- */
-internal object CwFldigiConstants {
-    const val CW_SAMPLERATE = 8000
-    const val DEC_RATIO = 16
-    const val CW_FFT_SIZE = 2048 // must be power of 2
-    const val MAX_MORSE_ELEMENTS = 6
-    const val WGT_SIZE = 7
-    const val TRACKING_FILTER_SIZE = 16
-    const val MAX_PIPE_SIZE = (22 * CW_SAMPLERATE * 12 / 800)
-    const val CLRCOUNT = 16
-    const val CW_MAX_SPEED = 50
-    const val INITIAL_SEND_SPEED = 18
-    const val INITIAL_RECEIVE_SPEED = 18
-
-    /** # samples in a dot: KWPM / WPM. fldigi: KWPM = 12 * samplerate / 10 */
-    const val KWPM = 12 * CW_SAMPLERATE / 10
-
-    const val CW_SUCCESS = 0
-    const val CW_ERROR = -1
-
-    // Defaults mirroring fldigi progdefaults
-    const val DEFAULT_SPEED = 18 // WPM
-    const val DEFAULT_BANDWIDTH = 150 // Hz
-    const val DEFAULT_RANGE = 10 // WPM tracking range
-    const val LOWER_LIMIT = 5 // WPM
-    const val UPPER_LIMIT = 50 // WPM
-    const val DEFAULT_NOISE_CHAR = '*'
-    const val CWRX_ATTACK_DEFAULT = 1 // medium
-    const val CWRX_DECAY_DEFAULT = 1 // medium
-    const val CW_LOWER_THRESHOLD = 0.4
-    const val CW_UPPER_THRESHOLD = 0.6
-}
-
-/**
- * Moving average filter, ported from fldigi Cmovavg (filters.cxx).
- */
-internal class CwMovAvg(private var len: Int) {
-    private val buf = DoubleArray(MAX_MOVAVG)
-    private var out = 0.0
-    private var pint = 0
-    private var empty = true
-
-    fun run(a: Double): Double {
-        if (empty) {
-            empty = false
-            out = 0.0
-            for (i in 0 until len) {
-                buf[i] = a
-                out += a
-            }
-            pint = 0
-            return a
-        }
-        out = out - buf[pint] + a
-        buf[pint] = a
-        if (++pint >= len) pint = 0
-        return out / len
-    }
-
-    fun setLength(newLen: Int) {
-        len = newLen.coerceAtMost(MAX_MOVAVG).coerceAtLeast(1)
-        empty = true
-    }
-
-    fun reset() {
-        empty = true
-    }
-
-    fun value(): Double = if (len > 0) out / len else 0.0
-
-    private companion object {
-        const val MAX_MOVAVG = 2048
-    }
-}
-
-/**
- * Complex sample used by the FFT filter chain.
- */
-internal data class CwComplex(var re: Double = 0.0, var im: Double = 0.0) {
-    operator fun timesAssign(other: CwComplex) {
-        val r = re * other.re - im * other.im
-        val i = re * other.im + im * other.re
-        re = r; im = i
-    }
-
-    fun abs(): Double = kotlin.math.sqrt(re * re + im * im)
-}
-
-/**
- * In-place radix-2 complex FFT, ported from fldigi gfft.h semantics
- * (ComplexFFT / InverseComplexFFT, forward = -1).
- */
-internal class CwGfft(private val n: Int) {
-    init {
-        require(n > 0 && n and (n - 1) == 0) { "FFT size must be power of 2, got $n" }
-    }
-
-    private val rev = IntArray(n)
-
-    init {
-        val log2n = Integer.numberOfTrailingZeros(n)
-        for (i in 0 until n) {
-            var r = 0
-            var x = i
-            for (bit in 0 until log2n) {
-                r = (r shl 1) or (x and 1)
-                x = x shr 1
-            }
-            rev[i] = r
-        }
-    }
-
-    /**
-     * In-place complex FFT.
-     * @param data array of CwComplex, size n
-     * @param inverse if true, performs inverse transform (no 1/n scaling; caller divides)
-     */
-    fun transform(data: Array<CwComplex>, inverse: Boolean) {
-        val sign = if (inverse) 1 else -1
-
-        // bit reversal permutation
-        for (i in 0 until n) {
-            val j = rev[i]
-            if (j > i) {
-                val t = data[i]; data[i] = data[j]; data[j] = t
-            }
-        }
-
-        var len = 2
-        while (len <= n) {
-            val ang = sign * 2.0 * Math.PI / len
-            val wRe = Math.cos(ang)
-            val wIm = Math.sin(ang)
-            var i = 0
-            while (i < n) {
-                var curRe = 1.0
-                var curIm = 0.0
-                for (j in 0 until len / 2) {
-                    val u = data[i + j]
-                    val v = data[i + j + len / 2]
-                    val tRe = curRe * v.re - curIm * v.im
-                    val tIm = curRe * v.im + curIm * v.re
-                    data[i + j] = CwComplex(u.re + tRe, u.im + tIm)
-                    data[i + j + len / 2] = CwComplex(u.re - tRe, u.im - tIm)
-                    val nRe = curRe * wRe - curIm * wIm
-                    val nIm = curRe * wIm + curIm * wRe
-                    curRe = nRe; curIm = nIm
-                }
-                i += len
-            }
-            len = len shl 1
-        }
-    }
-
-    fun forward(data: Array<CwComplex>) = transform(data, false)
-
-    fun inverse(data: Array<CwComplex>) = transform(data, true)
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwGoertzel.kt

@@ -1,54 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import kotlin.math.cos
-import kotlin.math.sqrt
-
-/**
- * Running Goertzel filter for CW tone detection.
- * Tracks a specific frequency over time with a sliding window.
- * Ported from ggmorse/src/goertzel.h
- */
-internal class CwGoertzel {
-    private var s1 = 0.0
-    private var s2 = 0.0
-    private var coeff = 0.0
-
-    fun init(sampleRate: Float, targetFreq: Float) {
-        val omega = 2.0 * kotlin.math.PI * targetFreq / sampleRate
-        coeff = 2.0 * cos(omega)
-        s1 = 0.0
-        s2 = 0.0
-    }
-
-    fun process(sample: Float) {
-        val s0 = sample.toDouble() + coeff * s1 - s2
-        s2 = s1
-        s1 = s0
-    }
-
-    fun getPower(): Float {
-        return sqrt(s2 * s2 + s1 * s1 - coeff * s1 * s2).toFloat()
-    }
-
-    fun reset() {
-        s1 = 0.0
-        s2 = 0.0
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwResampler.kt

@@ -1,53 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * Simple linear resampler.
- * Downsamples from input sample rate to output sample rate.
- * Ported from ggmorse/src/resampler.h
- */
-internal class CwResampler(private val inputRate: Float, private val outputRate: Float) {
-    private val ratio = inputRate / outputRate
-    private var lastSample = 0f
-
-    fun process(input: FloatArray): FloatArray {
-        if (ratio <= 0f || input.isEmpty()) return input
-        val outputLen = (input.size / ratio).toInt() + 1
-        val output = FloatArray(outputLen)
-        var idx = 0f
-        for (i in output.indices) {
-            val intIdx = idx.toInt()
-            val frac = idx - intIdx
-            if (intIdx + 1 < input.size) {
-                output[i] = input[intIdx] * (1 - frac) + input[intIdx + 1] * frac
-            } else if (intIdx < input.size) {
-                output[i] = input[intIdx] * (1 - frac) + lastSample * frac
-            } else {
-                output[i] = lastSample
-            }
-            idx += ratio
-        }
-        lastSample = input.lastOrNull() ?: lastSample
-        return output
-    }
-
-    fun reset() {
-        lastSample = 0f
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwSTFFT.kt

@@ -1,61 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import kotlin.math.cos
-import kotlin.math.sin
-import kotlin.math.sqrt
-
-/**
- * Lightweight pitch detector using DFT at specific frequency bins.
- * Only scans [200, 1200] Hz in configurable steps — much faster than full FFT.
- * Ported from ggmorse/src/stfft.h (simplified for CW use case).
- */
-internal class CwPitchDetector(
-    private val sampleRate: Float,
-    private val minFreq: Float = 200f,
-    private val maxFreq: Float = 1200f,
-    private val stepHz: Float = 10f
-) {
-    /**
-     * Find the dominant pitch frequency in the buffer.
-     * Returns null if no significant pitch found.
-     */
-    fun findPitch(buffer: FloatArray): Float? {
-        if (buffer.isEmpty()) return null
-        var bestFreq = 0f
-        var bestPower = 0f
-        var freq = minFreq
-        while (freq <= maxFreq) {
-            var real = 0.0
-            var imag = 0.0
-            val omega = 2.0 * kotlin.math.PI * freq / sampleRate
-            for (i in buffer.indices) {
-                real += buffer[i] * cos(omega * i)
-                imag += buffer[i] * -sin(omega * i)
-            }
-            val power = (real * real + imag * imag).toFloat()
-            if (power > bestPower) {
-                bestPower = power
-                bestFreq = freq
-            }
-            freq += stepHz
-        }
-        return if (bestPower > 0.001f) bestFreq else null
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/CwSpectrogram.kt

@@ -1,170 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * Sliding-window spectrogram for CW decoding.
- * Maintains a time-frequency matrix updated with each audio frame.
- *
- * FFT size: 256, hop size: 64, sample rate: 4000 (or native)
- * Frequency bins: 6..38 (187-1187 Hz, covers typical CW range)
- * History: 40 columns (320 ms window)
- * Time resolution: 64/4000 = 16 ms, Frequency resolution: 4000/256 = 15.625 Hz
- */
-internal class CwSpectrogram(
-    private val fftSize: Int = 256,
-    private val hopSize: Int = 64,
-    private val sampleRate: Int = 4000,
-    private val minBin: Int = 6,
-    private val maxBin: Int = 38,
-    val historyCols: Int = 40
-) {
-    private val fft = CwFFT(fftSize)
-    val numBins: Int get() = maxBin - minBin + 1
-
-    // Hanning window
-    private val hanning = FloatArray(fftSize) {
-        (0.5 - 0.5 * kotlin.math.cos(2.0 * kotlin.math.PI * it / (fftSize - 1))).toFloat()
-    }
-
-    // Spectrogram data: [timeCol][freqBin]
-    private val spectrogram = Array(historyCols) { FloatArray(numBins) }
-    private var currentCol = 0
-    private var samplesBuffered = 0
-    private val buffer = FloatArray(fftSize)
-
-    // Per-bin running energy for normalization
-    private val binEnergy = FloatArray(numBins) { 1f }
-    private val alpha = 0.95f
-
-    // Counter for new columns generated since last check
-    private var newColumnCount = 0
-
-    /** Add audio samples, compute FFTs for each complete hop. */
-    fun addSamples(samples: FloatArray) {
-        var offset = 0
-        while (offset < samples.size) {
-            val needed = fftSize - samplesBuffered
-            val copyLen = minOf(needed, samples.size - offset)
-            System.arraycopy(samples, offset, buffer, samplesBuffered, copyLen)
-            samplesBuffered += copyLen
-            offset += copyLen
-
-            if (samplesBuffered >= fftSize) {
-                processFrame()
-                newColumnCount++
-                // Shift buffer: keep last (fftSize - hopSize) samples
-                System.arraycopy(buffer, hopSize, buffer, 0, fftSize - hopSize)
-                samplesBuffered = fftSize - hopSize
-            }
-        }
-    }
-
-    /** Get number of new columns generated since the last call to this method. */
-    fun getNewColumns(): Int {
-        val count = newColumnCount
-        newColumnCount = 0
-        return count
-    }
-
-    private fun processFrame() {
-        // Apply Hanning window
-        val windowed = FloatArray(fftSize) { buffer[it] * hanning[it] }
-
-        // Compute FFT magnitude spectrum
-        val mag = fft.magnitudeSpectrum(windowed)
-
-        // Update spectrogram column
-        val col = spectrogram[currentCol]
-        for (b in 0 until numBins) {
-            val binIdx = minBin + b
-            val rawMag = mag[binIdx]
-            // Running energy normalization
-            binEnergy[b] = alpha * binEnergy[b] + (1 - alpha) * rawMag
-            col[b] = if (binEnergy[b] > 1e-6f) rawMag / binEnergy[b] else 0f
-        }
-
-        currentCol = (currentCol + 1) % historyCols
-    }
-
-    /** Get the current spectrogram as a 2D array in chronological order. */
-    fun getSpectrogram(): Array<FloatArray> {
-        val result = Array(historyCols) { i ->
-            val srcIdx = (currentCol + i) % historyCols
-            spectrogram[srcIdx].copyOf()
-        }
-        return result
-    }
-
-    /** Get the most recent column (current energy across all frequencies). */
-    fun getCurrentColumn(): FloatArray {
-        val prevCol = (currentCol - 1 + historyCols) % historyCols
-        return spectrogram[prevCol].copyOf()
-    }
-
-    /** Get a column by index from the history (0 = oldest, historyCols-1 = newest). */
-    fun getColumn(index: Int): FloatArray {
-        val clamped = index.coerceIn(0, historyCols - 1)
-        val srcIdx = (currentCol - historyCols + clamped + historyCols) % historyCols
-        return spectrogram[srcIdx].copyOf()
-    }
-
-    /** Find the frequency bin with peak energy. Returns -1 if no significant signal. */
-    fun findPeakBin(): Int {
-        val col = getCurrentColumn()
-        var maxBin = -1
-        var maxVal = 0f
-        for (i in col.indices) {
-            if (col[i] > maxVal) {
-                maxVal = col[i]
-                maxBin = i
-            }
-        }
-        return if (maxVal > 0.3f) maxBin else -1
-    }
-
-    /** Get energy at a specific bin over the last N columns in chronological order. */
-    fun getBinEnergy(bin: Int, numCols: Int): FloatArray {
-        val clamped = minOf(numCols, historyCols)
-        val result = FloatArray(clamped)
-        for (i in 0 until clamped) {
-            val colIdx = (currentCol - clamped + i + historyCols) % historyCols
-            result[i] = spectrogram[colIdx][bin]
-        }
-        return result
-    }
-
-    /** Get the bin index for a frequency in Hz. */
-    fun freqToBin(freqHz: Float): Int {
-        val bin = (freqHz * fftSize / sampleRate).toInt()
-        return (bin - minBin).coerceIn(0, numBins - 1)
-    }
-
-    /** Get the center frequency for a bin. */
-    fun binToFreq(bin: Int): Float {
-        return (minBin + bin).toFloat() * sampleRate / fftSize
-    }
-
-    fun reset() {
-        for (col in spectrogram) col.fill(0f)
-        currentCol = 0
-        samplesBuffered = 0
-        buffer.fill(0f)
-        binEnergy.fill(1f)
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/ICwDecoder.kt

@@ -0,0 +1,66 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.domain.cw
+
+import kotlinx.coroutines.flow.StateFlow
+
+/**
+ * A CW (Morse code) decoder fed with microphone PCM.
+ *
+ * Implementations live outside `core:domain` when they need platform APIs;
+ * this contract stays pure Kotlin so the UI can depend on it directly.
+ */
+interface ICwDecoder {
+
+    /**
+     * Decoded text for the *current* window.
+     *
+     * Note this is **replace** semantics, not append: a whole-segment model
+     * revises earlier characters as more audio arrives, so consumers must show
+     * the current value rather than accumulating emissions.
+     */
+    val decodedText: StateFlow<String>
+
+    /**
+     * Permanent transcript of everything that has scrolled out of the live
+     * window. Unlike [decodedText] this only ever grows (until [reset]); it is
+     * what the user reads back after a signal has passed.
+     */
+    val historyText: StateFlow<String>
+
+    /** Detected tone frequency in Hz, or null before a tone is found. */
+    val estimatedPitch: StateFlow<Float?>
+
+    /** Relative signal strength in 0..1 for level meters. */
+    val signalStrength: StateFlow<Float>
+
+    /** Most recent inference duration in milliseconds, for diagnostics. */
+    val lastInferenceMs: StateFlow<Int>
+
+    /** Non-null when the decoder cannot run, for example the model failed to load. */
+    val errorMessage: StateFlow<String?>
+
+    /** Feed captured mono PCM in -1..1. Safe to call from a capture thread. */
+    suspend fun processBuffer(samples: FloatArray, sampleRate: Int)
+
+    /** Clear decoded text and buffered audio. */
+    fun reset()
+
+    /** Release native resources. Must be called when the decoder goes away. */
+    fun close()
+}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/MorseTable.kt

@@ -1,140 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * Morse code lookup table, ported from fldigi morse.cxx (cMorse::cw_table).
- * Each entry: [enabled, displayChar, prosignDisplay, dotDashPattern].
- */
-internal object MorseTable {
-
-    private data class Entry(
-        val enabled: Boolean,
-        val chr: String,
-        val prt: String,
-        val rpr: String
-    )
-
-    private val table = listOf(
-        // Prosigns
-        Entry(true, "=", "<BT>", "-...-"),
-        Entry(false, "~", "<AA>", ".-.-"),
-        Entry(true, "<", "<AS>", ".-..."),
-        Entry(true, ">", "<AR>", ".-.-."),
-        Entry(true, "%", "<SK>", "...-.-"),
-        Entry(true, "+", "<KN>", "-.--."),
-        Entry(true, "&", "<INT>", "..-.-"),
-        Entry(true, "{", "<HM>", "....--"),
-        Entry(true, "}", "<VE>", "...-."),
-        // ASCII 7-bit letters
-        Entry(true, "A", "A", ".-"),
-        Entry(true, "B", "B", "-..."),
-        Entry(true, "C", "C", "-.-."),
-        Entry(true, "D", "D", "-.."),
-        Entry(true, "E", "E", "."),
-        Entry(true, "F", "F", "..-."),
-        Entry(true, "G", "G", "--."),
-        Entry(true, "H", "H", "...."),
-        Entry(true, "I", "I", ".."),
-        Entry(true, "J", "J", ".---"),
-        Entry(true, "K", "K", "-.-"),
-        Entry(true, "L", "L", ".-.."),
-        Entry(true, "M", "M", "--"),
-        Entry(true, "N", "N", "-."),
-        Entry(true, "O", "O", "---"),
-        Entry(true, "P", "P", ".--."),
-        Entry(true, "Q", "Q", "--.-"),
-        Entry(true, "R", "R", ".-."),
-        Entry(true, "S", "S", "..."),
-        Entry(true, "T", "T", "-"),
-        Entry(true, "U", "U", "..-"),
-        Entry(true, "V", "V", "...-"),
-        Entry(true, "W", "W", ".--"),
-        Entry(true, "X", "X", "-..-"),
-        Entry(true, "Y", "Y", "-.--"),
-        Entry(true, "Z", "Z", "--.."),
-        // lowercase map to uppercase
-        Entry(true, "a", "A", ".-"), Entry(true, "b", "B", "-..."),
-        Entry(true, "c", "C", "-.-."), Entry(true, "d", "D", "-.."),
-        Entry(true, "e", "E", "."), Entry(true, "f", "F", "..-."),
-        Entry(true, "g", "G", "--."), Entry(true, "h", "H", "...."),
-        Entry(true, "i", "I", ".."), Entry(true, "j", "J", ".---"),
-        Entry(true, "k", "K", "-.-"), Entry(true, "l", "L", ".-.."),
-        Entry(true, "m", "M", "--"), Entry(true, "n", "N", "-."),
-        Entry(true, "o", "O", "---"), Entry(true, "p", "P", ".--."),
-        Entry(true, "q", "Q", "--.-"), Entry(true, "r", "R", ".-."),
-        Entry(true, "s", "S", "..."), Entry(true, "t", "T", "-"),
-        Entry(true, "u", "U", "..-"), Entry(true, "v", "V", "...-"),
-        Entry(true, "w", "W", ".--"), Entry(true, "x", "X", "-..-"),
-        Entry(true, "y", "Y", "-.--"), Entry(true, "z", "Z", "--.."),
-        // Numerals
-        Entry(true, "0", "0", "-----"),
-        Entry(true, "1", "1", ".----"),
-        Entry(true, "2", "2", "..---"),
-        Entry(true, "3", "3", "...--"),
-        Entry(true, "4", "4", "....-"),
-        Entry(true, "5", "5", "....."),
-        Entry(true, "6", "6", "-...."),
-        Entry(true, "7", "7", "--..."),
-        Entry(true, "8", "8", "---.."),
-        Entry(true, "9", "9", "----."),
-        // Punctuation
-        Entry(true, "\\", "\\", ".-..-."),
-        Entry(true, "'", "'", ".----."),
-        Entry(true, "$", "$", "...-..-"),
-        Entry(true, "(", "(", "-.--."),
-        Entry(true, ")", ")", "-.--.-"),
-        Entry(true, ",", ",", "--..--"),
-        Entry(true, "-", "-", "-....-"),
-        Entry(true, ".", ".", ".-.-.-"),
-        Entry(true, "/", "/", "-..-."),
-        Entry(true, ":", ":", "---..."),
-        Entry(true, ";", ";", "-.-.-."),
-        Entry(true, "?", "?", "..--.."),
-        Entry(true, "_", "_", "..--.-"),
-        Entry(true, "@", "@", ".--.-."),
-        Entry(true, "!", "!", "-.-.--"),
-        // Accented (disabled by default in fldigi)
-        Entry(false, "Ä", "Ä", ".-.-"), Entry(false, "ä", "Ä", ".-.-"),
-        Entry(false, "Æ", "Æ", ".-.-"), Entry(false, "æ", "Æ", ".-.-"),
-        Entry(false, "Å", "Å", ".--.-"), Entry(false, "å", "Å", ".--.-"),
-        Entry(false, "Ç", "Ç", "-.-.."), Entry(false, "ç", "Ç", "-.-.."),
-        Entry(false, "È", "È", ".-..-"), Entry(false, "è", "È", ".-..-"),
-        Entry(false, "É", "É", "..-.."), Entry(false, "é", "É", "..-.."),
-        Entry(false, "Ó", "Ó", "---."), Entry(false, "ó", "Ó", "---."),
-        Entry(false, "Ö", "Ö", "---."), Entry(false, "ö", "Ö", "---."),
-        Entry(false, "Ø", "Ø", "---."), Entry(false, "ø", "Ø", "---."),
-        Entry(false, "Ñ", "Ñ", "--.--"), Entry(false, "ñ", "Ñ", "--.--"),
-        Entry(false, "Ü", "Ü", "..--"), Entry(false, "ü", "Ü", "..--"),
-        Entry(false, "Û", "Û", "..--"), Entry(false, "û", "Û", "..--")
-    )
-
-    /**
-     * Look up the display representation of a dot-dash pattern.
-     * Returns "" when the pattern is not in the table or is disabled.
-     * Mirror of cMorse::rx_lookup.
-     */
-    fun rxLookup(pattern: String): String {
-        for (e in table) {
-            if (pattern == e.rpr) {
-                if (e.enabled) return e.prt
-            }
-        }
-        return ""
-    }
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/cw/SomTable.kt

@@ -1,104 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-/**
- * Self-Organizing Map codebook for CW character matching, ported from
- * fldigi cw.cxx (cw::som_table). Each row is a dot/dash weight vector
- * (0 = element absent, 0.33 = dot, 1.0 = dash).
- */
-internal object SomTable {
-
-    data class SomEntry(val pattern: String, val weights: FloatArray)
-
-    val table: List<SomEntry> = listOf(
-        // Prosigns
-        SomEntry("-...-", floatArrayOf(1.0f, 0.33f, 0.33f, 0.33f, 1.0f, 0f, 0f)),
-        SomEntry(".-.-", floatArrayOf(0.33f, 1.0f, 0.33f, 1.0f, 0f, 0f, 0f)),
-        SomEntry(".-...", floatArrayOf(0.33f, 1.0f, 0.33f, 0.33f, 0.33f, 0f, 0f)),
-        SomEntry(".-.-.", floatArrayOf(0.33f, 1.0f, 0.33f, 1.0f, 0.33f, 0f, 0f)),
-        SomEntry("...-.-", floatArrayOf(0.33f, 0.33f, 0.33f, 1.0f, 0.33f, 1.0f, 0f)),
-        SomEntry("-.--.", floatArrayOf(1.0f, 0.33f, 1.0f, 1.0f, 0.33f, 0f, 0f)),
-        SomEntry("..-.-", floatArrayOf(0.33f, 0.33f, 1.0f, 0.33f, 1.0f, 0f, 0f)),
-        SomEntry("....--", floatArrayOf(0.33f, 0.33f, 0.33f, 0.33f, 1.0f, 1.0f, 0f)),
-        SomEntry("...-.", floatArrayOf(0.33f, 0.33f, 0.33f, 1.0f, 0.33f, 0f, 0f)),
-        // ASCII 7-bit letters
-        SomEntry(".-", floatArrayOf(0.33f, 1.0f, 0f, 0f, 0f, 0f, 0f)),
-        SomEntry("-...", floatArrayOf(1.0f, 0.33f, 0.33f, 0.33f, 0f, 0f, 0f)),
-        SomEntry("-.-.", floatArrayOf(1.0f, 0.33f, 1.0f, 0.33f, 0f, 0f, 0f)),
-        SomEntry("-..", floatArrayOf(1.0f, 0.33f, 0.33f, 0f, 0f, 0f, 0f)),
-        SomEntry(".", floatArrayOf(0.33f, 0f, 0f, 0f, 0f, 0f, 0f)),
-        SomEntry("..-.", floatArrayOf(0.33f, 0.33f, 1.0f, 0.33f, 0f, 0f, 0f)),
-        SomEntry("--.", floatArrayOf(1.0f, 1.0f, 0.33f, 0f, 0f, 0f, 0f)),
-        SomEntry("....", floatArrayOf(0.33f, 0.33f, 0.33f, 0.33f, 0f, 0f, 0f)),
-        SomEntry("..", floatArrayOf(0.33f, 0.33f, 0f, 0f, 0f, 0f, 0f)),
-        SomEntry(".---", floatArrayOf(0.33f, 1.0f, 1.0f, 1.0f, 0f, 0f, 0f)),
-        SomEntry("-.-", floatArrayOf(1.0f, 0.33f, 1.0f, 0f, 0f, 0f, 0f)),
-        SomEntry(".-..", floatArrayOf(0.33f, 1.0f, 0.33f, 0.33f, 0f, 0f, 0f)),
-        SomEntry("--", floatArrayOf(1.0f, 1.0f, 0f, 0f, 0f, 0f, 0f)),
-        SomEntry("-.", floatArrayOf(1.0f, 0.33f, 0f, 0f, 0f, 0f, 0f)),
-        SomEntry("---", floatArrayOf(1.0f, 1.0f, 1.0f, 0f, 0f, 0f, 0f)),
-        SomEntry(".--.", floatArrayOf(0.33f, 1.0f, 1.0f, 0.33f, 0f, 0f, 0f)),
-        SomEntry("--.-", floatArrayOf(1.0f, 1.0f, 0.33f, 1.0f, 0f, 0f, 0f)),
-        SomEntry(".-.", floatArrayOf(0.33f, 1.0f, 0.33f, 0f, 0f, 0f, 0f)),
-        SomEntry("...", floatArrayOf(0.33f, 0.33f, 0.33f, 0f, 0f, 0f, 0f)),
-        SomEntry("-", floatArrayOf(1.0f, 0f, 0f, 0f, 0f, 0f, 0f)),
-        SomEntry("..-", floatArrayOf(0.33f, 0.33f, 1.0f, 0f, 0f, 0f, 0f)),
-        SomEntry("...-", floatArrayOf(0.33f, 0.33f, 0.33f, 1.0f, 0f, 0f, 0f)),
-        SomEntry(".--", floatArrayOf(0.33f, 1.0f, 1.0f, 0f, 0f, 0f, 0f)),
-        SomEntry("-..-", floatArrayOf(1.0f, 0.33f, 0.33f, 1.0f, 0f, 0f, 0f)),
-        SomEntry("-.--", floatArrayOf(1.0f, 0.33f, 1.0f, 1.0f, 0f, 0f, 0f)),
-        SomEntry("--..", floatArrayOf(1.0f, 1.0f, 0.33f, 0.33f, 0f, 0f, 0f)),
-        // Numerals
-        SomEntry("-----", floatArrayOf(1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0f, 0f)),
-        SomEntry(".----", floatArrayOf(0.33f, 1.0f, 1.0f, 1.0f, 1.0f, 0f, 0f)),
-        SomEntry("..---", floatArrayOf(0.33f, 0.33f, 1.0f, 1.0f, 1.0f, 0f, 0f)),
-        SomEntry("...--", floatArrayOf(0.33f, 0.33f, 0.33f, 1.0f, 1.0f, 0f, 0f)),
-        SomEntry("....-", floatArrayOf(0.33f, 0.33f, 0.33f, 0.33f, 1.0f, 0f, 0f)),
-        SomEntry(".....", floatArrayOf(0.33f, 0.33f, 0.33f, 0.33f, 0.33f, 0f, 0f)),
-        SomEntry("-....", floatArrayOf(1.0f, 0.33f, 0.33f, 0.33f, 0.33f, 0f, 0f)),
-        SomEntry("--...", floatArrayOf(1.0f, 1.0f, 0.33f, 0.33f, 0.33f, 0f, 0f)),
-        SomEntry("---..", floatArrayOf(1.0f, 1.0f, 1.0f, 0.33f, 0.33f, 0f, 0f)),
-        SomEntry("----.", floatArrayOf(1.0f, 1.0f, 1.0f, 1.0f, 0.33f, 0f, 0f)),
-        // Punctuation
-        SomEntry(".-..-.", floatArrayOf(0.33f, 1.0f, 0.33f, 0.33f, 1.0f, 0.33f, 0f)),
-        SomEntry(".----.", floatArrayOf(0.33f, 1.0f, 1.0f, 1.0f, 1.0f, 0.33f, 0f)),
-        SomEntry("...-..-", floatArrayOf(0.33f, 0.33f, 0.33f, 1.0f, 0.33f, 0.33f, 1.0f)),
-        SomEntry("-.---.", floatArrayOf(1.0f, 0.33f, 1.0f, 1.0f, 0.33f, 0f, 0f)),
-        SomEntry("-.--.-", floatArrayOf(1.0f, 0.33f, 1.0f, 1.0f, 0.33f, 1.0f, 0f)),
-        SomEntry("--..--", floatArrayOf(1.0f, 1.0f, 0.33f, 0.33f, 1.0f, 1.0f, 0f)),
-        SomEntry("-....-", floatArrayOf(1.0f, 0.33f, 0.33f, 0.33f, 0.33f, 1.0f, 0f)),
-        SomEntry(".-.-.-", floatArrayOf(0.33f, 1.0f, 0.33f, 1.0f, 0.33f, 1.0f, 0f)),
-        SomEntry("-..-.", floatArrayOf(1.0f, 0.33f, 0.33f, 1.0f, 0.33f, 0f, 0f)),
-        SomEntry("---...", floatArrayOf(1.0f, 1.0f, 1.0f, 0.33f, 0.33f, 0.33f, 0f)),
-        SomEntry("-.-.-.", floatArrayOf(1.0f, 0.33f, 1.0f, 0.33f, 1.0f, 0.33f, 0f)),
-        SomEntry("..--..", floatArrayOf(0.33f, 0.33f, 1.0f, 1.0f, 0.33f, 0.33f, 0f)),
-        SomEntry("..--.-", floatArrayOf(0.33f, 0.33f, 1.0f, 1.0f, 0.33f, 1.0f, 0f)),
-        SomEntry(".--.-.", floatArrayOf(0.33f, 1.0f, 1.0f, 0.33f, 1.0f, 0.33f, 0f)),
-        SomEntry("-.-.--", floatArrayOf(1.0f, 0.33f, 1.0f, 0.33f, 1.0f, 1.0f, 0f)),
-        // Accented
-        SomEntry(".-.-", floatArrayOf(0.33f, 1.0f, 0.33f, 1.0f, 0f, 0f, 0f)), // A umlaut, A aelig
-        SomEntry(".--.-", floatArrayOf(0.33f, 1.0f, 1.0f, 0.33f, 1.0f, 0f, 0f)), // A ring
-        SomEntry("-.-..", floatArrayOf(1.0f, 0.33f, 1.0f, 0.33f, 0.33f, 0f, 0f)), // C cedilla
-        SomEntry(".-..-", floatArrayOf(0.33f, 1.0f, 0.33f, 0.33f, 1.0f, 0f, 0f)), // E grave
-        SomEntry("..-..", floatArrayOf(0.33f, 0.33f, 1.0f, 0.33f, 0.33f, 0f, 0f)), // E acute
-        SomEntry("---.", floatArrayOf(1.0f, 1.0f, 1.0f, 0.33f, 0f, 0f, 0f)), // O acute, O umlaut, O slash
-        SomEntry("--.--", floatArrayOf(1.0f, 1.0f, 0.33f, 1.0f, 1.0f, 0f, 0f)), // N tilde
-        SomEntry("..--", floatArrayOf(0.33f, 0.33f, 1.0f, 1.0f, 0f, 0f, 0f)) // U umlaut, U circ
-    )
-}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/model/Constants.kt

@@ -0,0 +1,23 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.domain.model
+
+object Constants {
+    const val FREQ_OFFSET_MIN_HZ = -50_000L
+    const val FREQ_OFFSET_MAX_HZ = 50_000L
+}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/model/SatStatus.kt

@@ -23,10 +23,10 @@ data class SatDay(
     val slots: List<SatSlot> // 12 槽(00-02 ... 22-24)
 )
 
-/** One satellite, 6 days of state */
+/** One satellite, 5 days of state */
 data class SatStatus(
     val name: String,        // "AO-123_[FM]"
-    val days: List<SatDay>   // 6 天(新→旧)
+    val days: List<SatDay>   // 5 天(新→旧)
 )
 
 /** Overall page parse result */

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/model/Settings.kt

@@ -29,8 +29,7 @@ data class PassesSettings(
     val minElevation: Double,
     val aosStartMinute: Int = 0,
     val aosEndMinute: Int = 23 * 60 + 59,
-    val invertAosTimeWindow: Boolean = false,
-    val selectedModes: List<String>
+    val invertAosTimeWindow: Boolean = false
 )
 
 data class RCSettings(
@@ -42,6 +41,7 @@ data class RCSettings(
     val frequencyAddress: String,
     val frequencyPort: String,
     val frequencyFormat: String,
+    val frequencyOffsetHz: Long = 0L,
     val bluetoothRotatorState: Boolean,
     val bluetoothRotatorFormat: String,
     val bluetoothRotatorName: String,
@@ -73,7 +73,10 @@ data class OtherSettings(
     val wavelogUrl: String = "",
     val wavelogApiKey: String = "",
     val wavelogStationId: String = "",
-    val wavelogAutoUpload: Boolean = false
+    val wavelogAutoUpload: Boolean = false,
+    // Upstream radar compass offset (merged from rt-bishop)
+    val radarCompassOffset: Float = 0f,
+    val radarCompassOffsetElev: Float = 0f
 )
 
 data class DataSourcesSettings(

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/navigation/MenuLayout.kt

@@ -0,0 +1,143 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.domain.navigation
+
+/**
+ * Single source of truth for the navigation menu layout.
+ *
+ * The bottom bar holds at most [MAIN_SLOTS] pages; the rest live behind the More
+ * button. Both the bar and the settings editor resolve through here, so the list
+ * the user edits is exactly the list they get.
+ *
+ * Lives in `core:domain` (pure Kotlin) so it is unit-testable and KMP-ready.
+ */
+object MenuLayout {
+
+    /** Bottom-bar capacity, including the Settings entry. */
+    const val MAIN_SLOTS = 5
+
+    /** Must stay reachable from some menu, so the user cannot lock themselves out. */
+    const val SETTINGS_ID = "Settings"
+
+    /** Bar contents for a fresh install. */
+    val defaultMainOrder = listOf("Satellites", "Passes", "Radar", "Map", SETTINGS_ID)
+
+    /** More-menu contents for a fresh install. */
+    val defaultMoreOrder = listOf("Mutual", "Roaming", "CwDecode", "WavelogLog", "AMSAT")
+
+    /** What the bar and the More menu actually show. */
+    data class Layout(val mainIds: List<String>, val moreIds: List<String>)
+
+    /** A menu assignment ready to be persisted to settings. */
+    data class Assignment(val screenOrder: List<String>, val subMenuOrder: List<String>)
+
+    /**
+     * Map persisted preferences onto the two menus.
+     *
+     * A page named by neither persisted list is new to this install and follows
+     * the defaults, so upgrades never lose pages. Visible pages that overflow
+     * [MAIN_SLOTS] fall through to the More menu instead of disappearing, and
+     * [SETTINGS_ID] always survives the slot cut.
+     */
+    fun resolve(
+        allScreenIds: List<String>,
+        screenOrder: List<String>,
+        subMenuOrder: List<String>,
+        hiddenScreenIds: List<String>
+    ): Layout {
+        val visible = allScreenIds.filter { it !in hiddenScreenIds || it == SETTINGS_ID }
+        val wantMain = ArrayList<String>()
+        val wantMore = ArrayList<String>()
+        for (id in visible) {
+            when {
+                id in screenOrder -> wantMain.add(id)
+                id in subMenuOrder -> wantMore.add(id)
+                id in defaultMainOrder -> wantMain.add(id)
+                else -> wantMore.add(id)
+            }
+        }
+        wantMain.sortBy { rank(it, screenOrder, defaultMainOrder) }
+        wantMore.sortBy { rank(it, subMenuOrder, defaultMoreOrder) }
+
+        // Reserve the Settings slot before cutting so it cannot be truncated away.
+        val settingsOnBar = SETTINGS_ID in wantMain
+        val budget = if (settingsOnBar) MAIN_SLOTS - 1 else MAIN_SLOTS
+        val main = ArrayList<String>(MAIN_SLOTS)
+        for (id in wantMain) {
+            if (id == SETTINGS_ID) continue
+            if (main.size == budget) break
+            main.add(id)
+        }
+        if (settingsOnBar) main.add(SETTINGS_ID)
+
+        val overflow = wantMain.filter { it !in main }
+        return Layout(mainIds = main, moreIds = overflow + wantMore)
+    }
+
+    /** Move [screenId] onto the bar, evicting the last movable page when full. */
+    fun moveToMain(
+        screenId: String,
+        allScreenIds: List<String>,
+        screenOrder: List<String>,
+        subMenuOrder: List<String>
+    ): Assignment {
+        val current = resolve(allScreenIds, screenOrder, subMenuOrder, emptyList())
+        val main = current.mainIds.toMutableList()
+        val more = current.moreIds.toMutableList()
+        val wasInMore = screenId in more
+        more.remove(screenId)
+        if (screenId !in main) {
+            val at = main.indexOf(SETTINGS_ID).let { if (it == -1) main.size else it }
+            main.add(at, screenId)
+        }
+        // Only evict when we actually added a new page from More; internal reordering must not evict.
+        if (wasInMore) {
+            val movable = main.filter { it != SETTINGS_ID && it != screenId }
+            if (main.size > MAIN_SLOTS && movable.isNotEmpty()) {
+                val evicted = movable.last()
+                main.remove(evicted)
+                more.add(0, evicted)
+            }
+        }
+        return Assignment(screenOrder = main, subMenuOrder = more)
+    }
+
+    /** Move [screenId] off the bar; Settings is refused so it stays reachable. */
+    fun moveToMore(
+        screenId: String,
+        allScreenIds: List<String>,
+        screenOrder: List<String>,
+        subMenuOrder: List<String>
+    ): Assignment {
+        if (screenId == SETTINGS_ID) return Assignment(screenOrder, subMenuOrder)
+        val current = resolve(allScreenIds, screenOrder, subMenuOrder, emptyList())
+        val more = current.moreIds.toMutableList()
+        if (screenId !in more) more.add(screenId)
+        return Assignment(
+            screenOrder = current.mainIds.filter { it != screenId },
+            subMenuOrder = more
+        )
+    }
+
+    private fun rank(id: String, persisted: List<String>, fallback: List<String>): Int {
+        val persistedIndex = persisted.indexOf(id)
+        if (persistedIndex != -1) return persistedIndex
+        val fallbackIndex = fallback.indexOf(id)
+        return if (fallbackIndex != -1) fallbackIndex else Int.MAX_VALUE
+    }
+}

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/predict/CelestialComputer.kt

@@ -424,8 +424,12 @@ object CelestialComputer {
         }
         if (sunrise == 0.0) sunrise = daynum
 
-        // Phase 4: fast-forward through the day until sun drops back below threshold
-        daynum = sunrise
+        // Phase 4: fast-forward through the day until sun drops back below threshold.
+        // Start from just after sunrise (small offset) so the sun is clearly above
+        // the threshold. This prevents a bug where Phase 3 converges to a point
+        // slightly below -threshold, causing Phase 4 to skip and Phase 5 to converge
+        // to the same time as sunrise, producing identical sunrise/sunset times.
+        daynum = sunrise + 0.001
         sunPos = getSunPosition(observer, daynumToMillis(daynum))
         guard = 0
         while (sunPos.elevation > -threshold && guard++ < 500) {

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/repository/IMainContainer.kt

@@ -35,6 +35,7 @@ interface IMainContainer {
     val mutualPassData: StateFlow<MutualPassData>
     fun setMutualPassData(data: MutualPassData)
     fun provideAddToCalendar(): IAddToCalendar
+    fun providePairedBluetoothDevices(): List<Pair<String, String>>
     fun provideShowToast(): IShowToast
     fun provideBluetoothReporter(): IReporter
     fun provideNetworkReporter(): IReporter
@@ -42,6 +43,7 @@ interface IMainContainer {
     fun provideTxRadioController(): IRadioController
     fun provideRxRadioController(): IRadioController
     fun provideAudioCapture(): IAudioCapture
+    fun provideCwDecoder(): com.rtbishop.look4sat.core.domain.cw.ICwDecoder
     fun provideSaveImage(): ISaveImage
     // WaveLog logging (4.5.2)
     val wavelogQueue: com.rtbishop.look4sat.core.domain.wavelog.WavelogQueue

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/repository/ISelectionRepo.kt

@@ -21,10 +21,10 @@ import com.rtbishop.look4sat.core.domain.model.SatItem
 import kotlinx.coroutines.flow.Flow
 
 interface ISelectionRepo {
-    fun getCurrentTypes(): List<String>
-    fun getTypesList(): List<String>
+    fun getCurrentModes(): List<String>
+    fun getModesList(): List<String>
     suspend fun getEntriesFlow(): Flow<List<SatItem>>
-    suspend fun setTypes(types: List<String>)
+    suspend fun setModes(modes: List<String>)
     suspend fun setQuery(query: String)
     suspend fun setSelection(selectAll: Boolean)
     suspend fun setSelection(ids: List<Int>, isTicked: Boolean)

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/repository/ISettingsRepo.kt

@@ -32,9 +32,9 @@ interface ISettingsRepo {
 
     //region # Satellites selection settings
     val selectedIds: StateFlow<List<Int>>
-    val selectedTypes: StateFlow<List<String>>
+    val selectedSatModes: StateFlow<List<String>>
     fun setSelectedIds(ids: List<Int>)
-    fun setSelectedTypes(types: List<String>)
+    fun setSelectedSatModes(modes: List<String>)
     //endregion
 
     //region # Passes filter settings
@@ -78,4 +78,9 @@ interface ISettingsRepo {
     val radioControlSettings: StateFlow<RadioControlSettings>
     fun updateRadioControlSettings(settings: RadioControlSettings)
     //endregion
+
+    //region # Per-satellite calculator offset settings
+    fun getSatelliteOffset(catnum: Int): String
+    fun setSatelliteOffset(catnum: Int, offset: String)
+    //endregion
 }

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/source/IRemoteSource.kt

@@ -23,6 +23,9 @@ interface IRemoteSource {
     suspend fun getFileStream(uri: String): InputStream?
     suspend fun getNetworkStream(url: String): InputStream?
 
-    /** Fetch AMSAT status page HTML (with UA; null = failure) */
-    suspend fun getStatusHtml(): String?
+    /** Fetch AMSAT API catalog (JSON string; null on failure) */
+    suspend fun getAmSatCatalog(): String?
+
+    /** Fetch AMSAT API reports for the past N hours (JSON string; null on failure) */
+    suspend fun getAmSatReports(hours: Int, limit: Int): String?
 }

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/source/Sources.kt

@@ -52,6 +52,15 @@ object Sources {
         "R4UAB" to "https://r4uab.ru/satonline.txt",
         "Other" to "" // key for sats filter
     )
+    val satelliteModes = listOf(
+        "4FSK", "64-QAM", "AFSK", "AFSK TUBiX10", "AHRPT", "AM", "APT", "ASK", "BPSK",
+        "BPSK PMT-A3", "CERTO", "CW", "DATV", "DBPSK", "DOKA", "DPSK", "DQPSK", "DSB", "DSTAR",
+        "DUV", "DVB-S2", "FFSK", "FM", "FMN", "FSK", "FSK AX.100 Mode 5", "FSK AX.100 Mode 6",
+        "FSK AX.25 G3RUH", "FT8", "GENESIS FSK", "GFSK", "GFSK Pkst", "GFSK Rktr", "GFSK/BPSK",
+        "GMSK", "GMSK USP", "HRPT", "LoRa", "LRPT", "LSB", "MFSK", "MSK", "MSK AX.100 Mode 5",
+        "MSK AX.100 Mode 6", "OFDM", "OQPSK", "PPM", "PSK", "PSK31", "PSK63", "QPSK", "QPSK31",
+        "QPSK63", "SIDLOC", "SQPSK", "SSDV", "SSTV", "UNKNOWN", "USB", "WSJT"
+    )
     val transceiversDataUrls = mapOf(
         "SatNOGS" to "https://db.satnogs.org/api/transmitters/?format=json&status=active"
     )

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/utility/DataParser.kt

@@ -70,8 +70,13 @@ class DataParser(private val dispatcher: CoroutineDispatcher) {
         val min = timestamp.substring(14, 16).toInt() * 60000
         val sec = timestamp.substring(17, 19).toInt() * 1000
         val ms = timestamp.substring(20, 26).toInt() / 1000.0
-        val frac = ((hour + min + sec + ms) / 86400000.0).toString().substring(1)
-        val epoch = "${year.substring(2)}$day$frac".toDouble()
+        // Add the day fraction numerically. Building it by string surgery breaks
+        // below 1e-3, where Double.toString() switches to scientific notation and
+        // dropping the first character removes a significant digit instead of the
+        // leading zero: 00:01:00 yielded "25001.944444444444445E-4" -> 2.50019,
+        // a silently valid epoch about 26 years off.
+        val dayFraction = (hour + min + sec + ms) / 86400000.0
+        val epoch = "${year.substring(2)}$day".toDouble() + dayFraction
         OrbitalData(
             name = name,
             epoch = epoch,
@@ -91,7 +96,7 @@ class DataParser(private val dispatcher: CoroutineDispatcher) {
         val line1 = tle[1]
         val line2 = tle[2]
         OrbitalData(
-            name = tle[0].trim(),
+            name = tle[0].trim().removePrefix("0 "),
             epoch = line1.substring(18, 32).toDouble(),
             meanmo = line2.substring(52, 63).toDouble(),
             eccn = line2.substring(26, 33).toDouble() / 1e7,

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/utility/DopplerFrequencyCalculator.kt

@@ -114,11 +114,30 @@ object DopplerFrequencyCalculator {
         val modes = listOfNotNull(transponder.downlinkMode, transponder.uplinkMode)
             .joinToString(separator = " ")
             .lowercase(Locale.ENGLISH)
-        val hasLinearName = info.contains("linear")
+        val hasLinearName = info.contains("linear") || info.contains(" lin") || info.startsWith("lin")
         val hasTransponderName = info.contains("transponder") || info.contains("transp") ||
                 info.contains("xponder") || info.contains("xpdr")
         val hasLinearMode = listOf("ssb", "usb", "lsb", "cw").any { modes.contains(it) }
 
-        return (hasLinearName && hasTransponderName) || (hasTransponderName && hasLinearMode)
+        return (hasLinearName && hasTransponderName) || (hasTransponderName && hasLinearMode) ||
+                (hasLinearName && hasLinearMode)
+    }
+
+    /**
+     * Removes duplicate transponder entries that describe the same physical
+     * transponder with different mode labels (e.g. SatNOGS lists AO-7's Mode A
+     * as both "Lin SSB" and "Lin CW", and JO-97's U/V transponder as both
+     * "CW Transponder" and "SSB Transponder").
+     *
+     * Entries sharing the same uplink/downlink frequency range are considered
+     * the same transponder. The non-CW entry is preferred because its invert
+     * flag is more reliable (e.g. JO-97's CW entry wrongly has invert=false).
+     */
+    fun deduplicateTransponders(radios: List<SatRadio>): List<SatRadio> {
+        return radios.groupBy { radio ->
+            listOf(radio.uplinkLow, radio.uplinkHigh, radio.downlinkLow, radio.downlinkHigh)
+        }.values.map { group ->
+            group.firstOrNull { it.downlinkMode?.equals("CW", ignoreCase = true) != true } ?: group.first()
+        }
     }
 }

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/utility/Extensions.kt

@@ -41,6 +41,21 @@ fun Double.round(decimals: Int): Double {
     return kotlin.math.round(this * multiplier) / multiplier
 }
 
+fun String.aprsPasscode(): Int {
+    val callsign = this.trim().uppercase().substringBefore('-') // commonly strip SSID
+    var hash = 0x73E2
+    var i = 0
+    while (i < callsign.length) {
+        hash = hash xor (callsign[i].code shl 8)
+        i++
+        if (i < callsign.length) {
+            hash = hash xor callsign[i].code
+            i++
+        }
+    }
+    return hash and 0x7FFF
+}
+
 //fun String.getHash(type: String = "SHA-256"): String {
 //    val hexChars = "0123456789ABCDEF"
 //    val bytes = MessageDigest.getInstance(type).digest(this.toByteArray())

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/utility/GeoConverter.kt

@@ -81,9 +81,18 @@ fun clipLat(latitude: Double): Double {
 }
 
 fun clipLon(longitude: Double): Double {
+    // Reduce with a modulo so a single pass always terminates. The previous
+    // while-loop never returned for extreme inputs: Infinity stays Infinity
+    // after subtracting 360, so the loop ran forever, and a ~1e12 degree value
+    // took billions of iterations. NaN still passes through to clip() and is
+    // returned as NaN, which is the same behaviour as before.
+    if (!longitude.isFinite()) return longitude
     var result = longitude
-    while (result < MIN_LONGITUDE) result += 360.0
-    while (result > MAX_LONGITUDE) result -= 360.0
+    result = ((result + 180.0) % 360.0 + 360.0) % 360.0 - 180.0
+    // The closed interval [-180, 180] keeps +180 for a value that lands exactly
+    // on the positive boundary (old loop: 180 stays 180, only > 180 wraps);
+    // -180 is reserved for values that actually came from the west side.
+    if (result == -180.0 && longitude > 0.0) result = 180.0
     return clip(result, MIN_LONGITUDE, MAX_LONGITUDE)
 }
 

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/utility/QthConverter.kt

@@ -74,8 +74,14 @@ fun qthToPosition(locator: String): GeoPos? {
  */
 fun positionToQth(latitude: Double, longitude: Double, precision: Int = 8): String? {
     if (!isValidPosition(latitude, longitude)) return null
-    val newLongitude = longitude + 180
-    val newLatitude = latitude + 90
+    // The grid spans [0, 360) lon and [0, 180) lat once shifted. Clamping the
+    // field index alone (coerceIn below) is not enough: at exactly +90 lat or
+    // +180 lon the field saturates to R while the square/subsquare terms come
+    // from a modulo that has already wrapped to 0, so the encoded locator
+    // decoded back 10 degrees of latitude / 20 degrees of longitude away.
+    // Nudge the upper bound into the last cell instead.
+    val newLongitude = (longitude + 180).coerceIn(0.0, 360.0 - 1e-9)
+    val newLatitude = (latitude + 90).coerceIn(0.0, 180.0 - 1e-9)
     val lonFirst = (65 + (newLongitude / 20).toInt().coerceIn(0, 17)).toChar()
     val latFirst = (65 + (newLatitude / 10).toInt().coerceIn(0, 17)).toChar()
     val lonSecond = ((newLongitude % 20) / 2).toInt()
@@ -94,11 +100,13 @@ fun positionToQth(latitude: Double, longitude: Double, precision: Int = 8): Stri
 }
 
 private fun isValidPosition(lat: Double, lon: Double): Boolean {
-    return (lat >= -90.0 && lat <= 90.0) && (lon >= -180.0 && lon <= 360.0)
+    return lat in -90.0..90.0 && lon in -180.0..180.0
 }
 
 private fun isValidLocator(locator: String): Boolean {
-    return locator.matches("[a-xA-X]{2}\\d{2}[a-xA-X]{2}(?:\\d{2}(?:[a-xA-X]{2})?)?".toRegex())
+    // Maidenhead fields are A-R (18 x 18). Subsquare letters are A-X (24).
+    // Accepting S-X in the first pair decodes to latitude >90 / longitude >180.
+    return locator.matches("[a-rA-R]{2}\\d{2}[a-xA-X]{2}(?:\\d{2}(?:[a-xA-X]{2})?)?".toRegex())
 }
 
 /**

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/wavelog/WaveLogApi.kt

@@ -106,6 +106,51 @@ object WaveLogApi {
         WavelogResult.Success("")
     }
 
+    /**
+     * ADIF band code from a frequency in Hz. "SAT" is NOT a legal ADIF band
+     * value (the Band enumeration is 160M/80M/.../2M/70CM/23CM...); a logger
+     * that fails to parse an illegal band falls back to a default such as
+     * 160m. Satellite QSOs must carry the real band of the TX frequency.
+     */
+    fun bandFromHz(freqHz: Long): String = when {
+        freqHz >= 1240_000_000 -> "23CM"
+        freqHz >= 902_000_000 -> "33CM"
+        freqHz >= 420_000_000 -> "70CM"
+        freqHz >= 222_000_000 -> "1.25M"
+        freqHz >= 144_000_000 -> "2M"
+        freqHz >= 50_000_000 -> "6M"
+        freqHz >= 28_000_000 -> "10M"
+        freqHz >= 24_890_000 -> "12M"
+        freqHz >= 21_000_000 -> "15M"
+        freqHz >= 18_068_000 -> "17M"
+        freqHz >= 14_000_000 -> "20M"
+        freqHz >= 10_000_000 -> "30M"
+        freqHz >= 7_000_000 -> "40M"
+        freqHz >= 5_102_000 -> "60M"
+        freqHz >= 3_500_000 -> "80M"
+        freqHz >= 1_800_000 -> "160M"
+        else -> "160M"
+    }
+
+    /** Band class letter for satellite mode derivation: VHF=V, UHF=U, SHF=S. */
+    private fun bandLetter(freqHz: Long): String = when {
+        freqHz >= 1_240_000_000 -> "S"
+        freqHz >= 420_000_000 -> "U"
+        freqHz >= 144_000_000 -> "V"
+        else -> "V"
+    }
+
+    /**
+     * ADIF SAT_MODE (free text, satellite convention): "V/U" = VHF up /
+     * UHF down, "U/V", "V/S", "U/S"... Derived from the actual TX/RX bands.
+     */
+    fun satModeFrom(txFreqHz: Long, rxFreqHz: Long): String {
+        if (rxFreqHz <= 0) return ""
+        val up = bandLetter(txFreqHz)
+        val down = bandLetter(rxFreqHz)
+        return if (up == down) "" else "$up/$down"
+    }
+
     /** LoTW-recognized satellite name: main name before parentheses, uppercased (ISS special case) */
     fun normalizeSatName(raw: String): String {
         val main = raw.substringBefore('(').trim()
@@ -142,10 +187,11 @@ object WaveLogApi {
         val satName = normalizeSatName(qso.satName)
 
         // v2: POST /index.php/api/v2/qso (JSON fields)
+        val satMode = satModeFrom(qso.freqTxHz, qso.freqRxHz)
         val v2Body = JSONObject().apply {
             put("station_profile_id", stationProfileId.toIntOrNull() ?: 0)
             put("call", qso.call)
-            put("band", "SAT")
+            put("band", bandFromHz(qso.freqTxHz))
             put("mode", qso.mode)
             put("qso_date", utcDate(qso.timeUtcMs))
             put("time_on", utcTime(qso.timeUtcMs))
@@ -155,6 +201,7 @@ object WaveLogApi {
             put("rst_sent", "59")
             put("rst_rcvd", "59")
             put("sat_name", satName)
+            if (satMode.isNotBlank()) put("sat_mode", satMode)
         }
         val (code, resp) = httpRequest("$base/index.php/api/v2/qso", "POST", apiKey, v2Body.toString())
         if (code in 200..299) return@withContext WavelogResult.Success("已上传 (v2)")
@@ -178,14 +225,15 @@ object WaveLogApi {
     }
 
     /** v1 ADIF string (freq in MHz, length = UTF-8 byte count, sat_name normalized) */
-    private fun toAdif(qso: WavelogQso, gridsquare: String, satName: String): String {
+    internal fun toAdif(qso: WavelogQso, gridsquare: String, satName: String): String {
         fun field(name: String, value: String): String {
             val bytes = value.toByteArray(Charsets.UTF_8).size
             return "<$name:$bytes>$value"
         }
+        val satMode = satModeFrom(qso.freqTxHz, qso.freqRxHz)
         return buildString {
             append(field("call", qso.call))
-            append(field("band", "SAT"))
+            append(field("band", bandFromHz(qso.freqTxHz)))
             append(field("mode", qso.mode))
             append(field("freq", String.format(Locale.ENGLISH, "%.6f", qso.freqTxHz / 1_000_000.0)))
             if (qso.freqRxHz > 0) {
@@ -195,9 +243,14 @@ object WaveLogApi {
             append(field("time_on", utcTimeCompact(qso.timeUtcMs)))
             append(field("rst_sent", "59"))
             append(field("rst_rcvd", "59"))
-            if (gridsquare.isNotBlank()) append(field("gridsquare", gridsquare.take(4)))
+            // Send the grid at full precision. Truncating to 4 characters threw
+            // away the 6-character locator the QRZ lookup provides, coarsening the
+            // stored position from ~4.6 km to ~100 km and making a QSO logged via
+            // v1 disagree with the same QSO logged via v2 (which sends it whole).
+            if (gridsquare.isNotBlank()) append(field("gridsquare", gridsquare))
             if (satName.isNotBlank()) {
                 append(field("sat_name", satName))
+                if (satMode.isNotBlank()) append(field("sat_mode", satMode))
                 append(field("prop_mode", "SAT"))
             }
             append("<eor>")

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/wavelog/WavelogQueue.kt

@@ -81,6 +81,7 @@ class WavelogQueue(private val store: IWavelogQueueStore) {
     }
 
     /** Update a QSO's counterpart grid (async backfill from the QRZ scraper, 4.5.5) */
+    @Synchronized
     fun updateGridsquare(id: String, grid: String) {
         save(all().map { if (it.id == id) it.copy(gridsquare = grid) else it })
     }

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/DataParserTest.kt

@@ -18,9 +18,11 @@
 package com.rtbishop.look4sat.core.domain
 
 import com.rtbishop.look4sat.core.domain.utility.DataParser
+import com.rtbishop.look4sat.core.domain.utility.aprsPasscode
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
 @ExperimentalCoroutinesApi
@@ -111,6 +113,47 @@ class DataParserTest {
         assert(dataParser.parseCSVStream(invalidCSVStream).isEmpty())
     }
 
+    private fun csvWithEpoch(epoch: String) = """
+        OBJECT_NAME,OBJECT_ID,EPOCH,MEAN_MOTION,ECCENTRICITY,INCLINATION,RA_OF_ASC_NODE,ARG_OF_PERICENTER,MEAN_ANOMALY,EPHEMERIS_TYPE,CLASSIFICATION_TYPE,NORAD_CAT_ID,ELEMENT_SET_NO,REV_AT_EPOCH,BSTAR,MEAN_MOTION_DOT,MEAN_MOTION_DDOT
+        ISS (ZARYA),1998-067A,$epoch,15.48582035,.0004694,51.6447,309.4881,203.6966,299.8876,0,U,25544,999,31220,.31985E-4,.1288E-4,0
+    """.trimIndent().byteInputStream()
+
+    @Test
+    fun `Given CSV epoch one minute past midnight the day fraction is correct`() = runTest(testDispatcher) {
+        // Regression: the day fraction used to be built by string surgery
+        // (Double.toString().substring(1)), but toString switches to scientific
+        // notation below 1e-3, so the leading significant digit was truncated.
+        // 00:01:00 produced "25001.944444444444445E-4" -> 2.50019..., an epoch
+        // roughly 26 years off, with no exception to reveal it.
+        val sat = dataParser.parseCSVStream(csvWithEpoch("2025-01-01T00:01:00.000000"))[0]
+        assertEquals(25001.0 + 60.0 / 86400.0, sat.epoch, 1e-9)
+    }
+
+    @Test
+    fun `Given CSV epoch one second past midnight the day fraction is correct`() = runTest(testDispatcher) {
+        val sat = dataParser.parseCSVStream(csvWithEpoch("2025-01-01T00:00:01.000000"))[0]
+        assertEquals(25001.0 + 1.0 / 86400.0, sat.epoch, 1e-9)
+    }
+
+    @Test
+    fun `Given CSV epoch exactly at midnight the day fraction is zero`() = runTest(testDispatcher) {
+        val sat = dataParser.parseCSVStream(csvWithEpoch("2025-01-01T00:00:00.000000"))[0]
+        assertEquals(25001.0, sat.epoch, 1e-9)
+    }
+
+    @Test
+    fun `Given CSV epoch at midday the day fraction is one half`() = runTest(testDispatcher) {
+        val sat = dataParser.parseCSVStream(csvWithEpoch("2025-01-01T12:00:00.000000"))[0]
+        assertEquals(25001.5, sat.epoch, 1e-9)
+    }
+
+    @Test
+    fun `Given CSV epoch late in the day the day fraction stays below one`() = runTest(testDispatcher) {
+        val sat = dataParser.parseCSVStream(csvWithEpoch("2025-01-01T23:59:59.999000"))[0]
+        assert(sat.epoch > 25001.999) { "expected almost a full day, got ${sat.epoch}" }
+        assert(sat.epoch < 25002.0) { "day fraction must not roll into the next day, got ${sat.epoch}" }
+    }
+
     @Test
     fun `Given valid TLE stream returns valid data`() = runTest(testDispatcher) {
         val parsedList = dataParser.parseTLEStream(validTLEStream)
@@ -239,4 +282,10 @@ class DataParserTest {
         // Matches the CSV test data epoch: 2021-11-16 → day 320
         assert(dataParser.getDayOfYear(2021, 11, 16) == 320)
     }
+
+    @Test
+    fun `check APRS passcode calculation`() {
+        assert("M7LNB".aprsPasscode() == 12443)
+        assert("N0CALL".aprsPasscode() == 13023)
+    }
 }

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/DopplerFrequencyCalculatorTest.kt

@@ -3,12 +3,17 @@ package com.rtbishop.look4sat.core.domain
 import com.rtbishop.look4sat.core.domain.model.SatRadio
 import com.rtbishop.look4sat.core.domain.predict.OrbitalPos
 import com.rtbishop.look4sat.core.domain.utility.DopplerFrequencyCalculator
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Test
 
 class DopplerFrequencyCalculatorTest {
 
     private fun linearTransponder(
+        uuid: String = "linear",
         upLow: Long = 145_000_000L,
         upHigh: Long = 145_500_000L,
         downLow: Long = 435_000_000L,
@@ -18,7 +23,7 @@ class DopplerFrequencyCalculatorTest {
         downlinkMode: String? = "USB",
         uplinkMode: String? = "LSB"
     ) = SatRadio(
-        uuid = "linear", info = info, isAlive = true,
+        uuid = uuid, info = info, isAlive = true,
         downlinkLow = downLow, downlinkHigh = downHigh,
         downlinkMode = downlinkMode, uplinkLow = upLow, uplinkHigh = upHigh,
         uplinkMode = uplinkMode, isInverted = inverted, catnum = 12345
@@ -68,19 +73,99 @@ class DopplerFrequencyCalculatorTest {
         assertFalse(DopplerFrequencyCalculator.isNamedLinearTransponder(driftingRangeEntry))
     }
 
+    @Test
+    fun isNamedLinearTransponder_returnsTrueForAbbreviatedLinName() {
+        // AO-7 style: "Mode V/A (A) Lin SSB" — "Lin" abbreviation, no "transponder" word
+        val ao7Entry = linearTransponder(info = "Mode V/A (A) Lin SSB", downlinkMode = "USB", uplinkMode = "USB")
+        assertTrue(DopplerFrequencyCalculator.isNamedLinearTransponder(ao7Entry))
+        val ao7CwEntry = linearTransponder(info = "Mode V/A (A) Lin CW", downlinkMode = "CW", uplinkMode = "CW")
+        assertTrue(DopplerFrequencyCalculator.isNamedLinearTransponder(ao7CwEntry))
+        val ao7ModeBEntry = linearTransponder(info = "Mode U/V (B) Lin", downlinkMode = "USB", uplinkMode = "LSB")
+        assertTrue(DopplerFrequencyCalculator.isNamedLinearTransponder(ao7ModeBEntry))
+    }
+
+    @Test
+    fun isNamedLinearTransponder_returnsTrueForLinearWithoutTransponderWord() {
+        // AO-73 style: "Mode U/V Linear" — has "Linear" but no "transponder"
+        val ao73Entry = linearTransponder(info = "Mode U/V Linear", downlinkMode = "USB", uplinkMode = "LSB")
+        assertTrue(DopplerFrequencyCalculator.isNamedLinearTransponder(ao73Entry))
+    }
+
+    @Test
+    fun isNamedLinearTransponder_returnsFalseForDownlinkContainingLinInsideWord() {
+        // "Downlink" contains "lin" but is not a linear-transponder name
+        val downlinkEntry = linearTransponder(info = "Mode U Downlink", downlinkMode = "FM", uplinkMode = "FM")
+        assertFalse(DopplerFrequencyCalculator.isNamedLinearTransponder(downlinkEntry))
+    }
+
     @Test
     fun isNamedLinearTransponder_returnsFalseForFmRepeater() {
         assertFalse(DopplerFrequencyCalculator.isNamedLinearTransponder(fmTransponder()))
     }
 
+    @Test
+    fun deduplicateTransponders_mergesSameFrequencyRange() {
+        // AO-7's Mode A: same range, SSB and CW entries
+        val ssb = linearTransponder(
+            uuid = "ssb-uuid", info = "Mode V/A (A) Lin SSB",
+            downlinkMode = "USB", uplinkMode = "USB"
+        )
+        val cw = linearTransponder(
+            uuid = "cw-uuid", info = "Mode V/A (A) Lin CW",
+            downlinkMode = "CW", uplinkMode = "CW"
+        )
+        val modeB = linearTransponder(
+            uuid = "modeb-uuid", info = "Mode U/V (B) Lin",
+            upLow = 432_125_000L, upHigh = 432_175_000L,
+            downLow = 145_925_000L, downHigh = 145_975_000L,
+            downlinkMode = "USB", uplinkMode = "LSB"
+        )
+        val result = DopplerFrequencyCalculator.deduplicateTransponders(listOf(ssb, cw, modeB))
+        assertEquals(2, result.size)
+        // SSB entry should be preferred over CW (same range)
+        assertEquals("ssb-uuid", result[0].uuid)
+        assertEquals("modeb-uuid", result[1].uuid)
+    }
+
+    @Test
+    fun deduplicateTransponders_prefersNonCwEntry() {
+        // JO-97: CW entry has invert=false (wrong), SSB has invert=true (correct)
+        val cw = linearTransponder(
+            uuid = "cw-uuid", info = "U/V CW Transponder",
+            downlinkMode = "CW", uplinkMode = "CW",
+            upLow = 435_100_000L, upHigh = 435_120_000L,
+            downLow = 145_855_000L, downHigh = 145_875_000L
+        )
+        val ssb = linearTransponder(
+            uuid = "ssb-uuid", info = "U/V SSB Transponder",
+            downlinkMode = "USB", uplinkMode = "LSB",
+            upLow = 435_100_000L, upHigh = 435_120_000L,
+            downLow = 145_855_000L, downHigh = 145_875_000L,
+            inverted = true
+        )
+        val result = DopplerFrequencyCalculator.deduplicateTransponders(listOf(cw, ssb))
+        assertEquals(1, result.size)
+        assertEquals("ssb-uuid", result[0].uuid)
+        // Verify the correct invert flag is preserved
+        assertTrue(result[0].isInverted)
+    }
+
+    @Test
+    fun deduplicateTransponders_preservesUniqueEntries() {
+        val t1 = linearTransponder(uuid = "t1", upLow = 145_000_000L, upHigh = 145_500_000L,
+            downLow = 435_000_000L, downHigh = 435_500_000L)
+        val t2 = linearTransponder(uuid = "t2", upLow = 435_000_000L, upHigh = 435_500_000L,
+            downLow = 145_000_000L, downHigh = 145_500_000L)
+        val result = DopplerFrequencyCalculator.deduplicateTransponders(listOf(t1, t2))
+        assertEquals(2, result.size)
+    }
+
     @Test
     fun computeUplinkFromDownlink_linear_noDoppler() {
         val xpdr = linearTransponder()
         val orbitalPos = pos(0.0)
         val uplink = DopplerFrequencyCalculator.computeUplinkFromDownlink(435_200_000L, xpdr, orbitalPos)
         assertNotNull(uplink)
-        assertTrue(uplink!! > 0)
-        // With zero Doppler, result equals mapDownlinkToUplink output
         assertEquals(145_200_000L, uplink)
     }
 
@@ -95,24 +180,23 @@ class DopplerFrequencyCalculatorTest {
 
     @Test
     fun computeUplinkFromDownlink_withDoppler_positiveRangeRate() {
-        // Satellite receding (positive range rate) → ground must transmit higher freq to compensate
+        // Satellite receding (positive range rate) → ground must transmit higher freq to compensate.
         val xpdr = linearTransponder()
-        val orbitalPos = pos(7.0)  // ~7 km/s receding
+        val orbitalPos = pos(7.0)
         val uplink = DopplerFrequencyCalculator.computeUplinkFromDownlink(435_200_000L, xpdr, orbitalPos)
         assertNotNull(uplink)
-        // Uplink freq should be Doppler shifted UP (compensating for receding)
         assertTrue(uplink!! > 145_200_000L)
     }
 
     @Test
-    fun computeUplinkFromDownlink_fm_transponder_returnsNull() {
+    fun computeUplinkFromDownlink_fmTransponder_returnsNull() {
         val orbitalPos = pos()
         val result = DopplerFrequencyCalculator.computeUplinkFromDownlink(435_600_000L, fmTransponder(), orbitalPos)
         assertNull(result)
     }
 
     @Test
-    fun computeDownlinkFromUplink_fm_transponder_returnsNull() {
+    fun computeDownlinkFromUplink_fmTransponder_returnsNull() {
         val orbitalPos = pos()
         val result = DopplerFrequencyCalculator.computeDownlinkFromUplink(145_900_000L, fmTransponder(), orbitalPos)
         assertNull(result)
@@ -171,13 +255,11 @@ class DopplerFrequencyCalculatorTest {
         val orbitalPos = pos(0.0)
         val uplink = DopplerFrequencyCalculator.computeUplinkFromDownlink(435_200_000L, xpdr, orbitalPos)
         assertNotNull(uplink)
-        // Inverted: offset from high end → maps to high end of uplink
         assertEquals(145_300_000L, uplink)
     }
 
     @Test
     fun computeUplinkFromDownlink_roundTrip() {
-        // downlink → uplink → downlink should round-trip
         val xpdr = linearTransponder()
         val orbitalPos = pos(3.5)
         val originalDownlink = 435_250_000L
@@ -185,7 +267,6 @@ class DopplerFrequencyCalculatorTest {
         assertNotNull(uplink)
         val roundTripDownlink = DopplerFrequencyCalculator.computeDownlinkFromUplink(uplink!!, xpdr, orbitalPos)
         assertNotNull(roundTripDownlink)
-        // Doppler round-trip: small residual due to freq-dependent Doppler
         val error = kotlin.math.abs(roundTripDownlink!! - originalDownlink)
         assertTrue("Round-trip error too large: $error", error < 10000)
     }

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/QthConverterTest.kt

@@ -70,7 +70,9 @@ class QthConverterTest {
     fun `Given boundary POS stays in valid grid`() {
         // antipodal / edge cases must not overflow the A-R / 0-9 / a-x alphabet
         assert(positionToQth(-90.0, -180.0, 8) == "AA00aa00")
-        assert(positionToQth(90.0, 180.0, 8) == "RR00aa00")
+        // Exact positive bounds belong to the final cell, not a modulo-wrapped
+        // R-field/0-square combination that decodes 10°/20° away.
+        assert(positionToQth(90.0, 180.0, 8) == "RR99xx99")
         assert(positionToQth(0.0, 0.0, 8) == "JJ00aa00")
         // roundtrip stability: 8-char roundtrip is stable across a sample of positions
         val positions = listOf(
@@ -85,6 +87,55 @@ class QthConverterTest {
         }
     }
 
+    @Test
+    fun `Encoded locator always decodes back within one cell`() {
+        // An 8-char cell is 30" lon x 15" lat, so a correct encode/decode pair
+        // can never differ by more than that. Field clamping used to break this
+        // near +90 / +180 and produced errors up to 10 deg lat / 20 deg lon.
+        var worstLat = 0.0
+        var worstLon = 0.0
+        var worst = ""
+        var lat = -90.0
+        while (lat <= 90.0) {
+            var lon = -180.0
+            while (lon <= 180.0) {
+                val qth = positionToQth(lat, lon, 8)
+                    ?: error("valid position rejected: ($lat, $lon)")
+                val pos = qthToPosition(qth) ?: error("own output rejected: $qth")
+                val dLat = kotlin.math.abs(pos.latitude - lat)
+                val dLon = kotlin.math.abs(pos.longitude - lon)
+                if (dLat > worstLat || dLon > worstLon) {
+                    worstLat = maxOf(worstLat, dLat)
+                    worstLon = maxOf(worstLon, dLon)
+                    worst = "($lat, $lon) -> $qth -> (${pos.latitude}, ${pos.longitude})"
+                }
+                lon += 0.5
+            }
+            lat += 0.5
+        }
+        assert(worstLat <= 0.01 && worstLon <= 0.01) {
+            "roundtrip drifted by (${worstLat}, ${worstLon}) deg, worst: $worst"
+        }
+    }
+
+    @Test
+    fun `Given out of range longitude returns null`() {
+        // Maidenhead only covers -180..180; 181..360 used to be accepted and
+        // encoded into a plausible-looking locator 20-200 deg away.
+        assert(positionToQth(0.0, 181.0) == null)
+        assert(positionToQth(0.0, 270.0) == null)
+        assert(positionToQth(0.0, 360.0) == null)
+    }
+
+    @Test
+    fun `Given locator with out of range field returns null`() {
+        // Fields run A-R; S-X in the first pair decoded past the poles.
+        assert(qthToPosition("SS00aa") == null)
+        assert(qthToPosition("XX99xx") == null)
+        assert(qthToPosition("AS00aa") == null)
+        assert(qthToPosition("AX99xx") == null)
+    }
+
     @Test
     fun `Given square returns correct 3x3 neighbors`() {
         // Reference grid from the QTH Locator screenshot: OL42

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/aprs/AprsPacketLocaleTest.kt

@@ -0,0 +1,91 @@
+package com.rtbishop.look4sat.core.domain.aprs
+
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import java.util.Locale
+
+/**
+ * APRS-IS is an ASCII line protocol. Formatting the position, altitude and
+ * course/speed extensions with the JVM default locale produced Eastern Arabic
+ * or Bengali digits on devices set to ar/fa/bn, and the server rejects those
+ * packets.
+ *
+ * Regression guard: every formatted field must stay ASCII regardless of the
+ * default locale.
+ */
+class AprsPacketLocaleTest {
+
+    private val original: Locale = Locale.getDefault()
+
+    @After
+    fun restoreLocale() {
+        Locale.setDefault(original)
+    }
+
+    private val asciiPacket = Regex("^[\\x20-\\x7E]*$")
+
+    @Test
+    fun position_staysAsciiUnderArabicLocale() {
+        Locale.setDefault(Locale.forLanguageTag("ar-EG"))
+
+        val encoded = AprsPosition(39.9042, 116.4074, '/', '>').toUncompressedString()
+
+        assertTrue("not ASCII: $encoded", asciiPacket.matches(encoded))
+        assertEquals("3954.25N/11624.44E>", encoded)
+    }
+
+    @Test
+    fun position_staysAsciiUnderBengaliLocale() {
+        Locale.setDefault(Locale.forLanguageTag("bn-BD"))
+
+        val encoded = AprsPosition(-33.8688, 151.2093, '/', '>').toUncompressedString()
+
+        assertTrue("not ASCII: $encoded", asciiPacket.matches(encoded))
+        assertEquals("3352.13S/15112.56E>", encoded)
+    }
+
+    @Test
+    fun altitudeAndCourseSpeed_stayAsciiUnderPersianLocale() {
+        Locale.setDefault(Locale.forLanguageTag("fa-IR"))
+
+        val altitude = AprsPacket.formatAltitude(100.0)
+        val courseSpeed = AprsPacket.formatCourseSpeed(10.0, 90f)
+        val filter = AprsPacket.formatRangeFilter(39.9042, 116.4074, 100)
+
+        assertTrue("not ASCII: $altitude", asciiPacket.matches(altitude))
+        assertTrue("not ASCII: $courseSpeed", asciiPacket.matches(courseSpeed))
+        assertTrue("not ASCII: $filter", asciiPacket.matches(filter))
+        assertEquals("/A=000328", altitude)
+        assertEquals("/090/019", courseSpeed)
+        assertEquals("r/39.904/116.407/100", filter)
+    }
+
+    @Test
+    fun altitude_clampsNegativeToKeepSixDigitField() {
+        // "%06d" of a negative value yields "/A=-00164": the '-' takes a digit
+        // slot, so the extension is no longer a valid fixed-width field.
+        assertEquals("/A=000000", AprsPacket.formatAltitude(-50.0))
+        assertEquals("/A=000000", AprsPacket.formatAltitude(-1.0))
+        assertEquals("/A=000328", AprsPacket.formatAltitude(100.0))
+    }
+
+    @Test
+    fun courseSpeed_wrapsCourseIntoValidRange() {
+        assertEquals("/000/019", AprsPacket.formatCourseSpeed(10.0, 360f))
+        assertEquals("/359/019", AprsPacket.formatCourseSpeed(10.0, -1f))
+        assertEquals("/090/019", AprsPacket.formatCourseSpeed(10.0, 90f))
+    }
+
+    @Test
+    fun ambiguousPosition_staysAsciiUnderArabicLocale() {
+        Locale.setDefault(Locale.forLanguageTag("ar-EG"))
+
+        for (ambiguity in 1..4) {
+            val encoded = AprsPosition(39.9042, 116.4074, '/', '>', ambiguity)
+                .toUncompressedString()
+            assertTrue("ambiguity=$ambiguity not ASCII: $encoded", asciiPacket.matches(encoded))
+        }
+    }
+}

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/cw/CwCtcDecoderTest.kt

@@ -0,0 +1,90 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.domain.cw
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+/**
+ * Greedy CTC collapse, matching the reference implementation's
+ * `greedy_ctc_decode`: drop blanks, then drop runs of the same label.
+ *
+ * Alphabet from `model.onnx.json` — 41 symbols plus blank at index 41.
+ */
+class CwCtcDecoderTest {
+
+    private val chars = listOf(
+        ",", ".", "/", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "?",
+        "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N",
+        "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", " "
+    )
+    private val blank = 41
+
+    /** Build a `[1, T, 42]` log-prob tensor whose argmax follows [path]. */
+    private fun logits(path: IntArray): Array<Array<FloatArray>> {
+        val frames = Array(path.size) { t ->
+            FloatArray(42) { -10f }.also { it[path[t]] = 0f }
+        }
+        return arrayOf(frames)
+    }
+
+    @Test
+    fun alphabetSizeMatchesModelMetadata() {
+        assertEquals("41 symbols + blank = 42 classes", 41, chars.size)
+    }
+
+    @Test
+    fun greedy_dropsRunsOfTheSameLabel() {
+        assertEquals("A", CwCtcDecoder.greedy(logits(intArrayOf(14, 14, 14)), chars, blank))
+    }
+
+    @Test
+    fun greedy_keepsRepeatsSeparatedByBlank() {
+        // A A <blank> A collapses to "AA": the blank breaks the run.
+        assertEquals("AA", CwCtcDecoder.greedy(logits(intArrayOf(14, 14, blank, 14)), chars, blank))
+    }
+
+    @Test
+    fun greedy_allBlanksYieldEmptyString() {
+        assertEquals("", CwCtcDecoder.greedy(logits(intArrayOf(blank, blank, blank)), chars, blank))
+    }
+
+    @Test
+    fun greedy_emptyInputYieldsEmptyString() {
+        assertEquals("", CwCtcDecoder.greedy(logits(intArrayOf()), chars, blank))
+    }
+
+    @Test
+    fun greedy_decodesCallsignWithSpaceAndDigits() {
+        // "CQ BG7" — C=16 Q=30 space=40 B=15 G=20 7=10
+        val path = intArrayOf(
+            blank, 16, 16, blank, 30, blank, 40,
+            15, blank, 20, blank, 10, blank
+        )
+        assertEquals("CQ BG7", CwCtcDecoder.greedy(logits(path), chars, blank))
+    }
+
+    @Test
+    fun greedy_picksHighestScoringClassPerFrame() {
+        // Frame favours S (32) over T (33); only S must survive.
+        val frame = FloatArray(42) { -10f }
+        frame[33] = -1f
+        frame[32] = -0.1f
+        assertEquals("S", CwCtcDecoder.greedy(arrayOf(arrayOf(frame)), chars, blank))
+    }
+}

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/cw/CwDecoderTest.kt

@@ -1,301 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import org.junit.Assert.*
-import org.junit.Test
-import kotlin.math.PI
-import kotlin.math.sin
-
-class CwDecoderTest {
-
-    // --- Morse table ---
-
-    @Test
-    fun morseToChar_basicLetters() {
-        assertEquals('A', CwBayesianDecoder.morseToChar("01"))
-        assertEquals('S', CwBayesianDecoder.morseToChar("000"))
-        assertEquals('O', CwBayesianDecoder.morseToChar("111"))
-    }
-
-    @Test
-    fun morseToChar_numbers() {
-        assertEquals('1', CwBayesianDecoder.morseToChar("01111"))
-        assertEquals('0', CwBayesianDecoder.morseToChar("11111"))
-    }
-
-    @Test
-    fun morseToChar_unknown_returnsNull() {
-        assertNull(CwBayesianDecoder.morseToChar("......."))
-        assertNull(CwBayesianDecoder.morseToChar(""))
-    }
-
-    // --- FFT ---
-
-    @Test
-    fun fft_magnitudeSpectrum_detectsTone() {
-        val fft = CwFFT(256)
-        val sampleRate = 8000f
-        val freq = 700f
-        val buffer = FloatArray(256) { (sin(2.0 * PI * freq * it / sampleRate)).toFloat() }
-        val mag = fft.magnitudeSpectrum(buffer)
-        // Peak should be at bin around 700 * 256 / 8000 ≈ 22.4
-        var maxBin = 0
-        var maxVal = 0f
-        for (i in mag.indices) {
-            if (mag[i] > maxVal) { maxVal = mag[i]; maxBin = i }
-        }
-        assertTrue("Peak bin $maxBin should be near 22", maxBin in 18..26)
-        assertTrue("Peak value $maxVal should be positive", maxVal > 0.01f)
-    }
-
-    @Test
-    fun fft_magnitudeSpectrum_silence_isFlat() {
-        val fft = CwFFT(256)
-        val buffer = FloatArray(256) { 0f }
-        val mag = fft.magnitudeSpectrum(buffer)
-        for (v in mag) assertEquals("Silence spectrum should be 0, got $v", 0f, v, 1e-6f)
-    }
-
-    @Test
-    fun fft_rejectsWrongSize() {
-        assertThrows(IllegalArgumentException::class.java) { CwFFT(100) }
-    }
-
-    // --- Spectrogram ---
-
-    @Test
-    fun spectrogram_addSamples_updatesEnergy() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        val freq = 700f
-        // Feed multiple frames to stabilize energy normalization
-        for (i in 0..5) {
-            val buffer = FloatArray(256) { (sin(2.0 * PI * freq * it / 8000.0)).toFloat() }
-            spec.addSamples(buffer)
-        }
-        val col = spec.getCurrentColumn()
-        val peakBin = spec.findPeakBin()
-        assertTrue("Peak bin $peakBin should be >= 0", peakBin >= 0)
-    }
-
-    @Test
-    fun spectrogram_findPeakBin_returnsValidBin() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        // Add multiple frames of 700 Hz tone
-        for (i in 0..5) {
-            val buffer = FloatArray(256) { (sin(2.0 * PI * 700.0 * it / 8000.0)).toFloat() }
-            spec.addSamples(buffer)
-        }
-        val peakBin = spec.findPeakBin()
-        assertTrue("Peak bin should be >= 0, got $peakBin", peakBin >= 0)
-    }
-
-    @Test
-    fun spectrogram_freqToBin_roundtrip() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        val freq = 700f
-        val bin = spec.freqToBin(freq)
-        val backFreq = spec.binToFreq(bin)
-        assertTrue("Freq $freq → bin $bin → freq $backFreq", backFreq > 600f && backFreq < 800f)
-    }
-
-    @Test
-    fun spectrogram_getBinEnergy_returnsCorrectLength() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        val energy = spec.getBinEnergy(0, 10)
-        assertEquals(10, energy.size)
-    }
-
-    @Test
-    fun spectrogram_reset() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        spec.addSamples(FloatArray(256) { 1f })
-        spec.reset()
-        assertEquals(-1, spec.findPeakBin())
-    }
-
-    // --- Bayesian decoder ---
-
-    @Test
-    fun bayesian_processTone_dit() {
-        val decoder = CwBayesianDecoder()
-        // At 20 WPM, dot = 60 ms
-        val result = decoder.processTone(60f)
-        assertEquals('0', result.symbol)
-        assertTrue("Dit probability should be positive", result.probability > 0.1f)
-    }
-
-    @Test
-    fun bayesian_processTone_dash() {
-        val decoder = CwBayesianDecoder()
-        // Dash = 3 * dot = 180 ms
-        val result = decoder.processTone(180f)
-        assertEquals('1', result.symbol)
-        assertTrue("Dash probability should be positive", result.probability > 0.1f)
-    }
-
-    @Test
-    fun bayesian_processTone_unknown_returnsNull() {
-        val decoder = CwBayesianDecoder()
-        // Very long tone — low probability for both dit and dash
-        val result = decoder.processTone(5000f)
-        assertNull(result.symbol)
-    }
-
-    @Test
-    fun bayesian_processGap_interChar_returnsChar() {
-        val decoder = CwBayesianDecoder()
-        decoder.processTone(60f) // dit
-        decoder.processTone(60f) // dit
-        decoder.processTone(60f) // dit
-        // 3 dots = "000" = 'S'
-        val char = decoder.processGap(180f) // 3 * dot = inter-char gap
-        assertEquals('S', char)
-    }
-
-    @Test
-    fun bayesian_processGap_wordGap_addsSpace() {
-        val decoder = CwBayesianDecoder()
-        decoder.processTone(60f) // dit = 'E'
-        decoder.processGap(180f) // inter-char gap
-        // Now word gap
-        val space = decoder.processGap(420f) // 7 * dot
-        assertEquals(' ', space)
-    }
-
-    @Test
-    fun bayesian_decodedText_accumulates() {
-        val decoder = CwBayesianDecoder()
-        decoder.processTone(60f) // dit = 'E'
-        decoder.processGap(180f) // inter-char
-        assertTrue(decoder.decodedText.isNotEmpty())
-    }
-
-    @Test
-    fun bayesian_reset() {
-        val decoder = CwBayesianDecoder()
-        decoder.processTone(60f)
-        decoder.reset()
-        assertEquals("", decoder.decodedText)
-    }
-
-    @Test
-    fun bayesian_getSpeed() {
-        val decoder = CwBayesianDecoder()
-        // Send 3 dits at 20 WPM (60 ms each)
-        decoder.processTone(60f)
-        decoder.processTone(60f)
-        decoder.processTone(60f)
-        val speed = decoder.getSpeed()
-        assertTrue("Speed should be ~20 WPM, got $speed", speed > 15f && speed < 30f)
-    }
-
-    // --- Channel tracker ---
-
-    @Test
-    fun channelTracker_initialState() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        val tracker = CwChannelTracker(spec)
-        val channels = tracker.update()
-        assertTrue("No channels should be active initially", channels.isEmpty())
-    }
-
-    @Test
-    fun channelTracker_detectsTone() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        // Feed a tone
-        for (i in 0..5) {
-            spec.addSamples(FloatArray(256) { (sin(2.0 * PI * 700.0 * it / 8000.0)).toFloat() })
-        }
-        val tracker = CwChannelTracker(spec)
-        val channels = tracker.update()
-        assertTrue("Should detect at least 1 channel", channels.isNotEmpty())
-    }
-
-    @Test
-    fun channelTracker_bestChannel() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        for (i in 0..5) {
-            spec.addSamples(FloatArray(256) { (sin(2.0 * PI * 700.0 * it / 8000.0)).toFloat() })
-        }
-        val tracker = CwChannelTracker(spec)
-        tracker.update()
-        val best = tracker.getBestChannel()
-        assertNotNull("Best channel should exist", best)
-        if (best != null) assertTrue(best.frequency in 600f..800f)
-    }
-
-    @Test
-    fun channelTracker_reset() {
-        val spec = CwSpectrogram(sampleRate = 8000)
-        for (i in 0..5) {
-            spec.addSamples(FloatArray(256) { (sin(2.0 * PI * 700.0 * it / 8000.0)).toFloat() })
-        }
-        val tracker = CwChannelTracker(spec)
-        tracker.update()
-        tracker.reset()
-        assertNull(tracker.getBestChannel())
-    }
-
-    // --- Full decoder ---
-
-    @Test
-    fun decoder_initialState() {
-        val decoder = CwDecoder()
-        assertEquals("", decoder.decodedTextFlow.value)
-        assertEquals(0f, decoder.signalStrength.value, 0.001f)
-    }
-
-    @Test
-    fun decoder_processSilence_doesNotCrash() {
-        val decoder = CwDecoder()
-        decoder.processBuffer(FloatArray(256) { 0f })
-        assertEquals("", decoder.decodedTextFlow.value)
-    }
-
-    @Test
-    fun decoder_processNoise_doesNotCrash() {
-        val decoder = CwDecoder()
-        decoder.processBuffer(FloatArray(256) { (Math.random() * 2 - 1).toFloat() * 0.1f })
-        assertNotNull(decoder.decodedTextFlow.value)
-    }
-
-    @Test
-    fun decoder_processTone_doesNotCrash() {
-        val decoder = CwDecoder()
-        for (i in 0..20) {
-            decoder.processBuffer(FloatArray(256) { (sin(2.0 * PI * 700.0 * it / 8000.0)).toFloat() })
-        }
-        assertNotNull(decoder.decodedTextFlow.value)
-    }
-
-    @Test
-    fun decoder_reset() {
-        val decoder = CwDecoder()
-        decoder.processBuffer(FloatArray(256) { 1f })
-        decoder.resetDecoder()
-        assertEquals("", decoder.decodedTextFlow.value)
-        assertEquals(0f, decoder.signalStrength.value, 0.001f)
-    }
-
-    @Test
-    fun decoder_withFixedPitch() {
-        val decoder = CwDecoder(sampleRate = 8000, cwToneFreq = 700f)
-        assertEquals(700f, decoder.estimatedPitch.value)
-    }
-}

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/cw/CwDeepBufferTest.kt

@@ -0,0 +1,152 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.domain.cw
+
+import org.junit.Assert.assertArrayEquals
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+/**
+ * The rolling audio buffer feeding DeepCW.
+ *
+ * DeepCW is a whole-segment CTC model, not a sample-by-sample decoder: it
+ * rewrites earlier output whenever more context arrives, so incremental
+ * stitching is impossible. Instead we keep a bounded window and re-decode all
+ * of it periodically, replacing the displayed text.
+ */
+class CwDeepBufferTest {
+
+    @Test
+    fun capacityIsCappedAtMaxSeconds() {
+        val buffer = CwDeepBuffer(sampleRate = 3200, maxSeconds = 20.0)
+        repeat(30) { buffer.append(FloatArray(3200)) }
+        assertEquals(3200 * 20, buffer.size)
+    }
+
+    @Test
+    fun oldestSamplesAreDiscardedFirst() {
+        val buffer = CwDeepBuffer(sampleRate = 4, maxSeconds = 1.0)
+        buffer.append(floatArrayOf(1f, 2f, 3f))
+        buffer.append(floatArrayOf(4f, 5f))
+        assertArrayEquals(floatArrayOf(2f, 3f, 4f, 5f), buffer.snapshot(), 0f)
+    }
+
+    @Test
+    fun snapshotIsChronologicalAfterWrapAround() {
+        val buffer = CwDeepBuffer(sampleRate = 4, maxSeconds = 1.0)
+        buffer.append(floatArrayOf(1f, 2f, 3f, 4f, 5f, 6f))
+        assertArrayEquals(floatArrayOf(3f, 4f, 5f, 6f), buffer.snapshot(), 0f)
+    }
+
+    @Test
+    fun appendLargerThanCapacityKeepsOnlyTheTail() {
+        val buffer = CwDeepBuffer(sampleRate = 4, maxSeconds = 1.0)
+        buffer.append(floatArrayOf(1f, 2f, 3f, 4f, 5f, 6f, 7f, 8f, 9f))
+        assertEquals(4, buffer.size)
+        assertArrayEquals(floatArrayOf(6f, 7f, 8f, 9f), buffer.snapshot(), 0f)
+    }
+
+    @Test
+    fun redecodeIsSignalledOncePerInterval() {
+        // 1.5 s at 3200 Hz is 4800 samples; 1600 samples is 0.5 s.
+        val buffer = CwDeepBuffer(3200, 20.0, redecodeIntervalMs = 1500)
+        assertFalse("1.0s elapsed: interval not reached", buffer.append(FloatArray(3200)))
+        assertTrue("1.5s elapsed: first trigger", buffer.append(FloatArray(1600)))
+        assertFalse("2.0s: only 0.5s since trigger", buffer.append(FloatArray(1600)))
+        assertFalse("2.5s: only 1.0s since trigger", buffer.append(FloatArray(1600)))
+        assertTrue("3.0s: 1.5s since trigger, fires again", buffer.append(FloatArray(1600)))
+    }
+
+    @Test
+    fun redecodeIntervalDoesNotDriftOverManyChunks() {
+        // 100 ms chunks, as AudioCapture emits them: exactly 15 chunks per
+        // 1.5 s interval, so 150 chunks must fire exactly 10 times.
+        val buffer = CwDeepBuffer(3200, 20.0, redecodeIntervalMs = 1500)
+        var fired = 0
+        repeat(150) { if (buffer.append(FloatArray(320))) fired++ }
+        assertEquals(10, fired)
+    }
+
+    @Test
+    fun snapshotDoesNotAliasInternalStorage() {
+        val buffer = CwDeepBuffer(sampleRate = 4, maxSeconds = 1.0)
+        buffer.append(floatArrayOf(1f, 2f, 3f, 4f))
+        buffer.snapshot()[0] = 99f
+        assertEquals("caller must not be able to mutate the buffer", 1f, buffer.snapshot()[0], 0f)
+    }
+
+    @Test
+    fun resetClearsSamplesAndIntervalCounter() {
+        val buffer = CwDeepBuffer(3200, 20.0, redecodeIntervalMs = 1500)
+        buffer.append(FloatArray(3200))
+        buffer.reset()
+        assertEquals(0, buffer.size)
+        assertFalse("counter restarted, 1.0s must not trigger", buffer.append(FloatArray(3200)))
+    }
+
+    @Test
+    fun hasEnoughAudioTracksTheModelMinimum() {
+        // compute() needs at least FFT_LENGTH samples to produce one frame.
+        val buffer = CwDeepBuffer(3200, 20.0)
+        buffer.append(FloatArray(100))
+        assertFalse(buffer.hasEnoughAudio)
+        buffer.append(FloatArray(200))
+        assertTrue(buffer.hasEnoughAudio)
+    }
+
+    @Test
+    fun defaultsMatchTheMeasuredOptimum() {
+        // 20s / 1.5s were chosen from measurements: 20s is the smallest window
+        // reaching 0.0% CER, and keeps inference well inside real time.
+        val buffer = CwDeepBuffer()
+        assertEquals(CwDeepSpectrogram.SAMPLE_RATE * 20, buffer.capacity)
+    }
+
+    @Test
+    fun overflowCollectsEvictedSamplesInOrder() {
+        val buffer = CwDeepBuffer(sampleRate = 4, maxSeconds = 1.0) // capacity 4
+        buffer.append(floatArrayOf(1f, 2f, 3f, 4f))
+        assertEquals("nothing evicted before the window is full", 0, buffer.overflowCount)
+        buffer.append(floatArrayOf(5f, 6f)) // overwrites 1, 2
+        assertArrayEquals("evicted samples, oldest first", floatArrayOf(1f, 2f), buffer.drainOverflow(), 0f)
+        assertArrayEquals("live window still correct", floatArrayOf(3f, 4f, 5f, 6f), buffer.snapshot(), 0f)
+    }
+
+    @Test
+    fun drainOverflowClearsItself() {
+        val buffer = CwDeepBuffer(sampleRate = 4, maxSeconds = 1.0)
+        buffer.append(floatArrayOf(1f, 2f, 3f, 4f))
+        buffer.append(floatArrayOf(5f))
+        assertEquals(1, buffer.overflowCount)
+        buffer.drainOverflow()
+        assertEquals(0, buffer.overflowCount)
+        assertArrayEquals(FloatArray(0), buffer.drainOverflow(), 0f)
+    }
+
+    @Test
+    fun resetClearsOverflow() {
+        val buffer = CwDeepBuffer(sampleRate = 4, maxSeconds = 1.0)
+        buffer.append(floatArrayOf(1f, 2f, 3f, 4f))
+        buffer.append(floatArrayOf(5f))
+        assertEquals(1, buffer.overflowCount)
+        buffer.reset()
+        assertEquals(0, buffer.overflowCount)
+    }
+}

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/cw/CwDeepGoldenVectorTest.kt

@@ -0,0 +1,130 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.domain.cw
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import kotlin.math.PI
+import kotlin.math.abs
+import kotlin.math.sin
+
+/**
+ * Pins the Kotlin front-end to the upstream Python reference implementation.
+ *
+ * `golden_spec.txt` was produced by deepcw-engine's own preprocessing code
+ * (numpy reflect padding, `np.hanning(N+1)[:-1]`, `np.fft.rfft`, `log1p`) over
+ * the audio [generateTestAudio] builds. Both sides synthesise the audio from
+ * the same deterministic formula, so only the spectrogram needs pinning.
+ *
+ * A mismatch here means the model would receive subtly wrong input and emit
+ * plausible-looking garbage, which is very hard to diagnose downstream — so
+ * this test guards the whole pipeline.
+ *
+ * Regenerate with `scripts/deepcw_gen_golden.py` from the skill library if the
+ * model metadata ever changes.
+ */
+class CwDeepGoldenVectorTest {
+
+    private companion object {
+        const val SRC_RATE = 8000
+        const val TONE_HZ = 700.0
+        const val AMPLITUDE = 0.6
+        const val DOT_SAMPLES = 480      // 20 WPM at 8000 Hz: 1.2/20*8000
+        const val PATTERN = "-.-."       // the letter C
+        const val TOLERANCE = 1e-4f
+    }
+
+    /** Square-keyed 700 Hz tone: 4 dots of silence, "C", 4 dots of silence. */
+    private fun generateTestAudio(): FloatArray {
+        val keying = ArrayList<Int>()
+        repeat(4 * DOT_SAMPLES) { keying.add(0) }
+        for ((i, element) in PATTERN.withIndex()) {
+            val length = if (element == '-') 3 * DOT_SAMPLES else DOT_SAMPLES
+            repeat(length) { keying.add(1) }
+            if (i < PATTERN.length - 1) repeat(DOT_SAMPLES) { keying.add(0) }
+        }
+        repeat(4 * DOT_SAMPLES) { keying.add(0) }
+
+        return FloatArray(keying.size) { i ->
+            if (keying[i] == 1) {
+                (AMPLITUDE * sin(2.0 * PI * TONE_HZ * i / SRC_RATE)).toFloat()
+            } else {
+                0f
+            }
+        }
+    }
+
+    private fun readGoldenSpectrogram(): Array<FloatArray> {
+        val stream = javaClass.classLoader?.getResourceAsStream("cw/golden_spec.txt")
+            ?: throw IllegalStateException("cw/golden_spec.txt missing from test resources")
+        stream.bufferedReader().use { reader ->
+            val (frames, bins) = reader.readLine().trim().split(" ").map(String::toInt)
+            return Array(frames) {
+                val row = reader.readLine().trim().split(" ")
+                require(row.size == bins) { "expected $bins values, got ${row.size}" }
+                FloatArray(bins) { i -> row[i].toFloat() }
+            }
+        }
+    }
+
+    @Test
+    fun spectrogramMatchesPythonReferenceFrameByFrame() {
+        val expected = readGoldenSpectrogram()
+        val audio = CwDeepSpectrogram.resampleLinear(
+            generateTestAudio(), SRC_RATE, CwDeepSpectrogram.SAMPLE_RATE
+        )
+        val actual = CwDeepSpectrogram.compute(audio)
+
+        assertEquals("frame count", expected.size, actual.size)
+        assertEquals("bin count", expected[0].size, actual[0].size)
+
+        var worstDelta = 0f
+        var worstAt = ""
+        for (t in expected.indices) {
+            for (f in expected[t].indices) {
+                val delta = abs(expected[t][f] - actual[t][f])
+                if (delta > worstDelta) {
+                    worstDelta = delta
+                    worstAt = "frame $t bin $f: expected ${expected[t][f]}, got ${actual[t][f]}"
+                }
+            }
+        }
+        assertTrue(
+            "front-end diverges from the Python reference — worst delta $worstDelta at $worstAt",
+            worstDelta <= TOLERANCE
+        )
+    }
+
+    @Test
+    fun resampledLengthMatchesReference() {
+        val audio = generateTestAudio()
+        assertEquals("source audio length", 9120, audio.size)
+        val resampled = CwDeepSpectrogram.resampleLinear(
+            audio, SRC_RATE, CwDeepSpectrogram.SAMPLE_RATE
+        )
+        assertEquals("resampled length", 3648, resampled.size)
+    }
+
+    @Test
+    fun goldenVectorHasExpectedShape() {
+        val golden = readGoldenSpectrogram()
+        assertEquals("frames", 77, golden.size)
+        assertEquals("bins", CwDeepSpectrogram.FREQUENCY_BINS, golden[0].size)
+    }
+}

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/cw/CwDeepSpectrogramTest.kt

@@ -0,0 +1,110 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.domain.cw
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import kotlin.math.PI
+import kotlin.math.abs
+import kotlin.math.sin
+
+/**
+ * Verifies the DeepCW front-end against the upstream Python reference
+ * implementation (deepcw-engine examples/python/decode_morse.py).
+ *
+ * Model metadata: sampleRate 3200, fftLength 256, hopLength 48,
+ * 400-1200 Hz -> 65 bins, log1p normalization.
+ */
+class CwDeepSpectrogramTest {
+
+    @Test
+    fun frequencyBinRange_matchesModelMetadata() {
+        // binHz = 3200/256 = 12.5; start = ceil(400/12.5) = 32; stop = floor(1200/12.5)+1 = 97
+        val (start, stop) = CwDeepSpectrogram.frequencyBinRange(3200, 256, 400.0, 1200.0)
+        assertEquals(32, start)
+        assertEquals(97, stop)
+        assertEquals("metadata declares 65 frequency bins", 65, stop - start)
+    }
+
+    @Test
+    fun compute_producesTimeBy65Matrix() {
+        // 1 second at 3200 Hz. Reflect padding adds fft/2 on both sides,
+        // so frames = 1 + (3200 + 256 - 256)/48 = 1 + 66 = 67
+        val spec = CwDeepSpectrogram.compute(FloatArray(3200))
+        assertEquals(67, spec.size)
+        assertEquals(65, spec[0].size)
+    }
+
+    @Test
+    fun compute_toneLandsInExpectedBin() {
+        // 700 Hz -> absolute bin 700/12.5 = 56 -> relative index 56 - 32 = 24
+        val audio = FloatArray(3200) { (0.6 * sin(2.0 * PI * 700.0 * it / 3200.0)).toFloat() }
+        val spec = CwDeepSpectrogram.compute(audio)
+        val middle = spec[spec.size / 2]
+        val peak = middle.indices.maxByOrNull { middle[it] } ?: -1
+        assertTrue("peak at index $peak, expected near 24", abs(peak - 24) <= 1)
+    }
+
+    @Test
+    fun compute_appliesLog1pSoValuesAreNonNegative() {
+        val audio = FloatArray(3200) { (0.6 * sin(2.0 * PI * 700.0 * it / 3200.0)).toFloat() }
+        val spec = CwDeepSpectrogram.compute(audio)
+        for (frame in spec) {
+            for (v in frame) {
+                assertTrue("log1p of a magnitude must be >= 0, got $v", v >= 0f)
+            }
+        }
+    }
+
+    @Test
+    fun resampleLinear_convertsRateAndLength() {
+        assertEquals(3200, CwDeepSpectrogram.resampleLinear(FloatArray(8000), 8000, 3200).size)
+        assertEquals(3200, CwDeepSpectrogram.resampleLinear(FloatArray(44100), 44100, 3200).size)
+    }
+
+    @Test
+    fun resampleLinear_sameRateIsIdentity() {
+        val input = floatArrayOf(0.1f, 0.2f, 0.3f)
+        val out = CwDeepSpectrogram.resampleLinear(input, 3200, 3200)
+        assertEquals(3, out.size)
+        assertEquals(0.2f, out[1], 1e-6f)
+    }
+
+    @Test
+    fun resampleLinear_preservesToneFrequency() {
+        // A 700 Hz tone sampled at 8000 Hz must still peak at bin 24 after
+        // resampling to 3200 Hz — this is the path real microphone audio takes.
+        val at8k = FloatArray(8000) { (0.6 * sin(2.0 * PI * 700.0 * it / 8000.0)).toFloat() }
+        val at3200 = CwDeepSpectrogram.resampleLinear(at8k, 8000, 3200)
+        val spec = CwDeepSpectrogram.compute(at3200)
+        val middle = spec[spec.size / 2]
+        val peak = middle.indices.maxByOrNull { middle[it] } ?: -1
+        assertTrue("resampled tone peak at $peak, expected near 24", abs(peak - 24) <= 1)
+    }
+
+    @Test
+    fun compute_rejectsAudioShorterThanFftLength() {
+        try {
+            CwDeepSpectrogram.compute(FloatArray(100))
+            throw AssertionError("expected an exception for audio shorter than fftLength")
+        } catch (expected: IllegalArgumentException) {
+            // desired path
+        }
+    }
+}

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/cw/CwFldigiDecoderTest.kt

@@ -1,149 +0,0 @@
-/*
- * Look4Sat. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2019-2026 Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.domain.cw
-
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import kotlin.math.PI
-import kotlin.math.sin
-
-/**
- * Tests for the fldigi-ported CW decoder. Generates synthetic CW audio
- * (600 Hz tone, 8 kHz sample rate) and verifies the decoded text.
- */
-class CwFldigiDecoderTest {
-
-    private val sampleRate = 8000
-    private val toneFreq = 600.0
-
-    /** Synthesize a CW audio buffer for a dot-dash pattern at given WPM. */
-    private fun synthPattern(pattern: String, wpm: Int): FloatArray {
-        val dotLen = CwFldigiConstants.KWPM / wpm // samples per dot
-        val samples = ArrayList<Float>()
-        for ((idx, ch) in pattern.withIndex()) {
-            val len = if (ch == '.') dotLen else 3 * dotLen
-            for (i in 0 until len) {
-                val t = i.toDouble() / sampleRate
-                samples.add((0.6 * sin(2.0 * PI * toneFreq * t)).toFloat())
-            }
-            if (idx < pattern.length - 1) {
-                for (i in 0 until dotLen) samples.add(0f) // intra-char gap
-            }
-        }
-        return samples.toFloatArray()
-    }
-
-    /** Append an inter-character gap (3 dot lengths) of silence. */
-    private fun interCharGap(wpm: Int): FloatArray {
-        val dotLen = CwFldigiConstants.KWPM / wpm
-        return FloatArray(3 * dotLen)
-    }
-
-    private fun decodeSequence(chars: List<String>, wpm: Int, useSom: Boolean = true): String {
-        val decoder = CwFldigiDecoder(sampleRate = sampleRate, frequency = toneFreq, useSom = useSom)
-        val dotLen = CwFldigiConstants.KWPM / wpm
-        for ((ci, pattern) in chars.withIndex()) {
-            decoder.processBuffer(synthPattern(pattern, wpm))
-            decoder.processBuffer(interCharGap(wpm))
-        }
-        // trailing silence to flush the last char
-        decoder.processBuffer(FloatArray(8 * dotLen))
-        return decoder.decodedTextFlow.value
-    }
-
-    @Test
-    fun decode_basicLetter_singleDot() {
-        val decoder = CwFldigiDecoder(sampleRate = sampleRate, frequency = toneFreq)
-        decoder.processBuffer(synthPattern(".", 18))
-        decoder.processBuffer(FloatArray(8 * CwFldigiConstants.KWPM / 18))
-        assertTrue("expected E in output, got: ${decoder.decodedTextFlow.value}",
-            decoder.decodedTextFlow.value.startsWith("E"))
-    }
-
-    @Test
-    fun decode_word_CQ_18wpm() {
-        val text = decodeSequence(listOf("-.-.", "--.-"), 18)
-        assertTrue("expected CQ in output, got: $text", text.contains("C") && text.contains("Q"))
-    }
-
-    @Test
-    fun decode_hello_20wpm() {
-        val text = decodeSequence(listOf("....", ".", ".-..", ".-..", "---"), 20)
-        assertTrue("expected HELLO in output, got: $text", text.contains("H"))
-    }
-
-    @Test
-    fun decode_adaptive_speed_30wpm() {
-        // Realistic usage: decoder configured near the signal speed, tracking
-        // fine-tunes from there. Verify correct decode at 30 wpm.
-        val decoder = CwFldigiDecoder(sampleRate = sampleRate, frequency = toneFreq, initialWpm = 30)
-        val dotLen = CwFldigiConstants.KWPM / 30
-        for (pattern in listOf(".-", "-...", "-.-.", "-..", ".", "..-.", "--.", "....", "..", ".---")) {
-            decoder.processBuffer(synthPattern(pattern, 30))
-            decoder.processBuffer(interCharGap(30))
-        }
-        decoder.processBuffer(FloatArray(8 * dotLen))
-        val text = decoder.decodedTextFlow.value
-        // First char may be off while tracking converges; rest must be exact.
-        assertTrue("expected B-J at 30wpm, got: $text", text.contains("B") && text.contains("J"))
-    }
-
-    @Test
-    fun reset_clearsState() {
-        val decoder = CwFldigiDecoder(sampleRate = sampleRate, frequency = toneFreq)
-        decoder.processBuffer(synthPattern(".", 18))
-        decoder.processBuffer(FloatArray(8 * CwFldigiConstants.KWPM / 18))
-        decoder.resetDecoder()
-        assertEquals("", decoder.decodedTextFlow.value)
-    }
-
-    @Test
-    fun morseTable_lookup() {
-        assertEquals("A", MorseTable.rxLookup(".-"))
-        assertEquals("S", MorseTable.rxLookup("..."))
-        assertEquals("1", MorseTable.rxLookup(".----"))
-        assertEquals("?", MorseTable.rxLookup("..--.."))
-        assertEquals("", MorseTable.rxLookup("........"))
-    }
-
-    @Test
-    fun somTable_hasAllAsciiLetters() {
-        val patterns = SomTable.table.map { it.pattern }.toSet()
-        val letters = listOf(".-", "-...", "-.-.", "-..", ".", "..-.", "--.", "....",
-            "..", ".---", "-.-", ".-..", "--", "-.", "---", ".--.", "--.-", ".-.",
-            "...", "-", "..-", "...-", ".--", "-..-", "-.--", "--..")
-        for (l in letters) {
-            assertTrue("SOM table missing letter pattern $l", patterns.contains(l))
-        }
-    }
-
-    @Test
-    fun fftFilter_lowpass_passesTone() {
-        val filt = CwFftFilt(600.0 / 8000.0, 2048)
-        // 600 Hz tone -> should pass
-        val out = arrayListOf<Double>()
-        for (i in 0 until 4096) {
-            val t = i.toDouble() / 8000.0
-            val z = CwComplex(0.5 * sin(2.0 * PI * 600.0 * t), 0.0)
-            filt.run(z)?.let { o -> for (j in 0 until 1024) out.add(o[j].abs()) }
-        }
-        val maxVal = out.maxOrNull() ?: 0.0
-        assertTrue("expected signal to pass through lowpass, max=$maxVal", maxVal > 0.05)
-    }
-}

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/navigation/MenuLayoutTest.kt

@@ -0,0 +1,154 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.domain.navigation
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+/**
+ * Menu layout rules. Every case here is a bug that shipped at least once, so
+ * treat a failure as a regression rather than a spec question.
+ */
+class MenuLayoutTest {
+
+    private val all = listOf(
+        "Satellites", "Passes", "Radar", "Mutual", "Roaming",
+        "CwDecode", "WavelogLog", "AMSAT", "Map", "Settings"
+    )
+
+    private fun layout(
+        screenOrder: List<String> = emptyList(),
+        subMenuOrder: List<String> = emptyList(),
+        hidden: List<String> = emptyList()
+    ) = MenuLayout.resolve(all, screenOrder, subMenuOrder, hidden)
+
+    @Test
+    fun defaultsPutFivePagesOnTheBarAndTheRestBehindMore() {
+        val l = layout()
+        assertEquals(listOf("Satellites", "Passes", "Radar", "Map", "Settings"), l.mainIds)
+        assertEquals(listOf("Mutual", "Roaming", "CwDecode", "WavelogLog", "AMSAT"), l.moreIds)
+    }
+
+    @Test
+    fun settingsIsAlwaysReachable() {
+        // Moving any page onto the bar used to push Settings out of BOTH menus,
+        // permanently locking the user out of the settings page.
+        for (page in listOf("Mutual", "Roaming", "CwDecode", "WavelogLog", "AMSAT")) {
+            val moved = MenuLayout.moveToMain(page, all, emptyList(), emptyList())
+            val l = layout(moved.screenOrder, moved.subMenuOrder)
+            assertTrue(
+                "moving $page hid Settings: main=${l.mainIds} more=${l.moreIds}",
+                "Settings" in l.mainIds || "Settings" in l.moreIds
+            )
+        }
+    }
+
+    @Test
+    fun movingAmsatToMainActuallyTakesEffect() {
+        // The legacy migration re-appended AMSAT to the sub-menu unconditionally,
+        // silently undoing the user's choice.
+        val moved = MenuLayout.moveToMain("AMSAT", all, emptyList(), emptyList())
+        val l = layout(moved.screenOrder, moved.subMenuOrder)
+        assertTrue("AMSAT missing from the bar: ${l.mainIds}", "AMSAT" in l.mainIds)
+        assertTrue("AMSAT still behind More: ${l.moreIds}", "AMSAT" !in l.moreIds)
+    }
+
+    @Test
+    fun movingWavelogLogToMainActuallyTakesEffect() {
+        val moved = MenuLayout.moveToMain("WavelogLog", all, emptyList(), emptyList())
+        val l = layout(moved.screenOrder, moved.subMenuOrder)
+        assertTrue("WavelogLog missing from the bar: ${l.mainIds}", "WavelogLog" in l.mainIds)
+    }
+
+    @Test
+    fun newPagesUnknownToPersistedOrderDefaultToTheMoreMenu() {
+        // Upgrading from a build that predates AMSAT and WavelogLog: neither list
+        // mentions them, so both must land behind More rather than vanishing.
+        val l = layout(
+            screenOrder = listOf("Satellites", "Passes", "Radar", "Map", "Settings"),
+            subMenuOrder = listOf("Mutual", "Roaming", "CwDecode")
+        )
+        assertTrue("AMSAT should land behind More", "AMSAT" in l.moreIds)
+        assertTrue("WavelogLog should land behind More", "WavelogLog" in l.moreIds)
+    }
+
+    @Test
+    fun everyVisiblePageIsReachableFromSomeMenu() {
+        // Pages beyond the five slots used to vanish instead of overflowing.
+        val l = layout(
+            screenOrder = listOf("Satellites", "Passes", "Radar", "Mutual", "Roaming", "Map", "Settings"),
+            subMenuOrder = listOf("CwDecode", "WavelogLog", "AMSAT")
+        )
+        assertEquals("every page must be reachable", all.toSet(), (l.mainIds + l.moreIds).toSet())
+    }
+
+    @Test
+    fun hiddenPagesAppearInNeitherMenu() {
+        val l = layout(hidden = listOf("Radar", "Map"))
+        assertTrue("Radar" !in l.mainIds && "Radar" !in l.moreIds)
+        assertTrue("Map" !in l.mainIds && "Map" !in l.moreIds)
+    }
+
+    @Test
+    fun settingsCannotBeHidden() {
+        val l = layout(hidden = listOf("Settings"))
+        assertTrue("Settings" in l.mainIds || "Settings" in l.moreIds)
+    }
+
+    @Test
+    fun theBarNeverExceedsFiveSlots() {
+        val l = layout(screenOrder = all)
+        assertTrue("bar had ${l.mainIds.size} slots: ${l.mainIds}", l.mainIds.size <= MenuLayout.MAIN_SLOTS)
+    }
+
+    @Test
+    fun movingAPageOutOfTheBarPutsItBehindMore() {
+        val moved = MenuLayout.moveToMore("Radar", all, emptyList(), emptyList())
+        val l = layout(moved.screenOrder, moved.subMenuOrder)
+        assertTrue("Radar" in l.moreIds)
+        assertTrue("Radar" !in l.mainIds)
+    }
+
+    @Test
+    fun settingsCannotBeMovedOffTheBar() {
+        val moved = MenuLayout.moveToMore("Settings", all, emptyList(), emptyList())
+        val l = layout(moved.screenOrder, moved.subMenuOrder)
+        assertTrue("Settings" in l.mainIds || "Settings" in l.moreIds)
+    }
+
+    @Test
+    fun resolveIsStableWhenAppliedTwice() {
+        // Persisting what resolve() produced must not change the outcome, or the
+        // settings list and the bar drift apart on the next recomposition.
+        val first = layout()
+        val second = layout(first.mainIds, first.moreIds)
+        assertEquals(first.mainIds, second.mainIds)
+        assertEquals(first.moreIds, second.moreIds)
+    }
+
+    @Test
+    fun movingAPageOntoAFullBarEvictsAnotherPageIntoMore() {
+        // The bar starts full (5 including Settings), so making room must push an
+        // existing page into More instead of dropping it.
+        val moved = MenuLayout.moveToMain("CwDecode", all, emptyList(), emptyList())
+        val l = layout(moved.screenOrder, moved.subMenuOrder)
+        assertTrue("CwDecode" in l.mainIds)
+        assertEquals("nothing may be lost", all.toSet(), (l.mainIds + l.moreIds).toSet())
+    }
+}

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/predict/CelestialComputerTest.kt

@@ -0,0 +1,105 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.domain.predict
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import java.time.Instant
+import kotlin.math.abs
+
+class CelestialComputerTest {
+
+    private val observer = GeoPos(22.314066, 108.706575)
+
+    private fun subLunarLongitude(gha: Double) = if (gha <= 180.0) -gha else 360.0 - gha
+
+    @Test
+    fun `moon hour angle stays within one revolution`() {
+        // Sample a full synodic month at 37-minute steps so the sweep crosses
+        // every hour-angle quadrant many times over.
+        var timeMillis = 1786060800_000L // 2026-08-07T00:00:00Z
+        val stepMillis = 37 * 60 * 1000L
+        val endMillis = timeMillis + 30L * 86400_000L
+        var samples = 0
+        while (timeMillis < endMillis) {
+            val gha = CelestialComputer.getMoonPosition(observer, timeMillis).gha
+            assertTrue("gha=$gha out of 0..360 at $timeMillis", gha >= 0.0 && gha < 360.0)
+            val longitude = subLunarLongitude(gha)
+            assertTrue(
+                "sub-lunar longitude=$longitude out of -180..180 at $timeMillis",
+                longitude >= -180.0 && longitude <= 180.0
+            )
+            samples++
+            timeMillis += stepMillis
+        }
+        assertTrue("expected a meaningful sweep, got $samples samples", samples > 1000)
+    }
+
+    private data class RiseSetCase(
+        val name: String,
+        val observer: GeoPos,
+        val startIso: String
+    )
+
+    @Test
+    fun `findSunRiseSet returns distinct sunrise and sunset for representative locations`() {
+        val cases = listOf(
+            RiseSetCase("Equator at March equinox", GeoPos(0.0, 0.0), "2026-03-20T00:00:00Z"),
+            RiseSetCase("Equator at September equinox", GeoPos(0.0, 0.0), "2026-09-23T00:00:00Z"),
+            RiseSetCase("Sydney winter", GeoPos(-33.8688, 151.2093), "2026-06-21T00:00:00Z"),
+            RiseSetCase("Buenos Aires winter", GeoPos(-34.6037, -58.3816), "2026-06-21T00:00:00Z"),
+            RiseSetCase("Cape Town winter", GeoPos(-33.9249, 18.4241), "2026-06-21T00:00:00Z"),
+            RiseSetCase("London summer", GeoPos(51.5074, -0.1278), "2026-06-21T00:00:00Z")
+        )
+
+        cases.forEach { testCase ->
+            val result = CelestialComputer.findSunRiseSet(testCase.observer, testCase.startIso.toMillis())
+            val daylightDuration = result.setTimeMillis - result.riseTimeMillis
+
+            assertTrue("${testCase.name}: sunrise should be non-zero", result.riseTimeMillis > 0L)
+            assertTrue("${testCase.name}: sunset should be non-zero", result.setTimeMillis > 0L)
+            assertTrue("${testCase.name}: sunset should be after sunrise", result.setTimeMillis > result.riseTimeMillis)
+            assertTrue("${testCase.name}: daylight duration should be longer than 1 hour", daylightDuration > HOUR_MILLIS)
+            assertTrue("${testCase.name}: daylight duration should be shorter than 24 hours", daylightDuration < DAY_MILLIS)
+
+            val riseElevation = CelestialComputer.getSunPosition(testCase.observer, result.riseTimeMillis).elevation
+            val setElevation = CelestialComputer.getSunPosition(testCase.observer, result.setTimeMillis).elevation
+            assertEquals("${testCase.name}: sunrise should converge near the standard threshold", SUNRISE_SET_THRESHOLD, riseElevation, 0.02)
+            assertEquals("${testCase.name}: sunset should converge near the standard threshold", SUNRISE_SET_THRESHOLD, setElevation, 0.02)
+        }
+    }
+
+    @Test
+    fun `findSunRiseSet does not return the same instant for equinox regression cases`() {
+        listOf("2026-03-20T00:00:00Z", "2026-09-23T00:00:00Z").forEach { startIso ->
+            val result = CelestialComputer.findSunRiseSet(GeoPos(0.0, 0.0), startIso.toMillis())
+            val separationMillis = abs(result.setTimeMillis - result.riseTimeMillis)
+
+            assertTrue("$startIso: sunrise and sunset should be separated", separationMillis > HOUR_MILLIS)
+        }
+    }
+
+    private fun String.toMillis(): Long = Instant.parse(this).toEpochMilli()
+
+    private companion object {
+        private const val SUNRISE_SET_THRESHOLD = -0.8333
+        private const val HOUR_MILLIS = 60L * 60L * 1000L
+        private const val DAY_MILLIS = 24L * HOUR_MILLIS
+    }
+}

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/utility/ClipLonTest.kt

@@ -0,0 +1,62 @@
+package com.rtbishop.look4sat.core.domain.utility
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+/**
+ * clipLon must reduce any longitude into [-180, 180] in bounded time. The old
+ * while-loop never returned for extreme inputs: Infinity stays Infinity after
+ * subtracting 360 (infinite loop), and ~1e12 degree values took billions of
+ * iterations. The modulo rewrite must be bit-equivalent for all finite values.
+ */
+class ClipLonTest {
+
+    private fun reduced(v: Double) = ((v + 180.0) % 360.0 + 360.0) % 360.0 - 180.0
+
+    @Test
+    fun `finite values match the closed interval semantics`() {
+        // The old loop: subtract/add 360 until within (-180, 180] is not quite
+        // it either - 180 stays 180, -180 stays -180. So the interval is closed
+        // on both ends with +180 for positive-boundary hits.
+        assertEquals(-180.0, clipLon(-180.0), 1e-12)
+        assertEquals(180.0, clipLon(180.0), 1e-12)
+        assertEquals(0.0, clipLon(360.0), 1e-12)
+        assertEquals(180.0, clipLon(540.0), 1e-12)
+        assertEquals(-180.0, clipLon(-540.0), 1e-12)
+        assertEquals(-179.999, clipLon(180.001), 1e-9)
+        assertEquals(179.999, clipLon(-180.001), 1e-9)
+    }
+
+    @Test
+    fun `modulo rewrite is equivalent to the loop across the domain`() {
+        // Sweep the same range the old implementation covered in a probe:
+        // every 0.01 degree from -10000 to 10000 must agree with the reference
+        // reduction to within 1e-9.
+        var v = -10000.0
+        while (v <= 10000.0) {
+            val reference = clipLonByLoop(v)
+            assertEquals(reference, clipLon(v), 1e-9)
+            v += 0.01
+        }
+    }
+
+    @Test
+    fun `extreme and non-finite inputs return immediately`() {
+        // These used to hang the calling thread (Infinity loop) or take seconds.
+        assertEquals(Double.POSITIVE_INFINITY, clipLon(Double.POSITIVE_INFINITY), 0.0)
+        assertEquals(Double.NEGATIVE_INFINITY, clipLon(Double.NEGATIVE_INFINITY), 0.0)
+        assertTrue(clipLon(Double.NaN).isNaN())
+        assertFalse(clipLon(1e15).isNaN())
+        assertTrue(clipLon(1e15) in -180.0..180.0)
+    }
+
+    /** The old while-loop implementation, kept as the reference for equivalence. */
+    private fun clipLonByLoop(longitude: Double): Double {
+        var result = longitude
+        while (result < -180.0) result += 360.0
+        while (result > 180.0) result -= 360.0
+        return minOf(maxOf(result, -180.0), 180.0)
+    }
+}

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/wavelog/WaveLogApiPayloadTest.kt

@@ -0,0 +1,109 @@
+package com.rtbishop.look4sat.core.domain.wavelog
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import java.util.Locale
+
+/**
+ * Verifies the WaveLog upload payload frequency/band fields.
+ *
+ * Regression: user reported QSOs landing in the 160m band. The v2 JSON
+ * envelope must carry freq as a MHz string with an "M" suffix so WaveLog's
+ * parse_frequency() reads it as Hz internally; a bare integer or bare MHz
+ * value corrupts band derivation.
+ */
+class WaveLogApiPayloadTest {
+
+    // SO-50: uplink 145.850 MHz, downlink 436.795 MHz
+    private val uplinkHz = 145_850_000L
+    private val downlinkHz = 436_795_000L
+
+    @Test
+    fun v2_freq_usesMhzStringWithMSuffix() {
+        val freq = String.format(Locale.ENGLISH, "%.6fM", uplinkHz / 1_000_000.0)
+        val freqRx = String.format(Locale.ENGLISH, "%.6fM", downlinkHz / 1_000_000.0)
+        assertEquals("145.850000M", freq)
+        assertEquals("436.795000M", freqRx)
+        // WaveLog parse_frequency: "145.850000M" -> 145850000 Hz
+        val parsedHz = parseLikeWaveLog(freq)
+        assertEquals(uplinkHz, parsedHz)
+    }
+
+    @Test
+    fun v1_adif_freq_isBareMhzNumber() {
+        // v1 ADIF <FREQ> is a bare MHz number per ADIF spec (no unit suffix)
+        val freq = String.format(Locale.ENGLISH, "%.6f", uplinkHz / 1_000_000.0)
+        assertEquals("145.850000", freq)
+        val adifFreq = freq.toDouble() * 1_000_000
+        assertEquals(uplinkHz.toDouble(), adifFreq, 1.0)
+    }
+
+    @Test
+    fun v1_adif_preservesSixCharacterGrid() {
+        val qso = WavelogQso(
+            id = "test",
+            timeUtcMs = 0L,
+            call = "BG7NTA",
+            mode = "FM",
+            freqTxHz = uplinkHz,
+            freqRxHz = downlinkHz,
+            satName = "SO-50"
+        )
+
+        val adif = WaveLogApi.toAdif(qso, "OM89ab", "SO-50")
+
+        assertTrue(adif.contains("<gridsquare:6>OM89ab"))
+    }
+
+    /** Mirrors WaveLog Logbook_model::parse_frequency: int = Hz, "12.3M" suffix = MHz. */
+    private fun parseLikeWaveLog(raw: String): Long {
+        val s = raw.trim()
+        return if (s.endsWith("M", ignoreCase = true)) {
+            (s.dropLast(1).toDouble() * 1_000_000).toLong()
+        } else if (s.endsWith("k", ignoreCase = true)) {
+            (s.dropLast(1).toDouble() * 1_000).toLong()
+        } else {
+            s.toLong()
+        }
+    }
+
+    @Test
+    fun qsoFreqs_stayInSatelliteBands_afterDoppler() {
+        // Doppler-corrected values must remain near the base frequency.
+        // SPEED_OF_LIGHT = 299792458 m/s; distanceRate is km/s (x1000 -> m/s).
+        val dopplerRate = 7.0 // km/s approaching
+        val corrected = uplinkHz * (299_792_458.0 + dopplerRate * 1000.0) / 299_792_458.0
+        assertTrue(
+            "corrected within +-20kHz, got ${corrected - uplinkHz} Hz",
+            kotlin.math.abs(corrected - uplinkHz) < 20_000
+        )
+        // band derivation: 145.x MHz -> 2m, never 160m (1.8-2.0 MHz)
+        val mhz = corrected / 1_000_000.0
+        assertTrue("145.x MHz stays in 2m, got $mhz MHz", mhz in 144.0..148.0)
+    }
+
+    @Test
+    fun band_isRealBand_notSAT() {
+        // SO-50: TX 145.850 MHz (VHF) -> band 2M, sat mode V/U
+        assertEquals("2M", WaveLogApi.bandFromHz(145_850_000))
+        assertEquals("V/U", WaveLogApi.satModeFrom(145_850_000, 436_795_000))
+        // AO-73: TX 435.150 MHz (UHF up), RX 145.950 MHz (VHF down) -> band 70CM, U/V
+        assertEquals("70CM", WaveLogApi.bandFromHz(435_150_000))
+        assertEquals("U/V", WaveLogApi.satModeFrom(435_150_000, 145_950_000))
+        // Same-band (e.g. simplex) -> empty sat mode
+        assertEquals("", WaveLogApi.satModeFrom(145_850_000, 145_950_000))
+        // Never 160m for satellite frequencies
+        assertTrue(WaveLogApi.bandFromHz(145_850_000) != "160M")
+        assertTrue(WaveLogApi.bandFromHz(436_795_000) != "160M")
+    }
+
+    @Test
+    fun adif_containsRealBandAndSatMode() {
+        // v2 payload fields (mirror postQso construction)
+        val band = WaveLogApi.bandFromHz(uplinkHz)
+        val satMode = WaveLogApi.satModeFrom(uplinkHz, downlinkHz)
+        assertEquals("2M", band)
+        assertEquals("V/U", satMode)
+    }
+}

core/domain/src/test/resources/cw/golden_spec.txt

@@ -0,0 +1,78 @@
+77 65
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0.07889045 0.08153424 0.08419035 0.08701893 0.09030894 0.09436007 0.09932096 0.1050817 0.1113084 0.1176305 0.1239188 0.1305645 0.1386389 0.1497532 0.1654913 0.1866336 0.2127252 0.2422527 0.2731474 0.3032433 0.3305584 0.3534314 0.3705729 0.3810754 0.3844073 0.3804049 0.3692688 0.3515675 0.3282437 0.3006178 0.2703726 0.239492 0.2101091 0.1842086 0.1631677 0.1472881 0.1356851 0.126759 0.1189501 0.1112676 0.1034146 0.09563871 0.0884626 0.08238604 0.07764256 0.07410739 0.07139879 0.06908784 0.06687377 0.06464756 0.06245377 0.06040035 0.05856907 0.05696608 0.05552753 0.05416456 0.05281367 0.05146397 0.05015182 0.0489313 0.04783952 0.04687586 0.04600478 0.04517753 0.04435825
+0.3260067 0.3363644 0.3473228 0.3584008 0.3717064 0.3864512 0.4010351 0.4184499 0.4389309 0.4590358 0.4825051 0.5122178 0.5418502 0.5749596 0.6208939 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 1.914222 1.97871 1.912684 1.720891 1.431183 1.139257 0.9739592 0.885756 0.7909085 0.7123318 0.6630843 0.6163642 0.5723305 0.5442435 0.5254506 0.5046235 0.4722382 0.4203468 0.3605282 0.3242991 0.3175806 0.3153524 0.3077487 0.2989038 0.2901882 0.2814592 0.2735062 0.2657845 0.2581551 0.2513816 0.2449855 0.2385921 0.2328572 0.2275815 0.2222787 0.2174161 0.213032 0.2086437 0.2045162 0.2008394 0.1972071 0.1937068
+0.4438076 0.4559436 0.4704448 0.4847386 0.5020207 0.5190093 0.5398599 0.5602847 0.5858377 0.6107538 0.6427084 0.6736734 0.7147121 0.7541329 0.8087943 0.8606219 0.9373714 1.008648 1.125829 1.230708 1.440158 1.613244 2.198886 2.788961 2.987679 2.787503 2.195585 1.607394 1.433426 1.222683 1.117479 0.9998917 0.9291879 0.853102 0.8035754 0.7514675 0.7191642 0.6857824 0.6938878 0.7097453 0.6016893 0.4058476 0.4104768 0.4370055 0.4281905 0.4192973 0.4079929 0.3965591 0.3857173 0.3747567 0.3649065 0.3549583 0.346147 0.3372574 0.3294108 0.3215023 0.3145201 0.3074889 0.3012713 0.2950149 0.2894724 0.2838991 0.2789537 0.2739837 0.2695685
+0.3260067 0.3363645 0.3473228 0.3584008 0.3717065 0.3864512 0.401035 0.4184498 0.438931 0.4590358 0.4825051 0.5122178 0.5418503 0.5749596 0.620894 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 3.06281 3.479569 3.061841 1.720891 1.431183 1.139257 0.9739593 0.8857559 0.7909085 0.7123318 0.6630843 0.6163641 0.5723306 0.5442436 0.5254506 0.5046235 0.6600668 0.5916568 0.1053787 0.324299 0.3175806 0.3153523 0.3077486 0.2989039 0.2901882 0.2814592 0.2735063 0.2657846 0.2581551 0.2513817 0.2449855 0.2385924 0.2328572 0.2275815 0.2222788 0.2174162 0.213032 0.2086438 0.2045162 0.2008394 0.1972071 0.1937068
+0.07889044 0.08153418 0.08419043 0.08701882 0.09030894 0.09435995 0.09932118 0.1050815 0.1113084 0.1176306 0.1239187 0.1305645 0.1386389 0.1497532 0.1654913 0.1866337 0.2127252 0.2422527 0.2731474 0.3032434 0.3305583 0.3534314 0.3705729 3.007106 3.643108 3.00695 0.3692689 0.3515675 0.3282436 0.300618 0.2703725 0.239492 0.210109 0.1842086 0.1631676 0.1472882 0.1356852 0.1267589 0.1189501 0.3679682 0.5516769 0.2577798 0.08846281 0.08238595 0.07764257 0.07410715 0.07139895 0.06908786 0.06687377 0.06464756 0.06245382 0.06040037 0.05856909 0.05696621 0.05552716 0.0541646 0.05281365 0.05146411 0.05015175 0.04893123 0.04783951 0.04687591 0.0460047 0.04517756 0.04435825
+1.564492e-07 1.122884e-07 8.888702e-08 1.762498e-07 8.600421e-09 1.938033e-07 2.387622e-07 2.871272e-07 2.21893e-07 1.239545e-07 8.498516e-08 5.176826e-08 1.897711e-07 8.593484e-08 4.070753e-08 7.40209e-08 2.278317e-07 8.807671e-08 9.716474e-08 1.372644e-07 1.501705e-07 2.285518e-08 9.67386e-08 2.987679 3.6553 2.987679 1.266364e-07 1.456021e-08 5.034151e-08 2.597979e-07 1.838301e-07 6.343754e-08 8.150528e-08 5.003271e-09 9.525829e-08 2.182818e-07 1.843608e-07 1.385002e-08 6.420205e-09 0.3078006 0.542824 0.3078008 2.254644e-07 1.478402e-07 1.590096e-07 3.480243e-07 1.698739e-07 5.310058e-08 4.452434e-08 4.024338e-09 5.150024e-08 2.914611e-08 1.276424e-07 1.826463e-07 3.983407e-07 5.450444e-08 2.266521e-07 1.942693e-07 7.255422e-08 1.167992e-07 1.510635e-07 6.353517e-08 7.878904e-08 3.480655e-08 4.585462e-09
+1.564492e-07 1.122884e-07 8.888694e-08 1.762498e-07 8.600284e-09 1.938033e-07 2.387623e-07 2.871272e-07 2.21893e-07 1.239545e-07 8.498505e-08 5.176823e-08 1.897709e-07 8.593484e-08 4.070745e-08 7.402096e-08 2.278317e-07 8.807665e-08 9.716481e-08 1.372644e-07 1.501703e-07 2.285522e-08 9.673848e-08 2.987679 3.6553 2.987679 1.266363e-07 1.456018e-08 5.034165e-08 2.597979e-07 1.8383e-07 6.34376e-08 8.150528e-08 5.003333e-09 9.525822e-08 2.182818e-07 1.843609e-07 1.385006e-08 6.420322e-09 0.3078006 0.542824 0.3078008 2.254643e-07 1.478403e-07 1.590095e-07 3.480243e-07 1.698739e-07 5.310051e-08 4.452434e-08 4.0244e-09 5.150032e-08 2.914612e-08 1.276426e-07 1.826462e-07 3.983408e-07 5.450447e-08 2.266521e-07 1.942694e-07 7.255434e-08 1.167993e-07 1.510637e-07 6.353518e-08 7.878896e-08 3.480649e-08 4.585462e-09
+1.564492e-07 1.122884e-07 8.888694e-08 1.762499e-07 8.600289e-09 1.938033e-07 2.387623e-07 2.871272e-07 2.21893e-07 1.239545e-07 8.498504e-08 5.176823e-08 1.897709e-07 8.593484e-08 4.070745e-08 7.402096e-08 2.278317e-07 8.807665e-08 9.716482e-08 1.372644e-07 1.501703e-07 2.285522e-08 9.673848e-08 2.987679 3.6553 2.987679 1.266363e-07 1.456017e-08 5.034164e-08 2.597979e-07 1.8383e-07 6.34376e-08 8.150528e-08 5.003331e-09 9.525821e-08 2.182818e-07 1.843609e-07 1.385006e-08 6.420325e-09 0.3078006 0.542824 0.3078008 2.254643e-07 1.478403e-07 1.590095e-07 3.480243e-07 1.698739e-07 5.310052e-08 4.452434e-08 4.024398e-09 5.150032e-08 2.914612e-08 1.276426e-07 1.826462e-07 3.983408e-07 5.450447e-08 2.266521e-07 1.942694e-07 7.255434e-08 1.167993e-07 1.510637e-07 6.353518e-08 7.878896e-08 3.480649e-08 4.585462e-09
+1.564492e-07 1.122884e-07 8.888702e-08 1.762499e-07 8.600421e-09 1.938034e-07 2.387622e-07 2.871271e-07 2.21893e-07 1.239546e-07 8.498516e-08 5.176833e-08 1.897711e-07 8.593477e-08 4.070753e-08 7.402097e-08 2.278317e-07 8.807664e-08 9.716474e-08 1.372644e-07 1.501705e-07 2.285512e-08 9.67386e-08 2.987679 3.6553 2.987679 1.266364e-07 1.456028e-08 5.034151e-08 2.59798e-07 1.838301e-07 6.343761e-08 8.150528e-08 5.003339e-09 9.525829e-08 2.182819e-07 1.843608e-07 1.384995e-08 6.420205e-09 0.3078006 0.542824 0.3078008 2.254644e-07 1.478402e-07 1.590096e-07 3.480242e-07 1.698739e-07 5.310051e-08 4.452434e-08 4.024406e-09 5.150024e-08 2.914618e-08 1.276424e-07 1.826463e-07 3.983407e-07 5.450437e-08 2.266521e-07 1.942693e-07 7.255422e-08 1.167992e-07 1.510635e-07 6.353524e-08 7.878904e-08 3.480648e-08 4.585462e-09
+1.564492e-07 1.122885e-07 8.888715e-08 1.762501e-07 8.600158e-09 1.938033e-07 2.387623e-07 2.871272e-07 2.21893e-07 1.239545e-07 8.498502e-08 5.176819e-08 1.897708e-07 8.593463e-08 4.070766e-08 7.402083e-08 2.278317e-07 8.807678e-08 9.716461e-08 1.372642e-07 1.501702e-07 2.285526e-08 9.673845e-08 2.987679 3.6553 2.987679 1.266363e-07 1.456013e-08 5.034177e-08 2.597981e-07 1.838302e-07 6.343747e-08 8.150528e-08 5.003199e-09 9.525842e-08 2.18282e-07 1.843611e-07 1.38501e-08 6.420349e-09 0.3078006 0.542824 0.3078008 2.254643e-07 1.478403e-07 1.590094e-07 3.480241e-07 1.698737e-07 5.310065e-08 4.452434e-08 4.024266e-09 5.150011e-08 2.914633e-08 1.276427e-07 1.826462e-07 3.983409e-07 5.45045e-08 2.266521e-07 1.942694e-07 7.255437e-08 1.167993e-07 1.510638e-07 6.353538e-08 7.878917e-08 3.480662e-08 4.585462e-09
+1.564492e-07 1.122885e-07 8.888713e-08 1.762501e-07 8.600153e-09 1.938034e-07 2.387623e-07 2.871272e-07 2.21893e-07 1.239545e-07 8.498504e-08 5.176827e-08 1.897708e-07 8.593455e-08 4.070764e-08 7.402088e-08 2.278317e-07 8.807672e-08 9.716463e-08 1.372642e-07 1.501702e-07 2.285517e-08 9.673848e-08 2.987679 3.6553 2.987679 1.266363e-07 1.456022e-08 5.034178e-08 2.597982e-07 1.838302e-07 6.343753e-08 8.150528e-08 5.003255e-09 9.52584e-08 2.182821e-07 1.843611e-07 1.385001e-08 6.420325e-09 0.3078006 0.542824 0.3078008 2.254643e-07 1.478402e-07 1.590094e-07 3.48024e-07 1.698737e-07 5.310059e-08 4.452434e-08 4.024322e-09 5.150013e-08 2.91464e-08 1.276427e-07 1.826463e-07 3.983408e-07 5.450445e-08 2.266521e-07 1.942693e-07 7.255434e-08 1.167992e-07 1.510638e-07 6.353546e-08 7.878916e-08 3.480656e-08 4.585462e-09
+1.564492e-07 1.122884e-07 8.888702e-08 1.762501e-07 8.600201e-09 1.938033e-07 2.387621e-07 2.871272e-07 2.21893e-07 1.239545e-07 8.49852e-08 5.176818e-08 1.897709e-07 8.59346e-08 4.070753e-08 7.402099e-08 2.278317e-07 8.807662e-08 9.716474e-08 1.372642e-07 1.501702e-07 2.285526e-08 9.673864e-08 2.987679 3.6553 2.987679 1.266365e-07 1.456013e-08 5.034173e-08 2.597982e-07 1.838301e-07 6.343763e-08 8.150528e-08 5.00336e-09 9.525829e-08 2.182821e-07 1.84361e-07 1.38501e-08 6.420163e-09 0.3078006 0.542824 0.3078008 2.254645e-07 1.478403e-07 1.590094e-07 3.480241e-07 1.698739e-07 5.310049e-08 4.452434e-08 4.024427e-09 5.150024e-08 2.914636e-08 1.276426e-07 1.826462e-07 3.983407e-07 5.450442e-08 2.266521e-07 1.942693e-07 7.255419e-08 1.167993e-07 1.510638e-07 6.353542e-08 7.878904e-08 3.480646e-08 4.585462e-09
+0.07889044 0.08153418 0.08419043 0.08701882 0.09030894 0.09435995 0.09932118 0.1050815 0.1113084 0.1176306 0.1239187 0.1305645 0.1386389 0.1497532 0.1654913 0.1866337 0.2127252 0.2422527 0.2731474 0.3032434 0.3305583 0.3534314 0.3705729 3.007106 3.643108 3.00695 0.3692689 0.3515675 0.3282436 0.300618 0.2703725 0.239492 0.210109 0.1842086 0.1631676 0.1472882 0.1356852 0.1267589 0.1189501 0.3679682 0.5516769 0.2577798 0.08846281 0.08238595 0.07764257 0.07410715 0.07139895 0.06908786 0.06687377 0.06464756 0.06245382 0.06040037 0.05856909 0.05696621 0.05552716 0.0541646 0.05281365 0.05146411 0.05015175 0.04893123 0.04783951 0.04687591 0.0460047 0.04517756 0.04435825
+0.3260067 0.3363645 0.3473228 0.3584008 0.3717065 0.3864512 0.401035 0.4184498 0.438931 0.4590358 0.4825051 0.5122178 0.5418503 0.5749596 0.620894 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 3.06281 3.479569 3.061841 1.720891 1.431183 1.139257 0.9739593 0.8857559 0.7909085 0.7123318 0.6630843 0.6163641 0.5723306 0.5442436 0.5254506 0.5046235 0.6600668 0.5916568 0.1053787 0.324299 0.3175806 0.3153523 0.3077486 0.2989039 0.2901882 0.2814592 0.2735063 0.2657846 0.2581551 0.2513817 0.2449855 0.2385924 0.2328572 0.2275815 0.2222788 0.2174162 0.213032 0.2086438 0.2045162 0.2008394 0.1972071 0.1937068
+0.4438076 0.4559436 0.4704448 0.4847386 0.5020207 0.5190093 0.5398599 0.5602847 0.5858377 0.6107538 0.6427084 0.6736734 0.7147121 0.7541329 0.8087943 0.8606219 0.9373714 1.008648 1.125829 1.230708 1.440158 1.613244 2.198886 2.788961 2.987679 2.787503 2.195585 1.607394 1.433426 1.222683 1.117479 0.9998917 0.9291879 0.853102 0.8035754 0.7514675 0.7191642 0.6857824 0.6938878 0.7097453 0.6016893 0.4058476 0.4104768 0.4370055 0.4281905 0.4192973 0.4079929 0.3965591 0.3857173 0.3747567 0.3649065 0.3549583 0.346147 0.3372574 0.3294108 0.3215023 0.3145201 0.3074889 0.3012713 0.2950149 0.2894724 0.2838991 0.2789537 0.2739837 0.2695685
+0.3260067 0.3363644 0.3473228 0.3584008 0.3717064 0.3864512 0.4010351 0.4184499 0.4389309 0.4590358 0.4825051 0.5122178 0.5418502 0.5749596 0.6208939 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 1.914222 1.97871 1.912684 1.720891 1.431183 1.139257 0.9739592 0.885756 0.7909085 0.7123318 0.6630843 0.6163642 0.5723305 0.5442435 0.5254506 0.5046235 0.4722382 0.4203468 0.3605282 0.3242991 0.3175806 0.3153524 0.3077487 0.2989038 0.2901882 0.2814592 0.2735062 0.2657845 0.2581551 0.2513816 0.2449855 0.2385921 0.2328572 0.2275815 0.2222787 0.2174161 0.213032 0.2086437 0.2045162 0.2008394 0.1972071 0.1937068
+0.0133671 0.103174 0.161102 0.1321454 0.01981753 0.1171069 0.1886141 0.1606799 0.03154613 0.1368369 0.230862 0.208004 0.05647711 0.1650847 0.3020293 0.298915 0.1252058 0.1979204 0.4401451 0.5311838 0.4472875 0.1536819 0.2990841 0.5738236 0.6613865 0.5702119 0.2925259 0.1586363 0.4468553 0.5274072 0.4351405 0.1946639 0.1232734 0.2943546 0.2986827 0.1671092 0.04655298 0.1966405 0.2236971 0.1398044 0.01435895 0.1384342 0.1696025 0.109466 0.009560954 0.1101514 0.1376043 0.08825757 0.01127213 0.09668601 0.1209162 0.07821064 0.008807627 0.0850097 0.1078746 0.07068323 0.006762736 0.07595089 0.09776526 0.06483996 0.005235632 0.0689388 0.08987227 0.0602516 0.004088645
+0.3260067 0.3363644 0.3473228 0.3584008 0.3717064 0.3864512 0.4010351 0.4184499 0.4389309 0.4590358 0.4825051 0.5122178 0.5418502 0.5749596 0.6208939 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 1.914222 1.97871 1.912684 1.720891 1.431183 1.139257 0.9739592 0.885756 0.7909085 0.7123318 0.6630843 0.6163642 0.5723305 0.5442435 0.5254506 0.5046235 0.4722382 0.4203468 0.3605282 0.3242991 0.3175806 0.3153524 0.3077487 0.2989038 0.2901882 0.2814592 0.2735062 0.2657845 0.2581551 0.2513816 0.2449855 0.2385921 0.2328572 0.2275815 0.2222787 0.2174161 0.213032 0.2086437 0.2045162 0.2008394 0.1972071 0.1937068
+0.4438076 0.4559436 0.4704448 0.4847386 0.5020207 0.5190093 0.5398599 0.5602847 0.5858377 0.6107538 0.6427084 0.6736734 0.7147121 0.7541329 0.8087943 0.8606219 0.9373714 1.008648 1.125829 1.230708 1.440158 1.613244 2.198886 2.788961 2.987679 2.787503 2.195585 1.607394 1.433426 1.222683 1.117479 0.9998917 0.9291879 0.853102 0.8035754 0.7514675 0.7191642 0.6857824 0.6938878 0.7097453 0.6016893 0.4058476 0.4104768 0.4370055 0.4281905 0.4192973 0.4079929 0.3965591 0.3857173 0.3747567 0.3649065 0.3549583 0.346147 0.3372574 0.3294108 0.3215023 0.3145201 0.3074889 0.3012713 0.2950149 0.2894724 0.2838991 0.2789537 0.2739837 0.2695685
+0.3260067 0.3363645 0.3473228 0.3584008 0.3717065 0.3864512 0.401035 0.4184498 0.438931 0.4590358 0.4825051 0.5122178 0.5418503 0.5749596 0.620894 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 3.06281 3.479569 3.061841 1.720891 1.431183 1.139257 0.9739593 0.8857559 0.7909085 0.7123318 0.6630843 0.6163641 0.5723306 0.5442436 0.5254506 0.5046235 0.6600668 0.5916568 0.1053787 0.324299 0.3175806 0.3153523 0.3077486 0.2989039 0.2901882 0.2814592 0.2735063 0.2657846 0.2581551 0.2513817 0.2449855 0.2385924 0.2328572 0.2275815 0.2222788 0.2174162 0.213032 0.2086438 0.2045162 0.2008394 0.1972071 0.1937068
+0.01336695 0.1031739 0.161102 0.1321453 0.01981753 0.1171067 0.1886142 0.1606797 0.03154635 0.1368371 0.2308619 0.2080039 0.05647729 0.1650848 0.3020293 0.298915 0.1252055 0.1979204 0.440145 0.531184 0.4472874 0.1536818 0.299084 3.026 3.630765 3.02569 0.2925259 0.1586363 0.4468552 0.5274073 0.4351404 0.1946639 0.1232734 0.2943546 0.2986827 0.1671094 0.04655316 0.1966404 0.2236971 0.4124265 0.5511931 0.1922355 0.1696027 0.1094658 0.009561111 0.110151 0.1376044 0.08825763 0.01127217 0.09668601 0.1209163 0.07821067 0.008807753 0.08500987 0.1078743 0.07068328 0.00676251 0.07595107 0.0977652 0.06483985 0.005235482 0.06893886 0.0898722 0.06025163 0.004088641
+0.3260067 0.3363645 0.3473228 0.3584008 0.3717065 0.3864512 0.401035 0.4184498 0.438931 0.4590358 0.4825051 0.5122178 0.5418503 0.5749596 0.620894 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 3.06281 3.479569 3.061841 1.720891 1.431183 1.139257 0.9739593 0.8857559 0.7909085 0.7123318 0.6630843 0.6163641 0.5723306 0.5442436 0.5254506 0.5046235 0.6600668 0.5916568 0.1053787 0.324299 0.3175806 0.3153523 0.3077486 0.2989039 0.2901882 0.2814592 0.2735063 0.2657846 0.2581551 0.2513817 0.2449855 0.2385924 0.2328572 0.2275815 0.2222788 0.2174162 0.213032 0.2086438 0.2045162 0.2008394 0.1972071 0.1937068
+0.4438076 0.4559436 0.4704448 0.4847386 0.5020207 0.5190093 0.5398599 0.5602847 0.5858377 0.6107538 0.6427084 0.6736734 0.7147121 0.7541329 0.8087943 0.8606219 0.9373714 1.008648 1.125829 1.230708 1.440158 1.613244 2.198886 2.788961 2.987679 2.787503 2.195585 1.607394 1.433426 1.222683 1.117479 0.9998917 0.9291879 0.853102 0.8035754 0.7514675 0.7191642 0.6857824 0.6938878 0.7097453 0.6016893 0.4058476 0.4104768 0.4370055 0.4281905 0.4192973 0.4079929 0.3965591 0.3857173 0.3747567 0.3649065 0.3549583 0.346147 0.3372574 0.3294108 0.3215023 0.3145201 0.3074889 0.3012713 0.2950149 0.2894724 0.2838991 0.2789537 0.2739837 0.2695685
+0.3260067 0.3363644 0.3473228 0.3584008 0.3717064 0.3864512 0.4010351 0.4184499 0.4389309 0.4590358 0.4825051 0.5122178 0.5418502 0.5749596 0.6208939 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 1.914222 1.97871 1.912684 1.720891 1.431183 1.139257 0.9739592 0.885756 0.7909085 0.7123318 0.6630843 0.6163642 0.5723305 0.5442435 0.5254506 0.5046235 0.4722382 0.4203468 0.3605282 0.3242991 0.3175806 0.3153524 0.3077487 0.2989038 0.2901882 0.2814592 0.2735062 0.2657845 0.2581551 0.2513816 0.2449855 0.2385921 0.2328572 0.2275815 0.2222787 0.2174161 0.213032 0.2086437 0.2045162 0.2008394 0.1972071 0.1937068
+0.0133671 0.103174 0.161102 0.1321454 0.01981753 0.1171069 0.1886141 0.1606799 0.03154613 0.1368369 0.230862 0.208004 0.05647711 0.1650847 0.3020293 0.298915 0.1252058 0.1979204 0.4401451 0.5311838 0.4472875 0.1536819 0.2990841 0.5738236 0.6613865 0.5702119 0.2925259 0.1586363 0.4468553 0.5274072 0.4351405 0.1946639 0.1232734 0.2943546 0.2986827 0.1671092 0.04655298 0.1966405 0.2236971 0.1398044 0.01435895 0.1384342 0.1696025 0.109466 0.009560954 0.1101514 0.1376043 0.08825757 0.01127213 0.09668601 0.1209162 0.07821064 0.008807627 0.0850097 0.1078746 0.07068323 0.006762736 0.07595089 0.09776526 0.06483996 0.005235632 0.0689388 0.08987227 0.0602516 0.004088645
+0.3260067 0.3363644 0.3473228 0.3584008 0.3717064 0.3864512 0.4010351 0.4184499 0.4389309 0.4590358 0.4825051 0.5122178 0.5418502 0.5749596 0.6208939 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 1.914222 1.97871 1.912684 1.720891 1.431183 1.139257 0.9739592 0.885756 0.7909085 0.7123318 0.6630843 0.6163642 0.5723305 0.5442435 0.5254506 0.5046235 0.4722382 0.4203468 0.3605282 0.3242991 0.3175806 0.3153524 0.3077487 0.2989038 0.2901882 0.2814592 0.2735062 0.2657845 0.2581551 0.2513816 0.2449855 0.2385921 0.2328572 0.2275815 0.2222787 0.2174161 0.213032 0.2086437 0.2045162 0.2008394 0.1972071 0.1937068
+0.4438076 0.4559436 0.4704448 0.4847386 0.5020207 0.5190093 0.5398599 0.5602847 0.5858377 0.6107538 0.6427084 0.6736734 0.7147121 0.7541329 0.8087943 0.8606219 0.9373714 1.008648 1.125829 1.230708 1.440158 1.613244 2.198886 2.788961 2.987679 2.787503 2.195585 1.607394 1.433426 1.222683 1.117479 0.9998917 0.9291879 0.853102 0.8035754 0.7514675 0.7191642 0.6857824 0.6938878 0.7097453 0.6016893 0.4058476 0.4104768 0.4370055 0.4281905 0.4192973 0.4079929 0.3965591 0.3857173 0.3747567 0.3649065 0.3549583 0.346147 0.3372574 0.3294108 0.3215023 0.3145201 0.3074889 0.3012713 0.2950149 0.2894724 0.2838991 0.2789537 0.2739837 0.2695685
+0.3260067 0.3363645 0.3473228 0.3584008 0.3717065 0.3864512 0.401035 0.4184498 0.438931 0.4590358 0.4825051 0.5122178 0.5418503 0.5749596 0.620894 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 3.06281 3.479569 3.061841 1.720891 1.431183 1.139257 0.9739593 0.8857559 0.7909085 0.7123318 0.6630843 0.6163641 0.5723306 0.5442436 0.5254506 0.5046235 0.6600668 0.5916568 0.1053787 0.324299 0.3175806 0.3153523 0.3077486 0.2989039 0.2901882 0.2814592 0.2735063 0.2657846 0.2581551 0.2513817 0.2449855 0.2385924 0.2328572 0.2275815 0.2222788 0.2174162 0.213032 0.2086438 0.2045162 0.2008394 0.1972071 0.1937068
+0.07889044 0.08153418 0.08419043 0.08701882 0.09030894 0.09435995 0.09932118 0.1050815 0.1113084 0.1176306 0.1239187 0.1305645 0.1386389 0.1497532 0.1654913 0.1866337 0.2127252 0.2422527 0.2731474 0.3032434 0.3305583 0.3534314 0.3705729 3.007106 3.643108 3.00695 0.3692689 0.3515675 0.3282436 0.300618 0.2703725 0.239492 0.210109 0.1842086 0.1631676 0.1472882 0.1356852 0.1267589 0.1189501 0.3679682 0.5516769 0.2577798 0.08846281 0.08238595 0.07764257 0.07410715 0.07139895 0.06908786 0.06687377 0.06464756 0.06245382 0.06040037 0.05856909 0.05696621 0.05552716 0.0541646 0.05281365 0.05146411 0.05015175 0.04893123 0.04783951 0.04687591 0.0460047 0.04517756 0.04435825
+1.564492e-07 1.122885e-07 8.888702e-08 1.762501e-07 8.600116e-09 1.938031e-07 2.387619e-07 2.871269e-07 2.21893e-07 1.239548e-07 8.498547e-08 5.176805e-08 1.897708e-07 8.59346e-08 4.070753e-08 7.402088e-08 2.278317e-07 8.807672e-08 9.716474e-08 1.372642e-07 1.501702e-07 2.28554e-08 9.673891e-08 2.987679 3.6553 2.987679 1.266367e-07 1.456e-08 5.034181e-08 2.597982e-07 1.838301e-07 6.343753e-08 8.150528e-08 5.003254e-09 9.525829e-08 2.182821e-07 1.843611e-07 1.385024e-08 6.419893e-09 0.3078006 0.542824 0.3078008 2.254647e-07 1.478404e-07 1.590093e-07 3.480241e-07 1.698739e-07 5.31006e-08 4.452434e-08 4.024321e-09 5.150024e-08 2.914635e-08 1.276427e-07 1.82646e-07 3.983404e-07 5.450418e-08 2.266521e-07 1.942691e-07 7.255392e-08 1.167995e-07 1.510639e-07 6.353541e-08 7.878904e-08 3.480657e-08 4.585462e-09
+1.564492e-07 1.122886e-07 8.888708e-08 1.762499e-07 8.600304e-09 1.938035e-07 2.387625e-07 2.871271e-07 2.21893e-07 1.239546e-07 8.49849e-08 5.176842e-08 1.89771e-07 8.593476e-08 4.070759e-08 7.402079e-08 2.278317e-07 8.807682e-08 9.716468e-08 1.372644e-07 1.501704e-07 2.285502e-08 9.673834e-08 2.987679 3.6553 2.987679 1.266362e-07 1.456037e-08 5.034163e-08 2.59798e-07 1.838302e-07 6.343743e-08 8.150528e-08 5.003165e-09 9.525835e-08 2.182819e-07 1.843609e-07 1.384986e-08 6.420458e-09 0.3078006 0.542824 0.3078008 2.254642e-07 1.478401e-07 1.590095e-07 3.480242e-07 1.698738e-07 5.310068e-08 4.452434e-08 4.024231e-09 5.150018e-08 2.914619e-08 1.276425e-07 1.826464e-07 3.98341e-07 5.45043e-08 2.266521e-07 1.942692e-07 7.255448e-08 1.167991e-07 1.510637e-07 6.353525e-08 7.87891e-08 3.480666e-08 4.585462e-09
+1.564492e-07 1.122883e-07 8.888687e-08 1.762498e-07 8.600378e-09 1.938033e-07 2.387621e-07 2.87127e-07 2.21893e-07 1.239547e-07 8.498525e-08 5.176826e-08 1.89771e-07 8.593487e-08 4.070738e-08 7.402101e-08 2.278317e-07 8.80766e-08 9.716489e-08 1.372645e-07 1.501704e-07 2.285518e-08 9.673868e-08 2.987679 3.6553 2.987679 1.266365e-07 1.456021e-08 5.034155e-08 2.597979e-07 1.8383e-07 6.343765e-08 8.150528e-08 5.003383e-09 9.525814e-08 2.182818e-07 1.843608e-07 1.385002e-08 6.420119e-09 0.3078006 0.542824 0.3078008 2.254645e-07 1.478402e-07 1.590096e-07 3.480243e-07 1.69874e-07 5.310046e-08 4.452434e-08 4.02445e-09 5.150039e-08 2.914608e-08 1.276425e-07 1.826463e-07 3.983406e-07 5.450425e-08 2.266521e-07 1.942691e-07 7.255414e-08 1.167992e-07 1.510636e-07 6.353514e-08 7.878889e-08 3.480644e-08 4.585462e-09
+1.564492e-07 1.122883e-07 8.888674e-08 1.762497e-07 8.60019e-09 1.938031e-07 2.387623e-07 2.871273e-07 2.21893e-07 1.239544e-07 8.498511e-08 5.176805e-08 1.897708e-07 8.593494e-08 4.070725e-08 7.402105e-08 2.278317e-07 8.807655e-08 9.716502e-08 1.372645e-07 1.501702e-07 2.285539e-08 9.673855e-08 2.987679 3.6553 2.987679 1.266364e-07 1.456e-08 5.034174e-08 2.597978e-07 1.838298e-07 6.343769e-08 8.150528e-08 5.00342e-09 9.525801e-08 2.182817e-07 1.84361e-07 1.385023e-08 6.420252e-09 0.3078006 0.542824 0.3078008 2.254644e-07 1.478404e-07 1.590094e-07 3.480244e-07 1.698741e-07 5.310043e-08 4.452434e-08 4.024487e-09 5.150052e-08 2.914602e-08 1.276427e-07 1.82646e-07 3.983407e-07 5.450456e-08 2.266521e-07 1.942695e-07 7.255427e-08 1.167994e-07 1.510638e-07 6.353508e-08 7.878877e-08 3.48064e-08 4.585462e-09
+1.564492e-07 1.122884e-07 8.888679e-08 1.762497e-07 8.600452e-09 1.938035e-07 2.387627e-07 2.871276e-07 2.21893e-07 1.239541e-07 8.49847e-08 5.176846e-08 1.897711e-07 8.593501e-08 4.07073e-08 7.402098e-08 2.278317e-07 8.807663e-08 9.716497e-08 1.372646e-07 1.501705e-07 2.285498e-08 9.673813e-08 2.987679 3.6553 2.987679 1.266359e-07 1.456041e-08 5.034148e-08 2.597978e-07 1.838299e-07 6.343762e-08 8.150528e-08 5.003356e-09 9.525806e-08 2.182816e-07 1.843608e-07 1.384982e-08 6.42067e-09 0.3078006 0.542824 0.3078008 2.254639e-07 1.4784e-07 1.590097e-07 3.480245e-07 1.698741e-07 5.310049e-08 4.452434e-08 4.024423e-09 5.150047e-08 2.914594e-08 1.276424e-07 1.826465e-07 3.983412e-07 5.450482e-08 2.266521e-07 1.942697e-07 7.255469e-08 1.16799e-07 1.510635e-07 6.3535e-08 7.878881e-08 3.480647e-08 4.585462e-09
+1.564492e-07 1.122884e-07 8.888694e-08 1.762497e-07 8.600463e-09 1.938032e-07 2.387621e-07 2.871272e-07 2.21893e-07 1.239545e-07 8.498531e-08 5.17681e-08 1.897711e-07 8.593498e-08 4.070744e-08 7.402095e-08 2.278317e-07 8.807665e-08 9.716483e-08 1.372646e-07 1.501705e-07 2.285535e-08 9.673875e-08 2.987679 3.6553 2.987679 1.266366e-07 1.456004e-08 5.034147e-08 2.597978e-07 1.8383e-07 6.34376e-08 8.150528e-08 5.003324e-09 9.52582e-08 2.182817e-07 1.843607e-07 1.385019e-08 6.420059e-09 0.3078006 0.542824 0.3078008 2.254646e-07 1.478404e-07 1.590097e-07 3.480245e-07 1.698739e-07 5.310052e-08 4.452434e-08 4.024391e-09 5.150033e-08 2.914598e-08 1.276424e-07 1.826461e-07 3.983406e-07 5.450446e-08 2.266521e-07 1.942694e-07 7.255408e-08 1.167994e-07 1.510635e-07 6.353503e-08 7.878896e-08 3.48065e-08 4.585462e-09
+1.564492e-07 1.122886e-07 8.888708e-08 1.762499e-07 8.600294e-09 1.938035e-07 2.387625e-07 2.871271e-07 2.21893e-07 1.239546e-07 8.498491e-08 5.176843e-08 1.89771e-07 8.593477e-08 4.070759e-08 7.40208e-08 2.278317e-07 8.807681e-08 9.716467e-08 1.372644e-07 1.501703e-07 2.285501e-08 9.673835e-08 2.987679 3.6553 2.987679 1.266362e-07 1.456038e-08 5.034164e-08 2.59798e-07 1.838302e-07 6.343744e-08 8.150528e-08 5.003168e-09 9.525836e-08 2.182819e-07 1.843609e-07 1.384985e-08 6.420451e-09 0.3078006 0.542824 0.3078008 2.254642e-07 1.478401e-07 1.590095e-07 3.480242e-07 1.698738e-07 5.310068e-08 4.452434e-08 4.024235e-09 5.150017e-08 2.914619e-08 1.276426e-07 1.826464e-07 3.983409e-07 5.450431e-08 2.266521e-07 1.942692e-07 7.255447e-08 1.167991e-07 1.510637e-07 6.353525e-08 7.878911e-08 3.480665e-08 4.585462e-09
+0.07889044 0.08153418 0.08419043 0.08701882 0.09030894 0.09435995 0.09932118 0.1050815 0.1113084 0.1176306 0.1239187 0.1305645 0.1386389 0.1497532 0.1654913 0.1866337 0.2127252 0.2422527 0.2731474 0.3032434 0.3305583 0.3534314 0.3705729 3.007106 3.643108 3.00695 0.3692689 0.3515675 0.3282436 0.300618 0.2703725 0.239492 0.210109 0.1842086 0.1631676 0.1472882 0.1356852 0.1267589 0.1189501 0.3679682 0.5516769 0.2577798 0.08846281 0.08238595 0.07764257 0.07410715 0.07139895 0.06908786 0.06687377 0.06464756 0.06245382 0.06040037 0.05856909 0.05696621 0.05552716 0.0541646 0.05281365 0.05146411 0.05015175 0.04893123 0.04783951 0.04687591 0.0460047 0.04517756 0.04435825
+0.3260067 0.3363645 0.3473228 0.3584008 0.3717065 0.3864512 0.401035 0.4184498 0.438931 0.4590358 0.4825051 0.5122178 0.5418503 0.5749596 0.620894 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 3.06281 3.479569 3.061841 1.720891 1.431183 1.139257 0.9739593 0.8857559 0.7909085 0.7123318 0.6630843 0.6163641 0.5723306 0.5442436 0.5254506 0.5046235 0.6600668 0.5916568 0.1053787 0.324299 0.3175806 0.3153523 0.3077486 0.2989039 0.2901882 0.2814592 0.2735063 0.2657846 0.2581551 0.2513817 0.2449855 0.2385924 0.2328572 0.2275815 0.2222788 0.2174162 0.213032 0.2086438 0.2045162 0.2008394 0.1972071 0.1937068
+0.4438076 0.4559436 0.4704448 0.4847386 0.5020207 0.5190093 0.5398599 0.5602847 0.5858377 0.6107538 0.6427084 0.6736734 0.7147121 0.7541329 0.8087943 0.8606219 0.9373714 1.008648 1.125829 1.230708 1.440158 1.613244 2.198886 2.788961 2.987679 2.787503 2.195585 1.607394 1.433426 1.222683 1.117479 0.9998917 0.9291879 0.853102 0.8035754 0.7514675 0.7191642 0.6857824 0.6938878 0.7097453 0.6016893 0.4058476 0.4104768 0.4370055 0.4281905 0.4192973 0.4079929 0.3965591 0.3857173 0.3747567 0.3649065 0.3549583 0.346147 0.3372574 0.3294108 0.3215023 0.3145201 0.3074889 0.3012713 0.2950149 0.2894724 0.2838991 0.2789537 0.2739837 0.2695685
+0.3260067 0.3363644 0.3473228 0.3584008 0.3717064 0.3864512 0.4010351 0.4184499 0.4389309 0.4590358 0.4825051 0.5122178 0.5418502 0.5749596 0.6208939 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 1.914222 1.97871 1.912684 1.720891 1.431183 1.139257 0.9739592 0.885756 0.7909085 0.7123318 0.6630843 0.6163642 0.5723305 0.5442435 0.5254506 0.5046235 0.4722382 0.4203468 0.3605282 0.3242991 0.3175806 0.3153524 0.3077487 0.2989038 0.2901882 0.2814592 0.2735062 0.2657845 0.2581551 0.2513816 0.2449855 0.2385921 0.2328572 0.2275815 0.2222787 0.2174161 0.213032 0.2086437 0.2045162 0.2008394 0.1972071 0.1937068
+0.0133671 0.103174 0.161102 0.1321454 0.01981753 0.1171069 0.1886141 0.1606799 0.03154613 0.1368369 0.230862 0.208004 0.05647711 0.1650847 0.3020293 0.298915 0.1252058 0.1979204 0.4401451 0.5311838 0.4472875 0.1536819 0.2990841 0.5738236 0.6613865 0.5702119 0.2925259 0.1586363 0.4468553 0.5274072 0.4351405 0.1946639 0.1232734 0.2943546 0.2986827 0.1671092 0.04655298 0.1966405 0.2236971 0.1398044 0.01435895 0.1384342 0.1696025 0.109466 0.009560954 0.1101514 0.1376043 0.08825757 0.01127213 0.09668601 0.1209162 0.07821064 0.008807627 0.0850097 0.1078746 0.07068323 0.006762736 0.07595089 0.09776526 0.06483996 0.005235632 0.0689388 0.08987227 0.0602516 0.004088645
+0.3260067 0.3363644 0.3473228 0.3584008 0.3717064 0.3864512 0.4010351 0.4184499 0.4389309 0.4590358 0.4825051 0.5122178 0.5418502 0.5749596 0.6208939 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 1.914222 1.97871 1.912684 1.720891 1.431183 1.139257 0.9739592 0.885756 0.7909085 0.7123318 0.6630843 0.6163642 0.5723305 0.5442435 0.5254506 0.5046235 0.4722382 0.4203468 0.3605282 0.3242991 0.3175806 0.3153524 0.3077487 0.2989038 0.2901882 0.2814592 0.2735062 0.2657845 0.2581551 0.2513816 0.2449855 0.2385921 0.2328572 0.2275815 0.2222787 0.2174161 0.213032 0.2086437 0.2045162 0.2008394 0.1972071 0.1937068
+0.4438076 0.4559436 0.4704448 0.4847386 0.5020207 0.5190093 0.5398599 0.5602847 0.5858377 0.6107538 0.6427084 0.6736734 0.7147121 0.7541329 0.8087943 0.8606219 0.9373714 1.008648 1.125829 1.230708 1.440158 1.613244 2.198886 2.788961 2.987679 2.787503 2.195585 1.607394 1.433426 1.222683 1.117479 0.9998917 0.9291879 0.853102 0.8035754 0.7514675 0.7191642 0.6857824 0.6938878 0.7097453 0.6016893 0.4058476 0.4104768 0.4370055 0.4281905 0.4192973 0.4079929 0.3965591 0.3857173 0.3747567 0.3649065 0.3549583 0.346147 0.3372574 0.3294108 0.3215023 0.3145201 0.3074889 0.3012713 0.2950149 0.2894724 0.2838991 0.2789537 0.2739837 0.2695685
+0.3260067 0.3363645 0.3473228 0.3584008 0.3717065 0.3864512 0.401035 0.4184498 0.438931 0.4590358 0.4825051 0.5122178 0.5418503 0.5749596 0.620894 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 3.06281 3.479569 3.061841 1.720891 1.431183 1.139257 0.9739593 0.8857559 0.7909085 0.7123318 0.6630843 0.6163641 0.5723306 0.5442436 0.5254506 0.5046235 0.6600668 0.5916568 0.1053787 0.324299 0.3175806 0.3153523 0.3077486 0.2989039 0.2901882 0.2814592 0.2735063 0.2657846 0.2581551 0.2513817 0.2449855 0.2385924 0.2328572 0.2275815 0.2222788 0.2174162 0.213032 0.2086438 0.2045162 0.2008394 0.1972071 0.1937068
+0.01336695 0.1031739 0.161102 0.1321453 0.01981753 0.1171067 0.1886142 0.1606797 0.03154635 0.1368371 0.2308619 0.2080039 0.05647729 0.1650848 0.3020293 0.298915 0.1252055 0.1979204 0.440145 0.531184 0.4472874 0.1536818 0.299084 3.026 3.630765 3.02569 0.2925259 0.1586363 0.4468552 0.5274073 0.4351404 0.1946639 0.1232734 0.2943546 0.2986827 0.1671094 0.04655316 0.1966404 0.2236971 0.4124265 0.5511931 0.1922355 0.1696027 0.1094658 0.009561111 0.110151 0.1376044 0.08825763 0.01127217 0.09668601 0.1209163 0.07821067 0.008807753 0.08500987 0.1078743 0.07068328 0.00676251 0.07595107 0.0977652 0.06483985 0.005235482 0.06893886 0.0898722 0.06025163 0.004088641
+0.3260067 0.3363645 0.3473228 0.3584008 0.3717065 0.3864512 0.401035 0.4184498 0.438931 0.4590358 0.4825051 0.5122178 0.5418503 0.5749596 0.620894 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 3.06281 3.479569 3.061841 1.720891 1.431183 1.139257 0.9739593 0.8857559 0.7909085 0.7123318 0.6630843 0.6163641 0.5723306 0.5442436 0.5254506 0.5046235 0.6600668 0.5916568 0.1053787 0.324299 0.3175806 0.3153523 0.3077486 0.2989039 0.2901882 0.2814592 0.2735063 0.2657846 0.2581551 0.2513817 0.2449855 0.2385924 0.2328572 0.2275815 0.2222788 0.2174162 0.213032 0.2086438 0.2045162 0.2008394 0.1972071 0.1937068
+0.4438076 0.4559436 0.4704448 0.4847386 0.5020207 0.5190093 0.5398599 0.5602847 0.5858377 0.6107538 0.6427084 0.6736734 0.7147121 0.7541329 0.8087943 0.8606219 0.9373714 1.008648 1.125829 1.230708 1.440158 1.613244 2.198886 2.788961 2.987679 2.787503 2.195585 1.607394 1.433426 1.222683 1.117479 0.9998917 0.9291879 0.853102 0.8035754 0.7514675 0.7191642 0.6857824 0.6938878 0.7097453 0.6016893 0.4058476 0.4104768 0.4370055 0.4281905 0.4192973 0.4079929 0.3965591 0.3857173 0.3747567 0.3649065 0.3549583 0.346147 0.3372574 0.3294108 0.3215023 0.3145201 0.3074889 0.3012713 0.2950149 0.2894724 0.2838991 0.2789537 0.2739837 0.2695685
+0.3260067 0.3363644 0.3473228 0.3584008 0.3717064 0.3864512 0.4010351 0.4184499 0.4389309 0.4590358 0.4825051 0.5122178 0.5418502 0.5749596 0.6208939 0.6692876 0.7196215 0.7983373 0.8930331 0.9810481 1.1455 1.435858 1.723972 1.914222 1.97871 1.912684 1.720891 1.431183 1.139257 0.9739592 0.885756 0.7909085 0.7123318 0.6630843 0.6163642 0.5723305 0.5442435 0.5254506 0.5046235 0.4722382 0.4203468 0.3605282 0.3242991 0.3175806 0.3153524 0.3077487 0.2989038 0.2901882 0.2814592 0.2735062 0.2657845 0.2581551 0.2513816 0.2449855 0.2385921 0.2328572 0.2275815 0.2222787 0.2174161 0.213032 0.2086437 0.2045162 0.2008394 0.1972071 0.1937068
+0.07889045 0.08153424 0.08419035 0.08701893 0.09030894 0.09436007 0.09932096 0.1050817 0.1113084 0.1176305 0.1239188 0.1305645 0.1386389 0.1497532 0.1654913 0.1866336 0.2127252 0.2422527 0.2731474 0.3032433 0.3305584 0.3534314 0.3705729 0.3810754 0.3844073 0.3804049 0.3692688 0.3515675 0.3282437 0.3006178 0.2703726 0.239492 0.2101091 0.1842086 0.1631677 0.1472881 0.1356851 0.126759 0.1189501 0.1112676 0.1034146 0.09563871 0.0884626 0.08238604 0.07764256 0.07410739 0.07139879 0.06908784 0.06687377 0.06464756 0.06245377 0.06040035 0.05856907 0.05696608 0.05552753 0.05416456 0.05281367 0.05146397 0.05015182 0.0489313 0.04783952 0.04687586 0.04600478 0.04517753 0.04435825
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/Components.kt

@@ -27,13 +27,18 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.CircularProgressIndicator
@@ -71,6 +76,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalWindowInfo
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
@@ -143,7 +150,7 @@ fun RowScope.NextPassRow(pass: OrbitalPass, modifier: Modifier = Modifier, isUtc
         if (isUtc) TimeZone.getTimeZone("UTC") else TimeZone.getDefault()
     }
     val sdfTime = remember(isUtc) {
-        SimpleDateFormat("HH:mm:ss", Locale.ENGLISH).also { it.timeZone = timeZone }
+        SimpleDateFormat("HH:mm:ss", displayLocale()).also { it.timeZone = timeZone }
     }
     ElevatedCard(
         modifier = modifier
@@ -209,6 +216,11 @@ fun RowScope.NextPassRow(pass: OrbitalPass, modifier: Modifier = Modifier, isUtc
     }
 }
 
+private fun displayLocale(): Locale {
+    val locale = Locale.getDefault()
+    return if (locale.language == Locale.CHINESE.language) locale else Locale.ENGLISH
+}
+
 @Composable
 fun CardButton(onClick: () -> Unit, text: String, modifier: Modifier = Modifier) {
     ElevatedButton(
@@ -224,8 +236,13 @@ fun CardButton(onClick: () -> Unit, text: String, modifier: Modifier = Modifier)
 }
 
 @Composable
-fun IconCard(action: () -> Unit, resId: Int, modifier: Modifier = Modifier, enabled: Boolean = true) {
-    ElevatedCard(modifier = Modifier.size(48.dp), enabled = enabled, onClick = action) {
+fun IconCard(
+    action: () -> Unit, resId: Int, modifier: Modifier = Modifier,
+    enabled: Boolean = true, containerColor: Color = Color.Unspecified
+) {
+    val colors = if (containerColor == Color.Unspecified) CardDefaults.elevatedCardColors()
+    else CardDefaults.elevatedCardColors(containerColor = containerColor)
+    ElevatedCard(modifier = Modifier.size(48.dp), enabled = enabled, onClick = action, colors = colors) {
         Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
             Icon(painter = painterResource(resId), contentDescription = null, modifier = modifier)
         }
@@ -280,6 +297,35 @@ fun getDefaultPass(): OrbitalPass = OrbitalPass(
     altitude = 0, maxElevation = 0.0, orbitalObject = NearEarthObject(defaultOrbitalData), progress = 0f
 )
 
+@Composable
+fun InfoDialog(
+    title: String,
+    onDismiss: () -> Unit,
+    onAccept: () -> Unit,
+    content: @Composable () -> Unit
+) {
+    DialogShell(onDismissRequest = onDismiss) { padding ->
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(start = padding, top = padding, end = padding)
+        ) {
+            Text(
+                text = title,
+                fontSize = 16.sp,
+                fontWeight = FontWeight.Medium,
+                color = MaterialTheme.colorScheme.primary,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier.weight(1f)
+            )
+            CardButton(onClick = onAccept, text = stringResource(R.string.btn_accept))
+        }
+        content()
+    }
+}
+
 @Composable
 fun SharedDialog(
     title: String, onCancel: () -> Unit, onAccept: () -> Unit, content: @Composable () -> Unit
@@ -329,6 +375,56 @@ fun SharedDialog(
     }
 }
 
+@Composable
+fun ConfirmDialog(
+    title: String,
+    onCancel: () -> Unit,
+    onAccept: () -> Unit,
+    content: @Composable () -> Unit
+) {
+    DialogShell(onDismissRequest = onCancel) { padding ->
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(start = padding, top = padding, end = padding)
+        ) {
+            CardButton(onClick = onCancel, text = stringResource(R.string.btn_cancel))
+            Text(
+                text = title,
+                fontSize = 16.sp,
+                fontWeight = FontWeight.Medium,
+                color = MaterialTheme.colorScheme.primary,
+                textAlign = TextAlign.Center,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier
+                    .weight(1f)
+                    .padding(horizontal = padding)
+            )
+            CardButton(onClick = onAccept, text = stringResource(R.string.btn_accept))
+        }
+        content()
+    }
+}
+
+@Composable
+fun WhatsNewDialog(onDismiss: () -> Unit) {
+    InfoDialog(
+        title = stringResource(R.string.pass_whatsnew_title),
+        onDismiss = onDismiss,
+        onAccept = onDismiss
+    ) {
+        Text(
+            text = stringResource(R.string.pass_whatsnew_message),
+            fontSize = 16.sp,
+            color = MaterialTheme.colorScheme.onSurface,
+            modifier = Modifier.padding(horizontal = LocalSpacing.current.large)
+        )
+        Spacer(modifier = Modifier.height(0.dp))
+    }
+}
+
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun DialogShell(
@@ -337,6 +433,9 @@ private fun DialogShell(
 ) {
     val padding = LocalSpacing.current.large
     val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    val statusBarHeight = WindowInsets.statusBars.asPaddingValues().calculateTopPadding()
+    val containerHeight = with(LocalDensity.current) { LocalWindowInfo.current.containerSize.height.toDp() }
+    val maxSheetHeight = containerHeight - statusBarHeight
     val stopSheetFling = remember {
         object : NestedScrollConnection {
             override suspend fun onPostFling(consumed: Velocity, available: Velocity): Velocity {
@@ -354,7 +453,7 @@ private fun DialogShell(
         onDismissRequest = onDismissRequest,
         sheetState = sheetState,
         dragHandle = null,
-        shape = MaterialTheme.shapes.medium,
+        shape = RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp),
         scrimColor = Color.Black.copy(alpha = 0.64f)
     ) {
         Column(
@@ -362,6 +461,7 @@ private fun DialogShell(
             verticalArrangement = Arrangement.spacedBy(padding),
             modifier = Modifier
                 .fillMaxWidth()
+                .heightIn(max = maxSheetHeight)
                 .nestedScroll(stopSheetFling)
         ) {
             content(padding)

core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/MainTheme.kt

@@ -79,6 +79,10 @@ private val lightScheme = lightColorScheme(
     onSecondary = Color(0xFFFFFFFF),
     secondaryContainer = Color(0xFFF1E1BB),
     onSecondaryContainer = Color(0xFF221B04),
+    tertiary = Color(0xFF3C6FE0), // AMSAT Active (darker for light theme)
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFFE09800), // AMSAT Telemetry (darker)
+    onTertiaryContainer = Color(0xFF000000),
     background = Color(0xFFFFF8F0),
     onBackground = Color(0xFF1E1B13),
     surface = Color(0xFFFFF8F0),
@@ -101,10 +105,10 @@ private val darkScheme = darkColorScheme(
     onSecondary = Color(0xFF000000),
     secondaryContainer = Color(0xFF404040), // navBar indicator,
     onSecondaryContainer = Color(0xFFE0E0E0), // navBar active icon
-//    tertiary = Color(0xFF121212),
-//    onTertiary = Color(0xFF121212),
-//    tertiaryContainer = Color(0xFF121212),
-//    onTertiaryContainer = Color(0xFF121212),
+    tertiary = Color(0xFF648FFF), // AMSAT Active (from amsat.org/status)
+    onTertiary = Color(0xFF000000),
+    tertiaryContainer = Color(0xFFFFB000), // AMSAT Telemetry
+    onTertiaryContainer = Color(0xFF000000),
     background = Color(0xFF121212),
     onBackground = Color(0xFFE0E0E0),
     surface = Color(0xFF202020), // card background

core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/Navigation.kt

@@ -24,13 +24,13 @@ import kotlinx.serialization.Serializable
 sealed class Screen(val iconResId: Int, val titleResId: Int, val screenId: String) : NavKey {
 
     @Serializable
-    data object Satellites : Screen(R.drawable.ic_satellites, R.string.nav_sat, "Satellites")
+    data object Satellites : Screen(R.drawable.ic_sputnik, R.string.nav_sat, "Satellites")
 
     @Serializable
     data object Passes : Screen(R.drawable.ic_passes, R.string.nav_pass, "Passes")
 
     @Serializable
-    data object Radar : Screen(R.drawable.ic_radar, R.string.nav_radar, "Radar")
+    data object Radar : Screen(R.drawable.ic_satellite, R.string.nav_radar, "Radar")
 
     @Serializable
     data object Map : Screen(R.drawable.ic_map, R.string.nav_map, "Map")
@@ -48,18 +48,12 @@ sealed class Screen(val iconResId: Int, val titleResId: Int, val screenId: Strin
     data object WavelogLog : Screen(R.drawable.ic_log, R.string.nav_log, "WavelogLog")
 
     @Serializable
-    data object AmSat : Screen(R.drawable.ic_satellites, R.string.nav_amsat, "AMSAT")
+    data object AmSat : Screen(R.drawable.ic_satellite, R.string.nav_amsat, "AMSAT")
 
     @Serializable
     data object Settings : Screen(R.drawable.ic_settings, R.string.nav_prefs, "Settings")
 }
 
-// UI settings: default main-menu page order (5 bottom-bar slots)
-val defaultScreenOrder = listOf("Satellites", "Passes", "Radar", "Map", "Settings")
-
-// UI settings: default More-menu order (pages behind "More")
-val defaultSubMenuOrder = listOf("Mutual", "Roaming", "CwDecode", "WavelogLog", "AMSAT")
-
 @Serializable
 data object RadarDestination : NavKey
 

core/presentation/src/main/res/drawable/ic_add.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z" />
+</vector>

core/presentation/src/main/res/drawable/ic_like.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="15"
+    android:viewportHeight="15">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13.91,6.75c-1.17,2.25 -4.3,5.31 -6.07,6.94c-0.19,0.172 -0.48,0.172 -0.67,0C5.39,12.06 2.26,9 1.09,6.75C-1.48,1.8 5,-1.5 7.5,3.45C10,-1.5 16.48,1.8 13.91,6.75z" />
+</vector>

core/presentation/src/main/res/drawable/ic_pound.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M14,21c1.93,0 3.62,-1.17 4,-3l-1.75,-0.88C16,18.21 15.33,19 14,19l-4.9,0c0.83,-1 1.5,-2.34 1.5,-4c0,-0.35 -0.03,-0.69 -0.08,-1L14,14v-2l-4.18,0C9,10.42 8,9.6 8,8c0,-1.93 1.57,-3.5 3.5,-3.5c1.5,0 2.79,0.95 3.28,2.28L16.63,6c-0.8,-2.05 -2.79,-3.5 -5.13,-3.5C8.46,2.5 6,4.96 6,8c0,1.78 0.79,2.9 1.49,4L6,12v2l2.47,0c0.08,0.31 0.13,0.64 0.13,1c0,2.7 -2.6,4 -2.6,4v2H14z" />
-</vector>

core/presentation/src/main/res/drawable/ic_radar.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80L520,80L520,411Q538,422 549,439.5Q560,457 560,480Q560,513 536.5,536.5Q513,560 480,560Q447,560 423.5,536.5Q400,513 400,480Q400,457 411,439Q422,421 440,411L440,325Q388,339 354,381.5Q320,424 320,480Q320,546 367,593Q414,640 480,640Q546,640 593,593Q640,546 640,480Q640,444 625.5,413.5Q611,383 586,360L643,303Q678,336 699,381.5Q720,427 720,480Q720,580 650,650Q580,720 480,720Q380,720 310,650Q240,580 240,480Q240,390 297,323.5Q354,257 440,243L440,162Q321,177 240.5,267Q160,357 160,480Q160,614 253,707Q346,800 480,800Q614,800 707,707Q800,614 800,480Q800,411 773,351Q746,291 699,247L756,190Q813,245 846.5,319.5Q880,394 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Z" />
-</vector>

core/presentation/src/main/res/drawable/ic_refresh.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Standard Material refresh icon (24dp viewport), centered geometry -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
->
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@android:color/white"
         android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z" />
 </vector>

core/presentation/src/main/res/drawable/ic_satellite.xml

@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:pathData="m105.14,114.12a2.86,2.86 90,0 0,1.7 -0.85l19.33,-19.33a2.86,2.86 90,0 0,-0 -4.03l-26.58,-26.62a2.86,2.86 90,0 0,-1.84 -0.81l-7.92,-0.63 5.77,-5.77a2.86,2.86 90,0 0,-0 -4.03l-19.6,-19.64a2.86,2.86 90,0 0,-4.07 -0l-5.77,5.77 -0.63,-7.92a2.86,2.86 90,0 0,-0.81 -1.83l-26.63,-26.58a2.86,2.86 90,0 0,-4.07 -0l-19.29,19.29a2.86,2.86 90,0 0,-0 4.07l26.58,26.62a2.86,2.86 90,0 0,1.83 0.81l7.92,0.63 -5.77,5.77a2.86,2.86 90,0 0,-0 4.07l19.6,19.6a2.86,2.86 90,0 0,4.07 -0l5.77,-5.77 0.63,7.92a2.86,2.86 90,0 0,0.81 1.83l26.63,26.58a2.86,2.86 90,0 0,2.06 0.85,2.86 2.86,90 0,0 0.27,-0zM104.82,107.23 L80.97,83.38 80.16,72.69 85.58,67.27 96.28,68.12 120.13,91.93zM55.33,47.85 L44.63,47 20.78,23.19 36.08,7.89 59.89,31.74 60.74,42.44z"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m62.65,115.81a2.86,2.86 90,1 0,-0 -5.73c-11.46,-0 -22.88,-4.35 -31.63,-13.11 -8.74,-8.74 -13.1,-20.17 -13.1,-31.61a2.86,2.86 90,1 0,-5.73 -0c-0,12.9 4.94,25.83 14.77,35.66 9.85,9.85 22.77,14.78 35.68,14.78z"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m62.65,127a2.86,2.86 90,1 0,-0 -5.73c-14.32,-0 -28.61,-5.44 -39.55,-16.37 -10.93,-10.93 -16.38,-25.23 -16.38,-39.54a2.86,2.86 90,1 0,-5.73 -0c-0,15.76 6.03,31.56 18.06,43.59 12.03,12.03 27.82,18.05 43.6,18.05z"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m62.65,104.7a2.86,2.86 90,1 0,-0 -5.73c-8.62,-0 -17.2,-3.26 -23.78,-9.84 -6.58,-6.58 -9.86,-15.17 -9.86,-23.77a2.86,2.86 90,1 0,-5.73 -0c-0,10.06 3.86,20.15 11.53,27.82 7.67,7.67 17.76,11.52 27.83,11.52z"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m62.65,93.48a2.86,2.86 90,1 0,-0 -5.73c-5.74,-0 -11.45,-2.17 -15.84,-6.56 -4.38,-4.38 -6.56,-10.1 -6.56,-15.83a2.86,2.86 90,1 0,-5.73 -0c-0,7.19 2.76,14.41 8.24,19.88 5.48,5.48 12.69,8.23 19.89,8.23z"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+</vector>

core/presentation/src/main/res/drawable/ic_tags.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M240,800L280,640L120,640L140,560L300,560L340,400L180,400L200,320L360,320L400,160L480,160L440,320L600,320L640,160L720,160L680,320L840,320L820,400L660,400L620,560L780,560L760,640L600,640L560,800L480,800L520,640L360,640L320,800L240,800ZM380,560L540,560L580,400L420,400L380,560Z" />
-</vector>

core/presentation/src/main/res/values-es/strings.xml

@@ -13,12 +13,16 @@
     <string name="nav_prefs">Ajustes</string>
 
     <!-- Satellites screen -->
-    <string name="sat_type_hint">Tipo: %s</string>
-    <string name="sat_type_title">Seleccionar tipo de satélite</string>
+    <string name="sat_type_hint">Modos: %s</string>
+    <string name="sat_type_title">Seleccionar modos</string>
     <string name="sat_search_hint">Id - Nombre</string>
     <string name="sat_search_clear">Vaciar</string>
     <string name="sat_clear_all">Vaciar todo</string>
     <string name="sat_select_all">Seleccionar todo</string>
+    <string name="sat_group_selected">Seleccionados</string>
+    <string name="sat_group_available">Disponibles</string>
+    <string name="sat_group_selected_count">Seleccionados (%1$d)</string>
+    <string name="sat_group_available_count">Disponibles (%1$d)</string>
     <string name="sat_empty_list_message">
         Asegúrese de que su consulta de búsqueda sea correcta y que la base de datos esté actualizada</string>
     <string name="sat_warning_title">Alarma\!</string>
@@ -26,7 +30,7 @@
         Esta aplicación incluye más de 9000 satélites.
         No tiene sentido rastrearlos todos a la vez.
         \n\nIntenta siempre limitar la lista a los que te
-        interesen mediante la búsqueda y el selector de tipos.</string>
+        interesen mediante la búsqueda y el selector de modos.</string>
 
     <!-- Passes screen -->
     <string name="pass_filter_title">Filtrar pases</string>
@@ -35,7 +39,7 @@
     <string name="pass_filter_aos_time">Ventana AOS</string>
     <string name="pass_filter_invert_time">Invertir ventana AOS</string>
     <string name="pass_filter_deep_space">DeepSpace (período &gt;225min)</string>
-    <string name="pass_modes_title">Tipo de modulación</string>
+    <string name="pass_modes_title">Seleccionar modos</string>
     <string name="pass_elevation">Elevación: %.1f°</string>
     <string name="pass_altitude">Altitud: %.0f km</string>
     <string name="pass_empty_list_message">
@@ -96,11 +100,11 @@
     <string name="prefs_loc_qth_title">QTH</string>
     <string name="prefs_loc_qth_error">Ubicación QTH no válida</string>
     <string name="prefs_loc_success">Ubicación actualizada con éxito</string>
-    <string name="prefs_station_title">Ajustar ubicaicón de la estación</string>
-    <string name="prefs_station_lat_text">Latitud de tu estación terrestre</string>
-    <string name="prefs_station_lon_text">Longitud de tu estación terrestre</string>
-    <string name="prefs_locator_title">Ajustes ubicación QTH</string>
-    <string name="prefs_locator_text">Ajustar posición de la estación con tu ubicación</string>
+    <string name="prefs_station_title">Ubicación de la estación</string>
+    <string name="prefs_station_lat_text">Latitud de estación</string>
+    <string name="prefs_station_lon_text">Longitud de estación</string>
+    <string name="prefs_locator_title">Localizador QTH</string>
+    <string name="prefs_locator_text">Posición por localizador</string>
 
     <string name="prefs_data_title">Datos satelitales</string>
     <string name="prefs_data_entries">Satélites: %s</string>
@@ -110,39 +114,52 @@
     <string name="prefs_data_clear">Vaciar</string>
     <string name="prefs_data_clear_success">Datos eliminados con éxito</string>
     <string name="prefs_data_update_success">Actualización completada con éxito</string>
+    <string name="prefs_data_import_satellites_error">No se importaron satélites. Usa un TLE/3LE (.txt) u OMM (.csv) válido.</string>
+    <string name="prefs_data_import_transceivers_error">No se importaron transceptores. Usa un SatNOGS (.json) válido.</string>
 
-    <string name="prefs_data_sources_title">Custom data sources</string>
-    <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>
-    <string name="prefs_data_sources_transceivers_switch">Custom transceivers URL</string>
+    <string name="prefs_data_sources_title">Fuentes personalizadas</string>
+    <string name="prefs_data_sources_tle_switch">URL TLE</string>
+    <string name="prefs_data_sources_transceivers_switch">URL transceptores</string>
+    <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>
 
-    <string name="prefs_data_output_title">Data output</string>
-    <string name="prefs_net_output">Network</string>
+    <string name="prefs_data_output_title">Salida de datos</string>
+    <string name="prefs_net_output">Red</string>
     <string name="prefs_bt_output">Bluetooth</string>
+    <string name="prefs_cat_output">CAT</string>
 
-    <string name="prefs_net_title">Salida de datos de red</string>
-    <string name="prefs_net_rotator_switch">Enable rotation output</string>
+    <string name="nav_radiocontrol">Control de radio</string>
+    <string name="rc_settings_title">Control CAT</string>
+    <string name="rc_radio_model">Modelo de radio</string>
+    <string name="rc_tx_device_hint">Dirección BT TX</string>
+    <string name="rc_rx_device_hint">Dirección BT RX</string>
+    <string name="rc_tx_name_hint">Nombre radio TX</string>
+    <string name="rc_rx_name_hint">Nombre radio RX</string>
+    <string name="rc_enable_switch">Activar CAT</string>
+
+    <string name="prefs_net_title">Salida de red</string>
+    <string name="prefs_net_rotator_switch">Activar salida de rotación</string>
     <string name="prefs_net_rotator_address_hint">IP:Puerto</string>
     <string name="prefs_net_rotator_format_hint">Formato de datos</string>
-    <string name="prefs_net_frequency_switch">Enable frequency output</string>
+    <string name="prefs_net_frequency_switch">Activar salida de frecuencia</string>
     <string name="prefs_net_frequency_address_hint">IP:Puerto</string>
     <string name="prefs_net_frequency_format_hint">Formato de datos</string>
 
-    <string name="prefs_bt_title">Salida por Bluetooth</string>
-    <string name="prefs_bt_rotator_switch">Enable rotation output</string>
-    <string name="prefs_bt_rotator_device_hint">Id dispositivo</string>
-    <string name="prefs_bt_rotator_output_hint">Formato de datos</string>
-    <string name="prefs_bt_frequency_switch">Enable frequency output</string>
-    <string name="prefs_bt_frequency_device_hint">Id dispositivo</string>
-    <string name="prefs_bt_frequency_output_hint">Formato de datos</string>
+    <string name="prefs_bt_title">Salida Bluetooth</string>
+    <string name="prefs_bt_rotator_switch">Activar salida de rotación</string>
+    <string name="prefs_bt_rotator_device_hint">ID dispositivo</string>
+    <string name="prefs_bt_rotator_output_hint">Formato</string>
+    <string name="prefs_bt_frequency_switch">Activar salida de frecuencia</string>
+    <string name="prefs_bt_frequency_device_hint">ID dispositivo</string>
+    <string name="prefs_bt_frequency_output_hint">Formato</string>
     <string name="prefs_bt_perm_error">Revisa los permisos de Bluetooth</string>
     <string name="prefs_net_perm_error">Revisa los permisos de red</string>
 
-    <string name="prefs_other_title">Otros ajustes</string>
-    <string name="prefs_other_switch_utc">Mostrar tiempos de pase en UTC</string>
-    <string name="prefs_other_switch_update">Habilitar auto actualización de datos</string>
-    <string name="prefs_other_switch_sweep">Habilitar animaciones radar</string>
-    <string name="prefs_other_switch_sensors">Usar sensores para rotar vista de radar</string>
-    <string name="prefs_other_switch_night_mode">Activar filtro nocturno rojo</string>
+    <string name="prefs_other_title">Otros</string>
+    <string name="prefs_other_switch_utc">Hora UTC</string>
+    <string name="prefs_other_switch_update">Actualización automática</string>
+    <string name="prefs_other_switch_sweep">Animación radar</string>
+    <string name="prefs_other_switch_sensors">Sensores</string>
+    <string name="prefs_other_switch_night_mode">Filtro nocturno</string>
 
     <string name="prefs_highlight_title">Resaltado de elevación</string>
     <string name="prefs_highlight_low">Baja &lt; %1$d°</string>

core/presentation/src/main/res/values-id/strings.xml

@@ -93,11 +93,22 @@
         \n\nPerbarui database setidaknya seminggu sekali untuk prediksi yang akurat.</string>
     <string name="pass_whatsnew_title" translatable="false">Apa yang baru di Look4Sat</string>
     <string name="pass_whatsnew_message" translatable="false">
-        * BARU: Status satelit AMSAT kini menggunakan API resmi AMSAT (v1 JSON, lebih cepat dan andal)
-        * Halaman status AMSAT kini mendukung layar penuh (tombol refresh dan waktu selalu dapat diakses)
-        * WaveLog: pencarian grid lawan QRZ (dialog ⚙ tempel Cookie + uji query)
-        * WaveLog: tombol perbarui daftar satelit LoTW (112 satelit bawaan)
-        * WaveLog: laporan sinyal RST 59/59 untuk QSO (v1 dan v2)
+        * BARU: Decoder CW kini memakai jaringan saraf DeepCW — jauh lebih baik menafsir Morse sinyal lemah
+        * BARU: menyertakan model fp32 penuh untuk akurasi tertinggi
+        * BARU: Riwayat CW tersimpan permanen (teks tidak lagi hilang)
+        * Waterfall CW: skema warna inferno baru dengan gradasi halus
+        * Menu Lainnya: panel ramping di kanan, tanpa lapisan gelap
+        * Halaman CW: tombol kembali yang tidak berfungsi dan baris status yang menyesatkan dihapus
+        * Dukungan 64-bit (arm64) dipulihkan
+        * Perbaikan: jeda/lanjut tidak lagi menampilkan galat "gagal menafsir" yang keliru
+        * Perbaikan: memindahkan halaman ke menu utama tidak lagi menyembunyikan Pengaturan secara permanen
+        * Perbaikan: AMSAT/WavelogLog kini dapat dipindahkan ke menu utama
+        * Perbaikan: penguraian epoch satelit untuk waktu dalam 86 detik pertama tengah malam UTC
+        * Perbaikan: halaman radar kini otomatis beralih ke pass berikutnya setelah pass saat ini berakhir
+        * Perbaikan: perhitungan Doppler radar kini menggunakan nilai slider offset langsung
+        * Perbaikan: perhitungan kemajuan pass dijaga terhadap pembagian dengan nol
+        * Perbaikan: panggilan calculatePasses bersamaan tidak lagi memicu perhitungan duplikat
+        * Perbaikan: pengiriman QSO duplikat WaveLog dan kondisi balapan pembaruan grid square
     </string>
     <string name="radar_back">Kembali</string>
     <string name="radar_notify">Beri tahu</string>
@@ -132,6 +143,8 @@
     <string name="radar_cw_start">Mulai</string>
     <string name="radar_cw_stop">Berhenti</string>
     <string name="radar_cw_reset">Bersihkan</string>
+    <string name="radar_cw_tone">Nada %1$d Hz</string>
+    <string name="radar_cw_waiting">Menunggu sinyal…</string>
     <string name="map_prev">Sebelumnya</string>
     <string name="map_next">Berikutnya</string>
     <string name="map_copyright" translatable="false">© Kontributor OpenStreetMap</string>

core/presentation/src/main/res/values-in/strings.xml

@@ -92,11 +92,22 @@
         \n\nPerbarui database setidaknya seminggu sekali untuk prediksi yang akurat.</string>
     <string name="pass_whatsnew_title" translatable="false">Apa yang baru di Look4Sat</string>
     <string name="pass_whatsnew_message" translatable="false">
-        * BARU: Status satelit AMSAT kini menggunakan API resmi AMSAT (v1 JSON, lebih cepat dan andal)
-        * Halaman status AMSAT kini mendukung layar penuh (tombol refresh dan waktu selalu dapat diakses)
-        * WaveLog: pencarian grid lawan QRZ (dialog ⚙ tempel Cookie + uji query)
-        * WaveLog: tombol perbarui daftar satelit LoTW (112 satelit bawaan)
-        * WaveLog: laporan sinyal RST 59/59 untuk QSO (v1 dan v2)
+        * BARU: Decoder CW kini memakai jaringan saraf DeepCW — jauh lebih baik menafsir Morse sinyal lemah
+        * BARU: menyertakan model fp32 penuh untuk akurasi tertinggi
+        * BARU: Riwayat CW tersimpan permanen (teks tidak lagi hilang)
+        * Waterfall CW: skema warna inferno baru dengan gradasi halus
+        * Menu Lainnya: panel ramping di kanan, tanpa lapisan gelap
+        * Halaman CW: tombol kembali yang tidak berfungsi dan baris status yang menyesatkan dihapus
+        * Dukungan 64-bit (arm64) dipulihkan
+        * Perbaikan: jeda/lanjut tidak lagi menampilkan galat "gagal menafsir" yang keliru
+        * Perbaikan: memindahkan halaman ke menu utama tidak lagi menyembunyikan Pengaturan secara permanen
+        * Perbaikan: AMSAT/WavelogLog kini dapat dipindahkan ke menu utama
+        * Perbaikan: penguraian epoch satelit untuk waktu dalam 86 detik pertama tengah malam UTC
+        * Perbaikan: halaman radar kini otomatis beralih ke pass berikutnya setelah pass saat ini berakhir
+        * Perbaikan: perhitungan Doppler radar kini menggunakan nilai slider offset langsung
+        * Perbaikan: perhitungan kemajuan pass dijaga terhadap pembagian dengan nol
+        * Perbaikan: panggilan calculatePasses bersamaan tidak lagi memicu perhitungan duplikat
+        * Perbaikan: pengiriman QSO duplikat WaveLog dan kondisi balapan pembaruan grid square
     </string>
     <string name="radar_back">Kembali</string>
     <string name="radar_notify">Beri tahu</string>
@@ -131,6 +142,8 @@
     <string name="radar_cw_start">Mulai</string>
     <string name="radar_cw_stop">Berhenti</string>
     <string name="radar_cw_reset">Bersihkan</string>
+    <string name="radar_cw_tone">Nada %1$d Hz</string>
+    <string name="radar_cw_waiting">Menunggu sinyal…</string>
     <string name="map_prev">Sebelumnya</string>
     <string name="map_next">Berikutnya</string>
     <string name="map_copyright" translatable="false">© Kontributor OpenStreetMap</string>

core/presentation/src/main/res/values-ru/strings.xml

@@ -13,19 +13,23 @@
     <string name="nav_prefs">Настройки</string>
 
     <!-- Satellites screen -->
-    <string name="sat_type_hint">Тип: %s</string>
-    <string name="sat_type_title">Выберите тип спутника</string>
+    <string name="sat_type_hint">Режимы: %s</string>
+    <string name="sat_type_title">Выберите режимы</string>
     <string name="sat_search_hint">Id - Название</string>
     <string name="sat_search_clear">Очистить</string>
     <string name="sat_clear_all">Очистить</string>
     <string name="sat_select_all">Выбрать</string>
+    <string name="sat_group_selected">Выбранные</string>
+    <string name="sat_group_available">Доступные</string>
+    <string name="sat_group_selected_count">Выбранные (%1$d)</string>
+    <string name="sat_group_available_count">Доступные (%1$d)</string>
     <string name="sat_empty_list_message">Убедитесь, что ваш поисковый запрос верен и база данных обновлена</string>
     <string name="sat_warning_title">Внимание\!</string>
     <string name="sat_warning_message">
         В этом приложении перечислено более 9000 спутников.
         Отслеживать их все одновременно бессмысленно.
         \n\nВсегда старайтесь сузить список до тех,
-        которые вас интересуют, используя поиск и селектор типов.</string>
+        которые вас интересуют, используя поиск и выбор режимов.</string>
 
     <!-- Passes screen -->
     <string name="pass_filter_title">Фильтровать пролеты</string>
@@ -34,7 +38,7 @@
     <string name="pass_filter_aos_time">Окно AOS</string>
     <string name="pass_filter_invert_time">Инвертировать окно AOS</string>
     <string name="pass_filter_deep_space">DeepSpace (период &gt;225мин)</string>
-    <string name="pass_modes_title">Выберите тип модуляции</string>
+    <string name="pass_modes_title">Выберите режимы</string>
     <string name="pass_elevation">Элевация: %.1f°</string>
     <string name="pass_altitude">Высота: %d км</string>
     <string name="pass_empty_list_message">
@@ -95,11 +99,11 @@
     <string name="prefs_loc_qth_title">QTH</string>
     <string name="prefs_loc_qth_error">Неправильный локатор QTH</string>
     <string name="prefs_loc_success">Позиция успешно обновлена</string>
-    <string name="prefs_station_title">Настройки местоположения</string>
-    <string name="prefs_station_lat_text">Введите широту наземной станции</string>
-    <string name="prefs_station_lon_text">Введите долготу наземной станции</string>
-    <string name="prefs_locator_title">Настройки локатора QTH</string>
-    <string name="prefs_locator_text">Введите позицию через локатор</string>
+    <string name="prefs_station_title">Положение станции</string>
+    <string name="prefs_station_lat_text">Широта станции</string>
+    <string name="prefs_station_lon_text">Долгота станции</string>
+    <string name="prefs_locator_title">Локатор QTH</string>
+    <string name="prefs_locator_text">Позиция по локатору</string>
 
     <string name="prefs_data_title">Данные спутников</string>
     <string name="prefs_data_entries">Спутников: %s</string>
@@ -109,16 +113,30 @@
     <string name="prefs_data_clear">Очистить</string>
     <string name="prefs_data_clear_success">Очистка прошла успешно</string>
     <string name="prefs_data_update_success">Обновление прошло успешно</string>
+    <string name="prefs_data_import_satellites_error">Спутники не импортированы. Нужен TLE/3LE (.txt) или OMM (.csv).</string>
+    <string name="prefs_data_import_transceivers_error">Трансиверы не импортированы. Нужен SatNOGS (.json).</string>
 
-    <string name="prefs_data_sources_title">Свои источники данных</string>
-    <string name="prefs_data_sources_tle_switch">Custom TLE URL</string>
-    <string name="prefs_data_sources_transceivers_switch">Custom Transceivers URL</string>
+    <string name="prefs_data_sources_title">Свои источники</string>
+    <string name="prefs_data_sources_tle_switch">URL TLE</string>
+    <string name="prefs_data_sources_transceivers_switch">URL трансиверов</string>
+    <string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>
 
-    <string name="prefs_data_output_title">Вывод данных</string>
+    <string name="prefs_data_output_title">Вывод</string>
     <string name="prefs_net_output">Сеть</string>
     <string name="prefs_bt_output">Bluetooth</string>
+    <string name="prefs_cat_output">CAT</string>
 
-    <string name="prefs_net_title">Вывод сетевых данных</string>
+    <string name="nav_radiocontrol">Управление радио</string>
+
+    <string name="rc_settings_title">CAT управление</string>
+    <string name="rc_radio_model">Модель радио</string>
+    <string name="rc_tx_device_hint">BT адрес TX</string>
+    <string name="rc_rx_device_hint">BT адрес RX</string>
+    <string name="rc_tx_name_hint">Имя радио TX</string>
+    <string name="rc_rx_name_hint">Имя радио RX</string>
+    <string name="rc_enable_switch">Включить CAT</string>
+
+    <string name="prefs_net_title">Сетевой вывод</string>
     <string name="prefs_net_rotator_switch">Включить вывод ротатора</string>
     <string name="prefs_net_rotator_address_hint">IP:Порт</string>
     <string name="prefs_net_rotator_format_hint">Формат</string>
@@ -126,22 +144,22 @@
     <string name="prefs_net_frequency_address_hint">IP:Порт</string>
     <string name="prefs_net_frequency_format_hint">Формат</string>
 
-    <string name="prefs_bt_title">Вывод данных Bluetooth</string>
+    <string name="prefs_bt_title">Вывод Bluetooth</string>
     <string name="prefs_bt_rotator_switch">Включить вывод ротатора</string>
-    <string name="prefs_bt_rotator_device_hint">Id устройства</string>
+    <string name="prefs_bt_rotator_device_hint">ID устройства</string>
     <string name="prefs_bt_rotator_output_hint">Формат</string>
     <string name="prefs_bt_frequency_switch">Включить вывод частоты</string>
-    <string name="prefs_bt_frequency_device_hint">Id устройства</string>
+    <string name="prefs_bt_frequency_device_hint">ID устройства</string>
     <string name="prefs_bt_frequency_output_hint">Формат</string>
     <string name="prefs_bt_perm_error">Нет разрешения использовать bluetooth</string>
     <string name="prefs_net_perm_error">Нет разрешения использовать сеть</string>
 
-    <string name="prefs_other_title">Другие настройки</string>
-    <string name="prefs_other_switch_utc">Показывать время по UTC</string>
-    <string name="prefs_other_switch_update">Обновлять данные автоматически</string>
-    <string name="prefs_other_switch_sweep">Показывать анимацию радара</string>
-    <string name="prefs_other_switch_sensors">Использовать сенсоры устройства</string>
-    <string name="prefs_other_switch_night_mode">Включить красный ночной фильтр</string>
+    <string name="prefs_other_title">Прочее</string>
+    <string name="prefs_other_switch_utc">Время в UTC</string>
+    <string name="prefs_other_switch_update">Автообновление данных</string>
+    <string name="prefs_other_switch_sweep">Анимация радара</string>
+    <string name="prefs_other_switch_sensors">Сенсоры</string>
+    <string name="prefs_other_switch_night_mode">Ночной фильтр</string>
 
     <string name="prefs_highlight_title">Подсветка высоты</string>
     <string name="prefs_highlight_low">Низко &lt; %1$d°</string>