remove CW decoder (audio->text) entirely; fix CWX macro not stopping on call typing

- Removes the RX-audio CW decoder: deletes app_cw.go + internal/cwdecode, the cwDecoder/cwPitchHz/cwMu/cwStop App fields, and all frontend state/effects, the header Ear button, the Tools menu item and the decoded-text strip. The CW KEYER (WinKeyer/Icom/Flex) is untouched. - Fix: typing a callsign while a macro is keying now aborts the CURRENT engine (Flex CWX / Icom / WinKeyer) on the first character, not just WinKeyer during an auto-call loop — via a shared stopKeyerTx() helper.
2026-07-20 19:00:09 +02:00
parent 2e39615554
commit cafade0dbb
7 changed files with 14 additions and 875 deletions
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import {
-  Activity, AlertCircle, Antenna, Bell, CheckCircle2, Clock, CloudOff, Compass, Database, Ear, Eraser, Hash, Loader2, Lock,
+  Activity, AlertCircle, Antenna, Bell, CheckCircle2, Clock, CloudOff, Compass, Database, Eraser, Hash, Loader2, Lock,
  Maximize2, Minimize2, Mic, MessageSquare, Pencil, Radio, RadioTower, RefreshCw, Satellite, Send, Settings, SlidersHorizontal, Square, Terminal, Trash2, Unlock, X, Zap,
 } from 'lucide-react';

