feat: Ultrabeam over USB, Paper QSL from the awards grid, per-role schemas
Ultrabeam on a serial port never worked, and three faults were stacked so
each hid the next:
- Stop() did not wait for the poll loop, so a stopped client kept the COM
port. Every later client then failed with "Serial port busy" — the
program holding it being OpsLog itself.
- startUltrabeam tore the old client down CONCURRENTLY with starting the
new one, and "Test connection" built a second client on a port already
ours. Harmless over TCP, fatal on a port with one owner.
- A silent serial port returns (0, nil) and bufio retries that a hundred
times: a 4 s timeout became ~7 minutes of a frozen poll loop logging
nothing.
The controller then answered at once. Confirmed on hardware: the USB cable
presents TWO COM ports, only the second reaches the controller, and only at
19200 baud — so the speed is pinned in code (an FTDI cable opens at any
speed, and a wrong one is indistinguishable from a dead controller) and the
port field says which one to pick. The first exchange after each connect is
hex-dumped, which separates silence from a wrong baud from a misread frame.
Databases now carry only the tables their role needs. Every target used to
get the whole migration set, so a shared MySQL logbook grew settings and
station_profiles tables nothing ever wrote to — an operator inspecting the
server could not tell which copy was authoritative. Statements are filtered
by role, unknown tables are kept in both (fail-safe), and existing databases
are cleaned once, dropping only EMPTY tables. Settings → Database gains a
Compact button, since SQLite frees pages inside the file and never shrinks it.
Also:
- Awards: the callsigns behind a cell open the QSL Manager on Paper QSL,
searched, ready for the card dates.
- The record button no longer goes missing after an update: whether manual
recording is possible is a per-profile question that was asked once, at
startup, before the profile was known.
- Alert rules and filter presets confirm that they were saved.
- Spot clicks on the radio panadapter carry the POTA park into F3.
- The build gate is re-checked wherever the active callsign can change; it
ran at startup alone, and a fresh install has no callsign then.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||
import { Bell, Plus, Trash2, Volume2, Mail, Eye, X, Search } from 'lucide-react';
|
||||
import {
|
||||
Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription,
|
||||
@@ -102,17 +102,40 @@ export function AlertsModal({ onClose, bands, modes, countries }: {
|
||||
return alerts.Rule.createFrom({ ...d, [key]: next });
|
||||
});
|
||||
|
||||
// Saving used to be silent: the dialog stays open and the rule looks exactly
|
||||
// as it did a second earlier, so there was nothing to tell an operator whether
|
||||
// the click had registered. A line that says so, and clears itself.
|
||||
const [savedMsg, setSavedMsg] = useState('');
|
||||
const savedTimer = useRef(0);
|
||||
function flashSaved(text: string) {
|
||||
setSavedMsg(text);
|
||||
window.clearTimeout(savedTimer.current);
|
||||
savedTimer.current = window.setTimeout(() => setSavedMsg(''), 3000);
|
||||
}
|
||||
useEffect(() => () => window.clearTimeout(savedTimer.current), []);
|
||||
|
||||
async function save() {
|
||||
if (!draft) return;
|
||||
if (!draft.name.trim()) { setErr(t('altm.giveName')); return; }
|
||||
try { const saved = await SaveAlertRule(draft); await refresh(); loadDraft(saved as Rule); setErr(''); }
|
||||
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||
try {
|
||||
const saved = await SaveAlertRule(draft);
|
||||
await refresh();
|
||||
loadDraft(saved as Rule);
|
||||
setErr('');
|
||||
flashSaved(t('altm.saved', { name: draft.name.trim() }));
|
||||
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||
}
|
||||
async function del() {
|
||||
if (!draft) return;
|
||||
if (!draft.id) { loadDraft(null); return; }
|
||||
if (!window.confirm(t('altm.deleteConfirm', { name: draft.name }))) return;
|
||||
try { await DeleteAlertRule(draft.id); loadDraft(null); await refresh(); }
|
||||
try {
|
||||
const name = draft.name;
|
||||
await DeleteAlertRule(draft.id);
|
||||
loadDraft(null);
|
||||
await refresh();
|
||||
flashSaved(t('altm.deleted', { name }));
|
||||
}
|
||||
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||
}
|
||||
|
||||
@@ -257,6 +280,7 @@ export function AlertsModal({ onClose, bands, modes, countries }: {
|
||||
{/* Editor actions */}
|
||||
<div className="flex items-center gap-2 px-3 py-2 border-t border-border/60">
|
||||
{err && <span className="text-[11px] text-danger flex-1 truncate">{err}</span>}
|
||||
{!err && savedMsg && <span className="text-[11px] text-success flex-1 truncate">{savedMsg}</span>}
|
||||
<div className="flex-1" />
|
||||
<Button variant="ghost" size="sm" className="text-danger" onClick={del}><Trash2 className="size-3.5" /> {t('altm.delete')}</Button>
|
||||
<Button size="sm" onClick={save}>{t('altm.saveRule')}</Button>
|
||||
|
||||
@@ -68,7 +68,11 @@ function ProgressBar({ worked, confirmed, total }: { worked: number; confirmed:
|
||||
// detection only means anything for those — see the Missing refs button.
|
||||
type AwardListItem = { code: string; name: string; valid?: boolean; bands?: string[]; emission?: string[]; scoped?: boolean };
|
||||
|
||||
export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: number) => void; onAwardsChanged?: () => void } = {}) {
|
||||
export function AwardsPanel({ onEditQSO, onAwardsChanged, onPaperQSL }: {
|
||||
onEditQSO?: (id: number) => void;
|
||||
onAwardsChanged?: () => void;
|
||||
onPaperQSL?: (call: string) => void;
|
||||
} = {}) {
|
||||
const { t } = useI18n();
|
||||
const [awardList, setAwardList] = useState<AwardListItem[]>([]);
|
||||
// Computed results are cached per award code — each award is scanned only the
|
||||
@@ -604,7 +608,7 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
||||
</div>
|
||||
|
||||
{cell && current && (
|
||||
<CellQSOModal code={current.code} cell={cell} modeClass={modeFilter === 'all' ? '' : modeFilter} onClose={() => setCell(null)} />
|
||||
<CellQSOModal code={current.code} cell={cell} modeClass={modeFilter === 'all' ? '' : modeFilter} onClose={() => setCell(null)} onPaperQSL={onPaperQSL} />
|
||||
)}
|
||||
{showMissing && current && (
|
||||
<MissingQSOModal code={current.code} name={current.name} onClose={() => setShowMissing(false)} onEditQSO={onEditQSO} />
|
||||
@@ -835,7 +839,14 @@ function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; nam
|
||||
}
|
||||
|
||||
// CellQSOModal lists the QSOs behind one award-grid cell (reference × band).
|
||||
function CellQSOModal({ code, cell, modeClass, onClose }: { code: string; cell: { ref: string; band: string; name?: string }; modeClass: string; onClose: () => void }) {
|
||||
function CellQSOModal({ code, cell, modeClass, onClose, onPaperQSL }: {
|
||||
code: string; cell: { ref: string; band: string; name?: string }; modeClass: string;
|
||||
onClose: () => void;
|
||||
// Send this callsign to the QSL Manager's Paper QSL view. Chasing a
|
||||
// confirmation starts here — an unconfirmed entity, the contact behind it —
|
||||
// and used to continue by retyping the callsign into another tab.
|
||||
onPaperQSL?: (call: string) => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const [qsos, setQsos] = useState<any[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
@@ -872,7 +883,15 @@ function CellQSOModal({ code, cell, modeClass, onClose }: { code: string; cell:
|
||||
{qsos.map((q, i) => (
|
||||
<tr key={q.id ?? i} className="border-b border-border/30">
|
||||
<td className="py-1 px-3 font-mono">{fmt(q.qso_date)}</td>
|
||||
<td className="py-1 pr-2 font-mono font-semibold">{q.callsign}</td>
|
||||
<td className="py-1 pr-2 font-mono font-semibold">
|
||||
{onPaperQSL ? (
|
||||
<button type="button" className="hover:underline text-primary"
|
||||
title={t('awp.paperQslTip')}
|
||||
onClick={() => { onPaperQSL(String(q.callsign ?? '')); onClose(); }}>
|
||||
{q.callsign}
|
||||
</button>
|
||||
) : q.callsign}
|
||||
</td>
|
||||
<td className="py-1 pr-2">{q.band}</td>
|
||||
<td className="py-1 pr-2">{q.mode}</td>
|
||||
<td className="py-1 pr-3 text-muted-foreground">{[isQSLConfirmed(q.lotw_rcvd) && 'LoTW', isQSLConfirmed(q.qsl_rcvd) && 'QSL', isQSLConfirmed(q.eqsl_rcvd) && 'eQSL'].filter(Boolean).join(', ')}</td>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||
import { Plus, Trash2, Save, FolderOpen, X } from 'lucide-react';
|
||||
import { writeUiPref } from '@/lib/uiPref';
|
||||
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog';
|
||||
@@ -192,6 +192,17 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
||||
|
||||
function apply() { onApply(buildFilter()); }
|
||||
|
||||
// Same silence as the alert rules: the preset landed in the list, but the list
|
||||
// is not where the operator is looking when they press Save.
|
||||
const [savedMsg, setSavedMsg] = useState('');
|
||||
const savedTimer = useRef(0);
|
||||
function flashSaved(text: string) {
|
||||
setSavedMsg(text);
|
||||
window.clearTimeout(savedTimer.current);
|
||||
savedTimer.current = window.setTimeout(() => setSavedMsg(''), 3000);
|
||||
}
|
||||
useEffect(() => () => window.clearTimeout(savedTimer.current), []);
|
||||
|
||||
function saveCurrentPreset() {
|
||||
const name = presetName.trim();
|
||||
if (!name) return;
|
||||
@@ -199,6 +210,7 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
||||
savePresets(next);
|
||||
setPresets(next);
|
||||
setPresetName('');
|
||||
flashSaved(t('fltb.presetSaved', { name }));
|
||||
}
|
||||
function loadPreset(name: string) {
|
||||
const f = presets[name];
|
||||
@@ -335,6 +347,7 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
||||
<Button variant="outline" size="sm" className="h-8" disabled={!presetName.trim()} onClick={saveCurrentPreset}>
|
||||
<Save className="size-3.5 mr-1" /> {t('fltb.savePreset')}
|
||||
</Button>
|
||||
{savedMsg && <span className="text-[11px] text-success truncate">{savedMsg}</span>}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -134,9 +134,14 @@ export type GridActions = {
|
||||
onDelete?: (ids: number[]) => void;
|
||||
};
|
||||
|
||||
export function QSLManagerPanel({ onEditQSO, actions }: {
|
||||
export function QSLManagerPanel({ onEditQSO, actions, paperRequest }: {
|
||||
onEditQSO?: (id: number) => void;
|
||||
actions?: GridActions;
|
||||
// A callsign to open the Paper QSL view on, sent from elsewhere in the app
|
||||
// (the awards grid). Carries a counter rather than being a bare string: the
|
||||
// panel is force-mounted and keeps its state, so asking twice for the SAME
|
||||
// callsign has to be two requests, not one unchanged prop.
|
||||
paperRequest?: { call: string; n: number };
|
||||
} = {}) {
|
||||
const { t } = useI18n();
|
||||
const [service, setService] = useState('lotw');
|
||||
@@ -198,6 +203,27 @@ export function QSLManagerPanel({ onEditQSO, actions }: {
|
||||
}, [paperCall]);
|
||||
|
||||
|
||||
// Honour an incoming request: switch to Paper QSL, fill the callsign, search.
|
||||
// The search runs from the effect below once paperCall has actually changed —
|
||||
// searchPaper closes over paperCall, so calling it here would search the
|
||||
// PREVIOUS callsign.
|
||||
// The pending request's callsign, so the search fires for THAT callsign and
|
||||
// for nothing else: the effect below also wakes on every keystroke in the
|
||||
// field, and searching on each of them would query the log letter by letter.
|
||||
const pendingPaperCall = useRef('');
|
||||
useEffect(() => {
|
||||
const call = paperRequest?.call?.trim().toUpperCase();
|
||||
if (!call) return;
|
||||
setService('paper');
|
||||
setPaperCall(call);
|
||||
pendingPaperCall.current = call;
|
||||
}, [paperRequest?.call, paperRequest?.n]);
|
||||
useEffect(() => {
|
||||
if (!pendingPaperCall.current || paperCall !== pendingPaperCall.current) return;
|
||||
pendingPaperCall.current = '';
|
||||
searchPaper();
|
||||
}, [paperCall, searchPaper]);
|
||||
|
||||
async function applyPaper() {
|
||||
const ids = paperRows.filter((r) => paperSel.has(r.id)).map((r) => r.id);
|
||||
if (ids.length === 0) return;
|
||||
|
||||
@@ -3589,7 +3589,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
{isSerial ? (
|
||||
<div className="grid grid-cols-3 gap-3">
|
||||
<div className="space-y-1 col-span-2">
|
||||
<Label>{t('hw.motorCom')}</Label>
|
||||
<Label>{t('hw.motorCom')}{!isSteppir && <span className="ml-1.5 font-normal text-muted-foreground">{t('hw.motorComUb')}</span>}</Label>
|
||||
{/* A list AND a text field, which is why this is a Combobox and
|
||||
not the Select the other serial devices use: the port for a
|
||||
USB adapter that is currently unplugged does not appear in
|
||||
@@ -3613,12 +3613,19 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<Label>{t('hw.motorBaud')}</Label>
|
||||
<Select value={String(ultrabeam.baud || 9600)} onValueChange={(v) => setUltrabeam((s) => ({ ...s, baud: parseInt(v, 10) || 9600 }))}>
|
||||
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
{[1200, 4800, 9600, 19200].map((b) => <SelectItem key={b} value={String(b)}>{b}</SelectItem>)}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
{/* The Ultrabeam answers on 19200 and on nothing else, so there is
|
||||
no choice to offer — an FTDI cable opens at any speed, and a
|
||||
wrong one is indistinguishable from a dead controller. */}
|
||||
{!isSteppir ? (
|
||||
<Input className="h-9 font-mono" value="19200" readOnly disabled />
|
||||
) : (
|
||||
<Select value={String(ultrabeam.baud || 9600)} onValueChange={(s2) => setUltrabeam((s) => ({ ...s, baud: parseInt(s2, 10) || 9600 }))}>
|
||||
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
{[1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200].map((b) => <SelectItem key={b} value={String(b)}>{b}</SelectItem>)}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
|
||||
Reference in New Issue
Block a user