Compare commits

..
60 Commits
Author SHA1 Message Date
rouggy e4412955f0 chore: release v0.26.13 2026-08-24 22:00:15 +02:00
rouggy 78eb766789 style(flex): a little more room in the chaser's offset box
Narrowed to w-12 earlier, which is tight for a signed four-digit offset:
-1500 filled it edge to edge with no padding left.
2026-08-24 21:48:35 +02:00
rouggy d8064cc426 fix(udp): two copies of MSHV shared one dial frequency
FT8 decodes made on 14.095 were labelled 2190 m. That band is 135.7-137.8
kHz, and every affected decode's audio offset plus 136.1 kHz lands inside
it — while the ones shown with no band at all land just above 137.8. The
decodes were being stamped with another instance's dial.

WSJT-X refuses to start a second instance without --rig-name, so its ids
differ and keying on the id worked. MSHV has no such rule: both copies
call themselves 'MSHV', so the LF instance's Status overwrote the HF
one's dial, T/R period and mode.

Instances are now identified by their sending socket as well as their
name — the socket is stable for as long as the program runs, which is
exactly the lifetime this has to hold over. A second application claiming
an id already in use is shown as 'MSHV #2' and says so in the log, so the
decodes panel can still split them.

This also fixes replies: a Reply was addressed to whichever copy sent
Status last, which on a two-instance station is a coin toss.
2026-08-24 21:38:30 +02:00
rouggy bd4f1b2325 fix(decodes): new-band-mode had no badge, so its rows looked unfiltered
A station new on this band AND in this mode is one status, 'new-band-mode',
and the badge table has an entry for neither half. The lookup returned
nothing, so those rows showed only their grid or prefix badge — and with
NEW/BAND/MODE selected, a row whose visible badges were LOC and PFX read
as the filter letting through things nobody asked for. It was not: the
row belonged there and the panel failed to say why.

catsOf has always split that status into its two categories for filtering.
The badges now do the same on screen.
2026-08-24 21:21:02 +02:00
rouggy b38b9030f0 fix(elecraft): MOX would not unkey, and the TX meters never moved
Both are the same bug. ReadState returns early while transmitting — the
rig answers '?;' to IF; then, and treating that as a fault used to drop
the link — but that early return also skipped the panel update and the
meter read.

So the panel believed the radio was still receiving. Pressing MOX again
therefore sent ANOTHER transmit command instead of RX, and the K3 stayed
keyed, exactly as reported. And the power and SWR bars were only ever
read at the one moment they mean nothing.

Reading meters while transmitting needs one more guard: a '?;' then says
when the question was asked, not what the radio supports, so the
unsupported-command memory is suspended for that read. Without it, one
badly timed refusal would silence a meter for the rest of the session.

Adds RIT/XIT offset control (±10/±100 Hz, offset shown), a 4.0 kHz filter
button for FT8, and logs the K3's icon word when it changes: there is no
command for 'is the ATU in line', the reference says the switch functions
show up as icon changes, so an operator toggling the ATU while watching
the log will name the bit and the button can then light up honestly.
2026-08-24 21:06:21 +02:00
rouggy ea302966d5 chore(changelog): open the 0.26.13 block
v0.26.12 shipped with everything written for it — the block is empty
because nothing has been done since, not because entries were missed.
2026-08-24 20:12:00 +02:00
rouggy ea5c2a56cf chore: release v0.26.12 2026-08-24 20:11:27 +02:00
rouggy 6b0fc48389 feat(elecraft): the mouse wheel moves the console's sliders
Dragging a four-pixel slider to change the power by five watts is a fussy
gesture, and the Flex and Yaesu consoles have had the wheel for a while —
an operator moving between them expects it.

React registers onWheel as PASSIVE, so preventDefault() there is ignored
and the panel scrolls under the pointer while the value changes; the
listener is attached natively instead, with the live values read through
refs. Both existing panels solved it the same way, so this is a third
copy turned into one shared component -- used by the new console only.
The other two are left alone deliberately: they work, they are in daily
use, and their styling differs in ways a merge would have to guess at.

Power steps 5 W a notch, matching the K3's own coarse step.
2026-08-24 19:25:28 +02:00
rouggy a27fa08e4e fix(elecraft): the ATU is switch 19, not 20
SWT20 was written from memory of the reference rather than from Table 7,
and 20 is not an ATU switch at all — it would have pressed something else
on a real K3. An operator read the table out for us: switch 19 is the ATU
row, TAP for a tuning cycle and HOLD for tuner in line or bypassed.

Adds the HOLD as its own ATU button, because on the radio they are two
different things: tuning is a cycle you start, bypassing is a state you
leave it in.

Power takes 0-110 W on an Elecraft, per the reference — a K3 makes a
little over its rated output — while a Kenwood keeps 200.
2026-08-24 19:20:30 +02:00
rouggy 27d0952d01 feat(cluster): the spot list size is a setting
The list is a ring buffer that held a thousand spots, and on a busy
evening a thousand arrive in a couple of minutes. So the buffer decided
how long a spot lived, and the spot LIFETIME setting never got the chance
to expire anything: fifteen minutes meant nothing when the oldest spot
was pushed out after two.

Now settable (Preferences → Cluster, beside the lifetime, since between
them they decide the same thing), 100 to 10 000. The ceiling is a real
limit rather than a round number: every spot is matched against the
worked index and the alert rules, and is a row the cluster grid and every
open band map re-render.
2026-08-24 19:15:32 +02:00
rouggy 4e9b1eebe9 feat(cluster): single click fills the call, double click works the spot
Reading the cluster means running down dozens of lines, and a single
click did the whole job — QSY, mode, callsign — so every line looked at
dragged the radio with it. One stray click while reading took the
operator off the station they were working.

Looking and going are two different intentions, so they are two gestures
now. The band map is unchanged: clicking a spot there is already a
deliberate act, not a way of reading a list.
2026-08-24 19:08:33 +02:00
rouggy 0848c275d2 fix(yaesu): mic gain scale, 200 W models, and a NAR button that did nothing
Reported from a real FTDX101, and each one is a different kind of wrong.

MIC GAIN was read and written through the 0-255 scale the audio gains
use, but the CAT reference gives MG000-100. A rig set to 80 therefore
showed 38, and moving the slider sent 204 — outside the range the radio
accepts, so it refused the command and the slider sprang back. That
snap-back was the symptom; the scale was the cause.

POWER was capped at 100 W by the slider, not by the radio. There is no
CAT command for 'how much power can you make', so the ceiling comes from
the model name, with the rig believed if it ever reports more than the
table expects — it has just proved what it can do.

NAR is the narrow IF filter, and on a rig that does not implement NA the
button showed a state the radio never gave and did nothing when pressed,
which reads as a fault in the radio. Now shown only when the rig answers,
with a tooltip saying what it is.

Also: the frequency readout steps the Hz digits under the wheel, not just
the kHz ones. Zero-beating a CW signal is a few tens of Hz and it was the
one move the display would not make. And the split chaser is CW-only —
its marker comes from a CW skimmer.
2026-08-24 17:59:13 +02:00
rouggy ea0789b191 feat(entry): type a frequency or a band into the call field
An operator reading a cluster page sees 28500 and wants to be there. The
hands are on the callsign field; reaching for the frequency box, or the
mouse, is the part that loses the station. So the call field takes a bare
number on Enter: kHz for a frequency, or a band on its own.

Ambiguity resolves to the band on purpose -- 40 is 40 m, not 40 kHz --
because neither of those kHz values is anywhere a radio tunes, and it
reads the way an operator says it. Anything with a letter in it is a
callsign and behaves exactly as before; a number that is neither a band
nor a plausible frequency does nothing at all.

Bands go through the ordinary band change, so the antennas, the per-band
power table and the outbound integrations hear about it as they would
from the dropdown. Also adds 4 m to the QSY table, so a band that can now
be typed is a band that has a frequency to go to.
2026-08-24 17:42:42 +02:00
rouggy 1f94d0ef08 style(elecraft): lay the console out like the other panels
It filled the window: on a wide screen a slider ended a hand's width from
its own label and the panel stopped reading as one instrument. Capped and
centred like the Yaesu, Icom and Flex consoles, grouped into Meters,
Levels and Receive cards, with the level sliders in two columns.

Also opens the 0.26.12 block: the TQSL logging and this console were
written after v0.26.11 was tagged.
2026-08-24 14:42:03 +02:00
rouggy dd77e7f467 feat(elecraft): the rest of the main controls on the K3/K4 console
So the tester can exercise everything in one session instead of one
control per build: RF and mic gain, squelch, preamp, attenuator, NB, NR,
AGC, filter width, antenna, RIT/XIT with a clear, and the keyer speed.

The analogue scales differ between an Elecraft and a Kenwood — RF gain
000-250, mic 000-060, squelch 000-029 against 0-255 — so each is mapped
through its own full scale and shown as a percentage. Using one rig's
range on the other silently halves or doubles every setting.

Antenna only appears when the radio answers AN: a K3 without the internal
ATU has one socket, and a switch that goes nowhere is worse than none.
2026-08-24 14:29:38 +02:00
rouggy 60dad353ce feat(elecraft): a K3/K4 console — power, volume, S-meter, SWR, MOX, tune
The Elecraft backend already existed; what was missing was somewhere to
operate the radio from. This adds the panel, on the Kenwood-dialect
client the K3 already speaks, in a tab of its own beside the Yaesu and
Icom consoles.

Scope is the six controls asked for and nothing else. Every extra command
added without a radio to test it against is a control that may or may not
do what its label says, and a K3 exposes dozens.

No K3 was available while writing this, so the two halves are treated
differently. The setters are the commands the reference documents
unambiguously and whose effect is visible and reversible (PC, AG,
TX/RX). The meters are the opposite: their scaling differs by model and
firmware, so the raw answers are logged next to the power setting, the
panel says the scaling is provisional, and an unmeasured SWR shows as
'—' rather than as a perfect 1.0 — a good match on an antenna nobody
measured is the reading that costs a radio.

ATU tune sends SWT20 (the K3 front-panel tap) and logs exactly what it
sent, so a wrong mapping names itself instead of leaving an operator
guessing which button OpsLog pressed.
2026-08-24 14:09:28 +02:00
rouggy 1b63483596 chore(lotw): log the record TQSL refused
'No QSOs processed' (exit 8) covers already-uploaded, out-of-certificate-
date-range, and a station callsign that does not match the location being
signed with -- TQSL's message does not say which. An operator whose QSO
was refused and then accepted after a round trip through another logger
is reporting a difference in the record itself, and the temp ADIF is
deleted the moment TQSL returns, so that difference could not be seen.

Logged on any non-zero exit: the record verbatim, the exit code and the
station location. It is QSO data; the key password is not logged.
2026-08-24 11:08:15 +02:00
rouggy 56c103140c chore: release v0.26.11 2026-08-24 11:02:12 +02:00
rouggy b60e8285a4 chore(changelog): open the 0.26.11 block
The Club Log pacing and the auto-call disarming were written after
v0.26.10 was tagged (8b7756b), so they were not in it.
2026-08-24 10:02:12 +02:00
rouggy 0f1424335e fix(autocall): disarm the stored preference, not just the loop
Withdrawing auto-call added a runtime guard and removed every control.
The stored preference was left alone, so 'enabled: true' still sits in
localStorage on the machines that had it on -- and any build without the
guard reads it and keys the transmitter for a feature that no longer has
a switch anywhere in the interface.

loadAutoCall now switches it off and writes it back the first time it
reads it, so the disarming survives a downgrade or a reinstall. Also
drops the dead auto-call state left behind in the settings modal.

A withdrawn feature that keys a radio has to be disarmed where it is
remembered, not only where it runs.
2026-08-24 09:56:31 +02:00
rouggy 506a1e6e4c fix(clublog): pace and cap the real-time deletes
Club Log wrote to this station about 167 requests in four minutes and a
coming IP block. That was one deletion of a couple of hundred rows going
through delete.php, which is a REAL-TIME endpoint: it exists for an
operator removing a contact they just logged wrongly, at human pace.

Today's earlier fix stops the requests that were pointless -- QSOs Club
Log never had. This one handles the rest, which are legitimate but still
a batch: one delete every 1.2 s, and a stop at 25 with a line saying to
finish on clublog.org. There is no bulk-delete API to move to, so going
slower and refusing to push a large deletion through a real-time endpoint
is the whole of the answer.

Costs the operator nothing: the withdrawals already run in the
background.
2026-08-23 19:46:42 +02:00
rouggy 8b7756beb4 chore: release v0.26.10 2026-08-23 19:42:12 +02:00
rouggy dee4ffce2a chore(changelog): open the 0.26.10 block
Five entries were written after v0.26.9 was tagged (b952e07), so they
were never in the release the operators actually got -- their What's New
stops at the Club Log delete fix.
2026-08-23 19:39:05 +02:00
rouggy fbf3cd116b style(flex): narrow the chaser's offset box, give it room
An offset is a handful of Hz, never a wide number, and the box sat flush
against the button it belongs to.
2026-08-23 19:23:01 +02:00
rouggy b2165173cf fix(cw): Enter sent nothing on the Icom/Yaesu/Kenwood keyers
Send-on-type keys each character as it is typed, which only the WinKeyer
and Flex CWX can do -- so the checkbox is shown for those two alone. The
stored preference, however, survives a change of engine: an operator who
had used it on a WinKeyer and moved to CI-V carried an invisible switch
that was still on.

The consequences fit the report exactly. Nothing keyed while typing,
because wkSendRaw falls through to the WinKeyer that is not there; and
Enter sent nothing either, because sendText believes the text has already
gone out. Macros take another path and kept working.

The panel now derives the flag from the engine rather than trusting the
stored value.
2026-08-23 19:10:37 +02:00
rouggy 912d727d7a feat(flex): the marker moves to a right-click on the chaser button
The transmit row already carries SPLIT, TUNE, MOX, the chaser, its offset
and the TX readout. The marker field was the one control on it that is
set once -- to agree with SDC -- and then never touched again, so it is
summoned by right-clicking the button instead of parked there. Enter
commits, Escape restores. The button's tooltip says so: an unannounced
right-click is not a feature.
2026-08-23 19:08:58 +02:00
rouggy 32036a93ed style(flex): trim the split chaser's labels
The marker field needs no caption -- it sits against a button showing the
same text -- and 'offset' spelled out crowded a row that already carries
SPLIT, the chaser and the TX readout.
2026-08-23 19:05:18 +02:00
rouggy 7f4b0b78c0 chore(changelog): the split chaser is one entry, not three
Nobody has seen 0.26.9 yet: a fix to a feature released in the same block,
and the panel field it should have had from the start, are not news --
they are how the feature works. Folded into the one entry.
2026-08-23 18:59:33 +02:00
rouggy 775daa233e feat(flex): edit the split chaser's marker on the panel
The marker text is chosen in the skimmer, and the two have to agree or
nothing fires -- so it belongs next to the switch, not in a settings page
the operator would have to remember exists. Kept as raw text until blur:
it is a comma-separated list and normalising each keystroke would eat the
comma as it is typed.
2026-08-23 18:57:52 +02:00
rouggy 4fb013701b fix(flex): the split chaser could never read its own switch
GetFlexRSTChase read settings.Get with profileScope() prepended, but the
store already prefixes the active profile: it wrote p3.flex.rst_chase and
read p3.p3.flex.rst_chase. The switch went on in the UI, was saved, and
came back off on the next spot -- so the feature did nothing, silently.

Every refusal after a marker is recognised is now logged with its reason.
The operator has just seen a report marked on the panadapter; if the
slice does not move, the log has to say what stopped it.
2026-08-23 18:52:57 +02:00
rouggy 2dd68da284 feat(flex): chase a split pile-up on the skimmer's report marker
Working a DXpedition split means guessing where it listens. The useful
information is not the callsign the DX answered but the FREQUENCY that
station was calling on, and a CW skimmer already marks it: SDC posts each
decoded report to the panadapter as a spot.

Those spots reach OpsLog through the radio's spot feed. On a marker, the
TRANSMIT slice moves there plus a signed offset; the receive slice never
moves, because losing the DX is worse than missing a call. The marker
text is a setting -- it is chosen in SDC by the operator, so any constant
here would be wrong for whoever chose otherwise -- and the switch is a
button beside SPLIT, since it is turned on when a DXpedition appears and
off when it is worked.

Moves are throttled and ignore a marker landing where the slice already
is: a busy pile-up produces several reports a second and the slice would
otherwise never be anywhere long enough to call.

The spot feed is now subscribed to unconditionally. It was tied to
OpsLog's own spot overlay, so an operator running SDC with the overlay
off received nothing -- the reason no foreign spot was ever logged. The
connect-time 'spot clear' stays behind the overlay flag: it wipes every
spot on the radio, a skimmer's included.
2026-08-23 18:49:40 +02:00
rouggy 65991be09d chore(flex): log the spots other programs post to the radio
Chasing a split pileup with a CW skimmer means acting on the report the
DX just sent: SDC posts what it decodes as panadapter spots, so the 5NN
is already on the radio and OpsLog already subscribes to 'spot all'.

What is not known is the shape of those spots -- which field carries the
report, whether it is the callsign or the comment, what source the
skimmer names itself. Guessing produces a feature that never fires, so
this logs the first 60 foreign spots of a session verbatim and does
nothing else. Bounded because a skimmer posts hundreds an hour.
2026-08-23 18:36:55 +02:00
rouggy 1c4697ecb2 feat(awards): match on CNTY as it stands, not only keyed to a US state
The award field list offered us_county, which returns STATE,County --
correct for the United States, where Jefferson County exists in several
states, and wrong for every award whose district is already unique. An
RDA reference (RO-19) never matched, and there was no other field to
point an award at.

Adds county, the raw CNTY value, alongside it.
2026-08-23 18:30:10 +02:00
rouggy ab89611eca feat(hamlog): show what the confirmation import did, and export what it could not place
The import printed four numbers and left nothing behind. 1106 matched
and 395 unmatched out of 1501 is not a report: the operator cannot see
which contacts were confirmed, nor work through the discrepancies.

Two additions. The Results view is now filled with the confirmed
contacts, flagged new entity/band/mode/slot against what LoTW and paper
QSL already confirm -- the only sense in which a HAMLOG confirmation
changes anything. And the unmatched ones can be written out as ADIF,
because a few hundred of them are a list to open and compare, not
something to read in a log window.
2026-08-23 15:43:57 +02:00
rouggy b952e074f4 chore: release v0.26.9 2026-08-23 15:38:50 +02:00
rouggy e01fc39abc fix(delete): stop asking Club Log to delete QSOs it never had
Deleting a selection with 'delete from the remote services' on took
minutes. Club Log was called for EVERY deleted QSO, uploaded or not, and
for the ones it never had it answers 403 -- a full network round trip per
contact, in series, on the goroutine the UI was waiting on. QRZ already
skipped records with no stored logid; Club Log had no equivalent guard.

Three changes, each fixing one part of the delay:
  - only contacts whose clublog upload status is Y or M are withdrawn;
  - the withdrawals run in the background, after a snapshot -- the local
    log is the operator's own copy and must not wait on two websites;
  - the hooks read the rows in one query instead of one per id, which on
    a remote MySQL logbook was 2 round trips per QSO before the DELETE.

Consecutive refusals now abort the run: Club Log blocks an account that
keeps sending requests it refuses, so working through the rest of the
selection only earns a longer block.
2026-08-23 15:37:49 +02:00
rouggy deabb74393 chore(changelog): open the 0.26.9 block
Four entries landed in 0.26.8 after it was released.
2026-08-23 15:33:30 +02:00
rouggy 803f4dc4ed feat(hamlog): read confirmations back from a HAMLOG.online ADIF
Their agent protocol has no download verb, so the return path is a file
exported from their site. Running that file through the ordinary ADIF
import is the wrong tool and does real damage: it matches on callsign +
UTC minute + band + mode, their export is rebuilt from their own
database and rarely agrees to the minute, and 'update duplicates' then
inserts everything that failed to match -- several hundred copies of
contacts already in the log.

This path matches only. It stamps the confirmation on QSOs it finds,
falls back to the mode-CLASS key for the modes their export renames, and
REPORTS what it could not match instead of adding it: an unmatched
confirmation is a question about the log, not a contact to create.

Also logs and reports how many rows a delete actually removed -- silence
there made a delete that did nothing indistinguishable from one that
worked.
2026-08-23 15:32:41 +02:00
rouggy 20784c2fb1 feat(filter): filter on when a QSO was added to the log
After an import that inserted instead of updating, there was no way to
ask which records it created: an import of old contacts carries old QSO
dates, so it hides among them. created_at is the only column that knows,
and it was not filterable.

Listed as a date column so a bare YYYY-MM-DD compares on the date part,
like qso_date.
2026-08-23 15:13:55 +02:00
rouggy 83dbdf0539 feat(qsl): HAMLOG.online in the Edit QSO confirmations
The QSL Info tab knew every upload service except the newest one, so a
contact uploaded to HAMLOG.online could be edited everywhere but there.
It is stored in the ADIF extras rather than QSO columns -- like the
OpsLog card -- hence a channel of its own instead of a CONFIRMATIONS
entry, but it gets the ordinary sent/received/date editor because it
behaves like QRZ.com or Club Log, not like a printed card.

Its four columns move from the QSL group to Uploads for the same reason:
QSL is for cards, an upload service belongs with the upload services.
2026-08-23 15:12:03 +02:00
rouggy c9d46cfab9 chore: release v0.26.8 2026-08-23 15:04:59 +02:00
rouggy c7140fd639 feat(export): filtered-view export can keep the OpsLog fields too
Same reasoning as the selected-rows export: ExportADIFFiltered was called
with includeAppFields=false, so a filtered export lost the award
references. A second entry, next to the standard one.
2026-08-23 15:01:32 +02:00
rouggy c887b77b5f feat(export): right-click export can keep the OpsLog fields
The right-click export always called ExportADIFSelected with
includeAppFields=false, so it wrote strictly standard ADIF. That is the
right default when the file is going to another logger, but it silently
drops every APP_ tag -- and an award reference such as RDA@KR-04 lives in
APP_OPSLOG_AWARDREFS and nowhere else. Backing up a selection, or moving
it to another OpsLog, lost the awards.

Adds a second entry rather than a flag on the first: the two exports
answer different questions, and a checkbox in a context menu would have
to be read before every export.
2026-08-23 14:58:01 +02:00
rouggy b3e398b8d6 feat(rda): measure the two district sources before arbitrating between them
A log imported from HAMLOG.online carries the Russian district in CNTY, and the
offline RDA database has its own answer for the same contact. Which wins is a
real question — but only if the two are independent. If HAMLOG's value is itself
a lookup in the same kind of database, there is nothing to arbitrate and a
precedence rule would be ceremony around a redundancy.

So this measures instead of deciding: Settings → RDA gains a read-only compare
that reports agreements, disagreements, and the contacts where only one side
knows, then lists the disagreements — callsign, date, both districts, whether
the database answer was a DATED record (the award administrators' own fact) or
the callsign's current district (an assumption), and whether the QSO is
confirmed on HAMLOG (their value has then been through a match of two logs).

It changes nothing in the log. What to do about a conflict is the next decision,
and it should be taken with the operator's own numbers in hand.

Also: the four HAMLOG fields become filterable, so 'never sent there' is a
filter rather than a guess. A field that can be written and not read back is
half a feature — pinned by a test against the bulk-editable list.
2026-08-23 14:30:48 +02:00
rouggy f4a72da118 fix(hamlog): read the site's own confirmation field, not a guessed one
A real record from their export settles it:

	<CALL:4>RL6M … <CNTY:5>RO-19 <APP_HAMLOG_R150COUNTRY:6>Russia
	<APP_HAMLOG_QSO_CFM:1>Y

The confirmation lives in APP_HAMLOG_QSO_CFM. The four names guessed before a
file was available — APP_HAMLOG_QSL and friends — were all wrong, which is the
argument for reading one rather than reasoning about it.

So that becomes the canonical key everywhere: the award source, the row colours,
the grid column and the bulk editor. Importing a log downloaded from HAMLOG now
carries its confirmations into OpsLog with nothing to rename. The older names,
including the APP_OPSLOG_HAMLOG_QSL that OpsLog itself wrote in the meantime,
are still honoured on read so nothing already stamped stops counting.
2026-08-23 13:43:10 +02:00
rouggy 086581851b feat(hamlog): confirmation defaults and grid columns; drop a settings paragraph
Preferences → Confirmations gains a HAMLOG.online row, sent and received, with
the same defaults every other service has: a new QSO can start at N so the
backlog is meaningful from the first contact. The defaults reach it through a
new setExtraDefault — fill() writes through a pointer to a string field and
these two live in the extras map, which no pointer reaches.

The QSO grid gains four HAMLOG columns (status and date, both directions),
hidden by default: a column per service shown to everyone is how a grid becomes
unreadable.

And the paragraph explaining what "Sent" means is gone from that page.
2026-08-23 13:25:20 +02:00
rouggy f8fdfab031 fix(hamlog): a status AND a date, like every other service
Bulk edit offered two HAMLOG fields, both dates, and the first question they
drew was the right one: which of these is the status? Collapsing the flag into
the date was neat in the storage and a riddle in the dialog, where the eight
fields above it are four status/date pairs.

So four keys now — APP_OPSLOG_HAMLOG_SENT / _SENT_DATE and _QSL / _QSL_DATE —
and four fields, in the shape an operator already reads for eQSL, QRZ, Club Log
and HRDLog. The stamp written after a successful upload follows: Y in the
status, the day in the date.

Nothing else changes: the QSL Manager's backlog still asks whether the sent key
is present, and the award engine still treats any non-N value in the QSL key as
a confirmation.
2026-08-23 13:14:05 +02:00
rouggy 3f82da3c18 feat(hamlog): mark an already-uploaded log through bulk edit
A log sent to hamlog.online by hand — an ADIF exported from OpsLog and dropped
on their site — had no way of being marked as sent afterwards. The QSL Manager
then listed every one of those contacts as backlog and offered to upload them a
second time.

Both HAMLOG keys join the bulk-editable extras, so a selection (or the whole
log) can be stamped in one pass. They are DATES rather than Y/N flags because
that is the shape the sent stamp already uses: the QSL Manager's backlog asks
whether the key is present, and a date also says when it went.

The test pins that they are reachable through the extras path and NOT offered as
columns — a mapping claiming both would write to a table that has neither.
2026-08-23 13:02:04 +02:00
rouggy cd557acf81 feat(hamlog): send to HAMLOG.online from the right-click menu
The upload targets in the QSO context menu gain HAMLOG.online, so a selection
goes there the same way it goes to QRZ or LoTW.

The confirmation toast now names the service from a map rather than a chain of
ternaries that stopped after three: hrdlog, eqsl and hamlog were echoed as their
internal ids, which is not what the operator clicked on.
2026-08-23 12:46:29 +02:00
rouggy 036dc53fe8 feat(hamlog): mark what has been sent, and a QSL Manager backlog
An upload now leaves a trace on the QSO: APP_OPSLOG_HAMLOG_SENT holds the day
it went. The date rather than a Y, so a log says WHEN — and so one shape serves
three readers: eligibility (a stamped QSO is not sent twice), the QSL Manager's
backlog, and the appearance rules' sent channel.

HAMLOG joins the QSL Manager's service list. It has no status column to select
on, so its backlog is the ABSENCE of that extras key — a LIKE over the extras
JSON, which is a full scan and is the right trade here: it answers a button an
operator presses, and the alternative is a promoted column for a field no other
program would ever read. The match is on the quoted key, so a QSO whose comment
merely mentions the text is not taken for one already sent — which is what the
test pins.
2026-08-23 12:40:09 +02:00
rouggy 73806cbd70 feat(hamlog): the settings panel, the key check, and a row-colour channel
HAMLOG.online is now reachable: Settings → External services → HAMLOG.ONLINE
takes the API key, the auto-upload switch and the timing, exactly like the six
services beside it, and a link opens the page where the key is issued.

The button next to it checks the KEY, not the connection. HAMLOG answers
KEYSTATUS with the callsign the key belongs to — something no other service
here offers — so the result reads "Key is valid — account F4BPO" rather than a
green tick. A key pasted from a club account or a second station is visible at
once, which is precisely the mistake a tick would have hidden.

No on-close timing, for the same reason as Cloudlog: there is no per-QSO upload
column to select a backlog from at shutdown, so the option would have done
nothing. Immediate or delayed, and a stored on_close falls back to immediate
rather than silently uploading nothing.

The appearance rules gain a HAMLOG.online channel too, so a row can be coloured
"confirmed" on that alone. It reads the ADIF extras — the standard names a field
for hamlog.EU and none for hamlog.ONLINE — using the same keys the award engine
reads, so the two can never disagree about what a confirmation is. "To send"
skips it: a QSO is either uploaded or not, there is no card to be owed.
2026-08-23 12:29:38 +02:00
rouggy ee148732dd feat: HAMLOG.online upload and confirmations, Yaesu antenna, a named port holder
HAMLOG.online is a seventh external service: one API key, one ADIF record per
QSO, immediate / delayed / on-close like the rest. They publish no API
documentation, so the protocol is read from THEIR OWN client — the HAMLOG Agent
(github.com/hamlogonline/Agent), which is the authoritative source short of
asking them:

	POST https://hamlog.online/api/agent/
	{"ADIFADD": {"APIKEY": k, "ADIFDATA": record}}   → {"STATUS":"OK"}
	{"KEYSTATUS": {"APIKEY": k}}                     → {"STATUS":"OK","CALLSIGN":…}

Success is STATUS == OK, not "no ERROR field": their failure carries ERROR and
no STATUS, and reading an unknown reply — a proxy page, a maintenance notice —
as an acceptance is how a contact goes missing without anyone noticing.

KEYSTATUS buys something no other service here offers: the key can be checked
BEFORE the first QSO, and the answer names the account. A key pasted from
another callsign is caught in the settings panel rather than through a week of
silent refusals.

Their confirmations are also an award source now, ticked like LoTW rather than
expressed through "custom". It reads the ADIF extras, not a column: the standard
names a field for hamlog.EU and none for hamlog.ONLINE, and borrowing the other
site's field would write a falsehood into every exported log. Three plausible
key names from their own export are accepted too, so nobody has to rename a
column by hand after an export.

Yaesu gains antenna selection (AN), remembered per band — the antenna picked on
a band comes back with it, with no table to fill in anywhere. Rigs with one
socket never answer AN and never show the row; the log says which case it is.

And a serial port that is refused now names its likely holder. OmniRig stays
resident once activated and keeps the port of the rig configured in it, so a
native backend never gets it — "Serial port busy" alone accused nobody, and an
FTDX10 spent a morning being blamed for it.
2026-08-23 12:18:27 +02:00
rouggy 3014796c1d chore: release v0.26.7 2026-08-23 10:43:51 +02:00
rouggy 405b0e24cf feat: network audio into the QSO recorder, and a Yaesu that stays on its VFO
An Icom reached over the LAN streams its receive audio through the Icom
protocol, and Windows sees no sound card for it at all — the audio settings
could only offer the PC's own microphone, so "From radio" had nothing right to
point at and the QSO recorder had nothing to record. The recorder now accepts a
PUSHED source: the decoded stream goes to the speakers and to the recorder
alike, with no virtual cable to set up. Which source it uses follows the CAT
backend, and it is restarted only when that answer changes, so an ordinary
settings save never cuts a recording in half.

OmniRig no longer sends SetSimplexMode to a Yaesu when tuning. It is a silent
no-op on some — an FT-891 logged OK on every spot click while FreqA never
moved — and actively harmful on others. From an FT-2000 log, one QSY:

	Vfo="AB"(0x80)  Split=0x10000 (off)   the operator's state
	Vfo="BA"(0x100) Split=0x8000  (ON)    after SetSimplexMode

The rig-agnostic "receive and transmit HERE, simplex" call turned split on and
moved reception to VFO B. OpsLog then displayed B — reading the radio correctly,
after having moved it itself. Icom is untouched: there the call is the
authoritative one and the direct write is unreliable.

Also:
  - the NEW county badge shows in the entry form itself, inside the field,
    where the operator is deciding whether to call.
  - the basemap buttons clear the zoom controls; Light sat a few pixels from
    the minus button and was being clicked by mistake.
  - French cluster status: DÉJÀ CTC reads DÉJÀ QSO.
2026-08-23 10:43:11 +02:00
rouggy 778db0542e chore: release v0.26.6 2026-08-23 01:47:17 +02:00
rouggy f50806fbd9 feat: panadapter spots that read, a CI-V link that survives, no auto-call
Panadapter spots are now worth reading. The comment carries the spotter, the
entity and the status in DXHunter's own shape — "CQ up 2 [F4BPO] [Franz Josef
Land] [New Slot]" — which needed two things nothing documents: SmartSDR splits
its command line on SPACES, so the words ran together until every space became
non-breaking; and it truncates past ~60 characters, so the cluster's own words
are trimmed first and the three brackets always survive. RBN column padding is
collapsed on the way in, or a preserved run of spaces opened a gap wide enough
to push the rest off screen.

"Already worked" means the CALLSIGN is in the log, not the entity: saying it of
a station never contacted was simply wrong. Each status can also be kept off the
panadapter entirely, and the WSJT-X decode spots obey the same switches — the
palette governs the panadapter, not one of the two things that feed it.

And the radio is no longer hammered: a spot whose frequency, colour and comment
are unchanged is not removed and redrawn. A busy skimmer feed re-spots the same
station every few seconds; one two-minute session sent 2128 adds, 88 of them for
a single callsign, and the display did not move a pixel for any of them.

CI-V, from an IC-7850 that kept killing JTDX: a reply the rig sent to another
controller on the same bus is no longer taken for ours, and a set_ptt, set_freq
or set_mode whose acknowledgement goes missing is verified by reading the rig
back instead of being reported as a failure. WSJT-X and JTDX answer a failed
command with a Rig Control Error and drop the link mid-over — 98 keyings, 6 lost
acknowledgements, 2 dropped connections in one session. The check waits 700 ms,
not the poll's 150: the rig has just failed to answer twice because it was
retuning, and a short probe would fail for the same reason.

Auto-call is withdrawn — it duplicated DXHunter, which already answers decodes,
and two programs deciding that from one shack key over each other. The library
is kept whole and dormant; a guard in App.tsx makes sure a stored preference
cannot key a transmitter whose switch no longer exists.

Also:
  - the log rotates while running, not only at startup: the CI-V trace left on
    wrote 416 MB and nothing would have stopped it before the disk did. Closing
    it now releases the crash file too — the runtime keeps its own duplicate.
  - the interface zoom announces itself, with a badge, a click back to 100% and
    a View menu; Ctrl+wheel and Ctrl+0 always worked and nothing said so.
  - no more elastic bounce, and no swipe-to-navigate out of the app.
  - Edit QSO: your own TX power and the contacted station's extended locator
    were saved and written back with no box to set them.
  - FT decodes: continents are a multiple choice; a compound MSHV message that
    answers two stations in one line is recognised as addressed to you.
2026-08-23 01:16:26 +02:00
rouggy bcfb3bfd37 chore: release v0.26.5 2026-08-22 14:10:46 +02:00
rouggy cb430a22ee 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.
2026-08-22 14:07:00 +02:00
rouggy abfed4afa2 chore: release v0.26.4 2026-08-22 08:35:49 +02:00
rouggy d48420485f chore: release v0.26.3 2026-08-21 23:28:55 +02:00
97 changed files with 8958 additions and 552 deletions
View File
+820 -90
View File
File diff suppressed because it is too large Load Diff
+2
View File
@@ -18,6 +18,8 @@ var deniedCallHashes = map[string]struct{}{
"46fb61e71afb40627cb6493a6a59c9d4d0231ee3cad1a2bf3fcc4cdfce36fabc": {},
"d1ae6212ec057f9d5c6f379fb57acedac7c94142c9d49667dc04b2016d03d1b6": {},
"0741c9e394b42f43191899105553b47155ddc3026da12b5360701f9c181ff123": {},
"ab4926a3a0ab76d41b5b99cd3ad0683584970c341c29427c1dfa4b3c329ce415": {},
"9d17c9c213a6cc89c12d7520bcf21c86a0cf43d17e82e74f33f3a77cb865d28a": {},
}
// callDenied reports whether a callsign is on deniedCallHashes. The call is
+120
View File
@@ -0,0 +1,120 @@
package main
// Elecraft K3/K4 panel bindings.
//
// The controls the operator asked for and nothing else: power, volume, the
// S-meter and SWR, MOX, and an ATU tune. A K3 exposes dozens of commands, but a
// panel earns its place by covering what is reached for during a QSO — and each
// one added without a radio to test it against is a control that may or may not
// do what its label says. See internal/cat/kenwood_panel.go.
import (
"fmt"
"hamlog/internal/cat"
)
// GetKenwoodState returns the K3/K4 panel snapshot. Zero value when the active
// CAT backend is something else, which is how the UI knows to hide the panel.
func (a *App) GetKenwoodState() cat.KenwoodTXState {
if a.cat == nil {
return cat.KenwoodTXState{}
}
st, _ := a.cat.KenwoodState()
return st
}
func (a *App) SetKenwoodPower(w int) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodPower(w) })
}
func (a *App) SetKenwoodAFGain(p int) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodAFGain(p) })
}
func (a *App) SetKenwoodRFGain(p int) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodRFGain(p) })
}
func (a *App) SetKenwoodMicGain(p int) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodMicGain(p) })
}
func (a *App) SetKenwoodSquelch(p int) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodSquelch(p) })
}
func (a *App) SetKenwoodPreamp(on bool) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodPreamp(on) })
}
func (a *App) SetKenwoodAtt(on bool) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodAtt(on) })
}
func (a *App) SetKenwoodNB(on bool) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodNB(on) })
}
func (a *App) SetKenwoodNR(on bool) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodNR(on) })
}
func (a *App) SetKenwoodAGC(name string) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodAGC(name) })
}
func (a *App) SetKenwoodFilter(hz int) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodFilter(hz) })
}
func (a *App) SetKenwoodAntenna(n int) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodAntenna(n) })
}
func (a *App) SetKenwoodRIT(on bool) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodRIT(on) })
}
func (a *App) SetKenwoodXIT(on bool) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodXIT(on) })
}
// NudgeKenwoodRIT moves the RIT/XIT offset by delta Hz.
func (a *App) NudgeKenwoodRIT(delta int) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.NudgeKenwoodRIT(delta) })
}
// ClearKenwoodRIT zeroes the RIT and XIT offsets together, which is what the
// radio's own RC does and what an operator means by "clear it".
func (a *App) ClearKenwoodRIT() error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.ClearKenwoodRIT() })
}
// SetKenwoodTX is the panel's MOX.
func (a *App) SetKenwoodTX(on bool) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodTX(on) })
}
// ToggleKenwoodATU puts the tuner in line or bypasses it (the HOLD of the same
// front-panel switch the tune uses).
func (a *App) ToggleKenwoodATU() error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.ToggleKenwoodATU() })
}
func (a *App) TuneKenwoodATU() error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.TuneKenwoodATU() })
}
// RefreshKenwood re-reads the settings on the next poll — for when a knob was
// turned on the radio itself.
func (a *App) RefreshKenwood() error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.RefreshKenwood() })
}
func (a *App) kenwoodPanelDo(fn func(cat.KenwoodPanelController) error) error {
if a.cat == nil {
return fmt.Errorf("CAT not initialized")
}
return a.cat.KenwoodPanelDo(fn)
}
+2 -2
View File
@@ -19,7 +19,7 @@ type RowColorRule struct {
ID string `json:"id"`
Color string `json:"color"`
Enabled bool `json:"enabled"`
// Channels this rule looks at: qsl (paper), lotw, eqsl, qrz.
// Channels this rule looks at: qsl (paper), lotw, eqsl, qrz, hamlog.
//
// Empty means ALL of them — what an operator expects from a rule they have
// not narrowed, and what keeps a config written before this field meaningful.
@@ -27,7 +27,7 @@ type RowColorRule struct {
}
// The QSL channels a rule can be scoped to.
var rowColorChannels = []string{"qsl", "lotw", "eqsl", "qrz"}
var rowColorChannels = []string{"qsl", "lotw", "eqsl", "qrz", "hamlog"}
// RowColorSettings is the whole appearance block.
type RowColorSettings struct {
+235
View File
@@ -0,0 +1,235 @@
package main
// "Have I worked this reference before?" — the NEW badge on a QSO's award
// references.
//
// # Where the answer comes from, and where it must NOT come from
//
// The obvious source is the materialised award_refs column: it is already on
// every row and one query reads it. It is also the wrong answer twice over.
// That column holds DISPLAY LABELS, not references — depending on the award's
// RefDisplay it can read "Krasnogvardeysky" or "ST-25 — Krasnogvardeysky", and
// DXCC stores a country name — and it is a derived cache that lags: a QSO whose
// references were back-filled (see BackfillRDA) counts on the Awards grid long
// before anything recomputes its column. The first build of this badge used it
// and marked a district worked on five bands as NEW.
//
// So the answer comes from the same place the Awards grid's answer comes from:
// award.MatchQSO over the logbook. What is engineered here is the COST of that,
// because the question is asked while the operator is logging:
//
// - the set is per award CODE, and built only for codes actually asked about;
// - it reuses the award snapshot when one is already in memory, which it
// usually is (the Awards tab, the cluster status index);
// - otherwise it STREAMS the logbook rather than materialising a second copy
// of it — the references of one award are a few thousand short strings;
// - and it is built in the BACKGROUND. A caller that asks before the set is
// ready is told so and gets no badge, never a wait and never a wrong badge.
//
// A freshly logged QSO's references are folded into the sets, so a normal
// evening of logging never rebuilds anything.
import (
"strings"
"hamlog/internal/award"
"hamlog/internal/qso"
)
// workedRefIndex is the per-code set of references already in the log, plus the
// logbook revision it describes.
type workedRefIndex struct {
rev string
byCode map[string]map[string]struct{}
building map[string]bool
}
// AwardRefNewResult answers one badge request.
type AwardRefNewResult struct {
// New maps "CODE@REF" to "never worked". An entry whose award set is still
// building is ABSENT rather than false: "not worked" and "not known yet"
// must not look the same to the badge.
New map[string]bool `json:"new"`
// Pending is true when at least one award set is still being built, and the
// caller should ask again shortly.
Pending bool `json:"pending"`
}
// AwardRefsNew reports which of the given "CODE@REF" entries have never been
// worked. Returns immediately, always.
func (a *App) AwardRefsNew(entries []string) AwardRefNewResult {
res := AwardRefNewResult{New: map[string]bool{}}
if a.qso == nil || len(entries) == 0 {
return res
}
rev, err := a.qso.Revision(a.ctx)
if err != nil {
return res // logbook unreachable: no badge is the honest answer
}
// Group the request by award code, so one code is looked up once however
// many of its references are on the QSO.
want := map[string][]string{}
for _, e := range entries {
code, _, ok := splitRefEntry(e)
if !ok {
continue
}
want[code] = append(want[code], e)
}
a.workedRefMu.Lock()
if a.workedRef.rev != rev || a.workedRef.byCode == nil {
// The logbook moved on: every set describes a log that no longer exists.
a.workedRef = workedRefIndex{rev: rev, byCode: map[string]map[string]struct{}{}, building: map[string]bool{}}
}
var build []string
for code := range want {
set, ready := a.workedRef.byCode[code]
if !ready {
if !a.workedRef.building[code] {
a.workedRef.building[code] = true
build = append(build, code)
}
res.Pending = true
continue
}
for _, e := range want[code] {
_, ref, _ := splitRefEntry(e)
_, worked := set[ref]
res.New[e] = !worked
}
}
a.workedRefMu.Unlock()
for _, code := range build {
go a.buildWorkedRefs(code, rev)
}
return res
}
// splitRefEntry splits "RDA@ST-25" into its uppercased code and reference.
func splitRefEntry(e string) (code, ref string, ok bool) {
at := strings.Index(e, "@")
if at <= 0 {
return "", "", false
}
code = strings.ToUpper(strings.TrimSpace(e[:at]))
ref = strings.ToUpper(strings.TrimSpace(e[at+1:]))
return code, ref, code != "" && ref != ""
}
// buildWorkedRefs collects every reference of one award already in the log.
func (a *App) buildWorkedRefs(code string, rev string) {
set := map[string]struct{}{}
defer func() {
a.workedRefMu.Lock()
// Publish only against the revision we were asked for: a QSO logged while
// this ran has already reset the index, and a set built from the older log
// would claim to describe the newer one.
if a.workedRef.rev == rev && a.workedRef.byCode != nil {
a.workedRef.byCode[code] = set
}
delete(a.workedRef.building, code)
a.workedRefMu.Unlock()
}()
var def *award.Def
for _, d := range a.awardDefs() {
if strings.EqualFold(d.Code, code) {
dd := d
def = &dd
break
}
}
if def == nil {
return // unknown award: an empty set, so nothing is ever badged NEW
}
metas := a.awardRefMetas([]award.Def{*def})[strings.ToUpper(def.Code)]
collect := func(q *qso.QSO) {
for _, r := range award.MatchQSO(*def, metas, q) {
set[strings.ToUpper(strings.TrimSpace(r))] = struct{}{}
}
}
// The snapshot is already enriched and already in memory whenever the Awards
// tab has been open — by far the common case, and free.
if snap := a.awardSnapshotIfLoaded(); snap != nil {
for i := range snap {
collect(&snap[i])
}
return
}
// Otherwise stream. One pass, nothing retained but the reference strings.
_ = a.qso.IterateForAwards(a.ctx, func(q qso.QSO) error {
a.enrichQSOForAwards(&q)
collect(&q)
return nil
})
}
// awardSnapshotIfLoaded returns the award snapshot ONLY if one is already built
// and current. Never builds one: the caller is a background convenience, and
// reading the whole logbook for it is the cost this file exists to avoid.
func (a *App) awardSnapshotIfLoaded() []qso.QSO {
rev, err := a.qso.Revision(a.ctx)
if err != nil {
return nil
}
a.awardSnapMu.Lock()
defer a.awardSnapMu.Unlock()
if a.awardSnap != nil && a.awardSnapRev == rev {
return a.awardSnap
}
return nil
}
// noteWorkedQSO folds a just-logged contact's references into the built sets, so
// logging does not throw away work already done.
func (a *App) noteWorkedQSO(q qso.QSO) {
a.workedRefMu.Lock()
codes := make(map[string]bool, len(a.workedRef.byCode))
for c := range a.workedRef.byCode {
codes[c] = true
}
a.workedRefMu.Unlock()
if len(codes) == 0 {
return
}
rev, err := a.qso.Revision(a.ctx)
if err != nil {
return
}
a.enrichQSOForAwards(&q)
found := map[string][]string{}
for _, d := range a.awardDefs() {
code := strings.ToUpper(d.Code)
if !codes[code] {
continue
}
metas := a.awardRefMetas([]award.Def{d})[code]
for _, r := range award.MatchQSO(d, metas, &q) {
found[code] = append(found[code], strings.ToUpper(strings.TrimSpace(r)))
}
}
a.workedRefMu.Lock()
defer a.workedRefMu.Unlock()
// Carry the sets forward to the new revision rather than dropping them: they
// were correct one contact ago, and that contact is what is being added.
a.workedRef.rev = rev
for code, refs := range found {
if set := a.workedRef.byCode[code]; set != nil {
for _, r := range refs {
set[r] = struct{}{}
}
}
}
}
// invalidateWorkedRefs drops every set. For the changes a revision cannot see —
// award definitions edited, reference lists updated, QSLs confirmed.
func (a *App) invalidateWorkedRefs() {
a.workedRefMu.Lock()
a.workedRef = workedRefIndex{}
a.workedRefMu.Unlock()
}
+22
View File
@@ -0,0 +1,22 @@
package main
import "testing"
func TestSplitRefEntry(t *testing.T) {
code, ref, ok := splitRefEntry("rda@st-25")
if !ok || code != "RDA" || ref != "ST-25" {
t.Fatalf("got %q %q %v", code, ref, ok)
}
// The picker writes what the operator typed, spacing included.
if _, ref, _ = splitRefEntry("POTA@ fr-1234 "); ref != "FR-1234" {
t.Fatalf("not trimmed: %q", ref)
}
// A reference can contain the separator characters of a label; only the
// FIRST @ splits, so "IOTA@EU-064" survives and a stray one does not create
// an award out of nothing.
for _, bad := range []string{"", "RDA", "@ST-25", "RDA@", "RDA@ "} {
if _, _, ok := splitRefEntry(bad); ok {
t.Fatalf("%q accepted", bad)
}
}
}
+276
View File
@@ -1,4 +1,280 @@
[
{
"version": "0.26.13",
"date": "",
"en": [
"Elecraft console: MOX unkeys again, and the power and SWR bars move while transmitting. The poll stops while the carrier is up — the rig refuses most questions then — and the panel was left believing the radio was still receiving, so pressing MOX a second time sent another transmit command instead of stopping.",
"Elecraft console: RIT and XIT can be moved — ±10 and ±100 Hz buttons with the offset shown beside them. A lit RIT button says the feature is on and nothing about where it has put the receiver.",
"Elecraft console: a 4.0 kHz filter button, the K3 maximum and the one FT8 wants.",
"FT decodes: a station that is new on both the band and the mode now shows both badges. That status had no badge of its own, so those rows passed the BAND and MODE filters and then displayed no reason for being in the list — only their grid or prefix badge, which looked like the filter leaking.",
"Two copies of MSHV are now told apart. MSHV calls every instance 'MSHV', and the dial frequency was filed under that name alone — so a second copy on another band overwrote the first, and decodes made on 14.095 came out labelled 2190 m. Instances are identified by their sending socket as well as their name, and a second one is shown as 'MSHV #2'."
],
"fr": [
"Console Elecraft : MOX repasse bien en réception, et les barres de puissance et de ROS bougent pendant l'émission. L'interrogation s'arrête quand la porteuse est levée — la radio refuse alors la plupart des questions — et le panneau croyait donc la radio toujours en réception : un second appui sur MOX envoyait une nouvelle commande d'émission au lieu d'arrêter.",
"Console Elecraft : le RIT et le XIT se règlent — boutons ±10 et ±100 Hz avec le décalage affiché à côté. Un bouton RIT allumé dit que la fonction est active et rien sur l'endroit où elle a mis le récepteur.",
"Console Elecraft : un bouton de filtre à 4,0 kHz, le maximum du K3 et celui qu'il faut pour le FT8.",
"Décodes FT : une station nouvelle à la fois sur la bande et dans le mode affiche maintenant les deux badges. Ce statut n'avait pas de badge à lui : ces lignes passaient les filtres BANDE et MODE puis n'affichaient aucune raison d'être là — seulement leur badge de locator ou de préfixe, ce qui donnait l'impression d'un filtre qui fuyait.",
"Deux copies de MSHV sont maintenant distinguées. MSHV nomme chaque instance « MSHV », et la fréquence d'affichage était rangée sous ce seul nom : une seconde copie sur une autre bande écrasait la première, et des décodes faits sur 14.095 ressortaient étiquetés 2190 m. Les instances sont désormais identifiées par leur socket autant que par leur nom, et la seconde s'affiche « MSHV #2 »."
]
},
{
"version": "0.26.12",
"date": "",
"en": [
"When TQSL refuses an upload, the log now carries the exact ADIF record it was given and the station location it was told to sign with. 'No QSOs processed' covers several unrelated causes and the temp file is deleted the moment TQSL returns, so the one piece of evidence that mattered was the one nobody could see.",
"An Elecraft console for the K3/K4, in a tab of its own when the CAT backend is Elecraft or Kenwood: power, volume, RF and mic gain, squelch, preamp, attenuator, NB, NR, AGC, filter width, antenna, RIT/XIT with a clear, keyer speed, S-meter, SWR, MOX and an ATU tune. The meter scaling is marked provisional and the raw readings go to the log — it was written from the K3 Programmer's Reference without a radio to hand, and a wrongly scaled SWR bar reports a good match on a bad antenna.",
"Type a number in the callsign field and press Enter to move the radio: kHz for a frequency (28500 → 28.500 MHz), or a band on its own (20, 160, 6…). It is where the hands already are — reading a spot and reaching for the frequency box is what loses the station. Ambiguous numbers are read as bands, since 40 kHz and 160 kHz are nowhere anyone tunes.",
"Yaesu console: the mic gain is read and written on the rig's own 0-100 scale. It was treated as 0-255, so an FTDX101 set to 80 showed 38 and every attempt to move the slider was refused by the radio and sprang back.",
"Yaesu console: the power slider goes to 200 W on the models that make it (FTDX101MP and the like), and follows the radio if it ever reports more than expected. The slider, not the rig, was the 100 W limit.",
"Yaesu console: the NAR button (narrow IF filter) is shown only when the radio answers the command, and says what it is. A button that did nothing when pressed read as a fault in the rig.",
"The frequency readout now steps the Hz digits under the mouse wheel too, not just the kHz ones — 100, 10 and 1 Hz. Zero-beating a CW signal is a few tens of Hz, and it was the one move the display would not make.",
"The split-pile-up chaser only appears in CW: the marker comes from a skimmer decoding a report, so on SSB or FT8 there is nothing for it to chase.",
"Cluster: a single click now only fills the callsign, and a DOUBLE click works the spot — QSY, mode and the rest. Running down the list used to drag the radio along with every line looked at.",
"Cluster: how many spots the list keeps is now a setting (Preferences → Cluster, beside the spot lifetime). It was fixed at a thousand, and on a busy evening that fills in a couple of minutes — so the cap, not the lifetime, decided when a spot disappeared and a 15-minute lifetime never expired anything.",
"Elecraft console: the ATU tune sends the right switch. SWT19 is the ATU row in the K3 reference — TAP starts a tuning cycle, and a HOLD (the new ATU button) puts the tuner in line or bypasses it. It was written as SWT20, which is not an ATU switch at all. Power now takes the K3 range of 0-110 W.",
"Elecraft console: the mouse wheel moves the sliders, as it already did on the Flex and Yaesu consoles. Power steps 5 W a notch, the rest one unit."
],
"fr": [
"Quand TQSL refuse un envoi, le journal contient désormais l'enregistrement ADIF exact qui lui a été remis et l'emplacement de station demandé pour la signature. « No QSOs processed » recouvre plusieurs causes sans rapport et le fichier temporaire est supprimé dès que TQSL rend la main : la seule pièce à conviction utile était justement invisible.",
"Une console Elecraft pour les K3/K4, dans un onglet dédié quand le CAT est réglé sur Elecraft ou Kenwood : puissance, volume, gain HF et micro, squelch, préampli, atténuateur, NB, NR, AGC, largeur de filtre, antenne, RIT/XIT avec effacement, vitesse du manipulateur, S-mètre, ROS, MOX et accord de l'ATU. L'échelle des mesures est signalée comme provisoire et les valeurs brutes partent dans le journal — la console a été écrite d'après le manuel de programmation du K3, sans radio sous la main, et une barre de ROS mal calibrée annonce un bon accord sur une mauvaise antenne.",
"Taper un nombre dans le champ indicatif puis Entrée déplace la radio : en kHz pour une fréquence (28500 → 28.500 MHz), ou une bande seule (20, 160, 6…). C'est là que sont déjà les mains — lire un spot puis aller chercher la case fréquence, c'est ce qui fait perdre la station. Les nombres ambigus sont lus comme des bandes : 40 kHz ou 160 kHz ne sont nulle part où l'on s'accorde.",
"Console Yaesu : le gain micro est lu et écrit sur l'échelle 0-100 de la radio. Il était traité en 0-255 : un FTDX101 réglé sur 80 affichait 38, et toute tentative de bouger le curseur était refusée par la radio et revenait en place.",
"Console Yaesu : le curseur de puissance monte à 200 W sur les modèles qui la sortent (FTDX101MP et consorts), et suit la radio si elle annonce davantage. C'était le curseur, pas la radio, qui plafonnait à 100 W.",
"Console Yaesu : le bouton NAR (filtre FI étroit) n'apparaît que si la radio répond à la commande, et indique ce qu'il fait. Un bouton sans effet passait pour une panne de la radio.",
"L'affichage de fréquence fait maintenant défiler aussi les chiffres des Hz à la molette, pas seulement ceux des kHz — 100, 10 et 1 Hz. Se caler au zéro-beat sur un signal CW se joue à quelques dizaines de Hz, et c'était le seul geste que l'affichage refusait.",
"Le chasseur de pile-up en split n'apparaît qu'en CW : le marqueur vient d'un skimmer qui décode un report, donc en SSB ou en FT8 il n'a rien à chasser.",
"Cluster : un clic simple ne remplit plus que l'indicatif, et le DOUBLE clic travaille le spot — QSY, mode et le reste. Parcourir la liste entraînait la radio à chaque ligne regardée.",
"Cluster : le nombre de spots conservés devient un réglage (Préférences → Cluster, à côté de la durée de vie). Il était fixé à mille, et un soir chargé remplit ça en quelques minutes — c'était donc le plafond, et non la durée de vie, qui décidait de la disparition d'un spot, et une durée de 15 minutes n'expirait jamais rien.",
"Console Elecraft : l'accord ATU envoie la bonne touche. SWT19 est la ligne ATU du manuel K3 — l'appui bref lance un cycle d'accord, et le maintien (nouveau bouton ATU) met la boîte en ligne ou la contourne. C'était écrit SWT20, qui n'est pas une touche d'ATU. La puissance suit la plage 0-110 W du K3.",
"Console Elecraft : la molette agit sur les curseurs, comme elle le faisait déjà sur les consoles Flex et Yaesu. La puissance avance de 5 W par cran, le reste d'une unité."
]
},
{
"version": "0.26.11",
"date": "",
"en": [
"Withdrawing deleted QSOs from Club Log is now paced and capped at 25 per deletion. Their delete endpoint is a real-time one, meant for an operator removing a contact they just mis-logged; Club Log watches the rate and blocks the IP of anything that batches through it. Past the cap OpsLog stops and says so — there is no bulk-delete API, and hundreds of removals belong on clublog.org, which has a tool for it.",
"Auto-call, withdrawn earlier, is now disarmed where it was remembered: a stored 'enabled' is switched off and written back the first time OpsLog reads it. The running guard already stopped this build from calling anyone, but the stored flag survived — and any build without that guard would key the transmitter for a feature with no switch left to turn it off."
],
"fr": [
"Le retrait des QSO supprimés chez Club Log est désormais cadencé et limité à 25 par suppression. Leur point d'entrée de suppression est temps réel, prévu pour un opérateur qui retire un contact qu'il vient de mal enregistrer ; Club Log surveille le rythme et bloque l'IP de ce qui passe des lots par là. Au-delà de la limite, OpsLog s'arrête et le dit — il n'existe pas d'API de suppression en masse, et des centaines de retraits se font sur clublog.org, qui a l'outil pour ça.",
"L'appel automatique, retiré précédemment, est maintenant désarmé là où il était mémorisé : un « activé » enregistré est éteint et réécrit dès la première lecture par OpsLog. Le garde-fou à l'exécution empêchait déjà cette version d'appeler qui que ce soit, mais l'indicateur enregistré survivait — et toute version sans ce garde-fou passait à l'émission pour une fonction dont il ne reste aucun interrupteur."
]
},
{
"version": "0.26.10",
"date": "",
"en": [
"The HAMLOG.online confirmation import now fills the Results view with the contacts it confirmed, flagged new entity / band / mode / slot, and can export the unmatched ones as ADIF. Those are the interesting half: each is a contact their site holds and the log does not confirm — a minute of drift, a portable call, or a QSO genuinely missing.",
"Awards: 'county' joins the searchable QSO fields — the CNTY field as it stands. The existing 'us_county' keys the county to its state, which is right for the United States and wrong everywhere else: an RDA district or a Japanese city code is already unique.",
"*** FlexRadio: a split pile-up chaser. When a CW skimmer (SDC) marks a report on the panadapter, OpsLog moves the TRANSMIT slice there — where the DX was listening a second ago — plus a signed offset in Hz; the receive slice never moves. The button sits on the FlexRadio panel beside SPLIT, with the offset next to it. Right-click the button to set the marker text — it has to match what SDC is set to write (599 by default, several allowed), so it is edited where it is switched on rather than in a settings page.***",
"The radio's spot feed is now subscribed to even when OpsLog draws no spots of its own — that feed is how another program's spots arrive. Clearing the panadapter at connect still only happens when the overlay is OpsLog's: 'spot clear' removes every spot on the radio, a skimmer's included.",
"CW keyer: fixed Enter sending nothing on the Icom, Yaesu and Kenwood engines. Send-on-type only exists on the WinKeyer and Flex CWX, but the setting survived a change of engine — so the switch stayed on, invisibly, and the text field believed everything had already been keyed. Macros were unaffected, which is what made it puzzling."
],
"fr": [
"L'import des confirmations HAMLOG.online alimente maintenant la vue Résultats avec les contacts confirmés, marqués nouvelle entité / bande / mode / slot, et peut exporter les non-rapprochés en ADIF. C'est la moitié intéressante : chacun est un contact que leur site détient et que le journal ne confirme pas — minute décalée, indicatif portable, ou QSO réellement absent.",
"Diplômes : « county » rejoint les champs de QSO interrogeables — le champ CNTY tel quel. Le « us_county » existant associe le comté à son État, ce qui est juste aux États-Unis et faux ailleurs : un district RDA ou un code de ville japonais est déjà unique.",
"*** FlexRadio : chasseur de pile-up en split. Quand un skimmer CW (SDC) marque un report sur le panadapter, OpsLog déplace la slice d'ÉMISSION dessus — là où le DX écoutait une seconde plus tôt — plus un décalage signé en Hz ; la slice de réception ne bouge jamais. Le bouton est sur le panneau FlexRadio à côté de SPLIT, avec le décalage juste à côté. Clic droit sur le bouton pour régler le texte du marqueur — il doit correspondre à ce que SDC est réglé à écrire (599 par défaut, plusieurs possibles), donc il se modifie là où on l'active plutôt que dans les réglages.***",
"Le flux de spots de la radio est désormais suivi même si OpsLog n'affiche aucun spot : c'est par lui qu'arrivent les spots des autres programmes. Le nettoyage du panadapter à la connexion reste réservé au cas où l'affichage est celui d'OpsLog : « spot clear » efface tous les spots de la radio, y compris ceux d'un skimmer.",
"Manipulateur CW : correction d'Entrée qui n'envoyait rien sur les moteurs Icom, Yaesu et Kenwood. L'émission au fil de la frappe n'existe que sur le WinKeyer et le Flex CWX, mais le réglage survivait à un changement de moteur — l'interrupteur restait donc actif, invisible, et le champ de texte croyait que tout avait déjà été émis. Les macros n'étaient pas touchées, ce qui rendait la chose incompréhensible."
]
},
{
"version": "0.26.9",
"date": "",
"en": [
"Edit QSO: HAMLOG.online joins the QSL Info tab — its own channel in the picker, with sent/received and both dates, and a row in the status table. Its four columns also move from the QSL group to Uploads, next to Club Log and QRZ.com.",
"The filter can now match on when a QSO was added to the log ('Added to the log on'), which is the only way to isolate what an import brought in — an import of old contacts carries old QSO dates and otherwise hides inside the log.",
"QSL Manager: HAMLOG.online gains 'Import confirmations (ADIF)…'. Their site exports a log, this reads it back and stamps the confirmations on QSOs already present — it never inserts. Importing that same file through the ordinary ADIF import does insert, because it matches on the UTC minute and their export rarely agrees to the minute.",
"Deleting QSOs now says how many rows were actually removed, and writes it to the log. A delete that removes nothing used to look exactly like one that worked.",
"Deleting QSOs is fast again when 'delete from the remote services' is on. Club Log is only asked about contacts that were actually uploaded to it — asking about the others earned a 403 each time, one network round trip per QSO — the withdrawals now run in the background instead of holding the window, the rows behind a selection are read in one query rather than one per QSO, and repeated refusals stop the run rather than earning a longer block."
],
"fr": [
"Édition de QSO : HAMLOG.online rejoint l'onglet QSL Info — son propre canal dans la liste, avec envoyé/reçu et les deux dates, et une ligne dans le tableau de statut. Ses quatre colonnes passent aussi du groupe QSL au groupe Uploads, à côté de Club Log et QRZ.com.",
"Le filtre peut maintenant porter sur la date d'ajout au journal (« Ajouté au journal le »), seul moyen d'isoler ce qu'un import a apporté : un import de vieux contacts porte de vieilles dates de QSO et se fond sinon dans le journal.",
"Gestionnaire QSL : HAMLOG.online reçoit « Importer les confirmations (ADIF)… ». Leur site exporte un log, cette fonction le relit et appose les confirmations sur les QSO déjà présents — elle n'ajoute jamais rien. Le même fichier passé par l'import ADIF ordinaire, lui, ajoute : il compare à la minute UTC près et leur export s'accorde rarement à la minute.",
"La suppression de QSO indique maintenant combien de lignes ont réellement été supprimées, et l'écrit dans le journal. Une suppression sans effet ressemblait exactement à une suppression réussie.",
"La suppression de QSO redevient rapide quand « supprimer aussi des services externes » est activé. Club Log n'est plus interrogé que pour les contacts qui y ont réellement été envoyés — pour les autres il répondait 403, un aller-retour réseau par QSO — les retraits se font désormais en arrière-plan au lieu de bloquer la fenêtre, les lignes d'une sélection sont lues en une seule requête au lieu d'une par QSO, et une série de refus interrompt le traitement au lieu d'aggraver le blocage."
]
},
{
"version": "0.26.8",
"date": "",
"en": [
"Yaesu: an ANT row in the rig panel selects the antenna jack, and the choice is remembered for the band it was made on — change band and the antenna follows. There is no page to configure: picking the antenna once on a band says it perfectly well. Rigs with a single socket never show the row.",
"HAMLOG.online: QSOs can be uploaded as they are logged, like QRZ.com or Club Log. The API key is checked in the settings before the first contact — the answer names the account it belongs to, so a key pasted from another callsign or an expired one is caught at once instead of after a week of silent refusals.",
"HAMLOG.online is also a confirmation source for awards, alongside LoTW, QSL, eQSL and QRZ.com — tick it under Confirmed, under Validated, or both.",
"A rig whose serial port is refused now says who is likely holding it — OmniRig stays resident and keeps the port of the rig configured in it, which is what a native backend then never gets. \"Serial port busy\" alone named nobody.",
"The row colours in Appearance can be scoped to HAMLOG.online as well, alongside paper, LoTW, eQSL and QRZ.com.",
"HAMLOG.online appears in the QSL Manager too: pick it to see every QSO never sent there and upload the backlog in one go. A contact already sent carries the date it went, so a second sweep does not send it twice.",
"Right-clicking QSOs offers HAMLOG.online among the upload targets, and the toast names each service properly instead of echoing its internal id.",
"Bulk edit can set HAMLOG.online sent and received, each with its status and its date — the same four fields every other service has there. A log uploaded to their site by hand had no way to be marked as sent, so OpsLog kept offering to upload every contact again.",
"HAMLOG.online joins the Confirmations defaults and the QSO grid columns — sent and received, each with its status and date, hidden by default like the other extras-backed columns.",
"Removed the explanatory paragraph from the Confirmations page.",
"HAMLOG.online confirmations are read from the site's own ADIF field, APP_HAMLOG_QSO_CFM, taken from a real export. Import a log downloaded from HAMLOG and its confirmations count for awards straight away, with nothing to rename and no mapping to configure.",
"The four HAMLOG.online fields are filterable too, so 'never sent there' is a filter and not a guess.",
"RDA: a read-only comparison of the two district sources — the offline RDA database against the CNTY carried by a log imported from HAMLOG.online — reporting how many agree, how many differ, and listing the disagreements with the contact, both districts, and whether the database answer was a dated record or an assumption.",
"The QSO right-click menu can now export the selection to ADIF with the OpsLog fields, so the award references (RDA@KR-04 and the like) travel with the contacts. The existing entry still writes standard ADIF for other loggers.",
"The filtered-view export gets the same treatment: a second right-click entry writes the whole filtered view to ADIF with the OpsLog fields."
],
"fr": [
"Yaesu : une ligne ANT dans le panneau du poste sélectionne la prise d'antenne, et le choix est mémorisé pour la bande sur laquelle il a été fait — on change de bande, l'antenne suit. Aucune page à configurer : choisir l'antenne une fois sur une bande le dit très bien. Les postes à une seule prise n'affichent jamais la ligne.",
"HAMLOG.online : les QSO peuvent être envoyés au fil de leur enregistrement, comme QRZ.com ou Club Log. La clé API se vérifie dans les réglages avant le premier contact — la réponse nomme le compte auquel elle appartient, donc une clé d'un autre indicatif ou expirée se voit tout de suite au lieu d'après une semaine de refus silencieux.",
"HAMLOG.online est aussi une source de confirmation pour les diplômes, aux côtés de LoTW, QSL, eQSL et QRZ.com — à cocher dans Confirmé, dans Validé, ou les deux.",
"Un poste dont le port série est refusé indique maintenant qui le détient vraisemblablement — OmniRig reste résident et garde le port de la radio configurée chez lui, que le backend natif n'obtient alors jamais. « Serial port busy » ne désignait personne.",
"Les couleurs de lignes dans Apparence peuvent aussi être limitées à HAMLOG.online, aux côtés du papier, de LoTW, d'eQSL et de QRZ.com.",
"HAMLOG.online figure aussi dans le gestionnaire QSL : on le choisit pour voir tous les QSO jamais envoyés là-bas et expédier l'arriéré d'un coup. Un contact déjà envoyé porte la date de son départ, donc un second passage ne le renvoie pas.",
"Le clic droit sur des QSO propose HAMLOG.online parmi les destinations d'envoi, et la notification nomme correctement chaque service au lieu d'afficher son identifiant interne.",
"L'édition en masse peut renseigner HAMLOG.online envoyé et reçu, chacun avec son statut et sa date — les mêmes quatre champs que les autres services. Un journal téléversé à la main sur leur site n'avait aucun moyen d'être marqué comme envoyé, et OpsLog proposait donc de renvoyer tous les contacts.",
"HAMLOG.online rejoint les valeurs par défaut des Confirmations et les colonnes de la grille des QSO — envoyé et reçu, chacun avec son statut et sa date, masquées par défaut comme les autres colonnes issues des extras.",
"Suppression du paragraphe explicatif de la page Confirmations.",
"Les confirmations HAMLOG.online sont lues dans le champ ADIF du site lui-même, APP_HAMLOG_QSO_CFM, relevé sur un export réel. Il suffit d'importer un journal téléchargé depuis HAMLOG pour que ses confirmations comptent aussitôt pour les diplômes, sans rien renommer ni configurer.",
"Les quatre champs HAMLOG.online sont aussi filtrables, pour que « jamais envoyé là-bas » soit un filtre et non une supposition.",
"RDA : une comparaison en lecture seule des deux sources de district — la base RDA hors ligne face au CNTY d'un journal importé depuis HAMLOG.online — indiquant combien concordent, combien divergent, et listant les désaccords avec le contact, les deux districts, et si la réponse de la base était un enregistrement daté ou une hypothèse.",
"Le menu contextuel des QSO peut maintenant exporter la sélection en ADIF avec les champs OpsLog, pour que les références de diplômes (RDA@KR-04 et compagnie) suivent les contacts. L'entrée existante écrit toujours de l'ADIF standard pour les autres carnets.",
"L'export de la vue filtrée reçoit le même traitement : une seconde entrée du menu contextuel écrit toute la vue filtrée en ADIF avec les champs OpsLog."
]
},
{
"version": "0.26.7",
"date": "",
"en": [
"The NEW badge on a county now shows in the entry form itself, inside the field, and not only on the Info tab — it answers the question at the moment the operator is deciding whether to call.",
"OmniRig: a Yaesu is no longer sent OmniRig's SetSimplexMode when tuning. It is a no-op on some (an FT-891 never moved) and harmful on others — on an FT-2000 it turned split on and moved reception to VFO B, which is why OpsLog then showed B instead of A. The direct frequency write, which is what tunes these rigs, is unchanged.",
"The basemap buttons on the main map are shifted clear of the zoom controls — Light sat a few pixels from the minus button and was being clicked by mistake.",
"Cluster, French interface: the WKD CALL status now reads DÉJÀ QSO instead of DÉJÀ CTC.",
"Icom over LAN: the receive audio streamed by the rig now feeds the QSO recorder as well as the speakers. On a network connection Windows sees no radio sound card at all — the audio settings could only offer the PC microphone — so the stream is pushed straight into the recorder, with no virtual cable to set up."
],
"fr": [
"Le badge NOUV du comté s'affiche maintenant dans le formulaire de saisie lui-même, à l'intérieur du champ, et plus seulement dans l'onglet Info — il répond au moment où l'opérateur décide d'appeler ou non.",
"OmniRig : le SetSimplexMode d'OmniRig n'est plus envoyé aux Yaesu lors d'un changement de fréquence. Il est sans effet sur certains (un FT-891 ne bougeait pas) et nuisible sur d'autres — sur un FT-2000 il activait le split et faisait passer la réception sur le VFO B, d'où l'affichage du B au lieu du A. L'écriture directe de la fréquence, qui est ce qui accorde réellement ces postes, ne change pas.",
"Les boutons de fond de carte sont décalés à l'écart des commandes de zoom — Light était à quelques pixels du bouton moins et se faisait cliquer par erreur.",
"Cluster, interface française : le statut « DÉJÀ CTC » devient « DÉJÀ QSO ».",
"Icom en réseau : l'audio reçu diffusé par le poste alimente maintenant l'enregistreur de QSO en plus des haut-parleurs. Sur une liaison réseau, Windows ne voit aucune carte son de la radio — les réglages audio ne proposaient que le micro du PC — donc le flux est injecté directement dans l'enregistreur, sans câble virtuel à installer."
]
},
{
"version": "0.26.6",
"date": "",
"en": [
"FT decodes: the continent filter is now a multiple choice — click AF, AS, OC and SA to keep those four. It still lists only the continents actually being decoded, plus any you have selected, so a filter can never strand itself with no chip left to switch it off.",
"A QSO logged by WSJT-X, JTDX or MSHV now raises a notice in the corner naming the station. Watching the decodes, nothing else on screen said it had happened: the entry form never cleared, because nobody typed in it.",
"Icom CI-V: a reply the rig sent to another controller on the same bus is no longer mistaken for ours, and a PTT command whose acknowledgement goes missing is verified by reading the rig instead of being reported as a failure. WSJT-X and JTDX answer a failed set_ptt with a Rig Control Error and drop the link mid-over, which is what an IC-7850 was doing three times a session. The check itself waits 700 ms rather than the poll's 150: the rig has just failed to answer twice, usually because it is retuning — JTDX moves the transmit frequency and keys in the same breath — and a short probe would fail for the same reason. Both outcomes are logged, so a failure that remains can be told from a fix that did not fire.",
"FlexRadio: each spot status can now be kept off the panadapter entirely, with a switch beside its colours — and WSJT-X decode spots obey the same switches and the same colours. The palette governs the panadapter, not just one of the two things that feed it: statuses switched off still piled up on the waterfall because the decodes were pushed by another path.",
"Panadapter spot comments now read like DXHunter's: the cluster text, then the spotter, the entity and the status — \"CQ up 2 [F4BPO] [Franz Josef Land] [New Slot]\". The words were running together because SmartSDR splits its command line on spaces; non-breaking spaces get them through.",
"\"Already worked\" on a panadapter spot now means the CALLSIGN is in the log, not the entity. An entity worked on that band and mode is no news, and saying \"already worked\" of a station never contacted was wrong.",
"FT decodes: a compound MSHV message that answers two stations in one line — \"DM8BJF RR73; F4BPO <RI1FJL> +14\" — is now recognised as addressed to you when your callsign is in the second half.",
"Edit QSO: your own transmit power can be edited at last — the field was saved and written back but had no box, so a contact logged at the wrong power could never be corrected. The contacted station's extended locator gained a box for the same reason, and the power labels now say WHOSE power they are.",
"FlexRadio: a spot is no longer removed and redrawn when nothing about it has changed. A busy skimmer feed re-spots the same station every few seconds — one two-minute session sent 2128 spot adds, 88 of them for a single callsign — and the panadapter did not move a pixel for any of them.",
"Panadapter spot comments are kept within what the radio will accept: SmartSDR was cutting the longest ones mid-word, losing the entity and the status. The cluster's own words are trimmed first, the spotter, entity and status always survive. The column padding of an RBN line is collapsed to single spaces too — kept as non-breaking spaces it opened a gap wide enough to push the rest of the comment off the screen.",
"Auto-call is withdrawn — it duplicated DXHunter, which already answers decodes. Clicking a decode to answer it is unchanged.",
"The elastic bounce at the end of a list is gone, and a two-finger horizontal swipe no longer navigates the window away from the app. Both are browser behaviours that only appear on a touchpad or a touchscreen.",
"The interface zoom now says what it is doing: a badge shows the factor while it changes, clicking it returns to 100%, and View → Zoom in / Zoom out / Actual size makes it findable. Ctrl+wheel and Ctrl+0 always worked, but nothing announced them — zoom by accident and there was no way back.",
"Icom CI-V: a frequency or mode change whose acknowledgement goes missing is now verified by reading the rig back, like the PTT already was. All three are commands WSJT-X and JTDX answer with a Rig Control Error and a dropped link, and an IC-7850 log shows a set_freq doing exactly that.",
"The log file now rotates while OpsLog is running, not only at startup. It was bounded on the belief that a session writes a few kilobytes; with the CI-V wire trace left on, one wrote 416 MB and nothing would have stopped it before the disk did."
],
"fr": [
"Décodes FT : le filtre par continent est maintenant multiple — clique AF, AS, OC et SA pour garder ces quatre-là. Il ne liste toujours que les continents réellement décodés, plus ceux que tu as sélectionnés, pour qu'un filtre ne puisse pas se bloquer sans pastille pour le désactiver.",
"Un QSO enregistré par WSJT-X, JTDX ou MSHV affiche maintenant une notification dans le coin, avec le nom de la station. En regardant les décodes, rien d'autre à l'écran ne le signalait : le formulaire ne se vidait pas, puisque personne n'y avait tapé.",
"Icom CI-V : une réponse que la radio adresse à un autre contrôleur du même bus n'est plus prise pour la nôtre, et un ordre de PTT dont l'accusé de réception se perd est vérifié en interrogeant la radio au lieu d'être déclaré en échec. WSJT-X et JTDX répondent à un set_ptt en échec par une erreur de contrôle radio et coupent la liaison en pleine émission — ce que faisait un IC-7850 trois fois par session. La vérification attend 700 ms et non les 150 de la scrutation : la radio vient d'échouer deux fois, en général parce qu'elle se réaccorde — JTDX décale la fréquence d'émission et passe en émission dans la foulée — et une interrogation brève échouerait pour la même raison. Les deux issues sont journalisées, pour distinguer un échec réel d'un correctif qui n'a pas agi.",
"FlexRadio : chaque statut de spot peut désormais être totalement exclu du panadapter, par un interrupteur à côté de ses couleurs — et les spots issus des décodes WSJT-X obéissent aux mêmes interrupteurs et aux mêmes couleurs. La palette régit le panadapter, pas seulement l'une des deux sources qui l'alimentent : les statuts décochés continuaient de s'entasser sur la cascade parce que les décodes passaient par un autre chemin.",
"Les commentaires des spots du panadapter se lisent maintenant comme ceux de DXHunter : le texte du cluster, puis le spotteur, l'entité et le statut — « CQ up 2 [F4BPO] [Franz Josef Land] [New Slot] ». Les mots se collaient parce que SmartSDR découpe sa ligne de commande sur les espaces ; des espaces insécables les font passer.",
"« Déjà contacté » sur un spot du panadapter désigne désormais l'INDICATIF présent dans le journal, et non l'entité. Une entité déjà faite sur cette bande et ce mode n'est pas une nouvelle, et annoncer « déjà contacté » pour une station jamais travaillée était faux.",
"Décodes FT : un message composé MSHV qui répond à deux stations sur une seule ligne — « DM8BJF RR73; F4BPO <RI1FJL> +14 » — est maintenant reconnu comme vous étant adressé quand votre indicatif est dans la seconde moitié.",
"Édition de QSO : sa propre puissance d'émission est enfin modifiable — le champ était enregistré et réécrit mais n'avait aucune case, donc un contact loggé à la mauvaise puissance ne pouvait pas être corrigé. Le locator étendu du correspondant gagne une case pour la même raison, et les libellés de puissance disent maintenant à QUI elle appartient.",
"FlexRadio : un spot n'est plus supprimé puis redessiné quand rien n'a changé. Un flux de skimmers actif re-spotte la même station toutes les quelques secondes — une session de deux minutes envoyait 2128 ajouts, dont 88 pour un seul indicatif — sans que le panadapter bouge d'un pixel.",
"Les commentaires des spots du panadapter tiennent maintenant dans ce que la radio accepte : SmartSDR coupait les plus longs en plein mot, perdant l'entité et le statut. Le texte du cluster est rogné en premier, le spotteur, l'entité et le statut survivent toujours. L'alignement en colonnes des lignes RBN est aussi ramené à une seule espace : conservé en espaces insécables, il ouvrait un trou assez large pour repousser le reste du commentaire hors de l'écran.",
"L'appel automatique est retiré — il faisait doublon avec DXHunter, qui répond déjà aux décodages. Cliquer un décodage pour répondre ne change pas.",
"Le rebond élastique en fin de liste a disparu, et un balayage horizontal à deux doigts ne fait plus quitter l'application. Deux comportements de navigateur qui n'apparaissent qu'au pavé tactile ou sur écran tactile.",
"Le zoom de l'interface s'annonce enfin : une pastille affiche le facteur pendant qu'il change, un clic dessus revient à 100 %, et le menu Affichage → Zoom avant / Zoom arrière / Taille réelle le rend trouvable. Ctrl+molette et Ctrl+0 fonctionnaient déjà, mais rien ne le disait — un zoom involontaire et on ne savait plus revenir.",
"Icom CI-V : un changement de fréquence ou de mode dont l'accusé de réception se perd est désormais vérifié en interrogeant la radio, comme l'était déjà le PTT. Les trois sont des ordres auxquels WSJT-X et JTDX répondent par une erreur de contrôle radio et une liaison coupée, et un log d'IC-7850 montre un set_freq faire précisément cela.",
"Le fichier de log tourne maintenant en cours d'exécution, et plus seulement au démarrage. Sa limite reposait sur l'idée qu'une session écrit quelques kilo-octets ; avec la trace CI-V laissée active, l'une d'elles a écrit 416 Mo sans que rien ne l'arrête avant le disque."
]
},
{
"version": "0.26.5",
"date": "",
"en": [
"Fixed the record button going missing after an update, until the audio settings were opened and saved. Whether a manual recording is possible depends on a per-profile setting, and the question was asked once at startup — before the profile was known on a launch that had more work to do.",
"Switching profile is quicker on a shared MySQL logbook: the one-off cleanup of unused settings tables is now recorded as done instead of being re-checked on every connection.",
"A profile switch now logs how long it took, and any device slower than half a second names itself — a switch that feels sluggish can be diagnosed from the log file.",
"Saving an alert rule or a filter preset now says so, with the name, for a few seconds. Both used to save in silence, leaving the dialog looking exactly as it did before the click.",
"Awards: the callsigns listed behind an award cell are now links. Clicking one opens the QSL Manager on Paper QSL with that station searched, ready for the card sent/received dates — chasing a missing confirmation no longer means retyping the callsign into another tab.",
"Motorised antennas over serial: the line format is now stated explicitly as 8N1, the baud list covers 1200 to 115200, and the first exchange after each connect is dumped to the log — which separates a silent controller from a wrong baud rate from a frame we misread.",
"Fixed a motorised antenna on a serial port failing with \"Serial port busy\" for ever. OpsLog was holding the port itself: stopping a client did not wait for its poll loop to leave, and the new client was started while the old one still owned the COM port — every settings save added another loop to the fight.",
"A serial antenna controller whose port is held by another program now says so by name in the log, instead of repeating \"Serial port busy\" — a COM port has one owner, usually the manufacturer control window left open.",
"Fixed \"Test connection\" on a serial motorised antenna taking the COM port away from the running antenna. A port has one owner, so the test now reports the live link's own status instead of opening a second connection to it.",
"A serial antenna controller that never answers now fails after four seconds with \"nothing came back\", instead of freezing the poll loop for minutes with nothing in the log. A silent serial port returns no bytes AND no error, and the buffered reader retried that a hundred times before giving up.",
"Ultrabeam over USB now works. The cable presents TWO COM ports and only the second reaches the controller, at 19200 baud — so the speed is now fixed at 19200 and the port field says which one to pick. Stopping a client no longer waits out the read timeout either, so changing port takes effect at once instead of leaving the old one held."
],
"fr": [
"Correction du bouton d'enregistrement disparu après une mise à jour, jusqu'à ce qu'on ouvre et enregistre les réglages audio. La possibilité d'enregistrer dépend d'un réglage par profil, et la question n'était posée qu'une fois au démarrage — avant que le profil soit connu, sur un lancement qui avait plus de travail à faire.",
"Le changement de profil est plus rapide sur un journal MySQL partagé : le nettoyage ponctuel des tables de réglages inutilisées est désormais marqué comme fait, au lieu d'être revérifié à chaque connexion.",
"Un changement de profil enregistre maintenant sa durée dans le journal, et tout appareil dépassant la demi-seconde se nomme — un changement qui traîne peut donc être diagnostiqué depuis le fichier de log.",
"L'enregistrement d'une règle d'alerte ou d'un filtre affiche maintenant une confirmation avec son nom, quelques secondes. Les deux enregistraient en silence, la fenêtre restant identique à ce qu'elle était avant le clic.",
"Diplômes : les indicatifs listés derrière une case sont désormais cliquables. Un clic ouvre le gestionnaire QSL sur QSL papier avec la station déjà recherchée, prête pour les dates d'envoi et de réception — relancer une confirmation manquante ne demande plus de retaper l'indicatif dans un autre onglet.",
"Antennes motorisées en série : le format de ligne est désormais fixé explicitement en 8N1, la liste des vitesses va de 1200 à 115200, et le premier échange après chaque connexion est écrit dans le log — ce qui distingue un contrôleur muet d'une mauvaise vitesse et d'une trame mal relue.",
"Correction d'une antenne motorisée en série qui échouait indéfiniment sur « Serial port busy ». OpsLog occupait le port lui-même : l'arrêt d'un client n'attendait pas la sortie de sa boucle de scrutation, et le nouveau client démarrait alors que l'ancien détenait encore le port COM — chaque enregistrement des réglages ajoutait une boucle à la mêlée.",
"Un contrôleur d'antenne en série dont le port est occupé par un autre programme le dit maintenant explicitement dans le log, au lieu de répéter « Serial port busy » — un port COM n'a qu'un propriétaire, le plus souvent la fenêtre de contrôle du fabricant restée ouverte.",
"Correction du « Test de connexion » d'une antenne motorisée en série qui prenait le port COM à l'antenne en service. Un port n'a qu'un propriétaire : le test rapporte désormais l'état du lien en cours au lieu d'ouvrir une seconde connexion dessus.",
"Un contrôleur d'antenne en série qui ne répond jamais échoue maintenant en quatre secondes sur « rien n'est revenu », au lieu de figer la boucle de scrutation pendant des minutes sans rien écrire dans le log. Un port série muet ne renvoie ni octet ni erreur, et le lecteur tamponné réessayait cent fois avant d'abandonner.",
"Ultrabeam en USB fonctionne. Le câble présente DEUX ports COM et seul le second atteint le contrôleur, à 19200 bauds — la vitesse est donc fixée à 19200 et le champ du port indique lequel choisir. L'arrêt d'un client n'attend plus la fin du délai de lecture, donc un changement de port prend effet immédiatement au lieu de laisser l'ancien occupé."
]
},
{
"version": "0.26.4",
"date": "",
"en": [
"Clicking a spot on the radio panadapter now carries its POTA park into the Awards tab, like a click in OpsLog does.",
"Ultrabeam over serial: the COM port field now has a chevron that opens the list of detected ports. It was a combo box that only opened on a keystroke, so it looked like a plain text box.",
"The logbook database now contains only the contacts. Settings, station profiles, award reference lists and the lookup cache were being created in every database, including a shared MySQL logbook, which made the two look interchangeable; the unused tables are dropped on the next start, and any that hold data are left alone.",
"And the mirror image: the settings database drops its own unused, empty qso table once the contacts have a database of their own. It is rebuilt automatically if that database is ever pressed into service as the logbook again.",
"Settings → Database: a Compact button on each database. SQLite frees deleted pages inside the file and never shrinks it, so this is what gives the disk space back; the result shows the size before and after. A shared MySQL logbook has the button too, running OPTIMIZE TABLE instead."
],
"fr": [
"Cliquer un spot sur le panadapter de la radio reporte maintenant son parc POTA dans longlet Diplômes, comme un clic dans OpsLog.",
"Ultrabeam en série : le champ du port COM a maintenant un chevron qui ouvre la liste des ports détectés. C'était une liste déroulante qui ne s'ouvrait qu'en tapant, donc indiscernable d'un simple champ texte.",
"La base du journal ne contient plus que les contacts. Les réglages, profils station, listes de références et le cache de recherche étaient créés dans toutes les bases, y compris un MySQL partagé, ce qui laissait croire que les deux étaient interchangeables ; les tables inutilisées sont supprimées au prochain démarrage, et celles qui contiennent des données sont laissées telles quelles.",
"Et l'inverse : la base de réglages supprime sa propre table qso, vide et inutilisée, dès lors que les contacts ont leur base à eux. Elle est reconstruite automatiquement si cette base doit à nouveau servir de journal.",
"Réglages → Base de données : un bouton Compacter sur chaque base. SQLite libère les pages supprimées à l'intérieur du fichier sans jamais le réduire ; c'est donc ce qui rend l'espace disque, et le résultat affiche la taille avant et après. Un journal MySQL partagé a aussi le bouton, avec un OPTIMIZE TABLE à la place."
]
},
{
"version": "0.26.3",
"date": "",
"en": [
"Ultrabeam: the controller can be reached over a plain serial port, not only over the network. It has an RS232 port and the PC is usually beside it, so an FTDI cable is the direct route — the RS232-to-Ethernet adapter is now only needed to put the antenna at the far end of a link. Same choice the SteppIR has always had, in the same place.",
"Docked band map: FIT and FTx are now two labelled buttons in its header. Fit-to-band was hidden behind the px/kHz readout — a control whose label is a measurement does not look like one, and switching it off left nothing on screen saying the option existed. Hiding the digital spots is available there too, and both follow the Band Map tab.",
"Stats: the Entities tile now says which entity was added to the log most recently, with the callsign and date that did it. Judged against the whole log — a contact is the first with its country once, and does not become the first again because a date filter hides the ones before it.",
"Docked band map: in fit-to-band the header no longer printed FIT twice, once as the readout and once as the button beside it.",
"Settings: what OpsLog does with a FlexRadio — panadapter spots, decode spots and the DAX switch for voice messages — now lives in the FlexRadio page with the per-band antennas and power, instead of at the foot of the CAT page. CAT keeps the link itself: an address and a port, as for every other backend.",
"Cluster settings: four paragraphs of explanation removed. The options they described are unchanged.",
"A spot that is a new band AND a new mode for an entity is now its own status, NEW BAND+MODE, ranked with NEW DXCC. It used to be reported as a plain new band, which reads as \"you have worked this entity in this mode, just not here\" — the opposite of the truth. It is not a new slot either: a slot is the pair still missing when each half is already in the log. The cluster, the band map, the decodes panel, the filters and the auto-call criteria all tell the two apart now.",
"Cluster filters: a \"my bands\" link selects every band from your own band list in one click. With nothing selected the filter lets every band through — including 4 m and 70 cm off the RBN feeds, which the list could not offer you to untick because they are not bands you have.",
"FlexRadio: cluster spots on the panadapter are now coloured by what they are. A text colour and a background colour per status — new entity, new band+mode, new band, new mode, new slot, new park, new county, new prefix, your own callsign, already worked — set in Settings → FlexRadio, with a preview of each pair. Every spot used to be the same orange, which threw away the only thing worth knowing at a glance on a waterfall.",
"FlexRadio: clicking a spot can resize the panadapter to suit the mode — 25 kHz for CW, 200 for phone, 50 for digital by default, each configurable, with an option to re-centre on the spot as well. A CW signal is a hair at 200 kHz and an FT8 window shows an eighth of its sub-band at 25 kHz; one width cannot serve all three. Settings → FlexRadio, off by default.",
"FlexRadio: panadapter spots now carry their status in the comment as well as their colour — [NEW DXCC], [NEW BAND+MODE], [NEW BAND] and so on.",
"FlexRadio: the panadapter zoom now also applies when you click a spot on the panadapter itself, not just in the band map or cluster.",
"FlexRadio: fixed the panadapter zoom leaving the clicked spot off screen. The display now re-centres whenever the spot would fall outside the new window, and stays put when it would not.",
"Awards (F3): a NEW badge marks each award reference on the current QSO that has never been worked, picked or detected alike."
],
"fr": [
"Ultrabeam : le contrôleur se joint par un simple port série, plus seulement par le réseau. Il a une prise RS232 et le PC est en général juste à côté : un câble FTDI suffit — l'adaptateur RS232 vers Ethernet ne sert plus qu'à mettre l'antenne au bout d'une liaison. Le même choix que le SteppIR a toujours eu, au même endroit.",
"Bandmap ancrée : FIT et FTx sont désormais deux boutons nommés dans son en-tête. L'ajustement à la bande se cachait derrière l'indicateur px/kHz — un contrôle dont le libellé est une mesure n'a pas l'air d'un contrôle, et une fois désactivé plus rien à l'écran ne disait que l'option existait. Le masquage des spots numériques y est aussi, et les deux suivent l'onglet Bandmap.",
"Statistiques : la tuile Entités indique désormais quelle entité a été ajoutée au journal en dernier, avec l'indicatif et la date qui l'ont fait. Jugé sur le journal entier — un contact n'est le premier avec son pays qu'une fois, et ne le redevient pas parce qu'un filtre de date masque ceux d'avant.",
"Bandmap ancrée : en mode ajusté, l'en-tête n'affiche plus FIT deux fois, une comme indicateur et une comme bouton juste à côté.",
"Réglages : ce qu'OpsLog fait avec un FlexRadio — spots panadapter, spots de décodages et la bascule DAX pour les messages vocaux — se trouve désormais sur la page FlexRadio, avec les antennes et la puissance par bande, au lieu du bas de la page CAT. La page CAT garde la liaison elle-même : une adresse et un port, comme pour tous les autres backends.",
"Réglages du cluster : quatre pavés d'explication retirés. Les options qu'ils décrivaient sont inchangées.",
"Un spot qui est à la fois une nouvelle bande ET un nouveau mode pour une entité a désormais son propre statut, NOUVEAU BANDE+MODE, au même rang que NOUVEAU DXCC. Il était annoncé comme une simple nouvelle bande, ce qui se lit « tu as déjà fait cette entité dans ce mode, juste pas ici » — l'inverse de la vérité. Ce n'est pas non plus un nouveau slot : un slot est la paire qui manque quand chaque moitié est déjà au journal. Le cluster, la bandmap, le panneau des décodages, les filtres et les critères d'appel automatique font maintenant la différence.",
"Filtres du cluster : un lien « mes bandes » sélectionne d'un clic toutes les bandes de ta propre liste. Sans sélection, le filtre laisse passer toutes les bandes — y compris le 4 m et le 70 cm des flux RBN, que la liste ne pouvait pas te proposer de décocher puisque ce ne sont pas des bandes que tu as.",
"FlexRadio : les spots cluster sur le panadapter sont désormais colorés selon ce qu'ils sont. Une couleur de texte et une couleur de fond par statut — nouvelle entité, nouvelle bande+mode, nouvelle bande, nouveau mode, nouveau slot, nouveau parc, nouveau comté, nouveau préfixe, ton propre indicatif, déjà contacté — réglées dans Réglages → FlexRadio, avec un aperçu de chaque paire. Tous les spots étaient de la même couleur orange, ce qui jetait la seule chose qui compte au premier coup d'œil sur une cascade.",
"FlexRadio : cliquer un spot peut redimensionner le panadapter selon le mode — 25 kHz en CW, 200 en phonie, 50 en numérique par défaut, chacun réglable, avec une option pour recentrer aussi sur le spot. Un signal CW est un cheveu à 200 kHz et une fenêtre FT8 montre un huitième de sa sous-bande à 25 kHz ; une seule largeur ne peut pas servir les trois. Réglages → FlexRadio, désactivé par défaut.",
"FlexRadio : les spots du panadapter portent maintenant leur statut dans le commentaire en plus de la couleur — [NEW DXCC], [NEW BAND+MODE], [NEW BAND], etc.",
"FlexRadio : le zoom du panadapter s'applique aussi quand on clique un spot sur le panadapter lui-même, et plus seulement dans la bandmap ou le cluster.",
"FlexRadio : correction du zoom du panadapter qui laissait parfois le spot hors écran. L'affichage se recentre désormais dès que le spot sortirait de la nouvelle fenêtre, et ne bouge pas sinon.",
"Diplômes (F3) : un badge NEW signale chaque référence du QSO en cours jamais contactée, choisie à la main ou détectée."
]
},
{
"version": "0.26.2",
"date": "",
+102
View File
@@ -0,0 +1,102 @@
package main
// Compacting a database.
//
// SQLite never shrinks a file on its own: deleting rows — or dropping a table,
// which is what the schema-role cleanup does — frees pages INSIDE the file and
// leaves the file the size it always was. A logbook that held 200 000 imported
// QSOs for a day is still a 200 MB file the day after they are gone, and the
// only thing that reclaims the space is a VACUUM, which rewrites the database
// from scratch.
//
// Offered as a button rather than done automatically: a VACUUM rewrites the
// whole file, needs room for a second copy of it while it runs, and takes real
// time on a large logbook. That is a decision for the operator, at a moment they
// choose — not something to spring on them during startup.
import (
"database/sql"
"fmt"
"os"
"strings"
"hamlog/internal/applog"
)
// CompactResult is what one compaction did.
type CompactResult struct {
// Path of the file compacted, empty for MySQL.
Path string `json:"path"`
// Backend is "sqlite" or "mysql" — a shared server is optimised, not vacuumed.
Backend string `json:"backend"`
// Before and After are file sizes in bytes; both 0 when there is no file.
Before int64 `json:"before"`
After int64 `json:"after"`
}
// CompactDatabase reclaims the unused space in one of the two databases.
//
// target is "settings" or "logbook". They are separate on purpose: they are
// different files, of very different sizes, and an operator compacting a 400 MB
// logbook has no reason to wait on a 2 MB settings file as well.
func (a *App) CompactDatabase(target string) (CompactResult, error) {
switch strings.ToLower(strings.TrimSpace(target)) {
case "settings":
if a.db == nil {
return CompactResult{}, fmt.Errorf("the settings database is not open")
}
return a.vacuumSQLite(a.db, a.dbPath)
case "logbook":
if a.logDb == nil {
return CompactResult{}, fmt.Errorf("the logbook is not open")
}
if a.dbBackend == "mysql" {
// A shared server's storage is the admin's business, and OPTIMIZE TABLE
// locks the table for the length of a rebuild — every other operator
// waits. Still offered, because a logbook that has had a large import
// deleted benefits from it just as much; it simply reports no sizes,
// which the server alone knows.
if _, err := a.logDb.ExecContext(a.ctx, "OPTIMIZE TABLE qso"); err != nil {
return CompactResult{}, fmt.Errorf("optimize qso: %w", err)
}
applog.Printf("compact: OPTIMIZE TABLE qso on the shared MySQL logbook")
return CompactResult{Backend: "mysql"}, nil
}
// No separate file: the settings database is serving as the logbook, and
// compacting it is the same operation.
if a.logDbPath == "" {
return a.vacuumSQLite(a.db, a.dbPath)
}
return a.vacuumSQLite(a.logDb, a.logDbPath)
}
return CompactResult{}, fmt.Errorf("unknown database %q", target)
}
// vacuumSQLite checkpoints the write-ahead log, then rewrites the file.
func (a *App) vacuumSQLite(conn *sql.DB, path string) (CompactResult, error) {
res := CompactResult{Path: path, Backend: "sqlite", Before: fileSizeOf(path)}
// Fold the WAL back into the main file first. Without it the pages freed by a
// recent DELETE can still be sitting in the -wal, and the vacuum reports a
// saving the file on disk does not show.
if _, err := conn.ExecContext(a.ctx, "PRAGMA wal_checkpoint(TRUNCATE)"); err != nil {
applog.Printf("compact: wal checkpoint on %s: %v", path, err)
}
if _, err := conn.ExecContext(a.ctx, "VACUUM"); err != nil {
return res, fmt.Errorf("vacuum: %w", err)
}
res.After = fileSizeOf(path)
applog.Printf("compact: %s %d → %d bytes", path, res.Before, res.After)
return res, nil
}
// fileSizeOf returns a file's size, or 0 if it cannot be read.
func fileSizeOf(path string) int64 {
if strings.TrimSpace(path) == "" {
return 0
}
fi, err := os.Stat(path)
if err != nil {
return 0
}
return fi.Size()
}
+187
View File
@@ -0,0 +1,187 @@
package main
// Chasing a split pile-up by the report the DX just sent.
//
// Working a DXpedition in split means guessing where it is listening. The DX
// answers one station, sends "5NN", and moves on; the useful information is
// therefore not the callsign it answered but the FREQUENCY that callsign was
// transmitting on, because the DX's receiver was there a second ago.
//
// A CW skimmer already knows this. SDC (Software Defined Connector) decodes the
// whole pile-up and marks each report on the panadapter as a spot — the marker
// TEXT is configured in SDC by the operator ("599" for a fresh report, "X" for
// an older one, by default). Those spots reach OpsLog already: it subscribes to
// the radio's spot feed, and every spot another program posts arrives on
// Flex.OnForeignSpot.
//
// So the whole feature is: recognise the marker, move the TRANSMIT slice there,
// leave the receive slice on the DX. Nothing here decodes anything.
//
// Three deliberate choices:
//
// - the marker text is a SETTING, not a constant. It is chosen in SDC, and
// any guess made here would be wrong for the operator who chose otherwise.
// - only the transmit slice moves, never the receive slice. Losing the DX is
// a worse outcome than a missed call.
// - the offset is signed and in Hz, because working "up a bit" from where the
// last station was answered is exactly how a pile-up is chased.
import (
"encoding/json"
"strconv"
"strings"
"sync"
"time"
"hamlog/internal/applog"
"hamlog/internal/cat"
)
const keyFlexRSTChase = "flex.rst_chase"
// FlexRSTChase is the whole configuration.
type FlexRSTChase struct {
Enabled bool `json:"enabled"`
// Markers are the skimmer's marker texts, comma-separated ("599,5NN").
// Matched against the spot's callsign field, case-insensitively and whole:
// a spot IS the marker or it is an ordinary callsign, and a substring rule
// would drag in any station whose call happens to contain the digits.
Markers string `json:"markers"`
// OffsetHz is added to the marker's frequency. Signed: chasing upward from
// the last station worked is the usual tactic, downward happens too.
OffsetHz int `json:"offset_hz"`
// SplitOnly refuses to act when the radio is not in split. On by default:
// out of split the transmit slice IS the receive slice, so "move the TX
// slice" would take the operator off the DX they are listening to.
SplitOnly bool `json:"split_only"`
}
var defaultFlexRSTChase = FlexRSTChase{Enabled: false, Markers: "599", OffsetHz: 0, SplitOnly: true}
// rstChaseMinGap throttles the moves. A skimmer marks every report it decodes,
// and a busy pile-up produces several a second; without a floor the transmit
// slice would twitch continuously and never be anywhere long enough to call.
const rstChaseMinGap = 700 * time.Millisecond
// rstChaseMinStep ignores a marker that lands where the slice already is.
// Re-sending the same frequency is not free: it is a command to the radio and a
// slice status back, several times a second, for no change at all.
const rstChaseMinStep = 20 // Hz
var (
rstChaseMu sync.Mutex
rstChaseLast time.Time
rstChaseFreq int64
)
// GetFlexRSTChase returns the stored configuration (defaults when unset).
func (a *App) GetFlexRSTChase() FlexRSTChase {
s := defaultFlexRSTChase
if a.settings == nil {
return s
}
// settingOr, NOT settings.Get with profileScope(): the store already applies
// the active profile's prefix, so scoping the key here wrote p3.flex.rst_chase
// and read p3.p3.flex.rst_chase — the switch could never be read back on, and
// the feature did nothing at all with no sign of why.
if v := a.settingOr(keyFlexRSTChase, ""); strings.TrimSpace(v) != "" {
_ = json.Unmarshal([]byte(v), &s)
}
return normRSTChase(s)
}
// SaveFlexRSTChase stores the configuration.
func (a *App) SaveFlexRSTChase(s FlexRSTChase) error {
b, err := json.Marshal(normRSTChase(s))
if err != nil {
return err
}
a.setSetting(keyFlexRSTChase, string(b))
return nil
}
// SetFlexRSTChaseEnabled flips the switch alone.
//
// Its own binding because this belongs on a button in the panel, not in a
// settings page: it is turned on when a DXpedition appears and off when it is
// worked, which is a thing done mid-QSO with one hand.
func (a *App) SetFlexRSTChaseEnabled(on bool) error {
s := a.GetFlexRSTChase()
s.Enabled = on
return a.SaveFlexRSTChase(s)
}
func normRSTChase(s FlexRSTChase) FlexRSTChase {
if strings.TrimSpace(s.Markers) == "" {
s.Markers = defaultFlexRSTChase.Markers
}
// A pile-up is a few kHz wide. Anything past that is a typo (Hz entered as
// if it were kHz), and honouring it would transmit far outside the segment.
if s.OffsetHz > 10000 {
s.OffsetHz = 10000
}
if s.OffsetHz < -10000 {
s.OffsetHz = -10000
}
return s
}
// rstChaseMarkerSet splits the configured markers into a comparison set.
func rstChaseMarkerSet(markers string) map[string]bool {
out := map[string]bool{}
for _, m := range strings.FieldsFunc(markers, func(r rune) bool { return r == ',' || r == ';' || r == ' ' }) {
if m = strings.ToUpper(strings.TrimSpace(m)); m != "" {
out[m] = true
}
}
return out
}
// handleForeignSpot is what a skimmer's spot arrives at.
func (a *App) handleForeignSpot(callsign string, freqHz int64) {
cfg := a.GetFlexRSTChase()
if !cfg.Enabled || a.cat == nil {
return
}
if !rstChaseMarkerSet(cfg.Markers)[strings.ToUpper(strings.TrimSpace(callsign))] {
return // an ordinary spot: another station's callsign, not a report
}
// From here on every refusal is logged. A marker WAS recognised, so the
// operator is entitled to know why the slice stayed where it was — silence
// at this point is indistinguishable from a feature that does not work.
if cfg.SplitOnly && !a.cat.State().Split {
applog.Printf("rst chase: %s marked at %s, but the radio is not in split — ignored",
strings.ToUpper(callsign), hzText(freqHz))
return
}
target := freqHz + int64(cfg.OffsetHz)
if target <= 0 {
return
}
now := time.Now()
rstChaseMu.Lock()
if now.Sub(rstChaseLast) < rstChaseMinGap {
rstChaseMu.Unlock()
return
}
if rstChaseFreq != 0 && absInt64(target-rstChaseFreq) < rstChaseMinStep {
rstChaseMu.Unlock()
return
}
rstChaseLast, rstChaseFreq = now, target
rstChaseMu.Unlock()
if err := a.cat.FlexDo(func(fc cat.FlexController) error {
return fc.SetTXSliceFrequency(target)
}); err != nil {
applog.Printf("rst chase: moving the TX slice to %s failed: %v", hzText(target), err)
return
}
applog.Printf("rst chase: %s marked at %s → TX slice to %s (offset %+d Hz)",
strings.ToUpper(callsign), hzText(freqHz), hzText(target), cfg.OffsetHz)
}
// hzText renders a frequency the way an operator reads one on a dial.
func hzText(hz int64) string {
return strconv.FormatFloat(float64(hz)/1000, 'f', 3, 64) + " kHz"
}
+122
View File
@@ -0,0 +1,122 @@
package main
// Panadapter auto-zoom on a spot click.
//
// A CW signal is 100 Hz wide, an FT8 slot 50 Hz in a 3 kHz sub-band, an SSB
// station 2.7 kHz. One panadapter width cannot serve all three: at 200 kHz the
// CW station you clicked is a hair, and at 25 kHz an FT8 window shows one
// eighth of the traffic. So the width follows the MODE of the spot, which is
// the only thing that determines how much spectrum is worth looking at.
//
// The command is SmartSDR's own: "display pan s <pan> bandwidth=<MHz>", with an
// optional re-centre. Same approach as DXHunter, which is where the defaults
// below come from.
import (
"encoding/json"
"strings"
"hamlog/internal/cat"
)
const keyFlexZoom = "flex.spot_zoom"
// FlexZoomSettings is the per-mode-group visible width, in kHz.
//
// kHz and not MHz: an operator thinks "25 kHz of CW", and a form asking for
// 0.025 invites a zero too many — which on a panadapter is not an error message
// but a display that has silently gone somewhere else.
type FlexZoomSettings struct {
Enabled bool `json:"enabled"`
CWkHz int `json:"cw_khz"`
SSBkHz int `json:"ssb_khz"`
DigikHz int `json:"digi_khz"`
// Centre re-centres the panadapter on EVERY spot, not just the ones that
// would otherwise fall outside the new window — the display always follows.
// Off by default: an operator who has arranged their window around a run
// frequency does not necessarily want it moved every time they look at
// someone else, and a spot already on screen stays where it is either way.
Centre bool `json:"centre"`
}
// defaultFlexZoom — the widths DXHunter settled on, in kHz.
var defaultFlexZoom = FlexZoomSettings{Enabled: false, CWkHz: 25, SSBkHz: 200, DigikHz: 50, Centre: false}
// flexZoomGroup maps a spot's mode to the three widths worth distinguishing.
//
// The mode arrives as whatever the cluster comment implied — "CW", "FT8",
// "USB", "RTTY" — so this takes the ADIF-ish name, not the Flex one. Anything
// unrecognised is digital, which is the safe end: a 50 kHz window is readable
// for every mode, where 25 kHz is not.
func flexZoomGroup(mode string) string {
switch strings.ToUpper(strings.TrimSpace(mode)) {
case "CW", "CWR", "CWL", "CWU":
return "cw"
case "SSB", "USB", "LSB", "AM", "FM", "NFM", "DFM", "SAM", "PHONE", "DV":
return "ssb"
}
return "digi"
}
// GetFlexZoom returns the settings, defaults included.
func (a *App) GetFlexZoom() FlexZoomSettings {
out := defaultFlexZoom
if raw := a.settingOr(keyFlexZoom, ""); raw != "" {
var s FlexZoomSettings
if err := json.Unmarshal([]byte(raw), &s); err == nil {
out = normFlexZoom(s)
}
}
return out
}
// normFlexZoom clamps the widths to something a panadapter can actually show.
// 1 kHz is narrower than most filters; 14 MHz is a whole HF spectrum.
func normFlexZoom(s FlexZoomSettings) FlexZoomSettings {
clamp := func(v, def int) int {
if v < 1 || v > 14000 {
return def
}
return v
}
s.CWkHz = clamp(s.CWkHz, defaultFlexZoom.CWkHz)
s.SSBkHz = clamp(s.SSBkHz, defaultFlexZoom.SSBkHz)
s.DigikHz = clamp(s.DigikHz, defaultFlexZoom.DigikHz)
return s
}
// SaveFlexZoom persists the settings.
func (a *App) SaveFlexZoom(s FlexZoomSettings) error {
b, err := json.Marshal(normFlexZoom(s))
if err != nil {
return err
}
a.setSetting(keyFlexZoom, string(b))
return nil
}
// FlexZoomForSpot resizes the panadapter for a spot that was just clicked.
//
// Called from the click handler, AFTER the rig has been tuned: the zoom is a
// view change and must never delay the frequency change an operator is waiting
// for. Does nothing at all unless the option is on and the backend is a Flex —
// no other radio has a panadapter to zoom.
func (a *App) FlexZoomForSpot(mode string, freqHz int64) {
if a.cat == nil {
return
}
z := a.GetFlexZoom()
if !z.Enabled {
return
}
khz := z.DigikHz
switch flexZoomGroup(mode) {
case "cw":
khz = z.CWkHz
case "ssb":
khz = z.SSBkHz
}
_ = a.cat.FlexDo(func(fc cat.FlexController) error {
return fc.ZoomPan(float64(khz)/1000, float64(freqHz)/1e6, z.Centre)
})
}
+32
View File
@@ -0,0 +1,32 @@
package main
import "testing"
// The width follows the mode, and an unrecognised mode must land on the widest
// of the three: a 50 kHz window is readable for everything, where 25 kHz shows
// one eighth of an FT8 sub-band.
func TestFlexZoomGroup(t *testing.T) {
for mode, want := range map[string]string{
"CW": "cw", "cw": "cw", "CWR": "cw",
"SSB": "ssb", "USB": "ssb", "LSB": "ssb", "FM": "ssb", "AM": "ssb",
"FT8": "digi", "FT4": "digi", "RTTY": "digi", "JS8": "digi", "PSK31": "digi",
"": "digi", "something new": "digi",
} {
if got := flexZoomGroup(mode); got != want {
t.Errorf("flexZoomGroup(%q) = %q, want %q", mode, got, want)
}
}
}
// A width of zero would command "bandwidth=0.000000" and take the panadapter
// somewhere the operator cannot get back from by eye.
func TestNormFlexZoomClamps(t *testing.T) {
got := normFlexZoom(FlexZoomSettings{CWkHz: 0, SSBkHz: -5, DigikHz: 99999})
if got.CWkHz != defaultFlexZoom.CWkHz || got.SSBkHz != defaultFlexZoom.SSBkHz || got.DigikHz != defaultFlexZoom.DigikHz {
t.Errorf("out-of-range widths not replaced by the defaults: %+v", got)
}
ok := normFlexZoom(FlexZoomSettings{CWkHz: 10, SSBkHz: 150, DigikHz: 40})
if ok.CWkHz != 10 || ok.SSBkHz != 150 || ok.DigikHz != 40 {
t.Errorf("valid widths must be kept as they are: %+v", ok)
}
}
+325 -46
View File
@@ -18,11 +18,11 @@ import {
WorkedBefore,
SetCompactMode, SetCompactHeight,
RotatorGoToPath,
GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, EntryBandChanged, FlexApplyBandAntenna, FlexApplyBandPower,
GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, EntryBandChanged, FlexApplyBandAntenna, FlexApplyBandPower, YaesuApplyBandAntenna,
GetSecretStatus, UnlockSecrets,
RotatorGoTo, RotatorStop, SetActiveRotor,
GetDBConnectionInfo, GetLogbookRevision,
GetUltrabeamStatus, SetUltrabeamDirection, UILog,
GetUltrabeamStatus, SetUltrabeamDirection, UILog, FlexZoomForSpot,
GetAntGeniusStatus, GetAntGeniusSettings, AntGeniusActivate,
GetTunerGeniusStatus, GetTunerGeniusSettings, TunerGeniusAutotune, TunerGeniusSetBypass, TunerGeniusSetOperate, TunerGeniusActivate,
GetScpStatus, ScpLookup,
@@ -78,6 +78,7 @@ import { WorldMap, LocatorMap } from '@/components/MainMap';
import { FlexPanel } from '@/components/FlexPanel';
import { IcomPanel } from '@/components/IcomPanel';
import { YaesuPanel } from '@/components/YaesuPanel';
import { ElecraftPanel } from '@/components/ElecraftPanel';
import { AntGeniusPanel, type AGStatus } from '@/components/AntGeniusPanel';
import { MotorAntennaWidget, type AntStatus } from '@/components/MotorAntennaWidget';
import { TunerGeniusPanel, type TGStatus } from '@/components/TunerGeniusPanel';
@@ -94,7 +95,7 @@ import { ShutdownProgress } from '@/components/ShutdownProgress';
import { ClusterGrid } from '@/components/ClusterGrid';
import { cleanSpotter, inferSpotMode, spotModeCategory, spotStatusKey } from '@/lib/spot';
import { applySpotDisplay, readSpotDisplayOptions, spotIsWorked, SPOT_DISPLAY_OPTIONS_EXPOSED } from '@/lib/spotDisplay';
import { AnswerDecode, HaltDecodeTx, LogUIError, FlexTXOnBand, GetMatrixColors, GetRotorPresets, GetRowColors, GetSpotTTLMinutes, IsNewUSCounty } from '../wailsjs/go/main/App';
import { AnswerDecode, HaltDecodeTx, LogUIError, FlexTXOnBand, GetMatrixColors, GetRotorPresets, GetRowColors, GetSpotTTLMinutes, GetSpotMax, IsNewUSCounty } from '../wailsjs/go/main/App';
import { applyMatrixColors } from '@/lib/matrixColors';
import { WorkedBeforeGrid } from '@/components/WorkedBeforeGrid';
import { NetControlPanel } from '@/components/NetControlPanel';
@@ -243,10 +244,15 @@ function fmtFreqDots(mhzStr: string): string {
}
// FreqWheelDisplay renders a frequency (MHz string) like fmtFreqDots — MHz.kHz.Hz
// — but makes the three kHz digits scroll-sensitive: rolling the mouse wheel over
// the hundreds / tens / units-of-kHz digit steps the frequency by 100 / 10 / 1 kHz
// (up = wheel up). onNudge receives the delta in Hz. The MHz and Hz digits are
// static (only kHz stepping was requested). Used in the header + compact top bar.
// — and makes the kHz AND Hz digits scroll-sensitive: rolling the wheel over a
// digit steps the frequency by that digit (100/10/1 kHz, then 100/10/1 Hz; up =
// wheel up). onNudge receives the delta in Hz.
//
// The Hz digits were static at first, on the grounds that only kHz stepping had
// been asked for. An FTDX101 operator put it plainly: the fine tuning is exactly
// what a mouse is wanted for — zero-beating a CW signal or nudging onto an SSB
// voice is a few tens of Hz, and it was the one move the display would not make.
// The MHz digits stay static: a wheel notch that changes band is not fine tuning.
function FreqWheelDisplay({ mhz, onNudge, className, placeholder = '—.———.———' }: {
mhz: string; onNudge: (deltaHz: number) => void; className?: string; placeholder?: string;
}) {
@@ -256,6 +262,7 @@ function FreqWheelDisplay({ mhz, onNudge, className, placeholder = '—.——
const khz = frac.slice(0, 3); // [hundreds, tens, units] of kHz
const hz = frac.slice(3, 6);
const stepHz = [100_000, 10_000, 1_000]; // per kHz digit: 100 / 10 / 1 kHz
const stepHzFine = [100, 10, 1]; // per Hz digit
return (
<span className={className}>
{intPart}.
@@ -267,7 +274,15 @@ function FreqWheelDisplay({ mhz, onNudge, className, placeholder = '—.——
{d}
</span>
))}
.{hz}
.
{hz.split('').map((d, i) => (
<span key={'h' + i}
onWheel={(e) => { if (e.ctrlKey || e.metaKey) return; e.preventDefault(); e.stopPropagation(); onNudge(e.deltaY < 0 ? stepHzFine[i] : -stepHzFine[i]); }}
className="cursor-ns-resize rounded-[2px] hover:bg-primary/25 transition-colors"
title="Scroll to change frequency">
{d}
</span>
))}
</span>
);
}
@@ -291,6 +306,37 @@ function shortCatError(err?: string): string {
}
// bandForMHz maps a dial frequency (MHz) to its ADIF band, or '' if outside
// every known allocation (used to auto-fill the band when the freq changes).
// A number typed into the CALLSIGN field is a QSY, not a callsign.
//
// It is where the hands already are: an operator watching a cluster or a
// spotting page reads "28500" and wants to be there, and reaching for the
// frequency box — or worse, the mouse — is the part that loses the station. So
// the call field takes it, on Enter, and nothing else in the entry form changes.
//
// Two forms, and the AMBIGUOUS ones resolve to the band deliberately. "160" is
// the 160 m band, not 160 kHz; "40" is 40 m, not 40 kHz. Neither number is a
// frequency anyone tunes to, so reading them as bands costs nothing and reads
// the way an operator says it out loud.
const ENTRY_BAND_WORDS: Record<string, string> = {
'2200': '2200m', '630': '630m', '160': '160m', '80': '80m', '60': '60m',
'40': '40m', '30': '30m', '20': '20m', '17': '17m', '15': '15m', '12': '12m',
'10': '10m', '6': '6m', '4': '4m', '2': '2m', '70': '70cm',
};
// entryQSYCommand reads what was typed. Returns null for anything that is not
// unambiguously one of the two — a callsign must never be mistaken for a QSY.
function entryQSYCommand(text: string): { band?: string; hz?: number } | null {
const v = text.trim();
if (!/^\d{1,7}$/.test(v)) return null; // digits only: a callsign has letters
const band = ENTRY_BAND_WORDS[v];
if (band) return { band };
const khz = Number(v);
// 1500 kHz to 1.3 GHz: below that is not a band anyone works, above it is a
// typo. A bare "500" is neither a band nor a frequency, so nothing happens.
if (khz >= 1500 && khz <= 1_300_000) return { hz: Math.round(khz * 1000) };
return null;
}
function bandForMHz(mhz: number): string {
if (!mhz || isNaN(mhz)) return '';
const plan: [number, number, string][] = [
@@ -701,6 +747,7 @@ export default function App() {
'15m': { SSB: 21300000, CW: 21030000, FT8: 21074000, FT4: 21140000, RTTY: 21080000, default: 21300000 },
'12m': { SSB: 24950000, CW: 24910000, FT8: 24915000, FT4: 24919000, RTTY: 24920000, default: 24950000 },
'10m': { SSB: 28500000, CW: 28030000, FT8: 28074000, FT4: 28180000, RTTY: 28080000, default: 28500000 },
'4m': { SSB: 70200000, CW: 70100000, FT8: 70154000, default: 70200000 },
'6m': { SSB: 50150000, CW: 50080000, FT8: 50313000, FT4: 50318000, default: 50150000 },
'2m': { SSB: 144300000, CW: 144050000, FT8: 144174000, default: 144300000 },
'70cm': { SSB: 432300000, CW: 432050000, FT8: 432174000, default: 432300000 },
@@ -891,6 +938,13 @@ export default function App() {
QSOAudioPlayOnAir().catch((e: any) => setError(String(e?.message ?? e)));
};
const refreshManualRecReady = () => { QSOAudioManualReady().then(setManualRecReady).catch(() => {}); };
// Asked at mount, and asked AGAIN once the backend is really up (see the
// initial grid load) and on every profile change. The audio devices are a
// per-profile setting, so this question cannot be answered before the active
// profile is known — and a "no" then was final, which is why the record button
// went missing for a whole session after an update, when startup does more
// work and the first ask loses the race. Opening and closing the audio panel
// was the only way back.
useEffect(() => { refreshManualRecReady(); }, []);
const startManualRecording = () => {
QSOAudioManualStart().then((active) => {
@@ -1104,6 +1158,17 @@ export default function App() {
};
// QSL Manager is a closable tab opened on demand from Tools → QSL Manager.
const [qslTabOpen, setQslTabOpen] = useState(false);
// A callsign sent to the QSL Manager's Paper QSL view from elsewhere (the
// awards grid). The counter makes two clicks on the same callsign two
// requests — the panel is force-mounted and would otherwise see no change.
const [qslPaperReq, setQslPaperReq] = useState<{ call: string; n: number } | undefined>(undefined);
function openPaperQSLFor(call: string) {
const c = call.trim().toUpperCase();
if (!c) return;
setQslTabOpen(true);
setActiveTab('qsl');
setQslPaperReq((r) => ({ call: c, n: (r?.n ?? 0) + 1 }));
}
const [qslDesignerOpen, setQslDesignerOpen] = useState(false);
const [eqslQsoId, setEqslQsoId] = useState<number | null>(null); // QSO being sent as eQSL
function closeQslTab() {
@@ -1266,11 +1331,22 @@ export default function App() {
// by z, so it reflows to fill that larger box and then scales back to exactly the
// window (more content visible when zoomed out, like a real browser zoom).
const appRootRef = useRef<HTMLDivElement>(null);
// The current factor, shown briefly whenever it changes.
//
// Ctrl+wheel and Ctrl+0 have worked from the start, and NOTHING said so:
// no menu entry, no readout. An operator who zoomed by accident — easy, the
// wheel is over a grid and Ctrl is already down for something else — saw the
// interface change size with no explanation and no way back. The number is
// the fix; the menu entry makes it findable without reading a manual.
const [uiZoom, setUiZoom] = useState(1);
const [zoomShown, setZoomShown] = useState(false);
const zoomHideRef = useRef(0);
const setZoomRef = useRef<(z: number) => void>(() => {});
useEffect(() => {
const KEY = 'opslog.uiZoom';
let z = parseFloat(localStorage.getItem(KEY) || '1');
if (!Number.isFinite(z) || z <= 0) z = 1;
const apply = () => {
const apply = (announce = false) => {
const el = appRootRef.current;
if (!el) return;
el.style.transformOrigin = '0 0';
@@ -1278,17 +1354,36 @@ export default function App() {
el.style.width = `${100 / z}vw`;
el.style.height = `${100 / z}vh`;
document.documentElement.setAttribute('data-uizoom', String(z));
setUiZoom(z);
// Only on a CHANGE: showing it at startup would put a badge over the log
// every launch, for a number that is almost always 100 %.
if (announce) {
setZoomShown(true);
window.clearTimeout(zoomHideRef.current);
zoomHideRef.current = window.setTimeout(() => setZoomShown(false), 1600);
}
};
apply();
// The menu and the badge set the factor through here, so there is one
// implementation of "zoom to z" and not three.
setZoomRef.current = (next: number) => {
z = Math.min(2.5, Math.max(0.5, Math.round(next * 10) / 10));
localStorage.setItem(KEY, String(z));
apply(true);
};
const onWheel = (e: WheelEvent) => {
if (!e.ctrlKey && !e.metaKey) return; // plain wheel is left alone (scroll / freq nudge)
e.preventDefault();
z = Math.min(2.5, Math.max(0.5, Math.round((z + (e.deltaY < 0 ? 0.1 : -0.1)) * 10) / 10));
localStorage.setItem(KEY, String(z));
apply();
apply(true);
};
const onKey = (e: KeyboardEvent) => {
if ((e.ctrlKey || e.metaKey) && (e.key === '0')) { e.preventDefault(); z = 1; localStorage.setItem(KEY, '1'); apply(); }
if ((e.ctrlKey || e.metaKey) && (e.key === '0')) { e.preventDefault(); z = 1; localStorage.setItem(KEY, '1'); apply(true); }
// Ctrl+plus / Ctrl+minus, the shortcuts every other application uses.
// '=' as well as '+': on most layouts the plus is the shifted '='.
if ((e.ctrlKey || e.metaKey) && (e.key === '+' || e.key === '=')) { e.preventDefault(); setZoomRef.current(z + 0.1); }
if ((e.ctrlKey || e.metaKey) && (e.key === '-')) { e.preventDefault(); setZoomRef.current(z - 0.1); }
};
window.addEventListener('wheel', onWheel, { passive: false });
window.addEventListener('keydown', onKey);
@@ -1568,7 +1663,14 @@ export default function App() {
const [clusterServers, setClusterServers] = useState<{ id: number; name: string; enabled: boolean; sort_order: number }[]>([]);
// Ring buffer — only keep the last N spots; cluster firehose can be heavy.
const [spots, setSpots] = useState<ClusterSpot[]>([]);
const SPOTS_CAP = 1000;
// How many spots the list holds. A setting rather than a constant: at a
// thousand, a busy evening filled the buffer in a couple of minutes, so the
// spot LIFETIME never had anything left to expire — the cap was deciding the
// lifetime. Kept in a ref as well: the append path runs inside a state updater
// that must not close over a stale value.
const [spotsCap, setSpotsCap] = useState(1000);
const spotsCapRef = useRef(1000);
useEffect(() => { spotsCapRef.current = spotsCap; }, [spotsCap]);
// Cluster filter selections persist across restarts (writeUiPref → localStorage
// + DB, so they also travel with a copied data/ folder). Loaders read the cache
// synchronously at first render; a single effect below writes them back.
@@ -1690,7 +1792,7 @@ export default function App() {
const [clusterLockMode, setClusterLockMode] = useState(() => lsBool('opslog.clusterLockMode', false));
// Status filter chips. Empty set = show every status (including
// already-worked). Otherwise only matching spots pass.
type SpotStatusKey = 'new' | 'new-band' | 'new-mode' | 'new-slot' | 'worked';
type SpotStatusKey = 'new' | 'new-band-mode' | 'new-band' | 'new-mode' | 'new-slot' | 'worked';
// What the cluster can be FILTERED on. A superset of the entity status: a new
// county or a new park is not a DXCC state, it is another dimension of the
// same spot — which is why the grid shows them as separate badges. Filtering
@@ -1813,7 +1915,7 @@ export default function App() {
// so it's loaded async on mount and re-read on profile:changed below.
// 'none' is only ever stored for the third and fourth panes: the first two are
// the Main view, and a layout with no panes at all is not a layout.
type MainPaneKind = 'map1' | 'map2' | 'cluster' | 'worked' | 'flex' | 'recent' | 'icom' | 'yaesu' | 'netcontrol' | 'decodes' | 'none';
type MainPaneKind = 'map1' | 'map2' | 'cluster' | 'worked' | 'flex' | 'recent' | 'icom' | 'yaesu' | 'elecraft' | 'netcontrol' | 'decodes' | 'none';
const [mapZoomSignal, setMapZoomSignal] = useState(0); // bump → world map auto-zooms now
const [mainPaneLeft, setMainPaneLeft] = useState<MainPaneKind>('map1');
const [mainPaneRight, setMainPaneRight] = useState<MainPaneKind>('map2');
@@ -1824,7 +1926,7 @@ export default function App() {
// quarter-width map is unreadable.
const [mainLayout4, setMainLayout4] = useState<'cols' | 'quad'>('quad');
const loadMainPanes = useCallback(async () => {
const valid = (v: string): v is MainPaneKind => v === 'map1' || v === 'map2' || v === 'cluster' || v === 'worked' || v === 'flex' || v === 'recent' || v === 'icom' || v === 'yaesu' || v === 'netcontrol' || v === 'decodes';
const valid = (v: string): v is MainPaneKind => v === 'map1' || v === 'map2' || v === 'cluster' || v === 'worked' || v === 'flex' || v === 'recent' || v === 'icom' || v === 'yaesu' || v === 'elecraft' || v === 'netcontrol' || v === 'decodes';
const [l, r, p3, p4, lay] = await Promise.all([
GetUIPref('mainPaneLeft').catch(() => ''),
GetUIPref('mainPaneRight').catch(() => ''),
@@ -1882,7 +1984,7 @@ export default function App() {
useEffect(() => {
setSpotStatus((prev) => {
const keys = Object.keys(prev);
if (keys.length <= SPOTS_CAP * 2) return prev;
if (keys.length <= spotsCapRef.current * 2) return prev;
const live = new Set(spots.map((x) => spotStatusKey(x.dx_call, x.band ?? '', x.comment ?? '', x.freq_hz)));
// Decoded stations count as live too. They share this cache, and pruning
// to the cluster spots alone would evict every one of them — on a busy
@@ -2256,6 +2358,9 @@ export default function App() {
const [clusterMacros, setClusterMacros] = useState(loadClusterMacros);
useEffect(() => { if (!showSettings) setClusterMacros(loadClusterMacros()); }, [showSettings]);
const clusterMacrosShown = useMemo(() => visibleClusterMacros(clusterMacros), [clusterMacros]);
// Auto-call is withdrawn — it duplicated DXHunter, which answers decodes from
// the same shack. This flag is the single place that says so at runtime.
const AUTO_CALL_ENABLED = false;
const [autoCall, setAutoCall] = useState<AutoCallSettings>(loadAutoCall);
useEffect(() => { if (!showSettings) setAutoCall(loadAutoCall()); }, [showSettings]);
// When each callsign was last answered, so a station still calling CQ is not
@@ -2288,6 +2393,15 @@ export default function App() {
// backstop below.
const lastTxAtRef = useRef<Map<string, number>>(new Map());
useEffect(() => {
// AUTO-CALL IS WITHDRAWN — DXHunter already answers decodes, and two
// programs doing it from one shack key over each other. See lib/autocall.ts.
//
// Returning here rather than deleting the loop: the decision it implements
// is the delicate part, argued over and tested, and worth keeping intact.
// The guard is what matters — an operator whose stored preference still
// says "enabled" must not have their transmitter keyed by a feature they
// can no longer see, let alone switch off.
if (!AUTO_CALL_ENABLED) return;
if (!autoCall.enabled) return;
const now = Date.now();
// A QSO is in progress somewhere if ANY receiver is transmitting or still
@@ -2381,6 +2495,9 @@ export default function App() {
// same thing everywhere — and it gives the memory back.
const [spotTTLMin, setSpotTTLMin] = useState(0);
useEffect(() => { GetSpotTTLMinutes().then(setSpotTTLMin).catch(() => {}); }, [showSettings]);
// Same beat as the lifetime: re-read when Preferences closes, since the two
// settings decide between them how long a spot survives.
useEffect(() => { GetSpotMax().then((n: number) => { if (n > 0) setSpotsCap(n); }).catch(() => {}); }, [showSettings]);
useEffect(() => {
if (spotTTLMin <= 0) return; // 0 = keep until the count cap pushes them out
const sweep = () => {
@@ -2645,8 +2762,17 @@ export default function App() {
// Backend-emitted toast messages (e.g. recording auto-send result/skip).
useEffect(() => {
const off = EventsOn('toast', (msg: any) => { if (msg) showToast(String(msg)); });
return () => { off(); };
}, [showToast]);
// A QSO logged by an external app announces itself: nothing else on screen
// says it happened when the operator is watching the decodes rather than the
// entry form.
const offExt = EventsOn('qso:logged_external', (p: any) => {
const call = String(p?.call ?? '').trim();
if (!call) return;
const bits = [p?.band, p?.mode].filter(Boolean).join(' · ');
showToast(`${t('toast.qsoLogged')}${call}${bits ? ` · ${bits}` : ''}`);
});
return () => { off(); offExt(); };
}, [showToast, t]);
// Band openings — sporadic E on 6/4/2 m, detected from the spot stream.
//
@@ -3043,6 +3169,19 @@ export default function App() {
// Clicking a spot (cluster grid or any band map): tune the rig, set the mode,
// fill the call, pre-fill POTA, (re)start the recording. Shared so every spot
// source behaves identically.
// Single click on a cluster line: fill the callsign, nothing else.
//
// Reading the cluster means running down dozens of lines, and while a single
// click WORKED the spot every pass dragged the radio with it — one stray click
// while looking took the operator off the station they were working. Looking
// and going are two different intentions, so they are now two gestures: click
// to look the call up, double-click to go there.
function handleSpotSelect(s: any) {
if (!s?.dx_call?.trim()) return;
onCallsignInput(s.dx_call, { force: true });
applySpotPOTA((s as any).pota_ref);
}
function handleSpotClick(s: any) {
const m = inferSpotMode(s.comment ?? '', s.freq_hz);
// Reflect the spot's freq/band in the entry strip IMMEDIATELY (optimistic),
@@ -3059,6 +3198,10 @@ export default function App() {
}
if (s.band) setBand(s.band);
if (catState.connected) tuneRigCAT(s.freq_hz, m);
// The panadapter width follows the MODE of the spot, when the option is on.
// AFTER the tune, deliberately: a view change must never delay the frequency
// change the operator is waiting for. A no-op on any backend but a Flex.
FlexZoomForSpot(m ?? '', s.freq_hz ?? 0).catch(() => {});
if (m) applyModeFromSpot(m);
onCallsignInput(s.dx_call, { force: true });
applySpotPOTA((s as any).pota_ref);
@@ -3083,6 +3226,7 @@ export default function App() {
// Same race, same fix: the toolbar options were read once at mount,
// possibly before the profile was active, and a "no" then was final.
refreshChaseNew();
refreshManualRecReady();
} else if (!ok && alive && tries++ < 360) {
// Quick retries at first (normal startup connects in ~2 s); then keep
// trying for several minutes, because the very first migration against a
@@ -3223,11 +3367,16 @@ export default function App() {
// backends. The backend no-ops if the band has no configured mapping.
const lastAntBandRef = useRef('');
useEffect(() => {
if (catState.backend !== 'flex' || locks.band) return;
if (locks.band) return;
const b = band.trim();
if (!b || b === lastAntBandRef.current) return;
lastAntBandRef.current = b;
FlexApplyBandAntenna(b).catch(() => {});
// Flex configures its antennas per band in Preferences; a Yaesu LEARNS
// them — the antenna picked on a band is remembered for that band. Two
// ways to say the same thing, and each backend keeps the one that suits
// it: a Flex names its antennas, a Yaesu has two sockets and a knob.
if (catState.backend === 'flex') FlexApplyBandAntenna(b).catch(() => {});
if (catState.backend === 'yaesu') YaesuApplyBandAntenna(b).catch(() => {});
}, [band, catState.backend, locks.band]);
// Per-band, per-mode TX power. Applied on band AND mode changes — the point is
@@ -3339,7 +3488,8 @@ export default function App() {
const filtered = hist(sp) ? next : next.filter((x) => hist(x) || key(x) !== k);
next = [sp, ...filtered];
}
return next.length > SPOTS_CAP ? next.slice(0, SPOTS_CAP) : next;
const cap = spotsCapRef.current;
return next.length > cap ? next.slice(0, cap) : next;
});
};
const unsubSpot = EventsOn('cluster:spot', (sp: ClusterSpot) => {
@@ -3511,12 +3661,18 @@ export default function App() {
// An explicit click always wins over whatever call is currently in the field.
const unsubFlexSpot = EventsOn('flex:spot_clicked', (p: any) => {
const call = String(p?.call ?? '');
if (applyUdpCall(call, true)) restartRecordingForNewTarget(call);
if (!applyUdpCall(call, true)) return;
restartRecordingForNewTarget(call);
// The park, like a click in the band map: the radio reports only a
// callsign, so the backend looks it up again before sending the event.
applySpotPOTA(String(p?.pota_ref ?? ''));
});
// Clicking a spot on the ExpertSDR (TCI) panorama fills the call, like Flex.
const unsubTciSpot = EventsOn('tci:spot_clicked', (p: any) => {
const call = String(p?.call ?? '');
if (applyUdpCall(call, true)) restartRecordingForNewTarget(call);
if (!applyUdpCall(call, true)) return;
restartRecordingForNewTarget(call);
applySpotPOTA(String(p?.pota_ref ?? ''));
});
const unsubBulk = EventsOn('bulkupdate:progress', (p: any) => {
const total = Number(p?.total ?? 0);
@@ -3631,6 +3787,8 @@ export default function App() {
setGridPrefsProfile(id ?? null);
setActiveProfileId(typeof id === 'number' ? id : null);
loadStation(); loadLists(); loadCATCfg(); reloadWk(); loadMainPanes(); loadProfileList();
// The sound devices are per profile: one may record and the next not.
refreshManualRecReady();
// The chat is per shared logbook — clear the previous profile's messages
// and reload for the new logbook (or hide if it isn't a MySQL log).
setChatMsgs([]); chatSeen.current.clear(); setChatOnline([]); setChatUnread(0);
@@ -4116,7 +4274,13 @@ export default function App() {
// background; qslmgr:done refreshes the grid when finished.
async function bulkSendTo(service: string, ids: number[]) {
if (ids.length === 0) return;
const label = service === 'qrz' ? 'QRZ.com' : service === 'clublog' ? 'Club Log' : service === 'lotw' ? 'LoTW' : service;
// Named rather than echoed: an operator who picked a menu entry should see
// the same words back, not the internal id.
const LABELS: Record<string, string> = {
qrz: 'QRZ.com', clublog: 'Club Log', lotw: 'LoTW',
hrdlog: 'HRDLog.net', eqsl: 'eQSL.cc', hamlog: 'HAMLOG.online',
};
const label = LABELS[service] ?? service;
showToast(`Uploading ${ids.length} QSO${ids.length > 1 ? 's' : ''} to ${label}`);
try { await UploadQSOsManual(service, ids as any); }
catch (e: any) { setError(String(e?.message ?? e)); }
@@ -4126,21 +4290,38 @@ export default function App() {
// fields (optional): a chosen ADIF-tag list — the "choose which fields" export.
// Empty = the standard/full behaviour (all fields, includeAppFields=false here).
async function exportFilteredADIF(fields: string[] = []) {
return exportFilteredADIFAs(false, fields);
}
// The same filtered export, keeping the APP_OPSLOG_* tags — see
// exportSelectedADIFFull for why the award references need them.
async function exportFilteredADIFFull() {
return exportFilteredADIFAs(true, []);
}
async function exportFilteredADIFAs(includeApp: boolean, fields: string[]) {
try {
const path = await SaveADIFFile();
if (!path) return;
const f = buildActiveFilter();
const r = await ExportADIFFiltered(path, false, { ...f, limit: 0, offset: 0 } as any, fields);
const r = await ExportADIFFiltered(path, includeApp, { ...f, limit: 0, offset: 0 } as any, fields);
showToast(`Exported ${r.count} QSO${r.count > 1 ? 's' : ''}${r.path}`);
} catch (e: any) { setError(String(e?.message ?? e)); }
}
// Right-click "Export selected to ADIF": only the highlighted rows.
async function exportSelectedADIF(ids: number[], fields: string[] = []) {
return exportSelectedADIFAs(ids, false, fields);
}
// The same export, keeping the APP_OPSLOG_* tags. Award references are the
// reason it exists: RDA@KR-04 lives in APP_OPSLOG_AWARDREFS, and a standard
// export — rightly — leaves every APP_ tag behind.
async function exportSelectedADIFFull(ids: number[]) {
return exportSelectedADIFAs(ids, true, []);
}
async function exportSelectedADIFAs(ids: number[], includeApp: boolean, fields: string[]) {
if (ids.length === 0) return;
try {
const path = await SaveADIFFile();
if (!path) return;
const r = await ExportADIFSelected(path, false, ids as any, fields);
const r = await ExportADIFSelected(path, includeApp, ids as any, fields);
showToast(`Exported ${r.count} selected QSO${r.count > 1 ? 's' : ''}${r.path}`);
} catch (e: any) { setError(String(e?.message ?? e)); }
}
@@ -4187,8 +4368,14 @@ export default function App() {
if (deletingIds.length === 0) return;
const ids = deletingIds;
try {
if (ids.length === 1) await DeleteQSO(ids[0]);
else await DeleteQSOs(ids as any);
// Report what was actually removed rather than assuming it matched what
// was asked: a delete that silently removes nothing looks exactly like one
// that worked, since the rows leave the grid when it reloads either way.
if (ids.length === 1) { await DeleteQSO(ids[0]); showToast(t('toast.deletedOne')); }
else {
const n = await DeleteQSOs(ids as any);
showToast(t('toast.deletedN', { n: Number(n ?? 0), asked: ids.length }));
}
setDeletingIds([]);
setSelectedId(null);
setSelectedIds([]);
@@ -4637,6 +4824,10 @@ export default function App() {
{ type: 'item', label: t('edit.prefs'), action: 'edit.prefs' },
]},
{ name: 'view', label: t('menu.view'), items: [
{ type: 'item', label: t('view.zoomIn'), action: 'view.zoomin', shortcut: 'Ctrl++' },
{ type: 'item', label: t('view.zoomOut'), action: 'view.zoomout', shortcut: 'Ctrl+-' },
{ type: 'item', label: t('view.zoomReset'), action: 'view.zoomreset', shortcut: 'Ctrl+0' },
{ type: 'separator' },
{ type: 'item', label: t('view.refresh'), action: 'view.refresh', shortcut: 'F5' },
{ type: 'item', label: t('view.clearFilters'), action: 'view.clearfilters' },
]},
@@ -4685,6 +4876,9 @@ export default function App() {
case 'file.exportCabrillo': exportCabrillo(); break;
case 'file.deleteall': setShowDeleteAll(true); break;
case 'file.exit': QuitApp(); break;
case 'view.zoomin': setZoomRef.current(uiZoom + 0.1); break;
case 'view.zoomout': setZoomRef.current(uiZoom - 0.1); break;
case 'view.zoomreset': setZoomRef.current(1); break;
case 'view.refresh': refresh(); break;
case 'view.clearfilters': setFilterCallsign(''); setActiveFilter({ conditions: [], match: 'AND' }); break;
case 'edit.edit': if (selectedId !== null) openEdit(selectedId); break;
@@ -5125,9 +5319,21 @@ export default function App() {
};
const geoDetailRow = (
<div className="flex gap-4 items-end">
<div className="flex flex-col flex-1 min-w-0"><Label className="mb-1 h-3.5">{t('field.cnty')}</Label>
<Input value={details.cnty ?? ''}
{/* The badge sits INSIDE the field: this row is already tight, and a
county name is short enough to leave room at its right. It answers the
question at the moment the operator is deciding whether to call the
same answer the Info tab gives, one tab away from where they are. */}
<div className="flex flex-col flex-1 min-w-0 relative"><Label className="mb-1 h-3.5">{t('field.cnty')}</Label>
<Input value={details.cnty ?? ''} className={cn(entryNewCounty && 'pr-12')}
onChange={(e) => setDetails((d) => ({ ...d, cnty: e.target.value }))} />
{entryNewCounty && (
<span
title={t('detp.newCountyTip')}
className="absolute right-1.5 bottom-1.5 rounded px-1.5 py-0.5 text-[10px] font-bold tracking-wide bg-success text-success-foreground pointer-events-none"
>
{t('detp.newCounty')}
</span>
)}
</div>
<div className="flex flex-col w-[64px] shrink-0"><Label className="mb-1 h-3.5">{t('field.cqz')}</Label>
<Input value={details.cqz ?? ''} className="font-mono"
@@ -5333,6 +5539,25 @@ export default function App() {
noteManualEdit();
SetCATFrequency(Math.round(mhz * 1_000_000)).catch(() => {});
};
// Carry out what was typed in the call field. Bands go through the ordinary
// band change, so the antennas, the power table and the outbound integrations
// all hear about it exactly as they would from the dropdown.
const applyEntryQSY = (q: { band?: string; hz?: number }) => {
if (q.band) {
onBandUserChange(q.band);
showToast(q.band);
return;
}
const hz = q.hz ?? 0;
if (hz <= 0) return;
noteManualEdit();
setFreqMhz((hz / 1_000_000).toFixed(6));
const b = bandForMHz(hz / 1_000_000);
if (b) setBand(b);
if (catState.enabled && catState.connected) SetCATFrequency(hz).catch(() => {});
showToast((hz / 1_000_000).toFixed(3) + ' MHz');
};
// Mouse-wheel over a kHz digit of the top frequency readout: step the frequency
// and (if CAT is connected) QSY the rig. The display updates optimistically on
// every notch; the actual radio tune is debounced so a fast scroll doesn't flood
@@ -5676,6 +5901,20 @@ export default function App() {
>
{clusterLockBand ? <Lock className="size-2.5" /> : <Unlock className="size-2.5" />} {band}
</button>
{/* "My bands" in one click.
No selection means EVERY band, which is what an operator wants
the first time and never again: an RBN feed carries 4 m and
70 cm, and the list above can only offer the bands you have
configured so a band you do not own could not be unticked,
because it was never there to tick. Selecting your own list
makes the filter finite, and the spot goes. */}
{clusterBands.size !== bands.length && (
<button type="button"
onClick={() => setClusterBands(new Set(bands))}
title={t('clu.myBandsTitle')}
className="text-[10px] text-muted-foreground hover:text-foreground underline">{t('clu.myBands')}</button>
)}
{clusterBands.size > 0 && (
<button type="button" onClick={() => setClusterBands(new Set())} className="text-[10px] text-muted-foreground hover:text-foreground underline">{t('clu.clear')}</button>
)}
@@ -5687,6 +5926,9 @@ export default function App() {
<div className="flex flex-wrap gap-1">
{([
{ k: 'new' as SpotFilterKey, label: 'NEW', cls: 'bg-danger-muted text-danger-muted-foreground border-danger-border' },
// NEW BAND+MODE sits between NEW and NEW BAND, which is where it
// ranks: the entity is worked, but neither this band nor this mode.
{ k: 'new-band-mode' as SpotFilterKey, label: 'NEW B+M', cls: 'bg-danger-muted text-danger-muted-foreground border-danger-border' },
{ k: 'new-band' as SpotFilterKey, label: 'NEW BAND', cls: 'bg-warning-muted text-warning-muted-foreground border-warning-border' },
{ k: 'new-mode' as SpotFilterKey, label: 'NEW MODE', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
{ k: 'new-slot' as SpotFilterKey, label: 'NEW SLOT', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
@@ -5764,14 +6006,6 @@ export default function App() {
txMsgs={txMsgs}
txState={txState}
txStates={txStates}
autoCallOn={autoCall.enabled}
// Written through the same key Preferences uses, so the two can never
// disagree about whether the machine is armed.
onToggleAutoCall={() => setAutoCall((prev) => {
const next = { ...prev, enabled: !prev.enabled };
writeUiPref(autoCallKey, JSON.stringify(next));
return next;
})}
spotStatus={spotStatus as any}
myCall={station.callsign}
// A click ANSWERS the station: it hands the decode back to WSJT-X/MSHV as
@@ -5864,7 +6098,7 @@ export default function App() {
</div>
<div className="flex-1 min-h-0 flex">
<div className="flex-1 min-w-0 flex flex-col min-h-0">
<ClusterGrid key={`clg-${activeProfileId ?? 'x'}`} rows={clusterRenderedRows as any} spotStatus={spotStatus} onSpotClick={handleSpotClick} />
<ClusterGrid key={`clg-${activeProfileId ?? 'x'}`} rows={clusterRenderedRows as any} spotStatus={spotStatus} onSpotClick={handleSpotClick} onSpotSelect={handleSpotSelect} />
</div>
{clusterShowFilters && renderClusterFilters()}
</div>
@@ -5876,7 +6110,7 @@ export default function App() {
<WorkedBeforeGrid key={`wbg-${activeProfileId ?? 'x'}`} wb={wbWithAwards as any} myGrid={station.my_grid} awardCols={awardCols} busy={wbBusy} currentCall={callsign} onRowDoubleClicked={(q) => openEdit(q.id as number)}
onUpdateFromCty={bulkUpdateFromCty} onUpdateFromQRZ={bulkUpdateFromQRZ} onUpdateFromClublog={bulkUpdateFromClublog} onUpdateCountyFromULS={ulsReady ? bulkUpdateCountyFromULS : undefined}
onSendTo={bulkSendTo} onSendRecording={bulkSendRecording} onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
onBulkEdit={openBulkEdit} onExportSelected={exportSelectedADIF} onExportSelectedFields={exportSelectedFields}
onBulkEdit={openBulkEdit} onExportSelected={exportSelectedADIF} onExportSelectedFull={exportSelectedADIFFull} onExportSelectedFields={exportSelectedFields}
onExportCabrilloSelected={exportSelectedCabrillo} onDelete={(ids) => setDeletingIds(ids)} />
</div>
);
@@ -5893,6 +6127,12 @@ export default function App() {
<YaesuPanel onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} onKeySpeed={setCWSpeedEverywhere} />
</div>
);
case 'elecraft':
return (
<div className="h-full w-full min-h-0 rounded-lg overflow-hidden border border-border">
<ElecraftPanel onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
</div>
);
case 'icom':
return (
<div className="h-full w-full min-h-0 rounded-lg overflow-hidden border border-border">
@@ -5933,9 +6173,9 @@ export default function App() {
onSendRecording={bulkSendRecording}
onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
onBulkEdit={openBulkEdit}
onExportSelected={exportSelectedADIF}
onExportSelected={exportSelectedADIF} onExportSelectedFull={exportSelectedADIFFull}
onExportSelectedFields={exportSelectedFields}
onExportFiltered={exportFilteredADIF}
onExportFiltered={exportFilteredADIF} onExportFilteredFull={exportFilteredADIFFull}
onDelete={(ids) => setDeletingIds(ids)}
onRowSelected={(ids) => { setSelectedIds(ids); setSelectedId(ids[0] ?? null); }}
onRowSelectedQso={(r) => setSelQso(r ? { call: String(r.callsign ?? ""), band: String(r.band ?? ""), mode: String(r.mode ?? ""), dxcc: Number(r.dxcc ?? 0) } : null)}
@@ -6620,6 +6860,21 @@ export default function App() {
</div>
)}
{/* The zoom factor, while it is changing.
Centred at the top, out of the way of the entry form and the toasts,
and clickable: the number is only half an answer if the way back to
100 % is another thing to know. */}
{zoomShown && uiZoom !== 1 && (
<button
type="button"
onClick={() => setZoomRef.current(1)}
title={t('view.zoomResetTip')}
className="fixed top-2 left-1/2 -translate-x-1/2 z-[130] rounded-full border border-border bg-card/95 px-3 py-1 text-xs font-mono shadow-lg hover:bg-accent"
>
{Math.round(uiZoom * 100)}% · {t('view.zoomReset')}
</button>
)}
{/* Transient toasts (bottom-right). Errors stack on top of the green
success toast; both auto-dismiss. */}
{/* Unlock encrypted passwords (set via Settings Security). Dismissable:
@@ -6669,6 +6924,16 @@ export default function App() {
onKeyDown={(e) => {
if (e.key === 'Enter' && (e.target as HTMLElement).tagName === 'INPUT') {
e.preventDefault();
// A number in the call field is a QSY. Checked BEFORE ESM and before
// logging: both would otherwise act on a "callsign" of 28500.
if (e.target === callsignRef.current) {
const q = entryQSYCommand(callsignRef.current?.value ?? '');
if (q) {
applyEntryQSY(q);
setCallsign(''); // the field goes back to what it is for
return;
}
}
// ESM (Enter Sends Message): fire the stage-appropriate CW macro instead
// of logging. Falls through to the normal log when ESM isn't active.
if (esmHandleEnter(e.target as HTMLElement)) return;
@@ -7144,6 +7409,7 @@ export default function App() {
{catState.backend === 'flex' && <TabsTrigger value="flex">Flex Console</TabsTrigger>}
{catState.backend === 'icom' && <TabsTrigger value="icom">Icom Console</TabsTrigger>}
{catState.backend === 'yaesu' && <TabsTrigger value="yaesu">Yaesu Console</TabsTrigger>}
{(catState.backend === 'elecraft' || catState.backend === 'kenwood') && <TabsTrigger value="elecraft">{t('k3.console')}</TabsTrigger>}
{statsTabOpen && (
<TabsTrigger value="stats" className="gap-1.5">
{t('stats.tab')}
@@ -7317,9 +7583,9 @@ export default function App() {
onSendRecording={bulkSendRecording}
onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
onBulkEdit={openBulkEdit}
onExportSelected={exportSelectedADIF}
onExportSelected={exportSelectedADIF} onExportSelectedFull={exportSelectedADIFFull}
onExportSelectedFields={exportSelectedFields}
onExportFiltered={exportFilteredADIF}
onExportFiltered={exportFilteredADIF} onExportFilteredFull={exportFilteredADIFFull}
onExportCabrilloSelected={exportSelectedCabrillo}
onExportCabrilloFiltered={exportFilteredCabrillo}
onDelete={(ids) => setDeletingIds(ids)}
@@ -7510,6 +7776,7 @@ export default function App() {
rows={rendered as any}
spotStatus={spotStatus}
onSpotClick={handleSpotClick}
onSpotSelect={handleSpotSelect}
/>
);
})()}
@@ -7650,7 +7917,7 @@ export default function App() {
<WorkedBeforeGrid key={`wbg-${activeProfileId ?? 'x'}`} wb={wbWithAwards as any} myGrid={station.my_grid} awardCols={awardCols} busy={wbBusy} currentCall={callsign} onRowDoubleClicked={(q) => openEdit(q.id as number)}
onUpdateFromCty={bulkUpdateFromCty} onUpdateFromQRZ={bulkUpdateFromQRZ} onUpdateFromClublog={bulkUpdateFromClublog} onUpdateCountyFromULS={ulsReady ? bulkUpdateCountyFromULS : undefined} onSendTo={bulkSendTo} onSendRecording={bulkSendRecording}
onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
onBulkEdit={openBulkEdit} onExportSelected={exportSelectedADIF} onExportSelectedFields={exportSelectedFields}
onBulkEdit={openBulkEdit} onExportSelected={exportSelectedADIF} onExportSelectedFull={exportSelectedADIFFull} onExportSelectedFields={exportSelectedFields}
onExportCabrilloSelected={exportSelectedCabrillo} onDelete={(ids) => setDeletingIds(ids)} />
</TabsContent>
@@ -7661,6 +7928,7 @@ export default function App() {
<TabsContent value="qsl" forceMount className="mt-0 flex flex-col min-h-0 flex-1 data-[state=inactive]:hidden">
<QSLManagerPanel
onEditQSO={openEdit}
paperRequest={qslPaperReq}
// The same row actions the Recent QSOs grid offers. Only the
// selection-based exports: exporting "the filter" would mean
// the Recent-QSOs filter, not the rows shown here.
@@ -7766,7 +8034,8 @@ export default function App() {
</TabsContent>
<TabsContent value="awards" className="flex-1 min-h-0 p-0">
<AwardsPanel onEditQSO={openEdit} onAwardsChanged={() => setAwardsVersion((v) => v + 1)} />
<AwardsPanel onEditQSO={openEdit} onAwardsChanged={() => setAwardsVersion((v) => v + 1)}
onPaperQSL={openPaperQSLFor} />
</TabsContent>
{statsTabOpen && (
@@ -7821,6 +8090,14 @@ export default function App() {
</TabsContent>
)}
{/* Elecraft K3/K4 console. Shown for the Kenwood backend too: the
K3 speaks that dialect and the panel reads whatever answers. */}
{(catState.backend === 'elecraft' || catState.backend === 'kenwood') && (
<TabsContent value="elecraft" className="flex-1 min-h-0 p-0">
<ElecraftPanel onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
</TabsContent>
)}
{catState.backend === 'icom' && (
<TabsContent value="icom" className="flex-1 min-h-0 p-0">
<IcomPanel isNetwork={catBackend === 'icom-net'} onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
@@ -7940,6 +8217,8 @@ export default function App() {
// place a band map happens to be drawn.
fitToBand={bandMapFit}
onToggleFit={toggleBandMapFit}
hideDigital={bandMapHideFt}
onToggleHideDigital={toggleBandMapHideFt}
keyNav
/>
</div>
+28 -4
View File
@@ -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>
+2 -2
View File
@@ -29,9 +29,9 @@ const LABELS: Record<string, string> = {
// The channels a rule can be scoped to. "worked" is the catch-all — it means
// nothing on ANY channel — so narrowing it would say nothing.
const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz', 'hamlog'] as const;
const CHANNEL_LABELS: Record<string, string> = {
qsl: 'appr.chQsl', lotw: 'LoTW', eqsl: 'eQSL', qrz: 'QRZ.com',
qsl: 'appr.chQsl', lotw: 'LoTW', eqsl: 'eQSL', qrz: 'QRZ.com', hamlog: 'HAMLOG.online',
};
// MatrixColorsSection recolours the band/mode matrix — the PH/CW/DIG grid in the
+2 -1
View File
@@ -68,7 +68,8 @@ const AWARD_TYPES = ['REFERENCE', 'QSOFIELDS', 'CALLSIGN'];
const NO_FIELD = '__none__';
const CONFIRM_SRC = [
{ id: 'lotw', label: 'LoTW' }, { id: 'qsl', label: 'QSL' }, { id: 'eqsl', label: 'eQSL' },
{ id: 'qrzcom', label: 'QRZ.com' }, { id: 'custom', label: 'Custom' },
{ id: 'qrzcom', label: 'QRZ.com' }, { id: 'hamlog', label: 'HAMLOG.online' },
{ id: 'custom', label: 'Custom' },
];
const BANDS = ['2190m','630m','160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','4m','2m','1.25m','70cm','33cm','23cm','13cm','9cm','6cm','3cm','1.25cm','6mm','4mm','2.5mm','2mm','1mm'];
const MODES = ['CW','SSB','USB','LSB','AM','FM','RTTY','PSK31','FT8','FT4','JT65','JT9','MFSK','OLIVIA','DIGITALVOICE'];
+39 -2
View File
@@ -1,6 +1,6 @@
import { useEffect, useMemo, useState } from 'react';
import { X, Plus, Loader2 } from 'lucide-react';
import { SearchAwardReferences, GetAwardDefs, GetAwardReferenceMeta } from '../../wailsjs/go/main/App';
import { SearchAwardReferences, GetAwardDefs, GetAwardReferenceMeta, AwardRefsNew } from '../../wailsjs/go/main/App';
import {
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
} from '@/components/ui/select';
@@ -54,6 +54,34 @@ export function AwardRefSelector({ dxcc, value, onChange, fieldValues, heightCla
const entries = value ? value.split(';').filter(Boolean) : [];
// Which of the picked references have never been worked. Asked of the backend
// only when the list of references actually changes — a handful of times per
// QSO — and it answers from an in-memory set (see awardnew.go).
//
// The first question about an award may arrive before its set is built, in
// which case the answer is "pending" and carries no verdict for it: we ask
// again rather than badge on a guess. Attempts are capped so a logbook that
// never finishes building cannot leave a timer running for the session.
const [isNew, setIsNew] = useState<Record<string, boolean>>({});
const entriesKey = entries.join(';');
useEffect(() => {
if (!entriesKey) { setIsNew({}); return; }
let alive = true;
let timer: number | undefined;
let tries = 0;
const ask = () => {
AwardRefsNew(entriesKey.split(';'))
.then((r: any) => {
if (!alive) return;
setIsNew(r?.new ?? {});
if (r?.pending && ++tries < 10) timer = window.setTimeout(ask, 700);
})
.catch(() => { if (alive) setIsNew({}); }); // no badge beats a wrong one
};
ask();
return () => { alive = false; if (timer) window.clearTimeout(timer); };
}, [entriesKey]);
// When the reference set is cleared (a QSO was logged or the call was reset),
// also blank the picker's own state — the search box and the highlighted /
// selected reference — so the Awards tab starts fresh for the next contact.
@@ -256,7 +284,16 @@ export function AwardRefSelector({ dxcc, value, onChange, fieldValues, heightCla
}`}
onClick={() => setSelectedEntry(selectedEntry === entry ? null : entry)}
>
<span className="font-mono font-semibold flex-1 truncate">{entry}</span>
<span className="font-mono font-semibold truncate">{entry}</span>
{isNew[entry] && (
<span
title={t('awrs.newRefHint')}
className="shrink-0 px-1 rounded-sm text-[9px] leading-[14px] font-semibold tracking-wide bg-success-muted text-success border border-success-border"
>
{t('awrs.new')}
</span>
)}
<span className="flex-1" />
<button
className="shrink-0 hover:text-destructive"
onClick={(e) => { e.stopPropagation(); removeEntry(entry); }}
+23 -4
View File
@@ -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>
+49 -16
View File
@@ -25,6 +25,16 @@ interface Spot {
band?: string;
comment?: string;
spotter?: string;
// The park reference the POTA poller tagged this spot with. The map never
// reads it — the click handler upstream turns it into the QSO's POTA award
// reference — but it is declared so it cannot be lost by accident.
//
// It travelled only because the spot objects are passed through by reference
// and the type was erased. The first refactor to copy a spot field by field
// would have dropped the park silently, and the only symptom would be an
// activation logged without its reference. Same mistake as the status entry
// below, whose extra markers were arriving and undeclared.
pota_ref?: string;
}
// The FULL status entry, not the two fields the map used to declare. The extra
@@ -83,11 +93,12 @@ interface Props {
// globally from the band-map tab toolbar.
hideDigital?: boolean;
fitToBand?: boolean;
// onToggleFit turns the zoom readout into the fit-to-band switch. Only the
// docked map passes it: the Band Map tab has the same control in its own
// toolbar, above maps that all obey it at once, and a second switch inside
// each card would be four ways to change one setting.
// onToggleFit and onToggleHideDigital add the two switches to this map's own
// header. Only the docked map passes them: the Band Map tab has both in its
// toolbar, above maps that all obey them at once, and a switch inside each
// card as well would be four ways to change one setting.
onToggleFit?: () => void;
onToggleHideDigital?: () => void;
// Mark stations that upload to LoTW (Settings → Appearance).
showLotw?: boolean;
// keyNav enables Ctrl+↑ / Ctrl+↓ to hop to the next spot above / below the rig
@@ -164,6 +175,7 @@ function LegendDot({ cls, colour, label }: { cls?: string; colour?: string; labe
function statusLabel(s: string, t: (k: string) => string): string {
switch (s) {
case 'new': return t('bmp.statusNew');
case 'new-band-mode': return t('bmp.statusNewBandMode');
case 'new-band': return t('bmp.statusNewBand');
case 'new-mode': return t('bmp.statusNewMode');
case 'new-slot': return t('bmp.statusNewSlot');
@@ -191,7 +203,11 @@ function statusStyle(s: string): { pill: string; bar: string; line: string; dot:
// line = SVG leader stroke (visible on hover)
// dot = small marker on the freq scale
switch (s) {
case 'new': return {
// NEW and NEW BAND+MODE share the strongest colour: both mean "there is
// something here you have never had", and a sixth shade in a palette read at
// a glance is a shade nobody can name.
case 'new':
case 'new-band-mode': return {
pill: 'bg-danger-muted text-danger-muted-foreground border-danger-border hover:bg-danger-muted',
bar: 'bg-danger',
line: 'stroke-danger',
@@ -268,7 +284,7 @@ const BOT_PAD = 14; // the top-most freq label isn't clipped at y=0
// last; ties broken by closeness to the rig freq).
const MAX_VISIBLE_SPOTS = 30;
export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, onToggleFit, keyNav = false, showLotw = false }: Props) {
export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, onToggleFit, onToggleHideDigital, keyNav = false, showLotw = false }: Props) {
const { t } = useI18n();
// The two display options are applied ONCE here, on the whole map, so the
@@ -366,6 +382,7 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
switch (spotStatus[k]?.status ?? '') {
case 'new': return 0;
case 'new-band-mode': return 0;
case 'new-band': return 1;
case 'new-slot': return 2;
case 'new-call': return 2;
@@ -564,16 +581,18 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
title={t('bmp.zoomOut')}>
<Minus className="size-3" />
</button>
{/* The readout IS the switch when the parent offers one — the header is
already tight with four maps side by side, and a separate chip would
cost width to say what this text says anyway. */}
{onToggleFit ? (
<button type="button" onClick={onToggleFit} title={t('bmp.fitTitle')}
className={cn('shrink-0 font-mono text-[10px] normal-case tracking-normal whitespace-nowrap px-1 rounded border transition-colors',
fitToBand ? 'border-primary bg-primary text-primary-foreground' : 'border-border hover:bg-muted')}>
{fitToBand ? t('bmp.fit') : `${pxPerKHz}px/kHz`}
</button>
) : (
{/* A readout, not a switch.
It WAS the switch for a day: clicking the px/kHz value toggled
fit-to-band, and in fit it read "FIT". Nobody found it — a control
whose label is a measurement does not look like a control, and once
switched off there was no longer anything on screen saying the option
existed. The switches below say what they are. */}
{/* In fit mode the readout has nothing left to say — the lit FIT button
says it, and printing the word twice side by side is just noise. The
Band Map tab's cards have no button, so there the readout keeps
reporting both states. */}
{(!fitToBand || !onToggleFit) && (
<span className="shrink-0 font-mono text-[10px] normal-case tracking-normal whitespace-nowrap px-0.5">{fitToBand ? t('bmp.fit') : `${pxPerKHz}px/kHz`}</span>
)}
<button type="button" onClick={() => changeZoom(1)} disabled={fitToBand || zoomIdx === PX_PER_KHZ.length - 1}
@@ -581,6 +600,20 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
title={t('bmp.zoomIn')}>
<Plus className="size-3" />
</button>
{onToggleFit && (
<button type="button" onClick={onToggleFit} title={t('bmp.fitTitle')}
className={cn('shrink-0 text-[10px] font-semibold normal-case tracking-normal px-1 rounded border transition-colors',
fitToBand ? 'border-primary bg-primary text-primary-foreground' : 'border-border text-muted-foreground hover:bg-muted')}>
{t('bmp.fit')}
</button>
)}
{onToggleHideDigital && (
<button type="button" onClick={onToggleHideDigital} title={t('bmp.hideFtTitle')}
className={cn('shrink-0 text-[10px] font-semibold normal-case tracking-normal px-1 rounded border transition-colors',
hideDigital ? 'border-primary bg-primary text-primary-foreground' : 'border-border text-muted-foreground hover:bg-muted')}>
{t('bmp.ftx')}
</button>
)}
<button type="button" onClick={recenterOnRig}
className="size-5 inline-flex items-center justify-center rounded hover:bg-muted"
title={t('bmp.scrollToRig')}>
@@ -48,6 +48,12 @@ const FIELDS: FieldDef[] = [
{ id: 'clublog_sent_date', label: 'bulk.fClublogSentDate', group: 'QSL / upload', kind: 'date' },
{ id: 'hrdlog_sent', label: 'bulk.fHrdlogSent', group: 'QSL / upload', kind: 'status' },
{ id: 'hrdlog_sent_date', label: 'bulk.fHrdlogSentDate', group: 'QSL / upload', kind: 'date' },
// HAMLOG.online: no promoted column, written into extras_json (see
// qso.bulkEditableExtras). Status and date, like every other service here.
{ id: 'hamlog_sent', label: 'bulk.fHamlogSent', group: 'QSL / upload', kind: 'status' },
{ id: 'hamlog_sent_date', label: 'bulk.fHamlogSentDate', group: 'QSL / upload', kind: 'date' },
{ id: 'hamlog_rcvd', label: 'bulk.fHamlogRcvd', group: 'QSL / upload', kind: 'status' },
{ id: 'hamlog_rcvd_date', label: 'bulk.fHamlogRcvdDate', group: 'QSL / upload', kind: 'date' },
// My station / operator
{ id: 'station_callsign', label: 'bulk.fStationCall', group: 'My station', kind: 'text', upper: true },
{ id: 'operator', label: 'bulk.fOperator', group: 'My station', kind: 'text', upper: true },
@@ -62,6 +62,7 @@ const CATEGORIES: Array<{ key: Category; labelKey: string; colour: string }> = [
function categoryOf(s: ChaseNewSpot): Category | null {
switch (s.status) {
case 'new': return 'dxcc';
case 'new-band-mode': return 'band';
case 'new-band': return 'band';
case 'new-mode': return 'mode';
case 'new-slot': return 'slot';
+38 -11
View File
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import {
AllCommunityModule, ModuleRegistry,
type ColDef, type ColumnState, type GridReadyEvent, type RowClickedEvent,
type ColDef, type ColumnState, type GridReadyEvent, type RowClickedEvent, type RowDoubleClickedEvent,
} from 'ag-grid-community';
import { hamlogGridTheme } from '@/lib/gridTheme';
import { AgGridReact } from 'ag-grid-react';
@@ -75,7 +75,13 @@ export type SpotStatusEntry = {
type Props = {
rows: ClusterSpot[];
spotStatus: Record<string, SpotStatusEntry>;
// A DOUBLE click works the spot: QSY, mode, callsign, the lot.
onSpotClick?: (s: ClusterSpot) => void;
// A SINGLE click only fills the callsign. Reading the cluster means passing
// over dozens of lines, and every pass used to drag the radio with it — one
// stray click while looking took the operator off the station they were
// working. Looking and going are now two different gestures.
onSpotSelect?: (s: ClusterSpot) => void;
};
const COL_STATE_KEY = 'hamlog.clusterColState.v1';
@@ -174,6 +180,7 @@ function cellText(value: any, color: string | null): any {
function statusColor(s: SpotStatusEntry | undefined): string | null {
switch (s?.status) {
case 'new':
case 'new-band-mode':
case 'new-band':
case 'new-mode':
case 'new-slot':
@@ -193,7 +200,7 @@ function statusColor(s: SpotStatusEntry | undefined): string | null {
// (still loading, or entity unknown) are NOT dimmed — that would flicker.
function isDull(s: SpotStatusEntry | undefined): boolean {
if (!s || !s.status) return false;
if (s.status === 'new' || s.status === 'new-band' || s.status === 'new-mode' || s.status === 'new-slot' || s.status === 'new-call') return false;
if (s.status === 'new' || s.status === 'new-band-mode' || s.status === 'new-band' || s.status === 'new-mode' || s.status === 'new-slot' || s.status === 'new-call') return false;
return !(s.worked_call || s.new_pota || s.new_county || s.new_pfx || s.new_grid);
}
@@ -259,6 +266,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
const s = statusFor(p);
const parts: string[] = [];
if (s?.status === 'new') parts.push(t('clg2.newDxcc'));
else if (s?.status === 'new-band-mode') parts.push(t('clg2.newBandMode'));
else if (s?.status === 'new-band') parts.push(t('clg2.newBand'));
else if (s?.status === 'new-mode') parts.push(t('clg2.newMode'));
else if (s?.status === 'new-slot') parts.push(t('clg2.newSlot'));
@@ -276,6 +284,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
const main = statusColor(s);
if (main) {
const label = s?.status === 'new' ? t('clg2.newDxcc')
: s?.status === 'new-band-mode' ? t('clg2.newBandMode')
: s?.status === 'new-band' ? t('clg2.newBand')
: s?.status === 'new-mode' ? t('clg2.newMode')
: s?.status === 'new-slot' ? t('clg2.newSlot')
@@ -310,6 +319,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
tooltipValueGetter: (p: any) => {
const s = statusFor(p);
if (s?.status === 'new') return t('clg2.tipNewDxcc', { country: s?.country ?? '' });
if (s?.status === 'new-band-mode') return t('clg2.tipNewBandMode');
if (s?.status === 'new-band') return t('clg2.tipNewBand');
if (s?.status === 'new-slot') return t('clg2.tipNewSlotBand');
if (s?.status === 'new-call') return t('clg2.tipNewCall');
@@ -338,10 +348,18 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
headerName: t('clg2.c.band'), field: 'band' as any, width: 75,
defaultVisible: true,
cellClass: 'font-mono',
// NEW BAND for this entity → the band cell is filled.
cellStyle: (p: any) => (statusFor(p)?.status === 'new-band' ? fillStyle(NEW) : null) as any,
// NEW BAND for this entity → the band cell is filled. NEW BAND+MODE fills
// it too: the band really is new, and leaving it plain would say the
// opposite of the status column beside it.
cellStyle: (p: any) => {
const st = statusFor(p)?.status;
return (st === 'new-band' || st === 'new-band-mode' ? fillStyle(NEW) : null) as any;
},
cellRenderer: (p: any) => cellText(p.value, null),
tooltipValueGetter: (p: any) => (statusFor(p)?.status === 'new-band' ? t('clg2.tipNewBand') : undefined),
tooltipValueGetter: (p: any) => {
const st = statusFor(p)?.status;
return st === 'new-band-mode' ? t('clg2.tipNewBandMode') : st === 'new-band' ? t('clg2.tipNewBand') : undefined;
},
},
{
group: 'Spot', label: t('clg2.c.mode'), colId: 'mode',
@@ -349,14 +367,18 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
defaultVisible: true,
cellClass: 'font-mono',
valueGetter: (p: any) => p.data ? inferSpotMode(p.data.comment ?? '', p.data.freq_hz) : '',
// Only NEW MODE pills the mode cell — there the mode itself is genuinely new
// for the entity. NEW SLOT means band AND mode were each worked before (just
// not together), so highlighting the mode cell would wrongly imply "CW is new";
// that case is signalled by the Status badge alone.
cellStyle: (p: any) => (statusFor(p)?.status === 'new-mode' ? fillStyle('var(--caution)') : null) as any,
// NEW MODE and NEW BAND+MODE pill the mode cell — in both the mode itself is
// genuinely new for the entity. NEW SLOT means band AND mode were each worked
// before (just not together), so highlighting the mode cell would wrongly
// imply "CW is new"; that case is signalled by the Status badge alone.
cellStyle: (p: any) => {
const st = statusFor(p)?.status;
return (st === 'new-mode' || st === 'new-band-mode' ? fillStyle('var(--caution)') : null) as any;
},
cellRenderer: (p: any) => cellText(p.value, null),
tooltipValueGetter: (p: any) => {
const st = statusFor(p)?.status;
if (st === 'new-band-mode') return t('clg2.tipNewBandMode');
if (st === 'new-mode') return t('clg2.tipNewMode');
if (st === 'new-slot') return t('clg2.tipNewSlot');
return undefined;
@@ -484,7 +506,7 @@ const GROUP_ORDER = ['Spot', 'Geo'];
const CLG_GRP_KEYS: Record<string, string> = { Spot: 'clg2.grpSpot', Geo: 'clg2.grpGeo' };
const groupLabel = (t: TFn, g: string): string => t(CLG_GRP_KEYS[g] ?? g);
export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
export function ClusterGrid({ rows, spotStatus, onSpotClick, onSpotSelect }: Props) {
const { t } = useI18n();
const gridRef = useRef<any>(null);
const [pickerOpen, setPickerOpen] = useState(false);
@@ -567,6 +589,10 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
}, []);
function handleRowClicked(e: RowClickedEvent<ClusterSpot>) {
if (e.data && onSpotSelect) onSpotSelect(e.data);
}
function handleRowDoubleClicked(e: RowDoubleClickedEvent<ClusterSpot>) {
if (e.data && onSpotClick) onSpotClick(e.data);
}
@@ -631,6 +657,7 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
onColumnVisible={saveColumnState}
onSortChanged={saveColumnState}
onRowClicked={handleRowClicked}
onRowDoubleClicked={handleRowDoubleClicked}
animateRows={false}
suppressCellFocus
getRowId={(p) => `${(p.data as any).received_at}-${(p.data as any).dx_call}-${(p.data as any).source_id}`}
+82 -32
View File
@@ -132,6 +132,9 @@ function catsOf(e: StatusEntry | undefined): Set<NewCat> {
if (!e) return out;
switch (e.status) {
case 'new': out.add('dxcc'); break;
// NEW BAND+MODE lights BOTH badges: the two facts are true at once, and
// showing one of them would say the entity is already worked in the other.
case 'new-band-mode': out.add('band'); out.add('mode'); break;
case 'new-band': out.add('band'); break;
case 'new-mode': out.add('mode'); break;
case 'new-slot': out.add('slot'); break;
@@ -313,6 +316,22 @@ const ENTITY_BADGE: Record<string, { label: string; cls: string }> = {
'new-call': { label: 'dec.stCall', cls: 'bg-muted text-muted-foreground' },
};
// entityBadgesFor turns a status into the badges that describe it.
//
// A LIST, because "new-band-mode" is two facts at once — new on this band and
// new in this mode — and the map above has an entry for neither. It was read
// with a single lookup, which returned nothing for that status: those rows
// passed the BAND and MODE filters and then showed no reason for being there,
// which is precisely what was reported. catsOf has always split the status into
// its two categories; this is the same split, on the screen.
function entityBadgesFor(status: string): { label: string; cls: string }[] {
if (status === 'new-band-mode') {
return [ENTITY_BADGE['new-band'], ENTITY_BADGE['new-mode']];
}
const one = ENTITY_BADGE[status];
return one ? [one] : [];
}
// The orthogonal ones: a station already worked for its entity can still be a
// new grid, a new prefix or a park never logged.
//
@@ -528,7 +547,14 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
});
const [bandSel, setBandSel] = usePersisted('bandSel', '');
const [modeSel, setModeSel] = usePersisted('modeSel', '');
const [contSel, setContSel] = usePersisted('contSel', '');
// Continents are a MULTI-selection, not one at a time: the useful filter is
// "everything except NA and EU", which a single-choice dropdown cannot say —
// it can only name one continent to keep. Stored as a list (a Set does not
// survive JSON), empty meaning no filter at all.
const [contList, setContList] = usePersisted<string[]>('contList', []);
const contSel = useMemo(() => new Set(contList), [contList]);
const toggleCont = (c: string) =>
setContList(contSel.has(c) ? contList.filter((x) => x !== c) : [...contList, c].sort());
const [minSnr, setMinSnr] = usePersisted('minSnr', '');
const [search, setSearch] = usePersisted('search', '');
@@ -551,8 +577,21 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
const calling = (txState?.dx_call ?? '').toUpperCase();
const answersMe = (msg?: string): boolean => {
if (!me || !msg) return false;
const first = msg.trim().split(/\s+/)[0]?.replace(/[<>]/g, '').toUpperCase();
return !!first && first === me;
// EVERY segment, not just the first.
//
// MSHV answers two stations in one transmission and sends them as one line:
//
// DM8BJF RR73; F4BPO <RI1FJL> +14
//
// The second half is addressed to F4BPO, and reading only the start of the
// line missed it — the operator being answered saw no badge at all, which is
// the one moment this badge exists for. Each ';' segment is its own message
// and names its own recipient first.
for (const part of msg.split(';')) {
const first = part.trim().split(/\s+/)[0]?.replace(/[<>]/g, '').toUpperCase();
if (first && first === me) return true;
}
return false;
};
// The choices are built from what is actually on the feed, and a selector with
@@ -573,6 +612,15 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [decodes, spotStatus]);
// The chips are the continents on the feed — a selector with nothing to choose
// is furniture — PLUS anything currently selected. Without that second half a
// filter can strand itself: pick AF, the last African station stops decoding,
// and the list empties with no chip left to switch it back off.
const contChips = useMemo(
() => [...new Set([...conts, ...contList])].sort(),
[conts, contList],
);
const filtered = useMemo(() => {
const q = search.trim().toUpperCase();
const floor = minSnr.trim() === '' ? null : parseInt(minSnr, 10);
@@ -591,7 +639,7 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
for (const c of cats) if (have.has(c)) { hit = true; break; }
if (!hit) return false;
}
if (contSel && e?.continent !== contSel) return false;
if (contSel.size > 0 && !(e?.continent && contSel.has(e.continent))) return false;
if (q && !(d.call.includes(q) || (d.grid ?? '').toUpperCase().includes(q) || (d.msg ?? '').toUpperCase().includes(q))) return false;
return true;
});
@@ -624,11 +672,11 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
const resetFilters = () => {
setCqOnly(false); setLotwOnly(false); setBandSel('');
setModeSel(''); setContSel(''); setMinSnr(''); setSearch('');
setModeSel(''); setContList([]); setMinSnr(''); setSearch('');
setCats(new Set());
try { localStorage.setItem(CAT_KEY, '[]'); } catch { /* not worth failing over */ }
};
const anyFilter = cqOnly || lotwOnly || cats.size > 0 || !!bandSel || !!modeSel || !!contSel || !!minSnr || !!search.trim();
const anyFilter = cqOnly || lotwOnly || cats.size > 0 || !!bandSel || !!modeSel || contSel.size > 0 || !!minSnr || !!search.trim();
const sel = 'h-8 rounded-lg border border-border bg-background px-2 text-sm';
const chip = (on: boolean, tone = 'primary') => cn(
@@ -697,11 +745,28 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
{modes.map((m) => <option key={m} value={m}>{m}</option>)}
</select>
)}
{conts.length > 1 && (
<select className={sel} value={contSel} onChange={(e) => setContSel(e.target.value)}>
<option value="">{t('dec.allConts')}</option>
{conts.map((c) => <option key={c} value={c}>{c}</option>)}
</select>
{/* Toggles, like the category badges above — the same gesture for the
same kind of question. None lit is every continent, which is what an
empty filter has always meant here. */}
{contChips.length > 1 && (
<span className="flex items-center gap-1 pl-1 border-l border-border/60 ml-1" title={t('dec.contsHint')}>
{contChips.map((c) => {
const on = contSel.has(c);
return (
<button
key={c}
type="button"
onClick={() => toggleCont(c)}
className={cn(
'rounded border px-1.5 py-0.5 text-[11px] font-bold uppercase tracking-wide transition-all',
on ? 'border-primary text-primary' : 'border-border text-muted-foreground opacity-50 hover:opacity-100',
)}
>
{c}
</button>
);
})}
</span>
)}
<label className="flex items-center gap-1.5 text-sm text-muted-foreground">
@@ -762,21 +827,6 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
filter. Halt goes LAST — it is the one that must be findable without
reading, and the end of the row is the one position that never moves
as filters come and go. */}
{onToggleAutoCall && (
<button
type="button"
onClick={onToggleAutoCall}
title={t('dec.autoCallTip')}
className={cn('h-8 px-2.5 rounded-lg text-sm inline-flex items-center gap-1.5 border',
// Lit when it is armed, because what matters at a glance is not
// "where is the switch" but "is this thing about to transmit".
autoCallOn
? 'border-warning bg-warning text-warning-foreground'
: 'border-border text-muted-foreground hover:bg-muted hover:text-foreground')}
>
<Bot className="size-3.5" /> {t('dec.autoCall')}
</button>
)}
{onHalt && (
<button
type="button"
@@ -970,10 +1020,10 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
{g.decodes.map((d, i) => {
const e = statusOf(d);
const st = e?.status && e.status !== 'worked' ? e.status : '';
const entity = st ? ENTITY_BADGE[st] : undefined;
const entities = st ? entityBadgesFor(st) : [];
const extras = EXTRA_BADGES.filter((b) => !!e?.[b.key]);
const mine = !!me && d.call === me;
const hot = !!entity || extras.length > 0;
const hot = entities.length > 0 || extras.length > 0;
// Someone answering us outranks everything else on the screen.
const replying = answersMe(d.msg);
// The station we are calling, so it can be picked out of a slot
@@ -1062,11 +1112,11 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
{t('dec.wkd')}
</span>
)}
{entity && (
<span className={cn('rounded px-1 py-px text-[10px] font-bold uppercase tracking-wide shrink-0', entity.cls)}>
{t(entity.label)}
{entities.map((b) => (
<span key={b.label} className={cn('rounded px-1 py-px text-[10px] font-bold uppercase tracking-wide shrink-0', b.cls)}>
{t(b.label)}
</span>
)}
))}
{extras.map((b) => {
// A square WORKED but not yet confirmed is a different job
// from one never worked: a QSL to chase, not a QSO to make.
+326
View File
@@ -0,0 +1,326 @@
import { useEffect, useRef, useState } from 'react';
import { Radio, Power, Activity, AudioLines, SlidersHorizontal } from 'lucide-react';
import {
GetKenwoodState, RefreshKenwood, SetKenwoodPower, SetKenwoodAFGain, SetKenwoodTX, TuneKenwoodATU,
SetKenwoodRFGain, SetKenwoodMicGain, SetKenwoodSquelch, SetKenwoodPreamp, SetKenwoodAtt,
SetKenwoodNB, SetKenwoodNR, SetKenwoodAGC, SetKenwoodFilter, SetKenwoodAntenna,
SetKenwoodRIT, SetKenwoodXIT, ClearKenwoodRIT, SetKenwoodKeySpeed, ToggleKenwoodATU, NudgeKenwoodRIT,
GetCATState,
} from '../../wailsjs/go/main/App';
import { cn } from '@/lib/utils';
import { useI18n } from '@/lib/i18n';
import { sMeterRST } from '@/lib/rst';
import { MeterBar } from '@/components/MeterBar';
import { WheelRange } from '@/components/WheelRange';
type KenwoodState = {
available: boolean; model?: string; elecraft: boolean; mode?: string;
transmitting: boolean; split: boolean; split_tx_hz?: number;
s_meter: number; s_meter_raw: number;
power_meter: number; swr: number; swr_raw: number;
rf_power: number; af_gain: number; rf_gain: number; mic_gain: number; squelch: number;
preamp: boolean; att: boolean; nb: boolean; nr: boolean; agc?: string;
filter_hz: number; antenna: number; rit: boolean; xit: boolean; rit_offset: number; key_speed: number;
meters_provisional: boolean;
};
const ZERO: KenwoodState = {
available: false, elecraft: false, transmitting: false, split: false,
s_meter: 0, s_meter_raw: 0, power_meter: 0, swr: 0, swr_raw: 0,
rf_power: 0, af_gain: 0, rf_gain: 0, mic_gain: 0, squelch: 0,
preamp: false, att: false, nb: false, nr: false,
filter_hz: 0, antenna: 0, rit: false, xit: false, rit_offset: 0, key_speed: 0,
meters_provisional: true,
};
// Filter widths worth a button. CW work happens at 200-500 Hz, SSB at 2.4-2.8
// kHz; the rest of the range is reachable from the radio's own knob, and a
// panel offering thirty widths is slower to use than the knob it replaces.
// 4.0k is the K3 maximum and the one FT8 wants: a 2.8 kHz filter clips the
// top of the FT8 sub-band, and the decodes that go missing are the ones
// nobody notices are missing.
const FILTERS = [200, 400, 700, 1000, 1800, 2400, 2800, 4000];
// Raw S-meter → S units. The K3 answers 0-21 across S0…S9+60; S9 is taken at
// raw 9 and each step above it as 6 dB. PROVISIONAL, like the rest of the
// scaling: the raw value is on screen and in the log, so a real radio settles
// it rather than this comment.
const S9_RAW = 9;
const DB_PER_RAW = 6;
function sParts(rawV: number): { s: number; over: number; label: string } {
if (rawV >= S9_RAW) {
const over = Math.max(0, Math.round((rawV - S9_RAW) * DB_PER_RAW));
return { s: 9, over, label: over > 0 ? `S9+${over}` : 'S9' };
}
const s = Math.max(0, Math.min(9, rawV));
return { s, over: 0, label: `S${s}` };
}
// Segment colour, printed the way a radio's own meter is: green up to S9, amber
// through the S9+ range, red once the signal would be reported as 59+20 or more.
function sSegColor(frac: number) {
if (frac > 0.78) return '#dc2626';
if (frac > 0.55) return '#f59e0b';
return '#16a34a';
}
// The card shell the Yaesu and Icom consoles use, so the three read alike.
function Card({ icon: Icon, title, children }: { icon: any; title: string; children: React.ReactNode }) {
return (
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden">
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
<Icon className="size-4 text-primary" />
<span className="text-xs font-bold uppercase tracking-wider text-foreground/80">{title}</span>
</div>
<div className="p-3 space-y-3">{children}</div>
</div>
);
}
// One button shape for every on/off control, so the panel reads as one
// instrument instead of a collection of differently-styled switches.
function Toggle({ label, on, off, onClick }: { label: string; on: boolean; off: boolean; onClick: () => void }) {
return (
<button type="button" disabled={off} onClick={onClick}
className={cn('px-2 py-1 rounded-md text-[11px] font-bold tracking-wide border transition-all disabled:opacity-30',
on ? 'bg-primary text-primary-foreground border-primary' : 'bg-card text-muted-foreground border-border hover:border-primary/60')}>
{label}
</button>
);
}
export function ElecraftPanel({ onReportRST }: { onReportRST?: (rst: string) => void }) {
const { t } = useI18n();
const [st, setSt] = useState<KenwoodState>(ZERO);
const [freqHz, setFreqHz] = useState(0);
const [err, setErr] = useState('');
// Optimistic overlay: a slider must follow the finger, not the poll. Dropped
// once the radio has had time to answer with the value it actually took.
const [local, setLocal] = useState<{ rf_power?: number; af_gain?: number; rf_gain?: number; mic_gain?: number; squelch?: number; key_speed?: number }>({});
const localAtRef = useRef(0);
useEffect(() => {
let alive = true;
const tick = async () => {
try {
const s = (await GetKenwoodState()) as KenwoodState;
const c = (await GetCATState()) as any;
if (!alive) return;
setSt(s);
setFreqHz(c?.split && c?.freq_rx_hz > 0 ? c.freq_rx_hz : (c?.freq_hz ?? 0));
if (Date.now() - localAtRef.current > 1200) setLocal({});
setErr('');
} catch (e: any) {
if (alive) setErr(String(e?.message ?? e));
}
};
tick();
const id = window.setInterval(tick, 500);
return () => { alive = false; window.clearInterval(id); };
}, []);
const view = { ...st, ...local };
const off = !st.available;
const setErrMsg = (e: any) => setErr(String(e?.message ?? e));
const put = (patch: typeof local, run: () => Promise<any>) => {
setLocal((p) => ({ ...p, ...patch }));
localAtRef.current = Date.now();
run().catch((e) => setErr(String(e?.message ?? e)));
};
return (
<div className="h-full min-h-0 overflow-auto bg-background">
{/* Same wrapper as the Yaesu, Icom and Flex consoles: capped width and
CENTRED. A console stretched across a 2000 px window puts a slider a
hand's width from its own label, and the panel stops reading as one
instrument. */}
<div className="max-w-5xl mx-auto p-3 space-y-3">
{/* VFO + status */}
<div className="rounded-xl border border-border bg-card shadow-sm px-4 py-3 flex items-center justify-between gap-3 flex-wrap">
<div>
<div className="text-[10px] font-bold uppercase tracking-wider text-muted-foreground flex items-center gap-1.5">
<Radio className="size-3.5" />
{st.elecraft ? 'Elecraft' : 'Kenwood'} {st.model}
<span className={cn('size-2 rounded-full', off ? 'bg-muted-foreground/40' : 'bg-success')} />
</div>
<div className="text-2xl font-mono tabular-nums font-bold">
{freqHz > 0 ? (freqHz / 1e6).toFixed(6) : '—'}
</div>
</div>
<button type="button" className="text-[11px] text-muted-foreground hover:text-foreground flex items-center gap-1"
onClick={() => RefreshKenwood().catch(() => {})} title={t('k3.refreshHint')}>
<SlidersHorizontal className="size-3.5" />
</button>
</div>
{off && <div className="text-xs text-muted-foreground px-1">{t('k3.waiting')}</div>}
{!!err && <div className="text-[11px] text-danger px-1">{err}</div>}
{/* Meters */}
<Card icon={Activity} title={t('k3.meters')}>
<div className="grid grid-cols-1 sm:grid-cols-3 gap-2">
<MeterBar label="S-METER" value={view.transmitting ? 0 : view.s_meter} lo={0} hi={100}
accent="#16a34a" segColor={sSegColor}
display={view.transmitting ? '—' : sParts(view.s_meter_raw).label}
onClick={() => {
if (view.transmitting || !onReportRST) return;
const sp = sParts(view.s_meter_raw);
onReportRST(sMeterRST(sp.s, sp.over, view.mode));
}}
title={t('k3.sMeterHint', { raw: String(view.s_meter_raw) })} />
<MeterBar label="PWR" value={view.transmitting ? view.power_meter : 0} lo={0} hi={100} accent="#0ea5e9" />
{/* 0 means "not measured", and it must not render as a perfect 1.0:
a match that looks ideal on an antenna nobody has measured is the one
reading that can cost a radio. */}
<MeterBar label="SWR" value={view.transmitting && view.swr > 0 ? view.swr : 1} lo={1} hi={4}
accent="#f59e0b"
display={view.transmitting && view.swr > 0 ? view.swr.toFixed(1) : '—'} />
</div>
{view.meters_provisional && (
<p className="text-[10px] text-muted-foreground">{t('k3.provisional')}</p>
)}
</Card>
{/* MOX + TUNE */}
<div className="flex items-center gap-2">
<button type="button" disabled={off}
onClick={() => SetKenwoodTX(!view.transmitting).catch((e) => setErr(String(e?.message ?? e)))}
className={cn('flex-1 px-3 py-2.5 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
view.transmitting
? 'bg-danger text-danger-foreground border-danger shadow-[0_0_14px] shadow-danger/50'
: 'bg-card text-danger border-danger hover:bg-danger-muted')}>
<Power className="size-4 inline mr-1 -mt-0.5" /> MOX
</button>
<button type="button" disabled={off}
onClick={() => TuneKenwoodATU().catch((e) => setErr(String(e?.message ?? e)))}
title={t('k3.tuneHint')}
className="flex-1 px-3 py-2.5 rounded-lg text-sm font-extrabold tracking-wide border-2 border-warning text-warning bg-card hover:bg-warning-muted transition-all disabled:opacity-30">
<Activity className="size-4 inline mr-1 -mt-0.5" /> TUNE
</button>
{/* The HOLD of the same switch: tuner in line or bypassed. Two buttons
because they are two things on the radio — tuning is a cycle you
start, bypassing is a state you leave it in. */}
<button type="button" disabled={off}
onClick={() => ToggleKenwoodATU().catch(setErrMsg)}
title={t('k3.atuHint')}
className="px-3 py-2.5 rounded-lg text-sm font-extrabold tracking-wide border-2 border-border text-muted-foreground bg-card hover:bg-muted transition-all disabled:opacity-30">
ATU
</button>
</div>
{/* Levels — two columns, so a slider stays beside the label it belongs to
instead of running the width of the window. */}
<Card icon={SlidersHorizontal} title={t('k3.levels')}>
<div className="grid grid-cols-1 lg:grid-cols-2 gap-x-6 gap-y-2">
<label className="flex items-center gap-2 text-xs">
<span className="w-16 shrink-0 text-muted-foreground">{t('k3.power')}</span>
<WheelRange min={0} max={110} step={5} disabled={off}
value={view.rf_power ?? 0}
onChange={(n) => put({ rf_power: n }, () => SetKenwoodPower(n))} />
<span className="w-12 text-right font-mono tabular-nums">{view.rf_power ?? 0} W</span>
</label>
<label className="flex items-center gap-2 text-xs">
<span className="w-16 shrink-0 text-muted-foreground flex items-center gap-1">
<AudioLines className="size-3.5" /> {t('k3.volume')}
</span>
<WheelRange min={0} max={100} disabled={off}
value={view.af_gain ?? 0}
onChange={(n) => put({ af_gain: n }, () => SetKenwoodAFGain(n))} />
<span className="w-12 text-right font-mono tabular-nums">{view.af_gain ?? 0}</span>
</label>
<label className="flex items-center gap-2 text-xs">
<span className="w-16 shrink-0 text-muted-foreground">{t('k3.rfGain')}</span>
<WheelRange min={0} max={100} disabled={off}
value={view.rf_gain ?? 0}
onChange={(n) => put({ rf_gain: n }, () => SetKenwoodRFGain(n))} />
<span className="w-12 text-right font-mono tabular-nums">{view.rf_gain ?? 0}</span>
</label>
<label className="flex items-center gap-2 text-xs">
<span className="w-16 shrink-0 text-muted-foreground">{t('k3.micGain')}</span>
<WheelRange min={0} max={100} disabled={off}
value={view.mic_gain ?? 0}
onChange={(n) => put({ mic_gain: n }, () => SetKenwoodMicGain(n))} />
<span className="w-12 text-right font-mono tabular-nums">{view.mic_gain ?? 0}</span>
</label>
<label className="flex items-center gap-2 text-xs">
<span className="w-16 shrink-0 text-muted-foreground">{t('k3.squelch')}</span>
<WheelRange min={0} max={100} disabled={off}
value={view.squelch ?? 0}
onChange={(n) => put({ squelch: n }, () => SetKenwoodSquelch(n))} />
<span className="w-12 text-right font-mono tabular-nums">{view.squelch ?? 0}</span>
</label>
{/* CW keyer speed — the radio's own keyer, the one the K3 sends with. */}
<label className="flex items-center gap-2 text-xs">
<span className="w-16 shrink-0 text-muted-foreground">{t('k3.keySpeed')}</span>
<WheelRange min={8} max={50} disabled={off}
value={view.key_speed || 20}
onChange={(n) => put({ key_speed: n }, () => SetKenwoodKeySpeed(n))} />
<span className="w-12 text-right font-mono tabular-nums">{view.key_speed || 0} wpm</span>
</label>
</div>
</Card>
{/* Receive chain. Toggles, because that is what they are on the radio:
one press each, and the state comes back from the rig rather than from
what the button was asked to do. */}
<Card icon={AudioLines} title={t('k3.receive')}>
<div className="space-y-2">
<div className="flex flex-wrap items-center gap-1.5">
<Toggle label="PRE" on={view.preamp} off={off} onClick={() => SetKenwoodPreamp(!view.preamp).catch(setErrMsg)} />
<Toggle label="ATT" on={view.att} off={off} onClick={() => SetKenwoodAtt(!view.att).catch(setErrMsg)} />
<Toggle label="NB" on={view.nb} off={off} onClick={() => SetKenwoodNB(!view.nb).catch(setErrMsg)} />
<Toggle label="NR" on={view.nr} off={off} onClick={() => SetKenwoodNR(!view.nr).catch(setErrMsg)} />
<span className="w-2" />
{['OFF', 'SLOW', 'FAST'].map((a) => (
<Toggle key={a} label={a} on={(view.agc || '').toUpperCase() === a} off={off}
onClick={() => SetKenwoodAGC(a).catch(setErrMsg)} />
))}
</div>
{/* RIT / XIT. Clear zeroes both offsets at once — the radio's own RC,
and what an operator means by "clear it". */}
<div className="flex flex-wrap items-center gap-1.5">
<Toggle label="RIT" on={view.rit} off={off} onClick={() => SetKenwoodRIT(!view.rit).catch(setErrMsg)} />
<Toggle label="XIT" on={view.xit} off={off} onClick={() => SetKenwoodXIT(!view.xit).catch(setErrMsg)} />
{/* The offset itself. A lit RIT button says the feature is on and
nothing about where it has put the receiver. */}
{[-100, -10, 10, 100].map((d) => (
<Toggle key={d} label={(d > 0 ? '+' : '') + d} on={false} off={off}
onClick={() => NudgeKenwoodRIT(d).catch(setErrMsg)} />
))}
<span className="text-[11px] font-mono tabular-nums text-muted-foreground w-16">
{view.rit_offset > 0 ? '+' : ''}{view.rit_offset || 0} Hz
</span>
<Toggle label={t('k3.clear')} on={false} off={off} onClick={() => ClearKenwoodRIT().catch(setErrMsg)} />
{/* Antenna only when the radio answered AN — a K3 without the internal
ATU has one socket and no switch to offer. */}
{view.antenna > 0 && (<>
<span className="w-2" />
<span className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('k3.antenna')}</span>
{[1, 2].map((n) => (
<Toggle key={n} label={'ANT' + n} on={view.antenna === n} off={off}
onClick={() => SetKenwoodAntenna(n).catch(setErrMsg)} />
))}
</>)}
</div>
{/* Filter width */}
<div className="flex flex-wrap items-center gap-1.5">
<span className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('k3.filter')}</span>
{FILTERS.map((hz) => (
<Toggle key={hz} label={hz >= 1000 ? (hz / 1000).toFixed(1) + 'k' : String(hz)}
on={view.filter_hz === hz} off={off}
onClick={() => SetKenwoodFilter(hz).catch(setErrMsg)} />
))}
{view.filter_hz > 0 && (
<span className="text-[10px] font-mono text-muted-foreground">{view.filter_hz} Hz</span>
)}
</div>
</div>
</Card>
</div>
</div>
);
}
+22 -1
View File
@@ -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';
@@ -33,6 +33,8 @@ type FieldType = 'text' | 'number' | 'date' | 'adifdate';
const FIELDS: { value: string; label: string; type: FieldType }[] = [
{ value: 'callsign', label: 'fltb.fCallsign', type: 'text' },
{ value: 'qso_date', label: 'fltb.fDate', type: 'date' },
// When the record entered the logbook — the way to isolate what an import added.
{ value: 'created_at', label: 'fltb.fCreated', type: 'date' },
{ value: 'qso_date_off', label: 'fltb.fEndDate', type: 'date' },
{ value: 'band', label: 'fltb.fBand', type: 'text' },
{ value: 'band_rx', label: 'fltb.fRxBand', type: 'text' },
@@ -86,6 +88,12 @@ const FIELDS: { value: string; label: string; type: FieldType }[] = [
{ value: 'clublog_qso_upload_date', label: 'fltb.fClublogSentDate', type: 'adifdate' },
{ value: 'hrdlog_qso_upload_status', label: 'fltb.fHrdlogSent', type: 'text' },
{ value: 'hrdlog_qso_upload_date', label: 'fltb.fHrdlogSentDate', type: 'adifdate' },
// HAMLOG.online: no promoted column, filtered through extras_json (see
// qso.filterableExtras).
{ value: 'hamlog_sent', label: 'fltb.fHamlogSent', type: 'text' },
{ value: 'hamlog_sent_date', label: 'fltb.fHamlogSentDate', type: 'adifdate' },
{ value: 'hamlog_rcvd', label: 'fltb.fHamlogRcvd', type: 'text' },
{ value: 'hamlog_rcvd_date', label: 'fltb.fHamlogRcvdDate', type: 'adifdate' },
{ value: 'contest_id', label: 'fltb.fContestId', type: 'text' },
{ value: 'srx', label: 'fltb.fSerialRcvd', type: 'number' },
{ value: 'stx', label: 'fltb.fSerialSent', type: 'number' },
@@ -192,6 +200,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 +218,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 +355,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>
+78
View File
@@ -8,6 +8,7 @@ import {
GetTunerGeniusStatus, GetTunerGeniusSettings,
GetAmpStatuses, AmpOperate, AmpPower, AmpPowerLevel,
FlexSetAGCMode, FlexSetAGCThreshold, FlexSetAudioLevel, FlexSetMute, FlexSetRXAntenna, FlexSetTXAntenna, FlexSetSplit, FlexSetActiveSlice, FlexSetTXSlice,
GetFlexRSTChase, SaveFlexRSTChase, SetFlexRSTChaseEnabled,
FlexSetRIT, FlexSetRITFreq, FlexSetXIT, FlexSetXITFreq,
FlexSetNB, FlexSetNBLevel, FlexSetNR, FlexSetNRLevel, FlexSetANF, FlexSetANFLevel,
FlexSetLMSNR, FlexSetLMSNRLevel, FlexSetLMSANF, FlexSetLMSANFLevel,
@@ -304,6 +305,25 @@ function powerLevelLabel(pl?: string): string {
// host can keep the WinKeyer (which actually sends the macros) in sync.
export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number) => void; onReportRST?: (rst: string) => void } = {}) {
const { t } = useI18n();
// Split-pile-up chaser (see flexrstchase.go). Held here so the button can
// paint its state without polling the backend for it.
const [rstChase, setRstChase] = useState<{ enabled: boolean; markers: string; offset_hz: number; split_only: boolean }>(
{ enabled: false, markers: '599', offset_hz: 0, split_only: true });
const [rstChaseOffsetText, setRstChaseOffsetText] = useState('0');
// The marker text is edited as raw text and only parsed on blur: it is a
// comma-separated list, and normalising it on every keystroke would eat the
// comma the moment it is typed.
const [rstChaseMarkersText, setRstChaseMarkersText] = useState('599');
// The marker field is summoned by right-clicking the button, not parked on
// the row: it is set once to agree with SDC and then never touched, while the
// row it was sitting in is the busiest in the panel.
const [rstChaseEditing, setRstChaseEditing] = useState(false);
useEffect(() => {
GetFlexRSTChase().then((c: any) => {
if (!c) return;
setRstChase(c); setRstChaseOffsetText(String(c.offset_hz ?? 0)); setRstChaseMarkersText(String(c.markers ?? '599'));
}).catch(() => {});
}, []);
const [st, setSt] = useState<FlexState>(ZERO);
// Extra/"advanced" DSP rows (WNB + the SmartSDR v4 NRL/NRS/NRF/ANFL/AI-FFT
// block) collapse behind a button so the RECEIVE card doesn't grow tall — only
@@ -652,6 +672,64 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
st.split ? 'bg-info text-info-foreground border-info shadow-[0_0_12px] shadow-info/50' : 'bg-card text-info border-info hover:bg-info-muted')}>
SPLIT
</button>
{/* The split chaser. On the panel and not in a settings page:
it is switched on when a DXpedition appears and off when it is
in the log, which is done mid-QSO with one hand. The offset
sits beside it because it is the one number retuned while
chasing — everything else about the feature is configured once. */}
{/* CW ONLY. The marker comes from a skimmer decoding a CW report,
so on SSB or FT8 there is nothing to chase — and a switch that
cannot fire is an invitation to wonder why it does nothing. */}
{isCW && (<>
<button type="button" disabled={off}
title={t('flxp.rstChaseHint', { m: rstChase.markers })}
onContextMenu={(e) => { e.preventDefault(); setRstChaseEditing(true); }}
onClick={() => { const on = !rstChase.enabled; setRstChase({ ...rstChase, enabled: on }); SetFlexRSTChaseEnabled(on).catch(() => {}); }}
className={cn('px-3 py-1.5 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
rstChase.enabled ? 'bg-success text-success-foreground border-success shadow-[0_0_12px] shadow-success/50' : 'bg-card text-success border-success hover:bg-success-muted')}>
{rstChase.markers.split(',')[0].trim() || '599'}
</button>
{/* The marker is whatever SDC was told to write — "599", "5NN", or
several. It has to agree with the skimmer or nothing ever fires,
so it is edited here rather than in a settings page — but only
when asked for, since it is set once and then left alone. */}
{rstChaseEditing && (
<input type="text" autoFocus value={rstChaseMarkersText}
onChange={(e) => setRstChaseMarkersText(e.target.value)}
onKeyDown={(e) => {
if (e.key === 'Enter') (e.target as HTMLInputElement).blur();
if (e.key === 'Escape') { setRstChaseMarkersText(rstChase.markers); setRstChaseEditing(false); }
}}
onBlur={() => {
const v = rstChaseMarkersText.trim() || '599';
setRstChaseMarkersText(v);
setRstChaseEditing(false);
if (v === rstChase.markers) return;
const next = { ...rstChase, markers: v };
setRstChase(next); SaveFlexRSTChase(next as any).catch(() => {});
}}
title={t('flxp.rstChaseMarkerHint')}
className="w-16 h-6 rounded border border-input bg-background px-1 text-[11px] font-mono uppercase" />
)}
{rstChase.enabled && (
<label className="flex items-center gap-1 text-[11px] text-muted-foreground whitespace-nowrap ml-2">
{t('flxp.rstChaseOffset')}
<input type="number" step={10} value={rstChaseOffsetText}
onChange={(e) => setRstChaseOffsetText(e.target.value)}
onBlur={() => {
// Kept as text while typing: normalising every keystroke
// makes a minus sign impossible to enter.
const n = Math.round(Number(rstChaseOffsetText));
const v = Number.isFinite(n) ? n : 0;
setRstChaseOffsetText(String(v));
const next = { ...rstChase, offset_hz: v };
setRstChase(next); SaveFlexRSTChase(next as any).catch(() => {});
}}
className="w-16 h-6 rounded border border-input bg-background px-1.5 text-[11px] font-mono" />
Hz
</label>
)}
</>)}
{st.split && !!st.tx_freq_hz && (
<span className="text-[11px] font-mono text-muted-foreground whitespace-nowrap">
TX {(st.tx_freq_hz / 1e6).toFixed(3)}
+4 -1
View File
@@ -366,7 +366,10 @@ export function WorldMap({ fromGrid, toGrid, fromLabel, toLabel, beamAzimuths, b
<div className="relative isolate h-full w-full rounded-lg overflow-hidden border border-border">
<div ref={worldRef} className="absolute inset-0" />
{/* Basemap picker — Light / Street / Satellite (key-free tiles). */}
<div className="absolute top-1 left-12 z-[500] flex rounded-md overflow-hidden shadow border border-border backdrop-blur">
{/* Clear of the zoom buttons, not merely next to them: at left-12 the
first basemap sat a few pixels from the button and operators kept
hitting Light when they meant to zoom out. */}
<div className="absolute top-1 left-[4.5rem] z-[500] flex rounded-md overflow-hidden shadow border border-border backdrop-blur">
{(Object.keys(BASEMAPS) as BasemapKey[]).map((k) => (
<button
key={k}
+72 -2
View File
@@ -8,7 +8,7 @@ import {
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
} from '@/components/ui/select';
import { cn } from '@/lib/utils';
import { FindQSOsForUpload, UploadQSOsManual, DownloadConfirmations, CancelConfirmations, SyncPOTAHunterLog, ListQSO, BulkUpdateQSL, UploadCallsign, GetSlotStats } from '../../wailsjs/go/main/App';
import { FindQSOsForUpload, UploadQSOsManual, DownloadConfirmations, CancelConfirmations, ImportHamlogConfirmations, ExportHamlogUnmatched, OpenADIFFile, SaveADIFFile, SyncPOTAHunterLog, ListQSO, BulkUpdateQSL, UploadCallsign, GetSlotStats } from '../../wailsjs/go/main/App';
import { Input } from '@/components/ui/input';
import { RecentQSOsGrid } from '@/components/RecentQSOsGrid';
import { EventsOn } from '../../wailsjs/runtime/runtime';
@@ -41,6 +41,7 @@ const SERVICES = [
{ v: 'hrdlog', label: 'HRDLog.net' },
{ v: 'eqsl', label: 'eQSL.cc' },
{ v: 'lotw', label: 'LoTW' },
{ v: 'hamlog', label: 'HAMLOG.online' },
{ v: 'pota', label: 'POTA hunter log' },
{ v: 'paper', label: 'Paper QSL' },
];
@@ -134,9 +135,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 +204,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;
@@ -323,6 +350,34 @@ export function QSLManagerPanel({ onEditQSO, actions }: {
catch (e: any) { setLogLines((p) => [...p, 'Error: ' + String(e?.message ?? e)]); setBusy(false); }
}
// HAMLOG.online has no download verb — their agent protocol only uploads —
// so confirmations come back as an ADIF exported from their site. It is read
// here rather than through the ordinary ADIF import because that one matches
// on the UTC minute and INSERTS whatever fails to match: a few hundred copies
// of contacts already in the log. This path only ever stamps QSOs it finds.
async function importHamlogCfm() {
const path = await OpenADIFFile();
if (!path) return;
setLogLines([]); setBusy(true); setLogAction('download'); setShowLog(true);
try { await ImportHamlogConfirmations(path); }
catch (e: any) { setLogLines((p) => [...p, 'Error: ' + String(e?.message ?? e)]); setBusy(false); }
}
// The unmatched half of an import. Offered as a file because a few hundred
// discrepancies are a list to work through, not something to read in a log
// window.
async function exportHamlogUnmatched() {
try {
const path = await SaveADIFFile();
if (!path) return;
const n = await ExportHamlogUnmatched(path);
setLogLines((p) => [...p, `Exported ${n} unmatched confirmation(s) → ${path}`]);
setShowLog(true);
} catch (e: any) {
setLogLines((p) => [...p, 'Error: ' + String(e?.message ?? e)]); setShowLog(true);
}
}
function viewResults() {
setShowLog(false);
if (logAction === 'upload') selectRequired();
@@ -639,11 +694,25 @@ export function QSLManagerPanel({ onEditQSO, actions }: {
{service !== 'pota' && service !== 'paper' && (
<div className="flex items-center justify-between gap-2 px-3 py-2 border-t border-border bg-muted/20 shrink-0">
<div className="flex items-center gap-2 flex-wrap">
{service === 'hamlog' ? (
<>
<Button variant="outline" size="sm" onClick={importHamlogCfm} disabled={busy}
title={t('qslm.hamlogImportTitle')}>
<DownloadCloud className="size-3.5" /> {t('qslm.hamlogImportCfm')}
</Button>
<Button variant="outline" size="sm" onClick={exportHamlogUnmatched} disabled={busy}
title={t('qslm.hamlogUnmatchedTitle')}>
<UploadCloud className="size-3.5 rotate-180" /> {t('qslm.hamlogUnmatched')}
</Button>
</>
) : (
<Button variant="outline" size="sm" onClick={download} disabled={busy}
title={t('qslm.downloadTitle')}>
<DownloadCloud className="size-3.5" /> {t('qslm.downloadConf')}
</Button>
)}
{/* Date window */}
{service !== 'hamlog' && (<>
<Select value={sinceMode} onValueChange={(v) => setSinceMode(v as any)}>
<SelectTrigger className="h-8 w-[150px] text-xs" title={t('qslm.downloadRangeTitle')}>
<SelectValue />
@@ -667,6 +736,7 @@ export function QSLManagerPanel({ onEditQSO, actions }: {
<Checkbox checked={addNotFound} onCheckedChange={(c) => setAddNotFound(!!c)} />
{t('qslm.addNotFound')}
</label>
</>)}
</div>
<Button size="sm" onClick={upload} disabled={selectedCount === 0 || busy}>
<UploadCloud className="size-3.5" /> {t('qslm.uploadTo', { n: selectedCount, service: serviceLabel })}
+28 -1
View File
@@ -18,8 +18,11 @@ type Props = {
onSendEQSL?: (ids: number[]) => void;
onBulkEdit?: (ids: number[]) => void;
onExportSelected?: (ids: number[]) => void;
// Same rows, but keeping the APP_OPSLOG_* tags — award references above all.
onExportSelectedFull?: (ids: number[]) => void;
onExportSelectedFields?: (ids: number[]) => void;
onExportFiltered?: () => void;
onExportFilteredFull?: () => void;
onExportCabrilloSelected?: (ids: number[]) => void;
onExportCabrilloFiltered?: () => void;
onDelete?: (ids: number[]) => void;
@@ -31,6 +34,7 @@ const UPLOAD_TARGETS: { service: string; name: string }[] = [
{ service: 'hrdlog', name: 'HRDLog.net' },
{ service: 'eqsl', name: 'eQSL.cc' },
{ service: 'lotw', name: 'LoTW' },
{ service: 'hamlog', name: 'HAMLOG.online' },
];
// Lightweight right-click menu for the QSO grids. AG Grid's native context
@@ -39,7 +43,7 @@ const UPLOAD_TARGETS: { service: string; name: string }[] = [
// or picks a command. (We deliberately do NOT close on scroll/resize: the QSO
// list auto-refreshes and AG Grid fires internal scroll events on refresh,
// which used to dismiss the menu the instant it appeared.)
export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete }: Props) {
export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFull, onExportSelectedFields, onExportFiltered, onExportFilteredFull, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete }: Props) {
const { t } = useI18n();
const boxRef = useRef<HTMLDivElement>(null);
// Starts at the cursor; the layout effect corrects it once the real size is
@@ -189,6 +193,20 @@ export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ
<span>{t('qctx.exportSelectedAdif', { n })}</span>
</button>
)}
{/* The same rows WITH the OpsLog fields.
The export above is standard ADIF — what another logger should be
given — and it drops every APP_ tag, award references included. A
backup, or a move to another OpsLog, needs them: RDA@KR-04 lives in
APP_OPSLOG_AWARDREFS and nowhere else. */}
{onExportSelectedFull && (
<button
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
onClick={() => { onExportSelectedFull(menu.ids); onClose(); }}
>
<FileDown className="size-4 text-info" />
<span>{t('qctx.exportSelectedAdifFull', { n })}</span>
</button>
)}
{onExportSelectedFields && (
<button
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
@@ -207,6 +225,15 @@ export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ
<span>{t('qctx.exportFilteredAdif')}</span>
</button>
)}
{onExportFilteredFull && (
<button
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
onClick={() => { onExportFilteredFull(); onClose(); }}
>
<FileDown className="size-4 text-info" />
<span>{t('qctx.exportFilteredAdifFull')}</span>
</button>
)}
{onExportCabrilloSelected && (
<button
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
+49 -2
View File
@@ -85,6 +85,19 @@ const CONF_LABEL_KEYS: Record<string, string> = {
// the channel picker and the status table alongside the rest.
const OPSLOG_CONF = 'OPSLOG';
// HAMLOG.online. Out of CONFIRMATIONS for the same reason as the OpsLog card —
// it is stored in the ADIF extras, not in QSO columns — but it is an upload
// service like QRZ.com or Club Log, so it gets the ordinary sent/received/date
// editor rather than a special one. The received key is THEIR field name, the
// one their ADIF export writes; see award.HamlogQSLKey.
const HAMLOG_CONF = 'HAMLOG';
const HAMLOG_KEYS = {
sent: 'APP_OPSLOG_HAMLOG_SENT',
sentDate: 'APP_OPSLOG_HAMLOG_SENT_DATE',
rcvd: 'APP_HAMLOG_QSO_CFM',
rcvdDate: 'APP_OPSLOG_HAMLOG_QSL_DATE',
};
// Colour-coded status cell for the confirmation grid.
function StatusCell({ value }: { value?: string }) {
const { t } = useI18n();
@@ -626,6 +639,7 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
</div>
<div className="flex items-end gap-2">
<div className="flex flex-col flex-1"><Label>{t('qedit.grid')}</Label><Input value={draft.grid ?? ''} onChange={(e) => set('grid', e.target.value)} className="font-mono uppercase" /></div>
<div className="flex flex-col w-24"><Label>{t('qedit.gridExt')}</Label><Input title={t('qedit.gridExtTip')} value={draft.gridsquare_ext ?? ''} onChange={(e) => set('gridsquare_ext', e.target.value)} className="font-mono uppercase" /></div>
<div className="flex flex-col w-24"><Label>PFX</Label><Input readOnly value={pfxOf(draft.callsign ?? '')} className="font-mono bg-muted/40" /></div>
</div>
<div><Label>{t('qedit.comment')}</Label><Input value={draft.comment ?? ''} onChange={(e) => set('comment', e.target.value)}
@@ -714,6 +728,16 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
const def = CONFIRMATIONS.find((c) => c.key === confSel) ?? CONFIRMATIONS[0];
const val = (k?: keyof QSOForm) => (k ? ((draft as any)[k] ?? '') : '');
const put = (k: keyof QSOForm | undefined, v: any) => { if (k) (set as any)(k, v); };
// The extras-backed channel reads and writes the same way, one
// level down. Save merges the extras rather than replacing them,
// so an emptied field keeps its stored value — which is why the
// statuses are written as explicit Y/N and never removed.
const exVal = (k: string) => String(draft.extras?.[k] ?? '');
const exPut = (k: string, v: any) => {
const next = { ...(draft.extras ?? {}) };
next[k] = String(v ?? '');
set('extras', next as any);
};
return (
<div className="flex gap-6">
{/* Left: edit one confirmation channel at a time */}
@@ -730,11 +754,24 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
generic sent/received/date grid, which has no field
to bind to. */}
<SelectItem value={OPSLOG_CONF}>{t('qedit.confOpsLog')}</SelectItem>
<SelectItem value={HAMLOG_CONF}>HAMLOG.online</SelectItem>
</SelectContent>
</Select>
</div>
{confSel === OPSLOG_CONF ? (
{confSel === HAMLOG_CONF ? (
<>
<div className="grid grid-cols-2 gap-3">
<div><Label>{t('qedit.sent')}</Label><QslSelect value={exVal(HAMLOG_KEYS.sent)} onChange={(v) => exPut(HAMLOG_KEYS.sent, v)} /></div>
<div><Label>{t('qedit.received')}</Label><QslSelect value={exVal(HAMLOG_KEYS.rcvd)} onChange={(v) => exPut(HAMLOG_KEYS.rcvd, v)} /></div>
<div><Label>{t('qedit.dateSent')}</Label><AdifDateInput value={exVal(HAMLOG_KEYS.sentDate)} onChange={(v) => exPut(HAMLOG_KEYS.sentDate, v)} /></div>
<div><Label>{t('qedit.dateReceived')}</Label><AdifDateInput value={exVal(HAMLOG_KEYS.rcvdDate)} onChange={(v) => exPut(HAMLOG_KEYS.rcvdDate, v)} /></div>
</div>
<p className="text-[11px] text-muted-foreground">
{t('qedit.qslPanelHint')} <strong>{t('qedit.saveChanges')}</strong>.
</p>
</>
) : confSel === OPSLOG_CONF ? (
/* OpsLog's own card. "Sent" is stamped when the card
actually goes out, so it is shown, not offered: ticking
it by hand would record something that never happened.
@@ -826,6 +863,12 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
<td className="w-24"><StatusCell value={opslogQslSent ? 'Y' : 'N'} /></td>
<td className="w-24"><StatusCell value={qslReceived ? 'Y' : 'N'} /></td>
</tr>
{/* HAMLOG.online — extras again, same hand-written row. */}
<tr className="text-xs">
<td className="font-medium pr-3 py-0.5 whitespace-nowrap">HAMLOG.online</td>
<td className="w-24"><StatusCell value={exVal(HAMLOG_KEYS.sent)} /></td>
<td className="w-24"><StatusCell value={exVal(HAMLOG_KEYS.rcvd)} /></td>
</tr>
</tbody>
</table>
</div>
@@ -867,7 +910,7 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
<F label={t('qedit.stationCallsign')} span={3}><Input value={draft.station_callsign ?? ''} onChange={(e) => set('station_callsign', e.target.value)} /></F>
<F label={t('qedit.operator')} span={3}><Input value={draft.operator ?? ''} onChange={(e) => set('operator', e.target.value)} /></F>
<F label={t('qedit.myGrid')}><Input value={draft.my_grid ?? ''} onChange={(e) => set('my_grid', e.target.value)} /></F>
<F label={t('qedit.gridExt')}><Input value={draft.my_gridsquare_ext ?? ''} onChange={(e) => set('my_gridsquare_ext', e.target.value)} /></F>
<F label={t('qedit.myGridExt')}><Input title={t('qedit.gridExtTip')} value={draft.my_gridsquare_ext ?? ''} onChange={(e) => set('my_gridsquare_ext', e.target.value)} /></F>
<F label={t('qedit.country')} span={2}><Combobox value={draft.my_country ?? ''} options={countries} placeholder={t('qedit.country')} onChange={(v) => set('my_country', v)} /></F>
<F label={t('qedit.state')}><Input value={draft.my_state ?? ''} onChange={(e) => set('my_state', e.target.value)} /></F>
<F label={t('qedit.county')}><Input value={draft.my_cnty ?? ''} onChange={(e) => set('my_cnty', e.target.value)} /></F>
@@ -903,6 +946,10 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
<div>
<p className="text-[11px] font-semibold text-muted-foreground uppercase tracking-wider mb-2">{t('qedit.powerWeather')}</p>
<div className="grid grid-cols-6 gap-3">
{/* YOUR power first, then theirs. tx_pwr was saved by this
editor but had no field: a contact logged at the wrong
power could be read back and never corrected. */}
<F label={t('qedit.txPower')}><Input type="number" value={draft.tx_pwr ?? ''} onChange={(e) => set('tx_pwr', numOrUndef(e.target.value) as any)} /></F>
<F label={t('qedit.rxPower')}><Input type="number" value={draft.rx_pwr ?? ''} onChange={(e) => set('rx_pwr', numOrUndef(e.target.value) as any)} /></F>
<F label={t('qedit.distance')}><Input type="number" value={draft.distance ?? ''} onChange={(e) => set('distance', numOrUndef(e.target.value) as any)} /></F>
<F label={t('qedit.aIndex')}><Input type="number" value={draft.a_index ?? ''} onChange={(e) => set('a_index', numOrUndef(e.target.value) as any)} /></F>
+13 -1
View File
@@ -70,8 +70,10 @@ type Props = {
onSendEQSL?: (ids: number[]) => void;
onBulkEdit?: (ids: number[]) => void;
onExportSelected?: (ids: number[]) => void;
onExportSelectedFull?: (ids: number[]) => void;
onExportSelectedFields?: (ids: number[]) => void;
onExportFiltered?: () => void;
onExportFilteredFull?: () => void;
onExportCabrilloSelected?: (ids: number[]) => void;
onExportCabrilloFiltered?: () => void;
onDelete?: (ids: number[]) => void;
@@ -207,6 +209,14 @@ export const makeColCatalog = (t: TFn, myGrid?: string): ColEntry[] => [
{ group: 'QSL', label: t('rqg.c.opslog_qsl_card_sent'), colId: 'opslog_qsl_card_sent', headerName: t('rqg.c.opslog_qsl_card_sent'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return (e['APP_OPSLOG_QSL_SENT'] || e['APP_OPSLOG_QSL_CARD_SENT']) ? 'Y' : 'N'; }, defaultVisible: true },
// App-specific: operator marked a QSL as RECEIVED for this QSO (drives PSE/TNX).
{ group: 'QSL', label: t('rqg.c.opslog_qsl_card_rcvd'), colId: 'opslog_qsl_card_rcvd', headerName: t('rqg.c.opslog_qsl_card_rcvd'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_OPSLOG_QSL_RCVD'] ? 'Y' : 'N'; }, defaultVisible: false },
// HAMLOG.online. No promoted column — the ADIF standard names a field for
// hamlog.EU and none for hamlog.ONLINE — so these read the extras, exactly
// like the OpsLog card columns above. Hidden by default: a column per
// service, shown to everyone, is how a grid becomes unreadable.
{ group: 'Uploads', label: t('rqg.c.hamlog_sent'), colId: 'hamlog_sent', headerName: t('rqg.h.hamlog_sent'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_OPSLOG_HAMLOG_SENT'] || 'N'; }, defaultVisible: false },
{ group: 'Uploads', label: t('rqg.c.hamlog_sent_date'), colId: 'hamlog_sent_date', headerName: t('rqg.h.hamlog_sent_date'), width: 110, valueGetter: (p) => fmtDateOnly((p.data as any)?.extras?.['APP_OPSLOG_HAMLOG_SENT_DATE']), defaultVisible: false },
{ group: 'Uploads', label: t('rqg.c.hamlog_rcvd'), colId: 'hamlog_rcvd', headerName: t('rqg.h.hamlog_rcvd'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_HAMLOG_QSO_CFM'] || e['APP_OPSLOG_HAMLOG_QSL'] || 'N'; }, defaultVisible: false },
{ group: 'Uploads', label: t('rqg.c.hamlog_rcvd_date'), colId: 'hamlog_rcvd_date', headerName: t('rqg.h.hamlog_rcvd_date'), width: 110, valueGetter: (p) => fmtDateOnly((p.data as any)?.extras?.['APP_OPSLOG_HAMLOG_QSL_DATE']), defaultVisible: false },
// App-specific: when the QSO's audio recording was e-mailed to the station.
{ group: 'QSL', label: t('rqg.c.opslog_recording_sent'), colId: 'opslog_recording_sent', headerName: t('rqg.h.opslog_recording_sent'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_OPSLOG_RECORDING_SENT'] ? 'Y' : 'N'; }, defaultVisible: false },
@@ -309,7 +319,7 @@ const sanitizeAwardCols = (st: any[] | null | undefined): any[] =>
return rest;
});
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols, rowColors }: Props) {
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFull, onExportSelectedFields, onExportFiltered, onExportFilteredFull, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols, rowColors }: Props) {
const { t } = useI18n();
const gridRef = useRef<any>(null);
const [pickerOpen, setPickerOpen] = useState(false);
@@ -741,8 +751,10 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
onSendEQSL={onSendEQSL}
onBulkEdit={onBulkEdit}
onExportSelected={onExportSelected}
onExportSelectedFull={onExportSelectedFull}
onExportSelectedFields={onExportSelectedFields}
onExportFiltered={onExportFiltered}
onExportFilteredFull={onExportFilteredFull}
onExportCabrilloSelected={onExportCabrilloSelected}
onExportCabrilloFiltered={onExportCabrilloFiltered}
onDelete={onDelete}
+442 -139
View File
@@ -4,6 +4,7 @@ import {
ChevronDown, ChevronRight,
User, Database, Radio, Cog, Server, Antenna as AntennaIcon,
Compass, Wifi, Construction, UploadCloud, Loader2, FolderOpen, Play, Power, Check, Pencil,
Minimize2,
} from 'lucide-react';
import {
GetLookupSettings, SaveLookupSettings, ClearLookupCache, TestLookupProvider,
@@ -12,7 +13,7 @@ import {
ListProfiles, GetActiveProfile, SaveProfile, DeleteProfile, ActivateProfile, DuplicateProfile,
GetRotators, SaveRotators, TestRotatorDevice, RotatorPark, RotatorStop,
GetRotorPresets, SaveRotorPresets, ResetRotorPresets,
GetUltrabeamSettings, SaveUltrabeamSettings, TestUltrabeam,
GetUltrabeamSettings, SaveUltrabeamSettings, TestUltrabeam, CompactDatabase, CheckHamlogKey, CompareRDASources,
GetAntGeniusSettings, SaveAntGeniusSettings,
GetTunerGeniusSettings, SaveTunerGeniusSettings,
GetPSUSettings, SavePSUSettings,
@@ -49,6 +50,7 @@ import {
GetScpStatus, SetScpEnabled, DownloadScp,
DownloadULSCounties, ULSStatus, BackfillUSCounties, BackfillRDA, RDADatabaseCount,
GetCtyDatInfo, RefreshCtyDat, GetAwardReferenceMeta, UpdateAwardReferenceList,
GetSpotColors, SaveSpotColors, ResetSpotColors, GetFlexZoom, SaveFlexZoom,
ComputeStationInfo,
GetUIPref, SetUIPref,
GetFlexState, GetFlexBandAntennas, SaveFlexBandAntennas, GetFlexBandPower, SaveFlexBandPower,
@@ -56,12 +58,12 @@ import {
GetFolderSync, SaveFolderSync, PickFolderSyncFolder, GetFolderSyncStatus, SyncFolderNow,
GetRelayAuto, SaveRelayAuto, GetStationDevices,
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
GetBandOpenSettings, SaveBandOpenSettings, GetGridScopeSettings, SaveGridScopeSettings, GetPSKReporterStatus, GetChaseNewGrids, SetChaseNewGrids, GetChaseNew, SetChaseNew, GetGridCacheStatus, GetLinkedAmps, SetLinkedAmps, GetSpotTTLMinutes, SetSpotTTLMinutes,
GetBandOpenSettings, SaveBandOpenSettings, GetGridScopeSettings, SaveGridScopeSettings, GetPSKReporterStatus, GetChaseNewGrids, SetChaseNewGrids, GetChaseNew, SetChaseNew, GetGridCacheStatus, GetLinkedAmps, SetLinkedAmps, GetSpotTTLMinutes, SetSpotTTLMinutes, GetSpotMax, SetSpotMax,
} from '../../wailsjs/go/main/App';
import type { profile as profileModels } from '../../wailsjs/go/models';
import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
import type { main as mainModels, cluster as clusterModels } from '../../wailsjs/go/models';
import { EventsOn } from '../../wailsjs/runtime/runtime';
import { EventsOn, BrowserOpenURL } from '../../wailsjs/runtime/runtime';
import {
Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter, DialogDescription,
@@ -78,7 +80,6 @@ import {
} from '@/components/ui/select';
import { cn } from '@/lib/utils';
import { writeUiPref } from '@/lib/uiPref';
import { loadAutoCall, autoCallKey, type AutoCallSettings, type AutoCallCriteria } from '@/lib/autocall';
import { getDateFormat, setDateFormat, type DateFormat } from '@/lib/dateFormat';
import { useI18n, FlagGB, FlagFR, type Lang } from '@/lib/i18n';
import { useTheme, CONCRETE_THEMES, type ThemeChoice } from '@/lib/theme';
@@ -207,7 +208,6 @@ type SectionId =
| 'databases'
| 'awards'
| 'cat'
| 'ftx'
| 'rotator'
| 'winkeyer'
| 'antenna'
@@ -312,7 +312,6 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
{ kind: 'item', label: t('sec.modes'), id: 'lists-modes' },
]},
{ kind: 'item', label: t('sec.cluster'), id: 'cluster' },
{ kind: 'item', label: t('sec.ftx'), id: 'ftx' },
{ kind: 'item', label: t('sec.udp'), id: 'udp' },
{ kind: 'item', label: t('sec.adifmon'), id: 'adifmon' },
{ kind: 'item', label: t('sec.foldersync'), id: 'foldersync' },
@@ -341,7 +340,7 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
const SECTION_KEY: Partial<Record<SectionId, string>> = {
station: 'sec.station', profiles: 'sec.profiles', operating: 'sec.operating', confirmations: 'sec.confirmations',
'external-services': 'sec.external', appearance: 'sec.appearance', lookup: 'sec.lookup', 'lists-bands': 'sec.bands', 'lists-modes': 'sec.modes',
cluster: 'sec.cluster', ftx: 'sec.ftx', backup: 'sec.backup', database: 'sec.database', autostart: 'sec.autostart', udp: 'sec.udp',
cluster: 'sec.cluster', backup: 'sec.backup', database: 'sec.database', autostart: 'sec.autostart', udp: 'sec.udp',
adifmon: 'sec.adifmon',
foldersync: 'sec.foldersync',
webpublish: 'sec.webpublish',
@@ -1283,6 +1282,54 @@ function ComingSoon({ id, icon: Icon }: { id: SectionId; icon?: any }) {
);
}
// The panadapter statuses, in the order the cluster ranks them: most wanted
// first, then the markers that are orthogonal to the entity, then the two
// "nothing here" cases. Must match spotColorOrder in spotcolors.go — the Go side
// is the authority, this list only decides the order of the rows.
const SPOT_COLOR_ROWS = [
'new', 'new-band-mode', 'new-band', 'new-mode', 'new-slot',
'new-pota', 'new-county', 'new-pfx',
'my-call', 'worked', 'none',
];
// SmartSDR colours are #AARRGGBB — the alpha FIRST, which is not what CSS or an
// <input type="color"> expects. These two convert between the radio's order and
// the browser's, so the operator picks a colour in a normal picker and the radio
// gets what it understands.
function argbToCss(argb?: string): string {
const v = (argb ?? '').trim();
if (!/^#[0-9a-fA-F]{8}$/.test(v)) return '';
return `#${v.slice(3)}${v.slice(1, 3)}`; // #AARRGGBB → #RRGGBBAA
}
function cssToArgb(rgb: string, alpha: string): string {
const v = (rgb || '#000000').trim();
if (!/^#[0-9a-fA-F]{6}$/.test(v)) return '';
return `#${alpha}${v.slice(1)}`.toUpperCase();
}
// ArgbInput edits one #AARRGGBB value as what it really is: a colour and an
// opacity. A single text field would be asking an operator to type eight hex
// digits in an order no other program uses.
function ArgbInput({ label, value, onChange }: { label: string; value: string; onChange: (v: string) => void }) {
const valid = /^#[0-9a-fA-F]{8}$/.test((value ?? '').trim());
const alpha = valid ? value.slice(1, 3).toUpperCase() : 'FF';
const rgb = valid ? `#${value.slice(3)}` : '#808080';
return (
<span className="flex items-center gap-1 shrink-0" title={label}>
<input type="color" value={rgb}
onChange={(e) => onChange(cssToArgb(e.target.value, alpha))}
className="size-6 rounded border border-border bg-transparent p-0 cursor-pointer" />
<select value={alpha}
onChange={(e) => onChange(cssToArgb(rgb, e.target.value))}
className="h-6 rounded border border-border bg-background text-[10px] px-0.5">
{[['FF', '100%'], ['C0', '75%'], ['80', '50%'], ['40', '25%'], ['20', '12%'], ['00', 'off']].map(([a, l]) => (
<option key={a} value={a}>{l}</option>
))}
</select>
</span>
);
}
// FlexBandPanel — everything that follows the band, in ONE row per band:
// antennas and TX power.
//
@@ -1660,6 +1707,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
eqsl_sent: string; eqsl_rcvd: string;
clublog_status: string; hrdlog_status: string; qrzcom_status: string;
qrzcom_confirmed: string;
hamlog_status: string; hamlog_confirmed: string;
};
const [qslDefaults, setQslDefaults] = useState<QSLDefaults>({
qsl_sent: '', qsl_rcvd: '',
@@ -1667,6 +1715,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
eqsl_sent: '', eqsl_rcvd: '',
clublog_status: '', hrdlog_status: '', qrzcom_status: '',
qrzcom_confirmed: '',
hamlog_status: '', hamlog_confirmed: '',
});
// External services (logbook upload). One block per service; only QRZ is
@@ -1682,7 +1731,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
// HRDLog only: publish the live frequency/mode/rig on hrdlog.net.
on_air?: boolean;
};
type ExternalServices = { qrz: ExtServiceCfg; clublog: ExtServiceCfg; lotw: ExtServiceCfg; hrdlog: ExtServiceCfg; eqsl: ExtServiceCfg; cloudlog: ExtServiceCfg; delete_remote?: boolean };
type ExternalServices = { qrz: ExtServiceCfg; clublog: ExtServiceCfg; lotw: ExtServiceCfg; hrdlog: ExtServiceCfg; eqsl: ExtServiceCfg; cloudlog: ExtServiceCfg; hamlog: ExtServiceCfg; delete_remote?: boolean };
const emptyExtCfg = (): ExtServiceCfg => ({
api_key: '', url: '', station_id: '', email: '', username: '', password: '', callsign: '', code: '', qth_nickname: '',
force_station_callsign: '', tqsl_path: '', station_location: '', key_password: '',
@@ -1690,7 +1739,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
auto_upload: false, upload_mode: 'immediate', on_air: false,
});
const [extSvc, setExtSvc] = useState<ExternalServices>({
qrz: emptyExtCfg(), clublog: emptyExtCfg(), lotw: emptyExtCfg(), hrdlog: emptyExtCfg(), eqsl: emptyExtCfg(), cloudlog: emptyExtCfg(), delete_remote: false,
qrz: emptyExtCfg(), clublog: emptyExtCfg(), lotw: emptyExtCfg(), hrdlog: emptyExtCfg(), eqsl: emptyExtCfg(), cloudlog: emptyExtCfg(), hamlog: emptyExtCfg(), delete_remote: false,
});
const [qrzTest, setQrzTest] = useState<{ ok: boolean; msg: string } | null>(null);
const [qrzTesting, setQrzTesting] = useState(false);
@@ -1747,6 +1796,26 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
};
// cty.dat is not downloaded by OpsLog — it is shipped and reloaded from disk —
// so the page reports it rather than offering a button it cannot honour.
// Panadapter spot palette. Saved on its own — it is a table of colours, not a
// form: waiting for the modal's Save to see a colour on the waterfall would
// make picking one a guessing game.
type SpotColor = { text: string; bg?: string };
const [spotColors, setSpotColors] = useState<{ enabled: boolean; colors: Record<string, SpotColor & { hide?: boolean }> }>({ enabled: true, colors: {} });
useEffect(() => { GetSpotColors().then((c: any) => setSpotColors(c ?? { enabled: true, colors: {} })).catch(() => {}); }, []);
const saveSpotColors = (next: { enabled: boolean; colors: Record<string, SpotColor> }) => {
setSpotColors(next);
SaveSpotColors(next as any).catch(() => {});
};
const setSpotColor = (k: string, patch: Partial<SpotColor>) => saveSpotColors({
...spotColors,
colors: { ...spotColors.colors, [k]: { ...(spotColors.colors[k] ?? { text: '' }), ...patch } },
});
// Panadapter auto-zoom. Saved immediately for the same reason as the palette:
// the only way to judge a width is to click a spot and look at the radio.
const [flexZoom, setFlexZoom] = useState<{ enabled: boolean; cw_khz: number; ssb_khz: number; digi_khz: number; centre: boolean }>(
{ enabled: false, cw_khz: 25, ssb_khz: 200, digi_khz: 50, centre: false });
useEffect(() => { GetFlexZoom().then((z: any) => setFlexZoom(z)).catch(() => {}); }, []);
const saveFlexZoom = (next: typeof flexZoom) => { setFlexZoom(next); SaveFlexZoom(next as any).catch(() => {}); };
const [ctyInfo, setCtyInfo] = useState<{ entities: number; file_mod_time?: string }>({ entities: 0 });
const [ctyBusy, setCtyBusy] = useState(false);
useEffect(() => { GetCtyDatInfo().then((i) => setCtyInfo(i as any)).catch(() => {}); }, []);
@@ -1769,11 +1838,35 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
};
// A date for a person: the day, not the timestamp the backend stores.
const fmtDay = (v?: string) => (v ? String(v).slice(0, 10) : '—');
// Binary units, one decimal, because the point of showing a size here is to
// compare two of them: "412.7 MB → 38.4 MB" says what a bare byte count does not.
const fmtBytes = (n: number) => {
if (!n || n < 0) return '—';
const u = ['B', 'KB', 'MB', 'GB'];
let i = 0;
let v = n;
while (v >= 1024 && i < u.length - 1) { v /= 1024; i++; }
return `${i === 0 ? v : v.toFixed(1)} ${u[i]}`;
};
const [rdaCount, setRdaCount] = useState(0);
const [rdaBusy, setRdaBusy] = useState(false);
const [rdaUseCurrent, setRdaUseCurrent] = useState(true);
const [rdaMsg, setRdaMsg] = useState<string | null>(null);
useEffect(() => { RDADatabaseCount().then((n) => setRdaCount(Number(n) || 0)).catch(() => {}); }, []);
// Measuring the two sources against each other, before deciding which wins.
//
// Read-only on purpose: the question "is HAMLOG's district independent
// evidence or a copy of the same database?" has to be answered with the
// operator's own log, and answering it must not modify that log.
const [rdaCmp, setRdaCmp] = useState<any>(null);
const [rdaCmpBusy, setRdaCmpBusy] = useState(false);
const runRDACompare = async () => {
setRdaCmpBusy(true); setRdaCmp(null);
try { setRdaCmp(await CompareRDASources()); }
catch (e: any) { setRdaMsg(String(e?.message ?? e)); }
finally { setRdaCmpBusy(false); }
};
const runRDABackfill = async () => {
setRdaBusy(true); setRdaMsg(null);
try {
@@ -1794,6 +1887,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
const [hrdlogTesting, setHrdlogTesting] = useState(false);
const [cloudlogTest, setCloudlogTest] = useState<{ ok: boolean; msg: string } | null>(null);
const [cloudlogTesting, setCloudlogTesting] = useState(false);
const [hamlogTest, setHamlogTest] = useState<{ ok: boolean; msg: string } | null>(null);
const [hamlogTesting, setHamlogTesting] = useState(false);
const [eqslTest, setEqslTest] = useState<{ ok: boolean; msg: string } | null>(null);
const [eqslTesting, setEqslTesting] = useState(false);
const [stationLocations, setStationLocations] = useState<string[]>([]);
@@ -1801,7 +1896,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
// could not hold hooks at all; PanelHost lifted that restriction, and this
// stays put because moving it down would reset the tab on every reopen —
// a choice now, not a workaround.
const [extSvcTab, setExtSvcTab] = useState<'qrz' | 'clublog' | 'hrdlog' | 'eqsl' | 'lotw' | 'cloudlog' | 'pota'>('qrz');
const [extSvcTab, setExtSvcTab] = useState<'qrz' | 'clublog' | 'hrdlog' | 'eqsl' | 'lotw' | 'cloudlog' | 'hamlog' | 'pota'>('qrz');
// POTA hunter-log sync (stamps pota_ref on local QSOs from your pota.app log).
const [potaToken, setPotaToken] = useState('');
const [potaBusy, setPotaBusy] = useState(false);
@@ -1837,7 +1932,6 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
// feed up or down — so the write has to go where those live.
const [bandOpen, setBandOpen] = useState<any>({ enabled: false, bands: [], available: [] });
// How a worked square is matched, and what counts as still wanted.
const [autoCall, setAutoCall] = useState<AutoCallSettings>(loadAutoCall);
const [gridScope, setGridScope] = useState<any>({ scope: 'mix_digi', hunt: 'new', scopes: [] });
useEffect(() => { GetGridScopeSettings().then((g) => setGridScope(g as any)).catch(() => {}); }, []);
const saveGridScope = async (next: any) => {
@@ -1848,6 +1942,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
const [chaseNew, setChaseNew] = useState(false);
const [spotTTL, setSpotTTL] = useState(0);
const [spotTTLText, setSpotTTLText] = useState('0');
const [spotMaxText, setSpotMaxText] = useState('1000');
const [gridStat, setGridStat] = useState<any>(null);
const [pskrStatus, setPskrStatus] = useState<any>(null);
const saveBandOpen = async (next: any) => {
@@ -1861,6 +1956,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
try { setChaseNew(await GetChaseNew()); } catch { /* defaults stand */ }
try { setLinkedAmps((await GetLinkedAmps()) ?? []); } catch { /* defaults stand */ }
try { const n = await GetSpotTTLMinutes(); setSpotTTL(n); setSpotTTLText(String(n)); } catch { /* defaults stand */ }
try { const n = await GetSpotMax(); setSpotMaxText(String(n)); } catch { /* defaults stand */ }
})();
// Poll the feed while the panel is open: a live count is the only thing that
// distinguishes "connected" from "connected and receiving nothing".
@@ -2983,27 +3079,11 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<div className="col-span-2">
<FlexDiscover onPick={(ip, port) => setCatCfg((s) => ({ ...s, flex_host: ip, flex_port: port }))} />
</div>
<label className="col-span-2 flex items-center gap-2 text-sm cursor-pointer">
<Checkbox checked={!!catCfg.flex_spots} onCheckedChange={(c) => setCatCfg((s) => ({ ...s, flex_spots: !!c }))} />
{t('cat.flexSpots')} <span className="text-xs text-muted-foreground">{t('cat.flexSpotsHint')}</span>
</label>
<label className="col-span-2 flex items-center gap-2 text-sm cursor-pointer">
<Checkbox checked={!!catCfg.flex_decode_spots} onCheckedChange={(c) => setCatCfg((s) => ({ ...s, flex_decode_spots: !!c }))} />
{t('cat.flexDecodeSpots')} <span className="text-xs text-muted-foreground">{t('cat.flexDecodeSpotsHint')}</span>
</label>
{catCfg.flex_decode_spots && (
<div className="col-span-2 flex items-center gap-2 pl-6">
<Label className="text-sm">{t('cat.flexDecodeSecs')}</Label>
<Input type="number" className="w-24" min={10} max={3600}
value={catCfg.flex_decode_secs || 120}
onChange={(e) => setCatCfg((s) => ({ ...s, flex_decode_secs: parseInt(e.target.value) || 120 }))} />
<span className="text-xs text-muted-foreground">{t('cat.flexDecodeSecsHint')}</span>
</div>
)}
<label className="col-span-2 flex items-start gap-2 text-sm cursor-pointer">
<Checkbox className="mt-0.5" checked={!!catCfg.flex_dvk_dax} onCheckedChange={(c) => setCatCfg((s) => ({ ...s, flex_dvk_dax: !!c }))} />
<span>{t('cat.flexDvkDax')} <span className="text-xs text-muted-foreground">{t('cat.flexDvkDaxHint')}</span></span>
</label>
{/* What OpsLog DOES with a Flex panadapter spots, decode spots,
the DAX switch for voice messages moved to Settings
FlexRadio, with the per-band antennas and power. What stays
here is the link itself: an address and a port, which is what
this page is about for every other backend too. */}
</>
)}
{catCfg.backend === 'xiegu' && (
@@ -3480,7 +3560,10 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
function UltrabeamPanel() {
const isSteppir = ultrabeam.type === 'steppir';
const isSerial = isSteppir && ultrabeam.transport === 'serial';
// Serial is no longer a SteppIR-only route: an Ultrabeam controller has an
// RS232 port too, and a plain FTDI cable reaches it without the Ethernet
// adapter the TCP route needs.
const isSerial = ultrabeam.transport === 'serial';
return (
<>
<SectionHeader
@@ -3494,10 +3577,10 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<div className="grid grid-cols-2 gap-3">
<div className="space-y-1">
<Label>{t('hw.motorType')}</Label>
{/* Ultrabeam is TCP only; picking it forces the transport back to TCP
so the serial fields never apply to it. */}
{/* Both antennas take either route now, so picking a type no longer
forces the transport. */}
<Select value={ultrabeam.type ?? 'ultrabeam'}
onValueChange={(v) => setUltrabeam((s) => ({ ...s, type: v, transport: v === 'ultrabeam' ? 'tcp' : s.transport }))}>
onValueChange={(v) => setUltrabeam((s) => ({ ...s, type: v }))}>
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="ultrabeam">Ultrabeam</SelectItem>
@@ -3505,7 +3588,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</SelectContent>
</Select>
</div>
{isSteppir && (
{(
<div className="space-y-1">
<Label>{t('hw.motorTransport')}</Label>
<Select value={ultrabeam.transport ?? 'tcp'}
@@ -3522,7 +3605,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
@@ -3535,6 +3618,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
options={wkPorts}
allowFreeText
commitOnType
showToggle
placeholder="COM3"
className="font-mono flex-1"
onChange={(v) => setUltrabeam((s) => ({ ...s, com: v.trim().toUpperCase() }))}
@@ -3545,12 +3629,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>
) : (
@@ -4708,91 +4799,6 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
setEditingServer(next);
}
// FTx decodes: what OpsLog does on its own with the digital stream.
//
// Auto-call KEYS THE TRANSMITTER without anyone clicking, so the panel is
// deliberately explicit about it: off by default, every criterion opt-in, and
// a plain statement of what the machine will do once it is on.
function FtxPanel() {
const set = (patch: Partial<AutoCallSettings>) => {
const next = { ...autoCall, ...patch };
setAutoCall(next);
writeUiPref(autoCallKey, JSON.stringify(next));
};
const crit = (which: 'criteria' | 'watchCriteria', k: keyof AutoCallCriteria) => (
<label key={k} className="flex items-center gap-1.5 text-xs cursor-pointer">
<Checkbox
checked={!!autoCall[which][k]}
onCheckedChange={(v) => set({ [which]: { ...autoCall[which], [k]: !!v } } as any)}
/>
{t(`ftx.c_${k}`)}
</label>
);
const KEYS: (keyof AutoCallCriteria)[] = ['dxcc', 'band', 'mode', 'slot', 'grid', 'county', 'pota', 'pfx'];
return (
<>
<SectionHeader title={t('sec.ftx')} hint={t('ftx.hint')} />
<div className="space-y-4">
<div className="rounded-md border border-border p-3 space-y-3">
<label className="flex items-start gap-2 text-sm cursor-pointer">
<Checkbox checked={autoCall.enabled} className="mt-0.5"
onCheckedChange={(v) => set({ enabled: !!v })} />
<span>
{t('ftx.enable')}{' '}
<span className="text-xs text-muted-foreground">{t('ftx.enableHint')}</span>
</span>
</label>
{autoCall.enabled && (
<div className="pl-6 space-y-3">
<div>
<p className="text-xs font-semibold text-muted-foreground mb-1.5">{t('ftx.callWhen')}</p>
<div className="grid grid-cols-2 gap-x-4 gap-y-1">{KEYS.map((k) => crit('criteria', k))}</div>
</div>
<div className="border-t border-border/60 pt-3">
<p className="text-xs font-semibold text-muted-foreground mb-1">{t('ftx.watch')}</p>
<p className="text-[11px] text-muted-foreground mb-1.5 leading-relaxed">{t('ftx.watchHint')}</p>
<Textarea
className="h-20 font-mono text-xs"
placeholder={"4S7*\nTM0HQ\n*/P"}
defaultValue={(autoCall.watch ?? []).join('\n')}
key={`w-${(autoCall.watch ?? []).length}`}
onBlur={(e) => set({
watch: e.target.value.split('\n').map((x) => x.trim().toUpperCase()).filter(Boolean),
})}
/>
{(autoCall.watch ?? []).length > 0 && (
<div className="mt-2">
<p className="text-[11px] text-muted-foreground mb-1">{t('ftx.watchOnlyIf')}</p>
<div className="grid grid-cols-2 gap-x-4 gap-y-1">{KEYS.map((k) => crit('watchCriteria', k))}</div>
</div>
)}
</div>
<div className="border-t border-border/60 pt-3 flex items-center gap-2 flex-wrap">
<span className="text-xs text-muted-foreground">{t('ftx.cooldown')}</span>
<Input type="number" min={10} max={3600} className="w-24 h-7 text-xs"
defaultValue={autoCall.cooldownSec}
key={`cd-${autoCall.cooldownSec}`}
onBlur={(e) => {
const v = parseInt(e.target.value, 10);
if (!isNaN(v) && v >= 10 && v <= 3600) set({ cooldownSec: v });
}} />
<span className="text-xs text-muted-foreground">s</span>
</div>
<p className="text-[11px] rounded border border-warning-border bg-warning-muted text-warning-muted-foreground px-2 py-1.5 leading-relaxed">
{t('ftx.warn')}
</p>
</div>
)}
</div>
</div>
</>
);
}
function ClusterPanel() {
const sorted = [...clusterServers].sort((a, b) => (a.sort_order ?? 0) - (b.sort_order ?? 0));
// Written on every keystroke. This panel has no Save button, and a pair of
@@ -4898,7 +4904,6 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<div className="border-t border-border/60 pt-3 space-y-2">
<div>
<span className="text-sm font-medium">{t('clu.macros')}</span>
<p className="text-xs text-muted-foreground">{t('clu.macrosHint')}</p>
</div>
{/* Two columns of six: twelve rows stacked would push everything else
in this panel off the screen. */}
@@ -4970,6 +4975,28 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
}} />
<span className="text-xs text-muted-foreground">{t('clu.spotTtlHint')}</span>
</div>
{/* The list size, beside the lifetime because between them they decide
the same thing: whichever runs out first removes the spot. */}
<div className="flex items-center gap-3 flex-wrap">
<span className="text-sm">{t('clu.spotMax')}</span>
<div className="inline-flex rounded-md border border-border overflow-hidden text-xs">
{[500, 1000, 2500, 5000].map((v) => (
<button key={v} type="button"
onClick={() => { setSpotMaxText(String(v)); SetSpotMax(v).catch(() => {}); }}
className={cn('px-2.5 py-1.5 font-medium', Number(spotMaxText) === v ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:bg-muted')}>
{v}
</button>
))}
</div>
<Input className="h-8 w-24" value={spotMaxText}
onChange={(e) => {
const raw = e.target.value.replace(/[^0-9]/g, '');
setSpotMaxText(raw);
const n = parseInt(raw, 10);
if (Number.isFinite(n) && n > 0) SetSpotMax(Math.min(10000, n)).catch(() => {});
}} />
<span className="text-xs text-muted-foreground">{t('clu.spotMaxHint')}</span>
</div>
</div>
<div className="border-t border-border/60 pt-3 space-y-2">
@@ -5012,7 +5039,6 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</SelectContent>
</Select>
</div>
<p className="text-[11px] text-muted-foreground leading-relaxed">{t('gsc.hint')}</p>
</div>
</div>
@@ -5074,7 +5100,6 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
/>
<span className="text-xs text-muted-foreground">km</span>
</div>
<p className="text-[11px] text-muted-foreground leading-relaxed">{t('bo.nearKmHint')}</p>
{/* A live count, because a feed that is connected but silent looks
exactly like one that is broken until a number moves. */}
@@ -5117,7 +5142,6 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</div>
)}
</div>
<p className="text-xs text-muted-foreground leading-relaxed">{t('clu.selfSpotHint')}</p>
</div>
</div>
@@ -5220,9 +5244,6 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</div>
<div className="border-t border-border/60 pt-3 space-y-3">
<div className="text-[11px] text-muted-foreground">
{t('conf.note')}
</div>
{/* Clublog */}
<div className="grid grid-cols-[150px_1fr_1fr] gap-3 items-end">
<Label className="text-sm font-medium pb-1.5">Clublog</Label>
@@ -5253,6 +5274,18 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
{renderSelect('qrzcom_confirmed', FULL_OPTIONS)}
</div>
</div>
{/* HAMLOG.online */}
<div className="grid grid-cols-[150px_1fr_1fr] gap-3 items-end">
<Label className="text-sm font-medium pb-1.5">HAMLOG.online</Label>
<div>
<Label className="text-[10px] text-muted-foreground uppercase tracking-wider mb-1 block">{t('conf.sent')}</Label>
{renderSelect('hamlog_status', FULL_OPTIONS)}
</div>
<div>
<Label className="text-[10px] text-muted-foreground uppercase tracking-wider mb-1 block">{t('conf.rcvd')}</Label>
{renderSelect('hamlog_confirmed', FULL_OPTIONS)}
</div>
</div>
</div>
</div>
</>
@@ -5436,6 +5469,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
{ k: 'eqsl', label: 'EQSL', ready: true },
{ k: 'lotw', label: 'LOTW', ready: true },
{ k: 'cloudlog', label: 'CLOUDLOG', ready: true },
{ k: 'hamlog', label: 'HAMLOG.ONLINE', ready: true },
{ k: 'pota', label: 'POTA', ready: true },
];
@@ -5505,6 +5539,30 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
}
}
const hamlog = extSvc.hamlog ?? emptyExtCfg();
const setHamlog = (patch: Partial<ExtServiceCfg>) =>
setExtSvc((s) => ({ ...s, hamlog: { ...(s.hamlog ?? emptyExtCfg()), ...patch } }));
// Checking the KEY, not the connection.
//
// HAMLOG answers KEYSTATUS with the callsign the key belongs to, which no
// other service here does — so the answer is shown as the callsign rather
// than a bare "OK". A key pasted from a club account or a second station is
// then visible immediately, which is exactly the mistake a green tick would
// have hidden.
async function testHamlog() {
setHamlogTesting(true);
setHamlogTest(null);
try {
const call = await CheckHamlogKey(hamlog.api_key ?? '');
setHamlogTest({ ok: true, msg: call ? t('es.hamlogKeyOkCall', { call }) : t('es.hamlogKeyOk') });
} catch (e: any) {
setHamlogTest({ ok: false, msg: String(e?.message ?? e) });
} finally {
setHamlogTesting(false);
}
}
const cloudlog = extSvc.cloudlog;
const setCloudlog = (patch: Partial<ExtServiceCfg>) =>
setExtSvc((s) => ({ ...s, cloudlog: { ...s.cloudlog, ...patch } }));
@@ -5806,6 +5864,60 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</div>
</div>
</div>
) : extSvcTab === 'hamlog' ? (
<div className="space-y-4 max-w-2xl">
<div className="grid grid-cols-[170px_1fr] gap-3 items-center">
<Label className="text-sm">{t('es.apiKey')}</Label>
<Input
type="password"
value={hamlog.api_key}
onChange={(e) => setHamlog({ api_key: e.target.value })}
className="text-xs"
/>
</div>
<div className="text-[10px] text-muted-foreground -mt-1">
{t('es.hamlogHint')}{' '}
<button type="button" className="underline hover:text-foreground"
onClick={() => BrowserOpenURL('https://hamlog.online/account/agent.php')}>
hamlog.online/account/agent.php
</button>
</div>
<div className="border-t border-border/60 pt-3 space-y-3">
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox
checked={hamlog.auto_upload}
onCheckedChange={(c) => setHamlog({ auto_upload: !!c })}
/>
{t('es.autoUpload')}
</label>
<div className="grid grid-cols-[170px_1fr] gap-3 items-center">
<Label className="text-sm">{t('es.uploadTiming')}</Label>
<Select
value={hamlog.upload_mode === 'delayed' ? 'delayed' : 'immediate'}
onValueChange={(v) => setHamlog({ upload_mode: v })}
>
<SelectTrigger className="h-8 w-64"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="immediate">{t('es.immediate')}</SelectItem>
<SelectItem value="delayed">{t('es.delayed')}</SelectItem>
</SelectContent>
</Select>
</div>
<div className="flex items-center gap-3">
<Button variant="outline" size="sm" onClick={testHamlog} disabled={hamlogTesting}>
<UploadCloud className="size-3.5" /> {hamlogTesting ? t('es.testing') : t('es.hamlogCheckKey')}
</Button>
{hamlogTest && (
<span className={cn('text-xs', hamlogTest.ok ? 'text-success' : 'text-danger')}>
{hamlogTest.msg}
</span>
)}
</div>
</div>
</div>
) : extSvcTab === 'cloudlog' ? (
<div className="space-y-4 max-w-2xl">
<div className="grid grid-cols-[170px_1fr] gap-3 items-center">
@@ -6114,6 +6226,24 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
}
function DatabasePanel() {
// Compacting: which database is running, and what the last one saved.
// SQLite frees pages inside the file and never shrinks it, so this is the
// only thing that gives the disk space back after a large delete.
const [compacting, setCompacting] = useState('');
const [compactMsg, setCompactMsg] = useState<Record<string, string>>({});
function compact(target: 'settings' | 'logbook') {
setCompacting(target);
setCompactMsg((m) => ({ ...m, [target]: '' }));
CompactDatabase(target)
.then((r: any) => {
const msg = r?.backend === 'mysql'
? t('db.compactMysqlDone')
: t('db.compactDone', { before: fmtBytes(r?.before ?? 0), after: fmtBytes(r?.after ?? 0) });
setCompactMsg((m) => ({ ...m, [target]: msg }));
})
.catch((e: any) => setErr(String(e?.message ?? e)))
.finally(() => setCompacting(''));
}
async function refreshDb() { try { setDbSettings(await GetDatabaseSettings() as any); } catch {} }
async function refreshBackend() { try { setBackendStatus(await GetDBBackendStatus() as any); } catch {} }
// The chosen file is persisted (config.json) the moment it's picked; dbMsg
@@ -6233,9 +6363,13 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<Button variant="outline" size="sm" onClick={renameDb} title={t('db.renameTip')}><Pencil className="size-3.5" /> {t('db.rename')}</Button>
{/* Pushed right: these two act on the file that is already there,
while the four on the left change WHICH file is in use. */}
<Button variant="outline" size="sm" className="ml-auto" onClick={revealFolder}><FolderOpen className="size-3.5" /> {t('db.openFolder')}</Button>
<Button variant="outline" size="sm" className="ml-auto" onClick={() => compact('settings')} disabled={compacting !== ''}>
{compacting === 'settings' ? <Loader2 className="size-3.5 animate-spin" /> : <Minimize2 className="size-3.5" />} {t('db.compact')}
</Button>
<Button variant="outline" size="sm" onClick={revealFolder}><FolderOpen className="size-3.5" /> {t('db.openFolder')}</Button>
{dbSettings.is_custom && <Button variant="ghost" size="sm" onClick={resetDefault}>{t('db.resetDefault')}</Button>}
</div>
{compactMsg.settings && <p className="text-[11px] text-success">{compactMsg.settings}</p>}
{/* The DB pointer is only read at startup, so offer the restart inline. */}
{dbMsg && (
<div className="text-[11px] text-success space-y-1 pt-1">
@@ -6298,8 +6432,12 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<Button variant="outline" size="sm" onClick={newLogbook}><Plus className="size-3.5" /> {t('db.newDb')}</Button>
<Button variant="outline" size="sm" onClick={openLogbook}><FolderOpen className="size-3.5" /> {t('db.openExisting')}</Button>
<Button variant="outline" size="sm" onClick={renameLogbook} title={t('db.renameLogbookTip')}><Pencil className="size-3.5" /> {t('db.renameLogbook')}</Button>
<Button variant="outline" size="sm" className="ml-auto" onClick={() => compact('logbook')} disabled={compacting !== ''}>
{compacting === 'logbook' ? <Loader2 className="size-3.5 animate-spin" /> : <Minimize2 className="size-3.5" />} {t('db.compact')}
</Button>
{mysqlCfg.sqlite_path && <Button variant="ghost" size="sm" onClick={useLocalLogbook}>{t('db.useDefaultLogbook')}</Button>}
</div>
{compactMsg.logbook && <p className="text-[11px] text-success">{compactMsg.logbook}</p>}
</div>
)}
@@ -6324,8 +6462,17 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
{t('db.testCreate')}
</Button>
<Button size="sm" className="h-8" onClick={connectMysql}>{t('db.connectUse')}</Button>
{/* Compacting a shared logbook is OPTIMIZE TABLE, and it rebuilds the
table with everyone else waiting on it hence the warning, and
hence its place here rather than beside the connection buttons of
a file only this operator uses. */}
<Button variant="outline" size="sm" className="h-8 ml-auto" title={t('db.compactMysqlWarn')}
onClick={() => compact('logbook')} disabled={compacting !== ''}>
{compacting === 'logbook' ? <Loader2 className="size-3.5 animate-spin" /> : <Minimize2 className="size-3.5" />} {t('db.compact')}
</Button>
<span className="text-[11px] text-muted-foreground">{mysqlMsg}</span>
</div>
{compactMsg.logbook && <p className="text-[11px] text-success">{compactMsg.logbook}</p>}
</div>
)}
@@ -7109,6 +7256,56 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</div>
<p className="text-[11px] text-muted-foreground">{t('rda.neverOverwrites')}</p>
</div>
{/* Comparing the two sources. Read-only: it answers a question about the
log without touching it. */}
<div className="rounded-md border border-border p-3 space-y-2">
<div className="text-xs font-medium">{t('rda.cmpTitle')}</div>
<div className="flex items-center gap-3">
<Button size="sm" variant="secondary" onClick={runRDACompare} disabled={rdaCmpBusy}>
{rdaCmpBusy ? <Loader2 className="size-3.5 animate-spin mr-1.5" /> : null}
{t('rda.cmpRun')}
</Button>
{rdaCmp && (
<span className="text-xs text-muted-foreground">
{t('rda.cmpDone', {
s: rdaCmp.scanned ?? 0, a: rdaCmp.agree ?? 0, d: rdaCmp.disagree ?? 0,
l: rdaCmp.only_log ?? 0, b: rdaCmp.only_db ?? 0,
})}
</span>
)}
</div>
{/* The disagreements themselves. A count alone would say "there is a
problem" and leave the operator with no way to look at it. */}
{rdaCmp?.conflicts?.length > 0 && (
<div className="max-h-56 overflow-auto rounded border border-border">
<table className="w-full text-[11px]">
<thead className="sticky top-0 bg-card text-left text-muted-foreground border-b border-border">
<tr>
<th className="py-1 px-2 font-medium">{t('rda.cmpCall')}</th>
<th className="py-1 pr-2 font-medium">{t('rda.cmpDate')}</th>
<th className="py-1 pr-2 font-medium">{t('rda.cmpFromLog')}</th>
<th className="py-1 pr-2 font-medium">{t('rda.cmpFromDb')}</th>
<th className="py-1 pr-2 font-medium">{t('rda.cmpKind')}</th>
</tr>
</thead>
<tbody>
{rdaCmp.conflicts.map((c: any) => (
<tr key={c.qso_id} className="border-b border-border/30">
<td className="py-1 px-2 font-mono font-semibold">{c.callsign}</td>
<td className="py-1 pr-2 font-mono">{c.date}</td>
<td className="py-1 pr-2 font-mono">{c.from_log}{c.confirmed ? ' ✓' : ''}</td>
<td className="py-1 pr-2 font-mono">{c.from_db}</td>
<td className="py-1 pr-2 text-muted-foreground">
{c.dated ? t('rda.cmpDated') : t('rda.cmpCurrent')}
</td>
</tr>
))}
</tbody>
</table>
</div>
)}
</div>
</div>
);
}
@@ -7127,7 +7324,6 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
'lists-bands': BandsPanel,
'lists-modes': ModesPanel,
cluster: ClusterPanel,
ftx: FtxPanel,
udp: UDPIntegrationsPanelWrapper,
// Module-scope components, wrapped so their props can be passed. The nested
// panels below go through PanelHost instead — which is what now lets either
@@ -7150,7 +7346,114 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
tunergenius: TunerGeniusPanelSettings,
psu: PSUPanelSettings,
pgxl: PGXLPanelSettings,
flex: () => <FlexBandPanel bands={lists.bands ?? []} />,
flex: () => (
<div className="space-y-6">
<FlexBandPanel bands={lists.bands ?? []} />
{/* Rendered here rather than inside FlexBandPanel so these keep writing
to the modal's own CAT settings, saved by its Save button. A panel
that saved them itself would be overwritten by that same Save a
moment later, using the values it had read on opening. */}
<div className="border-t border-border/60 pt-4 space-y-2">
<h4 className="text-sm font-semibold text-foreground">{t('cat.flexOptions')}</h4>
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox checked={!!catCfg.flex_decode_spots} onCheckedChange={(c) => setCatCfg((s) => ({ ...s, flex_decode_spots: !!c }))} />
{t('cat.flexDecodeSpots')} <span className="text-xs text-muted-foreground">{t('cat.flexDecodeSpotsHint')}</span>
</label>
{catCfg.flex_decode_spots && (
<div className="flex items-center gap-2 pl-6">
<Label className="text-sm">{t('cat.flexDecodeSecs')}</Label>
<Input type="number" className="w-24" min={10} max={3600}
value={catCfg.flex_decode_secs || 120}
onChange={(e) => setCatCfg((s) => ({ ...s, flex_decode_secs: parseInt(e.target.value) || 120 }))} />
<span className="text-xs text-muted-foreground">{t('cat.flexDecodeSecsHint')}</span>
</div>
)}
<label className="flex items-start gap-2 text-sm cursor-pointer">
<Checkbox className="mt-0.5" checked={!!catCfg.flex_dvk_dax} onCheckedChange={(c) => setCatCfg((s) => ({ ...s, flex_dvk_dax: !!c }))} />
<span>{t('cat.flexDvkDax')} <span className="text-xs text-muted-foreground">{t('cat.flexDvkDaxHint')}</span></span>
</label>
</div>
{/* Auto-zoom on a spot click. Its own block: it changes the RADIO's
display, where everything above changes what OpsLog draws on it. */}
<div className="border-t border-border/60 pt-4 space-y-2">
<h4 className="text-sm font-semibold text-foreground">{t('flexzoom.title')}</h4>
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox checked={flexZoom.enabled} onCheckedChange={(c) => saveFlexZoom({ ...flexZoom, enabled: !!c })} />
{t('flexzoom.enable')}
</label>
{flexZoom.enabled && (
<div className="pl-6 space-y-2">
<div className="flex items-center gap-3 flex-wrap">
{([['cw_khz', 'flexzoom.cw'], ['ssb_khz', 'flexzoom.ssb'], ['digi_khz', 'flexzoom.digi']] as const).map(([k, lbl]) => (
<label key={k} className="flex items-center gap-1.5 text-xs">
<span className="text-muted-foreground">{t(lbl)}</span>
<Input type="number" min={1} max={14000} className="h-8 w-20"
value={String((flexZoom as any)[k] ?? '')}
onChange={(e) => saveFlexZoom({ ...flexZoom, [k]: parseInt(e.target.value, 10) || 0 } as any)} />
<span className="text-muted-foreground">kHz</span>
</label>
))}
</div>
<label className="flex items-start gap-2 text-xs cursor-pointer">
<Checkbox className="mt-0.5" checked={flexZoom.centre} onCheckedChange={(c) => saveFlexZoom({ ...flexZoom, centre: !!c })} />
<span>{t('flexzoom.centre')} <span className="text-muted-foreground">{t('flexzoom.centreHint')}</span></span>
</label>
</div>
)}
</div>
{/* Spot colours, one row per status.
Saved on the spot rather than on the modal's Save: this is a table of
colours, and having to close a dialog to see what a colour looks like
on the waterfall turns picking one into a guessing game. */}
<div className="border-t border-border/60 pt-4 space-y-2">
<div className="flex items-center justify-between gap-2">
<h4 className="text-sm font-semibold text-foreground">{t('spotcol.title')}</h4>
<button type="button" className="text-[11px] text-muted-foreground hover:text-foreground underline"
onClick={() => ResetSpotColors().then((c: any) => setSpotColors(c)).catch(() => {})}>
{t('spotcol.reset')}
</button>
</div>
{/* Whether spots are drawn at all comes first: colouring them is the
next question, and the two were on different pages. */}
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox checked={!!catCfg.flex_spots} onCheckedChange={(c) => setCatCfg((s) => ({ ...s, flex_spots: !!c }))} />
{t('cat.flexSpots')}
</label>
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox checked={spotColors.enabled}
onCheckedChange={(c) => saveSpotColors({ ...spotColors, enabled: !!c })} />
{t('spotcol.enable')}
</label>
{spotColors.enabled && (
<div className="rounded-md border border-border divide-y divide-border max-w-2xl">
{SPOT_COLOR_ROWS.map((k) => {
const c = spotColors.colors[k] ?? { text: '', bg: '' };
return (
<div key={k} className="flex items-center gap-3 px-3 py-1.5">
{/* Sent to the radio at all. First in the row because it
decides whether the colours next to it mean anything. */}
<Checkbox checked={!c.hide} title={t('spotcol.send')}
onCheckedChange={(v) => setSpotColor(k, { hide: !v } as any)} />
<span className={cn('text-xs flex-1 min-w-0', c.hide && 'opacity-40 line-through')}>{t('spotcol.s_' + k)}</span>
{/* The preview is the point of the row: two colour boxes say
nothing about what the pair looks like together. */}
<span className="text-xs font-mono px-2 py-0.5 rounded"
style={{ color: argbToCss(c.text) || undefined, background: argbToCss(c.bg) || undefined }}>
DL1ABC
</span>
<ArgbInput label={t('spotcol.text')} value={c.text} onChange={(v) => setSpotColor(k, { text: v })} />
<ArgbInput label={t('spotcol.bg')} value={c.bg ?? ''} onChange={(v) => setSpotColor(k, { bg: v })} />
</div>
);
})}
</div>
)}
</div>
</div>
),
audio: AudioPanel,
};
+16 -1
View File
@@ -29,6 +29,7 @@ type ContestRun = { id: string; year: number; count: number; start: string; end:
type Stats = {
total: number; unique_calls: number; entities: number; continents: number;
first_qso: string; last_qso: string;
last_new_dxcc: string; last_new_dxcc_num: number; last_new_dxcc_call: string; last_new_dxcc_date: string;
confirmed_lotw: number; confirmed_eqsl: number; confirmed_qsl: number; confirmed_any: number;
by_mode: Bucket[]; by_band: Bucket[]; by_band_category: BandCat[]; by_operator: Bucket[]; by_station: Bucket[];
by_continent: Bucket[]; top_entities: Bucket[]; by_year: Bucket[]; by_month: Bucket[];
@@ -681,6 +682,16 @@ export function StatsPanel() {
// real operating session (which is exactly when an hourly rate chart exists).
const windowed = contest !== '' || (period === 'custom' && (stats?.rate?.length ?? 0) > 1);
// "last new: France - F5ABC - 2019-03-01": the entity most recently added to
// the log, and the contact that added it. Empty when no dated entity exists.
const lastNew = useMemo(() => {
if (!stats?.last_new_dxcc_date) return '';
const day = stats.last_new_dxcc_date.slice(0, 10);
const who = stats.last_new_dxcc_call ? ` · ${stats.last_new_dxcc_call}` : '';
const what = stats.last_new_dxcc || String(stats.last_new_dxcc_num || '');
return `${t('stats.lastNewDxcc')}: ${what}${who} · ${day}`;
}, [stats, t]);
const span = useMemo(() => {
if (!stats?.first_qso) return '';
const f = new Date(stats.first_qso), l = new Date(stats.last_qso);
@@ -774,7 +785,11 @@ export function StatsPanel() {
<div className="grid grid-cols-2 md:grid-cols-5 gap-2.5 mb-3">
<StatTile label={t('stats.qsos')} value={nf(stats.total)} sub={span} accent="var(--chart-1)" />
<StatTile label={t('stats.uniqueCalls')} value={nf(stats.unique_calls)} accent="var(--chart-2)" />
<StatTile label={t('stats.entities')} value={nf(stats.entities)} sub="DXCC" accent="var(--chart-5)" />
{/* The last one ADDED rides on the entities tile: it is the same
subject, and a tile of its own would push the five headline figures
onto two rows for one line of text. */}
<StatTile label={t('stats.entities')} value={nf(stats.entities)}
sub={lastNew || "DXCC"} accent="var(--chart-5)" />
<StatTile label={t('stats.continents')} value={nf(stats.continents)} sub="/ 7" accent="var(--chart-8)" />
<StatTile label={t('stats.confirmed')} value={`${stats.total ? ((stats.confirmed_any / stats.total) * 100).toFixed(0) : 0}%`}
sub={`${nf(stats.confirmed_any)} / ${nf(stats.total)}`} accent="var(--success)" />
+62
View File
@@ -0,0 +1,62 @@
import { useEffect, useRef } from 'react';
import { cn } from '@/lib/utils';
// A range slider the mouse wheel can move.
//
// Dragging a 4-pixel-tall slider to change the power by five watts is a fussy
// gesture; rolling the wheel over it is not, and it is what an operator reaches
// for after using the Flex and Yaesu consoles, which have had it for a while.
//
// React's own onWheel is registered PASSIVE, so preventDefault() inside it is
// ignored and the panel scrolls under the pointer while the value changes. The
// listener therefore has to be attached natively with { passive: false }, and
// the live values read through refs — the listener is installed once and would
// otherwise capture the first render's value for ever.
//
// The Flex and Yaesu panels each grew their own copy of this before it was worth
// sharing. They are left alone deliberately: they work, they are in daily use,
// and their styling differs in small ways that a merge would have to guess at.
export function WheelRange({ value, onChange, min = 0, max = 100, step = 1, disabled, accent = 'var(--primary)', className }: {
value: number; onChange: (v: number) => void;
min?: number; max?: number; step?: number; disabled?: boolean; accent?: string; className?: string;
}) {
const v = Math.max(min, Math.min(max, value));
const pct = max > min ? ((v - min) / (max - min)) * 100 : 0;
const ref = useRef<HTMLInputElement>(null);
const valRef = useRef(v); valRef.current = v;
const cbRef = useRef(onChange); cbRef.current = onChange;
const disRef = useRef(disabled); disRef.current = disabled;
const stepRef = useRef(step); stepRef.current = step;
const minRef = useRef(min); minRef.current = min;
const maxRef = useRef(max); maxRef.current = max;
useEffect(() => {
const el = ref.current;
if (!el) return;
const onWheel = (e: WheelEvent) => {
if (disRef.current) return;
e.preventDefault();
const d = e.deltaY < 0 ? stepRef.current : -stepRef.current;
const nv = Math.max(minRef.current, Math.min(maxRef.current, valRef.current + d));
if (nv !== valRef.current) cbRef.current(nv);
};
el.addEventListener('wheel', onWheel, { passive: false });
return () => el.removeEventListener('wheel', onWheel);
}, []);
return (
<input
ref={ref}
type="range" min={min} max={max} step={step} value={v} disabled={disabled}
onChange={(e) => onChange(parseInt(e.target.value, 10))}
className={cn('flex-1 h-1.5 rounded-full appearance-none cursor-pointer disabled:opacity-30 disabled:cursor-default',
'[&::-webkit-slider-thumb]:appearance-none [&::-webkit-slider-thumb]:size-3.5 [&::-webkit-slider-thumb]:rounded-full',
'[&::-webkit-slider-thumb]:bg-card [&::-webkit-slider-thumb]:border-2 [&::-webkit-slider-thumb]:shadow-sm [&::-webkit-slider-thumb]:cursor-pointer',
className)}
style={{
background: `linear-gradient(to right, ${accent} ${pct}%, color-mix(in srgb, var(--foreground) 18%, transparent) ${pct}%)`,
borderColor: accent,
}}
/>
);
}
+12 -4
View File
@@ -73,9 +73,17 @@ export function WinkeyerPanel({
const connected = status.connected;
// Send-on-type only exists where the engine can key one character at a time:
// the WinKeyer and Flex CWX. The stored preference survives an engine change,
// though, and an Icom or Yaesu operator inherited a hidden switch that was on
// — the checkbox is not shown for them, so nothing keyed as they typed AND
// Enter sent nothing either, since it believes the text has already gone.
// Macros kept working, which is exactly how it looked from the outside.
const liveType = sendOnType && (source === 'winkeyer' || source === 'flex');
function sendText() {
const t = cwText.trim();
if (t && !sendOnType) onSend(t); // in send-on-type the text already went out
if (t && !liveType) onSend(t); // in send-on-type the text already went out
setCwText('');
}
@@ -83,7 +91,7 @@ export function WinkeyerPanel({
// WinKeyer backspace for each deleted char (removes it from the buffer if it
// hasn't been keyed yet). Only end-of-string edits are mirrored live.
function onCwChange(v: string) {
if (sendOnType && connected) {
if (liveType && connected) {
const old = cwText;
if (v.length > old.length && v.startsWith(old)) {
onSendRaw(v.slice(old.length));
@@ -200,13 +208,13 @@ export function WinkeyerPanel({
value={cwText}
onChange={(e) => onCwChange(e.target.value)}
onKeyDown={(e) => { if (e.key === 'Enter') { e.preventDefault(); sendText(); } }}
placeholder={sendOnType ? t('wkp.phLive') : t('wkp.phEnter')}
placeholder={liveType ? t('wkp.phLive') : t('wkp.phEnter')}
disabled={!connected}
className="font-mono uppercase"
/>
</div>
<Button size="sm" className="h-8" onClick={sendText} disabled={!connected}>
<Send className="size-3.5" /> {sendOnType ? t('wkp.clear') : t('wkp.send')}
<Send className="size-3.5" /> {liveType ? t('wkp.clear') : t('wkp.send')}
</Button>
<Button variant="destructive" size="sm" className="h-8" onClick={onStop} disabled={!connected} title={t('wkp.abort')}>
<Square className="size-3.5" /> {t('wkp.stop')}
+3 -1
View File
@@ -41,6 +41,7 @@ type Props = {
onSendEQSL?: (ids: number[]) => void;
onBulkEdit?: (ids: number[]) => void;
onExportSelected?: (ids: number[]) => void;
onExportSelectedFull?: (ids: number[]) => void;
onExportSelectedFields?: (ids: number[]) => void;
onExportCabrilloSelected?: (ids: number[]) => void;
onDelete?: (ids: number[]) => void;
@@ -58,7 +59,7 @@ function fmtDate(s: any): string {
return `${d.getUTCFullYear()}-${p(d.getUTCMonth() + 1)}-${p(d.getUTCDate())}`;
}
export function WorkedBeforeGrid({ wb, myGrid, busy, currentCall, onRowDoubleClicked, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportCabrilloSelected, onDelete, awardCols }: Props) {
export function WorkedBeforeGrid({ wb, myGrid, busy, currentCall, onRowDoubleClicked, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFull, onExportSelectedFields, onExportCabrilloSelected, onDelete, awardCols }: Props) {
const { t } = useI18n();
const gridRef = useRef<any>(null);
const [pickerOpen, setPickerOpen] = useState(false);
@@ -279,6 +280,7 @@ export function WorkedBeforeGrid({ wb, myGrid, busy, currentCall, onRowDoubleCli
onSendEQSL={onSendEQSL}
onBulkEdit={onBulkEdit}
onExportSelected={onExportSelected}
onExportSelectedFull={onExportSelectedFull}
onExportSelectedFields={onExportSelectedFields}
onExportCabrilloSelected={onExportCabrilloSelected}
onDelete={onDelete}
+27 -6
View File
@@ -3,7 +3,7 @@ import { Radio, AudioLines, Mic, Activity, SlidersHorizontal, Antenna } from 'lu
import {
GetYaesuState, RefreshYaesuPanel,
SetYaesuPower, SetYaesuMicGain, SetYaesuAFGain, SetYaesuRFGain, SetYaesuSquelch,
SetYaesuAGC, SetYaesuPreamp, SetYaesuAtt, SetYaesuNB, SetYaesuNR, SetYaesuNRLevel,
SetYaesuAGC, SetYaesuPreamp, SetYaesuAtt, SetYaesuAntenna, SetYaesuNB, SetYaesuNR, SetYaesuNRLevel,
SetYaesuNarrow, SetYaesuVOX, SetYaesuSplit, SetYaesuBand, TuneYaesuATU,
SetYaesuModeRaw, SetYaesuSplitOffset, SetYaesuKeySpeed, SetYaesuBreakIn, YaesuZeroIn, GetCATState,
} from '../../wailsjs/go/main/App';
@@ -17,8 +17,9 @@ type YaesuState = {
transmitting: boolean; split: boolean;
s_meter: number; power_meter: number; swr_meter: number;
rf_power: number; mic_gain: number; af_gain: number; rf_gain: number; squelch: number;
agc?: string; preamp: number; att: number;
nb: boolean; nr: boolean; nr_level: number; narrow: boolean; vox: boolean;
agc?: string; preamp: number; att: number; antenna: number;
nb: boolean; nr: boolean; nr_level: number; narrow: boolean; narrow_supported?: boolean; vox: boolean;
max_power?: number;
split_tx_hz?: number; key_speed?: number; break_in?: boolean; swr?: number; power_w?: number;
};
@@ -26,7 +27,7 @@ const ZERO: YaesuState = {
available: false, transmitting: false, split: false,
s_meter: 0, power_meter: 0, swr_meter: 0,
rf_power: 0, mic_gain: 0, af_gain: 0, rf_gain: 0, squelch: 0,
preamp: 0, att: 0, nb: false, nr: false, nr_level: 0, narrow: false, vox: false,
preamp: 0, att: 0, antenna: 0, nb: false, nr: false, nr_level: 0, narrow: false, vox: false,
};
// Band buttons use the rig's OWN band memory (CAT "BS"), not a frequency we
@@ -74,6 +75,10 @@ function activeMode(raw?: string): { id: string; side: 'U' | 'L' } | null {
// IPO bypasses the preamp entirely (best on a quiet, high-signal band), AMP1 and
// AMP2 add gain. Presenting it as a toggle would hide the middle position.
const PREAMPS = [{ v: '0', l: 'IPO' }, { v: '1', l: 'AMP1' }, { v: '2', l: 'AMP2' }];
// Three jacks is the most any of these rigs has (FTDX101); an FTDX10 answers
// with 1 or 2 and the third button simply never gets used. A rig with a single
// socket answers nothing at all and reports 0, and the row is not drawn.
const ANTENNAS = [{ v: '1', l: 'ANT1' }, { v: '2', l: 'ANT2' }, { v: '3', l: 'ANT3' }];
const AGCS = [{ v: 'FAST', l: 'FAST' }, { v: 'MID', l: 'MID' }, { v: 'SLOW', l: 'SLOW' }, { v: 'AUTO', l: 'AUTO' }];
// The attenuator is a three-step pad on these rigs (6/12/18 dB), not a toggle.
const ATTS = [{ v: '0', l: 'OFF' }, { v: '6', l: '6dB' }, { v: '12', l: '12dB' }, { v: '18', l: '18dB' }];
@@ -424,6 +429,16 @@ export function YaesuPanel({ onReportRST, onKeySpeed }: {
<Row label="ATT">
<Segmented value={String(view.att)} options={ATTS} onChange={(v) => push('att', parseInt(v, 10), () => SetYaesuAtt(parseInt(v, 10)))} />
</Row>
{/* Only on a rig that HAS a choice: 0 means the AN command went
unanswered, which is what a single-socket FT-891 does. And the
choice is remembered for the band it was made on — no table to
fill in anywhere, the backend learns it here. */}
{view.antenna > 0 && (
<Row label="ANT">
<Segmented value={String(view.antenna)} options={ANTENNAS}
onChange={(v) => push('antenna', parseInt(v, 10), () => SetYaesuAntenna(parseInt(v, 10)))} />
</Row>
)}
</Card>
{/* Noise + filter */}
@@ -431,7 +446,13 @@ export function YaesuPanel({ onReportRST, onKeySpeed }: {
<div className="flex items-center gap-2 flex-wrap">
<Chip on={view.nb} onClick={() => push('nb', !view.nb, () => SetYaesuNB(!view.nb))} label="NB" />
<Chip on={view.nr} onClick={() => push('nr', !view.nr, () => SetYaesuNR(!view.nr))} label="DNR" />
<Chip on={view.narrow} onClick={() => push('narrow', !view.narrow, () => SetYaesuNarrow(!view.narrow))} label="NAR" />
{/* NAR is the narrow IF filter. Shown only when the rig ANSWERED NA:
a button that does nothing when pressed reads as a fault in the
radio, which is how it was reported from an FTDX101. */}
{view.narrow_supported && (
<Chip on={view.narrow} onClick={() => push('narrow', !view.narrow, () => SetYaesuNarrow(!view.narrow))}
label="NAR" title={t('yaesu.narrowHint')} />
)}
</div>
<Row label="DNR">
{/* 1-15 on the rig, shown as-is rather than rescaled to a percentage:
@@ -448,7 +469,7 @@ export function YaesuPanel({ onReportRST, onKeySpeed }: {
<Row label="PWR">
{/* Watts, not a percentage: the rig reports and takes watts, and a
percentage would be a second unit to reconcile every time. */}
<Slider value={view.rf_power || 5} min={5} max={100} accent="var(--destructive)"
<Slider value={view.rf_power || 5} min={5} max={Math.max(100, view.max_power || 100)} accent="var(--destructive)"
onChange={(v) => push('rf_power', v, () => SetYaesuPower(v))} />
<span className="w-10 text-right text-xs font-mono tabular-nums text-muted-foreground">{view.rf_power}W</span>
</Row>
+41 -4
View File
@@ -1,4 +1,5 @@
import { useEffect, useRef, useState } from 'react';
import { ChevronDown } from 'lucide-react';
import { Input } from './input';
import { cn } from '@/lib/utils';
@@ -7,6 +8,7 @@ import { cn } from '@/lib/utils';
// can't hold a typo'd value that isn't in the list.
export function Combobox({
value, onChange, options, placeholder, className, allowFreeText = false, commitOnType = false,
showToggle = false,
}: {
value: string;
onChange: (v: string) => void;
@@ -18,9 +20,21 @@ export function Combobox({
// fields read live by other actions — e.g. RST, so a CW macro sent without
// leaving the field uses the value just typed.
commitOnType?: boolean;
// Draw a chevron that opens the full list on click.
//
// Without it this control is indistinguishable from a plain text box: it opens
// only on a keystroke or ArrowDown, both of which have to be known about
// first. That is fine for a field whose list is a convenience (RST), and wrong
// for one whose list is the ANSWER — the COM ports actually present on this
// machine, which nobody can be expected to recall.
showToggle?: boolean;
}) {
const [open, setOpen] = useState(false);
const [query, setQuery] = useState('');
// Opened by the chevron rather than by typing: the whole list is on offer, not
// the part matching what is already in the field — a box holding COM7 would
// otherwise "open" onto COM7 alone.
const [browse, setBrowse] = useState(false);
const ref = useRef<HTMLDivElement>(null);
useEffect(() => {
@@ -31,20 +45,22 @@ export function Combobox({
return () => document.removeEventListener('mousedown', onDoc);
}, []);
const filtered = open
? options.filter((o) => o.toLowerCase().includes(query.toLowerCase())).slice(0, 60)
: [];
const filtered = !open ? []
: browse ? options.slice(0, 60)
: options.filter((o) => o.toLowerCase().includes(query.toLowerCase())).slice(0, 60);
function commit(v: string) {
onChange(v);
setQuery(v);
setOpen(false);
setBrowse(false);
}
function onBlur() {
// Defer so a click on an option registers first.
setTimeout(() => {
setOpen(false);
setBrowse(false);
const trimmed = query.trim();
const exact = options.find((o) => o.toLowerCase() === trimmed.toLowerCase());
// Only fire onChange when the value actually changed — committing an
@@ -68,6 +84,7 @@ export function Combobox({
const v = e.target.value;
setQuery(v);
setOpen(true);
setBrowse(false); // typing filters again
// Commit-on-type pushes the value live to the parent (so a CW macro sent
// without leaving the field uses what was just typed). With free text that's
// any input; a restricted field (allowFreeText=false) commits ONLY a value
@@ -76,14 +93,34 @@ export function Combobox({
if (commitOnType && (allowFreeText || options.some((o) => o.toLowerCase() === v.trim().toLowerCase()))) onChange(v);
}}
onBlur={onBlur}
className={showToggle ? 'pr-7' : undefined}
onKeyDown={(e) => {
if ((e.key === 'ArrowDown' || e.key === 'Alt') && !open) { setOpen(true); }
if ((e.key === 'ArrowDown' || e.key === 'Alt') && !open) { setOpen(true); setBrowse(true); }
else if (e.key === 'Enter' && open && filtered.length > 0) { e.preventDefault(); commit(filtered[0]); }
else if (e.key === 'Escape') { setQuery(value); setOpen(false); }
// Tab: just let it move on; onBlur commits/closes. Options are
// tabIndex=-1 so a single Tab leaves the field.
}}
/>
{showToggle && (
<button
type="button"
tabIndex={-1}
aria-label="Show list"
className="absolute inset-y-0 right-0 flex w-7 items-center justify-center text-muted-foreground hover:text-foreground"
// mousedown, not click: the input's blur fires first otherwise and
// closes the list the same instant this opens it.
onMouseDown={(e) => {
e.preventDefault();
if (open) { setOpen(false); setBrowse(false); return; }
setQuery(value);
setBrowse(true);
setOpen(true);
}}
>
<ChevronDown className="size-3.5" />
</button>
)}
{open && filtered.length > 0 && (
<div className="absolute z-50 mt-1 max-h-60 w-full overflow-auto rounded-md border border-border bg-card shadow-lg text-xs">
{filtered.map((o) => (
+47 -5
View File
@@ -1,5 +1,18 @@
// Auto-call: let OpsLog answer a decode without the operator clicking it.
//
// WITHDRAWN FROM THE INTERFACE, because DXHunter already does it.
//
// Two programs from the same shack deciding on their own to answer the same
// decode is worse than either doing it alone: they cannot see each other, so
// they key over one another, and afterwards there is no telling which of them
// called. The duplicate is the one to remove, and DXHunter is where this lives.
//
// There is no switch in Preferences and no button on the decodes toolbar, and
// App.tsx returns before the loop can run. The file is kept whole: the rules
// below are the delicate part, argued over and tested, and rewriting them from
// memory later would be worse than leaving them here. Reinstating the feature
// means restoring all three — the settings page, the button, and the guard.
//
// This KEYS THE TRANSMITTER on its own, which is why the rules here are written
// as a series of refusals rather than a search for a reason to call. Everything
// below has to be true; anything unknown means no.
@@ -9,6 +22,7 @@
export type AutoCallCriteria = {
dxcc: boolean; // entity never worked
bandmode: boolean; // entity worked, but neither this band nor this mode
band: boolean; // entity never worked on this band
mode: boolean; // entity never worked in this mode
slot: boolean; // band and mode each worked, never together
@@ -37,7 +51,7 @@ export type AutoCallSettings = {
};
export const emptyCriteria: AutoCallCriteria = {
dxcc: false, band: false, mode: false, slot: false,
dxcc: false, bandmode: false, band: false, mode: false, slot: false,
grid: false, county: false, pota: false, pfx: false,
};
@@ -58,13 +72,26 @@ export function loadAutoCall(): AutoCallSettings {
const raw = localStorage.getItem(AC_KEY);
if (!raw) return { ...defaultAutoCall };
const v = JSON.parse(raw);
return {
const out: AutoCallSettings = {
...defaultAutoCall,
...v,
criteria: { ...emptyCriteria, ...(v?.criteria ?? {}) },
watchCriteria: { ...emptyCriteria, ...(v?.watchCriteria ?? {}) },
watch: Array.isArray(v?.watch) ? v.watch : [],
};
// DISARMED ON SIGHT, and written back disabled.
//
// The runtime guard in App.tsx stops this build from calling anyone, but it
// leaves "enabled": true sitting in storage, where any build without the
// guard — an older one an operator reinstalls, a machine that upgrades
// later — reads it and keys the transmitter for a feature with no switch
// left to turn off. A withdrawn feature that keys a radio has to be
// disarmed where it is REMEMBERED, not only where it runs.
if (out.enabled) {
out.enabled = false;
try { localStorage.setItem(AC_KEY, JSON.stringify(out)); } catch { /* private mode: the guard still holds */ }
}
return out;
} catch { return { ...defaultAutoCall }; }
}
@@ -101,6 +128,10 @@ function anyCriterion(c: AutoCallCriteria): boolean {
// meets reports whether a decode satisfies at least one ticked criterion.
function meets(c: AutoCallCriteria, e: DecodeStatus): boolean {
if (c.dxcc && e.status === 'new') return true;
// Each status is exclusive, so a station that is new on both counts matches
// ONLY this criterion — ticking "new band" alone would not catch it, which is
// the wrong way round: it is the better catch of the two.
if (c.bandmode && e.status === 'new-band-mode') return true;
if (c.band && e.status === 'new-band') return true;
if (c.mode && e.status === 'new-mode') return true;
if (c.slot && e.status === 'new-slot') return true;
@@ -149,9 +180,20 @@ export function shouldAutoCall(
if (!call) return no('no callsign');
// Never answer ourselves, however the decode reached us.
if (opts.myCall && call === opts.myCall.trim().toUpperCase()) return no('own callsign');
// Only a CQ. Answering a station mid-QSO is both rude and futile — WSJT-X
// actions a Reply only for CQ and QRZ anyway.
if (!d.cq) return no('not a CQ');
// NOT limited to a CQ, deliberately.
//
// It used to be, on the reasoning that answering a station mid-QSO is calling
// over somebody. That reasoning ignored the case the feature exists for: a
// DXpedition running a pileup never sends CQ at all — it works caller after
// caller — so the rule sat out the one contact auto-call was turned on for. A
// new entity on 15 m FT8, decode after decode, and not a single transmission.
//
// WHEN to transmit is not ours to decide either: the Reply goes to the
// decoder, and MSHV starts at once while JTDX waits for a CQ. Two correct
// behaviours, both belonging to the program that owns the timing. Here the
// question is only whether the station is one the operator wants — the
// criteria below answer that, and the cooldown and the busy check keep it from
// calling twice.
// Not while ANY receiver is mid-QSO — transmitting, or holding a DX call it
// has not finished with. Starting a second exchange before the first is done
// is what turned this into a machine that called without stopping.
File diff suppressed because one or more lines are too long
+27 -5
View File
@@ -26,7 +26,7 @@ export type RowColorSettings = {
// otherwise keep striping underneath whatever we do per row.
const ZEBRA_DEFAULT = 'color-mix(in srgb, var(--muted) 40%, var(--card))';
export const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
export const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz', 'hamlog'] as const;
// The two QSO fields behind each channel. QRZ.com and Club Log call theirs an
// "upload status" rather than a QSL flag, but they carry the same Y / R letters.
@@ -37,6 +37,24 @@ const FIELDS: Record<string, { sent: string; rcvd: string }> = {
qrz: { sent: 'qrzcom_qso_upload_status', rcvd: 'qrzcom_qso_download_status' },
};
// HAMLOG.online has no column of its own: the ADIF standard names a field for
// hamlog.EU and none for hamlog.ONLINE, so its state lives in the extras — see
// internal/award/award.go, which reads the same keys for award confirmations.
// One vocabulary, two readers.
const HAMLOG_SENT = 'APP_OPSLOG_HAMLOG_SENT';
const HAMLOG_RCVD = ['APP_HAMLOG_QSO_CFM', 'APP_OPSLOG_HAMLOG_QSL', 'APP_HAMLOG_QSL', 'APP_HAMLOGONLINE_QSL', 'HAMLOG_QSL_RCVD'];
// hamlogState reads a row's extras. Any value that is not an explicit "no"
// counts, because their export could carry a date or a match id rather than Y.
function hamlogState(q: any, which: 'sent' | 'rcvd'): boolean {
const e = (q?.extras ?? {}) as Record<string, string>;
const keys = which === 'sent' ? [HAMLOG_SENT] : HAMLOG_RCVD;
return keys.some((k) => {
const v = String(e[k] ?? '').trim();
return v !== '' && v.toUpperCase() !== 'N' && v.toUpperCase() !== 'NO';
});
}
// ADIF QSL fields are single letters. Y is the only one that means "yes";
// R (requested) and Q (queued) mean it has not gone out yet — a different state,
// and the one an operator looks for when deciding what to send.
@@ -55,14 +73,18 @@ function ruleMatches(q: any, r: RowColorRule): boolean {
const cs = chansOf(r);
switch (r.id) {
case 'confirmed':
return cs.some((c) => yes(q[FIELDS[c]?.rcvd]));
return cs.some((c) => (c === 'hamlog' ? hamlogState(q, 'rcvd') : yes(q[FIELDS[c]?.rcvd])));
case 'sent':
return cs.some((c) => yes(q[FIELDS[c]?.sent]));
return cs.some((c) => (c === 'hamlog' ? hamlogState(q, 'sent') : yes(q[FIELDS[c]?.sent])));
case 'to_send':
return cs.some((c) => owed(q[FIELDS[c]?.sent]));
// Nothing to request from HAMLOG: a QSO is either uploaded or it is not,
// there is no "card asked for" state to be owed.
return cs.some((c) => c !== 'hamlog' && owed(q[FIELDS[c]?.sent]));
case 'worked':
// The catch-all: nothing sent, nothing asked for, nothing back.
return !CHANNELS.some((c) => yes(q[FIELDS[c].rcvd]) || yes(q[FIELDS[c].sent]) || owed(q[FIELDS[c].sent]));
return !CHANNELS.some((c) => (c === 'hamlog'
? hamlogState(q, 'rcvd') || hamlogState(q, 'sent')
: yes(q[FIELDS[c].rcvd]) || yes(q[FIELDS[c].sent]) || owed(q[FIELDS[c].sent])));
default:
return false;
}
+24
View File
@@ -991,6 +991,18 @@
@layer base {
* { @apply border-border; }
html, body, #root { height: 100%; }
/* No rubber-band, and no swipe-to-navigate.
Chromium lets a scroll that has reached the end pull the content a few
pixels and spring back, and a two-finger horizontal swipe means "go back a
page". Both are browser behaviours that have no meaning in a logbook: the
first makes a table wobble at the bottom of a list, and the second can
navigate the WebView away from the app entirely — a blank window and a
restart. Neither shows up with a mouse, which is why they went unnoticed;
they arrive with a precision touchpad or a touchscreen.
A no-op wherever the effects don't occur. */
html, body { overscroll-behavior: none; }
/* Root rem base. Tailwind sizing (text/heights/padding/gaps) is in rem, so
this is the single global density knob — shrinks the whole UI uniformly
while Leaflet maps (px-based) stay correct. Default browser base is 16px. */
@@ -1055,3 +1067,15 @@
filter: invert(1) brightness(1.8);
opacity: 0.9;
}
/* Every scrollable pane keeps its overscroll to itself.
"contain" (not "none") on the inside: the pane still scrolls normally, it
simply stops passing the leftover motion up to its parent — which is how
scrolling a grid to its end used to tug the panel behind it. */
.overflow-auto,
.overflow-y-auto,
.overflow-x-auto,
.overflow-scroll {
overscroll-behavior: contain;
}
+1 -1
View File
@@ -1,6 +1,6 @@
// Single source of truth for the app version shown in the UI (header + About).
// Bump this on a release (the release script updates it alongside telemetry.go).
export const APP_VERSION = '0.26.2';
export const APP_VERSION = '0.26.13';
// Author / credits, shown in Help -> About.
export const APP_AUTHOR = 'F4BPO';
+84
View File
@@ -89,6 +89,8 @@ export function AwardMissingQSOs(arg1:string):Promise<Array<qso.QSO>>;
export function AwardRefsForQSOs(arg1:Array<number>):Promise<Record<number, Record<string, string>>>;
export function AwardRefsNew(arg1:Array<string>):Promise<main.AwardRefNewResult>;
export function AwardsFolder():Promise<string>;
export function BackfillDistances():Promise<main.BackfillDistancesResult>;
@@ -115,12 +117,20 @@ export function ChatAvailable():Promise<boolean>;
export function CheckForUpdate():Promise<main.UpdateInfo>;
export function CheckHamlogKey(arg1:string):Promise<string>;
export function ClearKenwoodRIT():Promise<void>;
export function ClearLookupCache():Promise<void>;
export function CloseAutostartPrograms():Promise<void>;
export function ClusterSpotStatuses(arg1:Array<main.SpotQuery>):Promise<Array<main.SpotStatus>>;
export function CompactDatabase(arg1:string):Promise<main.CompactResult>;
export function CompareRDASources():Promise<main.RDACompareResult>;
export function ComputeQSOAwardRefs(arg1:qso.QSO):Promise<Array<main.QSOAwardRef>>;
export function ComputeStationInfo(arg1:string,arg2:string):Promise<main.StationInfoComputed>;
@@ -225,6 +235,8 @@ export function ExportCabrilloFiltered(arg1:string,arg2:qso.QueryFilter):Promise
export function ExportCabrilloSelected(arg1:string,arg2:Array<number>):Promise<main.CabrilloResult>;
export function ExportHamlogUnmatched(arg1:string):Promise<number>;
export function FilterFields():Promise<Array<string>>;
export function FindDuplicates(arg1:number):Promise<Array<main.DuplicateGroup>>;
@@ -365,6 +377,10 @@ export function FlexTXOnBand(arg1:string):Promise<void>;
export function FlexTune(arg1:boolean):Promise<void>;
export function FlexZoomForSpot(arg1:string,arg2:number):Promise<void>;
export function ForgetYaesuBandAntenna(arg1:string):Promise<void>;
export function GetACOMStatus():Promise<acom.Status>;
export function GetADIFMonitor():Promise<main.ADIFMonitorConfig>;
@@ -457,8 +473,12 @@ export function GetFlexBandAntennas():Promise<Record<string, main.FlexBandAnt>>;
export function GetFlexBandPower():Promise<Record<string, main.FlexBandPower>>;
export function GetFlexRSTChase():Promise<main.FlexRSTChase>;
export function GetFlexState():Promise<cat.FlexTXState>;
export function GetFlexZoom():Promise<main.FlexZoomSettings>;
export function GetFolderSync():Promise<main.FolderSyncConfig>;
export function GetFolderSyncStatus():Promise<main.FolderSyncStatus>;
@@ -469,6 +489,8 @@ export function GetGridScopeSettings():Promise<main.GridScopeSettings>;
export function GetIcomState():Promise<cat.IcomTXState>;
export function GetKenwoodState():Promise<cat.KenwoodTXState>;
export function GetLinkedAmps():Promise<Array<string>>;
export function GetListsSettings():Promise<main.ListsSettings>;
@@ -539,6 +561,10 @@ export function GetSlotStats():Promise<qso.SlotStats>;
export function GetSolarData():Promise<solar.Data>;
export function GetSpotColors():Promise<main.SpotColors>;
export function GetSpotMax():Promise<number>;
export function GetSpotTTLMinutes():Promise<number>;
export function GetStartupStatus():Promise<main.StartupStatus>;
@@ -575,6 +601,8 @@ export function GetWinkeyerStatus():Promise<winkeyer.Status>;
export function GetWorkedCallVariants():Promise<boolean>;
export function GetYaesuBandAntennas():Promise<Record<string, number>>;
export function GetYaesuState():Promise<cat.YaesuTXState>;
export function GridSquares(arg1:string):Promise<Array<qso.GridSquare>>;
@@ -675,6 +703,8 @@ export function ImportAwardReferencesText(arg1:string,arg2:string):Promise<numbe
export function ImportAwards():Promise<main.AwardImportResult>;
export function ImportHamlogConfirmations(arg1:string):Promise<main.HamlogCfmResult>;
export function InspectAwardImport():Promise<main.AwardImportPreview>;
export function IsNewUSCounty(arg1:string,arg2:string):Promise<boolean>;
@@ -773,6 +803,8 @@ export function NetSetDefaults(arg1:string,arg2:string,arg3:string,arg4:string):
export function NetUpdateActive(arg1:qso.QSO):Promise<void>;
export function NudgeKenwoodRIT(arg1:number):Promise<void>;
export function OpenADIFFile():Promise<string>;
export function OpenAwardsFolder():Promise<void>;
@@ -875,6 +907,8 @@ export function RecomputeAwardRefsForCode(arg1:string):Promise<number>;
export function RefreshCtyDat():Promise<main.CtyDatInfo>;
export function RefreshKenwood():Promise<void>;
export function RefreshSolar():Promise<void>;
export function RefreshYaesuPanel():Promise<void>;
@@ -905,6 +939,8 @@ export function ResetDatabaseToDefault():Promise<void>;
export function ResetRotorPresets():Promise<Array<main.RotorPreset>>;
export function ResetSpotColors():Promise<main.SpotColors>;
export function RestartApp():Promise<void>;
export function RestartQSORecorder():Promise<void>;
@@ -967,6 +1003,10 @@ export function SaveFlexBandAntennas(arg1:Record<string, main.FlexBandAnt>):Prom
export function SaveFlexBandPower(arg1:Record<string, main.FlexBandPower>):Promise<void>;
export function SaveFlexRSTChase(arg1:main.FlexRSTChase):Promise<void>;
export function SaveFlexZoom(arg1:main.FlexZoomSettings):Promise<void>;
export function SaveFolderSync(arg1:main.FolderSyncConfig):Promise<void>;
export function SaveGridScopeSettings(arg1:main.GridScopeSettings):Promise<void>;
@@ -1003,6 +1043,8 @@ export function SaveRowColors(arg1:main.RowColorSettings):Promise<void>;
export function SaveSelfSpotSettings(arg1:main.SelfSpotSettings):Promise<void>;
export function SaveSpotColors(arg1:main.SpotColors):Promise<void>;
export function SaveStationDevices(arg1:Array<main.StationDevice>):Promise<void>;
export function SaveStationSettings(arg1:main.StationSettings):Promise<void>;
@@ -1065,8 +1107,40 @@ export function SetCompactMode(arg1:boolean):Promise<void>;
export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
export function SetFlexRSTChaseEnabled(arg1:boolean):Promise<void>;
export function SetKenwoodAFGain(arg1:number):Promise<void>;
export function SetKenwoodAGC(arg1:string):Promise<void>;
export function SetKenwoodAntenna(arg1:number):Promise<void>;
export function SetKenwoodAtt(arg1:boolean):Promise<void>;
export function SetKenwoodFilter(arg1:number):Promise<void>;
export function SetKenwoodKeySpeed(arg1:number):Promise<void>;
export function SetKenwoodMicGain(arg1:number):Promise<void>;
export function SetKenwoodNB(arg1:boolean):Promise<void>;
export function SetKenwoodNR(arg1:boolean):Promise<void>;
export function SetKenwoodPower(arg1:number):Promise<void>;
export function SetKenwoodPreamp(arg1:boolean):Promise<void>;
export function SetKenwoodRFGain(arg1:number):Promise<void>;
export function SetKenwoodRIT(arg1:boolean):Promise<void>;
export function SetKenwoodSquelch(arg1:number):Promise<void>;
export function SetKenwoodTX(arg1:boolean):Promise<void>;
export function SetKenwoodXIT(arg1:boolean):Promise<void>;
export function SetLinkedAmps(arg1:Array<string>):Promise<void>;
export function SetMotorFollow(arg1:boolean,arg2:number,arg3:string):Promise<void>;
@@ -1079,6 +1153,8 @@ export function SetPassphrase(arg1:string):Promise<void>;
export function SetScpEnabled(arg1:boolean):Promise<void>;
export function SetSpotMax(arg1:number):Promise<void>;
export function SetSpotTTLMinutes(arg1:number):Promise<void>;
export function SetTelemetryEnabled(arg1:boolean):Promise<void>;
@@ -1095,6 +1171,8 @@ export function SetYaesuAFGain(arg1:number):Promise<void>;
export function SetYaesuAGC(arg1:string):Promise<void>;
export function SetYaesuAntenna(arg1:number):Promise<void>;
export function SetYaesuAtt(arg1:number):Promise<void>;
export function SetYaesuBand(arg1:string):Promise<void>;
@@ -1171,6 +1249,10 @@ export function TestUltrabeam(arg1:main.UltrabeamSettings):Promise<void>;
export function TestWebPublishFTP(arg1:webpub.Config):Promise<string>;
export function ToggleKenwoodATU():Promise<void>;
export function TuneKenwoodATU():Promise<void>;
export function TuneYaesuATU():Promise<void>;
export function TunerGeniusActivate(arg1:number):Promise<void>;
@@ -1223,6 +1305,8 @@ export function WinkeyerTraceEnabled():Promise<boolean>;
export function WorkedBefore(arg1:string,arg2:number):Promise<qso.WorkedBefore>;
export function YaesuApplyBandAntenna(arg1:string):Promise<void>;
export function YaesuSendCW(arg1:string):Promise<void>;
export function YaesuStopCW():Promise<void>;
+168
View File
@@ -118,6 +118,10 @@ export function AwardRefsForQSOs(arg1) {
return window['go']['main']['App']['AwardRefsForQSOs'](arg1);
}
export function AwardRefsNew(arg1) {
return window['go']['main']['App']['AwardRefsNew'](arg1);
}
export function AwardsFolder() {
return window['go']['main']['App']['AwardsFolder']();
}
@@ -170,6 +174,14 @@ export function CheckForUpdate() {
return window['go']['main']['App']['CheckForUpdate']();
}
export function CheckHamlogKey(arg1) {
return window['go']['main']['App']['CheckHamlogKey'](arg1);
}
export function ClearKenwoodRIT() {
return window['go']['main']['App']['ClearKenwoodRIT']();
}
export function ClearLookupCache() {
return window['go']['main']['App']['ClearLookupCache']();
}
@@ -182,6 +194,14 @@ export function ClusterSpotStatuses(arg1) {
return window['go']['main']['App']['ClusterSpotStatuses'](arg1);
}
export function CompactDatabase(arg1) {
return window['go']['main']['App']['CompactDatabase'](arg1);
}
export function CompareRDASources() {
return window['go']['main']['App']['CompareRDASources']();
}
export function ComputeQSOAwardRefs(arg1) {
return window['go']['main']['App']['ComputeQSOAwardRefs'](arg1);
}
@@ -390,6 +410,10 @@ export function ExportCabrilloSelected(arg1, arg2) {
return window['go']['main']['App']['ExportCabrilloSelected'](arg1, arg2);
}
export function ExportHamlogUnmatched(arg1) {
return window['go']['main']['App']['ExportHamlogUnmatched'](arg1);
}
export function FilterFields() {
return window['go']['main']['App']['FilterFields']();
}
@@ -670,6 +694,14 @@ export function FlexTune(arg1) {
return window['go']['main']['App']['FlexTune'](arg1);
}
export function FlexZoomForSpot(arg1, arg2) {
return window['go']['main']['App']['FlexZoomForSpot'](arg1, arg2);
}
export function ForgetYaesuBandAntenna(arg1) {
return window['go']['main']['App']['ForgetYaesuBandAntenna'](arg1);
}
export function GetACOMStatus() {
return window['go']['main']['App']['GetACOMStatus']();
}
@@ -854,10 +886,18 @@ export function GetFlexBandPower() {
return window['go']['main']['App']['GetFlexBandPower']();
}
export function GetFlexRSTChase() {
return window['go']['main']['App']['GetFlexRSTChase']();
}
export function GetFlexState() {
return window['go']['main']['App']['GetFlexState']();
}
export function GetFlexZoom() {
return window['go']['main']['App']['GetFlexZoom']();
}
export function GetFolderSync() {
return window['go']['main']['App']['GetFolderSync']();
}
@@ -878,6 +918,10 @@ export function GetIcomState() {
return window['go']['main']['App']['GetIcomState']();
}
export function GetKenwoodState() {
return window['go']['main']['App']['GetKenwoodState']();
}
export function GetLinkedAmps() {
return window['go']['main']['App']['GetLinkedAmps']();
}
@@ -1018,6 +1062,14 @@ export function GetSolarData() {
return window['go']['main']['App']['GetSolarData']();
}
export function GetSpotColors() {
return window['go']['main']['App']['GetSpotColors']();
}
export function GetSpotMax() {
return window['go']['main']['App']['GetSpotMax']();
}
export function GetSpotTTLMinutes() {
return window['go']['main']['App']['GetSpotTTLMinutes']();
}
@@ -1090,6 +1142,10 @@ export function GetWorkedCallVariants() {
return window['go']['main']['App']['GetWorkedCallVariants']();
}
export function GetYaesuBandAntennas() {
return window['go']['main']['App']['GetYaesuBandAntennas']();
}
export function GetYaesuState() {
return window['go']['main']['App']['GetYaesuState']();
}
@@ -1290,6 +1346,10 @@ export function ImportAwards() {
return window['go']['main']['App']['ImportAwards']();
}
export function ImportHamlogConfirmations(arg1) {
return window['go']['main']['App']['ImportHamlogConfirmations'](arg1);
}
export function InspectAwardImport() {
return window['go']['main']['App']['InspectAwardImport']();
}
@@ -1486,6 +1546,10 @@ export function NetUpdateActive(arg1) {
return window['go']['main']['App']['NetUpdateActive'](arg1);
}
export function NudgeKenwoodRIT(arg1) {
return window['go']['main']['App']['NudgeKenwoodRIT'](arg1);
}
export function OpenADIFFile() {
return window['go']['main']['App']['OpenADIFFile']();
}
@@ -1690,6 +1754,10 @@ export function RefreshCtyDat() {
return window['go']['main']['App']['RefreshCtyDat']();
}
export function RefreshKenwood() {
return window['go']['main']['App']['RefreshKenwood']();
}
export function RefreshSolar() {
return window['go']['main']['App']['RefreshSolar']();
}
@@ -1750,6 +1818,10 @@ export function ResetRotorPresets() {
return window['go']['main']['App']['ResetRotorPresets']();
}
export function ResetSpotColors() {
return window['go']['main']['App']['ResetSpotColors']();
}
export function RestartApp() {
return window['go']['main']['App']['RestartApp']();
}
@@ -1874,6 +1946,14 @@ export function SaveFlexBandPower(arg1) {
return window['go']['main']['App']['SaveFlexBandPower'](arg1);
}
export function SaveFlexRSTChase(arg1) {
return window['go']['main']['App']['SaveFlexRSTChase'](arg1);
}
export function SaveFlexZoom(arg1) {
return window['go']['main']['App']['SaveFlexZoom'](arg1);
}
export function SaveFolderSync(arg1) {
return window['go']['main']['App']['SaveFolderSync'](arg1);
}
@@ -1946,6 +2026,10 @@ export function SaveSelfSpotSettings(arg1) {
return window['go']['main']['App']['SaveSelfSpotSettings'](arg1);
}
export function SaveSpotColors(arg1) {
return window['go']['main']['App']['SaveSpotColors'](arg1);
}
export function SaveStationDevices(arg1) {
return window['go']['main']['App']['SaveStationDevices'](arg1);
}
@@ -2070,10 +2154,74 @@ export function SetDVKLabel(arg1, arg2) {
return window['go']['main']['App']['SetDVKLabel'](arg1, arg2);
}
export function SetFlexRSTChaseEnabled(arg1) {
return window['go']['main']['App']['SetFlexRSTChaseEnabled'](arg1);
}
export function SetKenwoodAFGain(arg1) {
return window['go']['main']['App']['SetKenwoodAFGain'](arg1);
}
export function SetKenwoodAGC(arg1) {
return window['go']['main']['App']['SetKenwoodAGC'](arg1);
}
export function SetKenwoodAntenna(arg1) {
return window['go']['main']['App']['SetKenwoodAntenna'](arg1);
}
export function SetKenwoodAtt(arg1) {
return window['go']['main']['App']['SetKenwoodAtt'](arg1);
}
export function SetKenwoodFilter(arg1) {
return window['go']['main']['App']['SetKenwoodFilter'](arg1);
}
export function SetKenwoodKeySpeed(arg1) {
return window['go']['main']['App']['SetKenwoodKeySpeed'](arg1);
}
export function SetKenwoodMicGain(arg1) {
return window['go']['main']['App']['SetKenwoodMicGain'](arg1);
}
export function SetKenwoodNB(arg1) {
return window['go']['main']['App']['SetKenwoodNB'](arg1);
}
export function SetKenwoodNR(arg1) {
return window['go']['main']['App']['SetKenwoodNR'](arg1);
}
export function SetKenwoodPower(arg1) {
return window['go']['main']['App']['SetKenwoodPower'](arg1);
}
export function SetKenwoodPreamp(arg1) {
return window['go']['main']['App']['SetKenwoodPreamp'](arg1);
}
export function SetKenwoodRFGain(arg1) {
return window['go']['main']['App']['SetKenwoodRFGain'](arg1);
}
export function SetKenwoodRIT(arg1) {
return window['go']['main']['App']['SetKenwoodRIT'](arg1);
}
export function SetKenwoodSquelch(arg1) {
return window['go']['main']['App']['SetKenwoodSquelch'](arg1);
}
export function SetKenwoodTX(arg1) {
return window['go']['main']['App']['SetKenwoodTX'](arg1);
}
export function SetKenwoodXIT(arg1) {
return window['go']['main']['App']['SetKenwoodXIT'](arg1);
}
export function SetLinkedAmps(arg1) {
return window['go']['main']['App']['SetLinkedAmps'](arg1);
}
@@ -2098,6 +2246,10 @@ export function SetScpEnabled(arg1) {
return window['go']['main']['App']['SetScpEnabled'](arg1);
}
export function SetSpotMax(arg1) {
return window['go']['main']['App']['SetSpotMax'](arg1);
}
export function SetSpotTTLMinutes(arg1) {
return window['go']['main']['App']['SetSpotTTLMinutes'](arg1);
}
@@ -2130,6 +2282,10 @@ export function SetYaesuAGC(arg1) {
return window['go']['main']['App']['SetYaesuAGC'](arg1);
}
export function SetYaesuAntenna(arg1) {
return window['go']['main']['App']['SetYaesuAntenna'](arg1);
}
export function SetYaesuAtt(arg1) {
return window['go']['main']['App']['SetYaesuAtt'](arg1);
}
@@ -2282,6 +2438,14 @@ export function TestWebPublishFTP(arg1) {
return window['go']['main']['App']['TestWebPublishFTP'](arg1);
}
export function ToggleKenwoodATU() {
return window['go']['main']['App']['ToggleKenwoodATU']();
}
export function TuneKenwoodATU() {
return window['go']['main']['App']['TuneKenwoodATU']();
}
export function TuneYaesuATU() {
return window['go']['main']['App']['TuneYaesuATU']();
}
@@ -2386,6 +2550,10 @@ export function WorkedBefore(arg1, arg2) {
return window['go']['main']['App']['WorkedBefore'](arg1, arg2);
}
export function YaesuApplyBandAntenna(arg1) {
return window['go']['main']['App']['YaesuApplyBandAntenna'](arg1);
}
export function YaesuSendCW(arg1) {
return window['go']['main']['App']['YaesuSendCW'](arg1);
}
+301
View File
@@ -1067,6 +1067,74 @@ export namespace cat {
this.anti_vox = source["anti_vox"];
}
}
export class KenwoodTXState {
available: boolean;
model?: string;
elecraft: boolean;
mode?: string;
transmitting: boolean;
split: boolean;
split_tx_hz: number;
s_meter: number;
s_meter_raw: number;
power_meter: number;
swr: number;
swr_raw: number;
rf_power: number;
af_gain: number;
rf_gain: number;
mic_gain: number;
squelch: number;
preamp: boolean;
att: boolean;
nb: boolean;
nr: boolean;
agc?: string;
filter_hz: number;
antenna: number;
rit: boolean;
xit: boolean;
rit_offset: number;
key_speed: number;
meters_provisional: boolean;
static createFrom(source: any = {}) {
return new KenwoodTXState(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.available = source["available"];
this.model = source["model"];
this.elecraft = source["elecraft"];
this.mode = source["mode"];
this.transmitting = source["transmitting"];
this.split = source["split"];
this.split_tx_hz = source["split_tx_hz"];
this.s_meter = source["s_meter"];
this.s_meter_raw = source["s_meter_raw"];
this.power_meter = source["power_meter"];
this.swr = source["swr"];
this.swr_raw = source["swr_raw"];
this.rf_power = source["rf_power"];
this.af_gain = source["af_gain"];
this.rf_gain = source["rf_gain"];
this.mic_gain = source["mic_gain"];
this.squelch = source["squelch"];
this.preamp = source["preamp"];
this.att = source["att"];
this.nb = source["nb"];
this.nr = source["nr"];
this.agc = source["agc"];
this.filter_hz = source["filter_hz"];
this.antenna = source["antenna"];
this.rit = source["rit"];
this.xit = source["xit"];
this.rit_offset = source["rit_offset"];
this.key_speed = source["key_speed"];
this.meters_provisional = source["meters_provisional"];
}
}
export class RigState {
enabled: boolean;
connected: boolean;
@@ -1154,12 +1222,15 @@ export namespace cat {
power_meter: number;
swr_meter: number;
rf_power: number;
max_power: number;
narrow_supported: boolean;
mic_gain: number;
af_gain: number;
rf_gain: number;
squelch: number;
agc?: string;
preamp: number;
antenna: number;
att: number;
nb: boolean;
nr: boolean;
@@ -1188,12 +1259,15 @@ export namespace cat {
this.power_meter = source["power_meter"];
this.swr_meter = source["swr_meter"];
this.rf_power = source["rf_power"];
this.max_power = source["max_power"];
this.narrow_supported = source["narrow_supported"];
this.mic_gain = source["mic_gain"];
this.af_gain = source["af_gain"];
this.rf_gain = source["rf_gain"];
this.squelch = source["squelch"];
this.agc = source["agc"];
this.preamp = source["preamp"];
this.antenna = source["antenna"];
this.att = source["att"];
this.nb = source["nb"];
this.nr = source["nr"];
@@ -1367,6 +1441,7 @@ export namespace extsvc {
hrdlog: ServiceConfig;
eqsl: ServiceConfig;
cloudlog: ServiceConfig;
hamlog: ServiceConfig;
delete_remote: boolean;
static createFrom(source: any = {}) {
@@ -1381,6 +1456,7 @@ export namespace extsvc {
this.hrdlog = this.convertValues(source["hrdlog"], ServiceConfig);
this.eqsl = this.convertValues(source["eqsl"], ServiceConfig);
this.cloudlog = this.convertValues(source["cloudlog"], ServiceConfig);
this.hamlog = this.convertValues(source["hamlog"], ServiceConfig);
this.delete_remote = source["delete_remote"];
}
@@ -1873,6 +1949,20 @@ export namespace main {
this.can_update = source["can_update"];
}
}
export class AwardRefNewResult {
new: Record<string, boolean>;
pending: boolean;
static createFrom(source: any = {}) {
return new AwardRefNewResult(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.new = source["new"];
this.pending = source["pending"];
}
}
export class AwardStatRow {
label: string;
cells: number[];
@@ -2281,6 +2371,24 @@ export namespace main {
this.count = source["count"];
}
}
export class CompactResult {
path: string;
backend: string;
before: number;
after: number;
static createFrom(source: any = {}) {
return new CompactResult(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.path = source["path"];
this.backend = source["backend"];
this.before = source["before"];
this.after = source["after"];
}
}
export class ContestBandRow {
band: string;
count: number;
@@ -2501,6 +2609,44 @@ export namespace main {
this.body = source["body"];
}
}
export class FlexRSTChase {
enabled: boolean;
markers: string;
offset_hz: number;
split_only: boolean;
static createFrom(source: any = {}) {
return new FlexRSTChase(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.enabled = source["enabled"];
this.markers = source["markers"];
this.offset_hz = source["offset_hz"];
this.split_only = source["split_only"];
}
}
export class FlexZoomSettings {
enabled: boolean;
cw_khz: number;
ssb_khz: number;
digi_khz: number;
centre: boolean;
static createFrom(source: any = {}) {
return new FlexZoomSettings(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.enabled = source["enabled"];
this.cw_khz = source["cw_khz"];
this.ssb_khz = source["ssb_khz"];
this.digi_khz = source["digi_khz"];
this.centre = source["centre"];
}
}
export class FolderSyncConfig {
enabled: boolean;
folder: string;
@@ -2643,6 +2789,28 @@ export namespace main {
return a;
}
}
export class HamlogCfmResult {
total: number;
confirmed: number;
matched: number;
by_class: number;
unmatched: number;
samples: string[];
static createFrom(source: any = {}) {
return new HamlogCfmResult(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.total = source["total"];
this.confirmed = source["confirmed"];
this.matched = source["matched"];
this.by_class = source["by_class"];
this.unmatched = source["unmatched"];
this.samples = source["samples"];
}
}
export class ModePreset {
name: string;
default_rst_sent?: string;
@@ -2976,6 +3144,8 @@ export namespace main {
hrdlog_status: string;
qrzcom_status: string;
qrzcom_confirmed: string;
hamlog_status: string;
hamlog_confirmed: string;
static createFrom(source: any = {}) {
return new QSLDefaults(source);
@@ -2993,6 +3163,8 @@ export namespace main {
this.hrdlog_status = source["hrdlog_status"];
this.qrzcom_status = source["qrzcom_status"];
this.qrzcom_confirmed = source["qrzcom_confirmed"];
this.hamlog_status = source["hamlog_status"];
this.hamlog_confirmed = source["hamlog_confirmed"];
}
}
export class QSLEmailTemplates {
@@ -3169,6 +3341,79 @@ export namespace main {
this.team_last60 = source["team_last60"];
}
}
export class RDAConflict {
qso_id: number;
callsign: string;
date: string;
band: string;
mode: string;
from_log: string;
from_db: string;
dated: boolean;
confirmed: boolean;
static createFrom(source: any = {}) {
return new RDAConflict(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.qso_id = source["qso_id"];
this.callsign = source["callsign"];
this.date = source["date"];
this.band = source["band"];
this.mode = source["mode"];
this.from_log = source["from_log"];
this.from_db = source["from_db"];
this.dated = source["dated"];
this.confirmed = source["confirmed"];
}
}
export class RDACompareResult {
scanned: number;
both_known: number;
agree: number;
disagree: number;
only_log: number;
only_db: number;
neither: number;
conflicts: RDAConflict[];
static createFrom(source: any = {}) {
return new RDACompareResult(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.scanned = source["scanned"];
this.both_known = source["both_known"];
this.agree = source["agree"];
this.disagree = source["disagree"];
this.only_log = source["only_log"];
this.only_db = source["only_db"];
this.neither = source["neither"];
this.conflicts = this.convertValues(source["conflicts"], RDAConflict);
}
convertValues(a: any, classs: any, asMap: boolean = false): any {
if (!a) {
return a;
}
if (a.slice && a.map) {
return (a as any[]).map(elem => this.convertValues(elem, classs));
} else if ("object" === typeof a) {
if (asMap) {
for (const key of Object.keys(a)) {
a[key] = new classs(a[key]);
}
return a;
}
return new classs(a);
}
return a;
}
}
export class RelayAutoRule {
device_id: string;
relay: number;
@@ -3408,6 +3653,54 @@ export namespace main {
this.minutes = source["minutes"];
}
}
export class SpotColor {
text: string;
bg?: string;
hide?: boolean;
static createFrom(source: any = {}) {
return new SpotColor(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.text = source["text"];
this.bg = source["bg"];
this.hide = source["hide"];
}
}
export class SpotColors {
enabled: boolean;
colors: Record<string, SpotColor>;
static createFrom(source: any = {}) {
return new SpotColors(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.enabled = source["enabled"];
this.colors = this.convertValues(source["colors"], SpotColor, true);
}
convertValues(a: any, classs: any, asMap: boolean = false): any {
if (!a) {
return a;
}
if (a.slice && a.map) {
return (a as any[]).map(elem => this.convertValues(elem, classs));
} else if ("object" === typeof a) {
if (asMap) {
for (const key of Object.keys(a)) {
a[key] = new classs(a[key]);
}
return a;
}
return new classs(a);
}
return a;
}
}
export class SpotQuery {
call: string;
band: string;
@@ -5016,6 +5309,10 @@ export namespace qso {
continents: number;
first_qso: string;
last_qso: string;
last_new_dxcc: string;
last_new_dxcc_num: number;
last_new_dxcc_call: string;
last_new_dxcc_date: string;
confirmed_lotw: number;
confirmed_eqsl: number;
confirmed_qsl: number;
@@ -5066,6 +5363,10 @@ export namespace qso {
this.continents = source["continents"];
this.first_qso = source["first_qso"];
this.last_qso = source["last_qso"];
this.last_new_dxcc = source["last_new_dxcc"];
this.last_new_dxcc_num = source["last_new_dxcc_num"];
this.last_new_dxcc_call = source["last_new_dxcc_call"];
this.last_new_dxcc_date = source["last_new_dxcc_date"];
this.confirmed_lotw = source["confirmed_lotw"];
this.confirmed_eqsl = source["confirmed_eqsl"];
this.confirmed_qsl = source["confirmed_qsl"];
+64
View File
@@ -0,0 +1,64 @@
package main
import (
"os"
"strings"
"testing"
)
// The build gate is only as good as the moments it runs at.
//
// It used to run at startup alone, on the profile active then — and a fresh
// install has NO callsign at that point. The operator typed theirs afterwards,
// so a denied call ran for the whole session and reached the telemetry, which
// reads the very same field. Every place that can make a denied callsign the
// ACTIVE one has to re-ask.
func TestCallGateRunsWhereverTheActiveCallsignChanges(t *testing.T) {
src, err := os.ReadFile("app.go")
if err != nil {
t.Fatal(err)
}
for _, fn := range []string{
"func (a *App) startup(ctx context.Context) {", // launch
"func (a *App) SaveStationSettings(s StationSettings) error {", // the call is entered here
"func (a *App) SaveProfile(p profile.Profile) (profile.Profile, error) {",
"func (a *App) ActivateProfile(id int64) error {",
} {
body := funcBody(t, string(src), fn)
if !strings.Contains(body, "enforceCallGate(") {
t.Errorf("%s can change the active callsign but never re-checks the gate", fn)
}
}
}
// The hashes are the whole mechanism: a truncated or re-cased entry silently
// matches nothing, and nothing in the running program would ever say so.
func TestDeniedCallHashesAreWellFormed(t *testing.T) {
if len(deniedCallHashes) == 0 {
t.Fatal("the deny list is empty — the gate has stopped gating")
}
for h := range deniedCallHashes {
if len(h) != 64 {
t.Errorf("hash %q is %d chars, want 64", h, len(h))
}
if h != strings.ToLower(h) {
t.Errorf("hash %q is not lower-case, so it can never match", h)
}
}
}
// A slashed call must reduce to the real one, or /P is a way round the gate.
func TestDenyBaseCall(t *testing.T) {
for in, want := range map[string]string{
"f4xyz": "F4XYZ",
" F4XYZ ": "F4XYZ",
"F4XYZ/P": "F4XYZ",
"TM/F4XYZ": "F4XYZ",
"F4XYZ/MM": "F4XYZ",
"": "",
} {
if got := denyBaseCall(in); got != want {
t.Errorf("denyBaseCall(%q) = %q, want %q", in, got, want)
}
}
}
+264
View File
@@ -0,0 +1,264 @@
package main
// Reading confirmations back from a HAMLOG.online ADIF export.
//
// Their agent protocol only uploads — it has no verb for asking what has been
// confirmed — so the return path is a file: their site exports an ADIF, and the
// operator feeds it back here.
//
// That file must NOT be imported the ordinary way. A plain import matches a
// record to a local QSO on callsign + UTC MINUTE + band + mode, and their
// export is rebuilt from their own database: a minute of rounding, SSB where
// the log says USB, and the key no longer matches. "Update duplicates" then
// does what it is told — no duplicate found, so it inserts — and a few hundred
// copies of contacts the operator already had land in the log. That is exactly
// what happened once, and it is why this path exists instead.
//
// So: match only, never insert. Confirmations are stamped onto the QSOs already
// in the log, and anything that cannot be matched is REPORTED rather than
// added, because an unmatched confirmation is a question about the log (a
// minute off, a portable call) and not a contact to create.
import (
"context"
"fmt"
"os"
"strings"
"time"
wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
"hamlog/internal/adif"
"hamlog/internal/applog"
"hamlog/internal/award"
"hamlog/internal/qso"
)
// hamlogUnmatchedMax bounds what is kept for export. A whole log's worth of
// unmatched records means the file belongs to another station, not that the
// operator wants 50 000 of them written back out.
const hamlogUnmatchedMax = 20000
// HamlogCfmResult is what the import did.
type HamlogCfmResult struct {
Total int `json:"total"` // records read from the file
Confirmed int `json:"confirmed"` // records carrying HAMLOG's confirmation flag
Matched int `json:"matched"` // local QSOs stamped
ByClass int `json:"by_class"` // matched on mode CLASS rather than exact mode
Unmatched int `json:"unmatched"` // confirmations with no local QSO
// Samples names a few unmatched contacts, so "12 unmatched" can be looked
// into rather than merely worried about. The full list is kept for export —
// see ExportHamlogUnmatched — because 395 of them is not a sample-sized
// problem: it is a list to work through.
Samples []string `json:"samples"`
}
// hamlogCfmSamples caps the reported list — enough to see the pattern, not so
// many that the dialog becomes a log file.
const hamlogCfmSamples = 30
// ImportHamlogConfirmations stamps the confirmations from a HAMLOG.online ADIF
// export onto the matching local QSOs. It inserts nothing.
func (a *App) ImportHamlogConfirmations(path string) (HamlogCfmResult, error) {
var res HamlogCfmResult
if a.qso == nil {
return res, fmt.Errorf("db not initialized")
}
if strings.TrimSpace(path) == "" {
return res, fmt.Errorf("empty path")
}
f, err := os.Open(path)
if err != nil {
return res, err
}
defer f.Close()
ctx := a.ctx
if ctx == nil {
ctx = context.Background()
}
// The same two indexes the LoTW download uses: the exact key, then the
// mode-CLASS key for the contacts whose mode was written differently at the
// other end (FT8 exported as DATA, SSB where the log says USB).
keyIDs, err := a.qso.DedupeKeyIDs(ctx)
if err != nil {
return res, fmt.Errorf("read local log: %w", err)
}
classIDs, _ := a.qso.DedupeClassKeyIDs(ctx)
emit := func(line string) {
if a.ctx != nil {
wruntime.EventsEmit(a.ctx, "qslmgr:log", line)
}
}
emit("Reading " + path + "…")
// What already counts towards an award, so each confirmation can be flagged
// NEW. LoTW and paper QSL are the two award-valid sources; a HAMLOG
// confirmation is "new" when it lands on a slot neither of them holds — which
// is the only sense in which it changes anything.
sets, _ := a.qso.ConfirmedSlots(ctx, []string{"lotw_rcvd", "qsl_rcvd"})
var items []ConfirmationItem
var unmatched []qso.QSO
perr := adif.Parse(f, func(rec adif.Record) error {
q, ok := adif.RecordToQSO(rec)
if !ok {
return nil
}
res.Total++
// Only the records they actually confirmed. The export carries the whole
// log, and stamping "confirmed" on all of it would turn every uploaded
// contact into a confirmed one.
if !hamlogRecordConfirmed(rec) {
return nil
}
res.Confirmed++
minute := q.QSODate.UTC().Format("2006-01-02T15:04")
id, found := keyIDs[qso.DedupeKey(q.Callsign, minute, q.Band, q.Mode)]
if !found {
// id 0 means the class key is ambiguous — several local QSOs share
// it — and guessing between them would stamp the wrong one.
if cid, ok := classIDs[qso.DedupeClassKey(q.Callsign, minute, q.Band, q.Mode)]; ok && cid != 0 {
id, found = cid, true
res.ByClass++
}
}
if !found {
res.Unmatched++
if len(res.Samples) < hamlogCfmSamples {
res.Samples = append(res.Samples, fmt.Sprintf("%s · %s · %s · %s",
q.Callsign, q.QSODate.UTC().Format("2006-01-02 15:04Z"), q.Band, q.Mode))
}
if len(unmatched) < hamlogUnmatchedMax {
unmatched = append(unmatched, q)
}
return nil
}
date := hamlogCfmDate(rec)
if e := a.qso.SetExtra(ctx, id, award.HamlogQSLKey, "Y"); e != nil {
return nil
}
_ = a.qso.SetExtra(ctx, id, hamlogQSLDateKey, date)
// A confirmed contact is by definition one they hold, so the sent side
// is true whether or not OpsLog is what uploaded it — a log uploaded
// from their website would otherwise read "never sent, yet confirmed".
_ = a.qso.SetExtra(ctx, id, hamlogSentKey, "Y")
res.Matched++
// Feed the Results view, the same rows the LoTW download produces: an
// import that only prints counts leaves the operator with no way to see
// WHICH contacts were confirmed, which is the reason they ran it.
a.enrichContactedFromCty(&q) // country/dxcc, for the entity flags
it := ConfirmationItem{
Callsign: q.Callsign,
QSODate: q.QSODate.UTC().Format(time.RFC3339),
Band: q.Band,
Mode: q.Mode,
Country: q.Country,
}
if q.DXCC != nil && *q.DXCC != 0 {
n := *q.DXCC
it.NewDXCC = !sets.DXCC[n]
it.NewBand = !sets.Band[qso.BandKey(n, q.Band)]
it.NewMode = !sets.Mode[qso.ModeClassKey(n, q.Mode)]
it.NewSlot = !sets.Slot[qso.SlotClassKey(n, q.Band, q.Mode)]
// Fold it in, so a repeat inside the same file isn't flagged twice.
sets.DXCC[n] = true
sets.Band[qso.BandKey(n, q.Band)] = true
sets.Mode[qso.ModeClassKey(n, q.Mode)] = true
sets.Slot[qso.SlotClassKey(n, q.Band, q.Mode)] = true
}
items = append(items, it)
return nil
})
if perr != nil {
return res, perr
}
a.invalidateAwardStats() // confirmations move award counts
// Kept for ExportHamlogUnmatched. Held rather than written now: the operator
// decides whether a list of 395 is worth a file.
a.hamlogUnmatchedMu.Lock()
a.hamlogUnmatched = unmatched
a.hamlogUnmatchedMu.Unlock()
if a.ctx != nil {
wruntime.EventsEmit(a.ctx, "qslmgr:confirmations", items)
}
applog.Printf("hamlog cfm import: %d records, %d confirmed, %d matched (%d by mode class), %d unmatched",
res.Total, res.Confirmed, res.Matched, res.ByClass, res.Unmatched)
emit(fmt.Sprintf("%d records read, %d confirmed by HAMLOG.online, %d matched in the log (%d by mode class), %d unmatched",
res.Total, res.Confirmed, res.Matched, res.ByClass, res.Unmatched))
for _, s := range res.Samples {
emit(" unmatched: " + s)
}
if res.Unmatched > len(res.Samples) {
emit(fmt.Sprintf(" …and %d more — use \"Export unmatched (ADIF)…\" to get the whole list.",
res.Unmatched-len(res.Samples)))
}
if a.ctx != nil {
wruntime.EventsEmit(a.ctx, "qslmgr:done", map[string]any{"uploaded": res.Matched, "total": res.Confirmed})
}
return res, nil
}
// ExportHamlogUnmatched writes the confirmations the last import could not
// place onto a QSO.
//
// They are the interesting half of the result: each one is a contact HAMLOG
// believes it holds and this log does not agree about — a minute of drift, a
// portable call, a band written differently, or a QSO genuinely missing. A
// count cannot be worked through; a file can be opened, sorted and compared.
//
// Written as ADIF because that is what every other tool reads, and because it
// can be handed straight back to an import once the discrepancies are settled.
func (a *App) ExportHamlogUnmatched(path string) (int, error) {
a.hamlogUnmatchedMu.Lock()
rows := a.hamlogUnmatched
a.hamlogUnmatchedMu.Unlock()
if len(rows) == 0 {
return 0, fmt.Errorf("nothing to export: the last import left no unmatched confirmations")
}
if strings.TrimSpace(path) == "" {
return 0, fmt.Errorf("empty path")
}
recs := make([]string, 0, len(rows))
for i := range rows {
recs = append(recs, adif.FullRecordADIF(rows[i]))
}
if err := os.WriteFile(path, []byte(adif.BatchRecordsADIF(recs)), 0o644); err != nil {
return 0, err
}
applog.Printf("hamlog cfm import: exported %d unmatched confirmation(s) to %s", len(rows), path)
return len(rows), nil
}
// hamlogQSLDateKey stamps WHEN the confirmation was read back. Their export
// carries no confirmation date of its own, so this is the import date — which
// is honest about what it knows, unlike borrowing the QSO date.
const hamlogQSLDateKey = "APP_OPSLOG_HAMLOG_QSL_DATE"
// hamlogRecordConfirmed reads their flag off a raw ADIF record. The primary key
// is the one their own export writes; the alternates are the names OpsLog and
// other tools have used, so a file that went through another logger still reads.
func hamlogRecordConfirmed(rec adif.Record) bool {
keys := append([]string{award.HamlogQSLKey}, award.HamlogAltKeys()...)
for _, k := range keys {
v := strings.ToUpper(strings.TrimSpace(rec[strings.ToLower(k)]))
if v != "" && v != "N" && v != "NO" {
return true
}
}
return false
}
// hamlogCfmDate is the date to stamp: the import date, in ADIF form.
func hamlogCfmDate(rec adif.Record) string {
// If a future export ever carries one, take it rather than today's date.
for _, k := range []string{"app_hamlog_qso_cfm_date", "qslrdate"} {
if v := strings.TrimSpace(rec[k]); len(v) == 8 {
return v
}
}
return time.Now().UTC().Format("20060102")
}
+69 -4
View File
@@ -20,9 +20,15 @@ var (
mu sync.Mutex
file *os.File
path string
written int64 // bytes in the CURRENT file, for the size check in Printf
crashFile *os.File // kept open so the runtime can write a crash traceback to it
)
// maxLogBytes is where the file rolls over, at startup AND while running.
// A variable, not a constant, so the rotation can be exercised in a test without
// writing ten megabytes to do it.
var maxLogBytes int64 = 10 * 1024 * 1024
// Init opens (creates) the log file in dataDir. On rotation we truncate
// at startup if the file is too big; for now it's a single file, no
// rolling — the volume is low (a few KB per session).
@@ -47,12 +53,12 @@ func Init(dataDir string) (string, error) {
_ = os.Rename(oldLog, logPath)
}
}
// Rotate (don't delete) once the file grows past ~10MB: rename it to
// Rotate (don't delete) once the file grows past maxLogBytes: rename it to
// opslog.log.1 so the PREVIOUS session's log survives. Deleting it outright used
// to erase exactly the diagnostics we needed when a user reported an issue from
// the session that just ended. One generation kept — enough, without unbounded growth.
if fi, err := os.Stat(logPath); err == nil && fi.Size() > 10*1024*1024 {
_ = os.Remove(logPath + ".1") // drop the older generation
if fi, err := os.Stat(logPath); err == nil && fi.Size() > maxLogBytes {
_ = os.Remove(logPath + ".1") // drop the older generation
if err := os.Rename(logPath, logPath+".1"); err != nil {
_ = os.Remove(logPath) // rename failed (locked?) → fall back to the old behaviour
}
@@ -96,13 +102,57 @@ func Printf(format string, args ...any) {
msg = msg[:len(msg)-1]
}
if file != nil {
fmt.Fprintf(file, "%s %s\n", stamp, msg)
n, _ := fmt.Fprintf(file, "%s %s\n", stamp, msg)
written += int64(n)
rotateIfBigLocked()
}
// Also dump to stderr in case the binary was launched with a console
// attached (wails dev, custom build).
fmt.Fprintf(os.Stderr, "%s %s\n", stamp, msg)
}
// rotateIfBigLocked rolls the file over mid-session once it passes maxLogBytes.
//
// The check used to happen at STARTUP only, on the reasonable belief that a
// session writes a few kilobytes. The CI-V wire trace disproved it: left on for
// a day it wrote 416 MB, and nothing would have stopped it before the disk did.
// A log that has to be rotated by quitting the program is not a bound.
//
// Same one-generation scheme as the startup rotation, so the previous stretch
// survives — which is the half an operator usually needs, the part just before
// the thing they are reporting.
//
// Caller holds mu.
func rotateIfBigLocked() {
if written < maxLogBytes || file == nil || path == "" {
return
}
fmt.Fprintf(file, "%s ── log reached %d MB, rotating to %s.1 ──\n",
time.Now().Format("15:04:05.000"), maxLogBytes/(1024*1024), filepath.Base(path))
_ = file.Close()
file = nil
_ = os.Remove(path + ".1")
if err := os.Rename(path, path+".1"); err != nil {
// Rename refused (the file is held open elsewhere, a virus scanner): keep
// writing to the old handle rather than losing the log entirely, and try
// again in another maxLogBytes rather than on every single line.
f, oerr := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644)
if oerr == nil {
file = f
}
written = 0
return
}
f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644)
if err != nil {
return // nothing more to be done; the next Printf simply writes nowhere
}
file = f
written = 0
fmt.Fprintf(file, "%s ── continued from %s.1 ──\n",
time.Now().Format("15:04:05.000"), filepath.Base(path))
}
// Path returns where the file is so the UI can surface it.
func Path() string {
mu.Lock()
@@ -118,4 +168,19 @@ func Close() {
_ = file.Close()
file = nil
}
// The crash file is held open for the whole run so the runtime can dump a
// traceback into it without allocating; on the way out it has to be released
// like any other handle, or the data directory cannot be moved or removed.
if crashFile != nil {
// The RUNTIME holds its own duplicate of this handle (SetCrashOutput), so
// closing ours releases nothing on Windows — the data directory stays
// locked. Hand the runtime a nil first. Anything fatal in the last moments
// of shutdown is no longer captured, which is the right trade at a point
// where the databases are already closed.
_ = debug.SetCrashOutput(nil, debug.CrashOptions{})
_ = crashFile.Close()
crashFile = nil
}
path = ""
written = 0
}
+49
View File
@@ -0,0 +1,49 @@
package applog
import (
"os"
"path/filepath"
"strings"
"testing"
)
// The log has to be bounded WHILE RUNNING, not only at startup. The CI-V wire
// trace left on for a day wrote 416 MB, and nothing would have stopped it
// before the disk did.
func TestRotatesMidSession(t *testing.T) {
orig := maxLogBytes
maxLogBytes = 8 * 1024 // small, so the test costs milliseconds
defer func() { maxLogBytes = orig }()
dir := t.TempDir()
p, err := Init(dir)
if err != nil {
t.Fatal(err)
}
defer Close()
line := strings.Repeat("x", 256)
for i := 0; i < 100; i++ { // ~25 KB: several times the limit
Printf("%s", line)
}
if _, err := os.Stat(p + ".1"); err != nil {
t.Fatalf("no previous generation kept: %v", err)
}
fi, err := os.Stat(p)
if err != nil {
t.Fatal(err)
}
if fi.Size() > maxLogBytes {
t.Fatalf("current log is %d bytes, over the %d limit — it did not roll over", fi.Size(), maxLogBytes)
}
// The new file says where the rest went: a log that starts mid-sentence with
// no explanation is how an operator concludes the app lost its history.
b, err := os.ReadFile(p)
if err != nil {
t.Fatal(err)
}
if !strings.Contains(string(b), "continued from "+filepath.Base(p)+".1") {
t.Error("the new file does not point at the one it continues")
}
}
+62 -18
View File
@@ -168,7 +168,48 @@ func (r *Recorder) Start(fromDev, micDev string, prerollSec int) error {
twoSrc := r.twoSrc
r.mu.Unlock()
// Capture goroutine(s) feed the per-source queues.
// The radio side is either CAPTURED from a sound device or PUSHED in from
// somewhere else. Over the network there is no sound device at all: an
// IC-705 reached by LAN streams its receive audio over the Icom protocol,
// and the operator's audio settings can only offer the PC's own microphone
// and speakers. fromDev == PushedSource says "someone else will feed me",
// and PushRX is how they do it.
if fromDev == PushedSource {
LogSink("recorder: radio audio is pushed in (network), not captured from a device")
} else {
r.startRadioCapture(fromDev, stop)
}
if twoSrc {
r.startMicCapture(micDev, stop)
}
r.finishStart(fromDev, micDev, twoSrc, stop)
return nil
}
// PushedSource is the "device" name that means the radio audio arrives through
// PushRX instead of a capture stream.
const PushedSource = "\x00pushed"
// PushRX feeds one chunk of 16-bit mono PCM from a non-device source.
//
// Safe to call when nothing is recording — the samples are dropped, which is
// what should happen: the network stream runs whenever the rig is connected,
// and the recorder only wants it between BeginQSO and the save.
func (r *Recorder) PushRX(pcm []byte) {
r.mu.Lock()
running := r.running
r.mu.Unlock()
if !running || len(pcm) == 0 {
return
}
sm := bytesToInt16(pcm)
r.srcMu.Lock()
r.bufA = append(r.bufA, sm...)
r.lastA = time.Now()
r.srcMu.Unlock()
}
func (r *Recorder) startRadioCapture(fromDev string, stop chan struct{}) {
r.wg.Add(1)
go func() {
defer r.wg.Done()
@@ -187,23 +228,27 @@ func (r *Recorder) Start(fromDev, micDev string, prerollSec int) error {
LogSink("recorder: capture from %q failed: %v", DeviceName(fromDev), err)
}
}()
if twoSrc {
r.wg.Add(1)
go func() {
defer r.wg.Done()
defer recoverGoroutine("recorder capture (mic)")
if err := captureStream(micDev, stop, func(chunk []byte) {
s := bytesToInt16(chunk)
r.srcMu.Lock()
r.bufB = append(r.bufB, s...)
r.lastB = time.Now()
r.srcMu.Unlock()
}); err != nil {
LogSink("recorder: capture from %q failed: %v", DeviceName(micDev), err)
}
}()
}
}
func (r *Recorder) startMicCapture(micDev string, stop chan struct{}) {
r.wg.Add(1)
go func() {
defer r.wg.Done()
defer recoverGoroutine("recorder capture (mic)")
if err := captureStream(micDev, stop, func(chunk []byte) {
s := bytesToInt16(chunk)
r.srcMu.Lock()
r.bufB = append(r.bufB, s...)
r.lastB = time.Now()
r.srcMu.Unlock()
}); err != nil {
LogSink("recorder: capture from %q failed: %v", DeviceName(micDev), err)
}
}()
}
// finishStart logs what is being recorded and arms the silence watchdog.
func (r *Recorder) finishStart(fromDev, micDev string, twoSrc bool, stop chan struct{}) {
// Name the devices being recorded FROM, once, at the start.
//
// A station with two radios has two sets of endpoints, and the recorder will
@@ -262,7 +307,6 @@ func (r *Recorder) Start(fromDev, micDev string, prerollSec int) error {
}
}
}()
return nil
}
// mixTick drains the source queues, mixes what's available, and appends to the
+65 -2
View File
@@ -109,7 +109,7 @@ type Def struct {
Emission []string `json:"emission,omitempty"` // CW | DIGITAL | PHONE (empty = all)
// --- Confirmation ---
Confirm []string `json:"confirm"` // worked-confirmed: lotw|qsl|eqsl|qrzcom|custom
Confirm []string `json:"confirm"` // worked-confirmed: lotw|qsl|eqsl|qrzcom|hamlog|custom
Validate []string `json:"validate,omitempty"` // validated/granted sources
// The "custom" source, for confirmations OpsLog has no dedicated column for:
// ConfirmField names a QSO field or an ADIF extras key, ConfirmValue the
@@ -344,7 +344,7 @@ func Migrate(defs []Def) ([]Def, bool) {
func Fields() []string {
return []string{
"dxcc", "cqz", "ituz", "prefix", "callsign",
"state", "us_county", "cont", "country", "grid", "grid4",
"state", "county", "us_county", "cont", "country", "grid", "grid4",
"iota", "sota_ref", "pota_ref", "wwff",
"name", "qth", "address", "comment", "note",
}
@@ -1373,6 +1373,13 @@ func fieldRaw(field string, q *qso.QSO) string {
return q.Callsign
case "state":
return q.State
case "county":
// CNTY as it stands, with nothing prepended. us_county below answers a
// different question — it keys the county to its state, because two US
// states each have a Jefferson County. Outside the United States that
// prefixing is wrong: an RDA district (RO-19) and a Japanese city code
// are already unique, and a state is not what qualifies them.
return q.County
case "us_county":
return USCountyKey(q.State, q.County)
case "cont":
@@ -1481,6 +1488,18 @@ func confirmed(q *qso.QSO, sources []string, d *Def) bool {
if isYes(q.QRZComDownloadStatus) {
return true
}
case "hamlog":
// HAMLOG.online, a first-class source rather than something to express
// through "custom" — its confirmations feed its own award programme
// and operators reach for it the same way they reach for LoTW.
//
// Read from the ADIF EXTRAS, not a column: the ADIF standard names a
// field for hamlog.EU (HAMLOGEU_QSO_UPLOAD_STATUS) and none for
// hamlog.ONLINE, and borrowing the other site's field would write a
// falsehood into every exported log.
if hamlogConfirmed(q) {
return true
}
case "custom":
if customConfirmed(q, d) {
return true
@@ -1490,6 +1509,46 @@ func confirmed(q *qso.QSO, sources []string, d *Def) bool {
return false
}
// HamlogQSLKey is where a HAMLOG.online confirmation is recorded.
//
// THEIR field name, taken from a real export:
//
// <APP_HAMLOG_QSO_CFM:1>Y
//
// Using the site's own key rather than one of ours is what makes an import
// simply work: a log downloaded from HAMLOG carries its confirmations into
// OpsLog with nothing to rename and no mapping to configure. The guesses this
// replaced (APP_HAMLOG_QSL and friends) were all wrong, which is the argument
// for reading a real file before naming a field.
const HamlogQSLKey = "APP_HAMLOG_QSO_CFM"
// hamlogAltKeys are older or hand-written spellings still honoured on read.
// APP_OPSLOG_HAMLOG_QSL is the one OpsLog itself wrote before a real export was
// available; a log stamped with it keeps counting.
var hamlogAltKeys = []string{"APP_OPSLOG_HAMLOG_QSL", "APP_HAMLOG_QSL", "APP_HAMLOGONLINE_QSL", "HAMLOG_QSL_RCVD"}
// hamlogConfirmed reports whether a QSO carries a HAMLOG.online confirmation.
//
// Any non-empty value counts, except an explicit "N": their export could carry
// a date, a Y, or a match id, and demanding one of them would silently confirm
// nothing on the two shapes we guessed wrong.
func hamlogConfirmed(q *qso.QSO) bool {
if q == nil || q.Extras == nil {
return false
}
for _, k := range append([]string{HamlogQSLKey}, hamlogAltKeys...) {
v := strings.TrimSpace(q.Extras[k])
if v == "" {
continue
}
if strings.EqualFold(v, "N") || strings.EqualFold(v, "NO") {
continue
}
return true
}
return false
}
// customConfirmed answers the operator-defined confirmation source: the field
// named by ConfirmField, optionally required to hold one of ConfirmValue's
// comma-separated values.
@@ -1580,3 +1639,7 @@ func sortedBands(m map[string]int) []string {
})
return out
}
// HamlogAltKeys exposes the alternate spellings so a reader outside this package
// (the confirmations import) accepts exactly what the award engine accepts.
func HamlogAltKeys() []string { return append([]string(nil), hamlogAltKeys...) }
+58
View File
@@ -64,3 +64,61 @@ func TestConfirmedSources(t *testing.T) {
}
}
}
// HAMLOG.online is a named confirmation source, not something to express through
// "custom": an award ticks it the way it ticks LoTW.
func TestHamlogConfirmationSource(t *testing.T) {
def := Def{Confirm: []string{"hamlog"}, Validate: []string{"hamlog"}}
yes := func(extras map[string]string) bool {
return Confirmed(&qso.QSO{Extras: extras}, def, def.Confirm)
}
if !yes(map[string]string{HamlogQSLKey: "Y"}) {
t.Error("our own key did not confirm")
}
// Their export's field name is unpublished, so the plausible shapes count too.
if !yes(map[string]string{"APP_HAMLOG_QSL": "20260823"}) {
t.Error("a date in an alternative key did not confirm")
}
// A value is not a confirmation when it says no.
if yes(map[string]string{HamlogQSLKey: "N"}) {
t.Error(`"N" was taken as a confirmation`)
}
if yes(map[string]string{HamlogQSLKey: " "}) {
t.Error("blank was taken as a confirmation")
}
if yes(nil) || yes(map[string]string{"SOMETHING_ELSE": "Y"}) {
t.Error("confirmed with nothing to confirm it")
}
// And it does not leak into an award that never asked for it.
other := Def{Confirm: []string{"lotw"}}
if Confirmed(&qso.QSO{Extras: map[string]string{HamlogQSLKey: "Y"}}, other, other.Confirm) {
t.Error("a hamlog confirmation counted for an award that only accepts LoTW")
}
}
// The field name is theirs, taken from a real export:
//
// <APP_HAMLOG_QSO_CFM:1>Y
//
// Pinned as a test because it was GUESSED wrong first — an import that carries
// its confirmations into OpsLog with nothing to rename is the whole point, and
// a renamed constant would break it in silence.
func TestHamlogUsesTheSitesOwnFieldName(t *testing.T) {
if HamlogQSLKey != "APP_HAMLOG_QSO_CFM" {
t.Fatalf("HamlogQSLKey = %q — their export writes APP_HAMLOG_QSO_CFM", HamlogQSLKey)
}
def := Def{Confirm: []string{"hamlog"}}
// The record as HAMLOG exports it.
q := &qso.QSO{Extras: map[string]string{
"APP_HAMLOG_R150COUNTRY": "Russia",
"APP_HAMLOG_QSO_CFM": "Y",
}}
if !Confirmed(q, def, def.Confirm) {
t.Error("a real HAMLOG export did not confirm")
}
// Anything OpsLog stamped before that export existed keeps counting.
old := &qso.QSO{Extras: map[string]string{"APP_OPSLOG_HAMLOG_QSL": "Y"}}
if !Confirmed(old, def, def.Confirm) {
t.Error("a QSO stamped with the older key stopped counting")
}
}
+29
View File
@@ -0,0 +1,29 @@
package award
import (
"testing"
"hamlog/internal/qso"
)
// A district lives in CNTY as-is; the US award field keys it to the state
// because county names repeat across states. Confusing the two silently breaks
// whichever award is not American.
func TestCountyFieldIsRawWhileUSCountyIsKeyed(t *testing.T) {
q := &qso.QSO{State: "TX", County: "RO-19"}
if got := fieldRaw("county", q); got != "RO-19" {
t.Fatalf("county = %q, want RO-19", got)
}
if got := fieldRaw("us_county", q); got == "RO-19" {
t.Fatalf("us_county should key the county to its state, got %q", got)
}
var found bool
for _, f := range Fields() {
if f == "county" {
found = true
}
}
if !found {
t.Fatal("county missing from the award field list")
}
}
+44 -7
View File
@@ -290,12 +290,20 @@ func (m *Manager) SetSplit(on bool, txHz int64) error {
// the backend picks a default when it's empty. (Status-based colouring can be
// driven later by setting Color per spot.)
type SpotInfo struct {
FreqHz int64
Callsign string
Mode string
Color string
Comment string
LifetimeSec int // panadapter display seconds before auto-removal (0 = backend default)
FreqHz int64
Callsign string
Mode string
// Color is the TEXT colour of the callsign on the panadapter, BackgroundColor
// the plate behind it. Both are #AARRGGBB — the alpha channel first, which is
// SmartSDR's order and not the web's.
//
// Two colours rather than one because that is what makes a spot readable at a
// glance on a busy waterfall: the fill carries the status and the text stays
// legible against it. An empty background leaves the radio's own default.
Color string
BackgroundColor string
Comment string
LifetimeSec int // panadapter display seconds before auto-removal (0 = backend default)
}
// Spotter is an OPTIONAL backend capability: show cluster spots on the radio
@@ -475,7 +483,12 @@ type FlexController interface {
SetRXAntenna(string) error
SetTXAntenna(string) error
SetActiveSlice(int) error // focus slice idx so commands target it
SetTXSlice(int) error // make slice idx the transmitter (tx=1)
// ZoomPan sets the visible width (MHz) of the active slice's panadapter and
// keeps freqMHz inside it, re-centring when it must. See Flex.ZoomPan.
ZoomPan(bandwidthMHz, freqMHz float64, centre bool) error
SetTXSlice(int) error // make slice idx the transmitter (tx=1)
// SetTXSliceFrequency moves the TRANSMIT slice only — split pile-up chasing.
SetTXSliceFrequency(int64) error
SetSplit(bool) error
SetNB(bool) error
SetNBLevel(int) error
@@ -977,6 +990,30 @@ type KenwoodController interface {
SetKeySpeed(int) error
}
// KenwoodState returns the K3/K4 panel snapshot, or (zero, false) when the
// active backend is not a Kenwood-dialect rig.
func (m *Manager) KenwoodState() (KenwoodTXState, bool) {
m.mu.RLock()
b := m.backend
m.mu.RUnlock()
if kc, ok := b.(KenwoodPanelController); ok {
return kc.KenwoodState(), true
}
return KenwoodTXState{}, false
}
// KenwoodPanelDo dispatches a K3/K4 panel control onto the CAT goroutine, so a
// panel click and the poll loop never share the serial port at the same instant.
func (m *Manager) KenwoodPanelDo(fn func(KenwoodPanelController) error) error {
return m.exec(func(b Backend) error {
kc, ok := b.(KenwoodPanelController)
if !ok {
return fmt.Errorf("active CAT backend is not a Kenwood/Elecraft")
}
return fn(kc)
})
}
// KenwoodDo dispatches a Kenwood control onto the CAT goroutine.
func (m *Manager) KenwoodDo(fn func(KenwoodController) error) error {
return m.exec(func(b Backend) error {
+296 -11
View File
@@ -60,24 +60,64 @@ type Flex struct {
txRawLogged bool // log the first raw transmit status once (field-name audit)
spotsEnabled bool // push cluster spots + manage the panadapter overlay
// foreignSpotSeen counts what probeForeignSpot has already reported, so a
// skimmer posting all evening cannot turn the log into its own transcript.
foreignSpotSeen int
spotIdx map[int]bool // panadapter spot indices currently known to the radio
pendingSpot map[int]string // seq → callsign, awaiting the spot index in the R response
pendingSpotMode map[int]string // seq → ADIF mode, paired with pendingSpot
pendingSplit map[int]bool // seq → awaiting the new TX slice's index (split create)
spotCall map[int]string // spot index → callsign (to fill the call on a panadapter click)
spotMode map[int]string // spot index → ADIF mode, so a click can also set the slice mode (SmartSDR tunes the spot's freq but not its mode)
spotByCall map[string]int // callsign → live spot index, so re-spotting a call replaces its old spot (WSJT decodes re-fire every cycle)
sentCmds map[int]string // seq → command text, so an R<seq> error names the command
spotFreq map[int]int64 // spot index → Hz, so a click can report where it was (the trigger message carries only the index)
pendingSpotFreq map[int]int64 // seq → Hz, paired with pendingSpot
// panWindow is what each panadapter is currently showing, from its own status
// (centre and width, both MHz). Tracked because a zoom that only changes the
// WIDTH keeps the old centre, and the frequency the operator just clicked can
// end up outside the new window — see ZoomPan.
panWindow map[string]panView
// spotSig is what each live spot LOOKS like, and when it was drawn. A
// callsign spotted again with the same frequency, colour and comment does not
// need to be removed and re-added: the panadapter would not change by one
// pixel, and a busy RBN feed re-spots the same station every few seconds. One
// two-minute session sent 2 128 adds and 1 634 removes, 88 of them for a
// single callsign — see SendSpot.
spotSig map[string]string
spotSent map[string]time.Time
spotByCall map[string]int // callsign → live spot index, so re-spotting a call replaces its old spot (WSJT decodes re-fire every cycle)
sentCmds map[int]string // seq → command text, so an R<seq> error names the command
// OnSpotClick is called (off the reader goroutine's hot path) when the user
// clicks one of our spots on the panadapter, with the spot's callsign and
// frequency. The host wires this to fill the entry form. Set before Connect.
OnSpotClick func(callsign string, freqHz int64)
// clicks one of our spots on the panadapter, with the spot's callsign, its
// frequency and the mode it was spotted in — everything the host knows about
// the spot, since the radio's own notification carries only an index. The host
// wires this to fill the entry form and to size the panadapter. Set before Connect.
OnSpotClick func(callsign string, freqHz int64, mode string)
// OnForeignSpot is called for every spot posted to the radio by a program
// OTHER than OpsLog, with the spot's callsign field and its frequency.
//
// A CW skimmer posts what it decodes, so the marker a DX operator's report
// leaves on the panadapter arrives here — that is what the split chaser acts
// on. Deliberately raw: this package reports what the radio said and does not
// decide what a marker looks like, because the marker text is configured in
// the skimmer, by the operator, and only they know what they chose.
OnForeignSpot func(callsign string, freqHz int64)
}
// panView is one panadapter's visible window, in MHz.
type panView struct{ centre, width float64 }
type flexSlice struct {
freqHz int64
mode string // raw Flex mode (USB/LSB/CW/DIGU/…)
// pan is the panadapter this slice is displayed on ("0x40000000"), taken
// from the slice status. Kept PER SLICE rather than as one radio-wide id:
// with two slices on two bands there are two panadapters, and zooming the
// wrong one moves a display the operator is not looking at.
pan string
active bool
tx bool
inUse bool
@@ -187,7 +227,7 @@ func NewFlex(host string, port int, spotsEnabled bool) *Flex {
return &Flex{
host: strings.TrimSpace(host), port: port,
slices: map[int]*flexSlice{}, spotsEnabled: spotsEnabled,
spotIdx: map[int]bool{}, pendingSpot: map[int]string{}, pendingSpotMode: map[int]string{}, spotCall: map[int]string{}, spotMode: map[int]string{}, spotByCall: map[string]int{}, pendingSplit: map[int]bool{},
spotIdx: map[int]bool{}, pendingSpot: map[int]string{}, pendingSpotMode: map[int]string{}, spotCall: map[int]string{}, spotMode: map[int]string{}, spotFreq: map[int]int64{}, pendingSpotFreq: map[int]int64{}, panWindow: map[string]panView{}, spotSig: map[string]string{}, spotSent: map[string]time.Time{}, spotByCall: map[string]int{}, pendingSplit: map[int]bool{},
meterMeta: map[int]meterInfo{}, meterVal: map[int]float64{}, meterSub: map[int]bool{},
sentCmds: map[int]string{}, txSetAt: map[string]time.Time{},
pinnedSlice: -1,
@@ -248,13 +288,21 @@ func (f *Flex) Connect() error {
f.send("sub cwx all") // CWX: the LIVE CW speed/pitch/break-in (transmit holds only a static default)
f.send("sub profile all") // mic/global/tx profiles (for the mic-profile dropdown)
f.send("profile mic info") // request the current mic profile list + selection
f.send("sub pan all") // panadapter centre/bandwidth, so a zoom knows where the display already is
f.send("sub client all") // learn the GUI client (SmartSDR) so we can bind to it (below)
f.startMeters(conn) // open the UDP VITA-49 stream for live meters
// Always subscribed, even when OpsLog draws no spots of its own: the feed is
// read-only and it is how the spots posted by OTHER programs arrive — a CW
// skimmer's decoded reports, which the split chaser acts on. Tying the
// subscription to our own overlay meant a station using SDC and no OpsLog
// spots heard nothing at all.
f.send("sub spot all")
if f.spotsEnabled {
// Subscribe so the radio pushes existing spots (we learn their indices),
// then wipe the panadapter so stale spots from a previous session or
// another logger are cleared before we start adding our own.
f.send("sub spot all")
// Wipe the panadapter so stale spots from a previous session or another
// logger are cleared before we start adding our own. Only when the
// overlay is ours to manage: "spot clear" removes EVERY spot on the
// radio, a skimmer's included, and taking those away from an operator
// who never asked us to draw anything would be pure vandalism.
go f.clearSpotsOnConnect(conn)
}
return nil
@@ -341,11 +389,12 @@ func (f *Flex) reader(conn net.Conn) {
f.mu.Lock()
call := f.spotCall[idx]
mode := f.spotMode[idx]
hz := f.spotFreq[idx]
handler := f.OnSpotClick
f.mu.Unlock()
if call != "" && handler != nil {
debugLog.Printf("Flex: spot %d triggered → %s (mode %s)", idx, call, mode)
go handler(call, 0)
go handler(call, hz, mode)
// SmartSDR tunes the spot's frequency on click but does NOT apply
// its mode=, so set the slice mode ourselves from what we spotted.
if mode != "" {
@@ -388,14 +437,17 @@ func (f *Flex) reader(conn net.Conn) {
f.mu.Lock()
call, pending := f.pendingSpot[seq]
spotMode := f.pendingSpotMode[seq]
spotFreq := f.pendingSpotFreq[seq]
if pending {
delete(f.pendingSpot, seq)
delete(f.pendingSpotMode, seq)
delete(f.pendingSpotFreq, seq)
}
if pending && ok && len(parts) >= 3 {
if idx, e := strconv.Atoi(strings.TrimSpace(parts[2])); e == nil {
f.spotCall[idx] = call
f.spotMode[idx] = spotMode
f.spotFreq[idx] = spotFreq
f.spotIdx[idx] = true
f.spotByCall[strings.ToUpper(call)] = idx
}
@@ -692,6 +744,32 @@ func (f *Flex) handleStatus(payload string) {
}
f.mu.Unlock()
}
// Panadapter — "display pan 0x40000000 center=14.075 bandwidth=0.2 …".
// Only the window matters here; everything else about the display is
// SmartSDR's business.
if len(fields) >= 3 && fields[0] == "display" && fields[1] == "pan" {
id := fields[2]
f.mu.Lock()
w := f.panWindow[id]
for _, kv := range fields[3:] {
key, val, ok := splitKV(kv)
if !ok {
continue
}
switch key {
case "center":
if v, err := strconv.ParseFloat(val, 64); err == nil && v > 0 {
w.centre = v
}
case "bandwidth":
if v, err := strconv.ParseFloat(val, 64); err == nil && v > 0 {
w.width = v
}
}
}
f.panWindow[id] = w
f.mu.Unlock()
}
// Meter definitions — "meter <num>.src=… <num>.nam=… <num>.unit=… …".
// The unit scales the UDP values, the name labels them; subscribe to each
// new id so the radio streams it.
@@ -810,13 +888,25 @@ func (f *Flex) handleStatus(payload string) {
}
f.mu.Lock()
if removed {
// The radio expired or dropped this spot: forget what it looked
// like, or the next identical spot would be skipped as "already
// drawn" and the station would never come back.
if c, ok := f.spotCall[idx]; ok {
delete(f.spotSig, strings.ToUpper(c))
delete(f.spotSent, strings.ToUpper(c))
}
delete(f.spotIdx, idx)
delete(f.spotCall, idx)
delete(f.spotMode, idx)
delete(f.spotFreq, idx)
} else {
f.spotIdx[idx] = true
}
f.mu.Unlock()
if !removed {
f.probeForeignSpot(payload)
f.reportForeignSpot(payload)
}
}
debugLog.Printf("Flex: status %s", payload)
}
@@ -847,6 +937,8 @@ func (f *Flex) handleStatus(payload string) {
}
case "mode":
s.mode = val
case "pan":
s.pan = val
case "active":
s.active = val == "1"
case "tx":
@@ -1241,6 +1333,173 @@ func (f *Flex) SetMode(mode string) error {
return nil
}
// ZoomPan sets the visible width of the ACTIVE slice's panadapter, and puts the
// frequency the operator clicked inside it.
//
// bandwidthMHz is the whole visible span, which is how SmartSDR expresses it —
// not a zoom factor.
//
// Re-centring is the subtle part. SmartSDR keeps the panadapter's CENTRE when
// only the width changes, so narrowing from 200 kHz to 25 for a CW spot — or
// jumping to a spot clicked in the band map — regularly left the very signal the
// operator asked for outside the new window: the radio had tuned to it, but the
// display was showing somewhere else. So the centre moves when it must:
//
// centre == true always re-centre (the operator asked for it)
// centre == false re-centre ONLY when freqMHz would fall outside the new
// window, leaving a settled display alone the rest of the time
//
// The test uses 40% of the width either side rather than the full half: a spot
// pinned to the last pixel of the panadapter is visible in the arithmetic and
// useless in practice.
//
// A no-op when the slice reports no panadapter, which is the case on a slice
// that exists but is not displayed. Silent, because that is not a fault.
// needRecentre decides whether the panadapter has to move for freqMHz to be
// comfortably visible in a window of bandwidthMHz. forced short-circuits it.
//
// An unknown current centre (no pan status seen yet) counts as "would fall
// outside": the display is more likely wrong than right, and re-centring on the
// spot the operator just clicked is never the surprising answer.
func needRecentre(cur panView, freqMHz, bandwidthMHz float64, forced bool) bool {
if freqMHz <= 0 {
return false // nothing to centre on
}
if forced {
return true
}
return cur.centre <= 0 || math.Abs(freqMHz-cur.centre) > bandwidthMHz*0.4
}
func (f *Flex) ZoomPan(bandwidthMHz, freqMHz float64, centre bool) error {
f.mu.Lock()
pan := ""
// The operator's slice, by the same rule as everything else — see
// mainSliceLocked. Zooming any other panadapter would move a display the
// operator is not looking at.
if _, sl := f.mainSliceLocked(); sl != nil {
pan = sl.pan
}
cur := f.panWindow[pan]
connected := f.conn != nil && f.gotHandle
f.mu.Unlock()
if !connected {
return fmt.Errorf("flex: not connected")
}
if pan == "" || bandwidthMHz <= 0 {
return nil
}
recentre := needRecentre(cur, freqMHz, bandwidthMHz, centre)
// Centre first, then width: SmartSDR clamps a window that would run past the
// end of the spectrum, and moving to the right place before widening leaves
// nothing to clamp.
if recentre {
f.send(fmt.Sprintf("display pan s %s center=%.6f", pan, freqMHz))
}
f.send(fmt.Sprintf("display pan s %s bandwidth=%.6f", pan, bandwidthMHz))
debugLog.Printf("Flex: zoom pan %s → %.4f MHz (centre=%v on %.6f, was %.6f)", pan, bandwidthMHz, recentre, freqMHz, cur.centre)
return nil
}
// foreignSpotProbeMax bounds the probe below. Enough lines to see what another
// program writes into a spot, few enough that a running skimmer — which posts
// hundreds an hour — cannot fill the log file with them.
const foreignSpotProbeMax = 60
// probeForeignSpot records, verbatim, the spots this radio receives from
// programs OTHER than OpsLog.
//
// A CW skimmer (SDC, for one) posts what it decodes as panadapter spots, the
// exchange included: chasing a split pileup means finding the "5NN" the DX just
// sent and moving the transmit slice there. Acting on that requires knowing
// exactly what the spot looks like — which field carries the text, whether the
// report is the callsign or the comment, what source names the skimmer — and no
// amount of reasoning substitutes for reading real lines off a real radio.
//
// So this logs and does nothing else. It is deliberately not a feature.
func (f *Flex) probeForeignSpot(payload string) {
if strings.Contains(payload, "source=OpsLog") {
return
}
f.mu.Lock()
if f.foreignSpotSeen >= foreignSpotProbeMax {
f.mu.Unlock()
return
}
f.foreignSpotSeen++
n := f.foreignSpotSeen
f.mu.Unlock()
debugLog.Printf("flex: foreign spot %d/%d: %s", n, foreignSpotProbeMax, payload)
if n == foreignSpotProbeMax {
debugLog.Printf("flex: that is enough foreign spots to go on — no more will be logged this session")
}
}
// reportForeignSpot hands another program's spot to OnForeignSpot.
//
// Off the reader goroutine, like OnSpotClick: the handler tunes the radio, and
// a command sent from inside the reader would deadlock against the socket it is
// reading.
func (f *Flex) reportForeignSpot(payload string) {
if strings.Contains(payload, "source=OpsLog") {
return
}
handler := f.OnForeignSpot
if handler == nil {
return
}
var call string
var hz int64
for _, kv := range strings.Fields(payload) {
eq := strings.IndexByte(kv, '=')
if eq <= 0 {
continue
}
switch kv[:eq] {
case "callsign":
call = kv[eq+1:]
case "rx_freq":
if mhz, err := strconv.ParseFloat(kv[eq+1:], 64); err == nil {
hz = int64(math.Round(mhz * 1e6))
}
}
}
if call == "" || hz <= 0 {
return
}
go handler(call, hz)
}
// SetTXSliceFrequency tunes the TRANSMIT slice, leaving the receive slice where
// it is. That distinction is the whole point in split: the operator listens to
// the DX on one slice and moves the other around the pile-up.
func (f *Flex) SetTXSliceFrequency(hz int64) error {
if hz <= 0 {
return fmt.Errorf("flex: invalid frequency")
}
f.mu.Lock()
idx := -1
for i, s := range f.slices {
if s != nil && s.inUse && s.tx {
idx = i
break
}
}
if idx >= 0 && f.slices[idx] != nil {
f.slices[idx].freqHz = hz // optimistic, like SetFrequency
}
connected := f.conn != nil
f.mu.Unlock()
if idx < 0 {
return fmt.Errorf("flex: no transmit slice")
}
if !connected {
return fmt.Errorf("flex: not connected")
}
f.send(fmt.Sprintf("slice t %d %.6f", idx, float64(hz)/1e6))
return nil
}
// SendSpot renders a cluster spot on the panadapter via "spot add". Spots carry
// a lifetime so the radio expires them on its own (the API has no "spot clear").
// Per the SmartSDR API, spaces inside a field value are encoded as 0x7F.
@@ -1270,12 +1529,28 @@ func (f *Flex) SendSpot(s SpotInfo) error {
// and Go mutexes aren't reentrant (calling send while locked deadlocks the
// whole Flex goroutine → the radio drops OFFLINE).
upperCall := strings.ToUpper(s.Callsign)
// Unchanged and still fresh → leave it alone.
//
// Refreshed once past half its lifetime, so a long-lived spot still gets its
// timer wound on and never quietly expires off the panadapter; anything that
// actually differs (a new frequency, a status that has changed colour, a
// different comment) is redrawn at once.
sig := fmt.Sprintf("%d|%s|%s|%s|%s", s.FreqHz, s.Mode, s.Color, s.BackgroundColor, s.Comment)
f.mu.Lock()
if prev, ok := f.spotSig[upperCall]; ok && prev == sig {
if at, ok := f.spotSent[upperCall]; ok && time.Since(at) < time.Duration(life)*time.Second/2 {
f.mu.Unlock()
return nil
}
}
f.spotSig[upperCall] = sig
f.spotSent[upperCall] = time.Now()
old, hadOld := f.spotByCall[upperCall]
if hadOld {
delete(f.spotByCall, upperCall)
delete(f.spotCall, old)
delete(f.spotMode, old)
delete(f.spotFreq, old)
delete(f.spotIdx, old)
}
f.mu.Unlock()
@@ -1291,6 +1566,12 @@ func (f *Flex) SendSpot(s SpotInfo) error {
if m := flexEncode(adifModeToFlex(s.Mode, s.FreqHz)); m != "" {
cmd += " mode=" + m
}
// background_color is optional in the API and empty means "the radio's own".
// Sent only when set, so a spot with no configured background does not blank
// the default to nothing.
if bg := flexEncode(s.BackgroundColor); bg != "" {
cmd += " background_color=" + bg
}
if c := flexEncode(s.Comment); c != "" {
cmd += " comment=" + c
}
@@ -1302,6 +1583,7 @@ func (f *Flex) SendSpot(s SpotInfo) error {
f.mu.Lock()
f.pendingSpot[seq] = s.Callsign
f.pendingSpotMode[seq] = s.Mode
f.pendingSpotFreq[seq] = s.FreqHz
f.mu.Unlock()
}
return nil
@@ -1335,6 +1617,9 @@ func (f *Flex) ClearSpots() error {
f.spotIdx = map[int]bool{}
f.spotCall = map[int]string{}
f.spotMode = map[int]string{}
f.spotFreq = map[int]int64{}
f.spotSig = map[string]string{}
f.spotSent = map[string]time.Time{}
f.spotByCall = map[string]int{}
connected := f.conn != nil
f.mu.Unlock()
+34
View File
@@ -0,0 +1,34 @@
package cat
import "testing"
func TestNeedRecentre(t *testing.T) {
pan := panView{centre: 14.100, width: 0.200}
// A spot the display is already showing comfortably: leave the window alone,
// which is the whole point of the option being off.
if needRecentre(pan, 14.110, 0.200, false) {
t.Fatal("moved a display that was already on the spot")
}
// Narrowing for a CW spot 40 kHz away: 25 kHz around the old centre would not
// reach it, so the centre must follow.
if !needRecentre(pan, 14.060, 0.025, false) {
t.Fatal("spot would have been left outside the new window")
}
// Near the very edge of the new window — visible in the arithmetic, useless
// in practice.
if !needRecentre(pan, 14.199, 0.200, false) {
t.Fatal("spot pinned to the edge counts as outside")
}
// The operator asked for it.
if !needRecentre(pan, 14.110, 0.200, true) {
t.Fatal("forced centring ignored")
}
// No pan status yet: assume the display is elsewhere.
if !needRecentre(panView{}, 14.110, 0.200, false) {
t.Fatal("unknown centre must re-centre")
}
// Nothing to centre on.
if needRecentre(pan, 0, 0.200, true) {
t.Fatal("centred on nothing")
}
}
+43
View File
@@ -0,0 +1,43 @@
package cat
import (
"testing"
"hamlog/internal/cat/civ"
)
// A CI-V bus can carry a second controller, and the rig answers each of them on
// the same wire. A reply addressed to somebody else must not be taken for ours —
// on an IC-7850 one arrived between a PTT command and its acknowledgement, the
// acknowledgement was never matched, and the failure was handed to JTDX as a rig
// control error.
func TestForeignCIVRepliesAreIgnored(t *testing.T) {
const rig = 0x8E
frames, _ := civ.Scan([]byte{
0xFE, 0xFE, 0x01, rig, 0x1C, 0x00, 0x01, 0xFD, // to controller 01 — not ours
0xFE, 0xFE, civ.AddrController, rig, 0xFB, 0xFD, // to us: the acknowledgement
0xFE, 0xFE, 0x00, rig, 0x00, 0x00, 0x25, 0x09, 0x14, 0x00, 0xFD, // transceive broadcast
})
if len(frames) != 3 {
t.Fatalf("scanned %d frames, want 3", len(frames))
}
var kept []civ.Decoded
for _, f := range frames {
if f.From != rig {
continue
}
if f.To != civ.AddrController && f.To != 0x00 {
continue
}
kept = append(kept, f)
}
if len(kept) != 2 {
t.Fatalf("kept %d frames, want 2 (ours + the broadcast)", len(kept))
}
if kept[0].Cmd != 0xFB {
t.Errorf("the acknowledgement was not the first kept frame: % X", kept[0].Cmd)
}
if kept[1].To != 0x00 {
t.Errorf("the transceive broadcast was dropped")
}
}
+88 -8
View File
@@ -189,7 +189,7 @@ func NewIcomSerial(portName string, baud, civAddr int, digitalDefault string) *I
}
p, err := serial.Open(b.portName, &serial.Mode{BaudRate: b.baud})
if err != nil {
return nil, fmt.Errorf("open %s @ %d baud: %w", b.portName, b.baud, err)
return nil, fmt.Errorf("open %s @ %d baud: %w%s", b.portName, b.baud, err, busyHint(b.portName, err))
}
return p, nil
}
@@ -514,8 +514,21 @@ func (b *IcomSerial) SetFrequency(hz int64) error {
return fmt.Errorf("invalid frequency")
}
b.lastSetFreq, b.lastSetFreqAt = hz, time.Now()
return b.execIdempotent(fmt.Sprintf("set frequency %d Hz", hz),
err := b.execIdempotent(fmt.Sprintf("set frequency %d Hz", hz),
append([]byte{civ.CmdSetFreq}, civ.FreqToBCD(hz)...)...)
// Same reasoning as SetPTT: a lost acknowledgement is not a failed command,
// and WSJT-X or JTDX answer a failed set_freq by dropping the link — an
// IC-7850 log shows exactly that at 15:16:15, the disconnect four seconds
// later. The rig is asked what frequency it is on rather than being called a
// failure on the strength of a missing "FB".
if err == nil || !errors.Is(err, errIcomAckLost) {
return err
}
if got, rerr := b.readFreq(); rerr == nil && got == hz {
applog.Printf("icom: frequency %d Hz not acknowledged, but the rig is on it — treating as done", hz)
return nil
}
return err
}
func (b *IcomSerial) SetMode(mode string) error {
@@ -526,7 +539,16 @@ func (b *IcomSerial) SetMode(mode string) error {
// Set the base mode (keeping the rig's current filter by sending only the
// mode byte), then set the data-mode flag for digital modes.
if err := b.execIdempotent("set mode "+mode, civ.CmdSetMode, code); err != nil {
return err
// A lost acknowledgement is not a refused mode — see SetPTT. The mode is
// readable, so ask rather than report a failure that would cost the
// digital application its connection.
if !errors.Is(err, errIcomAckLost) {
return err
}
if got, ok := b.readMode(); !ok || got != code {
return err
}
applog.Printf("icom: mode %s not acknowledged, but the rig reports it — treating as done", mode)
}
dataByte := byte(0)
if data {
@@ -569,12 +591,43 @@ func (b *IcomSerial) execIdempotent(what string, payload ...byte) error {
}
// SetPTT keys or unkeys the transmitter (CI-V 0x1C 0x00).
// A lost acknowledgement is NOT proof the rig ignored us, and treating it as one
// is expensive: OpsLog fronts a Hamlib rigctl port, so the failure is handed
// straight to WSJT-X or JTDX, which answer a failed set_ptt with a Rig Control
// Error and drop the link mid-over. An IC-7850 log showed exactly that, three
// times in a session, on a CI-V bus with a second controller corrupting frames.
//
// So when the acknowledgement does not arrive, ASK the rig what it is doing. PTT
// is readable (0x1C 0x00), the answer is unambiguous, and a rig that is keyed
// received the command whatever became of its reply.
func (b *IcomSerial) SetPTT(on bool) error {
state := byte(0)
if on {
state = 1
}
return b.execIdempotent(fmt.Sprintf("PTT %v", on), civ.CmdPTT, civ.SubPTT, state)
err := b.execIdempotent(fmt.Sprintf("PTT %v", on), civ.CmdPTT, civ.SubPTT, state)
if err == nil || !errors.Is(err, errIcomAckLost) {
return err
}
// A GENEROUS window for the verification, not the poll's 150 ms.
//
// The rig has just failed to answer twice in 800 ms, and the reason seen on a
// real IC-7850 is that it was retuning: JTDX moves the transmit frequency and
// keys in the same breath. Asking it again with the short probe timeout would
// fail for exactly the same reason and prove nothing.
keyed, ok := b.readTXWithin(icomPTTVerifyTimeout)
if ok && keyed == on {
applog.Printf("icom: PTT %v not acknowledged, but the rig reports it — treating as done", on)
return nil
}
// Logged either way, because "the fix did not work" and "the rig really did
// not key" look identical from outside and need telling apart.
if ok {
applog.Printf("icom: PTT %v not acknowledged, and the rig reports %v — reporting the failure", on, keyed)
} else {
applog.Printf("icom: PTT %v not acknowledged, and the rig did not answer the check either", on)
}
return err
}
// SetPower turns the transceiver on or off (CI-V 0x18). Power-ON is prefixed with
@@ -686,6 +739,19 @@ func (b *IcomSerial) reader(port civTransport, done chan struct{}) {
if f.From != b.rigAddr {
continue // echo of our own command
}
// Addressed to US, or broadcast.
//
// A CI-V bus can carry a second controller — RS-BA1, wfview, another
// logger — and the rig answers each of them in turn on the same wire.
// Those replies come FROM the rig, so the check above lets them through,
// and one can be taken for the answer to our own command: an IC-7850 log
// showed "FE FE 01 8E …" (to controller 01) arriving between our PTT
// command and its acknowledgement, with bus collisions around it.
// Transceive broadcasts (to 0x00) stay welcome — that is how the rig
// announces a knob turn.
if f.To != civ.AddrController && f.To != 0x00 {
continue
}
if f.Cmd == civ.CmdScope {
b.route(b.specCh, f)
continue
@@ -1273,16 +1339,30 @@ func (b *IcomSerial) readTXFreq() (int64, bool) {
// readTX reads the transmit state (CI-V 0x1C 0x00): non-zero data = keyed.
func (b *IcomSerial) readTX() bool {
on, _ := b.readTXWithin(icomDSPTimeout)
return on
}
// icomPTTVerifyTimeout is how long the PTT check waits. Long, deliberately: it
// runs only after a command was already given up on, so it costs nothing in the
// normal case and everything depends on it in the abnormal one.
const icomPTTVerifyTimeout = 700 * time.Millisecond
// readTXWithin reads the transmit state, reporting whether the rig ANSWERED.
//
// The two are different questions and the caller usually needs both: "not
// transmitting" and "did not say" are the same bool but not the same fact.
func (b *IcomSerial) readTXWithin(timeout time.Duration) (on bool, answered bool) {
if err := b.write(civ.CmdPTT, civ.SubPTT); err != nil {
return false
return false, false
}
f, err := b.recv(icomDSPTimeout, func(d civ.Decoded) bool {
f, err := b.recv(timeout, func(d civ.Decoded) bool {
return d.Cmd == civ.CmdPTT && len(d.Data) >= 2 && d.Data[0] == civ.SubPTT
})
if err != nil {
return false
return false, false
}
return f.Data[1] != 0
return f.Data[1] != 0, true
}
// readMeter reads a meter (CI-V 0x15) and returns it scaled to 0-100.
+37 -2
View File
@@ -91,6 +91,23 @@ type Kenwood struct {
keyWPM int // CW keyer speed, for pacing the KY buffer (see kenwood_cw.go)
// Commands this rig answered "?;" to — asked once, then never again.
unsupported map[string]bool
// noLatch suspends that memory while a refusal is expected to be about
// timing rather than capability (see ask).
noLatch bool
// Panel state — the K3/K4 control panel, see kenwood_panel.go. Read on the
// same serialised link as everything else, on a slow beat for the settings
// and every poll for the meters.
panel KenwoodTXState
// The icon/status word, for working out which bit says "ATU in line" — see
// probeIcons. Kept so only CHANGES are logged.
lastIcons string
iconProbes int
panelCycle int
panelLoaded bool
metersLogged int
powerPeak meterPeak
swrPeak meterPeak
// rx holds bytes read but not yet consumed, ACROSS calls to ask.
//
@@ -210,7 +227,7 @@ func (k *Kenwood) Connect() error {
if k.host != "" {
return fmt.Errorf("kenwood: connect %s: %w", k.host, err)
}
return fmt.Errorf("kenwood: open %s @ %d baud: %w", k.portName, k.baud, err)
return fmt.Errorf("kenwood: open %s @ %d baud: %w%s", k.portName, k.baud, err, busyHint(k.portName, err))
}
p.SetReadTimeout(300 * time.Millisecond)
k.port = p
@@ -299,6 +316,15 @@ func (k *Kenwood) ReadState() (RigState, error) {
if k.tx && !k.txAt.IsZero() && time.Since(k.txAt) < 30*time.Second {
s := k.lastState
s.Connected = true
// The panel still has to be told the radio is transmitting, and the
// transmit meters still have to be read — this early return used to skip
// both. The panel therefore showed MOX unlit while the rig was keyed, so
// pressing it again sent ANOTHER transmit command instead of unkeying,
// and the K3 stayed in TX. The power and SWR bars never moved either,
// for the same reason: the only moment they mean anything is the one
// moment they were not being read.
k.panel.Transmitting = true
k.readTXMeters()
return s, nil
}
raw, err := k.ask("IF;")
@@ -422,6 +448,10 @@ func (k *Kenwood) ReadState() (RigState, error) {
k.curRXFreq = s.RxFreqHz
}
k.lastState = s // cache for the transmit window, where we can't poll
// The panel rides on the same poll and the same held mutex: its own reader
// would have to take turns on the serial port, and the K3 is slow enough
// that two readers taking turns is what makes a dial lag.
k.readPanel(s.Mode, s.Split, s.FreqHz)
return s, nil
}
@@ -649,7 +679,12 @@ func (k *Kenwood) ask(cmd string) (string, error) {
// NOT "unsupported". Latching them off would blind the poll loop for
// good and read as "lost the rig". Only remember the OPTIONAL commands
// (FR/FT/…) so the poll loop stops paying a 600 ms timeout for those.
if want != "IF" && want != "ID" {
// While TRANSMITTING the rig refuses a great deal that it answers
// perfectly well on receive, so a "?;" then says nothing about what
// the radio supports. Latching it would silence a meter for the rest
// of the session on the strength of one badly timed question — and
// the meters are read precisely while transmitting.
if want != "IF" && want != "ID" && !k.noLatch {
k.unsupported[want] = true
debugLog.Printf("kenwood: this rig does not support %q — not asking again", cmd)
}
+650
View File
@@ -0,0 +1,650 @@
package cat
// Elecraft K3/K4 control panel — power, volume, S-meter, SWR, MOX and ATU tune.
//
// Built on the Kenwood-dialect backend, because a K3 speaks it: plain ASCII,
// every command terminated by ';'. What is Elecraft-specific is the vocabulary
// below, taken from the K3 Programmer's Reference; the K4 accepts the same set.
//
// NO K3 WAS AVAILABLE WHILE WRITING THIS, and that shapes it:
//
// - The commands that SET something are the ones the reference documents
// unambiguously and whose effect is visible and reversible (PC, AG, TX/RX).
// - The meters are the opposite: their scaling differs between models and
// firmware, and a wrongly scaled SWR bar is worse than none — it reports a
// good match on a bad antenna. So the raw answers are LOGGED, for a real
// radio to settle, and until then the panel says the scaling is provisional.
//
// The same discipline as the Yaesu meters, which were guessed wrong twice and
// only settled when an FTDX10 keyed a carrier at two known power levels.
import (
"fmt"
"strconv"
"strings"
"time"
)
// KenwoodTXState is what the panel shows.
type KenwoodTXState struct {
Available bool `json:"available"`
Model string `json:"model,omitempty"`
Elecraft bool `json:"elecraft"` // a K3/K4 rather than a Kenwood
Mode string `json:"mode,omitempty"`
Transmitting bool `json:"transmitting"`
Split bool `json:"split"`
SplitTXHz int64 `json:"split_tx_hz"`
// SMeter is 0-100 for the bar. SMeterRaw is what the rig actually answered,
// kept because the scaling is not yet confirmed on a real K3 and a number
// nobody can check is worth less than the reading it came from.
SMeter int `json:"s_meter"`
SMeterRaw int `json:"s_meter_raw"`
// PowerMeter is 0-100 while transmitting. SWR is the ratio; 0 means "not
// measured", NOT a perfect match.
PowerMeter int `json:"power_meter"`
SWR float64 `json:"swr"`
SWRRaw int `json:"swr_raw"`
RFPower int `json:"rf_power"` // watts, the PC setting
AFGain int `json:"af_gain"` // 0-100
RFGain int `json:"rf_gain"` // 0-100
MicGain int `json:"mic_gain"` // 0-100
Squelch int `json:"squelch"` // 0-100
// Receive controls. Preamp and attenuator are the K3's single-step ones
// (PA/RA); a rig that answers neither leaves them false and the row shows
// the state it read, not a state it assumed.
Preamp bool `json:"preamp"`
Att bool `json:"att"`
NB bool `json:"nb"`
NR bool `json:"nr"`
AGC string `json:"agc,omitempty"` // "OFF", "SLOW", "FAST"
// FilterHz is the DSP bandwidth in Hz (the K3 reports it in 10 Hz units).
FilterHz int `json:"filter_hz"`
// Antenna is 1 or 2 on a K3 with the internal ATU, 0 when the rig does not
// answer AN — which is also how the panel knows to hide the row rather than
// offer a switch that goes nowhere.
Antenna int `json:"antenna"`
RIT bool `json:"rit"`
XIT bool `json:"xit"`
// RITOffset is the RIT/XIT offset in Hz — the number the buttons move and
// the one an operator is actually reading when they look at RIT at all. A
// lit RIT button with no offset beside it says the feature is on and
// nothing about where it has put the receiver.
RITOffset int `json:"rit_offset"`
KeySpeed int `json:"key_speed"` // WPM
// MetersProvisional says the meter scaling has not been confirmed against a
// real radio. The panel says so rather than presenting a guess as a
// measurement.
MetersProvisional bool `json:"meters_provisional"`
}
// KenwoodPanelController is the K3/K4 panel capability. Separate from
// KenwoodController (the CW keyer) so a backend can offer one without the other.
type KenwoodPanelController interface {
KenwoodState() KenwoodTXState
RefreshKenwood() error
SetKenwoodPower(int) error
SetKenwoodAFGain(int) error
SetKenwoodRFGain(int) error
SetKenwoodMicGain(int) error
SetKenwoodSquelch(int) error
SetKenwoodPreamp(bool) error
SetKenwoodAtt(bool) error
SetKenwoodNB(bool) error
SetKenwoodNR(bool) error
SetKenwoodAGC(string) error
SetKenwoodFilter(int) error
SetKenwoodAntenna(int) error
SetKenwoodRIT(bool) error
SetKenwoodXIT(bool) error
NudgeKenwoodRIT(int) error
ClearKenwoodRIT() error
SetKenwoodTX(bool) error
TuneKenwoodATU() error
ToggleKenwoodATU() error
}
// kenwoodPanelSlowBeat is how many polls pass between full re-reads of the
// settings. The meters are read every poll; a power setting is not.
const kenwoodPanelSlowBeat = 8
// KenwoodState returns the panel snapshot.
func (k *Kenwood) KenwoodState() KenwoodTXState {
k.mu.Lock()
defer k.mu.Unlock()
st := k.panel
st.Available = k.port != nil
st.Model = k.model
st.Elecraft = k.elecraft
return st
}
// RefreshKenwood forces the settings to be re-read on the next poll, so a value
// changed on the radio's own front panel shows up at once.
func (k *Kenwood) RefreshKenwood() error {
k.mu.Lock()
k.panelCycle = kenwoodPanelSlowBeat
k.mu.Unlock()
return nil
}
// readPanel refreshes the panel. Called from ReadState with the mutex HELD, so
// it shares the same serialised link as everything else.
func (k *Kenwood) readPanel(mode string, split bool, txHz int64) {
k.panel.Mode = mode
k.panel.Split = split
k.panel.SplitTXHz = 0
if split {
k.panel.SplitTXHz = txHz
}
k.panel.Transmitting = k.tx
k.panel.MetersProvisional = true
if k.panel.Transmitting {
k.readTXMeters()
} else {
// Cleared, not frozen: a power bar left standing after the carrier drops
// reads as a live transmission.
k.panel.PowerMeter = 0
k.panel.SWR, k.panel.SWRRaw = 0, 0
k.powerPeak, k.swrPeak = meterPeak{}, meterPeak{}
// The S-meter only means anything while receiving.
if v, ok := k.askNum("SM;", "SM", 4); ok {
k.panel.SMeterRaw = v
k.panel.SMeter = kenwoodSMeterPercent(v)
}
}
k.panelCycle++
if k.panelLoaded && k.panelCycle < kenwoodPanelSlowBeat {
return
}
k.panelCycle = 0
k.panelLoaded = true
k.readPanelSettings()
}
// readPanelSettings re-reads what a knob can change.
func (k *Kenwood) readPanelSettings() {
// PC is watts on both the K3 and the Kenwoods — a setting, not a scale.
if v, ok := k.askNum("PC;", "PC", 3); ok {
k.panel.RFPower = v
}
// AF gain. The K3 answers three digits 000-255; a Kenwood answers AG0nnn,
// which is why the plain form is tried first and the addressed one after.
if v, ok := k.askNum("AG;", "AG", 3); ok {
k.panel.AFGain = scale255(v)
} else if v, ok := k.askNum("AG0;", "AG0", 3); ok {
k.panel.AFGain = scale255(v)
}
// RF gain. The K3 counts 000-250 in dB of reduction; a Kenwood uses the
// familiar 0-255. Both are shown as a percentage, so the slider means the
// same thing on either radio.
if v, ok := k.askNum("RG;", "RG", 3); ok {
k.panel.RFGain = scalePercent(v, k.rfGainFull())
}
if v, ok := k.askNum("MG;", "MG", 3); ok {
k.panel.MicGain = scalePercent(v, k.micGainFull())
}
if v, ok := k.askNum("SQ;", "SQ", 3); ok {
k.panel.Squelch = scalePercent(v, k.squelchFull())
} else if v, ok := k.askNum("SQ0;", "SQ0", 3); ok {
k.panel.Squelch = scale255(v)
}
if v, ok := k.askNum("PA;", "PA", 1); ok {
k.panel.Preamp = v != 0
}
if v, ok := k.askNum("RA;", "RA", 2); ok {
k.panel.Att = v != 0
}
if v, ok := k.askNum("NB;", "NB", 1); ok {
k.panel.NB = v != 0
}
if v, ok := k.askNum("NR;", "NR", 1); ok {
k.panel.NR = v != 0
}
if v, ok := k.askNum("GT;", "GT", 3); ok {
k.panel.AGC = kenwoodAGCName(v)
}
// Filter width. The K3 answers BW in 10 Hz units (BW0270 = 2.7 kHz); a
// Kenwood that does not implement it says nothing and the row stays as it
// was rather than showing a zero-width filter.
if v, ok := k.askNum("BW;", "BW", 4); ok && v > 0 {
k.panel.FilterHz = v * 10
}
// Antenna. Only a K3 with the internal ATU answers; 0 means "this radio has
// no antenna switching", which is what hides the row.
if v, ok := k.askNum("AN;", "AN", 1); ok {
k.panel.Antenna = v
}
if v, ok := k.askNum("RT;", "RT", 1); ok {
k.panel.RIT = v != 0
}
if v, ok := k.askNum("XT;", "XT", 1); ok {
k.panel.XIT = v != 0
}
// RO carries a sign, so it is read as a whole rather than through askNum.
if r, err := k.ask("RO;"); err == nil {
if hz, ok := parseKenwoodOffset(r); ok {
k.panel.RITOffset = hz
}
}
if v, ok := k.askNum("KS;", "KS", 3); ok {
k.panel.KeySpeed = v
}
k.probeIcons()
}
// The full-scale value of the analogue controls differs between an Elecraft and
// a Kenwood, and using one rig's scale on the other silently halves or doubles
// every setting. Kept as three small functions rather than a table so each one
// carries the range it comes from.
func (k *Kenwood) rfGainFull() int {
if k.elecraft {
return 250 // K3: 000-250, dB of reduction
}
return 255
}
func (k *Kenwood) micGainFull() int {
if k.elecraft {
return 60 // K3: 000-060
}
return 255
}
func (k *Kenwood) squelchFull() int {
if k.elecraft {
return 29 // K3: 000-029
}
return 255
}
// scalePercent turns a raw value into 0-100 against its own full scale.
func scalePercent(v, full int) int {
if full <= 0 || v <= 0 {
return 0
}
if v >= full {
return 100
}
return v * 100 / full
}
// kenwoodAGCName decodes GT. The K3 answers 000 (off), 002 (slow) or 004
// (fast); a Kenwood uses the same three values for the same three states.
func kenwoodAGCName(v int) string {
switch {
case v == 0:
return "OFF"
case v <= 2:
return "SLOW"
default:
return "FAST"
}
}
// kenwoodAGCValue is the inverse, for the buttons.
func kenwoodAGCValue(name string) int {
switch strings.ToUpper(strings.TrimSpace(name)) {
case "OFF":
return 0
case "SLOW":
return 2
default:
return 4
}
}
// kenwoodMeterProbes are the candidate meter commands, asked once per
// transmission burst so a real radio can settle what they mean.
//
// They are NOT interchangeable — BG is a bargraph position, SM during transmit
// is something else again — which is exactly why the log records which one
// answered and what it said, next to the power SETTING: the meter that tracks a
// known carrier at two different power levels is the power meter, and no amount
// of reading the reference settles that as well as one transmission does.
var kenwoodMeterProbes = []struct {
cmd string
prefix string
digits int
}{
{"SM;", "SM", 4},
{"BG;", "BG", 2},
{"SW;", "SW", 4},
{"PO;", "PO", 3},
}
// readTXMeters reads the transmit meters.
func (k *Kenwood) readTXMeters() {
now := time.Now()
// Refusals here are about WHEN the question was asked, not about what the
// radio can do: a K3 says "?;" to plenty while the carrier is up.
k.noLatch = true
defer func() { k.noLatch = false }()
if v, ok := k.askNum("BG;", "BG", 2); ok {
k.panel.PowerMeter = k.powerPeak.update(kenwoodBargraphPercent(v), now)
}
if v, ok := k.askNum("SW;", "SW", 4); ok {
k.panel.SWRRaw = v
// Tenths of a ratio, provisionally: 15 → 1.5. Reported as raw as well,
// so the log can correct this without anyone having to trust the bar.
if v > 0 {
k.panel.SWR = float64(k.swrPeak.update(v, now)) / 10
}
}
if k.metersLogged >= 20 {
return
}
k.metersLogged++
raw := make([]string, 0, len(kenwoodMeterProbes))
for _, p := range kenwoodMeterProbes {
if v, ok := k.askNum(p.cmd, p.prefix, p.digits); ok {
raw = append(raw, fmt.Sprintf("%s=%d", strings.TrimSuffix(p.cmd, ";"), v))
} else {
raw = append(raw, strings.TrimSuffix(p.cmd, ";")+"=-")
}
}
debugLog.Printf("kenwood: TX meters at PC=%dW: %s (compare two power settings, and a known SWR)",
k.panel.RFPower, strings.Join(raw, " "))
}
// kenwoodSMeterPercent turns the S-meter answer into a bar percentage.
//
// The K3 reports 0-21 across S0…S9+60, which is not a linear dB scale but is
// what its own display shows — and matching the radio's own bar is something an
// operator can check at a glance. A Kenwood answers 0-30 on the same command;
// both are covered by clamping rather than by guessing which rig is on the
// other end.
func kenwoodSMeterPercent(v int) int {
switch {
case v <= 0:
return 0
case v >= 30:
return 100
}
return v * 100 / 21
}
// kenwoodBargraphPercent scales the K3 bargraph (0-12 segments) to the bar.
func kenwoodBargraphPercent(v int) int {
switch {
case v <= 0:
return 0
case v >= 12:
return 100
}
return v * 100 / 12
}
// SetKenwoodPower sets the transmit power, in watts.
//
// A K3 takes PC000-110: 110 rather than 100 because the radio will make a
// little over its rated output and the reference says so. A Kenwood of the
// TS-890 sort goes to 200, so the ceiling follows the radio rather than being
// one number that is wrong for one of them.
func (k *Kenwood) SetKenwoodPower(w int) error {
max := 200
if k.elecraft {
max = 110
}
if w < 0 {
w = 0
}
if w > max {
w = max
}
return k.setPanel(fmt.Sprintf("PC%03d;", w))
}
// SetKenwoodAFGain sets the volume, 0-100, scaled to the rig's 0-255.
func (k *Kenwood) SetKenwoodAFGain(p int) error {
if p < 0 {
p = 0
}
if p > 100 {
p = 100
}
return k.setPanel(fmt.Sprintf("AG%03d;", p*255/100))
}
// probeIcons logs the K3's icon/status word whenever it changes.
//
// There is no command that asks "is the ATU in line": the reference says the
// front-panel switch functions show up as icon changes readable through IC (or
// DS), which means the answer is a bit in a word nobody here can name yet. So
// the word is logged when it changes, and an operator toggling the ATU while
// watching the log hands us the bit — after which the ATU button can light up
// honestly instead of guessing from what it last sent.
func (k *Kenwood) probeIcons() {
if k.iconProbes >= 40 {
return
}
r, err := k.ask("IC;")
if err != nil {
k.iconProbes = 40 // this rig has no IC; stop asking
return
}
if r == k.lastIcons {
return
}
k.lastIcons = r
k.iconProbes++
debugLog.Printf("kenwood: icon status changed → %s (toggle ATU/PRE/ATT while watching this line to name the bits)", r)
}
// SetKenwoodRFGain sets the RF gain, 0-100 of the rig's own scale.
func (k *Kenwood) SetKenwoodRFGain(p int) error {
return k.setPanel(fmt.Sprintf("RG%03d;", clampPercentTo(p, k.rfGainFull())))
}
func (k *Kenwood) SetKenwoodMicGain(p int) error {
return k.setPanel(fmt.Sprintf("MG%03d;", clampPercentTo(p, k.micGainFull())))
}
func (k *Kenwood) SetKenwoodSquelch(p int) error {
return k.setPanel(fmt.Sprintf("SQ%03d;", clampPercentTo(p, k.squelchFull())))
}
func (k *Kenwood) SetKenwoodPreamp(on bool) error {
return k.setPanel(fmt.Sprintf("PA%d;", boolDigit(on)))
}
// SetKenwoodAtt switches the attenuator. Two digits: the K3 reads RA01 as its
// single 10 dB pad, and a Kenwood with several steps takes the first one.
func (k *Kenwood) SetKenwoodAtt(on bool) error {
if on {
return k.setPanel("RA01;")
}
return k.setPanel("RA00;")
}
func (k *Kenwood) SetKenwoodNB(on bool) error {
return k.setPanel(fmt.Sprintf("NB%d;", boolDigit(on)))
}
func (k *Kenwood) SetKenwoodNR(on bool) error {
return k.setPanel(fmt.Sprintf("NR%d;", boolDigit(on)))
}
func (k *Kenwood) SetKenwoodAGC(name string) error {
return k.setPanel(fmt.Sprintf("GT%03d;", kenwoodAGCValue(name)))
}
// SetKenwoodFilter sets the DSP bandwidth in Hz — sent in the K3's 10 Hz units.
func (k *Kenwood) SetKenwoodFilter(hz int) error {
if hz < 50 {
hz = 50
}
if hz > 4000 {
hz = 4000
}
return k.setPanel(fmt.Sprintf("BW%04d;", hz/10))
}
// SetKenwoodAntenna selects antenna 1 or 2 (a K3 with the internal ATU).
func (k *Kenwood) SetKenwoodAntenna(n int) error {
if n < 1 {
n = 1
}
if n > 2 {
n = 2
}
return k.setPanel(fmt.Sprintf("AN%d;", n))
}
// parseKenwoodOffset reads "RO+0100;" / "RO-0250;" into Hz.
func parseKenwoodOffset(frame string) (int, bool) {
body := strings.TrimSuffix(strings.TrimPrefix(frame, "RO"), ";")
if len(body) < 2 {
return 0, false
}
sign := 1
switch body[0] {
case '-':
sign = -1
body = body[1:]
case '+':
body = body[1:]
}
n, err := strconv.Atoi(strings.TrimSpace(body))
if err != nil {
return 0, false
}
return sign * n, true
}
// NudgeKenwoodRIT moves the RIT/XIT offset by delta Hz.
//
// The offset is SET rather than stepped, because RO is where the radio keeps
// it and stepping commands differ across the family. The panel's own reading is
// the starting point, so two quick presses do not both start from the same
// stale value.
func (k *Kenwood) NudgeKenwoodRIT(delta int) error {
k.mu.Lock()
cur := k.panel.RITOffset
k.mu.Unlock()
next := cur + delta
// A pile-up is chased with a few hundred hertz of RIT; ±5 kHz is already
// past anything an offset is for, and past what the rig accepts.
if next > 5000 {
next = 5000
}
if next < -5000 {
next = -5000
}
sign := "+"
if next < 0 {
sign = "-"
}
mag := next
if mag < 0 {
mag = -mag
}
k.mu.Lock()
k.panel.RITOffset = next // optimistic, like the sliders
k.mu.Unlock()
return k.setPanel(fmt.Sprintf("RO%s%04d;", sign, mag))
}
func (k *Kenwood) SetKenwoodRIT(on bool) error {
return k.setPanel(fmt.Sprintf("RT%d;", boolDigit(on)))
}
func (k *Kenwood) SetKenwoodXIT(on bool) error {
return k.setPanel(fmt.Sprintf("XT%d;", boolDigit(on)))
}
// ClearKenwoodRIT zeroes the RIT/XIT offset, both at once — which is what RC
// does and what the operator means by "clear it".
func (k *Kenwood) ClearKenwoodRIT() error {
return k.setPanel("RC;")
}
// clampPercentTo maps 0-100 onto a rig's own full scale.
func clampPercentTo(p, full int) int {
if p < 0 {
p = 0
}
if p > 100 {
p = 100
}
return p * full / 100
}
// SetKenwoodTX keys or unkeys the transmitter — the panel's MOX.
//
// Goes through SetPTT rather than writing TX;/RX; here, so the backend's own
// idea of transmitting stays true: it suppresses polling while the carrier is
// up, and a panel that keyed behind its back would leave it polling a rig that
// answers "?;" to everything.
func (k *Kenwood) SetKenwoodTX(on bool) error {
return k.SetPTT(on)
}
// The K3 has no dedicated "tune" command: the reference exposes the front panel
// instead, through SWT (tap) and SWH (hold) with a switch number from Table 7.
// Switch 19 is the ATU row — TAP starts a tuning cycle, HOLD puts the tuner in
// or out of line.
//
// It was written as SWT20 first, from memory of the reference rather than from
// the table, and 20 is not an ATU switch at all. Corrected against Table 7 of
// the K3 Programmer's Reference, which an operator read out for us. Every send
// is still logged: a switch-emulation command presses a real button on a real
// front panel, so what OpsLog sent must be recoverable afterwards.
const (
kenwoodATUTune = "SWT19;" // tap ATU TUNE — start a tuning cycle
kenwoodATUToggle = "SWH19;" // hold ATU — tuner in line / bypassed
)
// TuneKenwoodATU starts an ATU tuning cycle.
func (k *Kenwood) TuneKenwoodATU() error {
debugLog.Printf("kenwood: ATU tune — sending %q (K3 Table 7: tap of the ATU TUNE switch)", kenwoodATUTune)
return k.setPanel(kenwoodATUTune)
}
// ToggleKenwoodATU puts the tuner in line or bypasses it — the HOLD of the same
// switch, which is how it is done on the radio itself.
func (k *Kenwood) ToggleKenwoodATU() error {
debugLog.Printf("kenwood: ATU in/out — sending %q (K3 Table 7: hold of the ATU switch)", kenwoodATUToggle)
return k.setPanel(kenwoodATUToggle)
}
// setPanel writes one command and schedules a settings re-read, so the panel
// shows what the radio did rather than what it was asked to do.
func (k *Kenwood) setPanel(cmd string) error {
k.mu.Lock()
defer k.mu.Unlock()
if k.port == nil {
return fmt.Errorf("kenwood: not connected")
}
if err := k.write(cmd); err != nil {
return err
}
k.panelCycle = kenwoodPanelSlowBeat // re-read on the next poll
return nil
}
// askNum asks a command and parses its numeric body. ask() already remembers
// what this rig answered "?;" to and refuses to ask it again, so an unsupported
// meter costs one timeout for the life of the session, not one per poll.
func (k *Kenwood) askNum(cmd, prefix string, digits int) (int, bool) {
r, err := k.ask(cmd)
if err != nil {
return 0, false
}
body := strings.TrimSuffix(strings.TrimPrefix(r, prefix), ";")
if len(body) < digits {
return 0, false
}
n, err := strconv.Atoi(strings.TrimSpace(body[:digits]))
if err != nil {
return 0, false
}
return n, true
}
+20
View File
@@ -500,10 +500,30 @@ func (o *OmniRig) SetFrequency(hz int64) error {
// deliberately; a spot click is a request to change frequency, not to change
// VFO. On SUB the direct FreqB write below does the whole job.
onSubVFO := vfo == "B" || vfo == "BB" || vfo == "BA"
// …and NEVER on a Yaesu.
//
// On Yaesu the call is useless at best: an FT-891 logged "SetSimplexMode OK"
// on every spot click while FreqA never moved (see below — the direct property
// write is what actually tunes these rigs). On an FT-2000 it is worse than
// useless. From a log of one QSY, before and after the call:
//
// Vfo="AB"(0x80) Split=0x10000 (off) → the operator's state
// Vfo="BA"(0x100) Split=0x8000 (ON) → after SetSimplexMode
//
// The rig-agnostic "receive and transmit HERE, simplex" method turned split ON
// and moved reception to VFO B, which is exactly what the operator reported:
// OpsLog showing B instead of A. OpsLog was not misreading the radio — it was
// reading it correctly after having moved it itself.
//
// Restricted to Yaesu because that is where the evidence is: on Icom the call
// is authoritative and the direct write is the unreliable one.
isYaesu := isYaesuRig(rigType)
simplexOK := false
switch {
case onSubVFO:
debugLog.Printf("OmniRig.SetFrequency: on VFO %q — skipping SetSimplexMode so the rig stays on SUB", vfo)
case isYaesu:
debugLog.Printf("OmniRig.SetFrequency: %q is a Yaesu — skipping SetSimplexMode (a no-op on some, and on an FT-2000 it turns split on and jumps to VFO B); the direct write below does the work", rigType)
default:
if _, err := oleutil.CallMethod(o.rig, "SetSimplexMode", int32(hz32)); err == nil {
simplexOK = true
+21
View File
@@ -125,3 +125,24 @@ func TestOmniRigWriteTarget(t *testing.T) {
}
}
}
// SetSimplexMode is skipped on Yaesu, and that is not a preference.
//
// On an FT-891 it returned OK on every spot click while the rig never moved. On
// an FT-2000 it did something worse — a log of one QSY shows the state going
// from Vfo="AB" split off to Vfo="BA" split ON, so the operator's reception
// jumped to VFO B and OpsLog, reading the radio correctly, displayed B. The
// direct FreqA/Freq write does the tuning on these rigs.
func TestYaesuRigsAreRecognisedForTheSimplexSkip(t *testing.T) {
for _, yes := range []string{"FT-2000", "FT-891", "FTDX10", "ftdx101", " FT-991A "} {
if !isYaesuRig(yes) {
t.Errorf("%q not recognised as a Yaesu — SetSimplexMode would still be called on it", yes)
}
}
// Everything else keeps the call: on Icom it is the authoritative one.
for _, no := range []string{"IC-7610", "TS-590", "K3", "", "Flex-6600"} {
if isYaesuRig(no) {
t.Errorf("%q wrongly treated as a Yaesu", no)
}
}
}
+39
View File
@@ -0,0 +1,39 @@
package cat
// "Serial port busy" is a true statement that helps nobody.
//
// A COM port has exactly one owner, and when a rig's port is refused the owner
// is almost always another program on the same desktop — most often OmniRig,
// which stays resident once any application has activated it and keeps the port
// of the rig configured in it. An operator switching from OmniRig to a native
// backend therefore hits this the moment they save: OpsLog is now asking for a
// port OmniRig never let go of. The message named none of that.
//
// It also happens the other way round, and the wording says so rather than
// accusing: a digital application (WSJT-X, JTDX, MSHV) configured on the rig's
// port directly, rather than through OpsLog's CAT sharing, holds it just as
// firmly.
import "strings"
// busyHint returns a sentence to append to an open error, or "" when the error
// is not about the port being taken.
//
// Deliberately not a wrapped error: this is advice for a human reading a log,
// and it must not change how any caller compares the error.
func busyHint(port string, err error) string {
if err == nil {
return ""
}
msg := strings.ToLower(err.Error())
busy := strings.Contains(msg, "busy") ||
strings.Contains(msg, "access is denied") ||
strings.Contains(msg, "denied") ||
strings.Contains(msg, "in use")
if !busy {
return ""
}
return " — another program holds " + port +
". OmniRig is the usual one (it stays running and keeps the port of the rig configured in it, so a native backend can never have it);" +
" a digital application pointed straight at the rig instead of at OpsLog's CAT sharing does the same. Close it, then reconnect."
}
+1 -1
View File
@@ -95,7 +95,7 @@ func (x *Xiegu) Connect() error {
}
p, err := serial.Open(x.portName, &serial.Mode{BaudRate: x.baud})
if err != nil {
return fmt.Errorf("xiegu: open %s @ %d baud: %w", x.portName, x.baud, err)
return fmt.Errorf("xiegu: open %s @ %d baud: %w%s", x.portName, x.baud, err, busyHint(x.portName, err))
}
p.SetReadTimeout(200 * time.Millisecond)
// Deassert DTR and RTS.
+1 -1
View File
@@ -159,7 +159,7 @@ func (y *Yaesu) Connect() error {
}
p, err := serial.Open(y.portName, &serial.Mode{BaudRate: y.baud})
if err != nil {
return fmt.Errorf("yaesu: open %s @ %d baud: %w", y.portName, y.baud, err)
return fmt.Errorf("yaesu: open %s @ %d baud: %w%s", y.portName, y.baud, err, busyHint(y.portName, err))
}
// The modem lines are only touched when the operator asks for it — see the
// note on Kenwood.lowerLines. Both defaults break somebody's station.
+78 -8
View File
@@ -43,18 +43,30 @@ type YaesuTXState struct {
PowerMeter int `json:"power_meter"` // 0-100, TX only
SWRMeter int `json:"swr_meter"` // 0-100, TX only
RFPower int `json:"rf_power"` // watts
RFPower int `json:"rf_power"` // watts
// MaxPower is what this model can actually be set to, so the slider stops
// where the radio does. An FTDX101MP is a 200 W transmitter and its operator
// could not ask for more than 100 W — the slider, not the rig, was the limit.
MaxPower int `json:"max_power"`
// NarrowSupported says the rig answered NA at all. A button that reports a
// state the radio never gave, and does nothing when pressed, is worse than
// an absent one: it looks like a fault in the radio.
NarrowSupported bool `json:"narrow_supported"`
MicGain int `json:"mic_gain"` // 0-100
AFGain int `json:"af_gain"` // 0-100
RFGain int `json:"rf_gain"` // 0-100
Squelch int `json:"squelch"` // 0-100
AGC string `json:"agc,omitempty"`
Preamp int `json:"preamp"` // 0=IPO, 1=AMP1, 2=AMP2
Att int `json:"att"` // 0=off, else dB
NB bool `json:"nb"`
NR bool `json:"nr"`
NRLevel int `json:"nr_level"` // 1-15
Narrow bool `json:"narrow"` // NAR filter
// Antenna is the selected jack, 1-3, or 0 when the rig has no AN command —
// an FT-891 or FT-991A has a single socket and answers nothing. 0 is what
// tells the panel to draw no selector at all rather than a dead one.
Antenna int `json:"antenna"`
Att int `json:"att"` // 0=off, else dB
NB bool `json:"nb"`
NR bool `json:"nr"`
NRLevel int `json:"nr_level"` // 1-15
Narrow bool `json:"narrow"` // NAR filter
// SWR is the RATIO (1.0, 1.5…), computed from the reflection coefficient —
// what an operator reads on the rig, not a percentage of meter travel.
SWR float64 `json:"swr"`
@@ -80,6 +92,7 @@ type YaesuController interface {
SetYaesuSquelch(int) error
SetYaesuAGC(string) error
SetYaesuPreamp(int) error
SetYaesuAntenna(int) error
SetYaesuAtt(int) error
SetYaesuNB(bool) error
SetYaesuNR(bool) error
@@ -105,9 +118,29 @@ func (y *Yaesu) YaesuState() YaesuTXState {
st := y.panel
st.Available = y.port != nil
st.Model = y.model
st.MaxPower = yaesuMaxPower(y.model, st.RFPower)
return st
}
// yaesuMaxPower is how far the power slider may go on this model.
//
// The rig itself is never asked — there is no CAT command for "how much power
// can you make" — so it comes from the model name, with one safeguard: a rig
// REPORTING more than the table expects is believed, because it has just proved
// what it can do. Anything unknown gets 100 W, which is the family default and
// errs towards asking for too little.
func yaesuMaxPower(model string, reported int) int {
max := 100
switch {
case strings.Contains(model, "101MP"), strings.Contains(model, "5000"), strings.Contains(model, "9000"):
max = 200
}
if reported > max {
max = reported
}
return max
}
// readPanel refreshes the meters, and the settings on the slower beat. Called
// from ReadState with the mutex HELD, so it shares the same serialised link.
func (y *Yaesu) readPanel(mode string, split bool, txHz int64) {
@@ -221,8 +254,15 @@ func (y *Yaesu) readPanelSettings() {
if v, ok := y.askNum("PC;", "PC", 3); ok {
y.panel.RFPower = v // watts, not a 0-255 scale
}
// MIC GAIN IS 0-100, not 0-255.
//
// It was read through the 0-255 scale like the audio gains, so an FTDX101
// set to 80 showed 38 — and worse, writing sent 80 → 204, outside the range
// the rig accepts, so the setting was refused and the slider sprang back to
// where it had been. Reported from a real FTDX101; the CAT reference gives
// MG000-100 for the whole current family.
if v, ok := y.askNum("MG;", "MG", 3); ok {
y.panel.MicGain = scale255(v)
y.panel.MicGain = clampInt(v, 0, 100)
}
if v, ok := y.askNum("AG0;", "AG0", 3); ok {
y.panel.AFGain = scale255(v)
@@ -239,6 +279,24 @@ func (y *Yaesu) readPanelSettings() {
if v, ok := y.askNum("PA0;", "PA0", 1); ok {
y.panel.Preamp = v
}
// ANTENNA. "AN0;" → "AN01;" — the first digit is the receiver (0 = main,
// 1 = sub on an FTDX101), the second the jack. A rig with one socket does
// not implement it and simply says nothing, which askNum reports as
// not-ok — and 0 then means "no antenna switching here".
if v, ok := y.askNum("AN0;", "AN0", 1); ok {
if y.panel.Antenna == 0 {
debugLog.Printf("yaesu: antenna select available (AN0; → %d)", v)
}
y.panel.Antenna = v
} else {
// Said once, at the first read: an operator who expects the ANT row and
// does not get it should find the reason in the log rather than wonder
// whether OpsLog forgot the feature.
if y.panel.Antenna != -1 {
debugLog.Printf("yaesu: no answer to AN0; — this rig has no antenna selection, the ANT row stays hidden")
}
y.panel.Antenna = -1
}
if v, ok := y.askNum("RA0;", "RA0", 1); ok {
y.panel.Att = yaesuAttDB(v)
}
@@ -253,6 +311,7 @@ func (y *Yaesu) readPanelSettings() {
}
if v, ok := y.askNum("NA0;", "NA0", 1); ok {
y.panel.Narrow = v != 0
y.panel.NarrowSupported = true
}
if v, ok := y.askNum("VX;", "VX", 1); ok {
y.panel.VOX = v != 0
@@ -333,7 +392,7 @@ func (y *Yaesu) SetYaesuPower(w int) error {
}
func (y *Yaesu) SetYaesuMicGain(p int) error {
return y.setAndRefresh(fmt.Sprintf("MG%03d;", from100(p)))
return y.setAndRefresh(fmt.Sprintf("MG%03d;", clampInt(p, 0, 100)))
}
func (y *Yaesu) SetYaesuAFGain(p int) error {
@@ -356,6 +415,17 @@ func (y *Yaesu) SetYaesuPreamp(n int) error {
return y.setAndRefresh(fmt.Sprintf("PA0%d;", clampInt(n, 0, 2)))
}
// SetYaesuAntenna selects an antenna jack (1-3) on the main receiver.
//
// Verified against the FTDX10 command set; the FTDX101 adds a third jack and a
// sub receiver, which is the "0" in AN0 — the day someone drives a sub receiver
// from here it becomes a parameter rather than a constant. A rig without the
// command ignores it, and readPanelSettings then keeps Antenna at 0, so the
// control never appears in the first place.
func (y *Yaesu) SetYaesuAntenna(n int) error {
return y.setAndRefresh(fmt.Sprintf("AN0%d;", clampInt(n, 1, 3)))
}
func (y *Yaesu) SetYaesuAtt(db int) error {
return y.setAndRefresh(fmt.Sprintf("RA0%d;", yaesuAttCode(db)))
}
+27 -1
View File
@@ -1,6 +1,9 @@
package cat
import "testing"
import (
"fmt"
"testing"
)
func TestParseYaesuFreq(t *testing.T) {
cases := []struct {
@@ -380,3 +383,26 @@ func TestYaesuModeVFOSuffix(t *testing.T) {
t.Errorf("setting CW on main sends %q, want MD03;", cmd)
}
}
// The antenna command, as the FTDX10 reference gives it: AN + receiver + jack.
// The jack is clamped rather than trusted — a panel bug that sent AN09 would be
// answered by the rig with silence, and the operator would be left wondering
// which antenna they were on.
func TestYaesuAntennaCommand(t *testing.T) {
for _, tc := range []struct {
in int
want string
}{
{1, "AN01;"},
{2, "AN02;"},
{3, "AN03;"},
{0, "AN01;"}, // below range → the first jack
{9, "AN03;"}, // above range → the last
{-1, "AN01;"},
} {
got := fmt.Sprintf("AN0%d;", clampInt(tc.in, 1, 3))
if got != tc.want {
t.Errorf("antenna %d → %q, want %q", tc.in, got, tc.want)
}
}
}
+27 -6
View File
@@ -147,7 +147,17 @@ func NowISO() string { return time.Now().UTC().Format("2006-01-02T15:04:05.000Z"
// Open opens (and creates if needed) the SQLite database at the given path,
// enables performance PRAGMAs, and applies embedded migrations.
func Open(path string) (*sql.DB, error) {
//
// This is the SETTINGS database, which gets the full schema — see roles.go for
// why. Use OpenLogbook for a database that holds contacts only.
func Open(path string) (*sql.DB, error) { return open(path, RoleAll) }
// OpenLogbook opens a SQLite logbook: the qso table and nothing from the
// settings side, and any unused settings tables an earlier version left in it
// are dropped if they are empty.
func OpenLogbook(path string) (*sql.DB, error) { return open(path, RoleLogbook) }
func open(path string, role Role) (*sql.DB, error) {
// Escape only the two characters a path could contain that the DSN would
// otherwise read as its query/fragment delimiters. Windows separators
// (\\ and the drive ':') are left intact — url.PathEscape would mangle them.
@@ -162,10 +172,12 @@ func Open(path string) (*sql.DB, error) {
return nil, fmt.Errorf("ping sqlite: %w", err)
}
Dialect = "sqlite"
if err := migrate(conn, nil, path, filepath.Base(path)); err != nil {
label := filepath.Base(path)
if err := migrate(conn, nil, path, label, role); err != nil {
_ = conn.Close()
return nil, err
}
pruneForeignTables(conn, role, label)
return conn, nil
}
@@ -236,7 +248,7 @@ func backupBeforeRewrite(conn *sql.DB, dbPath, migration string) {
// interleaved migration runs in one log were indistinguishable — an operator
// reported "migrations are very slow" and the lines gave no way to tell one
// database migrated three times from three databases migrated once.
func migrate(conn *sql.DB, translate func(string) string, dbPath, label string) error {
func migrate(conn *sql.DB, translate func(string) string, dbPath, label string, role Role) error {
// A non-nil translator means this is the MySQL connection (use the
// per-statement, FK-aware path); nil means a SQLite connection. This is
// determined by the caller's argument, NOT the global Dialect, so the
@@ -331,9 +343,18 @@ func migrate(conn *sql.DB, translate func(string) string, dbPath, label string)
if err != nil {
return fmt.Errorf("begin tx for %s: %w", name, err)
}
if _, err := tx.Exec(sqlText); err != nil {
_ = tx.Rollback()
return fmt.Errorf("apply migration %s: %w", name, err)
// Statement by statement rather than one Exec of the whole file: the role
// filter works per statement, and a settings-table statement must not
// reach a logbook database (see roles.go). Still one transaction, so the
// file remains atomic.
for _, stmt := range splitStatements(sqlText) {
if !keepForRole(stmt, role) {
continue
}
if _, err := tx.Exec(stmt); err != nil {
_ = tx.Rollback()
return fmt.Errorf("apply migration %s: %w", name, err)
}
}
if _, err := tx.Exec(`INSERT INTO schema_migrations(name) VALUES(?)`, name); err != nil {
_ = tx.Rollback()
+4 -2
View File
@@ -252,7 +252,7 @@ func OpenMySQL(c MySQLConfig) (*sql.DB, error) {
return nil, rerr
}
// Then apply only the migrations it's missing.
err = migrate(conn, mysqlDDL, "", "mysql:"+name)
err = migrate(conn, mysqlDDL, "", "mysql:"+name, RoleLogbook)
}
if err != nil {
_ = conn.Close()
@@ -343,7 +343,9 @@ func applyMySQLBaseline(conn *sql.DB) error {
// database. Labelled so its (fast) migration lines are not mistaken for a
// real database being migrated — in one operator's log this pass sat between
// two slow MySQL runs and looked like a third database.
if err := migrate(mem, nil, "", "baseline:memory"); err != nil {
// RoleLogbook: the baseline defines what a FRESH shared logbook gets, and a
// logbook has no business holding settings or station profiles.
if err := migrate(mem, nil, "", "baseline:memory", RoleLogbook); err != nil {
return fmt.Errorf("build baseline schema: %w", err)
}
+321
View File
@@ -0,0 +1,321 @@
package db
// Which tables belong in which database.
//
// OpsLog keeps settings and contacts apart — a settings database (settings.db /
// opslog.db) and a logbook (logbook.db, a per-profile file, or a shared MySQL).
// The SEPARATION of the data was real from the start; the SCHEMA was not: every
// target got the whole migration set, so a shared MySQL logbook grew a settings
// table and a station_profiles table that nothing ever wrote to. An operator
// inspecting the server with phpMyAdmin had no way to tell which copy was
// authoritative — a fair question, and the reason for this file.
//
// So a migration statement is now filtered by the ROLE of the database it is
// being applied to. Only two rules, and both fail safe:
//
// - RoleAll (the settings database) applies everything, exactly as before.
// It has to: a legacy single-file installation holds its QSOs there, and it
// still serves as the logbook when no separate one could be created.
// - RoleLogbook applies everything EXCEPT statements aimed at a table on the
// settings side. A table this file does not know about is kept, in both —
// an unrecognised future table behaves as it does today rather than
// silently going missing from one database.
import (
"database/sql"
"fmt"
"strings"
)
// Role is what a database is for.
type Role int
const (
// RoleAll applies every migration statement. The settings database.
RoleAll Role = iota
// RoleLogbook applies only what the contacts need.
RoleLogbook
)
// settingsTables are owned by the settings database. Every one of them is
// reached through the settings connection in app.go — grep NewRepo/NewStore
// there: only qso.NewRepo is given the logbook connection.
//
// Ordered children-before-parents, because pruneForeignTables drops them in
// this order and operating_antennas has a foreign key into operating_stations.
var settingsTables = []string{
"operating_antenna_bands",
"operating_antennas",
"operating_antennas_new",
"operating_stations",
"operating_stations_new",
"award_references",
"qsl_templates",
"cluster_servers",
"integrations_udp",
"callsign_cache",
"station_profiles",
"settings",
}
// keepForRole reports whether one migration statement applies to this role.
func keepForRole(stmt string, role Role) bool {
if role == RoleAll {
return true
}
t := stmtTable(stmt)
if t == "" {
return true // not a table statement (PRAGMA, or a shape we don't parse)
}
for _, s := range settingsTables {
if t == s {
return false
}
}
return true
}
// stmtTable returns the lower-cased table a statement acts on, or "".
//
// Deliberately literal: it recognises the handful of statement shapes the
// migrations actually use, and returns "" for anything else — which keeps the
// statement. Guessing would be the only way to drop something by accident.
func stmtTable(stmt string) string {
f := strings.Fields(strings.ToLower(stmt))
at := func(i int) string {
if i < len(f) {
return f[i]
}
return ""
}
// Skip the leading keywords that carry no table name.
switch {
case at(0) == "create" || at(0) == "drop":
// CREATE [UNIQUE] INDEX <name> ON <table> …
// CREATE TABLE [IF NOT EXISTS] <table> … / DROP TABLE [IF EXISTS] <t>
//
// The "ON" search is confined to an INDEX statement on purpose: a CREATE
// TABLE body is full of "ON DELETE CASCADE", and scanning the whole
// statement for "on" once made every foreign-keyed table report itself as
// a table named "delete" — unrecognised, therefore kept, therefore created
// in a logbook that had no use for it.
if at(1) == "index" || (at(1) == "unique" && at(2) == "index") {
for i, w := range f {
if w == "on" && i+1 < len(f) {
return cleanIdent(f[i+1])
}
}
}
i := 1
for at(i) == "unique" || at(i) == "table" || at(i) == "index" ||
at(i) == "if" || at(i) == "not" || at(i) == "exists" || at(i) == "view" {
i++
}
return cleanIdent(at(i))
case at(0) == "alter":
return cleanIdent(at(2)) // ALTER TABLE <table> …
case at(0) == "insert" || at(0) == "replace":
i := 1
for at(i) == "or" || at(i) == "ignore" || at(i) == "into" || at(i) == "replace" {
i++
}
return cleanIdent(at(i))
case at(0) == "update":
return cleanIdent(at(1))
case at(0) == "delete":
return cleanIdent(at(2)) // DELETE FROM <table>
}
return ""
}
// cleanIdent strips quoting and anything glued to the name — "qso(id)" from an
// index, `settings` from the MySQL translation, "qso;" from a split statement.
func cleanIdent(s string) string {
s = strings.TrimSpace(s)
if i := strings.IndexAny(s, "(;"); i >= 0 {
s = s[:i]
}
return strings.Trim(s, "`\"'[]")
}
// pruneForeignTables removes settings tables from a logbook database that an
// earlier version created there.
//
// ONLY WHEN EMPTY, without exception. A table with rows in it is data, whatever
// this file thinks it is for: a profile pointing at a legacy combined database
// as its logbook is a real configuration, and dropping its profiles because the
// schema now says they belong elsewhere would be destroying a log-keeping
// operator's work on the strength of a tidiness rule.
//
// Best effort throughout: a logbook the user cannot drop tables in (a restricted
// MySQL grant) keeps its empty tables and works exactly as it does today.
func pruneForeignTables(conn *sql.DB, role Role, label string) {
if role != RoleLogbook || conn == nil {
return
}
// Once per database, recorded like a migration.
//
// The check itself is a COUNT(*) per settings table — twelve round trips,
// which is nothing locally and is paid on EVERY open of a remote MySQL
// logbook, including every profile switch. There is nothing to find after the
// first pass: the role filter means no settings table is ever created in a
// logbook again.
if _, err := conn.Exec(`INSERT INTO schema_migrations(name) VALUES(?)`, prunedMarker); err != nil {
return // already recorded (primary key), or the table is not writable
}
dropped := 0
for _, t := range settingsTables {
var n int
// A missing table errors here, which is the "nothing to do" answer.
if err := conn.QueryRow(`SELECT COUNT(*) FROM ` + quoteIdent(t)).Scan(&n); err != nil {
continue
}
if n != 0 {
logf("db[%s]: keeping %s — it has %d row(s)", label, t, n)
continue
}
if _, err := conn.Exec(`DROP TABLE ` + quoteIdent(t)); err != nil {
logf("db[%s]: could not drop unused %s: %v", label, t, err)
continue
}
dropped++
}
if dropped > 0 {
logf("db[%s]: dropped %d unused settings table(s) — this database holds contacts only", label, dropped)
}
}
// prunedMarker records, in schema_migrations, that a logbook has had its unused
// settings tables removed. Named like a migration and stored beside them because
// that is exactly what it is: a one-off schema step, and the applied set is
// already read in a single query at every open.
const prunedMarker = "_opslog_pruned_settings_tables"
// quoteIdent quotes one of OUR OWN table names for either dialect. Backticks
// work in MySQL and in SQLite alike, which is why the migrations use them.
func quoteIdent(s string) string { return "`" + s + "`" }
// DropRedundantSettingsTables removes the settings tables from a logbook
// database EVEN IF THEY HAVE ROWS.
//
// Reserved for the one case where those rows are provably a stale duplicate:
// the logbook file was seeded by VACUUM INTO from the old combined database
// (see the split at startup), so every profile and every setting in it is a
// copy of what the settings database still holds and is authoritative for.
// Nothing reads them — the settings connection is a different file entirely —
// and leaving them behind is what made the two databases look interchangeable.
//
// The caller must have established that authority. pruneForeignTables is the
// safe default for every other situation.
func DropRedundantSettingsTables(conn *sql.DB, label string) {
if conn == nil {
return
}
dropped := 0
for _, t := range settingsTables {
if err := conn.QueryRow(`SELECT COUNT(*) FROM ` + quoteIdent(t)).Scan(new(int)); err != nil {
continue // not there: nothing to do
}
if _, err := conn.Exec(`DROP TABLE ` + quoteIdent(t)); err != nil {
logf("db[%s]: could not drop redundant %s: %v", label, t, err)
continue
}
dropped++
}
if dropped > 0 {
logf("db[%s]: dropped %d settings table(s) copied by the logbook split — the settings database keeps the originals", label, dropped)
}
}
// EnsureQSOTable recreates the contacts table if it is missing.
//
// It exists so dropping an EMPTY qso table from the settings database is a
// reversible act. The settings database can still be pressed into service as the
// logbook — that is the fallback when no separate logbook file can be created —
// and the migrations that would have built the table are recorded as applied, so
// nothing would ever build it again. This does, from the same migrations, on
// demand.
//
// The schema is derived rather than duplicated: the migrations are replayed on a
// throwaway in-memory SQLite whose sqlite_master then holds the FINAL shape of
// the table with every ALTER-added column folded in. Same trick as the MySQL
// baseline, and for the same reason — there is no second schema to drift.
//
// SQLite only: the shared MySQL logbook is never the settings database.
func EnsureQSOTable(conn *sql.DB) error {
if conn == nil {
return nil
}
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(new(int)); err == nil {
return nil // already there
}
stmts, err := qsoSchemaDDL()
if err != nil {
return err
}
for _, st := range stmts {
if _, err := conn.Exec(st); err != nil {
return fmt.Errorf("recreate qso table: %w", err)
}
}
logf("db: recreated the qso table — this database is being used as the logbook")
return nil
}
// qsoSchemaDDL returns the CREATE statements for the qso table and its indexes,
// in that order.
func qsoSchemaDDL() ([]string, error) {
mem, err := sql.Open("sqlite", "file:opslog_qsoschema?mode=memory&cache=shared")
if err != nil {
return nil, fmt.Errorf("open schema sqlite: %w", err)
}
defer mem.Close()
if err := migrate(mem, nil, "", "qso-schema:memory", RoleLogbook); err != nil {
return nil, fmt.Errorf("build qso schema: %w", err)
}
rows, err := mem.Query(`SELECT type, sql FROM sqlite_master
WHERE sql IS NOT NULL AND tbl_name = 'qso'`)
if err != nil {
return nil, err
}
defer rows.Close()
var tables, indexes []string
for rows.Next() {
var typ, s string
if err := rows.Scan(&typ, &s); err != nil {
return nil, err
}
if typ == "table" {
tables = append(tables, s)
} else {
indexes = append(indexes, s)
}
}
if len(tables) == 0 {
return nil, fmt.Errorf("qso table not found in the derived schema")
}
return append(tables, indexes...), rows.Err()
}
// DropEmptyQSOTable removes the contacts table from a database that is not the
// logbook — the settings database, once its QSOs live in their own file.
//
// Only when empty, and reversible: EnsureQSOTable builds it again the moment
// this database is asked to serve as the logbook.
func DropEmptyQSOTable(conn *sql.DB, label string) {
if conn == nil {
return
}
var n int
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
return // not there: nothing to do
}
if n != 0 {
return // contacts: this table is data, whatever the schema says
}
if _, err := conn.Exec(`DROP TABLE qso`); err != nil {
logf("db[%s]: could not drop the unused qso table: %v", label, err)
return
}
logf("db[%s]: dropped the unused qso table — the contacts live in their own database", label)
}
+283
View File
@@ -0,0 +1,283 @@
package db
import (
"path/filepath"
"sort"
"strings"
"testing"
)
func TestStmtTable(t *testing.T) {
cases := map[string]string{
"CREATE TABLE station_profiles (\n id INTEGER PRIMARY KEY)": "station_profiles",
"CREATE TABLE IF NOT EXISTS settings (`key` TEXT PRIMARY KEY)": "settings",
"CREATE UNIQUE INDEX idx_qso_uid ON qso(sync_uid)": "qso",
"CREATE INDEX idx_ref ON award_references (award_code)": "award_references",
"ALTER TABLE qso ADD COLUMN ant_path TEXT NOT NULL DEFAULT ''": "qso",
"ALTER TABLE `station_profiles` ADD COLUMN my_cq_zone TEXT": "station_profiles",
"INSERT INTO settings(`key`, value) VALUES('x','y')": "settings",
"INSERT OR IGNORE INTO cluster_servers(name) VALUES('dxc')": "cluster_servers",
"UPDATE qso SET callsign = UPPER(callsign)": "qso",
"DELETE FROM operating_antennas WHERE station_id IS NULL": "operating_antennas",
"DROP TABLE IF EXISTS operating_stations_new": "operating_stations_new",
"PRAGMA foreign_keys = off": "",
"": "",
}
for in, want := range cases {
if got := stmtTable(in); got != want {
t.Errorf("stmtTable(%.40q) = %q, want %q", in, got, want)
}
}
}
func TestKeepForRole(t *testing.T) {
// The settings database takes everything, exactly as before this existed.
for _, s := range []string{"CREATE TABLE settings (a TEXT)", "CREATE TABLE qso (a TEXT)"} {
if !keepForRole(s, RoleAll) {
t.Fatalf("RoleAll dropped %q", s)
}
}
// A logbook takes the contacts and refuses the settings side.
if !keepForRole("CREATE INDEX i ON qso(callsign)", RoleLogbook) {
t.Fatal("logbook dropped a qso statement")
}
if keepForRole("CREATE TABLE station_profiles (id INTEGER)", RoleLogbook) {
t.Fatal("logbook accepted station_profiles")
}
// An unrecognised statement — a future table, a PRAGMA — is kept, so a new
// migration behaves as it does today rather than vanishing from one database.
if !keepForRole("CREATE TABLE something_new (id INTEGER)", RoleLogbook) {
t.Fatal("logbook dropped an unknown table")
}
if !keepForRole("PRAGMA foreign_keys = off", RoleLogbook) {
t.Fatal("logbook dropped a PRAGMA")
}
}
// tablesIn lists the tables of an open database.
func tablesIn(t *testing.T, path string) []string {
t.Helper()
conn, err := Open(path) // RoleAll: opening must not change what is there
if err != nil {
t.Fatal(err)
}
defer conn.Close()
rows, err := conn.Query(`SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'`)
if err != nil {
t.Fatal(err)
}
defer rows.Close()
var out []string
for rows.Next() {
var n string
if err := rows.Scan(&n); err != nil {
t.Fatal(err)
}
out = append(out, n)
}
sort.Strings(out)
return out
}
// A logbook opened through OpenLogbook holds the contacts and nothing else.
func TestOpenLogbookSchema(t *testing.T) {
path := filepath.Join(t.TempDir(), "logbook.db")
conn, err := OpenLogbook(path)
if err != nil {
t.Fatal(err)
}
var n int
// The one table that matters has to be there and has to be usable.
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
t.Fatalf("qso table unusable: %v", err)
}
for _, forbidden := range settingsTables {
if err := conn.QueryRow(`SELECT COUNT(*) FROM ` + quoteIdent(forbidden)).Scan(&n); err == nil {
t.Errorf("%s was created in a logbook database", forbidden)
}
}
conn.Close()
// Reopening as a logbook is idempotent, and the migrations already recorded
// as applied must not be re-run into a half-schema.
conn2, err := OpenLogbook(path)
if err != nil {
t.Fatalf("reopen: %v", err)
}
if err := conn2.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
t.Fatalf("qso lost on reopen: %v", err)
}
conn2.Close()
}
// An existing logbook that an older version filled with the whole schema loses
// the unused tables — and keeps any that hold rows.
func TestPruneKeepsNonEmptyTables(t *testing.T) {
path := filepath.Join(t.TempDir(), "legacy.db")
conn, err := Open(path) // the old behaviour: every table everywhere
if err != nil {
t.Fatal(err)
}
if _, err := conn.Exec(`INSERT INTO station_profiles(name) VALUES('Home')`); err != nil {
t.Fatal(err)
}
conn.Close()
if got := tablesIn(t, path); len(got) < 10 {
t.Fatalf("expected a full legacy schema, got %v", got)
}
conn, err = OpenLogbook(path)
if err != nil {
t.Fatal(err)
}
defer conn.Close()
var n int
// Rows are data: this one stays, whatever the schema says it is for.
if err := conn.QueryRow(`SELECT COUNT(*) FROM station_profiles`).Scan(&n); err != nil || n != 1 {
t.Fatalf("station_profiles dropped with a row in it (err=%v n=%d)", err, n)
}
// The empty ones go.
if err := conn.QueryRow(`SELECT COUNT(*) FROM settings`).Scan(&n); err == nil {
t.Error("empty settings table survived in a logbook")
}
// And the contacts are untouched throughout.
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
t.Fatalf("qso table lost: %v", err)
}
}
// A CREATE TABLE body is full of "ON DELETE CASCADE": the index rule must not
// read it as a table name, or the table goes unrecognised and gets created in
// every database.
func TestStmtTableForeignKeyBody(t *testing.T) {
stmt := `CREATE TABLE operating_stations (
id INTEGER PRIMARY KEY AUTOINCREMENT,
profile_id INTEGER NOT NULL,
FOREIGN KEY (profile_id) REFERENCES station_profiles(id) ON DELETE CASCADE
)`
if got := stmtTable(stmt); got != "operating_stations" {
t.Fatalf("got %q", got)
}
if keepForRole(stmt, RoleLogbook) {
t.Fatal("a settings table reached a logbook database")
}
}
// The settings database loses its unused qso table — and gets it back, in full,
// the moment it has to serve as the logbook again.
func TestDropAndRecreateQSOTable(t *testing.T) {
path := filepath.Join(t.TempDir(), "settings.db")
conn, err := Open(path)
if err != nil {
t.Fatal(err)
}
defer conn.Close()
// A contact in it is data: the table must survive.
if _, err := conn.Exec(`INSERT INTO qso(callsign, qso_date, band, mode)
VALUES('F4BPO','2026-01-01T12:00:00Z','20m','SSB')`); err != nil {
t.Fatal(err)
}
DropEmptyQSOTable(conn, "settings")
var n int
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil || n != 1 {
t.Fatalf("dropped a qso table holding a contact (err=%v n=%d)", err, n)
}
// Empty, so it goes.
if _, err := conn.Exec(`DELETE FROM qso`); err != nil {
t.Fatal(err)
}
DropEmptyQSOTable(conn, "settings")
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err == nil {
t.Fatal("empty qso table survived")
}
// And comes back complete when this database is pressed into service as the
// logbook — a late column and an index included, not just a bare table.
if err := EnsureQSOTable(conn); err != nil {
t.Fatal(err)
}
if _, err := conn.Exec(`INSERT INTO qso(callsign, qso_date, band, mode, ant_path, sync_uid)
VALUES('F1TRF','2026-01-02T13:00:00Z','40m','CW','S','uid-1')`); err != nil {
t.Fatalf("recreated qso table is incomplete: %v", err)
}
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil || n != 1 {
t.Fatalf("recreated table unusable (err=%v n=%d)", err, n)
}
// Idempotent: a second call on a live table must not touch it.
if err := EnsureQSOTable(conn); err != nil {
t.Fatal(err)
}
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil || n != 1 {
t.Fatalf("EnsureQSOTable disturbed an existing table (err=%v n=%d)", err, n)
}
}
// A brand-new logbook — the case of a fresh install, or the "New database"
// button — is right from the first open: the contacts and the migration ledger,
// nothing else. Pinned as an exact list so an accidentally unfiltered future
// migration shows up here rather than in an operator's phpMyAdmin.
func TestFreshLogbookHasOnlyContactTables(t *testing.T) {
path := filepath.Join(t.TempDir(), "fresh.db")
conn, err := OpenLogbook(path)
if err != nil {
t.Fatal(err)
}
rows, err := conn.Query(`SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'`)
if err != nil {
t.Fatal(err)
}
var got []string
for rows.Next() {
var n string
if err := rows.Scan(&n); err != nil {
t.Fatal(err)
}
got = append(got, n)
}
rows.Close()
conn.Close()
sort.Strings(got)
want := []string{"qso", "schema_migrations"}
if strings.Join(got, ",") != strings.Join(want, ",") {
t.Fatalf("fresh logbook holds %v, want %v", got, want)
}
}
// The cleanup is a one-off, recorded like a migration: it must not be repeated
// at every connection. Twelve COUNT(*) round trips on a remote MySQL is a cost
// paid at every profile switch for something that can no longer be found.
func TestPruneRunsOnlyOnce(t *testing.T) {
path := filepath.Join(t.TempDir(), "once.db")
conn, err := Open(path) // full legacy schema
if err != nil {
t.Fatal(err)
}
conn.Close()
conn, err = OpenLogbook(path) // first open: the cleanup happens
if err != nil {
t.Fatal(err)
}
var n int
if err := conn.QueryRow(`SELECT COUNT(*) FROM settings`).Scan(&n); err == nil {
t.Fatal("first open did not clean up")
}
// Put one back by hand. A second pass would remove it again; a cleanup that
// knows it is done leaves it alone.
if _, err := conn.Exec("CREATE TABLE `settings` (`key` TEXT PRIMARY KEY, value TEXT)"); err != nil {
t.Fatal(err)
}
conn.Close()
conn, err = OpenLogbook(path)
if err != nil {
t.Fatal(err)
}
defer conn.Close()
if err := conn.QueryRow(`SELECT COUNT(*) FROM settings`).Scan(&n); err != nil {
t.Fatal("the cleanup ran a second time — it is not recorded as done")
}
}
+3
View File
@@ -36,6 +36,8 @@ const (
// ServiceCloudlog covers Cloudlog AND its fork Wavelog: same API contract,
// only the instance URL differs, so one service handles both.
ServiceCloudlog Service = "cloudlog"
// ServiceHamlog is HAMLOG.online — one API key, an ADIF record per QSO.
ServiceHamlog Service = "hamlog"
)
// UploadMode selects when an auto-upload fires after a QSO is saved.
@@ -130,6 +132,7 @@ type ExternalServices struct {
HRDLog ServiceConfig `json:"hrdlog"`
EQSL ServiceConfig `json:"eqsl"`
Cloudlog ServiceConfig `json:"cloudlog"`
Hamlog ServiceConfig `json:"hamlog"`
// DeleteRemote asks OpsLog to withdraw a QSO from QRZ.com and Club Log when
// it is deleted locally. Off unless the operator turns it on: neither
+149
View File
@@ -0,0 +1,149 @@
package extsvc
import (
"bytes"
"context"
"encoding/json"
"fmt"
"io"
"net/http"
"strings"
"time"
)
// HAMLOG.online — a cloud logbook whose confirmations feed its own award
// programme, so operators want their contacts there as they make them.
//
// # Where this protocol comes from
//
// HAMLOG publishes no API documentation. What follows is read from THEIR OWN
// client, the HAMLOG Agent (github.com/hamlogonline/Agent, Hamlog/hamlog_api.py)
// — the authoritative source short of asking them, and the same code their own
// users run:
//
// POST https://hamlog.online/api/agent/ (JSON in, JSON out)
//
// {"KEYSTATUS": {"APIKEY": k}} → {"STATUS":"OK","CALLSIGN":…,"EXPIRES":…}
// {"ADIFADD": {"APIKEY": k, "ADIFDATA": rec}} → {"STATUS":"OK"}
// {"QSOADD": {"APIKEY": k, "DATA": {…}}} → field map, keys upper-cased
// {"LOGOUT": {"APIKEY": k}}
//
// A failure answers {"ERROR": "…"} with no STATUS, so success is "STATUS is
// exactly OK" rather than "no error field" — an unknown reply shape must not
// read as an accepted QSO.
//
// ADIFADD is the verb used here: OpsLog already builds a full ADIF record for
// every other service, and sending the same bytes keeps one representation of
// a contact instead of two.
//
// The operator gets their key from https://hamlog.online/account/agent.php.
const (
hamlogAPIEndpoint = "https://hamlog.online/api/agent/"
hamlogKeyPage = "https://hamlog.online/account/agent.php"
)
// hamlogReply is the shape both success and failure share.
type hamlogReply struct {
Status string `json:"STATUS"`
Error string `json:"ERROR"`
Callsign string `json:"CALLSIGN"`
Expires any `json:"EXPIRES"` // seconds since the epoch; string or number depending on the verb
}
// hamlogPost sends one verb and decodes the reply.
func hamlogPost(ctx context.Context, client *http.Client, endpoint string, body map[string]any) (hamlogReply, error) {
buf, err := json.Marshal(body)
if err != nil {
return hamlogReply{}, fmt.Errorf("hamlog: encode request: %w", err)
}
req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, bytes.NewReader(buf))
if err != nil {
return hamlogReply{}, fmt.Errorf("hamlog: build request: %w", err)
}
req.Header.Set("Content-Type", "application/json")
req.Header.Set("Accept", "application/json")
if client == nil {
client = &http.Client{Timeout: 20 * time.Second}
}
resp, err := client.Do(req)
if err != nil {
return hamlogReply{}, fmt.Errorf("hamlog: request failed: %w", err)
}
defer resp.Body.Close()
raw, _ := io.ReadAll(io.LimitReader(resp.Body, 64*1024))
var r hamlogReply
if jerr := json.Unmarshal(raw, &r); jerr != nil {
// Not JSON at all — a proxy error page, a maintenance notice. Report what
// arrived rather than "invalid character '<'", which tells an operator
// nothing about their own setup.
msg := strings.TrimSpace(string(raw))
if len(msg) > 200 {
msg = msg[:200]
}
if msg == "" {
msg = fmt.Sprintf("HTTP %d", resp.StatusCode)
}
return hamlogReply{}, fmt.Errorf("hamlog: unexpected reply: %s", msg)
}
return r, nil
}
// hamlogFailure turns a reply into a human-readable reason, or "" on success.
func hamlogFailure(r hamlogReply) string {
if strings.EqualFold(strings.TrimSpace(r.Status), "OK") {
return ""
}
if e := strings.TrimSpace(r.Error); e != "" {
return e
}
return "rejected"
}
// UploadHamlog pushes one ADIF record to HAMLOG.online.
func UploadHamlog(ctx context.Context, client *http.Client, cfg ServiceConfig, adifRecord string) (UploadResult, error) {
return uploadHamlogTo(ctx, client, hamlogAPIEndpoint, cfg, adifRecord)
}
func uploadHamlogTo(ctx context.Context, client *http.Client, endpoint string, cfg ServiceConfig, adifRecord string) (UploadResult, error) {
key := strings.TrimSpace(cfg.APIKey)
if key == "" {
return UploadResult{}, fmt.Errorf("hamlog: API key not set — get one at %s", hamlogKeyPage)
}
rec := strings.TrimSpace(adifRecord)
if rec == "" {
return UploadResult{}, fmt.Errorf("hamlog: empty ADIF record")
}
r, err := hamlogPost(ctx, client, endpoint, map[string]any{
"ADIFADD": map[string]any{"APIKEY": key, "ADIFDATA": rec},
})
if err != nil {
return UploadResult{}, err
}
if reason := hamlogFailure(r); reason != "" {
return UploadResult{OK: false, Message: reason}, nil
}
return UploadResult{OK: true}, nil
}
// CheckHamlogKey validates an API key and reports the callsign it belongs to.
//
// Worth its own call because HAMLOG offers what no other service here does: the
// key can be checked BEFORE the first QSO, and the answer names the account. An
// operator who pasted the key of another callsign — or one that has expired —
// finds out in the settings panel rather than through a week of silent refusals.
func CheckHamlogKey(ctx context.Context, client *http.Client, key string) (callsign string, err error) {
key = strings.TrimSpace(key)
if key == "" {
return "", fmt.Errorf("hamlog: API key not set — get one at %s", hamlogKeyPage)
}
r, perr := hamlogPost(ctx, client, hamlogAPIEndpoint, map[string]any{
"KEYSTATUS": map[string]any{"APIKEY": key},
})
if perr != nil {
return "", perr
}
if reason := hamlogFailure(r); reason != "" {
return "", fmt.Errorf("hamlog: %s", reason)
}
return strings.ToUpper(strings.TrimSpace(r.Callsign)), nil
}
+87
View File
@@ -0,0 +1,87 @@
package extsvc
import (
"context"
"encoding/json"
"io"
"net/http"
"net/http/httptest"
"strings"
"testing"
)
// The verb, the key and the record must arrive in the shape HAMLOG's own agent
// sends — this is read from their client, not from documentation, so the test
// pins it rather than trusting a memory of it.
func TestUploadHamlogRequestShape(t *testing.T) {
var got map[string]map[string]any
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost {
t.Errorf("method %s, want POST", r.Method)
}
if ct := r.Header.Get("Content-Type"); !strings.Contains(ct, "application/json") {
t.Errorf("Content-Type %q", ct)
}
b, _ := io.ReadAll(r.Body)
_ = json.Unmarshal(b, &got)
_, _ = w.Write([]byte(`{"STATUS":"OK"}`))
}))
defer srv.Close()
res, err := uploadHamlogTo(context.Background(), nil, srv.URL, ServiceConfig{APIKey: "KEY123"}, "<call:5>F4BPO <eor>")
if err != nil {
t.Fatal(err)
}
if !res.OK {
t.Fatalf("upload not OK: %+v", res)
}
add, ok := got["ADIFADD"]
if !ok {
t.Fatalf("no ADIFADD verb in %v", got)
}
if add["APIKEY"] != "KEY123" {
t.Errorf("APIKEY = %v", add["APIKEY"])
}
if add["ADIFDATA"] != "<call:5>F4BPO <eor>" {
t.Errorf("ADIFDATA = %v", add["ADIFDATA"])
}
}
// A refusal must be reported as a refusal. Their failure shape carries ERROR
// and no STATUS, so "no error field" would have read an unknown reply as an
// accepted QSO — which is how a contact goes missing without anyone noticing.
func TestHamlogFailureIsNotSuccess(t *testing.T) {
for _, tc := range []struct {
body string
wantOK bool
wantSaid string
}{
{`{"STATUS":"OK"}`, true, ""},
{`{"ERROR":"Invalid API key"}`, false, "Invalid API key"},
{`{"STATUS":"FAILED"}`, false, "rejected"},
{`{}`, false, "rejected"}, // an empty object is not an acceptance
} {
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
_, _ = w.Write([]byte(tc.body))
}))
res, err := uploadHamlogTo(context.Background(), nil, srv.URL, ServiceConfig{APIKey: "K"}, "<eor>")
srv.Close()
if err != nil {
t.Fatalf("%s: %v", tc.body, err)
}
if res.OK != tc.wantOK {
t.Errorf("%s → OK=%v, want %v", tc.body, res.OK, tc.wantOK)
}
if !tc.wantOK && res.Message != tc.wantSaid {
t.Errorf("%s → message %q, want %q", tc.body, res.Message, tc.wantSaid)
}
}
}
// Nothing leaves without a key, and the message says where to get one.
func TestUploadHamlogNeedsAKey(t *testing.T) {
_, err := UploadHamlog(context.Background(), nil, ServiceConfig{}, "<eor>")
if err == nil || !strings.Contains(err.Error(), hamlogKeyPage) {
t.Fatalf("err = %v, want it to point at %s", err, hamlogKeyPage)
}
}
+16
View File
@@ -265,6 +265,22 @@ func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord stri
// callsign certificate's validity is silently left out, and reporting that as
// success stamped it sent for ever. TQSL says which case it is in its output,
// so the message is carried up rather than replaced with a guess.
if code != 0 && LogSink != nil {
// The ADIF that was handed to TQSL, verbatim, and how TQSL was called.
//
// TQSL says "no QSOs processed" for several unrelated reasons — already
// uploaded, outside the certificate's dates, or a STATION_CALLSIGN that
// does not match the station location it was told to sign with — and its
// message does not distinguish them. An operator whose contact was
// refused, then accepted after a round trip through another logger, is
// reporting a difference in THIS RECORD, and there is no way to see it
// afterwards: the temp file is deleted as soon as TQSL returns.
//
// Nothing secret here: it is a QSO, and the key password is not logged.
LogSink("lotw: tqsl exit %d for station location %q", code, loc)
LogSink("lotw: record was: %s", strings.TrimSpace(adifRecord))
}
switch code {
case 0:
return UploadResult{OK: true, Message: "uploaded to LoTW"}, nil
+25
View File
@@ -139,6 +139,7 @@ func (m *Manager) SetConfig(cfg ExternalServices) {
cfg.HRDLog = cfg.HRDLog.normalised()
cfg.EQSL = cfg.EQSL.normalised()
cfg.Cloudlog = cfg.Cloudlog.normalised()
cfg.Hamlog = cfg.Hamlog.normalised()
m.cfg = cfg
// Summary of what is armed, written at startup and on every settings save.
@@ -152,6 +153,7 @@ func (m *Manager) SetConfig(cfg ExternalServices) {
}{
{"qrz", cfg.QRZ}, {"clublog", cfg.Clublog}, {"lotw", cfg.LoTW},
{"hrdlog", cfg.HRDLog}, {"eqsl", cfg.EQSL}, {"cloudlog", cfg.Cloudlog},
{"hamlog", cfg.Hamlog},
} {
if s.cfg.AutoUpload {
on = append(on, fmt.Sprintf("%s(%s)", s.name, s.cfg.UploadMode))
@@ -227,6 +229,14 @@ func (m *Manager) OnQSOLogged(id int64) {
m.route(ServiceCloudlog, id, c)
}
}
// HAMLOG.online — one API key and nothing else to get wrong.
if h := cfg.Hamlog; h.AutoUpload {
if h.APIKey == "" {
m.logf("extsvc: hamlog auto-upload is ON but no API key is set (QSO %d not sent)", id)
} else {
m.route(ServiceHamlog, id, h)
}
}
}
// route sends a logged QSO down the configured timing path: queue it for the
@@ -277,6 +287,9 @@ func (m *Manager) onCloseServices() []Service {
if c := cfg.Cloudlog; c.AutoUpload && c.UploadMode == ModeOnClose && c.URL != "" && c.APIKey != "" && c.StationID != "" {
out = append(out, ServiceCloudlog)
}
if h := cfg.Hamlog; h.AutoUpload && h.UploadMode == ModeOnClose && h.APIKey != "" {
out = append(out, ServiceHamlog)
}
return out
}
@@ -323,6 +336,8 @@ func (m *Manager) FlushOnClose() int {
uploaded += m.flushOneByOne(svc, ids, cfg.HRDLog)
case ServiceCloudlog:
uploaded += m.flushOneByOne(svc, ids, cfg.Cloudlog)
case ServiceHamlog:
uploaded += m.flushOneByOne(svc, ids, cfg.Hamlog)
}
}
return uploaded
@@ -644,6 +659,16 @@ func (m *Manager) upload(svc Service, id int64, cfg ServiceConfig) (ok bool, ret
return false, false
}
res, err = UploadCloudlog(ctx, m.deps.Client, cfg, record)
case ServiceHamlog:
// The station callsign is whatever the QSO carries: HAMLOG files the
// contact under the account the API key belongs to, and KEYSTATUS is how
// the operator checks that account is the right one.
record, ok := m.deps.BuildADIF(id, "")
if !ok {
m.logf("extsvc: %s upload of QSO %d skipped (no record)", svc, id)
return false, false
}
res, err = UploadHamlog(ctx, m.deps.Client, cfg, record)
default:
return false, false
}
@@ -0,0 +1,52 @@
package udp
import (
"net"
"testing"
)
// Two copies of MSHV call themselves "MSHV". WSJT-X refuses to start a second
// instance without --rig-name, so its ids differ; MSHV has no such rule, and
// everything a decode needs — the dial frequency, the T/R period, the mode —
// used to be filed under the id alone.
//
// The consequence was reported from a real station: the second copy, on LF,
// overwrote the dial of the first, and FT8 decodes made on 14.095 came out
// labelled 2190 m — which is 136 kHz plus an audio offset, to the hertz.
func TestSameProgramIDFromTwoAddressesAreTwoInstances(t *testing.T) {
s := &Server{}
a := &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 2237}
b := &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 2238}
first := s.instanceLabel("MSHV", a)
second := s.instanceLabel("MSHV", b)
if first == second {
t.Fatalf("two applications on different sockets share the label %q", first)
}
if first != "MSHV" {
t.Fatalf("the first instance should keep the plain id, got %q", first)
}
// Stable: the same socket must keep its name for as long as it runs, or the
// decodes panel would grow a new column every time a packet arrived.
if again := s.instanceLabel("MSHV", a); again != first {
t.Fatalf("label changed for the same address: %q then %q", first, again)
}
if again := s.instanceLabel("MSHV", b); again != second {
t.Fatalf("label changed for the same address: %q then %q", second, again)
}
}
// Distinct ids stay distinct without decoration — a station running WSJT-X and
// MSHV should not see either renamed.
func TestDifferentProgramIDsAreLeftAlone(t *testing.T) {
s := &Server{}
a := &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 2237}
b := &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 2238}
if got := s.instanceLabel("WSJT-X", a); got != "WSJT-X" {
t.Fatalf("WSJT-X was renamed to %q", got)
}
if got := s.instanceLabel("MSHV", b); got != "MSHV" {
t.Fatalf("MSHV was renamed to %q", got)
}
}
+62 -12
View File
@@ -212,6 +212,21 @@ type Server struct {
// lastFrom is the address each program's packets arrive from — where a Reply
// has to be sent. See SendReply.
lastFrom map[string]*net.UDPAddr
// instLabel names each running application, keyed by id AND sending address.
//
// WSJT-X requires --rig-name for a second instance, so its ids differ. MSHV
// does not: two copies both call themselves "MSHV", and everything below was
// keyed on that name alone — so the second copy's Status overwrote the
// first's dial frequency, and decodes from the 20 m instance were placed at
// the LF instance's frequency. Reported as FT8 decodes on 14.095 labelled
// 2190 m, which is exactly 136 kHz plus an audio offset.
//
// The label is what the rest of OpsLog sees: the plain id for the first
// instance, then "MSHV #2", "MSHV #3"… so the decodes panel can still tell
// them apart on screen.
instLabel map[string]string
// instSeq counts how many distinct instances have claimed each id.
instSeq map[string]int
// lastMode is the mode NAME from each program's last Status, used to resolve
// a Decode's one-character mode marker.
lastMode map[string]string
@@ -374,6 +389,40 @@ func (s *Server) run() {
}
}
// instanceLabel returns the name for one running application, allocating it on
// first sight. Caller holds s.mu.
//
// The address is part of the identity because the id is not enough: two copies
// of MSHV send the same id from different sockets, and the two are different
// radios on different bands. The port is included — a program keeps its socket
// for as long as it runs, which is exactly the lifetime this has to be stable
// over.
func (s *Server) instanceLabel(id string, remote *net.UDPAddr) string {
if id == "" {
return ""
}
if remote == nil {
return id
}
key := id + "|" + remote.String()
if s.instLabel == nil {
s.instLabel = map[string]string{}
s.instSeq = map[string]int{}
}
if lbl, ok := s.instLabel[key]; ok {
return lbl
}
s.instSeq[id]++
lbl := id
if n := s.instSeq[id]; n > 1 {
lbl = fmt.Sprintf("%s #%d", id, n)
applog.Printf("udp: [%s] a second application calls itself %q (from %s) — it will be shown as %q",
s.cfg.Name, id, remote, lbl)
}
s.instLabel[key] = lbl
return lbl
}
// logBadPacket reports a datagram this listener could not parse, with enough of
// it to identify the sender — then falls silent.
//
@@ -464,14 +513,15 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
// to it. Per PROGRAM, not per listener: two receivers share one multicast
// group, and a reply must reach the one that heard the station — and it
// must go to the sender's own address, never to the group.
if w.ProgramID != "" && remote != nil {
s.mu.Lock()
s.mu.Lock()
inst := s.instanceLabel(w.ProgramID, remote)
if inst != "" && remote != nil {
if s.lastFrom == nil {
s.lastFrom = map[string]*net.UDPAddr{}
}
s.lastFrom[w.ProgramID] = remote
s.mu.Unlock()
s.lastFrom[inst] = remote
}
s.mu.Unlock()
// Status carries the current dial frequency; remember it so Decode audio
// offsets can be turned into RF frequencies for the panadapter.
if w.FreqHz > 0 && !w.IsDecode {
@@ -479,7 +529,7 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
if s.dialHz == nil {
s.dialHz = map[string]int64{}
}
s.dialHz[w.ProgramID] = w.FreqHz
s.dialHz[inst] = w.FreqHz
// The T/R period travels with Status, and a decode has to be told
// which slot it belongs to — so it is remembered per program the
// same way the dial is.
@@ -487,7 +537,7 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
if s.trPeriod == nil {
s.trPeriod = map[string]int{}
}
s.trPeriod[w.ProgramID] = w.TRPeriod
s.trPeriod[inst] = w.TRPeriod
}
// The mode NAME, which only Status carries: a Decode gives the
// one-character marker instead. See DecodeModeName.
@@ -495,7 +545,7 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
if s.lastMode == nil {
s.lastMode = map[string]string{}
}
s.lastMode[w.ProgramID] = w.Mode
s.lastMode[inst] = w.Mode
}
s.mu.Unlock()
}
@@ -507,13 +557,13 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
ev.TxMessage = w.TxMessage
ev.Transmitting = w.Transmitting
ev.DECall = w.DECall
ev.ProgramID = w.ProgramID
ev.ProgramID = inst
}
if w.IsDecode {
s.mu.Lock()
dial := s.dialHz[w.ProgramID]
tr := s.trPeriod[w.ProgramID]
statusMode := s.lastMode[w.ProgramID]
dial := s.dialHz[inst]
tr := s.trPeriod[inst]
statusMode := s.lastMode[inst]
s.mu.Unlock()
if dial <= 0 {
// No Status from THIS instance yet. Guessing with another
@@ -534,7 +584,7 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
ev.DecodeTRPeriod = tr
ev.DecodeDial = dial
ev.DecodeOffAir = w.OffAir
ev.ProgramID = w.ProgramID
ev.ProgramID = inst
ev.DecodeDT = w.DeltaTime
ev.DecodeAudioHz = w.DeltaFreqHz
ev.DecodeMs = w.DecodeMsSinceMidnight
+26
View File
@@ -24,3 +24,29 @@ func TestBandIsNotBulkEditableAlone(t *testing.T) {
}
}
}
// A log uploaded to HAMLOG.online BY HAND has to be markable afterwards, or
// OpsLog offers to send every one of those contacts again. Both directions live
// in extras — the ADIF names a field for hamlog.EU and none for hamlog.ONLINE —
// so they must be reachable through the extras path, not the column one.
func TestHamlogFieldsAreBulkEditable(t *testing.T) {
for field, want := range map[string]string{
"hamlog_sent": "APP_OPSLOG_HAMLOG_SENT",
"hamlog_sent_date": "APP_OPSLOG_HAMLOG_SENT_DATE",
// Their field name — see award.HamlogQSLKey. Editing it by hand and
// importing their ADIF must land in the SAME place.
"hamlog_rcvd": "APP_HAMLOG_QSO_CFM",
"hamlog_rcvd_date": "APP_OPSLOG_HAMLOG_QSL_DATE",
} {
if got := BulkExtraKey(field); got != want {
t.Errorf("BulkExtraKey(%q) = %q, want %q", field, got, want)
}
}
// And they are NOT columns: a mapping that also claimed a column would write
// to a table that has none.
for _, col := range []string{"hamlog_sent", "hamlog_rcvd", "APP_OPSLOG_HAMLOG_SENT"} {
if BulkEditable(col) {
t.Errorf("%q is offered as a bulk-editable COLUMN", col)
}
}
}
+21
View File
@@ -55,3 +55,24 @@ func TestNotInKeepsNulls(t *testing.T) {
t.Errorf("sql = %q, want the column wrapped in IFNULL", sql)
}
}
// Every HAMLOG field an operator can bulk-edit must also be filterable: the
// question "which contacts have never gone to HAMLOG" is what you ask BEFORE
// uploading a backlog, and a field that can be written but not read back is
// half a feature.
func TestHamlogFieldsAreFilterable(t *testing.T) {
filterable := map[string]bool{}
for _, f := range FilterableFields() {
filterable[f] = true
}
for _, f := range []string{"hamlog_sent", "hamlog_sent_date", "hamlog_rcvd", "hamlog_rcvd_date"} {
if !filterable[f] {
t.Errorf("%s is bulk-editable but not filterable", f)
}
}
// The received key must be THEIR name, or an imported log filters differently
// from a stamped one — the exact split the confirmation source exists to avoid.
if got := filterableExtras["hamlog_rcvd"]; got != "APP_HAMLOG_QSO_CFM" {
t.Errorf("hamlog_rcvd filters on %q, want APP_HAMLOG_QSO_CFM", got)
}
}
+54
View File
@@ -0,0 +1,54 @@
package qso
import (
"testing"
"time"
)
// "When did I last add an entity" is judged against the whole log. A QSO that
// was the fifth with its country must not become the first because the four
// before it fall outside a date filter — that would announce a new one every
// time the operator changed the period.
func TestLastNewDXCCIgnoresThePeriodFilter(t *testing.T) {
firstByEntity := map[int]entityFirst{}
// Two entities, worked twice each, out of chronological order on purpose.
rows := []struct {
dxcc int
at string
call string
country string
}{
{227, "2019-03-01", "F5ABC", "France"},
{291, "2021-07-04", "W1AW", "United States"},
{227, "2024-06-01", "F6XYZ", "France"}, // later, same entity
{291, "2018-01-01", "K1ZZ", "United States"}, // EARLIER than the one above
}
for _, r := range rows {
at, _ := time.Parse("2006-01-02", r.at)
if cur, seen := firstByEntity[r.dxcc]; !seen || at.Before(cur.at) {
firstByEntity[r.dxcc] = entityFirst{at: at, call: r.call, country: r.country}
}
}
if got := firstByEntity[291].call; got != "K1ZZ" {
t.Errorf("first US contact = %q, want K1ZZ (the earliest, whatever the row order)", got)
}
if got := firstByEntity[227].call; got != "F5ABC" {
t.Errorf("first French contact = %q, want F5ABC", got)
}
// The last new entity is the NEWEST of those firsts: France in 2019, not the
// 2024 French contact, and not the 2021 US one.
var s Stats
for num, f := range firstByEntity {
if f.at.After(parseTimeLoose(s.LastNewDXCCDate)) {
s.LastNewDXCC, s.LastNewDXCCNum, s.LastNewDXCCCall = f.country, num, f.call
s.LastNewDXCCDate = f.at.Format(time.RFC3339)
}
}
if s.LastNewDXCC != "France" || s.LastNewDXCCNum != 227 || s.LastNewDXCCCall != "F5ABC" {
t.Errorf("last new entity = %q/%d/%q, want France/227/F5ABC", s.LastNewDXCC, s.LastNewDXCCNum, s.LastNewDXCCCall)
}
if s.LastNewDXCCDate[:10] != "2019-03-01" {
t.Errorf("date = %q, want 2019-03-01", s.LastNewDXCCDate)
}
}
+64 -1
View File
@@ -909,6 +909,19 @@ func (r *Repo) BulkSetField(ctx context.Context, ids []int64, column, value stri
// column and there is no owner_callsign column.
var bulkEditableExtras = map[string]string{
"owner_callsign": "OWNER_CALLSIGN",
// HAMLOG.online has no promoted column — the ADIF standard defines a field
// for hamlog.EU and none for hamlog.ONLINE. Bulk-editable because a log
// uploaded to their site BY HAND has to be markable afterwards: without it
// OpsLog would offer to send every one of those contacts again.
//
// A STATUS and a DATE in each direction, like every other service: one field
// holding a date and standing in for the flag looked clever and read as a
// riddle — "which of these two is the status?" was the first thing an
// operator asked of it.
"hamlog_sent": "APP_OPSLOG_HAMLOG_SENT",
"hamlog_sent_date": "APP_OPSLOG_HAMLOG_SENT_DATE",
"hamlog_rcvd": "APP_HAMLOG_QSO_CFM",
"hamlog_rcvd_date": "APP_OPSLOG_HAMLOG_QSL_DATE",
}
// BulkExtraKey maps a frontend field id to its ADIF key in extras_json, or "".
@@ -1278,11 +1291,16 @@ var filterableColumns = map[string]bool{
"my_wwff_ref": true, "my_street": true, "my_city": true, "my_postal_code": true,
"my_rig": true, "my_antenna": true, "my_sig": true, "my_sig_info": true,
"tx_pwr": true, "comment": true, "notes": true,
// When the record entered THIS logbook, as opposed to when the contact was
// made. The question it answers is "what did that import actually add?" —
// unanswerable otherwise, since an import of old contacts carries old QSO
// dates and hides inside the log.
"created_at": true,
}
// dateColumns are stored as full ISO timestamps; a filter on a bare YYYY-MM-DD
// value compares on the date part (see conditionSQL) so day filters are exact.
var dateColumns = map[string]bool{"qso_date": true, "qso_date_off": true}
var dateColumns = map[string]bool{"qso_date": true, "qso_date_off": true, "created_at": true}
// numericColumns are the filterable columns holding numbers rather than text.
//
@@ -1303,6 +1321,15 @@ var bareDateRe = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}$`)
// ADIF/Extras key; the SQL expression uses json_extract.
var filterableExtras = map[string]string{
"owner_callsign": "OWNER_CALLSIGN",
// HAMLOG.online, in both directions and with its dates. Filterable for the
// same reason it is bulk-editable: without it there is no way to ask "which
// contacts have never gone there", which is the question an operator asks
// before uploading a backlog. The received key is THEIR field name — see
// award.HamlogQSLKey — so an imported log filters the same as a stamped one.
"hamlog_sent": "APP_OPSLOG_HAMLOG_SENT",
"hamlog_sent_date": "APP_OPSLOG_HAMLOG_SENT_DATE",
"hamlog_rcvd": "APP_HAMLOG_QSO_CFM",
"hamlog_rcvd_date": "APP_OPSLOG_HAMLOG_QSL_DATE",
}
// FilterableFields returns the whitelist (for the frontend to build its field
@@ -3750,3 +3777,39 @@ func (r *Repo) IDByDedupeKey(ctx context.Context, callsign, qsoDateMinute, band,
}
return id, u.String, true, nil
}
// ListMissingExtra returns the QSOs that do NOT carry an ADIF extras key.
//
// For a service with no status column of its own — HAMLOG.online, whose field
// the ADIF standard does not define — this is the backlog: everything never
// sent. Matched with LIKE on the extras JSON, which is a full scan; that is
// acceptable here because it answers a button the operator presses, not a hot
// path, and the alternative is a promoted column for a field no other program
// would ever read.
func (r *Repo) ListMissingExtra(ctx context.Context, key string) ([]QSO, error) {
key = strings.ToUpper(strings.TrimSpace(key))
if key == "" {
return nil, fmt.Errorf("missing extras key")
}
// The JSON is written by encoding/json, so a present key always appears as
// "KEY": — quoted, followed by a colon. A value containing that text cannot
// produce a false positive: it would be escaped inside its own quotes.
like := "%\"" + key + "\":%"
rows, err := r.db.QueryContext(ctx,
`SELECT `+selectCols+` FROM qso
WHERE COALESCE(extras_json,'') NOT LIKE ?
ORDER BY qso_date DESC, id DESC`, like)
if err != nil {
return nil, fmt.Errorf("list missing extra: %w", err)
}
defer rows.Close()
out := make([]QSO, 0, 64)
for rows.Next() {
q, err := scanQSO(rows)
if err != nil {
return nil, err
}
out = append(out, q)
}
return out, rows.Err()
}
+48
View File
@@ -137,6 +137,13 @@ const gapThreshold = 30 * time.Minute
const rateMaxHours = 7 * 24
// Stats is the whole dashboard payload.
// entityFirst is the first contact ever made with one DXCC entity.
type entityFirst struct {
at time.Time
call string
country string
}
type Stats struct {
// Headline figures.
Total int `json:"total"`
@@ -146,6 +153,19 @@ type Stats struct {
FirstQSO string `json:"first_qso"` // RFC3339, "" when the log is empty
LastQSO string `json:"last_qso"`
// The most recent entity worked for the FIRST time, and the contact that did
// it. "When did I last add one" is the question a DX chaser asks of a log,
// and it was the one figure the panel could not answer.
//
// Judged against the WHOLE log, never the selected period: an entity is new
// once, and a QSO that was the fifth with its country does not become the
// first because the four before it fall outside a date filter. Only the
// period filter decides whether that contact is SHOWN.
LastNewDXCC string `json:"last_new_dxcc"` // country name
LastNewDXCCNum int `json:"last_new_dxcc_num"` // ADIF entity number
LastNewDXCCCall string `json:"last_new_dxcc_call"`
LastNewDXCCDate string `json:"last_new_dxcc_date"` // RFC3339, "" if none
// Confirmations (of Total).
ConfirmedLoTW int `json:"confirmed_lotw"`
ConfirmedEQSL int `json:"confirmed_eqsl"`
@@ -331,6 +351,8 @@ func (r *Repo) Stats(ctx context.Context, from, to time.Time, contestID string,
monthC = map[string]int{}
times []entry // every dated QSO (+ its operator), for the rate / gap maths
first, last time.Time
// The earliest contact with each entity, for "last new DXCC".
firstByEntity = map[int]entityFirst{}
)
for rows.Next() {
@@ -346,6 +368,22 @@ func (r *Repo) Stats(ctx context.Context, from, to time.Time, contestID string,
return s, err
}
// The first contact with each entity, over the WHOLE log — recorded before
// every filter below, because being new is a property of the log and not
// of the period on screen.
if dxcc.Valid && dxcc.Int64 > 0 {
if t := parseTimeLoose(dateStr.String).UTC(); !t.IsZero() {
n := int(dxcc.Int64)
if cur, seen := firstByEntity[n]; !seen || t.Before(cur.at) {
firstByEntity[n] = entityFirst{
at: t,
call: strings.ToUpper(strings.TrimSpace(call.String)),
country: strings.TrimSpace(country.String),
}
}
}
}
// Contest filter first — same reasoning as the window below: a QSO that
// isn't in this contest must not reach ANY bucket.
if contestID != "" && strings.ToUpper(strings.TrimSpace(contestID2.String)) != contestID {
@@ -459,6 +497,16 @@ func (r *Repo) Stats(ctx context.Context, from, to time.Time, contestID string,
return s, err
}
// The newest of the first-contacts: the last entity added to the log.
for num, f := range firstByEntity {
if f.at.After(parseTimeLoose(s.LastNewDXCCDate)) {
s.LastNewDXCC = f.country
s.LastNewDXCCNum = num
s.LastNewDXCCCall = f.call
s.LastNewDXCCDate = f.at.Format(time.RFC3339)
}
}
s.UniqueCalls = len(calls)
s.Entities = len(entities)
s.Continents = len(contC)
+34
View File
@@ -143,3 +143,37 @@ func TestIDByDedupeKeyRecognisesTheSameContact(t *testing.T) {
t.Error("an empty key matched a row")
}
}
// A service with no status column of its own — HAMLOG.online, whose field the
// ADIF standard does not define — finds its backlog by the ABSENCE of an extras
// key. The LIKE has to match the key, and only the key: a QSO whose comment
// happens to contain the same text must not be mistaken for one already sent.
func TestListMissingExtraMatchesTheKeyNotItsText(t *testing.T) {
r := openRepo(t)
ctx := context.Background()
sent := addQSO(t, r, "F4BPO", time.Date(2026, 1, 1, 12, 0, 0, 0, time.UTC))
notSent, err := r.Add(ctx, QSO{
Callsign: "F1TRF", QSODate: time.Date(2026, 1, 2, 12, 0, 0, 0, time.UTC),
Band: "40m", Mode: "CW",
Comment: "mentions APP_OPSLOG_HAMLOG_SENT in the text",
})
if err != nil {
t.Fatal(err)
}
if err := r.SetExtra(ctx, sent, "APP_OPSLOG_HAMLOG_SENT", "20260823"); err != nil {
t.Fatal(err)
}
got, err := r.ListMissingExtra(ctx, "APP_OPSLOG_HAMLOG_SENT")
if err != nil {
t.Fatal(err)
}
if len(got) != 1 || got[0].ID != notSent {
ids := make([]int64, len(got))
for i, q := range got {
ids[i] = q.ID
}
t.Fatalf("backlog = %v, want just %d (the one never sent)", ids, notSent)
}
}
+57 -3
View File
@@ -30,6 +30,7 @@ import (
"io"
"log"
"net"
"strings"
"sync"
"time"
@@ -126,7 +127,10 @@ type Client struct {
pendingDirSet bool
stopChan chan struct{}
running bool
// done is closed by the poll loop on its way out, so Stop can wait for the
// serial port to be genuinely released — see Stop.
done chan struct{}
running bool
}
func New(tr Transport) *Client {
@@ -138,10 +142,20 @@ func New(tr Transport) *Client {
func (c *Client) Start() error {
c.running = true
c.done = make(chan struct{})
go c.pollLoop()
return nil
}
// Stop closes the link and WAITS for the poll loop to leave.
//
// Closing the port from another goroutine does not undo an open() the loop is
// already inside: that open returns a fresh handle which the loop then stores,
// and the stopped client goes on owning the serial port. The next client — a
// settings save, a profile switch — cannot open it, and the operator sees
// "Serial port busy" with no other program running.
//
// Bounded, so a device stuck in the driver cannot freeze a settings save.
func (c *Client) Stop() {
if !c.running {
return
@@ -154,6 +168,14 @@ func (c *Client) Stop() {
c.conn = nil
}
c.connMu.Unlock()
if c.done == nil {
return
}
select {
case <-c.done:
case <-time.After(6 * time.Second):
log.Printf("steppir: poll loop did not exit within 6s — %s may stay busy a moment longer", c.target())
}
}
// LastSetKHz returns the frequency last commanded, or 0.
@@ -179,7 +201,14 @@ func (c *Client) open() (io.ReadWriteCloser, error) {
if c.tr.COM == "" {
return nil, fmt.Errorf("steppir: no serial port configured")
}
p, err := serial.Open(c.tr.COM, &serial.Mode{BaudRate: c.tr.Baud})
// 8N1 spelled out rather than left to the library defaults: a controller
// that answers nothing must not have a line format that depends on them.
p, err := serial.Open(c.tr.COM, &serial.Mode{
BaudRate: c.tr.Baud,
DataBits: 8,
Parity: serial.NoParity,
StopBits: serial.OneStopBit,
})
if err != nil {
return nil, err
}
@@ -210,7 +239,7 @@ func (c *Client) noteOpenFailure(err error) {
c.connMu.Unlock()
switch {
case n <= openFailQuiet:
log.Printf("steppir: cannot open %s: %v (attempt %d)", c.target(), err, n)
log.Printf("steppir: cannot open %s: %v%s (attempt %d)", c.target(), err, portBusyHint(c.tr.Mode, c.tr.COM, err), n)
case n == openFailQuiet+1:
log.Printf("steppir: still cannot open %s — retrying every 2 s, further attempts will not be logged until it comes back", c.target())
}
@@ -225,6 +254,18 @@ func (c *Client) target() string {
}
func (c *Client) pollLoop() {
// Signals Stop that the port is genuinely released.
defer func() {
c.connMu.Lock()
if c.conn != nil {
c.conn.Close()
c.conn = nil
}
c.connMu.Unlock()
if c.done != nil {
close(c.done)
}
}()
ticker := time.NewTicker(2 * time.Second)
defer ticker.Stop()
for {
@@ -632,3 +673,16 @@ func (c *Client) Retract() error {
}
return c.writeCmd(buildSet(khz*1000, DirNormal, 'S'))
}
// portBusyHint turns "Serial port busy" into something actionable — see the
// identical note in internal/ultrabeam.
func portBusyHint(mode, com string, err error) string {
if mode != "serial" || err == nil {
return ""
}
msg := strings.ToLower(err.Error())
if !strings.Contains(msg, "busy") && !strings.Contains(msg, "access is denied") && !strings.Contains(msg, "denied") {
return ""
}
return " — another program already has " + com + " open (the SteppIR control window, PstRotator, a terminal). A COM port has one owner: close the other program, then OpsLog can connect."
}
+80
View File
@@ -0,0 +1,80 @@
package ultrabeam
import (
"bufio"
"errors"
"strings"
"testing"
"time"
)
// Stop must not return while the poll loop is still alive: on a serial link the
// loop owns the port, and a client that outlives its Stop is what turned every
// later connection into "Serial port busy".
func TestStopWaitsForPollLoop(t *testing.T) {
// A transport that cannot connect, so the loop spends its life in open() and
// the reconnect path — the state the real fault happened in.
c := New(Transport{Mode: "tcp", Host: "127.0.0.1", Port: 1})
if err := c.Start(); err != nil {
t.Fatal(err)
}
done := c.done
time.Sleep(50 * time.Millisecond)
c.Stop()
select {
case <-done:
default:
t.Fatal("Stop returned while the poll loop was still running")
}
// Stopping twice must not panic on the closed channel.
c.Stop()
}
func TestPortBusyHint(t *testing.T) {
// The Windows driver's own words, and the ones an operator has to act on.
if h := portBusyHint("serial", "COM13", errors.New("Serial port busy")); !strings.Contains(h, "COM13") {
t.Fatalf("no hint for a busy port: %q", h)
}
if h := portBusyHint("serial", "COM13", errors.New("Access is denied.")); h == "" {
t.Fatal("no hint for access denied")
}
// A port that simply is not there is a different problem, and saying "another
// program has it" would send the operator hunting for a program that is not
// running.
if h := portBusyHint("serial", "COM13", errors.New("The system cannot find the file specified.")); h != "" {
t.Fatalf("hinted at a busy port for a missing one: %q", h)
}
if h := portBusyHint("tcp", "", errors.New("connection refused")); h != "" {
t.Fatalf("serial hint on a TCP link: %q", h)
}
}
// silentPort answers every read the way a serial port with nothing on the other
// end does: no bytes, no error. bufio turns a run of those into ErrNoProgress.
type silentPort struct{ writes int }
func (s *silentPort) Read(p []byte) (int, error) { return 0, nil }
func (s *silentPort) Write(p []byte) (int, error) { s.writes++; return len(p), nil }
func (s *silentPort) Close() error { return nil }
// A controller that never answers must fail ONCE, promptly, with a message that
// says so — not wedge the poll loop for minutes inside bufio's retry budget.
func TestSilentControllerFailsWithinTheReadTimeout(t *testing.T) {
c := New(Transport{Mode: "serial", COM: "COM_TEST", Baud: 9600})
c.conn = &silentPort{}
c.reader = bufio.NewReader(c.conn)
start := time.Now()
_, err := c.sendCommand(CMD_STATUS, nil)
elapsed := time.Since(start)
if err == nil {
t.Fatal("a silent controller reported success")
}
if elapsed > 3*ubReadTimeout {
t.Fatalf("took %s to give up — the read deadline is not bounding the exchange", elapsed.Round(time.Millisecond))
}
if !strings.Contains(err.Error(), "no reply") {
t.Fatalf("unhelpful error for a silent port: %v", err)
}
}
+57
View File
@@ -0,0 +1,57 @@
package ultrabeam
import (
"errors"
"io"
"net"
"testing"
"time"
)
// The two transports report a slow reply differently, and neither means the
// link is gone: a remote TCP hop and a controller busy moving its motors both
// look like silence. Getting this wrong tears the connection down on every poll.
func TestTransientRead(t *testing.T) {
if !transientRead(timeoutErr{}) {
t.Errorf("a TCP read timeout must be transient")
}
// A serial port that stays silent returns (0, nil) forever; bufio gives up
// after a hundred empty reads with ErrNoProgress.
if !transientRead(io.ErrNoProgress) {
t.Errorf("a silent serial port must be transient")
}
if transientRead(io.EOF) {
t.Errorf("EOF is the link closing, not a slow reply")
}
if transientRead(errors.New("access denied")) {
t.Errorf("an open failure is not a slow reply")
}
}
// open must refuse a configuration it cannot honour rather than dial nothing.
func TestOpenRejectsEmptyConfig(t *testing.T) {
if _, err := New(Transport{Mode: "serial"}).open(); err == nil {
t.Errorf("serial with no COM port must fail")
}
if _, err := New(Transport{Mode: "tcp"}).open(); err == nil {
t.Errorf("tcp with no host must fail")
}
}
// A missing baud is the controller's default, not zero — serial.Open would
// reject 0 and the operator would see "invalid speed" for a field they never
// knew existed.
func TestDefaultBaud(t *testing.T) {
if got := New(Transport{Mode: "serial", COM: "COM3"}).tr.Baud; got != 9600 {
t.Errorf("default baud = %d, want 9600", got)
}
}
type timeoutErr struct{}
func (timeoutErr) Error() string { return "i/o timeout" }
func (timeoutErr) Timeout() bool { return true }
func (timeoutErr) Temporary() bool { return true }
var _ net.Error = timeoutErr{}
var _ = time.Second
+264 -21
View File
@@ -1,19 +1,40 @@
// Package ultrabeam drives an Ultrabeam remote-controlled antenna over TCP
// (typically via an RS232↔Ethernet adapter). The wire protocol (STX/ETX
// framing, DLE escaping, XOR checksum) and command codes are the manufacturer's.
// Package ultrabeam drives an Ultrabeam remote-controlled antenna over SERIAL
// or TCP. The wire protocol (STX/ETX framing, DLE escaping, XOR checksum) and
// command codes are the manufacturer's, and identical on both: the Ethernet
// route is an RS232↔Ethernet adapter passing the same bytes.
//
// Serial came second, which is the wrong way round for most stations: the
// controller has an RS232 port and the PC is usually right next to it, so a
// plain FTDI cable does the job and the adapter is only needed to put the
// antenna at the other end of a link.
package ultrabeam
import (
"bufio"
"errors"
"fmt"
"io"
"log"
"net"
"runtime"
"strings"
"sync"
"time"
"go.bug.st/serial"
)
// Transport says how to reach the controller. Mirrors internal/steppir, which
// has had both routes from the start — one shape for the two antennas rather
// than two shapes to remember.
type Transport struct {
Mode string // "tcp" | "serial"
Host string // tcp
Port int // tcp
COM string // serial device (COM3, /dev/ttyUSB0)
Baud int // serial baud
}
// Connection tuning. Remote operation (the antenna controller reached over the
// internet, not the LAN) sees real latency and jitter, so the read timeout is
// generous and a few transient timeouts are tolerated before the link is torn
@@ -64,17 +85,26 @@ const (
)
type Client struct {
host string
port int
conn net.Conn
tr Transport
conn io.ReadWriteCloser
connMu sync.Mutex
reader *bufio.Reader
lastStatus *Status
statusMu sync.RWMutex
stopChan chan struct{}
running bool
seqNum byte
seqMu sync.Mutex
// done is closed by pollLoop as it exits, so Stop can WAIT for it. Without
// that wait the loop outlives the client that owns it, and on a serial link
// the zombie keeps the port open: every later client then fails with "Serial
// port busy" — forever, because the thing holding the port is us.
done chan struct{}
running bool
seqNum byte
seqMu sync.Mutex
// First-exchange diagnostics — see armDiag.
diagMu sync.Mutex
diag bool
diagJunk []byte
// Optimistic pattern direction kept until the antenna's status poll reports
// it (or it ages out) — the motors take a second or two, and a stale poll in
@@ -129,21 +159,122 @@ type Status struct {
Connected bool `json:"connected"`
}
func New(host string, port int) *Client {
func New(tr Transport) *Client {
if tr.Baud <= 0 {
tr.Baud = 9600
}
return &Client{
host: host,
port: port,
tr: tr,
stopChan: make(chan struct{}),
seqNum: 0,
}
}
// open dials the transport. Callers hold connMu.
func (c *Client) open() (io.ReadWriteCloser, error) {
if c.tr.Mode == "serial" {
if c.tr.COM == "" {
return nil, fmt.Errorf("ultrabeam: no serial port configured")
}
// 8N1 spelled out. The library's zero values happen to mean the same
// thing today, but a controller that answers nothing is impossible to
// diagnose with a line count that depends on a default.
p, err := serial.Open(c.tr.COM, &serial.Mode{
BaudRate: c.tr.Baud,
DataBits: 8,
Parity: serial.NoParity,
StopBits: serial.OneStopBit,
})
if err != nil {
return nil, err
}
// A finite read timeout so a silent controller cannot wedge the poll
// loop. Replaced per exchange by setReadTimeout below.
_ = p.SetReadTimeout(ubReadTimeout)
return p, nil
}
if c.tr.Host == "" {
return nil, fmt.Errorf("ultrabeam: no host configured")
}
dialer := net.Dialer{Timeout: 5 * time.Second, KeepAlive: ubKeepAlive}
return dialer.Dial("tcp", net.JoinHostPort(c.tr.Host, fmt.Sprintf("%d", c.tr.Port)))
}
// diagNextExchange asks for the next command/reply to be dumped to the log.
//
// "It does not work" is unanswerable for a serial link, because the three
// possible causes look identical from the outside: nothing arrives (wrong port,
// dead cable, controller off), something arrives but is not our protocol (wrong
// baud), or a valid frame arrives and we misread it. One hex dump of the first
// exchange after each connect separates them, and costs two log lines per
// connection.
func (c *Client) armDiag() {
c.diagMu.Lock()
c.diag = true
c.diagJunk = c.diagJunk[:0]
c.diagMu.Unlock()
}
func (c *Client) diagOn() bool {
c.diagMu.Lock()
defer c.diagMu.Unlock()
return c.diag
}
// target names what the client is talking to, for the log.
func (c *Client) target() string {
if c.tr.Mode == "serial" {
return fmt.Sprintf("%s @ %d baud", c.tr.COM, c.tr.Baud)
}
return fmt.Sprintf("%s:%d", c.tr.Host, c.tr.Port)
}
// setReadTimeout bounds the next read, whichever transport is open.
//
// TCP takes a deadline (an instant) and serial a timeout (a duration) — the two
// libraries disagree, and the caller should not have to care.
func (c *Client) setReadTimeout(d time.Duration) {
switch t := c.conn.(type) {
case net.Conn:
_ = t.SetReadDeadline(time.Now().Add(d))
case serial.Port:
_ = t.SetReadTimeout(d)
}
}
// transientRead reports a read that timed out rather than failed.
//
// The two transports say it differently. TCP returns a net.Error with
// Timeout(); a serial port that stays silent returns (0, nil) on every read,
// which bufio turns into io.ErrNoProgress after a hundred empty attempts.
// Neither means the link is gone — over a remote link, or with a controller
// busy moving its motors, a slow reply is ordinary.
func transientRead(err error) bool {
var ne net.Error
if errors.As(err, &ne) && ne.Timeout() {
return true
}
return errors.Is(err, io.ErrNoProgress)
}
func (c *Client) Start() error {
c.running = true
c.done = make(chan struct{})
go c.pollLoop()
return nil
}
// Stop closes the link and WAITS for the poll loop to leave.
//
// The wait is the point. Closing the port from another goroutine does not undo
// an open() the loop is already inside: that open returns a fresh handle, the
// loop stores it, and the client that was told to stop goes on owning the serial
// port. The next client — a settings save, a profile switch — then cannot open
// it, and the operator sees "Serial port busy" with no other program running.
//
// Bounded, because a serial open can sit in the driver for a while and a stuck
// device must not freeze a settings save. If the deadline passes, the loop is
// still on its way out and the log says so.
func (c *Client) Stop() {
if !c.running {
return
@@ -157,9 +288,30 @@ func (c *Client) Stop() {
c.conn = nil
}
c.connMu.Unlock()
if c.done == nil {
return
}
select {
case <-c.done:
case <-time.After(6 * time.Second):
log.Printf("Ultrabeam: poll loop did not exit within 6s — %s may stay busy a moment longer", c.target())
}
}
func (c *Client) pollLoop() {
// Signals Stop that the port is genuinely released.
defer func() {
c.connMu.Lock()
if c.conn != nil {
c.conn.Close()
c.conn = nil
}
c.connMu.Unlock()
if c.done != nil {
close(c.done)
}
}()
ticker := time.NewTicker(2 * time.Second) // Increased from 500ms to 2s
defer ticker.Stop()
@@ -174,11 +326,10 @@ func (c *Client) pollLoop() {
// Try to connect if not connected
c.connMu.Lock()
if c.conn == nil {
log.Printf("Ultrabeam: Not connected, attempting connection...")
dialer := net.Dialer{Timeout: 5 * time.Second, KeepAlive: ubKeepAlive}
conn, err := dialer.Dial("tcp", net.JoinHostPort(c.host, fmt.Sprintf("%d", c.port)))
log.Printf("Ultrabeam: Not connected, attempting connection to %s...", c.target())
conn, err := c.open()
if err != nil {
log.Printf("Ultrabeam: Connection failed: %v", err)
log.Printf("Ultrabeam: Connection failed: %v%s", err, portBusyHint(c.tr.Mode, c.tr.COM, err))
c.connMu.Unlock()
// Mark as disconnected
@@ -188,9 +339,25 @@ func (c *Client) pollLoop() {
continue
}
c.conn = conn
// Stopped while open() was running? Let go of the port at once.
// Stop cannot interrupt an open already in flight, so without this
// the fresh handle is stored by a client that has been told to die,
// and it keeps the port — which is precisely the "Serial port busy"
// the next client then reports, forever.
select {
case <-c.stopChan:
conn.Close()
c.conn = nil // already closed; keep the deferred cleanup from closing it twice
c.connMu.Unlock()
return
default:
}
c.reader = bufio.NewReader(c.conn)
pollFails = 0
log.Printf("Ultrabeam: Connected to %s:%d", c.host, c.port)
log.Printf("Ultrabeam: Connected to %s", c.target())
// Dump the first exchange on this link. A connection that opens and
// then says nothing is the whole of what a serial user can see.
c.armDiag()
}
c.connMu.Unlock()
@@ -200,8 +367,7 @@ func (c *Client) pollLoop() {
// A single slow/lost reply over a remote link is normal — keep
// the connection (and the last status) for a few tries before
// tearing it down, so we don't churn reconnect/disconnect.
var ne net.Error
transient := errors.As(err, &ne) && ne.Timeout()
transient := transientRead(err)
pollFails++
if transient && pollFails < ubMaxPollTimeout {
log.Printf("Ultrabeam: status timeout (%d/%d), keeping link: %v", pollFails, ubMaxPollTimeout, err)
@@ -425,13 +591,31 @@ func (c *Client) sendCommand(cmd byte, data []byte) ([]byte, error) {
seq := c.getNextSeq()
packet := c.buildPacket(seq, cmd, data)
diag := c.diagOn()
if diag {
log.Printf("Ultrabeam: first exchange on %s — sending %d bytes: % X", c.target(), len(packet), packet)
}
if _, err := c.conn.Write(packet); err != nil {
return nil, fmt.Errorf("failed to write: %w", err)
}
// Read the reply with a timeout generous enough for a remote link.
c.conn.SetReadDeadline(time.Now().Add(ubReadTimeout))
c.setReadTimeout(ubReadTimeout)
buffer, err := c.readPacket()
if diag {
c.diagMu.Lock()
junk := append([]byte(nil), c.diagJunk...)
c.diag = false
c.diagMu.Unlock()
switch {
case err != nil && len(junk) == 0:
log.Printf("Ultrabeam: first exchange — NOTHING came back (%v). The controller is not answering on this port. Note that the USB cable presents TWO COM ports and only the SECOND one reaches the controller (at 19200 baud on the units seen so far); also check the cable and that the controller is on.", err)
case err != nil:
log.Printf("Ultrabeam: first exchange — %d bytes came back but no frame started (% X): %v. Bytes with no frame usually mean the wrong baud rate.", len(junk), junk, err)
default:
log.Printf("Ultrabeam: first exchange — reply %d bytes: % X (%d discarded before the frame: % X)", len(buffer), buffer, len(junk), junk)
}
}
if err != nil {
return nil, err
}
@@ -467,7 +651,8 @@ func (c *Client) sendCommand(cmd byte, data []byte) ([]byte, error) {
// behind by a command that timed out. A short read deadline lets it consume what
// is there and stop quickly when the stream is clean. Caller holds connMu.
func (c *Client) drainStale() {
c.conn.SetReadDeadline(time.Now().Add(5 * time.Millisecond))
c.setReadTimeout(5 * time.Millisecond)
defer c.setReadTimeout(ubReadTimeout) // leave the link on its normal budget
buf := make([]byte, 256)
for {
n, err := c.reader.Read(buf)
@@ -483,13 +668,53 @@ func (c *Client) drainStale() {
// so a raw ETX only ever appears as the real terminator. Caller holds connMu and
// has set a read deadline.
func (c *Client) readPacket() ([]byte, error) {
// A DEADLINE for the whole frame, not a timeout per read.
//
// A silent serial port does not error: it returns (0, nil) on every read once
// its timeout expires, and bufio retries that a hundred times before giving up
// with ErrNoProgress. With a 4-second port timeout that is over six minutes of
// a poll loop frozen mid-exchange, logging nothing — which is exactly how a
// controller that never answered looked like a program that had hung. Short
// port timeouts, checked against a deadline here, turn it into one clear
// "nothing came back" after four seconds.
deadline := time.Now().Add(ubReadTimeout)
c.setReadTimeout(250 * time.Millisecond)
defer c.setReadTimeout(ubReadTimeout)
var buffer []byte
for {
// A stop must not have to wait out the deadline. Without this, tearing the
// client down mid-exchange took up to four seconds — long enough for the
// replacement client to find the port still held, and for Stop to give up
// waiting and say so.
select {
case <-c.stopChan:
return nil, fmt.Errorf("stopped")
default:
}
if time.Now().After(deadline) {
if len(buffer) == 0 {
return nil, fmt.Errorf("no reply within %s", ubReadTimeout)
}
return nil, fmt.Errorf("incomplete frame within %s (% X)", ubReadTimeout, buffer)
}
b, err := c.reader.ReadByte()
if err != nil {
// A quiet port between bytes is normal — go.bug.st returns (0, nil) on
// its timeout, which bufio eventually reports as ErrNoProgress. Only the
// deadline above decides that the exchange has failed.
if transientRead(err) {
continue
}
return nil, fmt.Errorf("failed to read: %w", err)
}
if len(buffer) == 0 && b != STX {
// Kept, briefly, for the first exchange after a connect: what gets
// discarded here IS the diagnosis when the link is misconfigured.
c.diagMu.Lock()
if c.diag && len(c.diagJunk) < 32 {
c.diagJunk = append(c.diagJunk, b)
}
c.diagMu.Unlock()
continue // resync to the start of a frame
}
buffer = append(buffer, b)
@@ -647,3 +872,21 @@ func (c *Client) ModifyElement(elementNum int, lengthMm int) error {
_, err := c.sendCommand(CMD_MODIFY_ELEM, data)
return err
}
// portBusyHint turns "Serial port busy" into something actionable.
//
// A COM port has exactly one owner. The message the driver gives back says the
// port is busy and stops there, which reads like a fault in OpsLog — and the
// program actually holding it is usually the antenna manufacturer's own control
// window, sitting open on the same desktop. Naming that is the difference
// between a bug report and a five-second fix.
func portBusyHint(mode, com string, err error) string {
if mode != "serial" || err == nil {
return ""
}
msg := strings.ToLower(err.Error())
if !strings.Contains(msg, "busy") && !strings.Contains(msg, "access is denied") && !strings.Contains(msg, "denied") {
return ""
}
return " — another program already has " + com + " open (the UltraBeam Controller window, PstRotator, a terminal). A COM port has one owner: close the other program, then OpsLog can connect."
}
+27
View File
@@ -76,3 +76,30 @@ func TestMotorTuneKHzForBandFallsBack(t *testing.T) {
}
}
}
// The Ultrabeam's USB link answers on 19200 and on nothing else — confirmed on
// hardware, where 9600 opened the port and returned not one byte. A speed with a
// single right answer must not be storable as anything else, whatever an older
// config or a hand-edited setting says.
func TestNormMotorBaud(t *testing.T) {
for _, tc := range []struct {
typ, transport string
in, want int
}{
{"ultrabeam", "serial", 9600, 19200},
{"ultrabeam", "serial", 0, 19200},
{"ultrabeam", "serial", 115200, 19200},
// Over TCP the speed is the adapter's business, not ours.
{"ultrabeam", "tcp", 9600, 9600},
// The SteppIR controller really does run at several speeds.
{"steppir", "serial", 4800, 4800},
{"steppir", "serial", 19200, 19200},
// Nonsense falls back rather than reaching the driver.
{"steppir", "serial", 0, 9600},
{"steppir", "serial", 999999, 9600},
} {
if got := normMotorBaud(tc.typ, tc.transport, tc.in); got != tc.want {
t.Errorf("normMotorBaud(%q, %q, %d) = %d, want %d", tc.typ, tc.transport, tc.in, got, tc.want)
}
}
}
+38 -1
View File
@@ -1,6 +1,10 @@
package main
import "testing"
import (
"os"
"strings"
"testing"
)
// The tracking mode decides how often a motorized antenna's elements run, so a
// value that fails to parse must not silently become the most aggressive
@@ -46,3 +50,36 @@ func TestBandForHzDrivesBandTracking(t *testing.T) {
t.Errorf("30 m and 20 m both read %q — band mode would never re-tune between them", a)
}
}
// A "Test connection" on a serial port must not open a port OpsLog already
// holds: a COM port has one owner, and the owner is the running antenna client.
// Building a second client made the two fight — one of them logging "Serial port
// busy" for the rest of the session.
func TestTestUltrabeamReusesTheLiveSerialClient(t *testing.T) {
src, err := os.ReadFile("app.go")
if err != nil {
t.Fatal(err)
}
body := funcBody(t, string(src), "func (a *App) TestUltrabeam(s UltrabeamSettings) error {")
if !strings.Contains(body, "a.liveMotorFor(s)") {
t.Error("TestUltrabeam builds a client without first checking whether the live one already owns that port")
}
// The check has to come BEFORE the second client is created, or it is no check.
if i, j := strings.Index(body, "a.liveMotorFor(s)"), strings.Index(body, "newMotorClient(s)"); i < 0 || j < 0 || i > j {
t.Error("the live-client check must precede newMotorClient")
}
}
// funcBody returns the source of a function, up to the closing brace in column 0.
func funcBody(t *testing.T, src, signature string) string {
t.Helper()
i := strings.Index(src, signature)
if i < 0 {
t.Fatalf("function not found: %s", signature)
}
rest := src[i:]
if j := strings.Index(rest, "\n}\n"); j >= 0 {
return rest[:j]
}
return rest
}
+145
View File
@@ -0,0 +1,145 @@
package main
// Comparing the two sources of a Russian district, BEFORE deciding which wins.
//
// A QSO can carry an RDA district from two places now:
//
// - the offline RDA database (internal/rda), compiled by the award's own
// administrators, which knows where a callsign was on a GIVEN DAY;
// - the CNTY field of a log downloaded from HAMLOG.online, whose export
// writes the district there (<CNTY:5>RO-19 on a real record).
//
// Whether that second source is EVIDENCE or merely a COPY is not a matter of
// opinion, and it decides everything downstream: if HAMLOG's value always
// equals the database's, there is nothing to arbitrate and a precedence rule
// would be ceremony around a redundancy. If they genuinely differ on some
// contacts, then two independent records disagree about a QSO that counts for
// an award, and that has to be surfaced rather than silently resolved.
//
// So: measure first. This reports agreements, disagreements, and the contacts
// where only one side has an answer — and it changes nothing in the log.
import (
"fmt"
"regexp"
"strings"
"hamlog/internal/applog"
"hamlog/internal/award"
"hamlog/internal/qso"
"hamlog/internal/rda"
)
// rdaDistrictRe is the shape of an RDA reference: two letters, a dash, two
// digits (RO-19, KO-05). Used to tell a real district in CNTY from a US county
// name or whatever else a callbook dropped in that field.
var rdaDistrictRe = regexp.MustCompile(`^[A-Z]{2}-[0-9]{2}$`)
// RDAConflict is one contact where the two sources disagree.
type RDAConflict struct {
QSOID int64 `json:"qso_id"`
Callsign string `json:"callsign"`
Date string `json:"date"`
Band string `json:"band"`
Mode string `json:"mode"`
// FromLog is the district the imported log carries (CNTY).
FromLog string `json:"from_log"`
// FromDB is what the offline RDA database answers for that callsign on that
// day, and Dated says whether it was a dated activity record (a fact) or the
// callsign's current district (an assumption).
FromDB string `json:"from_db"`
Dated bool `json:"dated"`
// Confirmed is whether the QSO is confirmed on HAMLOG — a confirmed contact's
// CNTY has been through their matching of two logs, which is what makes it
// worth weighing against the database at all.
Confirmed bool `json:"confirmed"`
}
// RDACompareResult is the measurement.
type RDACompareResult struct {
Scanned int `json:"scanned"` // Russian QSOs examined
BothKnown int `json:"both_known"` // a district from each source
Agree int `json:"agree"`
Disagree int `json:"disagree"`
OnlyLog int `json:"only_log"` // CNTY has it, the database does not
OnlyDB int `json:"only_db"` // the database has it, the log does not
Neither int `json:"neither"`
// Conflicts lists the disagreements, newest first, capped so a large log
// cannot produce a dialog nobody can read. Count is in Disagree regardless.
Conflicts []RDAConflict `json:"conflicts"`
}
// rdaCompareMax bounds the returned list. The COUNT is always exact; it is the
// enumeration that is capped, because a hundred rows is already more than
// anyone reviews in one sitting.
const rdaCompareMax = 200
// CompareRDASources measures the two sources against each other. Read-only.
func (a *App) CompareRDASources() (RDACompareResult, error) {
var res RDACompareResult
if a.qso == nil {
return res, fmt.Errorf("db not initialized")
}
rows, err := a.qso.List(a.ctx, qso.ListFilter{Limit: 1_000_000})
if err != nil {
return res, err
}
for i := range rows {
q := &rows[i]
// The same three entities the award covers — see BackfillRDA.
if q.DXCC == nil {
continue
}
switch *q.DXCC {
case 15, 54, 126:
default:
continue
}
res.Scanned++
fromLog := strings.ToUpper(strings.TrimSpace(q.County))
if !rdaDistrictRe.MatchString(fromLog) {
fromLog = "" // a county name, a stray value: not a district
}
var fromDB string
var dated bool
if m, ok := rda.Lookup(q.Callsign, q.QSODate); ok {
fromDB, dated = m.District, m.Dated
}
switch {
case fromLog == "" && fromDB == "":
res.Neither++
case fromLog == "":
res.OnlyDB++
case fromDB == "":
res.OnlyLog++
default:
res.BothKnown++
if fromLog == fromDB {
res.Agree++
continue
}
res.Disagree++
if len(res.Conflicts) < rdaCompareMax {
res.Conflicts = append(res.Conflicts, RDAConflict{
QSOID: q.ID, Callsign: q.Callsign,
Date: q.QSODate.UTC().Format("2006-01-02"),
Band: q.Band, Mode: q.Mode,
FromLog: fromLog, FromDB: fromDB, Dated: dated,
Confirmed: q.Extras != nil && isHamlogConfirmed(q.Extras[award.HamlogQSLKey]),
})
}
}
}
applog.Printf("rda compare: %d Russian QSOs — both %d (agree %d, disagree %d), only-log %d, only-db %d, neither %d",
res.Scanned, res.BothKnown, res.Agree, res.Disagree, res.OnlyLog, res.OnlyDB, res.Neither)
return res, nil
}
// isHamlogConfirmed reads their Y — anything that is not an explicit no counts,
// the same rule the award engine applies.
func isHamlogConfirmed(v string) bool {
v = strings.ToUpper(strings.TrimSpace(v))
return v != "" && v != "N" && v != "NO"
}
+329
View File
@@ -0,0 +1,329 @@
package main
// Panadapter spot colours, per status.
//
// A FlexRadio draws every OpsLog spot in one colour today, which throws away the
// only thing worth knowing at a glance on a waterfall: whether the station is
// worth stopping for. The radio's own API has always taken a text colour AND a
// background colour per spot — see internal/cat/flex.go — so the information can
// be carried without a single extra pixel of screen.
//
// The statuses are the ones the cluster already computes (see spotEntityStatus),
// plus the three orthogonal markers an operator chases separately.
import (
"encoding/json"
"strings"
)
// keySpotColors holds the per-status palette.
const keySpotColors = "flex.spot_colors"
// SpotColor is one status's pair. Both are #AARRGGBB — alpha FIRST, which is
// SmartSDR's order, not the web's. An empty background leaves the radio's own.
type SpotColor struct {
Text string `json:"text"`
Bg string `json:"bg,omitempty"`
// Hide keeps this status OFF the panadapter entirely.
//
// Expressed as "hide" and not "send" so the zero value means SEND: every
// palette stored before this existed has to keep behaving as it did, and a
// missing field must never be read as "the operator turned this off".
//
// A colour and a switch rather than one control: the operator who stops
// drawing already-worked stations today may want them back tomorrow, and
// their colour should still be there when they do.
Hide bool `json:"hide,omitempty"`
}
// SpotColors is the whole palette, keyed by the status names the cluster uses.
//
// Stored as a map rather than a struct with nine fields so a status added later
// (a new award marker, say) needs no migration: an unknown key is ignored and a
// missing one falls back to the default below.
type SpotColors struct {
// Enabled off sends no colour at all, which is the behaviour before this
// existed: every spot in the radio's default orange. Kept as a real switch so
// turning it off is a genuine revert rather than "some other palette".
Enabled bool `json:"enabled"`
Colors map[string]SpotColor `json:"colors"`
}
// spotColorOrder is the palette's canonical order — most wanted first, then the
// orthogonal markers, then the two "nothing here" cases. The settings panel
// renders it in this order, and it is the order the resolver tries.
var spotColorOrder = []string{
"new", "new-band-mode", "new-band", "new-mode", "new-slot",
"new-pota", "new-county", "new-pfx",
"my-call", "worked", "none",
}
// defaultSpotColors is the shipped palette.
//
// Text colours are opaque and bright, backgrounds are the same hue at a fifth of
// the alpha: a waterfall is dark and busy, and a solid plate behind the callsign
// hides the very signal the operator is looking at. The scale runs red → amber →
// blue for "never had it" → "missing a piece" → "already yours".
var defaultSpotColors = map[string]SpotColor{
"new": {Text: "#FFFF3B30", Bg: "#40FF3B30"}, // entity never worked — the one you stop for
"new-band-mode": {Text: "#FFFF6B22", Bg: "#40FF6B22"}, // neither band nor mode: nearly as good
"new-band": {Text: "#FFFFCC00", Bg: "#40FFCC00"},
"new-mode": {Text: "#FFFFA500", Bg: "#40FFA500"},
"new-slot": {Text: "#FF5AC8FA", Bg: "#405AC8FA"},
"new-pota": {Text: "#FF34C759", Bg: "#4034C759"},
"new-county": {Text: "#FF30D158", Bg: "#4030D158"},
"new-pfx": {Text: "#FFAF52DE", Bg: "#40AF52DE"},
"my-call": {Text: "#FFFF2D55", Bg: "#60FF2D55"}, // someone spotted YOU
"worked": {Text: "#FF9CA3AF", Bg: "#209CA3AF"}, // already in the log — present, quiet
"none": {Text: "#FF9CA3AF", Bg: ""}, // status unresolved
}
// hexARGB accepts #AARRGGBB and nothing else. The Flex refuses anything shorter
// with a command error the operator never sees, so a half-typed value must not
// reach the radio — it is dropped here and the default is used instead.
func hexARGB(s string) bool {
s = strings.TrimSpace(s)
if len(s) != 9 || s[0] != '#' {
return false
}
for i := 1; i < len(s); i++ {
c := s[i]
if !(c >= '0' && c <= '9' || c >= 'a' && c <= 'f' || c >= 'A' && c <= 'F') {
return false
}
}
return true
}
// normSpotColors drops anything that is not a valid colour, so the stored
// palette can never make the radio reject a spot.
func normSpotColors(s SpotColors) SpotColors {
out := SpotColors{Enabled: s.Enabled, Colors: map[string]SpotColor{}}
known := map[string]bool{}
for _, k := range spotColorOrder {
known[k] = true
}
for k, v := range s.Colors {
if !known[k] {
continue
}
c := SpotColor{Hide: v.Hide}
if hexARGB(v.Text) {
c.Text = strings.ToUpper(strings.TrimSpace(v.Text))
}
if hexARGB(v.Bg) {
c.Bg = strings.ToUpper(strings.TrimSpace(v.Bg))
}
// Kept when it carries ANY decision — a status with no colours but "hide"
// set is a real instruction, and dropping it would silently switch that
// status back on.
if c.Text != "" || c.Bg != "" || c.Hide {
out.Colors[k] = c
}
}
return out
}
// GetSpotColors returns the palette, filled with the defaults for every status
// the operator has not overridden — so the panel always has a colour to show and
// the resolver never has to decide what "unset" looks like.
func (a *App) GetSpotColors() SpotColors {
out := SpotColors{Enabled: true, Colors: map[string]SpotColor{}}
if raw := a.settingOr(keySpotColors, ""); raw != "" {
var stored SpotColors
if err := json.Unmarshal([]byte(raw), &stored); err == nil {
stored = normSpotColors(stored)
out.Enabled = stored.Enabled
out.Colors = stored.Colors
}
}
for _, k := range spotColorOrder {
if _, ok := out.Colors[k]; !ok {
out.Colors[k] = defaultSpotColors[k]
}
}
return out
}
// SaveSpotColors persists the palette.
func (a *App) SaveSpotColors(s SpotColors) error {
b, err := json.Marshal(normSpotColors(s))
if err != nil {
return err
}
a.setSetting(keySpotColors, string(b))
a.spotColorsMu.Lock()
a.spotColorsCache = nil // re-read on the next spot
a.spotColorsMu.Unlock()
return nil
}
// ResetSpotColors puts the shipped palette back.
func (a *App) ResetSpotColors() SpotColors {
a.setSetting(keySpotColors, "")
a.spotColorsMu.Lock()
a.spotColorsCache = nil
a.spotColorsMu.Unlock()
return a.GetSpotColors()
}
// spotColorFor picks the pair for one spot status.
//
// Cached, because this runs on EVERY spot from every cluster — a busy evening is
// several a second, and re-reading and re-parsing the settings JSON for each one
// would put a database round trip in the middle of the cluster read loop.
func (a *App) spotColorFor(status string) SpotColor {
a.spotColorsMu.Lock()
if a.spotColorsCache == nil {
c := a.GetSpotColors()
a.spotColorsCache = &c
}
p := a.spotColorsCache
a.spotColorsMu.Unlock()
if !p.Enabled {
return SpotColor{}
}
if c, ok := p.Colors[status]; ok {
return c
}
return p.Colors["none"]
}
// spotStatusTag is the short label appended to a panadapter spot's comment.
//
// The colour says WHAT a spot is only to someone who has learnt the palette; the
// word says it to everyone, including the operator who set the colours a month
// ago. Both, then — the same choice DXHunter makes, whose spots read
// "10 dB 18 WPM CQ [AC0C] [United States] [NEW CTY]".
//
// Short on purpose: the comment shares a panadapter with the signals, and a
// spot label that runs over its neighbours hides the very thing it describes.
// "worked" and an unresolved entity get nothing at all — there is no news in
// either, and the absence of a tag is itself the answer.
func spotStatusTag(status string) string {
switch status {
case "new":
return "New DXCC"
case "new-band-mode":
return "New B&M"
case "new-band":
return "New Band"
case "new-mode":
return "New Mode"
case "new-slot":
return "New Slot"
case "new-pota":
return "New POTA"
case "new-county":
return "New Cnty"
case "new-pfx":
return "New Pfx"
case "my-call":
return "Me"
case "worked":
return "Worked"
}
return ""
}
// spotComment builds what the panadapter shows under a spot:
//
// CQ up 2 [F4BPO] [Franz Josef Land] [New Slot]
//
// the cluster's own text, then WHO spotted it, then the entity, then what it is
// worth. Same order and same shape as DXHunter, whose users read these at a
// glance and should not have to learn a second convention.
//
// # The spaces are not spaces
//
// SmartSDR's command line separates parameters ON SPACES, so a comment written
// with ordinary ones arrives at the radio as "CQup2[F4BPO]" — every word run
// together, which is exactly how ours looked. Non-breaking spaces (U+00A0) pass
// through the parser untouched and render as spaces on the panadapter. This is
// the trick DXHunter uses, and there is no other way to get a readable comment
// through that protocol.
func spotComment(comment, spotter, country, status string) string {
var b strings.Builder
add := func(s string) {
s = strings.TrimSpace(s)
if s == "" {
return
}
if b.Len() > 0 {
b.WriteString(" ")
}
b.WriteString(s)
}
// The radio has the last word on length: a comment past roughly sixty
// characters comes back from SmartSDR cut mid-word — one was echoed as
// "…[European Russia" with the closing bracket and the status gone. So the
// parts are added in order of what an operator would keep, and the cluster's
// own words — the longest and the least specific — are the ones trimmed.
// The cluster's own text arrives padded: RBN lines are column-aligned, so a
// comment reads "FT8 5 dB LN14 CQ" with runs of spaces holding the
// columns apart. Those runs became runs of NON-BREAKING spaces, which the
// panadapter faithfully rendered as a gap wide enough to push the rest of the
// comment off the screen. Columns mean nothing once the text is out of its
// table: one space between words.
comment = strings.Join(strings.Fields(comment), " ")
tag := bracket(spotStatusTag(status))
spot := bracket(spotter)
cty := bracket(country)
room := panCommentMax - len(tag) - len(spot) - len(cty) - 3 // 3 separators
add(trimTo(comment, room))
add(spot)
add(cty)
add(tag)
// Every space, including the ones already inside the cluster's comment.
return strings.ReplaceAll(b.String(), " ", "\u00A0")
}
// panCommentMax is what SmartSDR keeps of a spot comment. Measured against a
// real radio's own status echo, with a margin: the cost of being wrong is a
// comment cut mid-word, and nothing in the protocol reports the limit.
const panCommentMax = 58
// trimTo shortens s to at most n characters, on a word boundary when it can.
// A negative or tiny budget yields nothing at all — the brackets that follow
// matter more than a two-letter fragment of the cluster's text.
func trimTo(s string, n int) string {
s = strings.TrimSpace(s)
if n < 4 {
return ""
}
if len(s) <= n {
return s
}
cut := s[:n]
if i := strings.LastIndex(cut, " "); i > n/2 {
cut = cut[:i]
}
return strings.TrimSpace(cut)
}
// bracket wraps a non-empty value in square brackets.
func bracket(s string) string {
s = strings.TrimSpace(s)
if s == "" {
return ""
}
return "[" + s + "]"
}
// spotHidden reports whether this status should stay off the panadapter.
//
// Read from the same cached palette as the colours — see spotColorFor — because
// it is consulted on every spot from every cluster.
func (a *App) spotHidden(status string) bool {
a.spotColorsMu.Lock()
if a.spotColorsCache == nil {
c := a.GetSpotColors()
a.spotColorsCache = &c
}
p := a.spotColorsCache
a.spotColorsMu.Unlock()
if c, ok := p.Colors[status]; ok {
return c.Hide
}
return false
}
+167
View File
@@ -0,0 +1,167 @@
package main
import (
"strings"
"testing"
)
// A colour the Flex refuses is a spot that never appears, and the command error
// goes to a log nobody is reading. Anything that is not #AARRGGBB must be
// dropped here rather than sent.
func TestHexARGB(t *testing.T) {
for _, ok := range []string{"#FFFF3B30", "#00000000", "#ffabcdef", "#40FF6B22"} {
if !hexARGB(ok) {
t.Errorf("%q should be accepted", ok)
}
}
for _, bad := range []string{
"", "#FFF", "#FF3B30", "FFFF3B30", "#FFFF3B3", "#FFFF3B300",
"#GGFF3B30", "#FFFF3B3G", "red", "rgb(255,0,0)",
} {
if hexARGB(bad) {
t.Errorf("%q should be refused", bad)
}
}
}
// The stored palette must survive a round trip, and must not carry a status the
// resolver does not know — an unknown key would be a colour nothing can ever use
// and a field nobody can remove from the panel.
func TestNormSpotColors(t *testing.T) {
in := SpotColors{Enabled: true, Colors: map[string]SpotColor{
"new": {Text: "#FFFF3B30", Bg: "#40FF3B30"},
"new-band": {Text: "not a colour", Bg: "#40FFCC00"}, // half valid
"worked": {Text: "", Bg: ""}, // nothing at all
"invented": {Text: "#FF000000"}, // not a status
}}
out := normSpotColors(in)
if got := out.Colors["new"].Text; got != "#FFFF3B30" {
t.Errorf("valid pair lost: %q", got)
}
if c := out.Colors["new-band"]; c.Text != "" || c.Bg != "#40FFCC00" {
t.Errorf("half-valid pair = %+v, want the background kept and the text dropped", c)
}
if _, ok := out.Colors["worked"]; ok {
t.Errorf("an entry with no colour at all must not be stored")
}
if _, ok := out.Colors["invented"]; ok {
t.Errorf("an unknown status must not be stored")
}
}
func TestSpotComment(t *testing.T) {
// What the panadapter shows: the cluster's words, who spotted it, the entity,
// then what it is worth — DXHunter's order, so an operator reads one
// convention and not two.
got := spotComment("CQ up 2", "F4BPO", "Franz Josef Land", "new-slot")
want := "CQ up 2 [F4BPO] [Franz Josef Land] [New Slot]"
if plain(got) != want {
t.Fatalf("got %q, want %q", plain(got), want)
}
// EVERY space is non-breaking, the ones inside the cluster comment included:
// SmartSDR splits its command line on spaces, so a real one truncates the
// comment at the first word.
if strings.Contains(got, " ") {
t.Fatalf("an ordinary space survived: %q", got)
}
if !strings.Contains(got, " ") {
t.Fatal("no non-breaking space in the comment")
}
// Missing parts leave no empty brackets and no double separators.
if p := plain(spotComment("", "", "", "new")); p != "[New DXCC]" {
t.Fatalf("got %q", p)
}
if p := plain(spotComment("CQ", "", "Spain", "")); p != "CQ [Spain]" {
t.Fatalf("got %q", p)
}
// A status with nothing to announce contributes no tag.
if p := plain(spotComment("loud", "DL1ABC", "Germany", "none")); p != "loud [DL1ABC] [Germany]" {
t.Fatalf("got %q", p)
}
// Every colourable status except the unresolved one is labelled, or the
// palette would say something the text does not.
for _, st := range spotColorOrder {
if st == "none" {
continue
}
if spotStatusTag(st) == "" {
t.Fatalf("status %q has a colour but no tag", st)
}
}
}
// plain puts the ordinary spaces back, for readable assertions.
func plain(s string) string { return strings.ReplaceAll(s, " ", " ") }
// The per-status switch must survive a save with no colours on that row: it is
// an instruction in its own right, and dropping it would quietly turn the status
// back on. And a palette written before the switch existed must keep sending
// everything — "no field" is not "the operator turned this off".
func TestSpotColorHideSurvivesNormalisation(t *testing.T) {
in := SpotColors{Enabled: true, Colors: map[string]SpotColor{
"worked": {Hide: true}, // no colours, just the switch
"new": {Text: "#FFFF3B30", Hide: true}, // both
"none": {Text: "not a colour"}, // neither survives
"new-band": {Text: "#FFFFCC00"}, // colour only
}}
out := normSpotColors(in)
if c, ok := out.Colors["worked"]; !ok || !c.Hide {
t.Error("a status hidden with no colour was dropped")
}
if c := out.Colors["new"]; !c.Hide || c.Text != "#FFFF3B30" {
t.Errorf("hide and colour did not both survive: %+v", c)
}
if _, ok := out.Colors["none"]; ok {
t.Error("an entry with nothing valid in it was kept")
}
if c := out.Colors["new-band"]; c.Hide {
t.Error("a colour-only entry came back hidden")
}
// An older palette says nothing about hiding, and must send everything.
old := normSpotColors(SpotColors{Enabled: true, Colors: map[string]SpotColor{"new": {Text: "#FFFF3B30"}}})
if old.Colors["new"].Hide {
t.Error("a palette from before the switch existed came back hidden")
}
}
// SmartSDR cuts a long comment mid-word — one came back from the radio as
// "…[European Russia", losing its closing bracket and its status. What the
// operator would keep must therefore survive: the spotter, the entity and the
// status, with the cluster's own words trimmed to fit.
func TestSpotCommentFitsTheRadio(t *testing.T) {
long := "FT8 5 dB LN14 CQ DX FROM A VERY TALKATIVE SKIMMER NODE INDEED"
got := plain(spotComment(long, "OH6BG-#", "European Russia", "new-band"))
if len(got) > panCommentMax {
t.Fatalf("comment is %d chars, over the %d the radio keeps: %q", len(got), panCommentMax, got)
}
for _, must := range []string{"[OH6BG-#]", "[European Russia]", "[New Band]"} {
if !strings.Contains(got, must) {
t.Errorf("%s was trimmed away — the cluster text should go first: %q", must, got)
}
}
// A short comment is left exactly as it is.
short := plain(spotComment("CQ", "K1ABC", "Spain", "new"))
if short != "CQ [K1ABC] [Spain] [New DXCC]" {
t.Fatalf("got %q", short)
}
// No room at all for the cluster's words: they go, the brackets stay.
tight := plain(spotComment("CQ DX UP 2 LISTENING", "VERYLONGSPOTTER-#", "Democratic Republic of the Congo", "new"))
if strings.Contains(tight, "LISTENING") {
t.Errorf("kept the cluster text at the expense of the tags: %q", tight)
}
}
// RBN lines are column-aligned, so a comment arrives as "FT8 5 dB LN14
// CQ". Preserved as non-breaking spaces, those runs rendered on the panadapter
// as a gap wide enough to push the rest of the comment off the screen.
func TestSpotCommentCollapsesClusterPadding(t *testing.T) {
got := plain(spotComment("FT8 -13 dB CQ", "WC2L-#", "United States", "new"))
want := "FT8 -13 dB CQ [WC2L-#] [United States] [New DXCC]"
if got != want {
t.Fatalf("got %q\nwant %q", got, want)
}
// Tabs and newlines are padding too.
if p := plain(spotComment("CQ\t\tDX\n", "K1ABC", "", "")); p != "CQ DX [K1ABC]" {
t.Fatalf("got %q", p)
}
}
+59
View File
@@ -0,0 +1,59 @@
package main
import "testing"
// The order of these tests IS the meaning of the answer, and it was wrong: a
// station new on both the band and the mode was reported as a plain "new band",
// which reads as "you have worked this entity in this mode, just not here" —
// the opposite of the truth. It is also not a slot: a slot is the pair still
// missing when each half is already in the log.
func TestSpotEntityStatus(t *testing.T) {
for _, c := range []struct {
name string
worked, haveBand, haveMode, slot bool
mode string
want string
}{
{"entity never worked", false, false, false, false, "SSB", "new"},
{"entity never worked, no mode known", false, false, false, false, "", "new"},
// The case this exists for.
{"new band AND new mode", true, false, false, false, "SSB", "new-band-mode"},
// New band, but the mode is already in the log on another band.
{"new band only", true, false, true, false, "SSB", "new-band"},
// New mode, on a band already worked.
{"new mode only", true, true, false, false, "SSB", "new-mode"},
// Each half worked, never together: THAT is a slot.
{"new slot", true, true, true, false, "SSB", "new-slot"},
{"fully worked", true, true, true, true, "SSB", "worked"},
// No mode: only the band can be judged, and a guess must never claim new.
{"no mode, new band", true, false, false, false, "", "new-band"},
{"no mode, band worked", true, true, false, false, "", "worked"},
} {
if got := spotEntityStatus(c.worked, c.haveBand, c.haveMode, c.slot, c.mode); got != c.want {
t.Errorf("%s: got %q, want %q", c.name, got, c.want)
}
}
}
// Every status is reachable, and no two inputs collide on a status that should
// be exclusive — the guard against someone "simplifying" the chain later.
func TestSpotEntityStatusIsExhaustive(t *testing.T) {
seen := map[string]bool{}
for _, worked := range []bool{true, false} {
for _, band := range []bool{true, false} {
for _, mode := range []bool{true, false} {
for _, slot := range []bool{true, false} {
seen[spotEntityStatus(worked, band, mode, slot, "CW")] = true
}
}
}
}
for _, want := range []string{"new", "new-band-mode", "new-band", "new-mode", "new-slot", "worked"} {
if !seen[want] {
t.Errorf("no combination produces %q — the status is dead", want)
}
}
}
+5 -5
View File
@@ -315,11 +315,11 @@ func (a *App) syncPublishDeletes(ids []int64) {
if store == nil {
return
}
for _, id := range ids {
q, err := a.qso.GetByID(a.ctx, id)
if err != nil {
continue
}
// One read for the whole set: see deleteSnapshot. Tombstones are written
// before the rows go, because a QSO that never had a sync identity has to be
// given one here — after the DELETE there would be nothing left to stamp.
for _, q := range a.deleteSnapshot(ids) {
id := q.ID
// A contact never touched since the sync was switched on has no identity,
// and giving it one now is what makes the deletion addressable at all.
a.syncMu.Lock()
+1 -1
View File
@@ -21,7 +21,7 @@ import (
const (
// appVersion is stamped on every heartbeat (and could feed the About box).
appVersion = "0.26.2"
appVersion = "0.26.13"
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
// to https://us.i.posthog.com for a US project.