Compare commits

..
45 Commits
Author SHA1 Message Date
rouggy f7d2de0777 chore: release v0.24.6 2026-08-11 21:14:59 +02:00
rouggy 344e8b2091 fix(lookup): /QRP is about power, not about place
QRZ has no record under M0BFS/QRP, so the lookup falls back to the home call —
that part worked. What followed did not: the home record's location is then
discarded, on the reasoning that a portable operator is not at their registered
address. True for /P and /M, and simply wrong for /QRP, which says something
about the transmitter and nothing about where it is.

So the grid came back empty for M0BFS/QRP while the same call without the suffix
answered perfectly, which is exactly how it was reported.

The distinction is now explicit rather than lumped in with the other operational
suffixes. /P and /M keep clearing the location, because mobile and portable both
mean somewhere other than home — that behaviour was correct and is untouched.
A power suffix stacked on a portable one (F4BPO/P/QRP) still clears: one of them
moved the operator.
2026-08-11 21:12:37 +02:00
rouggy c5e0ec9033 fix(filter): "equals nothing" found nothing
A NULL never equals '', so a condition written that way returned zero rows. The
question is perfectly clear — the operator wants the ones with nothing in that
field — and answering it with silence makes the filter look broken rather than
mis-stated. eq and ne with a blank value now run the empty / not-empty test.

Empty on a NUMERIC column also had a real fault behind it. IFNULL(col,'')=''
compares 0 against '', which SQLite calls false and MySQL calls true — one
expression quietly answering two different questions depending on where the
logbook lives. Numeric columns test NULL or zero explicitly now; text keeps the
string test, where '' is a real value and 0 is not.
2026-08-11 21:02:33 +02:00
rouggy 210a99983e fix(bulk): a group missing from a hand-written list never rendered
The dialog walked a hand-written GROUPS array. "The contact" was added to the
fields and not to it, so mode, submode and RST existed, passed every check I had
written, and could not be picked — the same shape of fault as the missing column
mapping, one layer further out. Two lists that must agree, with nothing making
them agree.

GROUPS is derived from the fields now, in declaration order, so adding a group
is adding a field. A group with no translation falls back to its own name rather
than rendering an empty heading: a missing label should look untidy, not
invisible.

Also stacks the DX sunrise/sunset in the band-slot header. Side by side it cost
about 150 px of a row that also carries the callsign, the badges and the band
grid, and it was what pushed that row onto a second line. Two short times one
above the other cost a fraction of it and no extra height — the row is already
taller than one line of text. The "UTC" label goes to the tooltip: the times are
monospaced and always UTC everywhere in OpsLog, so it was spending width to
repeat a convention the operator already lives by.
2026-08-11 20:46:59 +02:00
rouggy 2a6e09a1d7 fix(bulk): mode and RST were offered but could not be saved
A bulk-editable field passes through THREE tables: the list the dialog shows,
bulkFieldColumns in app.go, and bulkEditableCols in internal/qso. I added mode,
submode and RST to the first and the third and missed the middle one, so the
dialog offered them and every save came back "unknown field".

Nothing warns about that. Each table is perfectly valid on its own, and the
mismatch only surfaces when an operator picks the one field that falls through
the gap — which is exactly how it was found.

So both directions are pinned now: every mapped field must be writable by the
qso layer, and every writable column must have a field mapping to it. A column
nothing maps to looks supported from the inside and cannot be reached from
outside, which is the same fault wearing the other hat.
2026-08-11 20:39:46 +02:00
rouggy 1b7f8ec9c1 docs: one entry for the distance work, not two 2026-08-11 20:33:08 +02:00
rouggy 75a2f73992 fix(distance): compute it where QSOs are made, not in a settings button
The button was the wrong shape twice over. A maintenance chore does not belong
beside the options an operator actually chooses, and nobody should have to be
told their log is missing a field before it gets filled in.

So the distance is computed where QSOs come from: on the logging path and on the
ADIF import. fillDistance is its own function rather than part of
applyStationDefaults, because the import only applies those when the operator
ticks a box — and a distance is not a station default. It is derived from the
QSO's own two grids and is true whatever was chosen about profile fields.

What is already in the log is handled by a one-time migration at startup,
recorded by a settings key. In the background: on a large log over a remote
MySQL that is thousands of row updates and startup must not wait for a tidy-up.
Marked done only on SUCCESS, so a run cut short by a closed program tries again
next time rather than leaving half the log filled for ever.

An imported value still wins. It came from the log that made the contact, which
knew the real positions rather than two four-character squares.
2026-08-11 20:14:27 +02:00
rouggy deee8c4618 fix(rda): 1015 districts were on the wrong DXCC entity
Every one of the 2660 references was filed under European Russia. Corrected
against the RDA reference list: 991 are Asiatic Russia (15), and the 24 KA-
districts are Kaliningrad (126), which is not Russia for DXCC purposes at all.
1645 were already right.

dxcc_filter went from [15,54] to [15,54,126] with them. That filter decides
which QSOs are even considered, so leaving it alone would have made the 24
Kaliningrad districts unclaimable — a correction that quietly removes references
is worse than the error it fixes.

BA-27 (Mezhgorye) and BO-33 (Schebekino) are not in the reference list at all
and were left exactly as they were. Guessing an entity for a district nobody
lists is how a second wrong answer gets added to the first.

Only the dxcc field changed. Names differ in transliteration between the two
sources — Maykop against Maikop — and rewriting those was not asked for and
would churn 2660 lines to no purpose.
2026-08-11 19:55:37 +02:00
rouggy 92a5f30ac0 feat(db): fill in the distances nothing ever recorded
The published page derives a distance as it renders, which fixed the empty
column there but not the cause: the field is empty in the database, so it goes
out empty in every ADIF export and leaves the same gap in whoever imports it.

BackfillDistances computes it from the two locators for QSOs that have both.
Only where it is EMPTY: a stored distance came from the log that recorded the
contact, which knew the real positions, and two four-character squares are a
worse answer that must not overwrite a better one. Whole kilometres, for the
same reason the published column is.

In the Database panel rather than beside the county backfill, which lives under
US Counties: this one touches the whole logbook, whatever country the QSOs are in.
2026-08-11 19:49:03 +02:00
rouggy d3a405f4f6 fix(webpub): the published page hid columns it had room for
The page was capped at 1100px — a comfortable reading width, and the right
choice for the eight default columns. Now that all 123 fields can be published,
anything past about eight sat behind a horizontal scrollbar on a screen wide
enough to show the lot.

Worse, Windows hides overlay scrollbars until something moves, so a table that
scrolled looked exactly like a table with its right-hand columns missing. That
is what was reported, and the report was reasonable: nothing on screen said
otherwise.

The wrapper grows with its content now, up to the window, and keeps a minimum so
a two-column table does not collapse on a large display. The table sizes to what
its cells need rather than being squeezed to the container first — that squeeze
could wrap a callsign while empty space sat further along the same row. And the
scrollbar is drawn permanently, thin and in the page's own colours.
2026-08-11 19:45:00 +02:00
rouggy f7b9bfd0bc fix(webpub): the Distance column was empty for every QSO logged here
Nothing computes a distance when a QSO is logged. The DISTANCE field is only
ever filled by an ADIF import that carried one, so publishing it straight gave
an empty column to anyone whose log was made in OpsLog — which is everyone who
reported it.

It falls back to the two locators, which are on the QSO already. A stored
distance still wins: it came from the log that recorded the contact, which knew
more than two four-character squares do. No grids means an empty cell, not a
zero — an empty cell is honest, a zero is a claim.

Rounded to whole kilometres. The squares are tens of kilometres across and a
decimal would assert an accuracy nobody has.

The geometry moved to internal/geo on the way. It lived in package main, which
internal packages cannot import, so the PSK Reporter watcher already had its
maths injected from main and this would have been a third copy. A bearing that
disagrees with itself between two panels is a fault nobody reports, because each
screen looks perfectly plausible on its own.
2026-08-11 19:41:47 +02:00
rouggy 102097c5c4 feat(bulk): mode, submode and RST are repair fields, so allow them
They were excluded as "per-QSO", alongside callsign and date. That rule confused
two different things: bulk edit is not for describing QSOs, it is for REPAIRING
a batch of them — an import that mapped every contact to SSB, an ADIF that
carried no MODE at all. Refusing because a hundred rows should not normally
share a value left the operator editing a hundred rows by hand.

Setting the mode CLEARS the submode. A submode belongs to the mode it was
recorded under; left behind it contradicts the new one, and "FT8 with a submode
of USB" is not a thing — worse, the submode is what most ADIF readers believe.

Band is still refused on its own, and that half of the rule stands. It travels
with the frequency through BulkSetFrequency, which writes the pair: a band
contradicting its own frequency is invalid ADIF, and every export would carry
the contradiction out into the world. Callsign and date stay out too — they
identify the contact rather than describe it.
2026-08-11 19:36:56 +02:00
rouggy 3b90ef6b7a chore: open 0.24.6
Empty block at the top so the next change has somewhere to go. 0.24.5 keeps its
nine entries; the release script stamps the version constants.
2026-08-11 18:20:42 +02:00
rouggy 839cf0aafd chore: release v0.24.5 2026-08-11 18:19:54 +02:00
rouggy 9fd801ea69 fix(bandopen): stop subscribing to a band nobody watches, and drop the toast
A saved band selection outlives the code that made it. 12 m was removed from the
watched set, but every operator who had already enabled the watch kept
subscribing to it — paying for a firehose whose messages the detector then threw
away. The stored list is filtered against the offered one now.

The badge appeared on the next poll rather than on the event, up to twenty
seconds after the announcement, so the two read as unrelated things that happened
to mention the same band. It appears immediately.

And the toast is gone. It said the same thing as the badge and vanished after
five seconds — an operator who was tuning when it passed had no way back to it,
which is precisely what the badge was built to fix. Keeping both announced an
opening twice and still lost it once.
2026-08-11 18:11:09 +02:00
rouggy 298c2fde44 fix(ui): "1.5kkm" — the opening badge showed a doubled unit
Abbreviating 1500 to "1.5k" and then appending "km" produced "1.5kkm", which
means nothing. Plain kilometres now.

Written correctly it would still have been wrong: "1.5k km" asks the reader to
do arithmetic to recover a number that was four characters long to begin with.
There was nothing to save.
2026-08-11 18:04:04 +02:00
rouggy 78e99afc63 fix(ui): the opening badge must say what is open, not that something is
It read "6M OPEN" and kept the rest in a tooltip nobody hovers — an alarm with
no content, announcing that something was happening and refusing to say what.
Band, direction and typical distance are on the badge now: the three facts that
decide whether to point an antenna, all readable without touching anything. Out
of season gets a mark there too, since that is the one an operator must not
learn last.

The compass point is computed in Go and carried on the Opening rather than
derived in the UI. Sector() already gets the wrap round north right, and it got
it wrong once — a second copy of that arithmetic is how a badge ends up naming
the opposite direction to the log line beside it.
2026-08-11 17:58:51 +02:00
rouggy 740f007395 docs: one entry for the Kenwood split work 2026-08-11 17:55:59 +02:00
rouggy 43095a1d89 feat(rigctld): split that actually reaches the radio, or an honest refusal
set_split_vfo and set_split_freq both answered RPRT 0 and did nothing. WSJT-X
and JTDX in "Split Operating: Rig" send exactly that pair, believed both, and
transmitted on the RECEIVE frequency — on a pileup, straight onto the DX, while
showing the operator precisely what they had asked for. A lie that leaves no
trace in any log is the worst kind of bug this program can have.

The two commands are honoured as a PAIR. Arming alone does nothing on the radio,
because WSJT-X sends the frequency second and split armed on whatever the
transmit VFO happened to hold is worse than no split at all: it transmits
somewhere the operator never chose. The request is remembered and set_split_freq
does the work.

Kenwood gains SetSplit — FB to place the dial, then FR0/FT1 to arm, in that
order for the same reason. It writes what State() already knows how to read.

Everything else REFUSES, and that is the feature, not a shortfall. Only Flex and
Icom could even toggle split before, neither could set the transmit frequency,
and Yaesu, TCI and OmniRig have nothing at all. A refusal WSJT-X can report —
and act on, by falling back to Fake It — is worth far more than a success it has
no way to check.

Both paths are pinned: split reaching the rig as one armed call with the right
frequency, and a backend that cannot do it producing an error rather than RPRT 0.
2026-08-11 17:53:46 +02:00
rouggy fa01968207 fix(kenwood): split frequencies swapped on transmit
IF reports the VFO "in use". In split that is the RECEIVE VFO while receiving
and the TRANSMIT VFO while transmitting — the backend took it as the receive VFO
in both cases. Everything therefore read correctly until the PTT closed and then
reversed, which is exactly how it was reported from a TS-590 on USB.

The IF frame has carried the transmit bit all along; parseKenwoodIF already
decoded it into f.TX. It was simply never consulted here.

This is not only a display fault. FreqHz is what a QSO is LOGGED on, so a
contact worked in split went into the log on the DX's frequency instead of the
operator's — wrong in the log, wrong in every ADIF exported from it, and
invisible until someone checked a QSO by hand.

The emulated rig in the test package can now be keyed, so the case is pinned
from both sides: verified failing without the fix (tx and rx exchanged) and
passing with it.
2026-08-11 17:28:23 +02:00
rouggy 91452cefc0 feat(filter): "is one of" — so a real question can be asked
Every condition was joined by ONE global AND or OR. "2 m or 70 cm, in FT8, since
January" therefore had no expression at all: AND killed the two bands, OR let
every FT8 QSO through. The filter could ask simple questions and nothing else.

Rather than grow nested groups — a tree in the UI to answer something that is
nearly always "this field, any of these values" — the OR lives INSIDE one
condition and everything else keeps ANDing. Two operators, a comma-separated
value, no change to how the rest of the filter behaves.

Two edges that matter more than they look. An empty list matches NOTHING rather
than being dropped: dropping it would widen the result set, the opposite of what
someone typing a filter expects. And "is none of" wraps the column in IFNULL,
because raw SQL NOT IN discards NULL rows — a QSO with no band recorded is not
one of the listed bands, so it belongs in the answer.
2026-08-11 17:07:32 +02:00
rouggy 904b451951 fix(station): toggling tracking must not drop the antenna link
SetMotorFollow went through SaveUltrabeamSettings, which tears the client down
and dials again. That is right when the transport changed and absurd for a
checkbox: the operator flipped tracking and watched the antenna disconnect and
come back, which on a remote controller is several seconds of a link that was
working perfectly.

The follow loop is a goroutine with its own stop channel and can be replaced on
its own — the connection underneath never knows. Only the two keys this call
actually changes are written, too: re-saving the whole block to change a
checkbox means re-normalising host, port, baud and bands, and every one of those
is a chance to alter something nobody asked to alter.

startUltrabeam now starts the loop through the same function rather than its own
copy. Two versions of "start the follow loop" drifting apart is how a step
change quietly stops taking effect.
2026-08-11 16:43:10 +02:00
rouggy c4d90e6880 feat(station): drive the motorized antenna from its widget
It showed pattern, elements and Retract — everything except where the antenna
is pointed, which is the thing an operator changes most. Tuning it meant opening
Settings or moving the rig.

A button per band, taken from the bands configured in Settings rather than a
list invented here: a band dropped there cannot be clicked here. They point at
where people actually work, not the arithmetic centre — 20 m centres on 14175
and nobody lives there, 10 m spans 1.7 MHz of which the top half is empty.

Up and down move 25 kHz, which is also the finest tracking threshold: a smaller
nudge would be undone by the next poll while tracking is on. They work from the
ANTENNA's frequency, not the rig's, or walking the antenna across a band while
the rig stays put would be undone on the first press.

Tracking moved within reach because it is an operating decision — off to park
the antenna, on to resume — not something set up once. Its step only appears
when it is on: a threshold for something switched off is a question the operator
cannot act on.

MotorTuneKHz carries the CURRENT direction rather than resetting it. Both
controllers set frequency and pattern in one command, so a bare frequency would
silently drop a 180° or bidirectional pattern — a beam turning round is not an
acceptable side effect of clicking a band.
2026-08-11 15:45:02 +02:00
rouggy 1ac00c101e fix(clublog): say what is wrong, not four kilobytes of markup
Club Log refuses with its ordinary web page rather than an error string, so the
new test reported a rejected login by pasting a 403 page — title, stylesheets,
navigation and all — into the status bar. The body now goes to the log, where a
real diagnosis happens, and the operator gets the one sentence there is to act
on: check the e-mail, the password and the logbook callsign.

Dropped the startyear=2099 filter with it, and that one matters more than it
looks. It was there to keep the reply small, but it was never verified against
Club Log's API — and Club Log answers an unrecognised request with the SAME 403
it uses for a refused login. An unverified parameter would therefore have made
every CORRECT password look wrong, which is precisely the failure this change
set out to end. The reply is capped at 4 KB and closed at once instead; the
status code arrives ahead of the body either way.
2026-08-11 15:34:06 +02:00
rouggy e107b0b741 docs: one changelog entry per thing, not one per commit
Band-opening detection had five entries in 0.24.5 — long paths, the PSK Reporter
feed, which bands, the densest sector, the region filter. Those are five steps I
took, not five things that happened to the operator, and the version read like a
work diary. Merged into one entry describing what the feature now does.

The 12 m mention went with them: it was added and removed inside this same
version, so it never existed as far as anyone reading this is concerned.
2026-08-11 15:26:40 +02:00
rouggy 24668d5981 fix(pskr): an opening has to be an opening HERE
A PSK Reporter message says "X was heard BY Y". The watcher measured the
distance and bearing from the operator to X and stopped there, never asking who
had actually heard it — so a station 1400 km away, decoded by somebody in Japan,
counted as evidence. That proves the path from X to JAPAN and says nothing about
whether anything reaches this station. It is how a "2 m opening" came to be
announced out of a KX9X in the United States, and the operator was right to find
the callsign list absurd.

Reports are now kept only when the RECEIVING station is within 300 km. Far
enough to borrow the ears of a whole region — an opening reaches an area, not a
postcode, and waiting for a decode at one's own antenna is just working the band
— and close enough that the ionosphere doing something there is it doing the
same thing here. The transmitter still supplies the direction and the path
length, which is what was always wanted from it.

Also drops 12 m from the watched bands, at the operator's request: at this point
in the cycle it is open often enough that announcing it is a notification rather
than news, and a band that cries wolf costs the ones that do not. One fewer
subscription is also less traffic on a PC that pays for every message.
2026-08-11 14:58:10 +02:00
rouggy 8aa0e39aff fix(bandopen): find the busiest sector, and name it correctly
Two faults, both found from one field log: 70 000 decodes, 10 and 12 m plainly
open, nothing announced — and the two openings that DID fire named the wrong
direction.

evaluate() required EVERY distinct station in the window to fit inside one 90°
arc. That is the shape of a sporadic-E cloud and of nothing else. With 10 and 12
m open on F2 the reports arrive from all round the compass, the arc is 360°, and
the test can never pass — so the busier the band, the less likely an opening was
announced. Exactly backwards. It now finds the DENSEST sector instead, which
keeps the Es signature intact (a cloud still makes one direction dense) and lets
a real F2 opening be seen through the handful of neighbours who are always
there. Scattered-but-busy still reports nothing: the point was to stop demanding
global agreement, not to call every open band an opening.

Sector() averaged the two bearings arithmetically, so an arc crossing north was
labelled by its opposite: 353–61° averaged to 207° and went out as SW when it
was NE. Not a vague error — a reversed one, given to an operator who may turn a
beam on it. The detector has handled the 0/360 wrap since it was written; only
this label had not.
2026-08-11 14:50:37 +02:00
rouggy 96c99f0ae6 feat(bandopen): a blinking badge that lasts as long as the opening does
The only sign of a detection was a toast. It is gone in seconds, and an operator
who was tuning at that moment had no way back to it — for an event that lasts
hours and happens a handful of times a season, that is the wrong shape entirely.

The badge sits at the right-hand end of the status bar, before the clock: an
opening is a state of the WORLD, not of this station, so it belongs with the
time and the logbook rather than among the rig and amplifier chips.

Knowing when to go out was the real work. Nothing announces that an opening
ended, and the detector deliberately says nothing more about a band for 45
minutes after announcing it — right for a message, useless for a badge. So it is
inferred: every qualifying spot on that band pushes a deadline out, and when
they stop arriving the badge fades by itself. Fifteen minutes, comfortably more
than the detector's own twelve-minute window, so a quiet couple of minutes
mid-opening does not blink it off and on again.

Gated on the same distance floor the detector uses. Without that, a band busy
with short-range tropo would hold an Es badge lit indefinitely on spots the
detector itself had refused.
2026-08-11 13:48:26 +02:00
rouggy 0550ecdac3 fix: a test button that cannot fail is worse than no button
TestClublog checked that three fields were non-empty and returned "Ready — CALL
via EMAIL". Nothing was ever sent to Club Log, so a wrong password produced the
identical green message. It now signs in, through getadif.php because that is
the one authenticated endpoint that cannot change anything: a test must never
put a record into someone's log. A future start year keeps it from downloading
130 000 QSOs to prove a password, and a rejected login answers 403 before any
body arrives.

LoTW is two credentials doing two jobs and the button reported only the first.
Uploads go through TQSL signed by the certificate — the website password is
never involved — so a wrong one breaks nothing until the day confirmations are
downloaded, by which time nobody connects the two events. Both are now checked
and, more importantly, reported separately.

Also: the detector still refused 12 and 10 m while the PSK Reporter feed was
already subscribed to them, so those decodes were fetched and thrown away. The
rule was never "HF is out", it is "is an opening here an event" — 20 m being
open is the normal state of the band, 10 m opening is not.
2026-08-11 13:16:09 +02:00
rouggy 9c33feecfa feat(ui): PSK Reporter chip in the status bar
Beside the rig and amplifier chips, before ON AIR, because it is the same kind
of fact they report: a link that is either up or it is not. Clicking it opens
the settings that control it, like the amplifier chips do.

Shown ONLY while the opening watch is on. A permanently grey chip for a feature
nobody enabled is clutter, and the bar is 28 px tall — every chip in it has to
earn its width.

Green once decodes are arriving, amber while connected but silent: those are
different states and an operator wondering why no opening has been announced
needs to tell them apart. The count itself is in the tooltip, not on the chip —
it moves several times a second on an open band, and a number flickering in the
corner of the eye is a distraction rather than information.
2026-08-11 13:08:04 +02:00
rouggy 8afba2c4e8 feat(bandopen): read PSK Reporter, and arrange the sources the watch needs
The detection shipped reading whatever the operator's cluster nodes happened to
carry. On VHF that is a few hundred skimmers, nearly all of them on HF: a 6 m
opening carrying 869 stations reached OpsLog as a handful of spots or none, and
Nexus flagged it on the same PC while OpsLog stayed silent.

internal/pskr subscribes to pskr/filter/v2/<band>/# on PSK Reporter's MQTT
broker. Every ordinary station running WSJT-X reports what it decodes, so the
difference is two orders of magnitude rather than a threshold. The feed's shape
suits us exactly: BOTH grids are in each message, so distance and bearing are
arithmetic — no lookup, and no DXCC-centre approximation, which is what made the
cluster path's bearings coarse. The geometry is injected from app.go so it stays
the same arithmetic the cluster path uses; two answers to one question is how a
bearing quietly becomes wrong.

Volume was the design constraint, not the protocol. Six metres open is thousands
of messages a minute and this runs on some very old PCs, so nothing is kept or
persisted in the watcher: each message is parsed, measured and handed on or
dropped, and the detector's existing window does the deciding.

And the part that was the real bug: enabling the watch now ARRANGES ITS OWN
SOURCES. It adds the two RBN nodes when missing and brings the feed up. A
feature that silently depends on sources nobody can know are needed does not
look unconfigured, it looks broken. Matched on host and port, not name, so an
operator who renamed theirs does not get a duplicate — which the detector would
read as twice as many stations, and announce an opening that is not there.

Turning it off leaves the nodes alone: they may have been wanted for their own
sake, and removing a node someone is using is worse than leaving one they are not.
2026-08-11 12:48:29 +02:00
rouggy 2d3bfa704e fix(bandopen): drop the distance ceiling
The detector refused any path over 2400 km, reasoning that past a single hop the
bearing test stops meaning anything. That was wrong, and it discarded exactly the
openings worth announcing: Nexus flagged a 6 m opening at 5477 km that OpsLog
never saw, because the spots were thrown away before any test ran.

Multi-hop Es is ordinary on 6 m — 5000 km paths are common, 10000 km happens —
and it stays directional: a second hop leaves the sector the first one entered.
So the sector test, which is what does the real work here, holds perfectly well
at any distance. The ceiling was standing in for a judgement it could not make.

The floor stays at 500 km: a short 6 m contact is tropo or ground wave and says
nothing about the ionosphere. Both are now pinned by a test.
2026-08-11 12:30:51 +02:00
rouggy 29bdea1e43 feat(rigctld): answer lock_mode and stop_morse instead of refusing them
Both are ordinary Hamlib commands, and Nexus sends them around every transmit.
Refusing with RPRT -11 is permitted and a tolerant client carries on, but
nothing obliges it to — and while they sit in the log as "unimplemented" they
stay suspects every time something else goes wrong.

get_lock_mode answers 0, which is true: OpsLog never locks the dial against its
own clients. set_lock_mode is accepted and ignored, like set_vfo — there is no
lock to set, and failing would abort a client's transmit sequence over a setting
with no effect either way. stop_morse answers success because nothing is queued
here: CW is keyed by the rig's own keyer through the backend, never buffered in
this server, so "stopped" is accurate rather than polite.

Whether this is what Nexus is actually unhappy about is not established. It
removes two known irritants and two lines of noise from the log; if the trouble
persists, what remains in the log will be about the trouble.
2026-08-11 12:14:12 +02:00
rouggy b93c67f3cb fix(webpub): the column search box must not be scrolled over
It was sticky inside the scrolling list, and the rows went over it: a menu item
carries its own background and its own stacking context, so it wins against a
sticky sibling however high the z-index is raised.

The menu is a flex column now — a header that never scrolls, and the list
scrolling beneath it. Nothing to lose the fight with.
2026-08-11 11:25:52 +02:00
rouggy 735dfe69db fix(webpub): the column picker is a dropdown, not a wall
The first attempt laid 123 fields out on the page, sectioned by group. That
buried every other setting in the panel and was no easier to read than the flat
wrap it replaced — more surface, same problem.

One dropdown now, alphabetical, with a search box pinned at its top. Alphabetical
because any other order means hunting: the operator arrives knowing the name of
the field they want. The menu stays open while ticking, since picking eight
columns should be one visit rather than eight.

The chosen columns keep their place above it, in publication order — that list
answers "what will the page look like", which no catalogue can.
2026-08-11 11:11:24 +02:00
rouggy 67fe5bcff0 feat(webpub): offer every field, and make choosing among them possible
The catalogue held 23 hand-picked columns, so publishing a county, a satellite
pass or an award reference was simply not possible. It is generated from the
qso.QSO struct now — 123 fields — which also means a new ADIF field cannot be
forgotten here, as a hand-written list always eventually is.

Three keys were renamed to their ADIF names on the way (pota, sota, station).
An alias map keeps existing configurations publishing the same columns; without
it three would have vanished silently on upgrade, which is the worst way for a
setting to change.

The picker had to change with it: 123 chips in one wrap is a wall nobody reads
to the end of. It is sectioned by group, filtered as you type, and the chosen
columns sit on top in publication order — after picking eight out of a hundred,
the question stops being "what exists" and becomes "what did I pick".

The package doc said columns were curated so the operator's address could not
be published. That is no longer true and the comment now says so plainly: the
judgement moved to the operator, the default selection is unchanged, and nothing
is published that was not chosen.

Also collapses the changelog: four separate shared-CAT entries were one thing
from where the operator sits, and all of them were far longer than the one or
two sentences this project asks for.
2026-08-11 10:59:01 +02:00
rouggy d36d431d9a feat(rigctld): only pass PTT on when it actually changes
Nexus sends set_ptt 0 about sixteen times a second, and every one of them became
an "xmit 0" to the FlexRadio — a write every 60 ms, for ever, saying nothing.

Repeating a state is not a request to change it. Only transitions reach the
radio now, and each is logged, so the next "it will not transmit" can be traced
to whoever asked rather than inferred from a wall of identical lines. The first
call always goes through: how the radio was left is not ours to assume.

This is not the whole of the reported symptom, and should not be read as such.
The log also shows "xmit 1" followed by "xmit 0" one to two milliseconds later,
off the 60 ms cadence — that is a genuine transition pair, so it still gets
through and the radio still unkeys at once. Those two commands come from the
client, not from here; the writes originate only in set_ptt, and there is no
loop in OpsLog that emits them.
2026-08-11 10:29:23 +02:00
rouggy 0c8d79e2fa feat(rigctld): say so when another program owns the CAT port
Listen() succeeding is not the same as being reachable. OpsLog binds 0.0.0.0,
and Windows lets a second program bind the SAME port on the specific address
127.0.0.1. Connections to localhost then go to the more specific listener, so
every client reaches the other program while ours sits there having logged
"sharing CAT on port 4532" and never seeing a single connection.

Found with Nexus, which starts its own rigctld on 127.0.0.1:4532 and talks to
it. Neither side reports anything wrong: the operator gets a CAT timeout from a
daemon with no radio behind it, and OpsLog's log is silent because nothing ever
arrived. Three exchanges went into establishing that the connection simply never
reached us — the port table was what settled it, not the code.

So the server now dials its own port at startup and checks the connection lands
on its own accept loop. If it does not, it says which program will be receiving
the CAT connections and what to do. The counter it compares can only be raised
by our own accept loop, so a real client arriving during the probe makes the
check pass, never fail wrongly.
2026-08-11 10:15:19 +02:00
rouggy 796a1d8e7d feat(rigctld): name the misconfiguration instead of timing out silently
A client set to a RIG MODEL (Kenwood, Yaesu, …) pointed at the CAT-sharing port
speaks raw rig dialect: "ID;", "IF;". That is not rigctl, so it fell to the
unknown-command branch and got RPRT -11 like anything else.

The symptom hides the cause completely. RPRT -11 has no ';' for the client's
parser to terminate on, so it waits out its timeout and reports "reply
incomplete, got nothing" — a hard failure that reads as "OpsLog's CAT sharing
does not work", when it is one setting in the other program.

A frame ending in ';' with no space in it cannot be a rigctl command, so the log
now says what it is and what to set instead. Reported from Nexus, whose Hamlib
error named kenwood_transaction — the one word that gave it away.
2026-08-11 09:54:28 +02:00
rouggy 9531a54ac1 docs: changelog the shared-CAT fix that was committed without one
cfdd24d shipped the "?;" tolerance with no changelog entry, against the
project's own rule. Placed before the CW entry: the link had to survive being
busy before anything keyed through it could matter.
2026-08-11 08:59:03 +02:00
rouggy d2d64706f5 fix(kenwood): KY takes a FIXED 24 characters, not a string
CW over CAT never worked on a Kenwood. The KY implementation was written against
Elecraft's, which accepts a string of any length, so "KY OH5CX;" went out and a
TS-590SG answered "?;". OpsLog read that as "this radio refuses CW over CAT" and
told the operator to fit a serial keyer — advice that was wrong, and expensive.

The TS-590 manual is explicit: P2 has a fixed length of 24, blanks are filled
with spaces, and those spaces are not keyed. So the fix costs nothing on air; it
is simply the shape the command has. Elecraft stays variable-length, where
padding would key the trailing spaces as word gaps.

The semicolon is also gone from the allowed CW characters. It TERMINATES a CAT
frame, the manual forbids it in P2, and one in a macro would have closed the
command early and left the rest of the message to be read as commands.

Found from a log and a manual page, not from a rig: nobody here owns a Kenwood.
What is proven is the frame shape; that a TS-590SG then keys it still needs the
operator to confirm.
2026-08-11 08:55:49 +02:00
rouggy cfdd24d52e fix(kenwood): a busy rig is not a lost rig
A Kenwood answers "?;" while it is busy, and the TS-590SG does it for a moment
after RX; — which is exactly when the poll resumes. One rejected IF; then tore
down the whole CAT link.

