fix(cw): stop the decoder claiming a healthy signal it cannot hear

With tone shift off and the operator tuned outside 400-1200 Hz, the page did not go quiet - it went confidently wrong. Three measurements, all reproduced against the real spectrogram path: estimatedPitch is (32 + loudestBin) * 12.5 - shiftHz with the bin confined to 0..64, so with no shift applied it can only ever report 400-1200 Hz. It cannot express 1500 Hz, and it does not try: it publishes whichever window edge the leakage piles against. For a 1500 Hz tone that is 1200 Hz. That leakage is not faint. The waterfall normalises to the loudest value on screen, so 50 of 65 bins clear the 0.06 draw threshold and the picture shows a keyed-looking column pinned to the right edge - the 1200 Hz column runs 25 times the 400 Hz one. signalStrength is prominence over the window mean, so the same leakage scores 0.78 and paints the meter to 78% of full width. So the operator got a strong-signal bar, a plausible 1200 Hz readout, a picture that looked like a signal, and an empty transcript, with nothing saying why. The scan that can see past the window now runs whether or not shifting is enabled - it is the only measurement that can - and publishes through a new detectedToneHz flow kept separate from estimatedPitch. Overloading the latter is what let the 1200 Hz claim out in the first place, so the two meanings stay in two flows. The shift decision still only happens when the setting is on. Cost is one 121-bin scan every 2 s. The meter now reads zero when a tone is out of range and not being shifted in: it is a claim that something decodable is present, and in that state nothing is. A line under the waterfall says which case the operator is in - the tone was moved in, or it is out of range and tone shift is off, naming the frequency and the remedy. Strings in all nine locales; feature:cw only had five, so values-es, values-ru, values-si and values-uk are new, with the Turkish apostrophe escaped. CwToneShifterTest pins the premise the hint rests on: that the scan reports tones the model window excludes, at 120, 250, 1400 and 1500 Hz.
2026-08-23 01:42:37 +00:00
1 parent 23f47d9122
commit 4cb03111bc
@@ -63,7 +63,9 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat
+import com.rtbishop.look4sat.core.domain.cw.CwToneShifter
 import com.rtbishop.look4sat.core.domain.repository.IContainerProvider
