Compare commits

...
66 Commits
Author SHA1 Message Date
rouggy e2c442552b chore: release v0.25.2 2026-08-15 02:50:48 +02:00
rouggy bb75c6f23f chore(changelog): one entry per subject in 0.25.2
Fourteen entries for ten subjects. "UDP" appeared four times and "Motorized
antenna" twice, which is one line per commit rather than one per thing an
operator notices.

The two new outbound services are now one Connections entry, everything that
was made loggable is another, and the antenna's two silences — a lost port and
a controller going its own way — read as the single symptom they produce.
2026-08-15 02:45:32 +02:00
rouggy 5c958572dc fix(relays): let the HTTP board's channel count be chosen
The selector offered 1, 2, 4, 8 and 16 and none of them took: the board stayed
at four relays.

The count is decided in three places — deviceRelayCount in Go, chanCount in the
Station Control panel, relayCountUI in Settings. The new type was added to the
first and the dropdown, and to neither of the others, so the panel resized the
labels from a helper that had never heard of it and fell straight through to
its fixed default. The Go side was right the whole time, which is why the
driver would have been built correctly for a count the operator could not set.

All three now know the type. A test pins the Go side against every count the
dropdown offers, and against the fixed boards, whose hardware decides and which
must keep ignoring the field.
2026-08-15 02:35:14 +02:00
rouggy 26b8dade20 feat(relays): generic HTTP relay board, and point band switching at it
An operator was about to build band→relay mapping into the custom URL rows.
It already exists, and better: relay auto-control has a per-relay "band" rule
driving webswitch, KMTronic, Dingtian, Denkovi and USB boards. It holds state
so a relay is only commanded when its wanted position changed, reads the
boards live before the first apply so it does not re-command one already in
place, and carries per-relay labels. A URL fired on a band change has none of
that, and would have been a second definition of "which antenna on which band"
— the drift that cost us a week on counties.

So the gap was only the hardware: a hand-made switch is none of the five named
types. It is now the sixth, "HTTP relay": an ON URL and an OFF URL, either as
one pattern with {relay} substituted, or one pair per relay. The per-relay
form is the reason it exists — these boxes often have URLs with nothing in
common between channels (…/FF0101 and …/FF0201), which no pattern can express.

Status is remembered rather than read: most have no endpoint worth trusting.
The cost is stated in the code and the panel — after a restart every relay is
re-commanded once, which is harmless on a board with no memory and far better
than assuming an antenna is already selected.

And the Connections panel now says so, exactly where the wrong choice is made:
picking a band change with a URL transport shows a note pointing at Station
Control. The URL transport stays — a lookup pushed to a webhook or a QSO to a
dashboard is an event, not a state, and Station Control has no place for it.
2026-08-15 02:23:03 +02:00
rouggy ffd6bcf54b fix(connections): log what was actually sent, and rename the section
Two answers to "can people debug this when it does not work".

They could not. A custom UDP row logged "sent 18 bytes to 127.0.0.1:12000"
and nothing about the message — which is a template the operator wrote, so
the byte count says nothing about whether the substitution came out as they
meant. The payload is now in the line, with the trigger that fired it, for
custom rows only: an ADIF record or a binary WSJT frame on every QSO would
bury the log rather than fill it.

Worse was the silent case. A template that is a single placeholder the trigger
does not carry — {freq} on a band change — renders empty, sends nothing, and
looked exactly like a row that had never fired. It now says so, throttled per
row, and points at the field list.

And a password in a URL is redacted before it reaches the file. Storing
http://admin:secret@switch/ as typed was a deliberate choice for LAN gear;
writing it into a log that gets sent to whoever is helping is a different
choice, and was never made.

The Settings section is "Connections" rather than "UDP integrations", since it
has not been UDP-only since the URL transport landed. The log prefix stays
"udp:" on purpose — renaming it would orphan every log an operator has already
sent and every note anyone has written against it.
2026-08-15 01:52:36 +02:00
rouggy 6c2c1f106a feat(udp): custom outbound messages — a trigger, a template, UDP or a URL
The hard-coded emitters each speak one published format at one fixed moment.
This is the escape hatch, and it exists mainly for antenna switches: they are
driven by a URL, and the band change is the trigger they want.

Four triggers, each carrying its own field set: band change (the RADIO's band,
not the entry form — a switch follows the rig, not what is being typed), QSO
logged, rotator command and callsign lookup. The panel prints the fields the
selected trigger can fill, which is the point of the whole thing: a placeholder
the trigger does not carry renders as nothing, and without the list an operator
writes {freq} on a band change and has no way to learn why the switch never
moved.

Three things the panel cannot show, handled here:

  - Escaping. A URL needs every value percent-encoded; a UDP payload must not
    be touched. The first portable callsign, F4BPO/P, puts a path separator in
    the middle of a query string otherwise — it works on the bench and fails on
    the air.
  - Blocking. An HTTP call to a switch that is unplugged would otherwise sit
    for the operating system's timeout, on the path of a band change. It runs
    in the background with a 3 s limit.
  - Silence. A switch answering 404 after a firmware update fails exactly like
    success looks from here, so the status code is logged, throttled per row.

The rotator trigger hooks the COMMAND rather than the SP/LP buttons, so the
compass and a spot click fire it too, and the path ("SP"/"LP") is passed
through because an azimuth alone cannot say which was taken — 137° is short
path to one station and long to another.

Credentials in a URL are stored as typed. That is the operator's call, on the
grounds that this is LAN gear, and the hint in the panel says so.
2026-08-15 01:39:16 +02:00
rouggy 03d5376d01 chore(udp): name the service for the protocol, not for one program
"WSJT-X logged QSO (Logger32)" reads as Logger32-only, and it is not: the row
speaks the WSJT-X UDP interface, which several loggers listen on. An operator
running something else would have scrolled past a service that would have
worked for them.

Logger32 stays in the hint as the example it is — it is what this was built
against, and its additional sockets are where most people will point it — and
port 2250 stays as the default, a starting point rather than a rule.
2026-08-15 01:18:44 +02:00
rouggy dc14990b44 fix(udp): send the structured QSO Logged too, not only the ADIF one
The ADIF datagram reached Logger32's socket and still nothing appeared in its
log. WSJT-X sends TWO messages for every contact — QSO Logged (type 5), the
structured one, and Logged ADIF (type 12) — and receivers differ on which they
read: MacLoggerDX takes the structured one by default and offers the ADIF as
an option. We were sending only the half Logger32 does not use.

Both now go out on that row, in WSJT-X's own order. Nothing double-logs: any
receiver built for WSJT-X already sees both from the real thing.

Type 5 is read positionally, so the field order is pinned by a test against
NetworkMessage.hpp — one field out of place shifts every one after it and the
receiver files nonsense without complaining. QDateTime is Qt's own encoding:
Julian day, milliseconds since midnight, then the time spec, which is sent as
UTC (1) because a spec of 0 would have the receiver re-read the contact in its
own zone. The Julian arithmetic is checked against known values; a day out
there files every QSO on the wrong date.
2026-08-15 00:55:24 +02:00
rouggy d95c998081 feat(udp): speak WSJT-X to Logger32, and lighten Sahara
"sent 1153 bytes to 127.0.0.1:2250" and nothing in Logger32. Both true: the
line the operator screenshotted is titled "Setup additional WSJT/JTDX UDP
sockets", and those receivers take UDP LOGGING PACKETS — the WSJT-X v2
protocol. A bare ADIF record posted to them is dropped without a word.

So there is a new outbound service rather than a change to the existing one:
"WSJT-X logged QSO (Logger32)" sends the same ADIF wrapped in a Logged ADIF
datagram (magic 0xadbccbda, schema 2, type 12), defaulting to port 2250. The
plain-text row stays for JTAlert/GridTracker-style receivers, because the two
really are different wire formats and one row cannot be both.

The id string is "OpsLog", not "WSJT-X": a receiver uses it to tell instances
apart, and impersonating the real thing would make a second WSJT-X
indistinguishable from us.

Tested both ways — the header byte for byte, and a round trip back through our
own ParseWSJT, since that is the same decoding every receiver applies.

Sahara moves to the parchment an operator asked for: page #e6ded0, panels
#f3eee2, toolbars #ded5c4, terracotta #c4501e on the buttons and the focus
ring. Lighter and less saturated than the deep sand it was.
2026-08-14 17:51:31 +02:00
rouggy c5c9d355ec fix(logging): name the antenna disagreement, and confirm an outbound send
Two silences from one operator's log.

The SteppIR is not blocked — it is being overruled. Every tune is commanded,
acknowledged on the next poll with the frequency asked for, then replaced on
the poll after by a different one: 21075 asked, 21075 confirmed, 21050
reported, again and again, with the operator tuning once more each time. Two
minutes of that reads as a dead link. It now says what it is, once, when the
motors have stopped and the reported frequency is more than 10 kHz from the
commanded one — a controller quantising to its own grid is not a fault, one
sitting somewhere else entirely is.

UDP outbound had no positive signal at all: only failures were logged. When
an operator sets up an ADIF message to a second logger and nothing arrives,
"OpsLog never sent it" and "the other program did not take it" looked exactly
the same from here — and the first is the common case, because a row created
as an inbound ADIF listener instead of an outbound ADIF message matches
nothing and emits nothing. Successful sends are logged with their destination
and service, and a QSO logged with no outbound row says so once a session.
2026-08-14 17:37:12 +02:00
rouggy 7470ebf47e feat(qsl): set the QSL route per direction from the QSL Manager
The paper form had one "Via", which since the QSL_VIA split writes
QSL_SENT_VIA. QSL_RCVD_VIA had no way in at all outside the per-QSO editor —
a field with a column, an import and an export, and nothing to fill it.

Each direction now has its own route dropdown, sitting with the status and
date it belongs to: how the card was sent, beside Sent; how it came back,
beside Received. Both apply to the whole selection, which is the shape of the
job — a stack confirmed in one go usually arrived the same way, a bureau
delivery being exactly that, and doing it one QSO at a time in the editor was
the only option before.

Both store the ADIF enumeration (B/D/E), and neither touches QSL_VIA — that
holds the manager's callsign and belongs to the QSO, not to a stack of cards
being confirmed together.

The two columns were already available in the paper list: it renders through
RecentQSOsGrid, which gained them with the field itself.
2026-08-14 16:32:12 +02:00
rouggy 2cd1274975 fix(logging): say why the antenna stopped and what the ADIF port is receiving
Two problems from one operator's log, both of them the log's fault.

SteppIR. The last line about it is "status query failed, reconnecting: Port
has been closed" and then nothing — for the rest of the session. The poll loop
does retry every two seconds, but a failed open was a bare `continue`: no line,
ever. And startUltrabeam had three silent ways out — settings unreadable, the
antenna turned off, no port or host configured — so a cleared field and a lost
adapter produced exactly the same evidence, which is none. Both now say what
happened, with the port or host named. Reopen failures are reported three
times and then throttled (a port that is gone stays gone), and the recovery
says how many attempts it took.

FLDIGI. Four hundred "ADIF payload ignored" lines and nothing else legible.
The cause is in the same log: two inbound listeners on the SAME multicast
group and port, 239.255.0.1:2237 — one WSJT (MSHV), one ADIF (FLDIGI). Every
WSJT-X packet is delivered to both, and an FT8 cycle is dozens of decodes
every fifteen seconds; the bursts in the log are exactly 15 s apart. The ADIF
listener now checks for the WSJT-X magic and says so once, with what to do
about it, instead of rejecting each packet in writing. Anything else is
described a few times with its payload and then goes quiet.
2026-08-14 16:24:06 +02:00
rouggy 61006d8155 fix(chase-new): the toolbar button was read once, too early
An operator waited over a minute and the button never appeared; opening
Settings and pressing Cancel made it appear at once. That is the whole
diagnosis — Cancel was the only thing that re-read the option.

GetChaseNew returned the cached atomic, which exists for the MQTT goroutine
and is false until startup has read the setting. The UI asked while the
database was still opening, was told "off", believed it, and never asked
again. It now reads the setting, like the grid-chasing binding beside it.

The frontend asks again at the two moments this class of race resolves: when
GetStartupStatus returns, and when the first logbook load succeeds — the seam
that already re-reads the connection label for exactly this reason, with a
comment saying so.

The open/closed state was already remembered per machine; it is now in
PORTABLE_KEYS with the other widget toggles, so it travels with data/ like the
rotor and amplifier panels rather than being the one that does not.
2026-08-14 15:50:40 +02:00
rouggy 94cba2592e feat(chase-new): drop the frequency column, the beacons and the bands you don't have
Three cuts, all of them removing things nobody could act on.

The frequency column is gone. Clicking the row tunes the rig to it, so the
number was there to be read and never used. It is still carried on the spot —
the click is what needs it — and it is in the row's tooltip. The country takes
the space.

Modes are limited to FT8, FT4, FT2, PSK31 and RTTY. WSPR is the one worth
spelling out: it is a beacon, nobody answers a WSPR transmission, so a "new
entity on WSPR" is a path report and not a station to work — and on a quiet
band it would have been most of the list.

Bands are limited to the operator's own list. PSK Reporter carries every band
its receivers listen on, and a 13 cm decode is not an opportunity for a station
with no 13 cm.

Both tests run before the status lookup and both read a cached map: they throw
away most of the feed, so nothing downstream pays for it. The band list is
re-read when the lists are saved, so ticking a band in Settings applies to the
next decode rather than the next restart — which would have looked like the
filter not working.
2026-08-14 15:41:37 +02:00
rouggy 9b1faada38 fix(chase-new): one badge, filters, a way in and a way out — and the frequency
Four things from an operator's first look at the panel, and one of them was
mine.

The frequency column showed "—" on every row. pskr.Spot.FreqHz was declared
and documented in one edit and never assigned in the next, so the payload's
"f" was parsed and dropped. A click therefore filled the callsign and left
the rig where it was, which is half the point of the panel. Assigned, with a
test that runs a real payload through and checks the value survives into the
Spot — the field being declared is what made it look done.

A row now carries ONE indication instead of stacking them. A station can be a
new band and a new prefix at once; the row says the first that matters, in the
order that would make an operator leave what they are doing: entity, band,
mode, slot, then prefix, then square. Two badges on one line made the list
unreadable at a glance, which is the only thing it is for.

Each category has a filter chip in the header, in its own colour, remembered
across sessions. A toolbar button shows the panel and a cross closes it — the
same split the Super Check Partial panel uses, where the setting decides
whether the feature exists and the button whether it is on screen.

The panel is wider and the country column gets what is left, which is more
than it was now that a row carries one badge.
2026-08-14 15:33:15 +02:00
rouggy e67f57fee7 fix(serial): list a COM port once, in the order a human reads it
An operator's keyer dropdown showed COM1 and COM3 twice, in the order
COM1 COM1 COM3 COM8 COM9 COM4 COM3, with "COM3COM3" as the selected value —
two entries sharing one value both counted as selected.

Not our bug to start with, but ours to absorb. Windows enumerates serial
ports from HARDWARE\DEVICEMAP\SERIALCOMM, which maps a DEVICE PATH to a COM
name, so the same name legitimately appears twice when two devices claim it:
a driver uninstalled without cleaning up after itself, or virtual-port
software. go.bug.st/serial returns one entry per device, faithfully.

Deduplicated and naturally sorted in the one binding every port dropdown in
the app calls, so CAT, rotators, amplifiers and the keyer all get it. COM4
now sits between COM3 and COM8 rather than after COM9, which is how a port
gets overlooked on a machine with a dozen.

A dropped duplicate is logged rather than swallowed: two devices holding one
COM name is also a good reason for one of them to report that port busy, and
that is not something an operator can work out from a list.
2026-08-14 15:25:45 +02:00
rouggy a9e3a159d9 feat(cluster): Chase New — a panel for what is new and audible here
PSK Reporter tells you what is actually being decoded in your region, which
is a larger set than what somebody chose to spot: nobody spots the FT8 caller
running ten watts from a rare square.

Almost all of it existed. The MQTT payload already carries frequency, mode,
transmitter and both grids; the watcher already drops any report collected
further than NearKm from the operator, which is exactly the question worth
asking — the station is being heard HERE, not in Japan; and with grid chasing
on the subscription is already every band, filtered at the broker by receiver
square, measured at 0.2 to 1.2 messages a second. This reads messages that
were arriving and being discarded.

"New" is not decided here. Every spot goes through ClusterSpotStatuses, the
same function the DX cluster grid uses and the same cached index, so the two
panels cannot drift apart the way the county columns did. Cost per message is
map lookups behind an option cached in an atomic, because the MQTT goroutine
must never wait on the settings store.

The option is its own, not nested under grid chasing: chasing squares and
chasing entities are different wants, and the feed now has three consumers,
any one of which brings it up and none of which cuts the others loose when it
goes down.

The panel says "digital modes only" in its footer. An empty list has to mean
"nothing new on FT8/FT4/JS8 near you", not "the band is dead" — it will never
show a new entity on CW.
2026-08-14 15:20:18 +02:00
rouggy 7c781bf793 fix(spot): spot the references worth chasing, not the derived ones
The comment came out "SSB WAC EU WAZ 15 WPX HA5" — the QSO's materialised
award_refs hold both kinds, and I took them all. Those four are what every
reader of the spot derives from the callsign in their head. They spent the
whole 30-character comment saying nothing and buried SOTA HA/KM-018, the one
reference anyone would have acted on.

Computed awards are now filtered out with the same rule the QSO editor uses
(isComputedAwardField), which is why they are the ones it lists on the left
and not in its read-only panel. The field map moves from a ref to state as
well: a ref left the first spot of a session computing before GetAwardDefs
had answered.

Also opens 0.25.2, since 0.25.1 shipped before the spot work, and sets the
default mode list to SSB, CW, FT8, FT4, FT2, RTTY, PSK31, FM. AM and
DIGITALVOICE stay in the catalogue but are no longer selected on a fresh
install. FT2 joins the digital family everywhere its siblings are listed —
report list, RST defaults, Flex power class — so it gets dB reports rather
than the 59 an unknown mode falls back to.
2026-08-14 13:31:17 +02:00
rouggy 4f9a366884 feat(spot): put the award references in the spot comment
After the mode, which is the order a cluster line is read in:
"CW POTA FR-11553".

Two sources, because the QSO can be at either stage. While it is being typed
the entry panel holds the references as "CODE@REF;CODE@REF"; once logged they
live on the row as the materialised award_refs. The Send Spot window takes the
entry's when there are any and falls back to the last logged QSO — the same
fallback the callsign and frequency defaults already use — and picking a QSO
from the Latest list fills in that QSO's own.

A self-spot is the opposite case and gets its own builder: it announces OUR
station, so it carries MY_POTA_REF and friends. Using the QSO's award
references there would spot us with the park number of the station we just
worked, announcing us from somewhere we are not.

Both cap at the 30 characters a cluster node keeps, and add a reference whole
or not at all — a truncated park number is worse than none, since nobody can
act on it, and it still costs everyone who reads the spot. Only the comment we
BUILD is held to that; what the operator types is their own business.
2026-08-14 13:22:21 +02:00
rouggy db87ef39c0 chore: release v0.25.1 2026-08-14 13:06:44 +02:00
rouggy 3ce930e9cc refactor(winkeyer): learn the slow boot instead of naming the keyer
The K3NG entry added an hour ago is gone. It named one clone among many —
WKmini, home-built Arduinos, unbranded boxes — for hardware that speaks
exactly the same protocol, and it was the only line in the engine list that
picked a boot delay rather than a protocol. An operator with an unlabelled
clone would have had to guess.

The delay is now learnt per port. The first connect finds out by failing the
quick attempt and succeeding on the slow one; that fact is written to a
global setting keyed by the port, and every connect afterwards goes straight
to the slow attempt. Global rather than per profile on purpose: which keyer
is plugged into COM3 belongs to the computer, and switching profiles for a
different rig does not change the keyer on the desk.

Two tests hold the contract from both sides — a slow keyer must be reported
as slow, and a keyer that answers at once must not be, or every K1EL connect
would inherit seconds it never needed.
2026-08-14 13:05:13 +02:00
rouggy aca4dc5678 feat(winkeyer): K3NG keyers, and wait out their reboot
The operator's keyer is a K3NG — an Arduino running an emulation of the
WinKeyer protocol — which changes the diagnosis and nearly broke it.

Checked against K3NG's own source before anything else, because yesterday's
handshake now FAILS a connect where it used to press on regardless. It is
safe: k3ng_keyer.ino implements admin echo (0x04) and echoes the byte back,
0x13 is a documented no-op, and OPTION_WINKEY_STRICT_HOST_OPEN — on by
default — ignores every byte except 0x00 before host open, so the resync
nulls are dropped harmlessly and the echo probe still gets through.

The real cause is in K3NG's options file, beside the feature itself:
"disabling Automatic Software Reset is highly recommended", and an option
to "discard errant serial port bytes at startup" for when it is not. On an
Arduino, DTR is wired to reset through a capacitor: opening the port reboots
the board into its bootloader. Ours spoke 400 ms later, to a keyer that was
not running yet.

So the retry now waits 2.5 s, which recovers it without an operator pressing
connect twice, and the engine list gains a K3NG entry that skips the doomed
fast attempt altogether. Everything else is identical to a K1EL — same
settings panel, same protocol.
2026-08-14 12:40:42 +02:00
rouggy c495dced0f chore(changelog): one entry per subject in 0.25.1
Fifteen entries for seven subjects — the block had "WinKeyer:" twice, "QSL:"
and "QSL designer:" four times between them, "US counties:" three times.
That is one line per commit, which is how it was written, not one line per
thing an operator notices. Merged, in both languages.
2026-08-14 12:28:05 +02:00
rouggy 1b736272c9 fix(winkeyer): perform K1EL's full opening handshake
An operator's log showed the whole fault in its first line: "connected on
COM3 — no reply — the keyer did not answer Host Open", followed by seven
configuration commands and two calls sent as Morse. Nothing was listening.
Reporting a link as up and then writing to it regardless is the part worth
fixing; the handshake is why it was down.

K1EL's Application Interface Guide gives the sequence, and we did one step
of it. Now all of it:

  - DTR on, RTS OFF. K1EL's own init sets DTR_CONTROL_ENABLE with
    RTS_CONTROL_DISABLE, and on a serial WinKeyer those lines ARE the power
    supply — DTR feeds the 3.3 V regulator, RTS provides the negative rail.
    go.bug.st/serial defaults both to true, so we drove RTS high on every
    connect without a line of code saying so.
  - 400 ms after the lines come up, for a WK1 still booting off DTR.
  - Three 0x13 nulls to resync the command parser. A keyer left part-way
    through a command by whoever spoke to it last would absorb Host Open as
    a parameter — the everyday cause of a silent WinKeyer, and one the
    operator can do nothing about from the outside.
  - An echo test (0x00 0x04 0x55) before trusting the port at all. This is
    the step that answers "is there a keyer here", and connecting now fails
    on it, with the byte that came back when something else replied.

The whole handshake is retried once, since the first attempt's nulls are
what clear a confused parser. Tested against a fake port that reproduces
each failure: absent, mid-command, and echoing but versionless.
2026-08-14 12:07:58 +02:00
rouggy 05fc8ad80c fix(qsl): copy a design's pictures, not just its row
copyDirContents wrote into a destination it never created, so the first
os.Create returned ENOENT. The caller was written as "ignore os.IsNotExist"
— meant for a design with no pictures at all — and that guard matched the
failed write exactly: nothing was copied, no error surfaced, and validation
two lines later reported "copied design is incomplete: hero photo file
img_… not found" with no way to tell why.

Three fixes, one cause:

  - copyDirContents creates its destination;
  - the caller stats the source folder instead of pattern-matching an error,
    so a genuine copy failure is reported and rolls back both the row and
    the folder;
  - DuplicateProfile had the same defect in its own form — an INSERT … SELECT
    that cloned the template rows and left their photos behind, giving the
    new profile designs with no thumbnail and nothing to print. It now copies
    row and folder together, per template, since each needs its id first.

A test reproduces the original failure: it fails with the exact ENOENT that
was being swallowed.
2026-08-14 11:57:35 +02:00
rouggy 4e88bdfaa7 fix(qsl): separate the QSL manager from the routing method (#16)
QSL_VIA is the manager. QSL_SENT_VIA and QSL_RCVD_VIA are the ADIF "QSL Via"
enumeration — B bureau, D direct, E electronic, M manager (import-only) —
and say how a card travelled. OpsLog had one column for all three:

  - the import folded QSL_SENT_VIA into QSL_VIA whenever QSL_VIA was empty,
    which is exactly a Log4OM export (it defaults QSL_SENT_VIA to E), so
    OE6CLD saw "E" everywhere OpsLog shows the manager;
  - QSL_RCVD_VIA was listed in adifPromoted with no column behind it, so it
    was not stored, not kept among the extras, and not exported — dropped
    outright on import;
  - neither was ever written on export, so an import followed by an export
    destroyed both;
  - and OpsLog polluted the field itself: the QSL Manager panel wrote
    "Bureau" / "Direct" / "Electronic", in full words, into QSL_VIA.

Two columns added (migration 0027), carried through the five places a
promoted ADIF field has to touch, with round-trip tests pinning the reported
case. The QSL panel now offers Bureau / Direct / Electronic for each
direction and stores the enumeration; the manager field is labelled as the
manager and holds only that. M is kept when a file gives it and never
written back out.

Existing logs hold a mixture of the two in one column. The repair is offered,
not performed: the count is shown once per log with a plain question, and a
"no" is remembered. It moves only where QSL_SENT_VIA is still empty, and only
values that normalise to the enumeration — a manager is a callsign and can
never be one of those six words, which a test pins against real manager calls.
2026-08-14 11:50:25 +02:00
rouggy 30143b01bf fix(counties): make the cluster and the entry panel agree on a US county
An operator asked why K1SEI showed "Middlesex" in Info (F2) and "Lower
Connecticut River Valley" in the cluster. Two sources: the entry panel has
a callbook answer, a spot carries only a callsign so the cluster derives one
from the FCC licence ZIP through GeoNames — and GeoNames has followed the
Census in replacing Connecticut's counties with the 2022 planning regions.
No award, callbook or log uses those, so every CT station matched nothing:
new county for ever, and counting toward nothing.

Measured against a full ULS import (1 556 444 US callsigns), 23 223 resolved
to a name the USA-CA reference does not contain. Three causes, three fixes:

  - Spelling. "City and County of San Francisco", "Baltimore (city)",
    "Nome (CA)", plus counties renamed since the award list was drawn
    (Kusilvak, Oglala Lakota, the Valdez-Cordova split) and Alaska's four
    "X City and Borough", whose reference codes read "JUNEAUCITYAND" because
    the county-type suffix strip eats the wrong end. Normalised in
    award.USCountyKey, which both sides already go through. 7 515 callsigns,
    no re-download needed.

  - Doña Ana, NM shipped into the reference as "NM/DO̱AANA" — mangled by a
    non-UTF-8 CSV line, a code nothing could ever produce, so that county was
    unwinnable and silent about it. Row repaired, cntygen now refuses such a
    line, and a test makes every one of the 3 102 references reproduce its own
    code from its own name.

  - Connecticut. A planning region is drawn from towns in several counties, so
    no name maps to a name — only the ZIP can resolve it. cmd/ctzipgen builds
    the table from the Census 2020 crosswalk, filling PO-box-only ZIPs from the
    nearest resolved centroid; all 11 ZIPs GeoNames still labels with a real
    county agree with the result. 15 037 callsigns, applied at import, so the
    store now carries a rules version and Settings says when a re-download is
    needed.

Alignment itself is the last piece: a spot now shows the county the station is
logged with when we have one, and falls back to the ZIP-derived county only for
stations never worked.
2026-08-14 00:42:27 +02:00
rouggy fbd62fda30 fix(appearance): make Sahara actually differ from Warm light
The sampled colours were Warm light's own (#faf6ea / #e8dfc9 / #ddd2b8) —
the annotated screenshot was that theme, and the request written on it was
"just a little darker". Keep the cream on panels and the entry strip, take
the page, tab bar, toolbars and table headers a shade deeper, and move the
accent from burnt orange to ochre so the two are told apart in the picker.
2026-08-14 00:07:50 +02:00
rouggy ab0db0ef3a feat(appearance): Sahara theme
Built from the three sands an operator sent: #faf6eb for panels, #e8dfca
for the page behind them, #ddd2ba for toolbars, table headers and rows.
The ordering is what makes it work — a panel reads as lifted off the page
and the log grid as settled into it, so rows stay scannable without extra
rules. Ink is a deep warm brown; pure black on sand glares.
2026-08-13 18:18:52 +02:00
rouggy 380472bda8 feat(qsl): copy a card design from another profile
A second profile is usually the same operator with a different rig or a
different locator — same callsign, same cards. Having to redraw a design
because the antenna changed is work nobody should do.

The designer now lists the designs the active profile cannot see and copies a
chosen one into it. Designs it already sees — its own, and the shared ones —
are left out: they are not something to copy.

A COPY, not a move or a share. The original profile keeps its design untouched
and the duplicate is free to diverge, which it usually will: a second profile
exists because something differs, and that something often ends up on the card.

The PICTURES are copied too, and that is the part worth getting right. Stored
documents reference photos by name relative to the template's own asset folder,
so duplicating the JSON alone would point the new design at files that are not
in its folder. It is validated against its own folder afterwards, and a failure
rolls the row back rather than leaving a design whose pictures are missing.
Sharing the source's folder was the other option and a worse one: deleting
either design would then have emptied the other.
2026-08-13 18:08:14 +02:00
rouggy 4e2a5877d6 fix(rigctld): stop refusing two commands JTDX sends in Fake It
From a user's log, repeating throughout the session:

	rigctld: split off failed: cat: this radio's backend cannot set split
	rigctld: unimplemented command "X PKTUSB -1"

Both are answered with an error, and JTDX treats a rig-control error as fatal:
it abandoned a transmission 0.86 seconds into a 13.8-second frame.

"S 0" — split OFF. Fake It uses no split, and JTDX still sends this to be sure.
A backend that cannot SET split was refusing a request that was ALREADY
satisfied. It now succeeds when the rig is simplex, without touching the rig at
all. Arming still fails loudly: there the request is real and unmet, and a
client that believes it transmits up the band while the radio sits on the DX's
frequency is exactly what that refusal exists to prevent.

"X <mode>" — set_split_mode. Sent during ordinary setup, Fake It included,
where there is no second VFO to give a mode to. Accepted now: applied when a
split is in force, and a plain success otherwise, because the transmit VFO
already has that mode — it is the same VFO. get_split_mode answers to match.

Both regressions fail without the fix with the exact codes from that log,
RPRT -9 and RPRT -11.
2026-08-13 15:57:58 +02:00
rouggy d44a971acf chore(rigctld): trace the client exchange
Only PTT transitions were recorded. So when JTDX aborted a transmission
0.86 seconds into a 13.8-second frame, the log showed the abort and the Fake It
frequency restore around it — and not the command that preceded them, which is
the one thing needed to tell whether OpsLog answered something the client could
not accept.

Behind the existing CAT wire-trace switch rather than a new one: this is a line
per poll and would drown an ordinary log, and an operator chasing a rig-control
fault turns that trace on already.
2026-08-13 15:48:05 +02:00
rouggy fabd1becce fix(amp): couple a chosen GROUP, not every amplifier
The first version was a single switch meaning "command them all", and that is
wrong the moment a station has three: two SPE on a combiner and a PowerGenius
on another antenna would all go into OPERATE together, keying an amplifier that
has nothing to do with the pair.

It is now a set. Each amplifier is ticked into the group or not, the group is
stored as a list of ids, and an amplifier outside it keeps its own buttons —
which is the entire point of it being a set.

A group of fewer than two members is stored as none: one amplifier coupled to
itself would make every command fan out to a single member for ever.

A remembered member that is no longer running is skipped rather than failing
the command — deleting one amplifier must not break the button on the other.

An amplifier saved without an id cannot join, and the panel says so instead of
quietly omitting it from the list.
2026-08-13 15:24:43 +02:00
rouggy 345be94c65 fix(amp): put the coupling switch where it can be seen
It sat above the first amplifier card. With three cards configured — the case
it exists for — that is a scroll away from anything the operator is looking at,
and it was reported as missing rather than misplaced.

Moved next to Add amplifier: coupling belongs to the SET of amplifiers, not to
any one of them, so it belongs with the other set-level control.
2026-08-13 15:03:46 +02:00
rouggy d0c6e420d2 feat(amp): command linked amplifiers together for a combiner
The SPE CO1-2 combiner is an RF device: it sums two amplifiers and commands
nothing. So "combined" operation is really two amplifiers that must be held in
the same state, and one left in STANDBY while the other keys means the combiner
sees power on a single input.

A switch in Settings → Amplifier makes ON, OFF and OPERATE act on every
configured amplifier. Offered only with two or more: coupling one amplifier to
itself is a switch that cannot do anything.

The METERS stay per amplifier, deliberately. Two amps combined are still two
amps, and an operator watching for one of them to run away needs to see them
apart — a summed bar would hide exactly the fault worth catching.

Fanned out in AmpOperate/AmpPower rather than in the UI: the card and the docked
widget both call these, and a coupling built into one would be missing from the
other, which on a combiner means one amplifier keyed and one not. The clicked
amplifier goes first, so a partial failure still did what the operator asked
before it stopped.

While linked, an amplifier with no power command — a PGXL on its direct link —
is skipped silently rather than reported: it would make a successful pair look
broken.
2026-08-13 14:02:34 +02:00
rouggy f0026b8bd3 chore: open 0.25.1 2026-08-13 13:51:38 +02:00
rouggy 2007479da6 chore: release v0.25.0 2026-08-13 13:51:08 +02:00
rouggy 4ba5569ca8 fix(dxcc): /MM and /AM belong to no entity
RI1FJL/MM resolved to Franz Josef Land while the expedition was still sailing
there, telling the operator they had worked an entity they had not.

The old behaviour was deliberate — the comment read "strict DXCC says no
entity, but the log should still show the operator's country" — and that is
wrong for exactly this reason. A home country on a maritime mobile is not extra
information; it is a false claim about where the contact happened, and it is
the kind of false claim that gets a QSO submitted for an award it cannot win.

Trailing only. A LEADING "MM" is the Scotland prefix and "AM" is Spain, so
MM0ABC and AM5X keep their entities — getting that wrong would be a far larger
error than the one being fixed. /P, /M and /B are unaffected: a portable
station is still ashore.

In the cluster the column says "Maritime mobile — no DXCC" rather than going
blank, because blank is what an UNRESOLVED spot looks like and the two mean
opposite things — one is "we don't know yet", this is "there is nothing to
know". Display only: the QSO's own Country stays empty, since that field holds
a DXCC entity name and there is none.
2026-08-13 12:25:33 +02:00
rouggy dc0b00b474 fix(adif): CNTY must be STATE,COUNTY
ADIF defines CNTY as "STATE,COUNTY" — "GA,BARROW". OpsLog wrote the bare county
name, which a receiving logger cannot resolve: county names repeat across
states, and there is a Washington County in thirty of them. The award engine
here was never affected, since it reads the columns rather than the ADIF; the
damage was to every file we hand to someone else.

One writer covers everything — writeRecord — so this fixes file exports and the
LoTW, Club Log, HRDLog and QRZ uploads together. MY_CNTY gets the same
treatment.

The county alone is still written when no state is known: a bare name is worth
more than nothing, and inventing a prefix would be worse than either. A value
that already carries a comma passes through untouched, so re-exporting an
imported record cannot double the prefix.

Import is the mirror: "GA,BARROW" fills both columns, and a file carrying the
bare county — as OpsLog's own older exports do — still imports unchanged. The
state parsed out of CNTY only fills a blank STATE, never overrides it: STATE is
the dedicated field and the more specific statement.
2026-08-13 12:15:09 +02:00
rouggy 2695747db6 chore(email): name the server, encryption and attachment size on a send failure
"An existing connection was forcibly closed by the remote host" during DATA
reads the same whether the server refused the SIZE, hit an hourly quota, or
simply dropped the socket — and only the first is something an operator can act
on. The message now carries host:port, the encryption in use and the total
attachment size, so the size can be ruled in or out without a second attempt.

A path that does not exist is not counted: the mail library skips it, so
reporting it would describe a message that was never sent.
2026-08-13 12:09:57 +02:00
rouggy eba54344b0 feat(hrdlog): ON AIR — publish the live frequency, mode and rig
Puts "F4BPO is on air 14,074,000 FT8 IC-7300" on hrdlog.net's front page while
the station is operating, which is what HRDLog's own "Automatic HRDLog ON AIR"
setting does.

The endpoint and its field names come from HRDLog's own library
(github.com/iw1qlh/HRDLOG-net-library, HrdProtocol.SendOnAirAsync): OnAir.aspx,
with Frequency in Hz, Mode, Radio, Callsign, Code and App. Read rather than
guessed — an invented endpoint would have produced a switch that silently did
nothing.

HTTPS where that library uses plain HTTP: the upload code is a credential and
has no business crossing the network in clear, and the sibling NewEntry
endpoint on the same host already serves TLS.

A heartbeat every two minutes, not a change notification — HRDLog drops a
station from the list when it stops hearing from it. Silent when switched off,
unconfigured, or when the rig reports no frequency: announcing 0 Hz would say
the operator is on air on nothing. Failures are logged, never toasted; a
broadcast the operator did not ask for at that instant must not interrupt them
every two minutes on a flaky link.

Its own switch beside auto-upload rather than folded into it: this is a live
status and needs the rig readable, not a QSO.
2026-08-13 12:03:51 +02:00
rouggy 93879a0ce1 fix(compact): size the window to the strip instead of a tuned constant
compactH was 158px, "tuned so the compact entry strip fits in a single row".
A constant tuned against a layout stops being true the moment the layout
changes, and this one outlived a strip that had since shrunk — leaving about
70px of empty window under the fields.

The frontend now measures what it rendered and asks for that height, watched by
a ResizeObserver so a strip that wraps at a narrow width is followed too. The
topbar is added as its declared h-8 rather than measured, since it is fixed.

Bounded in the backend: a measurement of zero — a layout not yet painted —
must not collapse the window, and the call is ignored unless compact is on so
nothing can shrink the normal window. Rounded to whole pixels so a sub-pixel
reflow cannot start a resize loop.
2026-08-13 11:54:09 +02:00
rouggy 8fccfa29b1 fix(rotator): the SP/LP readout goes BELOW the dial
The wrapper around the svg was a flex ROW, so a sibling landed beside the
compass instead of under it. Column, and the readout spans the full width.
2026-08-13 11:48:59 +02:00
rouggy 784d809290 fix(rotator): put the SP/LP readout inside the compass itself
It went under the Station Control rotator; the compass that wanted it is the
docked one beside the entry strip. Both are the same RotorCompass, so the
readout moves INTO that component: every compass in the app carries it, and no
caller draws its own.

The bezel already showed the short path as a red marker, but a marker is a
direction, not a number — and the numbers in the status bar are 10px, which is
what prompted this.

Clickable only when the caller passed onGoto, since a compass rendered without
one cannot turn anything and a button that does nothing is worse than a label.
2026-08-13 11:45:49 +02:00
rouggy 700b688fc0 feat(rotator): short and long path headings under the compass
The same pair already sits in the status bar, where it is 10px and several
operators reported not being able to read it. Repeated under the compass at a
size that can be read across a shack.

Clickable, like the ones in the status bar: a heading you can see and not act
on would be a step backwards from what is already there. Disabled and dashed
when no station is entered, rather than showing a heading to nowhere.
2026-08-13 11:34:00 +02:00
rouggy 03598cfaff feat(entry): NEW badge on the county in the entry strip
The same answer the Details tab already gave, moved to where the county is now
typed — a badge in a tab nobody has open while working a station is a badge
that does not do its job.

Debounced at 300 ms and keyed on state + county together: the field is typed
into as well as filled by the lookup, and the check queries the log. A county
name means nothing without its state, so both have to settle before asking.
2026-08-13 11:30:27 +02:00
rouggy ed517eb8d3 style(entry): County/CQ/ITU/DXCC above Comment and Note
The looked-up values now sit directly under the geography line they continue —
QTH, State, locator, then county and zones — and the free-text fields close the
block. Reading order follows what the lookup fills, rather than interleaving it
with what the operator types.
2026-08-13 11:28:11 +02:00
rouggy 1cfba19ed2 feat(entry): County, CQ, ITU and DXCC on the freed row
Comment and Note moving onto one line left the right column two rows shorter
than the left, and this fills it: county, both zones and the ADIF entity
number. All four are filled by the lookup and were only visible after opening a
tab — the wrong place for values an operator wants to SEE are right before
pressing Log.

County is a name, not a code ("St. Tammany Parish"), so it takes the flexible
width and the three numbers get fixed narrow boxes.

Cleared numeric fields store undefined, not 0. Zero is a real DXCC number and a
real zone, so an empty box has to stay empty rather than assert something the
operator did not type.

State stays up on the geography line beside QTH and the locator, which is how
the lookup fills them and how they are read.
2026-08-13 11:24:10 +02:00
rouggy b18f5c491e fix(entry): the State field was defined but never rendered
stateBlock was built and then not placed in the row — the field simply did not
exist on screen. Now between QTH and the locator, where it was meant to go.

Left column 210 → 230px, and Comment and Note move onto ONE line side by side:
two fields that are usually a few words each were taking two full rows of the
entry strip. That frees a row for whatever goes there next.
2026-08-13 11:04:23 +02:00
rouggy 741364bf99 feat(entry): narrower left column, and a State field
Name, Band, Mode and Country go from 300px to 210px, which moves QTH, Comment
and Note left by the same amount. The width is set in TWO places — the Name row
and the Band/Mode/Country stack below it — and they have to stay equal or the
two rows stop lining up, so both were changed together.

State goes between QTH and the locator: it is part of the same "where is this
station" reading, and it is what WAS and the US county work key off. Narrow,
since it holds two or three characters, and upper-cased on the way in like the
other coded fields.

The Name label in this layout was hardcoded English while its twin went through
t(); fixed while here.
2026-08-13 10:56:52 +02:00
rouggy d0f06d9670 fix(lookup): QRZ Name is the first name, not first + surname
A log greets an operator; it does not address an envelope. "Robert Smith"
filled the Name field with something no one would ever send on the air, and it
is the first name that gets used when the contact is answered.

So fname alone, with the surname kept only as a last resort for a record that
has no first name at all — better a surname than an empty field. The nickname
option now falls back to the first name too, which is what it should have done
from the start.

joinName went with it: nothing composed a name any more.
2026-08-13 10:53:13 +02:00
rouggy 8e49d37cbd feat(lookup): optional QRZ nickname as the logged name
QRZ publishes <nickname> — the name an operator goes BY on the air — and
OpsLog was composing fname + name instead. "Bob" is what belongs in a log;
"Robert J Smith" is what belongs on a licence.

QRZ only, and deliberately so: HamQTH's <nick> already fills the Name field
that way, so the same switch there would toggle a behaviour it has no way to
turn off.

A published nickname is optional, so an empty one falls through to the
registered name. That is the whole point of it being a fallback rather than a
swap, and it is what the test pins — a blank nickname must never blank the
name.
2026-08-13 10:49:52 +02:00
rouggy b2382a6135 feat(cluster): configurable spot lifetime
Spots were bounded by COUNT alone, so on a quiet band a two-hour-old spot sat
on the band map looking like something to chase. Settings → DX Cluster now
takes a lifetime: presets at 5/10/15/30/60 minutes, or any value up to twelve
hours, and 0 keeps the old behaviour.

Spots are REMOVED from the shared list rather than hidden at render. The
cluster list, every band map and the counts all read that one array, so pruning
it once is what makes the setting mean the same thing in every view — the
lesson already paid for when the band map ignored the cluster's filters. It
also gives the memory back.

A spot whose timestamp will not parse is never dropped: an unreadable stamp is
a reason to distrust the clock, not to throw away the spot.

Swept every 30 seconds — close enough that a 5-minute setting is honoured, and
invisible next to the spot stream. Clamped in the backend as well as the UI.
2026-08-13 10:38:08 +02:00
rouggy f8fb57210f fix(cluster): hide worked must not hide what is new
Reported on BH2SWB and 4X9AA: both flagged NEW PFX, neither ever worked, both
vanished the moment "hide worked" went on.

The predicate hid a spot when worked_call OR status === 'worked' — and that
second one is the ENTITY's status, not the callsign's. So any spot in an entity
worked years ago disappeared, however new it was for something else.

The extra markers are orthogonal to the entity status; the band map already
says so in as many words. They now win: a new prefix, county, grid or park is
never hidden, whatever the entity says. A worked entity that is new for nothing
is still hidden, which is what the filter is for.

Extracted to spotIsWorked in lib/spotDisplay, beside the other rule the cluster
and band map share, rather than left inline in a predicate that has already
grown once.

This repo has no frontend test runner, so this is verified by build and reading
rather than by a test.
2026-08-13 10:34:15 +02:00
rouggy 8762131248 chore: open 0.25.0 2026-08-13 10:15:39 +02:00
rouggy e5f79b18c2 chore: release v0.24.9 2026-08-13 10:15:02 +02:00
rouggy 1605e30f60 feat(appearance): four QSL categories, each scoped to chosen channels
Replaces the four fixed rules with the model Logger32 uses and the operator
asked for: Worked / Confirmed / QSL sent / To be sent, and inside each, which
channels count — paper QSL, LoTW, eQSL, QRZ.com. No ticks means every channel,
because a rule the operator has not narrowed must not quietly become a rule
about nothing.

"To be sent" is FIRST in the order, and that is the substantive decision here.
A contact can be confirmed on LoTW and still owe a paper card; the colour an
operator scans for is the one meaning "something is still owed". Placed after
"confirmed" that row goes green and the card never gets printed.

"Worked" is the catch-all — nothing sent, nothing requested, nothing back — and
is off by default, since turning it on paints every remaining row.

R and Q both count as owed: ADIF says requested and queued, and both mean the
card has not gone out.
2026-08-13 09:46:52 +02:00
rouggy 6aff322be6 chore(spe): make a failed power-on say where it failed
"The ON button does nothing" has three different causes — the modem-line pulse
was refused, the pulse went out and the amplifier ignored it, or the amplifier
woke and the UI missed it — and the log could not separate them: it recorded
one combined error and never said whether the amp came up.

RTS and DTR are now reported separately (not every USB-serial chip honours the
modem lines, and some refuse them without saying so), alongside the model and
transport. A watcher then logs whether the amplifier answered within 15
seconds, off the caller's goroutine so the click still returns at once.

No change to the wake sequence itself, which is the part that took a long time
to get right on the 1.3K-FA.
2026-08-13 09:29:53 +02:00
rouggy ed3c132f70 chore(udp): log the ADIF record, not just its size
"Was the grid in what WSJT-X sent, or did OpsLog put it there?" is the first
question asked when a contact is logged in the wrong square, and a byte count
cannot answer it. An expedition logged at its licence holder's home QTH stayed
undiagnosable for exactly that reason.

One line per QSO, around 280 bytes, whitespace collapsed so the record sits on
a single line.
2026-08-13 09:13:27 +02:00
rouggy 385e8c4c86 fix: log the grid the station sent, and show the SPE going off first press
Grid: RI0FA transmitted QN35 all evening and was logged with its licence
holder's home square. WSJT-X's logged ADIF usually carries no GRIDSQUARE, so
the lookup was the only source left — and QRZ/HamQTH describe where an operator
LIVES, which for an expedition is the wrong side of the planet.

The square heard on the air is now applied before the lookup runs, so
refineGrid has something to defend. It still upgrades a 4-character square to a
6-character one from the same field, and still refuses a finer square from a
different field.

SPE: decodeCSV marks the client connected on every frame it parses, and the
poll goroutine can be mid-read while PowerOff runs. The frame from a second ago
landed after PowerOff had marked the amp offline and put it straight back,
which is why OFF had to be pressed twice.

Frames are ignored for three seconds after the off key goes out — the window is
opened before the key is sent, so nothing already travelling can beat it. Time
bounded rather than latched: an amp switched back on at its own front panel has
to reappear without being told.
2026-08-13 09:08:19 +02:00
rouggy 61e5736f1e fix(lotw): stop reporting suppressed QSOs as uploaded
Reported: ten fresh contacts upload and appear on LoTW; twenty older ones,
bulk-edited to exactly the same LOTW_SENT/RCVD state, are accepted by OpsLog
and never arrive. The operator's reading was that a failed attempt could not be
overridden. It is simpler and worse than that.

TQSL's exit codes, from its own cmdline documentation:

	 8  NO QSOs were processed — already uploaded OR OUT OF DATE RANGE
	 9  some processed, some ignored — same two reasons
	14  some already uploaded, the rest signed

8 and 9 were both read as plain success. So on 8 — nothing uploaded at all —
OpsLog announced "already uploaded (duplicate)" and stamped every selected
contact as sent. They were never on LoTW and now looked as if they were, which
is exactly the reported symptom, and it is not recoverable by re-uploading
because the operator has no reason to try.

"Out of date range" is the cause that bites here: a contact older than the
callsign certificate's validity is silently left out. Older QSOs failing while
today's succeed is the signature.

Now: 8 is a failure and nothing is stamped — a duplicate left at "R" is
harmless and will be refused again, whereas a contact wrongly marked sent is
one nobody will look at twice. 9 and 14 succeed but carry Ignored, and the
caller says so in the console and a toast.

TQSL's own sentence ("20 QSO records are out of date range") is captured and
shown. It was being read and thrown away, and it is the whole answer to "why is
my contact not on LoTW".
2026-08-13 08:55:29 +02:00
rouggy 6ca808a6c9 fix(bandmap): the docked map was missing the LoTW prop
Two BandMap instances, and cleaning up a duplicated attribute took the prop off
the docked one as well as the copy. The multi-band tab drew the badge; the map
beside the entry form — the one actually in front of the operator — did not.
2026-08-13 08:46:29 +02:00
rouggy f698096f53 feat(bandmap): mark LoTW users, with the badge the cluster already uses
Logger32 draws a green square for a LoTW user and an X for a worked one. The
square is the part worth copying; the way it is drawn is not.

Colour on this map is already spoken for — it carries the entity status, and
the left edge of each pill stacks the new-park / new-county markers. Adding a
green fill for LoTW would put two unrelated meanings on one channel, and an
operator would have to work out which green meant what. So it is the same "L"
badge the cluster list draws, in the same muted blue, for the reason written
there: whether a station uploads to LoTW says nothing about whether the spot is
worth chasing.

Worked stations already read as worked here — the pill goes grey and the
status markers speak — so no X is needed.

Switchable in Settings → Appearance, and on by default: a `configured` flag
distinguishes "saved with this off" from "saved before the option existed", so
turning it off sticks instead of being undone by the next default.
2026-08-13 08:41:38 +02:00
rouggy ef628e066a fix(bandmap): follow the cluster's filters
The band map received the raw spot stream filtered by band alone, so none of
the cluster's filters reached it: switching on "LoTW users only" changed the
list and left the panadapter showing everyone. The same was true of hide
worked, the spotter continent, and the status and mode chips.

The predicate is extracted and shared rather than copied — two views of one
spot stream disagreeing about the same spot is the fault lib/spotDisplay
already exists to prevent, and a second copy would have drifted the first time
a filter was added.

The BAND filter is deliberately excluded from the shared part: a band map's
band is its filter, and applying the cluster's would empty every map but one.
2026-08-13 08:26:00 +02:00
rouggy 4ffdfc2548 feat(appearance): left stripe by default, with fill and strength as choices
The first version filled the whole row at 24%, and in a real log that meant
every row was painted: nearly every contact has SOME QSL state, so colour was
present everywhere and stopped being information — a striped background with
the data behind it.

The default is now a 3px stripe down the left edge. Same signal, nothing lost
to read it. A filled row is still offered, with a strength slider, for
operators who want the block — and the rule cards in Settings preview whichever
is chosen, so the decision is made by looking rather than by imagining.

Drawn as an inset shadow rather than a border: a border would shift the cells
three pixels on coloured rows only, and the columns would stop lining up.

Style and strength are normalised rather than rejected — a value out of range
is a slider that got away, not a reason to reset the operator's colours.
2026-08-13 01:42:08 +02:00
rouggy 83e7727aab chore: open 0.24.9 2026-08-13 01:26:47 +02:00
99 changed files with 7697 additions and 19621 deletions
+63
View File
@@ -0,0 +1,63 @@
package main
import "testing"
// The coupling is a SET, not a global switch.
//
// A station can run a combiner pair AND a third amplifier that has nothing to
// do with it — two SPE on the combiner, a PowerGenius on another antenna. A
// global flag would send that third one into OPERATE alongside them.
func TestAmpTargetsFollowTheGroup(t *testing.T) {
a := &App{}
a.ampInsts = map[string]*ampInst{"spe1": {}, "spe2": {}, "pgxl": {}}
group := []string{"spe1", "spe2"}
// A member commands the whole group, itself first.
got := a.ampTargets("spe2", group)
if len(got) != 2 || got[0] != "spe2" || got[1] != "spe1" {
t.Errorf("member = %v, want [spe2 spe1] — the clicked one first", got)
}
// The amplifier OUTSIDE the group keeps its buttons to itself.
if got := a.ampTargets("pgxl", group); len(got) != 1 || got[0] != "pgxl" {
t.Errorf("outsider = %v, want just [pgxl]", got)
}
// No group at all: everyone is on their own.
if got := a.ampTargets("spe1", nil); len(got) != 1 || got[0] != "spe1" {
t.Errorf("no group = %v, want just [spe1]", got)
}
// A group remembering an amplifier that is gone must not carry it: it would
// fail the command for a member that no longer exists.
if got := a.ampTargets("spe1", []string{"spe1", "deleted"}); len(got) != 1 || got[0] != "spe1" {
t.Errorf("stale member = %v, want it dropped", got)
}
}
// One amplifier coupled to itself is not a group — storing it would make every
// command fan out to a single member for ever, which is just noise.
func TestLinkedAmpsNeedsTwo(t *testing.T) {
for _, tc := range []struct {
in []string
want int
}{
{[]string{"a", "b"}, 2},
{[]string{"a"}, 0},
{[]string{" ", "a"}, 0}, // blanks are not members
{nil, 0},
} {
clean := make([]string, 0, len(tc.in))
for _, id := range tc.in {
if id != "" && id != " " {
clean = append(clean, id)
}
}
if len(clean) < 2 {
clean = nil
}
if len(clean) != tc.want {
t.Errorf("SetLinkedAmps(%v) would keep %d, want %d", tc.in, len(clean), tc.want)
}
}
}
+640 -30
View File
File diff suppressed because it is too large Load Diff
+162
View File
@@ -748,3 +748,165 @@ func sampleQSO() qso.QSO {
QSLMsg: "TNX FB QSO — 73!",
}
}
// QSLForeignTemplate is one card design belonging to ANOTHER profile, offered
// for copying into the active one.
type QSLForeignTemplate struct {
ID int64 `json:"id"`
Name string `json:"name"`
ProfileID int64 `json:"profile_id"`
ProfileName string `json:"profile_name"`
}
// QSLListOtherProfileTemplates lists the designs the ACTIVE profile cannot see.
//
// A second profile is usually the same operator with a different rig or a
// different locator — same callsign, same cards. Redrawing a design because the
// antenna changed is work nobody should have to do, and the designs a profile
// already sees (its own, and the shared ones) are deliberately left out: they
// are not something to copy.
func (a *App) QSLListOtherProfileTemplates() ([]QSLForeignTemplate, error) {
if a.qslTemplates == nil || a.profiles == nil {
return nil, fmt.Errorf("db not initialized")
}
active := int64(-1)
if p, err := a.profiles.Active(a.ctx); err == nil {
active = p.ID
}
names := map[int64]string{}
if list, err := a.ListProfiles(); err == nil {
for _, p := range list {
names[p.ID] = p.Name
}
}
all, err := a.qslTemplates.List(a.ctx)
if err != nil {
return nil, err
}
out := []QSLForeignTemplate{}
for _, r := range all {
// Shared designs (no profile) already appear in every profile's list.
if r.ProfileID == nil || *r.ProfileID == active {
continue
}
out = append(out, QSLForeignTemplate{
ID: r.ID, Name: r.Name, ProfileID: *r.ProfileID,
ProfileName: firstNonEmptyStr(names[*r.ProfileID], fmt.Sprintf("profile %d", *r.ProfileID)),
})
}
return out, nil
}
// QSLCopyTemplateToActiveProfile duplicates another profile's design into the
// active one and returns the new id.
//
// A COPY, not a move or a share. The original profile keeps its design
// untouched, and the copy is free to diverge — a second profile usually exists
// because something differs, and that something often ends up on the card.
func (a *App) QSLCopyTemplateToActiveProfile(id int64) (int64, error) {
if a.qslTemplates == nil {
return 0, fmt.Errorf("db not initialized")
}
src, err := a.qslTemplates.Get(a.ctx, id)
if err != nil {
return 0, err
}
// The stored document references photos by NAME, relative to the template's
// own asset folder — so copying the JSON alone would point the new design at
// files that are not in its folder, and the save would fail validation.
//
// The files are copied too, giving the duplicate its own folder. Sharing the
// source's would mean deleting one design silently emptied the other.
rec := qslcard.Record{Name: src.Name + " (copy)", JSON: src.JSON}
if p, e := a.profiles.Active(a.ctx); e == nil {
rec.ProfileID = &p.ID
}
// Saved first: a new template needs its id before it can own a folder.
if err := a.qslTemplates.Save(a.ctx, &rec); err != nil {
return 0, err
}
srcDir := qslcard.TemplateDir(a.qslDir(), id)
dstDir := qslcard.TemplateDir(a.qslDir(), rec.ID)
// A design with no pictures at all has no folder, and that is not a failure.
// Anything else IS: this used to be written as "ignore os.IsNotExist", which
// also swallowed every ENOENT raised while copying — so a failed copy looked
// like a design that had nothing to copy, and the operator got "hero photo
// not found" with no clue why.
if _, statErr := os.Stat(srcDir); statErr == nil {
if err := copyDirContents(srcDir, dstDir); err != nil {
// Roll back rather than leave a design whose pictures are missing.
_ = a.qslTemplates.Delete(a.ctx, rec.ID)
_ = qslcard.RemoveTemplateDir(a.qslDir(), rec.ID)
return 0, fmt.Errorf("copy template assets: %w", err)
}
}
// Every failure from here rolls back BOTH halves: deleting only the row would
// leave the copied pictures on disk under an id nothing refers to.
rollback := func() {
_ = a.qslTemplates.Delete(a.ctx, rec.ID)
_ = qslcard.RemoveTemplateDir(a.qslDir(), rec.ID)
}
t, err := qslcard.Parse([]byte(rec.JSON))
if err != nil {
rollback()
return 0, err
}
if err := qslcard.Validate(t, qslcard.PhotoExistsIn(dstDir)); err != nil {
rollback()
return 0, fmt.Errorf("copied design is incomplete: %w", err)
}
applog.Printf("qsl: copied template %q (id %d) into the active profile as %q (id %d)",
src.Name, id, rec.Name, rec.ID)
return rec.ID, nil
}
// copyQSLTemplatesToProfile duplicates one profile's QSL designs into another,
// PICTURES INCLUDED.
//
// This was an INSERT … SELECT, which cloned the rows and nothing else. A design
// references its photos by name, relative to its own asset folder, so every
// duplicated design pointed at a folder that did not exist: no thumbnail in the
// designer, and nothing to print. The rows looked right, which is why it went
// unnoticed — the damage is entirely on disk.
//
// Row by row rather than in one statement, because each new design needs its id
// before it can own a folder. A design whose files cannot be copied is dropped
// rather than kept empty: an operator who sees the design listed will believe
// it works.
func (a *App) copyQSLTemplatesToProfile(fromProfile, toProfile int64) error {
if a.qslTemplates == nil {
return fmt.Errorf("db not initialized")
}
all, err := a.qslTemplates.List(a.ctx)
if err != nil {
return err
}
for _, src := range all {
if src.ProfileID == nil || *src.ProfileID != fromProfile {
continue
}
rec := qslcard.Record{Name: src.Name, JSON: src.JSON, IsDefault: src.IsDefault}
to := toProfile
rec.ProfileID = &to
if err := a.qslTemplates.Save(a.ctx, &rec); err != nil {
return err
}
srcDir := qslcard.TemplateDir(a.qslDir(), src.ID)
if _, statErr := os.Stat(srcDir); statErr != nil {
continue // a design with no pictures at all — nothing to carry over
}
if err := copyDirContents(srcDir, qslcard.TemplateDir(a.qslDir(), rec.ID)); err != nil {
_ = a.qslTemplates.Delete(a.ctx, rec.ID)
_ = qslcard.RemoveTemplateDir(a.qslDir(), rec.ID)
return fmt.Errorf("copy assets of %q: %w", src.Name, err)
}
}
return nil
}
func firstNonEmptyStr(a, b string) string {
if strings.TrimSpace(a) != "" {
return a
}
return b
}
+78 -8
View File
@@ -19,31 +19,66 @@ 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.
//
// 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.
Channels []string `json:"channels"`
}
// The QSL channels a rule can be scoped to.
var rowColorChannels = []string{"qsl", "lotw", "eqsl", "qrz"}
// RowColorSettings is the whole appearance block.
type RowColorSettings struct {
Enabled bool `json:"enabled"`
// Style is how the colour is shown: "bar" paints a stripe down the left edge,
// "tint" washes the row, "both" does each.
//
// A bar is the default because a filled row is a poor signal in a log where
// nearly every contact has SOME QSL state: colour that is always present
// stops being information and becomes a striped background, with the data
// behind it. The stripe says the same thing and costs nothing to read.
Style string `json:"style"`
// Intensity is the tint strength in percent. Only used by "tint"/"both".
Intensity int `json:"intensity"`
// BandMapLotw marks stations that upload to LoTW on the band map, with the
// same "L" badge the cluster list uses — one visual vocabulary across the two
// views rather than a second invention.
BandMapLotw bool `json:"bandmap_lotw"`
// Configured distinguishes "saved with this off" from "saved before the
// option existed", so a new marker can default ON without silently turning
// itself back on for an operator who switched it off.
Configured bool `json:"configured"`
Rules []RowColorRule `json:"rules"`
}
// The rule ids, in priority order. The frontend matches on these and holds the
// labels, so a translated name never has to travel through the settings.
// The four categories, in the order they are tested — first match wins.
//
// "To send" comes FIRST on purpose. A contact can be confirmed on LoTW and
// still owe a paper card, and the colour an operator scans for is the one that
// means "there is something left to do here". Put after "confirmed", that row
// would go green and the card would never be printed.
//
// "Worked" is the catch-all: a contact with nothing sent, nothing asked for and
// nothing back. Off by default — with it on, every remaining row is painted.
var rowColorOrder = []string{
"confirmed_lotw", // LoTW confirmation received
"confirmed_paper", // card or eQSL received
"sent_waiting", // sent by some route, nothing back yet
"to_send", // a card is requested / queued and has not gone out
"to_send", // requested or queued on a watched channel, not gone out
"confirmed", // a watched channel has a confirmation back
"sent", // gone out on a watched channel, nothing back yet
"worked", // none of the above
}
// Defaults: green for done, amber for waiting, blue for owed. Deliberately
// muted — they are composited at low opacity over a dark grid, and a saturated
// value there reads as an error state rather than a status.
var rowColorDefaults = map[string]string{
"confirmed_lotw": "#16a34a",
"confirmed_paper": "#0ea5e9",
"sent_waiting": "#f59e0b",
"to_send": "#a855f7",
"confirmed": "#16a34a",
"sent": "#f59e0b",
"worked": "#64748b",
}
// hexColor guards what reaches the stylesheet. The value is interpolated into a
@@ -56,13 +91,48 @@ func normRowColors(s RowColorSettings) RowColorSettings {
for _, r := range s.Rules {
byID[r.ID] = r
}
out := RowColorSettings{Enabled: s.Enabled}
out := RowColorSettings{
Enabled: s.Enabled, Style: s.Style, Intensity: s.Intensity,
BandMapLotw: s.BandMapLotw, Configured: true,
}
if !s.Configured {
out.BandMapLotw = true // new option, on unless the operator says otherwise
}
switch out.Style {
case "bar", "tint", "both":
default:
out.Style = "bar"
}
// Clamped rather than rejected: the value only shapes a colour-mix, and a
// number outside the range is a slider that got away, not a fault worth
// resetting the operator's whole choice for.
if out.Intensity < 5 {
out.Intensity = 12
} else if out.Intensity > 45 {
out.Intensity = 45
}
ok := map[string]bool{}
for _, c := range rowColorChannels {
ok[c] = true
}
for _, id := range rowColorOrder {
r := byID[id]
r.ID = id
if !hexColor.MatchString(strings.TrimSpace(r.Color)) {
r.Color = rowColorDefaults[id]
}
// Keep only channels we know, in the canonical order, de-duplicated.
want := map[string]bool{}
for _, c := range r.Channels {
want[strings.ToLower(strings.TrimSpace(c))] = true
}
chans := []string{}
for _, c := range rowColorChannels {
if want[c] {
chans = append(chans, c)
}
}
r.Channels = chans
out.Rules = append(out.Rules, r)
}
return out
+73 -10
View File
@@ -6,8 +6,8 @@ import "testing"
// that is not plainly a hex colour has to be refused rather than passed on.
func TestRowColorsRefuseAnythingButHex(t *testing.T) {
in := RowColorSettings{Enabled: true, Rules: []RowColorRule{
{ID: "confirmed_lotw", Color: "#123abc", Enabled: true},
{ID: "sent_waiting", Color: "red; background:url(x)", Enabled: true},
{ID: "confirmed", Color: "#123abc", Enabled: true},
{ID: "sent", Color: "red; background:url(x)", Enabled: true},
{ID: "to_send", Color: "", Enabled: true},
}}
got := normRowColors(in)
@@ -16,11 +16,11 @@ func TestRowColorsRefuseAnythingButHex(t *testing.T) {
for _, r := range got.Rules {
byID[r.ID] = r
}
if byID["confirmed_lotw"].Color != "#123abc" {
t.Errorf("a valid colour was rewritten: %q", byID["confirmed_lotw"].Color)
if byID["confirmed"].Color != "#123abc" {
t.Errorf("a valid colour was rewritten: %q", byID["confirmed"].Color)
}
if byID["sent_waiting"].Color != rowColorDefaults["sent_waiting"] {
t.Errorf("an injection attempt survived: %q", byID["sent_waiting"].Color)
if byID["sent"].Color != rowColorDefaults["sent"] {
t.Errorf("an injection attempt survived: %q", byID["sent"].Color)
}
if byID["to_send"].Color != rowColorDefaults["to_send"] {
t.Errorf("an empty colour was kept: %q", byID["to_send"].Color)
@@ -34,7 +34,7 @@ func TestRowColorsKeepPriorityOrder(t *testing.T) {
// Saved in a jumbled order, as a hand-edited settings row could be.
got := normRowColors(RowColorSettings{Rules: []RowColorRule{
{ID: "to_send", Color: "#111111"},
{ID: "confirmed_lotw", Color: "#222222"},
{ID: "confirmed", Color: "#222222"},
}})
if len(got.Rules) != len(rowColorOrder) {
t.Fatalf("got %d rules, want every one present", len(got.Rules))
@@ -44,8 +44,71 @@ func TestRowColorsKeepPriorityOrder(t *testing.T) {
t.Errorf("rule %d is %q, want %q", i, got.Rules[i].ID, id)
}
}
// The saved colours survived the reordering.
if got.Rules[0].Color != "#222222" {
t.Errorf("confirmed_lotw lost its colour: %q", got.Rules[0].Color)
// The saved colours survived the reordering: each stayed with its own rule.
byID := map[string]string{}
for _, r := range got.Rules {
byID[r.ID] = r.Color
}
if byID["to_send"] != "#111111" || byID["confirmed"] != "#222222" {
t.Errorf("colours moved between rules: %v", byID)
}
}
// Style and strength are normalised, not rejected: they only shape a colour, and
// a value that got away is a slider, not a fault worth resetting the operator's
// whole choice for.
func TestRowColorsNormaliseStyleAndIntensity(t *testing.T) {
for _, tc := range []struct {
inStyle string
inPct int
wantStyle string
wantPct int
}{
{"bar", 12, "bar", 12},
{"tint", 30, "tint", 30},
{"both", 45, "both", 45},
{"", 0, "bar", 12}, // never configured
{"wallpaper", 12, "bar", 12}, // not a style we draw
{"tint", 900, "tint", 45}, // clamped, not reset
{"tint", -5, "tint", 12},
} {
got := normRowColors(RowColorSettings{Style: tc.inStyle, Intensity: tc.inPct})
if got.Style != tc.wantStyle || got.Intensity != tc.wantPct {
t.Errorf("(%q,%d) -> (%q,%d), want (%q,%d)",
tc.inStyle, tc.inPct, got.Style, got.Intensity, tc.wantStyle, tc.wantPct)
}
}
}
// Channels are normalised to the canonical order, and anything unknown is
// dropped. Empty stays empty, because empty means "every channel" — a rule the
// operator has not narrowed must not silently become a rule about nothing.
func TestRowColorChannelsNormalise(t *testing.T) {
got := normRowColors(RowColorSettings{Rules: []RowColorRule{
{ID: "confirmed", Color: "#111111", Channels: []string{"LOTW", "pigeon", "qsl", "lotw"}},
{ID: "sent", Color: "#222222"},
}})
byID := map[string][]string{}
for _, r := range got.Rules {
byID[r.ID] = r.Channels
}
if len(byID["confirmed"]) != 2 || byID["confirmed"][0] != "qsl" || byID["confirmed"][1] != "lotw" {
t.Errorf("confirmed channels = %v, want [qsl lotw] — canonical order, deduped, unknown dropped", byID["confirmed"])
}
if len(byID["sent"]) != 0 {
t.Errorf("sent channels = %v, want empty (meaning every channel)", byID["sent"])
}
}
// The order IS the priority, and "to send" leads. A contact confirmed on LoTW
// that still owes a paper card must read as owing the card — put after
// "confirmed" it would go green and never be printed.
func TestToSendOutranksConfirmed(t *testing.T) {
got := normRowColors(RowColorSettings{})
if got.Rules[0].ID != "to_send" {
t.Errorf("first rule is %q, want to_send", got.Rules[0].ID)
}
if got.Rules[len(got.Rules)-1].ID != "worked" {
t.Errorf("last rule is %q, want worked as the catch-all", got.Rules[len(got.Rules)-1].ID)
}
}
+16 -7
View File
@@ -138,7 +138,10 @@ func (a *App) startBandOpenFeed() {
a.clearBandOpenings()
}
chaseGrids := a.gridStore != nil
if !s.Enabled && !chaseGrids {
chaseNew := a.chaseNewEnabled()
// Three consumers, one feed. Any one of them is reason enough to bring it up,
// and turning one off must not cut the others loose.
if !s.Enabled && !chaseGrids && !chaseNew {
return
}
// Every spot is measured from the operator's position. Without one there is
@@ -149,10 +152,11 @@ func (a *App) startBandOpenFeed() {
return
}
// Grid chasing wants every band; the opening watch wants its four. "+" is the
// MQTT single-level wildcard, so one subscription per square covers the lot.
// Grid chasing and new-chasing want every band; the opening watch wants its
// four. "+" is the MQTT single-level wildcard, so one subscription per square
// covers the lot.
bands := s.Bands
if chaseGrids {
if chaseGrids || chaseNew {
bands = []string{"+"}
}
// Filter at the BROKER on the receiver's square rather than receiving the
@@ -168,8 +172,13 @@ func (a *App) startBandOpenFeed() {
onGrid = func(call, grid string) { a.rememberDecodeGrid(call, grid, gridcache.SourceMQTT) }
}
var onSpot func(pskr.Spot)
if s.Enabled {
switch {
case s.Enabled && chaseNew:
onSpot = func(sp pskr.Spot) { a.feedBandOpen(sp); a.feedChaseNew(sp) }
case s.Enabled:
onSpot = a.feedBandOpen
case chaseNew:
onSpot = a.feedChaseNew
}
a.pskr = pskr.New(pskr.Config{
@@ -195,8 +204,8 @@ func (a *App) startBandOpenFeed() {
applog.Printf("pskr: feed did not start: %v", err)
return
}
applog.Printf("pskr: feed up — bands %v, %d receiver squares (openings=%v, grids=%v)",
bands, len(rxGrids), s.Enabled, chaseGrids)
applog.Printf("pskr: feed up — bands %v, %d receiver squares (openings=%v, grids=%v, chase-new=%v)",
bands, len(rxGrids), s.Enabled, chaseGrids, chaseNew)
}
// feedBandOpen hands one PSK Reporter decode to the detector.
-18902
View File
File diff suppressed because it is too large Load Diff
+98
View File
@@ -1,4 +1,102 @@
[
{
"version": "0.25.2",
"date": "",
"en": [
"Send Spot: the comment now carries the award references after the mode — the ones you assigned (POTA, SOTA, IOTA…), not the DXCC, zone and prefix every reader works out from the callsign. A self-spot carries your OWN activation references.",
"Modes: a fresh install now starts with SSB, CW, FT8, FT4, FT2, RTTY, PSK31 and FM. AM and DIGITALVOICE stay in the available list but are no longer selected by default.",
"Chase new: a panel listing the stations PSK Reporter is hearing within about 300 km of you that are new against your log — on FT8, FT4, FT2, PSK31 and RTTY, and only on the bands you have selected. One badge per row, the most valuable first (entity, band, mode, slot, prefix, square), with a filter for each, a toolbar button to show it and a cross to close it. Click a row to put the callsign in the entry and tune the rig.",
"QSL Manager, paper QSL: the route is set per direction — bureau, direct or electronic, beside the sent status and beside the received one — and applies to the whole selection at once.",
"Connections (was “UDP integrations”): two new outbound services. “WSJT-X logged QSO” announces each contact on the WSJT-X UDP interface, both messages WSJT-X itself sends, for loggers that listen there rather than for plain-text ADIF (Logger32 among them). “Custom message” lets you choose what fires it — band change, QSO logged, rotator command, callsign lookup — and what it says, sent as a UDP datagram or an HTTP request.",
"Connections: everything sent is now written to the log. Outbound messages say where they went and, for custom ones, what they contained; a message that came out empty says so instead of vanishing; a password in a URL is hidden; and an ADIF listener sharing a port with a WSJT source now names that traffic once rather than a line per decode.",
"Station relays: new “HTTP relay” device for home-made and generic switches — an ON and an OFF URL, either one pattern with {relay} or one pair per relay, with a channel count from 1 to 16. It then follows the same per-band rules as the named boards.",
"Serial ports: a port claimed by two devices in the Windows port map was listed twice in every port dropdown, and showed as “COM3COM3”. Listed once now, and in natural order — COM4 between COM3 and COM8, not after COM9.",
"Motorized antenna: an antenna that lost its serial port stopped answering with nothing at all in the log, and a controller that settled somewhere other than where it was sent looked exactly the same. Both now say what happened, once.",
"Appearance: the Sahara theme is lighter, parchment rather than deep sand, with a terracotta accent."
],
"fr": [
"Envoi de spot : le commentaire porte désormais les références de diplôme après le mode — celles que vous avez attribuées (POTA, SOTA, IOTA…), pas le DXCC, la zone et le préfixe que chacun déduit de lindicatif. Un auto-spot porte VOS références dactivation.",
"Modes : une installation neuve démarre avec SSB, CW, FT8, FT4, FT2, RTTY, PSK31 et FM. AM et DIGITALVOICE restent dans la liste disponible mais ne sont plus sélectionnés par défaut.",
"Chasse au nouveau : un panneau listant les stations que PSK Reporter entend à moins de 300 km de chez vous et qui sont nouvelles par rapport à votre log — en FT8, FT4, FT2, PSK31 et RTTY, et seulement sur les bandes que vous avez sélectionnées. Une seule indication par ligne, la plus précieuse dabord (entité, bande, mode, créneau, préfixe, carré), avec un filtre pour chacune, un bouton dans la barre pour lafficher et une croix pour le fermer. Un clic met lindicatif en saisie et accorde la radio.",
"Gestionnaire QSL, QSL papier : la voie se règle par sens — bureau, direct ou électronique, à côté du statut envoyé et à côté du statut reçu — et sapplique à toute la sélection dun coup.",
"Connexions (ex-« Intégrations UDP ») : deux nouvelles sorties. « QSO enregistré WSJT-X » annonce chaque contact sur linterface UDP WSJT-X, les deux messages que WSJT-X émet lui-même, pour les loggers qui écoutent là plutôt que lADIF en texte brut (Logger32 entre autres). « Message personnalisé » vous laisse choisir ce qui la déclenche — changement de bande, QSO enregistré, commande de rotor, recherche dindicatif — et ce quelle dit, en datagramme UDP ou en requête HTTP.",
"Connexions : tout ce qui part est désormais inscrit au journal. Les messages sortants indiquent leur destination et, pour les personnalisés, leur contenu ; un message rendu vide le signale au lieu de disparaître ; un mot de passe dans une URL est masqué ; et un écouteur ADIF partageant un port avec une source WSJT nomme ce trafic une fois au lieu d’écrire une ligne par décodage.",
"Relais de station : nouveau périphérique « Relais HTTP » pour les commutateurs faits main ou génériques — une URL ON et une URL OFF, soit un modèle avec {relay}, soit une paire par relais, avec un nombre de voies de 1 à 16. Il suit ensuite les mêmes règles par bande que les cartes reconnues.",
"Ports série : un port revendiqué par deux périphériques dans la table Windows apparaissait en double dans toutes les listes, et saffichait « COM3COM3 ». Une seule fois désormais, et dans lordre naturel — COM4 entre COM3 et COM8, pas après COM9.",
"Antenne motorisée : une antenne ayant perdu son port série cessait de répondre sans rien laisser dans le journal, et un contrôleur qui se fixait ailleurs que là où on lavait envoyé ressemblait exactement à ça. Les deux disent maintenant ce qui sest passé, une fois.",
"Apparence : le thème Sahara s’éclaircit, parchemin plutôt que sable profond, avec un accent terre cuite."
]
},
{
"version": "0.25.1",
"date": "",
"en": [
"Amplifiers: tick the ones sharing a combiner and ON, OFF and OPERATE act on all of them at once. Each keeps its own meters.",
"Shared CAT: JTDX and WSJT-X no longer get an error for turning split off or setting the transmit mode — which made JTDX abandon a transmission — and the wire trace now logs every exchange.",
"QSL designer: a card design can be copied from another profile, pictures included, and duplicating a profile now carries its designs pictures too instead of leaving cards that cannot be printed.",
"Appearance: new Sahara theme, warm sand tones for long sessions in daylight.",
"US counties: Connecticut returned the census planning regions, and San Francisco, Doña Ana, Baltimore city and several Alaska boroughs matched nothing at all. The cluster now shows the same county as the Info panel. Re-download the county database.",
"QSL: the manager (QSL_VIA) and the sending method (QSL_SENT_VIA / QSL_RCVD_VIA) are separate fields at last, as ADIF defines them. Imports keep both, exports write both, and a log where they were mixed is offered a correction at startup.",
"WinKeyer: the opening handshake follows K1ELs own sequence (RTS off, parser resync, echo test), which wakes keyers that stayed silent, and a port where nothing answers now says so instead of showing “connected”. A keyer that reboots when the port opens — K3NG and other Arduino builds — is waited out and remembered, so it opens directly next time."
],
"fr": [
"Amplificateurs : cochez ceux qui partagent un combineur et ON, OFF et OPERATE agissent sur tous à la fois. Chacun garde ses propres mesures.",
"CAT partagé : JTDX et WSJT-X ne reçoivent plus derreur en coupant le split ou en réglant le mode d’émission — ce qui faisait abandonner une transmission à JTDX — et la trace consigne désormais chaque échange.",
"Concepteur QSL : un design peut être copié depuis un autre profil, images comprises, et dupliquer un profil emporte aussi les images de ses designs au lieu de laisser des cartes impossibles à imprimer.",
"Apparence : nouveau thème Sahara, tons sable chauds pour les longues sessions en plein jour.",
"Comtés US : le Connecticut renvoyait les planning regions du recensement, et San Francisco, Doña Ana, Baltimore city et plusieurs districts dAlaska ne correspondaient à rien. Le cluster affiche maintenant le même comté que le panneau Info. Rechargez la base des comtés.",
"QSL : le manager (QSL_VIA) et le mode denvoi (QSL_SENT_VIA / QSL_RCVD_VIA) sont enfin deux champs distincts, comme le veut lADIF. Les imports gardent les deux, les exports les écrivent, et un log où ils étaient mélangés se voit proposer une correction au démarrage.",
"WinKeyer : la séquence douverture suit celle de K1EL (RTS bas, resynchronisation, test d’écho), ce qui réveille les manipulateurs muets, et un port où rien ne répond le dit au lieu dafficher « connecté ». Un manipulateur qui redémarre à louverture du port — K3NG et autres montages Arduino — est attendu puis mémorisé, pour souvrir directement ensuite."
]
},
{
"version": "0.25.0",
"date": "",
"en": [
"Cluster: \"Hide worked\" no longer hides a spot that is a new prefix, county, grid or park in an entity already worked.",
"DX Cluster: a spot lifetime can be set — 5, 10, 15 minutes or your own value — after which spots leave the list and the band maps.",
"Call lookup: QRZ.com now fills Name with the first name only, and optionally with the operator nickname instead.",
"Entry form: a narrower left column, State beside the locator, and a new line with County, CQ, ITU and DXCC.",
"Station Control: the short and long path headings are repeated under the compass, at a readable size and clickable.",
"Compact mode: the window now fits the entry strip instead of leaving a band of empty space below it.",
"HRDLog: an ON AIR option publishes your live frequency, mode and rig on hrdlog.net.",
"ADIF: the county is exported as STATE,COUNTY as the standard requires, and a county imported that way now fills the state too.",
"A /MM or /AM callsign no longer resolves to a country — RI1FJL/MM read as Franz Josef Land while the expedition was still sailing there."
],
"fr": [
"Cluster : « Masquer les contactés » ne masque plus un spot qui est un nouveau préfixe, comté, carré ou parc dans une contrée déjà faite.",
"Cluster DX : on peut fixer une durée de vie des spots — 5, 10, 15 minutes ou une valeur libre — au-delà de laquelle ils quittent la liste et les band maps.",
"Recherche d indicatif : QRZ.com remplit désormais Nom avec le seul prénom, et au choix avec le surnom de l opérateur.",
"Saisie : colonne de gauche plus étroite, État à côté du locator, et une nouvelle ligne Comté, CQ, ITU et DXCC.",
"Contrôle station : les azimuts court et long chemin sont repris sous la boussole, lisibles et cliquables.",
"Mode compact : la fenêtre épouse la bande de saisie au lieu de laisser une bande vide en dessous.",
"HRDLog : une option ON AIR publie ta fréquence, ton mode et ta radio en direct sur hrdlog.net.",
"ADIF : le comté est exporté sous la forme ÉTAT,COMTÉ comme l exige le standard, et un comté importé ainsi remplit aussi l état.",
"Un indicatif en /MM ou /AM ne se résout plus en pays — RI1FJL/MM affichait Franz Josef Land alors que l expédition faisait encore route."
]
},
{
"version": "0.24.9",
"date": "",
"en": [
"Appearance: row colouring now defaults to a left stripe, with a filled row and its strength offered as choices.",
"The band map now follows the cluster filters — LoTW only, spotter continent, hide worked, status and mode chips.",
"Band map: stations that upload to LoTW now carry the same L badge as the cluster list, switchable in Appearance.",
"LoTW: contacts TQSL leaves out — already uploaded, or outside the certificate date range — are no longer reported as uploaded.",
"FT8: a contact is logged with the grid the station actually sent, not the home square from QRZ — expeditions were logged in the wrong place.",
"SPE amplifier: switching it off is shown at once, instead of needing a second press of OFF.",
"Appearance: row colouring is now Worked / Confirmed / QSL sent / To be sent, each scoped to the channels you pick — paper, LoTW, eQSL, QRZ.com."
],
"fr": [
"Apparence : la coloration des lignes se fait par défaut sur une barre à gauche, la ligne remplie et son intensité restant proposées.",
"La band map suit désormais les filtres du cluster — LoTW seulement, continent du spotter, masquer les contactés, statuts et modes.",
"Band map : les stations qui utilisent LoTW portent le même badge L que la liste du cluster, activable dans Apparence.",
"LoTW : les contacts que TQSL écarte — déjà envoyés, ou hors de la plage de dates du certificat — ne sont plus annoncés comme envoyés.",
"FT8 : un contact est enregistré avec le locator réellement émis par la station, et non le carré du domicile depuis QRZ — les expéditions étaient logguées au mauvais endroit.",
"Amplificateur SPE : l extinction s affiche immédiatement, au lieu de demander un second appui sur OFF.",
"Apparence : la coloration des lignes devient Contacté / Confirmé / QSL envoyée / À envoyer, chacune limitée aux canaux choisis — papier, LoTW, eQSL, QRZ.com."
]
},
{
"version": "0.24.8",
"date": "",
+10
View File
@@ -9,6 +9,7 @@ import (
"os"
"sort"
"strings"
"unicode/utf8"
"hamlog/internal/award"
)
@@ -58,6 +59,15 @@ func main() {
sc.Scan() // header
for sc.Scan() {
line := sc.Text()
// The FIPS CSV is not reliably UTF-8, and the one county whose name is
// not ASCII (Doña Ana, NM) came through mangled once already — it landed
// in the reference as "NM/DO̱AANA", a code no log could ever match,
// silently costing that county for every operator. Refuse the row rather
// than emit a broken one.
if !utf8.ValidString(line) {
fmt.Fprintf(os.Stderr, "cntygen: skipping non-UTF-8 line: %q\n", line)
continue
}
parts := strings.SplitN(line, ",", 3)
if len(parts) < 3 {
continue
+203
View File
@@ -0,0 +1,203 @@
package main
// One-shot generator: emits internal/uls/ctcounty_gen.go, the Connecticut
// ZIP → legal county table. Not part of the build.
//
// Why it has to exist
// -------------------
// internal/uls resolves a US callsign to a county through GeoNames' ZIP table.
// The Census replaced Connecticut's eight counties with nine PLANNING REGIONS
// as county-equivalents in 2022, and GeoNames followed: 418 of Connecticut's
// 429 ZIPs now report "Capitol Region", "Lower Connecticut River Valley" and
// so on. CQ's USA-CA award did not follow, callbooks did not follow, and no
// operator's log did either — so every Connecticut station resolved to a name
// nothing could match, showed as a new county for ever, and counted for no
// award. Roughly 15 000 US callsigns.
//
// A planning region is NOT a renamed county — it is built from towns drawn
// from several different counties — so there is no name-to-name mapping to be
// had. The ZIP is the only handle, hence this table.
//
// Sources (both public, both free)
// --------------------------------
// geonames US.txt from https://download.geonames.org/export/zip/US.zip
// — the ZIP list itself, and each ZIP's centroid.
// crosswalk https://www2.census.gov/geo/docs/maps-data/data/rel2020/
// zcta520/tab20_zcta520_county20_natl.txt
// — the 2020 ZCTA↔county relationship file, which predates the
// change and therefore still carries the eight real counties.
//
// The crosswalk covers 278 of the 418 affected ZIPs. The rest are PO-box-only
// ZIPs, which have no ZCTA at all; each is given the county of the nearest
// resolved ZIP centroid. That is sound here because a PO-box ZIP sits inside
// the town it serves, and Connecticut's counties are tens of kilometres across
// — the fallback can only err on a ZIP that straddles a county line, which the
// ZIP-to-county approach is already documented as accepting (~98%).
//
// Usage:
//
// go run ./cmd/ctzipgen US.txt tab20_zcta520_county20_natl.txt > internal/uls/ctcounty_gen.go
import (
"bufio"
"fmt"
"math"
"os"
"sort"
"strconv"
"strings"
)
type zipPt struct {
zip string
lat, lon float64
county string // from the crosswalk, "" if the ZIP has no ZCTA
geoName string // what GeoNames says today
}
func main() {
if len(os.Args) < 3 {
fmt.Fprintln(os.Stderr, "usage: ctzipgen US.txt tab20_zcta520_county20_natl.txt")
os.Exit(2)
}
// 1. Every Connecticut ZIP, with its centroid, from GeoNames.
var pts []*zipPt
byZip := map[string]*zipPt{}
f, err := os.Open(os.Args[1])
must(err)
sc := bufio.NewScanner(f)
sc.Buffer(make([]byte, 0, 64*1024), 256*1024)
for sc.Scan() {
c := strings.Split(sc.Text(), "\t")
if len(c) < 11 || strings.ToUpper(strings.TrimSpace(c[4])) != "CT" {
continue
}
z := strings.TrimSpace(c[1])
if z == "" || byZip[z] != nil {
continue
}
p := &zipPt{zip: z, lat: atof(c[9]), lon: atof(c[10]), geoName: strings.TrimSpace(c[5])}
byZip[z] = p
pts = append(pts, p)
}
must(sc.Err())
f.Close()
// 2. The 2020 county for each ZCTA. A ZCTA can straddle a county line, so
// keep the county holding the largest share of its land area.
best := map[string]float64{}
f2, err := os.Open(os.Args[2])
must(err)
sc2 := bufio.NewScanner(f2)
sc2.Buffer(make([]byte, 0, 64*1024), 1<<20)
sc2.Scan() // header
for sc2.Scan() {
c := strings.Split(sc2.Text(), "|")
if len(c) < 18 || !strings.HasPrefix(c[9], "09") {
continue
}
p := byZip[strings.TrimSpace(c[1])]
if p == nil {
continue
}
area := atof(c[16])
if p.county != "" && area <= best[p.zip] {
continue
}
best[p.zip] = area
p.county = strings.TrimSuffix(strings.TrimSpace(c[10]), " County")
}
must(sc2.Err())
f2.Close()
// 3. Fill the PO-box-only ZIPs from the nearest ZIP the crosswalk resolved.
var anchors []*zipPt
for _, p := range pts {
if p.county != "" {
anchors = append(anchors, p)
}
}
if len(anchors) == 0 {
fmt.Fprintln(os.Stderr, "ctzipgen: crosswalk resolved nothing — wrong file?")
os.Exit(1)
}
filled := 0
for _, p := range pts {
if p.county != "" {
continue
}
nearest, bestD := "", math.MaxFloat64
for _, a := range anchors {
if d := haversine(p.lat, p.lon, a.lat, a.lon); d < bestD {
bestD, nearest = d, a.county
}
}
p.county = nearest
filled++
}
// 4. Self-check: the ZIPs GeoNames still labels with a real county must
// agree with what we derived, or the derivation is wrong.
real := map[string]bool{
"Fairfield": true, "Hartford": true, "Litchfield": true, "Middlesex": true,
"New Haven": true, "New London": true, "Tolland": true, "Windham": true,
}
checked, bad := 0, 0
for _, p := range pts {
if !real[p.geoName] {
continue
}
checked++
if p.geoName != p.county {
bad++
fmt.Fprintf(os.Stderr, "MISMATCH %s: geonames %q, derived %q\n", p.zip, p.geoName, p.county)
}
}
fmt.Fprintf(os.Stderr, "ctzipgen: %d zips, %d from crosswalk, %d by nearest; cross-check %d/%d agree\n",
len(pts), len(pts)-filled, filled, checked-bad, checked)
if bad > 0 {
os.Exit(1)
}
sort.Slice(pts, func(i, j int) bool { return pts[i].zip < pts[j].zip })
var b strings.Builder
b.WriteString("// Code generated by cmd/ctzipgen. DO NOT EDIT.\n\n")
b.WriteString("package uls\n\n")
b.WriteString("// ctCounty maps a Connecticut ZIP to its legal county.\n")
b.WriteString("//\n")
b.WriteString("// GeoNames reports Connecticut's 2022 planning regions instead, which no\n")
b.WriteString("// award, callbook or log uses. See cmd/ctzipgen for how this was built and\n")
b.WriteString("// why a name-to-name mapping cannot work.\n")
fmt.Fprintf(&b, "var ctCounty = map[string]string{\n")
for _, p := range pts {
fmt.Fprintf(&b, "\t%q: %q,\n", p.zip, p.county)
}
b.WriteString("}\n")
fmt.Print(b.String())
}
func atof(s string) float64 {
v, _ := strconv.ParseFloat(strings.TrimSpace(s), 64)
return v
}
// haversine returns the great-circle distance in km. Connecticut is small
// enough that a flat approximation would do, but this costs nothing and cannot
// be wrong near the state's edges.
func haversine(lat1, lon1, lat2, lon2 float64) float64 {
const r = 6371.0
dLat := (lat2 - lat1) * math.Pi / 180
dLon := (lon2 - lon1) * math.Pi / 180
a := math.Sin(dLat/2)*math.Sin(dLat/2) +
math.Cos(lat1*math.Pi/180)*math.Cos(lat2*math.Pi/180)*math.Sin(dLon/2)*math.Sin(dLon/2)
return 2 * r * math.Asin(math.Sqrt(a))
}
func must(err error) {
if err != nil {
fmt.Fprintln(os.Stderr, "ctzipgen:", err)
os.Exit(1)
}
}
+61
View File
@@ -0,0 +1,61 @@
package main
import (
"os"
"path/filepath"
"testing"
)
// TestCopyDirContentsCreatesDestination pins the bug that broke copying a QSL
// design between profiles.
//
// copyDirContents wrote straight into dst without creating it, so the first
// os.Create failed with ENOENT. The caller was written as "ignore
// os.IsNotExist", meaning "the source has no assets, that is fine" — and ENOENT
// from the failed write matched it exactly. Nothing was copied, no error was
// reported, and the operator saw "copied design is incomplete: hero photo file
// … not found" from the validation two lines later.
func TestCopyDirContentsCreatesDestination(t *testing.T) {
base := t.TempDir()
src := filepath.Join(base, "src")
if err := os.MkdirAll(filepath.Join(src, "sub"), 0o755); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(src, "img_25c06bda.jpg"), []byte("hero"), 0o644); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(src, "sub", "back.png"), []byte("back"), 0o644); err != nil {
t.Fatal(err)
}
// dst does not exist — the case of every first copy.
dst := filepath.Join(base, "dst")
if err := copyDirContents(src, dst); err != nil {
t.Fatalf("copyDirContents: %v", err)
}
for name, want := range map[string]string{
"img_25c06bda.jpg": "hero",
"sub/back.png": "back",
} {
got, err := os.ReadFile(filepath.Join(dst, filepath.FromSlash(name)))
if err != nil {
t.Errorf("%s: %v", name, err)
continue
}
if string(got) != want {
t.Errorf("%s = %q, want %q", name, got, want)
}
}
}
// A missing SOURCE is still an error from copyDirContents itself — it is the
// caller that decides whether a design with no pictures is acceptable, and it
// can only decide that if this does not quietly succeed.
func TestCopyDirContentsMissingSource(t *testing.T) {
base := t.TempDir()
if err := copyDirContents(filepath.Join(base, "nope"), filepath.Join(base, "dst")); err == nil {
t.Fatal("copying a missing source returned no error")
} else if !os.IsNotExist(err) {
t.Fatalf("want a not-exist error, got %v", err)
}
}
+274 -27
View File
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import {
Activity, AlertCircle, Antenna, Bell, Check, CheckCircle2, ChevronDown, Clock, CloudOff, Compass, Database, Ear, Eraser, Flame, Gauge, Hash, Loader2, Lock,
Maximize2, Minimize2, Mic, MessageSquare, Pencil, Radio, RadioTower, RefreshCw, Satellite, Send, Settings, SlidersHorizontal, SpellCheck, Square, Terminal, Trash2, Unlock, X, Zap,
Maximize2, Minimize2, Mic, MessageSquare, Pencil, Radar, Radio, RadioTower, RefreshCw, Satellite, Send, Settings, SlidersHorizontal, SpellCheck, Square, Terminal, Trash2, Unlock, X, Zap,
} from 'lucide-react';
import {
@@ -16,7 +16,8 @@ import {
GetStartupStatus, CheckForUpdate, DownloadAndApplyUpdate, GetLiveStations, GetWhatsNew, GetChangelog,
SMTPConfigured, SendLogToDeveloper,
WorkedBefore,
SetCompactMode,
SetCompactMode, SetCompactHeight,
RotatorGoToPath,
GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, FlexApplyBandAntenna, FlexApplyBandPower,
GetSecretStatus, UnlockSecrets,
RefreshCtyDat, DownloadAllReferenceLists,
@@ -51,10 +52,11 @@ import {
ReportLiveActivity, LiveLastQSOAgeSec,
GetAmpStatuses, AmpOperate,
GetFlexState, FlexAmpOperate,
GetPSKReporterStatus, GetLiveOpenings,
GetPSKReporterStatus, GetLiveOpenings, GetChaseNew,
QSLViaRepairStatus, RepairQSLVia, DismissQSLViaRepair,
} from '../wailsjs/go/main/App';
import { Combobox } from '@/components/ui/combobox';
import { applyAwardRefs } from '@/lib/awardRefs';
import { applyAwardRefs, parseAwardRefs as parseManualRefs, spotRefList } from '@/lib/awardRefs';
import { EventsOn, BrowserOpenURL, WindowMinimise, WindowToggleMaximise, WindowIsMaximised, Quit } from '../wailsjs/runtime/runtime';
import type { adif as adifModels, lookup as lookupModels, cat as catModels } from '../wailsjs/go/models';
import type { QSOForm, WorkedBeforeView, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
@@ -81,6 +83,7 @@ import { AntGeniusPanel, type AGStatus } from '@/components/AntGeniusPanel';
import { TunerGeniusPanel, type TGStatus } from '@/components/TunerGeniusPanel';
import { AmpWidget } from '@/components/AmpWidget';
import { ScpPanel, type ScpResult } from '@/components/ScpPanel';
import { ChaseNewPanel } from '@/components/ChaseNewPanel';
import { FilterBuilder, type QueryFilter } from '@/components/FilterBuilder';
import { AwardsPanel } from '@/components/AwardsPanel';
import { StatsPanel } from '@/components/StatsPanel';
@@ -90,8 +93,8 @@ import { ExportFieldsDialog } from '@/components/ExportFieldsDialog';
import { ShutdownProgress } from '@/components/ShutdownProgress';
import { ClusterGrid } from '@/components/ClusterGrid';
import { cleanSpotter, inferSpotMode, spotModeCategory, spotStatusKey } from '@/lib/spot';
import { applySpotDisplay, readSpotDisplayOptions, SPOT_DISPLAY_OPTIONS_EXPOSED } from '@/lib/spotDisplay';
import { GetRowColors } from '../wailsjs/go/main/App';
import { applySpotDisplay, readSpotDisplayOptions, spotIsWorked, SPOT_DISPLAY_OPTIONS_EXPOSED } from '@/lib/spotDisplay';
import { GetRowColors, GetSpotTTLMinutes, IsNewUSCounty } from '../wailsjs/go/main/App';
import { WorkedBeforeGrid } from '@/components/WorkedBeforeGrid';
import { NetControlPanel } from '@/components/NetControlPanel';
import { ContestPanel, CONTEST_DEFAULT, type ContestSession } from '@/components/ContestPanel';
@@ -140,7 +143,9 @@ type CATState = Omit<catModels.RigState, 'convertValues'>;
// threshold is bypassed while filtering — see buildActiveFilter).
const FILTERED_LIMIT_CAP = 10000;
const DEFAULT_BANDS = ['160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','2m','70cm','23cm'];
const DEFAULT_MODES = ['SSB','CW','FT8','FT4','RTTY','PSK31','AM','FM','DIGITALVOICE'];
// Mirrors defaultModes in app.go — the fallback used before the backend answers.
// AM and DIGITALVOICE stay in the catalogue but are not offered by default.
const DEFAULT_MODES = ['SSB','CW','FT8','FT4','FT2','RTTY','PSK31','FM'];
// Modes the QSO recorder captures (phone only). Mirrors recordableMode() in
// app.go — digital modes carry no useful audio, and CW has no DAX audio on Flex,
// so neither is recorded (no REC badge / timer for them).
@@ -310,7 +315,7 @@ function modeAccent(mode?: string): string {
type RSTLists = { phone: string[]; cw: string[]; digital: string[] };
function rstCategory(mode: string): keyof RSTLists {
const m = (mode || '').toUpperCase();
const digital = ['FT8', 'FT4', 'JT65', 'JT9', 'JS8', 'Q65', 'MSK144', 'FST4', 'FST4W', 'MFSK', 'OLIVIA', 'JT4', 'WSPR'];
const digital = ['FT8', 'FT4', 'FT2', 'JT65', 'JT9', 'JS8', 'Q65', 'MSK144', 'FST4', 'FST4W', 'MFSK', 'OLIVIA', 'JT4', 'WSPR'];
if (digital.includes(m)) return 'digital';
if (['CW', 'RTTY', 'PSK31', 'PSK63', 'PSK', 'PSK125'].includes(m)) return 'cw';
return 'phone';
@@ -529,6 +534,28 @@ export default function App() {
setCompact(next);
SetCompactMode(next);
}
// Fit the compact window to what was actually rendered.
//
// The height was a constant "tuned so the compact entry strip fits in a single
// row". A constant tuned against a layout stops being true the moment the
// layout changes, and this one outlived a strip that had since lost a row —
// leaving a band of empty window under the fields. Measure instead.
const compactRootRef = useRef<HTMLDivElement | null>(null);
useEffect(() => {
if (!compact) return;
const fit = () => {
const el = compactRootRef.current;
if (!el) return;
// Rounded, so a sub-pixel reflow cannot start a resize loop.
// + the compact topbar, which is a fixed h-8 (32px), + a couple of pixels
// for the border so the strip is never clipped by one row of anti-aliasing.
SetCompactHeight(Math.round(el.getBoundingClientRect().height) + 32 + 2);
};
const id = window.setTimeout(fit, 60); // let the strip paint first
const ro = new ResizeObserver(fit);
if (compactRootRef.current) ro.observe(compactRootRef.current);
return () => { window.clearTimeout(id); ro.disconnect(); };
}, [compact]);
// CAT — receives live rig state via Wails events.
const [catState, setCatState] = useState<CATState>({ enabled: false, connected: false } as any);
@@ -1771,6 +1798,20 @@ export default function App() {
// close so the next plain "Preferences" launch reverts to default.
const [settingsSection, setSettingsSection] = useState<string | undefined>(undefined);
const [showDeleteAll, setShowDeleteAll] = useState(false);
// How many QSOs hold a QSL routing word where the manager belongs — null when
// there is nothing to offer, or the operator has already answered. Asked once
// per log, a moment after startup so it does not race the first paint.
const [qslViaRepair, setQslViaRepair] = useState<number | null>(null);
useEffect(() => {
let alive = true;
const id = window.setTimeout(async () => {
try {
const s: any = await QSLViaRepairStatus();
if (alive && !s?.asked && (s?.affected ?? 0) > 0) setQslViaRepair(s.affected);
} catch { /* a log we cannot query yet will be offered next start */ }
}, 4000);
return () => { alive = false; window.clearTimeout(id); };
}, []);
const [showAbout, setShowAbout] = useState(false);
// "What's new": the changelog for the version(s) since the operator last ran,
// shown once on the first launch after an update (EN/FR per the UI language).
@@ -1928,6 +1969,31 @@ export default function App() {
// settings dialog closes, which is the only place it changes.
const [rowColors, setRowColors] = useState<any>(null);
useEffect(() => { GetRowColors().then(setRowColors).catch(() => {}); }, [showSettings]);
// Spot lifetime (Settings → DX Cluster). Spots are actually REMOVED rather
// than filtered at render: the cluster list, every band map and the counts all
// read the same array, so pruning it once is what makes the setting mean the
// same thing everywhere — and it gives the memory back.
const [spotTTLMin, setSpotTTLMin] = useState(0);
useEffect(() => { GetSpotTTLMinutes().then(setSpotTTLMin).catch(() => {}); }, [showSettings]);
useEffect(() => {
if (spotTTLMin <= 0) return; // 0 = keep until the count cap pushes them out
const sweep = () => {
const cutoff = Date.now() - spotTTLMin * 60_000;
setSpots((arr) => {
const kept = arr.filter((sp) => {
const t = Date.parse((sp as any).received_at ?? '');
return isNaN(t) || t >= cutoff; // an unparseable stamp is never a reason to drop a spot
});
return kept.length === arr.length ? arr : kept;
});
};
sweep();
// Half a minute: fine enough that a 5-minute setting is honoured closely,
// coarse enough to be invisible next to the spot stream itself.
const id = window.setInterval(sweep, 30_000);
return () => window.clearInterval(id);
}, [spotTTLMin]);
const qsosWithAwards = useMemo(
() => (qsos as any[]).map((q) => ({ ...q, award_refs: parseAwardRefs(q.award_refs) })),
[qsos],
@@ -2022,21 +2088,49 @@ export default function App() {
const [showAntGenius, setShowAntGenius] = useState(() => localStorage.getItem('opslog.showAntGenius') !== '0');
const [showTuner, setShowTuner] = useState(() => localStorage.getItem('opslog.showTuner') !== '0');
const [showScp, setShowScp] = useState(() => localStorage.getItem('opslog.showScp') !== '0');
// The Chase New widget follows its own setting rather than a local toggle: the
// panel is only meaningful while the PSK Reporter feed is up, and that is what
// the setting decides.
const [chaseNewOn, setChaseNewOn] = useState(false);
// The setting decides whether the feature exists; this decides whether the
// panel is on screen — the same split the Super Check Partial panel uses.
const [showChaseNew, setShowChaseNew] = useState(() => localStorage.getItem('opslog.showChaseNew') !== '0');
const refreshChaseNew = useCallback(() => { GetChaseNew().then(setChaseNewOn).catch(() => {}); }, []);
useEffect(() => { refreshChaseNew(); }, [refreshChaseNew]);
const [showBeamOnMap, setShowBeamOnMap] = useState(() => localStorage.getItem('opslog.showBeamOnMap') !== '0');
// Award code → scanned field (e.g. POTA→pota_ref, WWFF→wwff). Used to route
// picked award references to the QSO field/extras each award actually reads.
const awardFieldRef = useRef<Record<string, string>>({});
// The same map as state, because the spot comment has to be recomputed once it
// arrives — a ref would leave the first Send Spot of a session with no
// references at all, or with the computed ones it is meant to filter out.
const [awardFields, setAwardFields] = useState<Record<string, string>>({});
useEffect(() => {
GetAwardDefs()
.then((defs) => {
const m: Record<string, string> = {};
for (const d of (defs ?? []) as any[]) m[String(d.code).toUpperCase()] = String(d.field || '').toLowerCase();
awardFieldRef.current = m;
setAwardFields(m);
})
.catch(() => {});
}, []);
// Award references offered to the Send Spot window, as cluster-ready strings.
//
// The entry panel holds them as "CODE@REF;CODE@REF" while the QSO is being
// typed; once it is logged they live on the row as the materialised award_refs
// object. Take the entry's when there is one — spotting usually happens with
// the station still in the field — and fall back to the last logged QSO, which
// is where the callsign and frequency defaults come from too.
const spotEntryRefs = useMemo(() => {
const entry = spotRefList(parseManualRefs(details.award_refs ?? ''), awardFields);
if (entry.length) return entry;
return spotRefList(parseAwardRefs(qsos[0]?.award_refs), awardFields);
}, [details.award_refs, qsos, awardFields]);
// === Clock ===
const [utcNow, setUtcNow] = useState('');
useEffect(() => {
@@ -2555,6 +2649,9 @@ export default function App() {
// case its one-shot fetch ran during the startup race (before the
// backend was determined) and grabbed the wrong/stale value.
GetDBConnectionInfo().then((i) => { if (alive) setDbConn(i as any); }).catch(() => {});
// 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();
} 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
@@ -2567,7 +2664,7 @@ export default function App() {
};
attempt();
return () => { alive = false; if (timer) window.clearTimeout(timer); };
}, [refresh]);
}, [refresh, refreshChaseNew]);
useEffect(() => {
(async () => {
try {
@@ -2588,6 +2685,10 @@ export default function App() {
loadStation();
loadLists();
loadCATCfg();
// Options the toolbar reads. At mount the database may still be opening,
// and a one-shot read then answers "off" for everything — which is why the
// Chase New button only appeared after a trip through Settings.
refreshChaseNew();
})();
// Poll the CAT state at launch until the rig reports a frequency: the
// backend connects asynchronously and only PUSHES cat:state on change, so
@@ -4414,6 +4515,67 @@ export default function App() {
onBlur={() => setQth(titleCase)} />
</div>
);
// State sits between QTH and the locator: it is part of the same "where is
// this station" reading, and it is what several awards key off (WAS, the US
// county work). Narrow — it holds two or three characters.
const stateBlock = (
<div className="flex flex-col w-[70px] shrink-0"><Label className="mb-1 h-3.5">{t('field.state')}</Label>
<Input value={details.state ?? ''} className="font-mono"
onChange={(e) => setDetails((d) => ({ ...d, state: e.target.value.toUpperCase() }))} />
</div>
);
// County beside State: the lookup fills QTH, State, County and the locator
// together, and they are read together. Wider than State because a county name
// is a name — "St. Tammany Parish", not a code.
// The row Comment/Note freed by moving onto one line: county, zones and the
// ADIF entity number. All four are filled by the lookup and were previously
// only visible after opening a tab — which is the wrong place for values an
// operator wants to SEE are right before pressing Log.
//
// A numeric field stores undefined when cleared, not 0: zero is a real DXCC
// number for "no entity" and a real answer for a zone, so an empty box must
// stay empty rather than assert something.
// NEW badge on the county — the same answer the Details tab gives, moved to
// where the county is now typed. Debounced: this field is typed into as well
// as filled by the lookup, and the check hits the database.
const [entryNewCounty, setEntryNewCounty] = useState(false);
useEffect(() => {
const cnty = (details.cnty ?? '').trim();
if (!cnty) { setEntryNewCounty(false); return; }
let alive = true;
const id = window.setTimeout(async () => {
try {
const isNew = await IsNewUSCounty(details.state ?? '', cnty);
if (alive) setEntryNewCounty(!!isNew);
} catch { if (alive) setEntryNewCounty(false); }
}, 300);
return () => { alive = false; window.clearTimeout(id); };
}, [details.state, details.cnty]);
const num = (v: string): number | undefined => {
const s = v.replace(/[^0-9]/g, '');
return s === '' ? undefined : parseInt(s, 10);
};
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 ?? ''}
onChange={(e) => setDetails((d) => ({ ...d, cnty: e.target.value }))} />
</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"
onChange={(e) => setDetails((d) => ({ ...d, cqz: num(e.target.value) }))} />
</div>
<div className="flex flex-col w-[64px] shrink-0"><Label className="mb-1 h-3.5">{t('field.ituz')}</Label>
<Input value={details.ituz ?? ''} className="font-mono"
onChange={(e) => setDetails((d) => ({ ...d, ituz: num(e.target.value) }))} />
</div>
<div className="flex flex-col w-[72px] shrink-0"><Label className="mb-1 h-3.5">{t('field.dxcc')}</Label>
<Input value={details.dxcc ?? ''} className="font-mono"
onChange={(e) => setDetails((d) => ({ ...d, dxcc: num(e.target.value) }))} />
</div>
</div>
);
const gridBlock = (
<div className="flex flex-col w-[76px] shrink-0"><Label className="mb-1 h-3.5">{t('field.grid')}</Label>
<Input value={grid} placeholder="JN05" className="font-mono" onChange={(e) => { setGrid(e.target.value); markEdited('grid'); }} />
@@ -4717,12 +4879,21 @@ export default function App() {
// Cluster spots after every active filter (band / mode / status / search /
// hide-worked / group). Shared by the Cluster tab and the Main-view cluster
// pane so both show exactly the same list.
const clusterRenderedRows = useMemo(() => {
const bandsActive = clusterLockBand ? new Set([band]) : clusterBands;
// Everything the operator has said about WHICH STATIONS they care about —
// LoTW only, the spotter's continent, hide worked, the status and mode chips,
// the search box, the source node.
//
// Shared with the band map, which used to receive the raw stream filtered by
// band alone: switching on "LoTW users only" changed the cluster list and left
// the panadapter showing everyone. Two views of one spot stream disagreeing
// about the same spot is the fault lib/spotDisplay already exists to prevent.
//
// The BAND filter is deliberately not in here: a band map's band IS its
// filter, and applying the cluster's would empty every map but one.
const spotPassesStationFilters = useCallback((s: ClusterSpot): boolean => {
const search = clusterSearch.trim().toUpperCase();
const list = spots.filter((s) => {
{
if (clusterFilterSource && s.source_id !== clusterFilterSource) return false;
if (bandsActive.size > 0 && !bandsActive.has(s.band ?? '')) return false;
if (search && !s.dx_call.includes(search)) return false;
if (clusterLockMode) {
const spotMode = inferSpotMode(s.comment ?? '', s.freq_hz);
@@ -4771,9 +4942,27 @@ export default function App() {
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
const e = spotStatus[k];
if (!e) return false;
if (e.worked_call || e.status === 'worked') return false;
// A spot that is NEW for something is not "worked", whatever the entity
// says. The extra markers are orthogonal to the entity status — the same
// rule the band map already states — so a new prefix, county, grid or
// park in an entity worked years ago is exactly what an operator is
// hunting, and hiding it is the opposite of what was asked.
//
// Reported on BH2SWB and 4X9AA: both flagged NEW PFX, neither ever
// worked, both vanished the moment "hide worked" went on.
const isNew = !!(e.new_pota || e.new_county || e.new_pfx || e.new_grid);
if (!isNew && (e.worked_call || e.status === 'worked')) return false;
}
return true;
}
}, [clusterFilterSource, clusterSearch, clusterLockMode, mode, clusterModeFilter,
clusterStatusFilter, spotStatus, clusterLotwOnly, clusterSpotterConts, clusterHideWorked]);
const clusterRenderedRows = useMemo(() => {
const bandsActive = clusterLockBand ? new Set([band]) : clusterBands;
const list = spots.filter((s) => {
if (bandsActive.size > 0 && !bandsActive.has(s.band ?? '')) return false;
return spotPassesStationFilters(s);
});
let rendered = list as (ClusterSpot & { repeats?: number })[];
if (clusterGroup) {
@@ -5182,13 +5371,15 @@ export default function App() {
{(() => {
const p = dxPath;
const disabled = !p;
const goto = (az: number) => RotatorGoTo(Math.round(az), -1).catch((err) => setError(String(err?.message ?? err)));
// The path is passed through so a custom outbound row can say which
// bearing was taken — 137° is short path to one station and long to another.
const goto = (az: number, path: 'SP' | 'LP') => RotatorGoToPath(Math.round(az), -1, path).catch((err) => setError(String(err?.message ?? err)));
return (
<div className="inline-flex items-center rounded-full border border-info-border bg-info-muted overflow-hidden text-[11px] font-mono font-semibold">
<button
type="button"
disabled={disabled}
onClick={() => p && goto(p.bearingShort)}
onClick={() => p && goto(p.bearingShort, 'SP')}
title={p
? `Rotate short-path · ${Math.round(p.distanceShort).toLocaleString()} km`
: (station.my_grid ? 'No remote grid' : 'Set your station grid in Preferences')}
@@ -5205,7 +5396,7 @@ export default function App() {
<button
type="button"
disabled={disabled}
onClick={() => p && goto(p.bearingLong)}
onClick={() => p && goto(p.bearingLong, 'LP')}
title={p ? `Rotate long-path · ${Math.round(p.distanceLong).toLocaleString()} km` : ''}
className={cn(
'px-1.5 py-0.5 border-l border-info-border text-[10px] transition-colors',
@@ -5401,6 +5592,20 @@ export default function App() {
<SpellCheck className="size-4" />
</button>
)}
{chaseNewOn && (
<button
type="button"
onClick={() => { const v = !showChaseNew; setShowChaseNew(v); writeUiPref('opslog.showChaseNew', v ? '1' : '0'); }}
title={showChaseNew ? `${t('chn.toggle')}${t('chn.close')}` : t('chn.toggle')}
className={cn(
'relative inline-flex items-center justify-center size-7 rounded-md border transition-colors',
showChaseNew ? 'border-success-border bg-success-muted text-success-muted-foreground hover:bg-success-muted'
: 'border-border text-muted-foreground hover:bg-muted',
)}
>
<Radar className="size-4" />
</button>
)}
{chatAvailable && (
<button
type="button"
@@ -5779,7 +5984,7 @@ export default function App() {
Enter from any <input> inside the strip logs the QSO. Radix Selects
render as <button> elements and are ignored by this handler they
keep their own keyboard behaviour. */}
<div className={cn(!compact && 'flex gap-2.5 items-stretch px-2.5 pt-2.5 shrink-0')}>
<div ref={compactRootRef} className={cn(!compact && 'flex gap-2.5 items-stretch px-2.5 pt-2.5 shrink-0')}>
<section
className={cn('bg-card shadow-sm border-border',
compact
@@ -5834,25 +6039,30 @@ export default function App() {
to be pushed outside the entry panel and clipped. Wrapping drops
it to its own line instead, which stays readable. */}
<div className="flex gap-4 items-end flex-wrap">
<div className="flex flex-col w-[300px] shrink-0"><Label className="mb-1 h-3.5">Name</Label>
<div className="flex flex-col w-[230px] shrink-0"><Label className="mb-1 h-3.5">{t('field.name')}</Label>
<Input value={name} onChange={(e) => { setName(e.target.value); markEdited('name'); }}
onBlur={() => setName(titleCase)} />
</div>
{qthBlock}
{stateBlock}
{gridBlock}
</div>
{/* Row 3: tight left detail column (Band/Mode/Country) and
single-line Comment/Note on the right. */}
Comment/Note SIDE BY SIDE on the right one line each was a lot
of vertical space for two fields that are usually short. */}
<div className="flex gap-4 items-start">
<div className="flex flex-col gap-1.5 w-[300px] shrink-0">
<div className="flex flex-col gap-1.5 w-[230px] shrink-0">
{bandRow}
{modeRow}
{countryRow}
</div>
<div className="flex flex-col gap-1.5 flex-1 min-w-0">
{commentLine}
{noteLine}
{geoDetailRow}
<div className="flex gap-4">
<div className="flex-1 min-w-0">{commentLine}</div>
<div className="flex-1 min-w-0">{noteLine}</div>
</div>
</div>
</div>
@@ -5915,7 +6125,7 @@ export default function App() {
{/* Reserved free space to the right. The WinKeyer CW keyer and/or the
Digital Voice Keyer take this slot when enabled (Log4OM-style);
otherwise it shows the QRZ profile photo. */}
{!compact && (chatShown || wkEnabled || dvkEnabled || lookupResult?.image_url || (showRotor && (rotatorHeading.enabled || dxPath)) || (showAntGenius && agEnabled) || (showTuner && tgEnabled) || (showAmpWidget && ampSts.length > 0) || (showScp && scpEnabled) || (showLiveStations && dbConn?.backend === 'mysql')) && (
{!compact && (chatShown || wkEnabled || dvkEnabled || lookupResult?.image_url || (showRotor && (rotatorHeading.enabled || dxPath)) || (showAntGenius && agEnabled) || (showTuner && tgEnabled) || (showAmpWidget && ampSts.length > 0) || (showScp && scpEnabled) || (chaseNewOn && showChaseNew) || (showLiveStations && dbConn?.backend === 'mysql')) && (
// relative + absolute inner (like the F1-F5 panel): a taller widget (e.g.
// the DVK with Auto CQ) can't grow the row — the row height stays set by
// the entry strip and each widget fills that height, scrolling inside.
@@ -6041,6 +6251,16 @@ export default function App() {
/>
</div>
)}
{chaseNewOn && showChaseNew && (
<div className="w-[420px] shrink-0 min-h-0">
{/* Same reflex as clicking a cluster spot: the callsign into the
entry, and the rig onto the frequency it was decoded on. */}
<ChaseNewPanel onPick={(sp) => {
onCallsignInput(sp.call, { force: true });
if (sp.freq_hz) void tuneRigCAT(sp.freq_hz, sp.mode);
}} onClose={() => { setShowChaseNew(false); writeUiPref('opslog.showChaseNew', '0'); }} />
</div>
)}
{dvkEnabled && (
<div className="w-[320px] shrink-0 min-h-0">
<DvkPanel
@@ -6775,13 +6995,14 @@ export default function App() {
</div>
<BandMap
band={b}
spots={spots.filter((s) => s.band === b)}
spots={spots.filter((s) => s.band === b && spotPassesStationFilters(s))}
spotStatus={spotStatus}
currentFreqHz={band === b && freqMhz ? Math.round(parseFloat(freqMhz) * 1_000_000) : 0}
onSpotClick={handleSpotClick}
onClose={() => toggleBandMapBand(b)}
hideDigital={bandMapHideFt}
fitToBand={bandMapFit}
showLotw={!!rowColors?.bandmap_lotw}
/>
</div>
))}
@@ -6811,11 +7032,12 @@ export default function App() {
side={bandMapSide}
onToggleSide={toggleBandMapSide}
band={band}
spots={spots.filter((s) => s.band === band)}
spots={spots.filter((s) => s.band === band && spotPassesStationFilters(s))}
spotStatus={spotStatus}
currentFreqHz={band && freqMhz ? Math.round(parseFloat(freqMhz) * 1_000_000) : 0}
onSpotClick={handleSpotClick}
onClose={() => setBandMapShown(false)}
showLotw={!!rowColors?.bandmap_lotw}
keyNav
/>
</div>
@@ -7059,6 +7281,9 @@ export default function App() {
: (qsos[0]?.freq_hz ? Math.round((qsos[0].freq_hz / 1000) * 10) / 10 : 0)
}
defaultMode={mode || qsos[0]?.mode || ''}
// Award references: the ones on the QSO being entered, else those already
// logged for the last QSO — the same source the callsign above falls back to.
defaultRefs={spotEntryRefs}
targetName={
clusterServers
.filter((s) => s.enabled)
@@ -7069,6 +7294,7 @@ export default function App() {
freqKHz: q.freq_hz ? Math.round((q.freq_hz / 1000) * 10) / 10 : 0,
mode: q.mode ?? '',
band: q.band,
refs: spotRefList(parseAwardRefs(q.award_refs), awardFields),
}))}
onSend={async (call, freqKHz, comment) => {
await SendClusterSpot(call, freqKHz, comment);
@@ -7082,7 +7308,7 @@ export default function App() {
{showSettings && (
<SettingsModal
initialSection={settingsSection}
onClose={() => { setShowSettings(false); setSettingsSection(undefined); }}
onClose={() => { setShowSettings(false); setSettingsSection(undefined); refreshChaseNew(); }}
onSaved={() => {
loadStation(); loadLists(); loadCATCfg(); reloadWk(); refreshManualRecReady();
// Drop the cached spot statuses. They are computed once per
@@ -7133,6 +7359,27 @@ export default function App() {
/>
);
})()}
{/* One-time offer to move QSL routing words out of the manager field.
Shown with a count and never acted on without an answer: it rewrites
what the operator sees in their own log. Either answer is final
asking again after a "no" would be a nag. */}
{qslViaRepair !== null && (
<ConfirmDialog
title={t('qslvia.title')}
message={t('qslvia.body', { n: qslViaRepair.toLocaleString() })}
confirmLabel={t('qslvia.confirm')}
cancelLabel={t('qslvia.cancel')}
onConfirm={async () => {
const n = qslViaRepair;
setQslViaRepair(null);
try {
const r: any = await RepairQSLVia();
showToast(t('qslvia.done', { n: (r?.moved ?? n).toLocaleString() }));
} catch { /* the log keeps the reason; nothing to undo */ }
}}
onCancel={() => { setQslViaRepair(null); DismissQSLViaRepair().catch(() => {}); }}
/>
)}
{showDeleteAll && (
<ConfirmDialog
title="Delete ALL QSOs?"
+72 -7
View File
@@ -17,10 +17,17 @@ const PALETTE = [
// The rule ids the backend orders; the labels live here so a translation never
// travels through the settings row.
const LABELS: Record<string, string> = {
confirmed_lotw: 'appr.confirmedLotw',
confirmed_paper: 'appr.confirmedPaper',
sent_waiting: 'appr.sentWaiting',
to_send: 'appr.toSend',
to_send: 'appr.ruleToSend',
confirmed: 'appr.ruleConfirmed',
sent: 'appr.ruleSent',
worked: 'appr.ruleWorked',
};
// 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 CHANNEL_LABELS: Record<string, string> = {
qsl: 'appr.chQsl', lotw: 'LoTW', eqsl: 'eQSL', qrz: 'QRZ.com',
};
export function AppearancePanel() {
@@ -37,15 +44,32 @@ export function AppearancePanel() {
setCfg(next);
SaveRowColors(next as any).catch(() => {});
};
const patchRule = (id: string, patch: Partial<{ color: string; enabled: boolean }>) => {
const patchRule = (id: string, patch: Partial<{ color: string; enabled: boolean; channels: string[] }>) => {
if (!cfg) return;
save({ ...cfg, rules: cfg.rules.map((r) => (r.id === id ? { ...r, ...patch } : r)) });
};
// The rule card shows the row exactly as the grid will draw it, so the choice
// is made by looking rather than by imagining.
const preview = (color: string): Record<string, string> => {
const st = cfg?.style ?? 'bar';
const pct = cfg?.intensity ?? 12;
const out: Record<string, string> = {};
if (st === 'tint' || st === 'both') out.backgroundColor = `color-mix(in srgb, ${color} ${pct}%, transparent)`;
if (st === 'bar' || st === 'both') out.boxShadow = `inset 3px 0 0 ${color}`;
return out;
};
if (!cfg) return <div className="p-1 text-sm text-muted-foreground"></div>;
return (
<div className="space-y-4">
<label className="flex items-start gap-2 text-sm cursor-pointer">
<Checkbox checked={!!cfg.bandmap_lotw} className="mt-0.5"
onCheckedChange={(c) => save({ ...cfg, bandmap_lotw: !!c } as any)} />
<span>{t('appr.bandmapLotw')} <span className="text-xs text-muted-foreground">{t('appr.bandmapLotwHint')}</span></span>
</label>
<label className="flex items-start gap-2 text-sm cursor-pointer">
<Checkbox checked={cfg.enabled} className="mt-0.5"
onCheckedChange={(c) => save({ ...cfg, enabled: !!c })} />
@@ -53,18 +77,59 @@ export function AppearancePanel() {
</label>
{cfg.enabled && (
<div className="space-y-2">
<div className="space-y-3">
{/* Style first: it decides whether the colours below are a signal or a
wallpaper, which matters more than which hue they are. */}
<div className="flex items-center gap-3 flex-wrap">
<span className="text-sm">{t('appr.style')}</span>
<div className="inline-flex rounded-md border border-border overflow-hidden text-xs">
{(['bar', 'tint', 'both'] as const).map((v) => (
<button key={v} type="button" onClick={() => save({ ...cfg, style: v })}
className={cn('px-3 py-1.5 font-medium', (cfg.style ?? 'bar') === v ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:bg-muted')}>
{t('appr.style' + v[0].toUpperCase() + v.slice(1))}
</button>
))}
</div>
{(cfg.style ?? 'bar') !== 'bar' && (
<label className="flex items-center gap-2 text-sm">
{t('appr.intensity')}
<input type="range" min={5} max={45} step={1} value={cfg.intensity ?? 12}
onChange={(e) => save({ ...cfg, intensity: parseInt(e.target.value, 10) })}
className="w-32 accent-[var(--primary)]" />
<span className="font-mono text-xs text-muted-foreground w-8">{cfg.intensity ?? 12}%</span>
</label>
)}
</div>
{/* Order matters and is shown: a contact is usually several of these at
once, and the first match wins. */}
<p className="text-xs text-muted-foreground">{t('appr.orderHint')}</p>
{cfg.rules.map((r, i) => (
<div key={r.id} className="rounded-lg border border-border/60 p-2.5 space-y-2"
style={{ backgroundColor: r.enabled ? `color-mix(in srgb, ${r.color} 24%, transparent)` : undefined }}>
style={r.enabled ? preview(r.color) : undefined}>
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox checked={r.enabled} onCheckedChange={(c) => patchRule(r.id, { enabled: !!c })} />
<span className="font-mono text-xs text-muted-foreground">{i + 1}.</span>
<span className="font-medium">{t(LABELS[r.id] ?? r.id)}</span>
</label>
{/* Which channels this category looks at. None ticked = all of
them, which is what an unnarrowed rule should mean. */}
{r.enabled && r.id !== 'worked' && (
<div className="flex items-center gap-3 flex-wrap pl-6 text-xs">
{CHANNELS.map((c) => {
const on = !r.channels?.length || r.channels.includes(c);
return (
<label key={c} className="flex items-center gap-1.5 cursor-pointer">
<Checkbox checked={on} onCheckedChange={(v) => {
const cur = r.channels?.length ? r.channels : [...CHANNELS];
const next = v ? [...new Set([...cur, c])] : cur.filter((x) => x !== c);
patchRule(r.id, { channels: next });
}} />
{CHANNEL_LABELS[c]?.startsWith('appr.') ? t(CHANNEL_LABELS[c]) : CHANNEL_LABELS[c]}
</label>
);
})}
</div>
)}
{r.enabled && (
<div className="flex items-center gap-1.5 flex-wrap pl-6">
{PALETTE.map((c) => (
+15 -1
View File
@@ -38,6 +38,9 @@ type SpotStatusEntry = {
new_county?: boolean;
new_pota?: boolean;
new_pfx?: boolean;
// Whether the station uploads to LoTW. Not a status — it says nothing about
// whether the spot is worth chasing — so it is drawn as a badge, never a colour.
lotw?: boolean;
};
// The extra markers are ORTHOGONAL to the entity status: a spot can be a worked
@@ -79,6 +82,8 @@ interface Props {
// globally from the band-map tab toolbar.
hideDigital?: boolean;
fitToBand?: boolean;
// Mark stations that upload to LoTW (Settings → Appearance).
showLotw?: boolean;
// keyNav enables Ctrl+↑ / Ctrl+↓ to hop to the next spot above / below the rig
// frequency (and tune to it). Only the docked Main-view band map sets this, so
// the multi-band Band Map tab (several maps) doesn't fight over the shortcut.
@@ -227,7 +232,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, keyNav = false }: Props) {
export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, keyNav = false, showLotw = false }: Props) {
const { t } = useI18n();
// The two display options are applied ONCE here, on the whole map, so the
@@ -649,6 +654,15 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
})()}
<span className="flex items-center gap-1.5 px-2 font-mono text-[11px] font-bold leading-none">
<span>{p.spot.dx_call}</span>
{/* Same badge the cluster list draws, for the same reason: the
muted-blue of a confirmation, never a status colour —
whether a station uploads to LoTW says nothing about
whether the spot is worth chasing. A glyph rather than a
colour also keeps it off the channel the statuses use. */}
{showLotw && entry?.lotw && (
<span title={t('clu.lotwBadge')} className="text-[9px] font-normal rounded px-1 py-px"
style={{ background: 'color-mix(in srgb, var(--info) 22%, transparent)', color: 'var(--info)' }}>L</span>
)}
{mode && (
<span className="text-[9px] font-normal text-current/70 bg-current/10 rounded px-1 py-px">
{mode}
@@ -30,6 +30,8 @@ const FIELDS: FieldDef[] = [
{ id: 'qsl_rcvd', label: 'bulk.fQslRcvd', group: 'QSL / upload', kind: 'status' },
{ id: 'qsl_rcvd_date', label: 'bulk.fQslRcvdDate', group: 'QSL / upload', kind: 'date' },
{ id: 'qsl_via', label: 'bulk.fQslVia', group: 'QSL / upload', kind: 'text' },
{ id: 'qsl_sent_via', label: 'bulk.fQslSentVia', group: 'QSL / upload', kind: 'text' },
{ id: 'qsl_rcvd_via', label: 'bulk.fQslRcvdVia', group: 'QSL / upload', kind: 'text' },
{ id: 'lotw_sent', label: 'bulk.fLotwSent', group: 'QSL / upload', kind: 'status' },
{ id: 'lotw_sent_date', label: 'bulk.fLotwSentDate', group: 'QSL / upload', kind: 'date' },
{ id: 'lotw_rcvd', label: 'bulk.fLotwRcvd', group: 'QSL / upload', kind: 'status' },
+217
View File
@@ -0,0 +1,217 @@
// ChaseNewPanel — the stations PSK Reporter is hearing NEAR HERE that are new
// against the log.
//
// A DX cluster tells you what somebody chose to spot. This tells you what is
// actually being decoded in your own region, which is a different and often
// larger set: nobody spots the FT8 caller running ten watts from a rare square.
//
// The one thing an operator has to know, and the reason for the line at the
// bottom: PSK Reporter carries DIGITAL MODES ONLY. An empty panel means nothing
// new is being decoded on FT8/FT4/JS8 near here — not that the band is dead.
import { useEffect, useMemo, useState } from 'react';
import { Radar, Loader2, X } from 'lucide-react';
import { useI18n } from '@/lib/i18n';
import { markerColour } from '@/lib/spotMarkers';
import { cn } from '@/lib/utils';
import { GetChaseNewSpots } from '../../wailsjs/go/main/App';
export interface ChaseNewSpot {
call: string;
band: string;
mode: string;
freq_hz?: number;
grid?: string;
country?: string;
cont?: string;
dist_km?: number;
bearing?: number;
status?: string;
new_pfx?: boolean;
new_grid?: boolean;
lotw?: boolean;
at: string;
}
interface Props {
// Tuning the rig to a row is the whole point — a station heard on 14.074 is
// only useful if you can get there in one click.
onPick?: (s: ChaseNewSpot) => void;
onClose?: () => void;
}
// The categories, in priority order. A station can be several at once — a new
// band AND a new prefix — but a row shows ONE, the first that matches here.
//
// The order is by what would make an operator leave what they are doing: a new
// entity beats a new band on it, which beats a new mode, which beats a new slot;
// a prefix or a square is worth knowing but never worth interrupting a QSO for.
// Two badges on one line also made the list unreadable at a glance, which is the
// only thing this panel is for.
type Category = 'dxcc' | 'band' | 'mode' | 'slot' | 'pfx' | 'grid';
const CATEGORIES: Array<{ key: Category; labelKey: string; colour: string }> = [
{ key: 'dxcc', labelKey: 'clg2.newDxcc', colour: 'var(--danger)' },
{ key: 'band', labelKey: 'clg2.newBand', colour: 'var(--danger)' },
{ key: 'mode', labelKey: 'clg2.newMode', colour: 'var(--danger)' },
{ key: 'slot', labelKey: 'clg2.newSlot', colour: 'var(--danger)' },
{ key: 'pfx', labelKey: 'clg2.newPfx', colour: markerColour('new_pfx') },
{ key: 'grid', labelKey: 'clg2.newGrid', colour: markerColour('new_grid') },
];
// categoryOf is the single thing a row says about a station.
function categoryOf(s: ChaseNewSpot): Category | null {
switch (s.status) {
case 'new': return 'dxcc';
case 'new-band': return 'band';
case 'new-mode': return 'mode';
case 'new-slot': return 'slot';
}
if (s.new_pfx) return 'pfx';
if (s.new_grid) return 'grid';
return null;
}
const FILTER_KEY = 'opslog.chaseNewFilters';
function loadFilters(): Set<Category> {
try {
const raw = localStorage.getItem(FILTER_KEY);
if (raw) {
const list = JSON.parse(raw) as Category[];
if (Array.isArray(list)) return new Set(list);
}
} catch { /* a corrupt preference is not worth a broken panel */ }
return new Set(CATEGORIES.map((c) => c.key));
}
export function ChaseNewPanel({ onPick, onClose }: Props) {
const { t } = useI18n();
const [spots, setSpots] = useState<ChaseNewSpot[]>([]);
const [loaded, setLoaded] = useState(false);
const [on, setOn] = useState<Set<Category>>(loadFilters);
// Polled rather than pushed: the feed can deliver several a second under an
// opening, and an event per row would be a redraw per row for a list nobody
// reads that fast.
useEffect(() => {
let alive = true;
const tick = async () => {
try {
const r = ((await GetChaseNewSpots()) ?? []) as ChaseNewSpot[];
if (alive) { setSpots(r); setLoaded(true); }
} catch { /* the feed may not be up yet */ }
};
tick();
const id = window.setInterval(tick, 5000);
return () => { alive = false; window.clearInterval(id); };
}, []);
function toggle(k: Category) {
setOn((prev) => {
const next = new Set(prev);
if (next.has(k)) next.delete(k); else next.add(k);
try { localStorage.setItem(FILTER_KEY, JSON.stringify([...next])); } catch { /* not worth failing over */ }
return next;
});
}
const shown = useMemo(() => {
return spots.filter((s) => {
const c = categoryOf(s);
return c !== null && on.has(c);
});
}, [spots, on]);
return (
<div className="flex h-full flex-col rounded-md border border-border bg-card overflow-hidden">
<div className="flex items-center gap-2 border-b border-border px-2 py-1.5">
<Radar className="size-3.5 shrink-0 text-primary" />
<span className="shrink-0 text-xs font-semibold">{t('chn.title')}</span>
{/* Filters, in the same order and colours as the badges they hide. */}
<div className="flex flex-1 flex-wrap items-center gap-1">
{CATEGORIES.map((c) => (
<button
key={c.key}
type="button"
onClick={() => toggle(c.key)}
title={t('chn.filterHint')}
className={cn(
'rounded border px-1 py-px text-[9px] font-bold uppercase tracking-wide transition-colors',
on.has(c.key) ? 'border-transparent' : 'border-border text-muted-foreground opacity-50',
)}
style={on.has(c.key) ? { color: c.colour, borderColor: c.colour } : undefined}
>
{t(c.labelKey).replace(/^(NEW|NOUV)\s+/i, '')}
</button>
))}
</div>
<span className="shrink-0 text-[10px] text-muted-foreground">
{loaded ? t('chn.count', { n: shown.length }) : ''}
</span>
{onClose && (
<button
type="button"
onClick={onClose}
title={t('chn.close')}
className="shrink-0 rounded p-0.5 text-muted-foreground hover:bg-muted hover:text-foreground"
>
<X className="size-3.5" />
</button>
)}
</div>
<div className="flex-1 overflow-y-auto">
{!loaded ? (
<div className="flex items-center justify-center gap-2 p-3 text-[11px] text-muted-foreground">
<Loader2 className="size-3 animate-spin" /> {t('chn.loading')}
</div>
) : shown.length === 0 ? (
<p className="p-3 text-[11px] text-muted-foreground leading-relaxed">
{spots.length === 0 ? t('chn.empty') : t('chn.allFiltered')}
</p>
) : (
<div className="divide-y divide-border/60">
{shown.map((s, i) => {
const c = categoryOf(s);
const def = CATEGORIES.find((x) => x.key === c);
return (
<button
key={`${s.call}-${s.band}-${s.mode}-${i}`}
type="button"
onClick={() => onPick?.(s)}
className="flex w-full items-center gap-1.5 px-2 py-1 text-left text-[11px] hover:bg-accent/40"
title={[
s.country,
s.grid,
s.dist_km ? `${s.dist_km} km` : '',
s.freq_hz ? `${(s.freq_hz / 1000).toFixed(1)} kHz` : '',
].filter(Boolean).join(' · ')}
>
<span className="w-[84px] shrink-0 truncate font-mono font-bold">{s.call}</span>
<span className="w-9 shrink-0 font-mono text-muted-foreground">{s.band}</span>
<span className="w-10 shrink-0 truncate text-muted-foreground">{s.mode}</span>
{/* No frequency column: clicking the row tunes the rig to it,
so the number was a thing to read and never to use. It is
still carried on the spot — the click is what needs it —
and shows in the row's tooltip for anyone who wants it.
The country takes the space it freed. */}
<span className="min-w-0 flex-1 truncate text-muted-foreground">{s.country ?? ''}</span>
{def && (
<span className="shrink-0 text-[9px] font-bold" style={{ color: def.colour }}>
{t(def.labelKey)}
</span>
)}
{s.lotw && <span className="shrink-0 text-[9px] text-info" title="LoTW">L</span>}
</button>
);
})}
</div>
)}
</div>
<p className="border-t border-border px-2 py-1 text-[10px] text-muted-foreground">{t('chn.digitalOnly')}</p>
</div>
);
}
@@ -68,6 +68,8 @@ const FIELDS: { value: string; label: string; type: FieldType }[] = [
{ value: 'qsl_rcvd', label: 'fltb.fQslRcvd', type: 'text' },
{ value: 'qsl_rcvd_date', label: 'fltb.fQslRcvdDate', type: 'adifdate' },
{ value: 'qsl_via', label: 'fltb.fQslVia', type: 'text' },
{ value: 'qsl_sent_via', label: 'fltb.fQslSentVia', type: 'text' },
{ value: 'qsl_rcvd_via', label: 'fltb.fQslRcvdVia', type: 'text' },
{ value: 'lotw_sent', label: 'fltb.fLotwSent', type: 'text' },
{ value: 'lotw_sent_date', label: 'fltb.fLotwSentDate', type: 'adifdate' },
{ value: 'lotw_rcvd', label: 'fltb.fLotwRcvd', type: 'text' },
+19 -10
View File
@@ -54,12 +54,14 @@ const QSL_STATUSES = [
{ v: 'I', label: 'qslm.ignore' },
];
// QSL routing methods for the paper-QSL "Via" dropdown (was free text).
// QSL routing methods for the paper-QSL route dropdowns, one per direction.
// These are the ADIF QSL Via enumeration (B/D/E) and go to QSL_SENT_VIA and
// QSL_RCVD_VIA — NOT to QSL_VIA, which holds the manager's callsign.
const QSL_VIA_OPTIONS = [
{ v: '_', label: 'qslm.leave' },
{ v: 'Bureau', label: 'qslm.viaBureau' },
{ v: 'Direct', label: 'qslm.viaDirect' },
{ v: 'Electronic', label: 'qslm.viaElectronic' },
{ v: 'B', label: 'qslm.viaBureau' },
{ v: 'D', label: 'qslm.viaDirect' },
{ v: 'E', label: 'qslm.viaElectronic' },
];
// Maps a service value → its i18n label key (only for services with
@@ -149,7 +151,8 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
const [qslSent, setQslSent] = useState('_');
const [qslRcvdDate, setQslRcvdDate] = useState('');
const [qslSentDate, setQslSentDate] = useState('');
const [qslVia, setQslVia] = useState('_');
const [qslVia, setQslVia] = useState('_'); // how the card was SENT
const [qslRcvdVia, setQslRcvdVia] = useState('_'); // how it CAME BACK
const [qslNotes, setQslNotes] = useState('');
const [qslComment, setQslComment] = useState('');
@@ -181,6 +184,7 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
sent_date: ymd(qslSentDate),
rcvd_date: ymd(qslRcvdDate),
via: qslVia === '_' ? '' : qslVia,
rcvd_via: qslRcvdVia === '_' ? '' : qslRcvdVia,
notes: qslNotes,
comment: qslComment,
} as any);
@@ -553,6 +557,10 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
{/* Paper-QSL apply form */}
{service === 'paper' && (
<div className="flex items-end flex-wrap gap-3 px-3 py-2 border-t border-border bg-muted/20 shrink-0">
{/* Each direction carries its own route, and each sits with the status
and date it belongs to. A stack confirmed in one go usually arrived
the same way — a bureau delivery is exactly that — which is why the
route belongs on this form and not one QSO at a time in the editor. */}
<div className="flex flex-col gap-1">
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('qslm.qslReceived')}</label>
<div className="flex gap-1.5">
@@ -561,6 +569,10 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
<SelectContent>{QSL_STATUSES.map((s) => <SelectItem key={s.v} value={s.v}>{t(s.label)}</SelectItem>)}</SelectContent>
</Select>
<Input type="date" className="h-8 w-36" value={qslRcvdDate} onChange={(e) => setQslRcvdDate(e.target.value)} title={t('qslm.qslRcvdDateTitle')} />
<Select value={qslRcvdVia} onValueChange={setQslRcvdVia}>
<SelectTrigger className="h-8 w-32" title={t('qslm.rcvdViaTitle')}><SelectValue /></SelectTrigger>
<SelectContent>{QSL_VIA_OPTIONS.map((o) => <SelectItem key={o.v} value={o.v}>{t(o.label)}</SelectItem>)}</SelectContent>
</Select>
</div>
</div>
<div className="flex flex-col gap-1">
@@ -571,15 +583,12 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
<SelectContent>{QSL_STATUSES.map((s) => <SelectItem key={s.v} value={s.v}>{t(s.label)}</SelectItem>)}</SelectContent>
</Select>
<Input type="date" className="h-8 w-36" value={qslSentDate} onChange={(e) => setQslSentDate(e.target.value)} title={t('qslm.qslSentDateTitle')} />
</div>
</div>
<div className="flex flex-col gap-1">
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('qslm.via')}</label>
<Select value={qslVia} onValueChange={setQslVia}>
<SelectTrigger className="h-8 w-32"><SelectValue /></SelectTrigger>
<SelectTrigger className="h-8 w-32" title={t('qslm.sentViaTitle')}><SelectValue /></SelectTrigger>
<SelectContent>{QSL_VIA_OPTIONS.map((o) => <SelectItem key={o.v} value={o.v}>{t(o.label)}</SelectItem>)}</SelectContent>
</Select>
</div>
</div>
<div className="flex flex-col gap-1">
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('qslm.notes')}</label>
<Input className="h-8 w-40" value={qslNotes} onChange={(e) => setQslNotes(e.target.value)} placeholder={t('qslm.notesPlaceholder')} />
+40 -5
View File
@@ -57,10 +57,12 @@ type ConfDef = {
key: string; label: string;
sent?: keyof QSOForm; rcvd?: keyof QSOForm;
sentDate?: keyof QSOForm; rcvdDate?: keyof QSOForm;
via?: keyof QSOForm;
// How the card travelled, each way (ADIF QSL_SENT_VIA / QSL_RCVD_VIA). Paper
// only — the electronic channels below ARE the route.
sentVia?: keyof QSOForm; rcvdVia?: keyof QSOForm;
};
const CONFIRMATIONS: ConfDef[] = [
{ key: 'QSL', label: 'QSL (paper)', sent: 'qsl_sent', rcvd: 'qsl_rcvd', sentDate: 'qsl_sent_date', rcvdDate: 'qsl_rcvd_date', via: 'qsl_via' },
{ key: 'QSL', label: 'QSL (paper)', sent: 'qsl_sent', rcvd: 'qsl_rcvd', sentDate: 'qsl_sent_date', rcvdDate: 'qsl_rcvd_date', sentVia: 'qsl_sent_via', rcvdVia: 'qsl_rcvd_via' },
{ key: 'LOTW', label: 'LoTW', sent: 'lotw_sent', rcvd: 'lotw_rcvd', sentDate: 'lotw_sent_date', rcvdDate: 'lotw_rcvd_date' },
{ key: 'EQSL', label: 'eQSL', sent: 'eqsl_sent', rcvd: 'eqsl_rcvd', sentDate: 'eqsl_sent_date', rcvdDate: 'eqsl_rcvd_date' },
{ key: 'QRZCOM', label: 'QRZ.com', sent: 'qrzcom_qso_upload_status' as any, sentDate: 'qrzcom_qso_upload_date' as any, rcvd: 'qrzcom_qso_download_status' as any, rcvdDate: 'qrzcom_qso_download_date' as any },
@@ -216,6 +218,28 @@ function QslSelect({ value, onChange }: { value?: string; onChange: (v: string)
);
}
// The ADIF QSL Via enumeration. M (manager) is import-only in the standard, so
// it is not offered here — a file that arrives carrying it keeps it, and this
// list is what an operator may choose.
const QSL_VIA_CHOICES = [
{ value: '_', label: 'qedit.qslDash' },
{ value: 'B', label: 'qedit.viaBureau' },
{ value: 'D', label: 'qedit.viaDirect' },
{ value: 'E', label: 'qedit.viaElectronic' },
];
function QslViaSelect({ value, onChange }: { value?: string; onChange: (v: string) => void }) {
const { t } = useI18n();
return (
<Select value={value || '_'} onValueChange={(v) => onChange(v === '_' ? '' : v)}>
<SelectTrigger><SelectValue /></SelectTrigger>
<SelectContent>
{QSL_VIA_CHOICES.map((s) => <SelectItem key={s.value} value={s.value}>{t(s.label)}</SelectItem>)}
</SelectContent>
</Select>
);
}
export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], bands, modes }: Props) {
const { t } = useI18n();
// Use the operator's configured band/mode lists (incl. custom ones like 13cm);
@@ -633,7 +657,12 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
<Label>{t('qedit.qslMsg')}</Label>
<Input value={draft.qsl_msg ?? ''} onChange={(e) => set('qsl_msg', e.target.value)} />
</div>
<div><Label>{t('qedit.qslVia')}</Label><Input value={draft.qsl_via ?? ''} onChange={(e) => set('qsl_via', e.target.value)} /></div>
{/* The manager, and only the manager — ADIF QSL_VIA. How the
card travelled is a separate field, on the QSL Info tab. */}
<div>
<Label>{t('qedit.qslVia')}</Label>
<Input value={draft.qsl_via ?? ''} onChange={(e) => set('qsl_via', e.target.value)} placeholder={t('qedit.qslViaPlaceholder')} />
</div>
</div>
</div>
</TabsContent>
@@ -734,8 +763,14 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
</div>
<div><Label>{t('qedit.dateSent')}</Label><AdifDateInput value={val(def.sentDate)} onChange={(v) => put(def.sentDate, v)} /></div>
<div><Label>{t('qedit.dateReceived')}</Label><AdifDateInput value={val(def.rcvdDate)} onChange={(v) => put(def.rcvdDate, v)} disabled={!def.rcvdDate} /></div>
{def.via && (
<div className="col-span-2"><Label>{t('qedit.via')}</Label><Input value={val(def.via)} onChange={(e) => put(def.via, e.target.value)} placeholder={t('qedit.viaPlaceholder')} /></div>
{/* How the card travelled, each way — ADIF's QSL Via
enumeration. Not the manager: that is a callsign
and lives on the Contact's details tab. */}
{def.sentVia && (
<div><Label>{t('qedit.sentVia')}</Label><QslViaSelect value={val(def.sentVia)} onChange={(v) => put(def.sentVia, v)} /></div>
)}
{def.rcvdVia && (
<div><Label>{t('qedit.rcvdVia')}</Label><QslViaSelect value={val(def.rcvdVia)} onChange={(v) => put(def.rcvdVia, v)} /></div>
)}
</div>
<p className="text-[11px] text-muted-foreground">
@@ -186,6 +186,8 @@ export const makeColCatalog = (t: TFn, myGrid?: string): ColEntry[] => [
{ group: 'QSL', label: t('rqg.c.qsl_sent_date'),colId: 'qsl_sent_date', headerName: t('rqg.h.qsl_sent_date'), field: 'qsl_sent_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) },
{ group: 'QSL', label: t('rqg.c.qsl_rcvd_date'),colId: 'qsl_rcvd_date', headerName: t('rqg.h.qsl_rcvd_date'), field: 'qsl_rcvd_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) },
{ group: 'QSL', label: t('rqg.c.qsl_via'), colId: 'qsl_via', headerName: t('rqg.c.qsl_via'), field: 'qsl_via' as any, width: 130 },
{ group: 'QSL', label: t('rqg.c.qsl_sent_via'), colId: 'qsl_sent_via', headerName: t('rqg.h.qsl_sent_via'), field: 'qsl_sent_via' as any, width: 110 },
{ group: 'QSL', label: t('rqg.c.qsl_rcvd_via'), colId: 'qsl_rcvd_via', headerName: t('rqg.h.qsl_rcvd_via'), field: 'qsl_rcvd_via' as any, width: 110 },
{ group: 'QSL', label: t('rqg.c.qsl_msg'), colId: 'qsl_msg', headerName: t('rqg.c.qsl_msg'), field: 'qsl_msg' as any, width: 200 },
{ group: 'QSL', label: t('rqg.c.qslmsg_rcvd'), colId: 'qslmsg_rcvd', headerName: t('rqg.c.qslmsg_rcvd'), field: 'qslmsg_rcvd' as any, width: 200 },
+28 -1
View File
@@ -128,7 +128,9 @@ export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLa
</div>
)}
<div className="flex items-center justify-center p-2 min-h-0">
{/* flex-col: the readout goes BELOW the dial. This wrapper was a row, so a
sibling of the <svg> landed beside it. */}
<div className="flex flex-col items-center justify-center p-2 min-h-0">
<svg
viewBox={`0 0 ${SIZE} ${SIZE}`}
className={onGoto ? 'cursor-pointer select-none' : 'select-none'}
@@ -188,6 +190,31 @@ export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLa
); })}
<circle cx={C} cy={C} r={3.5} fill="#15803d" stroke="#fff" strokeWidth={1} />
</svg>
{/* Short and long path to the DX, in figures.
The bezel already carries the short path as a red marker, but a
marker is a direction, not a number — the same pair sits in the
status bar at 10px and operators reported not being able to read it.
Here because it belongs to the compass: every place that draws one
gets the readout, instead of each caller inventing its own.
Clickable when the caller can turn, like the status bar's. */}
<div className="flex gap-1.5 mt-2 font-mono w-full">
{([['SP', bearing ?? null], ['LP', bearing == null ? null : (bearing + 180) % 360]] as const).map(([lbl, az]) => (
<button key={lbl} type="button" disabled={az == null || !onGoto}
onClick={() => { if (az != null && onGoto) onGoto(Math.round(az)); }}
title={az == null ? '' : `${lbl} ${Math.round(az)}°`}
className={
'flex-1 rounded-md border py-1 text-xs font-semibold tabular-nums transition-colors ' +
(az == null
? 'border-border text-muted-foreground/50 cursor-not-allowed'
: onGoto
? 'border-info-border text-info-muted-foreground hover:bg-info-muted cursor-pointer'
: 'border-border text-muted-foreground cursor-default')
}>
{lbl} {az == null ? '—' : `${Math.round(az)}°`}
</button>
))}
</div>
</div>
</section>
);
+33 -4
View File
@@ -13,6 +13,32 @@ export interface RecentSpotQSO {
freqKHz: number;
mode: string;
band?: string;
// Award references logged for this QSO, each one complete and ready to read
// on a cluster line ("POTA FR-11553"). Empty for an ordinary contact.
refs?: string[];
}
// SPOT_COMMENT_MAX is the DX cluster comment field: 30 characters, and nodes
// truncate what does not fit without saying so. Only the comment BUILT here is
// held to it — whatever the operator types is their own business.
const SPOT_COMMENT_MAX = 30;
// spotComment puts the award references after the mode, the order a cluster
// line is read in: "CW POTA FR-11553".
//
// A reference goes in whole or not at all. Truncation would leave "CW POTA" or
// half a park number on the air, which is worse than saying nothing: a spot
// nobody can act on still costs everyone who reads it.
export function spotComment(mode: string, refs?: string[]): string {
let out = (mode || '').trim();
for (const ref of refs ?? []) {
const one = ref.trim();
if (!one) continue;
const next = out ? `${out} ${one}` : one;
if (next.length > SPOT_COMMENT_MAX) continue; // a shorter one may still fit
out = next;
}
return out;
}
interface Props {
@@ -23,6 +49,9 @@ interface Props {
defaultCall: string;
defaultFreqKHz: number;
defaultMode: string;
// Award references on the QSO being entered (or on the last logged one),
// appended to the comment after the mode.
defaultRefs?: string[];
// Master cluster name, shown so the user knows where the spot goes.
targetName?: string;
recent: RecentSpotQSO[];
@@ -33,7 +62,7 @@ interface Props {
// the master cluster: callsign + frequency (kHz) + a free message (defaults
// to the mode). A "Latest QSOs" list lets the operator one-click a recent
// contact into the form.
export function SendSpotModal({ open, onClose, defaultCall, defaultFreqKHz, defaultMode, targetName, recent, onSend }: Props) {
export function SendSpotModal({ open, onClose, defaultCall, defaultFreqKHz, defaultMode, defaultRefs, targetName, recent, onSend }: Props) {
const { t } = useI18n();
const [call, setCall] = useState('');
const [freqKHz, setFreqKHz] = useState('');
@@ -48,12 +77,12 @@ export function SendSpotModal({ open, onClose, defaultCall, defaultFreqKHz, defa
if (!open) return;
setCall((defaultCall || '').toUpperCase());
setFreqKHz(defaultFreqKHz > 0 ? trimKHz(defaultFreqKHz) : '');
setMessage(defaultMode || '');
setMessage(spotComment(defaultMode, defaultRefs));
setError('');
setOk(false);
// Focus the freq if the call is already known, else the call.
setTimeout(() => callRef.current?.focus(), 50);
}, [open, defaultCall, defaultFreqKHz, defaultMode]);
}, [open, defaultCall, defaultFreqKHz, defaultMode, defaultRefs]);
async function send() {
const c = call.trim().toUpperCase();
@@ -77,7 +106,7 @@ export function SendSpotModal({ open, onClose, defaultCall, defaultFreqKHz, defa
function pick(q: RecentSpotQSO) {
setCall(q.callsign.toUpperCase());
if (q.freqKHz > 0) setFreqKHz(trimKHz(q.freqKHz));
if (q.mode) setMessage(q.mode);
setMessage(spotComment(q.mode, q.refs));
setError('');
}
+134 -4
View File
@@ -52,7 +52,7 @@ import {
GetADIFMonitor, SaveADIFMonitor, PickADIFMonitorFile,
GetRelayAuto, SaveRelayAuto, GetStationDevices,
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
GetBandOpenSettings, SaveBandOpenSettings, GetPSKReporterStatus, GetChaseNewGrids, SetChaseNewGrids, GetGridCacheStatus,
GetBandOpenSettings, SaveBandOpenSettings, GetPSKReporterStatus, GetChaseNewGrids, SetChaseNewGrids, GetChaseNew, SetChaseNew, GetGridCacheStatus, GetLinkedAmps, SetLinkedAmps, GetSpotTTLMinutes, SetSpotTTLMinutes,
} from '../../wailsjs/go/main/App';
import type { profile as profileModels } from '../../wailsjs/go/models';
import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
@@ -109,6 +109,7 @@ const MODE_CATALOG: Array<{ name: string; sent: string; rcvd: string }> = [
{ name: 'DIGITALVOICE', sent: '59', rcvd: '59' },
{ name: 'FT8', sent: '-10', rcvd: '-10' },
{ name: 'FT4', sent: '-10', rcvd: '-10' },
{ name: 'FT2', sent: '-10', rcvd: '-10' },
{ name: 'JS8', sent: '-10', rcvd: '-10' },
{ name: 'MSK144', sent: '+00', rcvd: '+00' },
{ name: 'JT65', sent: '-15', rcvd: '-15' },
@@ -412,6 +413,7 @@ const THEME_SWATCH: Record<Exclude<ThemeChoice, 'auto'>, { bg: string; card: str
'light-warm': { bg: '#e8dfc9', card: '#faf6ea', accent: '#b8410c' },
'light-cool': { bg: '#f4f6f8', card: '#ffffff', accent: '#2563eb' },
'light-sage': { bg: '#eef1ec', card: '#f8faf6', accent: '#2f855a' },
'sahara': { bg: '#e6ded0', card: '#f3eee2', accent: '#c4501e' },
'light-nordic': { bg: '#eef1f7', card: '#ffffff', accent: '#4f46e5' },
'dim-slate': { bg: '#343b47', card: '#3d4552', accent: '#fb923c' },
'dark-warm': { bg: '#221d18', card: '#2e2820', accent: '#e07a2e' },
@@ -699,7 +701,13 @@ const MOTOR_BAND_DEFAULT_KHZ: Record<string, number> = {
'40m': 7100, '30m': 10125, '20m': 14150, '17m': 18110,
'15m': 21150, '12m': 24930, '10m': 28400, '6m': 50150,
};
const relayCountUI = (type: string) => (type === 'kmtronic' || type === 'denkovi' ? 8 : 5);
// Fallback only: the rule editor sizes itself from the device's labels, which
// SaveStationDevices already normalises to the real relay count. This is what it
// falls back to when a device somehow has none, so it only needs to be in the
// right neighbourhood — but it is the third place that counts relays, and the
// first two disagreeing is what pinned the HTTP board at four.
const relayCountUI = (type: string) =>
type === 'kmtronic' || type === 'denkovi' ? 8 : type === 'httpgen' ? 4 : 5;
// Live status + OPERATE/STANDBY toggle for ONE configured amplifier (by config
// id) — SPE / ACOM / PGXL alike. Module-scoped (not a nested component) so it
@@ -1224,6 +1232,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
hamqth_user: '', hamqth_password: '',
primary: '', failsafe: '',
download_images: false,
qrz_prefer_nickname: false,
cache_ttl_days: 30,
});
// Per-provider Test state — keeps the success/error feedback adjacent
@@ -1273,6 +1282,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
// Amplifier list — operators can run SEVERAL amps (even two SPEs combined),
// each with its own connection. Saved as a whole via SaveAmplifiers.
const [amps, setAmps] = useState<AmpUI[]>([]);
const [linkedAmps, setLinkedAmps] = useState<string[]>([]);
// WinKeyer CW keyer settings + macro editor.
type WKMac = { label: string; text: string };
@@ -1441,13 +1451,15 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
tqsl_path: string; station_location: string; key_password: string;
upload_flags: string[]; write_log: boolean;
auto_upload: boolean; upload_mode: string;
// 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 };
const emptyExtCfg = (): ExtServiceCfg => ({
api_key: '', url: '', station_id: '', email: '', username: '', password: '', callsign: '', code: '', qth_nickname: '',
force_station_callsign: '', tqsl_path: '', station_location: '', key_password: '',
upload_flags: ['N', 'R'], write_log: false,
auto_upload: false, upload_mode: 'immediate',
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,
@@ -1484,7 +1496,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
finally { setScpBusy(false); }
};
// US Counties (offline FCC ULS) — download progress arrives via events.
const [ulsStatus, setUlsStatus] = useState<{ count: number; updated_at?: string }>({ count: 0 });
const [ulsStatus, setUlsStatus] = useState<{ count: number; updated_at?: string; needs_refresh?: boolean }>({ count: 0 });
const [ulsBusy, setUlsBusy] = useState(false);
const [ulsProgress, setUlsProgress] = useState<{ stage: string; pct: number } | null>(null);
const [ulsMsg, setUlsMsg] = useState<{ ok: boolean; text: string } | null>(null);
@@ -1556,6 +1568,9 @@ 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: [] });
const [chaseGrids, setChaseGrids] = useState(false);
const [chaseNew, setChaseNew] = useState(false);
const [spotTTL, setSpotTTL] = useState(0);
const [spotTTLText, setSpotTTLText] = useState('0');
const [gridStat, setGridStat] = useState<any>(null);
const [pskrStatus, setPskrStatus] = useState<any>(null);
const saveBandOpen = async (next: any) => {
@@ -1566,6 +1581,9 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
(async () => {
try { setBandOpen(await GetBandOpenSettings()); } catch { /* defaults stand */ }
try { setChaseGrids(await GetChaseNewGrids()); } catch { /* defaults stand */ }
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 */ }
})();
// Poll the feed while the panel is open: a live count is the only thing that
// distinguishes "connected" from "connected and receiving nothing".
@@ -2309,6 +2327,23 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</span>
</span>
</label>
{/* QRZ only. HamQTH's <nick> already fills the Name field with the
on-air name, so the same switch there would toggle a behaviour it
has no way to turn off. */}
<label className="flex items-start gap-2 text-sm cursor-pointer mt-3">
<Checkbox
checked={!!(lookup as any).qrz_prefer_nickname}
onCheckedChange={(c) => setLookup((s) => ({ ...s, qrz_prefer_nickname: !!c } as any))}
className="mt-0.5"
/>
<span>
{t('lk.qrzNickname')}
<span className="block text-xs text-muted-foreground mt-0.5">
{t('lk.qrzNicknameHint')}
</span>
</span>
</label>
</div>
<div className="mt-6 pt-4 border-t border-border">
@@ -3579,6 +3614,38 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<Plus className="size-3.5 mr-1" /> {t('amp.add')}
</Button>
{/* WHICH amplifiers are coupled, not whether coupling is on.
A station can run a combiner pair AND a third amplifier that has
nothing to do with it two SPE on the combiner, a PowerGenius on
another antenna so a single switch would send that third one into
OPERATE alongside them. Shown from two amplifiers up. */}
{amps.length > 1 && (
<div className="border-t border-border/60 pt-3 space-y-2">
<div className="text-sm">{t('amp.linked')}</div>
<p className="text-xs text-muted-foreground">{t('amp.linkedHint')}</p>
<div className="flex flex-wrap gap-x-4 gap-y-1.5">
{amps.filter((x) => (x.id ?? '') !== '').map((x) => {
const on = linkedAmps.includes(x.id!);
return (
<label key={x.id} className="flex items-center gap-1.5 text-sm cursor-pointer">
<Checkbox checked={on} onCheckedChange={(c) => {
const next = c ? [...linkedAmps, x.id!] : linkedAmps.filter((v) => v !== x.id);
setLinkedAmps(next);
SetLinkedAmps(next).catch(() => {});
}} />
{x.name?.trim() || x.type}
</label>
);
})}
</div>
{/* An amplifier saved without an id cannot be a member say so
rather than silently leaving it out of the list. */}
{amps.some((x) => (x.id ?? '') === '') && (
<p className="text-xs text-muted-foreground">{t('amp.linkedSaveFirst')}</p>
)}
</div>
)}
</div>
</>
);
@@ -4237,6 +4304,35 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
{/* Grid chasing. Here rather than in the filter panel because it is set
up once: it decides whether locators learnt from decodes are KEPT
across restarts, not what the list shows right now. */}
{/* Spot lifetime. Applies to the cluster list AND every band map: the
spots are removed from the shared list rather than hidden, so the
setting cannot mean one thing in one view and another elsewhere. */}
<div className="border-t border-border/60 pt-3 space-y-2">
<div className="flex items-center gap-3 flex-wrap">
<span className="text-sm">{t('clu.spotTtl')}</span>
<div className="inline-flex rounded-md border border-border overflow-hidden text-xs">
{[0, 5, 10, 15, 30, 60].map((v) => (
<button key={v} type="button"
onClick={() => { setSpotTTL(v); setSpotTTLText(String(v)); SetSpotTTLMinutes(v).catch(() => {}); }}
className={cn('px-2.5 py-1.5 font-medium', spotTTL === v ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:bg-muted')}>
{v === 0 ? t('clu.spotTtlNever') : `${v}`}
</button>
))}
</div>
{/* Raw text in local state: binding the input straight to the
clamped number makes an empty field impossible to type into. */}
<Input className="h-8 w-20" value={spotTTLText}
onChange={(e) => {
const raw = e.target.value.replace(/[^0-9]/g, '');
setSpotTTLText(raw);
const n = Math.min(720, parseInt(raw, 10) || 0);
setSpotTTL(n);
SetSpotTTLMinutes(n).catch(() => {});
}} />
<span className="text-xs text-muted-foreground">{t('clu.spotTtlHint')}</span>
</div>
</div>
<div className="border-t border-border/60 pt-3 space-y-2">
<label className="flex items-start gap-2 text-sm cursor-pointer">
<Checkbox checked={chaseGrids} className="mt-0.5"
@@ -4251,6 +4347,17 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
)}
</div>
{/* Chase new its own option, NOT nested under grid chasing. Chasing
squares and chasing entities are different wants; they only share
the PSK Reporter feed, which either one brings up. */}
<div className="border-t border-border/60 pt-3 space-y-2">
<label className="flex items-start gap-2 text-sm cursor-pointer">
<Checkbox checked={chaseNew} className="mt-0.5"
onCheckedChange={(c) => { setChaseNew(!!c); SetChaseNew(!!c).catch(() => {}); }} />
<span>{t('chn.option')} <span className="text-xs text-muted-foreground">{t('chn.optionHelp')}</span></span>
</label>
</div>
{/* Band-opening watch. It lives HERE, with the cluster nodes, because
switching it on adds two of them the operator should see that
happen where it happens rather than find nodes they did not add. */}
@@ -4969,6 +5076,20 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
{t('es.autoUpload')}
</label>
{/* ON AIR is a live status, not an upload: it needs the rig
readable, not a QSO. Its own switch beside the upload one
rather than folded into it. */}
<label className="flex items-start gap-2 text-sm cursor-pointer">
<Checkbox className="mt-0.5"
checked={!!(hrdlog as any).on_air}
onCheckedChange={(c) => setHrdlog({ on_air: !!c } as any)}
/>
<span>
{t('es.hrdOnAir')}
<span className="block text-xs text-muted-foreground mt-0.5">{t('es.hrdOnAirHint')}</span>
</span>
</label>
<div className="grid grid-cols-[170px_1fr] gap-3 items-center">
<Label className="text-sm">{t('es.uploadTiming')}</Label>
<Select
@@ -6132,6 +6253,15 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</Button>
</div>
{/* A database downloaded by an older OpsLog still holds Connecticut's
planning regions instead of its counties. The download date cannot
show that, so say it outright. */}
{loaded && ulsStatus.needs_refresh && !ulsBusy && (
<div className="text-[11px] rounded border border-warning-border bg-warning-muted text-warning-muted-foreground px-2 py-1.5 leading-relaxed">
{t('uscty.stale')}
</div>
)}
{ulsProgress && (
<div className="space-y-1">
<div className="text-[11px] text-muted-foreground flex justify-between">
@@ -23,7 +23,12 @@ import {
type RotatorProps = { centerLat?: number | null; centerLon?: number | null; bearing?: number | null };
type Device = { id: string; type: string; name: string; host: string; user?: string; pass?: string; channels?: number; labels: string[] };
type Device = {
id: string; type: string; name: string; host: string;
user?: string; pass?: string; channels?: number; labels: string[];
// Generic HTTP board only. The per-relay URLs win over the patterns.
on_urls?: string[]; off_urls?: string[]; on_pattern?: string; off_pattern?: string;
};
type Relay = { number: number; label: string; on: boolean };
type DevStatus = { id: string; name: string; type: string; connected: boolean; error?: string; relays: Relay[] };
@@ -34,14 +39,20 @@ type DevStatus = { id: string; name: string; type: string; connected: boolean; e
const CARD_MIN = 430; // narrowest a card may get before "Auto" drops a column
const GRID_GAP = 16; // px between cards, both axes
const RELAY_COUNT: Record<string, number> = { webswitch: 5, kmtronic: 8, denkovi: 8, usbrelay: 8, dingtian: 2 };
const TYPE_LABEL: Record<string, string> = { webswitch: 'WebSwitch 1216H', kmtronic: 'KMTronic 8-relay', denkovi: 'Denkovi USB (FT245)', usbrelay: 'Denkovi USB (serial)', dingtian: 'Dingtian IOT relay' };
const RELAY_COUNT: Record<string, number> = { webswitch: 5, kmtronic: 8, denkovi: 8, usbrelay: 8, dingtian: 2, httpgen: 4 };
const TYPE_LABEL: Record<string, string> = { webswitch: 'WebSwitch 1216H', kmtronic: 'KMTronic 8-relay', denkovi: 'Denkovi USB (FT245)', usbrelay: 'Denkovi USB (serial)', dingtian: 'Dingtian IOT relay', httpgen: 'HTTP relay' };
// Relay count for a configured device: fixed by type, except Denkovi (4/8) and
// the generic USB-serial board, whose channel count the user picks.
// chanCount is the relay count for a device. It MUST agree with
// deviceRelayCount in app.go: the two decide how many labels and URL rows the
// editor shows and how many relays the driver is built for, and a type known to
// one and not the other silently pins the count to its fixed default — which is
// exactly what happened when the HTTP board was added here and not below.
const chanCount = (d: Device): number =>
(d.type === 'denkovi' || d.type === 'usbrelay') ? (d.channels && d.channels >= 1 ? d.channels : 8)
: d.type === 'dingtian' ? (d.channels && d.channels >= 1 ? d.channels : 2)
: d.type === 'httpgen' ? (d.channels && d.channels >= 1 ? d.channels : 4)
: (RELAY_COUNT[d.type] ?? 5);
function blankDevice(): Device {
@@ -77,6 +88,8 @@ function RotatorWidget({ hd, refetch, centerLat, centerLon, bearing, t }: Rotato
title={hd.ok ? t('station.online') : t('station.rotatorNoRead')} />
</div>
<div className="p-3 flex gap-4 items-start">
{/* The SP/LP readout lives INSIDE RotorCompass, so every compass in the
app carries it rather than each caller drawing its own. */}
<RotorCompass
bearing={bearing ?? null}
headings={hd.ok ? [hd.azimuth] : []}
@@ -673,6 +686,7 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
const isDingtian = device.type === 'dingtian';
const isDenkovi = device.type === 'denkovi';
const isUsbRelay = device.type === 'usbrelay';
const isHTTPGen = device.type === 'httpgen';
// COM ports for the generic USB-serial relay picker.
const [serialPorts, setSerialPorts] = useState<string[]>([]);
useEffect(() => {
@@ -724,6 +738,7 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
<SelectItem value="dingtian">Dingtian IOT relay (LAN / WiFi)</SelectItem>
<SelectItem value="denkovi">Denkovi USB (FT245 / D2XX)</SelectItem>
<SelectItem value="usbrelay">Denkovi USB (serial / COM)</SelectItem>
<SelectItem value="httpgen">{t('station.typeHttpGen')}</SelectItem>
</SelectContent>
</Select>
</div>
@@ -732,7 +747,7 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
<Input value={device.name} placeholder={TYPE_LABEL[device.type]} onChange={(e) => onChange({ ...device, name: e.target.value })} />
</div>
</div>
{(isDenkovi || isUsbRelay || isDingtian) && (
{(isDenkovi || isUsbRelay || isDingtian || isHTTPGen) && (
<div className="space-y-1 max-w-[10rem]">
<Label>{t('station.channels')}</Label>
<Select value={String(chanCount(device))} onValueChange={(v) => setChannels(parseInt(v, 10))}>
@@ -818,6 +833,57 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
)}
</div>
)}
{/* Generic HTTP board: a URL to switch each relay on and one to switch it
off. Two ways to fill it, and the per-relay one is why this type
exists — a hand-made switch often has URLs with nothing in common
between channels, which no pattern can express. */}
{isHTTPGen && (
<div className="space-y-3 rounded-md border border-border/60 p-3">
<div className="grid grid-cols-2 gap-3">
<div className="space-y-1">
<Label>{t('station.onPattern')}</Label>
<Input className="font-mono text-xs" placeholder="http://192.168.1.9/relay?n={relay}&state=on"
value={device.on_pattern ?? ''}
onChange={(e) => onChange({ ...device, on_pattern: e.target.value })} />
</div>
<div className="space-y-1">
<Label>{t('station.offPattern')}</Label>
<Input className="font-mono text-xs" placeholder="http://192.168.1.9/relay?n={relay}&state=off"
value={device.off_pattern ?? ''}
onChange={(e) => onChange({ ...device, off_pattern: e.target.value })} />
</div>
</div>
<div className="text-[10px] text-muted-foreground">{t('station.patternHint')}</div>
<div className="space-y-1">
<Label>{t('station.perRelayUrls')}</Label>
<div className="space-y-1">
{device.labels.map((_, i) => (
<div key={i} className="grid grid-cols-[2.5rem_1fr_1fr] items-center gap-2">
<span className="text-[11px] text-muted-foreground">{i + 1}</span>
<Input className="h-8 font-mono text-[11px]" placeholder={t('station.onUrlPh')}
value={device.on_urls?.[i] ?? ''}
onChange={(e) => {
const on_urls = [...(device.on_urls ?? [])];
while (on_urls.length < device.labels.length) on_urls.push('');
on_urls[i] = e.target.value;
onChange({ ...device, on_urls });
}} />
<Input className="h-8 font-mono text-[11px]" placeholder={t('station.offUrlPh')}
value={device.off_urls?.[i] ?? ''}
onChange={(e) => {
const off_urls = [...(device.off_urls ?? [])];
while (off_urls.length < device.labels.length) off_urls.push('');
off_urls[i] = e.target.value;
onChange({ ...device, off_urls });
}} />
</div>
))}
</div>
<div className="text-[10px] text-muted-foreground">{t('station.perRelayHint')}</div>
</div>
</div>
)}
<div className="space-y-1">
<Label>{t('station.labels')}</Label>
<div className="grid grid-cols-4 gap-2">
@@ -1,4 +1,4 @@
import { useCallback, useEffect, useState } from 'react';
import React, { useCallback, useEffect, useState } from 'react';
import { Plus, Trash2, Edit2, RefreshCcw, ArrowDownToLine, ArrowUpFromLine } from 'lucide-react';
import {
ListUDPIntegrations, SaveUDPIntegration, DeleteUDPIntegration, ReloadUDPIntegrations,
@@ -24,7 +24,13 @@ type UDPConfig = {
direction: 'inbound' | 'outbound';
name: string;
port: number;
service_type: 'wsjt' | 'adif' | 'n1mm' | 'remote_call' | 'db_updated' | 'pstrotator_freq' | 'n1mm_radioinfo';
service_type: 'wsjt' | 'adif' | 'n1mm' | 'remote_call' | 'db_updated' | 'pstrotator_freq' | 'n1mm_radioinfo' | 'wsjt_log' | 'custom';
// Custom rows only.
trigger?: string;
template?: string;
transport?: string;
url?: string;
line_end?: string;
multicast: boolean;
multicast_group: string;
destination_ip: string;
@@ -77,6 +83,28 @@ const SERVICE_TYPES: Array<{
hint: 'udpp.svcDbHint',
defaults: { port: 2333, destination_ip: '127.0.0.1' },
},
{
// Announces the QSO on the WSJT-X UDP interface instead of as plain text.
// Named for the protocol, not for one program: Logger32 is what it was
// built against, but anything listening on that interface takes it, and a
// label saying "Logger32" would have every other operator scroll past.
// 2250 is Logger32's first additional socket — a starting point, not a rule.
id: 'wsjt_log',
direction: 'outbound',
label: 'udpp.svcWsjtLogLabel',
hint: 'udpp.svcWsjtLogHint',
defaults: { port: 2250, destination_ip: '127.0.0.1' },
},
{
// The general case: the operator picks the moment and writes the message.
// Mainly for antenna switches, which are driven by a URL and want the band
// change — but nothing about it is specific to them.
id: 'custom',
direction: 'outbound',
label: 'udpp.svcCustomLabel',
hint: 'udpp.svcCustomHint',
defaults: { port: 12000, destination_ip: '127.0.0.1' },
},
{
id: 'pstrotator_freq',
direction: 'outbound',
@@ -93,6 +121,27 @@ const SERVICE_TYPES: Array<{
},
];
// The fields each trigger carries, and NOTHING else.
//
// This list is the point of the whole feature. A rotation has no frequency, a
// lookup has no report — and a placeholder the trigger cannot fill renders as
// nothing at all. Without seeing what is available, an operator writes {freq}
// on a band change, gets an empty string, and has no way to learn why. So the
// panel prints them under the box, for the trigger actually selected.
const TRIGGER_FIELDS: Record<string, string[]> = {
qso_logged: ['call', 'band', 'band_m', 'mode', 'freq_hz', 'freq_mhz', 'grid', 'name', 'country', 'dxcc', 'rst_s', 'rst_r', 'comment', 'date', 'time'],
rotator_goto: ['az', 'el', 'path'],
lookup_done: ['call', 'name', 'grid', 'country', 'qth', 'state', 'dxcc'],
band_change: ['band', 'band_m', 'freq_hz', 'freq_mhz', 'mode'],
};
const TRIGGERS = [
{ id: 'band_change', label: 'udpp.trgBand' },
{ id: 'qso_logged', label: 'udpp.trgQso' },
{ id: 'rotator_goto', label: 'udpp.trgRotator' },
{ id: 'lookup_done', label: 'udpp.trgLookup' },
];
type Props = { onError: (msg: string) => void };
export function UDPIntegrationsPanel({ onError }: Props) {
@@ -124,6 +173,7 @@ export function UDPIntegrationsPanel({ onError }: Props) {
destination_ip: preset.defaults.destination_ip ?? '',
enabled: true,
sort_order: items.filter((i) => i.direction === direction).length,
trigger: '', template: '', transport: 'udp', url: '', line_end: '',
});
}
@@ -376,7 +426,7 @@ function EditDialog({
</div>
)}
{draft.direction === 'outbound' && (
{draft.direction === 'outbound' && draft.service_type !== 'custom' && (
<div className="space-y-1">
<Label>{t('udpp.destinationIp')}</Label>
<Input
@@ -388,6 +438,10 @@ function EditDialog({
</div>
)}
{draft.service_type === 'custom' && (
<CustomFields draft={draft} setDraft={setDraft} />
)}
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox
checked={draft.enabled}
@@ -413,3 +467,108 @@ function EditDialog({
// silence unused-import for cn — kept for future styling tweaks
void cn;
// CustomFields is the editor for a custom outbound row: what fires it, how it
// leaves, and what it says.
function CustomFields({ draft, setDraft }: {
draft: UDPConfig;
setDraft: React.Dispatch<React.SetStateAction<UDPConfig>>;
}) {
const { t } = useI18n();
const fields = TRIGGER_FIELDS[draft.trigger ?? ''] ?? [];
const isURL = draft.transport === 'url';
return (
<div className="space-y-4 rounded-md border border-border/60 p-3">
<div className="grid grid-cols-2 gap-3">
<div className="space-y-1">
<Label>{t('udpp.trigger')}</Label>
<Select value={draft.trigger || 'band_change'} onValueChange={(v) => setDraft((d) => ({ ...d, trigger: v }))}>
<SelectTrigger><SelectValue /></SelectTrigger>
<SelectContent>
{TRIGGERS.map((x) => <SelectItem key={x.id} value={x.id}>{t(x.label)}</SelectItem>)}
</SelectContent>
</Select>
</div>
<div className="space-y-1">
<Label>{t('udpp.transport')}</Label>
<Select value={draft.transport || 'udp'} onValueChange={(v) => setDraft((d) => ({ ...d, transport: v }))}>
<SelectTrigger><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="udp">{t('udpp.transportUdp')}</SelectItem>
<SelectItem value="url">{t('udpp.transportUrl')}</SelectItem>
</SelectContent>
</Select>
</div>
</div>
{/* The one place these two features overlap. A relay board is a STATE per
band, not an event: Station Control tracks it, reads the boards at
startup and does not re-switch while the VFO moves inside a band. A
URL fired on a band change has none of that, and building the mapping
by hand here is work that is already done there. */}
{draft.trigger === 'band_change' && isURL && (
<div className="rounded border border-warning-border bg-warning-muted px-2 py-1.5 text-[11px] text-warning-muted-foreground leading-relaxed">
{t('udpp.relayInstead')}
</div>
)}
{isURL ? (
<div className="space-y-1">
<Label>{t('udpp.url')}</Label>
<Input
className="font-mono text-xs"
placeholder="http://192.168.1.50/antenna?band={band}"
value={draft.url ?? ''}
onChange={(e) => setDraft((d) => ({ ...d, url: e.target.value }))}
/>
<div className="text-[10px] text-muted-foreground">{t('udpp.urlHint')}</div>
</div>
) : (
<>
<div className="grid grid-cols-[1fr_auto] gap-2">
<div className="space-y-1">
<Label>{t('udpp.destinationIp')}</Label>
<Input
className="font-mono"
placeholder="127.0.0.1"
value={draft.destination_ip}
onChange={(e) => setDraft((d) => ({ ...d, destination_ip: e.target.value }))}
/>
</div>
<div className="space-y-1">
<Label>{t('udpp.lineEnd')}</Label>
<Select value={draft.line_end || 'none'} onValueChange={(v) => setDraft((d) => ({ ...d, line_end: v === 'none' ? '' : v }))}>
<SelectTrigger className="w-28"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="none">{t('udpp.lineEndNone')}</SelectItem>
<SelectItem value="lf">LF</SelectItem>
<SelectItem value="crlf">CRLF</SelectItem>
</SelectContent>
</Select>
</div>
</div>
<div className="space-y-1">
<Label>{t('udpp.template')}</Label>
<textarea
className="w-full min-h-[64px] rounded-md border border-input bg-background px-2 py-1.5 font-mono text-xs"
placeholder="<AZIMUT>{az}</AZIMUT>"
value={draft.template ?? ''}
onChange={(e) => setDraft((d) => ({ ...d, template: e.target.value }))}
/>
</div>
</>
)}
{/* What this trigger can actually fill in. */}
<div className="space-y-1">
<div className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('udpp.fieldsAvailable')}</div>
<div className="flex flex-wrap gap-1">
{fields.map((f) => (
<code key={f} className="rounded bg-muted px-1 py-px text-[10px] text-muted-foreground">{`{${f}}`}</code>
))}
</div>
<div className="text-[10px] text-muted-foreground">{t('udpp.fieldsHint')}</div>
</div>
</div>
);
}
@@ -13,6 +13,7 @@ import { Checkbox } from '@/components/ui/checkbox';
import { Label } from '@/components/ui/label';
import {
QSLPickPhotos, QSLGenerateProposals, QSLListTemplates, QSLGetTemplate,
QSLListOtherProfileTemplates, QSLCopyTemplateToActiveProfile,
QSLSaveTemplate, QSLSetDefaultTemplate, QSLDeleteTemplate, QSLSavePreview,
QSLPreviewDataURL, QSLResolvePreview, QSLStylePresets,
} from '../../../wailsjs/go/main/App';
@@ -59,6 +60,7 @@ export function QslDesignerModal({ open, onClose }: Props) {
const [busy, setBusy] = useState(false);
const [error, setError] = useState('');
const [saved, setSaved] = useState<QSLTemplateInfo[]>([]);
const [foreign, setForeign] = useState<any[]>([]);
const [previews, setPreviews] = useState<Record<number, string>>({});
const [presets, setPresets] = useState<QSLPresetInfo[]>([]);
const [fontFamilies, setFontFamilies] = useState<string[]>([]);
@@ -88,6 +90,8 @@ export function QslDesignerModal({ open, onClose }: Props) {
if (url) p[t.id] = url;
}));
setPreviews(p);
// The designs this profile cannot see, offered for copying.
try { setForeign(((await QSLListOtherProfileTemplates()) ?? []) as any[]); } catch { /* nothing to offer */ }
} catch (e) {
setError(String(e));
}
@@ -274,7 +278,29 @@ export function QslDesignerModal({ open, onClose }: Props) {
</section>
<section className="space-y-2">
<div className="flex items-center gap-3">
<h3 className="text-sm font-semibold">Saved templates</h3>
{/* Designs owned by another profile. A second profile is usually
the same operator with a different rig or locator — same
callsign, same cards — and redrawing one because the antenna
changed is work nobody should have to do. */}
{!!foreign.length && (
<select
value=""
onChange={async (e) => {
const id = parseInt(e.target.value, 10);
if (!id) return;
try { await QSLCopyTemplateToActiveProfile(id); await refreshSaved(); }
catch (err) { setError(String(err)); }
}}
className="h-7 rounded-md border border-border bg-background px-2 text-xs">
<option value="">Copy from another profile</option>
{foreign.map((f) => (
<option key={f.id} value={f.id}>{f.profile_name} {f.name}</option>
))}
</select>
)}
</div>
{!saved.length && <p className="text-xs text-muted-foreground">None yet.</p>}
<div className="grid grid-cols-3 gap-3">
{saved.map((t) => (
+38
View File
@@ -154,3 +154,41 @@ export function buildAwardRefs(qso: any, pickable: Array<{ code: string; field:
}
return out.join(';');
}
// COMPUTED_AWARD_FIELDS mirrors isComputedAwardField in app.go: awards whose
// reference is derived from the callsign and cty.dat, never assigned by hand.
//
// State and county are deliberately absent, there as here — an operator sets
// those themselves and they drive real predefined-list awards (WAS, WAJA, JCC).
const COMPUTED_AWARD_FIELDS = new Set([
'dxcc', 'cqz', 'ituz', 'prefix', 'callsign', 'cont', 'country', 'grid', 'grid4',
]);
// spotRefList turns a QSO's code→ref map into the strings a DX-cluster comment
// wants: ["SOTA HA/KM-018"].
//
// COMPUTED awards are dropped. A QSO's materialised references hold both kinds,
// and the derived ones — DXCC, WAC, WAZ, WPX — are exactly what every reader of
// the spot works out from the callsign anyway. Announcing "WAC EU WAZ 15 WPX HA5"
// spends the whole 30-character comment saying nothing, and buries the one
// reference worth chasing. Same rule as the QSO editor, which is why these are
// the references it lists on the LEFT and not in its read-only panel.
//
// fieldOf is award code → scanned field (from GetAwardDefs). A code missing from
// it is dropped rather than guessed: showing a reference on the air matters more
// than showing all of them.
//
// A code carrying several references (a two-fer park) yields one entry each, so
// a spot can take the one that fits instead of emitting a truncated pair.
// Shortest first: when they cannot all fit, more references beat fewer.
export function spotRefList(byCode: Record<string, string>, fieldOf: Record<string, string>): string[] {
const out: string[] = [];
for (const [code, refs] of Object.entries(byCode ?? {})) {
const field = fieldOf?.[code.toUpperCase()];
if (!field || COMPUTED_AWARD_FIELDS.has(field)) continue;
for (const ref of String(refs).split(',').map((s) => s.trim()).filter(Boolean)) {
out.push(`${code.toUpperCase()} ${ref.toUpperCase()}`);
}
}
return out.sort((a, b) => a.length - b.length || a.localeCompare(b));
}
File diff suppressed because one or more lines are too long
+78 -26
View File
@@ -1,41 +1,93 @@
// Row colouring for the log grid, by QSL / LoTW status.
// Row colouring for the log grid, by QSL status.
//
// The rules are ORDERED and the first match wins: a contact is usually several
// things at once, and one confirmed on LoTW and by card is confirmed, not
// "sent, awaiting reply".
// Four categories, each scoped to the channels the operator cares about —
// paper QSL, LoTW, eQSL, QRZ.com. The rules are ORDERED and the first match
// wins, because a contact is usually several of them at once.
export type RowColorRule = { id: string; color: string; enabled: boolean };
export type RowColorSettings = { enabled: boolean; rules: RowColorRule[] };
export type RowColorRule = {
id: string;
color: string;
enabled: boolean;
channels?: string[]; // empty = every channel
};
export type RowColorSettings = {
enabled: boolean;
style?: 'bar' | 'tint' | 'both';
intensity?: number;
bandmap_lotw?: boolean;
rules: RowColorRule[];
};
export const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] 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.
const FIELDS: Record<string, { sent: string; rcvd: string }> = {
qsl: { sent: 'qsl_sent', rcvd: 'qsl_rcvd' },
lotw: { sent: 'lotw_sent', rcvd: 'lotw_rcvd' },
eqsl: { sent: 'eqsl_sent', rcvd: 'eqsl_rcvd' },
qrz: { sent: 'qrzcom_qso_upload_status', rcvd: 'qrzcom_qso_download_status' },
};
// ADIF QSL fields are single letters. Y is the only one that means "yes";
// R (requested) and Q (queued) mean a card is owed, which is a different state
// and the one an operator is looking for when deciding what to post.
// 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.
const yes = (v: any) => String(v ?? '').trim().toUpperCase() === 'Y';
const owed = (v: any) => {
const s = String(v ?? '').trim().toUpperCase();
return s === 'R' || s === 'Q';
};
export function matchRowRule(q: any): string | null {
if (!q) return null;
if (yes(q.lotw_rcvd)) return 'confirmed_lotw';
if (yes(q.qsl_rcvd) || yes(q.eqsl_rcvd)) return 'confirmed_paper';
if (yes(q.qsl_sent) || yes(q.lotw_sent) || yes(q.eqsl_sent)) return 'sent_waiting';
// Any route still queued, not just the paper card. LoTW marks a pending upload
// as R, which is the commonest "not gone out yet" state in a digital log and
// was matching nothing at all while this only looked at qsl_sent.
if (owed(q.qsl_sent) || owed(q.lotw_sent) || owed(q.eqsl_sent)) return 'to_send';
const chansOf = (r: RowColorRule): readonly string[] =>
r.channels && r.channels.length ? r.channels : CHANNELS;
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]));
case 'sent':
return cs.some((c) => yes(q[FIELDS[c]?.sent]));
case 'to_send':
return cs.some((c) => 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]));
default:
return false;
}
}
// Walks the rules IN ORDER — the order is the priority, and the settings panel
// shows it numbered so it can be read rather than guessed.
export function matchRowRule(q: any, cfg: RowColorSettings | null): RowColorRule | null {
if (!q || !cfg?.rules) return null;
for (const r of cfg.rules) {
if (r.enabled && ruleMatches(q, r)) return r;
}
return null;
}
// The colour is applied as a TINT, not a fill. The grid is dark and a solid
// user-picked colour behind white text is unreadable at exactly the moment it
// matters — Logger32 gets away with it because its grid is white.
export function rowStyleFor(q: any, cfg: RowColorSettings | null): { backgroundColor: string } | undefined {
// The colour is never a fill by default.
//
// A log where nearly every contact has SOME QSL state ends up with every row
// painted, and colour that is always present stops being information. The
// default is a stripe down the left edge; a tint is offered at a chosen strength.
export function rowStyleFor(q: any, cfg: RowColorSettings | null): Record<string, string> | undefined {
if (!cfg?.enabled) return undefined;
const id = matchRowRule(q);
if (!id) return undefined;
const rule = cfg.rules?.find((r) => r.id === id);
if (!rule?.enabled || !rule.color) return undefined;
return { backgroundColor: `color-mix(in srgb, ${rule.color} 24%, transparent)` };
const rule = matchRowRule(q, cfg);
if (!rule?.color) return undefined;
const style = cfg.style ?? 'bar';
const pct = Math.max(5, Math.min(45, cfg.intensity ?? 12));
const out: Record<string, string> = {};
if (style === 'tint' || style === 'both') {
out.backgroundColor = `color-mix(in srgb, ${rule.color} ${pct}%, transparent)`;
}
if (style === 'bar' || style === 'both') {
// inset shadow rather than a border: a border would shift the cells three
// pixels on coloured rows only, and the columns would stop lining up.
out.boxShadow = `inset 3px 0 0 ${rule.color}`;
}
return out;
}
+13
View File
@@ -74,3 +74,16 @@ export function applySpotDisplay<T extends Entry>(s: T, o: SpotDisplayOptions):
}
return e;
}
// spotIsWorked answers "does this spot bring me nothing?", which is what the
// "hide worked" filter is really asking.
//
// The extra markers are ORTHOGONAL to the entity status — a spot can be a worked
// entity AND a new park, prefix, county or grid — so they win. Without that, a
// new prefix in an entity worked years ago vanished the moment the filter went
// on, which is the opposite of what an operator hunting prefixes wants.
export function spotIsWorked(e: Entry): boolean {
if (!e) return false;
if (e.new_pota || e.new_county || e.new_pfx || e.new_grid) return false;
return !!e.worked_call || e.status === 'worked';
}
+2 -2
View File
@@ -6,14 +6,14 @@ import { GetUIPref } from '../../wailsjs/go/main/App';
// CSS variables in style.css key off of. 'auto' follows the OS light/dark
// preference. The choice is persisted (localStorage + portable UI pref, so it
// travels with the data/ folder like the language).
export type ThemeChoice = 'auto' | 'light-warm' | 'light-cool' | 'light-sage' | 'light-nordic'
export type ThemeChoice = 'auto' | 'light-warm' | 'light-cool' | 'light-sage' | 'light-nordic' | 'sahara'
| 'dim-slate' | 'dark-warm' | 'dark-graphite' | 'dark-indigo' | 'dark-teal' | 'dark-plum' | 'high-contrast';
// Selectable, concrete themes (excludes 'auto') in display order: lights first,
// then darks, with high-contrast last — it is an accessibility choice, not a
// taste one, and listing it among the moods buries it.
export const CONCRETE_THEMES: Exclude<ThemeChoice, 'auto'>[] = [
'light-warm', 'light-cool', 'light-sage', 'light-nordic',
'light-warm', 'light-cool', 'light-sage', 'light-nordic', 'sahara',
'dim-slate', 'dark-warm', 'dark-graphite', 'dark-indigo', 'dark-teal', 'dark-plum',
'high-contrast',
];
+1
View File
@@ -17,6 +17,7 @@ const PORTABLE_KEYS = [
'opslog.autofocusWB', // auto-focus Worked-before
'hamlog.filterPresets', // Filter Builder saved presets
'opslog.showRotor', // rotor compass shown next to the keyers
'opslog.showChaseNew', // Chase New panel shown next to the keyers
'opslog.showAmpWidget', // amplifier widget shown next to the keyers
'opslog.ampSel.widget', // which amplifier that widget shows ("all" or an amp id)
'opslog.showBeamOnMap', // antenna beam lobe drawn on the Main map
+78 -1
View File
@@ -775,6 +775,82 @@
color-scheme: light;
}
/* ---- Theme 1e: Sahara — Warm light, taken a step deeper --------------------
Warm light's cream is kept for panels and the entry strip (#faf6eb, the one
surface an operator stares at while typing a call), but the page behind them
and every toolbar, tab bar and table header go one shade further into the
sand. That was the whole request: same family, just a little darker, so the
cream panels lift clearly instead of blending into the page.
Ink is a deep warm brown rather than black: pure black on sand glares.
The accent moves from Warm light's burnt orange to ochre to keep the two
themes apart at a glance in the theme picker. ---------------------------- */
[data-theme="sahara"] {
--background: #e6ded0; /* parchment — the page */
--foreground: #3a3227; /* warm brown-ink */
--card: #f3eee2; /* panels, entry strip, log rows */
--card-foreground: #3a3227;
--popover: #f3eee2;
--popover-foreground: #3a3227;
--primary: #c4501e; /* terracotta — buttons and the frequency */
--primary-foreground: #fdf8f0;
--secondary: #ded5c4;
--secondary-foreground: #3a3227;
--muted: #ded5c4; /* toolbars / tab bar / table headers */
--muted-foreground: #6a5f4e; /* readable on both parchments */
--accent: #ecd9c0; /* warm highlight */
--accent-foreground: #7a3410;
--destructive: #b3401b;
--destructive-foreground: #ffffff;
--destructive-muted: #f7e4da;
--destructive-muted-foreground: #8f3315;
--border: #cdc2ae; /* one step down, so edges read without lines */
--input: #cdc2ae;
--ring: #c4501e; /* the accent, so focus matches the buttons */
--success: #15803d;
--success-foreground: #ffffff;
--success-muted: #dcf3e1;
--success-muted-foreground: #14532d;
--success-border: #86d99f;
--warning: #b45309;
--warning-foreground: #ffffff;
--warning-muted: #fbeacd;
--warning-muted-foreground: #7c3d05;
--warning-border: #e8b96a;
--caution: #a16207;
--caution-foreground: #1c1917;
--caution-muted: #f7edcb;
--caution-muted-foreground: #713f12;
--caution-border: #e0c069;
--danger: #be123c;
--danger-foreground: #ffffff;
--danger-muted: #fbe3e8;
--danger-muted-foreground: #9f1239;
--danger-border: #ee9aac;
--info: #0369a1;
--info-foreground: #ffffff;
--info-muted: #e0eef6;
--info-muted-foreground: #075985;
--info-border: #86c5e4;
/* Band/mode matrix — the app's blues kept, on a sand neutral so an empty slot
recedes into the grid instead of punching a hole in it. */
--mx-call-conf: #15803d;
--mx-call-work: #7fd6a4;
--mx-dx-conf: #3730a3;
--mx-dx-work: #a5b4fc;
--mx-none: #ded5c4;
--scrollbar-thumb: #c2b6a0;
--scrollbar-thumb-hover: #a5977e;
--card-shadow: 0 1px 2px rgba(58, 50, 39, 0.06), 0 0 0 1px rgba(58, 50, 39, 0.03);
color-scheme: light;
}
/* ── Data-viz palette (Statistics dashboard) ────────────────────────────────
A VALIDATED categorical palette, not hand-picked: the slot ORDER is what makes
it colour-blind-safe (worst adjacent ΔE 24.2 light / 10.3 dark), so never
@@ -793,7 +869,8 @@
[data-theme="light-warm"],
[data-theme="light-cool"],
[data-theme="light-sage"],
[data-theme="light-nordic"] {
[data-theme="light-nordic"],
[data-theme="sahara"] {
--chart-1: #2a78d6; /* blue — default single-series hue */
--chart-2: #1baf7a; /* aqua */
--chart-3: #eda100; /* yellow */
+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.24.8';
export const APP_VERSION = '0.25.2';
// Author / credits, shown in Help -> About.
export const APP_AUTHOR = 'F4BPO';
+28
View File
@@ -176,6 +176,8 @@ export function DiscoverFlexRadios():Promise<Array<cat.FlexRadio>>;
export function DismissAwardUpdate(arg1:string):Promise<void>;
export function DismissQSLViaRepair():Promise<void>;
export function DownloadAllReferenceLists():Promise<string>;
export function DownloadAndApplyUpdate(arg1:string):Promise<void>;
@@ -404,8 +406,12 @@ export function GetCatalogCodes():Promise<Array<string>>;
export function GetChangelog():Promise<Array<main.ChangelogEntry>>;
export function GetChaseNew():Promise<boolean>;
export function GetChaseNewGrids():Promise<boolean>;
export function GetChaseNewSpots():Promise<Array<main.ChaseNewSpot>>;
export function GetChatHistory(arg1:number):Promise<Array<main.ChatMessage>>;
export function GetClublogCtyInfo():Promise<main.ClublogCtyInfo>;
@@ -446,6 +452,8 @@ export function GetGridCacheStatus():Promise<main.GridCacheStatus>;
export function GetIcomState():Promise<cat.IcomTXState>;
export function GetLinkedAmps():Promise<Array<string>>;
export function GetListsSettings():Promise<main.ListsSettings>;
export function GetLiveOpenings():Promise<Array<bandopen.Opening>>;
@@ -506,6 +514,8 @@ export function GetSlotStats():Promise<qso.SlotStats>;
export function GetSolarData():Promise<solar.Data>;
export function GetSpotTTLMinutes():Promise<number>;
export function GetStartupStatus():Promise<main.StartupStatus>;
export function GetStationDevices():Promise<Array<main.StationDevice>>;
@@ -766,6 +776,8 @@ export function PopulateBuiltinReferences(arg1:string):Promise<number>;
export function PublishLogNow():Promise<string>;
export function QSLCopyTemplateToActiveProfile(arg1:number):Promise<number>;
export function QSLDefaultTemplateID():Promise<number>;
export function QSLDeleteTemplate(arg1:number):Promise<void>;
@@ -780,6 +792,8 @@ export function QSLGetEmailTemplates():Promise<main.QSLEmailTemplates>;
export function QSLGetTemplate(arg1:number):Promise<string>;
export function QSLListOtherProfileTemplates():Promise<Array<main.QSLForeignTemplate>>;
export function QSLListTemplates():Promise<Array<main.QSLTemplateInfo>>;
export function QSLPhotoDataURL(arg1:number,arg2:string):Promise<string>;
@@ -800,6 +814,8 @@ export function QSLSetDefaultTemplate(arg1:number):Promise<void>;
export function QSLStylePresets():Promise<Array<main.QSLPresetInfo>>;
export function QSLViaRepairStatus():Promise<main.QSLViaRepairStatus>;
export function QSOAudioBegin():Promise<boolean>;
export function QSOAudioCancel():Promise<void>;
@@ -838,6 +854,8 @@ export function RenameLogbook(arg1:string):Promise<void>;
export function RenderEQSL(arg1:number,arg2:number):Promise<string>;
export function RepairQSLVia():Promise<main.QSLViaRepairResult>;
export function ReplaceAwardReferences(arg1:string,arg2:Array<awardref.Ref>):Promise<number>;
export function ReportLiveActivity(arg1:number,arg2:string,arg3:string):Promise<void>;
@@ -858,6 +876,8 @@ export function RevealDataFolder():Promise<void>;
export function RotatorGoTo(arg1:number,arg2:number):Promise<void>;
export function RotatorGoToPath(arg1:number,arg2:number,arg3:string):Promise<void>;
export function RotatorPark():Promise<void>;
export function RotatorStop():Promise<void>;
@@ -978,6 +998,8 @@ export function SetCIVTrace(arg1:boolean):Promise<void>;
export function SetCWDecoderPitch(arg1:number):Promise<void>;
export function SetChaseNew(arg1:boolean):Promise<void>;
export function SetChaseNewGrids(arg1:boolean):Promise<void>;
export function SetClublogCtyEnabled(arg1:boolean):Promise<void>;
@@ -986,12 +1008,16 @@ export function SetClublogMostWantedEnabled(arg1:boolean):Promise<void>;
export function SetClusterAutoConnect(arg1:boolean):Promise<void>;
export function SetCompactHeight(arg1:number):Promise<void>;
export function SetCompactMode(arg1:boolean):Promise<void>;
export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
export function SetKenwoodKeySpeed(arg1:number):Promise<void>;
export function SetLinkedAmps(arg1:Array<string>):Promise<void>;
export function SetMotorFollow(arg1:boolean,arg2:number,arg3:string):Promise<void>;
export function SetOpsLogQSLReceived(arg1:number,arg2:boolean):Promise<void>;
@@ -1000,6 +1026,8 @@ export function SetPassphrase(arg1:string):Promise<void>;
export function SetScpEnabled(arg1:boolean):Promise<void>;
export function SetSpotTTLMinutes(arg1:number):Promise<void>;
export function SetTelemetryEnabled(arg1:boolean):Promise<void>;
export function SetUIPref(arg1:string,arg2:string):Promise<void>;
+56
View File
@@ -294,6 +294,10 @@ export function DismissAwardUpdate(arg1) {
return window['go']['main']['App']['DismissAwardUpdate'](arg1);
}
export function DismissQSLViaRepair() {
return window['go']['main']['App']['DismissQSLViaRepair']();
}
export function DownloadAllReferenceLists() {
return window['go']['main']['App']['DownloadAllReferenceLists']();
}
@@ -750,10 +754,18 @@ export function GetChangelog() {
return window['go']['main']['App']['GetChangelog']();
}
export function GetChaseNew() {
return window['go']['main']['App']['GetChaseNew']();
}
export function GetChaseNewGrids() {
return window['go']['main']['App']['GetChaseNewGrids']();
}
export function GetChaseNewSpots() {
return window['go']['main']['App']['GetChaseNewSpots']();
}
export function GetChatHistory(arg1) {
return window['go']['main']['App']['GetChatHistory'](arg1);
}
@@ -834,6 +846,10 @@ export function GetIcomState() {
return window['go']['main']['App']['GetIcomState']();
}
export function GetLinkedAmps() {
return window['go']['main']['App']['GetLinkedAmps']();
}
export function GetListsSettings() {
return window['go']['main']['App']['GetListsSettings']();
}
@@ -954,6 +970,10 @@ export function GetSolarData() {
return window['go']['main']['App']['GetSolarData']();
}
export function GetSpotTTLMinutes() {
return window['go']['main']['App']['GetSpotTTLMinutes']();
}
export function GetStartupStatus() {
return window['go']['main']['App']['GetStartupStatus']();
}
@@ -1474,6 +1494,10 @@ export function PublishLogNow() {
return window['go']['main']['App']['PublishLogNow']();
}
export function QSLCopyTemplateToActiveProfile(arg1) {
return window['go']['main']['App']['QSLCopyTemplateToActiveProfile'](arg1);
}
export function QSLDefaultTemplateID() {
return window['go']['main']['App']['QSLDefaultTemplateID']();
}
@@ -1502,6 +1526,10 @@ export function QSLGetTemplate(arg1) {
return window['go']['main']['App']['QSLGetTemplate'](arg1);
}
export function QSLListOtherProfileTemplates() {
return window['go']['main']['App']['QSLListOtherProfileTemplates']();
}
export function QSLListTemplates() {
return window['go']['main']['App']['QSLListTemplates']();
}
@@ -1542,6 +1570,10 @@ export function QSLStylePresets() {
return window['go']['main']['App']['QSLStylePresets']();
}
export function QSLViaRepairStatus() {
return window['go']['main']['App']['QSLViaRepairStatus']();
}
export function QSOAudioBegin() {
return window['go']['main']['App']['QSOAudioBegin']();
}
@@ -1618,6 +1650,10 @@ export function RenderEQSL(arg1, arg2) {
return window['go']['main']['App']['RenderEQSL'](arg1, arg2);
}
export function RepairQSLVia() {
return window['go']['main']['App']['RepairQSLVia']();
}
export function ReplaceAwardReferences(arg1, arg2) {
return window['go']['main']['App']['ReplaceAwardReferences'](arg1, arg2);
}
@@ -1658,6 +1694,10 @@ export function RotatorGoTo(arg1, arg2) {
return window['go']['main']['App']['RotatorGoTo'](arg1, arg2);
}
export function RotatorGoToPath(arg1, arg2, arg3) {
return window['go']['main']['App']['RotatorGoToPath'](arg1, arg2, arg3);
}
export function RotatorPark() {
return window['go']['main']['App']['RotatorPark']();
}
@@ -1898,6 +1938,10 @@ export function SetCWDecoderPitch(arg1) {
return window['go']['main']['App']['SetCWDecoderPitch'](arg1);
}
export function SetChaseNew(arg1) {
return window['go']['main']['App']['SetChaseNew'](arg1);
}
export function SetChaseNewGrids(arg1) {
return window['go']['main']['App']['SetChaseNewGrids'](arg1);
}
@@ -1914,6 +1958,10 @@ export function SetClusterAutoConnect(arg1) {
return window['go']['main']['App']['SetClusterAutoConnect'](arg1);
}
export function SetCompactHeight(arg1) {
return window['go']['main']['App']['SetCompactHeight'](arg1);
}
export function SetCompactMode(arg1) {
return window['go']['main']['App']['SetCompactMode'](arg1);
}
@@ -1926,6 +1974,10 @@ export function SetKenwoodKeySpeed(arg1) {
return window['go']['main']['App']['SetKenwoodKeySpeed'](arg1);
}
export function SetLinkedAmps(arg1) {
return window['go']['main']['App']['SetLinkedAmps'](arg1);
}
export function SetMotorFollow(arg1, arg2, arg3) {
return window['go']['main']['App']['SetMotorFollow'](arg1, arg2, arg3);
}
@@ -1942,6 +1994,10 @@ export function SetScpEnabled(arg1) {
return window['go']['main']['App']['SetScpEnabled'](arg1);
}
export function SetSpotTTLMinutes(arg1) {
return window['go']['main']['App']['SetSpotTTLMinutes'](arg1);
}
export function SetTelemetryEnabled(arg1) {
return window['go']['main']['App']['SetTelemetryEnabled'](arg1);
}
+122
View File
@@ -1331,6 +1331,7 @@ export namespace extsvc {
upload_flags: string[];
write_log: boolean;
auto_upload: boolean;
on_air: boolean;
upload_mode: string;
static createFrom(source: any = {}) {
@@ -1355,6 +1356,7 @@ export namespace extsvc {
this.upload_flags = source["upload_flags"];
this.write_log = source["write_log"];
this.auto_upload = source["auto_upload"];
this.on_air = source["on_air"];
this.upload_mode = source["upload_mode"];
}
}
@@ -2129,6 +2131,44 @@ export namespace main {
this.fr = source["fr"];
}
}
export class ChaseNewSpot {
call: string;
band: string;
mode: string;
freq_hz: number;
grid: string;
country?: string;
cont?: string;
dist_km: number;
bearing: number;
status?: string;
new_pfx?: boolean;
new_grid?: boolean;
lotw?: boolean;
at: string;
static createFrom(source: any = {}) {
return new ChaseNewSpot(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.call = source["call"];
this.band = source["band"];
this.mode = source["mode"];
this.freq_hz = source["freq_hz"];
this.grid = source["grid"];
this.country = source["country"];
this.cont = source["cont"];
this.dist_km = source["dist_km"];
this.bearing = source["bearing"];
this.status = source["status"];
this.new_pfx = source["new_pfx"];
this.new_grid = source["new_grid"];
this.lotw = source["lotw"];
this.at = source["at"];
}
}
export class ChatMessage {
id: number;
operator: string;
@@ -2541,6 +2581,7 @@ export namespace main {
primary: string;
failsafe: string;
download_images: boolean;
qrz_prefer_nickname: boolean;
cache_ttl_days: number;
static createFrom(source: any = {}) {
@@ -2556,6 +2597,7 @@ export namespace main {
this.primary = source["primary"];
this.failsafe = source["failsafe"];
this.download_images = source["download_images"];
this.qrz_prefer_nickname = source["qrz_prefer_nickname"];
this.cache_ttl_days = source["cache_ttl_days"];
}
}
@@ -2697,6 +2739,7 @@ export namespace main {
sent_date: string;
rcvd_date: string;
via: string;
rcvd_via: string;
notes: string;
comment: string;
@@ -2711,6 +2754,7 @@ export namespace main {
this.sent_date = source["sent_date"];
this.rcvd_date = source["rcvd_date"];
this.via = source["via"];
this.rcvd_via = source["rcvd_via"];
this.notes = source["notes"];
this.comment = source["comment"];
}
@@ -2781,6 +2825,24 @@ export namespace main {
this.data_b64 = source["data_b64"];
}
}
export class QSLForeignTemplate {
id: number;
name: string;
profile_id: number;
profile_name: string;
static createFrom(source: any = {}) {
return new QSLForeignTemplate(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.id = source["id"];
this.name = source["name"];
this.profile_id = source["profile_id"];
this.profile_name = source["profile_name"];
}
}
export class QSLPresetInfo {
name: string;
label: string;
@@ -2837,6 +2899,32 @@ export namespace main {
this.updated_at = source["updated_at"];
}
}
export class QSLViaRepairResult {
moved: number;
static createFrom(source: any = {}) {
return new QSLViaRepairResult(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.moved = source["moved"];
}
}
export class QSLViaRepairStatus {
affected: number;
asked: boolean;
static createFrom(source: any = {}) {
return new QSLViaRepairStatus(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.affected = source["affected"];
this.asked = source["asked"];
}
}
export class QSOAwardRef {
code: string;
ref: string;
@@ -2996,6 +3084,7 @@ export namespace main {
id: string;
color: string;
enabled: boolean;
channels: string[];
static createFrom(source: any = {}) {
return new RowColorRule(source);
@@ -3006,10 +3095,15 @@ export namespace main {
this.id = source["id"];
this.color = source["color"];
this.enabled = source["enabled"];
this.channels = source["channels"];
}
}
export class RowColorSettings {
enabled: boolean;
style: string;
intensity: number;
bandmap_lotw: boolean;
configured: boolean;
rules: RowColorRule[];
static createFrom(source: any = {}) {
@@ -3019,6 +3113,10 @@ export namespace main {
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.enabled = source["enabled"];
this.style = source["style"];
this.intensity = source["intensity"];
this.bandmap_lotw = source["bandmap_lotw"];
this.configured = source["configured"];
this.rules = this.convertValues(source["rules"], RowColorRule);
}
@@ -3175,6 +3273,10 @@ export namespace main {
pass?: string;
channels?: number;
labels: string[];
on_urls?: string[];
off_urls?: string[];
on_pattern?: string;
off_pattern?: string;
static createFrom(source: any = {}) {
return new StationDevice(source);
@@ -3190,6 +3292,10 @@ export namespace main {
this.pass = source["pass"];
this.channels = source["channels"];
this.labels = source["labels"];
this.on_urls = source["on_urls"];
this.off_urls = source["off_urls"];
this.on_pattern = source["on_pattern"];
this.off_pattern = source["off_pattern"];
}
}
export class StationRelay {
@@ -3330,6 +3436,7 @@ export namespace main {
export class ULSStatusResult {
count: number;
updated_at: string;
needs_refresh: boolean;
static createFrom(source: any = {}) {
return new ULSStatusResult(source);
@@ -3339,6 +3446,7 @@ export namespace main {
if ('string' === typeof source) source = JSON.parse(source);
this.count = source["count"];
this.updated_at = source["updated_at"];
this.needs_refresh = source["needs_refresh"];
}
}
export class UltrabeamSettings {
@@ -4296,6 +4404,8 @@ export namespace qso {
qsl_sent_date?: string;
qsl_rcvd_date?: string;
qsl_via?: string;
qsl_sent_via?: string;
qsl_rcvd_via?: string;
qsl_msg?: string;
qslmsg_rcvd?: string;
lotw_sent?: string;
@@ -4435,6 +4545,8 @@ export namespace qso {
this.qsl_sent_date = source["qsl_sent_date"];
this.qsl_rcvd_date = source["qsl_rcvd_date"];
this.qsl_via = source["qsl_via"];
this.qsl_sent_via = source["qsl_sent_via"];
this.qsl_rcvd_via = source["qsl_rcvd_via"];
this.qsl_msg = source["qsl_msg"];
this.qslmsg_rcvd = source["qslmsg_rcvd"];
this.lotw_sent = source["lotw_sent"];
@@ -5039,6 +5151,11 @@ export namespace udp {
destination_ip: string;
enabled: boolean;
sort_order: number;
trigger: string;
template: string;
transport: string;
url: string;
line_end: string;
static createFrom(source: any = {}) {
return new Config(source);
@@ -5056,6 +5173,11 @@ export namespace udp {
this.destination_ip = source["destination_ip"];
this.enabled = source["enabled"];
this.sort_order = source["sort_order"];
this.trigger = source["trigger"];
this.template = source["template"];
this.transport = source["transport"];
this.url = source["url"];
this.line_end = source["line_end"];
}
}
+74
View File
@@ -0,0 +1,74 @@
package main
// HRDLog "ON AIR" — publishing the live frequency, mode and rig on hrdlog.net,
// so the site shows "F4BPO is on air 14,074,000 FT8 IC-7300" while the station
// is operating.
//
// The endpoint and its field names come from HRDLog's own library
// (github.com/iw1qlh/HRDLOG-net-library), not from reading someone's traffic.
import (
"context"
"strings"
"time"
"hamlog/internal/applog"
"hamlog/internal/extsvc"
)
// onAirEvery is how often the status is refreshed. HRDLog drops a station from
// the on-air list when it stops hearing from it, so this is a heartbeat, not a
// change notification.
const onAirEvery = 2 * time.Minute
// hrdlogOnAirLoop publishes while the option is on and the rig is readable.
func (a *App) hrdlogOnAirLoop() {
defer func() { _ = recover() }() // never crash the app from a status broadcast
t := time.NewTicker(onAirEvery)
defer t.Stop()
for range t.C {
a.publishHRDLogOnAir()
}
}
// publishHRDLogOnAir sends one update. Silent when switched off, unconfigured,
// or when the rig has nothing to report — an announcement with no frequency
// would say the operator is on air on 0 Hz.
func (a *App) publishHRDLogOnAir() {
cfg := a.loadExternalServices().HRDLog
if !cfg.OnAir || strings.TrimSpace(cfg.Callsign) == "" || strings.TrimSpace(cfg.Code) == "" {
return
}
if a.cat == nil {
return
}
st := a.cat.State()
if !st.Connected || st.FreqHz <= 0 {
return
}
// The rig NAME as the operator knows it — that string is what the site
// displays. The active profile's MyRig first, since it is what every QSO is
// stamped with; the CAT backend's own model only when the profile has none.
radio := ""
if a.profiles != nil {
if pr, err := a.profiles.Active(a.ctx); err == nil {
radio = strings.TrimSpace(pr.MyRig)
}
}
if radio == "" {
radio = strings.TrimSpace(st.Rig)
}
ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
defer cancel()
msg, err := extsvc.SendHRDLogOnAir(ctx, nil, cfg.Callsign, cfg.Code, st.FreqHz, st.Mode, radio)
if err != nil {
// Logged, never surfaced: this is a broadcast the operator did not ask
// for at this instant, and a toast every two minutes on a flaky link
// would be worse than the missing status.
applog.Printf("hrdlog on-air: %v (%s)", err, msg)
return
}
applog.Printf("hrdlog on-air: %s %.3f MHz %s (%s) — %s",
cfg.Callsign, float64(st.FreqHz)/1e6, st.Mode, radio, msg)
}
+46
View File
@@ -0,0 +1,46 @@
package adif
import "testing"
// ADIF defines CNTY as "STATE,COUNTY" — "GA,BARROW". OpsLog exported the bare
// county, which a receiving logger cannot resolve: county names repeat across
// states, and there is a Washington County in thirty of them.
func TestADIFCountyFormat(t *testing.T) {
for _, tc := range []struct{ state, county, want string }{
{"GA", "BARROW", "GA,BARROW"},
{"ga", "Barrow", "GA,Barrow"}, // the state is a code, upper-cased; the name is not touched
{"", "BARROW", "BARROW"}, // no state known: a bare name beats nothing
{"GA", "", ""}, // no county: nothing to write
{"GA", "GA,BARROW", "GA,BARROW"}, // already formatted — never double the prefix
{" GA ", " BARROW ", "GA,BARROW"},
} {
if got := adifCounty(tc.state, tc.county); got != tc.want {
t.Errorf("adifCounty(%q, %q) = %q, want %q", tc.state, tc.county, got, tc.want)
}
}
}
// And the mirror: a file from a logger that follows the standard must fill both
// columns, while a file carrying the bare county still imports unchanged.
func TestSplitADIFCounty(t *testing.T) {
for _, tc := range []struct{ in, county, state string }{
{"GA,BARROW", "BARROW", "GA"},
{"ga, Barrow", "Barrow", "GA"},
{"BARROW", "BARROW", ""}, // the old OpsLog form, and many other loggers
{"", "", ""},
{" ", "", ""},
} {
c, s := splitADIFCounty(tc.in)
if c != tc.county || s != tc.state {
t.Errorf("splitADIFCounty(%q) = (%q, %q), want (%q, %q)", tc.in, c, s, tc.county, tc.state)
}
}
}
// Round trip: what OpsLog writes, OpsLog reads back to the same two values.
func TestCountyRoundTrip(t *testing.T) {
c, s := splitADIFCounty(adifCounty("GA", "BARROW"))
if c != "BARROW" || s != "GA" {
t.Errorf("round trip gave (%q, %q), want (BARROW, GA)", c, s)
}
}
+32 -2
View File
@@ -221,7 +221,7 @@ func writeRecord(bw *bufio.Writer, q qso.QSO, includeApp bool, allow map[string]
w("VUCC_GRIDS", q.VUCCGrids)
w("COUNTRY", q.Country)
w("STATE", q.State)
w("CNTY", q.County)
w("CNTY", adifCounty(q.State, q.County))
wi("DXCC", q.DXCC)
w("CONT", q.Continent)
wi("CQZ", q.CQZ)
@@ -241,6 +241,14 @@ func writeRecord(bw *bufio.Writer, q qso.QSO, includeApp bool, allow map[string]
w("QSLSDATE", q.QSLSentDate)
w("QSLRDATE", q.QSLRcvdDate)
w("QSL_VIA", q.QSLVia)
// M (manager) is import-only in the QSL Via enumeration: we keep it when a
// file gives it to us, but a file we write must not carry it.
if q.QSLSentVia != QSLViaManager {
w("QSL_SENT_VIA", q.QSLSentVia)
}
if q.QSLRcvdVia != QSLViaManager {
w("QSL_RCVD_VIA", q.QSLRcvdVia)
}
w("QSLMSG", q.QSLMsg)
w("QSLMSG_RCVD", q.QSLMsgRcvd)
w("LOTW_QSL_SENT", q.LOTWSent)
@@ -285,7 +293,7 @@ func writeRecord(bw *bufio.Writer, q qso.QSO, includeApp bool, allow map[string]
w("MY_GRIDSQUARE_EXT", q.MyGridExt)
w("MY_COUNTRY", q.MyCountry)
w("MY_STATE", q.MyState)
w("MY_CNTY", q.MyCounty)
w("MY_CNTY", adifCounty(q.MyState, q.MyCounty))
w("MY_IOTA", q.MyIOTA)
w("MY_SOTA_REF", q.MySOTARef)
w("MY_POTA_REF", q.MyPOTARef)
@@ -413,3 +421,25 @@ func modeForExport(mode, submode string) (string, string) {
}
return mode, ""
}
// adifCounty renders CNTY the way ADIF specifies: "STATE,COUNTY", e.g.
// "GA,BARROW".
//
// OpsLog stores the two apart, and exported only the county — which a receiving
// logger cannot resolve, since county names repeat across states (there is a
// Washington County in thirty of them). The award engine here was never
// affected because it reads the columns, not the ADIF; the damage was to
// everyone we send a file to.
//
// The county alone is still written when no state is known: a bare name is
// worth more than nothing, and inventing a prefix would be worse than either.
// A county that ALREADY carries a comma is passed through — it has been
// formatted once, and doubling the prefix would corrupt it.
func adifCounty(state, county string) string {
c := strings.TrimSpace(county)
s := strings.TrimSpace(state)
if c == "" || s == "" || strings.Contains(c, ",") {
return c
}
return strings.ToUpper(s) + "," + c
}
+2 -2
View File
@@ -135,8 +135,8 @@ var Fields = []FieldDef{
{Name: "QSLSDATE", Kind: KindDate, Category: "QSL", Promoted: true},
{Name: "QSLRDATE", Kind: KindDate, Category: "QSL", Promoted: true},
{Name: "QSL_VIA", Kind: KindText, Category: "QSL", Promoted: true},
{Name: "QSL_SENT_VIA", Kind: KindEnum, Category: "QSL"},
{Name: "QSL_RCVD_VIA", Kind: KindEnum, Category: "QSL"},
{Name: "QSL_SENT_VIA", Kind: KindEnum, Category: "QSL", Promoted: true},
{Name: "QSL_RCVD_VIA", Kind: KindEnum, Category: "QSL", Promoted: true},
{Name: "QSLMSG", Kind: KindText, Category: "QSL", Promoted: true},
{Name: "QSLMSG_INTL", Kind: KindText, Category: "QSL", Intl: true},
{Name: "QSLMSG_RCVD", Kind: KindText, Category: "QSL", Promoted: true},
+39 -5
View File
@@ -428,7 +428,12 @@ func recordToQSO(rec Record) (qso.QSO, bool) {
q.VUCCGrids = strings.ToUpper(rec["vucc_grids"])
q.Country = rec["country"]
q.State = strings.ToUpper(rec["state"])
q.County = rec["cnty"]
q.County, _ = splitADIFCounty(rec["cnty"])
if st := rec["state"]; strings.TrimSpace(st) == "" {
if _, fromCnty := splitADIFCounty(rec["cnty"]); fromCnty != "" {
q.State = fromCnty
}
}
if v, ok := parseInt(rec["dxcc"]); ok {
q.DXCC = &v
}
@@ -459,10 +464,17 @@ func recordToQSO(rec Record) (qso.QSO, bool) {
q.QSLRcvd = rec["qsl_rcvd"]
q.QSLSentDate = rec["qslsdate"]
q.QSLRcvdDate = rec["qslrdate"]
// QSL_VIA is the manager. QSL_SENT_VIA / QSL_RCVD_VIA are the routing
// method, an enumeration of their own.
//
// These used to be one field here: an empty QSL_VIA was filled from
// QSL_SENT_VIA, on the theory that loggers writing one meant the other.
// They do not — Log4OM defaults QSL_SENT_VIA to E, and the import put "E"
// where every panel in OpsLog shows the manager's callsign. Keeping them
// apart is also what lets an export give them back.
q.QSLVia = rec["qsl_via"]
if q.QSLVia == "" { // many loggers (Log4OM) write QSL_SENT_VIA instead
q.QSLVia = rec["qsl_sent_via"]
}
q.QSLSentVia = NormaliseQSLVia(rec["qsl_sent_via"])
q.QSLRcvdVia = NormaliseQSLVia(rec["qsl_rcvd_via"])
q.QSLMsg = rec["qslmsg"]
q.QSLMsgRcvd = rec["qslmsg_rcvd"]
q.LOTWSent = rec["lotw_qsl_sent"]
@@ -515,7 +527,12 @@ func recordToQSO(rec Record) (qso.QSO, bool) {
q.MyGridExt = strings.ToUpper(rec["my_gridsquare_ext"])
q.MyCountry = rec["my_country"]
q.MyState = strings.ToUpper(rec["my_state"])
q.MyCounty = rec["my_cnty"]
q.MyCounty, _ = splitADIFCounty(rec["my_cnty"])
if st := rec["my_state"]; strings.TrimSpace(st) == "" {
if _, fromCnty := splitADIFCounty(rec["my_cnty"]); fromCnty != "" {
q.MyState = fromCnty
}
}
q.MyIOTA = strings.ToUpper(rec["my_iota"])
q.MySOTARef = strings.ToUpper(rec["my_sota_ref"])
q.MyPOTARef = strings.ToUpper(rec["my_pota_ref"])
@@ -698,3 +715,20 @@ var promotableSubmodes = map[string]bool{
func submodeSubsumesParent(submode string) bool {
return promotableSubmodes[submode]
}
// splitADIFCounty reads CNTY, which ADIF defines as "STATE,COUNTY".
//
// Returns the county on its own plus the state the field carried, so an import
// from a logger that follows the standard fills BOTH columns here. Files that
// write the bare county — as OpsLog itself used to — still import unchanged.
//
// The state from the field never overrides an explicit STATE tag: STATE is the
// dedicated field and the more specific statement. It only fills a blank.
func splitADIFCounty(cnty string) (county, state string) {
cnty = strings.TrimSpace(cnty)
i := strings.Index(cnty, ",")
if i < 0 {
return cnty, ""
}
return strings.TrimSpace(cnty[i+1:]), strings.ToUpper(strings.TrimSpace(cnty[:i]))
}
+53
View File
@@ -0,0 +1,53 @@
package adif
import "strings"
// The ADIF "QSL Via" enumeration, used by QSL_SENT_VIA and QSL_RCVD_VIA. It
// says how a card travelled, and is a different thing entirely from QSL_VIA,
// which is the manager's callsign.
const (
QSLViaBureau = "B"
QSLViaDirect = "D"
QSLViaElectronic = "E"
// QSLViaManager is import-only in the standard: it may be read from another
// logger's file, never written to one. OpsLog keeps it when it arrives so
// the operator's own data is not silently altered, and NormaliseQSLVia is
// the only place that decides so.
QSLViaManager = "M"
)
// NormaliseQSLVia folds what other loggers and OpsLog's own older versions put
// in a routing field down to the ADIF enumeration.
//
// It accepts the letter, the English word, and the French one — OpsLog wrote
// "Bureau", "Direct" and "Electronic" in full for a long time, and the QSL
// Manager panel still shows those words to a French operator. Anything it does
// not recognise comes back empty rather than being passed through: this feeds
// an enumerated ADIF field, and inventing a value there breaks the file for
// every other logger that reads it.
func NormaliseQSLVia(s string) string {
switch strings.ToUpper(strings.TrimSpace(s)) {
case "B", "BUREAU", "BURO", "VIA BUREAU":
return QSLViaBureau
case "D", "DIRECT":
return QSLViaDirect
case "E", "ELECTRONIC", "ELECTRONIQUE", "ÉLECTRONIQUE", "OQRS":
return QSLViaElectronic
case "M", "MANAGER":
return QSLViaManager
}
return ""
}
// IsQSLViaRouting reports whether a QSL_VIA value is in fact a routing method
// that ended up in the manager field.
//
// It exists for one repair: OpsLog's QSL Manager panel wrote "Bureau",
// "Direct" and "Electronic" into QSL_VIA, and imports folded QSL_SENT_VIA
// there too, so logs hold a mixture of managers and routing words in one
// column. A manager is a callsign, never one of these six words, so the test
// is exact — but it is deliberately narrow: anything else, including a manager
// whose callsign happens to be unusual, is left alone.
func IsQSLViaRouting(s string) bool {
return NormaliseQSLVia(s) != ""
}
+37
View File
@@ -0,0 +1,37 @@
package adif
import "testing"
func TestNormaliseQSLVia(t *testing.T) {
for in, want := range map[string]string{
"B": "B", "b": "B", "Bureau": "B", "BUREAU": "B", " buro ": "B",
"D": "D", "Direct": "D", "direct": "D",
"E": "E", "Electronic": "E", "électronique": "E", "OQRS": "E",
"M": "M", "Manager": "M",
// A manager's callsign is not a routing method, and neither is noise.
"M0OXO": "", "EA5GL": "", "": "", "Bureau via M0OXO": "", "X": "",
} {
if got := NormaliseQSLVia(in); got != want {
t.Errorf("NormaliseQSLVia(%q) = %q, want %q", in, got, want)
}
}
}
// The repair moves values out of the manager column. A false positive would
// erase a real manager, so the guard is worth its own test: every callsign-like
// value must be refused.
func TestIsQSLViaRoutingRefusesManagers(t *testing.T) {
for _, call := range []string{
"M0OXO", "EA5GL", "F5CWU", "DJ9ZB", "W3HNK", "IK2DUW", "N7RO",
"BUREAU M0OXO", "via bureau DL1XYZ", "QSL DIRECT ONLY",
} {
if IsQSLViaRouting(call) {
t.Errorf("%q was taken for a routing method — the repair would erase it", call)
}
}
for _, v := range []string{"B", "D", "E", "M", "Bureau", "Direct", "Electronic"} {
if !IsQSLViaRouting(v) {
t.Errorf("%q should be recognised as a routing method", v)
}
}
}
+82
View File
@@ -119,3 +119,85 @@ func renderRecord(q qso.QSO, includeApp bool) string {
bw.Flush()
return buf.String()
}
// TestQSLViaFieldsRoundTrip covers the case reported as issue #16: a log
// exported by another logger carries a manager in QSL_VIA and a routing method
// in QSL_SENT_VIA, and the two must stay apart.
//
// Before this, QSL_SENT_VIA was folded into QSL_VIA whenever QSL_VIA was empty
// — so a Log4OM log, which defaults QSL_SENT_VIA to E, showed "E" wherever
// OpsLog displays the manager — and QSL_RCVD_VIA was thrown away outright: it
// was listed as a promoted field with no column behind it, so it was not even
// kept among the extras. Neither was ever exported, which made an import
// followed by an export destroy both.
func TestQSLViaFieldsRoundTrip(t *testing.T) {
in := qso.QSO{
Callsign: "3B9FR", Band: "20m", Mode: "CW",
QSODate: time.Date(2026, 6, 6, 12, 0, 0, 0, time.UTC),
QSLVia: "M0OXO", // the manager
QSLSentVia: "D", // sent direct
QSLRcvdVia: "B", // came back via the bureau
}
var buf bytes.Buffer
bw := bufio.NewWriter(&buf)
bw.WriteString("<EOH>\n")
writeRecord(bw, in, true, nil)
bw.Flush()
var rec Record
if err := Parse(strings.NewReader(buf.String()), func(r Record) error { rec = r; return nil }); err != nil {
t.Fatalf("parse: %v", err)
}
out, ok := recordToQSO(rec)
if !ok {
t.Fatal("recordToQSO returned !ok")
}
for name, c := range map[string]struct{ got, want string }{
"QSL_VIA": {out.QSLVia, in.QSLVia},
"QSL_SENT_VIA": {out.QSLSentVia, in.QSLSentVia},
"QSL_RCVD_VIA": {out.QSLRcvdVia, in.QSLRcvdVia},
} {
if c.got != c.want {
t.Errorf("%s: got %q, want %q", name, c.got, c.want)
}
}
}
// TestQSLSentViaDoesNotBecomeManager pins the exact shape a Log4OM export has:
// no QSL_VIA at all, QSL_SENT_VIA defaulted to E. The manager field must come
// back empty rather than holding "E".
func TestQSLSentViaDoesNotBecomeManager(t *testing.T) {
const rec = "<CALL:5>OE6CLD<QSO_DATE:8>20260606<TIME_ON:4>1200<BAND:3>20m<MODE:2>CW" +
"<QSL_SENT_VIA:1>E<EOR>\n"
var got Record
if err := Parse(strings.NewReader("<EOH>\n"+rec), func(r Record) error { got = r; return nil }); err != nil {
t.Fatalf("parse: %v", err)
}
q, ok := recordToQSO(got)
if !ok {
t.Fatal("recordToQSO returned !ok")
}
if q.QSLVia != "" {
t.Errorf("QSL_VIA = %q — the routing method leaked into the manager field again", q.QSLVia)
}
if q.QSLSentVia != "E" {
t.Errorf("QSL_SENT_VIA = %q, want %q", q.QSLSentVia, "E")
}
}
// M is import-only in the ADIF QSL Via enumeration: keep it when given, never
// write it back out.
func TestQSLViaManagerIsImportOnly(t *testing.T) {
in := qso.QSO{
Callsign: "3B9FR", Band: "20m", Mode: "CW",
QSODate: time.Date(2026, 6, 6, 12, 0, 0, 0, time.UTC),
QSLSentVia: "M", QSLRcvdVia: "M",
}
var buf bytes.Buffer
bw := bufio.NewWriter(&buf)
writeRecord(bw, in, true, nil)
bw.Flush()
if s := buf.String(); strings.Contains(s, "QSL_SENT_VIA") || strings.Contains(s, "QSL_RCVD_VIA") {
t.Errorf("exported an import-only value:\n%s", s)
}
}
+13 -4
View File
@@ -749,9 +749,14 @@ func EmissionOf(mode string) string { return emissionOf(mode) }
// abbreviating "Saint"→"St." and hyphenating "Matanuska-Susitna". The rules:
// - if cnty already carries "ST,County", split on the first comma; else take
// the state from the STATE column;
// - upper-case; drop periods and apostrophes; hyphens→space; strip a trailing
// County/Parish/Borough/Census Area/Municipality; fold Saint(e)→St(e);
// collapse whitespace;
// - upper-case; fold accents (the FIPS list writes "Doña Ana", callbooks and
// logs write "Dona Ana"); drop periods and apostrophes; hyphens→space;
// expand the parenthetical shapes GeoNames uses for county-equivalents
// ("Baltimore (city)", "Nome (CA)") and drop its "City and County of"
// style prefixes; strip a trailing County/Parish/Borough/Census Area/
// Municipality; fold Saint(e)→St(e); collapse whitespace;
// - fold the counties renamed since the USA-CA list was drawn onto the name
// the award still uses, so a QSO there counts for something (see renamed);
// - require a 2-letter state and a non-empty county, else no match ("").
func USCountyKey(state, cnty string) string {
s := strings.TrimSpace(cnty)
@@ -764,10 +769,11 @@ func USCountyKey(state, cnty string) string {
} else {
st, co = strings.TrimSpace(state), s
}
co = strings.ToUpper(co)
co = strings.ToUpper(foldAccents(co))
co = strings.ReplaceAll(co, ".", "")
co = strings.ReplaceAll(co, "'", "")
co = strings.ReplaceAll(co, "-", " ")
co = expandCountyEquivalent(co)
for _, suf := range []string{" COUNTY", " PARISH", " BOROUGH", " CENSUS AREA", " MUNICIPALITY"} {
if strings.HasSuffix(co, suf) {
co = strings.TrimSuffix(co, suf)
@@ -788,6 +794,9 @@ func USCountyKey(state, cnty string) string {
if len(st) != 2 || co == "" {
return ""
}
if alias, ok := renamed[st+"/"+co]; ok {
co = alias
}
// Separator is "/", NOT ",": the QSOFIELDS matcher splits a field value on
// commas/semicolons (n-fer POTA "US-1,US-2"), which would shatter "AL,AUTAUGA"
// into two non-matching tokens. The stored ADIF cnty keeps its comma; only
+120
View File
@@ -0,0 +1,120 @@
package award
import "strings"
// Name normalisation for USCountyKey. It exists because the county a QSO
// carries and the county the USA-CA reference list carries come from different
// hands and rarely agree letter for letter:
//
// - the reference is the FIPS list ("Doña Ana County", "Baltimore city");
// - a callbook writes what the licensee typed;
// - and OpsLog's own offline resolver reads GeoNames, which spells the
// county-equivalents its own way ("Baltimore (city)", "Nome (CA)",
// "City and County of San Francisco").
//
// Measured against a full FCC ULS import (1.56 M US callsigns), the shapes
// handled here account for ~7 300 stations whose county matched nothing at all
// — they showed as a new county for ever and counted for no award.
//
// Everything here is SPELLING. A county that genuinely no longer exists under
// that name is a different problem, handled by renamed below.
// foldAccents strips the diacritics that separate a FIPS name from the ASCII
// every log and callbook actually holds. Only the letters that occur in US
// place names are listed — this is not a general Unicode folder, and it must
// not become one: silently folding arbitrary marks would let two distinct
// references collapse onto one key.
var accents = strings.NewReplacer(
"ñ", "n", "Ñ", "N",
"á", "a", "Á", "A",
"é", "e", "É", "E",
"í", "i", "Í", "I",
"ó", "o", "Ó", "O",
"ú", "u", "Ú", "U",
"ü", "u", "Ü", "U",
"ç", "c", "Ç", "C",
)
func foldAccents(s string) string {
// Fast path: US county names are ASCII with a single exception (Doña Ana),
// so the common case must not pay for the replacer.
for i := 0; i < len(s); i++ {
if s[i] >= 0x80 {
return accents.Replace(s)
}
}
return s
}
// expandCountyEquivalent rewrites GeoNames' parenthetical and prefixed spellings
// of county-equivalents into the plain FIPS form, which the rest of USCountyKey
// then normalises as usual.
//
// Input is already upper-cased with periods and hyphens removed.
//
// BALTIMORE (CITY) → BALTIMORE CITY (FIPS "Baltimore city")
// NOME (CA) → NOME CENSUS AREA (suffix stripped after)
// CITY AND COUNTY OF SAN FRANCISCO → SAN FRANCISCO
//
// The truncated "(CITY" is not a typo here: GeoNames really does ship
// "Colonial Heights (city" with the closing parenthesis missing.
func expandCountyEquivalent(co string) string {
switch {
case strings.HasSuffix(co, " (CITY)"):
co = strings.TrimSuffix(co, " (CITY)") + " CITY"
case strings.HasSuffix(co, " (CITY"):
co = strings.TrimSuffix(co, " (CITY") + " CITY"
case strings.HasSuffix(co, " (CA)"):
co = strings.TrimSuffix(co, " (CA)") + " CENSUS AREA"
}
// "City and County of X" and "City and Borough of X" are the same place as
// FIPS's bare "X" (San Francisco, Denver, Honolulu, Juneau, Sitka). Note the
// order: the longer prefixes must be tried before "CITY OF ".
for _, p := range []string{
"CITY AND COUNTY OF ",
"CITY AND BOROUGH OF ",
"MUNICIPALITY OF ",
"BOROUGH OF ",
"CITY OF ",
} {
if strings.HasPrefix(co, p) {
return strings.TrimPrefix(co, p)
}
}
return co
}
// renamed folds a county renamed or re-drawn since the CQ USA-CA list was
// published onto the name the award still counts. Keys and values are finished
// USCountyKey county parts (upper-case, no spaces), looked up as "ST/COUNTY".
//
// This deliberately does NOT track the FIPS list. USA-CA is a fixed target of
// ~3 100 counties; when a state renames one, the award does not reissue its
// list, so a QSO with the new name would otherwise match nothing and count for
// nothing. Folding it onto the old name is the only outcome that scores.
//
// Connecticut is absent on purpose. Its 2022 planning regions are not renamed
// counties: a region is drawn from towns belonging to several different
// counties, so there is no name that maps to another name. That one is resolved
// from the station's ZIP, in internal/uls.
var renamed = map[string]string{
// Wade Hampton Census Area, AK → Kusilvak Census Area (2015).
"AK/KUSILVAK": "WADEHAMPTON",
// Shannon County, SD → Oglala Lakota County (2015).
"SD/OGLALALAKOTA": "SHANNON",
// Valdez-Cordova Census Area, AK was split in two (2019). Both halves fold
// back to the parent the award still lists.
"AK/CHUGACH": "VALDEZCORDOVA",
"AK/COPPERRIVER": "VALDEZCORDOVA",
// Alaska's four "X City and Borough". The reference codes for these look
// wrong and are not: the trailing " BOROUGH" is stripped as a county type,
// leaving "JUNEAU CITY AND". Nothing else in the chain produces that shape
// — a log that simply says "Juneau", and GeoNames' "City and Borough of
// Juneau", both arrive here as "JUNEAU" and would match nothing. Rather
// than re-key four published references, bend the bare name onto them.
"AK/JUNEAU": "JUNEAUCITYAND",
"AK/SITKA": "SITKACITYAND",
"AK/WRANGELL": "WRANGELLCITYAND",
"AK/YAKUTAT": "YAKUTATCITYAND",
}
+1 -1
View File
@@ -1943,7 +1943,7 @@ func usCounties() []Ref {
ref("NM/COLFAX", "Colfax County, NM", 291),
ref("NM/CURRY", "Curry County, NM", 291),
ref("NM/DEBACA", "De Baca County, NM", 291),
ref("NM/DO̱AANA", "Do̱a Ana County, NM", 291),
ref("NM/DONAANA", "Doña Ana County, NM", 291),
ref("NM/EDDY", "Eddy County, NM", 291),
ref("NM/GRANT", "Grant County, NM", 291),
ref("NM/GUADALUPE", "Guadalupe County, NM", 291),
+118
View File
@@ -0,0 +1,118 @@
package awardref
import (
"strings"
"testing"
"unicode/utf8"
"hamlog/internal/award"
)
// TestUSCountyRefsSelfConsistent is the guard that was missing when the Doña Ana
// row shipped mangled: its code was "NM/DO̱AANA", which no log, no callbook and
// no county database could ever produce, so that county was unwinnable and
// nothing said so.
//
// Every reference must reproduce its own code from its own display name through
// award.USCountyKey — the same function cmd/cntygen used to build it. That ties
// the generated file to the matcher: change the normalisation rules and this
// fails the moment one of the 3 102 references stops matching itself.
func TestUSCountyRefsSelfConsistent(t *testing.T) {
refs := usCounties()
if len(refs) < 3000 {
t.Fatalf("only %d counties — the generated list looks truncated", len(refs))
}
for _, r := range refs {
if !utf8.ValidString(r.Name) || !utf8.ValidString(r.Code) {
t.Errorf("%s (%q): not valid UTF-8", r.Code, r.Name)
continue
}
// Name is "County Name, ST".
i := strings.LastIndex(r.Name, ", ")
if i < 0 {
t.Errorf("%s: name %q is not \"County, ST\"", r.Code, r.Name)
continue
}
name, st := r.Name[:i], r.Name[i+2:]
if got := award.USCountyKey(st, name); got != r.Code {
t.Errorf("USCountyKey(%q, %q) = %q, want %q", st, name, got, r.Code)
}
}
}
// TestUSCountyRefsUnique catches a normalisation rule loose enough to collapse
// two real counties onto one key — the failure mode that would silently merge
// them in every award total.
func TestUSCountyRefsUnique(t *testing.T) {
seen := map[string]string{}
for _, r := range usCounties() {
if prev, dup := seen[r.Code]; dup {
t.Errorf("code %s is shared by %q and %q", r.Code, prev, r.Name)
continue
}
seen[r.Code] = r.Name
}
}
// TestUSCountyResolverShapes pins the spellings OpsLog's own offline resolver
// produces (GeoNames, via internal/uls) against the reference. These are the
// real strings that were failing to match, with the number of US callsigns each
// covers in a full FCC ULS import.
func TestUSCountyResolverShapes(t *testing.T) {
valid := map[string]bool{}
for _, r := range usCounties() {
valid[r.Code] = true
}
cases := []struct {
st, county, want string
}{
{"CA", "City and County of San Francisco", "CA/SANFRANCISCO"}, // 4 217 calls
{"NM", "Doña Ana", "NM/DONAANA"}, // 1 214
{"NM", "Dona Ana", "NM/DONAANA"}, // what logs hold
{"MD", "Baltimore (city)", "MD/BALTIMORECITY"}, // 885
{"MO", "St. Louis (city)", "MO/STLOUISCITY"}, // 574
{"MO", "St. Louis", "MO/STLOUIS"}, // the county, distinct
{"AK", "Nome (CA)", "AK/NOME"}, // 252
{"AK", "Yukon-Koyukuk (CA)", "AK/YUKONKOYUKUK"}, // 84
{"AK", "City and Borough of Wrangell", "AK/WRANGELLCITYAND"}, // 27
{"AK", "Juneau", "AK/JUNEAUCITYAND"}, // a log that just says Juneau
{"AK", "Kusilvak", "AK/WADEHAMPTON"}, // renamed 2015
{"SD", "Oglala Lakota County", "SD/SHANNON"}, // renamed 2015
{"AK", "Chugach Census Area", "AK/VALDEZCORDOVA"}, // split 2019
{"AK", "Copper River Census Area", "AK/VALDEZCORDOVA"},
{"CO", "City and County of Denver", "CO/DENVER"},
{"HI", "City and County of Honolulu", "HI/HONOLULU"},
}
for _, c := range cases {
got := award.USCountyKey(c.st, c.county)
if got != c.want {
t.Errorf("USCountyKey(%q, %q) = %q, want %q", c.st, c.county, got, c.want)
continue
}
if !valid[got] {
t.Errorf("USCountyKey(%q, %q) = %q, which is not in the reference list", c.st, c.county, got)
}
}
}
// TestUSCountyKeepsVirginiaCitiesOut guards the other direction: cmd/cntygen
// drops Virginia's independent cities and Carson City on purpose, because CQ's
// USA-CA does not count them. Normalising their names must not smuggle them
// back in as some neighbouring county.
func TestUSCountyKeepsVirginiaCitiesOut(t *testing.T) {
valid := map[string]bool{}
for _, r := range usCounties() {
valid[r.Code] = true
}
for _, c := range []string{"Virginia Beach (city)", "City of Alexandria", "Lynchburg (city)"} {
if k := award.USCountyKey("VA", c); valid[k] {
t.Errorf("%q resolved to %s, which USA-CA does not count", c, k)
}
}
// Charles City and James City ARE counties, despite the name.
for _, c := range []string{"Charles City", "James City"} {
if k := award.USCountyKey("VA", c); !valid[k] {
t.Errorf("%q resolved to %s, which is missing from the reference", c, k)
}
}
}
@@ -0,0 +1,18 @@
-- QSL_SENT_VIA / QSL_RCVD_VIA — the ADIF fields that say HOW a card travelled.
--
-- Until now OpsLog had one column, qsl_via, and used it for two unrelated
-- things: the QSL manager (what ADIF's QSL_VIA holds) and the routing method.
-- Imports made it worse — QSL_SENT_VIA was folded into qsl_via when qsl_via was
-- empty, so a Log4OM log arrived with "E" sitting where the manager belongs —
-- and QSL_RCVD_VIA was dropped outright, listed as a promoted field with no
-- column behind it, so it was not even kept among the extras.
--
-- These two columns hold the ADIF enumeration: B (bureau), D (direct),
-- E (electronic). M (manager) is accepted on import only, per the standard.
--
-- Adding the columns is all that happens here. Existing qsl_via values are NOT
-- touched: separating a manager from a routing word rewrites what an operator
-- can see in their own log, so it is offered once, with a count, and only runs
-- when they say yes.
ALTER TABLE qso ADD COLUMN qsl_sent_via TEXT;
ALTER TABLE qso ADD COLUMN qsl_rcvd_via TEXT;
@@ -0,0 +1,17 @@
-- Custom outbound messages: a trigger, a template, and a transport.
--
-- Until now an outbound row was one of a handful of hard-coded emitters, each
-- with its own format and its own moment. This adds the general case: pick what
-- fires it, write what it says, and choose whether it leaves as a UDP datagram
-- or an HTTP request.
--
-- The HTTP half is what makes it useful for antenna switches — most of them are
-- driven by a URL like http://192.168.1.50/antenna?band=20m — and the band
-- change is the trigger they want, being rare by nature.
--
-- Empty on every existing row, which is what the hard-coded services expect.
ALTER TABLE integrations_udp ADD COLUMN trig TEXT NOT NULL DEFAULT '';
ALTER TABLE integrations_udp ADD COLUMN template TEXT NOT NULL DEFAULT '';
ALTER TABLE integrations_udp ADD COLUMN transport TEXT NOT NULL DEFAULT '';
ALTER TABLE integrations_udp ADD COLUMN url TEXT NOT NULL DEFAULT '';
ALTER TABLE integrations_udp ADD COLUMN line_end TEXT NOT NULL DEFAULT '';
+31
View File
@@ -132,6 +132,18 @@ func (db *DB) Entities() []*Entity {
func (db *DB) Lookup(callsign string) (Match, bool) {
db.mu.RLock()
defer db.mu.RUnlock()
// Maritime and aeronautical mobile belong to NO entity, and that is not a
// technicality — the station is at sea or in the air. RI1FJL/MM resolved to
// Franz Josef Land while the expedition was still on its way there, telling
// the operator they had worked an entity they had not.
//
// The previous choice was deliberate ("the log should still show the
// operator's country") and it is wrong for exactly that reason: a home
// country here is not extra information, it is a false claim about where the
// contact happened.
if IsMobileNoEntity(callsign) {
return Match{}, false
}
call := normalizeCallsign(callsign)
if call == "" {
return Match{}, false
@@ -364,3 +376,22 @@ func replaceAreaDigit(call string, d byte) string {
}
return call
}
// IsMobileNoEntity reports a callsign DXCC assigns to no entity: a TRAILING
// /MM (maritime mobile) or /AM (aeronautical mobile).
//
// Trailing only. A LEADING "MM" is the Scotland prefix and "AM" is Spain, so
// MM0ABC and AM5X are ordinary calls — treating those as entity-less would be a
// far larger error than the one this fixes.
func IsMobileNoEntity(callsign string) bool {
s := strings.ToUpper(strings.TrimSpace(callsign))
i := strings.LastIndex(s, "/")
if i < 0 {
return false
}
switch s[i+1:] {
case "MM", "AM":
return true
}
return false
}
+39
View File
@@ -0,0 +1,39 @@
package dxcc
import "testing"
// /MM and /AM belong to NO DXCC entity: the station is at sea or in the air.
//
// This is not a technicality. RI1FJL/MM resolved to Franz Josef Land while the
// expedition was still sailing there, which told the operator they had worked
// an entity they had not.
func TestMobileNoEntity(t *testing.T) {
for _, tc := range []struct {
call string
want bool
}{
{"RI1FJL/MM", true},
{"YB1SCY/AM", true},
{"ri1fjl/mm", true},
{" RI1FJL/MM ", true},
// A LEADING MM is Scotland and AM is Spain. Treating those as
// entity-less would be a far larger error than the one this fixes.
{"MM0ABC", false},
{"AM5X", false},
{"MM/F4BPO", false},
{"AM/DL1ABC", false},
// Other suffixes keep their entity — a portable station is still ashore.
{"F4BPO/P", false},
{"F4BPO/M", false},
{"4U1UN/B", false},
{"F4BPO", false},
// Only the LAST element counts: RI1FJL/MM/P is still maritime, and a
// call whose /MM is not final is not.
{"RI1FJL/MM/P", false},
{"", false},
} {
if got := IsMobileNoEntity(tc.call); got != tc.want {
t.Errorf("IsMobileNoEntity(%q) = %v, want %v", tc.call, got, tc.want)
}
}
}
+27 -1
View File
@@ -4,6 +4,7 @@ package email
import (
"fmt"
"os"
"time"
"github.com/wneessen/go-mail"
@@ -85,7 +86,32 @@ func SendFiles(cfg Config, to, subject, body string, attachPaths []string) error
return fmt.Errorf("smtp client: %w", err)
}
if err := client.DialAndSend(m); err != nil {
return fmt.Errorf("send: %w", err)
return fmt.Errorf("send via %s:%d (%s, %s): %w",
cfg.Host, cfg.Port, cfg.Encryption, describeSize(attachPaths), err)
}
return nil
}
// describeSize reports what was attached, in bytes.
//
// "An existing connection was forcibly closed" during DATA is the same message
// whether the server refused the size, hit a quota, or simply dropped the
// socket — and the first of those is the only one the operator can act on
// directly. Naming the size rules it in or out without a second attempt.
func describeSize(paths []string) string {
var total int64
n := 0
for _, p := range paths {
if p == "" {
continue
}
if fi, err := os.Stat(p); err == nil {
total += fi.Size()
n++
}
}
if n == 0 {
return "no attachment"
}
return fmt.Sprintf("%d attachment(s), %d KB", n, (total+1023)/1024)
}
+34
View File
@@ -0,0 +1,34 @@
package email
import (
"os"
"path/filepath"
"testing"
)
// "An existing connection was forcibly closed" during DATA reads the same
// whether the server refused the SIZE, hit a quota, or just dropped the socket
// — and only the first is something the operator can act on. Naming the size in
// the error rules it in or out without a second attempt.
func TestDescribeSize(t *testing.T) {
dir := t.TempDir()
a := filepath.Join(dir, "card.jpg")
if err := os.WriteFile(a, make([]byte, 2048), 0o644); err != nil {
t.Fatal(err)
}
if got := describeSize(nil); got != "no attachment" {
t.Errorf("no attachment = %q", got)
}
if got := describeSize([]string{""}); got != "no attachment" {
t.Errorf("blank path = %q, want it ignored", got)
}
if got := describeSize([]string{a}); got != "1 attachment(s), 2 KB" {
t.Errorf("one file = %q", got)
}
// A path that does not exist must not be counted — the mail library skips it,
// so reporting it would describe a message that was never sent.
if got := describeSize([]string{a, filepath.Join(dir, "gone.jpg")}); got != "1 attachment(s), 2 KB" {
t.Errorf("missing file counted: %q", got)
}
}
+8
View File
@@ -81,6 +81,8 @@ type ServiceConfig struct {
UploadFlags []string `json:"upload_flags"` // LoTW: set of lotw_sent values that mean "ready to upload" — any of "N"/"R"
WriteLog bool `json:"write_log"` // LoTW: pass -t to write a TQSL diagnostic log
AutoUpload bool `json:"auto_upload"`
// OnAir: HRDLog only — publish the live frequency, mode and rig on the site.
OnAir bool `json:"on_air"`
UploadMode UploadMode `json:"upload_mode"`
}
@@ -142,4 +144,10 @@ type UploadResult struct {
OK bool // the service accepted (or already had) the QSO
LogID string // service-assigned record id, when provided
Message string // human-readable detail (reason on failure)
// Ignored is set when the service accepted the submission but left some or
// all of the QSOs out of it. TQSL does this for contacts already uploaded
// AND for contacts outside the certificate's date range, and reports both
// with the same exit code — so the caller must show the message rather than
// decide on its own that everything went through.
Ignored bool
}
+57
View File
@@ -6,6 +6,7 @@ import (
"io"
"net/http"
"net/url"
"strconv"
"strings"
"time"
)
@@ -143,3 +144,59 @@ func TestHRDLog(ctx context.Context, client *http.Client, cfg ServiceConfig) (st
}
return fmt.Sprintf("Credentials accepted — %s", callsign), nil
}
// hrdlogOnAirURL is HRDLog's live-status endpoint — what puts "F4BPO is on air
// 14,074,000 FM IC-7300" on the site's front page.
//
// Endpoint and field names taken from HRDLog's own library (github.com/iw1qlh/
// HRDLOG-net-library, HrdProtocol.SendOnAirAsync), not from guesswork: it posts
// Frequency in Hz, Mode, Radio, Callsign, Code and App.
//
// HTTPS where that library uses plain HTTP. The upload code is a credential and
// has no business crossing the network in clear; the sibling NewEntry endpoint
// on the same host already serves TLS.
const hrdlogOnAirURL = "https://robot.hrdlog.net/OnAir.aspx"
// SendHRDLogOnAir publishes the current frequency, mode and rig.
//
// Deliberately fire-and-forget in spirit: it is a status broadcast, so a
// failure is logged and never surfaced as an error the operator must clear —
// but the message is returned so the caller can log WHAT the site said rather
// than only that something went wrong.
func SendHRDLogOnAir(ctx context.Context, client *http.Client, callsign, code string, freqHz int64, mode, radio string) (string, error) {
callsign = strings.ToUpper(strings.TrimSpace(callsign))
code = strings.TrimSpace(code)
if callsign == "" || code == "" {
return "", fmt.Errorf("hrdlog: callsign and upload code required")
}
if freqHz <= 0 {
return "", fmt.Errorf("hrdlog: no frequency to announce")
}
form := url.Values{}
form.Set("Callsign", callsign)
form.Set("Code", code)
form.Set("App", hrdlogApp)
form.Set("Frequency", strconv.FormatInt(freqHz, 10))
form.Set("Mode", strings.TrimSpace(mode))
form.Set("Radio", strings.TrimSpace(radio))
req, err := http.NewRequestWithContext(ctx, http.MethodPost, hrdlogOnAirURL, strings.NewReader(form.Encode()))
if err != nil {
return "", fmt.Errorf("hrdlog on-air: build request: %w", err)
}
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
if client == nil {
client = &http.Client{Timeout: 15 * time.Second}
}
resp, err := client.Do(req)
if err != nil {
return "", fmt.Errorf("hrdlog on-air: %w", err)
}
defer resp.Body.Close()
body, _ := io.ReadAll(io.LimitReader(resp.Body, 32*1024))
msg := strings.TrimSpace(string(body))
if resp.StatusCode != http.StatusOK {
return msg, fmt.Errorf("hrdlog on-air: http %d", resp.StatusCode)
}
return msg, nil
}
+51 -4
View File
@@ -178,8 +178,12 @@ func fileExists(p string) bool {
//
// tqsl -d -x -a all -l "<location>" -u [-p <keypass>] <file.adi>
//
// Exit codes (TQSL): 0 = uploaded; 8 = nothing new (all duplicates/out of
// range); 9 = some uploaded, some skipped; anything else = failure.
// Exit codes are TQSL's own (see the table in its cmdline help). 8 and 9 are
// the ones that matter and both used to be read as plain success: 8 means NO
// QSOs were processed and 9 means some were left out — in each case because
// they were already uploaded OR outside the callsign certificate's date range.
// Reporting either as success is how a contact came to be stamped "uploaded"
// while LoTW had never seen it.
func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord string) (UploadResult, error) {
tqsl := strings.TrimSpace(cfg.TQSLPath)
loc := strings.TrimSpace(cfg.StationLocation)
@@ -249,11 +253,31 @@ func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord stri
}
}
// TQSL's exit codes, from its own cmdline documentation. Two of them used to
// be read as plain success, and that is how contacts came to be stamped
// "uploaded" while LoTW had never seen them:
//
// 8 NO QSOs were processed — already uploaded OR OUT OF DATE RANGE
// 9 some processed, some ignored — same two reasons
// 14 some already uploaded, the rest signed
//
// "Out of date range" is the one that bites: a contact older than the
// 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.
switch code {
case 0, 9:
case 0:
return UploadResult{OK: true, Message: "uploaded to LoTW"}, nil
case 9, 14:
return UploadResult{OK: true, Ignored: true, Message: tqslDetail(msg,
"uploaded — but TQSL left some contacts out (already uploaded, or outside the certificate's date range)")}, nil
case 8:
return UploadResult{OK: true, Message: "already uploaded (duplicate)"}, nil
// Nothing reached LoTW. NOT stamped as sent: a duplicate left at "R" is
// harmless and will be refused again, while a contact wrongly marked sent
// is one the operator will never think to look at again.
return UploadResult{OK: false, Ignored: true, Message: tqslDetail(msg,
"TQSL uploaded nothing — every contact was already uploaded, or outside the certificate's date range")},
fmt.Errorf("lotw: no QSOs processed")
default:
if msg == "" {
msg = fmt.Sprintf("tqsl exit code %d", code)
@@ -262,6 +286,29 @@ func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord stri
}
}
// tqslDetail keeps the lines of TQSL's own output that say what happened to the
// contacts, and appends the summary.
//
// TQSL is explicit — "414 QSO records were already uploaded", "N QSO records
// are out of date range" — and that sentence is the whole answer to "why is my
// contact not on LoTW". It used to be captured and thrown away.
func tqslDetail(out, summary string) string {
var keep []string
for _, ln := range strings.Split(out, "\n") {
ln = strings.TrimSpace(ln)
l := strings.ToLower(ln)
if strings.Contains(l, "qso") && (strings.Contains(l, "already uploaded") ||
strings.Contains(l, "date range") || strings.Contains(l, "ignored") ||
strings.Contains(l, "duplicate")) {
keep = append(keep, ln)
}
}
if len(keep) == 0 {
return summary
}
return summary + " — " + strings.Join(keep, "; ")
}
// TestLoTW validates the LoTW config: tqsl present and the chosen station
// location exists in station_data.
func TestLoTW(cfg ServiceConfig, stationDataPath string) (string, error) {
+44
View File
@@ -0,0 +1,44 @@
package extsvc
import "testing"
// TQSL's own exit codes, from its cmdline documentation:
//
// 0 success
// 8 NO QSOs were processed — already uploaded OR out of date range
// 9 some processed, some ignored — same two reasons
// 14 some already uploaded, the rest signed
//
// 8 and 9 both used to be read as plain success, and that is how a contact came
// to be stamped "uploaded to LoTW" while LoTW had never seen it. The one that
// bites is "out of date range": a contact older than the callsign certificate's
// validity is silently left out of the submission.
func TestTQSLDetailKeepsTheReason(t *testing.T) {
out := `13:22:01: Signing using Callsign G0ABC, DXCC Entity ENGLAND
13:22:02: /tmp/x.adi: 20 QSO records are out of date range
13:22:02: Final Status: No QSOs were processed (8)`
got := tqslDetail(out, "summary")
if got == "summary" {
t.Fatal("threw away TQSL's explanation — that sentence is the whole answer to \"why is my contact not on LoTW\"")
}
if !contains(got, "out of date range") {
t.Errorf("the reason was lost: %q", got)
}
}
func TestTQSLDetailFallsBackToTheSummary(t *testing.T) {
if got := tqslDetail("nothing useful here", "summary"); got != "summary" {
t.Errorf("got %q, want the plain summary when TQSL said nothing specific", got)
}
}
func contains(h, n string) bool {
return len(h) >= len(n) && (func() bool {
for i := 0; i+len(n) <= len(h); i++ {
if h[i:i+len(n)] == n {
return true
}
}
return false
})()
}
@@ -0,0 +1,40 @@
package udp
import (
"encoding/binary"
"testing"
)
// An operator's log arrived with four hundred identical "ADIF payload ignored"
// lines and nothing else legible: two inbound listeners were configured on the
// SAME multicast group and port, one WSJT and one ADIF, so every WSJT-X decode
// was delivered to both and the ADIF one rejected each in writing. An FT8 cycle
// is dozens of decodes every fifteen seconds.
//
// The listener has to recognise that traffic and say what it is — once.
func TestIgnoredADIFStaysBounded(t *testing.T) {
s := &Server{cfg: Config{Name: "FLDIGI", Port: 2237}}
// A WSJT-X packet: magic first. One line is the whole diagnosis, so the
// counter is pushed past the cap immediately.
pkt := make([]byte, 16)
binary.BigEndian.PutUint32(pkt[:4], wsjtMagic)
s.noteIgnoredADIF(pkt)
if s.badPkts <= maxBadPktDumps {
t.Errorf("badPkts = %d — WSJT traffic should silence the listener at once", s.badPkts)
}
// Anything else is described a few times before going quiet, so an ordinary
// keep-alive does not get the same one-line treatment as a real diagnosis.
s2 := &Server{cfg: Config{Name: "FLDIGI", Port: 2237}}
s2.noteIgnoredADIF([]byte("keep-alive"))
if s2.badPkts > maxBadPktDumps {
t.Errorf("one unusable payload silenced the listener (badPkts = %d)", s2.badPkts)
}
for i := 0; i < 50; i++ {
s2.noteIgnoredADIF([]byte("keep-alive"))
}
if s2.badPkts <= maxBadPktDumps {
t.Errorf("badPkts = %d — the throttle never engaged", s2.badPkts)
}
}
+47 -6
View File
@@ -37,6 +37,34 @@ const (
ServiceDBUpdated ServiceType = "db_updated" // ADIF of each locally-logged QSO (on save)
ServicePstFreq ServiceType = "pstrotator_freq" // <PST><FREQUENCY> radio freq (on freq change)
ServiceN1MMRadio ServiceType = "n1mm_radioinfo" // N1MM RadioInfo XML: freq+mode (on freq/mode change)
// ServiceWSJTLog wraps the same ADIF in a WSJT-X "Logged ADIF" datagram.
// Logger32 and others listen on the WSJT-X interface, not for plain text, and
// discard a bare ADIF record without a word — so the two cannot be one row.
ServiceWSJTLog ServiceType = "wsjt_log"
// ServiceCustom is the general case: the operator picks the trigger, writes
// the message, and chooses UDP or HTTP. See Trigger and Config.Template.
ServiceCustom ServiceType = "custom"
)
// Trigger names the moment a custom outbound row fires.
type Trigger string
const (
TriggerQSOLogged Trigger = "qso_logged"
TriggerRotatorGo Trigger = "rotator_goto"
TriggerLookupDone Trigger = "lookup_done"
// TriggerBandChange is the RIG changing band, not the entry form: a switch
// follows the radio, not what is being typed. Rare by nature, so unlike a
// frequency trigger it needs no damping.
TriggerBandChange Trigger = "band_change"
)
// Transport is how a custom row leaves: a UDP datagram or an HTTP GET.
type Transport string
const (
TransportUDP Transport = "udp"
TransportURL Transport = "url"
)
// Config is one user-defined UDP connection.
@@ -51,6 +79,13 @@ type Config struct {
DestinationIP string `json:"destination_ip"` // outbound only
Enabled bool `json:"enabled"`
SortOrder int `json:"sort_order"`
// Custom rows only (ServiceCustom).
Trigger Trigger `json:"trigger"`
Template string `json:"template"` // message text with {fields}
Transport Transport `json:"transport"` // udp | url
URL string `json:"url"` // URL template, when transport is url
LineEnd string `json:"line_end"` // "" | lf | crlf — UDP only
}
// Repo is the persistence layer for UDP integration rows.
@@ -62,7 +97,8 @@ func (r *Repo) List(ctx context.Context) ([]Config, error) {
rows, err := r.db.QueryContext(ctx, `
SELECT id, direction, name, port, service_type,
multicast, multicast_group, destination_ip,
enabled, sort_order
enabled, sort_order,
trig, template, transport, url, line_end
FROM integrations_udp
ORDER BY direction, sort_order, id`)
if err != nil {
@@ -74,7 +110,8 @@ func (r *Repo) List(ctx context.Context) ([]Config, error) {
var c Config
var mc, en int
if err := rows.Scan(&c.ID, &c.Direction, &c.Name, &c.Port, &c.ServiceType,
&mc, &c.MulticastGroup, &c.DestinationIP, &en, &c.SortOrder); err != nil {
&mc, &c.MulticastGroup, &c.DestinationIP, &en, &c.SortOrder,
&c.Trigger, &c.Template, &c.Transport, &c.URL, &c.LineEnd); err != nil {
return nil, err
}
c.Multicast = mc != 0
@@ -101,10 +138,12 @@ func (r *Repo) Save(ctx context.Context, c *Config) error {
if c.ID == 0 {
res, err := r.db.ExecContext(ctx, `
INSERT INTO integrations_udp(direction, name, port, service_type,
multicast, multicast_group, destination_ip, enabled, sort_order)
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)`,
multicast, multicast_group, destination_ip, enabled, sort_order,
trig, template, transport, url, line_end)
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
c.Direction, c.Name, c.Port, c.ServiceType,
mc, c.MulticastGroup, c.DestinationIP, en, c.SortOrder)
mc, c.MulticastGroup, c.DestinationIP, en, c.SortOrder,
c.Trigger, c.Template, c.Transport, c.URL, c.LineEnd)
if err != nil {
return fmt.Errorf("insert udp: %w", err)
}
@@ -117,10 +156,12 @@ func (r *Repo) Save(ctx context.Context, c *Config) error {
direction = ?, name = ?, port = ?, service_type = ?,
multicast = ?, multicast_group = ?, destination_ip = ?,
enabled = ?, sort_order = ?,
trig = ?, template = ?, transport = ?, url = ?, line_end = ?,
updated_at = ?
WHERE id = ?`,
c.Direction, c.Name, c.Port, c.ServiceType,
mc, c.MulticastGroup, c.DestinationIP, en, c.SortOrder, db.NowISO(), c.ID)
mc, c.MulticastGroup, c.DestinationIP, en, c.SortOrder,
c.Trigger, c.Template, c.Transport, c.URL, c.LineEnd, db.NowISO(), c.ID)
if err != nil {
return fmt.Errorf("update udp: %w", err)
}
+205
View File
@@ -0,0 +1,205 @@
package udp
import (
"context"
"fmt"
"net/http"
"net/url"
"strings"
"time"
"hamlog/internal/applog"
)
// Custom outbound messages: a trigger, a template, a transport.
//
// The hard-coded emitters beside this one each speak a published format at a
// fixed moment. This is the escape hatch: the operator chooses when it fires and
// writes what it says. It exists mainly for antenna switches, which are driven
// by a URL — http://192.168.1.50/antenna?band=20m — and want the band change,
// but nothing here is specific to them.
//
// The presets are NOT reimplemented on top of this. PstRotator and N1MM
// RadioInfo are documented formats that work; a typo in a template would break
// them silently, and "it worked before I touched anything" is not a trade worth
// making for one less code path.
// httpTimeout bounds a request. A UDP datagram leaves and is forgotten; an HTTP
// call to a switch that has been unplugged will otherwise sit there for the
// operating system's own timeout — and this fires on a band change, which is
// exactly when nobody wants to wait.
const httpTimeout = 3 * time.Second
// customHTTP is the client for URL rows. One client, reused: a new one per
// request leaks connections on a switch that keeps them alive.
var customHTTP = &http.Client{Timeout: httpTimeout}
// Render substitutes {field} placeholders in tmpl.
//
// escape decides how a value is written, and it is not cosmetic: in a URL every
// value has to be percent-encoded, or the first portable callsign — F4BPO/P —
// puts a path separator in the middle of a query string, and a name with a
// space breaks the request outright. In a UDP payload the opposite holds: the
// receiver wants the text as typed.
//
// A placeholder with no value becomes empty rather than staying as "{freq}".
// Leaving the braces would send them down the wire, and a receiver would store
// the literal text as if it meant something.
func Render(tmpl string, fields map[string]string, escape bool) string {
var b strings.Builder
for {
i := strings.IndexByte(tmpl, '{')
if i < 0 {
b.WriteString(tmpl)
return b.String()
}
j := strings.IndexByte(tmpl[i:], '}')
if j < 0 {
b.WriteString(tmpl) // an unclosed brace is literal text
return b.String()
}
b.WriteString(tmpl[:i])
key := strings.ToLower(strings.TrimSpace(tmpl[i+1 : i+j]))
v := fields[key]
if escape {
v = url.QueryEscape(v)
}
b.WriteString(v)
tmpl = tmpl[i+j+1:]
}
}
// lineEnding turns the stored choice into the bytes appended to a UDP payload.
// Many receivers read a line at a time and wait for a terminator; a trailing
// space in a text box is invisible and lost on the first copy-paste, so this is
// a choice rather than something to type.
func lineEnding(s string) string {
switch strings.ToLower(strings.TrimSpace(s)) {
case "lf":
return "\n"
case "crlf":
return "\r\n"
}
return ""
}
// EmitTrigger fires every enabled custom row bound to this trigger.
//
// Runs the sends in the background: an HTTP request must never sit on the path
// of the thing that caused it — a band change waiting on an antenna switch is a
// band change the operator watches not happen.
func (m *Manager) EmitTrigger(t Trigger, fields map[string]string) {
var rows []Config
for _, c := range m.Outbound(ServiceCustom) {
if c.Trigger == t {
rows = append(rows, c)
}
}
if len(rows) == 0 {
return
}
for _, c := range rows {
go m.fireCustom(c, fields)
}
}
func (m *Manager) fireCustom(c Config, fields map[string]string) {
if c.Transport == TransportURL {
target := Render(c.URL, fields, true)
if strings.TrimSpace(target) == "" {
m.noteEmptyRender(c, c.URL)
return
}
m.getURL(c, target)
return
}
payload := Render(c.Template, fields, false) + lineEnding(c.LineEnd)
if strings.TrimSpace(payload) == "" {
m.noteEmptyRender(c, c.Template)
return
}
m.sendTo(c, []byte(payload))
}
// noteEmptyRender reports a template that produced nothing.
//
// Silence here was the worst of the lot: a row whose template is a single
// placeholder the trigger does not carry — {freq} on a band change — renders
// empty, sends nothing, and looked exactly like a row that had never fired. The
// operator has no way to tell a typo from a trigger that is not reaching them.
//
// Throttled with the same per-row timer as a failing URL: a template that is
// wrong stays wrong on every band change.
func (m *Manager) noteEmptyRender(c Config, tmpl string) {
m.noteCustomProblem(c, fmt.Sprintf(
"on %s the message came out empty — %q filled in nothing. Check the field names against the list under the box.",
c.Trigger, tmpl))
}
// getURL performs the request and reports what came back.
//
// The status code is logged, not just transport errors. A switch answering 404
// because a firmware update moved its endpoint is a total failure that looks
// exactly like success from here — the datagram equivalent does not exist, and
// an operator would have no way to tell.
func (m *Manager) getURL(c Config, target string) {
ctx, cancel := context.WithTimeout(context.Background(), httpTimeout)
defer cancel()
req, err := http.NewRequestWithContext(ctx, http.MethodGet, target, nil)
if err != nil {
applog.Printf("udp: [%s] bad URL %q: %v", c.Name, redactURL(target), err)
return
}
resp, err := customHTTP.Do(req)
if err != nil {
m.noteCustomProblem(c, fmt.Sprintf("%s failed: %v", redactURL(target), err))
return
}
defer resp.Body.Close()
if resp.StatusCode >= 400 {
m.noteCustomProblem(c, fmt.Sprintf("%s answered %s", redactURL(target), resp.Status))
return
}
applog.Printf("udp: [%s] on %s GET %s → %s", c.Name, c.Trigger, redactURL(target), resp.Status)
}
// redactURL hides the password in a URL before it reaches the log.
//
// The URL is what makes this feature debuggable, so it is logged in full — but
// an operator who put http://admin:secret@switch/ in the box is going to send
// that log to somebody when something goes wrong. Storing the password as typed
// was a deliberate choice for LAN gear; writing it into a file that travels is
// not the same choice, and was never made.
func redactURL(raw string) string {
u, err := url.Parse(raw)
if err != nil || u.User == nil {
return raw
}
if _, hasPass := u.User.Password(); !hasPass {
return raw
}
u.User = url.UserPassword(u.User.Username(), "***")
// Qt-style escaping of the placeholder would give %2A%2A%2A; put it back so
// the line stays readable.
return strings.ReplaceAll(u.String(), "%2A%2A%2A", "***")
}
// noteCustomProblem logs a failing URL row, throttled per row: a switch that is
// off answers the same way on every band change, and this fires on every one.
func (m *Manager) noteCustomProblem(c Config, msg string) {
m.httpFailMu.Lock()
if m.httpFailAt == nil {
m.httpFailAt = map[int64]time.Time{}
}
last := m.httpFailAt[c.ID]
now := time.Now()
quiet := now.Sub(last) < 5*time.Minute
if !quiet {
m.httpFailAt[c.ID] = now
}
m.httpFailMu.Unlock()
if quiet {
return
}
applog.Printf("udp: [%s] %s", c.Name, msg)
}
+108
View File
@@ -0,0 +1,108 @@
package udp
import (
"strings"
"testing"
)
// The escaping rule is the whole difference between a template that works on
// the bench and one that fails on the first portable callsign.
func TestRenderEscapesForURLsOnly(t *testing.T) {
fields := map[string]string{
"call": "F4BPO/P", "name": "Jean Pierre", "band": "20m", "az": "137",
}
// UDP: the receiver wants the text as typed.
if got := Render("<CALL>{call}</CALL>", fields, false); got != "<CALL>F4BPO/P</CALL>" {
t.Errorf("UDP render = %q", got)
}
// URL: a slash in a callsign is a path separator, a space breaks the request.
if got := Render("http://sw/a?c={call}&n={name}", fields, true); got != "http://sw/a?c=F4BPO%2FP&n=Jean+Pierre" {
t.Errorf("URL render = %q", got)
}
}
// A placeholder the trigger does not carry becomes empty, not the literal
// "{freq}" — otherwise the braces go down the wire and a receiver files them.
func TestRenderDropsUnknownFields(t *testing.T) {
if got := Render("<AZIMUT>{az}</AZIMUT>{freq}", map[string]string{"az": "137"}, false); got != "<AZIMUT>137</AZIMUT>" {
t.Errorf("got %q", got)
}
}
// Text that merely looks like a placeholder must survive: an unclosed brace is
// content, not a broken field.
func TestRenderLeavesLiteralBraces(t *testing.T) {
for _, c := range []struct{ in, want string }{
{"no fields here", "no fields here"},
{"{unclosed", "{unclosed"},
{"a } b", "a } b"},
} {
if got := Render(c.in, map[string]string{}, false); got != c.want {
t.Errorf("Render(%q) = %q, want %q", c.in, got, c.want)
}
}
}
// Field names are matched case- and space-insensitively: an operator typing
// {Band} or { band } means the band.
func TestRenderFieldNamesAreForgiving(t *testing.T) {
f := map[string]string{"band": "20m"}
for _, tmpl := range []string{"{band}", "{Band}", "{ BAND }"} {
if got := Render(tmpl, f, false); got != "20m" {
t.Errorf("Render(%q) = %q, want 20m", tmpl, got)
}
}
}
// Receivers that read a line at a time need a terminator, and a trailing space
// in a text box is invisible — hence a choice rather than something to type.
func TestLineEnding(t *testing.T) {
for in, want := range map[string]string{
"": "", "lf": "\n", "LF": "\n", "crlf": "\r\n", " CRLF ": "\r\n", "nonsense": "",
} {
if got := lineEnding(in); got != want {
t.Errorf("lineEnding(%q) = %q, want %q", in, got, want)
}
}
}
// These logs get sent to whoever is helping when something breaks. Storing a
// switch password as typed was a deliberate choice for LAN gear; putting it in
// a file that travels is a different one, and was never made.
func TestRedactURLHidesThePassword(t *testing.T) {
for in, want := range map[string]string{
"http://admin:[email protected]/ant?b=20m": "http://admin:***@192.168.1.50/ant?b=20m",
// No credentials, nothing to hide — and the URL must come back untouched,
// because it is the thing being debugged.
"http://192.168.1.50/ant?b=20m": "http://192.168.1.50/ant?b=20m",
// A username with no password is not a secret.
"http://[email protected]/ant": "http://[email protected]/ant",
// Not a URL at all: leave it, the operator needs to see what they typed.
"not a url {band}": "not a url {band}",
} {
if got := redactURL(in); got != want {
t.Errorf("redactURL(%q) = %q, want %q", in, got, want)
}
}
}
// "sent 18 bytes" says nothing about whether the substitution came out right.
// The payload is shown for custom rows and only those: an ADIF record or a
// binary WSJT frame on every QSO would bury the log.
func TestSentPreviewIsForCustomRowsOnly(t *testing.T) {
custom := Config{ServiceType: ServiceCustom, Trigger: TriggerBandChange}
got := sentPreview(custom, []byte("<BAND>20</BAND>\r\n"))
if got != ` on band_change: "<BAND>20</BAND>\r\n"` {
t.Errorf("custom preview = %q", got)
}
// A line ending is a choice the operator made — it has to be visible, and it
// must not break the log line in two.
if strings.ContainsAny(got, "\r\n") {
t.Error("the preview put a real newline in the log line")
}
for _, s := range []ServiceType{ServiceDBUpdated, ServiceWSJTLog, ServiceN1MMRadio} {
if p := sentPreview(Config{ServiceType: s}, []byte("<CALL:5>VK9XX<EOR>")); p != "" {
t.Errorf("%s should not dump its payload, got %q", s, p)
}
}
}
+84 -1
View File
@@ -86,12 +86,92 @@ func (m *Manager) EmitLoggedADIF(adif string) {
if strings.TrimSpace(adif) == "" {
return
}
for _, c := range m.Outbound(ServiceDBUpdated) {
rows := m.Outbound(ServiceDBUpdated)
if len(rows) == 0 {
// Said once per session, not per QSO. An operator who configured a second
// logger and sees nothing arrive needs to know the difference between "we
// sent it" and "there was nothing to send to" — and the usual cause is a
// row created as an inbound ADIF listener instead of an outbound message.
m.noADIFOnce.Do(func() {
applog.Printf("udp: a QSO was logged but no outbound \"ADIF message\" row is enabled — " +
"nothing is forwarded to another logger")
})
return
}
for _, c := range rows {
m.sendTo(c, []byte(adif))
}
}
// EmitLoggedQSOWSJT announces a logged contact on the WSJT-X interface, for
// receivers that speak it rather than plain text — Logger32's additional UDP
// sockets among them.
//
// BOTH messages go out, "QSO Logged" (5) then "Logged ADIF" (12), because that
// is exactly what WSJT-X does for every contact. Which one a receiver takes is
// its own business: MacLoggerDX reads the structured one by default and offers
// the ADIF as an option, and sending only the ADIF is why a QSO reached
// Logger32's socket and never reached its log. Anything built for WSJT-X
// already sees both from the real thing, so neither is a surprise and nothing
// logs the contact twice.
func (m *Manager) EmitLoggedQSOWSJT(q LoggedQSO, adifRec string) {
rows := m.Outbound(ServiceWSJTLog)
if len(rows) == 0 {
return
}
qsoPkt := BuildWSJTQSOLogged("OpsLog", q)
var adifPkt []byte
if strings.TrimSpace(adifRec) != "" {
adifPkt = BuildWSJTLoggedADIF("OpsLog", adifRec)
}
for _, c := range rows {
m.sendTo(c, qsoPkt)
if adifPkt != nil {
m.sendTo(c, adifPkt)
}
}
}
// sentPreview appends what was actually sent, for the rows where that is worth
// reading.
//
// Custom rows only, and deliberately: their payload is a template the operator
// wrote, and "sent 18 bytes" tells them nothing about whether the substitution
// came out as they meant. The ADIF and WSJT-X rows carry a whole record or a
// binary frame, and dumping either into the log on every QSO would bury it.
//
// The trigger is named too — a row that fires on the wrong moment looks exactly
// like a row that does not fire.
func sentPreview(c Config, payload []byte) string {
if c.ServiceType != ServiceCustom {
return ""
}
const maxShown = 200
s := string(payload)
if len(s) > maxShown {
s = s[:maxShown] + "…"
}
// %q below already renders a carriage return as \r rather than breaking the
// log line in two — and it is the line ending the operator chose, so it has
// to be visible. Escaping it by hand first would double every backslash.
if c.Trigger != "" {
return fmt.Sprintf(" on %s: %q", c.Trigger, s)
}
return fmt.Sprintf(": %q", s)
}
// sendTo resolves the row's destination (host:port) and fires one datagram.
//
// A successful send is logged, not just a failure. UDP has no delivery report:
// when an operator says "I set up an ADIF message to Logger32 on port 2250 and
// nothing arrives", the only thing that separates "OpsLog never sent it" from
// "the other program did not take it" is a line saying we sent. Without one,
// both look identical from here — and the first is far more common, because a
// row created as an INBOUND ADIF listener rather than an OUTBOUND ADIF message
// matches nothing and emits nothing, in silence.
//
// Rate is not a concern: these fire on a QSO being logged or a frequency
// change, not per packet on a socket.
func (m *Manager) sendTo(c Config, payload []byte) {
host := strings.TrimSpace(c.DestinationIP)
if host == "" {
@@ -100,5 +180,8 @@ func (m *Manager) sendTo(c Config, payload []byte) {
dst := fmt.Sprintf("%s:%d", host, c.Port)
if err := SendUDP(dst, payload); err != nil {
applog.Printf("udp: [%s] outbound send to %s failed: %v", c.Name, dst, err)
return
}
applog.Printf("udp: [%s] sent %d bytes to %s (%s)%s",
c.Name, len(payload), dst, c.ServiceType, sentPreview(c, payload))
}
+49 -1
View File
@@ -2,6 +2,7 @@ package udp
import (
"context"
"encoding/binary"
"fmt"
"net"
"regexp"
@@ -268,6 +269,44 @@ func (s *Server) logBadPacket(kind string, remote *net.UDPAddr, pkt []byte, err
}
}
// noteIgnoredADIF reports a payload the ADIF listener could not use, ONCE per
// cause and then quietly.
//
// This used to log a line per datagram. An operator's log arrived with four
// hundred identical "ADIF payload ignored" lines and nothing else legible: two
// inbound listeners were configured on the SAME multicast group and port
// (239.255.0.1:2237, one WSJT and one ADIF), so every WSJT-X decode packet was
// delivered to both, and the ADIF one rejected each of them in writing. An FT8
// cycle is dozens of decodes every fifteen seconds.
//
// So the WSJT-X magic number is checked here. When it matches, the payload is
// not "chatter" — it is a specific, fixable misconfiguration, and saying which
// is the difference between a log the operator can act on and one they cannot.
func (s *Server) noteIgnoredADIF(pkt []byte) {
s.mu.Lock()
s.badPkts++
n := s.badPkts
s.mu.Unlock()
if n > maxBadPktDumps {
return
}
if len(pkt) >= 4 && binary.BigEndian.Uint32(pkt[:4]) == wsjtMagic {
applog.Printf("udp: [%s] this is WSJT-X traffic, not ADIF — port %d is shared with a WSJT source; "+
"give the ADIF forwarder (JTAlert / GridTracker) its own port, or set this listener's service to WSJT\n",
s.cfg.Name, s.cfg.Port)
// One line is the whole diagnosis: nothing is gained by counting to five.
s.mu.Lock()
s.badPkts = maxBadPktDumps + 1
s.mu.Unlock()
return
}
applog.Printf("udp: [%s] ADIF payload ignored (no <call:>/<eor>) — %s\n", s.cfg.Name, describePacket(pkt))
if n == maxBadPktDumps {
applog.Printf("udp: [%s] further unusable payloads on port %d will not be logged\n",
s.cfg.Name, s.cfg.Port)
}
}
func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
ev := Event{ConfigID: s.cfg.ID, Service: s.cfg.ServiceType, Source: remote.String()}
switch s.cfg.ServiceType {
@@ -338,7 +377,7 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
text := string(pkt)
low := strings.ToLower(text)
if !strings.Contains(low, "<call:") || !strings.Contains(low, "<eor") {
applog.Printf("udp: [%s] ADIF payload ignored (no <call:>/<eor>)\n", s.cfg.Name)
s.noteIgnoredADIF(pkt)
return
}
ev.LoggedADIF = text
@@ -458,6 +497,15 @@ type Manager struct {
repo *Repo
out chan Event
// noADIFOnce keeps the "nothing to forward to" note to one line a session
// rather than one per QSO logged.
noADIFOnce sync.Once
// httpFailAt throttles the complaint from a custom URL row, per row: a
// switch that is off answers the same way on every band change.
httpFailMu sync.Mutex
httpFailAt map[int64]time.Time
mu sync.Mutex
inbound map[int64]*Server
outbound []Config
+148
View File
@@ -0,0 +1,148 @@
package udp
import (
"bytes"
"encoding/binary"
"time"
)
// Sending WSJT-X UDP messages, as opposed to parsing them (wsjt.go).
//
// This exists for Logger32, and for anything else that listens on the WSJT-X
// interface rather than for plain text. Logger32's "additional WSJT/JTDX UDP
// sockets" receivers — ports 2250, 2251, 2252 — are documented as receiving
// "UDP logging packets": they speak the WSJT-X v2 protocol, and a raw ADIF
// record posted to them is discarded without a word.
//
// That is a real distinction and not a detail: an operator can watch OpsLog
// report "sent 1153 bytes to 127.0.0.1:2250" and see nothing whatsoever appear
// in Logger32, because both statements are true.
// buildQString encodes a Qt QString/QByteArray as QDataStream writes it: a
// big-endian int32 length followed by the UTF-8 bytes. A negative length means
// null, which is not what we ever want here — an empty string is length 0.
func buildQString(s string) []byte {
out := make([]byte, 4, 4+len(s))
binary.BigEndian.PutUint32(out, uint32(len(s)))
return append(out, s...)
}
// BuildWSJTLoggedADIF frames a WSJT-X "Logged ADIF" datagram (message type 12).
//
// uint32 magic 0xadbccbda
// uint32 schema 2
// uint32 type 12
// QString id the sending program's name
// QString adif the ADIF record
//
// id matters more than it looks: a receiver uses it to tell instances apart, and
// some show it in their log. "OpsLog" is honest — pretending to be WSJT-X would
// make a second instance of the real thing indistinguishable from us.
func BuildWSJTLoggedADIF(id, adif string) []byte {
var b bytes.Buffer
var hdr [12]byte
binary.BigEndian.PutUint32(hdr[0:4], wsjtMagic)
binary.BigEndian.PutUint32(hdr[4:8], 2) // schema 2 — what WSJT-X 2.x speaks
binary.BigEndian.PutUint32(hdr[8:12], wsjtMsgLoggedADIF)
b.Write(hdr[:])
b.Write(buildQString(id))
b.Write(buildQString(adif))
return b.Bytes()
}
// LoggedQSO is what a WSJT-X "QSO Logged" message carries. Declared here rather
// than taking a qso.QSO so this package stays free of the logbook — it speaks a
// wire protocol and nothing else.
type LoggedQSO struct {
DXCall string
DXGrid string
TxFreqHz uint64
Mode string
ReportSent string
ReportRcvd string
TxPower string
Comments string
Name string
TimeOn time.Time // UTC
TimeOff time.Time // UTC
OperatorCall string
MyCall string
MyGrid string
ExchangeSent string
ExchangeRcvd string
PropMode string
}
// BuildWSJTQSOLogged frames a WSJT-X "QSO Logged" datagram (message type 5).
//
// This is the message most loggers listen for — MacLoggerDX takes it by default
// and offers the ADIF one as an alternative, and WSJT-X itself sends BOTH for
// every contact. Sending only the ADIF form was the reason a QSO reached
// Logger32's socket and never reached its log.
//
// Field order is fixed by WSJT-X's NetworkMessage.hpp and cannot be rearranged:
// a receiver reads them positionally, so one field out of place shifts every
// one after it.
func BuildWSJTQSOLogged(id string, q LoggedQSO) []byte {
var b bytes.Buffer
var hdr [12]byte
binary.BigEndian.PutUint32(hdr[0:4], wsjtMagic)
binary.BigEndian.PutUint32(hdr[4:8], 2)
binary.BigEndian.PutUint32(hdr[8:12], wsjtMsgQSOLogged)
b.Write(hdr[:])
b.Write(buildQString(id))
b.Write(buildQDateTimeUTC(q.TimeOff))
b.Write(buildQString(q.DXCall))
b.Write(buildQString(q.DXGrid))
var f [8]byte
binary.BigEndian.PutUint64(f[:], q.TxFreqHz)
b.Write(f[:])
b.Write(buildQString(q.Mode))
b.Write(buildQString(q.ReportSent))
b.Write(buildQString(q.ReportRcvd))
b.Write(buildQString(q.TxPower))
b.Write(buildQString(q.Comments))
b.Write(buildQString(q.Name))
b.Write(buildQDateTimeUTC(q.TimeOn))
b.Write(buildQString(q.OperatorCall))
b.Write(buildQString(q.MyCall))
b.Write(buildQString(q.MyGrid))
b.Write(buildQString(q.ExchangeSent))
b.Write(buildQString(q.ExchangeRcvd))
b.Write(buildQString(q.PropMode))
return b.Bytes()
}
// buildQDateTimeUTC encodes a QDateTime the way QDataStream has since Qt 5:
//
// qint64 Julian day number
// quint32 milliseconds since midnight
// quint8 time spec — 1 is UTC, which is the only one we ever send
//
// Everything in the logbook is already UTC, and a receiver that guessed local
// time from a spec of 0 would file the contact in the wrong hour.
func buildQDateTimeUTC(t time.Time) []byte {
t = t.UTC()
out := make([]byte, 0, 13)
var jd [8]byte
binary.BigEndian.PutUint64(jd[:], uint64(julianDay(t)))
out = append(out, jd[:]...)
ms := uint32(t.Hour()*3600000 + t.Minute()*60000 + t.Second()*1000 + t.Nanosecond()/1e6)
var m [4]byte
binary.BigEndian.PutUint32(m[:], ms)
out = append(out, m[:]...)
return append(out, 1) // Qt::UTC
}
// julianDay is the standard Gregorian-to-JDN conversion. Integer division
// throughout — this is the arithmetic Qt uses, and a floating-point version
// lands a day out at the edges.
func julianDay(t time.Time) int64 {
y := int64(t.Year())
m := int64(t.Month())
d := int64(t.Day())
a := (14 - m) / 12
y2 := y + 4800 - a
m2 := m + 12*a - 3
return d + (153*m2+2)/5 + 365*y2 + y2/4 - y2/100 + y2/400 - 32045
}
+139
View File
@@ -0,0 +1,139 @@
package udp
import (
"bytes"
"encoding/binary"
"testing"
"time"
)
// What we send has to be what we can read back: Logger32 and the rest decode
// this with the same rules our own parser uses, so a round trip through
// ParseWSJT is the honest check.
//
// The case behind it: OpsLog reported "sent 1153 bytes to 127.0.0.1:2250" and
// Logger32 showed nothing. Both were true — its UDP sockets speak the WSJT-X
// protocol and discard a bare ADIF record without a word.
func TestWSJTLoggedADIFRoundTrips(t *testing.T) {
const rec = "<CALL:5>VK9XX<BAND:3>20m<MODE:3>FT8<QSO_DATE:8>20260814<TIME_ON:6>174433<EOR>"
pkt := BuildWSJTLoggedADIF("OpsLog", rec)
ev, ok, err := ParseWSJT(pkt)
if err != nil {
t.Fatalf("ParseWSJT: %v", err)
}
if !ok {
t.Fatal("our own parser did not recognise the datagram we build")
}
if ev.LoggedADIF != rec {
t.Errorf("ADIF = %q, want %q", ev.LoggedADIF, rec)
}
if ev.ProgramID != "OpsLog" {
t.Errorf("id = %q, want OpsLog — a receiver uses it to tell instances apart", ev.ProgramID)
}
}
// The header is fixed and other programs match on it byte for byte.
func TestWSJTLoggedADIFHeader(t *testing.T) {
pkt := BuildWSJTLoggedADIF("OpsLog", "<EOR>")
want := []byte{
0xad, 0xbc, 0xcb, 0xda, // magic
0x00, 0x00, 0x00, 0x02, // schema 2
0x00, 0x00, 0x00, 0x0c, // type 12 — Logged ADIF
0x00, 0x00, 0x00, 0x06, // len("OpsLog")
'O', 'p', 's', 'L', 'o', 'g',
0x00, 0x00, 0x00, 0x05, // len("<EOR>")
'<', 'E', 'O', 'R', '>',
}
if !bytes.Equal(pkt, want) {
t.Errorf("packet = % X\nwant % X", pkt, want)
}
}
// The julian day has to match Qt's, because the receiver turns it back into a
// date. A day out here files every contact on the wrong day.
func TestJulianDayMatchesKnownValues(t *testing.T) {
for _, c := range []struct {
date time.Time
want int64
}{
// Checked against the standard tables: JDN is the count at noon UTC.
{time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC), 2451545},
{time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC), 2440588},
{time.Date(2026, 8, 15, 0, 0, 0, 0, time.UTC), 2461268},
} {
if got := julianDay(c.date); got != c.want {
t.Errorf("julianDay(%s) = %d, want %d", c.date.Format("2006-01-02"), got, c.want)
}
}
}
// QDateTime is julian day, then milliseconds since midnight, then the time
// spec. A receiver reads them positionally, and a spec of 0 (local time) would
// have it re-interpret a UTC contact in its own zone.
func TestQDateTimeIsUTCAndPositional(t *testing.T) {
got := buildQDateTimeUTC(time.Date(2026, 8, 15, 17, 44, 33, 0, time.UTC))
if len(got) != 13 {
t.Fatalf("%d bytes, want 13", len(got))
}
if jd := int64(binary.BigEndian.Uint64(got[0:8])); jd != 2461268 {
t.Errorf("julian day = %d, want 2461268", jd)
}
wantMs := uint32((17*3600 + 44*60 + 33) * 1000)
if ms := binary.BigEndian.Uint32(got[8:12]); ms != wantMs {
t.Errorf("ms since midnight = %d, want %d", ms, wantMs)
}
if got[12] != 1 {
t.Errorf("time spec = %d, want 1 (UTC)", got[12])
}
}
// The QSO Logged message is read positionally: one field out of place shifts
// every one after it, and the receiver silently files nonsense. This pins the
// order against WSJT-X's NetworkMessage.hpp.
func TestWSJTQSOLoggedFieldOrder(t *testing.T) {
pkt := BuildWSJTQSOLogged("OpsLog", LoggedQSO{
DXCall: "VK9XX", DXGrid: "QH30", TxFreqHz: 14074000, Mode: "FT8",
ReportSent: "-12", ReportRcvd: "-08", TxPower: "50", Comments: "tnx",
Name: "Ken", TimeOn: time.Date(2026, 8, 15, 17, 44, 0, 0, time.UTC),
TimeOff: time.Date(2026, 8, 15, 17, 45, 0, 0, time.UTC),
MyCall: "F4BPO", MyGrid: "IN95", OperatorCall: "F4BPO",
PropMode: "",
})
r := bytes.NewReader(pkt)
var magic, schema, mtype uint32
binary.Read(r, binary.BigEndian, &magic)
binary.Read(r, binary.BigEndian, &schema)
binary.Read(r, binary.BigEndian, &mtype)
if magic != wsjtMagic || schema != 2 || mtype != wsjtMsgQSOLogged {
t.Fatalf("header magic=%08x schema=%d type=%d", magic, schema, mtype)
}
id, _ := readQString(r)
if id != "OpsLog" {
t.Errorf("id = %q", id)
}
r.Seek(13, 1) // QSO off
call, _ := readQString(r)
grid, _ := readQString(r)
var freq uint64
binary.Read(r, binary.BigEndian, &freq)
mode, _ := readQString(r)
sent, _ := readQString(r)
rcvd, _ := readQString(r)
if call != "VK9XX" || grid != "QH30" || freq != 14074000 || mode != "FT8" || sent != "-12" || rcvd != "-08" {
t.Errorf("got call=%q grid=%q freq=%d mode=%q sent=%q rcvd=%q", call, grid, freq, mode, sent, rcvd)
}
pwr, _ := readQString(r)
comments, _ := readQString(r)
name, _ := readQString(r)
if pwr != "50" || comments != "tnx" || name != "Ken" {
t.Errorf("got pwr=%q comments=%q name=%q", pwr, comments, name)
}
r.Seek(13, 1) // QSO on
op, _ := readQString(r)
myCall, _ := readQString(r)
myGrid, _ := readQString(r)
if op != "F4BPO" || myCall != "F4BPO" || myGrid != "IN95" {
t.Errorf("got op=%q myCall=%q myGrid=%q", op, myCall, myGrid)
}
}
+33 -14
View File
@@ -21,6 +21,12 @@ type QRZ struct {
HTTP *http.Client
// PreferNickname takes QRZ's <nickname> over the composed first+last name
// when the operator has published one. It is the name they go BY on the air,
// which is what belongs in a log — HamQTH's <nick> is already used that way,
// and this brings QRZ into line for operators who want it.
PreferNickname bool
mu sync.Mutex
session string
loggedAt time.Time
@@ -117,7 +123,7 @@ func (q *QRZ) fetch(ctx context.Context, sessionKey, callsign string) (Result, e
}
r := Result{
Callsign: strings.ToUpper(c.Call),
Name: joinName(c.FName, c.Name),
Name: qrzName(q.PreferNickname, c.Nickname, c.FName, c.Name),
QTH: c.Addr2,
Address: composeQRZAddress(c.Addr1, c.Addr2, c.Zip, c.Country),
State: strings.ToUpper(c.State),
@@ -169,6 +175,7 @@ type qrzSession struct {
type qrzCallsign struct {
Call string `xml:"call"`
FName string `xml:"fname"`
Nickname string `xml:"nickname"` // the name the operator goes by on the air
Name string `xml:"name"`
Addr1 string `xml:"addr1"`
Addr2 string `xml:"addr2"`
@@ -213,19 +220,6 @@ func composeQRZAddress(addr1, addr2, zip, country string) string {
return strings.Join(parts, ", ")
}
func joinName(first, last string) string {
first = strings.TrimSpace(first)
last = strings.TrimSpace(last)
switch {
case first != "" && last != "":
return first + " " + last
case first != "":
return first
default:
return last
}
}
func firstNonEmpty(s ...string) string {
for _, v := range s {
v = strings.TrimSpace(v)
@@ -235,3 +229,28 @@ func firstNonEmpty(s ...string) string {
}
return ""
}
// qrzName picks what goes in the log's Name field.
//
// The FIRST name only. A log greets an operator, it does not address an
// envelope: "Robert" is what goes out on the air, and "Robert Smith" filled the
// field with something no one would ever send. The surname stays available in
// the record; it simply is not the name of the contact.
//
// The nickname is taken ahead of it when the operator asked for that AND QRZ
// has one — a blank nickname must never blank the name, which is the whole
// reason this is a fallback rather than a swap.
//
// The surname is the last resort: a record with no first name at all is better
// answered with a surname than with nothing.
func qrzName(preferNickname bool, nickname, fname, name string) string {
if preferNickname {
if n := strings.TrimSpace(nickname); n != "" {
return n
}
}
if f := strings.TrimSpace(fname); f != "" {
return f
}
return strings.TrimSpace(name)
}
+33
View File
@@ -0,0 +1,33 @@
package lookup
import "testing"
// What goes in a log's Name field is the FIRST name. A log greets an operator;
// it does not address an envelope. "Robert Smith" filled the field with
// something no one would ever send on the air.
//
// The nickname wins ahead of it when asked for — but a published nickname is
// optional, so an empty one must fall through rather than blank the name. That
// is the whole difference between a fallback and a swap.
func TestQRZName(t *testing.T) {
for _, tc := range []struct {
name string
prefer bool
nickname, fname, last string
want string
}{
{"first name only, never the surname", false, "Bob", "Robert", "Smith", "Robert"},
{"nickname when asked for", true, "Bob", "Robert", "Smith", "Bob"},
{"no nickname published falls back to the FIRST name", true, "", "Robert", "Smith", "Robert"},
{"a blank nickname is not a nickname", true, " ", "Robert", "Smith", "Robert"},
{"option off ignores the nickname", false, "Bob", "Robert", "Smith", "Robert"},
{"surname is the last resort, not the default", true, "", "", "Smith", "Smith"},
{"nothing published at all", false, "", "", "", ""},
{"nickname alone", true, "Bob", "", "", "Bob"},
} {
if got := qrzName(tc.prefer, tc.nickname, tc.fname, tc.last); got != tc.want {
t.Errorf("%s: qrzName(%v, %q, %q, %q) = %q, want %q",
tc.name, tc.prefer, tc.nickname, tc.fname, tc.last, got, tc.want)
}
}
}
+4
View File
@@ -54,6 +54,9 @@ type Spot struct {
Band string
Mode string
Grid string // transmitter's grid, 4 characters
// FreqHz is where the decode happened. The band alone is enough for an
// opening, but a station worth chasing has to be tuned to.
FreqHz int64
DistKm int // from the operator
Bearing int // degrees from the operator, short path
At time.Time
@@ -269,6 +272,7 @@ func (w *Watcher) handle(_ mqtt.Client, m mqtt.Message) {
s := Spot{
Call: call, Band: strings.ToLower(strings.TrimSpace(p.Band)),
Mode: strings.ToUpper(strings.TrimSpace(p.Mode)), Grid: grid[:4],
FreqHz: p.Freq,
DistKm: dist, Bearing: brg,
// Stamped on receipt: the broker's own timestamps vary between payload
// versions, and the window this feeds is measured in minutes.
+29
View File
@@ -0,0 +1,29 @@
package pskr
import (
"encoding/json"
"testing"
)
// The frequency has to survive from the payload to the Spot: the Chase New
// panel is only useful if a click can put the rig on the station, and a row
// showing "—" instead of 14074.0 is a row nobody can act on.
func TestWirePayloadCarriesFrequency(t *testing.T) {
const payload = `{"sq":1,"f":14074123,"md":"FT8","rp":-12,"sc":"VK9XX","sl":"QH30","rc":"F4BPO","rl":"IN95","b":"20m"}`
var p wire
if err := json.Unmarshal([]byte(payload), &p); err != nil {
t.Fatalf("unmarshal: %v", err)
}
if p.Freq != 14074123 {
t.Errorf("Freq = %d, want 14074123", p.Freq)
}
if p.TxCall != "VK9XX" || p.Band != "20m" || p.Mode != "FT8" {
t.Errorf("unexpected decode: %+v", p)
}
// And the Spot the watcher builds must carry it — this is the field that was
// declared, documented, and then never assigned.
s := Spot{Call: p.TxCall, Band: p.Band, Mode: p.Mode, FreqHz: p.Freq}
if s.FreqHz != p.Freq {
t.Errorf("Spot.FreqHz = %d, want %d", s.FreqHz, p.Freq)
}
}
+139 -6
View File
@@ -99,7 +99,9 @@ type QSO struct {
QSLRcvd string `json:"qsl_rcvd,omitempty"`
QSLSentDate string `json:"qsl_sent_date,omitempty"`
QSLRcvdDate string `json:"qsl_rcvd_date,omitempty"`
QSLVia string `json:"qsl_via,omitempty"`
QSLVia string `json:"qsl_via,omitempty"` // ADIF QSL_VIA — the QSL manager
QSLSentVia string `json:"qsl_sent_via,omitempty"` // ADIF enumeration B/D/E — how the card was sent
QSLRcvdVia string `json:"qsl_rcvd_via,omitempty"` // same enumeration, for the card received
QSLMsg string `json:"qsl_msg,omitempty"`
QSLMsgRcvd string `json:"qslmsg_rcvd,omitempty"`
@@ -246,7 +248,7 @@ const columnList = `callsign, qso_date, qso_date_off, band, band_rx, mode, submo
grid, gridsquare_ext, vucc_grids,
country, state, cnty, dxcc, cont, cqz, ituz, iota, sota_ref, pota_ref,
age, lat, lon, rig, ant,
qsl_sent, qsl_rcvd, qsl_sent_date, qsl_rcvd_date, qsl_via, qsl_msg, qslmsg_rcvd,
qsl_sent, qsl_rcvd, qsl_sent_date, qsl_rcvd_date, qsl_via, qsl_sent_via, qsl_rcvd_via, qsl_msg, qslmsg_rcvd,
lotw_sent, lotw_rcvd, lotw_sent_date, lotw_rcvd_date,
eqsl_sent, eqsl_rcvd, eqsl_sent_date, eqsl_rcvd_date,
clublog_qso_upload_date, clublog_qso_upload_status,
@@ -321,7 +323,7 @@ func (q *QSO) args() []any {
q.Grid, q.GridExt, q.VUCCGrids,
q.Country, q.State, q.County, q.DXCC, q.Continent, q.CQZ, q.ITUZ, q.IOTA, q.SOTARef, q.POTARef,
q.Age, q.Lat, q.Lon, q.Rig, q.Ant,
q.QSLSent, q.QSLRcvd, q.QSLSentDate, q.QSLRcvdDate, q.QSLVia, q.QSLMsg, q.QSLMsgRcvd,
q.QSLSent, q.QSLRcvd, q.QSLSentDate, q.QSLRcvdDate, q.QSLVia, q.QSLSentVia, q.QSLRcvdVia, q.QSLMsg, q.QSLMsgRcvd,
q.LOTWSent, q.LOTWRcvd, q.LOTWSentDate, q.LOTWRcvdDate,
q.EQSLSent, q.EQSLRcvd, q.EQSLSentDate, q.EQSLRcvdDate,
q.ClublogUploadDate, q.ClublogUploadStatus,
@@ -771,6 +773,8 @@ var bulkEditableCols = map[string]bool{
"qsl_sent": true,
"qsl_rcvd": true,
"qsl_via": true,
"qsl_sent_via": true,
"qsl_rcvd_via": true,
"qrzcom_qso_upload_status": true,
"qrzcom_qso_download_status": true,
"clublog_qso_upload_status": true,
@@ -1250,7 +1254,7 @@ var filterableColumns = map[string]bool{
"grid": true, "country": true, "state": true, "cnty": true,
"dxcc": true, "cont": true, "cqz": true, "ituz": true,
"iota": true, "sota_ref": true, "pota_ref": true, "wwff_ref": true, "rig": true, "ant": true,
"qsl_sent": true, "qsl_rcvd": true, "qsl_via": true,
"qsl_sent": true, "qsl_rcvd": true, "qsl_via": true, "qsl_sent_via": true, "qsl_rcvd_via": true,
"lotw_sent": true, "lotw_rcvd": true, "eqsl_sent": true, "eqsl_rcvd": true,
"qrzcom_qso_upload_status": true, "qrzcom_qso_download_status": true,
"clublog_qso_upload_status": true, "hrdlog_qso_upload_status": true,
@@ -2265,6 +2269,132 @@ func (r *Repo) WorkedCountyKeys(ctx context.Context, keyFn func(state, cnty stri
return out, rows.Err()
}
// CountQSLViaRouting counts the QSOs whose qsl_via holds a routing method
// instead of a manager, per isRouting.
//
// The test is applied in Go rather than in SQL because it has to hold the same
// vocabulary as the import and the QSL panel — one list of accepted spellings,
// in internal/adif, not a LIKE pattern drifting apart from it here. Only the
// distinct values are examined, so the log is scanned once whatever its size.
func (r *Repo) CountQSLViaRouting(ctx context.Context, isRouting func(string) bool) (int, error) {
rows, err := r.db.QueryContext(ctx,
`SELECT qsl_via, COUNT(*) FROM qso
WHERE qsl_via IS NOT NULL AND qsl_via != ''
AND (qsl_sent_via IS NULL OR qsl_sent_via = '')
GROUP BY qsl_via`)
if err != nil {
return 0, err
}
defer rows.Close()
n := 0
for rows.Next() {
var via string
var c int
if err := rows.Scan(&via, &c); err != nil {
return 0, err
}
if isRouting(via) {
n += c
}
}
return n, rows.Err()
}
// RepairQSLViaRouting moves routing words out of qsl_via into qsl_sent_via,
// returning how many QSOs were changed.
//
// One UPDATE per distinct spelling, not per QSO: a log holds a handful of them
// ("Bureau", "E", "Direct"…), and a remote MySQL logbook must not be made to
// carry one round trip per contact for a tidy-up. Rows that already have a
// sent-via are left alone by the same condition the count uses, so running this
// twice cannot undo a later import.
func (r *Repo) RepairQSLViaRouting(ctx context.Context, normalise func(string) string) (int, error) {
rows, err := r.db.QueryContext(ctx,
`SELECT DISTINCT qsl_via FROM qso
WHERE qsl_via IS NOT NULL AND qsl_via != ''
AND (qsl_sent_via IS NULL OR qsl_sent_via = '')`)
if err != nil {
return 0, err
}
type move struct{ from, to string }
var moves []move
for rows.Next() {
var via string
if err := rows.Scan(&via); err != nil {
rows.Close()
return 0, err
}
if to := normalise(via); to != "" {
moves = append(moves, move{from: via, to: to})
}
}
rows.Close()
if err := rows.Err(); err != nil {
return 0, err
}
total := 0
for _, m := range moves {
res, err := r.db.ExecContext(ctx,
`UPDATE qso SET qsl_sent_via = ?, qsl_via = ''
WHERE qsl_via = ? AND (qsl_sent_via IS NULL OR qsl_sent_via = '')`,
m.to, m.from)
if err != nil {
return total, err
}
if n, err := res.RowsAffected(); err == nil {
total += int(n)
}
}
return total, nil
}
// CallCounties returns callsign → "STATE,County" for every US station already
// logged with a county, newest QSO winning.
//
// It exists so the cluster shows the SAME county the entry panel does. The
// entry panel gets its county from a callbook, which knows where the licensee
// actually lives; a spot carries only a callsign, so the cluster falls back to
// deriving one from the FCC licence address, which is right about 98% of the
// time. Where the log already holds a callbook's answer for that station, the
// two panels disagreeing is pure noise — this is what lets the better answer
// win in both.
//
// One DISTINCT scan when the cluster snapshot is rebuilt, then map lookups per
// spot, like the worked-county and worked-grid sets beside it.
func (r *Repo) CallCounties(ctx context.Context) (map[string]string, error) {
rows, err := r.db.QueryContext(ctx,
`SELECT callsign, COALESCE(state,''), COALESCE(cnty,'') FROM qso
WHERE dxcc IN (291,110,6) AND cnty IS NOT NULL AND cnty != ''
ORDER BY qso_date, time_on`)
if err != nil {
return nil, err
}
defer rows.Close()
out := make(map[string]string, 1024)
for rows.Next() {
var call, state, cnty string
if err := rows.Scan(&call, &state, &cnty); err != nil {
return nil, err
}
call = strings.ToUpper(strings.TrimSpace(call))
cnty = strings.TrimSpace(cnty)
if call == "" || cnty == "" {
continue
}
// Store the ADIF "STATE,County" shape whatever the log holds, so the
// caller has both halves without a second column.
if !strings.Contains(cnty, ",") {
if state = strings.TrimSpace(state); state == "" {
continue
}
cnty = state + "," + cnty
}
out[call] = cnty
}
return out, rows.Err()
}
// CountyWorked reports whether one US county has already been worked.
//
// It exists so the entry panel can flag a new county without loading the whole
@@ -2843,7 +2973,8 @@ func scanQSO(s scanner) (QSO, error) {
rig, ant sql.NullString
qslSent, qslRcvd sql.NullString
qslSentDate, qslRcvdDate sql.NullString
qslVia, qslMsg, qslMsgRcvd sql.NullString
qslVia, qslSentVia, qslRcvdVia sql.NullString
qslMsg, qslMsgRcvd sql.NullString
lotwSent, lotwRcvd sql.NullString
lotwSentDate, lotwRcvdDate sql.NullString
eqslSent, eqslRcvd sql.NullString
@@ -2888,7 +3019,7 @@ func scanQSO(s scanner) (QSO, error) {
&grid, &gridExt, &vucc,
&country, &state, &cnty, &dxcc, &cont, &cqz, &ituz, &iota, &sota, &pota,
&age, &lat, &lon, &rig, &ant,
&qslSent, &qslRcvd, &qslSentDate, &qslRcvdDate, &qslVia, &qslMsg, &qslMsgRcvd,
&qslSent, &qslRcvd, &qslSentDate, &qslRcvdDate, &qslVia, &qslSentVia, &qslRcvdVia, &qslMsg, &qslMsgRcvd,
&lotwSent, &lotwRcvd, &lotwSentDate, &lotwRcvdDate,
&eqslSent, &eqslRcvd, &eqslSentDate, &eqslRcvdDate,
&clublogDate, &clublogStatus,
@@ -2972,6 +3103,8 @@ func scanQSO(s scanner) (QSO, error) {
q.QSLSentDate = qslSentDate.String
q.QSLRcvdDate = qslRcvdDate.String
q.QSLVia = qslVia.String
q.QSLSentVia = qslSentVia.String
q.QSLRcvdVia = qslRcvdVia.String
q.QSLMsg = qslMsg.String
q.QSLMsgRcvd = qslMsgRcvd.String
q.LOTWSent = lotwSent.String
+124
View File
@@ -0,0 +1,124 @@
package relaydev
import (
"context"
"fmt"
"strconv"
"strings"
"sync"
)
// A generic HTTP relay board: one URL to switch a relay on, one to switch it off.
//
// This is for the home-made switch — an ESP8266 with a web page, a Shelly, a
// Sonoff running third-party firmware, any of the boxes that answer a GET and
// have no protocol worth naming. The named drivers beside it exist because
// their boards need something specific; this one exists because most of them
// need nothing at all.
//
// TWO WAYS TO CONFIGURE IT, and the difference matters:
//
// - one URL pair with {relay} in it, used for every relay:
// http://192.168.1.9/relay?n={relay}&state=on
// - or one pair per relay, when the box has no pattern to speak of:
// relay 1 → http://192.168.1.9/FF0101 , relay 2 → .../FF0201
//
// The second is the reason this driver exists. A hand-made switch often has
// URLs with nothing in common between channels, and a template with {relay}
// cannot express that.
//
// STATE IS REMEMBERED, NOT READ. Most of these boxes have no status endpoint,
// or answer with a web page nobody can parse reliably. Status therefore returns
// what we last commanded — see the method for what that costs.
type httpGen struct {
onURLs []string // index 0 = relay 1; "" falls back to the pattern
offURLs []string
onPat string // pattern with {relay}, used when the per-relay URL is empty
offPat string
user string
pass string
count int
mu sync.Mutex
state []bool
}
// NewHTTPGeneric builds the driver. onURLs/offURLs are per relay (index 0 =
// relay 1) and may be short or hold empty entries; onPat/offPat are the
// fallback patterns.
func NewHTTPGeneric(onURLs, offURLs []string, onPat, offPat, user, pass string, count int) Device {
if count <= 0 {
count = len(onURLs)
}
if count <= 0 {
count = 1
}
return &httpGen{
onURLs: onURLs, offURLs: offURLs,
onPat: onPat, offPat: offPat,
user: user, pass: pass, count: count,
state: make([]bool, count),
}
}
func (h *httpGen) Count() int { return h.count }
func (h *httpGen) Close() error { return nil } // stateless HTTP, nothing to release
// urlFor picks the per-relay URL, falling back to the pattern.
func (h *httpGen) urlFor(relay int, on bool) string {
list, pat := h.offURLs, h.offPat
if on {
list, pat = h.onURLs, h.onPat
}
if i := relay - 1; i >= 0 && i < len(list) {
if u := strings.TrimSpace(list[i]); u != "" {
return u
}
}
if pat = strings.TrimSpace(pat); pat == "" {
return ""
}
return strings.ReplaceAll(pat, "{relay}", strconv.Itoa(relay))
}
func (h *httpGen) Set(ctx context.Context, relay int, on bool) error {
if relay < 1 || relay > h.count {
return fmt.Errorf("relay %d out of range 1..%d", relay, h.count)
}
u := h.urlFor(relay, on)
if u == "" {
// Naming the direction matters: an operator who filled the ON URLs and
// left OFF empty gets a switch that latches, and "no URL configured"
// alone would not say which half is missing.
dir := "OFF"
if on {
dir = "ON"
}
return fmt.Errorf("no %s URL configured for relay %d", dir, relay)
}
if _, err := get(ctx, u, h.user, h.pass); err != nil {
return err
}
h.mu.Lock()
if i := relay - 1; i < len(h.state) {
h.state[i] = on
}
h.mu.Unlock()
return nil
}
// Status returns what was last commanded, not what the board is doing.
//
// These boxes rarely have a status endpoint worth trusting, so there is nothing
// to read. The cost is real and worth stating: after OpsLog restarts, every
// relay reads as off until something switches it, so the automatic control
// re-commands each one once. That is a harmless extra command on a board with
// no memory of its own — and far better than guessing a state and leaving an
// antenna disconnected because we assumed it was already selected.
func (h *httpGen) Status(ctx context.Context) ([]bool, error) {
h.mu.Lock()
defer h.mu.Unlock()
out := make([]bool, h.count)
copy(out, h.state)
return out, nil
}
+92
View File
@@ -0,0 +1,92 @@
package relaydev
import (
"context"
"net/http"
"net/http/httptest"
"strings"
"sync"
"testing"
)
// The pattern form: one URL pair for the whole board, {relay} substituted.
func TestHTTPGenericPattern(t *testing.T) {
var mu sync.Mutex
var got []string
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
mu.Lock()
got = append(got, r.URL.String())
mu.Unlock()
}))
defer srv.Close()
d := NewHTTPGeneric(nil, nil,
srv.URL+"/relay?n={relay}&state=on",
srv.URL+"/relay?n={relay}&state=off", "", "", 4)
if err := d.Set(context.Background(), 2, true); err != nil {
t.Fatalf("Set on: %v", err)
}
if err := d.Set(context.Background(), 3, false); err != nil {
t.Fatalf("Set off: %v", err)
}
mu.Lock()
defer mu.Unlock()
want := []string{"/relay?n=2&state=on", "/relay?n=3&state=off"}
if strings.Join(got, " ") != strings.Join(want, " ") {
t.Errorf("requested %v, want %v", got, want)
}
}
// The per-relay form, which is the reason this driver exists: a hand-made
// switch often has URLs with nothing in common between channels, and no
// pattern can express that.
func TestHTTPGenericPerRelayURLsWinOverThePattern(t *testing.T) {
var mu sync.Mutex
var got []string
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
mu.Lock()
got = append(got, r.URL.Path)
mu.Unlock()
}))
defer srv.Close()
d := NewHTTPGeneric(
[]string{srv.URL + "/FF0101", "", srv.URL + "/weird/on"},
[]string{srv.URL + "/FF0100", "", ""},
srv.URL+"/pattern/on/{relay}", srv.URL+"/pattern/off/{relay}", "", "", 3)
_ = d.Set(context.Background(), 1, true) // its own URL
_ = d.Set(context.Background(), 2, true) // empty → falls back to the pattern
_ = d.Set(context.Background(), 3, false) // no OFF of its own → pattern
mu.Lock()
defer mu.Unlock()
want := []string{"/FF0101", "/pattern/on/2", "/pattern/off/3"}
if strings.Join(got, " ") != strings.Join(want, " ") {
t.Errorf("requested %v, want %v", got, want)
}
}
// A switch with the ON URLs filled and OFF left empty latches. The error has to
// name the direction, or the operator cannot tell which half is missing.
func TestHTTPGenericNamesTheMissingDirection(t *testing.T) {
d := NewHTTPGeneric([]string{"http://x/on"}, nil, "", "", "", "", 1)
err := d.Set(context.Background(), 1, false)
if err == nil || !strings.Contains(err.Error(), "OFF") {
t.Errorf("err = %v, want it to name the OFF direction", err)
}
}
// Status reports what was commanded: these boxes have nothing to read.
func TestHTTPGenericRemembersWhatItCommanded(t *testing.T) {
srv := httptest.NewServer(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {}))
defer srv.Close()
d := NewHTTPGeneric(nil, nil, srv.URL+"/on/{relay}", srv.URL+"/off/{relay}", "", "", 3)
_ = d.Set(context.Background(), 2, true)
st, err := d.Status(context.Background())
if err != nil {
t.Fatalf("Status: %v", err)
}
if len(st) != 3 || st[0] || !st[1] || st[2] {
t.Errorf("state = %v, want only relay 2 on", st)
}
}
+52 -1
View File
@@ -32,6 +32,7 @@ package rigctld
import (
"bufio"
"fmt"
"hamlog/internal/cat"
"net"
"strconv"
"strings"
@@ -244,7 +245,18 @@ func (s *Server) serve(c net.Conn) {
s.log("rigctld: client %s disconnected", c.RemoteAddr())
return
}
resp, quit := s.handle(strings.TrimSpace(line))
req := strings.TrimSpace(line)
resp, quit := s.handle(req)
// The whole exchange, when tracing is on.
//
// Only PTT transitions were ever recorded, so when JTDX aborted a
// transmission mid-frame the log showed the abort and not the command
// that preceded it — the one thing needed to tell whether OpsLog answered
// something the client could not accept. Behind the same switch as the CAT
// wire trace: this is one line per poll and would drown an ordinary log.
if req != "" && cat.CIVTraceEnabled() {
s.log("rigctld: %s → %q ⇒ %q", c.RemoteAddr(), req, strings.TrimRight(resp, "\r\n"))
}
if resp != "" {
if _, err := w.WriteString(resp); err != nil {
return
@@ -409,6 +421,17 @@ func (s *Server) handle(line string) (resp string, quit bool) {
return rprt(0), false
}
s.splitWanted.Store(false)
// Already simplex? Then there is nothing to do and the request is
// satisfied. Reporting a failure here is what broke JTDX in "Fake It":
// Fake It uses no split, JTDX still sends "S 0" to be sure, and a backend
// that cannot SET split answered an error to a request that was already
// true. JTDX read that as rig control failing and abandoned the
// transmission a second into the frame.
//
// A refusal is only honest when something actually needed doing.
if on, _ := s.rig.Split(); !on {
return rprt(0), false
}
if err := s.rig.SetSplit(false, 0); err != nil {
s.log("rigctld: split off failed: %v", err)
return rprt(-9), false
@@ -438,6 +461,34 @@ func (s *Server) handle(line string) (resp string, quit bool) {
s.log("rigctld: split ON, TX %.0f Hz", hz)
return rprt(0), false
case "X", "\\set_split_mode":
// "X <mode> <passband>" — the mode of the TRANSMIT VFO.
//
// Accepted rather than refused. WSJT-X and JTDX send it as part of their
// normal setup even in "Fake It", where there is no split and therefore no
// second VFO to give a mode to; answering "not implemented" made JTDX give
// up on rig control mid-transmission.
//
// The mode is applied when there IS a split — the transmit VFO is a real
// one then. Without split the request has no target and succeeding is the
// honest answer: the transmit VFO already has that mode, because it is the
// same VFO.
if len(args) < 1 {
return rprt(-1), false
}
if on, _ := s.rig.Split(); !on {
return rprt(0), false
}
if err := s.rig.SetMode(args[0]); err != nil {
s.log("rigctld: split mode %q failed: %v", args[0], err)
return rprt(-9), false
}
return rprt(0), false
case "x", "\\get_split_mode":
// Mirrors X: the transmit VFO's mode and passband. Without split that is
// simply the current mode.
return s.rig.Mode() + "\n2400\n", false
default:
// A frame ending in ';' is not a rigctl command at all — it is raw rig
// dialect (Kenwood/Elecraft/Yaesu), which means the client is configured
+52
View File
@@ -50,3 +50,55 @@ func TestSetSplitRefusalIsReported(t *testing.T) {
t.Errorf("a rig that cannot split answered %q — the client will transmit on the wrong frequency", got)
}
}
// "Fake It" uses NO split, and JTDX still sends "S 0" to make sure. A backend
// that cannot SET split used to answer an error to that — a refusal of a
// request that was already satisfied — and JTDX read it as rig control failing
// and abandoned the transmission a second into a 13.8-second frame.
//
// Reported against a Yaesu whose backend cannot arm split from software.
func TestSplitOffOnASimplexRigSucceeds(t *testing.T) {
rig := &fakeRig{freq: 14074000, mode: "FT8", noSplit: true}
s := New(0, rig, func(string, ...any) {})
if got, _ := s.handle("S 0 VFOA"); !strings.HasPrefix(got, "RPRT 0") {
t.Errorf("split off on a simplex rig answered %q — nothing needed doing", got)
}
// And it must not have bothered the rig at all.
if len(rig.splitCalls) != 0 {
t.Errorf("rig was asked to clear a split it did not have: %v", rig.splitCalls)
}
// Arming, however, must still fail loudly: there the request is real and
// unmet, and a client that believes it is transmitting up the band while the
// radio sits on the DX's frequency is the bug this refusal exists to prevent.
if got, _ := s.handle("S 1 VFOB"); !strings.HasPrefix(got, "RPRT 0") {
t.Fatalf("arming is deferred to set_split_freq: %q", got)
}
if got, _ := s.handle("I 14075300.000000"); strings.HasPrefix(got, "RPRT 0") {
t.Error("arming split on a backend that cannot must report a failure")
}
}
// X (set_split_mode) is sent by WSJT-X and JTDX during ordinary setup, Fake It
// included — where there is no second VFO to give a mode to. Answering "not
// implemented" made JTDX give up on rig control mid-transmission.
func TestSplitModeIsAccepted(t *testing.T) {
rig := &fakeRig{freq: 14074000, mode: "FT8"}
s := New(0, rig, func(string, ...any) {})
// No split: nothing to target, and succeeding is honest — the transmit VFO
// already has that mode because it is the same VFO.
if got, _ := s.handle("X PKTUSB -1"); !strings.HasPrefix(got, "RPRT 0") {
t.Errorf("set_split_mode answered %q", got)
}
if rig.mode != "FT8" {
t.Errorf("the mode was changed with no split in force: %q", rig.mode)
}
// Reading it back must answer a mode and a passband, never an error.
got, _ := s.handle("x")
if !strings.Contains(got, "FT8") {
t.Errorf("get_split_mode = %q, want the current mode", got)
}
}
+54
View File
@@ -0,0 +1,54 @@
package spe
import (
"testing"
"time"
)
// decodeCSV marks the client connected on EVERY frame it parses, and the poll
// goroutine can be mid-read while PowerOff runs. So the frame from a second ago
// landed after PowerOff had marked the amp offline and put it straight back —
// the console kept showing the amplifier on until the operator pressed OFF a
// second time.
func TestFrameInFlightDoesNotResurrectASwitchedOffAmp(t *testing.T) {
c := &Client{}
const frame = ",13K,O,R,A,1,05,1b,0r,M,0000, 0.00, 0.00, 1.3, 0.0, 26,000,000,N,N,"
// Normal running: a frame marks it connected and reads OPERATE.
c.decodeCSV(frame)
if !c.GetStatus().Connected || !c.GetStatus().Operate {
t.Fatal("a status frame should mark the amp connected")
}
// The operator presses OFF. This is what PowerOff does, in order.
c.statusMu.Lock()
c.offUntil = time.Now().Add(3 * time.Second)
c.statusMu.Unlock()
c.setErr(errSwitchedOff{})
// A frame that was already on the wire arrives now.
c.decodeCSV(frame)
if c.GetStatus().Connected {
t.Error("a frame from before the switch-off put the amp back on — this is the double-click on OFF")
}
}
// An amp switched back on at its own front panel must reappear without OpsLog
// being told, so the suppression has to expire rather than latch.
func TestSuppressionExpires(t *testing.T) {
c := &Client{}
c.statusMu.Lock()
c.offUntil = time.Now().Add(-time.Second) // window already past
c.statusMu.Unlock()
c.setErr(errSwitchedOff{})
c.decodeCSV(",13K,O,R,A,1,05,1b,0r,M,0000, 0.00, 0.00, 1.3, 0.0, 26,000,000,N,N,")
if !c.GetStatus().Connected {
t.Error("an amp answering after the window must come back on its own")
}
}
type errSwitchedOff struct{}
func (errSwitchedOff) Error() string { return "switched off" }
+56 -2
View File
@@ -91,6 +91,15 @@ type Client struct {
statusMu sync.RWMutex
status Status
lastRaw string // last raw status payload logged (log only on change)
// offUntil suppresses status frames that were already in flight when the amp
// was switched off. decodeCSV marks the client connected on every frame it
// parses, and the poll goroutine can be mid-read while PowerOff runs — so the
// frame from a second ago resurrected an amplifier the operator had just
// switched off, and the console only caught up when they pressed OFF twice.
//
// Time-bounded rather than a latch: an amp switched back on at its own front
// panel must reappear on its own.
offUntil time.Time
stop chan struct{}
running bool
@@ -177,6 +186,12 @@ func (c *Client) PowerOn() error {
if c.GetStatus().Connected {
return nil
}
// Switching on cancels the suppression window: the operator wants frames
// believed again, and waiting out a timer they cannot see would read as the
// power-on having failed.
c.statusMu.Lock()
c.offUntil = time.Time{}
c.statusMu.Unlock()
// The poll goroutine may still be inside a blocking read on the old handle;
// Windows keeps the port "busy" until that read times out (ioTimeout). Retry
// the open for a little longer than that.
@@ -205,9 +220,17 @@ func (c *Client) PowerOn() error {
time.Sleep(wakePulse)
return set(true)
}
if err = pulse(sp.SetRTS); err == nil {
err = pulse(sp.SetDTR)
// Each line reported separately. Not every USB-serial chip honours the modem
// lines, and some refuse them without saying so — on an amplifier that never
// wakes, "which of the two failed, or neither" is the whole diagnosis, and a
// single combined error cannot give it.
rtsErr := pulse(sp.SetRTS)
dtrErr := pulse(sp.SetDTR)
if err = rtsErr; err == nil {
err = dtrErr
}
applog.Printf("spe: power ON pulse on %s (model=%q transport=%s) — RTS err=%v, DTR err=%v",
c.cfg.ComPort, c.GetStatus().Model, c.cfg.Transport, rtsErr, dtrErr)
// Booting, the amp re-enumerates its USB interface, which leaves this handle
// pointing at a device that no longer exists — the amp came up and OpsLog
// still read "offline". Drop it; the poll loop reopens a fresh one as soon as
@@ -216,6 +239,26 @@ func (c *Client) PowerOn() error {
c.dropLocked()
c.mu.Unlock()
applog.Printf("spe: power ON — RTS then DTR pulsed on %s (err=%v)", c.cfg.ComPort, err)
// Say whether it actually woke. "The ON button does nothing" is a report with
// three different causes — the pulse was refused, the pulse went out and the
// amp ignored it, or the amp came up and the UI missed it — and only the log
// can separate them. Watched off the caller's goroutine so the click returns
// at once.
go func() {
deadline := time.Now().Add(15 * time.Second)
for time.Now().Before(deadline) {
time.Sleep(time.Second)
if c.GetStatus().Connected {
applog.Printf("spe: power ON — amp answered after %.0fs",
15-time.Until(deadline).Seconds())
return
}
}
applog.Printf("spe: power ON — no answer within 15s on %s. The pulse was sent; "+
"either this amplifier does not wake on RTS/DTR, or the adapter does not drive those lines",
c.cfg.ComPort)
}()
return err
}
@@ -226,6 +269,14 @@ func (c *Client) PowerOn() error {
// the poll loop keeps reopening the port with both lines high and that has
// never woken it — only the deliberate low→high sequence in PowerOn does.
func (c *Client) PowerOff() error {
// Close the window BEFORE the key goes out, so a frame already travelling up
// the wire cannot land after setErr and undo it. Three seconds covers a poll
// interval with room to spare; after that a real answer means the amp is
// genuinely alive again, which is what happens if it is switched back on at
// its own front panel.
c.statusMu.Lock()
c.offUntil = time.Now().Add(3 * time.Second)
c.statusMu.Unlock()
err := c.sendCmd(cmdOff)
applog.Printf("spe: power OFF — SWITCH OFF key sent (err=%v)", err)
// Drop the link and mark the amp offline at once, exactly as a fresh start
@@ -482,6 +533,9 @@ func (c *Client) decodeCSV(payload string) {
c.lastRaw = payload
applog.Printf("spe: status raw=%q fields=%d", payload, len(f))
}
if time.Now().Before(c.offUntil) {
return // a frame from before the switch-off — the amp is on its way down
}
c.status.Connected = true
c.status.LastError = ""
// The real frame carries a leading empty field (it starts with a comma), so the
+50
View File
@@ -0,0 +1,50 @@
package steppir
import "testing"
// An operator's log read as "the antenna stops responding": every tune was
// commanded, acknowledged with the requested frequency on the next poll, then
// replaced on the poll after by a different one — 21075 asked, 21075 confirmed,
// 21050 reported — with the operator tuning again each time. Nothing in the log
// named that, so it looked like a dead link.
func TestCheckDriftReportsOnceAndRecovers(t *testing.T) {
c := &Client{}
c.lastSetKHz = 21075
// Where it was asked to go: nothing to say.
c.checkDrift(&Status{Frequency: 21075})
if c.lastDriftKHz != 0 {
t.Errorf("a controller on frequency was reported as drifting (%d)", c.lastDriftKHz)
}
// Its own grid is not a fault.
c.checkDrift(&Status{Frequency: 21070})
if c.lastDriftKHz != 0 {
t.Errorf("%d kHz is within tolerance and was reported", 21070)
}
// Somewhere else entirely: recorded, so it is said once.
c.checkDrift(&Status{Frequency: 21050})
if c.lastDriftKHz != 21050 {
t.Errorf("lastDriftKHz = %d, want 21050", c.lastDriftKHz)
}
// Still there on the next poll: nothing new to say, and the marker stands.
c.checkDrift(&Status{Frequency: 21050})
if c.lastDriftKHz != 21050 {
t.Errorf("lastDriftKHz = %d after a repeat, want it unchanged", c.lastDriftKHz)
}
// Back where it belongs: the marker clears, so the next divergence is said.
c.checkDrift(&Status{Frequency: 21075})
if c.lastDriftKHz != 0 {
t.Errorf("lastDriftKHz = %d after recovery, want 0", c.lastDriftKHz)
}
}
// A frequency read while the elements are travelling is not a disagreement, it
// is an antenna on its way — reporting it would cry wolf on every single tune.
func TestCheckDriftIgnoresMovingMotors(t *testing.T) {
c := &Client{}
c.lastSetKHz = 21075
c.checkDrift(&Status{Frequency: 21000, MotorsMoving: 1})
if c.lastDriftKHz != 0 {
t.Errorf("a moving antenna was reported as drifting (%d)", c.lastDriftKHz)
}
}
+99
View File
@@ -88,6 +88,10 @@ type Client struct {
connMu sync.Mutex
conn io.ReadWriteCloser
// openFails counts consecutive failures to reopen the port, so the retry
// reports the first one and the recovery, and stays quiet in between.
// Guarded by connMu.
openFails int
// ioMu serialises EVERY exchange on the shared connection — a status query
// (write "?A" then read 11 bytes) and a command write must never interleave,
@@ -98,6 +102,10 @@ type Client struct {
statusMu sync.RWMutex
lastStatus *Status
lastSetKHz int
// lastDriftKHz is the frequency last reported for a controller that had gone
// somewhere other than where it was told, so the disagreement is stated once
// and not on every poll. Zero when it is where it should be.
lastDriftKHz int
// lastRaw holds the previous raw status frame so we only log a status line
// when the controller's reply actually changes — enough to diagnose a stuck
@@ -187,6 +195,35 @@ func (c *Client) open() (io.ReadWriteCloser, error) {
}
}
// openFailQuiet is how many consecutive failed reopens are reported before the
// loop goes quiet about them. A port that has gone (adapter unplugged, another
// program holding it) stays gone, and one line every two seconds would be the
// entire log.
const openFailQuiet = 3
// noteOpenFailure logs a failure to reopen the port, throttled. Caller must NOT
// hold connMu — it is taken here.
func (c *Client) noteOpenFailure(err error) {
c.connMu.Lock()
c.openFails++
n := c.openFails
c.connMu.Unlock()
switch {
case n <= openFailQuiet:
log.Printf("steppir: cannot open %s: %v (attempt %d)", c.target(), 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())
}
}
// target names what the client is trying to reach, 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)
}
func (c *Client) pollLoop() {
ticker := time.NewTicker(2 * time.Second)
defer ticker.Stop()
@@ -201,8 +238,19 @@ func (c *Client) pollLoop() {
if err != nil {
c.connMu.Unlock()
c.setDisconnected()
// SAY SO. This retried every two seconds in complete silence,
// so an antenna that lost its port stopped answering and the
// log had nothing at all after the disconnection — which is
// exactly what an operator reports as "it worked for a while
// and then it didn't". Throttled, because a port that is gone
// stays gone and this would otherwise be the whole log.
c.noteOpenFailure(err)
continue
}
if c.openFails > 0 {
log.Printf("steppir: reconnected after %d failed attempt(s)", c.openFails)
c.openFails = 0
}
c.conn = conn
}
c.connMu.Unlock()
@@ -225,10 +273,61 @@ func (c *Client) pollLoop() {
c.applyPendingDir(st)
c.lastStatus = st
c.statusMu.Unlock()
c.checkDrift(st)
}
}
}
// driftToleranceKHz is how far the controller's reported frequency may sit from
// the one we commanded before it is worth saying so. A SteppIR quantises to its
// own grid, so a few kHz is normal and must not be reported as a fault.
const driftToleranceKHz = 10
// checkDrift reports a controller that settled somewhere other than where it was
// told to go.
//
// This exists because of a log that read as "the antenna stops responding": every
// tune was commanded, acknowledged on the next poll with the requested frequency,
// and then REPLACED on the poll after by a different one — 21075 asked, 21075
// confirmed, 21050 reported, over and over, with the operator tuning again each
// time. Nothing in the log named that, so it looked like a dead link rather than
// a controller with a mind of its own (its own radio interface tracking the rig,
// or a front-panel mode that overrides the host).
//
// Only when the motors have stopped: a frequency read mid-travel is not a
// disagreement, it is an antenna on its way. And only when the value changes, so
// a controller parked somewhere else does not fill the log.
func (c *Client) checkDrift(st *Status) {
if st.MotorsMoving != 0 {
return
}
c.statusMu.Lock()
want := c.lastSetKHz
last := c.lastDriftKHz
if want <= 0 || st.Frequency <= 0 {
c.statusMu.Unlock()
return
}
diff := st.Frequency - want
if diff < 0 {
diff = -diff
}
if diff <= driftToleranceKHz {
c.lastDriftKHz = 0 // back where it was asked to be
c.statusMu.Unlock()
return
}
if last == st.Frequency {
c.statusMu.Unlock()
return // already said, and it has not moved since
}
c.lastDriftKHz = st.Frequency
c.statusMu.Unlock()
log.Printf("steppir: commanded %d kHz but the controller settled on %d kHz — "+
"something else is driving it (its own radio interface, or a front-panel mode overriding the host)",
want, st.Frequency)
}
// applyPendingDir replaces a freshly polled direction with the one the operator
// last commanded, until the controller confirms it (or the hold expires). The
// caller holds statusMu.
+440
View File
@@ -0,0 +1,440 @@
// Code generated by cmd/ctzipgen. DO NOT EDIT.
package uls
// ctCounty maps a Connecticut ZIP to its legal county.
//
// GeoNames reports Connecticut's 2022 planning regions instead, which no
// award, callbook or log uses. See cmd/ctzipgen for how this was built and
// why a name-to-name mapping cannot work.
var ctCounty = map[string]string{
"06001": "Hartford",
"06002": "Hartford",
"06006": "Hartford",
"06010": "Hartford",
"06011": "Hartford",
"06013": "Hartford",
"06016": "Hartford",
"06018": "Litchfield",
"06019": "Hartford",
"06020": "Hartford",
"06021": "Litchfield",
"06022": "Hartford",
"06023": "Hartford",
"06024": "Litchfield",
"06025": "Hartford",
"06026": "Hartford",
"06027": "Hartford",
"06028": "Hartford",
"06029": "Tolland",
"06030": "Hartford",
"06031": "Litchfield",
"06032": "Hartford",
"06033": "Hartford",
"06034": "Hartford",
"06035": "Hartford",
"06037": "Hartford",
"06039": "Litchfield",
"06040": "Hartford",
"06041": "Hartford",
"06042": "Hartford",
"06043": "Tolland",
"06045": "Hartford",
"06050": "Hartford",
"06051": "Hartford",
"06052": "Hartford",
"06053": "Hartford",
"06057": "Litchfield",
"06058": "Litchfield",
"06059": "Hartford",
"06060": "Hartford",
"06061": "Litchfield",
"06062": "Hartford",
"06063": "Litchfield",
"06064": "Hartford",
"06065": "Hartford",
"06066": "Tolland",
"06067": "Hartford",
"06068": "Litchfield",
"06069": "Litchfield",
"06070": "Hartford",
"06071": "Tolland",
"06072": "Tolland",
"06073": "Hartford",
"06074": "Hartford",
"06075": "Tolland",
"06076": "Tolland",
"06077": "Tolland",
"06078": "Hartford",
"06079": "Litchfield",
"06080": "Hartford",
"06081": "Hartford",
"06082": "Hartford",
"06083": "Hartford",
"06084": "Tolland",
"06085": "Hartford",
"06087": "Hartford",
"06088": "Hartford",
"06089": "Hartford",
"06090": "Hartford",
"06091": "Hartford",
"06092": "Hartford",
"06093": "Hartford",
"06094": "Litchfield",
"06095": "Hartford",
"06096": "Hartford",
"06098": "Litchfield",
"06101": "Hartford",
"06102": "Hartford",
"06103": "Hartford",
"06104": "Hartford",
"06105": "Hartford",
"06106": "Hartford",
"06107": "Hartford",
"06108": "Hartford",
"06109": "Hartford",
"06110": "Hartford",
"06111": "Hartford",
"06112": "Hartford",
"06114": "Hartford",
"06115": "Hartford",
"06117": "Hartford",
"06118": "Hartford",
"06119": "Hartford",
"06120": "Hartford",
"06123": "Hartford",
"06126": "Hartford",
"06127": "Hartford",
"06128": "Hartford",
"06129": "Hartford",
"06131": "Hartford",
"06132": "Hartford",
"06133": "Hartford",
"06134": "Hartford",
"06137": "Hartford",
"06138": "Hartford",
"06140": "Hartford",
"06141": "Hartford",
"06142": "Hartford",
"06143": "Hartford",
"06144": "Hartford",
"06145": "Hartford",
"06146": "Hartford",
"06147": "Hartford",
"06150": "Hartford",
"06151": "Hartford",
"06152": "Hartford",
"06153": "Hartford",
"06154": "Hartford",
"06155": "Hartford",
"06156": "Hartford",
"06160": "Hartford",
"06161": "Hartford",
"06167": "Hartford",
"06176": "Hartford",
"06180": "Hartford",
"06183": "Hartford",
"06199": "Hartford",
"06226": "Windham",
"06230": "Windham",
"06231": "Tolland",
"06232": "Tolland",
"06233": "Windham",
"06234": "Windham",
"06235": "Windham",
"06237": "Tolland",
"06238": "Tolland",
"06239": "Windham",
"06241": "Windham",
"06242": "Windham",
"06243": "Windham",
"06244": "Windham",
"06245": "Windham",
"06246": "Windham",
"06247": "Windham",
"06248": "Tolland",
"06249": "New London",
"06250": "Tolland",
"06251": "Tolland",
"06254": "New London",
"06255": "Windham",
"06256": "Windham",
"06258": "Windham",
"06259": "Windham",
"06260": "Windham",
"06262": "Windham",
"06263": "Windham",
"06264": "Windham",
"06265": "Tolland",
"06266": "Windham",
"06267": "Windham",
"06268": "Tolland",
"06269": "Tolland",
"06277": "Windham",
"06278": "Windham",
"06279": "Tolland",
"06280": "Windham",
"06281": "Windham",
"06282": "Windham",
"06320": "New London",
"06330": "New London",
"06331": "Windham",
"06332": "Windham",
"06333": "New London",
"06334": "New London",
"06335": "New London",
"06336": "New London",
"06338": "New London",
"06339": "New London",
"06340": "New London",
"06349": "New London",
"06350": "New London",
"06351": "New London",
"06353": "New London",
"06354": "Windham",
"06355": "New London",
"06357": "New London",
"06359": "New London",
"06360": "New London",
"06365": "New London",
"06370": "New London",
"06371": "New London",
"06372": "New London",
"06373": "Windham",
"06374": "Windham",
"06375": "New London",
"06376": "New London",
"06377": "Windham",
"06378": "New London",
"06379": "New London",
"06380": "New London",
"06382": "New London",
"06383": "New London",
"06384": "New London",
"06385": "New London",
"06387": "Windham",
"06388": "New London",
"06389": "New London",
"06401": "New Haven",
"06403": "New Haven",
"06404": "Fairfield",
"06405": "New Haven",
"06408": "New Haven",
"06409": "Middlesex",
"06410": "New Haven",
"06411": "New Haven",
"06412": "Middlesex",
"06413": "Middlesex",
"06414": "Middlesex",
"06415": "New London",
"06416": "Middlesex",
"06417": "Middlesex",
"06418": "New Haven",
"06419": "Middlesex",
"06420": "New London",
"06422": "Middlesex",
"06423": "Middlesex",
"06424": "Middlesex",
"06426": "Middlesex",
"06437": "New Haven",
"06438": "Middlesex",
"06439": "New London",
"06440": "Fairfield",
"06441": "Middlesex",
"06442": "Middlesex",
"06443": "New Haven",
"06444": "Hartford",
"06447": "Hartford",
"06450": "New Haven",
"06451": "New Haven",
"06455": "Middlesex",
"06456": "Middlesex",
"06457": "Middlesex",
"06459": "Middlesex",
"06460": "New Haven",
"06461": "New Haven",
"06467": "Hartford",
"06468": "Fairfield",
"06469": "Middlesex",
"06470": "Fairfield",
"06471": "New Haven",
"06472": "New Haven",
"06473": "New Haven",
"06474": "New London",
"06475": "Middlesex",
"06477": "New Haven",
"06478": "New Haven",
"06479": "Hartford",
"06480": "Middlesex",
"06481": "Middlesex",
"06482": "Fairfield",
"06483": "New Haven",
"06484": "Fairfield",
"06487": "New Haven",
"06488": "New Haven",
"06489": "Hartford",
"06491": "Fairfield",
"06492": "New Haven",
"06493": "New Haven",
"06494": "New Haven",
"06495": "New Haven",
"06498": "Middlesex",
"06501": "New Haven",
"06502": "New Haven",
"06503": "New Haven",
"06504": "New Haven",
"06505": "New Haven",
"06506": "New Haven",
"06507": "New Haven",
"06508": "New Haven",
"06509": "New Haven",
"06510": "New Haven",
"06511": "New Haven",
"06512": "New Haven",
"06513": "New Haven",
"06514": "New Haven",
"06515": "New Haven",
"06516": "New Haven",
"06517": "New Haven",
"06518": "New Haven",
"06519": "New Haven",
"06520": "New Haven",
"06521": "New Haven",
"06524": "New Haven",
"06525": "New Haven",
"06530": "New Haven",
"06531": "New Haven",
"06532": "New Haven",
"06533": "New Haven",
"06534": "New Haven",
"06535": "New Haven",
"06536": "New Haven",
"06537": "New Haven",
"06538": "New Haven",
"06540": "New Haven",
"06601": "Fairfield",
"06602": "Fairfield",
"06604": "Fairfield",
"06605": "Fairfield",
"06606": "Fairfield",
"06607": "Fairfield",
"06608": "Fairfield",
"06610": "Fairfield",
"06611": "Fairfield",
"06612": "Fairfield",
"06614": "Fairfield",
"06615": "Fairfield",
"06673": "Fairfield",
"06699": "Fairfield",
"06701": "New Haven",
"06702": "New Haven",
"06703": "New Haven",
"06704": "New Haven",
"06705": "New Haven",
"06706": "New Haven",
"06708": "New Haven",
"06710": "New Haven",
"06712": "New Haven",
"06716": "New Haven",
"06720": "New Haven",
"06721": "New Haven",
"06722": "New Haven",
"06723": "New Haven",
"06724": "New Haven",
"06725": "New Haven",
"06726": "New Haven",
"06749": "New Haven",
"06750": "Litchfield",
"06751": "Litchfield",
"06752": "Litchfield",
"06753": "Litchfield",
"06754": "Litchfield",
"06755": "Litchfield",
"06756": "Litchfield",
"06757": "Litchfield",
"06758": "Litchfield",
"06759": "Litchfield",
"06762": "New Haven",
"06763": "Litchfield",
"06770": "New Haven",
"06776": "Litchfield",
"06777": "Litchfield",
"06778": "Litchfield",
"06779": "Litchfield",
"06781": "Litchfield",
"06782": "Litchfield",
"06783": "Litchfield",
"06784": "Fairfield",
"06785": "Litchfield",
"06786": "Litchfield",
"06787": "Litchfield",
"06790": "Litchfield",
"06791": "Litchfield",
"06792": "Litchfield",
"06793": "Litchfield",
"06794": "Litchfield",
"06795": "Litchfield",
"06796": "Litchfield",
"06798": "Litchfield",
"06801": "Fairfield",
"06804": "Fairfield",
"06807": "Fairfield",
"06810": "Fairfield",
"06811": "Fairfield",
"06812": "Fairfield",
"06813": "Fairfield",
"06814": "Fairfield",
"06816": "Fairfield",
"06817": "Fairfield",
"06820": "Fairfield",
"06824": "Fairfield",
"06825": "Fairfield",
"06828": "Fairfield",
"06829": "Fairfield",
"06830": "Fairfield",
"06831": "Fairfield",
"06836": "Fairfield",
"06838": "Fairfield",
"06840": "Fairfield",
"06850": "Fairfield",
"06851": "Fairfield",
"06852": "Fairfield",
"06853": "Fairfield",
"06854": "Fairfield",
"06855": "Fairfield",
"06856": "Fairfield",
"06857": "Fairfield",
"06858": "Fairfield",
"06860": "Fairfield",
"06870": "Fairfield",
"06875": "Fairfield",
"06876": "Fairfield",
"06877": "Fairfield",
"06878": "Fairfield",
"06879": "Fairfield",
"06880": "Fairfield",
"06881": "Fairfield",
"06883": "Fairfield",
"06888": "Fairfield",
"06889": "Fairfield",
"06890": "Fairfield",
"06896": "Fairfield",
"06897": "Fairfield",
"06901": "Fairfield",
"06902": "Fairfield",
"06903": "Fairfield",
"06904": "Fairfield",
"06905": "Fairfield",
"06906": "Fairfield",
"06907": "Fairfield",
"06910": "Fairfield",
"06911": "Fairfield",
"06912": "Fairfield",
"06913": "Fairfield",
"06914": "Fairfield",
"06920": "Fairfield",
"06921": "Fairfield",
"06922": "Fairfield",
"06926": "Fairfield",
"06927": "Fairfield",
}
+70
View File
@@ -0,0 +1,70 @@
package uls
import (
"testing"
"hamlog/internal/award"
)
// The eight counties Connecticut still has for every purpose except the Census.
var ctLegalCounties = map[string]bool{
"Fairfield": true, "Hartford": true, "Litchfield": true, "Middlesex": true,
"New Haven": true, "New London": true, "Tolland": true, "Windham": true,
}
// TestCTCountyOnlyLegalCounties makes sure no planning region ever creeps back
// into the table — a regenerated file that quietly picked up "Capitol Region"
// would put every Hartford-area station back out of reach of the award, which
// is exactly the failure this table exists to end.
func TestCTCountyOnlyLegalCounties(t *testing.T) {
if len(ctCounty) < 400 {
t.Fatalf("only %d Connecticut ZIPs — the table looks truncated", len(ctCounty))
}
for zip, county := range ctCounty {
if !ctLegalCounties[county] {
t.Errorf("ZIP %s → %q, which is not one of Connecticut's eight counties", zip, county)
}
if len(zip) != 5 {
t.Errorf("ZIP %q is not five digits", zip)
}
}
}
// TestCTCountyMatchesAward closes the loop: every county in the table has to
// produce a key the USA-CA reference actually lists. A county the resolver can
// name but the award cannot match is worth no more than the planning region it
// replaced.
func TestCTCountyMatchesAward(t *testing.T) {
want := map[string]bool{
"CT/FAIRFIELD": true, "CT/HARTFORD": true, "CT/LITCHFIELD": true,
"CT/MIDDLESEX": true, "CT/NEWHAVEN": true, "CT/NEWLONDON": true,
"CT/TOLLAND": true, "CT/WINDHAM": true,
}
for zip, county := range ctCounty {
if k := award.USCountyKey("CT", county); !want[k] {
t.Errorf("ZIP %s → %q → key %q, not a USA-CA county", zip, county, k)
}
}
}
// TestCTCountyKnownZips pins a ZIP in each county against ground truth, so a
// regeneration that silently shifted the whole table is caught. 06419 is the
// case that started this: Killingworth is in Middlesex, and GeoNames calls it
// "Lower Connecticut River Valley".
func TestCTCountyKnownZips(t *testing.T) {
for zip, want := range map[string]string{
"06419": "Middlesex", // Killingworth
"06001": "Hartford", // Avon
"06106": "Hartford", // Hartford
"06510": "New Haven", // New Haven
"06880": "Fairfield", // Westport
"06340": "New London", // Groton
"06226": "Windham", // Willimantic
"06238": "Tolland", // Coventry
"06759": "Litchfield", // Litchfield
} {
if got := ctCounty[zip]; got != want {
t.Errorf("ctCounty[%s] = %q, want %q", zip, got, want)
}
}
}
+46 -2
View File
@@ -34,6 +34,7 @@ import (
"path/filepath"
"regexp"
"sort"
"strconv"
"strings"
"sync"
"time"
@@ -114,6 +115,33 @@ func (s *Store) Count() int {
return n
}
// RulesVersion is bumped whenever a correction applied DURING import changes
// the county a callsign resolves to. The value is stamped into uls_meta, so a
// database built by an older OpsLog can be told apart from one built by this
// one — the rows themselves carry no clue, and the fix cannot be applied
// retroactively because the ZIP each county was derived from is not stored.
//
// 1 — original.
// 2 — Connecticut ZIPs mapped back to their legal county instead of the
// 2022 planning region GeoNames now reports (see ctcounty_gen.go).
const RulesVersion = 2
// NeedsRefresh reports that the store was built before a correction that
// changes its answers, so the operator should download it again. False for an
// empty store: there is nothing stale about data that was never fetched.
func (s *Store) NeedsRefresh() bool {
s.mu.RLock()
defer s.mu.RUnlock()
var n int
if s.db.QueryRow(`SELECT COUNT(*) FROM uls_callsign`).Scan(&n); n == 0 {
return false
}
var v string
s.db.QueryRow(`SELECT value FROM uls_meta WHERE key='rules_version'`).Scan(&v)
got, _ := strconv.Atoi(v)
return got < RulesVersion
}
// UpdatedAt returns when the store was last imported (zero if never).
func (s *Store) UpdatedAt() time.Time {
s.mu.RLock()
@@ -285,6 +313,10 @@ func (s *Store) rebuild(ctx context.Context, amatZip string, zipmap map[string]z
time.Now().UTC().Format(time.RFC3339)); err != nil {
return err
}
if _, err := tx.ExecContext(ctx, `INSERT OR REPLACE INTO uls_meta(key,value) VALUES('rules_version',?)`,
strconv.Itoa(RulesVersion)); err != nil {
return err
}
if err := tx.Commit(); err != nil {
return err
}
@@ -333,9 +365,21 @@ func parseGeoNames(zipPath string) (map[string]zipRow, error) {
}
lat := parseFloat(f[9])
lon := parseFloat(f[10])
state := strings.ToUpper(strings.TrimSpace(f[4]))
county := strings.TrimSpace(f[5])
// Connecticut: GeoNames reports the 2022 planning regions, which are
// county-equivalents for the Census and nothing at all for amateur
// radio — no award, no callbook and no log uses them, so every CT
// station resolved to a name that matched nothing. Substitute the legal
// county for the ZIP. See cmd/ctzipgen.
if state == "CT" {
if c, ok := ctCounty[zip5]; ok {
county = c
}
}
out[zip5] = zipRow{
state: strings.ToUpper(strings.TrimSpace(f[4])),
county: strings.TrimSpace(f[5]),
state: state,
county: county,
lat: lat,
lon: lon,
}
+159
View File
@@ -0,0 +1,159 @@
package winkeyer
import (
"errors"
"fmt"
"time"
"go.bug.st/serial"
"hamlog/internal/applog"
)
// The opening handshake, as K1EL specifies it in the WinKeyer2 Application
// Interface Guide ("WK Init Psuedo Code"). OpsLog used to send Host Open alone
// and carry on whatever came back, which is how an operator ended up with a
// keyer reported as connected, a full set of settings written to it, and not
// one character keyed — the log said "no reply" and then behaved as if there
// had been one.
//
// The steps exist for reasons that are not obvious from the byte values:
//
// 400 ms a WK1 is still powering up off the DTR line when the port opens;
// WK2 and later do not need it, and it costs nothing once.
// 0x13 ×3 null commands. WinKey's parser may be part-way through a command
// left over from whoever spoke to it last — another logger, or us
// before a crash. A command byte expecting parameters would swallow
// Host Open whole. Three nulls flush that state out.
// echo ask the keyer to send one known byte back. This is the only step
// that answers "is there really a WinKeyer on this port", and it is
// the one to fail on: everything after it assumes a listener.
// open 0x00 0x02, and the keyer returns its firmware version.
const (
cmdNull = 0x13
cmdAdmin = 0x00
adminOpen = 0x02
adminEcho = 0x04
echoProbe = 0x55 // K1EL's own choice; any byte works, this one is 0b01010101
bootDelay = 400 * time.Millisecond
echoTimeout = 2 * time.Second // K1EL: "if a WK doesn't respond within 2 seconds abort"
openTimeout = 2 * time.Second
// resetDelay is the second attempt's wait, and it is not there for a K1EL.
//
// Plenty of "WinKeyers" are a K3NG keyer — an Arduino running an emulation
// of the same protocol. On an Arduino, DTR is wired to the reset pin through
// a capacitor: raising it when the port opens REBOOTS the board, which then
// sits in its bootloader before the sketch even starts. K3NG's own options
// file says as much ("disabling Automatic Software Reset is highly
// recommended", and an option to "discard errant serial port bytes at
// startup" for when it is not). 400 ms is nowhere near long enough, so the
// keyer misses the whole handshake and looks absent.
//
// Rather than make every operator wait for the slowest possible device, the
// first attempt stays quick and only the retry allows for a reboot.
resetDelay = 2500 * time.Millisecond
handshakeTry = 2
)
// errNoKeyer is returned when nothing answers the echo probe.
var errNoKeyer = errors.New("no WinKeyer answered on this port — check the cable, the port, and that no other program holds the keyer")
// hostOpen runs the full documented handshake and returns the firmware version
// byte. It is tried twice, and the two attempts cover the two ways a keyer that
// is plugged in and working can miss being spoken to: a parser left mid-command
// by whoever talked to it last (the first attempt's nulls clear that), and an
// Arduino-based keyer still rebooting from the DTR edge (the second attempt
// waits long enough for it).
// slowBoot skips straight to the long wait, set when this port has already been
// seen to need it. The second return value says whether the long wait is what
// worked, so the caller can remember it and open quickly next time.
func hostOpen(p serial.Port, slowBoot bool) (ver int, needsSlowBoot bool, err error) {
var lastErr error
for attempt := 1; attempt <= handshakeTry; attempt++ {
wait := bootDelay
if attempt > 1 || slowBoot {
wait = resetDelay
}
ver, err := hostOpenOnce(p, wait)
if err == nil {
if attempt > 1 {
applog.Printf("winkeyer: answered on attempt %d — this keyer needs %s to boot (a K3NG or another Arduino keyer with auto-reset on); remembering that for this port", attempt, wait)
}
return ver, wait == resetDelay, nil
}
lastErr = err
if attempt < handshakeTry {
applog.Printf("winkeyer: handshake attempt %d failed (%v) — retrying after %s in case the keyer is rebooting", attempt, err, resetDelay)
}
}
return 0, false, lastErr
}
func hostOpenOnce(p serial.Port, boot time.Duration) (int, error) {
// The keyer may still be booting off the DTR line we just raised.
time.Sleep(boot)
drain(p)
// Resync the command parser before asking it anything.
if _, err := p.Write([]byte{cmdNull, cmdNull, cmdNull}); err != nil {
return 0, fmt.Errorf("resync: %w", err)
}
time.Sleep(50 * time.Millisecond)
drain(p)
// Is anything actually there?
if _, err := p.Write([]byte{cmdAdmin, adminEcho, echoProbe}); err != nil {
return 0, fmt.Errorf("echo test: %w", err)
}
b, ok := readByte(p, echoTimeout)
if !ok {
return 0, errNoKeyer
}
if b != echoProbe {
// Something replied, but not what we asked for. Say what came back —
// on a wrong port that byte is the only clue to what is on the other end.
return 0, fmt.Errorf("echo test: expected 0x%02X, got 0x%02X — is this the keyer's port?", echoProbe, b)
}
if _, err := p.Write([]byte{cmdAdmin, adminOpen}); err != nil {
return 0, fmt.Errorf("host open: %w", err)
}
ver, ok := readByte(p, openTimeout)
if !ok {
return 0, errors.New("host open: the keyer echoed but did not return its firmware version")
}
return int(ver), nil
}
// readByte waits up to d for one byte. The serial read timeout is per-call and
// can return 0 bytes without an error, so this loops until the deadline rather
// than trusting a single Read.
func readByte(p serial.Port, d time.Duration) (byte, bool) {
_ = p.SetReadTimeout(200 * time.Millisecond)
deadline := time.Now().Add(d)
buf := make([]byte, 1)
for time.Now().Before(deadline) {
n, err := p.Read(buf)
if n > 0 {
return buf[0], true
}
if err != nil {
return 0, false
}
}
return 0, false
}
// drain throws away anything already waiting — a status byte from a previous
// session, or the tail of a reply we are no longer interested in.
func drain(p serial.Port) {
_ = p.SetReadTimeout(20 * time.Millisecond)
buf := make([]byte, 64)
for i := 0; i < 16; i++ {
n, err := p.Read(buf)
if n == 0 || err != nil {
return
}
}
}
+216
View File
@@ -0,0 +1,216 @@
package winkeyer
import (
"errors"
"sync"
"testing"
"time"
"go.bug.st/serial"
)
// fakeKeyer is a serial.Port that behaves like a WinKeyer: it answers the echo
// probe and Host Open, and records everything the host sent so the handshake
// can be checked byte for byte against K1EL's documented sequence.
type fakeKeyer struct {
mu sync.Mutex
written []byte
toRead []byte
version byte
// deaf drops every command — the keyer that is not there, or is not
// listening because RTS starved it.
deaf bool
// mute answers the echo but never returns a version.
mute bool
// needsResync ignores commands until three nulls have been seen, standing
// in for a keyer left mid-command by another program.
needsResync bool
nulls int
}
func (f *fakeKeyer) Write(p []byte) (int, error) {
f.mu.Lock()
defer f.mu.Unlock()
f.written = append(f.written, p...)
if f.deaf {
return len(p), nil
}
for i := 0; i < len(p); i++ {
switch {
case p[i] == cmdNull:
f.nulls++
case f.needsResync && f.nulls < 3:
// still confused — swallow it
case p[i] == cmdAdmin && i+1 < len(p):
i++
switch p[i] {
case adminEcho:
if i+1 < len(p) {
i++
f.toRead = append(f.toRead, p[i])
}
case adminOpen:
if !f.mute {
f.toRead = append(f.toRead, f.version)
}
}
}
}
return len(p), nil
}
func (f *fakeKeyer) Read(p []byte) (int, error) {
f.mu.Lock()
defer f.mu.Unlock()
if len(f.toRead) == 0 {
return 0, nil // a timeout, not an error — what a real port does
}
n := copy(p, f.toRead)
f.toRead = f.toRead[n:]
return n, nil
}
func (f *fakeKeyer) sent() []byte {
f.mu.Lock()
defer f.mu.Unlock()
return append([]byte(nil), f.written...)
}
func (f *fakeKeyer) Drain() error { return nil }
func (f *fakeKeyer) ResetInputBuffer() error { return nil }
func (f *fakeKeyer) ResetOutputBuffer() error { return nil }
func (f *fakeKeyer) SetDTR(bool) error { return nil }
func (f *fakeKeyer) SetRTS(bool) error { return nil }
func (f *fakeKeyer) GetModemStatusBits() (*serial.ModemStatusBits, error) {
return &serial.ModemStatusBits{}, nil
}
func (f *fakeKeyer) SetReadTimeout(time.Duration) error { return nil }
func (f *fakeKeyer) Close() error { return nil }
func (f *fakeKeyer) Break(time.Duration) error { return nil }
func (f *fakeKeyer) SetMode(*serial.Mode) error { return nil }
// TestHostOpenFollowsK1ELSequence checks the handshake against the order K1EL
// publishes: three nulls to resync the parser, an echo probe to prove there is
// a keyer, then Host Open. OpsLog used to send Host Open alone, which a keyer
// left mid-command simply absorbed.
func TestHostOpenFollowsK1ELSequence(t *testing.T) {
f := &fakeKeyer{version: 23}
ver, _, err := hostOpen(f, false)
if err != nil {
t.Fatalf("hostOpen: %v", err)
}
if ver != 23 {
t.Errorf("version = %d, want 23", ver)
}
want := []byte{
cmdNull, cmdNull, cmdNull,
cmdAdmin, adminEcho, echoProbe,
cmdAdmin, adminOpen,
}
got := f.sent()
if len(got) != len(want) {
t.Fatalf("sent % X, want % X", got, want)
}
for i := range want {
if got[i] != want[i] {
t.Fatalf("sent % X, want % X", got, want)
}
}
}
// A keyer left part-way through a command by another program is the everyday
// cause of a silent WinKeyer. The nulls must recover it without the operator
// having to unplug anything.
func TestHostOpenRecoversAConfusedParser(t *testing.T) {
f := &fakeKeyer{version: 30, needsResync: true}
ver, _, err := hostOpen(f, false)
if err != nil {
t.Fatalf("hostOpen: %v", err)
}
if ver != 30 {
t.Errorf("version = %d, want 30", ver)
}
}
// Nothing on the port must FAIL the connection. Reporting success and then
// writing settings and text into the void is what produced a log full of
// commands and a keyer that never made a sound.
func TestHostOpenFailsWhenNothingAnswers(t *testing.T) {
f := &fakeKeyer{deaf: true}
if _, _, err := hostOpen(f, false); !errors.Is(err, errNoKeyer) {
t.Fatalf("want errNoKeyer, got %v", err)
}
}
// Echoing but not returning a version is a different fault and must not be
// reported as "no keyer".
func TestHostOpenReportsMissingVersion(t *testing.T) {
f := &fakeKeyer{mute: true}
_, _, err := hostOpen(f, false)
if err == nil {
t.Fatal("want an error")
}
if errors.Is(err, errNoKeyer) {
t.Fatalf("a keyer that echoed was reported as absent: %v", err)
}
}
// slowKeyer answers nothing until it has been "powered up" for d — a K3NG on an
// Arduino, which the DTR edge from opening the port drops into its bootloader.
type slowKeyer struct {
fakeKeyer
ready time.Time
}
func (s *slowKeyer) Write(p []byte) (int, error) {
if time.Now().Before(s.ready) {
return len(p), nil // still in the bootloader — the bytes are lost
}
return s.fakeKeyer.Write(p)
}
// TestHostOpenWaitsOutAnArduinoReboot is the case that started this: a K3NG
// keyer reboots when the port opens, so it misses a handshake sent 400 ms
// later. The retry has to wait long enough, and must not need the operator to
// press connect twice.
func TestHostOpenWaitsOutAnArduinoReboot(t *testing.T) {
f := &slowKeyer{ready: time.Now().Add(1500 * time.Millisecond)}
f.version = 23
ver, slow, err := hostOpen(f, false)
if err != nil {
t.Fatalf("hostOpen: %v", err)
}
if ver != 23 {
t.Errorf("version = %d, want 23", ver)
}
// This second value is what gets remembered for the port, and it is the
// whole reason the operator is never asked what kind of keyer they own.
// Lose it and every later connect pays the same doomed quick attempt.
if !slow {
t.Error("the long wait is what worked, but it was not reported as needed")
}
}
// A keyer that answers straight away must NOT be remembered as slow — that
// would add seconds to every connect for a K1EL that never needed them.
func TestHostOpenDoesNotMarkAFastKeyerSlow(t *testing.T) {
f := &fakeKeyer{version: 23}
if _, slow, err := hostOpen(f, false); err != nil || slow {
t.Fatalf("hostOpen = slow %v, err %v — want a fast keyer left alone", slow, err)
}
}
// A port already known to hold a slow keyer skips the doomed fast attempt, so
// the second connect is as quick as a K1EL's.
func TestHostOpenSlowBootSucceedsFirstTry(t *testing.T) {
f := &slowKeyer{ready: time.Now().Add(1500 * time.Millisecond)}
f.version = 23
if _, _, err := hostOpen(f, true); err != nil {
t.Fatalf("hostOpen: %v", err)
}
// One attempt: exactly one handshake on the wire, not two.
want := len([]byte{cmdNull, cmdNull, cmdNull, cmdAdmin, adminEcho, echoProbe, cmdAdmin, adminOpen})
if got := len(f.sent()); got != want {
t.Errorf("sent %d bytes, want %d — the fast attempt was not skipped", got, want)
}
}
+32 -10
View File
@@ -51,6 +51,13 @@ type Config struct {
UsePTT bool `json:"use_ptt"` // key PTT (Key/PTT output)
SerialEcho bool `json:"serial_echo"` // device echoes sent chars back to host
// SlowBoot skips the quick opening attempt and waits for a keyer that reboots
// when the port opens — a K3NG or any other Arduino-based WinKeyer with its
// auto-reset still enabled. Not an operator setting: it is remembered per port
// the first time a keyer only answers the long attempt, so the second connect
// is as quick as a K1EL's and nobody has to know what is inside the box.
SlowBoot bool `json:"-"`
// Type selects the keyer engine on this serial port:
// "" / "k1el" → a K1EL WinKeyer chip (the default, everything above applies)
// "serial" → the PC bit-bangs Morse on a control line (no WinKeyer chip):
@@ -108,12 +115,20 @@ type Manager struct {
onStatus func(Status)
onEcho func(string) // chars the device echoes back as it keys them
// onSlowBoot fires when a keyer answered only after the long wait, so the
// caller can persist that for this port. See Config.SlowBoot.
onSlowBoot func(port string)
}
func NewManager(onStatus func(Status), onEcho func(string)) *Manager {
return &Manager{onStatus: onStatus, onEcho: onEcho}
}
// OnSlowBoot registers the callback that persists "this port needs the long
// opening wait". Optional: without it a slow keyer still connects, it just
// pays the failed quick attempt on every connect.
func (m *Manager) OnSlowBoot(fn func(port string)) { m.onSlowBoot = fn }
// ListPorts returns the available serial port names (COM3, COM6, …).
func ListPorts() ([]string, error) {
ports, err := serial.GetPortsList()
@@ -152,22 +167,26 @@ func (m *Manager) Connect(cfg Config) error {
DataBits: 8,
Parity: serial.NoParity,
StopBits: serial.OneStopBit,
// DTR on, RTS OFF. K1EL's own init code sets exactly this
// (DTR_CONTROL_ENABLE / RTS_CONTROL_DISABLE), and on a serial WinKeyer
// the two lines are the chip's power supply: DTR feeds the 3.3 V
// regulator, RTS provides the negative rail for the RS-232 swing.
// Driving RTS high starves that rail. The serial library defaults BOTH
// to true, which is how this was wrong without anyone writing it.
InitialStatusBits: &serial.ModemOutputBits{DTR: true, RTS: false},
})
if err != nil {
return fmt.Errorf("winkeyer: open %s: %w", cfg.Port, err)
}
_ = p.SetReadTimeout(200 * time.Millisecond)
// Host Open: <0x00 0x02>. Device replies with its firmware version byte.
if _, err := p.Write([]byte{0x00, 0x02}); err != nil {
ver, slowBoot, err := hostOpen(p, cfg.SlowBoot)
if err != nil {
_ = p.Close()
return fmt.Errorf("winkeyer: host open: %w", err)
return fmt.Errorf("winkeyer: %s: %w", cfg.Port, err)
}
ver := 0
buf := make([]byte, 16)
_ = p.SetReadTimeout(1 * time.Second)
if n, _ := p.Read(buf); n > 0 {
ver = int(buf[0])
// Tell the caller to remember it, so this port opens quickly next time.
if slowBoot && !cfg.SlowBoot && m.onSlowBoot != nil {
m.onSlowBoot(cfg.Port)
}
_ = p.SetReadTimeout(200 * time.Millisecond)
@@ -515,7 +534,10 @@ func cmdName(b []byte) string {
func firmwareFamily(ver int) string {
switch {
case ver == 0:
return "no reply — the keyer did not answer Host Open"
// Unreachable from a successful connect — the handshake fails rather
// than returning a version of zero. Kept so a future caller that skips
// hostOpen cannot print "WK1 (v0)" and be believed.
return "unknown firmware (no version returned)"
case ver < 20:
return fmt.Sprintf("WK1 (v%d)", ver)
case ver < 30:
+287
View File
@@ -0,0 +1,287 @@
package main
// Chase New — a widget listing the stations PSK Reporter is hearing NEAR HERE
// that are new against the log.
//
// The feed is the one the band-opening watch and the grid store already use, so
// this costs no extra subscription when either is on: it reads messages that
// were arriving and being discarded. Measured on the live broker, one ring of
// neighbour squares is 0.2 to 1.2 messages a second.
//
// Two things about the data decide the shape of everything below:
//
// - PSK Reporter is DIGITAL ONLY. This can never show a new entity on CW or
// SSB, and the panel says so rather than letting an operator conclude the
// band is dead when it is full of CW.
// - A report says "X was heard BY Y". The watcher already drops anything
// collected further than NearKm from the operator (internal/pskr), so what
// arrives here is a station being heard in this region — not a world map.
//
// "New" is NOT decided here. It goes through ClusterSpotStatuses, the same
// function the DX cluster grid uses, because two definitions of new is how the
// two panels quietly start disagreeing about the same callsign.
import (
"sort"
"strings"
"sync"
"time"
"hamlog/internal/applog"
"hamlog/internal/pskr"
)
// keyChaseNew turns the widget on. Deliberately NOT nested under "chase grids":
// chasing squares and chasing entities are different wants, and an operator may
// have one without the other. They only share the feed, which either one starts.
const keyChaseNew = "cluster.chase_new"
// chaseNewMax bounds the panel. A list nobody can read to the bottom is not more
// information, and the oldest rows are the least likely to still be on the air.
const chaseNewMax = 200
// chaseSeenTTL is how long the same station stays de-duplicated on one band and
// mode. PSK Reporter re-reports a calling station every cycle — without this the
// panel would be one operator repeated fifty times.
const chaseSeenTTL = 10 * time.Minute
// ChaseNewSpot is one station worth looking at, as the widget shows it.
type ChaseNewSpot struct {
Call string `json:"call"`
Band string `json:"band"`
Mode string `json:"mode"`
FreqHz int64 `json:"freq_hz"`
Grid string `json:"grid"`
Country string `json:"country,omitempty"`
Cont string `json:"cont,omitempty"`
DistKm int `json:"dist_km"`
Bearing int `json:"bearing"`
// Status is the entity-level verdict from the cluster's own vocabulary:
// new | new-band | new-mode | new-slot. Empty when the row is here for a
// prefix or a square instead.
Status string `json:"status,omitempty"`
NewPfx bool `json:"new_pfx,omitempty"`
NewGrid bool `json:"new_grid,omitempty"`
LoTW bool `json:"lotw,omitempty"`
At string `json:"at"` // RFC3339, stamped on receipt
}
// chaseNewStore holds what the widget shows. Written from the MQTT goroutine,
// read by the UI poll, so everything is behind one mutex — the work per message
// is a handful of map lookups and this must never become the reason the broker's
// buffer backs up.
type chaseNewStore struct {
mu sync.Mutex
spots []ChaseNewSpot // newest last
seen map[string]time.Time // "CALL|BAND|MODE" → when it was last shown
}
func newChaseNewStore() *chaseNewStore {
return &chaseNewStore{seen: make(map[string]time.Time, 512)}
}
// put adds a spot unless the same station on the same band and mode is already
// on the list. Returns false when it was a duplicate.
func (s *chaseNewStore) put(sp ChaseNewSpot, now time.Time) bool {
key := sp.Call + "|" + sp.Band + "|" + sp.Mode
s.mu.Lock()
defer s.mu.Unlock()
if last, ok := s.seen[key]; ok && now.Sub(last) < chaseSeenTTL {
return false
}
s.seen[key] = now
s.spots = append(s.spots, sp)
if len(s.spots) > chaseNewMax {
s.spots = s.spots[len(s.spots)-chaseNewMax:]
}
// The de-duplication map is the only thing here that grows without a natural
// bound, so it is swept when it gets large rather than on every message.
if len(s.seen) > 4*chaseNewMax {
for k, t := range s.seen {
if now.Sub(t) >= chaseSeenTTL {
delete(s.seen, k)
}
}
}
return true
}
// list returns the spots newer than ttl, newest first.
func (s *chaseNewStore) list(ttl time.Duration, now time.Time) []ChaseNewSpot {
s.mu.Lock()
defer s.mu.Unlock()
out := make([]ChaseNewSpot, 0, len(s.spots))
for _, sp := range s.spots {
at, err := time.Parse(time.RFC3339, sp.At)
if err == nil && ttl > 0 && now.Sub(at) > ttl {
continue
}
out = append(out, sp)
}
sort.SliceStable(out, func(i, j int) bool { return out[i].At > out[j].At })
return out
}
func (s *chaseNewStore) clear() {
s.mu.Lock()
defer s.mu.Unlock()
s.spots = nil
s.seen = make(map[string]time.Time, 512)
}
// chaseModes is what the panel will show. PSK Reporter reports everything its
// receivers decode, and most of it is not a contact waiting to happen:
//
// - WSPR is a beacon. Nobody answers a WSPR transmission, so a "new entity on
// WSPR" is a path report, not a station to work — and on a quiet band it
// would be most of the list.
// - JT65, JT9, FST4W, Q65 and the rest are real but rare enough that they
// would only dilute what an operator scans.
//
// The list is the modes an operator actually calls on. Deliberately not a
// setting: a widget with its own mode list is a second place to get the answer
// wrong, and this one is short enough to read.
var chaseModes = map[string]bool{
"FT8": true, "FT4": true, "FT2": true, "PSK31": true, "RTTY": true,
}
// chaseNewEnabled reads the option. Called per message, so it reads the cached
// atomic rather than the settings store.
func (a *App) chaseNewEnabled() bool { return a.chaseNewOn.Load() }
// chaseBandAllowed reports whether a band is one the operator uses.
//
// PSK Reporter carries every band its receivers listen on, including microwave
// segments nobody in the region is equipped for. A 13 cm decode is not an
// opportunity for a station with no 13 cm — it is a row in the way.
//
// The answer is the operator's own band list (Settings → Modes & bands), read
// once and cached: this is consulted per message, and re-reading a JSON setting
// at that rate on the MQTT goroutine is exactly what must not happen.
func (a *App) chaseBandAllowed(band string) bool {
a.chaseBandsMu.RLock()
m := a.chaseBands
a.chaseBandsMu.RUnlock()
if m == nil {
return true // list not loaded yet — better to show than to swallow
}
return m[strings.ToLower(strings.TrimSpace(band))]
}
// refreshChaseBands re-reads the operator's band list into the cache. Called
// when the widget is switched on and whenever the lists are saved.
func (a *App) refreshChaseBands() {
s, _ := a.GetListsSettings()
m := make(map[string]bool, len(s.Bands))
for _, b := range s.Bands {
if b = strings.ToLower(strings.TrimSpace(b)); b != "" {
m[b] = true
}
}
a.chaseBandsMu.Lock()
a.chaseBands = m
a.chaseBandsMu.Unlock()
}
// refreshChaseNew re-reads the option into the atomic the feed consults.
func (a *App) refreshChaseNew() {
on := a.settingOr(keyChaseNew, "") == "1"
a.chaseNewOn.Store(on)
if on {
// Read the band list here rather than per message. Saving the lists calls
// back into this, so a band ticked in Settings applies to the next decode.
a.refreshChaseBands()
}
if !on && a.chaseNew != nil {
// Drop the list rather than leave it on screen: it would go stale with no
// feed behind it, and a frozen list of "new" stations is worse than none.
a.chaseNew.clear()
}
}
// feedChaseNew turns one PSK Reporter decode into a widget row, or drops it.
//
// Runs on the MQTT goroutine. The cheap tests come first — the option, then the
// de-duplication — so a station already listed costs one map lookup and nothing
// else.
func (a *App) feedChaseNew(sp pskr.Spot) {
if !a.chaseNewEnabled() || a.chaseNew == nil {
return
}
call := strings.ToUpper(strings.TrimSpace(sp.Call))
if call == "" {
return
}
band := strings.ToLower(strings.TrimSpace(sp.Band))
mode := strings.ToUpper(strings.TrimSpace(sp.Mode))
// Both tests before the status lookup: they are map reads on short keys and
// they throw away most of the feed, so nothing further down pays for a band
// this station cannot work or a mode nobody answers.
if !chaseModes[mode] || !a.chaseBandAllowed(band) {
return
}
// The same verdict the cluster grid computes, from the same cached index:
// map lookups per spot, no query.
st := a.ClusterSpotStatuses([]SpotQuery{{Call: call, Band: band, Mode: mode}})
if len(st) == 0 {
return
}
s := st[0]
isNew := s.Status == "new" || s.Status == "new-band" ||
s.Status == "new-mode" || s.Status == "new-slot" || s.NewPfx || s.NewGrid
if !isNew {
return
}
now := time.Now()
row := ChaseNewSpot{
Call: call, Band: band, Mode: mode, FreqHz: sp.FreqHz,
Grid: sp.Grid, Country: s.Country, Cont: s.Continent,
DistKm: sp.DistKm, Bearing: sp.Bearing,
Status: s.Status, NewPfx: s.NewPfx, NewGrid: s.NewGrid, LoTW: s.LoTW,
At: now.UTC().Format(time.RFC3339),
}
// The grid the watcher gives is the transmitter's own, straight off the air —
// better than anything we could look up, so it is kept even when the status
// index had one.
if row.Grid == "" {
row.Grid = s.Grid
}
a.chaseNew.put(row, now)
}
// GetChaseNewSpots returns what the widget should show, newest first, aged out
// with the same spot lifetime the cluster and band maps use — one setting for
// "how long is a spot worth looking at", not three.
func (a *App) GetChaseNewSpots() []ChaseNewSpot {
if a.chaseNew == nil || !a.chaseNewEnabled() {
return []ChaseNewSpot{}
}
ttl := time.Duration(a.GetSpotTTLMinutes()) * time.Minute
return a.chaseNew.list(ttl, time.Now())
}
// GetChaseNew reports whether the widget is on.
//
// Reads the SETTING, not the cached atomic. The atomic exists for the MQTT
// goroutine and is false until startup has read the option — so a UI that asked
// this while the database was still opening was told "off", believed it, and
// never asked again. The toolbar button only appeared after opening Settings
// and closing it, which is what re-read it.
func (a *App) GetChaseNew() bool { return a.settingOr(keyChaseNew, "") == "1" }
// SetChaseNew turns the widget on or off and brings the feed up or down with it.
func (a *App) SetChaseNew(on bool) error {
v := "0"
if on {
v = "1"
}
a.setSetting(keyChaseNew, v)
a.refreshChaseNew()
// The feed is shared: startBandOpenSources decides whether it is still needed
// by anything else, so turning this off does not cut the grid store loose.
a.startBandOpenFeed()
applog.Printf("chase new: %v", on)
return nil
}
+111
View File
@@ -0,0 +1,111 @@
package main
import (
"testing"
"time"
)
// The panel must not become one station repeated. PSK Reporter re-reports a
// calling operator every cycle, and dozens of receivers report the same
// transmission, so a station arrives many times a minute.
func TestChaseNewStoreDeduplicates(t *testing.T) {
s := newChaseNewStore()
t0 := time.Date(2026, 8, 14, 12, 0, 0, 0, time.UTC)
row := ChaseNewSpot{Call: "VK9XX", Band: "20m", Mode: "FT8", At: t0.Format(time.RFC3339)}
if !s.put(row, t0) {
t.Fatal("the first sighting was rejected")
}
if s.put(row, t0.Add(2*time.Minute)) {
t.Error("the same station on the same band and mode was listed twice")
}
// A different band is a different opportunity — a new-band slot is exactly
// what an operator is watching for.
other := row
other.Band = "15m"
if !s.put(other, t0.Add(2*time.Minute)) {
t.Error("the same station on another band was suppressed")
}
// Once the window has passed it is worth showing again: the station is still
// there, and the row it had has aged out of the list.
if !s.put(row, t0.Add(chaseSeenTTL+time.Minute)) {
t.Error("the station never came back after the de-duplication window")
}
}
// The list is aged with the operator's own spot lifetime, so a station heard an
// hour ago is not offered as something to chase now.
func TestChaseNewStoreAgesOut(t *testing.T) {
s := newChaseNewStore()
t0 := time.Date(2026, 8, 14, 12, 0, 0, 0, time.UTC)
s.put(ChaseNewSpot{Call: "OLD", Band: "20m", Mode: "FT8", At: t0.Format(time.RFC3339)}, t0)
s.put(ChaseNewSpot{Call: "NEW", Band: "20m", Mode: "FT8",
At: t0.Add(20 * time.Minute).Format(time.RFC3339)}, t0.Add(20*time.Minute))
got := s.list(15*time.Minute, t0.Add(21*time.Minute))
if len(got) != 1 || got[0].Call != "NEW" {
t.Fatalf("got %+v, want only NEW", got)
}
// Newest first: an operator reads the top of this list and nothing else.
s.put(ChaseNewSpot{Call: "NEWEST", Band: "20m", Mode: "FT8",
At: t0.Add(25 * time.Minute).Format(time.RFC3339)}, t0.Add(25*time.Minute))
got = s.list(15*time.Minute, t0.Add(26*time.Minute))
if len(got) != 2 || got[0].Call != "NEWEST" {
t.Fatalf("got %+v, want NEWEST first", got)
}
}
// The list is bounded. A widget that grows without limit under a 6 m opening
// costs memory for rows nobody will ever scroll to.
func TestChaseNewStoreIsBounded(t *testing.T) {
s := newChaseNewStore()
t0 := time.Date(2026, 8, 14, 12, 0, 0, 0, time.UTC)
for i := 0; i < chaseNewMax+50; i++ {
at := t0.Add(time.Duration(i) * time.Second)
s.put(ChaseNewSpot{
Call: "S" + time.Duration(i).String(), Band: "20m", Mode: "FT8",
At: at.Format(time.RFC3339),
}, at)
}
if got := len(s.list(0, t0.Add(time.Hour))); got != chaseNewMax {
t.Errorf("kept %d rows, want the %d cap", got, chaseNewMax)
}
}
// The panel is for stations an operator can call. WSPR is a beacon — nobody
// answers one — and on a quiet band it would be most of the list.
func TestChaseModesExcludeBeaconsAndOddities(t *testing.T) {
for _, m := range []string{"FT8", "FT4", "FT2", "PSK31", "RTTY"} {
if !chaseModes[m] {
t.Errorf("%s should be listed", m)
}
}
for _, m := range []string{"WSPR", "JT65", "JT9", "FST4W", "Q65", "JS8", "MSK144", "OLIVIA", ""} {
if chaseModes[m] {
t.Errorf("%s should not be listed", m)
}
}
}
// A decode on a band the operator does not have is not an opportunity, it is a
// row in the way — PSK Reporter carries microwave segments nobody in the region
// is equipped for.
func TestChaseBandAllowed(t *testing.T) {
a := &App{}
// Nothing loaded yet: show rather than swallow, or the panel would look
// broken for the first seconds after it is switched on.
if !a.chaseBandAllowed("13cm") {
t.Error("with no band list loaded, nothing should be filtered")
}
a.chaseBands = map[string]bool{"20m": true, "40m": true, "6m": true}
for _, b := range []string{"20m", "40m", "6m", " 20M "} {
if !a.chaseBandAllowed(b) {
t.Errorf("%q is in the operator's list and was dropped", b)
}
}
for _, b := range []string{"13cm", "23cm", "2m", "630m", ""} {
if a.chaseBandAllowed(b) {
t.Errorf("%q is not in the operator's list and was kept", b)
}
}
}
+30
View File
@@ -0,0 +1,30 @@
package main
import "testing"
// The relay count is decided in Go and mirrored in the panel. When the HTTP
// board was added to one and not the other, an operator could pick 8 channels
// and still get 4 rows — the selector "did nothing".
//
// This pins the Go side, which is the one the driver is built from.
func TestDeviceRelayCountHonoursTheChosenChannels(t *testing.T) {
for _, typ := range []string{"httpgen", "usbrelay", "denkovi", "dingtian"} {
for _, n := range []int{1, 2, 4, 8, 16} {
if got := deviceRelayCount(StationDevice{Type: typ, Channels: n}); got != n {
t.Errorf("%s with %d channels → %d", typ, n, got)
}
}
}
// Fixed-size boards ignore it: their hardware decides.
for typ, want := range map[string]int{"webswitch": 5, "kmtronic": 8} {
if got := deviceRelayCount(StationDevice{Type: typ, Channels: 3}); got != want {
t.Errorf("%s → %d, want its fixed %d", typ, got, want)
}
}
// Unset falls back to something sensible per type, not to another's default.
for typ, want := range map[string]int{"httpgen": 4, "dingtian": 2, "usbrelay": 8, "denkovi": 8} {
if got := deviceRelayCount(StationDevice{Type: typ}); got != want {
t.Errorf("%s with no choice → %d, want %d", typ, got, want)
}
}
}
+52
View File
@@ -0,0 +1,52 @@
package main
import (
"testing"
"hamlog/internal/qso"
)
// A self-spot announces OUR station, so it must carry the references we are
// activating (MY_POTA_REF…), never the QSO's award references — those belong to
// the station we worked, and spotting yourself with someone else's park number
// puts you somewhere you are not.
func TestSelfSpotComment(t *testing.T) {
for name, c := range map[string]struct {
q qso.QSO
want string
}{
"mode only": {
q: qso.QSO{Mode: "cw"},
want: "CW",
},
"my park": {
q: qso.QSO{Mode: "SSB", MyPOTARef: "fr-11553"},
want: "SSB POTA FR-11553",
},
"two references": {
q: qso.QSO{Mode: "CW", MyPOTARef: "FR-11553", MySOTARef: "F/AM-123"},
want: "CW POTA FR-11553 SOTA F/AM-123",
},
// 30 characters is all a cluster keeps. The third reference is dropped
// whole rather than cut in half.
"too long drops the extra": {
q: qso.QSO{
Mode: "CW", MyPOTARef: "FR-11553", MySOTARef: "F/AM-123",
MyWWFFRef: "FFF-0123",
},
want: "CW POTA FR-11553 SOTA F/AM-123",
},
// A QSO's own award references are the DX's, and must not leak in.
"dx references are not ours": {
q: qso.QSO{Mode: "FT8", POTARef: "US-0001", AwardRefs: `{"POTA":"US-0001"}`},
want: "FT8",
},
} {
if got := selfSpotComment(c.q); got != c.want {
t.Errorf("%s: got %q, want %q", name, got, c.want)
}
if got := selfSpotComment(c.q); len(got) > spotCommentMax {
t.Errorf("%s: %d characters, over the %d a cluster keeps", name, len(got), spotCommentMax)
}
}
}
+46
View File
@@ -0,0 +1,46 @@
package main
import (
"strings"
"testing"
)
// The exact list an operator's machine produced: COM1 and COM3 each claimed by
// two devices in the Windows port map, and no order to speak of. The dropdown
// showed every duplicate, and rendered its own value as "COM3COM3" because two
// entries with the same value both counted as selected.
func TestTidySerialPortsDeduplicatesAndOrders(t *testing.T) {
got := tidySerialPorts([]string{"COM1", "COM1", "COM3", "COM8", "COM9", "COM4", "COM3"})
want := []string{"COM1", "COM3", "COM4", "COM8", "COM9"}
if strings.Join(got, ",") != strings.Join(want, ",") {
t.Errorf("got %v, want %v", got, want)
}
}
// COM10 after COM9, not between COM1 and COM2 — lexical order is how a port
// gets overlooked on a machine with a dozen of them.
func TestTidySerialPortsSortsNaturally(t *testing.T) {
got := tidySerialPorts([]string{"COM10", "COM2", "COM1", "COM20", "COM3"})
want := []string{"COM1", "COM2", "COM3", "COM10", "COM20"}
if strings.Join(got, ",") != strings.Join(want, ",") {
t.Errorf("got %v, want %v", got, want)
}
}
// Not every port is a COMn: a device path or a Unix name must survive, after
// the numbered ones, in its own order.
func TestTidySerialPortsKeepsOtherNames(t *testing.T) {
got := tidySerialPorts([]string{"/dev/ttyUSB1", "COM3", "/dev/ttyUSB0", "COM1", "", " "})
want := []string{"COM1", "COM3", "/dev/ttyUSB0", "/dev/ttyUSB1"}
if strings.Join(got, ",") != strings.Join(want, ",") {
t.Errorf("got %v, want %v", got, want)
}
}
// Case is not identity on Windows: "com3" and "COM3" are one port, and letting
// both through would put the same duplicate back in the list.
func TestTidySerialPortsIgnoresCase(t *testing.T) {
if got := tidySerialPorts([]string{"COM3", "com3"}); len(got) != 1 || got[0] != "COM3" {
t.Errorf("got %v, want [COM3]", got)
}
}
+1 -1
View File
@@ -21,7 +21,7 @@ import (
const (
// appVersion is stamped on every heartbeat (and could feed the About box).
appVersion = "0.24.8"
appVersion = "0.25.2"
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
// to https://us.i.posthog.com for a US project.
+47
View File
@@ -0,0 +1,47 @@
package main
import "testing"
// A CQ in FT8 carries the operator's square and it is where they are NOW.
// QRZ and HamQTH describe where they LIVE, which for an expedition is the
// wrong side of the planet — RI0FA transmitted QN35 all evening and was logged
// with its licence-holder's home square.
//
// refineGrid is the referee. What it must never do is let a directory value
// replace one heard on the air.
func TestRefineGridKeepsWhatWasHeardOnAir(t *testing.T) {
for _, tc := range []struct{ have, found, want string }{
// The expedition case: heard QN35, directory says the home square.
{"QN35", "KO85", "QN35"},
// Nothing heard: the directory is all there is.
{"", "KO85", "KO85"},
// A finer square from the SAME field is an upgrade, not a contradiction.
{"QN35", "QN35SL", "QN35SL"},
// A finer square from a DIFFERENT field is a contradiction — refuse it.
{"QN35", "KO85AB", "QN35"},
// Case and padding must not decide anything.
{" qn35 ", "KO85", "QN35"},
{"QN35", "", "QN35"},
} {
if got := refineGrid(tc.have, tc.found); got != tc.want {
t.Errorf("refineGrid(%q, %q) = %q, want %q", tc.have, tc.found, got, tc.want)
}
}
}
// And the ordering that makes it work: the decoded grid has to be applied
// BEFORE the lookup, or refineGrid has nothing to defend.
func TestDecodedGridWinsOverTheDirectory(t *testing.T) {
a := &App{}
a.rememberDecodeGrid("RI0FA", "QN35", "decode")
grid := "" // WSJT-X's ADIF carried no GRIDSQUARE, which is the usual case
if g := a.lookupDecodeGrid("RI0FA"); g != "" {
grid = refineGrid(grid, g)
}
grid = refineGrid(grid, "KO85") // then the lookup answers with the home square
if grid != "QN35" {
t.Errorf("logged grid = %q, want QN35 — the square the station actually sent", grid)
}
}
+148
View File
@@ -0,0 +1,148 @@
package main
// Wiring the custom outbound UDP/URL rows to the moments that fire them.
//
// One function per trigger, each building the fields its template can use. The
// field SET is per trigger and that is the point: a rotation has no frequency, a
// lookup has no report. The Settings panel lists what each one offers, because a
// template that quietly renders an empty string is the worst kind of wrong.
import (
"fmt"
"strconv"
"strings"
"sync"
"hamlog/internal/cat"
"hamlog/internal/integrations/udp"
"hamlog/internal/lookup"
"hamlog/internal/qso"
)
// lastTriggerBand remembers the rig's band so a change can be told from a
// frequency moving inside one. Guarded because the CAT callback and a settings
// reload can both reach it.
var (
lastTriggerBandMu sync.Mutex
lastTriggerBand string
)
// udpTriggerQSOLogged fires after a contact is written to the log.
func (a *App) udpTriggerQSOLogged(q qso.QSO) {
if a.udp == nil {
return
}
f := map[string]string{
"call": q.Callsign,
"band": q.Band,
"band_m": bandMetres(q.Band),
"mode": q.Mode,
"grid": q.Grid,
"name": q.Name,
"country": q.Country,
"rst_s": q.RSTSent,
"rst_r": q.RSTRcvd,
"comment": q.Comment,
"date": q.QSODate.UTC().Format("20060102"),
"time": q.QSODate.UTC().Format("150405"),
}
if q.FreqHz != nil && *q.FreqHz > 0 {
f["freq_hz"] = strconv.FormatInt(*q.FreqHz, 10)
f["freq_mhz"] = fmt.Sprintf("%.6f", float64(*q.FreqHz)/1e6)
}
if q.DXCC != nil {
f["dxcc"] = strconv.Itoa(*q.DXCC)
}
a.udp.EmitTrigger(udp.TriggerQSOLogged, f)
}
// udpTriggerRotator fires whenever the antenna is told to turn — the header's
// SP and LP buttons, the compass, a click on a spot.
//
// Hooked to the COMMAND rather than to a button: one place, and it stays true
// when the interface changes. path is "SP", "LP" or "" when the caller did not
// say which.
func (a *App) udpTriggerRotator(az, el int, path string) {
if a.udp == nil {
return
}
f := map[string]string{
"az": strconv.Itoa(az),
"path": path,
}
if el >= 0 {
f["el"] = strconv.Itoa(el)
}
a.udp.EmitTrigger(udp.TriggerRotatorGo, f)
}
// udpTriggerLookup fires after a callbook lookup returns.
func (a *App) udpTriggerLookup(r *lookup.Result) {
if a.udp == nil || r == nil {
return
}
a.udp.EmitTrigger(udp.TriggerLookupDone, map[string]string{
"call": r.Callsign,
"name": r.Name,
"grid": r.Grid,
"country": r.Country,
"qth": r.QTH,
"state": r.State,
"dxcc": strconv.Itoa(r.DXCC),
})
}
// udpTriggerBandChange fires when the RIG changes band — not the entry form: an
// antenna switch follows the radio, not what is being typed.
//
// Called from the CAT state callback, which runs on every user-relevant change,
// so the comparison against the last band is what makes this rare rather than
// continuous. No damping needed beyond that.
func (a *App) udpTriggerBandChange(s cat.RigState) {
if a.udp == nil {
return
}
band := strings.ToLower(strings.TrimSpace(s.Band))
if band == "" || !s.Connected {
return
}
lastTriggerBandMu.Lock()
changed := band != lastTriggerBand
if changed {
lastTriggerBand = band
}
lastTriggerBandMu.Unlock()
if !changed {
return
}
f := map[string]string{
"band": band,
"band_m": bandMetres(band),
"mode": s.Mode,
}
if s.FreqHz > 0 {
f["freq_hz"] = strconv.FormatInt(s.FreqHz, 10)
f["freq_mhz"] = fmt.Sprintf("%.6f", float64(s.FreqHz)/1e6)
}
a.udp.EmitTrigger(udp.TriggerBandChange, f)
}
// bandMetres turns "20m" into "20" — an antenna switch usually wants the number
// and nothing else, and asking an operator to strip it in a template would be
// one more thing to get wrong.
func bandMetres(band string) string {
b := strings.ToLower(strings.TrimSpace(band))
b = strings.TrimSuffix(b, "m")
b = strings.TrimSuffix(b, "c") // "70cm" → "70c" → "70"
if b == "" {
return ""
}
for _, r := range b {
if r < '0' || r > '9' {
if r != '.' {
return ""
}
}
}
return b
}