@@ -38,7 +38,6 @@ import {
  IcomSendCW, IcomStopCW, IcomSetKeySpeed, IcomSetBreakIn, GetIcomState,
  FlexSendCW, FlexStopCW, FlexSetKeySpeed, FlexBackspaceCW,
  GetDVKMessages, GetDVKStatus, DVKPlay, DVKStop,
-  StartCWDecoder, StopCWDecoder, SetCWDecoderPitch,
  ChatAvailable, GetChatHistory, SendChatMessage, GetOnlineOperators,
  QSOAudioBegin, QSOAudioCancel, QSOAudioRestart, QSOAudioResetClock,
  GetAwardDefs,
@@ -813,36 +812,6 @@ export default function App() {
  useEffect(() => { wkEscClearsRef.current = wkEscClears; }, [wkEscClears]);

  // === Digital Voice Keyer (DVK) ===
-  // CW decoder: taps RX audio and decodes Morse. Runs only when enabled AND the
-  // mode is CW. The decoded text appears in a strip above the tabs.
-  const [cwEnabled, setCwEnabled] = useState(() => localStorage.getItem('opslog.cwDecoder') === '1');
-  const [cwText, setCwText] = useState('');
-  const [cwStatus, setCwStatus] = useState<{ wpm: number; pitch: number; level: number; active: boolean }>({ wpm: 0, pitch: 0, level: 0, active: false });
-  const cwOn = cwEnabled && mode === 'CW';
-  // Keep the decoded line scrolled to the newest text (left-aligned, no scrollbar).
-  const cwScrollRef = useRef<HTMLDivElement>(null);
-  useEffect(() => { const el = cwScrollRef.current; if (el) el.scrollLeft = el.scrollWidth; }, [cwText]);
-  // Manual pitch override ('' = Auto: follow the radio's CW pitch / search).
-  const [cwPitch, setCwPitch] = useState(() => localStorage.getItem('opslog.cwPitch') || '');
-  useEffect(() => {
-    const hz = parseInt(cwPitch, 10);
-    SetCWDecoderPitch(Number.isFinite(hz) ? hz : 0).catch(() => {});
-    localStorage.setItem('opslog.cwPitch', cwPitch);
-  }, [cwPitch, cwOn]);
-  useEffect(() => {
-    const offT = EventsOn('cw:text', (t: string) => setCwText((s) => (s + t).slice(-200)));
-    const offS = EventsOn('cw:status', (st: any) => setCwStatus(st));
-    const offE = EventsOn('cw:error', (e: string) => { setError(String(e)); setCwEnabled(false); });
-    return () => { offT?.(); offS?.(); offE?.(); };
-  }, []);
-  // Start/stop the backend decoder as the (enabled, mode) combination changes.
-  useEffect(() => {
-    if (cwOn) { StartCWDecoder().catch((e: any) => { setError(String(e?.message ?? e)); setCwEnabled(false); }); }
-    else { StopCWDecoder().catch(() => {}); }
-  }, [cwOn]);
-  function toggleCwDecoder() {
-    setCwEnabled((v) => { const n = !v; localStorage.setItem('opslog.cwDecoder', n ? '1' : '0'); return n; });
-  }

  // === Multi-op chat (shared MySQL logbook) — docked panel like rotor/DVK ===
  const [chatAvailable, setChatAvailable] = useState(false);
@@ -2164,6 +2133,13 @@ export default function App() {
  }
  // stopAutoCall cancels any running auto-call loop.
  function stopAutoCall() { autoCallMacroRef.current = -1; autoCallGenRef.current++; }
+  // stopKeyerTx aborts the CW being sent RIGHT NOW, routed to the active engine
+  // (was WinKeyer-only in a few places, so a Flex CWX / Icom macro kept going).
+  function stopKeyerTx() {
+    if (cwSourceRef.current === 'icom') IcomStopCW().catch(() => {});
+    else if (cwSourceRef.current === 'flex') FlexStopCW().catch(() => {});
+    else WinkeyerStop().catch(() => {});
+  }
  // runAutoCall sends macro i, waits for the keyer to finish, waits the chosen
  // gap, then resends — looping until cancelled (reply entered, Stop, unchecked).
  async function runAutoCall(i: number) {
@@ -2670,7 +2646,11 @@ export default function App() {
    // rather than finishing the buffered call. (autoCallMacroRef flips to -1 on
    // the first keystroke, so we only abort once.)
    if (v.trim() !== '') {
-      if (autoCallMacroRef.current !== -1) WinkeyerStop().catch(() => {});
+      // Someone answered: on the FIRST character of a new call (the field was
+      // empty), abort whatever CW is being sent — a single macro OR an auto-call
+      // CQ loop — routed to the ACTIVE engine (was WinKeyer-only, so a Flex CWX /
+      // Icom macro kept keying over the answering station).
+      if (callsignValRef.current.trim() === '') stopKeyerTx();
      stopAutoCall();
    }
    // No-op guard: external apps (MSHV/WSJT-X) re-broadcast the same DX call
@@ -2794,7 +2774,6 @@ export default function App() {
      { type: 'separator' },
      { type: 'item', label: (wkEnabled ? '✓ ' : '') + t('tools.winkeyer'), action: 'tools.winkeyer' },
      { type: 'item', label: (dvkEnabled ? '✓ ' : '') + t('tools.dvk'), action: 'tools.dvk' },
-      { type: 'item', label: (cwEnabled ? '✓ ' : '') + t('tools.cwDecoder'), action: 'tools.cwdecoder' },
      { type: 'separator' },
      { type: 'item', label: (netEnabled ? '✓ ' : '') + t('tools.net'), action: 'tools.net' },
      { type: 'item', label: (contestTabEnabled ? '✓ ' : '') + t('tools.contest'), action: 'tools.contest' },
@@ -2810,7 +2789,7 @@ export default function App() {
    { name: 'help', label: t('menu.help'), items: [
      { type: 'item', label: t('help.about'), action: 'help.about' },
    ]},
-  ], [total, selectedId, selectedIds, ctyRefreshing, refsDownloading, exporting, wkEnabled, dvkEnabled, cwEnabled, netEnabled, contestTabEnabled, t]);
+  ], [total, selectedId, selectedIds, ctyRefreshing, refsDownloading, exporting, wkEnabled, dvkEnabled, netEnabled, contestTabEnabled, t]);

  function handleMenu(action: string) {
    switch (action) {
@@ -2831,7 +2810,6 @@ export default function App() {
      case 'tools.qsldesigner': setQslDesignerOpen(true); break;
      case 'tools.winkeyer':    wkSetEnabled(!wkEnabled); break;
      case 'tools.dvk':         setDvkEnabled((v) => !v); break;
-      case 'tools.cwdecoder':   toggleCwDecoder(); break;
      case 'tools.net':         setNetEnabled((v) => { const nv = !v; if (nv) setActiveTab('net'); return nv; }); break;
      case 'tools.contest':     setContestTabEnabled((v) => { const nv = !v; if (nv) setActiveTab('contest'); else setActiveTab((tb) => (tb === 'contest' ? 'recent' : tb)); return nv; }); break;
      case 'tools.alerts':      setAlertsOpen(true); break;
@@ -3857,24 +3835,6 @@ export default function App() {
              <Zap className="size-4" />
              {wkStatus.busy && <span className="absolute -top-0.5 -right-0.5 size-2 rounded-full bg-warning animate-pulse" />}
            </button>
-            <button
-              type="button"
-              onClick={toggleCwDecoder}
-              title={
-                cwEnabled
-                  ? (mode === 'CW' ? 'CW decoder — on (decoding) · click to disable' : 'CW decoder — on, idle until CW mode · click to disable')
-                  : 'CW decoder · click to enable (decodes RX audio in CW mode)'
-              }
-              className={cn(
-                'relative inline-flex items-center justify-center size-7 rounded-md border transition-colors',
-                cwOn && cwStatus.active ? 'border-success bg-success-muted text-success-muted-foreground'
-                  : cwEnabled ? 'border-success-border bg-success-muted text-success-muted-foreground hover:bg-success-muted'
-                  : 'border-border text-muted-foreground hover:bg-muted',
-              )}
-            >
-              <Ear className="size-4" />
-              {cwOn && cwStatus.active && <span className="absolute -top-0.5 -right-0.5 size-2 rounded-full bg-success animate-pulse" />}
-            </button>
            <button
              type="button"
              onClick={() => { const v = !showRotor; setShowRotor(v); writeUiPref('opslog.showRotor', v ? '1' : '0'); }}
@@ -4489,53 +4449,6 @@ export default function App() {
      </div>{/* /entry + aside row */}

      {/* ===== CW decoder strip (only when enabled AND mode is CW) ===== */}
-      {cwOn && (
-        <div className="ml-2.5 mt-1.5 -mb-1 w-[45%] flex items-center gap-2 rounded-md border border-success-border/70 bg-success-muted/60 px-2 py-1.5 text-xs">
-          <Ear className={cn('size-4 shrink-0', cwStatus.active ? 'text-success' : 'text-muted-foreground')} />
-          {/* Input-level meter — if this stays flat with a strong signal, the RX
-              audio device is wrong/silent rather than a decode problem. */}
-          <div className="shrink-0 w-12 h-1.5 rounded bg-muted overflow-hidden" title={`Audio level ${Math.round(cwStatus.level * 100)}%`}>
-            <div className="h-full bg-success transition-[width] duration-100" style={{ width: `${Math.min(100, Math.round(cwStatus.level * 100))}%` }} />
-          </div>
-          <span className="shrink-0 font-mono text-[10px] text-muted-foreground tabular-nums">
-            {cwStatus.wpm > 0 ? `${cwStatus.wpm} WPM` : '— WPM'} · {cwStatus.pitch > 0 ? `${cwStatus.pitch} Hz` : '— Hz'}
-          </span>
-          {/* Lock pitch: blank = Auto (follow the Flex CW pitch / search). */}
-          <input
-            type="number"
-            value={cwPitch}
-            onChange={(e) => setCwPitch(e.target.value)}
-            placeholder="auto"
-            title="Lock the decoder to this pitch (Hz). Blank = follow the radio's CW pitch / auto-search."
-            className="shrink-0 w-14 h-5 rounded border border-success-border/70 bg-card/60 px-1 text-[10px] font-mono text-center outline-none"
-          />
-          {/* Left-aligned single line, no scrollbar; auto-scrolled to the newest
-              text (see cwScrollRef effect) so the latest stays in view. */}
-          <div ref={cwScrollRef} className="flex-1 min-w-0 overflow-hidden font-mono leading-none flex items-center">
-            {cwText.trim() === '' ? (
-              <span className="text-muted-foreground italic">listening…</span>
-            ) : (
-              <div className="inline-flex items-center whitespace-nowrap">
-                {cwText.trim().split(/\s+/).map((tok, i) => (
-                  <button
-                    key={i}
-                    type="button"
-                    className="mr-1 shrink-0 rounded px-1 leading-none hover:bg-success-muted/70"
-                    title="Use as callsign"
-                    onClick={() => onCallsignInput(tok, { force: true })}
-                  >
-                    {tok}
-                  </button>
-                ))}
-              </div>
-            )}
-          </div>
-          <button type="button" className="shrink-0 text-muted-foreground hover:text-foreground" title="Clear" onClick={() => setCwText('')}>
-            <Eraser className="size-3.5" />
-          </button>
-        </div>
-      )}
-
      {/* ===== LOWER: tabbed table / cluster / band map ===== */}
      {compact ? null : <>
      <div className={cn('grid gap-2.5 p-2.5 flex-1 min-h-0 grid-rows-[minmax(0,1fr)]',
@@ -73,8 +73,6 @@ export function BulkUpdateField(arg1:Array<number>,arg2:string,arg3:string):Prom

 export function BulkUpdateQSL(arg1:Array<number>,arg2:main.QSLBulkUpdate):Promise<number>;

-export function CWDecoderRunning():Promise<boolean>;
-
 export function ChatAvailable():Promise<boolean>;

 export function CheckForUpdate():Promise<main.UpdateInfo>;
@@ -325,8 +323,6 @@ export function GetCATSettings():Promise<main.CATSettings>;

 export function GetCATState():Promise<cat.RigState>;

-export function GetCWDecoderPitch():Promise<number>;
-
 export function GetCatalogCodes():Promise<Array<string>>;

 export function GetChatHistory(arg1:number):Promise<Array<main.ChatMessage>>;
@@ -801,8 +797,6 @@ export function SetCATFrequency(arg1:number):Promise<void>;

 export function SetCATMode(arg1:string):Promise<void>;

-export function SetCWDecoderPitch(arg1:number):Promise<void>;
-
 export function SetClublogCtyEnabled(arg1:boolean):Promise<void>;

 export function SetClusterAutoConnect(arg1:boolean):Promise<void>;
@@ -821,12 +815,8 @@ export function SetUIPref(arg1:string,arg2:string):Promise<void>;

 export function SetUltrabeamDirection(arg1:number):Promise<void>;

-export function StartCWDecoder():Promise<void>;
-
 export function StationSetRelay(arg1:string,arg2:number,arg3:boolean):Promise<void>;

-export function StopCWDecoder():Promise<void>;
-
 export function SwitchCATRig(arg1:number):Promise<void>;

 export function SyncPOTAHunterLog(arg1:boolean,arg2:boolean):Promise<main.POTASyncResult>;
@@ -102,10 +102,6 @@ export function BulkUpdateQSL(arg1, arg2) {
  return window['go']['main']['App']['BulkUpdateQSL'](arg1, arg2);
 }

-export function CWDecoderRunning() {
-  return window['go']['main']['App']['CWDecoderRunning']();
-}
-
 export function ChatAvailable() {
  return window['go']['main']['App']['ChatAvailable']();
 }
@@ -606,10 +602,6 @@ export function GetCATState() {
  return window['go']['main']['App']['GetCATState']();
 }

-export function GetCWDecoderPitch() {
-  return window['go']['main']['App']['GetCWDecoderPitch']();
-}
-
 export function GetCatalogCodes() {
  return window['go']['main']['App']['GetCatalogCodes']();
 }
@@ -1558,10 +1550,6 @@ export function SetCATMode(arg1) {
  return window['go']['main']['App']['SetCATMode'](arg1);
 }

-export function SetCWDecoderPitch(arg1) {
-  return window['go']['main']['App']['SetCWDecoderPitch'](arg1);
-}
-
 export function SetClublogCtyEnabled(arg1) {
  return window['go']['main']['App']['SetClublogCtyEnabled'](arg1);
 }
@@ -1598,18 +1586,10 @@ export function SetUltrabeamDirection(arg1) {
  return window['go']['main']['App']['SetUltrabeamDirection'](arg1);
 }

-export function StartCWDecoder() {
-  return window['go']['main']['App']['StartCWDecoder']();
-}
-
 export function StationSetRelay(arg1, arg2, arg3) {
  return window['go']['main']['App']['StationSetRelay'](arg1, arg2, arg3);
 }

-export function StopCWDecoder() {
-  return window['go']['main']['App']['StopCWDecoder']();
-}
-
 export function SwitchCATRig(arg1) {
  return window['go']['main']['App']['SwitchCATRig'](arg1);
 }