+import kotlin.math.roundToInt
 import com.rtbishop.look4sat.core.presentation.R as CoreR

 /**
@@ -97,6 +99,7 @@ fun CwDecodeScreen() {
    val historyText by decoder.historyText.collectAsState()
    val signalStrength by decoder.signalStrength.collectAsState()
    val estimatedPitch by decoder.estimatedPitch.collectAsState()
+    val detectedToneHz by decoder.detectedToneHz.collectAsState()
    val activeShiftHz by decoder.activeShiftHz.collectAsState()
    val errorMessage by decoder.errorMessage.collectAsState()

@@ -179,6 +182,28 @@ fun CwDecodeScreen() {
            )
        }

+        // What the markers cannot say on their own. The waterfall covers only the model's
+        // 400-1200 Hz window, so a tone outside it is missing from the picture entirely -
+        // and with tone shift off there is nothing to mark either. One line of text is
+        // what turns "nothing is happening" into a reason and a remedy.
+        val toneHz = detectedToneHz
+        val hint = when {
+            toneHz == null -> null
+            activeShiftHz != 0f -> stringResource(R.string.cw_tone_shifted_hint, toneHz.roundToInt())
+            CwToneShifter.isInsideWindow(toneHz) -> null
+            else -> stringResource(R.string.cw_tone_outside_hint, toneHz.roundToInt())
+        }
+        if (hint != null) {
+            Text(
+                text = hint,
+                fontSize = 11.sp,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(start = 12.dp, top = 4.dp, end = 12.dp)
+            )
+        }
+
        Text(
            text = decodedText.takeLast(64).ifEmpty { "…" },
            fontSize = 20.sp,
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="cw_tone_shifted_hint">Tono de %1$d Hz trasladado a la ventana de decodificación de 400-1200 Hz</string>
+    <string name="cw_tone_outside_hint">El tono de %1$d Hz está fuera de la ventana de decodificación de 400-1200 Hz. Active el desplazamiento de tono en Ajustes.</string>
+</resources>
@@ -6,4 +6,6 @@
    <string name="cw_mic_permission">Izin mikrofon diperlukan untuk pendekodean CW</string>
    <string name="cw_grant_permission">Berikan izin</string>
    <string name="cw_open_settings">Buka pengaturan aplikasi</string>
+    <string name="cw_tone_shifted_hint">Nada %1$d Hz dipindahkan ke rentang dekode 400-1200 Hz</string>
+    <string name="cw_tone_outside_hint">Nada %1$d Hz di luar rentang dekode 400-1200 Hz. Aktifkan geser nada di Pengaturan.</string>
 </resources>
@@ -6,4 +6,6 @@
    <string name="cw_mic_permission">Izin mikrofon diperlukan untuk pendekodean CW</string>
    <string name="cw_grant_permission">Berikan izin</string>
    <string name="cw_open_settings">Buka pengaturan aplikasi</string>
+    <string name="cw_tone_shifted_hint">Nada %1$d Hz dipindahkan ke rentang dekode 400-1200 Hz</string>
+    <string name="cw_tone_outside_hint">Nada %1$d Hz di luar rentang dekode 400-1200 Hz. Aktifkan geser nada di Pengaturan.</string>
 </resources>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="cw_tone_shifted_hint">Тон %1$d Гц перенесён в окно декодирования 400-1200 Гц</string>
+    <string name="cw_tone_outside_hint">Тон %1$d Гц находится вне окна декодирования 400-1200 Гц. Включите сдвиг тона в настройках.</string>
+</resources>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="cw_tone_shifted_hint">%1$d Hz ස්වරය 400-1200 Hz විකේතන කවුළුවට ගෙන ගියා</string>
+    <string name="cw_tone_outside_hint">%1$d Hz ස්වරය 400-1200 Hz විකේතන කවුළුවෙන් පිටත. සැකසුම් තුළ ස්වර මාරුව සක්‍රිය කරන්න.</string>
+</resources>
@@ -6,4 +6,6 @@
    <string name="cw_mic_permission">CW çözümü için mikrofon izni gerekli</string>
    <string name="cw_grant_permission">İzin ver</string>
    <string name="cw_open_settings">Uygulama ayarlarını aç</string>
+    <string name="cw_tone_shifted_hint">%1$d Hz tonu 400-1200 Hz kod çözme aralığına taşındı</string>
+    <string name="cw_tone_outside_hint">%1$d Hz tonu 400-1200 Hz kod çözme aralığının dışında. Ayarlar\'dan ton kaydırmayı açın.</string>
 </resources>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="cw_tone_shifted_hint">Тон %1$d Гц перенесено у вікно декодування 400-1200 Гц</string>
+    <string name="cw_tone_outside_hint">Тон %1$d Гц перебуває поза вікном декодування 400-1200 Гц. Увімкніть зсув тону в налаштуваннях.</string>
+</resources>
@@ -6,4 +6,6 @@
    <string name="cw_mic_permission">CW 解码需要麦克风权限</string>
    <string name="cw_grant_permission">授予权限</string>
    <string name="cw_open_settings">打开应用设置</string>
+    <string name="cw_tone_shifted_hint">已将 %1$d Hz 音调搬入 400-1200 Hz 解码范围</string>
+    <string name="cw_tone_outside_hint">%1$d Hz 音调在 400-1200 Hz 解码范围外，请在设置中开启音调搬移。</string>
 </resources>
@@ -6,4 +6,6 @@
    <string name="cw_mic_permission">Microphone permission is required for CW decoding</string>
    <string name="cw_grant_permission">Grant permission</string>
    <string name="cw_open_settings">Open app settings</string>
+    <string name="cw_tone_shifted_hint">Tone %1$d Hz moved into the 400-1200 Hz decoder window</string>
+    <string name="cw_tone_outside_hint">Tone %1$d Hz is outside the 400-1200 Hz decoder window. Enable tone shift in Settings.</string>
 </resources>