mirror of
https://github.com/atsunatsu/Look4Sat.git
synced 2026-10-02 19:17:21 +00:00
Upstream addeda333192d(CW decoder and linear calculator page) andc80e3512(linear calculator offset mapping fix). Merged with all 7 conflicts resolved by hand: - app/build.gradle.kts: keep ours (keystore signing config + abiFilters) - CwDecodeScreen.kt: keep ours (only difference is localized strings vs upstream hardcoded English) - g3/d.java: keep ours (identical lookup table, 4-line diff) - app_values.xml: keep ours (3 CW permission strings upstream lacks) - feature/radar/build.gradle.kts: keep ours (same dependency line) - TransceiversPage.kt: take upstream (includes CalculatorPage + our CW panel + INV title logic; conflicts were comment-only) - RadarScreen.kt: both sides - keep our wavelog imports + Log tab, take upstream DopplerFrequencyCalculator import + Calculator tab; pages = Transceivers, Log, [Calculator if any named linear transponder per upstream isNamedLinearTransponder], Sstv Result: radar page tabs are Transceivers / Log / Calculator (linear sats only, upstream logic) / SSTV. WaveLog Log tab and all our localization/signing preserved. NOTE: committed WITHOUT building per user request - merge compile verification deferred.