The code already knew this. Its own comment says a "?;" to IF; is "a transient
busy, NOT unsupported" and that latching it off "would read as lost the rig".
That reasoning was applied to the unsupported-command map and stopped there: the
call still returned an error, the poll loop still turned it into connected=false,
and the link still dropped.

What it cost was not cosmetic. WSJT-X keys through shared CAT, so it lost the
rig mid-sequence; Hamlib then sent "F 9223372036854775808.000000" - an
uninitialised 2^63 - which OpsLog refused and logged. The operator sees a
frightening frequency error whose actual cause is three lines earlier.

A "?;" is now sentinel-wrapped so the poll can tell "the rig declined" from "the
serial link is gone", and three consecutive ones are ridden out on the last
known state before the link is called dead. Under a second of tolerance: enough
for the rig to finish, far too short to hide an unplugged cable. A serial fault
is untouched and still drops immediately.

Tested against the emulated rig already in this package, with a hook that
answers "?;" on demand: the link survives inside the grace and still reports the
last good frequency, the count resets on recovery so a later busy spell gets the
full allowance, and a rig refusing forever is still reported as broken.
2026-08-11 08:37:24 +02:00
rouggy 8052bd2935 update 2026-08-10 23:40:42 +02:00
rouggy 55879809f2 fix(udp): ignore N0CALL, and stop returning a grid as a callsign
N0CALL is what WSJT-X transmits under when its owner never set a callsign. It
has a letter, a digit and an ordinary shape, so nothing rejected it: it was
spotted, coloured, counted as a new WPX prefix, and now that CQ grids are read
it would have put a grid into the worked index under a callsign nobody holds.

The obvious fix - adding it to looksLikeCall's reject list - was wrong, and the
test caught it before it shipped. That function answers "could this token be a
callsign at all", and the CQ grammar uses it to decide whether the word after CQ
is a modifier (DX, NA, a zone) or the call itself. Teaching it that N0CALL is
not a callsign made "CQ N0CALL JN36" skip a slot and return JN36. Shape and
policy are different questions and now live in different functions.

Chasing that turned up the real defect behind it: ANY unrecognised word after CQ
made the parser skip a slot, and a four-character grid passes every shape test a
callsign does. "CQ FOO JN36" returned JN36 as the sender - logged, spotted and
coloured as a station. A grid in the callsign slot is now refused outright.
2026-08-10 21:51:49 +02:00
rouggy 6969560efb chore: open 0.24.5
Empty block at the top so the next change has somewhere to go. 0.24.4 keeps its
seven entries; the release script stamps the version constants.
2026-08-10 21:19:31 +02:00
52 changed files with 4174 additions and 1240 deletions
+264 -46
View File
@@ -40,6 +40,7 @@ import (
"hamlog/internal/dxcc" "hamlog/internal/dxcc"
"hamlog/internal/email" "hamlog/internal/email"
"hamlog/internal/extsvc" "hamlog/internal/extsvc"
"hamlog/internal/geo"
"hamlog/internal/integrations/udp" "hamlog/internal/integrations/udp"
"hamlog/internal/lookup" "hamlog/internal/lookup"
"hamlog/internal/lotwusers" "hamlog/internal/lotwusers"
@@ -49,6 +50,7 @@ import (
"hamlog/internal/pota" "hamlog/internal/pota"
"hamlog/internal/powergenius" "hamlog/internal/powergenius"
"hamlog/internal/profile" "hamlog/internal/profile"
"hamlog/internal/pskr"
"hamlog/internal/qslcard" "hamlog/internal/qslcard"
"hamlog/internal/qso" "hamlog/internal/qso"
"hamlog/internal/relaydev" "hamlog/internal/relaydev"
@@ -609,6 +611,10 @@ type App struct {
// air now, not a database. // air now, not a database.
decodeGrids map[string]string decodeGrids map[string]string
decodeGridsMu sync.RWMutex decodeGridsMu sync.RWMutex
// pskr is the PSK Reporter MQTT feed, up only while the opening watch is on.
// It is the source that makes VHF detection work at all: the cluster and RBN
// carry a handful of 6 m spots where PSK Reporter carries hundreds.
pskr *pskr.Watcher
// Self-spot throttle: when and on what frequency we last announced ourselves. // Self-spot throttle: when and on what frequency we last announced ourselves.
// Held in memory only — a restart legitimately re-announces the station. // Held in memory only — a restart legitimately re-announces the station.
selfSpotMu sync.Mutex selfSpotMu sync.Mutex
@@ -741,48 +747,16 @@ type App struct {
udpLastMode string udpLastMode string
} }
// gridToLatLon parses a Maidenhead locator (4 or 6 chars) and returns the // gridToLatLon and haversineKm live in internal/geo, which the internal
// centre lat/lon in degrees. Returns ok=false on malformed input. // packages can import — package main cannot be imported by anything. These
func gridToLatLon(grid string) (lat, lon float64, ok bool) { // forward so there is exactly ONE implementation: the PSK Reporter watcher and
g := strings.ToUpper(strings.TrimSpace(grid)) // the web publisher measure the same path the cluster does, and a bearing that
if len(g) < 4 { // disagrees with itself between two panels is a fault nobody reports, because
return 0, 0, false // each screen looks plausible alone.
} func gridToLatLon(grid string) (lat, lon float64, ok bool) { return geo.GridToLatLon(grid) }
A := g[0] - 'A'
B := g[1] - 'A'
C := g[2] - '0'
D := g[3] - '0'
if A > 17 || B > 17 || C > 9 || D > 9 {
return 0, 0, false
}
lon = -180 + float64(A)*20 + float64(C)*2
lat = -90 + float64(B)*10 + float64(D)*1
if len(g) >= 6 {
E := g[4] - 'A'
F := g[5] - 'A'
if E <= 23 && F <= 23 {
lon += float64(E)*(5.0/60.0) + 2.5/60.0
lat += float64(F)*(2.5/60.0) + 1.25/60.0
return lat, lon, true
}
}
// 4-char locator: aim at the centre of the square.
lon += 1
lat += 0.5
return lat, lon, true
}
// haversineKm returns the great-circle distance between two lat/lon pairs
// in kilometres. Standard Haversine, mean Earth radius 6371 km.
func haversineKm(lat1, lon1, lat2, lon2 float64) float64 { func haversineKm(lat1, lon1, lat2, lon2 float64) float64 {
const R = 6371.0 return geo.HaversineKm(lat1, lon1, lat2, lon2)
rad := math.Pi / 180.0
dLat := (lat2 - lat1) * rad
dLon := (lon2 - lon1) * rad
a := math.Sin(dLat/2)*math.Sin(dLat/2) +
math.Cos(lat1*rad)*math.Cos(lat2*rad)*math.Sin(dLon/2)*math.Sin(dLon/2)
c := 2 * math.Atan2(math.Sqrt(a), math.Sqrt(1-a))
return R * c
} }
// initialBearingDeg returns the initial great-circle bearing (azimuth) in // initialBearingDeg returns the initial great-circle bearing (azimuth) in
@@ -1399,6 +1373,11 @@ func (a *App) startup(ctx context.Context) {
go a.sendTelemetryHeartbeat() go a.sendTelemetryHeartbeat()
go a.liveStatusLoop() // multi-op: heartbeat current activity to shared MySQL go a.liveStatusLoop() // multi-op: heartbeat current activity to shared MySQL
go a.chatLoop() // multi-op: poll the shared chat + heartbeat presence go a.chatLoop() // multi-op: poll the shared chat + heartbeat presence
// PSK Reporter, when the opening watch is on. After the operator's grid is
// known: without it there is no distance to measure and the feed stays down.
a.startBandOpenFeed()
// One-time tidy-up of a field nothing used to record. Background, once.
a.backfillDistancesOnce()
fmt.Println("OpsLog: db ready at", a.dbPath) fmt.Println("OpsLog: db ready at", a.dbPath)
} }
@@ -2643,6 +2622,7 @@ func (a *App) AddQSO(q qso.QSO) (id int64, err error) {
} }
}() }()
a.applyStationDefaults(&q, true) a.applyStationDefaults(&q, true)
fillDistance(&q)
a.applyDXCCNumber(&q) a.applyDXCCNumber(&q)
a.applyULSCounty(&q) // fill blank US county/grid from the offline ULS store a.applyULSCounty(&q) // fill blank US county/grid from the offline ULS store
a.applyClublogException(&q, false) // override entity for date-ranged DXpeditions a.applyClublogException(&q, false) // override entity for date-ranged DXpeditions
@@ -2986,6 +2966,27 @@ func (a *App) refineDistrictZones(q *qso.QSO) {
} }
} }
// fillDistance computes DISTANCE from the two locators when nothing supplied one.
//
// Its own function, NOT part of applyStationDefaults, because the import only
// applies those when the operator ticks the box — and a distance is not a
// station default. It is derived from the QSO's own two grids and is true
// whatever the operator chose about profile fields.
//
// Nothing recorded it before, so the field went out empty in every ADIF export
// and left the same gap in whoever imported the file: a hole that travels. An
// imported value always wins, having come from the log that made the contact,
// which knew the real positions rather than two four-character squares.
func fillDistance(q *qso.QSO) {
if q == nil || (q.Distance != nil && *q.Distance > 0) {
return
}
if km, ok := geo.DistanceBetweenGrids(q.MyGrid, q.Grid); ok && km > 0 {
v := math.Round(km)
q.Distance = &v
}
}
// applyStationDefaults fills any empty MY_* / station field on q with the // applyStationDefaults fills any empty MY_* / station field on q with the
// currently-active profile's values. Multi-profile support means a user // currently-active profile's values. Multi-profile support means a user
// can be /P with a different callsign + grid + SOTA ref than home — the // can be /P with a different callsign + grid + SOTA ref than home — the
@@ -6161,6 +6162,12 @@ var bulkFieldColumns = map[string]string{
"iota": "iota", "iota": "iota",
"sig": "sig", "sig": "sig",
"sig_info": "sig_info", "sig_info": "sig_info",
// The contact itself — repair fields. Setting mode also clears submode, in
// qso.BulkSetField: a submode left over from the old mode contradicts the new.
"mode": "mode",
"submode": "submode",
"rst_sent": "rst_sent",
"rst_rcvd": "rst_rcvd",
// Misc text // Misc text
"comment": "comment", "comment": "comment",
"notes": "notes", "notes": "notes",
@@ -6477,6 +6484,8 @@ func (a *App) ImportADIF(path string, dupMode string, applyCty bool, applyStatio
a.applyClublogException(q, true) // force: explicit import-time correction a.applyClublogException(q, true) // force: explicit import-time correction
} }
} }
// Unconditional: see fillDistance.
fillDistance(q)
if applyStation { if applyStation {
// Backfill empty MY_* descriptive fields from the active profile // Backfill empty MY_* descriptive fields from the active profile
// (identity fields left alone to keep mixed-call routing intact). // (identity fields left alone to keep mixed-call routing intact).
@@ -10360,6 +10369,97 @@ func (a *App) DownloadULSCounties() error {
} }
// BackfillUSCountiesResult summarises a bulk county/grid backfill over the log. // BackfillUSCountiesResult summarises a bulk county/grid backfill over the log.
// keyDistanceBackfilled marks the one-time distance fill as done.
//
// A migration, not a setting. It was briefly a button in Preferences, which was
// the wrong shape twice over: a maintenance chore does not belong beside the
// options an operator actually chooses, and nobody should have to be TOLD their
// log is missing a field before it gets filled in. It runs once, in the
// background, and never asks.
const keyDistanceBackfilled = "migr.distance_from_grids.v1"
// backfillDistancesOnce fills DISTANCE across the log the first time this
// version runs, then records that it is done.
//
// In the background: on a large log over a remote MySQL this is thousands of
// row updates, and startup must not wait for a tidy-up. Marked done only on
// success — a run cut short by a closed program should try again next time
// rather than leave half the log filled for ever.
func (a *App) backfillDistancesOnce() {
if a.settings == nil || a.qso == nil {
return
}
if v, _ := a.settings.GetGlobal(a.ctx, keyDistanceBackfilled); v == "1" {
return
}
go func() {
res, err := a.BackfillDistances()
if err != nil {
applog.Printf("distance backfill: %v — will try again next start", err)
return
}
_ = a.settings.SetGlobal(a.ctx, keyDistanceBackfilled, "1")
applog.Printf("distance backfill: done once for this log (%d filled)", res.Filled)
}()
}
// BackfillDistancesResult reports what a distance backfill did.
type BackfillDistancesResult struct {
Scanned int `json:"scanned"` // QSOs examined
Filled int `json:"filled"` // QSOs that gained a distance
NoGrid int `json:"no_grid"` // skipped: one of the two locators is missing
}
// BackfillDistances computes DISTANCE for past QSOs that have both locators and
// no distance recorded.
//
// Nothing has ever computed it when logging — the column is only filled by an
// ADIF import that carried one — so a log made in OpsLog has it empty
// throughout. The published web page works around that by deriving the distance
// as it renders, but the column still travels empty into every ADIF export, and
// that is what leaves the gap in someone else's log.
//
// Only fills what is EMPTY. A stored distance came from the log that recorded
// the contact, which knew the real positions; two four-character squares are a
// worse answer and must not overwrite a better one.
func (a *App) BackfillDistances() (BackfillDistancesResult, error) {
var res BackfillDistancesResult
if a.qso == nil {
return res, fmt.Errorf("db not initialized")
}
rows, err := a.qso.List(a.ctx, qso.ListFilter{Limit: 1_000_000})
if err != nil {
return res, err
}
for i := range rows {
q := rows[i]
res.Scanned++
if q.Distance != nil && *q.Distance > 0 {
continue
}
km, ok := geo.DistanceBetweenGrids(q.MyGrid, q.Grid)
if !ok || km <= 0 {
res.NoGrid++
continue
}
// Whole kilometres: the squares are tens of kilometres across and a
// decimal would assert an accuracy the grids do not carry.
v := math.Round(km)
q.Distance = &v
if err := a.qso.Update(a.ctx, q); err != nil {
applog.Printf("backfill distance: QSO %d: %v", q.ID, err)
continue
}
res.Filled++
}
applog.Printf("backfill distance: %d scanned, %d filled, %d without both grids",
res.Scanned, res.Filled, res.NoGrid)
if res.Filled > 0 {
a.invalidateAwardStats()
}
return res, nil
}
type BackfillUSCountiesResult struct { type BackfillUSCountiesResult struct {
Scanned int `json:"scanned"` // US QSOs examined Scanned int `json:"scanned"` // US QSOs examined
County int `json:"county"` // QSOs that gained a county County int `json:"county"` // QSOs that gained a county
@@ -14714,12 +14814,10 @@ func (a *App) startUltrabeam() {
} }
a.motorAnt = c a.motorAnt = c
_ = a.motorAnt.Start() _ = a.motorAnt.Start()
if s.Follow { // One place starts the follow loop, whether the antenna just connected or the
stop := make(chan struct{}) // operator flipped tracking from the Station Control widget. Two copies of
a.ubFollowStop = stop // this drifting apart is how a step change quietly stops taking effect.
applog.Printf("ultrabeam: follow loop starting — covered bands %v, step %d kHz", s.Bands, s.StepKHz) a.restartMotorFollow(s)
go a.ultrabeamFollowLoop(a.motorAnt, s.StepKHz, s.Bands, stop)
}
if s.TXInhibit { if s.TXInhibit {
stop := make(chan struct{}) stop := make(chan struct{})
a.motorInhibStop = stop a.motorInhibStop = stop
@@ -14978,6 +15076,14 @@ type UltrabeamStatusInfo struct {
Band int `json:"band"` Band int `json:"band"`
Moving bool `json:"moving"` Moving bool `json:"moving"`
Elements []int `json:"elements"` // per-element lengths (mm); empty when unsupported Elements []int `json:"elements"` // per-element lengths (mm); empty when unsupported
// Follow and StepKHz are mirrored here so the Station Control widget can show
// and change tracking without loading the whole settings block for a poll.
Follow bool `json:"follow"`
StepKHz int `json:"step_khz"`
// Bands the antenna is configured to cover — the widget offers exactly these
// as buttons rather than inventing its own list, so a band dropped in Settings
// cannot be clicked here.
Bands []string `json:"bands"`
} }
// GetUltrabeamStatus returns the antenna's current state for the UI poll. // GetUltrabeamStatus returns the antenna's current state for the UI poll.
@@ -14986,6 +15092,9 @@ func (a *App) GetUltrabeamStatus() UltrabeamStatusInfo {
s, _ := a.GetUltrabeamSettings() s, _ := a.GetUltrabeamSettings()
out.Enabled = s.Enabled out.Enabled = s.Enabled
out.Type = s.Type out.Type = s.Type
out.Follow = s.Follow
out.StepKHz = s.StepKHz
out.Bands = append(out.Bands, s.Bands...)
if a.motorAnt == nil { if a.motorAnt == nil {
return out return out
} }
@@ -15043,6 +15152,107 @@ func (a *App) SetUltrabeamDirection(direction int) error {
return a.motorAnt.SetDirection(direction) return a.motorAnt.SetDirection(direction)
} }
// MotorTuneKHz points the antenna at a frequency, in kHz.
//
// The direction is carried over from the antenna's current state rather than
// reset: both controllers set frequency and pattern in the same command, so
// sending a bare frequency would silently drop a 180° or bidirectional pattern
// the operator had chosen — a beam quietly turning round is not an acceptable
// side effect of clicking a band.
func (a *App) MotorTuneKHz(khz int) error {
if a.motorAnt == nil {
return fmt.Errorf("antenna not connected — enable it in Settings → Antenna")
}
// A generous envelope rather than a band table: the antennas differ, some
// carry extensions, and refusing a frequency the hardware would have accepted
// is worse than letting the controller say no itself.
if khz < 1000 || khz > 60000 {
return fmt.Errorf("frequency %d kHz is outside anything these antennas tune", khz)
}
a.noteMotorMoveCommanded()
return a.motorAnt.SetFrequency(khz, a.motorAnt.Status().Direction)
}
// MotorNudgeKHz moves the antenna's commanded frequency by a step, up or down.
//
// Works from the ANTENNA's frequency, not the rig's: this exists so an operator
// can walk the antenna across a band while the rig stays where it is, and
// starting from the rig would undo that on the first press. Falls back to the
// rig only when the antenna has not reported a frequency yet.
func (a *App) MotorNudgeKHz(deltaKHz int) error {
if a.motorAnt == nil {
return fmt.Errorf("antenna not connected — enable it in Settings → Antenna")
}
cur := a.motorAnt.Status().Frequency
if cur <= 0 && a.cat != nil {
if rs := a.cat.State(); rs.Connected && rs.FreqHz > 0 {
cur = int(rs.FreqHz / 1000)
}
}
if cur <= 0 {
return fmt.Errorf("the antenna has not reported a frequency yet")
}
return a.MotorTuneKHz(cur + deltaKHz)
}
// SetMotorFollow turns frequency tracking on or off and sets its step, without
// opening Settings. Both are ordinary operating decisions — an operator turns
// tracking off to park the antenna and back on to resume — and a preferences
// dialog is the wrong place for something changed that often.
func (a *App) SetMotorFollow(on bool, stepKHz int) error {
s, err := a.GetUltrabeamSettings()
if err != nil {
return err
}
switch stepKHz {
case 25, 50, 100:
s.StepKHz = stepKHz
case 0: // leave the step alone
default:
return fmt.Errorf("step must be 25, 50 or 100 kHz")
}
s.Follow = on
// Persist WITHOUT the restart. SaveUltrabeamSettings tears the client down and
// dials again, which is right when the transport changed and absurd here: the
// operator toggling tracking watched the antenna drop off and reconnect, and
// on a remote controller that is several seconds of a link that was working.
//
// The follow loop is a goroutine with its own stop channel, so it can be
// replaced on its own — the connection underneath never knows.
// Only the two keys this call actually changes. Writing the whole block would
// mean re-normalising host, port, baud and bands to change a checkbox, and
// every one of those is a chance to alter something nobody asked to alter.
if a.settings == nil {
return fmt.Errorf("db not initialized")
}
if err := a.settings.Set(a.ctx, keyUltrabeamFollow, boolStr(s.Follow)); err != nil {
return err
}
if err := a.settings.Set(a.ctx, keyUltrabeamStep, strconv.Itoa(s.StepKHz)); err != nil {
return err
}
a.restartMotorFollow(s)
return nil
}
// restartMotorFollow swaps the follow loop for one matching the settings, leaving
// the antenna connection alone.
func (a *App) restartMotorFollow(s UltrabeamSettings) {
if a.ubFollowStop != nil {
close(a.ubFollowStop)
a.ubFollowStop = nil
}
if !s.Follow || a.motorAnt == nil {
applog.Printf("ultrabeam: follow loop stopped")
return
}
stop := make(chan struct{})
a.ubFollowStop = stop
applog.Printf("ultrabeam: follow loop restarting — covered bands %v, step %d kHz", s.Bands, s.StepKHz)
go a.ultrabeamFollowLoop(a.motorAnt, s.StepKHz, s.Bands, stop)
}
// UltrabeamRetract retracts all elements (storage / safe position). // UltrabeamRetract retracts all elements (storage / safe position).
func (a *App) UltrabeamRetract() error { func (a *App) UltrabeamRetract() error {
if a.motorAnt == nil { if a.motorAnt == nil {
@@ -16812,6 +17022,14 @@ func (r catShareRig) SetFreq(hz int64) error { return r.a.cat.SetFrequency(hz) }
func (r catShareRig) SetMode(m string) error { return r.a.cat.SetMode(m) } func (r catShareRig) SetMode(m string) error { return r.a.cat.SetMode(m) }
func (r catShareRig) SetPTT(on bool) error { return r.a.cat.SetPTT(on) } func (r catShareRig) SetPTT(on bool) error { return r.a.cat.SetPTT(on) }
// SetSplit passes the client's split request through to the radio, and passes
// the refusal back when the backend cannot do it. That refusal is the feature:
// WSJT-X can tell the operator to use "Fake It" instead, where before it was
// told everything had worked and transmitted on the receive frequency.
func (r catShareRig) SetSplit(on bool, txHz int64) error {
return r.a.cat.SetSplit(on, txHz)
}
// reloadCATShare starts, stops or restarts the sharing server to match the // reloadCATShare starts, stops or restarts the sharing server to match the
// settings. Called from reloadCAT so one "Save & Close" settles both. // settings. Called from reloadCAT so one "Save & Close" settles both.
func (a *App) reloadCATShare(s CATSettings) { func (a *App) reloadCATShare(s CATSettings) {
+2
View File
@@ -16,6 +16,8 @@ var deniedCallHashes = map[string]struct{}{
"2282a88b3e5e4eebc6b8174d005bb46d32025758b7741bdcf34f2b3621c02205": {}, "2282a88b3e5e4eebc6b8174d005bb46d32025758b7741bdcf34f2b3621c02205": {},
"0ee09fe60817a2a4982f5e5b14a60b8dbb11cff55b3d36661213c4cbdd0933ea": {}, "0ee09fe60817a2a4982f5e5b14a60b8dbb11cff55b3d36661213c4cbdd0933ea": {},
"46fb61e71afb40627cb6493a6a59c9d4d0231ee3cad1a2bf3fcc4cdfce36fabc": {}, "46fb61e71afb40627cb6493a6a59c9d4d0231ee3cad1a2bf3fcc4cdfce36fabc": {},
"d1ae6212ec057f9d5c6f379fb57acedac7c94142c9d49667dc04b2016d03d1b6": {},
"0741c9e394b42f43191899105553b47155ddc3026da12b5360701f9c181ff123": {},
} }
// callDenied reports whether a callsign is on deniedCallHashes. The call is // callDenied reports whether a callsign is on deniedCallHashes. The call is
+219
View File
@@ -0,0 +1,219 @@
package main
// The data sources band-opening detection depends on, and the settings that
// switch them on.
//
// The detection shipped reading whatever the operator's cluster nodes happened
// to carry. That was a design mistake of the worst kind: the feature depended
// on RBN feeds and a PSK Reporter subscription that nobody could know were
// needed, so it looked broken rather than unconfigured. Nexus showed a 6 m
// opening with 869 stations while OpsLog, on the same PC, showed nothing.
//
// So enabling the watch ARRANGES ITS OWN SOURCES: it adds the two RBN nodes if
// they are missing and brings the PSK Reporter feed up. Turning it off leaves
// the nodes alone — they may have been wanted for their own sake, and silently
// removing a cluster node an operator is using would be worse than leaving one
// they no longer need.
import (
"strings"
"hamlog/internal/applog"
"hamlog/internal/bandopen"
"hamlog/internal/cluster"
"hamlog/internal/pskr"
)
const (
keyBandOpenEnabled = "bandopen.enabled"
keyBandOpenBands = "bandopen.bands" // comma-separated; empty = the default set
)
// rbnNodes are the two Reverse Beacon Network endpoints the watch wants: CW and
// digital are separate ports and carry different skimmers.
var rbnNodes = []cluster.ServerConfig{
{Name: "RBN CW", Host: "telnet.reversebeacon.net", Port: 7000, Enabled: true},
{Name: "RBN FTx", Host: "telnet.reversebeacon.net", Port: 7001, Enabled: true},
}
// BandOpenSettings is the panel's shape.
type BandOpenSettings struct {
Enabled bool `json:"enabled"`
Bands []string `json:"bands"`
// Available is every band that can be watched, so the UI does not carry its
// own copy of a list that belongs to the detector.
Available []string `json:"available"`
}
func (a *App) GetBandOpenSettings() BandOpenSettings {
s := BandOpenSettings{
Enabled: a.settingOr(keyBandOpenEnabled, "") == "1",
Bands: splitCSV(a.settingOr(keyBandOpenBands, "")),
Available: pskr.Bands,
}
// Keep only bands that are still offered. A saved selection outlives the code
// that made it: 12 m was dropped from the watched set, but every operator who
// had already enabled the watch kept subscribing to it — paying for a firehose
// whose messages the detector then threw away.
s.Bands = keepKnownBands(s.Bands)
if len(s.Bands) == 0 {
s.Bands = append(s.Bands, pskr.Bands...)
}
return s
}
func keepKnownBands(want []string) []string {
ok := make(map[string]bool, len(pskr.Bands))
for _, b := range pskr.Bands {
ok[b] = true
}
out := make([]string, 0, len(want))
for _, b := range want {
if ok[strings.ToLower(strings.TrimSpace(b))] {
out = append(out, b)
}
}
return out
}
func (a *App) SaveBandOpenSettings(s BandOpenSettings) error {
a.setSetting(keyBandOpenEnabled, map[bool]string{true: "1", false: "0"}[s.Enabled])
a.setSetting(keyBandOpenBands, strings.Join(s.Bands, ","))
if s.Enabled {
a.ensureRBNNodes()
}
a.startBandOpenFeed()
return nil
}
// ensureRBNNodes adds the RBN endpoints when they are absent.
//
// Matched on host AND port rather than on name: an operator who renamed theirs
// "Skimmers CW" has the node, and adding a second one pointed at the same
// server would give them every spot twice — which the detector would read as
// twice as many stations, i.e. an opening that is not there.
func (a *App) ensureRBNNodes() {
have, err := a.ListClusterServers()
if err != nil {
applog.Printf("bandopen: cannot read the cluster nodes (%v) — not adding RBN", err)
return
}
for _, want := range rbnNodes {
found := false
for _, h := range have {
if strings.EqualFold(strings.TrimSpace(h.Host), want.Host) && h.Port == want.Port {
found = true
break
}
}
if found {
continue
}
if _, err := a.SaveClusterServer(want); err != nil {
applog.Printf("bandopen: could not add %s: %v", want.Name, err)
continue
}
applog.Printf("bandopen: added cluster node %s (%s:%d) — the watch needs it",
want.Name, want.Host, want.Port)
}
}
// startBandOpenFeed brings the PSK Reporter subscription up or down to match
// the setting. Called at startup and whenever the setting is saved.
func (a *App) startBandOpenFeed() {
if a.pskr != nil {
a.pskr.Stop()
a.pskr = nil
}
s := a.GetBandOpenSettings()
if !s.Enabled {
return
}
// Every spot is measured from the operator's position. Without one there is
// nothing to measure, and a detector fed unmeasurable spots reports nothing
// while looking like it is working.
if !a.opSet {
applog.Printf("bandopen: no station grid set — the opening watch needs one to measure a path")
return
}
a.pskr = pskr.New(pskr.Config{
Bands: s.Bands,
OpLat: a.opLat, OpLon: a.opLon,
Geo: func(grid string) (int, int, bool) {
lat, lon, ok := gridToLatLon(grid)
if !ok {
return 0, 0, false
}
// The same arithmetic the cluster path uses, so one spot cannot be
// 2000 km away down one road and 2100 km down the other.
d := int(haversineKm(a.opLat, a.opLon, lat, lon) + 0.5)
b := int(initialBearingDeg(a.opLat, a.opLon, lat, lon) + 0.5)
return d, b, true
},
OnSpot: a.feedBandOpen,
Logf: applog.Printf,
})
if err := a.pskr.Start(); err != nil {
applog.Printf("bandopen: PSK Reporter feed did not start: %v", err)
}
}
// feedBandOpen hands one PSK Reporter decode to the detector.
//
// Called from the MQTT goroutine at up to thousands a minute when 6 m is open,
// so it does the least possible: the detector's own window and de-duplication
// by callsign are what turn that flood into one announcement.
func (a *App) feedBandOpen(s pskr.Spot) {
if !bandopen.Watched(s.Band) {
return
}
a.bandOpen.mu.Lock()
if a.bandOpen.det == nil {
a.bandOpen.det = bandopen.New(bandopen.DefaultConfig())
}
op := a.bandOpen.det.Add(bandopen.Spot{
Call: s.Call, Band: s.Band, DistKm: s.DistKm, Bearing: s.Bearing, At: s.At,
}, a.opLat)
if op != nil {
a.rememberOpening(*op)
}
if s.DistKm >= bandopen.DefaultConfig().MinKm {
a.markBandAlive(s.Band, s.At)
}
a.bandOpen.mu.Unlock()
if op != nil {
a.announceOpening(*op)
}
}
// GetPSKReporterStatus is what the settings panel polls.
func (a *App) GetPSKReporterStatus() pskr.Status {
if a.pskr == nil {
return pskr.Status{Bands: pskr.Bands}
}
return a.pskr.Status()
}
// settingOr reads one key, falling back when the store is not up yet or the
// value is blank. The settings store is a plain string key/value and every
// caller does this by hand; two of them here earn the helper.
func (a *App) settingOr(key, def string) string {
if a.settings == nil {
return def
}
v, _ := a.settings.Get(a.ctx, key)
if strings.TrimSpace(v) == "" {
return def
}
return v
}
func splitCSV(s string) []string {
var out []string
for _, p := range strings.Split(s, ",") {
if p = strings.TrimSpace(p); p != "" {
out = append(out, p)
}
}
return out
}
+77 -4
View File
@@ -11,6 +11,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"sync" "sync"
"time"
"hamlog/internal/applog" "hamlog/internal/applog"
"hamlog/internal/bandopen" "hamlog/internal/bandopen"
@@ -23,8 +24,23 @@ type bandOpenState struct {
mu sync.Mutex mu sync.Mutex
det *bandopen.Detector det *bandopen.Detector
last []bandopen.Opening // most recent first, for the UI last []bandopen.Opening // most recent first, for the UI
// live holds the announced openings that are still going, keyed by band, and
// aliveUntil says when each stops counting as current.
//
// The detector announces an opening ONCE and then goes quiet for 45 minutes,
// which is right for a message but useless for a badge that has to stay lit
// while the band is open and go out when it closes. Nothing tells us an
// opening ended, so it is inferred: every qualifying spot on that band pushes
// the deadline out, and when they stop arriving the badge fades by itself.
live map[string]bandopen.Opening
aliveUntil map[string]time.Time
} }
// openingIdle is how long a band may go without a qualifying spot before its
// badge goes out. Longer than the detector's own 12-minute window, so a quiet
// couple of minutes mid-opening does not blink the badge off and on again.
const openingIdle = 15 * time.Minute
const maxRememberedOpenings = 20 const maxRememberedOpenings = 20
// detectBandOpening feeds one spot to the detector and announces a hit. // detectBandOpening feeds one spot to the detector and announces a hit.
@@ -43,16 +59,73 @@ func (a *App) detectBandOpening(s cluster.Spot) {
Bearing: s.ShortPath, At: s.ReceivedAt, Bearing: s.ShortPath, At: s.ReceivedAt,
}, a.opLat) }, a.opLat)
if op != nil { if op != nil {
a.bandOpen.last = append([]bandopen.Opening{*op}, a.bandOpen.last...) a.rememberOpening(*op)
}
// Keeps a lit badge lit. Gated on the same floor the detector uses, or a
// band busy with short-range tropo would hold an Es badge on for ever.
if s.DistanceKm >= bandopen.DefaultConfig().MinKm {
a.markBandAlive(s.Band, s.ReceivedAt)
}
a.bandOpen.mu.Unlock()
if op != nil {
a.announceOpening(*op)
}
}
// markBandAlive pushes a band's badge deadline out. Called for every spot the
// detector accepted, from either feed. Cheap on purpose: this runs on the MQTT
// goroutine at thousands a minute when 6 m is open.
//
// Caller holds bandOpen.mu.
func (a *App) markBandAlive(band string, at time.Time) {
if _, lit := a.bandOpen.live[strings.ToLower(band)]; !lit {
return // nothing announced for this band, nothing to keep alive
}
if a.bandOpen.aliveUntil == nil {
a.bandOpen.aliveUntil = map[string]time.Time{}
}
a.bandOpen.aliveUntil[strings.ToLower(band)] = at.Add(openingIdle)
}
// rememberOpening files a detection and lights its badge. Caller holds the mutex.
func (a *App) rememberOpening(op bandopen.Opening) {
a.bandOpen.last = append([]bandopen.Opening{op}, a.bandOpen.last...)
if len(a.bandOpen.last) > maxRememberedOpenings { if len(a.bandOpen.last) > maxRememberedOpenings {
a.bandOpen.last = a.bandOpen.last[:maxRememberedOpenings] a.bandOpen.last = a.bandOpen.last[:maxRememberedOpenings]
} }
if a.bandOpen.live == nil {
a.bandOpen.live = map[string]bandopen.Opening{}
a.bandOpen.aliveUntil = map[string]time.Time{}
} }
a.bandOpen.mu.Unlock() b := strings.ToLower(op.Band)
if op == nil { a.bandOpen.live[b] = op
return a.bandOpen.aliveUntil[b] = op.At.Add(openingIdle)
} }
// GetLiveOpenings returns the openings still under way, for the status-bar
// badge. Expired ones are dropped as they are noticed — there is no janitor for
// something that holds at most five entries.
func (a *App) GetLiveOpenings() []bandopen.Opening {
now := time.Now()
a.bandOpen.mu.Lock()
defer a.bandOpen.mu.Unlock()
out := make([]bandopen.Opening, 0, len(a.bandOpen.live))
for b, op := range a.bandOpen.live {
if until, ok := a.bandOpen.aliveUntil[b]; !ok || now.After(until) {
delete(a.bandOpen.live, b)
delete(a.bandOpen.aliveUntil, b)
applog.Printf("bandopen: %s opening has gone quiet", strings.ToUpper(b))
continue
}
out = append(out, op)
}
return out
}
// announceOpening logs and pushes one detection. Shared by both feeds — the
// cluster path here and the PSK Reporter path in bandopen_sources.go — so an
// opening reads the same however it was noticed.
func (a *App) announceOpening(op bandopen.Opening) {
applog.Printf("bandopen: %s opening — %d stations, ~%d km, %s%s (%s)", applog.Printf("bandopen: %s opening — %d stations, ~%d km, %s%s (%s)",
op.Band, op.Calls, op.MedianKm, op.Sector(), op.Band, op.Calls, op.MedianKm, op.Sector(),
map[bool]string{true: "", false: " — UNUSUAL for the season"}[op.InSeason], map[bool]string{true: "", false: " — UNUSUAL for the season"}[op.InSeason],
+35
View File
@@ -0,0 +1,35 @@
package main
import (
"testing"
"hamlog/internal/qso"
)
// A bulk-editable field passes through THREE tables: the field list in the UI,
// bulkFieldColumns here, and bulkEditableCols in internal/qso. Mode and RST were
// added to the first and the third and not the second, so the dialog offered
// them and the save failed with "unknown field" — reported from the field.
//
// Nothing warns about that: each table is valid on its own. This is the check.
func TestEveryMappedBulkFieldIsWhitelisted(t *testing.T) {
for id, col := range bulkFieldColumns {
if !qso.BulkEditable(col) {
t.Errorf("bulk field %q maps to column %q, which internal/qso refuses to write", id, col)
}
}
}
// And the reverse: a column the qso layer allows but nothing maps to is dead
// weight — it looks supported from the inside and cannot be reached from outside.
func TestNoUnreachableBulkColumn(t *testing.T) {
mapped := map[string]bool{}
for _, col := range bulkFieldColumns {
mapped[col] = true
}
for _, col := range qso.BulkEditableColumns() {
if !mapped[col] {
t.Errorf("column %q is bulk-writable but no field maps to it — unreachable", col)
}
}
}
+46
View File
@@ -1,4 +1,50 @@
[ [
{
"version": "0.24.6",
"date": "",
"en": [
"Bulk edit can now set mode, submode and RST. They were excluded as per-QSO fields, which missed the point: bulk edit is for repairing a batch — an import that mapped every contact to SSB, an ADIF with no mode at all — and refusing meant editing a hundred rows one at a time. Setting the mode clears the submode, since one left over from the old mode contradicts the new one. Band stays with frequency, which already sets the two together.",
"Web publishing: the page now widens to fit the table. It was capped at a comfortable reading width, so with more than about eight columns the rest sat behind a scrollbar on a screen wide enough to show them all — and Windows hides that scrollbar until something moves, which made a table that scrolls look like a table missing columns. Columns also take the width their contents need instead of being squeezed to fit first.",
"Every QSO now carries its distance. Nothing ever recorded one, so the field went out empty in every ADIF export and left the Distance column blank on a published page. It is computed from the two locators when a contact is logged and when an ADIF is imported, and a one-time pass fills in the QSOs already in your log the first time this version runs — in the background, without asking. A distance the imported file supplied is always kept.",
"RDA: 1015 districts were filed under the wrong DXCC entity. Every reference sat on European Russia; 991 belong to Asiatic Russia and the 24 KA- districts to Kaliningrad, which is a separate entity altogether. Corrected against the reference list, and Kaliningrad added to the award filter so those 24 can be claimed at all.",
"QSO filter: asking a field to equal nothing now finds the empty ones. SQL answers that question with nothing at all — a missing value never equals an empty one — so the filter looked broken rather than wrong. Empty on a numeric field also covers zero as well as missing, which SQLite and MySQL disagreed about.",
"Callsign lookup: a /QRP call now returns its locator. The lookup falls back to the home callsign when the slashed form is not registered, and then cleared the location — right for /P and /M, where the operator is somewhere other than their registered address, and wrong for /QRP, which says something about power and nothing about place. The grid came back empty while the same call without the suffix answered perfectly."
],
"fr": [
"L édition groupée sait enfin régler le mode, le sous-mode et le RST. Ils étaient exclus comme champs propres à chaque QSO, ce qui manquait l essentiel : l édition groupée sert à RÉPARER un lot — un import qui a tout mis en SSB, un ADIF sans aucun mode — et refuser obligeait à corriger cent lignes une par une. Régler le mode efface le sous-mode, celui de l ancien mode contredisant le nouveau. La bande reste avec la fréquence, qui pose déjà les deux ensemble.",
"Publication web : la page s élargit désormais à la taille du tableau. Elle était bridée à une largeur de lecture confortable, donc au-delà de huit colonnes environ le reste passait derrière une barre de défilement sur un écran assez large pour tout montrer — et Windows masque cette barre tant que rien ne bouge, si bien qu un tableau qui défile ressemblait à un tableau amputé. Les colonnes prennent aussi la largeur qu il leur faut au lieu d être comprimées d abord.",
"Chaque QSO porte désormais sa distance. Rien ne l enregistrait, elle partait donc vide dans chaque export ADIF et laissait la colonne Distance blanche sur une page publiée. Elle est calculée depuis les deux locators à l enregistrement d un contact et à l import d un ADIF, et une passe unique complète les QSO déjà présents au premier lancement de cette version — en tâche de fond, sans rien demander. Une distance fournie par le fichier importé est toujours conservée.",
"RDA : 1015 districts étaient rangés sous la mauvaise entité DXCC. Toutes les références étaient sur la Russie européenne ; 991 relèvent de la Russie asiatique et les 24 districts KA- de Kaliningrad, qui est une entité à part entière. Corrigé d après la liste de référence, et Kaliningrad ajouté au filtre de l award pour que ces 24 puissent être revendiqués.",
"Filtre QSO : demander à un champ d être égal à rien trouve désormais les vides. SQL répond à cette question par rien du tout — une valeur absente n est jamais égale à une valeur vide — et le filtre paraissait cassé plutôt que mal posé. Vide sur un champ numérique couvre aussi le zéro autant que l absence, ce sur quoi SQLite et MySQL n étaient pas d accord.",
"Recherche d indicatif : un indicatif en /QRP rend enfin son locator. La recherche se rabat sur l indicatif de base quand la forme avec barre n est pas enregistrée, puis effaçait la localisation — ce qui est juste pour /P et /M, où l opérateur n est pas à son adresse déclarée, et faux pour /QRP, qui parle de puissance et pas de lieu. Le locator revenait vide alors que le même indicatif sans le suffixe répondait parfaitement."
]
},
{
"version": "0.24.5",
"date": "",
"en": [
"Digital decodes: a station's grid square could be logged as its callsign when the message text was unusual. A grid in the callsign position is now refused.",
"CW over CAT now works on a Kenwood. The KY command was sent in Elecraft's variable-length form; a Kenwood needs exactly 24 characters, so every message was refused.",
"Shared CAT is steadier and now diagnoses itself. It survives a rig answering \"busy\" just after transmit instead of dropping the link, stops repeating a PTT state the client never changed, and logs a plain explanation when another program has taken its port or when a client is set to a rig model instead of Hamlib NET rigctl. It also answers the lock-mode and stop-morse commands some clients send around every transmit, instead of refusing them.",
"Web publishing now offers every field a QSO carries, awards included — 123 instead of 23 — from a searchable dropdown, with the chosen columns listed above it in publication order. Choose carefully: the page is public and the list includes addresses and e-mail.",
"Band-opening detection now works on the bands it was meant for. Switching on \"Watch for band openings\" (Settings DX Cluster) subscribes to the PSK Reporter feed and adds the two RBN nodes it needs — it was reading a handful of VHF cluster spots while thousands of stations were reporting. It watches 10, 6, 4 and 2 m, counts only reports collected within 300 km of you so an opening means an opening HERE, no longer throws away paths beyond 2400 km, and looks for the busiest direction instead of demanding that every station heard sit in one sector. An opening under way shows as a blinking badge beside the clock the moment it is found — band, direction and typical distance, with a mark when it is unusual for the season — and stays until the band goes quiet, and the direction it names is right — a sector crossing north used to be announced as its opposite.",
"Test connection now actually tests. Club Log checked that the three fields were not empty and reported success without contacting anyone, so a wrong password looked exactly like a right one; it now signs in for real, through the read-only endpoint so a test can never add a record. LoTW reports its two credentials separately: TQSL signs uploads and never uses the website password, so a wrong one used to break nothing until the day confirmations were downloaded.",
"The Ultrabeam / SteppIR widget in Station Control can now drive the antenna, not just describe it: a button per configured band tunes it there, up and down move it 25 kHz at a time, and tracking can be switched on or off with its 25 / 50 / 100 kHz threshold beside it. The band you are on lights up, and the commanded frequency is shown in the header.",
"The QSO filter can express a real question. Every condition was joined by one global AND or OR, so \"2 m or 70 cm, in FT8, since January\" had no form: AND killed the two bands, OR let every FT8 QSO through. Two operators — is one of / is none of — take a comma-separated list, so the OR sits inside one condition and the rest keeps ANDing.",
"Split works properly on a Kenwood. Split Operating: Rig in WSJT-X and JTDX did nothing at all through the shared CAT — OpsLog answered \"done\" to both split commands and left the radio on the receive frequency, so on a pileup you transmitted straight onto the DX while the software showed exactly what you had asked for. A radio whose backend cannot set split now refuses, so WSJT-X says so and you can switch to Fake It. And the two frequencies no longer swap the moment you key up: the rig reports the VFO in use, which is the receive one on receive and the transmit one on transmit, and that decided which frequency a split QSO was logged on."
],
"fr": [
"Décodes digitaux : le carré locator d une station pouvait être enregistré comme son indicatif quand le texte du message sortait de l ordinaire. Un grid à la place de l indicatif est maintenant refusé.",
"Le CW par CAT fonctionne sur Kenwood. La commande KY partait sous la forme Elecraft à longueur libre ; un Kenwood exige exactement 24 caractères, donc chaque message était refusé.",
"Le CAT partagé est plus solide et se diagnostique tout seul. Il survit à un rig qui répond « occupé » juste après une émission au lieu de lâcher le lien, cesse de répéter un état PTT que le client n a pas changé, et écrit une explication claire quand un autre programme lui a pris son port ou qu un client est réglé sur un modèle de rig au lieu de Hamlib NET rigctl. Il répond aussi aux commandes de verrouillage et d arrêt du morse que certains logiciels envoient à chaque émission, au lieu de les refuser.",
"La publication web propose désormais tous les champs d un QSO, awards compris — 123 au lieu de 23 — depuis une liste déroulante cherchable, les colonnes choisies étant listées au-dessus dans l ordre de publication. À choisir avec soin : la page est publique et la liste contient adresses et e-mails.",
"La détection d ouverture de bande fonctionne enfin sur les bandes visées. Activer « Surveiller les ouvertures de bande » (Paramètres Cluster DX) souscrit au flux PSK Reporter et ajoute les deux nœuds RBN nécessaires — elle lisait quelques spots VHF du cluster alors que des milliers de stations rapportaient. Elle surveille le 10, 6, 4 et 2 m, ne retient que les reports collectés à moins de 300 km de toi pour qu une ouverture veuille dire une ouverture ICI, ne jette plus les chemins au-delà de 2400 km, et cherche la direction la plus dense au lieu d exiger que toutes les stations entendues soient dans un même secteur. Une ouverture en cours s affiche en pastille clignotante à côté de l heure dès qu elle est détectée — bande, direction et distance typique, avec une marque si elle est inhabituelle pour la saison — et y reste jusqu à ce que la bande se taise, et la direction annoncée est juste — un secteur traversant le nord était auparavant annoncé à l opposé.",
"Le bouton Tester la connexion teste vraiment. Club Log vérifiait que les trois champs n étaient pas vides et annonçait la réussite sans contacter personne : un mauvais mot de passe ressemblait exactement à un bon. Il s authentifie maintenant pour de vrai, via le point d accès en lecture seule pour qu un test ne puisse jamais ajouter un enregistrement. LoTW annonce ses deux identifiants séparément : TQSL signe les envois et n utilise jamais le mot de passe du site, donc un mauvais ne cassait rien jusqu au jour du téléchargement des confirmations.",
"Le widget Ultrabeam / SteppIR de Station Control pilote enfin l antenne au lieu de seulement la décrire : un bouton par bande configurée l accorde dessus, haut et bas la déplacent par pas de 25 kHz, et le suivi s active ou se coupe avec son seuil de 25 / 50 / 100 kHz à côté. La bande courante s allume, et la fréquence commandée s affiche dans l en-tête.",
"Le filtre des QSO sait exprimer une vraie question. Toutes les conditions étaient jointes par un seul ET ou OU global, donc « 2 m ou 70 cm, en FT8, depuis janvier » n avait aucune forme : le ET tuait les deux bandes, le OU laissait passer tous les QSO FT8. Deux opérateurs — est parmi / n est pas parmi — acceptent une liste séparée par des virgules, le OU tient donc dans une seule condition et le reste continue de se combiner en ET.",
"Le split fonctionne correctement sur Kenwood. Split Operating: Rig dans WSJT-X et JTDX ne faisait rien du tout via le CAT partagé — OpsLog répondait « fait » aux deux commandes et laissait la radio sur la fréquence de réception, donc sur un pileup tu émettais en plein sur le DX pendant que le logiciel affichait exactement ce que tu avais demandé. Une radio dont le backend ne sait pas régler le split refuse désormais, WSJT-X le dit et tu peux passer en Fake It. Et les deux fréquences ne s inversent plus dès le passage en émission : le rig annonce le VFO en service, celui de réception à l écoute et celui d émission en émission, ce qui décidait sur quelle fréquence un QSO en split était enregistré."
]
},
{ {
"version": "0.24.4", "version": "0.24.4",
"date": "", "date": "",
+91 -5
View File
@@ -51,6 +51,7 @@ import {
ReportLiveActivity, LiveLastQSOAgeSec, ReportLiveActivity, LiveLastQSOAgeSec,
GetAmpStatuses, AmpOperate, GetAmpStatuses, AmpOperate,
GetFlexState, FlexAmpOperate, GetFlexState, FlexAmpOperate,
GetPSKReporterStatus, GetLiveOpenings,
} from '../wailsjs/go/main/App'; } from '../wailsjs/go/main/App';
import { Combobox } from '@/components/ui/combobox'; import { Combobox } from '@/components/ui/combobox';
import { applyAwardRefs } from '@/lib/awardRefs'; import { applyAwardRefs } from '@/lib/awardRefs';
@@ -1709,6 +1710,27 @@ export default function App() {
const [showSettings, setShowSettings] = useState(false); const [showSettings, setShowSettings] = useState(false);
// Re-read the "beam on map" toggle when Preferences closes (it's edited there). // Re-read the "beam on map" toggle when Preferences closes (it's edited there).
useEffect(() => { if (!showSettings) setShowBeamOnMap(localStorage.getItem('opslog.showBeamOnMap') !== '0'); }, [showSettings]); useEffect(() => { if (!showSettings) setShowBeamOnMap(localStorage.getItem('opslog.showBeamOnMap') !== '0'); }, [showSettings]);
// Openings under way, for the blinking status-bar badge. Polled rather than
// event-driven: the badge also has to go OUT when a band goes quiet, and
// nothing emits an event for something that stopped happening.
const [liveOpenings, setLiveOpenings] = useState<any[]>([]);
useEffect(() => {
const load = () => { GetLiveOpenings().then((v: any) => setLiveOpenings(v ?? [])).catch(() => {}); };
load();
const t = window.setInterval(load, 20000);
return () => window.clearInterval(t);
}, []);
// PSK Reporter feed, for the status-bar chip. Polled slowly: the chip only
// says up or down, and the count behind it is a tooltip.
const [pskr, setPskr] = useState<any>(null);
useEffect(() => {
const load = () => { GetPSKReporterStatus().then(setPskr).catch(() => {}); };
load();
const t = window.setInterval(load, 10000);
return () => window.clearInterval(t);
}, []);
// "ON AIR" status-bar badge: mirrors the multi-op live status this operator // "ON AIR" status-bar badge: mirrors the multi-op live status this operator
// publishes — online (blinking) when a QSO was logged in the last 5 min, else // publishes — online (blinking) when a QSO was logged in the last 5 min, else
// offline. Publishing is always on for a shared MySQL logbook (no user toggle: // offline. Publishing is always on for a shared MySQL logbook (no user toggle:
@@ -2104,13 +2126,18 @@ export default function App() {
useEffect(() => { useEffect(() => {
const off = EventsOn('bandopen:detected', (o: any) => { const off = EventsOn('bandopen:detected', (o: any) => {
if (!o?.band) return; if (!o?.band) return;
const season = o.in_season ? '' : `${t('bmp.openUnusual')}`; // The badge appears on the EVENT, not on the next poll. It used to wait for
showToast(`📡 ${t('bmp.openToast', { // one, so the announcement and the badge were up to twenty seconds apart and
band: String(o.band).toUpperCase(), n: o.calls, km: o.median_km, // read as two unrelated things happening to mention the same band.
})}${season}`); //
// No toast any more: the badge says the same thing and does not vanish after
// five seconds. An operator who was tuning when the toast passed had no way
// back to it, which is exactly what the badge was built to fix — keeping
// both meant announcing an opening twice and still losing it once.
setLiveOpenings((cur) => [...cur.filter((x: any) => x.band !== o.band), o]);
}); });
return () => { off(); }; return () => { off(); };
}, [showToast, t]); }, []);
// DX-cluster spot alerts: a matched rule fires here. Play a beep (WebAudio, no // DX-cluster spot alerts: a matched rule fires here. Play a beep (WebAudio, no
// asset needed — CSP-safe) and/or show a toast, per the rule's chosen actions. // asset needed — CSP-safe) and/or show a toast, per the rule's chosen actions.
@@ -6854,6 +6881,26 @@ export default function App() {
</button> </button>
); );
})} })}
{/* PSK Reporter, next to the hardware chips because it is the same
kind of fact: a link that is either up or it is not. Shown ONLY
when the opening watch is on a permanently grey chip for a
feature nobody enabled is clutter, and the bar is 28 px.
The decode count is in the tooltip rather than the chip: it moves
several times a second on an open band, and a number flickering in
the corner of the eye is not information, it is a distraction. */}
{pskr?.running && (
<button
type="button"
title={t('pskr.tip', { n: pskr.received ?? 0, bands: (pskr.bands ?? []).join(' ') })}
onClick={() => { setSettingsSection('cluster'); setShowSettings(true); }}
className="inline-flex items-center gap-1.5 px-2 h-5 rounded border text-[11px] transition-colors border-border hover:bg-muted cursor-pointer shrink-0"
>
<span className={cn('size-2 rounded-full',
(pskr.received ?? 0) > 0 ? 'bg-success' : 'bg-warning')} />
MQTT
</button>
)}
{/* ON AIR badge: "did I log a QSO in the last 5 min" meaningful on ANY {/* ON AIR badge: "did I log a QSO in the last 5 min" meaningful on ANY
logbook backend (only the live_status PUBLISHING is MySQL-specific), logbook backend (only the live_status PUBLISHING is MySQL-specific),
so it is always shown. Gating it on MySQL made it vanish for so it is always shown. Gating it on MySQL made it vanish for
@@ -6911,6 +6958,45 @@ export default function App() {
{/* UTC clock moved out of the header, where it competed with the {/* UTC clock moved out of the header, where it competed with the
frequency for the eye. It belongs with the other passive frequency for the eye. It belongs with the other passive
indicators. */} indicators. */}
{/* Openings under way. Right-hand end, before the clock, because it is
a state of the world rather than a state of this station the
same side as the time and the logbook.
It BLINKS and it stays. The toast that announces an opening is
gone in seconds, and an operator who was tuning at that moment
had no way back to it; a band opening lasts hours and deserves
something that lasts with it. It goes out by itself when the
spots stop arriving. */}
{liveOpenings.map((o: any) => (
<button
key={o.band}
type="button"
onClick={() => { setActiveTab('bandmap'); }}
title={t('bo.liveTip', {
band: String(o.band).toUpperCase(), n: o.calls, km: o.median_km,
sector: `${o.compass ?? ''} ${o.bearing_min}${o.bearing_max}°`,
season: o.in_season ? '' : ' — ' + t('bmp.openUnusual'),
})}
className="inline-flex items-center gap-1.5 rounded-md border px-2 py-0.5 text-[11px] font-bold uppercase tracking-wider shrink-0
border-warning-border bg-warning-muted text-warning-muted-foreground hover:bg-warning-muted/70 animate-pulse"
>
<Radio className="size-3 shrink-0" />
{/* The three facts that decide whether to act: which band, which
way to point, how far it reaches. They were in a tooltip
nobody hovers, which made the badge an alarm with no content
it said something was happening and refused to say what. */}
<span>{String(o.band).toUpperCase()}</span>
<span className="font-mono">{o.compass}</span>
{/* Plain kilometres. An earlier attempt abbreviated 1500 to
"1.5k" and then appended the unit, giving "1.5kkm" and even
written correctly, "1.5k km" makes a reader do arithmetic to
recover a number that was four characters long to begin with. */}
<span className="font-mono opacity-80">{o.median_km} km</span>
{/* Out of season is the one an operator must not learn last, so it
earns a mark on the badge rather than a line in the tooltip. */}
{!o.in_season && <span className="opacity-90">!</span>}
</button>
))}
<span className="inline-flex items-center gap-1 font-mono text-[11px] text-muted-foreground shrink-0" title="UTC"> <span className="inline-flex items-center gap-1 font-mono text-[11px] text-muted-foreground shrink-0" title="UTC">
<Clock className="size-3" /> <Clock className="size-3" />
{utcNow}<span className="text-[9px]">Z</span> {utcNow}<span className="text-[9px]">Z</span>
+12 -4
View File
@@ -172,8 +172,17 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
() => (lat == null || lon == null ? null : sunTimes(new Date(), lat, lon)), () => (lat == null || lon == null ? null : sunTimes(new Date(), lat, lon)),
[lat, lon], [lat, lon],
); );
// Stacked, not side by side. Laid out in a row this cost about 150 px of a
// header that has to hold the callsign, the badges and the band grid, and it
// was what pushed the whole row onto a second line. Two short times one above
// the other take a fraction of that and no extra height: the row is already
// taller than one line of text.
//
// "UTC" moves into the tooltip with them — the times are monospaced and always
// UTC everywhere in OpsLog, so the label was spending width to repeat a
// convention the operator already lives by.
const sunBlock = sun ? ( const sunBlock = sun ? (
<div className="ml-auto flex items-center gap-3 text-xs shrink-0" <div className="ml-auto flex flex-col items-end leading-tight text-xs shrink-0"
title="Sunrise / sunset at the DX station (UTC)"> title="Sunrise / sunset at the DX station (UTC)">
{sun.polarDay ? ( {sun.polarDay ? (
<span className="font-semibold text-warning">midnight sun</span> <span className="font-semibold text-warning">midnight sun</span>
@@ -182,14 +191,13 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
) : ( ) : (
<> <>
<span className="flex items-center gap-1"> <span className="flex items-center gap-1">
<Sunrise className="size-3.5 text-warning" /> <Sunrise className="size-3 text-warning" />
<span className="font-mono tabular-nums">{sun.rise || '—'}</span> <span className="font-mono tabular-nums">{sun.rise || '—'}</span>
</span> </span>
<span className="flex items-center gap-1"> <span className="flex items-center gap-1">
<Sunset className="size-3.5 text-info" /> <Sunset className="size-3 text-info" />
<span className="font-mono tabular-nums">{sun.set || '—'}</span> <span className="font-mono tabular-nums">{sun.set || '—'}</span>
</span> </span>
<span className="text-muted-foreground">UTC</span>
</> </>
)} )}
</div> </div>
+19 -2
View File
@@ -91,6 +91,17 @@ const FIELDS: FieldDef[] = [
{ id: 'iota', label: 'bulk.fIota', group: 'Contacted station', kind: 'text', upper: true }, { id: 'iota', label: 'bulk.fIota', group: 'Contacted station', kind: 'text', upper: true },
{ id: 'sig', label: 'bulk.fSig', group: 'Contacted station', kind: 'text' }, { id: 'sig', label: 'bulk.fSig', group: 'Contacted station', kind: 'text' },
{ id: 'sig_info', label: 'bulk.fSigInfo', group: 'Contacted station', kind: 'text' }, { id: 'sig_info', label: 'bulk.fSigInfo', group: 'Contacted station', kind: 'text' },
// The contact itself — repair fields, not description fields. An import that
// mapped every QSO to SSB, or an ADIF with no MODE at all, is fixed here
// instead of one row at a time.
//
// Band is deliberately absent: it travels with the frequency below, because a
// band contradicting its own frequency is invalid ADIF and every export would
// carry the contradiction.
{ id: 'mode', label: 'bulk.fMode', group: 'The contact', kind: 'text', upper: true },
{ id: 'submode', label: 'bulk.fSubmode', group: 'The contact', kind: 'text', upper: true },
{ id: 'rst_sent', label: 'bulk.fRstSent', group: 'The contact', kind: 'text' },
{ id: 'rst_rcvd', label: 'bulk.fRstRcvd', group: 'The contact', kind: 'text' },
// Misc // Misc
// Frequency (MHz) — sets freq_hz AND recomputes band. Main use: fixing a batch // Frequency (MHz) — sets freq_hz AND recomputes band. Main use: fixing a batch
// logged on a stale/default frequency after CAT dropped. // logged on a stale/default frequency after CAT dropped.
@@ -110,7 +121,12 @@ const STATUS_VALUES: { v: string; label: string }[] = [
{ v: '_', label: 'bulk.statusBlank' }, { v: '_', label: 'bulk.statusBlank' },
]; ];
const GROUPS = ['QSL / upload', 'My station', 'Contacted station', 'Contest', 'Propagation', 'Misc']; // Derived from the fields themselves, in the order they are declared.
//
// This used to be a hand-written list, and a group added to FIELDS but not to it
// simply never rendered — the fields existed, passed every check, and could not
// be picked. Two lists that must agree, with nothing to make them.
const GROUPS = [...new Set(FIELDS.map((f) => f.group))];
// Maps the internal group key → its i18n label key. // Maps the internal group key → its i18n label key.
const GROUP_LABELS: Record<string, string> = { const GROUP_LABELS: Record<string, string> = {
'QSL / upload': 'bulk.groupQsl', 'QSL / upload': 'bulk.groupQsl',
@@ -119,6 +135,7 @@ const GROUP_LABELS: Record<string, string> = {
'Contest': 'bulk.groupContest', 'Contest': 'bulk.groupContest',
'Propagation': 'bulk.groupPropagation', 'Propagation': 'bulk.groupPropagation',
'Misc': 'bulk.groupMisc', 'Misc': 'bulk.groupMisc',
'The contact': 'bulk.groupContact',
}; };
type Props = { type Props = {
@@ -177,7 +194,7 @@ export function BulkEditModal({ open, ids, onClose, onApplied }: Props) {
<SelectContent> <SelectContent>
{GROUPS.map((g) => ( {GROUPS.map((g) => (
<div key={g}> <div key={g}>
<div className="px-2 py-1 text-[10px] uppercase tracking-wider text-muted-foreground">{t(GROUP_LABELS[g])}</div> <div className="px-2 py-1 text-[10px] uppercase tracking-wider text-muted-foreground">{GROUP_LABELS[g] ? t(GROUP_LABELS[g]) : g}</div>
{FIELDS.filter((f) => f.group === g) {FIELDS.filter((f) => f.group === g)
.map((f) => ({ f, txt: t(f.label) })) .map((f) => ({ f, txt: t(f.label) }))
.sort((a, b) => a.txt.localeCompare(b.txt)) .sort((a, b) => a.txt.localeCompare(b.txt))
+23 -6
View File
@@ -13,7 +13,8 @@ import { useI18n } from '@/lib/i18n';
export type FilterOp = export type FilterOp =
| 'eq' | 'ne' | 'gt' | 'lt' | 'ge' | 'le' | 'eq' | 'ne' | 'gt' | 'lt' | 'ge' | 'le'
| 'contains' | 'startswith' | 'endswith' | 'empty' | 'notempty'; | 'contains' | 'startswith' | 'endswith' | 'empty' | 'notempty'
| 'in' | 'notin';
export interface FilterCondition { field: string; op: FilterOp; value: string } export interface FilterCondition { field: string; op: FilterOp; value: string }
export interface QueryFilter { export interface QueryFilter {
@@ -121,9 +122,15 @@ const OPS: { value: FilterOp; label: string }[] = [
{ value: 'le', label: 'fltb.opLe' }, { value: 'le', label: 'fltb.opLe' },
{ value: 'empty', label: 'fltb.opEmpty' }, { value: 'empty', label: 'fltb.opEmpty' },
{ value: 'notempty', label: 'fltb.opNotEmpty' }, { value: 'notempty', label: 'fltb.opNotEmpty' },
// 'in' is what makes a real question askable. Every condition is joined by ONE
// AND or OR, so "2 m or 70 cm, in FT8, since January" had no expression: AND
// killed the two bands, OR let every FT8 QSO through. The OR lives inside the
// condition instead, and the rest keeps ANDing.
{ value: 'in', label: 'fltb.opIn' },
{ value: 'notin', label: 'fltb.opNotIn' },
]; ];
const TEXT_OPS: FilterOp[] = ['contains', 'startswith', 'endswith', 'eq', 'ne', 'empty', 'notempty']; const TEXT_OPS: FilterOp[] = ['contains', 'startswith', 'endswith', 'eq', 'ne', 'in', 'notin', 'empty', 'notempty'];
const NUM_OPS: FilterOp[] = ['eq', 'ne', 'gt', 'lt', 'ge', 'le', 'empty', 'notempty']; const NUM_OPS: FilterOp[] = ['eq', 'ne', 'gt', 'lt', 'ge', 'le', 'empty', 'notempty'];
function opsFor(field: string): { value: FilterOp; label: string }[] { function opsFor(field: string): { value: FilterOp; label: string }[] {
@@ -257,6 +264,7 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
)} )}
{conditions.map((c, i) => { {conditions.map((c, i) => {
const needsValue = c.op !== 'empty' && c.op !== 'notempty'; const needsValue = c.op !== 'empty' && c.op !== 'notempty';
const isList = c.op === 'in' || c.op === 'notin';
const fieldType = FIELDS.find((f) => f.value === c.field)?.type ?? 'text'; const fieldType = FIELDS.find((f) => f.value === c.field)?.type ?? 'text';
return ( return (
<div key={i} className="flex items-center gap-2"> <div key={i} className="flex items-center gap-2">
@@ -281,19 +289,28 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
// An ADIF date is picked with a calendar but STORED as the // An ADIF date is picked with a calendar but STORED as the
// 8-digit form the column holds, so the comparison stays a // 8-digit form the column holds, so the comparison stays a
// plain string one on both sides. // plain string one on both sides.
type={fieldType === 'date' || fieldType === 'adifdate' ? 'date' : fieldType === 'number' ? 'number' : 'text'} // A list is typed by hand, commas and all, so it stays a text
// box even on a date or number field: a calendar cannot express
// "any one of these".
type={isList ? 'text'
: fieldType === 'date' || fieldType === 'adifdate' ? 'date'
: fieldType === 'number' ? 'number' : 'text'}
className="h-8 flex-1 text-xs" className="h-8 flex-1 text-xs"
disabled={!needsValue} disabled={!needsValue}
placeholder={needsValue ? (fieldType === 'date' ? 'YYYY-MM-DD' : t('fltb.valuePh')) : '—'} placeholder={!needsValue ? '—'
: isList ? t('fltb.listPh')
: fieldType === 'date' ? 'YYYY-MM-DD' : t('fltb.valuePh')}
// \d, not d: the escape was missing, so the test never matched // \d, not d: the escape was missing, so the test never matched
// an 8-digit ADIF date and the calendar input was handed // an 8-digit ADIF date and the calendar input was handed
// "20260728" — which type=date rejects, showing an empty box // "20260728" — which type=date rejects, showing an empty box
// over a value that was really there. // over a value that was really there.
value={fieldType === 'adifdate' && /^\d{8}$/.test(c.value) // The ADIF reshaping is skipped for a list: it would eat the
// commas and leave one unreadable run of digits.
value={!isList && fieldType === 'adifdate' && /^\d{8}$/.test(c.value)
? `${c.value.slice(0, 4)}-${c.value.slice(4, 6)}-${c.value.slice(6, 8)}` ? `${c.value.slice(0, 4)}-${c.value.slice(4, 6)}-${c.value.slice(6, 8)}`
: c.value} : c.value}
onChange={(e) => setCond(i, { onChange={(e) => setCond(i, {
value: fieldType === 'adifdate' ? e.target.value.replace(/-/g, '') : e.target.value, value: !isList && fieldType === 'adifdate' ? e.target.value.replace(/-/g, '') : e.target.value,
})} })}
onKeyDown={(e) => { if (e.key === 'Enter') apply(); }} onKeyDown={(e) => { if (e.key === 'Enter') apply(); }}
/> />
+59
View File
@@ -52,6 +52,7 @@ import {
GetADIFMonitor, SaveADIFMonitor, PickADIFMonitorFile, GetADIFMonitor, SaveADIFMonitor, PickADIFMonitorFile,
GetRelayAuto, SaveRelayAuto, GetStationDevices, GetRelayAuto, SaveRelayAuto, GetStationDevices,
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards, GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
GetBandOpenSettings, SaveBandOpenSettings, GetPSKReporterStatus,
} from '../../wailsjs/go/main/App'; } from '../../wailsjs/go/main/App';
import type { profile as profileModels } from '../../wailsjs/go/models'; import type { profile as profileModels } from '../../wailsjs/go/models';
import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types'; import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
@@ -1540,6 +1541,26 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
// blur, not per keystroke, or typing "10" would be rewritten to "5" the moment // blur, not per keystroke, or typing "10" would be rewritten to "5" the moment
// the "1" landed and the field would fight the operator. // the "1" landed and the field would fight the operator.
const SELF_SPOT_MIN_MIN = 5; const SELF_SPOT_MIN_MIN = 5;
// Band-opening watch. Saved through the backend rather than as a UI pref: it
// has side effects there — adding the RBN nodes, bringing the PSK Reporter
// feed up or down — so the write has to go where those live.
const [bandOpen, setBandOpen] = useState<any>({ enabled: false, bands: [], available: [] });
const [pskrStatus, setPskrStatus] = useState<any>(null);
const saveBandOpen = async (next: any) => {
setBandOpen(next);
try { await SaveBandOpenSettings(next); } catch { /* the status line shows the result */ }
};
useEffect(() => {
(async () => {
try { setBandOpen(await GetBandOpenSettings()); } 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".
const t = window.setInterval(async () => {
try { setPskrStatus(await GetPSKReporterStatus()); } catch { /* ignore */ }
}, 3000);
return () => window.clearInterval(t);
}, []);
const [selfSpot, setSelfSpot] = useState({ enabled: false, minutes: SELF_SPOT_MIN_MIN }); const [selfSpot, setSelfSpot] = useState({ enabled: false, minutes: SELF_SPOT_MIN_MIN });
const [selfSpotText, setSelfSpotText] = useState(String(SELF_SPOT_MIN_MIN)); const [selfSpotText, setSelfSpotText] = useState(String(SELF_SPOT_MIN_MIN));
const [clusterStatuses, setClusterStatuses] = useState<ClusterServerStatus[]>([]); const [clusterStatuses, setClusterStatuses] = useState<ClusterServerStatus[]>([]);
@@ -4148,6 +4169,44 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
things set up once. A preferences dialog you reopen every ten minutes things set up once. A preferences dialog you reopen every ten minutes
is a filter in the wrong place. */} is a filter in the wrong place. */}
{/* 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. */}
<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={bandOpen.enabled} className="mt-0.5"
onCheckedChange={(c) => saveBandOpen({ ...bandOpen, enabled: !!c })} />
<span>{t('bo.enable')} <span className="text-xs text-muted-foreground">{t('bo.enableHint')}</span></span>
</label>
{bandOpen.enabled && (
<div className="pl-6 space-y-2">
<div className="flex flex-wrap gap-1.5">
{(bandOpen.available ?? []).map((b: string) => {
const on = (bandOpen.bands ?? []).includes(b);
return (
<button key={b} type="button"
onClick={() => saveBandOpen({
...bandOpen,
bands: on ? bandOpen.bands.filter((x: string) => x !== b) : [...(bandOpen.bands ?? []), b],
})}
className={cn('px-2 py-0.5 rounded-md border text-[11px] font-bold tracking-wider font-mono',
on ? 'bg-primary text-primary-foreground border-primary' : 'text-muted-foreground border-border hover:bg-muted')}>
{b}
</button>
);
})}
</div>
{/* A live count, because a feed that is connected but silent looks
exactly like one that is broken until a number moves. */}
<p className="text-xs text-muted-foreground">
{pskrStatus?.running
? t('bo.feedUp', { n: pskrStatus.received ?? 0 })
: t('bo.feedDown')}
</p>
</div>
)}
</div>
{/* Self-spot. The interval only shows once it's on an interval for {/* Self-spot. The interval only shows once it's on an interval for
something switched off is just a question the operator can't act on. */} something switched off is just a question the operator can't act on. */}
<div className="border-t border-border/60 pt-3 space-y-2"> <div className="border-t border-border/60 pt-3 space-y-2">
@@ -1,5 +1,5 @@
import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'; import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
import { Plus, Pencil, Trash2, Power, PlugZap, Loader2, Check, X, Compass, Square, Antenna as AntennaIcon, ArrowDownToLine, Minus, RefreshCw, GripVertical } from 'lucide-react'; import { Plus, Pencil, Trash2, Power, PlugZap, Loader2, Check, X, Compass, Square, Antenna as AntennaIcon, ArrowDownToLine, Minus, RefreshCw, GripVertical, ChevronUp, ChevronDown } from 'lucide-react';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input'; import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label'; import { Label } from '@/components/ui/label';
@@ -15,6 +15,7 @@ import {
GetStationDevices, SaveStationDevices, GetStationStatus, StationSetRelay, GetStationDevices, SaveStationDevices, GetStationStatus, StationSetRelay,
GetRotatorHeading, RotatorGoTo, RotatorStop, SetActiveRotor, GetRotatorHeading, RotatorGoTo, RotatorStop, SetActiveRotor,
GetUltrabeamStatus, SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements, GetUltrabeamStatus, SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements,
MotorTuneKHz, MotorNudgeKHz, SetMotorFollow,
ListDenkoviDevices, ListSerialPorts, TestStationDevice, ListDenkoviDevices, ListSerialPorts, TestStationDevice,
GetAmpStatuses, GetFlexState, GetAmpStatuses, GetFlexState,
GetTunerGeniusStatus, GetTunerGeniusSettings, GetTunerGeniusStatus, GetTunerGeniusSettings,
@@ -115,7 +116,37 @@ function RotatorWidget({ hd, refetch, centerLat, centerLon, bearing, t }: Rotato
); );
} }
type AntStatus = { enabled: boolean; type: string; connected: boolean; direction: number; frequency: number; moving: boolean; elements: number[] }; type AntStatus = { enabled: boolean; type: string; connected: boolean; direction: number; frequency: number; moving: boolean; elements: number[]; follow?: boolean; step_khz?: number; bands?: string[] };
// Where each band button points the antenna.
//
// Not the arithmetic centre of the band. An antenna is tuned for where people
// actually work: 20 m centres on 14175 but nobody lives there, and 10 m spans
// 1.7 MHz of which the top half is empty. These are the points that leave the
// elements closest to right for the whole band, and one nudge away from the rest.
const ANT_BAND_KHZ: Record<string, number> = {
'40m': 7100, '30m': 10125, '20m': 14150, '17m': 18110,
'15m': 21150, '12m': 24930, '10m': 28400, '6m': 50150,
};
// NUDGE_KHZ is the up/down step. 25 kHz because that is also the finest tracking
// threshold: a nudge smaller than the tracking step would be undone by the next
// poll while tracking is on.
const NUDGE_KHZ = 25;
// bandOfKHz names the band a frequency sits in, so a band button can light up
// when the ANTENNA is already there. Deliberately generous at the edges: the
// antenna's reported frequency is where it was commanded, which can sit slightly
// outside the allocation.
function bandOfKHz(khz: number): string {
const edges: [number, number, string][] = [
[6900, 7300, '40m'], [10050, 10200, '30m'], [13900, 14400, '20m'],
[18000, 18200, '17m'], [20900, 21500, '15m'], [24800, 25000, '12m'],
[27900, 29800, '10m'], [49900, 50600, '6m'],
];
for (const [lo, hi, b] of edges) if (khz >= lo && khz <= hi) return b;
return '';
}
// MotorAntennaWidget controls a motorized antenna (Ultrabeam / SteppIR) from the // MotorAntennaWidget controls a motorized antenna (Ultrabeam / SteppIR) from the
// Station Control tab: pattern (Normal / 180° / Bi), Retract, and — Ultrabeam // Station Control tab: pattern (Normal / 180° / Bi), Retract, and — Ultrabeam
@@ -203,6 +234,70 @@ function MotorAntennaWidget({ ant, refetch, t }: { ant: AntStatus; refetch: () =
))} ))}
</div> </div>
</div> </div>
{/* Bands, then a nudge, then tracking — in the order an operator uses
them: get to the band, fine-tune inside it, decide whether the
antenna should follow the rig from here. */}
<div>
<div className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground mb-1">{t('station.bands')}</div>
<div className="grid grid-cols-5 gap-1">
{(ant.bands ?? []).map((b: string) => {
const khz = ANT_BAND_KHZ[b];
if (!khz) return null;
// "On this band" from the antenna's own frequency, not the rig's:
// the widget must show where the ANTENNA is, which is the whole
// reason for tuning it by hand.
const here = ant.frequency > 0 && bandOfKHz(ant.frequency) === b;
return (
<button key={b} type="button" disabled={!ant.connected}
onClick={() => run(MotorTuneKHz(khz))}
title={`${(khz / 1000).toFixed(3)} MHz`}
className={cn('rounded-md border py-1 text-[11px] font-mono font-semibold transition-colors disabled:opacity-40',
here ? 'bg-primary text-primary-foreground border-primary' : 'border-border hover:bg-muted')}>
{b}
</button>
);
})}
</div>
</div>
<div className="flex items-center gap-1">
<button type="button" disabled={!ant.connected}
onClick={() => run(MotorNudgeKHz(-NUDGE_KHZ))}
title={t('station.nudgeDown', { n: NUDGE_KHZ })}
className="flex-1 flex items-center justify-center gap-1 rounded-md border border-border py-1.5 text-xs font-semibold hover:bg-muted disabled:opacity-40">
<ChevronDown className="size-3.5" /> {NUDGE_KHZ}
</button>
<button type="button" disabled={!ant.connected}
onClick={() => run(MotorNudgeKHz(NUDGE_KHZ))}
title={t('station.nudgeUp', { n: NUDGE_KHZ })}
className="flex-1 flex items-center justify-center gap-1 rounded-md border border-border py-1.5 text-xs font-semibold hover:bg-muted disabled:opacity-40">
<ChevronUp className="size-3.5" /> {NUDGE_KHZ}
</button>
</div>
{/* Tracking. Here rather than only in Settings because it is an operating
decision — off to park the antenna, on to resume — not something set
up once. The step only shows when tracking is on: a threshold for
something switched off is a question the operator cannot act on. */}
<div className="flex items-center gap-2">
<button type="button"
onClick={() => run(SetMotorFollow(!ant.follow, 0))}
className={cn('flex-1 rounded-md border py-1.5 text-xs font-semibold transition-colors',
ant.follow ? 'bg-success-muted text-success-muted-foreground border-success-border' : 'border-border hover:bg-muted')}>
{ant.follow ? t('station.trackOn') : t('station.trackOff')}
</button>
{ant.follow && (
<select
value={String(ant.step_khz || 50)}
onChange={(e) => run(SetMotorFollow(true, parseInt(e.target.value, 10)))}
className="h-[30px] rounded-md border border-border bg-background px-1 text-xs font-mono"
title={t('station.trackStepTip')}
>
{[25, 50, 100].map((s) => <option key={s} value={s}>{s} kHz</option>)}
</select>
)}
</div>
<button type="button" disabled={!ant.connected} <button type="button" disabled={!ant.connected}
onClick={() => run(UltrabeamRetract())} onClick={() => run(UltrabeamRetract())}
className="w-full flex items-center justify-center gap-1.5 rounded-md border border-warning-border bg-warning-muted text-warning-muted-foreground py-1.5 text-xs font-semibold hover:brightness-95 disabled:opacity-40"> className="w-full flex items-center justify-center gap-1.5 rounded-md border border-warning-border bg-warning-muted text-warning-muted-foreground py-1.5 text-xs font-semibold hover:brightness-95 disabled:opacity-40">
+72 -8
View File
@@ -1,5 +1,5 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { Upload, FolderOpen, Loader2 } from 'lucide-react'; import { Upload, FolderOpen, Loader2, ChevronsUpDown } from 'lucide-react';
import { import {
GetWebPublishConfig, SaveWebPublishConfig, WebPublishColumns, GetWebPublishConfig, SaveWebPublishConfig, WebPublishColumns,
TestWebPublishFTP, PublishLogNow, GetWebPublishStatus, PickBackupFolder, TestWebPublishFTP, PublishLogNow, GetWebPublishStatus, PickBackupFolder,
@@ -9,6 +9,9 @@ import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label'; import { Label } from '@/components/ui/label';
import { Checkbox } from '@/components/ui/checkbox'; import { Checkbox } from '@/components/ui/checkbox';
import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from '@/components/ui/select'; import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from '@/components/ui/select';
import {
DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuCheckboxItem,
} from '@/components/ui/dropdown-menu';
import { useI18n } from '@/lib/i18n'; import { useI18n } from '@/lib/i18n';
import { cn } from '@/lib/utils'; import { cn } from '@/lib/utils';
@@ -18,12 +21,17 @@ type Cfg = {
ftp_enabled: boolean; ftp_host: string; ftp_port: number; ftp_user: string; ftp_enabled: boolean; ftp_host: string; ftp_port: number; ftp_user: string;
ftp_password: string; ftp_tls: boolean; ftp_folder: string; ftp_file_name: string; ftp_password: string; ftp_tls: boolean; ftp_folder: string; ftp_file_name: string;
}; };
type Col = { key: string; header: string }; type Col = { key: string; header: string; group: string };
export function WebPublishPanel() { export function WebPublishPanel() {
const { t } = useI18n(); const { t } = useI18n();
const [cfg, setCfg] = useState<Cfg | null>(null); const [cfg, setCfg] = useState<Cfg | null>(null);
const [cols, setCols] = useState<Col[]>([]); const [cols, setCols] = useState<Col[]>([]);
// The catalogue is 123 fields, so the picker is a dropdown with a search box
// rather than anything laid out on the page. Chosen columns stay visible above
// it, in publication order: after picking eight out of a hundred the question
// stops being 'what exists' and becomes 'what did I pick, and how will it print'.
const [colSearch, setColSearch] = useState('');
const [busy, setBusy] = useState<'' | 'test' | 'publish'>(''); const [busy, setBusy] = useState<'' | 'test' | 'publish'>('');
const [msg, setMsg] = useState(''); const [msg, setMsg] = useState('');
const [err, setErr] = useState(''); const [err, setErr] = useState('');
@@ -137,19 +145,75 @@ export function WebPublishPanel() {
{/* ── Columns ── */} {/* ── Columns ── */}
<div className="space-y-2 border-t border-border/60 pt-3"> <div className="space-y-2 border-t border-border/60 pt-3">
<div className="flex items-center justify-between">
<Label className="text-xs font-semibold">{t('wpub.columns')}</Label> <Label className="text-xs font-semibold">{t('wpub.columns')}</Label>
<span className="text-[11px] text-muted-foreground">
{t('wpub.columnsCount', { n: cfg.columns?.length ?? 0, total: cols.length })}
</span>
</div>
{/* CHOSEN, in publication order — this is the list that answers "what
will the page look like", which a sectioned catalogue cannot. */}
{(cfg.columns?.length ?? 0) > 0 && (
<div className="flex flex-wrap gap-1.5"> <div className="flex flex-wrap gap-1.5">
{cols.map((c) => { {cfg.columns.map((k) => {
const on = cfg.columns?.includes(c.key); const c = cols.find((x) => x.key === k);
return ( return (
<button key={c.key} type="button" onClick={() => toggleCol(c.key)} <button key={k} type="button" onClick={() => toggleCol(k)}
className={cn('px-2 py-0.5 rounded-full border text-[11px] font-medium transition-colors', title={t('wpub.removeColumn')}
on ? 'border-primary bg-primary text-primary-foreground' : 'border-border text-muted-foreground hover:bg-muted')}> className="px-2 py-0.5 rounded-full border border-primary bg-primary text-primary-foreground text-[11px] font-medium">
{c.header} {c?.header ?? k} ×
</button> </button>
); );
})} })}
</div> </div>
)}
{/* One dropdown, alphabetical, filtered as you type. The catalogue is
123 fields: laid out on the page it buries every other setting, and
sorting by anything but the alphabet means hunting. The menu stays
open while ticking — picking eight columns should be one visit. */}
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="outline" size="sm" className="w-full justify-between h-8 text-xs font-normal">
{t('wpub.columnsPick')}
<ChevronsUpDown className="size-3.5 opacity-60" />
</Button>
</DropdownMenuTrigger>
{/* The search box is OUTSIDE the scrolling area, not sticky inside it.
Sticky kept it in place but the rows scrolled over it: a menu item
carries its own background and its own stacking, so it wins over a
sticky sibling however high its z-index. A header that never
scrolls has nothing to lose the fight with. */}
<DropdownMenuContent align="start" className="w-72 p-0 flex flex-col max-h-80">
<div className="p-1.5 border-b border-border/60 bg-popover shrink-0">
<Input className="h-7 text-xs" placeholder={t('wpub.columnsSearch')}
value={colSearch}
onChange={(e) => setColSearch(e.target.value)}
onKeyDown={(e) => e.stopPropagation()} />
</div>
<div className="overflow-y-auto p-1">
{[...cols]
.sort((a, b) => a.header.localeCompare(b.header))
.filter((c) => {
const q = colSearch.trim().toLowerCase();
return !q || c.header.toLowerCase().includes(q) || c.key.toLowerCase().includes(q);
})
.map((c) => (
<DropdownMenuCheckboxItem
key={c.key}
checked={cfg.columns?.includes(c.key) ?? false}
onCheckedChange={() => toggleCol(c.key)}
onSelect={(e) => e.preventDefault()}
className="text-xs"
>
{c.header}
<span className="ml-auto pl-2 text-[10px] text-muted-foreground font-mono">{c.group}</span>
</DropdownMenuCheckboxItem>
))}
</div>
</DropdownMenuContent>
</DropdownMenu>
<p className="text-[11px] text-muted-foreground">{t('wpub.columnsHint')}</p> <p className="text-[11px] text-muted-foreground">{t('wpub.columnsHint')}</p>
</div> </div>
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1,6 +1,6 @@
// Single source of truth for the app version shown in the UI (header + About). // 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). // Bump this on a release (the release script updates it alongside telemetry.go).
export const APP_VERSION = '0.24.4'; export const APP_VERSION = '0.24.6';
// Author / credits, shown in Help -> About. // Author / credits, shown in Help -> About.
export const APP_AUTHOR = 'F4BPO'; export const APP_AUTHOR = 'F4BPO';
+17
View File
@@ -14,6 +14,7 @@ import {bandopen} from '../models';
import {cluster} from '../models'; import {cluster} from '../models';
import {extsvc} from '../models'; import {extsvc} from '../models';
import {powergenius} from '../models'; import {powergenius} from '../models';
import {pskr} from '../models';
import {spe} from '../models'; import {spe} from '../models';
import {solar} from '../models'; import {solar} from '../models';
import {tunergenius} from '../models'; import {tunergenius} from '../models';
@@ -87,6 +88,8 @@ export function AwardRefsForQSOs(arg1:Array<number>):Promise<Record<number, Reco
export function AwardsFolder():Promise<string>; export function AwardsFolder():Promise<string>;
export function BackfillDistances():Promise<main.BackfillDistancesResult>;
export function BackfillUSCounties():Promise<main.BackfillUSCountiesResult>; export function BackfillUSCounties():Promise<main.BackfillUSCountiesResult>;
export function BandSlotQSOs(arg1:string,arg2:number,arg3:string,arg4:string):Promise<Array<qso.QSO>>; export function BandSlotQSOs(arg1:string,arg2:number,arg3:string,arg4:string):Promise<Array<qso.QSO>>;
@@ -387,6 +390,8 @@ export function GetAwards():Promise<Array<award.Result>>;
export function GetBackupSettings():Promise<main.BackupSettings>; export function GetBackupSettings():Promise<main.BackupSettings>;
export function GetBandOpenSettings():Promise<main.BandOpenSettings>;
export function GetBandOpenings():Promise<Array<bandopen.Opening>>; export function GetBandOpenings():Promise<Array<bandopen.Opening>>;
export function GetCATSettings():Promise<main.CATSettings>; export function GetCATSettings():Promise<main.CATSettings>;
@@ -439,6 +444,8 @@ export function GetIcomState():Promise<cat.IcomTXState>;
export function GetListsSettings():Promise<main.ListsSettings>; export function GetListsSettings():Promise<main.ListsSettings>;
export function GetLiveOpenings():Promise<Array<bandopen.Opening>>;
export function GetLiveStations():Promise<Array<main.LiveStation>>; export function GetLiveStations():Promise<Array<main.LiveStation>>;
export function GetLoTWUsersStatus():Promise<main.LoTWUsersStatus>; export function GetLoTWUsersStatus():Promise<main.LoTWUsersStatus>;
@@ -465,6 +472,8 @@ export function GetPGXLStatus():Promise<powergenius.Status>;
export function GetPOTAToken():Promise<string>; export function GetPOTAToken():Promise<string>;
export function GetPSKReporterStatus():Promise<pskr.Status>;
export function GetPendingQSOs():Promise<Array<qso.QSO>>; export function GetPendingQSOs():Promise<Array<qso.QSO>>;
export function GetQSLDefaults():Promise<main.QSLDefaults>; export function GetQSLDefaults():Promise<main.QSLDefaults>;
@@ -675,10 +684,14 @@ export function LookupCallsign(arg1:string):Promise<lookup.Result>;
export function LookupCallsignFresh(arg1:string):Promise<lookup.Result>; export function LookupCallsignFresh(arg1:string):Promise<lookup.Result>;
export function MotorNudgeKHz(arg1:number):Promise<void>;
export function MotorReadElements():Promise<Array<number>>; export function MotorReadElements():Promise<Array<number>>;
export function MotorSetElement(arg1:number,arg2:number):Promise<void>; export function MotorSetElement(arg1:number,arg2:number):Promise<void>;
export function MotorTuneKHz(arg1:number):Promise<void>;
export function MoveDatabase(arg1:string):Promise<void>; export function MoveDatabase(arg1:string):Promise<void>;
export function NetActivate(arg1:string):Promise<qso.QSO>; export function NetActivate(arg1:string):Promise<qso.QSO>;
@@ -873,6 +886,8 @@ export function SaveAwardReference(arg1:string,arg2:awardref.Ref):Promise<void>;
export function SaveBackupSettings(arg1:main.BackupSettings):Promise<void>; export function SaveBackupSettings(arg1:main.BackupSettings):Promise<void>;
export function SaveBandOpenSettings(arg1:main.BandOpenSettings):Promise<void>;
export function SaveCATSettings(arg1:main.CATSettings):Promise<void>; export function SaveCATSettings(arg1:main.CATSettings):Promise<void>;
export function SaveCabrilloFile():Promise<string>; export function SaveCabrilloFile():Promise<string>;
@@ -967,6 +982,8 @@ export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
export function SetKenwoodKeySpeed(arg1:number):Promise<void>; export function SetKenwoodKeySpeed(arg1:number):Promise<void>;
export function SetMotorFollow(arg1:boolean,arg2:number):Promise<void>;
export function SetOpsLogQSLReceived(arg1:number,arg2:boolean):Promise<void>; export function SetOpsLogQSLReceived(arg1:number,arg2:boolean):Promise<void>;
export function SetPassphrase(arg1:string):Promise<void>; export function SetPassphrase(arg1:string):Promise<void>;
+32
View File
@@ -118,6 +118,10 @@ export function AwardsFolder() {
return window['go']['main']['App']['AwardsFolder'](); return window['go']['main']['App']['AwardsFolder']();
} }
export function BackfillDistances() {
return window['go']['main']['App']['BackfillDistances']();
}
export function BackfillUSCounties() { export function BackfillUSCounties() {
return window['go']['main']['App']['BackfillUSCounties'](); return window['go']['main']['App']['BackfillUSCounties']();
} }
@@ -718,6 +722,10 @@ export function GetBackupSettings() {
return window['go']['main']['App']['GetBackupSettings'](); return window['go']['main']['App']['GetBackupSettings']();
} }
export function GetBandOpenSettings() {
return window['go']['main']['App']['GetBandOpenSettings']();
}
export function GetBandOpenings() { export function GetBandOpenings() {
return window['go']['main']['App']['GetBandOpenings'](); return window['go']['main']['App']['GetBandOpenings']();
} }
@@ -822,6 +830,10 @@ export function GetListsSettings() {
return window['go']['main']['App']['GetListsSettings'](); return window['go']['main']['App']['GetListsSettings']();
} }
export function GetLiveOpenings() {
return window['go']['main']['App']['GetLiveOpenings']();
}
export function GetLiveStations() { export function GetLiveStations() {
return window['go']['main']['App']['GetLiveStations'](); return window['go']['main']['App']['GetLiveStations']();
} }
@@ -874,6 +886,10 @@ export function GetPOTAToken() {
return window['go']['main']['App']['GetPOTAToken'](); return window['go']['main']['App']['GetPOTAToken']();
} }
export function GetPSKReporterStatus() {
return window['go']['main']['App']['GetPSKReporterStatus']();
}
export function GetPendingQSOs() { export function GetPendingQSOs() {
return window['go']['main']['App']['GetPendingQSOs'](); return window['go']['main']['App']['GetPendingQSOs']();
} }
@@ -1294,6 +1310,10 @@ export function LookupCallsignFresh(arg1) {
return window['go']['main']['App']['LookupCallsignFresh'](arg1); return window['go']['main']['App']['LookupCallsignFresh'](arg1);
} }
export function MotorNudgeKHz(arg1) {
return window['go']['main']['App']['MotorNudgeKHz'](arg1);
}
export function MotorReadElements() { export function MotorReadElements() {
return window['go']['main']['App']['MotorReadElements'](); return window['go']['main']['App']['MotorReadElements']();
} }
@@ -1302,6 +1322,10 @@ export function MotorSetElement(arg1, arg2) {
return window['go']['main']['App']['MotorSetElement'](arg1, arg2); return window['go']['main']['App']['MotorSetElement'](arg1, arg2);
} }
export function MotorTuneKHz(arg1) {
return window['go']['main']['App']['MotorTuneKHz'](arg1);
}
export function MoveDatabase(arg1) { export function MoveDatabase(arg1) {
return window['go']['main']['App']['MoveDatabase'](arg1); return window['go']['main']['App']['MoveDatabase'](arg1);
} }
@@ -1690,6 +1714,10 @@ export function SaveBackupSettings(arg1) {
return window['go']['main']['App']['SaveBackupSettings'](arg1); return window['go']['main']['App']['SaveBackupSettings'](arg1);
} }
export function SaveBandOpenSettings(arg1) {
return window['go']['main']['App']['SaveBandOpenSettings'](arg1);
}
export function SaveCATSettings(arg1) { export function SaveCATSettings(arg1) {
return window['go']['main']['App']['SaveCATSettings'](arg1); return window['go']['main']['App']['SaveCATSettings'](arg1);
} }
@@ -1878,6 +1906,10 @@ export function SetKenwoodKeySpeed(arg1) {
return window['go']['main']['App']['SetKenwoodKeySpeed'](arg1); return window['go']['main']['App']['SetKenwoodKeySpeed'](arg1);
} }
export function SetMotorFollow(arg1, arg2) {
return window['go']['main']['App']['SetMotorFollow'](arg1, arg2);
}
export function SetOpsLogQSLReceived(arg1, arg2) { export function SetOpsLogQSLReceived(arg1, arg2) {
return window['go']['main']['App']['SetOpsLogQSLReceived'](arg1, arg2); return window['go']['main']['App']['SetOpsLogQSLReceived'](arg1, arg2);
} }
+86
View File
@@ -685,6 +685,7 @@ export namespace bandopen {
median_km: number; median_km: number;
bearing_min: number; bearing_min: number;
bearing_max: number; bearing_max: number;
compass: string;
in_season: boolean; in_season: boolean;
// Go type: time // Go type: time
at: any; at: any;
@@ -701,6 +702,7 @@ export namespace bandopen {
this.median_km = source["median_km"]; this.median_km = source["median_km"];
this.bearing_min = source["bearing_min"]; this.bearing_min = source["bearing_min"];
this.bearing_max = source["bearing_max"]; this.bearing_max = source["bearing_max"];
this.compass = source["compass"];
this.in_season = source["in_season"]; this.in_season = source["in_season"];
this.at = this.convertValues(source["at"], null); this.at = this.convertValues(source["at"], null);
this.examples = source["examples"]; this.examples = source["examples"];
@@ -1929,6 +1931,22 @@ export namespace main {
this.to = source["to"]; this.to = source["to"];
} }
} }
export class BackfillDistancesResult {
scanned: number;
filled: number;
no_grid: number;
static createFrom(source: any = {}) {
return new BackfillDistancesResult(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.scanned = source["scanned"];
this.filled = source["filled"];
this.no_grid = source["no_grid"];
}
}
export class BackfillUSCountiesResult { export class BackfillUSCountiesResult {
scanned: number; scanned: number;
county: number; county: number;
@@ -1971,6 +1989,22 @@ export namespace main {
this.default_folder = source["default_folder"]; this.default_folder = source["default_folder"];
} }
} }
export class BandOpenSettings {
enabled: boolean;
bands: string[];
available: string[];
static createFrom(source: any = {}) {
return new BandOpenSettings(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.enabled = source["enabled"];
this.bands = source["bands"];
this.available = source["available"];
}
}
export class CATSettings { export class CATSettings {
enabled: boolean; enabled: boolean;
backend: string; backend: string;
@@ -3284,6 +3318,9 @@ export namespace main {
band: number; band: number;
moving: boolean; moving: boolean;
elements: number[]; elements: number[];
follow: boolean;
step_khz: number;
bands: string[];
static createFrom(source: any = {}) { static createFrom(source: any = {}) {
return new UltrabeamStatusInfo(source); return new UltrabeamStatusInfo(source);
@@ -3299,6 +3336,9 @@ export namespace main {
this.band = source["band"]; this.band = source["band"];
this.moving = source["moving"]; this.moving = source["moving"];
this.elements = source["elements"]; this.elements = source["elements"];
this.follow = source["follow"];
this.step_khz = source["step_khz"];
this.bands = source["bands"];
} }
} }
export class UpdateInfo { export class UpdateInfo {
@@ -3791,6 +3831,52 @@ export namespace profile {
} }
export namespace pskr {
export class Status {
running: boolean;
received: number;
// Go type: time
last_at: any;
last_err?: string;
broker: string;
bands: string[];
static createFrom(source: any = {}) {
return new Status(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.running = source["running"];
this.received = source["received"];
this.last_at = this.convertValues(source["last_at"], null);
this.last_err = source["last_err"];
this.broker = source["broker"];
this.bands = source["bands"];
}
convertValues(a: any, classs: any, asMap: boolean = false): any {
if (!a) {
return a;
}
if (a.slice && a.map) {
return (a as any[]).map(elem => this.convertValues(elem, classs));
} else if ("object" === typeof a) {
if (asMap) {
for (const key of Object.keys(a)) {
a[key] = new classs(a[key]);
}
return a;
}
return new classs(a);
}
return a;
}
}
}
export namespace qslcard { export namespace qslcard {
export class Bevel { export class Bevel {
+4 -2
View File
@@ -4,6 +4,7 @@ go 1.25.0
require ( require (
github.com/braheezy/shine-mp3 v0.1.0 github.com/braheezy/shine-mp3 v0.1.0
github.com/eclipse/paho.mqtt.golang v1.5.1
github.com/go-ole/go-ole v1.3.0 github.com/go-ole/go-ole v1.3.0
github.com/go-sql-driver/mysql v1.10.0 github.com/go-sql-driver/mysql v1.10.0
github.com/gorilla/websocket v1.5.3 github.com/gorilla/websocket v1.5.3
@@ -12,7 +13,7 @@ require (
github.com/wailsapp/wails/v2 v2.11.0 github.com/wailsapp/wails/v2 v2.11.0
github.com/wneessen/go-mail v0.7.3 github.com/wneessen/go-mail v0.7.3
go.bug.st/serial v1.7.1 go.bug.st/serial v1.7.1
golang.org/x/net v0.35.0 golang.org/x/net v0.44.0
golang.org/x/sys v0.45.0 golang.org/x/sys v0.45.0
golang.org/x/text v0.37.0 golang.org/x/text v0.37.0
modernc.org/sqlite v1.50.1 modernc.org/sqlite v1.50.1
@@ -44,7 +45,8 @@ require (
github.com/valyala/fasttemplate v1.2.2 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/wailsapp/go-webview2 v1.0.22 // indirect github.com/wailsapp/go-webview2 v1.0.22 // indirect
github.com/wailsapp/mimetype v1.4.1 // indirect github.com/wailsapp/mimetype v1.4.1 // indirect
golang.org/x/crypto v0.33.0 // indirect golang.org/x/crypto v0.42.0 // indirect
golang.org/x/sync v0.20.0 // indirect
modernc.org/libc v1.72.3 // indirect modernc.org/libc v1.72.3 // indirect
modernc.org/mathutil v1.7.1 // indirect modernc.org/mathutil v1.7.1 // indirect
modernc.org/memory v1.11.0 // indirect modernc.org/memory v1.11.0 // indirect
+6 -4
View File
@@ -8,6 +8,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/eclipse/paho.mqtt.golang v1.5.1 h1:/VSOv3oDLlpqR2Epjn1Q7b2bSTplJIeV2ISgCl2W7nE=
github.com/eclipse/paho.mqtt.golang v1.5.1/go.mod h1:1/yJCneuyOoCOzKSsOTUc0AJfpsItBGWvYpBLimhArU=
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
@@ -84,13 +86,13 @@ github.com/wneessen/go-mail v0.7.3 h1:g3DravXC5SMlVdboFrQA8Jx95A8sOzoBeS5F+vzNRK
github.com/wneessen/go-mail v0.7.3/go.mod h1:QGhBX0yNbc1J+Mkjcu7z2rpj4B4l+BmDY8gYznPC9sk= github.com/wneessen/go-mail v0.7.3/go.mod h1:QGhBX0yNbc1J+Mkjcu7z2rpj4B4l+BmDY8gYznPC9sk=
go.bug.st/serial v1.7.1 h1:5aP8wYL0UjEYOVs3oPAGscjaSfRQLHtCvBFXNN/rwtc= go.bug.st/serial v1.7.1 h1:5aP8wYL0UjEYOVs3oPAGscjaSfRQLHtCvBFXNN/rwtc=
go.bug.st/serial v1.7.1/go.mod h1:d0MmS16Qt9b1m06yoYRNUXhRRTJV5Qg2S5EKqQtnayQ= go.bug.st/serial v1.7.1/go.mod h1:d0MmS16Qt9b1m06yoYRNUXhRRTJV5Qg2S5EKqQtnayQ=
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM= golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU= golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
File diff suppressed because it is too large Load Diff
+119 -17
View File
@@ -36,32 +36,47 @@ type Spot struct {
type Config struct { type Config struct {
Window time.Duration // how far back a burst may span Window time.Duration // how far back a burst may span
MinCalls int // distinct DX calls before it counts as an opening MinCalls int // distinct DX calls before it counts as an opening
MinKm, MaxKm int // single-hop Es range MinKm, MaxKm int // path length accepted; MaxKm 0 = no ceiling
BearingSpread int // widest arc (degrees) the spots may cover BearingSpread int // widest arc (degrees) the spots may cover
Requiet time.Duration // silence after announcing a band, so it is announced once Requiet time.Duration // silence after announcing a band, so it is announced once
} }
// DefaultConfig is the single-hop Es envelope. // DefaultConfig is the Es envelope.
// //
// 5002400 km: below ~500 km a 6 m contact is ordinary tropo or ground wave and // Below ~500 km a 6 m contact is ordinary tropo or ground wave and says nothing
// says nothing about the ionosphere; beyond ~2400 km it is no longer one hop, so // about the ionosphere, so that floor stays.
// the bearing test stops meaning anything. 90° of spread because a genuine Es //
// cloud illuminates a sector, not the whole horizon — the constraint that // There is NO ceiling. There used to be one at 2400 km, on the reasoning that
// separates an opening from a merely busy evening. // past a single hop the bearing test stops meaning anything. That was wrong, and
// it silently threw away exactly the openings worth hearing about: multi-hop Es
// is ordinary on 6 m, 5000 km paths are common and 10000 km happens. Those are
// still directional — a double hop leaves the same sector it entered — so the
// bearing test holds perfectly well, and it is the test doing the real work here.
//
// 90° of spread because a genuine Es cloud illuminates a sector, not the whole
// horizon: the constraint that separates an opening from a merely busy evening.
func DefaultConfig() Config { func DefaultConfig() Config {
return Config{ return Config{
Window: 12 * time.Minute, Window: 12 * time.Minute,
MinCalls: 4, MinCalls: 4,
MinKm: 500, MinKm: 500,
MaxKm: 2400, MaxKm: 0, // no ceiling — see above
BearingSpread: 90, BearingSpread: 90,
Requiet: 45 * time.Minute, Requiet: 45 * time.Minute,
} }
} }
// Bands watched. HF is deliberately absent: an "opening" on 20 m is the normal // Bands watched.
// state of the band and announcing it would be noise. //
var watched = map[string]bool{"6m": true, "4m": true, "2m": true} // 10 m is in, and it is HF. The line is not "HF versus VHF" but "is an opening
// here an event": 20 m being open is the normal state of the band and saying so
// is noise, while 10 m spends most of a solar cycle shut and opens sharply when
// it goes — which is what an operator wants interrupting them for.
//
// 12 m was tried and dropped. It behaves too much like 20 m at this point in the
// cycle: open often enough that announcing it is a notification rather than
// news, and every band that cries wolf costs the ones that do not.
var watched = map[string]bool{"10m": true, "6m": true, "4m": true, "2m": true}
// Watched reports whether a band is one the detector looks at. // Watched reports whether a band is one the detector looks at.
func Watched(band string) bool { return watched[strings.ToLower(strings.TrimSpace(band))] } func Watched(band string) bool { return watched[strings.ToLower(strings.TrimSpace(band))] }
@@ -73,6 +88,11 @@ type Opening struct {
MedianKm int `json:"median_km"` // typical hop length MedianKm int `json:"median_km"` // typical hop length
BearingMin int `json:"bearing_min"` // sector, degrees BearingMin int `json:"bearing_min"` // sector, degrees
BearingMax int `json:"bearing_max"` BearingMax int `json:"bearing_max"`
// Compass is the sector as a point of the compass ("NE"), computed here so
// the UI never has to redo the wrap-round-north arithmetic that Sector()
// already gets right — two answers to that question is how a badge ends up
// naming the opposite direction.
Compass string `json:"compass"`
InSeason bool `json:"in_season"` // false = unusual for the time of year InSeason bool `json:"in_season"` // false = unusual for the time of year
At time.Time `json:"at"` At time.Time `json:"at"`
Examples []string `json:"examples"` // a few callsigns, for the announcement Examples []string `json:"examples"` // a few callsigns, for the announcement
@@ -107,7 +127,7 @@ func (d *Detector) Add(s Spot, lat float64) *Opening {
} }
// Out-of-range spots are dropped rather than stored: they can never be part // Out-of-range spots are dropped rather than stored: they can never be part
// of a single-hop detection, and keeping them only grows the window. // of a single-hop detection, and keeping them only grows the window.
if s.DistKm < d.cfg.MinKm || s.DistKm > d.cfg.MaxKm { if s.DistKm < d.cfg.MinKm || (d.cfg.MaxKm > 0 && s.DistKm > d.cfg.MaxKm) {
return nil return nil
} }
d.recent = append(d.recent, s) d.recent = append(d.recent, s)
@@ -169,23 +189,90 @@ func evaluate(band string, spots []Spot, cfg Config) *Opening {
dists = append(dists, s.DistKm) dists = append(dists, s.DistKm)
calls = append(calls, c) calls = append(calls, c)
} }
lo, hi, spread := arc(bearings) // The DENSEST sector, not the sector covering everything.
if spread > cfg.BearingSpread { //
return nil // spots all round the compass — a busy band, not an opening // This used to demand that EVERY station fit inside one 90° arc, which is the
// right shape for a sporadic-E cloud and hopeless for anything else. With 10
// and 12 m open on F2 the reports come from all round the compass, the arc is
// 360°, and the test can never pass — so the busier the band, the less likely
// an opening was announced. Backwards.
//
// Finding the busiest 90° instead keeps the Es signature intact — a cloud
// still makes one direction dense — and lets an F2 opening toward South
// America be seen through the handful of Europeans that are always there.
lo, hi, n := densestSector(bearings, cfg.BearingSpread)
if n < cfg.MinCalls {
return nil // nothing concentrated anywhere: a busy band, not an opening
} }
sort.Ints(dists) sort.Ints(dists)
sort.Strings(calls) sort.Strings(calls)
if len(calls) > 5 { if len(calls) > 5 {
calls = calls[:5] calls = calls[:5]
} }
return &Opening{ op := &Opening{
Band: band, Calls: len(seen), MedianKm: dists[len(dists)/2], Band: band, Calls: len(seen), MedianKm: dists[len(dists)/2],
BearingMin: lo, BearingMax: hi, Examples: calls, BearingMin: lo, BearingMax: hi, Examples: calls,
} }
op.Compass = compass(midBearing(lo, hi))
return op
} }
// arc returns the smallest compass sector containing every bearing, coping with // arc returns the smallest compass sector containing every bearing, coping with
// the wrap at north: 350° and 10° are 20° apart, not 340°. // the wrap at north: 350° and 10° are 20° apart, not 340°.
// densestSector returns the width-degree arc containing the most bearings, as
// its start, end and count.
//
// Brute force over each bearing as a starting edge. n is at most a few hundred
// distinct callsigns in a twelve-minute window, so n² is nothing, and it runs
// once per accepted spot rather than once per decode.
//
// The arc STARTS on a real bearing rather than sweeping every degree: the
// densest window can always be slid until its leading edge sits on a station, so
// nothing is missed and there are 360 fewer positions to try.
func densestSector(b []int, width int) (lo, hi, count int) {
if len(b) == 0 {
return 0, 0, 0
}
s := append([]int(nil), b...)
sort.Ints(s)
best, bestAt := 0, 0
for i, start := range s {
n := 0
for _, x := range s {
// Distance clockwise from start to x, so the wrap through 0° needs no
// special case — which is where the old arc() logic earned its keep and
// this one has to match it.
d := x - start
if d < 0 {
d += 360
}
if d <= width {
n++
}
}
if n > best {
best, bestAt = n, i
}
}
lo = s[bestAt]
// The end is the furthest station actually inside the window, not lo+width:
// reporting an empty 90° when every station sits in the first 20° would
// overstate the opening's width by four times.
hi = lo
for _, x := range s {
d := x - lo
if d < 0 {
d += 360
}
if d <= width {
if e := (lo + d) % 360; d >= ((hi-lo)+360)%360 {
hi = e
}
}
}
return lo, hi, best
}
func arc(b []int) (lo, hi, spread int) { func arc(b []int) (lo, hi, spread int) {
if len(b) == 0 { if len(b) == 0 {
return 0, 0, 0 return 0, 0, 0
@@ -239,10 +326,25 @@ func InSeason(band string, t time.Time, lat float64) bool {
// Sector renders the bearing range for a human, e.g. "NE (3575°)". // Sector renders the bearing range for a human, e.g. "NE (3575°)".
func (o *Opening) Sector() string { func (o *Opening) Sector() string {
return compass(float64(o.BearingMin+o.BearingMax)/2) + return compass(midBearing(o.BearingMin, o.BearingMax)) +
" (" + strconv.Itoa(o.BearingMin) + "" + strconv.Itoa(o.BearingMax) + "°)" " (" + strconv.Itoa(o.BearingMin) + "" + strconv.Itoa(o.BearingMax) + "°)"
} }
// midBearing is the middle of the arc running CLOCKWISE from min to max.
//
// Not the arithmetic mean, which is wrong for every sector crossing north and
// wrong by the worst possible amount: an opening reported as 35361° averaged to
// 207° and was announced as SW when it was NE — the exact opposite direction, to
// an operator who might turn a beam on it. The detector itself has handled the
// 0/360 wrap since it was written; only this label did not.
func midBearing(min, max int) float64 {
span := max - min
if span < 0 {
span += 360
}
return math.Mod(float64(min)+float64(span)/2, 360)
}
func compass(deg float64) string { func compass(deg float64) string {
names := []string{"N", "NE", "E", "SE", "S", "SW", "W", "NW"} names := []string{"N", "NE", "E", "SE", "S", "SW", "W", "NW"}
i := int(math.Round(deg/45)) % 8 i := int(math.Round(deg/45)) % 8
+126
View File
@@ -1,6 +1,7 @@
package bandopen package bandopen
import ( import (
"strings"
"testing" "testing"
"time" "time"
) )
@@ -182,3 +183,128 @@ func TestBearingArcWrapsAtNorth(t *testing.T) {
t.Errorf("bearings on all four quadrants should span nearly the circle, got %d", s) t.Errorf("bearings on all four quadrants should span nearly the circle, got %d", s)
} }
} }
// Multi-hop must be detected, not thrown away.
//
// The detector used to cap paths at 2400 km, on the reasoning that past one hop
// the bearing test stops meaning anything. Nexus flagged a 6 m opening at
// 5477 km that OpsLog never saw: the spots were discarded before any test ran.
// Multi-hop Es is directional — a second hop leaves the sector the first one
// entered — so distance is not what tells an opening from noise. The sector is.
func TestMultiHopOpeningIsDetected(t *testing.T) {
d := New(DefaultConfig())
base := time.Date(2026, 6, 15, 18, 0, 0, 0, time.UTC)
var got *Opening
for i, call := range []string{"LU1AA", "PY2BB", "LU3CC", "PY4DD"} {
if op := d.Add(Spot{
Call: call, Band: "6m",
DistKm: 5400 + i*40, // double hop, far past the old ceiling
Bearing: +i * 5, // one sector, as a real cloud illuminates
At: base.Add(time.Duration(i) * time.Minute),
}, 47.0); op != nil {
got = op
}
}
if got == nil {
t.Fatal("a four-station 5400 km burst in one sector was not reported as an opening")
}
if got.Band != "6m" {
t.Errorf("band = %q, want 6m", got.Band)
}
}
// The floor stays: a short path says nothing about the ionosphere.
func TestGroundWaveIsStillIgnored(t *testing.T) {
d := New(DefaultConfig())
base := time.Date(2026, 6, 15, 18, 0, 0, 0, time.UTC)
for i, call := range []string{"F1AA", "F2BB", "F3CC", "F4DD"} {
if op := d.Add(Spot{
Call: call, Band: "6m", DistKm: 120, Bearing: 90,
At: base.Add(time.Duration(i) * time.Minute),
}, 47.0); op != nil {
t.Fatalf("a 120 km burst was reported as an opening: %+v", op)
}
}
}
// A sector crossing north must not be labelled by its opposite.
//
// Sector() averaged the two bearings arithmetically, so 35361° — plainly north
// — came out as (353+61)/2 = 207°, announced as SW. The worst possible error:
// not vague, but exactly reversed, to an operator who may turn a beam on it.
func TestSectorAcrossNorth(t *testing.T) {
cases := []struct {
min, max int
want string
}{
{353, 61, "NE"}, // the one seen in the field
{303, 11, "NW"}, // the other one
{35, 75, "NE"}, // no wrap, unchanged
{170, 190, "S"}, // due south, no wrap
{340, 20, "N"}, // straddling north evenly
{260, 300, "W"}, // due west
}
for _, c := range cases {
o := Opening{BearingMin: c.min, BearingMax: c.max}
got := o.Sector()
if !strings.HasPrefix(got, c.want+" ") {
t.Errorf("Sector(%d%d°) = %q, want it to start with %q", c.min, c.max, got, c.want)
}
}
}
// A band open in one direction must be found THROUGH the everyday noise.
//
// The detector used to demand that every station fit inside one 90° arc. On 10
// and 12 m with F2 open, reports arrive from all round the compass, the arc is
// 360°, and the test could never pass: the busier the band, the less likely an
// opening was announced. Reported from the field — 70 000 decodes, 10 and 12 m
// plainly open, nothing said.
func TestOpeningFoundThroughAllRoundNoise(t *testing.T) {
d := New(DefaultConfig())
base := time.Date(2026, 8, 11, 14, 0, 0, 0, time.UTC)
// Four stations concentrated to the south-west — the opening.
south := []struct {
call string
deg int
}{{"PY2AA", 220}, {"LU3BB", 228}, {"PY5CC", 235}, {"CX4DD", 240}}
// And the usual Europeans scattered everywhere, which is what used to veto it.
noise := []struct {
call string
deg int
}{{"DL1XX", 40}, {"SM2YY", 20}, {"EA3ZZ", 190}, {"UA9QQ", 70}, {"G4WW", 320}}
var got *Opening
for i, s := range noise {
d.Add(Spot{Call: s.call, Band: "10m", DistKm: 1200, Bearing: s.deg,
At: base.Add(time.Duration(i) * time.Second)}, 47.0)
}
for i, s := range south {
if op := d.Add(Spot{Call: s.call, Band: "10m", DistKm: 9800, Bearing: s.deg,
At: base.Add(time.Duration(10+i) * time.Second)}, 47.0); op != nil {
got = op
}
}
if got == nil {
t.Fatal("an opening concentrated to the SW was not found among stations all round the compass")
}
mid := midBearing(got.BearingMin, got.BearingMax)
if mid < 200 || mid > 260 {
t.Errorf("sector middle %.0f° — the reported sector is not the busy one (%d%d°)",
mid, got.BearingMin, got.BearingMax)
}
}
// Stations evenly all round the compass and nothing concentrated: still nothing.
// The point of the change was to stop requiring global agreement, not to start
// calling every busy band an opening.
func TestScatteredBandIsNotAnOpening(t *testing.T) {
d := New(DefaultConfig())
base := time.Date(2026, 8, 11, 14, 0, 0, 0, time.UTC)
for i, deg := range []int{0, 60, 120, 180, 240, 300} {
if op := d.Add(Spot{Call: string(rune('A'+i)) + "1AAA", Band: "10m",
DistKm: 3000, Bearing: deg, At: base.Add(time.Duration(i) * time.Second)}, 47.0); op != nil {
t.Fatalf("evenly scattered stations were called an opening: %+v", op)
}
}
}
+25
View File
@@ -200,6 +200,31 @@ func (m *Manager) SetPTT(on bool) error {
return m.exec(func(b Backend) error { return b.SetPTT(on) }) return m.exec(func(b Backend) error { return b.SetPTT(on) })
} }
// splitSetter is implemented by the backends that can arm split AND place the
// transmit frequency. Both together: arming without setting the dial transmits
// on whatever the transmit VFO happened to hold, which is worse than refusing.
type splitSetter interface {
SetSplit(on bool, txHz int64) error
}
// SetSplit arms or clears split on the rig, with the transmit frequency.
//
// Returns a plain error on a backend that cannot do it, and that is the point.
// The shared-CAT server used to answer "done" to WSJT-X's split commands while
// doing nothing at all — the software then believed it was transmitting up the
// band when it was transmitting on the DX's own frequency. A refusal WSJT-X can
// report is worth far more than a success it cannot check.
func (m *Manager) SetSplit(on bool, txHz int64) error {
return m.exec(func(b Backend) error {
s, ok := b.(splitSetter)
if !ok {
return fmt.Errorf("cat: this radio's backend cannot set split from software — " +
"use Split Operating: Fake It in WSJT-X/JTDX, or set split on the radio itself")
}
return s.SetSplit(on, txHz)
})
}
// SpotInfo is one cluster spot to render on a backend that supports a spot // SpotInfo is one cluster spot to render on a backend that supports a spot
// overlay (the FlexRadio panadapter). Color is an optional "#AARRGGBB" string; // overlay (the FlexRadio panadapter). Color is an optional "#AARRGGBB" string;
// the backend picks a default when it's empty. (Status-based colouring can be // the backend picks a default when it's empty. (Status-based colouring can be
+101 -5
View File
@@ -130,8 +130,30 @@ type Kenwood struct {
tx bool tx bool
txAt time.Time txAt time.Time
lastState RigState lastState RigState
// ifRejects counts consecutive "?;" answers to IF;. See State().
ifRejects int
} }
// errRigRejected marks a "?;" — the rig understood the frame and declined it.
// Distinct from a serial fault on purpose: one is "ask again in a moment", the
// other is "the link is gone", and collapsing them is what dropped CAT sharing.
var errRigRejected = errors.New("rejected by rig")
// ifRejectGrace is how many consecutive "?;" answers to IF; are ridden out
// before the link is called dead.
//
// A Kenwood answers "?;" while it is busy — the tail of a transmission, a menu
// open on the front panel. The TS-590SG does it for a moment after RX;, which is
// exactly when the poll resumes: WSJT-X keyed through shared CAT, dropped PTT,
// and the very next IF; came back "?;". One rejected poll then tore down the
// whole link, WSJT-X lost the rig, and Hamlib went on to send an uninitialised
// frequency (2^63) that OpsLog rightly refused — an alarming error message whose
// real cause was three lines earlier in the log.
//
// Three at 250 ms is under a second of tolerance: long enough for the rig to
// finish whatever it was doing, far too short to hide an unplugged cable.
const ifRejectGrace = 3
// SetLowerLines chooses whether DTR and RTS are deasserted on connect. Set // SetLowerLines chooses whether DTR and RTS are deasserted on connect. Set
// before Connect. // before Connect.
func (k *Kenwood) SetLowerLines(v bool) { func (k *Kenwood) SetLowerLines(v bool) {
@@ -281,8 +303,21 @@ func (k *Kenwood) ReadState() (RigState, error) {
} }
raw, err := k.ask("IF;") raw, err := k.ask("IF;")
if err != nil { if err != nil {
// A "?;" is the rig saying "busy", not "gone". Ride out a few and keep
// serving the last known state, so the CAT link the digital software keys
// through survives the moment after a transmission. A serial fault is NOT
// covered: that returns a different error and drops through at once.
if errors.Is(err, errRigRejected) && k.lastState.Connected && k.ifRejects < ifRejectGrace {
k.ifRejects++
debugLog.Printf("kenwood: IF; rejected (%d/%d) — rig busy, keeping the link", k.ifRejects, ifRejectGrace)
s := k.lastState
s.Connected = true
return s, nil
}
k.ifRejects = 0
return RigState{}, err return RigState{}, err
} }
k.ifRejects = 0
f, ok := parseKenwoodIF(raw) f, ok := parseKenwoodIF(raw)
if !ok { if !ok {
return RigState{}, fmt.Errorf("kenwood: unparsable IF frame %q", raw) return RigState{}, fmt.Errorf("kenwood: unparsable IF frame %q", raw)
@@ -342,16 +377,36 @@ func (k *Kenwood) ReadState() (RigState, error) {
f.Split = split f.Split = split
if f.Split { if f.Split {
// The transmit VFO is the other one. Read it rather than assume, and fall // The OTHER VFO is the one IF did not report. Read it rather than assume,
// back to simplex if it cannot be read: a wrong TX frequency is written // and fall back to simplex if it cannot be read: a wrong TX frequency is
// into the log, which is worse than showing no split at all. // written into the log, which is worse than showing no split at all.
other := "FB;" other := "FB;"
if f.VFO == "B" { if f.VFO == "B" {
other = "FA;" other = "FA;"
} }
var otherHz int64
if r, err := k.ask(other); err == nil { if r, err := k.ask(other); err == nil {
if hz, ok := parseKenwoodFreq(r, strings.TrimSuffix(other, ";")); ok && hz > 0 && hz != rx { if hz, ok := parseKenwoodFreq(r, strings.TrimSuffix(other, ";")); ok && hz > 0 && hz != rx {
tx = hz otherHz = hz
}
}
if otherHz > 0 {
// WHICH of the two is the transmit frequency depends on whether the rig
// is transmitting RIGHT NOW.
//
// IF reports the VFO "in use", and in split that is the RECEIVE VFO on
// receive and the TRANSMIT VFO on transmit. The code took it as the
// receive VFO always, so the moment the operator keyed up the two
// frequencies swapped: correct on receive, reversed on transmit, which
// is exactly how it was reported from a TS-590 on USB.
//
// It matters beyond the display. FreqHz is what a QSO is logged on, and
// a contact made in split would have gone into the log on the DX's
// frequency instead of the operator's.
if f.TX {
tx, rx = rx, otherHz
} else {
tx = otherHz
} }
} }
} }
@@ -458,6 +513,43 @@ func isKenwoodDataMode(mode string) bool {
return true return true
} }
// SetSplit arms or clears split, and when arming puts txHz on the transmit VFO.
//
// Both halves in one call on purpose. WSJT-X sends "split on, VFO B" and "VFO B
// to 14075300" as two commands, and honouring only the first is worse than
// honouring neither: split would arm on whatever VFO B happened to hold, so the
// operator transmits somewhere they never chose while the software reports
// exactly what they asked for. Nothing is armed here until the frequency is on
// the dial.
//
// FR selects the receive VFO, FT the transmit one — the same pair the poll loop
// already reads to detect split, so this writes what State() knows how to read.
func (k *Kenwood) SetSplit(on bool, txHz int64) error {
k.mu.Lock()
defer k.mu.Unlock()
if k.port == nil {
return fmt.Errorf("kenwood: not connected")
}
if !on {
// Transmit follows receive again. FR is left alone: which VFO the operator
// listens on is theirs to choose, and clearing split should not move them.
return k.write("FT0;")
}
if txHz <= 0 || txHz > 99_999_999_999 {
return fmt.Errorf("kenwood: split TX frequency %d out of the 11-digit CAT range", txHz)
}
// The transmit dial FIRST, then arm. Arming first would transmit on the old
// contents of VFO B for however long the next command takes to arrive — brief,
// but on the wrong frequency, and this runs the instant before a transmission.
if err := k.write(fmt.Sprintf("FB%011d;", txHz)); err != nil {
return err
}
if err := k.write("FR0;"); err != nil { // receive on A
return err
}
return k.write("FT1;") // transmit on B
}
func (k *Kenwood) SetPTT(on bool) error { func (k *Kenwood) SetPTT(on bool) error {
k.mu.Lock() k.mu.Lock()
defer k.mu.Unlock() defer k.mu.Unlock()
@@ -524,6 +616,10 @@ func (k *Kenwood) ask(cmd string) (string, error) {
k.rx = k.rx[i+1:] k.rx = k.rx[i+1:]
traceText("kenwood", "RX", frame) traceText("kenwood", "RX", frame)
if frame == "?;" { if frame == "?;" {
// Sentinel-wrapped so the poll loop can tell "the rig said no" apart
// from a serial fault. The two look identical as plain errors and must
// not be handled the same way: one means try again in a moment, the
// other means the link is gone.
// IF; and ID; are universal on Kenwood/Elecraft — a "?;" to them is a // IF; and ID; are universal on Kenwood/Elecraft — a "?;" to them is a
// transient "busy" (typically mid-transmit, or a menu open on the rig), // transient "busy" (typically mid-transmit, or a menu open on the rig),
// NOT "unsupported". Latching them off would blind the poll loop for // NOT "unsupported". Latching them off would blind the poll loop for
@@ -533,7 +629,7 @@ func (k *Kenwood) ask(cmd string) (string, error) {
k.unsupported[want] = true k.unsupported[want] = true
debugLog.Printf("kenwood: this rig does not support %q — not asking again", cmd) debugLog.Printf("kenwood: this rig does not support %q — not asking again", cmd)
} }
return "", fmt.Errorf("kenwood: %s rejected", want) return "", fmt.Errorf("kenwood: %s rejected: %w", want, errRigRejected)
} }
if strings.HasPrefix(frame, want) { if strings.HasPrefix(frame, want) {
return frame, nil return frame, nil
+25 -2
View File
@@ -29,7 +29,30 @@ const kenwoodCWChunk = 24
// kenwoodCWAllowed is what the keyer can send; anything else is dropped, since an // kenwoodCWAllowed is what the keyer can send; anything else is dropped, since an
// unsupported byte can abort the buffer and lose the rest of the message. // unsupported byte can abort the buffer and lose the rest of the message.
const kenwoodCWAllowed = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 /?.,-=+:;()" // The semicolon is deliberately absent: it TERMINATES a CAT frame. The TS-590
// manual says so outright for P2, and one in a macro would close the command
// early and leave the rest of the text to be read as commands of its own.
const kenwoodCWAllowed = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 /?.,-=+:()"
// padCW pads a piece to the fixed 24-character P2 a Kenwood demands.
//
// This is where CW over CAT failed on a TS-590SG. The KY command was written
// against Elecraft's, which takes a variable-length string, so "KY OH5CX;" went
// out and the radio answered "?;" — read as "this rig refuses CW over CAT", and
// the operator was told to go and buy a serial keyer.
//
// The TS-590 manual is explicit: P2 has a FIXED length of 24, and characters
// left blank are filled with spaces which are NOT keyed. So the padding costs
// nothing on air — it is simply the shape the command has to have.
//
// Elecraft is left variable-length: it accepts short strings, and padding there
// would key the trailing spaces as word gaps.
func (k *Kenwood) padCW(chunk string) string {
if k.elecraft || len(chunk) >= kenwoodCWChunk {
return chunk
}
return chunk + strings.Repeat(" ", kenwoodCWChunk-len(chunk))
}
// SendCW queues a message on the rig's keyer, fed in 24-character pieces, waiting // SendCW queues a message on the rig's keyer, fed in 24-character pieces, waiting
// for buffer room between pieces so a long macro doesn't lose its tail. // for buffer room between pieces so a long macro doesn't lose its tail.
@@ -51,7 +74,7 @@ func (k *Kenwood) SendCW(text string) error {
chunk := msg[:n] chunk := msg[:n]
msg = msg[n:] msg = msg[n:]
k.waitCWBuffer(3 * time.Second) k.waitCWBuffer(3 * time.Second)
if err := k.write("KY " + chunk + ";"); err != nil { if err := k.write("KY " + k.padCW(chunk) + ";"); err != nil {
return err return err
} }
if err := k.afterKY(); err != nil { if err := k.afterKY(); err != nil {
+42
View File
@@ -0,0 +1,42 @@
package cat
import (
"strings"
"testing"
)
// The TS-590 wants a FIXED 24-character P2. Sending the bare text is what made
// CW over CAT fail on a real TS-590SG: "KY OH5CX;" came back "?;", which OpsLog
// reported as "this radio rejected CW over CAT" and sent the operator off to buy
// a serial keyer he did not need.
func TestKenwoodCWPadsToTheFixedWidth(t *testing.T) {
k := &Kenwood{}
got := k.padCW("OH5CX")
if len(got) != kenwoodCWChunk {
t.Errorf("padCW(%q) is %d chars, want exactly %d — the rig rejects anything else",
"OH5CX", len(got), kenwoodCWChunk)
}
if got[:5] != "OH5CX" || strings.TrimRight(got, " ") != "OH5CX" {
t.Errorf("padCW = %q — the text must be intact and the rest spaces", got)
}
// A full piece is already the right width and must not grow.
full := strings.Repeat("A", kenwoodCWChunk)
if k.padCW(full) != full {
t.Error("a full 24-character piece was padded further")
}
// Elecraft takes variable length, and padding there would key the trailing
// spaces as word gaps.
e := &Kenwood{elecraft: true}
if e.padCW("OH5CX") != "OH5CX" {
t.Errorf("Elecraft piece was padded: %q", e.padCW("OH5CX"))
}
}
// ";" terminates a CAT frame. The manual forbids it in P2, and one arriving in a
// macro would close the command early and leave the rest to be read as commands.
func TestKenwoodCWDropsTheSemicolon(t *testing.T) {
if got := filterKenwoodCW("CQ; DE OH5CX"); strings.Contains(got, ";") {
t.Errorf("filterKenwoodCW kept a semicolon: %q", got)
}
}
+121 -1
View File
@@ -108,6 +108,9 @@ type ts2000 struct {
mode byte mode byte
onB bool onB bool
split bool split bool
// tx models the rig KEYED. On a real Kenwood in split, IF then reports the
// TRANSMIT VFO as the one in use — which is the whole point of the test below.
tx bool
// lazyIF models a rig that answers FR/FT correctly but never fills IF's // lazyIF models a rig that answers FR/FT correctly but never fills IF's
// split bit — the behaviour reported on a Flex through its Kenwood CAT // split bit — the behaviour reported on a Flex through its Kenwood CAT
// emulation, where the frequency reads perfectly and split never appears. // emulation, where the frequency reads perfectly and split never appears.
@@ -138,8 +141,12 @@ func (r *ts2000) answer(cmd string) string {
} }
// The catemu layout: IF | freq(11) | step(4) | RIT(±5) | 3 | mem(2) | // The catemu layout: IF | freq(11) | step(4) | RIT(±5) | 3 | mem(2) |
// rx/tx | mode | VFO | scan | split | tone | tone#(2) | shift | ; // rx/tx | mode | VFO | scan | split | tone | tone#(2) | shift | ;
txByte := 0
if r.tx {
txByte = 1
}
return fmt.Sprintf("IF%011d%04d%+06d%03d%02d%01d%c%c%01d%c%01d%02d%01d;", return fmt.Sprintf("IF%011d%04d%+06d%03d%02d%01d%c%c%01d%c%01d%02d%01d;",
cur, 0, 0, 0, 0, 0, r.mode, vfoDigit, 0, split, 0, 0, 0) cur, 0, 0, 0, 0, txByte, r.mode, vfoDigit, 0, split, 0, 0, 0)
case strings.HasPrefix(cmd, "FA") && len(cmd) > 3: case strings.HasPrefix(cmd, "FA") && len(cmd) > 3:
fmt.Sscanf(cmd, "FA%d;", &r.vfoA) fmt.Sscanf(cmd, "FA%d;", &r.vfoA)
return "" return ""
@@ -174,6 +181,19 @@ func dialTo(rig *ts2000) func() (serial.Port, error) {
} }
} }
// dialToBusy is dialTo with a hook that makes the rig answer "?;" instead —
// what a real Kenwood does while it is busy, rather than staying silent.
func dialToBusy(rig *ts2000, busy func(cmd string) bool) func() (serial.Port, error) {
return func() (serial.Port, error) {
return &fakeSerial{toRig: &strings.Builder{}, answer: func(cmd string) string {
if busy(cmd) {
return "?;"
}
return rig.answer(cmd)
}}, nil
}
}
func TestKenwoodAgainstEmulatedRig(t *testing.T) { func TestKenwoodAgainstEmulatedRig(t *testing.T) {
rig := &ts2000{vfoA: 14250000, vfoB: 14260000, mode: '2'} // 20 m USB rig := &ts2000{vfoA: 14250000, vfoB: 14260000, mode: '2'} // 20 m USB
k := NewKenwood("COM-TEST", 9600, "FT8") k := NewKenwood("COM-TEST", 9600, "FT8")
@@ -383,3 +403,103 @@ func TestKenwoodNoisyRigIsReportedAsNoiseNotSilence(t *testing.T) {
t.Errorf("error was %q — it should say data arrived, and quote it", err) t.Errorf("error was %q — it should say data arrived, and quote it", err)
} }
} }
// A "?;" to IF; must not tear the link down.
//
// The TS-590SG answers "?;" for a moment after coming out of transmit, which is
// exactly when the poll resumes. In the field that single rejected poll dropped
// the whole CAT link: WSJT-X, keying through shared CAT, lost the rig, and
// Hamlib then sent an uninitialised frequency (2^63) that OpsLog refused — an
// alarming error whose real cause was three lines earlier.
func TestKenwoodBusyRigKeepsTheLink(t *testing.T) {
rig := &ts2000{vfoA: 14250000, vfoB: 14260000, mode: '2'}
busy := 0
k := NewKenwood("COM-TEST", 9600, "FT8")
k.dialPort = dialToBusy(rig, func(cmd string) bool {
if strings.HasPrefix(cmd, "IF") && busy > 0 {
busy--
return true
}
return false
})
if err := k.Connect(); err != nil {
t.Fatalf("connect: %v", err)
}
defer k.Disconnect()
// One good read establishes the state the busy window will keep serving.
first, err := k.ReadState()
if err != nil || !first.Connected {
t.Fatalf("first read: %+v err=%v", first, err)
}
// Inside the grace: still connected, still reporting the last good frequency.
busy = ifRejectGrace
for i := 1; i <= ifRejectGrace; i++ {
s, err := k.ReadState()
if err != nil {
t.Fatalf("reject %d dropped the link: %v", i, err)
}
if !s.Connected || s.FreqHz != first.FreqHz {
t.Errorf("reject %d gave %+v — want the last good state, still connected", i, s)
}
}
// The rig answers again → the tolerance resets, so a later busy spell gets
// the full allowance instead of inheriting the previous one.
if s, err := k.ReadState(); err != nil || !s.Connected {
t.Fatalf("recovery read failed: %+v err=%v", s, err)
}
// Past the grace, a persistent refusal IS a fault and must surface.
busy = ifRejectGrace + 1
var lastErr error
for i := 0; i <= ifRejectGrace; i++ {
if _, lastErr = k.ReadState(); lastErr != nil {
break
}
}
if lastErr == nil {
t.Error("a rig refusing IF; forever was still reported as healthy")
}
}
// In split, the two frequencies must not swap the moment the operator keys up.
//
// IF reports the VFO "in use", and in split that is the RECEIVE VFO on receive
// and the TRANSMIT VFO on transmit. The backend took it as the receive VFO
// always, so everything read correctly until the PTT closed and then reversed —
// reported from a TS-590 on USB.
//
// It matters beyond the display: FreqHz is what a QSO is LOGGED on, so a split
// contact would have been logged on the DX's frequency instead of the operator's.
func TestKenwoodSplitDoesNotSwapOnTransmit(t *testing.T) {
rig := &ts2000{vfoA: 14200000, vfoB: 14205000, mode: '2', split: true}
k := NewKenwood("COM-TEST", 9600, "FT8")
k.dialPort = dialTo(rig)
if err := k.Connect(); err != nil {
t.Fatalf("connect: %v", err)
}
defer k.Disconnect()
// Receiving: IF reports VFO A, the receive dial.
s, err := k.ReadState()
if err != nil {
t.Fatalf("read on receive: %v", err)
}
if !s.Split || s.FreqHz != 14205000 || s.RxFreqHz != 14200000 {
t.Fatalf("on receive: split=%v tx=%d rx=%d — want tx 14205000, rx 14200000",
s.Split, s.FreqHz, s.RxFreqHz)
}
// Keyed: the rig switches to the transmit VFO and sets IF's TX byte.
rig.onB, rig.tx = true, true
s, err = k.ReadState()
if err != nil {
t.Fatalf("read on transmit: %v", err)
}
if s.FreqHz != 14205000 || s.RxFreqHz != 14200000 {
t.Errorf("on transmit: tx=%d rx=%d — the two swapped; want tx 14205000, rx 14200000",
s.FreqHz, s.RxFreqHz)
}
}
+84 -4
View File
@@ -27,6 +27,19 @@ const clublogBatchURL = "https://clublog.org/putlogs.php"
// must send a real, app-identifying User-Agent. // must send a real, app-identifying User-Agent.
const clublogUserAgent = "OpsLog/1.0 (+https://github.com/GregTroar/OpsLog)" const clublogUserAgent = "OpsLog/1.0 (+https://github.com/GregTroar/OpsLog)"
// looksLikeHTML reports a body that is a web page rather than an answer. Club
// Log serves its normal site for refusals and blocks, so this is what separates
// "here is what went wrong" from 4 KB of markup an operator cannot act on.
func looksLikeHTML(s string) bool {
l := strings.ToLower(strings.TrimSpace(s))
return strings.HasPrefix(l, "<!doctype html") || strings.HasPrefix(l, "<html")
}
// clublogDownloadURL is Club Log's ADIF export. Used ONLY to verify credentials
// (see TestClublog): it is the one authenticated endpoint that cannot change
// anything in the operator's log, which is what a test button must never do.
const clublogDownloadURL = "https://clublog.org/getadif.php"
// clublogAppAPIKey is OpsLog's Club Log *application* API key. Club Log // clublogAppAPIKey is OpsLog's Club Log *application* API key. Club Log
// requires an api parameter that identifies the client software (not the // requires an api parameter that identifies the client software (not the
// user) — the same way Log4OM embeds its own key — so we ship it baked in // user) — the same way Log4OM embeds its own key — so we ship it baked in
@@ -204,17 +217,84 @@ func stripHTMLBrief(s string) string {
// TestClublog validates the configured credentials by attempting a no-op // TestClublog validates the configured credentials by attempting a no-op
// style check. Club Log has no dedicated status endpoint, so we report the // style check. Club Log has no dedicated status endpoint, so we report the
// fields look complete; a real failure surfaces on the first upload. // fields look complete; a real failure surfaces on the first upload.
// TestClublog checks the credentials against Club Log, not against themselves.
//
// It used to verify that the three fields were non-empty and then report
// "Ready — <call> via <email>". Nothing was sent anywhere, so a wrong password
// produced exactly the same green message as a right one. That is worse than
// having no button: it is confidence the test never earned, and it cost an
// operator the one moment they were actually looking for the problem.
//
// The download endpoint is used because it is READ-ONLY: testing a password
// must not put a record into someone's log. Club Log answers a rejected login
// with 403 before sending any body, so the answer arrives immediately; on
// success the body is a log, and we read a few bytes and hang up rather than
// pull it down to prove a point.
func TestClublog(ctx context.Context, cfg ServiceConfig) (string, error) { func TestClublog(ctx context.Context, cfg ServiceConfig) (string, error) {
_ = ctx email := strings.TrimSpace(cfg.Email)
call := strings.ToUpper(strings.TrimSpace(cfg.Callsign))
switch { switch {
case strings.TrimSpace(cfg.Email) == "": case email == "":
return "", fmt.Errorf("clublog: account email not set") return "", fmt.Errorf("clublog: account email not set")
case cfg.Password == "": case cfg.Password == "":
return "", fmt.Errorf("clublog: password not set") return "", fmt.Errorf("clublog: password not set")
case strings.TrimSpace(cfg.Callsign) == "": case call == "":
return "", fmt.Errorf("clublog: logbook callsign not set") return "", fmt.Errorf("clublog: logbook callsign not set")
} }
return fmt.Sprintf("Ready — %s via %s", strings.ToUpper(strings.TrimSpace(cfg.Callsign)), strings.TrimSpace(cfg.Email)), nil
if ctx == nil {
ctx = context.Background()
}
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer cancel()
form := url.Values{}
form.Set("email", email)
form.Set("password", cfg.Password)
form.Set("call", call)
// No date filter. A "startyear=2099" was tried to keep the reply small, but
// Club Log answers an unrecognised request with the SAME 403 it uses for a
// refused login — so an unverified parameter would have made every correct
// password look wrong, which is the failure this whole change exists to end.
// The reply is capped at 4 KB and the body closed immediately instead; the
// status code arrives before any of it.
req, err := http.NewRequestWithContext(ctx, http.MethodPost, clublogDownloadURL, strings.NewReader(form.Encode()))
if err != nil {
return "", fmt.Errorf("clublog: build request: %w", err)
}
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
req.Header.Set("User-Agent", clublogUserAgent)
resp, err := (&http.Client{Timeout: 30 * time.Second}).Do(req)
if err != nil {
return "", fmt.Errorf("clublog: could not reach Club Log: %w", err)
}
defer resp.Body.Close()
body, _ := io.ReadAll(io.LimitReader(resp.Body, 4096))
msg := strings.TrimSpace(string(body))
switch resp.StatusCode {
case http.StatusOK:
return fmt.Sprintf("Ready — %s via %s (Club Log accepted the login)", call, email), nil
case http.StatusUnauthorized, http.StatusForbidden:
// Club Log refuses with its ordinary web page, not an error string, so the
// body is 4 KB of markup that says nothing to an operator. It goes to the
// log — that is where a real diagnosis happens — and the message says the
// one thing there is to do about it.
LogSink("clublog: login refused (http %d), body: %s", resp.StatusCode, msg)
return "", fmt.Errorf("Club Log refused the login — check the account e-mail, " +
"the password and the logbook callsign. They are the Club Log website's own credentials")
default:
LogSink("clublog: unexpected http %d, body: %s", resp.StatusCode, msg)
if looksLikeHTML(msg) {
return "", fmt.Errorf("clublog: Club Log answered with a web page (http %d) instead of a log — see the log file", resp.StatusCode)
}
if len(msg) > 200 {
msg = msg[:200] + "…"
}
return "", fmt.Errorf("clublog: http %d %s", resp.StatusCode, msg)
}
} }
// clublogPost performs the form POST and maps the HTTP status to a result. // clublogPost performs the form POST and maps the HTTP status to a result.
+26
View File
@@ -0,0 +1,26 @@
package extsvc
import "testing"
// Club Log answers a refused login with its ordinary web page. The operator must
// get a sentence they can act on, not four kilobytes of markup — that was the
// first thing reported once the test started working at all.
func TestLooksLikeHTML(t *testing.T) {
cases := []struct {
body string
want bool
}{
{"<!DOCTYPE html>\n<html lang='en'>…403 - Access denied…", true},
{" <html><head><title>403</title></head></html>", true},
{"<HTML>", true},
{"Invalid credentials", false},
{"", false},
// An ADIF answer must never be mistaken for a page.
{"<eoh>\n<call:5>F4BPO <band:3>20m <eor>", false},
}
for _, c := range cases {
if got := looksLikeHTML(c.body); got != c.want {
t.Errorf("looksLikeHTML(%.40q) = %v, want %v", c.body, got, c.want)
}
}
}
+24 -1
View File
@@ -277,10 +277,33 @@ func TestLoTW(cfg ServiceConfig, stationDataPath string) (string, error) {
if err != nil { if err != nil {
return "", fmt.Errorf("lotw: can't read station locations: %w", err) return "", fmt.Errorf("lotw: can't read station locations: %w", err)
} }
found := ""
for _, l := range locs { for _, l := range locs {
if strings.EqualFold(l.Name, loc) { if strings.EqualFold(l.Name, loc) {
return fmt.Sprintf("Ready — TQSL found, location %q (%s)", l.Name, l.Call), nil found = l.Call
break
} }
} }
if found == "" {
return "", fmt.Errorf("lotw: station location %q not found in TQSL", loc) return "", fmt.Errorf("lotw: station location %q not found in TQSL", loc)
} }
// LoTW is TWO credentials doing two jobs, and the button used to report only
// the first. Uploading goes through TQSL and is signed by the certificate —
// the website password is never involved, so a wrong one breaks nothing until
// the day confirmations are downloaded and nobody connects the two events.
//
// So the download login is tested separately, and said separately. A future
// "since" date makes LoTW return an empty report rather than the whole
// account: the credentials are what is being checked, not the log.
up := fmt.Sprintf("Ready — TQSL found, location %q (%s)", loc, found)
if strings.TrimSpace(cfg.Username) == "" || cfg.Password == "" {
return up + ". Download login not set — confirmations cannot be fetched.", nil
}
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
if _, err := DownloadLoTWConfirmations(ctx, nil, cfg, "2099-01-01", ""); err != nil {
return "", fmt.Errorf("%s — but the DOWNLOAD login failed: %w", up, err)
}
return up + ". Download login accepted.", nil
}
+69
View File
@@ -0,0 +1,69 @@
// Package geo is the one place that turns Maidenhead locators into positions,
// and positions into distances and bearings.
//
// It exists because there were about to be three copies. These functions lived
// in package main, which the internal packages cannot import, so the PSK
// Reporter watcher had its geometry injected from main and the web publisher
// was about to grow its own. A bearing that disagrees with itself between two
// panels is the kind of fault nobody reports, because each screen looks
// plausible on its own.
package geo
import (
"math"
"strings"
)
// GridToLatLon parses a Maidenhead locator (4 or 6 characters) and returns the
// centre of that square in degrees. ok=false on malformed input.
func GridToLatLon(grid string) (lat, lon float64, ok bool) {
g := strings.ToUpper(strings.TrimSpace(grid))
if len(g) < 4 {
return 0, 0, false
}
A := g[0] - 'A'
B := g[1] - 'A'
C := g[2] - '0'
D := g[3] - '0'
if A > 17 || B > 17 || C > 9 || D > 9 {
return 0, 0, false
}
lon = -180 + float64(A)*20 + float64(C)*2
lat = -90 + float64(B)*10 + float64(D)*1
if len(g) >= 6 {
E := g[4] - 'A'
F := g[5] - 'A'
if E <= 23 && F <= 23 {
lon += float64(E)*(5.0/60.0) + 2.5/60.0
lat += float64(F)*(2.5/60.0) + 1.25/60.0
return lat, lon, true
}
}
// 4-character locator: aim at the centre of the square.
lon += 1
lat += 0.5
return lat, lon, true
}
// HaversineKm returns the great-circle distance between two positions in
// kilometres. Mean Earth radius 6371 km.
func HaversineKm(lat1, lon1, lat2, lon2 float64) float64 {
const R = 6371.0
rad := math.Pi / 180.0
dLat := (lat2 - lat1) * rad
dLon := (lon2 - lon1) * rad
a := math.Sin(dLat/2)*math.Sin(dLat/2) +
math.Cos(lat1*rad)*math.Cos(lat2*rad)*math.Sin(dLon/2)*math.Sin(dLon/2)
return R * 2 * math.Atan2(math.Sqrt(a), math.Sqrt(1-a))
}
// DistanceBetweenGrids is the distance in kilometres between two locators,
// ok=false when either cannot be parsed.
func DistanceBetweenGrids(a, b string) (km float64, ok bool) {
lat1, lon1, ok1 := GridToLatLon(a)
lat2, lon2, ok2 := GridToLatLon(b)
if !ok1 || !ok2 {
return 0, false
}
return HaversineKm(lat1, lon1, lat2, lon2), true
}
+9 -2
View File
@@ -287,11 +287,18 @@ func wsjtSender(message string) (call string, isCQ bool, grid string) {
if len(f) > 2 && !looksLikeCall(f[1]) { if len(f) > 2 && !looksLikeCall(f[1]) {
idx = 2 idx = 2
} }
if idx < len(f) && looksLikeCall(f[idx]) { if idx < len(f) {
c := f[idx]
// A GRID sitting in the callsign slot means the real call was
// unparseable and the skip above went one word too far. JN36 has letters
// and digits and passes every shape test there is, so without this the
// station's grid gets logged, spotted and coloured as its callsign.
if looksLikeCall(c) && !isGridField(c) {
if idx+1 < len(f) && isGridField(f[idx+1]) { if idx+1 < len(f) && isGridField(f[idx+1]) {
grid = f[idx+1] grid = f[idx+1]
} }
return f[idx], true, grid return c, true, grid
}
} }
return "", true, "" return "", true, ""
} }
@@ -24,6 +24,9 @@ func TestWSJTSender(t *testing.T) {
{"CQ K1ABC FN42AB", "K1ABC", true, ""}, // 6-char: WSJT-X never sends it here {"CQ K1ABC FN42AB", "K1ABC", true, ""}, // 6-char: WSJT-X never sends it here
{"CQ K1ABC 73", "K1ABC", true, ""}, // bare sign-off {"CQ K1ABC 73", "K1ABC", true, ""}, // bare sign-off
{"CQ K1ABC SS42", "K1ABC", true, ""}, // S is past R — no such field {"CQ K1ABC SS42", "K1ABC", true, ""}, // S is past R — no such field
// An unknown word after CQ made the parser skip a slot; a grid passes every
// shape test a callsign does, so it came back AS the callsign.
{"CQ FOO JN36", "", true, ""},
// Non-callsign / free text → no sender. // Non-callsign / free text → no sender.
{"TNX 73 GL", "", false, ""}, {"TNX 73 GL", "", false, ""},
{"K1ABC RR73", "", false, ""}, // only one call + a token → 2nd token not a call {"K1ABC RR73", "", false, ""}, // only one call + a token → 2nd token not a call
+37 -2
View File
@@ -176,12 +176,20 @@ func (m *Manager) Lookup(ctx context.Context, callsign string) (Result, error) {
r.Callsign = call r.Callsign = call
r.Source = p.Name() r.Source = p.Name()
r.FetchedAt = time.Now().UTC() r.FetchedAt = time.Now().UTC()
// The home record's location is the operator's HOME, not where they // The home record's location is the operator's HOME — clear it so
// are portable now — clear it so cty.dat fills the real entity. // cty.dat fills in where they actually are.
//
// UNLESS the suffix says nothing about location. /QRP is a statement
// about power, not about place: M0BFS/QRP is M0BFS, at home, running
// five watts. Wiping the grid there threw away the one field the
// operator was looking the call up for, and it came back empty while
// the same lookup without the suffix answered perfectly.
if !saysNothingAboutLocation(call) {
r.Country, r.Continent = "", "" r.Country, r.Continent = "", ""
r.CQZ, r.ITUZ, r.DXCC = 0, 0, 0 r.CQZ, r.ITUZ, r.DXCC = 0, 0, 0
r.Lat, r.Lon = 0, 0 r.Lat, r.Lon = 0, 0
r.Grid, r.State, r.County = "", "", "" r.Grid, r.State, r.County = "", "", ""
}
fillFromDXCC(&r, dxcc) // entity/zones/lat-lon from the FULL (slashed) call fillFromDXCC(&r, dxcc) // entity/zones/lat-lon from the FULL (slashed) call
normalizeNames(&r) normalizeNames(&r)
_ = m.cache.Put(ctx, r) _ = m.cache.Put(ctx, r)
@@ -232,6 +240,33 @@ var LogSink = func(string, ...any) {}
// right and must be looked up exactly as entered. // right and must be looked up exactly as entered.
var opSuffixes = map[string]bool{"M": true, "MM": true, "AM": true, "P": true, "QRP": true} var opSuffixes = map[string]bool{"M": true, "MM": true, "AM": true, "P": true, "QRP": true}
// nonLocationSuffixes say nothing about WHERE the operator is.
//
// /QRP is a statement about power. /M and /P and their kin are not: mobile and
// portable both mean "somewhere other than the home station", which is exactly
// why the home record's location is discarded for them. Keeping that distinction
// is the difference between a grid that is stale and a grid that is absent.
var nonLocationSuffixes = map[string]bool{"QRP": true}
// saysNothingAboutLocation reports a call whose every suffix leaves the operator
// at their registered address — so the home record's location can be trusted.
func saysNothingAboutLocation(call string) bool {
parts := strings.Split(strings.ToUpper(strings.TrimSpace(call)), "/")
if len(parts) < 2 {
return false
}
base := strings.TrimSpace(parts[0])
if len(base) < 3 || !strings.ContainsAny(base, "0123456789") {
return false // "JW/OR1A": the first part is a prefix — a location change
}
for _, p := range parts[1:] {
if !nonLocationSuffixes[strings.TrimSpace(p)] {
return false
}
}
return true
}
// stripOpSuffix returns the bare callsign when call carries nothing but // stripOpSuffix returns the bare callsign when call carries nothing but
// operational suffixes ("F4LYI/M" → "F4LYI", true). Reports false for anything // operational suffixes ("F4LYI/M" → "F4LYI", true). Reports false for anything
// that changes entity or area ("JW/OR1A", "F4BPO/8"), and for a call whose base // that changes entity or area ("JW/OR1A", "F4BPO/8"), and for a call whose base
+27
View File
@@ -0,0 +1,27 @@
package lookup
import "testing"
// A grid came back empty for M0BFS/QRP while the same lookup without the suffix
// answered perfectly. The home-call pass wiped the location on the grounds that
// a portable operator is not at their registered address — true for /P and /M,
// and simply wrong for /QRP, which is a statement about power.
func TestSaysNothingAboutLocation(t *testing.T) {
keep := []string{"M0BFS/QRP", "f4bpo/qrp", "G0ABC/QRP"}
for _, c := range keep {
if !saysNothingAboutLocation(c) {
t.Errorf("%s: the home location should be kept — /QRP does not move anyone", c)
}
}
// These DO move the operator, or change the entity outright.
drop := []string{"F4BPO/P", "F4BPO/M", "F4BPO/MM", "F4BPO/AM", "JW/OR1A", "VP8/F4BPO", "F4BPO/8", "F4BPO"}
for _, c := range drop {
if saysNothingAboutLocation(c) {
t.Errorf("%s: the home location must NOT be trusted", c)
}
}
// A power suffix on top of a portable one still moves them.
if saysNothingAboutLocation("F4BPO/P/QRP") {
t.Error("F4BPO/P/QRP is portable — location must not be kept")
}
}
+264
View File
@@ -0,0 +1,264 @@
// Package pskr subscribes to PSK Reporter's MQTT feed and turns it into the
// spots the band-opening detector already eats.
//
// Why this exists at all: the detector was fed from the DX cluster and the RBN,
// and on VHF that is a few hundred skimmers, nearly all of them on HF. A 6 m
// opening carrying 869 stations reached OpsLog as a handful of spots, or none.
// PSK Reporter is every ordinary station running WSJT-X and reporting what it
// decodes — the difference is two orders of magnitude, not a threshold.
//
// The feed's shape happens to suit us exactly:
//
// topic pskr/filter/v2/<band>/<mode>/<tx call>/<rx call>/...
// payload {"f":50313000,"md":"FT8","rp":-12,"sc":"F4BPO","sl":"JN36",
// "rc":"OH5CX","rl":"KP30","b":"6m"}
//
// BOTH grids are in the message, so distance and bearing are arithmetic. No
// lookup, no DXCC-centre approximation, no extra network call — which is what
// made the cluster path's bearings coarse.
//
// Volume is the real design constraint. Six metres open is thousands of
// messages a minute, and OpsLog runs on some very old PCs. So: no history is
// kept here, nothing is persisted, each message is parsed and handed on or
// dropped, and the callback does the deciding.
package pskr
import (
"encoding/json"
"fmt"
"strings"
"sync"
"time"
mqtt "github.com/eclipse/paho.mqtt.golang"
)
// DefaultBroker is PSK Reporter's public MQTT endpoint, TLS.
const DefaultBroker = "tls://mqtt.pskreporter.info:1884"
// DefaultNearKm is the radius that counts as "around here" for a receiver.
const DefaultNearKm = 300
// Bands offered. Anything below 10 m is deliberately absent, 12 m included: an
// "opening" on 20 m is the normal state of the band and announcing it says
// nothing, and 12 m is close enough to that at this point in the cycle to be the
// same problem. These are the bands where an opening is an event.
//
// Fewer subscriptions is also less traffic, which matters here: the operator's
// PC pays for every message the broker sends, whether or not anything comes of it.
var Bands = []string{"10m", "6m", "4m", "2m"}
// Spot is one decode, already reduced to what a detector needs.
type Spot struct {
Call string // the transmitting station
Band string
Mode string
Grid string // transmitter's grid, 4 characters
DistKm int // from the operator
Bearing int // degrees from the operator, short path
At time.Time
}
// Config is what the watcher needs to run.
type Config struct {
Broker string
Bands []string
// OpLat/OpLon are the operator's position: every spot is measured from it,
// so with no position there is nothing to measure and the watcher stays down.
OpLat, OpLon float64
// NearKm is how close a RECEIVER must be to count as "around here". A report
// collected further away proves a path that is not the operator's.
//
// 300 km by default: far enough to borrow the ears of a whole region, which
// is the point — an opening reaches an area, not a postcode, and waiting for
// a decode at one's own station is just working the band. Close enough that
// the ionosphere doing something there is the ionosphere doing it here.
NearKm int
// Geo turns two grids into distance and bearing. Injected rather than
// implemented here so it stays the SAME arithmetic the cluster path uses —
// two answers for one question is how a bearing quietly becomes wrong.
Geo func(grid string) (distKm int, bearing int, ok bool)
// OnSpot receives every accepted decode. Called from the MQTT goroutine, so
// it must not block: the broker's buffer is what pays for it if it does.
OnSpot func(Spot)
Logf func(string, ...any)
}
// Watcher owns the MQTT connection and its subscriptions.
type Watcher struct {
mu sync.Mutex
cfg Config
client mqtt.Client
running bool
// received counts accepted spots since start, for the status panel: a
// connection that is up but silent looks identical to one that is working
// until you can see a number moving.
received uint64
lastAt time.Time
lastErr string
}
func New(cfg Config) *Watcher {
if cfg.Broker == "" {
cfg.Broker = DefaultBroker
}
if len(cfg.Bands) == 0 {
cfg.Bands = Bands
}
if cfg.NearKm <= 0 {
cfg.NearKm = DefaultNearKm
}
if cfg.Logf == nil {
cfg.Logf = func(string, ...any) {}
}
return &Watcher{cfg: cfg}
}
// Start connects and subscribes. Safe to call when already running.
func (w *Watcher) Start() error {
w.mu.Lock()
defer w.mu.Unlock()
if w.running {
return nil
}
if w.cfg.Geo == nil || w.cfg.OnSpot == nil {
return fmt.Errorf("pskr: Geo and OnSpot are required")
}
opts := mqtt.NewClientOptions().
AddBroker(w.cfg.Broker).
// A stable client id would collide with another OpsLog on the same
// account; the broker is anonymous, so uniqueness is ours to provide.
SetClientID(fmt.Sprintf("opslog-%d", time.Now().UnixNano())).
SetCleanSession(true).
SetAutoReconnect(true).
SetConnectRetry(true).
SetConnectRetryInterval(30 * time.Second).
SetConnectTimeout(15 * time.Second).
// No message is worth keeping if we cannot handle it now: an opening is
// a thing happening at this moment, and a queue of stale decodes would
// announce one that finished twenty minutes ago.
SetOrderMatters(false)
opts.OnConnect = func(c mqtt.Client) {
w.cfg.Logf("pskr: connected to %s", w.cfg.Broker)
for _, b := range w.cfg.Bands {
// Every mode, every pair of stations, on this band. That firehose IS
// the point: the detector's job is to find the shape in it.
topic := "pskr/filter/v2/" + b + "/#"
if tok := c.Subscribe(topic, 0, w.handle); tok.Wait() && tok.Error() != nil {
w.cfg.Logf("pskr: subscribe %s failed: %v", topic, tok.Error())
continue
}
w.cfg.Logf("pskr: watching %s", topic)
}
}
opts.OnConnectionLost = func(_ mqtt.Client, err error) {
w.mu.Lock()
w.lastErr = err.Error()
w.mu.Unlock()
w.cfg.Logf("pskr: connection lost: %v (will retry)", err)
}
c := mqtt.NewClient(opts)
// Deliberately NOT waiting on the connect token: the broker may be slow or
// unreachable and startup must not hang on a feature that is decoration.
// ConnectRetry brings it up in the background when it can.
c.Connect()
w.client = c
w.running = true
return nil
}
// Stop disconnects. Safe to call when already stopped.
func (w *Watcher) Stop() {
w.mu.Lock()
c, running := w.client, w.running
w.client, w.running = nil, false
w.mu.Unlock()
if running && c != nil {
c.Disconnect(250)
}
}
// wire is the payload as PSK Reporter sends it — short keys, no nesting.
type wire struct {
Freq int64 `json:"f"`
Mode string `json:"md"`
SNR int `json:"rp"`
TxCall string `json:"sc"`
TxGrid string `json:"sl"`
RxCall string `json:"rc"`
RxGrid string `json:"rl"`
Band string `json:"b"`
}
func (w *Watcher) handle(_ mqtt.Client, m mqtt.Message) {
var p wire
if err := json.Unmarshal(m.Payload(), &p); err != nil {
return // malformed payloads are not worth a log line at this rate
}
call := strings.ToUpper(strings.TrimSpace(p.TxCall))
grid := strings.ToUpper(strings.TrimSpace(p.TxGrid))
rxGrid := strings.ToUpper(strings.TrimSpace(p.RxGrid))
if call == "" || len(grid) < 4 || len(rxGrid) < 4 {
return
}
// THE RECEIVER HAS TO BE NEAR THE OPERATOR. This is the whole difference
// between a useful feed and a world map.
//
// A PSK Reporter message says "X was heard BY Y". Without this check, a
// station 1400 km from here heard by somebody in Japan counted as evidence
// of an opening — it proves the path from X to JAPAN, and says nothing at all
// about whether anything reaches this station. That is how a "2 m opening"
// came to be announced from a KX9X in the United States.
//
// Only reports collected by a receiver in the operator's own region show that
// signals are actually arriving HERE, which is the only question worth asking.
if rxDist, _, ok := w.cfg.Geo(rxGrid[:4]); !ok || rxDist > w.cfg.NearKm {
return
}
// The TRANSMITTER is the station on the air, so it is the transmitter's grid
// that gives the direction and length of the path that just proved itself.
dist, brg, ok := w.cfg.Geo(grid[:4])
if !ok {
return
}
s := Spot{
Call: call, Band: strings.ToLower(strings.TrimSpace(p.Band)),
Mode: strings.ToUpper(strings.TrimSpace(p.Mode)), Grid: grid[:4],
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.
At: time.Now(),
}
w.mu.Lock()
w.received++
w.lastAt = s.At
w.mu.Unlock()
w.cfg.OnSpot(s)
}
// Status is the snapshot the settings panel shows.
type Status struct {
Running bool `json:"running"`
Received uint64 `json:"received"`
LastAt time.Time `json:"last_at"`
LastErr string `json:"last_err,omitempty"`
Broker string `json:"broker"`
Bands []string `json:"bands"`
}
func (w *Watcher) Status() Status {
w.mu.Lock()
defer w.mu.Unlock()
st := Status{
Running: w.running, Received: w.received, LastAt: w.lastAt,
LastErr: w.lastErr, Broker: w.cfg.Broker,
}
st.Bands = append(st.Bands, w.cfg.Bands...)
return st
}
+26
View File
@@ -0,0 +1,26 @@
package qso
import "testing"
// Mode, submode and RST are repair fields: an import that mapped every contact
// to SSB, or an ADIF that carried no MODE, is fixed in one pass instead of one
// row at a time. They were excluded as "per-QSO", which confused describing a
// QSO with repairing a batch of them.
func TestModeAndRSTAreBulkEditable(t *testing.T) {
for _, col := range []string{"mode", "submode", "rst_sent", "rst_rcvd"} {
if !bulkEditableCols[col] {
t.Errorf("%s should be bulk-editable", col)
}
}
}
// Band must NOT be bulk-editable on its own: it travels with the frequency
// through BulkSetFrequency. A band contradicting its own frequency is invalid
// ADIF, and every export would carry the contradiction out into the world.
func TestBandIsNotBulkEditableAlone(t *testing.T) {
for _, col := range []string{"band", "freq_hz", "callsign", "qso_date"} {
if bulkEditableCols[col] {
t.Errorf("%s must not be bulk-editable on its own", col)
}
}
}
+41
View File
@@ -0,0 +1,41 @@
package qso
import (
"strings"
"testing"
)
// "equals nothing" and "is empty" are the same question. SQL answers the first
// with nothing at all — a NULL never equals ” — so a filter written in plain
// words returned zero rows and looked broken rather than wrong.
func TestEqualsBlankMeansEmpty(t *testing.T) {
sql, args, err := conditionSQL(Condition{Field: "freq_hz", Op: "eq", Value: ""})
if err != nil {
t.Fatalf("eq blank: %v", err)
}
if len(args) != 0 || !strings.Contains(sql, "IS NULL") {
t.Errorf("sql = %q args = %v — want the empty test", sql, args)
}
sql, _, _ = conditionSQL(Condition{Field: "name", Op: "ne", Value: " "})
if !strings.Contains(sql, "<> ''") {
t.Errorf("ne blank on text gave %q — want the not-empty test", sql)
}
}
// A numeric column is empty when NULL *or* zero, and that must be explicit:
// SQLite compares 0 against ” as false while MySQL calls it true, so one
// expression would answer two different questions depending on the backend.
func TestEmptyOnNumericCoversZeroAndNull(t *testing.T) {
sql, _, err := conditionSQL(Condition{Field: "freq_hz", Op: "empty"})
if err != nil {
t.Fatalf("empty: %v", err)
}
if !strings.Contains(sql, "IS NULL") || !strings.Contains(sql, "= 0") {
t.Errorf("sql = %q — want both NULL and zero", sql)
}
// Text keeps the string test: '' is a real value there, 0 is not.
sql, _, _ = conditionSQL(Condition{Field: "name", Op: "empty"})
if !strings.Contains(sql, "IFNULL") || strings.Contains(sql, "= 0") {
t.Errorf("text empty gave %q", sql)
}
}
+57
View File
@@ -0,0 +1,57 @@
package qso
import (
"strings"
"testing"
)
// "2 m or 70 cm, in FT8, since January" could not be asked before: the filter
// joins every condition with ONE AND or OR, so AND killed the two bands and OR
// let every FT8 QSO through. The OR now lives inside a single condition.
func TestInConditionExpressesSeveralValuesForOneField(t *testing.T) {
sql, args, err := conditionSQL(Condition{Field: "band", Op: "in", Value: "2m, 70cm"})
if err != nil {
t.Fatalf("in: %v", err)
}
if !strings.Contains(sql, "IN (?,?)") {
t.Errorf("sql = %q, want an IN with two placeholders", sql)
}
if len(args) != 2 || args[0] != "2m" || args[1] != "70cm" {
t.Errorf("args = %v, want [2m 70cm] trimmed", args)
}
}
// A trailing comma while typing must not add an empty value that matches nothing.
func TestInIgnoresBlanks(t *testing.T) {
_, args, err := conditionSQL(Condition{Field: "mode", Op: "in", Value: "FT8, ,FT4,"})
if err != nil {
t.Fatalf("in: %v", err)
}
if len(args) != 2 {
t.Errorf("args = %v, want the two real values only", args)
}
}
// An empty list matches nothing. Dropping the condition instead would WIDEN the
// result set — the opposite of what someone typing a filter expects.
func TestEmptyInMatchesNothing(t *testing.T) {
sql, _, err := conditionSQL(Condition{Field: "band", Op: "in", Value: " , "})
if err != nil {
t.Fatalf("in: %v", err)
}
if sql != "1=0" {
t.Errorf("sql = %q, want 1=0", sql)
}
}
// NOT IN must keep rows whose column is NULL: the row is not one of the listed
// values, so it belongs in the answer. Raw SQL NOT IN drops them.
func TestNotInKeepsNulls(t *testing.T) {
sql, _, err := conditionSQL(Condition{Field: "band", Op: "notin", Value: "2m"})
if err != nil {
t.Fatalf("notin: %v", err)
}
if !strings.HasPrefix(sql, "IFNULL(") {
t.Errorf("sql = %q, want the column wrapped in IFNULL", sql)
}
}
+134 -8
View File
@@ -734,13 +734,26 @@ func (r *Repo) MarkEQSLSent(ctx context.Context, id int64, date string) error {
return nil return nil
} }
// bulkEditableCols whitelists the columns BulkSetField may write. Limited to // bulkEditableCols whitelists the columns BulkSetField may write.
// TEXT fields where setting one value across many QSOs is meaningful: the //
// per-service QSL/upload status fields, plus "my station"/operator fields that // Mostly TEXT fields where one value across many QSOs is meaningful: the
// are naturally constant across a run (grid, antenna, rig, address, …). It // per-service QSL/upload status fields, plus "my station"/operator fields
// deliberately excludes per-QSO fields (callsign, band, mode, date, RST, the // naturally constant across a run (grid, antenna, rig, address, …).
// contacted station's details) and numeric columns (power, zones, lat/lon), //
// which would be corrupted or meaningless if bulk-set to a single value. // Mode, submode and RST are here too, which the original rule excluded as
// "per-QSO". That rule confused two different things. Bulk edit is not for
// describing QSOs, it is for REPAIRING a batch — an import that mapped every
// contact to SSB, an ADIF with no MODE at all — and refusing to fix a hundred
// rows because a hundred rows should not normally share a value leaves the
// operator editing them one at a time.
//
// Band is NOT here, and frequency is not either: both go through
// BulkSetFrequency, which writes the pair together. A band that contradicts its
// own frequency is invalid ADIF, and every export would carry the contradiction.
//
// Still excluded, and this part of the rule stands: callsign and date, which
// identify the contact rather than describe it, and the numeric columns (power,
// zones, lat/lon) that are meaningless shared.
var bulkEditableCols = map[string]bool{ var bulkEditableCols = map[string]bool{
// QSL / upload status // QSL / upload status
"lotw_sent": true, "lotw_sent": true,
@@ -820,6 +833,14 @@ var bulkEditableCols = map[string]bool{
"iota": true, "iota": true,
"sig": true, "sig": true,
"sig_info": true, "sig_info": true,
// The contact itself. Repair fields: an import that mapped everything to SSB,
// or an ADIF that carried no MODE. Setting mode CLEARS submode (see
// BulkSetField) — a submode left over from the old mode contradicts the new
// one, and "FT8 / USB" is not a thing.
"mode": true,
"submode": true,
"rst_sent": true,
"rst_rcvd": true,
// Misc text // Misc text
"comment": true, "comment": true,
"notes": true, "notes": true,
@@ -843,8 +864,16 @@ func (r *Repo) BulkSetField(ctx context.Context, ids []int64, column, value stri
ph[i] = "?" ph[i] = "?"
args = append(args, id) args = append(args, id)
} }
set := column + " = ?, updated_at = ?"
if column == "mode" {
// A submode belongs to the mode it was recorded under. Left behind, it
// contradicts the new one — "FT8" with a submode of "USB" is not a thing,
// and it is the submode that most ADIF readers believe. Clearing it is the
// only outcome that leaves the row meaning what the operator asked for.
set += ", submode = ''"
}
res, err := r.db.ExecContext(ctx, res, err := r.db.ExecContext(ctx,
`UPDATE qso SET `+column+` = ?, updated_at = ? WHERE id IN (`+strings.Join(ph, ",")+`)`, `UPDATE qso SET `+set+` WHERE id IN (`+strings.Join(ph, ",")+`)`,
args...) args...)
if err != nil { if err != nil {
return 0, fmt.Errorf("bulk set %s: %w", column, err) return 0, fmt.Errorf("bulk set %s: %w", column, err)
@@ -867,6 +896,23 @@ var bulkEditableExtras = map[string]string{
// BulkExtraKey maps a frontend field id to its ADIF key in extras_json, or "". // BulkExtraKey maps a frontend field id to its ADIF key in extras_json, or "".
func BulkExtraKey(field string) string { return bulkEditableExtras[field] } func BulkExtraKey(field string) string { return bulkEditableExtras[field] }
// BulkEditable reports whether a COLUMN may be bulk-written. Exported so the
// app layer can check its own field mapping against this whitelist: the two
// lists are separate, valid on their own, and a field present in one and absent
// from the other fails only when an operator tries to use it.
func BulkEditable(column string) bool { return bulkEditableCols[column] }
// BulkEditableColumns lists every bulk-writable column, for the same check from
// the other side: a column nothing maps to looks supported and cannot be used.
func BulkEditableColumns() []string {
out := make([]string, 0, len(bulkEditableCols))
for c := range bulkEditableCols {
out = append(out, c)
}
sort.Strings(out)
return out
}
// BulkSetExtra sets one whitelisted extras_json field on every listed QSO, // BulkSetExtra sets one whitelisted extras_json field on every listed QSO,
// leaving the other extras untouched. An empty value REMOVES the key rather than // leaving the other extras untouched. An empty value REMOVES the key rather than
// storing a blank — an empty extra would otherwise be carried into every export. // storing a blank — an empty extra would otherwise be carried into every export.
@@ -1220,6 +1266,17 @@ var filterableColumns = map[string]bool{
// value compares on the date part (see conditionSQL) so day filters are exact. // value compares on the date part (see conditionSQL) so day filters are exact.
var dateColumns = map[string]bool{"qso_date": true, "qso_date_off": true} var dateColumns = map[string]bool{"qso_date": true, "qso_date_off": true}
// numericColumns are the filterable columns holding numbers rather than text.
//
// "Empty" means something different for them: NULL *or* zero. It has to be said
// explicitly because the two backends disagree — SQLite compares 0 against ”
// as false, MySQL calls it true — so one expression would quietly answer two
// different questions depending on where the logbook lives.
var numericColumns = map[string]bool{
"freq_hz": true, "freq_rx_hz": true, "dxcc": true, "cqz": true, "ituz": true,
"srx": true, "stx": true, "tx_pwr": true,
}
// bareDateRe matches a plain calendar date with no time component. // bareDateRe matches a plain calendar date with no time component.
var bareDateRe = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}$`) var bareDateRe = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}$`)
@@ -1289,6 +1346,23 @@ func columnExpr(field string) (string, bool) {
} }
// conditionSQL turns one condition into a parameterised predicate. // conditionSQL turns one condition into a parameterised predicate.
// splitList parses the comma-separated value of an "in" / "not in" condition.
//
// Blanks are dropped, so a trailing comma or a stray space while typing does not
// silently add an empty value that matches nothing. Case is left alone: the
// columns this is used on (band, mode, country) are stored in the case the log
// was written in, and forcing it here would break the ones that are not.
func splitList(v string) []string {
parts := strings.Split(v, ",")
out := make([]string, 0, len(parts))
for _, p := range parts {
if p = strings.TrimSpace(p); p != "" {
out = append(out, p)
}
}
return out
}
func conditionSQL(c Condition) (string, []any, error) { func conditionSQL(c Condition) (string, []any, error) {
col, ok := columnExpr(c.Field) col, ok := columnExpr(c.Field)
if !ok { if !ok {
@@ -1303,6 +1377,18 @@ func conditionSQL(c Condition) (string, []any, error) {
col = "substr(" + col + ",1,10)" col = "substr(" + col + ",1,10)"
v = strings.TrimSpace(v) v = strings.TrimSpace(v)
} }
// "equals nothing" and "is empty" are the same question, and SQL answers the
// first with nothing at all: a NULL never equals '', so a filter written that
// way returns zero rows and looks broken rather than wrong. Asking it in
// plain words is not a mistake worth punishing.
if strings.TrimSpace(v) == "" {
switch c.Op {
case "eq":
c.Op = "empty"
case "ne":
c.Op = "notempty"
}
}
switch c.Op { switch c.Op {
case "eq": case "eq":
return col + " = ?", []any{v}, nil return col + " = ?", []any{v}, nil
@@ -1322,9 +1408,49 @@ func conditionSQL(c Condition) (string, []any, error) {
return col + " LIKE ?", []any{v + "%"}, nil return col + " LIKE ?", []any{v + "%"}, nil
case "endswith": case "endswith":
return col + " LIKE ?", []any{"%" + v}, nil return col + " LIKE ?", []any{"%" + v}, nil
case "in", "notin":
// Several values for ONE field, comma-separated.
//
// This is what makes a real question expressible. The filter joins every
// condition with a single AND or OR, so "2 m or 70 cm, in FT8, since
// January" could not be asked: AND killed the two bands, OR let every FT8
// QSO through. Rather than grow the model nested groups — a tree in the UI
// to answer a question that is nearly always "this field, any of these
// values" — the OR lives INSIDE one condition and everything else keeps
// ANDing.
vals := splitList(v)
if len(vals) == 0 {
// An empty list matches nothing, which is the honest reading. Silently
// dropping the condition would widen the result set instead.
if c.Op == "in" {
return "1=0", nil, nil
}
return "1=1", nil, nil
}
ph := strings.TrimSuffix(strings.Repeat("?,", len(vals)), ",")
args := make([]any, 0, len(vals))
for _, s := range vals {
args = append(args, s)
}
if c.Op == "notin" {
// IFNULL, or a NULL column would fail "NOT IN" and vanish from the
// result — the row is not one of the listed values, so it belongs.
return "IFNULL(" + col + ",'') NOT IN (" + ph + ")", args, nil
}
return col + " IN (" + ph + ")", args, nil
case "empty": case "empty":
// A numeric column is empty when it is NULL *or* zero, and that has to be
// said explicitly: SQLite compares 0 against '' as false while MySQL calls
// it true, so IFNULL(col,'')='' quietly means different things on the two
// backends OpsLog supports.
if numericColumns[strings.ToLower(strings.TrimSpace(c.Field))] {
return "(" + col + " IS NULL OR " + col + " = 0)", nil, nil
}
return "IFNULL(" + col + ",'') = ''", nil, nil return "IFNULL(" + col + ",'') = ''", nil, nil
case "notempty": case "notempty":
if numericColumns[strings.ToLower(strings.TrimSpace(c.Field))] {
return "(" + col + " IS NOT NULL AND " + col + " <> 0)", nil, nil
}
return "IFNULL(" + col + ",'') <> ''", nil, nil return "IFNULL(" + col + ",'') <> ''", nil, nil
default: default:
return "", nil, fmt.Errorf("unknown operator %q", c.Op) return "", nil, fmt.Errorf("unknown operator %q", c.Op)
+146 -1
View File
@@ -49,6 +49,10 @@ type Rig interface {
SetFreq(hz int64) error SetFreq(hz int64) error
SetMode(mode string) error SetMode(mode string) error
SetPTT(on bool) error SetPTT(on bool) error
// SetSplit arms or clears split and places the transmit frequency. Returns an
// error on a rig that cannot: a refusal the client can report is worth far
// more than a success it has no way to check.
SetSplit(on bool, txHz int64) error
} }
type Server struct { type Server struct {
@@ -61,12 +65,24 @@ type Server struct {
conns map[net.Conn]struct{} conns map[net.Conn]struct{}
closed bool closed bool
// accepted counts every connection this listener has taken. Only selfTest
// reads it, to tell "a client reached us" from "a client reached someone
// else on our port".
accepted atomic.Int64
// ptt mirrors the last PTT state a client commanded via set_ptt. WSJT-X/JTDX // ptt mirrors the last PTT state a client commanded via set_ptt. WSJT-X/JTDX
// poll get_ptt DURING transmit to confirm the rig is keyed; if get_ptt reads // poll get_ptt DURING transmit to confirm the rig is keyed; if get_ptt reads
// RX they conclude PTT failed and abort the over after a second or two. We // RX they conclude PTT failed and abort the over after a second or two. We
// don't read PTT back from every backend, so echo what the client last set — // don't read PTT back from every backend, so echo what the client last set —
// always consistent with its own command, and enough to satisfy the check. // always consistent with its own command, and enough to satisfy the check.
ptt atomic.Bool ptt atomic.Bool
// pttKnown says ptt reflects a state we actually commanded, so a repeat can
// be told from the very first call — where the radio's state is unknown and
// the command must go through.
pttKnown atomic.Bool
// splitWanted remembers a set_split_vfo that arrived before the frequency it
// needs, so the pair can be honoured in the order the client sends them.
splitWanted atomic.Bool
} }
func New(port int, rig Rig, logf func(string, ...any)) *Server { func New(port int, rig Rig, logf func(string, ...any)) *Server {
@@ -109,15 +125,58 @@ func (s *Server) Start() error {
} }
return return
} }
s.accepted.Add(1)
s.mu.Lock() s.mu.Lock()
s.conns[c] = struct{}{} s.conns[c] = struct{}{}
s.mu.Unlock() s.mu.Unlock()
go s.serve(c) go s.serve(c)
} }
}() }()
go s.selfTest()
return nil return nil
} }
// selfTest checks that a client connecting to 127.0.0.1:<port> actually reaches
// THIS listener, and says so in the log when it does not.
//
// Binding successfully is not the same as being reachable. OpsLog listens on
// 0.0.0.0, and Windows lets a second program bind the SAME port on the specific
// address 127.0.0.1. Connections to localhost then go to the MORE SPECIFIC
// listener — the other program — while ours sits there having logged "sharing
// CAT on port 4532" and never seeing a single client.
//
// Seen in the field with Nexus, which starts its own rigctld on 127.0.0.1:4532
// and connects to it. Neither program reports anything wrong; the operator gets
// a CAT timeout from a daemon with no radio behind it, and OpsLog's log is
// silent because nothing ever arrived. Three exchanges went into finding that,
// so it is worth one line at startup.
//
// The counter can only be raised by our own accept loop, so a real client
// arriving during the probe makes this pass, never fail wrongly.
func (s *Server) selfTest() {
before := s.accepted.Load()
addr := fmt.Sprintf("127.0.0.1:%d", s.port)
c, err := net.DialTimeout("tcp", addr, 2*time.Second)
if err != nil {
s.log("rigctld: WARNING — could not reach our own CAT port at %s (%v); "+
"clients on this PC will not find OpsLog", addr, err)
return
}
defer c.Close()
// Give the accept loop a moment: the dial returns as soon as the handshake
// completes, which can be marginally before Accept hands the connection over.
for i := 0; i < 20; i++ {
if s.accepted.Load() > before {
return // it reached us — nothing to say
}
time.Sleep(50 * time.Millisecond)
}
s.log("rigctld: WARNING — another program is already answering on %s. "+
"It will receive the CAT connections meant for OpsLog, which will look "+
"like a timeout in that program and silence here. Close it, or move "+
"OpsLog's shared CAT to a different port.", addr)
}
// releasePTT drops the transmitter when whoever was holding it goes away. // releasePTT drops the transmitter when whoever was holding it goes away.
// //
// Nothing else will. The Kenwood/Elecraft backend deliberately suspends its // Nothing else will. The Kenwood/Elecraft backend deliberately suspends its
@@ -224,6 +283,24 @@ func (s *Server) handle(line string) (resp string, quit bool) {
return "CHKVFO 0\n", false return "CHKVFO 0\n", false
case "\\get_powerstat", "get_powerstat": case "\\get_powerstat", "get_powerstat":
return "1\n", false return "1\n", false
// Three commands a client may issue as a matter of course. Refusing them with
// RPRT -11 is allowed, and a tolerant client carries on — but nothing obliges
// it to, and Nexus sends all three around every transmit. Answering costs
// nothing and removes them as suspects when something really is wrong.
case "\\get_lock_mode", "get_lock_mode":
// Truthful: OpsLog never locks the dial against its own clients.
return "0\n", false
case "\\set_lock_mode", "set_lock_mode":
// Accepted and ignored, like set_vfo below: there is no lock to set, and
// failing here would abort a client's whole transmit sequence over a
// setting that has no effect either way.
return rprt(0), false
case "\\stop_morse", "stop_morse":
// Nothing is queued here — CW over CAT is keyed by the rig's own keyer
// through the backend, not buffered in this server. "Stopped" is therefore
// accurate rather than polite.
return rprt(0), false
case "q", "Q", "\\quit": case "q", "Q", "\\quit":
return "", true return "", true
@@ -275,11 +352,27 @@ func (s *Server) handle(line string) (resp string, quit bool) {
return rprt(-1), false return rprt(-1), false
} }
on := args[0] != "0" on := args[0] != "0"
// Only touch the radio on a CHANGE.
//
// A client is free to restate PTT as often as it likes, and one does:
// Nexus sends set_ptt 0 about sixteen times a second, so the Flex was
// getting "xmit 0" every 60 ms forever. Worse than wasteful — its own
// "xmit 1" landed between two of them and was overwritten in the same
// millisecond, so the radio never stayed keyed and the operator saw a
// transmit request that simply did nothing.
//
// Repeating a state is not a request to change it. The first call always
// goes through, since we cannot know how the radio was left.
if s.pttKnown.Load() && s.ptt.Load() == on {
return rprt(0), false
}
if err := s.rig.SetPTT(on); err != nil { if err := s.rig.SetPTT(on); err != nil {
s.log("rigctld: set_ptt %v failed: %v", on, err) s.log("rigctld: set_ptt %v failed: %v", on, err)
return rprt(-9), false return rprt(-9), false
} }
s.ptt.Store(on) s.ptt.Store(on)
s.pttKnown.Store(true)
s.log("rigctld: PTT %s", map[bool]string{true: "ON", false: "off"}[on])
return rprt(0), false return rprt(0), false
case "v", "\\get_vfo": case "v", "\\get_vfo":
@@ -297,7 +390,31 @@ func (s *Server) handle(line string) (resp string, quit bool) {
} }
return fmt.Sprintf("%d\nVFOB\n", n), false return fmt.Sprintf("%d\nVFOB\n", n), false
case "S", "\\set_split_vfo": case "S", "\\set_split_vfo":
return rprt(0), false // see set_vfo — split is driven from the rig // "S <0|1> <VFO>". The VFO argument is ignored: which dial transmits is the
// rig's own business, and every backend here puts it on the second one.
//
// This used to answer RPRT 0 and do NOTHING. WSJT-X in "Split Operating:
// Rig" sends this and set_split_freq, believed both, and transmitted on the
// RECEIVE frequency — on a pileup, straight onto the DX, while the software
// showed exactly what the operator had asked for. A lie that leaves no
// trace anywhere is the worst kind of bug, so it now works or says so.
if len(args) < 1 {
return rprt(-1), false
}
if args[0] != "0" {
// Arming needs a frequency, and WSJT-X sends set_split_freq AFTER this.
// Remember the request and let that command do the work: alone, this
// would arm split on whatever the transmit VFO happens to hold.
s.splitWanted.Store(true)
return rprt(0), false
}
s.splitWanted.Store(false)
if err := s.rig.SetSplit(false, 0); err != nil {
s.log("rigctld: split off failed: %v", err)
return rprt(-9), false
}
s.log("rigctld: split off")
return rprt(0), false
case "i", "\\get_split_freq": case "i", "\\get_split_freq":
_, tx := s.rig.Split() _, tx := s.rig.Split()
if tx <= 0 { if tx <= 0 {
@@ -305,9 +422,37 @@ func (s *Server) handle(line string) (resp string, quit bool) {
} }
return fmt.Sprintf("%d\n", tx), false return fmt.Sprintf("%d\n", tx), false
case "I", "\\set_split_freq": case "I", "\\set_split_freq":
if len(args) < 1 {
return rprt(-1), false
}
// Hamlib sends a float ("14075300.000000"), so parse as one.
hz, err := strconv.ParseFloat(args[0], 64)
if err != nil || hz <= 0 {
return rprt(-1), false
}
if err := s.rig.SetSplit(true, int64(hz)); err != nil {
s.log("rigctld: split TX %.0f Hz failed: %v", hz, err)
return rprt(-9), false
}
s.splitWanted.Store(true)
s.log("rigctld: split ON, TX %.0f Hz", hz)
return rprt(0), false return rprt(0), false
default: 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
// with a RIG MODEL pointing at this port instead of "Hamlib NET rigctl".
//
// Worth naming, because the symptom hides the cause completely: we answer
// RPRT -11 like any unknown command, but that reply has no ';' to terminate
// on, so the client's parser waits and then reports "reply incomplete, got
// nothing". The operator sees a timeout and concludes the CAT share is
// broken, when it is a one-line setting in the other program.
if strings.HasSuffix(line, ";") && !strings.Contains(line, " ") {
s.log("rigctld: %q is a raw rig command, not rigctl — the client is set to a RIG MODEL; "+
"it must be set to \"Hamlib NET rigctl\" (rig 2) at this address", line)
return rprt(-11), false
}
// RPRT -11 is "command not implemented". Answering something is essential: // RPRT -11 is "command not implemented". Answering something is essential:
// a client waiting on a silent socket hangs rather than degrading. // a client waiting on a silent socket hangs rather than degrading.
s.log("rigctld: unimplemented command %q", line) s.log("rigctld: unimplemented command %q", line)
+94
View File
@@ -0,0 +1,94 @@
package rigctld
import (
"fmt"
"net"
"strings"
"sync"
"testing"
"time"
)
// A listener that binds successfully is not necessarily the one clients reach.
// Windows lets a second program bind the same port on the specific address
// 127.0.0.1 while ours holds 0.0.0.0, and localhost connections then go to the
// more specific one. Seen with Nexus, which starts its own rigctld on 4532.
func TestSelfTestWarnsWhenAnotherProgramHoldsLocalhost(t *testing.T) {
// Squat 127.0.0.1 first, the way the other program does.
squat, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {
t.Skipf("cannot bind localhost here: %v", err)
}
defer squat.Close()
port := squat.Addr().(*net.TCPAddr).Port
go func() {
for {
c, err := squat.Accept()
if err != nil {
return
}
c.Close()
}
}()
var mu sync.Mutex
var lines []string
s := New(port, nil, func(f string, a ...any) {
mu.Lock()
lines = append(lines, fmt.Sprintf(f, a...))
mu.Unlock()
})
if err := s.Start(); err != nil {
// The wildcard bind is refused on some setups; nothing to prove then.
t.Skipf("wildcard bind refused: %v", err)
}
defer s.Stop()
deadline := time.Now().Add(4 * time.Second)
for time.Now().Before(deadline) {
mu.Lock()
got := strings.Join(lines, "\n")
mu.Unlock()
if strings.Contains(got, "another program is already answering") {
return
}
time.Sleep(50 * time.Millisecond)
}
mu.Lock()
defer mu.Unlock()
t.Errorf("no warning was logged while another listener owned localhost:%d.\nlog was:\n%s",
port, strings.Join(lines, "\n"))
}
// The healthy case must stay silent: a warning on every clean start would be
// noise, and noise in a log is what makes the real line easy to miss.
func TestSelfTestIsSilentWhenReachable(t *testing.T) {
// A real, free port: with 0 the OS picks one but s.port stays 0, so the probe
// would dial 127.0.0.1:0 and prove nothing.
probe, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {
t.Skipf("cannot bind: %v", err)
}
port := probe.Addr().(*net.TCPAddr).Port
probe.Close()
var mu sync.Mutex
var lines []string
s := New(port, nil, func(f string, a ...any) {
mu.Lock()
lines = append(lines, fmt.Sprintf(f, a...))
mu.Unlock()
})
if err := s.Start(); err != nil {
t.Skipf("start: %v", err)
}
defer s.Stop()
time.Sleep(1500 * time.Millisecond)
mu.Lock()
defer mu.Unlock()
for _, l := range lines {
if strings.Contains(l, "WARNING") {
t.Errorf("a reachable port still warned: %q", l)
}
}
}
+16
View File
@@ -2,6 +2,7 @@ package rigctld
import ( import (
"bufio" "bufio"
"errors"
"fmt" "fmt"
"net" "net"
"strings" "strings"
@@ -21,11 +22,26 @@ type fakeRig struct {
setFreqs []int64 setFreqs []int64
setModes []string setModes []string
failSet bool failSet bool
// noSplit models a backend that cannot set split — the case that must reach
// the client as a refusal instead of a silent success.
noSplit bool
splitCalls []string
} }
func (f *fakeRig) Freq() int64 { f.mu.Lock(); defer f.mu.Unlock(); return f.freq } func (f *fakeRig) Freq() int64 { f.mu.Lock(); defer f.mu.Unlock(); return f.freq }
func (f *fakeRig) Mode() string { f.mu.Lock(); defer f.mu.Unlock(); return f.mode } func (f *fakeRig) Mode() string { f.mu.Lock(); defer f.mu.Unlock(); return f.mode }
func (f *fakeRig) Split() (bool, int64) { f.mu.Lock(); defer f.mu.Unlock(); return f.split, f.txFreq } func (f *fakeRig) Split() (bool, int64) { f.mu.Lock(); defer f.mu.Unlock(); return f.split, f.txFreq }
func (f *fakeRig) SetSplit(on bool, txHz int64) error {
f.mu.Lock()
defer f.mu.Unlock()
if f.noSplit {
return errors.New("this radio cannot set split from software")
}
f.splitCalls = append(f.splitCalls, fmt.Sprintf("%v:%d", on, txHz))
f.split, f.txFreq = on, txHz
return nil
}
func (f *fakeRig) SetFreq(hz int64) error { func (f *fakeRig) SetFreq(hz int64) error {
f.mu.Lock() f.mu.Lock()
defer f.mu.Unlock() defer f.mu.Unlock()
+52
View File
@@ -0,0 +1,52 @@
package rigctld
import (
"strings"
"testing"
)
// WSJT-X in "Split Operating: Rig" sends set_split_vfo then set_split_freq. Both
// used to answer RPRT 0 and do NOTHING: the software believed it was
// transmitting up the band while the radio stayed on the receive frequency —
// on a pileup, straight onto the DX, with no trace anywhere.
func TestSetSplitReachesTheRig(t *testing.T) {
rig := &fakeRig{freq: 14074000, mode: "FT8"}
s := New(0, rig, func(string, ...any) {})
if got, _ := s.handle("S 1 VFOB"); !strings.HasPrefix(got, "RPRT 0") {
t.Fatalf("set_split_vfo answered %q", got)
}
// Arming alone must NOT touch the rig: without a frequency it would transmit
// on whatever the second VFO happened to hold.
if len(rig.splitCalls) != 0 {
t.Errorf("split was armed before a frequency arrived: %v", rig.splitCalls)
}
if got, _ := s.handle("I 14075300.000000"); !strings.HasPrefix(got, "RPRT 0") {
t.Fatalf("set_split_freq answered %q", got)
}
if len(rig.splitCalls) != 1 || rig.splitCalls[0] != "true:14075300" {
t.Fatalf("rig saw %v, want one call arming split on 14075300", rig.splitCalls)
}
if got, _ := s.handle("S 0 VFOA"); !strings.HasPrefix(got, "RPRT 0") {
t.Fatalf("split off answered %q", got)
}
if len(rig.splitCalls) != 2 || !strings.HasPrefix(rig.splitCalls[1], "false:") {
t.Errorf("rig saw %v, want split cleared", rig.splitCalls)
}
}
// A backend that cannot do split must produce an ERROR the client can report.
// Answering success and doing nothing is what caused the original fault, and it
// is the one outcome that must never come back.
func TestSetSplitRefusalIsReported(t *testing.T) {
rig := &fakeRig{freq: 14074000, noSplit: true}
s := New(0, rig, func(string, ...any) {})
s.handle("S 1 VFOB")
got, _ := s.handle("I 14075300.000000")
if strings.HasPrefix(got, "RPRT 0") {
t.Errorf("a rig that cannot split answered %q — the client will transmit on the wrong frequency", got)
}
}
+223 -32
View File
@@ -10,9 +10,13 @@
// - The page is self-contained: no external CSS, font or script. It has to // - The page is self-contained: no external CSS, font or script. It has to
// work dropped into any hosting, including one that blocks third-party // work dropped into any hosting, including one that blocks third-party
// requests, and it must not leak the reader's visit to anyone. // requests, and it must not leak the reader's visit to anyone.
// - Columns are a fixed, curated set rather than "every ADIF field". This is // - Every ADIF field is offered, because an operator publishing a county hunt
// a page shown to the public: RST and QSL status belong, the operator's // or an award chase needs fields no curated list would have guessed. That
// home address does not. // puts the judgement on them, and it is a real one: this page is PUBLIC, and
// the catalogue includes the correspondent's address, e-mail and the
// operator's own street. Nothing is published unless it is chosen, and the
// default selection stays the eight columns a reader of someone else's log
// actually looks for.
package webpub package webpub
import ( import (
@@ -29,6 +33,7 @@ import (
"github.com/jlaffaye/ftp" "github.com/jlaffaye/ftp"
"hamlog/internal/geo"
"hamlog/internal/qso" "hamlog/internal/qso"
) )
@@ -60,6 +65,9 @@ type Config struct {
type Column struct { type Column struct {
Key string Key string
Header string Header string
// Group is the section a picker shows this under. With every ADIF field on
// offer, a flat list is unusable — the grouping IS what makes it navigable.
Group string
Value func(q *qso.QSO) string Value func(q *qso.QSO) string
} }
@@ -70,43 +78,208 @@ func str(p *int) string {
return strconv.Itoa(*p) return strconv.Itoa(*p)
} }
// Columns is the curated set, in default display order. Add here to offer a new func str64(p *int64) string {
// one; the stored config keeps keys, so order changes are safe. if p == nil {
return ""
}
return strconv.FormatInt(*p, 10)
}
// flt drops a trailing ".0": a distance reads better as "1420" than "1420.0",
// and a bearing as "142.5" keeps the half-degree that matters.
func flt(p *float64) string {
if p == nil {
return ""
}
return strconv.FormatFloat(*p, 'f', -1, 64)
}
// distanceKm is the path length for the Distance column.
//
// The stored DISTANCE field is only ever filled by an ADIF import that carried
// one — OpsLog does not compute it when logging — so publishing it straight gave
// an empty column for every QSO made here, which is how this was reported.
//
// So it falls back to the two locators, which are on the QSO already. Rounded to
// whole kilometres: the grids are squares tens of kilometres across, and a
// decimal on a figure that imprecise claims an accuracy nobody has.
func distanceKm(q *qso.QSO) string {
if q.Distance != nil && *q.Distance > 0 {
return flt(q.Distance)
}
km, ok := geo.DistanceBetweenGrids(q.MyGrid, q.Grid)
if !ok || km <= 0 {
return ""
}
return strconv.FormatFloat(km, 'f', 0, 64)
}
func stamp(t time.Time) string {
if t.IsZero() {
return ""
}
return t.UTC().Format("2006-01-02 15:04")
}
// Columns is every field a QSO can carry, in ADIF order, grouped for the picker.
//
// Generated from the qso.QSO struct rather than curated by hand: the previous
// list held 23 of them, so anyone wanting to publish a county, a satellite pass
// or an award reference simply could not. A hand list also silently rots — a new
// ADIF field is added to the struct and nobody remembers this file exists.
//
// The stored configuration keeps KEYS, so order and grouping can change freely.
var Columns = []Column{ var Columns = []Column{
{"date", "Date", func(q *qso.QSO) string { return q.QSODate.UTC().Format("2006-01-02") }}, // Date and time are one column in the database and two here: a log reads by
{"time", "UTC", func(q *qso.QSO) string { return q.QSODate.UTC().Format("15:04") }}, // day, and a reader scanning for "that evening" should not have to parse a
{"callsign", "Call", func(q *qso.QSO) string { return q.Callsign }}, // timestamp. Frequency is stored in Hz and published in MHz.
{"band", "Band", func(q *qso.QSO) string { return q.Band }}, {"date", "Date", "QSO", func(q *qso.QSO) string { return q.QSODate.UTC().Format("2006-01-02") }},
{"mode", "Mode", func(q *qso.QSO) string { return q.Mode }}, {"time", "UTC", "QSO", func(q *qso.QSO) string { return q.QSODate.UTC().Format("15:04") }},
{"freq", "Freq", func(q *qso.QSO) string { {"freq", "Freq", "QSO", func(q *qso.QSO) string {
if q.FreqHz == nil || *q.FreqHz == 0 { if q.FreqHz == nil || *q.FreqHz == 0 {
return "" return ""
} }
return strconv.FormatFloat(float64(*q.FreqHz)/1e6, 'f', 3, 64) return strconv.FormatFloat(float64(*q.FreqHz)/1e6, 'f', 3, 64)
}}, }},
{"rst_sent", "RST S", func(q *qso.QSO) string { return q.RSTSent }}, {"callsign", "Callsign", "QSO", func(q *qso.QSO) string { return q.Callsign }},
{"rst_rcvd", "RST R", func(q *qso.QSO) string { return q.RSTRcvd }}, {"qso_date_off", "End", "QSO", func(q *qso.QSO) string { return stamp(q.QSODateOff) }},
{"name", "Name", func(q *qso.QSO) string { return q.Name }}, {"band", "Band", "QSO", func(q *qso.QSO) string { return q.Band }},
{"qth", "QTH", func(q *qso.QSO) string { return q.QTH }}, {"band_rx", "Band RX", "QSO", func(q *qso.QSO) string { return q.BandRX }},
{"country", "Country", func(q *qso.QSO) string { return q.Country }}, {"mode", "Mode", "QSO", func(q *qso.QSO) string { return q.Mode }},
{"grid", "Grid", func(q *qso.QSO) string { return q.Grid }}, {"submode", "Submode", "QSO", func(q *qso.QSO) string { return q.Submode }},
{"dxcc", "DXCC", func(q *qso.QSO) string { return str(q.DXCC) }}, {"freq_rx_hz", "Freq RX", "QSO", func(q *qso.QSO) string { return str64(q.FreqRXHz) }},
{"cqz", "CQ", func(q *qso.QSO) string { return str(q.CQZ) }}, {"rst_sent", "RST S", "QSO", func(q *qso.QSO) string { return q.RSTSent }},
{"ituz", "ITU", func(q *qso.QSO) string { return str(q.ITUZ) }}, {"rst_rcvd", "RST R", "QSO", func(q *qso.QSO) string { return q.RSTRcvd }},
{"iota", "IOTA", func(q *qso.QSO) string { return q.IOTA }}, {"name", "Name", "QSO", func(q *qso.QSO) string { return q.Name }},
{"pota", "POTA", func(q *qso.QSO) string { return q.POTARef }}, {"qth", "QTH", "QSO", func(q *qso.QSO) string { return q.QTH }},
{"sota", "SOTA", func(q *qso.QSO) string { return q.SOTARef }}, {"address", "Address", "QSO", func(q *qso.QSO) string { return q.Address }},
{"qsl_sent", "QSL S", func(q *qso.QSO) string { return q.QSLSent }}, {"email", "Email", "QSO", func(q *qso.QSO) string { return q.Email }},
{"qsl_rcvd", "QSL R", func(q *qso.QSO) string { return q.QSLRcvd }}, {"web", "Web", "QSO", func(q *qso.QSO) string { return q.Web }},
{"lotw_rcvd", "LoTW", func(q *qso.QSO) string { return q.LOTWRcvd }}, {"grid", "Grid", "Location", func(q *qso.QSO) string { return q.Grid }},
{"station", "Station", func(q *qso.QSO) string { return q.StationCallsign }}, {"gridsquare_ext", "Grid ext", "Location", func(q *qso.QSO) string { return q.GridExt }},
{"comment", "Comment", func(q *qso.QSO) string { return q.Comment }}, {"vucc_grids", "VUCC", "Location", func(q *qso.QSO) string { return q.VUCCGrids }},
{"country", "Country", "Location", func(q *qso.QSO) string { return q.Country }},
{"state", "State", "Location", func(q *qso.QSO) string { return q.State }},
{"cnty", "County", "Location", func(q *qso.QSO) string { return q.County }},
{"dxcc", "Dxcc", "Location", func(q *qso.QSO) string { return str(q.DXCC) }},
{"cont", "Cont", "Location", func(q *qso.QSO) string { return q.Continent }},
{"cqz", "CQ", "Location", func(q *qso.QSO) string { return str(q.CQZ) }},
{"ituz", "ITU", "Location", func(q *qso.QSO) string { return str(q.ITUZ) }},
{"iota", "Iota", "Awards", func(q *qso.QSO) string { return q.IOTA }},
{"sota_ref", "SOTA", "Awards", func(q *qso.QSO) string { return q.SOTARef }},
{"pota_ref", "POTA", "Awards", func(q *qso.QSO) string { return q.POTARef }},
{"age", "Age", "QSO", func(q *qso.QSO) string { return str(q.Age) }},
{"lat", "Lat", "Location", func(q *qso.QSO) string { return flt(q.Lat) }},
{"lon", "Lon", "Location", func(q *qso.QSO) string { return flt(q.Lon) }},
{"rig", "Rig", "QSO", func(q *qso.QSO) string { return q.Rig }},
{"ant", "Ant", "QSO", func(q *qso.QSO) string { return q.Ant }},
{"qsl_sent", "QSL S", "QSL", func(q *qso.QSO) string { return q.QSLSent }},
{"qsl_rcvd", "QSL R", "QSL", func(q *qso.QSO) string { return q.QSLRcvd }},
{"qsl_sent_date", "Qsl sent date", "QSL", func(q *qso.QSO) string { return q.QSLSentDate }},
{"qsl_rcvd_date", "Qsl rcvd date", "QSL", func(q *qso.QSO) string { return q.QSLRcvdDate }},
{"qsl_via", "Qsl via", "QSL", func(q *qso.QSO) string { return q.QSLVia }},
{"qsl_msg", "Qsl msg", "QSL", func(q *qso.QSO) string { return q.QSLMsg }},
{"qslmsg_rcvd", "Qslmsg rcvd", "QSL", func(q *qso.QSO) string { return q.QSLMsgRcvd }},
{"lotw_sent", "LoTW S", "QSL", func(q *qso.QSO) string { return q.LOTWSent }},
{"lotw_rcvd", "LoTW R", "QSL", func(q *qso.QSO) string { return q.LOTWRcvd }},
{"lotw_sent_date", "Lotw sent date", "QSL", func(q *qso.QSO) string { return q.LOTWSentDate }},
{"lotw_rcvd_date", "Lotw rcvd date", "QSL", func(q *qso.QSO) string { return q.LOTWRcvdDate }},
{"eqsl_sent", "eQSL S", "QSL", func(q *qso.QSO) string { return q.EQSLSent }},
{"eqsl_rcvd", "eQSL R", "QSL", func(q *qso.QSO) string { return q.EQSLRcvd }},
{"eqsl_sent_date", "Eqsl sent date", "QSL", func(q *qso.QSO) string { return q.EQSLSentDate }},
{"eqsl_rcvd_date", "Eqsl rcvd date", "QSL", func(q *qso.QSO) string { return q.EQSLRcvdDate }},
{"clublog_qso_upload_date", "Clublog qso upload date", "QSL", func(q *qso.QSO) string { return q.ClublogUploadDate }},
{"clublog_qso_upload_status", "Clublog qso upload status", "QSL", func(q *qso.QSO) string { return q.ClublogUploadStatus }},
{"hrdlog_qso_upload_date", "Hrdlog qso upload date", "QSL", func(q *qso.QSO) string { return q.HRDLogUploadDate }},
{"hrdlog_qso_upload_status", "Hrdlog qso upload status", "QSL", func(q *qso.QSO) string { return q.HRDLogUploadStatus }},
{"qrzcom_qso_upload_date", "Qrzcom qso upload date", "QSL", func(q *qso.QSO) string { return q.QRZComUploadDate }},
{"qrzcom_qso_upload_status", "Qrzcom qso upload status", "QSL", func(q *qso.QSO) string { return q.QRZComUploadStatus }},
{"qrzcom_qso_download_date", "Qrzcom qso download date", "QSL", func(q *qso.QSO) string { return q.QRZComDownloadDate }},
{"qrzcom_qso_download_status", "Qrzcom qso download status", "QSL", func(q *qso.QSO) string { return q.QRZComDownloadStatus }},
{"contest_id", "Contest", "Contest", func(q *qso.QSO) string { return q.ContestID }},
{"srx", "Srx", "Contest", func(q *qso.QSO) string { return str(q.SRX) }},
{"stx", "Stx", "Contest", func(q *qso.QSO) string { return str(q.STX) }},
{"srx_string", "SRX str", "QSO", func(q *qso.QSO) string { return q.SRXString }},
{"stx_string", "STX str", "QSO", func(q *qso.QSO) string { return q.STXString }},
{"check", "Check", "Contest", func(q *qso.QSO) string { return q.Check }},
{"precedence", "Precedence", "Contest", func(q *qso.QSO) string { return q.Precedence }},
{"arrl_sect", "Section", "Contest", func(q *qso.QSO) string { return q.ARRLSect }},
{"prop_mode", "Prop", "QSO", func(q *qso.QSO) string { return q.PropMode }},
{"sat_name", "Sat", "QSO", func(q *qso.QSO) string { return q.SatName }},
{"sat_mode", "Sat mode", "QSO", func(q *qso.QSO) string { return q.SatMode }},
{"ant_az", "Ant az", "QSO", func(q *qso.QSO) string { return flt(q.AntAz) }},
{"ant_el", "Ant el", "QSO", func(q *qso.QSO) string { return flt(q.AntEl) }},
{"ant_path", "Ant path", "QSO", func(q *qso.QSO) string { return q.AntPath }},
{"station_callsign", "Station", "QSO", func(q *qso.QSO) string { return q.StationCallsign }},
{"operator", "Operator", "QSO", func(q *qso.QSO) string { return q.Operator }},
{"my_grid", "My grid", "My station", func(q *qso.QSO) string { return q.MyGrid }},
{"my_gridsquare_ext", "My gridsquare ext", "My station", func(q *qso.QSO) string { return q.MyGridExt }},
{"my_country", "My country", "My station", func(q *qso.QSO) string { return q.MyCountry }},
{"my_state", "My state", "My station", func(q *qso.QSO) string { return q.MyState }},
{"my_cnty", "My cnty", "My station", func(q *qso.QSO) string { return q.MyCounty }},
{"my_iota", "My iota", "My station", func(q *qso.QSO) string { return q.MyIOTA }},
{"my_sota_ref", "My sota ref", "My station", func(q *qso.QSO) string { return q.MySOTARef }},
{"my_pota_ref", "My pota ref", "My station", func(q *qso.QSO) string { return q.MyPOTARef }},
{"my_dxcc", "My dxcc", "My station", func(q *qso.QSO) string { return str(q.MyDXCC) }},
{"my_cq_zone", "My cq zone", "My station", func(q *qso.QSO) string { return str(q.MyCQZone) }},
{"my_itu_zone", "My itu zone", "My station", func(q *qso.QSO) string { return str(q.MyITUZone) }},
{"my_lat", "My lat", "My station", func(q *qso.QSO) string { return flt(q.MyLat) }},
{"my_lon", "My lon", "My station", func(q *qso.QSO) string { return flt(q.MyLon) }},
{"my_street", "My street", "My station", func(q *qso.QSO) string { return q.MyStreet }},
{"my_city", "My city", "My station", func(q *qso.QSO) string { return q.MyCity }},
{"my_postal_code", "My postal code", "My station", func(q *qso.QSO) string { return q.MyPostalCode }},
{"my_rig", "My rig", "My station", func(q *qso.QSO) string { return q.MyRig }},
{"my_antenna", "My antenna", "My station", func(q *qso.QSO) string { return q.MyAntenna }},
{"tx_pwr", "TX pwr", "QSO", func(q *qso.QSO) string { return flt(q.TXPower) }},
{"comment", "Comment", "QSO", func(q *qso.QSO) string { return q.Comment }},
{"notes", "Notes", "QSO", func(q *qso.QSO) string { return q.Notes }},
{"sig", "Sig", "Awards", func(q *qso.QSO) string { return q.SIG }},
{"sig_info", "Sig info", "Awards", func(q *qso.QSO) string { return q.SIGInfo }},
{"my_sig", "My sig", "My station", func(q *qso.QSO) string { return q.MySIG }},
{"my_sig_info", "My sig info", "My station", func(q *qso.QSO) string { return q.MySIGInfo }},
{"wwff_ref", "WWFF", "Awards", func(q *qso.QSO) string { return q.WWFFRef }},
{"my_wwff_ref", "My wwff ref", "My station", func(q *qso.QSO) string { return q.MyWWFFRef }},
{"distance", "Distance", "Location", distanceKm},
{"rx_pwr", "RX pwr", "QSO", func(q *qso.QSO) string { return flt(q.RXPower) }},
{"a_index", "A", "QSO", func(q *qso.QSO) string { return flt(q.AIndex) }},
{"k_index", "K", "QSO", func(q *qso.QSO) string { return flt(q.KIndex) }},
{"sfi", "SFI", "QSO", func(q *qso.QSO) string { return flt(q.SFI) }},
{"skcc", "Skcc", "Awards", func(q *qso.QSO) string { return q.SKCC }},
{"fists", "Fists", "Awards", func(q *qso.QSO) string { return q.FISTS }},
{"ten_ten", "10-10", "Awards", func(q *qso.QSO) string { return q.TenTen }},
{"contacted_op", "Op worked", "QSO", func(q *qso.QSO) string { return q.ContactedOp }},
{"eq_call", "Eq call", "QSO", func(q *qso.QSO) string { return q.EqCall }},
{"pfx", "Pfx", "Location", func(q *qso.QSO) string { return q.PFX }},
{"my_name", "My name", "My station", func(q *qso.QSO) string { return q.MyName }},
{"class", "Class", "Contest", func(q *qso.QSO) string { return q.Class }},
{"darc_dok", "DOK", "Awards", func(q *qso.QSO) string { return q.DarcDOK }},
{"my_darc_dok", "My darc dok", "My station", func(q *qso.QSO) string { return q.MyDarcDOK }},
{"region", "Region", "Location", func(q *qso.QSO) string { return q.Region }},
{"silent_key", "SK", "QSO", func(q *qso.QSO) string { return q.SilentKey }},
{"swl", "Swl", "QSO", func(q *qso.QSO) string { return q.SWL }},
{"qso_complete", "Complete", "QSO", func(q *qso.QSO) string { return q.QSOComplete }},
{"qso_random", "Random", "QSO", func(q *qso.QSO) string { return q.QSORandom }},
{"credit_granted", "Credit granted", "QSL", func(q *qso.QSO) string { return q.CreditGranted }},
{"credit_submitted", "Credit sub.", "QSL", func(q *qso.QSO) string { return q.CreditSubmitted }},
{"my_arrl_sect", "My arrl sect", "My station", func(q *qso.QSO) string { return q.MyARRLSect }},
{"my_vucc_grids", "My vucc grids", "My station", func(q *qso.QSO) string { return q.MyVUCCGrids }},
{"award_refs", "Award refs", "Awards", func(q *qso.QSO) string { return q.AwardRefs }},
} }
// DefaultColumns is what a fresh configuration publishes — the columns a reader // DefaultColumns is what a fresh configuration publishes — the columns a reader
// of someone else's log actually looks for. // of someone else's log actually looks for.
var DefaultColumns = []string{"date", "time", "callsign", "band", "mode", "rst_sent", "rst_rcvd", "country"} var DefaultColumns = []string{"date", "time", "callsign", "band", "mode", "rst_sent", "rst_rcvd", "country"}
// legacyKeys maps the short names the hand-written table used onto the ADIF
// names the generated one uses. A configuration saved before this change still
// publishes the same columns; without it, three of them would vanish silently on
// upgrade, which is the worst way for a setting to change.
var legacyKeys = map[string]string{
"pota": "pota_ref",
"sota": "sota_ref",
"station": "station_callsign",
}
func columnsFor(keys []string) []Column { func columnsFor(keys []string) []Column {
if len(keys) == 0 { if len(keys) == 0 {
keys = DefaultColumns keys = DefaultColumns
@@ -117,7 +290,11 @@ func columnsFor(keys []string) []Column {
} }
out := make([]Column, 0, len(keys)) out := make([]Column, 0, len(keys))
for _, k := range keys { for _, k := range keys {
if c, ok := byKey[strings.TrimSpace(k)]; ok { k = strings.TrimSpace(k)
if alias, ok := legacyKeys[k]; ok {
k = alias
}
if c, ok := byKey[k]; ok {
out = append(out, c) out = append(out, c)
} }
} }
@@ -224,11 +401,25 @@ func renderHTML(cfg Config, cols []Column, qsos []qso.QSO, stationCall string) [
*{box-sizing:border-box} *{box-sizing:border-box}
body{margin:0;padding:1.5rem 1rem;background:var(--bg);color:var(--fg); body{margin:0;padding:1.5rem 1rem;background:var(--bg);color:var(--fg);
font:14px/1.5 system-ui,-apple-system,"Segoe UI",Roboto,sans-serif} font:14px/1.5 system-ui,-apple-system,"Segoe UI",Roboto,sans-serif}
.wrap{max-width:1100px;margin:0 auto} /* The page grows with its table instead of being capped at a comfortable
READING width. 1100px suits eight columns and hides the rest behind a
scrollbar on a screen wide enough to show them all — which is how this was
reported. max-content lets a wide table use the window; min-width keeps a
narrow one from collapsing to nothing on a large display. */
.wrap{max-width:max-content;min-width:min(1100px,100%);margin:0 auto}
h1{margin:0 0 .25rem;font-size:1.35rem} h1{margin:0 0 .25rem;font-size:1.35rem}
.meta{margin:0 0 1rem;color:var(--mut);font-size:.8rem} .meta{margin:0 0 1rem;color:var(--mut);font-size:.8rem}
.scroll{overflow-x:auto;border:1px solid var(--line);border-radius:8px} /* A visible scrollbar. Windows hides overlay scrollbars until something moves,
table{border-collapse:collapse;width:100%;font-variant-numeric:tabular-nums} so a table that scrolls looks exactly like a table that is missing columns. */
.scroll{overflow-x:auto;border:1px solid var(--line);border-radius:8px;
scrollbar-width:thin;scrollbar-color:var(--line) transparent}
.scroll::-webkit-scrollbar{height:10px}
.scroll::-webkit-scrollbar-thumb{background:var(--line);border-radius:5px}
/* width:auto, not 100%: columns take the width their contents need. With
width:100% the browser squeezes them to fit the container first and only then
overflows, so a callsign could end up wrapped while empty space sat further
along the row. min-width keeps a two-column table filling the frame. */
table{border-collapse:collapse;width:auto;min-width:100%;font-variant-numeric:tabular-nums}
th,td{padding:.45rem .6rem;text-align:left;border-bottom:1px solid var(--line);white-space:nowrap} th,td{padding:.45rem .6rem;text-align:left;border-bottom:1px solid var(--line);white-space:nowrap}
th{position:sticky;top:0;background:var(--head);font-size:.72rem;letter-spacing:.05em; th{position:sticky;top:0;background:var(--head);font-size:.72rem;letter-spacing:.05em;
text-transform:uppercase;color:var(--mut);cursor:pointer;user-select:none} text-transform:uppercase;color:var(--mut);cursor:pointer;user-select:none}
+39
View File
@@ -0,0 +1,39 @@
package webpub
import (
"testing"
"hamlog/internal/qso"
)
// The Distance column was published empty for every QSO logged in OpsLog: the
// stored DISTANCE field is only ever filled by an ADIF import that carried one,
// and nothing computes it when logging. It falls back to the two locators.
func TestDistanceFallsBackToTheGrids(t *testing.T) {
// JN36 (French Alps) to IO91 (southern England): a few hundred kilometres.
got := distanceKm(&qso.QSO{MyGrid: "JN36DG", Grid: "IO91"})
if got == "" {
t.Fatal("no distance from two perfectly good locators")
}
if got == "0" {
t.Errorf("distance = %q", got)
}
}
// A stored distance wins: it came from the log that recorded the QSO, which knew
// more than two four-character squares do.
func TestStoredDistanceWins(t *testing.T) {
d := 1234.0
if got := distanceKm(&qso.QSO{Distance: &d, MyGrid: "JN36", Grid: "IO91"}); got != "1234" {
t.Errorf("distance = %q, want the stored 1234", got)
}
}
// No grids, no invention. An empty cell is honest; a zero is a claim.
func TestNoGridsNoDistance(t *testing.T) {
for _, q := range []qso.QSO{{}, {MyGrid: "JN36"}, {Grid: "IO91"}, {MyGrid: "??", Grid: "IO91"}} {
if got := distanceKm(&q); got != "" {
t.Errorf("distance(%+v) = %q, want empty", q, got)
}
}
}
+1 -1
View File
@@ -21,7 +21,7 @@ import (
const ( const (
// appVersion is stamped on every heartbeat (and could feed the About box). // appVersion is stamped on every heartbeat (and could feed the About box).
appVersion = "0.24.4" appVersion = "0.24.6"
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change // posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
// to https://us.i.posthog.com for a US project. // to https://us.i.posthog.com for a US project.