Compare commits

..
93 Commits
Author SHA1 Message Date
rouggy 5a77fdf68f chore: release v0.27.1 2026-08-30 12:01:03 +02:00
rouggy 31c898ad7f revert(icom): drop Wake-on-LAN — the deck does not honour it
Tried on the real IC-7760: the magic packet wakes nothing; Icom's own
mechanism is the network-standby session plus the CI-V power-on, which
OpsLog already does. The MAC store and the WOL sender go, and the changelog
entry with them. The CI-V pump now says once per session that the client
pings are armed — invisible pings read as absent pings.
2026-08-30 11:59:25 +02:00
rouggy 88c9756edf fix(icom): the client pings too — the dropouts' likely root cause
wfview sends a ping (0x07, 0x15 bytes, its own seq and a monotonic
timestamp) every 500 ms on every stream, and so does RS-BA1. OpsLog only
ever REPLIED to the rig's pings — and the loaner IC-7760 stopped serving
CI-V data about a minute into nearly every session while the transport
stayed alive: the rig had concluded nobody was listening. Scope, TX audio
and idle numbering were each eliminated in turn before wfview's source
settled it. Pings now go out on control, CI-V and audio alike.
2026-08-30 11:42:48 +02:00
rouggy 7b15b534cd fix(wb): latest lookup wins the worked-before panel
Two lookups race when a second callsign is typed before the first answered,
and the slow one landed last: the grid showed the previous call's QSOs under
the new call's name — LU5AVM's contact filed under LW8ETV, screenshot in
hand. A request token now discards any response that is not the newest.
2026-08-30 11:26:47 +02:00
rouggy 8e7ecc3d51 feat(icom): Wake-on-LAN for a deck that sleeps with its server
A 7760 switched fully off takes its LAN server down, and no session means no
console and no ON button — the one thing remote operation cannot tolerate.
The rig's MAC is learned from every login and persisted; when a dial finds
nobody home, the magic packet goes out to it before the next attempt. The
rig wakes into standby, the session opens, and the ON button does the rest.
2026-08-30 11:17:55 +02:00
rouggy 7f9019c7bc fix(omnirig): a Yaesu in split tunes both VFOs to the spot
The generic Freq write lands on the TX VFO when split is engaged: an FT-2000
moved B and left A — the receiver — behind, so a spot click QSYed the
transmitter and nothing audible changed; without split the same write moved A.
With split on (and the operator on MAIN), FreqA and FreqB are both written,
so the radio arrives on the spot whole, split left as the operator had it.
2026-08-30 11:12:08 +02:00
rouggy a1a3bad682 fix(cluster): the FT8/FT4 watering holes exist on every band
The inference tables knew FT8 on some bands and nothing on others: a 10.136
spot with a bare comment read as generic DATA — which is what every
skimmerless spot of a DXpedition's 30 m FT8 slot did. The standard FT8/FT4
windows are added on 30 m, 60 m, 80 m (FT4), 17 m (FT4) and 12 m, in BOTH
tables (backend band plan and frontend spot.ts), ahead of the wide segments
they sit inside — order is the mechanism there.
2026-08-30 03:14:21 +02:00
rouggy 1b746f2452 fix(icom): CI-V idles carry real sequence numbers
Every idle went out with seq 0, seven a second, interleaved with
properly-numbered data — where RS-BA1 and wfview draw idle sequence numbers
from the same counter as everything else. A rig that follows the sequence
tolerates the zeros for a minute or so and then stops serving CI-V data on
the stream: the shape of every dropout the loaner IC-7760 has shown, with the
scope and the TX path both since eliminated as causes. Idles now take the
next tracked seq and sit in the retransmit buffer like any other packet.
2026-08-30 03:08:59 +02:00
rouggy 3db49e1213 debug(icom): say whether the split mode-align was accepted
The 0x26 01 copy was fire-and-forget, and a real 7760's sub VFO kept
yesterday's mode with nothing to show why — refused, or sent with a stale
mode byte. The mode is read first when unknown, and both outcomes are
logged.
2026-08-30 03:02:06 +02:00
rouggy 605c934d33 style(icom): the shared LED meters, and the sideband named
The console's thin home-made bars were the one holdout — every other panel
(Flex, Elecraft, the amps, the tuner) draws the same MeterBar. And the mode
badge said SSB, which on any band leaves the operator guessing which
sideband the rig is on: the panel now shows USB or LSB (the log keeps ADIF's
SSB).
2026-08-30 03:00:58 +02:00
rouggy dad762a0f1 fix(dvk): repair the auto-CQ trace mangled by the previous commit
Shell quoting ate the template literals; the traced loop now compiles.
2026-08-30 02:52:04 +02:00
rouggy 97567d15dd debug(dvk): trace the auto-CQ loop into the app log
It keeps 'not repeating' on a network rig and every guess at which guard was
tripping proved wrong. Each round now logs play / playing-flag / end / gap,
and every exit names its reason.
2026-08-30 02:51:05 +02:00
rouggy fc080f3719 fix(icom): kill the leftover waveform in both command forms, and say so
The blind kill at connect still left a real 7760 streaming — the selector
byte differs by model, and the result was discarded so a quiet failure looked
like a cure. Both forms go out now (a NAK costs one frame) and the outcomes
are logged. The power table also gains its third measured anchor: a real
200 W reads full deflection, so raw 213 is 200 W — not the printed face's
250.
2026-08-30 02:43:43 +02:00
rouggy ce9ea10d68 fix(dvk): a transiently blank mode no longer kills the auto-CQ loop
Over the network the rig's mode read fails now and then and the CAT push
blanks the mode for a poll or two; the auto-CQ loop treated that blank as
'not a phone mode' and stopped after the first call. Only a KNOWN non-phone
mode stops the loop now.
2026-08-30 02:42:20 +02:00
rouggy dc94aa94b6 fix(icom): needle inertia for the TX meters, and room for three digits
The CI-V meters are point samples: between two SSB syllables a poll lands on
0 W and a perfect SWR, so a 150 W transmission read 0-10 W most of the time
and the SWR sat at 1.0. Power now decays like a needle and SWR holds its peak
then snaps to the live value — the same meterPeak the Yaesu and Kenwood
consoles already use. The readout column also widens so '180 W' stays on one
line.
2026-08-30 02:40:07 +02:00
rouggy db7ac771b1 feat(icom): the ATU can be taken out of line
TUNE (1C 01 02) started a cycle; nothing sent the 0 that puts the tuner back
through. An ATU chip beside SPLIT now toggles it, and the tuner state is read
on the slow front-panel beat so the radio's own TUNER button stays in sync.
2026-08-30 02:36:46 +02:00
rouggy 19134ea23c revert(icom): drop the PTT+split strip — MOX and SPLIT already live below
Added on a report that they were missing; they were below the fold, not
absent. The useful parts stay: the MOX button routes the PC microphone on a
network station, split aligns the TX VFO's mode, and SetIcomSplitOffset
remains available for a future use.
2026-08-30 02:34:47 +02:00
rouggy b12011fab7 fix(icom): send the leftover-waveform kill blind, at connect
The first attempt sent it only after CI-V answered — but the waveform flood
is what stops CI-V answering, so a rig wedged streaming never received its
cure. It now goes out at the end of Connect, before anything waits on a
reply: an unanswered set costs one frame, and the rig acts on what it decodes
whether or not we hear the acknowledgement.
2026-08-30 02:33:19 +02:00
rouggy d62cd10478 fix(icom): switch off a leftover waveform stream at first contact
The 0x27 output flag lives in the RADIO and survives our sessions: a scope
enabled by an older build (or another program) kept flooding every new
session with 700-byte frames — and on the IC-7760 that flood is what kills
the CI-V link. One 'waveform output off' as soon as the rig answers, once per
session; the front-panel display is deliberately untouched.
2026-08-30 02:28:41 +02:00
rouggy 7de7cb96c3 fix(icom): one sequence space for everything sent on the audio stream
The voice keyer and the live microphone each numbered their packets from 1.
A message played after a talk session re-used sequence numbers the rig had
already seen and was discarded wholesale: the PTT keyed for the full length
of the message and none of it was modulated. PlayTX now feeds the same framer
and counters as the microphone.
2026-08-30 02:25:37 +02:00
rouggy dbc97ad61b feat(icom): remove the console's spectrum scope
Every Icom streams its waveform differently: the IC-7851 controls a scope it
never streams, and a real IC-7760 stops answering CI-V altogether a few
frames in — taking CAT and the audio down with it, which is this week's whole
dropout saga. Chasing a per-model frame layout for a decoration is not worth
a console that drops the link; the radio's own scope is better anyway. The
backend scope plumbing stays (harmless while nothing enables it); the UI and
its enable path go.
2026-08-30 02:23:31 +02:00
rouggy 7966b01900 fix(icom): the console PTT carries the microphone on a network station
Keying alone is right on USB, where the operator talks into the radio's own
mic; over the LAN it transmitted silence. The console button now goes through
one binding that picks the road: network To-radio → the same key-and-stream
path as the Talk button, USB → key and nothing more.
2026-08-30 02:20:40 +02:00
rouggy f98e95fe9e feat(icom): PTT and offset split at the operator's hand
The MOX and SPLIT controls lived at the bottom of the Transmit card, below
the fold on most layouts — a console whose PTT needs scrolling is not a
console. A strip under the mode row now carries the PTT and Split as
OFF/+1k/+5k/+10k, DXpedition style, on a new SetIcomSplitOffset that takes
the chosen TX offset (0 keeps the old CW/SSB convention). The mode-alignment
from the previous fix rides along on every engage.
2026-08-30 02:15:16 +02:00
rouggy 392b93f089 fix(audio): the Listen button works with the network stream as the source
Its enable condition predated the network audio: with From-radio empty — the
normal network setup — the button was greyed out, and an operator who had
stopped listening had no way to start again from this panel. The stale 'later'
hints on both buttons said the network paths did not exist; they do.
2026-08-30 02:04:51 +02:00
rouggy 9c459c754f fix(icom): standby is not a fault — the quiet recovery needs prior CI-V
A radio in standby is silent on CI-V by design; only the transport chats.
The quiet-recovery added for the mid-session deafness treated that silence
as the fault it usually is and tore the session down every 15 s — taking the
console and its ON button with it, so a radio that was off when OpsLog
started could never be turned on. The recovery now arms only once the
session has heard at least one CI-V payload.
2026-08-30 01:55:35 +02:00
rouggy ec967e29cf fix(icom): the audio stream no longer depends on the speakers
The sink — decode + recorder feed — was built only on the success path of
starting the monitor, so speakers-off (the remembered preference) or an
output device that failed to open silently disabled the WHOLE stream: the
session connected audio=false, and a ticked RX-audio checkbox did nothing.
The sink now exists whenever the stream is on; only the monitor obeys the
speaker choice.
2026-08-30 01:53:06 +02:00
rouggy 58e36667a7 fix(audio): starting the monitor restarts a running one instead of refusing
'Monitor already running' surfaced as the speakers checkbox unticking itself
the instant it was ticked, whenever the UI's idea of the state and the real
monitor had drifted apart. Stop-then-start makes the button mean what it
says.
2026-08-30 01:44:11 +02:00
rouggy 77aba73096 fix(icom): a disconnected radio says so, not 'use the USB sound card'
The TX-audio entry points type-assert the transport; a nil port failed the
assertion and produced the sound-card message, sending an operator whose
radio was simply off — or on a new DHCP address — hunting through audio
devices.
2026-08-30 01:36:37 +02:00
rouggy da8f60a7b3 fix(icom): the SUB dial is always shown, and split aligns the TX mode
The unselected VFO was read only when split was on, so a dual-receiver rig's
second dial sat blank on the console. It is now read on the same slow beat
regardless. And engaging split copies the main's mode (and data flag) onto
the TX VFO with 0x26 01 — a split whose TX VFO still speaks yesterday's mode
transmits FM into a CW pileup; rigs that predate 0x26 NAK it harmlessly.
2026-08-29 21:53:16 +02:00
rouggy e8b5444fc2 feat(icom): live microphone over the network — the last remote brick
The talk button learns the network road the voice keyer already took: when
To-radio is the radio itself, the microphone is captured and re-framed into
the rig's 320-sample packets, the capture callback serving as the clock — the
mic delivers in real time, so no ring and no pacer. Counters and the frame
remainder live on the audio stream, so a talk session spans calls. PTT keys
before and releases after, through the same code as the USB path.

With this, a network Icom is a complete remote station over three UDP ports:
RX audio to the headset, live voice and recorded messages back, CW through
the rig's keyer, CAT for everything else.
2026-08-29 21:51:37 +02:00
rouggy 08bc401681 fix(audio): the network monitor needs no From-radio device
AudioStartMonitor refused before reaching the network branch when From-radio
was empty — which is the NORMAL network setup, so the new speakers checkbox
un-ticked itself the instant it was ticked. The capture-device requirement now
applies only to the USB path that actually captures.
2026-08-29 21:45:18 +02:00
rouggy 7ac342e2d4 feat(icom): the speaker choice appears beside the RX-audio option too
Same remembered preference as the console's speaker button, surfaced where
the stream itself is enabled — tick RX audio and decide in the same breath
whether it reaches the speakers. Applied immediately, no save needed.
2026-08-29 20:02:28 +02:00
rouggy b244575937 feat(icom): a speaker toggle on the console itself
Muting the network RX audio took a trip through Settings → Audio → Stop
listening — two panels away from the console the operator is actually using.
A speaker button now sits beside ON/OFF (network only, like them): one click
to listen or mute, the recorder and the voice keyer unaffected, the choice
remembered across reconnects and launches.
2026-08-29 19:49:09 +02:00
rouggy c878742e50 feat(icom): listening to the network audio is a remembered choice
The RX stream and the speakers were welded together: every reconnect and
every launch restarted the monitor, so an operator sitting in the room with
the radio could not have the stream (which the recorder and the voice keyer
need) without also hearing it twice. Stop listening now persists, the Listen
button turns it back on, and reconnects respect the choice.
2026-08-29 19:42:18 +02:00
rouggy 13434ca36c feat(icom): phase 5 — the voice keyer plays to the radio over the LAN
The audio session opens its TX side alongside RX (txenable in the conninfo,
16 kHz both ways), the stream gains a paced sender — 320 samples every 20 ms,
the frame mirroring what the rig itself sends on this socket, IDs swapped —
and the network Icom takes the same NetworkPlayer slot a TCI radio does: pick
'Radio (network audio)' as the To-radio device and the voice keyer needs no
cable and no virtual sound card. PTT brackets the message through the same
code as every other audio path.
2026-08-29 19:34:05 +02:00
rouggy 6345710de5 fix(icom): wait out the rig's session cleanup before redialling
The capture shows the spiral: a session goes deaf on CI-V (28 unanswered
commands, transport alive), the fast-fail rebuilds it, the new session answers
for one second — one state read got through — and is then strangled when the
rig purges the half-open old one. Twenty seconds a lap, no audio throughout,
and only the third or fourth session survives. When the previous session died
less than 90 s after connecting, the redial now pauses 20 s so the purge
happens BEFORE the new session, not on top of it. A long-lived session still
reconnects immediately.
2026-08-29 19:21:55 +02:00
rouggy 0cab1c1e6b debug(icom): count the questions asked during a CI-V silence
The operator's counter-hypothesis deserves an answer: RS-BA1 shows no such
dropouts, so are we sure the rig stops answering — or do we stop asking? The
quiet log now carries the number of CI-V commands sent since the last answer.
Zero would convict our own poll loop; a healthy count convicts the rig.
2026-08-29 18:43:46 +02:00
rouggy 1c71495446 fix(icom): give up on the quiet CI-V stream after 15 s, not 30
The capture settled it: the 7760 keeps the transport chatting (pings answered,
no socket error, no loss) while CI-V data simply stops, the in-place reopen is
ignored, and only a fresh session brings it back. So: one reopen attempt at
10 s — kept, it is free and the log will say if a firmware ever honours it —
and at 15 s the link is failed deliberately so the manager rebuilds it,
halving the outage. Also: the recovered-acknowledgement now sits on the DATA
packet, not on any packet — pings were toggling the detector, 160 reopens in
thirty seconds all logged as recoveries that never happened.
2026-08-29 18:35:41 +02:00
rouggy 2c0158b75c fix(icom): re-open the CI-V flow when the rig goes quiet mid-session
The IC-7760 recurrently stops answering CI-V a few minutes into a network
session while the transport keeps chatting — pings answered, session alive,
commands unanswered — and the only recovery was the 30 s watchdog's full
teardown. At 10 s of CI-V silence the pump now says 'open' again on the
existing stream, which is all it should take if the rig quietly closed the
data flow; the watchdog remains as the backstop. The send counters gain a
mutex since the pump now transmits too.
2026-08-29 16:56:06 +02:00
rouggy a2b019b280 debug(icom): the quiet detector watches CI-V DATA, not transport chatter
The first detector counted any packet and never fired: pings and idles keep
flowing while the rig stops answering CI-V commands — which is what the 7760's
recurring silence turns out to be. Now it fires on 10 s without a CI-V payload
and reports the ages of the transport, the last scope frame and the last
socket error, so the next occurrence says exactly what the rig was still
sending.
2026-08-29 16:54:37 +02:00
rouggy 1fba7d2d57 fix(icom): create the audio manager before the CAT link comes up
reloadCAT builds the network audio sink gated on audioMgr, and startup created
the manager AFTER the first reloadCAT: every fresh launch connected with audio
silently off however the option was set, and the operator had to
untick/save/retick it to hear anything. The manager is idle-until-used, so
creating it earlier costs nothing.
2026-08-29 16:47:42 +02:00
rouggy 490941f506 fix(icom): only forward-moving audio packets reach the sink
Every audio packet was delivered as if it were the next 20 ms, duplicates and
late retransmits included. The monitor's capped ring quietly threw the surplus
away, so the speakers sounded fine — but the recorder keeps every sample it is
given, and the file came out longer than the QSO, slowed and stuttering, each
lost-then-resent packet heard twice. trackRxSeq now says whether a packet
advances the stream, and only those are handed on.
2026-08-29 16:43:41 +02:00
rouggy 6bf759b6ae fix(cw): Icom CI-V CW works over the network backend too
The CI-V keyer is the same 0x17 command on the same IcomController whatever
carries the link; only the warnings and enable checks insisted on the USB
backend, telling a network operator their working keyer would fail.
2026-08-29 16:39:43 +02:00
rouggy 43e5088e96 fix(icom): the live radio names MY_RIG, and a manual take records it too
Two halves of the same station confusion. The entry form pre-filled MY_RIG
from the per-band default on every band change, so the log-time priority (the
radio that is keying beats the radio that was planned) never ran — the field
was no longer empty by the time the backend looked. The form now asks the
active radio first, through a new ActiveRadioMyRig binding.

And the manual record button started its capture from the From-radio sound
card unconditionally, where the automatic recorder already knew a network
Icom's audio is pushed from the 50003 stream: a manual take on the IC-7760
was a faithful recording of the Flex's DAX. Same source rule for both, and
the button is offered with no sound card at all when the network stream is
the source.
2026-08-29 16:35:25 +02:00
rouggy 582fa561b2 fix(rec): a fresh take starts its clock at zero, not at the last take's total
Two effects, wrong order: the ticking effect ran before the reset effect on a
new take, so its closure captured the PREVIOUS take's elapsed as its starting
point — the counter showed 0 for one second and then jumped back to thirty
minutes. Effects run in declaration order; the reset now comes first.
2026-08-29 16:31:38 +02:00
rouggy 7f328d4eb5 debug(icom): say what the CI-V stream was doing when it goes quiet
A real IC-7760 keeps going silent on the CI-V stream two-three minutes into a
session while the control link stays alive. At 10 s of silence the pump now
logs the last real socket error and the retransmit backlog, and notes when the
stream resumes — the 30 s watchdog that follows cannot tell a dead socket from
a rig that stopped talking, and the next occurrence should.
2026-08-29 16:07:42 +02:00
rouggy b2eb6a4b1e fix(icom): the 7760 power meter interpolates between MEASURED anchors
A known 50 W read raw ~89 where the two-segment curve said 62: the face is
not linear in watts below half scale. Watts now interpolate through the
measured points (50 W, 100 W, full-scale 250 W); refining the curve is adding
a row to the table.
2026-08-29 16:06:05 +02:00
rouggy c2db4c5f7e chore(icom): stop blaming a hijacker for every silent CI-V stream
The 30 s watchdog message asserted another program had taken the session; a
real IC-7760 went silent once with nothing else on the network, and the
message sent its operator hunting software that was not installed. State both
causes.
2026-08-29 16:04:06 +02:00
rouggy b246c4d10a fix(icom): power in watts on the 7760, and Listening restarts clean
The power meter applies Icom's own meter calibration (raw 143 = half
deflection, 213 = full scale) anchored against the real radio: a measured
100 W sits at half deflection of the 7760's 250 W face — the linear guess
showed it as 140. The RF power slider says watts on a 200 W rig instead of a
percentage the operator has to convert.

And the Listening button, pressed while a network Icom is connected, restarts
the monitor render-only: it used to open a USB capture from the From-radio
device as well, and that second producer interleaved with the network pushes
chopped the audio to pieces.
2026-08-29 16:02:15 +02:00
rouggy 6d4a110949 fix(cat): the settings panel opens on the radio that is actually active
The loader looked for an 'active' flag the radio list has never carried, so
reopening the panel always landed on the first entry — Radio 1's name over
whichever radio's settings were live, and every field edit (MY_RIG included)
silently rewriting the wrong entry. The backend is the only one who knows
which radio is on the air; ask it.
2026-08-29 15:52:37 +02:00
rouggy ffbbff80d6 feat(icom): a DATA button, native PSK, real watts — and the audio codec
The console gains a DATA mode button (USB-D, what FT8 and friends ride on);
the PSK button now maps to the rigs' native PSK mode (0x12) instead of erroring
as an unknown mode — rigs without one NAK it, exactly as RS-BA1's button does
there. The power meter shows real watts on the IC-7760, whose meter face runs
to 250 W where a 100 W rig's percentage was the watts. The clickable S-meter
gets a pointer cursor so it looks like what it is.

Network audio: rxcodec 0x04 — the experiments on the real 7760 settle the
codec table (0x10 = 16-bit stereo, 0x02 = 8-bit mono, both heard as garble),
and 0x04 is the 16-bit mono the playback path actually plays.
2026-08-29 15:48:26 +02:00
rouggy bd2edf6624 fix(icom): verify the data flag after a mode set, and correct it with 0x26
The IC-7760 acknowledges the 1A 06 data-mode command and stays in USB-D
anyway, which left the operator unable to get back to plain USB from the
console at all. After every mode set the flag is read back; on a mismatch it
is said again with 0x26 — mode, data flag and filter in one frame, the form
the newer rigs actually honour. Only on a mismatch, so rigs that predate 0x26
never see the command.
2026-08-29 15:36:55 +02:00
rouggy 6321948415 fix(icom): fold the 7760's stereo RX stream down to the mono it plays as
The rig keeps sending two-channel LPCM after rxcodec asks for one — 1280-byte
payloads, 320 stereo frames per 20 ms tick, right channel all zeros in the
capture. Played as mono that interleaving is half-speed metallic garble. A
stereo-sized packet is folded to its left channel; a 640-byte mono packet from
a rig that honours the request passes through untouched.
2026-08-29 15:34:18 +02:00
rouggy 89e239d83f fix(icom): decode the network RX audio as what the rig actually sends
The first real radio on the 50003 stream (an IC-7760) settles the two guesses
the experimental audio path shipped with. The payload starts at 0x18 — the
packet carries a big-endian payload length at 0x14 (0x500 on every packet) —
not at 0x16, which swallowed two header bytes into the PCM and laid a 50 Hz
click track under everything. And rxcodec 0x10 asks for TWO-channel LPCM,
which the mono playback path rendered as double-speed garble; 0x02 asks for
the one channel the monitor plays.
2026-08-29 15:32:44 +02:00
rouggy 0e48ad7bb2 fix(icom): the IC-7760's attenuator is the stepped 6/12/18 dB kind
Confirmed on a real one. It was falling into the single-20 dB default, whose
one button the rig NAKs.
2026-08-29 15:29:14 +02:00
rouggy ad82c21dbc debug(icom): log the raw packets seen during a control handshake
A rig that answers something unrecognised (a newer model, another firmware)
and a rig that answers nothing are different faults; a silent timeout hides
which. Capped at a dozen packets so a working handshake cannot flood the log.
Prompted by the first IC-7760 network attempt — which turned out to be aimed
at the console's IP, where nothing listens; the remote server lives on the RF
deck.
2026-08-29 15:12:12 +02:00
rouggy 6f126802cd feat(icom): the IC-7760 joins the model list
CI-V default address B2h, per the radio's own menu. Both places that know a
model: the settings dropdown and civ.ModelName.
2026-08-29 15:02:23 +02:00
rouggy 704b614c38 fix(elecraft): calibrate the S-meter, and stop the SWR spike lingering
The S-unit mapping was provisional, waiting for a real radio. One arrived:
side by side with a K3's own display, raw 5 reads S7 and raw 9 reads S9+20,
so S9 sits near raw 6.5 — not 9 — and each raw step above it is worth ~8 dB.
The old scale showed everything two S-units low.

The SWR meter borrowed the power meter's needle inertia — hold the peak, then
close a quarter of the gap per poll. The K3 throws a brief SWR spike as an FT8
frame ends, and that decay turned one bad sample into twelve seconds of red on
the next transmission. SWR now holds the peak for the same 1.5 s and then
snaps back to the live reading: it is a warning light, not a needle.
2026-08-29 13:52:40 +02:00
rouggy 6eb6f1b339 chore: release v0.27.0 2026-08-29 02:56:48 +02:00
rouggy dbd2fff121 chore(changelog): the watchlist block becomes 0.27.0
A new tab, a new file format carried over from another program, and a ClubLog
integration are a minor version, not a patch.
2026-08-29 02:56:28 +02:00
rouggy dc6da67cbf chore(changelog): the watchlist headlines 0.26.24
The block's one genuinely new feature opens it — with the ClubLog enrichment,
which had not made it into the entry yet — instead of sitting seventh between
an Elecraft button row and a bulk-edit field.
2026-08-29 02:55:16 +02:00
rouggy ea6fb1c29c fix(flex): send the spot-click zoom after the tune, not alongside it
Double-clicking a cluster spot tuned the slice and zoomed the panadapter in
the same breath. On a cross-band jump SmartSDR moves the panadapter itself to
follow the slice, and that follow lands after — and overrides — a zoom sent in
the same instant, so the width the operator configured never appeared. A spot
clicked ON the panadapter never hit this, because the radio had already tuned
before our zoom arrived; the two paths now behave the same. The Chase new
panel's pick is sequenced identically.
2026-08-29 02:45:07 +02:00
rouggy 29267a865c fix(flex): the Chase new panel's spot click zooms the panadapter too
Every other spot click — cluster grid, band map, watchlist, alert list — goes
through handleSpotClick, which applies the operator's per-mode panadapter
width after the tune. The Chase new panel had its own pick handler that tuned
and stopped there; it now makes the same view change, after the tune for the
same reason.
2026-08-29 02:37:13 +02:00
rouggy e93d2d36a8 feat(watchlist): the ClubLog expedition enrichment — phase 2 lands
clublog.org/watch.php, per entry: the DXpedition flag, OQRS, LiveStream, the
log's QSO total and the last-24h rate — the fields the schema has carried since
phase 1. Refreshed on DXHunter's own cadence (hourly for expeditions,
six-hourly for the rest), two at a time with a breath between requests: the
application API key is shared by every install, so a hundred-entry list must
read as a trickle at ClubLog's end. Nothing to configure — OpsLog's own key,
already used for cty and Most Wanted, serves.

A starred pattern is asked about by its base (ClubLog has no log for VK9*).
The card gains the 24h rate beside the QSO total and the Live link to the
expedition's stream.
2026-08-29 01:49:13 +02:00
rouggy 107c6fccf6 fix(watchlist): remove on a single click, like the bell and trophy beside it
The two-click arm goes: removing an entry is cheap to undo (type it again), so
it does not earn a confirmation its neighbours do not have. The bin reddens on
hover and the green line confirms the removal.
2026-08-29 01:36:06 +02:00
rouggy 9350af9589 fix(watchlist): remove actually removes on the second click
The two-click arm compared against the STATE variable, which each click's
handler captured at render time — a quick double-click read the pre-arm value
twice, so both clicks merely armed: the bin turned red and nothing was ever
deleted. The arm lives in a ref now, compared synchronously, and the window
grows to three seconds.
2026-08-29 01:34:09 +02:00
rouggy a9a6579a9a feat(watchlist): confirm an add, and both messages clear themselves
A green line under the toolbar says what was added (and as what — the contest
variant names the per-UTC-day rule); the already-exists error keeps its red
line. Both fade after four seconds: a stale 'added' from ten minutes ago reads
as a fresh one.
2026-08-29 01:30:10 +02:00
rouggy 7795e13432 fix(watchlist): open the store before the logbook connect
It was created after the (possibly remote) logbook connect, so a 10-30 s MySQL
dial left the tab saying 'Watchlist: 0' until the next refresh tick — twenty
seconds of an empty list for a JSON file that reads in a millisecond. It now
opens right after the data dir is known; only the auto-contest pattern waits
for the settings store.
2026-08-29 01:28:50 +02:00
rouggy c9e98d5fdd feat(watchlist): exact match by default, * for a family
The prefix matching ported from DXHunter swallowed too much: a three-letter
special-event entry N8W lit up NEEDED for N8WCR, a different station entirely.
The implicit becomes explicit — a bare entry matches exactly that call, a
trailing star makes it a family: VK9* catches every VK9…, RI0SP* the
expedition's portable forms. A star anywhere else (or alone) is refused at Add
rather than silently matching nothing. Same rule in the backend Match and the
tab's own matcher, pinned by test.
2026-08-29 01:25:34 +02:00
rouggy 72253f99fa style(watchlist): the toolbar is two atomic groups — no more orphan chip
Add-controls left, filters right, justify-between: when the pane narrows, the
whole filter group drops below as a block instead of shedding its last chip.
Shorter chip labels (Active / Needed) and a slimmer search keep both groups on
one line at the tab's normal width.
2026-08-29 01:16:53 +02:00
rouggy f0d3bed8a2 style(stats): room for a long entity beside its badges
The F1 panel widens 560 → 600 px, the header row drops its outer padding and
wide gaps, and the country badge tightens — so 'Central African Republic' and
the NEW SLOT chip share one line instead of the chip dropping alone underneath.
2026-08-29 01:11:02 +02:00
rouggy 30c9acf0d2 style(watchlist): counters on their own centred line, sane placeholders
The counters are the tab's headline and now sit alone, centred, above the
toolbar; everything one interacts with lives on the second row. The inputs stop
shouting their placeholders — the uppercase belonged to the VALUE (callsigns),
not the hint text — and the auto-contest field says what it is.
2026-08-29 01:08:39 +02:00
rouggy e3175ef6a3 fix(watchlist): never draw a spot before its verdict
A new spot rendered as Needed the instant it arrived and was withdrawn half a
second later when the worked answer landed — the list twitched on every burst.
Unsettled spots are now invisible everywhere (card lines, counters, the
Active/Needed-only filters) until their verdict is in: nobody needs a spot
150 ms early, they need it settled. The answer map is merged rather than
replaced, so a settled line can never fall back to unknown, and the query
debounce drops to 150 ms since there is nothing on screen waiting for it.
2026-08-29 01:06:01 +02:00
rouggy 441eb295c6 feat(watchlist): header counters, mode filter — and the alert checks worked FIRST
DXHunter's header row, ported: Watchlist / Active / Needed counts up front and
the All-Modes select beside the other filters (DIGI matches the digital class,
SSB folds USB/LSB). Counters, card lists and the Active/Needed-only filters all
read the same mode-filtered view, so the numbers add up to what is on screen.

And the notify alert now asks the SAME worked-slot question the tab asks —
before making a sound. It used to fire on the raw spot while the tab's verdict
arrived on a debounce, so the bell rang for a slot that showed Worked a moment
later. Judged in the backend at emit time: exact slot for named modes, digital
class for generic DATA, today-only for contest entries.
2026-08-29 01:03:37 +02:00
rouggy cb2f8aba72 fix(watchlist): the auto-contest FIELD — the backend shipped without its UI
The wiring script died on an app.go anchor mid-run: the backend half was
committed, the frontend half (the pattern field, the changed-event refresh, the
i18n keys) never ran. Replayed; the field sits after Add.
2026-08-29 00:58:46 +02:00
rouggy 7b9cda93bc style(watchlist): drop the lone '!' on needed lines
A needed line already says so twice — the amber left border and the Needed!
badge — and the exclamation mark was noise. The green tick stays on worked
lines.
2026-08-29 00:52:38 +02:00
rouggy 8f64e3fee3 feat(watchlist): the auto-contest pattern — DXHunter's contest_prefix
A field in the tab's toolbar (e.g. WWA): while non-empty, any spotted callsign
CONTAINING it joins the watchlist as a contest entry by itself — a
special-event fleet (HB9WWA, DL0WWA, F4WWA/P…) is collected as it appears
instead of typed in one by one, and each is judged per UTC day like any contest
entry. Contains, not prefix, because the event string sits anywhere in those
calls.

Global setting, cached in an atomic so the spot pipeline never touches the
settings store per spot. Emptying the field stops the collecting but keeps what
was collected — DXHunter deletes non-matching contest entries on a pattern
change, and a setting that silently empties an operator's list is the one
behaviour of the original this port refuses.

The tab also refreshes on backend auto-adds (event) and on a slow tick, so
last-seen and the counters stay honest while it sits open.
2026-08-29 00:50:14 +02:00
rouggy c4de5f2ea0 style(watchlist): a wider column, and the country stops truncating first
max-w-4xl left 'Central African R…' cut mid-name: the column grows to 5xl and
the country cell flexes with the row (capped at 14rem) instead of a hard 8rem.
2026-08-29 00:46:34 +02:00
rouggy 9172f504e5 fix(watchlist): judge generic DATA spots at digital-class grain; tidy the toolbar wrap
7.0589 falls in the band plan's generic [7.04-7.1] DATA segment — an F/H
DXpedition off the standard dials — and 'DATA' is in nobody's log, so the spot
read NEW MODE / Needed while the FT8 contact sat right there. A generic mode
cannot be matched exactly; it is now judged at digital-class grain — worked if
ANY digital mode of that call is logged on that band — against a second
class-folded slot set built beside the exact one (shared when the grouping
option already folds them). DXHunter answers this with a finer frequency table,
which fails on exactly these off-dial expeditions; the class rule cannot.

The toolbar also wraps as a whole with tighter gaps instead of dropping its
last filter chip onto a lone second line.
2026-08-29 00:43:30 +02:00
rouggy 7322e2ab66 feat(watchlist): dockable in the Main tab; sticky filters; Needed-only hides worked lines
The watchlist joins the Main-tab pane list (Settings → Main view), rendered in
a card like the other docked panels.

The three filters persist across tab switches — the component unmounts on every
switch, and filters that reset each time are filters nobody trusts.

Needed-only now hides the worked SPOT LINES as well as the all-worked cards,
which is DXHunter's own Not-Worked behaviour and the reported complaint: a
filter that says needed and still lists five green Worked rows answers a
different question than the one asked.

The add-row checkbox is relabelled 'as contest' — it marks the entry being
ADDED, and read as a filter beside the All/DX/Contest buttons it looked
redundant.
2026-08-29 00:39:07 +02:00
rouggy 29d79fb5d1 fix(watchlist): read the cluster's slot index, and cap the card width
The first version asked the alerts' worked-index — keyed by RAW mode (FT8) —
with a CLASS name (DIGI). Nothing ever matched, and a DXpedition worked on five
bands showed every slot as Needed.

The verdict now reads the cluster's own WorkedCallSlotKeys set, built in the
cached status maps (now unconditionally — it used to exist only when a display
option wanted it). Same index, same mode normalisation as the grid, so the
watchlist can never contradict the cluster about the same spot. The contest
today-set is normalised through the same function.

And the cards column is capped at a reading width instead of stretching
callsign-to-badge lines across the whole window.
2026-08-29 00:33:52 +02:00
rouggy f6b70184a7 chore(qso): drop the redundant SlotsSince free function 2026-08-29 00:26:32 +02:00
rouggy e4abcda94f feat(watchlist): the DXHunter watchlist as an OpsLog tab
The concept, transplanted: a list of callsigns or prefixes being hunted,
matched against the live spot stream, one card per entry with the spots
underneath and the two questions that matter answered on every line — is this
slot still needed, and what is it worth (the cluster's own NEW badges, read
from the same status index).

The file is DXHunter's own watchlist.json, field for field, ClubLog block
included though phase 2 will fill it — a file that round-trips unchanged is the
whole of 'same format', and a test pins it with a real DXHunter entry. Global
(dataDir), not per profile.

CONTEST is per entry, not the global mode DXHunter has: a contest entry is
judged against the current UTC day — the boundary lives in the query's date
bound, so midnight needs no timer and resets nothing. Normal entries read the
same in-memory worked index the alerts use. Prefix matching is why RI0SP
catches RI0SP/MM, pinned by test.

Notify goes through the existing alert:fired event — the frontend already
toasts and sounds it — throttled to one alert per entry per two minutes,
because a DXpedition lights every skimmer on the planet.

Tab wired like NET Control: opt-in from Tools, persisted, closable. Single
click fills the callsign, double click works the spot — the cluster's own
gesture, kept.
2026-08-29 00:25:40 +02:00
rouggy 284ee4ba7c feat(bulk): My DXCC / My CQ zone / My ITU zone
The My-station group covered nineteen fields and not the three numeric ones.
They take their own integer path rather than the generic text setter: the
columns are nullable integers, and while SQLite would coerce '14' quietly, a
shared MySQL logbook would not — and empty must become NULL, never ''. Bounds
checked (DXCC <1000, CQ 1-40, ITU 1-90) so a slip cannot stamp zone 400 across
a thousand rows.
2026-08-29 00:13:47 +02:00
rouggy 10ef984962 feat(k3): align RIT/XIT and the power step with the other consoles
'None of the consoles look alike' is the complaint ShiftRow exists to answer,
and the Elecraft panel was still driving its offset with a row of nudge buttons.
It now uses the shared control — ±, wheel, typed value — plus the same
Ctrl+←/→ 10 Hz clarifier the Icom and TCI panels have. The K3 keeps ONE offset
for RIT and XIT, so both rows show it, exactly like the Icom's.

The backend gains the absolute setter the shared control speaks
(SetKenwoodRITOffset, funnelled through the same RO write as the nudge), and
the power slider moves in 1 W steps — nobody asks a K3 for 'between 10 and 15
watts' in fives.

Also per review: the chase switches are labelled 'Chase POTA' / 'Chase SOTA',
matching 'Chase new grids' beside them.
2026-08-28 23:56:49 +02:00
rouggy bd8719ce99 feat(cluster): chase switches for POTA and SOTA
An operator who does not chase parks does not want NEW POTA shouting from every
activator spot. Two switches (Settings → DX Cluster, on by default): off, the
marker is withdrawn at the display layer — applySpotDisplay, the same chokepoint
the grid, the band map and the filter read through — so the badge, the colour,
the filter chip and the reference column all go quiet together, and a new-band +
new-POTA spot reads NEW BAND alone. The facts keep being computed; only the
telling stops, so ticking the box back on needs no rescan.
2026-08-28 23:48:22 +02:00
rouggy 5e38319379 style(settings): trim the DX Cluster panel's explanations
Per review: the digital-grouping sentence on the same-slot option, the
spot-lifetime explanation, the ring-buffer paragraph on the spots-kept field,
and the free-public-nodes line all go.
2026-08-28 23:44:01 +02:00
rouggy 7e7ad50f60 feat(k3): a mode row on the Elecraft console — CW/USB/LSB/DATA/DATA-RTTY
The report: switching the K3 to a data mode 'does not work for FT8 — the K3
does not go into DATA'. The mode digit is only half the answer on that radio:
MD6 keeps whatever DT submode the previous session left, and with FSK D still
armed the rig keys FT8 with no rear-audio modulation.

The panel buttons say the whole thing: DATA is MD6+DT0 (DATA A, the soundcard
path), DATA RTTY is MD6+DT2 (FSK D). The DT submode is also read on the
settings beat — Elecraft only, a plain Kenwood would '?;' it — so the active
DATA button follows what the rig is actually in, front-panel changes included.
A dedicated SetKenwoodPanelMode rather than the logger's SetMode: a panel
button is the operator saying exactly what the rig should do, not an ADIF mode
to be mapped through preferences.
2026-08-28 23:35:25 +02:00
rouggy 0f4e31853b fix(cluster): slot colour apart from POTA, chips match badges, NEW CALL filter works
Three from review. Aqua for NEW SLOT sat right next to the POTA green — it is
now the sky cyan the panadapter palette has shipped for new-slot all along.
The NEW COUNTY chip was green while its badge is violet, and NEW SLOT's chip
was still caution yellow: chips now carry the badge's own colour (color-mix for
the muted border/背景), because a filter that does not look like what it selects
has to be learned twice.

And the NEW CALL chip matched only the DISPLAYED status, which is manufactured
by the slot-highlight option — with that option off the chip matched nothing
and read as broken. It now filters on the fact itself (worked_slot false), so
it works either way.
2026-08-28 23:29:08 +02:00
rouggy c222468021 style(cluster): give NEW SLOT its own colour
The whole new-* family shared the warning amber while the NEW PFX marker sits in
caution yellow — two different facts, two near-identical colours in one cell.
NEW SLOT now takes aqua (chart-2), the same story the panadapter palette already
tells: its default for new-slot has been cyan all along.
2026-08-28 23:24:06 +02:00
rouggy 2fb4a4d0ce fix(spot): in split, pre-fill the RX frequency — where the station is
The Send-spot dialog took catState.freq_hz, which is the TX frequency. Working
a DXpedition split, that is where WE transmit: the spot went out five up from
the DX, pointing the whole cluster at the pile-up instead of the station. The
RX frequency is where we listen — where the DX is — and is what a spot names.
2026-08-28 23:21:17 +02:00
rouggy e4828482c4 fix(tci): send the sensor subscription in both cases
Two rounds of fixes and the SunSDR's meters are still silent. The one remaining
difference from the protocol document is the case: its examples read
TX_SENSORS_ENABLE:true,200; and ours went out lower-case. Every other command
works lower-case, but nothing proves this newer path does — a case-insensitive
server ignores the duplicate, a sensitive one finally hears it.
2026-08-28 22:54:44 +02:00
rouggy 8acfda4e42 fix(tci): resubscribe to the meters at 'ready', and log what comes back
The report from a real SunSDR: transmit power and SWR still empty after the
sensors fix. The subscription went out once, at connect — while ExpertSDR3 is
still streaming its initial state dump, exactly where a unidirectional control
command can be ignored. It is now renewed every time the server says 'ready'.

The sensor messages also join the logged-on-arrival set, capped like the rest:
the next log will say whether TX_SENSORS ever arrives, which is the question —
a radio that never sends it (AetherSDR may not) and a frame that arrived and
was dropped leave the same blank meters and need opposite fixes.
2026-08-28 22:51:25 +02:00
41 changed files with 3057 additions and 532 deletions
+258 -71
View File
@@ -74,6 +74,7 @@ import (
"hamlog/internal/tunergenius" "hamlog/internal/tunergenius"
"hamlog/internal/uls" "hamlog/internal/uls"
"hamlog/internal/ultrabeam" "hamlog/internal/ultrabeam"
"hamlog/internal/watchlist"
"hamlog/internal/winkeyer" "hamlog/internal/winkeyer"
wruntime "github.com/wailsapp/wails/v2/pkg/runtime" wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
@@ -95,12 +96,13 @@ const (
keyLookupFailsafe = "lookup.failsafe" keyLookupFailsafe = "lookup.failsafe"
keyLookupImages = "lookup.download_images" // 1 = expose QRZ ImageURL to UI keyLookupImages = "lookup.download_images" // 1 = expose QRZ ImageURL to UI
keyStationCallsign = "station.callsign" keyStationCallsign = "station.callsign"
keyStationOperator = "station.operator" keyStationOperator = "station.operator"
keyStationMyGrid = "station.my_grid" keyWatchlistContestPattern = "watchlist.contest_pattern" // auto-add contest calls containing this
keyStationCountry = "station.my_country" keyStationMyGrid = "station.my_grid"
keyStationSOTA = "station.my_sota_ref" keyStationCountry = "station.my_country"
keyStationPOTA = "station.my_pota_ref" keyStationSOTA = "station.my_sota_ref"
keyStationPOTA = "station.my_pota_ref"
keyListsBands = "lists.bands" keyListsBands = "lists.bands"
keyListsModes = "lists.modes" keyListsModes = "lists.modes"
@@ -157,6 +159,7 @@ const (
keyCATIcomNetUser = "cat.icom.net.user" // Icom network: Network User1 ID keyCATIcomNetUser = "cat.icom.net.user" // Icom network: Network User1 ID
keyCATIcomNetPass = "cat.icom.net.pass" // Icom network: Network User1 password keyCATIcomNetPass = "cat.icom.net.pass" // Icom network: Network User1 password
keyCATIcomNetAudio = "cat.icom.net.audio" // Icom network: stream RX audio on 50003 (experimental) keyCATIcomNetAudio = "cat.icom.net.audio" // Icom network: stream RX audio on 50003 (experimental)
keyAudioMonitorOn = "audio.monitor.on" // play the network RX audio through the Listening device (the stream itself stays open for the recorder either way)
keyCATTCIHost = "cat.tci.host" // TCI host (Expert Electronics SunSDR / ExpertSDR2) keyCATTCIHost = "cat.tci.host" // TCI host (Expert Electronics SunSDR / ExpertSDR2)
keyCATTCIPort = "cat.tci.port" // TCI WebSocket port (default 40001) keyCATTCIPort = "cat.tci.port" // TCI WebSocket port (default 40001)
keyCATTCISpots = "cat.tci.spots" // push cluster spots to the TCI panorama keyCATTCISpots = "cat.tci.spots" // push cluster spots to the TCI panorama
@@ -735,6 +738,10 @@ type App struct {
uls *uls.Store // US callsign→county/grid (offline FCC ULS), lazily opened uls *uls.Store // US callsign→county/grid (offline FCC ULS), lazily opened
awardRefs *awardref.Repo awardRefs *awardref.Repo
qslTemplates *qslcard.Repo qslTemplates *qslcard.Repo
watchlist *watchlist.Store // Tools → Watchlist (global watchlist.json)
watchAlertMu sync.Mutex // throttles watchlist alerts…
watchAlertAt map[string]time.Time // …per entry
watchPattern atomic.Value // auto-contest pattern (string), loaded at startup
operating *operating.Repo operating *operating.Repo
udp *udp.Manager udp *udp.Manager
udpRepo *udp.Repo udpRepo *udp.Repo
@@ -1015,6 +1022,13 @@ func (a *App) startup(ctx context.Context) {
return return
} }
a.dataDir = dataDir a.dataDir = dataDir
// The watchlist needs nothing but its file, so it opens FIRST. It used to be
// created after the logbook connect, and a remote MySQL dial of 10-30 s left
// the tab saying "Watchlist: 0" until the next refresh tick — twenty seconds
// of an empty list for a JSON file that reads in a millisecond. (The
// auto-contest pattern still loads later, once the settings store is open.)
a.watchlist = watchlist.New(filepath.Join(dataDir, "watchlist.json"))
a.watchAlertAt = map[string]time.Time{}
// Settings/config database (settings + profiles). Fresh installs use // Settings/config database (settings + profiles). Fresh installs use
// settings.db; existing installs keep their opslog.db (which also held the // settings.db; existing installs keep their opslog.db (which also held the
// QSOs before they were split into a dedicated logbook file — see below). // QSOs before they were split into a dedicated logbook file — see below).
@@ -1239,6 +1253,49 @@ func (a *App) startup(ctx context.Context) {
go a.applyRelayAuto(s.FreqHz, s.Band) go a.applyRelayAuto(s.FreqHz, s.Band)
} }
}) })
// Digital Voice Keyer + QSO recorder (WASAPI). Idle until used. Created
// BEFORE the CAT link comes up, and it matters: a network Icom with RX
// audio enabled builds its audio sink inside reloadCAT, gated on audioMgr —
// when the manager was created later, every fresh launch connected with
// audio silently off, and the operator had to untick/save/retick the option
// to hear anything.
a.audioMgr = audio.NewManager(func() {
st := a.dvkStatus()
// When a voice message finishes (or is stopped), drop the PTT we keyed
// for it — but tag the release with the current key generation so it
// can't cut a transmission a newer message already started.
if !st.Playing {
a.pttMu.Lock()
keyed := a.dvkPttKeyed
gen := a.pttGen
if keyed {
a.dvkPttKeyed = false
}
a.pttMu.Unlock()
if keyed {
go a.dvkUnkeyPTT(gen)
}
// And give the microphone back, if we took it (see raiseFlexDVKDax).
// Off the callback's goroutine: this talks to the radio, and the
// audio manager is reporting a state change, not waiting on us.
go a.lowerFlexDVKDax()
}
if a.ctx != nil {
wruntime.EventsEmit(a.ctx, "audio:status", st)
}
})
a.qsoRec = audio.NewRecorder()
if a.audioMgr != nil {
// A running monitor picks the new level up immediately: the operator is
// listening while they move the slider, and asking them to stop and
// restart it to hear the change is how a working control gets reported
// as broken.
if cfg, err := a.GetAudioSettings(); err == nil {
a.audioMgr.SetMonitorGain(cfg.FromGain)
}
}
a.startQSORecorderIfEnabled()
a.reloadCAT() a.reloadCAT()
// The QSO logbook lives where the ACTIVE PROFILE points it: the local SQLite // The QSO logbook lives where the ACTIVE PROFILE points it: the local SQLite
@@ -1385,6 +1442,8 @@ func (a *App) startup(ctx context.Context) {
// POTA: background poller of api.pota.app so cluster spots can be tagged // POTA: background poller of api.pota.app so cluster spots can be tagged
// when the DX station is currently activating a park. Best-effort. // when the DX station is currently activating a park. Best-effort.
a.pota = pota.New(func(format string, args ...any) { applog.Printf(format, args...) }) a.pota = pota.New(func(format string, args ...any) { applog.Printf(format, args...) })
a.startWatchlistClubLog()
a.watchPattern.Store(strings.ToUpper(strings.TrimSpace(a.settingOr(keyWatchlistContestPattern, ""))))
go a.pota.Run(a.ctx) go a.pota.Run(a.ctx)
// DX Cluster (multi-server): the spot callback enriches each spot // DX Cluster (multi-server): the spot callback enriches each spot
@@ -1464,44 +1523,6 @@ func (a *App) startup(ctx context.Context) {
}) })
a.solar.Start() a.solar.Start()
// Digital Voice Keyer + QSO recorder (WASAPI). Idle until used.
a.audioMgr = audio.NewManager(func() {
st := a.dvkStatus()
// When a voice message finishes (or is stopped), drop the PTT we keyed
// for it — but tag the release with the current key generation so it
// can't cut a transmission a newer message already started.
if !st.Playing {
a.pttMu.Lock()
keyed := a.dvkPttKeyed
gen := a.pttGen
if keyed {
a.dvkPttKeyed = false
}
a.pttMu.Unlock()
if keyed {
go a.dvkUnkeyPTT(gen)
}
// And give the microphone back, if we took it (see raiseFlexDVKDax).
// Off the callback's goroutine: this talks to the radio, and the
// audio manager is reporting a state change, not waiting on us.
go a.lowerFlexDVKDax()
}
if a.ctx != nil {
wruntime.EventsEmit(a.ctx, "audio:status", st)
}
})
a.qsoRec = audio.NewRecorder()
if a.audioMgr != nil {
// A running monitor picks the new level up immediately: the operator is
// listening while they move the slider, and asking them to stop and
// restart it to hear the change is how a working control gets reported
// as broken.
if cfg, err := a.GetAudioSettings(); err == nil {
a.audioMgr.SetMonitorGain(cfg.FromGain)
}
}
a.startQSORecorderIfEnabled()
// NET Control store (global JSON, shared across logbooks). // NET Control store (global JSON, shared across logbooks).
if ns, err := netctl.Open(filepath.Join(a.dataDir, "nets.json")); err != nil { if ns, err := netctl.Open(filepath.Join(a.dataDir, "nets.json")); err != nil {
applog.Printf("netctl: open failed: %v", err) applog.Printf("netctl: open failed: %v", err)
@@ -1796,6 +1817,9 @@ func (a *App) setSettingGlobal(key, val string) {
} }
func (a *App) shutdown(ctx context.Context) { func (a *App) shutdown(ctx context.Context) {
if a.watchlist != nil {
a.watchlist.Flush() // the save debounce would lose the last edits
}
// If the user managed to skip beforeClose (force kill, OS shutdown, // If the user managed to skip beforeClose (force kill, OS shutdown,
// crash recovery) we still try the backup here as a best-effort // crash recovery) we still try the backup here as a best-effort
// safety net. HasBackupToday makes a double-run a no-op. // safety net. HasBackupToday makes a double-run a no-op.
@@ -6938,6 +6962,28 @@ func (a *App) BulkUpdateField(ids []int64, field, value string) (int64, error) {
if field == "freq" { if field == "freq" {
return a.bulkSetFrequency(ids, value) return a.bulkSetFrequency(ids, value)
} }
// The station-side numbers. Bounded so a slip cannot stamp CQ zone 400 on a
// thousand rows: DXCC entities stop short of 1000, CQ zones at 40, ITU at 90.
// Empty clears (NULL).
if field == "my_dxcc" || field == "my_cq_zone" || field == "my_itu_zone" {
var vp *int
if t := strings.TrimSpace(value); t != "" {
v, err := strconv.Atoi(t)
max := map[string]int{"my_dxcc": 999, "my_cq_zone": 40, "my_itu_zone": 90}[field]
if err != nil || v < 1 || v > max {
return 0, fmt.Errorf("%s must be a number between 1 and %d (empty to clear)", field, max)
}
vp = &v
}
n, err := a.qso.BulkSetIntField(a.ctx, ids, field, vp)
if err != nil {
return 0, err
}
if n > 0 {
a.invalidateAwardStats()
}
return n, nil
}
// Some ADIF fields have no promoted column and live in extras_json // Some ADIF fields have no promoted column and live in extras_json
// (OWNER_CALLSIGN) — those take the JSON path so the rest of the extras on // (OWNER_CALLSIGN) — those take the JSON path so the rest of the extras on
// each QSO survive the edit. // each QSO survive the edit.
@@ -8395,7 +8441,7 @@ func (a *App) ListAudioInputDevices() ([]audio.Device, error) {
return devs, err return devs, err
} }
if a.tciAudioAvailable() { if a.tciAudioAvailable() {
devs = append([]audio.Device{{ID: audio.NetworkDeviceID, Name: "Radio (TCI network audio)"}}, devs...) devs = append([]audio.Device{{ID: audio.NetworkDeviceID, Name: "Radio (network audio)"}}, devs...)
} }
return devs, nil return devs, nil
} }
@@ -8422,7 +8468,7 @@ func (a *App) ListAudioOutputDevices() ([]audio.Device, error) {
return devs, err return devs, err
} }
if audio.NetworkPlayerReady() { if audio.NetworkPlayerReady() {
devs = append([]audio.Device{{ID: audio.NetworkDeviceID, Name: "Radio (TCI network audio)"}}, devs...) devs = append([]audio.Device{{ID: audio.NetworkDeviceID, Name: "Radio (network audio)"}}, devs...)
} }
return devs, nil return devs, nil
} }
@@ -8981,6 +9027,10 @@ func (a *App) clusterEventWorker() {
a.detectBandOpening(s) a.detectBandOpening(s)
// Fire any matching alert rules (sound / visual / e-mail). // Fire any matching alert rules (sound / visual / e-mail).
a.evaluateAlerts(s) a.evaluateAlerts(s)
// The watchlist sees the same live stream the alerts do — never the
// SH/DX replay above, which would mark forty stations "just seen" with
// spots from three hours ago.
a.watchSpot(s.DXCall, s.Band, alerts.InferMode(s.Comment, s.FreqHz), s.Country, s.Comment, s.FreqHz)
// Mirror the spot onto the FlexRadio panadapter when enabled. Infer the // Mirror the spot onto the FlexRadio panadapter when enabled. Infer the
// mode (from the comment, else the band plan) so clicking the spot on the // mode (from the comment, else the band plan) so clicking the spot on the
// panadapter tunes AND switches mode — a DX cluster line carries no mode, // panadapter tunes AND switches mode — a DX cluster line carries no mode,
@@ -9218,7 +9268,9 @@ func (a *App) QSOAudioManualReady() bool {
return false return false
} }
cfg, _ := a.GetAudioSettings() cfg, _ := a.GetAudioSettings()
return !cfg.QSORecord && strings.TrimSpace(cfg.FromRadio) != "" // Over the network the radio needs no sound card: the 50003 stream is the
// source, so the button is offered even with "From radio" empty.
return !cfg.QSORecord && (strings.TrimSpace(cfg.FromRadio) != "" || a.icomNetAudioActive())
} }
// QSOAudioManualStart begins a recording when automatic recording is off. // QSOAudioManualStart begins a recording when automatic recording is off.
@@ -9235,10 +9287,19 @@ func (a *App) QSOAudioManualStart() bool {
} }
if !a.qsoRec.Running() { if !a.qsoRec.Running() {
cfg, _ := a.GetAudioSettings() cfg, _ := a.GetAudioSettings()
if strings.TrimSpace(cfg.FromRadio) == "" { // Same source rule as the automatic recorder: when the RX audio arrives
// over the network, record THAT — not the "From radio" sound card, which
// on a mixed station is another radio entirely. A manual take on the
// network IC-7760 was capturing the Flex's DAX: technically a recording,
// just not of the QSO being made.
from := cfg.FromRadio
a.qsoRecPushed = a.icomNetAudioActive() || cfg.FromRadio == audio.NetworkDeviceID
if a.qsoRecPushed {
from = audio.PushedSource
} else if strings.TrimSpace(from) == "" {
return false return false
} }
if err := a.qsoRec.Start(cfg.FromRadio, cfg.RecordingDevice, cfg.PrerollSeconds); err != nil { if err := a.qsoRec.Start(from, cfg.RecordingDevice, cfg.PrerollSeconds); err != nil {
applog.Printf("qso-rec: manual start failed: %v", err) applog.Printf("qso-rec: manual start failed: %v", err)
return false return false
} }
@@ -10620,6 +10681,26 @@ func (a *App) AudioStartMonitor() error {
return fmt.Errorf("audio not initialized") return fmt.Errorf("audio not initialized")
} }
cfg, _ := a.GetAudioSettings() cfg, _ := a.GetAudioSettings()
// Idempotent: asking to listen while a monitor is already running restarts
// it instead of refusing. The refusal surfaced as a checkbox that unticked
// itself the instant it was ticked, whenever the UI's idea of the state and
// the real monitor had drifted apart.
a.audioMgr.StopMonitor()
// When the rig's audio arrives over the NETWORK (Icom 50003), the monitor
// must be render-only: this button used to start a USB capture from the
// "From radio" device as well, and that second producer — often another
// radio's DAX — interleaved its chunks with the network stream's pushes.
// The result was audio chopped to pieces the moment the operator toggled
// Listening off and on while connected to a network Icom.
if cs, err := a.GetCATSettings(); err == nil && cs.Enabled && cs.Backend == "icom-net" && cs.IcomNetAudio {
a.setSetting(keyAudioMonitorOn, "1")
applog.Printf("audio: RX monitor start (network sink only → listen=%q)", cfg.ListeningDevice)
return a.audioMgr.StartMonitorSink(cfg.ListeningDevice)
}
// Only the USB path needs a capture device — checked AFTER the network
// branch, which needs none: with From-radio empty (the normal network
// setup) this refusal was un-ticking the speakers checkbox the instant it
// was ticked.
if strings.TrimSpace(cfg.FromRadio) == "" { if strings.TrimSpace(cfg.FromRadio) == "" {
return fmt.Errorf(`no "From radio" capture device set — pick the rig's USB Audio CODEC in Settings → Audio`) return fmt.Errorf(`no "From radio" capture device set — pick the rig's USB Audio CODEC in Settings → Audio`)
} }
@@ -10630,6 +10711,7 @@ func (a *App) AudioStartMonitor() error {
// AudioStopMonitor stops the RX monitor passthrough. // AudioStopMonitor stops the RX monitor passthrough.
func (a *App) AudioStopMonitor() { func (a *App) AudioStopMonitor() {
a.setSetting(keyAudioMonitorOn, "0")
if a.audioMgr != nil { if a.audioMgr != nil {
a.audioMgr.StopMonitor() a.audioMgr.StopMonitor()
applog.Printf("audio: RX monitor stopped") applog.Printf("audio: RX monitor stopped")
@@ -10652,9 +10734,44 @@ func (a *App) AudioStartTX() error {
if strings.TrimSpace(cfg.ToRadio) == "" { if strings.TrimSpace(cfg.ToRadio) == "" {
return fmt.Errorf(`no "To radio" device set — pick the rig's USB Audio CODEC output in Settings → Audio`) return fmt.Errorf(`no "To radio" device set — pick the rig's USB Audio CODEC output in Settings → Audio`)
} }
// Live mic over the radio's own link: the To-radio "device" is the radio.
// Fetched before keying so a missing stream refuses cleanly with the PTT
// never touched.
var netSend func([]byte) error
if cfg.ToRadio == audio.NetworkDeviceID {
if strings.TrimSpace(cfg.RecordingDevice) == "" {
return fmt.Errorf("pick your microphone as the Recording mic in Settings → Audio")
}
type sender interface {
TXAudioSender() (func([]byte) error, error)
}
err := a.cat.IcomDo(func(ic cat.IcomController) error {
p, ok := ic.(sender)
if !ok {
return fmt.Errorf("this radio cannot take live microphone audio over its link yet")
}
fn, err := p.TXAudioSender()
if err != nil {
return err
}
netSend = fn
return nil
})
if err != nil {
return err
}
}
if err := a.pttKey(cfg); err != nil { // key first — no point streaming to a rig that isn't transmitting if err := a.pttKey(cfg); err != nil { // key first — no point streaming to a rig that isn't transmitting
return err return err
} }
if netSend != nil {
if err := a.audioMgr.StartTXAudioNetwork(cfg.RecordingDevice, netSend); err != nil {
a.pttUnkey()
return err
}
applog.Printf("audio: TX start (mic=%q → the radio over the network, ptt=%q)", cfg.RecordingDevice, cfg.PTTMethod)
return nil
}
if err := a.audioMgr.StartTXAudio(cfg.RecordingDevice, cfg.ToRadio); err != nil { if err := a.audioMgr.StartTXAudio(cfg.RecordingDevice, cfg.ToRadio); err != nil {
a.pttUnkey() a.pttUnkey()
return err return err
@@ -14416,6 +14533,23 @@ func (a *App) IcomSetSplit(on bool) error {
return a.cat.IcomDo(func(ic cat.IcomController) error { return ic.SetIcomSplit(on) }) return a.cat.IcomDo(func(ic cat.IcomController) error { return ic.SetIcomSplit(on) })
} }
// IcomSetATU puts the internal tuner in or out of line.
func (a *App) IcomSetATU(on bool) error {
if a.cat == nil {
return fmt.Errorf("cat not initialized")
}
return a.cat.IcomDo(func(ic cat.IcomController) error { return ic.SetATU(on) })
}
// IcomSetSplitOffset turns split on with a chosen TX offset (Hz) — the
// console's +1/+5/+10 kHz buttons.
func (a *App) IcomSetSplitOffset(hz int64) error {
if a.cat == nil {
return fmt.Errorf("cat not initialized")
}
return a.cat.IcomDo(func(ic cat.IcomController) error { return ic.SetIcomSplitOffset(true, hz) })
}
func (a *App) IcomSetAntenna(n int) error { func (a *App) IcomSetAntenna(n int) error {
if a.cat == nil { if a.cat == nil {
return fmt.Errorf("cat not initialized") return fmt.Errorf("cat not initialized")
@@ -15520,27 +15654,42 @@ func (a *App) reloadCAT() {
// verification (see icomaudio.go) — hence experimental + opt-in. // verification (see icomaudio.go) — hence experimental + opt-in.
acfg, _ := a.GetAudioSettings() acfg, _ := a.GetAudioSettings()
a.audioMgr.StopMonitor() // clear any prior monitor/sink so a re-save restarts cleanly a.audioMgr.StopMonitor() // clear any prior monitor/sink so a re-save restarts cleanly
if err := a.audioMgr.StartMonitorSink(acfg.ListeningDevice); err != nil { // The SINK — decode + recorder feed — exists whenever the stream is
applog.Printf("icom-net audio: cannot start output sink: %v", err) // on. It used to be built only when the speakers were also wanted,
} else { // so "speakers off" (or a sink that failed to open) silently turned
codec := audio.NewPCM16Codec() // the whole stream off: audio=false on the wire, no recordings, no
audioSink = func(payload []byte) { // voice keyer, and a ticked RX-audio checkbox that did nothing.
pcm, err := codec.Decode(payload) codec := audio.NewPCM16Codec()
if err != nil { audioSink = func(payload []byte) {
return pcm, err := codec.Decode(payload)
} if err != nil {
a.audioMgr.PushMonitorAudio(pcm) return
// And to the QSO recorder, which has no device to capture from
// on this backend. It drops the samples unless a recording is
// actually running, so this costs a function call when idle.
if a.qsoRec != nil {
a.qsoRec.PushRX(pcm)
}
} }
a.audioMgr.PushMonitorAudio(pcm)
// And to the QSO recorder, which has no device to capture from
// on this backend. It drops the samples unless a recording is
// actually running, so this costs a function call when idle.
if a.qsoRec != nil {
a.qsoRec.PushRX(pcm)
}
}
// Listening is a CHOICE, remembered: an operator sitting next to the
// radio hears it in the room and wants the stream only for the
// recorder and the voice keyer. Stop listening turns this off, the
// Listen button turns it back on, and reconnects respect it instead
// of switching the speakers back on every time.
if a.settingOr(keyAudioMonitorOn, "1") != "1" {
applog.Printf("icom-net audio: stream on, speakers off (Listening was stopped by the operator)")
} else if err := a.audioMgr.StartMonitorSink(acfg.ListeningDevice); err != nil {
applog.Printf("icom-net audio: stream on, but the output sink failed: %v", err)
} else {
applog.Printf("icom-net audio: RX audio streaming ENABLED (experimental) → %q", acfg.ListeningDevice) applog.Printf("icom-net audio: RX audio streaming ENABLED (experimental) → %q", acfg.ListeningDevice)
} }
} }
a.cat.Start(cat.NewIcomNet(s.IcomNetHost, s.IcomNetUser, s.IcomNetPass, s.IcomAddr, s.DigitalDefault, audioSink)) a.cat.Start(cat.NewIcomNet(s.IcomNetHost, s.IcomNetUser, s.IcomNetPass, s.IcomAddr, s.DigitalDefault, audioSink))
// With the audio session open the radio can also TAKE audio: offer it to
// the voice keyer, the way a TCI radio is offered.
a.installIcomTXPlayer(audioSink != nil)
case "tci": case "tci":
// Expert Electronics TCI (WebSocket) — SunSDR / ExpertSDR2, or any // Expert Electronics TCI (WebSocket) — SunSDR / ExpertSDR2, or any
// TCI-compatible server. The receive audio rides the same socket, so // TCI-compatible server. The receive audio rides the same socket, so
@@ -19682,10 +19831,11 @@ type SpotStatus struct {
// that already holds the pointer keeps reading valid (stale-by-one-log) data // that already holds the pointer keeps reading valid (stale-by-one-log) data
// while a newer snapshot is being built. See clusterStatusMaps. // while a newer snapshot is being built. See clusterStatusMaps.
type clusterStatusCache struct { type clusterStatusCache struct {
entities map[int]*qso.EntitySlot entities map[int]*qso.EntitySlot
workedCalls map[string]struct{} workedCalls map[string]struct{}
workedCallSlots map[string]struct{} // nil unless the "same slot" option is on workedCallSlots map[string]struct{}
workedCounties map[string]struct{} workedCallSlotsDig map[string]struct{} // same set, digital modes folded to DIG // nil unless the "same slot" option is on
workedCounties map[string]struct{}
// callCounties holds callsign → "STATE,County" for stations already logged // callCounties holds callsign → "STATE,County" for stations already logged
// with a county, so a spot shows the county the entry panel showed rather // with a county, so a spot shows the county the entry panel showed rather
// than the one derived from the licence ZIP. See qso.CallCounties. // than the one derived from the licence ZIP. See qso.CallCounties.
@@ -19768,8 +19918,18 @@ func (a *App) clusterStatusMaps() *clusterStatusCache {
// "Already worked only on the same slot" option (Settings → DX Cluster): the // "Already worked only on the same slot" option (Settings → DX Cluster): the
// WORKED-call flag then needs the SAME band and mode (digital-grouped through // WORKED-call flag then needs the SAME band and mode (digital-grouped through
// the same normMode when that option is on) rather than the call anywhere. // the same normMode when that option is on) rather than the call anywhere.
if sameSlot || slotHighlight { // Built UNCONDITIONALLY since the watchlist arrived: its per-slot verdict
c.workedCallSlots, _ = a.qso.WorkedCallSlotKeys(a.ctx, c.normMode) // needs this set whatever the cluster's own display options say, and the
// scan already runs at cache-rebuild cadence, not per batch.
c.workedCallSlots, _ = a.qso.WorkedCallSlotKeys(a.ctx, c.normMode)
// And once more at digital-CLASS grain, for the spots whose mode the band
// plan can only call "DATA": a generic mode cannot be matched exactly, so it
// is judged against "any digital mode of this call on this band". When the
// grouping option is on, workedCallSlots is already at that grain.
if c.normMode != nil {
c.workedCallSlotsDig = c.workedCallSlots
} else {
c.workedCallSlotsDig, _ = a.qso.WorkedCallSlotKeys(a.ctx, qso.GroupDigitalMode)
} }
// Orthogonal dimensions: worked US counties (for the ULS callsign→county // Orthogonal dimensions: worked US counties (for the ULS callsign→county
// lookup) and worked POTA parks. // lookup) and worked POTA parks.
@@ -20997,3 +21157,30 @@ func (a *App) CheckHamlogKey(key string) (string, error) {
defer cancel() defer cancel()
return extsvc.CheckHamlogKey(ctx, nil, key) return extsvc.CheckHamlogKey(ctx, nil, key)
} }
// GetAudioMonitorPref says whether the network RX audio should be played
// through the Listening device — the remembered speaker choice behind the
// console's speaker button and the CAT panel's checkbox.
func (a *App) GetAudioMonitorPref() bool {
return a.settingOr(keyAudioMonitorOn, "1") == "1"
}
// IcomConsolePTT is the console's PTT button. On a USB station it keys the
// rig and nothing more — the operator talks into the radio's own microphone.
// When the transmit audio goes over the NETWORK, keying alone transmits
// silence: the PC microphone must be routed with it, exactly as the Talk
// button does. One button, the right road picked here.
func (a *App) IcomConsolePTT(on bool) error {
cfg, _ := a.GetAudioSettings()
if cfg.ToRadio == audio.NetworkDeviceID {
if on {
return a.AudioStartTX()
}
a.AudioStopTX()
return nil
}
if a.cat == nil {
return fmt.Errorf("cat not initialized")
}
return a.cat.SetPTT(on)
}
+49
View File
@@ -0,0 +1,49 @@
package main
// The voice keyer, through an Icom's network link — the Icom face of what
// app_tci_dvk.go does for a SunSDR: selecting the radio as the "To radio"
// output hands messages to the 50003 audio session instead of a sound card.
// The same PTT before and after, the same gain, the same files.
import (
"fmt"
"hamlog/internal/applog"
"hamlog/internal/audio"
"hamlog/internal/cat"
)
// icomTXPlayer hands one message to the radio. Fetched on the CAT goroutine,
// played off it — a ten-second message must not freeze frequency, mode and
// PTT handling for ten seconds (see tciTXPlayer, which set the pattern).
func (a *App) icomTXPlayer(pcm []byte, rate, ch, bits int, stop <-chan struct{}) error {
if a.cat == nil {
return fmt.Errorf("CAT not initialized")
}
type txPlayer interface {
PlayTXAudio(pcm []byte, rate, ch, bits int, stop <-chan struct{}) error
}
var player txPlayer
err := a.cat.IcomDo(func(ic cat.IcomController) error {
p, ok := ic.(txPlayer)
if !ok {
return fmt.Errorf("this radio cannot take transmit audio over its CAT link")
}
player = p
return nil
})
if err != nil {
return err
}
return player.PlayTXAudio(pcm, rate, ch, bits, stop)
}
// installIcomTXPlayer offers the network Icom as an audio output, or withdraws
// it. Withdrawing matters as much as offering — see installTCITXPlayer.
func (a *App) installIcomTXPlayer(on bool) {
if !on {
return // the reloadCAT preamble already cleared the network player
}
audio.SetNetworkPlayer(a.icomTXPlayer)
applog.Printf("icom net: the radio is available as an audio output — the voice keyer can play to it without a cable")
}
+11
View File
@@ -24,6 +24,17 @@ func (a *App) GetKenwoodState() cat.KenwoodTXState {
return st return st
} }
// SetKenwoodPanelMode sets the operating mode from the panel's mode row —
// CW / USB / LSB / DATA (soundcard, DT0) / RTTY (FSK D, DT2).
func (a *App) SetKenwoodPanelMode(mode string) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodPanelMode(mode) })
}
// SetKenwoodRITOffset sets the RIT/XIT offset to an absolute value in Hz.
func (a *App) SetKenwoodRITOffset(hz int) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodRITOffset(hz) })
}
func (a *App) SetKenwoodPower(w int) error { func (a *App) SetKenwoodPower(w int) error {
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodPower(w) }) return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodPower(w) })
} }
+9
View File
@@ -235,3 +235,12 @@ func (a *App) activeRadioMyRig() string {
} }
return "" return ""
} }
// ActiveRadioMyRig exposes the connected radio's MY_RIG to the frontend, which
// pre-fills the entry form's My-station fields on every band change. Without
// this the per-band default landed in the field FIRST, and the log-time
// priority (the radio that is keying beats the radio that was planned) never
// ran — the field was no longer empty by the time the backend looked.
func (a *App) ActiveRadioMyRig() string {
return a.activeRadioMyRig()
}
+293
View File
@@ -0,0 +1,293 @@
package main
// Watchlist bindings — the DXHunter watchlist concept as an OpsLog tab.
// The store lives in internal/watchlist (global watchlist.json, DXHunter's own
// schema); this file is the Wails boundary plus the two places the list meets
// the rest of the app: the spot stream (MarkSeen + alert) and the logbook (the
// worked-today answer contest entries are judged by).
import (
"context"
"fmt"
"net/http"
"strings"
"time"
"hamlog/internal/applog"
"hamlog/internal/qso"
"hamlog/internal/watchlist"
wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
)
// The auto-contest pattern, DXHunter's contest_prefix: while non-empty, any
// spotted callsign CONTAINING it is added to the watchlist as a contest entry
// by itself — a special-event fleet (HB9WWA, DL0WWA, F4WWA…) is collected as
// it appears instead of typed in one by one. Held in an atomic so the spot
// pipeline never touches the settings store per spot.
func (a *App) GetWatchlistContestPattern() string {
if v := a.watchPattern.Load(); v != nil {
return v.(string)
}
return ""
}
// SetWatchlistContestPattern stores the pattern (global, like the list itself).
// Emptying it stops the auto-add; entries already collected stay — deleting an
// operator's list because a setting changed is DXHunter behaviour this port
// deliberately drops.
func (a *App) SetWatchlistContestPattern(p string) {
p = strings.ToUpper(strings.TrimSpace(p))
a.watchPattern.Store(p)
a.setSettingGlobal(keyWatchlistContestPattern, p)
}
// WatchlistEntries returns the list for the tab.
func (a *App) WatchlistEntries() []watchlist.Entry {
if a.watchlist == nil {
return nil
}
return a.watchlist.Entries()
}
// WatchlistAdd adds a callsign or prefix; contest entries are judged per UTC day.
func (a *App) WatchlistAdd(callsign string, contest bool) error {
if a.watchlist == nil {
return fmt.Errorf("watchlist not initialized")
}
return a.watchlist.Add(callsign, contest)
}
// WatchlistRemove deletes an entry.
func (a *App) WatchlistRemove(callsign string) error {
if a.watchlist == nil {
return fmt.Errorf("watchlist not initialized")
}
return a.watchlist.Remove(callsign)
}
// WatchlistSetNotify arms the existing alert path (sound + toast) for an entry.
func (a *App) WatchlistSetNotify(callsign string, on bool) error {
if a.watchlist == nil {
return fmt.Errorf("watchlist not initialized")
}
return a.watchlist.SetNotify(callsign, on)
}
// WatchlistSetContest flips the per-entry contest rule.
func (a *App) WatchlistSetContest(callsign string, on bool) error {
if a.watchlist == nil {
return fmt.Errorf("watchlist not initialized")
}
return a.watchlist.SetContest(callsign, on)
}
// WatchlistSlotQuery asks whether one spot's slot is worked — against the whole
// log for a normal entry, against TODAY (UTC) for a contest one.
type WatchlistSlotQuery struct {
Call string `json:"call"`
Band string `json:"band"`
Mode string `json:"mode"`
Contest bool `json:"contest"`
}
// WatchlistWorkedSlots answers a batch of slot questions for the tab.
//
// Normal entries read the CLUSTER's own slot set — the same cached
// WorkedCallSlotKeys index that colours the grid — so the watchlist can never
// contradict the cluster about the same spot. That index normalises the mode
// exactly as the operator configured (digital grouping on → FT4 counts as FT8's
// class; off → exact mode), and the first version of this ignored that: it
// asked the alerts' raw-mode index with a CLASS name, matched nothing, and
// showed a fully-worked DXpedition as all Needed.
//
// Contest entries read TODAY's contacts instead — the midnight-UTC reset is
// the query's date bound, nothing stored, nothing to reset — normalised through
// the same function so the two answers use one grammar.
func (a *App) WatchlistWorkedSlots(queries []WatchlistSlotQuery) []bool {
out := make([]bool, len(queries))
if a.qso == nil || len(queries) == 0 {
return out
}
idx := a.clusterStatusMaps()
norm := func(m string) string {
m = strings.ToUpper(strings.TrimSpace(m))
if idx.normMode != nil {
m = idx.normMode(m)
}
return m
}
slotKey := func(call, band, mode string) string {
up := strings.ToUpper(strings.TrimSpace(call))
b := strings.ToLower(strings.TrimSpace(band))
if m := norm(mode); m != "" {
return up + "|" + b + "|" + m
}
return up + "|" + b
}
// A spot whose mode the band plan could only call "DATA" (an F/H DXpedition
// off the standard dials, a comment with no mode) cannot be matched exactly:
// "DATA" is in nobody's log. Such a spot is judged at digital-CLASS grain —
// worked if ANY digital mode of that call is logged on that band. Claiming
// NEW MODE because the label differs from FT8 was the reported bug.
generic := func(m string) bool {
switch strings.ToUpper(strings.TrimSpace(m)) {
case "", "DATA", "DIG", "DIGI", "DIGITAL":
return true
}
return false
}
digKey := func(call, band string) string {
return strings.ToUpper(strings.TrimSpace(call)) + "|" + strings.ToLower(strings.TrimSpace(band)) + "|DIG"
}
needToday := false
for _, q := range queries {
if q.Contest {
needToday = true
break
}
}
today := map[string]bool{}
if needToday {
midnight := time.Now().UTC().Truncate(24 * time.Hour)
rows, err := a.qso.SlotsSince(a.ctx, midnight)
if err == nil {
for _, r := range rows {
today[slotKey(r.Callsign, r.Band, r.Mode)] = true
today[digKey(r.Callsign, r.Band)] = qso.ModeClass(r.Mode) == "DIG" || today[digKey(r.Callsign, r.Band)]
}
}
}
for i, q := range queries {
if q.Contest {
if generic(q.Mode) {
out[i] = today[digKey(q.Call, q.Band)]
} else {
out[i] = today[slotKey(q.Call, q.Band, q.Mode)]
}
} else if generic(q.Mode) {
if idx.workedCallSlotsDig != nil {
_, out[i] = idx.workedCallSlotsDig[digKey(q.Call, q.Band)]
}
} else if idx.workedCallSlots != nil {
_, out[i] = idx.workedCallSlots[slotKey(q.Call, q.Band, q.Mode)]
}
}
return out
}
// watchSpot runs one live spot through the watchlist: last-seen bookkeeping and
// the alert, through the SAME event the alert rules fire — the frontend already
// knows how to toast and sound it, and a second notification path would be a
// second thing to misconfigure.
func (a *App) watchSpot(dxCall, band, mode, country, comment string, freqHz int64) {
if a.watchlist == nil {
return
}
entry, notify, ok := a.watchlist.MarkSeen(dxCall)
if !ok {
// Not watched yet — the auto-contest pattern may claim it. Contains, not
// prefix: the event string sits anywhere in these calls (HB9WWA, F4WWA/P).
if p := a.GetWatchlistContestPattern(); p != "" &&
strings.Contains(strings.ToUpper(dxCall), p) {
if err := a.watchlist.Add(dxCall, true); err == nil {
applog.Printf("watchlist: auto-added %s (contest pattern %q)", dxCall, p)
entry, notify, ok = a.watchlist.MarkSeen(dxCall)
if a.ctx != nil {
wruntime.EventsEmit(a.ctx, "watchlist:changed")
}
}
}
}
if !ok || !notify || a.ctx == nil {
return
}
// Already worked? Then nothing to announce. Judged HERE, before the sound —
// the report was an alert ringing for a slot the tab showed as Worked a
// moment later, because the frontend's verdict arrives on a debounce while
// the alert used to fire on the raw spot. Same verdict as the tab: exact
// slot for named modes, digital class for a generic DATA spot, today-only
// for a contest entry.
if e, found := a.watchlist.Get(entry); found {
if a.WatchlistWorkedSlots([]WatchlistSlotQuery{{Call: dxCall, Band: band, Mode: mode, Contest: e.IsContest}})[0] {
return
}
}
// Throttled per entry: a DXpedition lights up every skimmer on the planet,
// and forty alerts a minute for one station is a alarm nobody keeps on.
a.watchAlertMu.Lock()
last := a.watchAlertAt[entry]
now := time.Now()
if now.Sub(last) < 2*time.Minute {
a.watchAlertMu.Unlock()
return
}
a.watchAlertAt[entry] = now
a.watchAlertMu.Unlock()
wruntime.EventsEmit(a.ctx, "alert:fired", map[string]any{
"rule": "Watchlist " + entry,
"call": strings.ToUpper(strings.TrimSpace(dxCall)),
"band": band,
"mode": mode,
"freq_hz": freqHz,
"country": country,
"comment": comment,
"sound": true,
"visual": true,
})
}
// startWatchlistClubLog begins the expedition enrichment: every entry's
// ClubLog block (expedition flag, OQRS, LiveStream, QSO totals and 24 h rate)
// is refreshed on a rolling schedule — hourly for expeditions, six-hourly for
// the rest, DXHunter's own cadence. OpsLog's application API key is used, so
// there is nothing to configure.
//
// Two at a time with a breath between requests: the key is shared by every
// OpsLog install, and a hundred-entry watchlist must read as a trickle at
// ClubLog's end, not a burst.
func (a *App) startWatchlistClubLog() {
if a.watchlist == nil {
return
}
go func() {
client := &http.Client{Timeout: 30 * time.Second}
// Let the app finish starting before the first network pass.
time.Sleep(15 * time.Second)
for {
stale := a.watchlist.StaleEntries(1*time.Hour, 6*time.Hour)
changed := false
for _, call := range stale {
// The pattern's BASE is what ClubLog knows: VK9* has no log.
base := strings.TrimSuffix(call, "*")
if base == "" {
continue
}
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
d, err := watchlist.FetchWatch(ctx, client, clublogAppAPIKey, base)
cancel()
if err != nil {
applog.Printf("watchlist clublog: %s: %v", base, err)
continue
}
if a.watchlist.ApplyClubLog(call, d) {
changed = true
if d.IsExpedition {
applog.Printf("watchlist clublog: %s is a DXpedition (%d QSOs, %d/24h, OQRS=%v)",
base, func() int {
if d.ClubLogInfo != nil {
return d.ClubLogInfo.TotalQSOs
}
return 0
}(), d.QSOs24h(), d.HasOQRS)
}
}
time.Sleep(400 * time.Millisecond)
}
if changed && a.ctx != nil {
wruntime.EventsEmit(a.ctx, "watchlist:changed")
}
time.Sleep(10 * time.Minute)
}
}()
}
+108
View File
@@ -1,4 +1,112 @@
[ [
{
"version": "0.27.1",
"date": "",
"en": [
"Elecraft console: the S-meter is calibrated against a real K3 — S9 and the +dB readings now match the radios own display (they read about two S-units low).",
"Elecraft console: an SWR spike (the K3s own blip at the end of an FT8 frame) no longer fades over twelve seconds — the peak shows briefly, then the meter returns straight to the live reading.",
"Icom: the IC-7760 joins the model list (CI-V address B2h).",
"Icom console: the IC-7760 gets its real attenuator steps — 6/12/18 dB.",
"Icom network audio: the RX stream is decoded correctly — mono is requested and the payload offset was confirmed on a real IC-7760, curing the garbled, clicking audio.",
"Icom: switching back from a data mode (USB-D1) to plain USB now sticks — if the rig ignores the data-flag command, it is repeated with the modern one-frame form (0x26). Seen on the IC-7760.",
"Icom console: a DATA mode button (USB-D, what FT8 wants), the PSK button drives the rigs that have a native PSK mode, and the power meter reads in real watts on the IC-7760s 250 W scale.",
"Icom network audio: the right codec is requested (16-bit mono LPCM), settled by experiment on a real IC-7760.",
"CAT settings: reopening the panel now shows the radio that is actually selected — it always showed the first one, with the fields (MY_RIG included) silently editing the wrong entry.",
"IC-7760: the power meter is calibrated against the radio (100 W reads 100 W on the 250 W face) and the RF power setting reads in watts, not a percentage.",
"Icom network audio: toggling Listening off and on no longer chops the sound — the monitor restarts as network-fed instead of also opening a USB capture.",
"QSO recorder: starting a fresh manual take resets the counter for good — it used to flash 0 and jump back to the previous takes elapsed time.",
"MY_RIG follows the radio actually connected: the entry form now asks the active radio first, before the per-band default — an IC-7760 on the air no longer logs as the Flex the band plan names.",
"QSO recorder: a manual take on a network Icom records the network RX stream, not the “From radio” sound card (which captured another radios DAX on a mixed station).",
"Icom network audio: duplicate and late-retransmitted packets no longer reach the recorder — recordings came out longer than the QSO, slowed and stuttering, while the speakers played fine.",
"Icom network audio: it now starts with the app — launching OpsLog connected with audio silently off, and the option had to be unticked and re-saved to hear anything.",
"Icom network: when the rig goes quiet on CI-V while the session stays up (seen on the IC-7760), the CI-V flow is re-opened on the spot — recovery in seconds instead of the 35-second full reconnect.",
"Icom network: after a session dies young, the redial waits 20 s so the rig can purge the old session first — stops the reconnect-die-reconnect spiral seen on the IC-7760, where each fresh session answered for a second and was then strangled by the previous ones cleanup.",
"Icom network audio, phase 5: the radio can now TAKE audio — with RX audio enabled, pick “Radio (network audio)” as the To-radio device and the voice keyer plays straight to the rig over the LAN, no cable, no virtual sound card. First tested on the IC-7760.",
"Icom network audio: listening is now a remembered choice — Stop listening keeps the speakers off across reconnects and restarts, while the stream stays open for the QSO recorder and the voice keyer.",
"Icom console: a speaker button beside ON/OFF toggles listening to the network RX audio right from the console — no more trip through Settings → Audio; recordings and the voice keyer keep working either way, and the choice is remembered.",
"CAT settings: a “Play it through the speakers” checkbox sits under the Icom RX-audio option — the same remembered switch as the consoles speaker button, applied immediately.",
"Icom network audio: “Talk to radio” now works over the LAN too — live microphone straight to the rig, PTT included. With RX audio and a headset, OpsLog is a complete remote station: hear, talk, key CW and log over one network link.",
"Icom console: the SUB display shows the sub receivers frequency at all times (it was blank until split), and engaging split copies the mode to the TX VFO so it matches the main.",
"Icom network audio: the stream now opens regardless of the speaker choice — speakers-off (or a failed output device) was silently disabling the whole stream: no audio session, no recordings, no voice keyer, despite the RX-audio option being ticked.",
"Icom network: a radio in standby keeps its session and the consoles ON button — the quiet-CI-V recovery was tearing the session down every 15 s, so a radio that was off when OpsLog started could never be powered on.",
"Icom console: the MOX button carries your microphone on a network station, and engaging split aligns the TX VFOs mode with the main.",
"Icom console: the spectrum scope is removed. Every model streams its waveform differently — and on the IC-7760 enabling it killed the whole CI-V link, audio included. The radios own scope does it better.",
"Icom: any leftover waveform stream is switched off at connect — the scope flag lives in the radio and survived sessions, and its flood is what was killing the IC-7760s CI-V link.",
"Icom console: an ATU chip beside SPLIT engages or DISENGAGES the internal tuner — TUNE started a cycle but could never take the tuner back out of line.",
"Icom console: the TX meters get needle inertia — power holds its peak instead of flickering to 0 W between syllables, SWR shows the real peak then returns to the live value — and the wattage readout no longer wraps at three digits.",
"Icom console: the meters use the same LED bars as the Flex and Elecraft consoles, and the mode badge says USB or LSB instead of an ambiguous SSB.",
"Cluster: spots on the standard FT8/FT4 frequencies of every band now read FT8/FT4 when the comment names no mode — 30 m, 60 m, 80 m FT4, 17 m FT4 and 12 m were falling into the generic DATA bucket.",
"OmniRig (Yaesu): with split engaged, tuning to a spot moves BOTH VFOs — on an FT-2000 the write landed on the TX VFO only, so the transmitter QSYed and the receiver stayed behind.",
"Worked before: a slow lookup can no longer overwrite a newer one — typing a second callsign quickly could leave the previous calls QSOs displayed under the new calls name.",
"Icom network: OpsLog now sends its own pings every 500 ms on all three streams, as RS-BA1 and wfview do — a client that only ever replied was judged absent by the rig, which stopped serving CI-V data about a minute into every session: the recurring sound/CAT dropouts."
],
"fr": [
"Console Elecraft : le S-mètre est calibré sur un vrai K3 — S9 et les +dB correspondent désormais à laffichage de la radio (il lisait environ deux points S trop bas).",
"Console Elecraft : un pic de ROS (le sursaut du K3 en fin de trame FT8) ne sestompe plus pendant douze secondes — le pic saffiche brièvement, puis le ros-mètre revient directement à la valeur réelle.",
"Icom : lIC-7760 rejoint la liste des modèles (adresse CI-V B2h).",
"Console Icom : lIC-7760 reçoit ses vrais crans datténuateur — 6/12/18 dB.",
"Audio réseau Icom : le flux RX est décodé correctement — le mono est demandé et loffset du payload a été confirmé sur un vrai IC-7760, ce qui guérit le son inaudible et les clics.",
"Icom : revenir dun mode data (USB-D1) au USB simple tient désormais — si la radio ignore la commande du drapeau data, elle est répétée sous la forme moderne en une trame (0x26). Constaté sur lIC-7760.",
"Console Icom : un bouton de mode DATA (USB-D, celui de FT8), le bouton PSK pilote les radios qui ont un vrai mode PSK, et le wattmètre lit en watts réels sur l’échelle 250 W de lIC-7760.",
"Audio réseau Icom : le bon codec est demandé (LPCM mono 16 bits), déterminé par lexpérience sur un vrai IC-7760.",
"Réglages CAT : rouvrir le panneau montre désormais la radio réellement sélectionnée — il montrait toujours la première, et les champs (MY_RIG compris) modifiaient silencieusement la mauvaise entrée.",
"IC-7760 : le wattmètre est calibré sur la radio (100 W affiche 100 W sur l’échelle 250 W) et le réglage RF power se lit en watts, plus en pourcentage.",
"Audio réseau Icom : couper puis relancer Listening ne hache plus le son — le moniteur redémarre alimenté par le réseau au lieu douvrir en plus une capture USB.",
"Enregistreur de QSO : démarrer une nouvelle prise manuelle remet le compteur à zéro pour de bon — il affichait 0 puis resautait au temps de la prise précédente.",
"MY_RIG suit la radio réellement connectée : le formulaire interroge dabord la radio active, avant le défaut par bande — un IC-7760 à lantenne ne se logue plus comme le Flex prévu par le plan de bande.",
"Enregistreur de QSO : une prise manuelle sur un Icom réseau enregistre le flux RX réseau, pas la carte son « From Radio » (qui capturait le DAX dune autre radio sur une station mixte).",
"Audio réseau Icom : les paquets dupliqués ou retransmis en retard natteignent plus lenregistreur — les enregistrements sortaient plus longs que le QSO, ralentis et hachés, alors que les haut-parleurs jouaient bien.",
"Audio réseau Icom : il démarre maintenant avec lapplication — au lancement, la connexion se faisait audio coupé, et il fallait décocher/recocher loption pour entendre quelque chose.",
"Réseau Icom : quand la radio se tait sur le CI-V alors que la session tient (constaté sur lIC-7760), le flux CI-V est rouvert immédiatement — récupération en quelques secondes au lieu des 35 secondes de reconnexion complète.",
"Réseau Icom : après une session morte jeune, la renumérotation attend 20 s pour que la radio purge dabord lancienne session — stoppe la spirale reconnexion-mort-reconnexion vue sur lIC-7760, où chaque session neuve répondait une seconde avant d’être étranglée par le nettoyage de la précédente.",
"Audio réseau Icom, phase 5 : la radio peut maintenant RECEVOIR de laudio — avec le RX audio activé, choisissez « Radio (network audio) » comme périphérique To Radio et le voice keyer joue directement vers la radio par le LAN, sans câble ni carte son virtuelle. Premier test sur lIC-7760.",
"Audio réseau Icom : l’écoute est désormais un choix mémorisé — Stop listening garde les enceintes coupées à travers reconnexions et redémarrages, tandis que le flux reste ouvert pour lenregistreur de QSO et le voice keyer.",
"Console Icom : un bouton haut-parleur à côté de ON/OFF bascule l’écoute du RX audio réseau depuis la console — fini laller-retour dans Réglages → Audio ; enregistrements et voice keyer continuent de fonctionner, et le choix est mémorisé.",
"Réglages CAT : une case « Écouter dans les enceintes » sous loption RX audio Icom — le même interrupteur mémorisé que le bouton haut-parleur de la console, appliqué immédiatement.",
"Audio réseau Icom : « Talk to radio » fonctionne aussi par le LAN — micro en direct vers la radio, PTT compris. Avec le RX audio et un casque, OpsLog devient une station remote complète : écouter, parler, manipuler la CW et loguer sur un seul lien réseau.",
"Console Icom : laffichage SUB montre la fréquence du sub receiver en permanence (il restait vide hors split), et activer le split copie le mode sur le VFO TX pour quil suive le main.",
"Audio réseau Icom : le flux souvre désormais indépendamment du choix d’écoute — enceintes coupées (ou périphérique de sortie en échec) désactivait silencieusement tout le flux : pas de session audio, ni enregistrements, ni voice keyer, malgré la case RX audio cochée.",
"Réseau Icom : une radio en veille garde sa session et le bouton ON de la console — la récupération du CI-V muet détruisait la session toutes les 15 s, donc une radio éteinte au lancement dOpsLog ne pouvait jamais être allumée.",
"Console Icom : le bouton MOX emporte votre micro sur une station réseau, et activer le split aligne le mode du VFO TX sur le main.",
"Console Icom : le scope spectral est retiré. Chaque modèle streame sa forme donde différemment — et sur lIC-7760 son activation tuait tout le lien CI-V, audio compris. Le scope de la radio fait ça mieux.",
"Icom : tout flux waveform résiduel est coupé à la connexion — le drapeau scope vit dans la radio et survivait aux sessions, et son flot est ce qui tuait le lien CI-V de lIC-7760.",
"Console Icom : une puce ATU à côté de SPLIT engage ou DÉSENGAGE le tuner interne — TUNE lançait un cycle mais ne pouvait jamais remettre le tuner hors ligne.",
"Console Icom : les mètres TX gagnent une inertie daiguille — la puissance tient sa crête au lieu de retomber à 0 W entre les syllabes, le ROS montre la vraie crête puis revient à la valeur vive — et laffichage en watts ne passe plus à la ligne à trois chiffres.",
"Console Icom : les mètres utilisent les mêmes barres LED que les consoles Flex et Elecraft, et le badge de mode dit USB ou LSB au lieu dun SSB ambigu.",
"Cluster : les spots sur les fréquences standard FT8/FT4 de chaque bande lisent désormais FT8/FT4 quand le commentaire ne nomme pas de mode — 30 m, 60 m, FT4 80 m, FT4 17 m et 12 m tombaient dans le bloc DATA générique.",
"OmniRig (Yaesu) : avec le split actif, se rendre sur un spot déplace LES DEUX VFO — sur un FT-2000 l’écriture natteignait que le VFO TX, donc l’émetteur QSYait et le récepteur restait derrière.",
"Déjà contacté : une recherche lente ne peut plus écraser une plus récente — taper un second indicatif rapidement pouvait laisser les QSO du call précédent affichés sous le nom du nouveau.",
"Réseau Icom : OpsLog envoie désormais ses propres pings toutes les 500 ms sur les trois flux, comme RS-BA1 et wfview — un client qui ne faisait que répondre était jugé absent par la radio, qui cessait de servir le CI-V au bout dune minute : les coupures récurrentes de son/CAT."
]
},
{
"version": "0.27.0",
"date": "",
"en": [
"⭐ NEW — Watchlist (Tools): the DXHunter watchlist as an OpsLog tab — callsigns you are hunting (exact, or a family with a trailing * — VK9* catches every VK9), the live cluster spots under each with the NEW badges and a Needed/Worked verdict per slot, an ON AIR badge, per-entry alerts through the normal alert path, and CONTEST entries judged per UTC day (at midnight everything is workable again).Each entry is enriched from ClubLog automatically: DXpedition badge, OQRS, LiveStream link, QSO total and 24-hour rate — nothing to configure. Reads and writes DXHunters own watchlist.json format — drop your existing file into the data folder to carry it over.",
"TCI (SunSDR): the meter subscription is renewed when the radio announces it is ready — sent only at connect, it could fall inside the initial state dump and be ignored, which left the transmit power and SWR empty. The log now also records the subscription and the first sensor frames, so a report can tell “the radio never sends them” from “they arrived and were dropped”.",
"Sending a spot while in split now pre-fills the RX frequency — where the station actually is — instead of the TX frequency, which spotted the pile-up five up from the DX.",
"Cluster: NEW SLOT gets its own colour — the sky cyan the panadapter palette already uses for it, clearly apart from POTA green and the yellows. The NEW SLOT and NEW COUNTY filter chips now wear the same colours as the badges they select, and the NEW CALL filter works even when the slot-highlight display option is off.",
"Elecraft console: a mode row — CW, USB, LSB, DATA and DATA RTTY. The two DATA buttons set the K3s submode as well (DATA A for FT8/FT4, FSK D for RTTY): switching to DATA by mode alone kept whatever submode the last session left, which is how a K3 “in DATA” keys FT8 with no audio.",
"DX Cluster settings: “I chase POTA” and “I chase SOTA”, on by default. Unticked, the NEW POTA badge, colour and filter disappear — a new-band + new-POTA spot reads NEW BAND alone — and the reference columns stay empty.",
"Elecraft console: RIT and XIT use the same control as the Icom and TCI consoles — ± buttons, mouse wheel, typed value, Ctrl+←/→ — and the power slider moves in 1 W steps instead of 5.",
"Bulk edit: My DXCC, My CQ zone and My ITU zone join the My-station fields — numbers checked against their real ranges, empty clears.",
"Clicking a spot in the Chase new panel now applies the FlexRadio panadapter width/zoom, like every other spot click.",
"FlexRadio: the panadapter width/zoom now applies reliably when double-clicking a cluster spot — the zoom is sent after the tune settles, so SmartSDRs own pan-follow on a band change no longer overrides it."
],
"fr": [
"⭐ NOUVEAU — Watchlist (Outils) : la watchlist de DXHunter en onglet OpsLog — indicatifs chassés (exacts, ou une famille avec une * finale — VK9* attrape tous les VK9), les spots cluster en direct sous chaque entrée avec les badges NOUVEAU et un verdict Manquant/Contacté par créneau, un badge ON AIR, des alertes par entrée via le circuit d'alerte normal, et des entrées CONTEST jugées par jour UTC (à minuit tout redevient à faire).Chaque entrée est enrichie automatiquement depuis ClubLog : badge DXpedition, OQRS, lien LiveStream, total de QSO et rythme sur 24 h — rien à configurer. Lit et écrit le format watchlist.json de DXHunter — déposez votre fichier existant dans le dossier data pour le récupérer.",
"TCI (SunSDR) : l'abonnement aux mesures est renouvelé quand la radio annonce qu'elle est prête — envoyé seulement à la connexion, il pouvait tomber pendant l'envoi initial de l'état et être ignoré, laissant la puissance et le ROS vides en émission. Le journal enregistre aussi l'abonnement et les premières trames de mesure, pour distinguer « la radio ne les envoie jamais » de « elles arrivaient et étaient perdues ».",
"Envoyer un spot en split préremplit désormais la fréquence RX — là où la station se trouve réellement — au lieu de la fréquence TX, qui spottait le pile-up cinq au-dessus du DX.",
"Cluster : NOUVEAU SLOT reçoit sa propre couleur — le cyan ciel que la palette du panadapter lui donne déjà, bien distinct du vert POTA et des jaunes. Les puces de filtre NOUVEAU SLOT et NOUVEAU COMTÉ portent désormais les couleurs des badges qu'elles sélectionnent, et le filtre NOUVEAU CALL fonctionne même quand l'option de surlignage par slot est désactivée.",
"Console Elecraft : une rangée de modes — CW, USB, LSB, DATA et DATA RTTY. Les deux boutons DATA règlent aussi le sous-mode du K3 (DATA A pour FT8/FT4, FSK D pour le RTTY) : passer en DATA par le seul mode gardait le sous-mode de la session précédente, et un K3 « en DATA » manipulait le FT8 sans audio.",
"Réglages DX Cluster : « Je chasse le POTA » et « Je chasse le SOTA », cochés par défaut. Décochés, le badge, la couleur et le filtre NOUVEAU POTA disparaissent — un spot nouvelle bande + nouveau POTA affiche seulement NOUVELLE BANDE — et les colonnes de références restent vides.",
"Console Elecraft : le RIT et le XIT utilisent la même commande que les consoles Icom et TCI — boutons ±, molette, valeur tapée, Ctrl+←/→ — et le curseur de puissance avance par pas de 1 W au lieu de 5.",
"Édition groupée : My DXCC, My CQ zone et My ITU zone rejoignent les champs Ma station — valeurs vérifiées contre leurs bornes réelles, vide efface.",
"Cliquer un spot dans le panneau Chase new applique désormais la largeur/zoom du panadapter FlexRadio, comme tout autre clic de spot.",
"FlexRadio : la largeur/zoom du panadapter sapplique désormais de façon fiable au double-clic sur un spot du cluster — le zoom est envoyé après le tune, pour que le suivi du panadapter de SmartSDR lors dun changement de bande ne l’écrase plus."
]
},
{ {
"version": "0.26.23", "version": "0.26.23",
"date": "", "date": "",
+125 -31
View File
@@ -33,7 +33,7 @@ import {
GetSolarData, GetSolarData,
GetQSORate, GetQSORate,
LoTWUserInfo, LoTWUserInfo,
OperatingDefaultForBand, OperatingDefaultForBand, ActiveRadioMyRig,
LogUDPLoggedADIF, LogUDPLoggedADIF,
ListCountries, ListCountries,
GetWinkeyerSettings, SaveWinkeyerSettings, ListSerialPorts, GetWinkeyerStatus, GetWinkeyerSettings, SaveWinkeyerSettings, ListSerialPorts, GetWinkeyerStatus,
@@ -69,6 +69,7 @@ import {
} from '@/components/ui/dropdown-menu'; } from '@/components/ui/dropdown-menu';
import { APP_VERSION, APP_AUTHOR } from '@/version'; import { APP_VERSION, APP_AUTHOR } from '@/version';
import { QSLManagerPanel } from '@/components/QSLManagerModal'; import { QSLManagerPanel } from '@/components/QSLManagerModal';
import { WatchlistTab } from '@/components/WatchlistTab';
import { QslDesignerModal } from '@/components/qsl/QslDesignerModal'; import { QslDesignerModal } from '@/components/qsl/QslDesignerModal';
import { SendEQSLModal } from '@/components/qsl/SendEQSLModal'; import { SendEQSLModal } from '@/components/qsl/SendEQSLModal';
import { AutoEQSL } from '@/components/qsl/AutoEQSL'; import { AutoEQSL } from '@/components/qsl/AutoEQSL';
@@ -98,7 +99,7 @@ import { ExportFieldsDialog } from '@/components/ExportFieldsDialog';
import { ShutdownProgress } from '@/components/ShutdownProgress'; import { ShutdownProgress } from '@/components/ShutdownProgress';
import { ClusterGrid } from '@/components/ClusterGrid'; import { ClusterGrid } from '@/components/ClusterGrid';
import { cleanSpotter, inferSpotMode, spotModeCategory, spotStatusKey } from '@/lib/spot'; import { cleanSpotter, inferSpotMode, spotModeCategory, spotStatusKey } from '@/lib/spot';
import { applySpotDisplay, readSpotDisplayOptions, spotIsWorked, SPOT_DISPLAY_OPTIONS_EXPOSED } from '@/lib/spotDisplay'; import { applySpotDisplay, chasePota, readSpotDisplayOptions, spotIsWorked, SPOT_DISPLAY_OPTIONS_EXPOSED } from '@/lib/spotDisplay';
import { AnswerDecode, HaltDecodeTx, LogUIError, FlexTXOnBand, GetMatrixColors, GetRotorPresets, GetRowColors, GetSpotTTLMinutes, GetSpotMax, IsNewUSCounty } from '../wailsjs/go/main/App'; import { AnswerDecode, HaltDecodeTx, LogUIError, FlexTXOnBand, GetMatrixColors, GetRotorPresets, GetRowColors, GetSpotTTLMinutes, GetSpotMax, IsNewUSCounty } from '../wailsjs/go/main/App';
import { applyMatrixColors } from '@/lib/matrixColors'; import { applyMatrixColors } from '@/lib/matrixColors';
import { WorkedBeforeGrid } from '@/components/WorkedBeforeGrid'; import { WorkedBeforeGrid } from '@/components/WorkedBeforeGrid';
@@ -933,11 +934,16 @@ export default function App() {
useEffect(() => { useEffect(() => {
if (!band) return; if (!band) return;
let cancelled = false; let cancelled = false;
OperatingDefaultForBand(band).then((d) => { OperatingDefaultForBand(band).then(async (d) => {
if (cancelled) return;
// The radio actually CONNECTED names itself ahead of the per-band plan:
// an IC-7760 on the air must not log as the Flex the band default names.
let liveRig = '';
try { liveRig = (await ActiveRadioMyRig()) || ''; } catch {}
if (cancelled) return; if (cancelled) return;
setDetails((cur) => ({ setDetails((cur) => ({
...cur, ...cur,
my_rig: d?.station_name || '', my_rig: liveRig || d?.station_name || '',
my_antenna: d?.antenna_name || '', my_antenna: d?.antenna_name || '',
tx_pwr: d?.tx_pwr ?? cur.tx_pwr, tx_pwr: d?.tx_pwr ?? cur.tx_pwr,
})); }));
@@ -1050,6 +1056,13 @@ export default function App() {
if (!active) setError(t('rec.manualFailed')); if (!active) setError(t('rec.manualFailed'));
}).catch((e: any) => setError(String(e?.message ?? e))); }).catch((e: any) => setError(String(e?.message ?? e)));
}; };
// recTick means "a fresh take" — that is the only case where the clock returns
// to zero, as opposed to resuming after a stop. Declared BEFORE the ticking
// effect below and deliberately so: effects run in declaration order, and the
// other way round the ticker captured the PREVIOUS take's elapsed as its
// starting point — the counter showed 0 for one second, then jumped straight
// back to the old thirty minutes.
useEffect(() => { setRecSeconds(0); recSecondsRef.current = 0; setRecStopped(false); }, [recTick]);
useEffect(() => { useEffect(() => {
if (!recording) { setRecSeconds(0); return; } if (!recording) { setRecSeconds(0); return; }
// A stopped take freezes the clock where it is: it must show the length of // A stopped take freezes the clock where it is: it must show the length of
@@ -1060,9 +1073,6 @@ export default function App() {
const id = window.setInterval(() => setRecSeconds(from + Math.floor((Date.now() - start) / 1000)), 1000); const id = window.setInterval(() => setRecSeconds(from + Math.floor((Date.now() - start) / 1000)), 1000);
return () => window.clearInterval(id); return () => window.clearInterval(id);
}, [recording, recTick, recStopped]); }, [recording, recTick, recStopped]);
// recTick means "a fresh take" — that is the only case where the clock returns
// to zero, as opposed to resuming after a stop.
useEffect(() => { setRecSeconds(0); recSecondsRef.current = 0; setRecStopped(false); }, [recTick]);
// The callsign the in-progress recording belongs to (uppercased; '' = none). // The callsign the in-progress recording belongs to (uppercased; '' = none).
// Lets us restart from zero when the operator edits the call to a different // Lets us restart from zero when the operator edits the call to a different
// station mid-recording, instead of continuing the old take. // station mid-recording, instead of continuing the old take.
@@ -1522,7 +1532,7 @@ export default function App() {
// Seed the current break-in from the rig when the CW panel becomes active in // Seed the current break-in from the rig when the CW panel becomes active in
// Icom mode (so the control reflects the radio's real state). // Icom mode (so the control reflects the radio's real state).
useEffect(() => { useEffect(() => {
if (cwSource !== 'icom' || !wkEnabled || !(catState.backend === 'icom' && catState.connected)) return; if (cwSource !== 'icom' || !wkEnabled || !((catState.backend === 'icom' || catState.backend === 'icom-net') && catState.connected)) return;
GetIcomState().then((s: any) => { if (s && typeof s.break_in === 'number') setIcomBreakIn(s.break_in); }).catch(() => {}); GetIcomState().then((s: any) => { if (s && typeof s.break_in === 'number') setIcomBreakIn(s.break_in); }).catch(() => {});
}, [cwSource, wkEnabled, catState.backend, catState.connected]); }, [cwSource, wkEnabled, catState.backend, catState.connected]);
// Auto-call: repeat the clicked macro (e.g. F1 CQ) every (message + N seconds) // Auto-call: repeat the clicked macro (e.g. F1 CQ) every (message + N seconds)
@@ -1546,7 +1556,7 @@ export default function App() {
// skips the log that hasn't happened yet. // skips the log that hasn't happened yet.
const wkSendGenRef = useRef(0); const wkSendGenRef = useRef(0);
useEffect(() => { useEffect(() => {
const connected = cwSource === 'icom' ? (catState.backend === 'icom' && catState.connected) const connected = cwSource === 'icom' ? ((catState.backend === 'icom' || catState.backend === 'icom-net') && catState.connected)
: cwSource === 'flex' ? (catState.backend === 'flex' && catState.connected) : cwSource === 'flex' ? (catState.backend === 'flex' && catState.connected)
: cwSource === 'yaesu' ? (catState.backend === 'yaesu' && catState.connected) : cwSource === 'yaesu' ? (catState.backend === 'yaesu' && catState.connected)
: cwSource === 'kenwood' ? (catState.backend === 'kenwood' && catState.connected) : cwSource === 'kenwood' ? (catState.backend === 'kenwood' && catState.connected)
@@ -1684,6 +1694,9 @@ export default function App() {
// NET Control tab — enabled from Tools (persisted; once on it's a tab like Cluster). // NET Control tab — enabled from Tools (persisted; once on it's a tab like Cluster).
const [netEnabled, setNetEnabled] = useState(() => localStorage.getItem('opslog.netEnabled') === '1'); const [netEnabled, setNetEnabled] = useState(() => localStorage.getItem('opslog.netEnabled') === '1');
useEffect(() => { localStorage.setItem('opslog.netEnabled', netEnabled ? '1' : '0'); }, [netEnabled]); useEffect(() => { localStorage.setItem('opslog.netEnabled', netEnabled ? '1' : '0'); }, [netEnabled]);
// Watchlist tab — opt-in from Tools, persisted, closable like NET Control.
const [watchlistEnabled, setWatchlistEnabled] = useState(() => localStorage.getItem('opslog.watchlistEnabled') === '1');
useEffect(() => { localStorage.setItem('opslog.watchlistEnabled', watchlistEnabled ? '1' : '0'); }, [watchlistEnabled]);
// Contest tab is hidden until enabled from Tools → Contest mode. // Contest tab is hidden until enabled from Tools → Contest mode.
const [contestTabEnabled, setContestTabEnabled] = useState(() => localStorage.getItem('opslog.contestTab') === '1'); const [contestTabEnabled, setContestTabEnabled] = useState(() => localStorage.getItem('opslog.contestTab') === '1');
useEffect(() => { localStorage.setItem('opslog.contestTab', contestTabEnabled ? '1' : '0'); }, [contestTabEnabled]); useEffect(() => { localStorage.setItem('opslog.contestTab', contestTabEnabled ? '1' : '0'); }, [contestTabEnabled]);
@@ -1733,15 +1746,29 @@ export default function App() {
const gen = ++dvkAutoCqGenRef.current; const gen = ++dvkAutoCqGenRef.current;
dvkAutoCqSlotRef.current = slot; dvkAutoCqSlotRef.current = slot;
const sleep = (ms: number) => new Promise((r) => window.setTimeout(r, ms)); const sleep = (ms: number) => new Promise((r) => window.setTimeout(r, ms));
// Traced into the app log deliberately: the loop kept 'not repeating' on a
// network rig and every guess at which guard was tripping proved wrong.
const trace = (m: string) => UILog(`dvk auto-cq: ${m}`).catch(() => {});
trace(`start slot=${slot} gen=${gen}`);
let round = 0;
while (dvkAutoCqSlotRef.current === slot && gen === dvkAutoCqGenRef.current && dvkActiveRef.current) { while (dvkAutoCqSlotRef.current === slot && gen === dvkAutoCqGenRef.current && dvkActiveRef.current) {
if (!isPhoneMode(modeRef.current)) { stopDvkAutoCq(); break; } // An EMPTY mode is not a mode change: over the network the rig's mode
await DVKPlay(slot).catch(() => {}); // read fails transiently and the CAT push blanks the field for a poll or
// two — killing the auto-CQ loop mid-run for nothing. Only a known
// non-phone mode stops the loop.
if (modeRef.current && !isPhoneMode(modeRef.current)) { trace(`stopped: mode ${modeRef.current} is not phone`); stopDvkAutoCq(); break; }
round++;
trace(`round ${round}: play`);
await DVKPlay(slot).catch((e: any) => trace(`play failed: ${e?.message ?? e}`));
await sleep(300); // let playback flip "playing" true await sleep(300); // let playback flip "playing" true
trace(`round ${round}: playing=${dvkPlayingRef.current}`);
let guard = 0; // then wait for it to finish (cap ~90 s) let guard = 0; // then wait for it to finish (cap ~90 s)
while (dvkPlayingRef.current && gen === dvkAutoCqGenRef.current && guard < 600) { await sleep(150); guard++; } while (dvkPlayingRef.current && gen === dvkAutoCqGenRef.current && guard < 600) { await sleep(150); guard++; }
if (gen !== dvkAutoCqGenRef.current) break; if (gen !== dvkAutoCqGenRef.current) { trace(`stopped mid-round: superseded (gen ${dvkAutoCqGenRef.current})`); break; }
trace(`round ${round}: message over after ~${(guard * 150 / 1000).toFixed(1)}s, gap ${dvkAutoCqSecsRef.current}s`);
await sleep(Math.max(0, dvkAutoCqSecsRef.current) * 1000); // gap before the next CQ await sleep(Math.max(0, dvkAutoCqSecsRef.current) * 1000); // gap before the next CQ
} }
trace(`exit: slotRef=${dvkAutoCqSlotRef.current} gen=${gen}/${dvkAutoCqGenRef.current} active=${dvkActiveRef.current}`);
} }
const dvkPlay = useCallback((slot: number) => { const dvkPlay = useCallback((slot: number) => {
if (!isPhoneMode(modeRef.current)) { setError(t('dvkp.notPhone')); return; } if (!isPhoneMode(modeRef.current)) { setError(t('dvkp.notPhone')); return; }
@@ -2014,7 +2041,7 @@ export default function App() {
// so it's loaded async on mount and re-read on profile:changed below. // so it's loaded async on mount and re-read on profile:changed below.
// 'none' is only ever stored for the third and fourth panes: the first two are // 'none' is only ever stored for the third and fourth panes: the first two are
// the Main view, and a layout with no panes at all is not a layout. // the Main view, and a layout with no panes at all is not a layout.
type MainPaneKind = 'map1' | 'map2' | 'cluster' | 'worked' | 'flex' | 'recent' | 'icom' | 'yaesu' | 'elecraft' | 'tci' | 'netcontrol' | 'decodes' | 'none'; type MainPaneKind = 'map1' | 'map2' | 'cluster' | 'worked' | 'flex' | 'recent' | 'icom' | 'yaesu' | 'elecraft' | 'tci' | 'netcontrol' | 'decodes' | 'watchlist' | 'none';
const [mapZoomSignal, setMapZoomSignal] = useState(0); // bump → world map auto-zooms now const [mapZoomSignal, setMapZoomSignal] = useState(0); // bump → world map auto-zooms now
const [mainPaneLeft, setMainPaneLeft] = useState<MainPaneKind>('map1'); const [mainPaneLeft, setMainPaneLeft] = useState<MainPaneKind>('map1');
const [mainPaneRight, setMainPaneRight] = useState<MainPaneKind>('map2'); const [mainPaneRight, setMainPaneRight] = useState<MainPaneKind>('map2');
@@ -2025,7 +2052,7 @@ export default function App() {
// quarter-width map is unreadable. // quarter-width map is unreadable.
const [mainLayout4, setMainLayout4] = useState<'cols' | 'quad'>('quad'); const [mainLayout4, setMainLayout4] = useState<'cols' | 'quad'>('quad');
const loadMainPanes = useCallback(async () => { const loadMainPanes = useCallback(async () => {
const valid = (v: string): v is MainPaneKind => v === 'map1' || v === 'map2' || v === 'cluster' || v === 'worked' || v === 'flex' || v === 'recent' || v === 'icom' || v === 'yaesu' || v === 'elecraft' || v === 'tci' || v === 'netcontrol' || v === 'decodes'; const valid = (v: string): v is MainPaneKind => v === 'map1' || v === 'map2' || v === 'cluster' || v === 'worked' || v === 'flex' || v === 'recent' || v === 'icom' || v === 'yaesu' || v === 'elecraft' || v === 'tci' || v === 'netcontrol' || v === 'decodes' || v === 'watchlist';
const [l, r, p3, p4, lay] = await Promise.all([ const [l, r, p3, p4, lay] = await Promise.all([
GetUIPref('mainPaneLeft').catch(() => ''), GetUIPref('mainPaneLeft').catch(() => ''),
GetUIPref('mainPaneRight').catch(() => ''), GetUIPref('mainPaneRight').catch(() => ''),
@@ -3300,11 +3327,16 @@ export default function App() {
noteManualEdit(); noteManualEdit();
} }
if (s.band) setBand(s.band); if (s.band) setBand(s.band);
if (catState.connected) tuneRigCAT(s.freq_hz, m);
// The panadapter width follows the MODE of the spot, when the option is on. // The panadapter width follows the MODE of the spot, when the option is on.
// AFTER the tune, deliberately: a view change must never delay the frequency // A no-op on any backend but a Flex. Sequenced AFTER the tune settles, not
// change the operator is waiting for. A no-op on any backend but a Flex. // fired alongside it: on a cross-band jump SmartSDR moves the panadapter
FlexZoomForSpot(m ?? '', s.freq_hz ?? 0).catch(() => {}); // itself to follow the slice, and that follow lands after — and overrides —
// a zoom sent in the same instant. (A spot clicked ON the panadapter never
// hit this: the radio had already tuned before our zoom arrived.)
const zoom = () => FlexZoomForSpot(m ?? '', s.freq_hz ?? 0).catch(() => {});
if (catState.connected) {
void tuneRigCAT(s.freq_hz, m).then(() => window.setTimeout(zoom, 300));
} else zoom();
if (m) applyModeFromSpot(m); if (m) applyModeFromSpot(m);
onCallsignInput(s.dx_call, { force: true }); onCallsignInput(s.dx_call, { force: true });
applySpotRefs((s as any).pota_ref, (s as any).sota_ref); applySpotRefs((s as any).pota_ref, (s as any).sota_ref);
@@ -4583,10 +4615,17 @@ export default function App() {
return () => { dead = true; }; return () => { dead = true; };
}, [selQso, callsign]); }, [selQso, callsign]);
const wbTokenRef = useRef(0);
async function runWorkedBefore(call: string, dxccHint: number = 0) { async function runWorkedBefore(call: string, dxccHint: number = 0) {
// Latest-wins: two lookups race when the operator types a second call
// before the first answered, and the SLOW one used to land last — the
// grid then showed the previous call's QSOs under the new call's name
// (LU5AVM's contact filed under LW8ETV, screenshot in hand).
const token = ++wbTokenRef.current;
setWbBusy(true); setWbBusy(true);
try { try {
const w = await WorkedBefore(call, dxccHint); const w = await WorkedBefore(call, dxccHint);
if (token !== wbTokenRef.current) return; // a newer lookup owns the panel
setWb(w); setWb(w);
// Mirrored synchronously rather than through the effect above: a backfill // Mirrored synchronously rather than through the effect above: a backfill
// parked by the lookup has to read this on the very next line, not a // parked by the lookup has to read this on the very next line, not a
@@ -4601,10 +4640,11 @@ export default function App() {
fillFromLastQso(p.r, call); fillFromLastQso(p.r, call);
} }
} catch { } catch {
if (token !== wbTokenRef.current) return;
setWb(null); setWb(null);
wbRef.current = null; wbRef.current = null;
wbCallRef.current = ''; wbCallRef.current = '';
} finally { setWbBusy(false); } } finally { if (token === wbTokenRef.current) setWbBusy(false); }
} }
// fillFromLastQso enriches the entry from the LAST QSO we logged with this call // fillFromLastQso enriches the entry from the LAST QSO we logged with this call
// when the live lookup came up short — the callsign isn't on QRZ/HamQTH, or no // when the live lookup came up short — the callsign isn't on QRZ/HamQTH, or no
@@ -5004,6 +5044,7 @@ export default function App() {
{ type: 'item', label: (cwEnabled ? '✓ ' : '') + t('tools.cwDecoder'), action: 'tools.cwdecoder' }, { type: 'item', label: (cwEnabled ? '✓ ' : '') + t('tools.cwDecoder'), action: 'tools.cwdecoder' },
{ type: 'separator' }, { type: 'separator' },
{ type: 'item', label: (netEnabled ? '✓ ' : '') + t('tools.net'), action: 'tools.net' }, { type: 'item', label: (netEnabled ? '✓ ' : '') + t('tools.net'), action: 'tools.net' },
{ type: 'item', label: (watchlistEnabled ? '✓ ' : '') + t('tools.watchlist'), action: 'tools.watchlist' },
{ type: 'item', label: (contestTabEnabled ? '✓ ' : '') + t('tools.contest'), action: 'tools.contest' }, { type: 'item', label: (contestTabEnabled ? '✓ ' : '') + t('tools.contest'), action: 'tools.contest' },
{ type: 'item', label: t('tools.alerts'), action: 'tools.alerts' }, { type: 'item', label: t('tools.alerts'), action: 'tools.alerts' },
{ type: 'separator' }, { type: 'separator' },
@@ -5027,7 +5068,7 @@ export default function App() {
{ type: 'separator' }, { type: 'separator' },
{ type: 'item', label: t('help.about'), action: 'help.about' }, { type: 'item', label: t('help.about'), action: 'help.about' },
]}, ]},
], [total, selectedId, selectedIds, exporting, wkEnabled, dvkEnabled, cwEnabled, netEnabled, contestTabEnabled, smtpConfigured, sendingLog, t]); ], [total, selectedId, selectedIds, exporting, wkEnabled, dvkEnabled, cwEnabled, netEnabled, watchlistEnabled, contestTabEnabled, smtpConfigured, sendingLog, t]);
function handleMenu(action: string) { function handleMenu(action: string) {
switch (action) { switch (action) {
@@ -5055,6 +5096,7 @@ export default function App() {
case 'tools.dvk': setDvkEnabled((v) => !v); break; case 'tools.dvk': setDvkEnabled((v) => !v); break;
case 'tools.cwdecoder': toggleCwDecoder(); break; case 'tools.cwdecoder': toggleCwDecoder(); break;
case 'tools.net': setNetEnabled((v) => { const nv = !v; if (nv) setActiveTab('net'); return nv; }); break; case 'tools.net': setNetEnabled((v) => { const nv = !v; if (nv) setActiveTab('net'); return nv; }); break;
case 'tools.watchlist': setWatchlistEnabled((v) => { const nv = !v; if (nv) setActiveTab('watchlist'); return nv; }); break;
case 'tools.contest': setContestTabEnabled((v) => { const nv = !v; if (nv) setActiveTab('contest'); else setActiveTab((tb) => (tb === 'contest' ? 'recent' : tb)); return nv; }); break; case 'tools.contest': setContestTabEnabled((v) => { const nv = !v; if (nv) setActiveTab('contest'); else setActiveTab((tb) => (tb === 'contest' ? 'recent' : tb)); return nv; }); break;
case 'tools.alerts': setAlertsOpen(true); break; case 'tools.alerts': setAlertsOpen(true); break;
case 'tools.duplicates': setShowDuplicates(true); break; case 'tools.duplicates': setShowDuplicates(true); break;
@@ -5870,6 +5912,13 @@ export default function App() {
// worked call still matches its own entity status too (new-band/new-slot), // worked call still matches its own entity status too (new-band/new-slot),
// so it stays visible under those chips. // so it stays visible under those chips.
const matches = (st !== 'worked' && clusterStatusFilter.has(st)) const matches = (st !== 'worked' && clusterStatusFilter.has(st))
// NEW CALL is a FACT about the callsign (never worked on this band and
// mode), surfaced as a status only by the slot-highlight option. The
// chip filters on the fact itself, so it works whether or not that
// display option is on — worked_slot is computed whenever either
// slot option is enabled.
|| (clusterStatusFilter.has('new-call') && e?.worked_slot === false
&& (!e?.status || e?.status === 'worked' || e?.status === 'new-call'))
|| (!!e?.worked_call && clusterStatusFilter.has('worked')) || (!!e?.worked_call && clusterStatusFilter.has('worked'))
|| (!!e?.new_pota && clusterStatusFilter.has('new-pota')) || (!!e?.new_pota && clusterStatusFilter.has('new-pota'))
|| (!!e?.new_county && clusterStatusFilter.has('new-county')) || (!!e?.new_county && clusterStatusFilter.has('new-county'))
@@ -5976,12 +6025,20 @@ export default function App() {
); );
const F_CHIP = 'px-1.5 py-[3px] rounded-md border text-[10px] font-bold tracking-wider transition-opacity'; const F_CHIP = 'px-1.5 py-[3px] rounded-md border text-[10px] font-bold tracking-wider transition-opacity';
const fChip = (key: string, label: string, cls: string, on: boolean, toggle: () => void) => ( const fChip = (key: string, label: string, cls: string, on: boolean, toggle: () => void, style?: React.CSSProperties, title?: string) => (
<button key={key} type="button" onClick={toggle} <button key={key} type="button" onClick={toggle} title={title}
className={cn(F_CHIP, on ? cls : `${cls} opacity-40 hover:opacity-80`)}> className={cn(F_CHIP, on ? cls : `${cls} opacity-40 hover:opacity-80`)} style={style}>
{label} {label}
</button> </button>
); );
// chipStyle builds a filter chip in an arbitrary colour — for the statuses
// whose grid badge is not one of the semantic tokens the chip classes cover.
// A filter that does not look like what it selects has to be learned twice.
const chipStyle = (c: string): React.CSSProperties => ({
color: c,
borderColor: `color-mix(in srgb, ${c} 45%, transparent)`,
background: `color-mix(in srgb, ${c} 14%, transparent)`,
});
const renderClusterFilters = () => ( const renderClusterFilters = () => (
<div className="w-56 shrink-0 border-l border-border/60 flex flex-col min-h-0 bg-muted/10"> <div className="w-56 shrink-0 border-l border-border/60 flex flex-col min-h-0 bg-muted/10">
@@ -6097,14 +6154,14 @@ export default function App() {
{ k: 'new-band-mode' as SpotFilterKey, label: 'NEW B+M', cls: 'bg-danger-muted text-danger-muted-foreground border-danger-border' }, { k: 'new-band-mode' as SpotFilterKey, label: 'NEW B+M', cls: 'bg-danger-muted text-danger-muted-foreground border-danger-border' },
{ k: 'new-band' as SpotFilterKey, label: 'NEW BAND', cls: 'bg-warning-muted text-warning-muted-foreground border-warning-border' }, { k: 'new-band' as SpotFilterKey, label: 'NEW BAND', cls: 'bg-warning-muted text-warning-muted-foreground border-warning-border' },
{ k: 'new-mode' as SpotFilterKey, label: 'NEW MODE', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' }, { k: 'new-mode' as SpotFilterKey, label: 'NEW MODE', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
{ k: 'new-slot' as SpotFilterKey, label: 'NEW SLOT', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' }, { k: 'new-slot' as SpotFilterKey, label: 'NEW SLOT', cls: 'border', style: chipStyle('#5AC8FA') },
// NEW CALL is about the CALLSIGN, not the entity: never worked on this // NEW CALL is about the CALLSIGN, not the entity: never worked on this
// band and mode. Only appears when the slot-highlight option is on. // band and mode. Only appears when the slot-highlight option is on.
{ k: 'new-call' as SpotFilterKey, label: 'NEW CALL', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' }, { k: 'new-call' as SpotFilterKey, label: 'NEW CALL', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
// Same colours as the badges in the grid — a filter that does not // Same colours as the badges in the grid — a filter that does not
// look like what it selects has to be learned twice. // look like what it selects has to be learned twice.
{ k: 'new-pota' as SpotFilterKey, label: 'NEW POTA', cls: 'bg-success-muted text-success-muted-foreground border-success-border' }, { k: 'new-pota' as SpotFilterKey, label: 'NEW POTA', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
{ k: 'new-county' as SpotFilterKey, label: 'NEW COUNTY', cls: 'bg-success-muted text-success-muted-foreground border-success-border' }, { k: 'new-county' as SpotFilterKey, label: 'NEW COUNTY', cls: 'border', style: chipStyle('var(--chart-5)') },
{ k: 'new-pfx' as SpotFilterKey, label: 'NEW PFX', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' }, { k: 'new-pfx' as SpotFilterKey, label: 'NEW PFX', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
// Only ever set for a station this receiver decoded over the UDP link. // Only ever set for a station this receiver decoded over the UDP link.
{ k: 'new-grid' as SpotFilterKey, label: 'NEW GRID', cls: 'bg-muted text-foreground border-border' }, { k: 'new-grid' as SpotFilterKey, label: 'NEW GRID', cls: 'bg-muted text-foreground border-border' },
@@ -6112,8 +6169,9 @@ export default function App() {
// worked spots; the separate "Hide worked" checkbox drops them — they // worked spots; the separate "Hide worked" checkbox drops them — they
// are opposite controls, so don't use both at once. // are opposite controls, so don't use both at once.
{ k: 'worked' as SpotFilterKey, label: 'WORKED', cls: 'bg-info-muted text-info-muted-foreground border-info-border' }, { k: 'worked' as SpotFilterKey, label: 'WORKED', cls: 'bg-info-muted text-info-muted-foreground border-info-border' },
]).map((s) => fChip(s.k, s.label, s.cls, clusterStatusFilter.has(s.k), ]).filter((s: any) => s.k !== 'new-pota' || chasePota())
() => setClusterStatusFilter((cur) => { const n = new Set(cur); if (n.has(s.k)) n.delete(s.k); else n.add(s.k); return n; })))} .map((s: any) => fChip(s.k, s.label, s.cls, clusterStatusFilter.has(s.k),
() => setClusterStatusFilter((cur) => { const n = new Set(cur); if (n.has(s.k)) n.delete(s.k); else n.add(s.k); return n; }), s.style))}
</div>, </div>,
clusterStatusFilter.size > 0 ? ( clusterStatusFilter.size > 0 ? (
<button type="button" onClick={() => setClusterStatusFilter(new Set())} <button type="button" onClick={() => setClusterStatusFilter(new Set())}
@@ -6317,6 +6375,13 @@ export default function App() {
<IcomPanel isNetwork={catBackend === 'icom-net'} onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} /> <IcomPanel isNetwork={catBackend === 'icom-net'} onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
</div> </div>
); );
case 'watchlist':
return (
<div className="h-full w-full min-h-0 flex flex-col bg-card border border-border rounded-lg overflow-hidden">
<WatchlistTab spots={spots} spotStatus={spotStatus}
onSpotSelect={handleSpotSelect} onSpotClick={handleSpotClick} />
</div>
);
case 'netcontrol': case 'netcontrol':
return ( return (
<div className="h-full w-full min-h-0 flex flex-col rounded-lg overflow-hidden border border-border"> <div className="h-full w-full min-h-0 flex flex-col rounded-lg overflow-hidden border border-border">
@@ -7210,7 +7275,7 @@ export default function App() {
// relative + absolute inner: the panel's content can't grow the row, so // relative + absolute inner: the panel's content can't grow the row, so
// the row height is set by the ENTRY STRIP. A taller tab (Awards/F3) then // the row height is set by the ENTRY STRIP. A taller tab (Awards/F3) then
// scrolls inside this fixed height instead of pushing everything down. // scrolls inside this fixed height instead of pushing everything down.
<div className="w-[560px] shrink-0 min-h-0 relative"> <div className="w-[600px] shrink-0 min-h-0 relative">
<div className="absolute inset-0 flex flex-col min-h-0"> <div className="absolute inset-0 flex flex-col min-h-0">
<DetailsPanel <DetailsPanel
callsign={callsign} callsign={callsign}
@@ -7392,7 +7457,10 @@ export default function App() {
entry, and the rig onto the frequency it was decoded on. */} entry, and the rig onto the frequency it was decoded on. */}
<ChaseNewPanel onPick={(sp) => { <ChaseNewPanel onPick={(sp) => {
onCallsignInput(sp.call, { force: true }); onCallsignInput(sp.call, { force: true });
if (sp.freq_hz) void tuneRigCAT(sp.freq_hz, sp.mode); // And the panadapter width too — after the tune settles, for the
// same SmartSDR pan-follow reason as handleSpotClick.
if (sp.freq_hz) void tuneRigCAT(sp.freq_hz, sp.mode).then(() =>
window.setTimeout(() => FlexZoomForSpot(sp.mode ?? '', sp.freq_hz ?? 0).catch(() => {}), 300));
}} onClose={() => { setShowChaseNew(false); writeUiPref('opslog.showChaseNew', '0'); }} /> }} onClose={() => { setShowChaseNew(false); writeUiPref('opslog.showChaseNew', '0'); }} />
</div> </div>
)} )}
@@ -7585,6 +7653,21 @@ export default function App() {
</span> </span>
</TabsTrigger> </TabsTrigger>
)} )}
{watchlistEnabled && (
<TabsTrigger value="watchlist" className="gap-1.5">
{t('tab.watchlist')}
<span
role="button"
aria-label="Close Watchlist"
title="Close"
className="inline-flex items-center justify-center size-4 rounded hover:bg-foreground/10 text-muted-foreground hover:text-foreground"
onPointerDown={(e) => { e.stopPropagation(); }}
onClick={(e) => { e.stopPropagation(); setWatchlistEnabled(false); setActiveTab((t) => (t === 'watchlist' ? 'recent' : t)); }}
>
<X className="size-3" />
</span>
</TabsTrigger>
)}
{catState.backend === 'flex' && <TabsTrigger value="flex">Flex Console</TabsTrigger>} {catState.backend === 'flex' && <TabsTrigger value="flex">Flex Console</TabsTrigger>}
{catState.backend === 'icom' && <TabsTrigger value="icom">Icom Console</TabsTrigger>} {catState.backend === 'icom' && <TabsTrigger value="icom">Icom Console</TabsTrigger>}
{catState.backend === 'yaesu' && <TabsTrigger value="yaesu">Yaesu Console</TabsTrigger>} {catState.backend === 'yaesu' && <TabsTrigger value="yaesu">Yaesu Console</TabsTrigger>}
@@ -8296,6 +8379,12 @@ export default function App() {
{/* Band Map: several bands shown side-by-side (panadapter-style {/* Band Map: several bands shown side-by-side (panadapter-style
strips). Pick bands with the chips; each strip is clickable to strips). Pick bands with the chips; each strip is clickable to
tune the rig. */} tune the rig. */}
{watchlistEnabled && (
<TabsContent value="watchlist" className="mt-0 flex flex-col min-h-0 flex-1">
<WatchlistTab spots={spots} spotStatus={spotStatus}
onSpotSelect={handleSpotSelect} onSpotClick={handleSpotClick} />
</TabsContent>
)}
{netEnabled && ( {netEnabled && (
<TabsContent value="net" className="mt-0 flex flex-col min-h-0 flex-1"> <TabsContent value="net" className="mt-0 flex flex-col min-h-0 flex-1">
<NetControlPanel onLogged={refresh} countries={countries} bands={bands} modes={modes} <NetControlPanel onLogged={refresh} countries={countries} bands={bands} modes={modes}
@@ -8652,9 +8741,14 @@ export default function App() {
// freqMhz display string, which the manual-edit freeze / field locks can // freqMhz display string, which the manual-edit freeze / field locks can
// leave stale (that dropped the sub-kHz: on 14134.5 the frozen "14.134" // leave stale (that dropped the sub-kHz: on 14134.5 the frozen "14.134"
// string spotted 14134). Fall back to the entry field, then the last QSO. // string spotted 14134). Fall back to the entry field, then the last QSO.
//
// The RX frequency when split, deliberately: a spot names where the
// STATION is, and in split that is where we listen — freq_hz is where
// we transmit, and spotting a 5-up pile-up's TX frequency sent the
// whole cluster five kHz above the DX.
defaultFreqKHz={ defaultFreqKHz={
catState.connected && (catState.freq_hz ?? 0) > 0 catState.connected && ((catState.split && (catState.freq_rx_hz ?? 0) > 0 ? catState.freq_rx_hz : catState.freq_hz) ?? 0) > 0
? Math.round(((catState.freq_hz ?? 0) / 1000) * 10) / 10 ? Math.round((((catState.split && (catState.freq_rx_hz ?? 0) > 0 ? catState.freq_rx_hz : catState.freq_hz) ?? 0) / 1000) * 10) / 10
: parseFloat(freqMhz) > 0 : parseFloat(freqMhz) > 0
? Math.round(parseFloat(freqMhz) * 1000 * 10) / 10 ? Math.round(parseFloat(freqMhz) * 1000 * 10) / 10
: (qsos[0]?.freq_hz ? Math.round((qsos[0].freq_hz / 1000) * 10) / 10 : 0) : (qsos[0]?.freq_hz ? Math.round((qsos[0].freq_hz / 1000) * 10) / 10 : 0)
+2 -2
View File
@@ -272,11 +272,11 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
// nothing until the next poll happened to hand over a fresh object. // nothing until the next poll happened to hand over a fresh object.
const dispOpts = readSpotDisplayOptions(); const dispOpts = readSpotDisplayOptions();
const spotStatus = useMemo(() => { const spotStatus = useMemo(() => {
if (!dispOpts.muteWorked && !dispOpts.slotHighlight) return spotStatusRaw; if (!dispOpts.muteWorked && !dispOpts.slotHighlight && dispOpts.chasePota) return spotStatusRaw;
const out: Record<string, SpotStatusEntry> = {}; const out: Record<string, SpotStatusEntry> = {};
for (const k of Object.keys(spotStatusRaw)) out[k] = applySpotDisplay(spotStatusRaw[k], dispOpts) as SpotStatusEntry; for (const k of Object.keys(spotStatusRaw)) out[k] = applySpotDisplay(spotStatusRaw[k], dispOpts) as SpotStatusEntry;
return out; return out;
}, [spotStatusRaw, dispOpts.muteWorked, dispOpts.slotHighlight]); }, [spotStatusRaw, dispOpts.muteWorked, dispOpts.slotHighlight, dispOpts.chasePota]);
// Re-render when the operator changes their IARU region in Settings. // Re-render when the operator changes their IARU region in Settings.
const [, setRegionTick] = useState(0); const [, setRegionTick] = useState(0);
useEffect(() => subscribeIaruRegion(() => setRegionTick((n) => n + 1)), []); useEffect(() => subscribeIaruRegion(() => setRegionTick((n) => n + 1)), []);
+3 -3
View File
@@ -242,11 +242,11 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
return ( return (
<section <section
className={cn( className={cn(
'flex items-center gap-4 px-3 py-2 flex-wrap shrink-0', 'flex items-center gap-2 px-2 py-2 flex-wrap shrink-0',
newOne && 'bg-gradient-to-br from-warning-muted to-warning-muted rounded-lg', newOne && 'bg-gradient-to-br from-warning-muted to-warning-muted rounded-lg',
)} )}
> >
<div className="flex items-center gap-2 min-w-[220px] flex-1"> <div className="flex items-center gap-2 min-w-0 flex-1">
{newOne ? ( {newOne ? (
<> <>
<Badge className="bg-warning text-warning-foreground gap-1 px-3 py-1 text-[11px]"> <Badge className="bg-warning text-warning-foreground gap-1 px-3 py-1 text-[11px]">
@@ -269,7 +269,7 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
{forCall} {forCall}
</Badge> </Badge>
)} )}
<Badge className="bg-primary text-primary-foreground px-3 py-1 text-xs normal-case font-semibold tracking-normal"> <Badge className="bg-primary text-primary-foreground px-2 py-0.5 text-xs normal-case font-semibold tracking-normal leading-tight">
{dxccName || `DXCC #${dxcc}`} {dxccName || `DXCC #${dxcc}`}
</Badge> </Badge>
{mwBadge} {mwBadge}
@@ -60,6 +60,9 @@ const FIELDS: FieldDef[] = [
// No promoted column: written into extras_json (see qso.bulkEditableExtras). // No promoted column: written into extras_json (see qso.bulkEditableExtras).
{ id: 'owner_callsign', label: 'bulk.fOwnerCallsign', group: 'My station', kind: 'text', upper: true }, { id: 'owner_callsign', label: 'bulk.fOwnerCallsign', group: 'My station', kind: 'text', upper: true },
{ id: 'my_grid', label: 'bulk.fMyGrid', group: 'My station', kind: 'text', upper: true }, { id: 'my_grid', label: 'bulk.fMyGrid', group: 'My station', kind: 'text', upper: true },
{ id: 'my_dxcc', label: 'bulk.fMyDxcc', group: 'My station', kind: 'text' },
{ id: 'my_cq_zone', label: 'bulk.fMyCqZone', group: 'My station', kind: 'text' },
{ id: 'my_itu_zone', label: 'bulk.fMyItuZone', group: 'My station', kind: 'text' },
{ id: 'my_antenna', label: 'bulk.fMyAntenna', group: 'My station', kind: 'text' }, { id: 'my_antenna', label: 'bulk.fMyAntenna', group: 'My station', kind: 'text' },
{ id: 'my_rig', label: 'bulk.fMyRig', group: 'My station', kind: 'text' }, { id: 'my_rig', label: 'bulk.fMyRig', group: 'My station', kind: 'text' },
{ id: 'my_street', label: 'bulk.fMyStreet', group: 'My station', kind: 'text' }, { id: 'my_street', label: 'bulk.fMyStreet', group: 'My station', kind: 'text' },
+14 -4
View File
@@ -13,7 +13,7 @@ import { Button } from '@/components/ui/button';
import { Checkbox } from '@/components/ui/checkbox'; import { Checkbox } from '@/components/ui/checkbox';
import { cleanSpotter, inferSpotMode, spotStatusKey } from '@/lib/spot'; import { cleanSpotter, inferSpotMode, spotStatusKey } from '@/lib/spot';
import { markerColour } from '@/lib/spotMarkers'; import { markerColour } from '@/lib/spotMarkers';
import { applySpotDisplay, readSpotDisplayOptions } from '@/lib/spotDisplay'; import { applySpotDisplay, chasePota, chaseSota, readSpotDisplayOptions } from '@/lib/spotDisplay';
import { loadLocal, loadRemote, saveState, seedLocal, whenGridPrefsReady } from '@/lib/gridPrefs'; import { loadLocal, loadRemote, saveState, seedLocal, whenGridPrefsReady } from '@/lib/gridPrefs';
import { distanceUnit, distanceValue, subscribeDistanceUnit } from '@/lib/units'; import { distanceUnit, distanceValue, subscribeDistanceUnit } from '@/lib/units';
import { useI18n } from '@/lib/i18n'; import { useI18n } from '@/lib/i18n';
@@ -148,6 +148,12 @@ function statusFor(p: any): SpotStatusEntry | undefined {
// filled pfx → new prefix filled POTA → new park filled county → new county // filled pfx → new prefix filled POTA → new park filled county → new county
// blue call → already worked (not a novelty, so text only) // blue call → already worked (not a novelty, so text only)
const NEW = 'var(--warning)'; // yellow: something here is new const NEW = 'var(--warning)'; // yellow: something here is new
// NEW SLOT gets its own hue. It shared the amber NEW family while the NEW PFX
// marker sits in caution yellow — two different facts, two near-identical
// colours in the same cell. Sky cyan, the exact colour the panadapter palette
// ships for new-slot (#5AC8FA), so the two views tell one story — and clearly
// apart from the POTA green the first attempt (aqua) sat next to.
const NEWSLOT = '#5AC8FA';
const WKD = 'var(--info)'; // blue: this callsign is already in the log const WKD = 'var(--info)'; // blue: this callsign is already in the log
// FILLING the cell that carries the fact, rather than only tinting its text. // FILLING the cell that carries the fact, rather than only tinting its text.
@@ -190,9 +196,10 @@ function statusColor(s: SpotStatusEntry | undefined): string | null {
case 'new-band-mode': case 'new-band-mode':
case 'new-band': case 'new-band':
case 'new-mode': case 'new-mode':
case 'new-slot':
case 'new-call': case 'new-call':
return NEW; return NEW;
case 'new-slot':
return NEWSLOT;
default: default:
return s?.worked_call ? WKD : null; return s?.worked_call ? WKD : null;
} }
@@ -336,7 +343,9 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
}, },
{ {
group: 'Spot', label: t('clg2.c.pota'), colId: 'pota', group: 'Spot', label: t('clg2.c.pota'), colId: 'pota',
headerName: t('clg2.c.pota'), field: 'pota_ref' as any, width: 92, cellClass: 'font-mono', headerName: t('clg2.c.pota'), width: 92, cellClass: 'font-mono',
// Through a valueGetter so the chase switch empties the column live.
valueGetter: (p: any) => (chasePota() ? p.data?.pota_ref ?? '' : ''),
defaultVisible: true, defaultVisible: true,
cellStyle: (p: any) => (statusFor(p)?.new_pota cellStyle: (p: any) => (statusFor(p)?.new_pota
? fillStyle(markerColour('new_pota')) ? fillStyle(markerColour('new_pota'))
@@ -349,7 +358,8 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
// which is why the column is off by default rather than an empty column for // which is why the column is off by default rather than an empty column for
// everyone who does not watch summits. // everyone who does not watch summits.
group: 'Spot', label: t('clg2.c.sota'), colId: 'sota', group: 'Spot', label: t('clg2.c.sota'), colId: 'sota',
headerName: t('clg2.c.sota'), field: 'sota_ref' as any, width: 100, cellClass: 'font-mono', headerName: t('clg2.c.sota'), width: 100, cellClass: 'font-mono',
valueGetter: (p: any) => (chaseSota() ? p.data?.sota_ref ?? '' : ''),
defaultVisible: false, defaultVisible: false,
cellStyle: () => ({ color: 'var(--success)' }) as any, cellStyle: () => ({ color: 'var(--success)' }) as any,
}, },
+78 -29
View File
@@ -4,17 +4,18 @@ import {
GetKenwoodState, RefreshKenwood, SetKenwoodPower, SetKenwoodAFGain, SetKenwoodTX, TuneKenwoodATU, GetKenwoodState, RefreshKenwood, SetKenwoodPower, SetKenwoodAFGain, SetKenwoodTX, TuneKenwoodATU,
SetKenwoodRFGain, SetKenwoodMicGain, SetKenwoodSquelch, SetKenwoodPreamp, SetKenwoodAtt, SetKenwoodRFGain, SetKenwoodMicGain, SetKenwoodSquelch, SetKenwoodPreamp, SetKenwoodAtt,
SetKenwoodNB, SetKenwoodNR, SetKenwoodAGC, SetKenwoodFilter, SetKenwoodAntenna, SetKenwoodNB, SetKenwoodNR, SetKenwoodAGC, SetKenwoodFilter, SetKenwoodAntenna,
SetKenwoodRIT, SetKenwoodXIT, ClearKenwoodRIT, SetKenwoodKeySpeed, ToggleKenwoodATU, NudgeKenwoodRIT, SetKenwoodRIT, SetKenwoodXIT, ClearKenwoodRIT, SetKenwoodKeySpeed, ToggleKenwoodATU, SetKenwoodRITOffset, SetKenwoodPanelMode,
GetCATState, GetCATState,
} from '../../wailsjs/go/main/App'; } from '../../wailsjs/go/main/App';
import { cn } from '@/lib/utils'; import { cn } from '@/lib/utils';
import { useI18n } from '@/lib/i18n'; import { useI18n } from '@/lib/i18n';
import { sMeterRST } from '@/lib/rst'; import { sMeterRST } from '@/lib/rst';
import { ShiftRow } from '@/components/ShiftRow';
import { MeterBar } from '@/components/MeterBar'; import { MeterBar } from '@/components/MeterBar';
import { WheelRange } from '@/components/WheelRange'; import { WheelRange } from '@/components/WheelRange';
type KenwoodState = { type KenwoodState = {
available: boolean; model?: string; elecraft: boolean; mode?: string; available: boolean; model?: string; elecraft: boolean; mode?: string; data_sub?: string;
transmitting: boolean; split: boolean; split_tx_hz?: number; transmitting: boolean; split: boolean; split_tx_hz?: number;
s_meter: number; s_meter_raw: number; s_meter: number; s_meter_raw: number;
power_meter: number; swr: number; swr_raw: number; power_meter: number; swr: number; swr_raw: number;
@@ -41,18 +42,22 @@ const ZERO: KenwoodState = {
// nobody notices are missing. // nobody notices are missing.
const FILTERS = [200, 400, 700, 1000, 1800, 2400, 2800, 4000]; const FILTERS = [200, 400, 700, 1000, 1800, 2400, 2800, 4000];
// Raw S-meter → S units. The K3 answers 0-21 across S0…S9+60; S9 is taken at // Raw S-meter → S units, CALIBRATED against a real K3 beside its own display
// raw 9 and each step above it as 6 dB. PROVISIONAL, like the rest of the // (2026-08): raw 5 reads S7 on the radio, raw 9 reads S9+20. So S9 sits near
// scaling: the raw value is on screen and in the log, so a real radio settles // raw 6.5 — not 9, which showed everything two S-units low — and each raw step
// it rather than this comment. // above it is worth ~8 dB, shown in the 10 dB steps the K3's own meter uses.
const S9_RAW = 9; // A Kenwood answers 0-30 on the same command and keeps the simple 1-per-raw
const DB_PER_RAW = 6; // scale until someone calibrates one against a real radio too.
function sParts(rawV: number): { s: number; over: number; label: string } { const K3_S9_RAW = 6.5;
if (rawV >= S9_RAW) { const K3_DB_PER_RAW = 8;
const over = Math.max(0, Math.round((rawV - S9_RAW) * DB_PER_RAW)); function sParts(rawV: number, elecraft: boolean): { s: number; over: number; label: string } {
const s9raw = elecraft ? K3_S9_RAW : 9;
if (rawV >= s9raw) {
let over = Math.max(0, Math.round((rawV - s9raw) * (elecraft ? K3_DB_PER_RAW : 6)));
if (elecraft) over = Math.round(over / 10) * 10;
return { s: 9, over, label: over > 0 ? `S9+${over}` : 'S9' }; return { s: 9, over, label: over > 0 ? `S9+${over}` : 'S9' };
} }
const s = Math.max(0, Math.min(9, rawV)); const s = Math.max(0, Math.min(9, Math.round(rawV * (elecraft ? 9 / K3_S9_RAW : 1))));
return { s, over: 0, label: `S${s}` }; return { s, over: 0, label: `S${s}` };
} }
@@ -89,9 +94,34 @@ function Toggle({ label, on, off, onClick }: { label: string; on: boolean; off:
); );
} }
// isDataMode: what the rig reports for MD6 varies — "DATA", or the configured
// digital default (FT8…) — so the DATA family is "not one of the native modes".
function isDataMode(m?: string): boolean {
switch ((m ?? '').toUpperCase()) {
case '': case 'CW': case 'USB': case 'LSB': case 'SSB': case 'FM': case 'AM': case 'RTTY':
return false;
}
return true;
}
export function ElecraftPanel({ onReportRST }: { onReportRST?: (rst: string) => void }) { export function ElecraftPanel({ onReportRST }: { onReportRST?: (rst: string) => void }) {
const { t } = useI18n(); const { t } = useI18n();
const [st, setSt] = useState<KenwoodState>(ZERO); const [st, setSt] = useState<KenwoodState>(ZERO);
// Ctrl+Left/Right shifts the RIT by ±10 Hz while RIT is on — the same
// keyboard clarifier the Icom and TCI consoles have, for zero-beating a
// caller without touching the mouse.
const stRef = useRef(st); stRef.current = st;
useEffect(() => {
const onKey = (e: KeyboardEvent) => {
if (!e.ctrlKey || (e.key !== 'ArrowLeft' && e.key !== 'ArrowRight')) return;
const v = stRef.current;
if (!v.available || !v.rit) return;
e.preventDefault();
SetKenwoodRITOffset((v.rit_offset || 0) + (e.key === 'ArrowRight' ? 10 : -10)).catch(() => {});
};
window.addEventListener('keydown', onKey);
return () => window.removeEventListener('keydown', onKey);
}, []);
const [freqHz, setFreqHz] = useState(0); const [freqHz, setFreqHz] = useState(0);
const [err, setErr] = useState(''); const [err, setErr] = useState('');
// Optimistic overlay: a slider must follow the finger, not the poll. Dropped // Optimistic overlay: a slider must follow the finger, not the poll. Dropped
@@ -149,6 +179,28 @@ export function ElecraftPanel({ onReportRST }: { onReportRST?: (rst: string) =>
{freqHz > 0 ? (freqHz / 1e6).toFixed(6) : '—'} {freqHz > 0 ? (freqHz / 1e6).toFixed(6) : '—'}
</div> </div>
</div> </div>
{/* Mode row. The two DATA buttons are why it exists: MD6 alone keeps
whatever submode the last session left, and a K3 "in DATA" with FSK D
still armed keys FT8 with no audio. DATA sends MD6+DT0 (DATA A, the
soundcard path), RTTY sends MD6+DT2 (FSK D). The active DATA button
follows the rig's own DT answer. */}
<div className="inline-flex rounded-md border border-border overflow-hidden">
{([
['CW', 'CW', view.mode === 'CW'],
['USB', 'USB', view.mode === 'USB'],
['LSB', 'LSB', view.mode === 'LSB'],
['DATA', t('k3.modeData'), isDataMode(view.mode) && view.data_sub !== 'FSK D' && view.data_sub !== 'PSK D'],
['RTTY', t('k3.modeRtty'), (isDataMode(view.mode) && (view.data_sub === 'FSK D' || view.data_sub === 'PSK D')) || view.mode === 'RTTY'],
] as [string, string, boolean][]).map(([cmd, label, on]) => (
<button key={cmd} type="button" disabled={off}
title={cmd === 'DATA' ? t('k3.modeDataHint') : cmd === 'RTTY' ? t('k3.modeRttyHint') : label}
onClick={() => SetKenwoodPanelMode(cmd).catch((e: any) => setErr(String(e?.message ?? e)))}
className={cn('px-2.5 py-1.5 text-xs font-bold border-l border-border first:border-l-0',
on ? 'bg-primary text-primary-foreground' : 'bg-card text-muted-foreground hover:bg-muted')}>
{label}
</button>
))}
</div>
<button type="button" className="text-[11px] text-muted-foreground hover:text-foreground flex items-center gap-1" <button type="button" className="text-[11px] text-muted-foreground hover:text-foreground flex items-center gap-1"
onClick={() => RefreshKenwood().catch(() => {})} title={t('k3.refreshHint')}> onClick={() => RefreshKenwood().catch(() => {})} title={t('k3.refreshHint')}>
<SlidersHorizontal className="size-3.5" /> <SlidersHorizontal className="size-3.5" />
@@ -163,10 +215,10 @@ export function ElecraftPanel({ onReportRST }: { onReportRST?: (rst: string) =>
<div className="grid grid-cols-1 sm:grid-cols-3 gap-2"> <div className="grid grid-cols-1 sm:grid-cols-3 gap-2">
<MeterBar label="S-METER" value={view.transmitting ? 0 : view.s_meter} lo={0} hi={100} <MeterBar label="S-METER" value={view.transmitting ? 0 : view.s_meter} lo={0} hi={100}
accent="#16a34a" segColor={sSegColor} accent="#16a34a" segColor={sSegColor}
display={view.transmitting ? '—' : sParts(view.s_meter_raw).label} display={view.transmitting ? '—' : sParts(view.s_meter_raw, view.elecraft).label}
onClick={() => { onClick={() => {
if (view.transmitting || !onReportRST) return; if (view.transmitting || !onReportRST) return;
const sp = sParts(view.s_meter_raw); const sp = sParts(view.s_meter_raw, view.elecraft);
onReportRST(sMeterRST(sp.s, sp.over, view.mode)); onReportRST(sMeterRST(sp.s, sp.over, view.mode));
}} }}
title={t('k3.sMeterHint', { raw: String(view.s_meter_raw) })} /> title={t('k3.sMeterHint', { raw: String(view.s_meter_raw) })} />
@@ -216,7 +268,7 @@ export function ElecraftPanel({ onReportRST }: { onReportRST?: (rst: string) =>
<div className="grid grid-cols-1 lg:grid-cols-2 gap-x-6 gap-y-2"> <div className="grid grid-cols-1 lg:grid-cols-2 gap-x-6 gap-y-2">
<label className="flex items-center gap-2 text-xs"> <label className="flex items-center gap-2 text-xs">
<span className="w-16 shrink-0 text-muted-foreground">{t('k3.power')}</span> <span className="w-16 shrink-0 text-muted-foreground">{t('k3.power')}</span>
<WheelRange min={0} max={110} step={5} disabled={off} <WheelRange min={0} max={110} step={1} disabled={off}
value={view.rf_power ?? 0} value={view.rf_power ?? 0}
onChange={(n) => put({ rf_power: n }, () => SetKenwoodPower(n))} /> onChange={(n) => put({ rf_power: n }, () => SetKenwoodPower(n))} />
<span className="w-12 text-right font-mono tabular-nums">{view.rf_power ?? 0} W</span> <span className="w-12 text-right font-mono tabular-nums">{view.rf_power ?? 0} W</span>
@@ -279,21 +331,18 @@ export function ElecraftPanel({ onReportRST }: { onReportRST?: (rst: string) =>
))} ))}
</div> </div>
{/* RIT / XIT. Clear zeroes both offsets at once — the radio's own RC, {/* RIT / XIT — the shared ShiftRow, exactly as the Icom and TCI consoles
and what an operator means by "clear it". */} drive theirs: ± / wheel / type, Ctrl+←/→ while RIT is on. The K3 has
ONE offset for both, so both rows show it, like the Icom's. */}
<div className="space-y-1.5">
<ShiftRow label="RIT" accent="#8b5cf6" on={view.rit} hz={view.rit_offset || 0} disabled={off}
onToggle={() => SetKenwoodRIT(!view.rit).catch(setErrMsg)}
onSet={(hz) => SetKenwoodRITOffset(hz).catch(setErrMsg)} />
<ShiftRow label="XIT" accent="#f59e0b" on={view.xit} hz={view.rit_offset || 0} disabled={off}
onToggle={() => SetKenwoodXIT(!view.xit).catch(setErrMsg)}
onSet={(hz) => SetKenwoodRITOffset(hz).catch(setErrMsg)} />
</div>
<div className="flex flex-wrap items-center gap-1.5"> <div className="flex flex-wrap items-center gap-1.5">
<Toggle label="RIT" on={view.rit} off={off} onClick={() => SetKenwoodRIT(!view.rit).catch(setErrMsg)} />
<Toggle label="XIT" on={view.xit} off={off} onClick={() => SetKenwoodXIT(!view.xit).catch(setErrMsg)} />
{/* The offset itself. A lit RIT button says the feature is on and
nothing about where it has put the receiver. */}
{[-100, -10, 10, 100].map((d) => (
<Toggle key={d} label={(d > 0 ? '+' : '') + d} on={false} off={off}
onClick={() => NudgeKenwoodRIT(d).catch(setErrMsg)} />
))}
<span className="text-[11px] font-mono tabular-nums text-muted-foreground w-16">
{view.rit_offset > 0 ? '+' : ''}{view.rit_offset || 0} Hz
</span>
<Toggle label={t('k3.clear')} on={false} off={off} onClick={() => ClearKenwoodRIT().catch(setErrMsg)} />
{/* Antenna only when the radio answered AN — a K3 without the internal {/* Antenna only when the radio answered AN — a K3 without the internal
ATU has one socket and no switch to offer. */} ATU has one socket and no switch to offer. */}
{view.antenna > 0 && (<> {view.antenna > 0 && (<>
+114 -309
View File
@@ -1,11 +1,12 @@
import { useEffect, useRef, useState } from 'react'; import { useEffect, useRef, useState } from 'react';
import { Radio, AudioLines, Mic, Activity, SlidersHorizontal, Antenna, Filter, Power } from 'lucide-react'; import { Radio, AudioLines, Mic, Activity, SlidersHorizontal, Antenna, Filter, Power, Volume2, VolumeX } from 'lucide-react';
import { import {
GetIcomState, IcomRefresh, GetIcomState, IcomRefresh,
IcomSetAFGain, IcomSetRFGain, IcomSetNB, IcomSetNBLevel, IcomSetNR, IcomSetNRLevel, IcomSetAFGain, IcomSetRFGain, IcomSetNB, IcomSetNBLevel, IcomSetNR, IcomSetNRLevel,
IcomSetANF, IcomSetAPF, IcomSetAGC, IcomSetPreamp, IcomSetAtt, IcomSetFilter, IcomSetANF, IcomSetAPF, IcomSetAGC, IcomSetPreamp, IcomSetAtt, IcomSetFilter,
IcomSetRFPower, IcomSetMicGain, IcomSetSplit, IcomTune, IcomSetPTT, AudioMonitorActive, AudioStartMonitor, AudioStopMonitor,
IcomSetScope, IcomScopeData, IcomSetScopeMode, IcomSetScopeEdges, GetCATState, SetCATFrequency, SetCATMode, IcomSetRFPower, IcomSetMicGain, IcomSetSplit, IcomTune, IcomSetATU, IcomConsolePTT,
GetCATState, SetCATFrequency, SetCATMode,
IcomSetRIT, IcomSetRITOn, IcomSetXITOn, IcomSetRIT, IcomSetRITOn, IcomSetXITOn,
IcomSetAntenna, IcomSetPBTInner, IcomSetPBTOuter, IcomSetManualNotch, IcomSetNotchPos, IcomSetAntenna, IcomSetPBTInner, IcomSetPBTOuter, IcomSetManualNotch, IcomSetNotchPos,
IcomSetSquelch, IcomSetComp, IcomSetCompLevel, IcomSetMonitor, IcomSetMonLevel, IcomSetSquelch, IcomSetComp, IcomSetCompLevel, IcomSetMonitor, IcomSetMonLevel,
@@ -19,7 +20,7 @@ import { ShiftRow } from '@/components/ShiftRow';
type IcomState = { type IcomState = {
available: boolean; model?: string; mode?: string; available: boolean; model?: string; mode?: string;
transmitting: boolean; split: boolean; transmitting: boolean; split: boolean; sub_hz?: number; atu_on?: boolean;
s_meter: number; power_meter: number; swr_meter: number; s_meter: number; power_meter: number; swr_meter: number;
rf_power: number; mic_gain: number; rf_power: number; mic_gain: number;
af_gain: number; rf_gain: number; af_gain: number; rf_gain: number;
@@ -79,17 +80,18 @@ function bandsFor(model?: string): Band[] {
// Mode buttons for the console (like RS-BA1's row). SetCATMode picks USB/LSB for // Mode buttons for the console (like RS-BA1's row). SetCATMode picks USB/LSB for
// SSB by frequency and the rig's data variant for digital modes. // SSB by frequency and the rig's data variant for digital modes.
const MODES = ['SSB', 'CW', 'RTTY', 'PSK', 'AM', 'FM']; const MODES = ['SSB', 'CW', 'RTTY', 'PSK', 'AM', 'FM', 'DATA'];
// Attenuator steps are MODEL-dependent even though the CI-V command (0x11) is the // Attenuator steps are MODEL-dependent even though the CI-V command (0x11) is the
// same: the value byte is the dB. The IC-7610 (and 7700/7800/7851) have a 6/12/18 // same: the value byte is the dB. The IC-7610 (and 7700/7800/7851) have a 6/12/18
// dB stepped attenuator; the IC-7300/705/7100 have a single 20 dB attenuator; the // dB stepped attenuator, and the IC-7760 the same (confirmed on a real one); the
// IC-7300/705/7100 have a single 20 dB attenuator; the
// IC-9700 a single 10 dB. Offering the wrong steps = a dead button (the rig NAKs // IC-9700 a single 10 dB. Offering the wrong steps = a dead button (the rig NAKs
// e.g. 6 dB on a 7300). Default to the common single 20 dB for unknown models. // e.g. 6 dB on a 7300). Default to the common single 20 dB for unknown models.
function attOptions(model?: string): { v: string; l: string }[] { function attOptions(model?: string): { v: string; l: string }[] {
const m = (model ?? '').toUpperCase(); const m = (model ?? '').toUpperCase();
const OFF = { v: '0', l: 'OFF' }; const OFF = { v: '0', l: 'OFF' };
if (/(7610|7700|7800|7850|7851)/.test(m)) { if (/(7610|7700|7760|7800|7850|7851)/.test(m)) {
return [OFF, { v: '6', l: '6dB' }, { v: '12', l: '12dB' }, { v: '18', l: '18dB' }]; return [OFF, { v: '6', l: '6dB' }, { v: '12', l: '12dB' }, { v: '18', l: '18dB' }];
} }
if (m.includes('9700')) return [OFF, { v: '10', l: '10dB' }]; if (m.includes('9700')) return [OFF, { v: '10', l: '10dB' }];
@@ -128,9 +130,38 @@ function fmtVFO(hz?: number): string {
} }
// modeMatches marks a mode button active, folding the rig's USB/LSB into SSB. // modeMatches marks a mode button active, folding the rig's USB/LSB into SSB.
// icomWatts turns the backend's 0-100 meter percentage back into watts on the
// IC-7760's own meter face. The backend value is linear in the RAW meter byte
// (0-255 → 0-100), but Icom's calibration is not: raw 143 is half deflection
// and raw 213 is full scale. On a real 7760 a measured 100 W sits at half
// deflection of the 250 W face — the linear ×2.5 first tried showed 140 W for
// it. Below half scale watts run 0→100, above it 100→250.
// The anchors are MEASURED on the real radio, not derived: a known 50 W read
// raw ≈89 and a known 100 W read raw 143 (Icom's documented half-deflection),
// with raw 213 = full scale = 250 W. The face is not linear in watts at the
// bottom — a two-segment guess showed 50 W as 62 — so watts interpolate
// between the measured anchors, and a new measurement just adds a row.
// Third measured anchor (2026-08-30): a real 200 W read full deflection —
// raw 213 is 200 W on this rig, not the 250 the printed face suggests.
const ICOM_7760_PO: [number, number][] = [[0, 0], [89, 50], [143, 100], [213, 200]];
function icomWatts(pct: number): { w: number; defl: number } {
const raw = Math.max(0, pct * 2.55);
const defl = raw <= 143 ? (raw / 143) * 50 : Math.min(100, 50 + ((raw - 143) / 70) * 50);
let w = 200;
for (let i = 1; i < ICOM_7760_PO.length; i++) {
const [r0, w0] = ICOM_7760_PO[i - 1], [r1, w1] = ICOM_7760_PO[i];
if (raw <= r1) { w = w0 + ((raw - r0) / (r1 - r0)) * (w1 - w0); break; }
}
return { w: Math.round(w), defl };
}
function modeMatches(btn: string, cur?: string): boolean { function modeMatches(btn: string, cur?: string): boolean {
if (!cur) return false; if (!cur) return false;
if (btn === 'SSB') return cur === 'SSB' || cur === 'USB' || cur === 'LSB'; if (btn === 'SSB') return cur === 'SSB' || cur === 'USB' || cur === 'LSB';
// The backend surfaces USB-D as the operator's digital default (FT8…), or as
// plain DATA — either way it is the DATA button that should light.
if (btn === 'DATA') return ['DATA', 'FT8', 'FT4', 'JS8', 'JT65', 'JT9', 'MFSK', 'OLIVIA'].includes(cur);
if (btn === 'PSK') return cur === 'PSK' || cur === 'PSK31';
return btn === cur; return btn === cur;
} }
@@ -241,11 +272,11 @@ function Meter({ label, value, accent, scale, onClick, title }: { label: string;
<div className="flex-1 h-2.5 rounded-full bg-muted/60 overflow-hidden"> <div className="flex-1 h-2.5 rounded-full bg-muted/60 overflow-hidden">
<div className="h-full rounded-full transition-[width] duration-150" style={{ width: `${v}%`, background: accent }} /> <div className="h-full rounded-full transition-[width] duration-150" style={{ width: `${v}%`, background: accent }} />
</div> </div>
<span className="w-10 text-right text-[11px] font-mono tabular-nums text-muted-foreground">{scale ?? v}</span> <span className="w-14 shrink-0 whitespace-nowrap text-right text-[11px] font-mono tabular-nums text-muted-foreground">{scale ?? v}</span>
</> </>
); );
if (onClick) { if (onClick) {
return <button type="button" onClick={onClick} title={title} className="flex items-center gap-2 w-full rounded hover:bg-muted/50 -mx-1 px-1 py-0.5">{body}</button>; return <button type="button" onClick={onClick} title={title} className="flex items-center gap-2 w-full rounded cursor-pointer hover:bg-muted/50 -mx-1 px-1 py-0.5">{body}</button>;
} }
return <div className="flex items-center gap-2">{body}</div>; return <div className="flex items-center gap-2">{body}</div>;
} }
@@ -253,6 +284,13 @@ function Meter({ label, value, accent, scale, onClick, title }: { label: string;
// sParts turns the raw 0-100 S-meter into S-unit + dB-over-S9 (S9 ≈ 47% on the // sParts turns the raw 0-100 S-meter into S-unit + dB-over-S9 (S9 ≈ 47% on the
// CI-V 0-255 scale, +60 dB near full scale). Used for both the display label and // CI-V 0-255 scale, +60 dB near full scale). Used for both the display label and
// the RST-tx value on click. // the RST-tx value on click.
// Green to S9, amber through +20, red above — the Elecraft console's scale.
function sSegColor(frac: number) {
if (frac > 0.78) return '#dc2626';
if (frac > 0.55) return '#f59e0b';
return '#16a34a';
}
function sParts(v: number): { s: number; over: number; label: string } { function sParts(v: number): { s: number; over: number; label: string } {
if (v >= 47) { if (v >= 47) {
const over = Math.max(0, Math.round((v - 47) * 60 / 47)); const over = Math.max(0, Math.round((v - 47) * 60 / 47));
@@ -280,294 +318,31 @@ function wfColor(v: number): [number, number, number] {
return WF_STOPS[WF_STOPS.length - 1][1]; return WF_STOPS[WF_STOPS.length - 1][1];
} }
// ScopePanadapter — enables the rig's spectrum-scope stream and draws the // The spectrum scope is GONE, deliberately. Every Icom streams its waveform
// reassembled sweep as a modern SDR panadapter: a glowing filled spectrum trace // differently — the IC-7851 controls a scope it never streams, and a real
// on top and a scrolling colour waterfall below. Amplitudes are raw rig scale // IC-7760 stops answering CI-V altogether a few frames in, taking CAT and
// (~0-160), normalised to the tallest recent peak so the trace fills the height. // audio down with it — and chasing a per-model frame layout for a decoration
function ScopePanadapter() { // is not worth a console that drops the link. The radio has a better scope
const { t } = useI18n(); // on its own front panel.
const [on, setOn] = useState(false);
const [fixed, setFixed] = useState(true);
const canvasRef = useRef<HTMLCanvasElement>(null);
const wfRef = useRef<HTMLCanvasElement>(null); // waterfall
const peakRef = useRef(160); // running amplitude ceiling for auto-scale
const holdRef = useRef<number[]>([]); // per-bin peak-hold line
// Some radios control their scope over CI-V but never stream it (IC-7851).
// Saying so beats a black rectangle, which reads as a bug in OpsLog.
const [unsupported, setUnsupported] = useState(false);
const spanRef = useRef({ low: 0, high: 0 }); // latest sweep edges, for click-to-tune
const vfoRef = useRef(0); // latest VFO frequency, for wheel-tune
const centerRef = useRef(0); // scope centre we last set (for pan ◀/▶)
const toggle = () => {
const next = !on;
setOn(next);
IcomSetScope(next).catch(() => {});
};
// Centre/pan the FIXED scope: set the edges to centre ±50 kHz (a 100 kHz
// window). "Centre" uses the live VFO; ◀/▶ shift the window by 50 kHz. This
// just writes the rig's fixed edges — simple and independent of the waveform
// decode.
const SCOPE_HALF = 50_000;
const applyEdges = (center: number) => {
if (center <= 0) return;
centerRef.current = center;
setFixed(true);
IcomSetScopeEdges(center - SCOPE_HALF, center + SCOPE_HALF).catch(() => {});
};
const centerOnVfo = async () => {
let c = vfoRef.current;
if (c <= 0) { try { const cs = await GetCATState(); c = cs?.freq_hz || 0; } catch {} }
applyEdges(c);
};
const pan = (dir: number) => applyEdges((centerRef.current || vfoRef.current) + dir * SCOPE_HALF);
const setMode = (nextFixed: boolean) => {
setFixed(nextFixed);
IcomSetScopeMode(nextFixed).catch(() => {});
};
// Stop the stream when the panel unmounts.
useEffect(() => () => { IcomSetScope(false).catch(() => {}); }, []);
useEffect(() => {
if (!on) return;
let raf = 0, lastSeq = -1, alive = true;
const tick = async () => {
if (!alive) return;
try {
const sw = await IcomScopeData();
if (sw?.unsupported) setUnsupported(true);
if (sw && sw.seq !== lastSeq && sw.amp && sw.amp.length) {
lastSeq = sw.seq;
setFixed(sw.fixed);
spanRef.current = { low: sw.low_hz, high: sw.high_hz };
let vfo = 0;
try {
const cs = await GetCATState();
vfo = cs?.split && cs.freq_rx_hz ? cs.freq_rx_hz : (cs?.freq_hz || 0);
} catch {}
if (vfo > 0) vfoRef.current = vfo;
draw(sw.amp, sw.low_hz, sw.high_hz, vfoRef.current, sw.fixed);
}
} catch {}
if (alive) raf = window.setTimeout(() => { raf = requestAnimationFrame(tick); }, 40) as unknown as number;
};
raf = requestAnimationFrame(tick);
return () => { alive = false; cancelAnimationFrame(raf); window.clearTimeout(raf); };
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [on]);
// Double-click tunes the rig to the clicked frequency.
const onDblClick = (e: React.MouseEvent<HTMLCanvasElement>) => {
const cv = canvasRef.current;
const { low, high } = spanRef.current;
if (!cv || !(low > 0 && high > low)) return;
const rect = cv.getBoundingClientRect();
const frac = Math.max(0, Math.min(1, (e.clientX - rect.left) / rect.width));
const hz = Math.round((low + frac * (high - low)) / 100) * 100; // nearest 100 Hz
SetCATFrequency(hz).catch(() => {});
};
// Mouse-wheel over the scope QSYs ±100 Hz. Non-passive listener so we can
// preventDefault (else the page scrolls); optimistic vfoRef so quick spins
// accumulate before the poll reconciles.
useEffect(() => {
const el = canvasRef.current;
if (!el || !on) return;
const onWheel = (e: WheelEvent) => {
if (!vfoRef.current) return;
e.preventDefault();
const next = vfoRef.current + (e.deltaY < 0 ? 100 : -100);
vfoRef.current = next;
SetCATFrequency(next).catch(() => {});
};
el.addEventListener('wheel', onWheel, { passive: false });
return () => el.removeEventListener('wheel', onWheel);
}, [on]);
const draw = (amp: number[], lowHz: number, highHz: number, vfoHz: number, fixedMode: boolean) => {
const cv = canvasRef.current;
if (!cv) return;
const dpr = window.devicePixelRatio || 1;
const w = cv.clientWidth, h = cv.clientHeight;
if (cv.width !== w * dpr || cv.height !== h * dpr) { cv.width = w * dpr; cv.height = h * dpr; }
const ctx = cv.getContext('2d');
if (!ctx) return;
ctx.setTransform(dpr, 0, 0, dpr, 0, 0);
// Auto-scale: track the peak, decaying slowly so the floor doesn't jump.
const peak = Math.max(...amp);
peakRef.current = Math.max(peak, peakRef.current * 0.95, 40);
const scale = peakRef.current;
const n = amp.length;
// Background — deep navy vertical gradient.
const bg = ctx.createLinearGradient(0, 0, 0, h);
bg.addColorStop(0, '#0b1220'); bg.addColorStop(1, '#05070e');
ctx.fillStyle = bg; ctx.fillRect(0, 0, w, h);
// Grid.
ctx.strokeStyle = 'rgba(120,150,200,0.08)';
ctx.lineWidth = 1;
for (let i = 1; i < 4; i++) { const y = (h * i) / 4; ctx.beginPath(); ctx.moveTo(0, y); ctx.lineTo(w, y); ctx.stroke(); }
for (let i = 1; i < 8; i++) { const x = (w * i) / 8; ctx.beginPath(); ctx.moveTo(x, 0); ctx.lineTo(x, h); ctx.stroke(); }
const xOf = (i: number) => (i / (n - 1)) * w;
const yOf = (v: number) => h - Math.min(1, v / scale) * h;
// Peak-hold line (slow decay) — a faint ghost of recent maxima.
const hold = holdRef.current;
if (hold.length !== n) hold.length = n, hold.fill(0);
for (let i = 0; i < n; i++) hold[i] = Math.max(amp[i], hold[i] * 0.92);
// Filled spectrum area.
ctx.beginPath();
ctx.moveTo(0, h);
for (let i = 0; i < n; i++) ctx.lineTo(xOf(i), yOf(amp[i]));
ctx.lineTo(w, h); ctx.closePath();
const grad = ctx.createLinearGradient(0, 0, 0, h);
grad.addColorStop(0, 'rgba(56,189,248,0.40)');
grad.addColorStop(1, 'rgba(56,189,248,0.02)');
ctx.fillStyle = grad; ctx.fill();
// Peak-hold trace (thin, faint).
ctx.beginPath();
for (let i = 0; i < n; i++) { const x = xOf(i), y = yOf(hold[i]); i === 0 ? ctx.moveTo(x, y) : ctx.lineTo(x, y); }
ctx.strokeStyle = 'rgba(148,197,255,0.35)'; ctx.lineWidth = 1; ctx.stroke();
// Live spectrum trace with a soft glow.
ctx.save();
ctx.shadowColor = 'rgba(56,189,248,0.7)'; ctx.shadowBlur = 6;
ctx.beginPath();
for (let i = 0; i < n; i++) { const x = xOf(i), y = yOf(amp[i]); i === 0 ? ctx.moveTo(x, y) : ctx.lineTo(x, y); }
ctx.strokeStyle = '#7dd3fc'; ctx.lineWidth = 1.5; ctx.lineJoin = 'round'; ctx.stroke();
ctx.restore();
// VFO marker: you should ALWAYS see where you are. Exact position when the VFO
// is inside the span; the centre in CTR mode; clamped to the nearest edge with
// a sideways arrow in FIX mode when the fixed scope doesn't cover the VFO (so
// you can tell which way to tune to get it back on-screen).
const haveVfo = vfoHz > 0 && lowHz > 0 && highHz > lowHz;
const inSpan = haveVfo && vfoHz >= lowHz && vfoHz <= highHz;
let markerX = -1;
let offEdge = 0; // -1 = VFO off the left edge, +1 = off the right
if (inSpan) markerX = ((vfoHz - lowHz) / (highHz - lowHz)) * w;
else if (!fixedMode) markerX = w / 2;
else if (haveVfo) { offEdge = vfoHz < lowHz ? -1 : 1; markerX = offEdge < 0 ? 1 : w - 1; }
if (markerX >= 0) {
const x = markerX;
ctx.fillStyle = 'rgba(244,63,94,0.10)'; ctx.fillRect(x - 5, 0, 10, h);
ctx.strokeStyle = 'rgba(244,63,94,0.9)'; ctx.lineWidth = 1.25;
ctx.beginPath(); ctx.moveTo(x, 0); ctx.lineTo(x, h); ctx.stroke();
ctx.fillStyle = 'rgba(244,63,94,0.95)';
if (offEdge === 0) {
ctx.beginPath(); ctx.moveTo(x - 4, 0); ctx.lineTo(x + 4, 0); ctx.lineTo(x, 6); ctx.closePath(); ctx.fill();
} else {
const yh = 8; ctx.beginPath(); ctx.moveTo(x, yh - 5); ctx.lineTo(x + offEdge * 7, yh); ctx.lineTo(x, yh + 5); ctx.closePath(); ctx.fill();
}
}
// Frequency scale. In fixed mode the rig reports usable edge frequencies, so
// we label low/centre/high from them. In centre mode the header frame's edge
// pair isn't a usable low..high range, but the scope is centred on the VFO —
// so we always label the centre with the live VFO frequency (which we fetch
// each sweep), and only add edge labels when the reported edges genuinely
// bracket the VFO. That guarantees you always see your frequency in CTR.
const mhz = (hz: number) => (hz / 1e6).toFixed(3);
ctx.font = '10px ui-monospace, monospace';
ctx.textBaseline = 'bottom';
ctx.shadowColor = 'rgba(0,0,0,0.8)'; ctx.shadowBlur = 3;
ctx.fillStyle = 'rgba(226,232,240,0.85)';
const label = (txt: string, x: number, align: CanvasTextAlign) => { ctx.textAlign = align; ctx.fillText(txt, x, h - 3); };
const validEdges = lowHz > 0 && highHz > lowHz;
if (fixedMode) {
if (validEdges) {
label(mhz(lowHz), 4, 'left');
label(mhz((lowHz + highHz) / 2), w / 2, 'center');
label(mhz(highHz), w - 4, 'right');
}
} else {
if (validEdges && vfoHz >= lowHz && vfoHz <= highHz) {
label(mhz(lowHz), 4, 'left');
label(mhz(highHz), w - 4, 'right');
}
if (vfoHz > 0) label(mhz(vfoHz), w / 2, 'center');
}
ctx.shadowBlur = 0;
drawWaterfall(amp, scale);
};
// drawWaterfall scrolls the history down one row and paints the newest sweep
// as a colour-mapped line at the top.
const drawWaterfall = (amp: number[], scale: number) => {
const cv = wfRef.current;
if (!cv) return;
const w = Math.max(1, cv.clientWidth), h = Math.max(1, cv.clientHeight);
if (cv.width !== w || cv.height !== h) { cv.width = w; cv.height = h; }
const ctx = cv.getContext('2d');
if (!ctx) return;
// Scroll everything down by one pixel row.
ctx.drawImage(cv, 0, 0, w, h - 1, 0, 1, w, h - 1);
// Paint the new top row.
const row = ctx.createImageData(w, 1);
const n = amp.length;
for (let x = 0; x < w; x++) {
const i = Math.min(n - 1, Math.round((x / (w - 1)) * (n - 1)));
const [r, g, b] = wfColor(amp[i] / scale);
const o = x * 4;
row.data[o] = r; row.data[o + 1] = g; row.data[o + 2] = b; row.data[o + 3] = 255;
}
ctx.putImageData(row, 0, 0);
};
// Collapsible card: when the scope is off, only the header band shows (the
// canvas is hidden entirely) so it doesn't waste vertical space. The CTR/FIX
// and ON/OFF controls live in the header itself.
return (
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden">
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
<Activity className="size-4" style={{ color: '#38bdf8' }} />
<span className="text-xs font-bold uppercase tracking-wider text-foreground/80">{t('icmp.spectrum')}</span>
<div className="ml-auto flex items-center gap-2 shrink-0">
{on && (
<div className="inline-flex rounded-md border border-border overflow-hidden">
<button type="button" onClick={() => pan(-1)} title={t('icmp.scopePanDown')}
className="px-2 py-1 text-xs font-bold bg-card text-muted-foreground hover:bg-muted border-r border-border"></button>
<button type="button" onClick={centerOnVfo} title={t('icmp.scopeCenterVfo')}
className="px-2 py-1 text-[11px] font-bold bg-card text-muted-foreground hover:bg-muted border-r border-border"></button>
<button type="button" onClick={() => pan(1)} title={t('icmp.scopePanUp')}
className="px-2 py-1 text-xs font-bold bg-card text-muted-foreground hover:bg-muted"></button>
</div>
)}
{on && (
<Segmented value={fixed ? 'FIX' : 'CTR'} options={[{ v: 'CTR', l: 'CTR' }, { v: 'FIX', l: 'FIX' }]}
onChange={(v) => setMode(v === 'FIX')} />
)}
<Chip label={on ? 'ON' : 'OFF'} on={on} onClick={toggle} />
</div>
</div>
{on && unsupported && (
<div className="px-3 py-2 text-xs text-muted-foreground">{t('icmp.scopeNoStream')}</div>
)}
{on && !unsupported && (
<div className="p-3">
<div className="rounded-xl overflow-hidden ring-1 ring-info/20 shadow-lg shadow-sky-500/5 bg-[#05070e]">
<canvas ref={canvasRef} onDoubleClick={onDblClick}
className="w-full block cursor-crosshair" style={{ height: 140 }} />
<canvas ref={wfRef} className="w-full block" style={{ height: 96 }} />
</div>
</div>
)}
</div>
);
}
// IcomPanel — full control surface (RX DSP + TX) for an Icom on the CI-V backend.
// Unlike the Flex (which pushes state), the Icom is polled: meters/TX state are
// read every cache cycle; DSP set-controls are optimistic and reconcile on the
// next poll. Front-panel knob changes for DSP show after ↻ Refresh.
export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (rst: string) => void; isNetwork?: boolean } = {}) { export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (rst: string) => void; isNetwork?: boolean } = {}) {
// The speaker toggle lives HERE, next to ON/OFF, because that is where the
// operator is looking — burying "stop listening" behind Settings → Audio
// meant a trip through two panels to mute a radio sitting in the same room.
const [listening, setListening] = useState(false);
useEffect(() => {
if (!isNetwork) return;
let alive = true;
const ask = () => AudioMonitorActive().then((v) => { if (alive) setListening(!!v); }).catch(() => {});
ask();
const id = window.setInterval(ask, 2000);
return () => { alive = false; window.clearInterval(id); };
}, [isNetwork]);
const toggleListening = () => {
const next = !listening;
setListening(next);
(next ? AudioStartMonitor() : Promise.resolve(AudioStopMonitor())).catch(() => setListening(!next));
};
const { t } = useI18n(); const { t } = useI18n();
const [st, setSt] = useState<IcomState>(ZERO); const [st, setSt] = useState<IcomState>(ZERO);
const [cat, setCat] = useState<any>(null); // RigState (freq/mode/split) for the VFO display const [cat, setCat] = useState<any>(null); // RigState (freq/mode/split) for the VFO display
@@ -603,7 +378,9 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
const toggleMox = () => { const toggleMox = () => {
const next = !txRef.current; const next = !txRef.current;
txRef.current = next; txRef.current = next;
set({ transmitting: next }, () => IcomSetPTT(next)); // Through the console binding: on a network station the PC microphone
// rides with the PTT (silence otherwise); on USB it keys and nothing more.
set({ transmitting: next }, () => IcomConsolePTT(next));
}; };
const tune = async () => { const tune = async () => {
@@ -646,8 +423,13 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
// other is TX (freq_hz); otherwise there's a single VFO (freq_hz). // other is TX (freq_hz); otherwise there's a single VFO (freq_hz).
const split = !!cat?.split; const split = !!cat?.split;
const mainHz: number = split ? (cat?.freq_rx_hz || 0) : (cat?.freq_hz || 0); const mainHz: number = split ? (cat?.freq_rx_hz || 0) : (cat?.freq_hz || 0);
const subHz: number = split ? (cat?.freq_hz || 0) : 0; // The sub receiver's dial is worth seeing whether or not split is on —
const curMode: string = cat?.mode || st.mode || ''; // in split the CAT state's TX freq is the authority, otherwise the panel's
// own sub_hz read.
const subHz: number = split ? (cat?.freq_hz || 0) : (st.sub_hz || 0);
// The panel's own mode first: it carries the sideband (USB/LSB) where the
// CAT state folds both into ADIF's SSB.
const curMode: string = st.mode || cat?.mode || '';
// Mode-dependent controls: VOX / speech-comp / mic are voice-only (hidden on // Mode-dependent controls: VOX / speech-comp / mic are voice-only (hidden on
// CW and data); APF (audio peak filter) is CW-only. Fold USB/LSB into phone. // CW and data); APF (audio peak filter) is CW-only. Fold USB/LSB into phone.
const um = curMode.toUpperCase(); const um = curMode.toUpperCase();
@@ -676,6 +458,14 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
rig's LAN server stays alive in standby, so both work. */} rig's LAN server stays alive in standby, so both work. */}
{isNetwork && ( {isNetwork && (
<> <>
<button type="button" onClick={toggleListening}
title={listening ? t('icmp.speakerOffHint') : t('icmp.speakerOnHint')}
className={cn('inline-flex items-center gap-1 rounded-md border px-2 py-1 text-xs font-bold',
listening
? 'border-primary/60 bg-primary/10 text-primary hover:bg-primary/20'
: 'border-border bg-card text-muted-foreground hover:bg-muted')}>
{listening ? <Volume2 className="size-3.5" /> : <VolumeX className="size-3.5" />}
</button>
<button type="button" onClick={() => IcomSetPower(true).catch(() => {})} title={t('icmp.powerOnHint')} <button type="button" onClick={() => IcomSetPower(true).catch(() => {})} title={t('icmp.powerOnHint')}
className="inline-flex items-center gap-1 rounded-md border border-success/60 bg-success/10 px-2 py-1 text-xs font-bold text-success hover:bg-success/20"> className="inline-flex items-center gap-1 rounded-md border border-success/60 bg-success/10 px-2 py-1 text-xs font-bold text-success hover:bg-success/20">
<Power className="size-3.5" /> ON <Power className="size-3.5" /> ON
@@ -717,7 +507,7 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
</div> </div>
</div> </div>
{/* Mode selector row (RS-BA1's SSB/CW/RTTY/PSK/AM/FM). */} {/* Mode selector row (RS-BA1's SSB/CW/RTTY/PSK/AM/FM). */}
<div className="grid grid-cols-6 border-t border-border/60 divide-x divide-border/60"> <div className="grid grid-cols-7 border-t border-border/60 divide-x divide-border/60">
{MODES.map((m) => { {MODES.map((m) => {
const on = modeMatches(m, curMode); const on = modeMatches(m, curMode);
return ( return (
@@ -731,20 +521,28 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
</div> </div>
</div> </div>
{/* Live meters — always visible: S (RX, click → RST), Po in watts, SWR. */} {/* Live meters — the SAME LED MeterBar every other console uses (Flex,
<div className="rounded-xl border border-border bg-card px-3 py-2.5 shadow-sm grid grid-cols-1 sm:grid-cols-3 gap-x-5 gap-y-2"> Elecraft, the amp cards): one instrument look across the app, per the
operator's "les consoles doivent se ressembler". S is clickable → RST. */}
<div className="grid grid-cols-1 sm:grid-cols-3 gap-2">
{(() => { const sp = sParts(st.s_meter); return ( {(() => { const sp = sParts(st.s_meter); return (
<Meter label="S" value={st.s_meter} accent="#22c55e" scale={sp.label} <MeterBar label="S-METER" value={st.transmitting ? 0 : st.s_meter} lo={0} hi={100}
accent="#16a34a" segColor={sSegColor}
display={st.transmitting ? '—' : sp.label}
title={onReportRST ? t('rst.clickToFill') : undefined} title={onReportRST ? t('rst.clickToFill') : undefined}
onClick={onReportRST ? () => onReportRST(sMeterRST(sp.s, sp.over, st.mode)) : undefined} /> onClick={onReportRST ? () => { if (!st.transmitting) onReportRST(sMeterRST(sp.s, sp.over, st.mode)); } : undefined} />
); })()} ); })()}
<Meter label="Po" value={st.power_meter} accent="#ef4444" scale={`${st.power_meter} W`} /> {(() => {
<Meter label="SWR" value={st.swr_meter} accent="#f59e0b" scale={st.swr_meter > 0 ? `${(1 + st.swr_meter / 33.3).toFixed(1)}` : '1.0'} /> if ((st.model ?? '').includes('7760')) {
const { w, defl } = icomWatts(st.power_meter);
return <MeterBar label="PWR" value={defl} lo={0} hi={100} accent="#0ea5e9" display={`${w} W`} />;
}
return <MeterBar label="PWR" value={st.power_meter} lo={0} hi={100} accent="#0ea5e9" display={`${st.power_meter} W`} />;
})()}
<MeterBar label="SWR" value={st.swr_meter > 0 ? 1 + st.swr_meter / 33.3 : 0} lo={1} hi={4} accent="#f59e0b"
display={st.swr_meter > 0 ? (1 + st.swr_meter / 33.3).toFixed(1) : '—'} />
</div> </div>
{/* Spectrum panadapter (full width). */}
<ScopePanadapter />
<div className="grid grid-cols-1 lg:grid-cols-2 gap-3"> <div className="grid grid-cols-1 lg:grid-cols-2 gap-3">
{/* Band buttons + antenna selection. */} {/* Band buttons + antenna selection. */}
<Card icon={Antenna} title={t('icmp.bandsAntenna')} accent="#0891b2"> <Card icon={Antenna} title={t('icmp.bandsAntenna')} accent="#0891b2">
@@ -784,7 +582,11 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
<Card icon={Mic} title={t('icmp.transmit')} accent="#ef4444"> <Card icon={Mic} title={t('icmp.transmit')} accent="#ef4444">
<Row label={t('icmp.power')}> <Row label={t('icmp.power')}>
<Slider value={st.rf_power} accent="#ef4444" onChange={(v) => set({ rf_power: v }, () => IcomSetRFPower(v))} /> <Slider value={st.rf_power} accent="#ef4444" onChange={(v) => set({ rf_power: v }, () => IcomSetRFPower(v))} />
<span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.rf_power}</span> {/* PC is a percentage of the rig's rated power; on a 200 W rig the
operator thinks in watts, so say it in watts there. */}
<span className="w-12 text-right text-xs font-mono tabular-nums text-muted-foreground">
{(st.model ?? '').includes('7760') ? `${st.rf_power * 2} W` : st.rf_power}
</span>
</Row> </Row>
{isPhone && ( {isPhone && (
<Row label={t('icmp.mic')}> <Row label={t('icmp.mic')}>
@@ -799,6 +601,9 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
{tx ? 'TX ON' : 'MOX'} {tx ? 'TX ON' : 'MOX'}
</button> </button>
<Chip label="SPLIT" on={st.split} onClick={() => set({ split: !st.split }, () => IcomSetSplit(!st.split))} /> <Chip label="SPLIT" on={st.split} onClick={() => set({ split: !st.split }, () => IcomSetSplit(!st.split))} />
{/* Tuner IN/OUT — TUNE below starts a cycle but could never take the
tuner back out of line. */}
<Chip label="ATU" on={!!st.atu_on} onClick={() => set({ atu_on: !st.atu_on } as any, () => IcomSetATU(!st.atu_on))} />
<button type="button" onClick={tune} disabled={tuning} <button type="button" onClick={tune} disabled={tuning}
className={cn('w-14 shrink-0 px-2 py-1.5 rounded-md text-[11px] font-bold border transition-colors', className={cn('w-14 shrink-0 px-2 py-1.5 rounded-md text-[11px] font-bold border transition-colors',
tuning ? 'bg-warning border-warning text-warning-foreground animate-pulse' : 'bg-card text-foreground border-border hover:bg-muted')}> tuning ? 'bg-warning border-warning text-warning-foreground animate-pulse' : 'bg-card text-foreground border-border hover:bg-muted')}>
+49 -12
View File
@@ -9,7 +9,8 @@ import {
import { import {
GetLookupSettings, SaveLookupSettings, ClearLookupCache, TestLookupProvider, GetLookupSettings, SaveLookupSettings, ClearLookupCache, TestLookupProvider,
GetListsSettings, SaveListsSettings, GetListsSettings, SaveListsSettings,
GetCATSettings, SaveCATSettings, GetRadios, SaveRadios, SetActiveRadio, DiscoverFlexRadios, GetCATSettings, SaveCATSettings, GetRadios, SaveRadios, SetActiveRadio, ActiveRadioID, DiscoverFlexRadios,
GetAudioMonitorPref,
ListProfiles, GetActiveProfile, SaveProfile, DeleteProfile, ActivateProfile, DuplicateProfile, ListProfiles, GetActiveProfile, SaveProfile, DeleteProfile, ActivateProfile, DuplicateProfile,
GetRotators, SaveRotators, TestRotatorDevice, RotatorPark, RotatorStop, GetRotators, SaveRotators, TestRotatorDevice, RotatorPark, RotatorStop,
GetRotorPresets, SaveRotorPresets, ResetRotorPresets, GetRotorPresets, SaveRotorPresets, ResetRotorPresets,
@@ -1086,7 +1087,7 @@ function RelayAutoPanel() {
// panes. The first two are the view; the third and fourth can be left empty, and // panes. The first two are the view; the third and fourth can be left empty, and
// an empty one is not drawn at all. Per-profile (stored via SetUIPref, which is // an empty one is not drawn at all. Per-profile (stored via SetUIPref, which is
// profile-prefixed). Self-contained so it owns its async-loaded state. // profile-prefixed). Self-contained so it owns its async-loaded state.
const MAIN_PANE_VALUES = ['map1', 'map2', 'cluster', 'worked', 'recent', 'netcontrol', 'decodes']; const MAIN_PANE_VALUES = ['map1', 'map2', 'cluster', 'worked', 'recent', 'netcontrol', 'decodes', 'watchlist'];
const PANE_NONE = 'none'; const PANE_NONE = 'none';
function MainViewPanes({ onChanged, flexAvailable, icomAvailable, yaesuAvailable, elecraftAvailable, tciAvailable }: { onChanged?: (side: 'left' | 'right' | 'p3' | 'p4' | 'layout', value: string) => void; flexAvailable?: boolean; icomAvailable?: boolean; yaesuAvailable?: boolean; elecraftAvailable?: boolean; tciAvailable?: boolean }) { function MainViewPanes({ onChanged, flexAvailable, icomAvailable, yaesuAvailable, elecraftAvailable, tciAvailable }: { onChanged?: (side: 'left' | 'right' | 'p3' | 'p4' | 'layout', value: string) => void; flexAvailable?: boolean; icomAvailable?: boolean; yaesuAvailable?: boolean; elecraftAvailable?: boolean; tciAvailable?: boolean }) {
const { t } = useI18n(); const { t } = useI18n();
@@ -1503,6 +1504,7 @@ const ICOM_MODELS: { name: string; addr: number }[] = [
{ name: 'IC-7600', addr: 0x7A }, { name: 'IC-7600', addr: 0x7A },
{ name: 'IC-7610', addr: 0x98 }, { name: 'IC-7610', addr: 0x98 },
{ name: 'IC-7700', addr: 0x74 }, { name: 'IC-7700', addr: 0x74 },
{ name: 'IC-7760', addr: 0xB2 },
{ name: 'IC-7800', addr: 0x6A }, { name: 'IC-7800', addr: 0x6A },
{ name: 'IC-7851', addr: 0x8E }, { name: 'IC-7851', addr: 0x8E },
{ name: 'IC-9100', addr: 0x7C }, { name: 'IC-9100', addr: 0x7C },
@@ -1600,6 +1602,7 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
// The saved radios. The CAT panel edits ONE of them — whichever is on the air // The saved radios. The CAT panel edits ONE of them — whichever is on the air
// — and the list is what makes switching possible without touching profiles. // — and the list is what makes switching possible without touching profiles.
const [radios, setRadios] = useState<any[]>([]); const [radios, setRadios] = useState<any[]>([]);
const [listenPref, setListenPref] = useState(true);
const [activeRadio, setActiveRadioId] = useState(''); const [activeRadio, setActiveRadioId] = useState('');
const [radioBusy, setRadioBusy] = useState(false); const [radioBusy, setRadioBusy] = useState(false);
const [catCfg, setCatCfg] = useState<CATSettings>({ const [catCfg, setCatCfg] = useState<CATSettings>({
@@ -2068,6 +2071,8 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
try { await SaveGridScopeSettings(next); } catch { /* the panel keeps the choice either way */ } try { await SaveGridScopeSettings(next); } catch { /* the panel keeps the choice either way */ }
}; };
const [chaseGrids, setChaseGrids] = useState(false); const [chaseGrids, setChaseGrids] = useState(false);
const [chasePotaOn, setChasePotaOn] = useState(() => localStorage.getItem('opslog.chasePota') !== '0');
const [chaseSotaOn, setChaseSotaOn] = useState(() => localStorage.getItem('opslog.chaseSota') !== '0');
const [chaseNew, setChaseNew] = useState(false); const [chaseNew, setChaseNew] = useState(false);
const [spotTTL, setSpotTTL] = useState(0); const [spotTTL, setSpotTTL] = useState(0);
const [spotTTLText, setSpotTTLText] = useState('0'); const [spotTTLText, setSpotTTLText] = useState('0');
@@ -2201,10 +2206,17 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
// buttons. See rotorPresetsLoaded for the belt to this brace. // buttons. See rotorPresetsLoaded for the belt to this brace.
try { setRotorPresets((((await GetRotorPresets()) ?? []) as any)); setRotorPresetsLoaded(true); } catch {} try { setRotorPresets((((await GetRotorPresets()) ?? []) as any)); setRotorPresetsLoaded(true); } catch {}
try { try {
try { setListenPref(!!(await GetAudioMonitorPref())); } catch {}
const rl: any = await GetRadios(); const rl: any = await GetRadios();
setRadios(rl ?? []); setRadios(rl ?? []);
const act = (rl ?? []).find((r: any) => r.active) ?? (rl ?? [])[0]; // The backend is the only one who knows which radio is on the air —
setActiveRadioId(act?.id ?? ''); // the list entries carry no 'active' flag, and guessing the first
// meant reopening the panel showed Radio 1's name over the settings
// of whichever radio was actually selected.
let actId = '';
try { actId = (await ActiveRadioID()) ?? ''; } catch {}
if (!actId || !(rl ?? []).some((r: any) => r.id === actId)) actId = (rl ?? [])[0]?.id ?? '';
setActiveRadioId(actId);
} catch { /* one radio, never listed — the panel works as it always did */ } } catch { /* one radio, never listed — the panel works as it always did */ }
try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {} try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {}
try { setAntgenius(await GetAntGeniusSettings() as any); } catch {} try { setAntgenius(await GetAntGeniusSettings() as any); } catch {}
@@ -3617,6 +3629,22 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
<span className="block text-[11px] text-muted-foreground">{t('cat.icomNetAudioHint')}</span> <span className="block text-[11px] text-muted-foreground">{t('cat.icomNetAudioHint')}</span>
</span> </span>
</label> </label>
{!!(catCfg as any).icom_net_audio && (
<label className="col-span-2 flex items-start gap-2 text-sm cursor-pointer pl-6">
{/* The speaker choice, right where the stream is enabled. Same
remembered preference as the console's speaker button
applied immediately, no save needed. */}
<Checkbox checked={listenPref}
onCheckedChange={(c) => {
setListenPref(!!c);
(c ? AudioStartMonitor() : Promise.resolve(AudioStopMonitor())).catch(() => setListenPref(!c));
}} />
<span>
{t('cat.icomNetListen')}
<span className="block text-[11px] text-muted-foreground">{t('cat.icomNetListenHint')}</span>
</span>
</label>
)}
</> </>
)} )}
{catCfg.backend === 'tci' && ( {catCfg.backend === 'tci' && (
@@ -4884,7 +4912,7 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
{wk.engine === 'icom' ? ( {wk.engine === 'icom' ? (
<> <>
{(!catCfg.enabled || catCfg.backend !== 'icom') && ( {(!catCfg.enabled || (catCfg.backend !== 'icom' && catCfg.backend !== 'icom-net')) && (
<p className="text-xs font-medium text-warning -mt-1 flex items-start gap-1.5"> <p className="text-xs font-medium text-warning -mt-1 flex items-start gap-1.5">
<span aria-hidden></span> <span aria-hidden></span>
<span>{t('wk.catWarnIcom', { backend: catCfg.enabled ? (catCfg.backend || 'none') : 'disabled' })}</span> <span>{t('wk.catWarnIcom', { backend: catCfg.enabled ? (catCfg.backend || 'none') : 'disabled' })}</span>
@@ -5314,11 +5342,6 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
))} ))}
</div> </div>
</div> </div>
<p className="text-xs text-muted-foreground">
{t('clu.freeNodes')} <span className="font-mono">dxc.k0xm.net:7300</span>,{' '}
<span className="font-mono">dx.maritimecontestclub.net:7300</span>,{' '}
<span className="font-mono">w8avi.net:7300</span>.
</p>
<label className="flex items-start gap-2 text-sm cursor-pointer border-t border-border/60 pt-3"> <label className="flex items-start gap-2 text-sm cursor-pointer border-t border-border/60 pt-3">
<Checkbox checked={clusterWorkedSameSlot} className="mt-0.5" <Checkbox checked={clusterWorkedSameSlot} className="mt-0.5"
onCheckedChange={(c) => { const v = !!c; setClusterWorkedSameSlot(v); writeUiPref('opslog.clusterWorkedSameSlot', v ? '1' : '0'); }} /> onCheckedChange={(c) => { const v = !!c; setClusterWorkedSameSlot(v); writeUiPref('opslog.clusterWorkedSameSlot', v ? '1' : '0'); }} />
@@ -5380,11 +5403,24 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
const n = parseInt(raw, 10); const n = parseInt(raw, 10);
if (Number.isFinite(n) && n > 0) SetSpotMax(Math.min(10000, n)).catch(() => {}); if (Number.isFinite(n) && n > 0) SetSpotMax(Math.min(10000, n)).catch(() => {});
}} /> }} />
<span className="text-xs text-muted-foreground">{t('clu.spotMaxHint')}</span>
</div> </div>
</div> </div>
<div className="border-t border-border/60 pt-3 space-y-2"> <div className="border-t border-border/60 pt-3 space-y-2">
{/* Chase switches: off, the marker stops being TOLD, everywhere at
once badge, colour, filter chip, reference column. A "new band
+ new POTA" spot then reads NEW BAND alone. */}
<label className="flex items-center gap-2 text-sm cursor-pointer" title={t('clu.chasePotaHint')}>
<Checkbox checked={chasePotaOn}
onCheckedChange={(c) => { const v = !!c; setChasePotaOn(v); writeUiPref('opslog.chasePota', v ? '1' : '0'); }} />
{t('clu.chasePota')}
</label>
<label className="flex items-center gap-2 text-sm cursor-pointer" title={t('clu.chaseSotaHint')}>
<Checkbox checked={chaseSotaOn}
onCheckedChange={(c) => { const v = !!c; setChaseSotaOn(v); writeUiPref('opslog.chaseSota', v ? '1' : '0'); }} />
{t('clu.chaseSota')}
</label>
<label className="flex items-start gap-2 text-sm cursor-pointer"> <label className="flex items-start gap-2 text-sm cursor-pointer">
<Checkbox checked={chaseGrids} className="mt-0.5" <Checkbox checked={chaseGrids} className="mt-0.5"
onCheckedChange={(c) => { setChaseGrids(!!c); SetChaseNewGrids(!!c).catch(() => {}); }} /> onCheckedChange={(c) => { setChaseGrids(!!c); SetChaseNewGrids(!!c).catch(() => {}); }} />
@@ -6952,7 +6988,8 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
size="sm" size="sm"
className="h-8" className="h-8"
onClick={toggleMonitor} onClick={toggleMonitor}
disabled={!monitorOn && (!audioCfg.from_radio || fromRadioIsNetwork)} disabled={!monitorOn && (!audioCfg.from_radio || fromRadioIsNetwork)
&& !(catCfg.backend === 'icom-net' && (catCfg as any).icom_net_audio)}
title={fromRadioIsNetwork ? t('aud.monitorNoTci') : t('aud.monitorTitle')} title={fromRadioIsNetwork ? t('aud.monitorNoTci') : t('aud.monitorTitle')}
> >
{monitorOn ? t('aud.stopListening') : t('aud.listenRadio')} {monitorOn ? t('aud.stopListening') : t('aud.listenRadio')}
+417
View File
@@ -0,0 +1,417 @@
// Watchlist — the DXHunter concept as an OpsLog tab.
//
// One card per watched callsign (or prefix), the live spots that match it
// underneath, and the two questions an operator actually asks answered on every
// line: is this slot still NEEDED, and what would it be worth (the same NEW
// DXCC / band / mode / slot badges the cluster shows, resolved from the same
// index). A CONTEST entry is judged against the current UTC day — at midnight
// everything reads "work today" again; the boundary lives in the backend query,
// so there is nothing to reset.
//
// The design is DXHunter's — the layout, the badges, the wording — repainted in
// the app's theme tokens rather than its hard-coded slate/pink.
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { Eye, Plus, Trash2, Bell, BellOff, Trophy, Search } from 'lucide-react';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Checkbox } from '@/components/ui/checkbox';
import { cn } from '@/lib/utils';
import { useI18n } from '@/lib/i18n';
import {
WatchlistEntries, WatchlistAdd, WatchlistRemove, WatchlistSetNotify,
WatchlistSetContest, WatchlistWorkedSlots,
GetWatchlistContestPattern, SetWatchlistContestPattern, OpenExternalURL,
} from '../../wailsjs/go/main/App';
import { EventsOn } from '../../wailsjs/runtime/runtime';
import type { ClusterSpot, SpotStatusEntry } from '@/components/ClusterGrid';
import { inferSpotMode, spotStatusKey } from '@/lib/spot';
interface WLEntry {
callsign: string; lastSeenStr: string; addedAt: string; spotCount: number;
isContest: boolean; notify: boolean;
isExpedition: boolean; clubLogQSOs24h: number; clubLogTotalQSOs: number;
clubLogHasOQRS: boolean; clubLogLiveStream: boolean;
}
interface Props {
spots: ClusterSpot[];
spotStatus: Record<string, SpotStatusEntry>;
onSpotSelect?: (s: ClusterSpot) => void;
onSpotClick?: (s: ClusterSpot) => void;
}
// A spot is ON AIR for the badge while its last sighting is this fresh.
const ON_AIR_MS = 10 * 60 * 1000;
// Exact unless the entry carries a trailing * — the same rule the backend's
// Match applies to the live stream, mirrored so the tab and the alerts can
// never disagree about what an entry covers.
function matchesEntry(call: string, pattern: string): boolean {
const c = call.toUpperCase();
if (pattern.endsWith('*')) {
const p = pattern.slice(0, -1);
return p !== '' && c.startsWith(p);
}
return c === pattern;
}
export function WatchlistTab({ spots, spotStatus, onSpotSelect, onSpotClick }: Props) {
const { t } = useI18n();
const [entries, setEntries] = useState<WLEntry[]>([]);
const [addCall, setAddCall] = useState('');
const [addContest, setAddContest] = useState(false);
const [search, setSearch] = useState('');
// The filters survive leaving the tab: the component unmounts on every tab
// switch, and filters that reset each time are filters nobody trusts.
const [neededOnly, setNeededOnlyRaw] = useState(() => localStorage.getItem('opslog.wlNeededOnly') === '1');
const [activeOnly, setActiveOnlyRaw] = useState(() => localStorage.getItem('opslog.wlActiveOnly') === '1');
const [family, setFamilyRaw] = useState<'all' | 'normal' | 'contest'>(() => {
const v = localStorage.getItem('opslog.wlFamily');
return v === 'normal' || v === 'contest' ? v : 'all';
});
const setNeededOnly = (f: (v: boolean) => boolean) => setNeededOnlyRaw((v) => { const nv = f(v); try { localStorage.setItem('opslog.wlNeededOnly', nv ? '1' : '0'); } catch {} return nv; });
const setActiveOnly = (f: (v: boolean) => boolean) => setActiveOnlyRaw((v) => { const nv = f(v); try { localStorage.setItem('opslog.wlActiveOnly', nv ? '1' : '0'); } catch {} return nv; });
const setFamily = (v: 'all' | 'normal' | 'contest') => { setFamilyRaw(v); try { localStorage.setItem('opslog.wlFamily', v); } catch {} };
// Mode filter — DXHunter's "All Modes" select. DIGI matches the digital class
// (FT8, FT4, a generic DATA spot…), the named modes match exactly.
const [modeFilter, setModeFilterRaw] = useState(() => localStorage.getItem('opslog.wlMode') || 'ALL');
const setModeFilter = (v: string) => { setModeFilterRaw(v); try { localStorage.setItem('opslog.wlMode', v); } catch {} };
const modeMatches = (s2: ClusterSpot): boolean => {
if (modeFilter === 'ALL') return true;
const m = (inferSpotMode(s2.comment ?? '', s2.freq_hz) || '').toUpperCase();
if (modeFilter === 'DIGI') return !['', 'CW', 'SSB', 'USB', 'LSB', 'FM', 'AM'].includes(m);
if (modeFilter === 'SSB') return m === 'SSB' || m === 'USB' || m === 'LSB';
return m === modeFilter;
};
const [error, setError] = useState('');
// A quiet confirmation under the toolbar; both messages clear themselves —
// a stale "added" from ten minutes ago reads as a fresh one.
const [notice, setNotice] = useState('');
const noticeTimer = useRef<number | undefined>(undefined);
const flash = (msg: string, isError: boolean) => {
if (noticeTimer.current) window.clearTimeout(noticeTimer.current);
setError(isError ? msg : '');
setNotice(isError ? '' : msg);
noticeTimer.current = window.setTimeout(() => { setError(''); setNotice(''); }, 4000) as unknown as number;
};
// worked answer per "call|band|modeclass|contest" key.
const [worked, setWorked] = useState<Record<string, boolean>>({});
const refresh = useCallback(async () => {
try { setEntries(((await WatchlistEntries()) ?? []) as any as WLEntry[]); }
catch (e: any) { setError(String(e?.message ?? e)); }
}, []);
// Refreshed on mount, when the backend auto-adds (event), and on a slow tick
// so last-seen and the spot counters stay honest while the tab sits open.
useEffect(() => {
void refresh();
const off = EventsOn('watchlist:changed', () => { void refresh(); });
const id = window.setInterval(() => { void refresh(); }, 30_000);
return () => { off(); window.clearInterval(id); };
}, [refresh]);
// The auto-contest pattern (DXHunter's contest_prefix): spots whose call
// contains it are added as contest entries by the backend.
const [pattern, setPattern] = useState('');
useEffect(() => { GetWatchlistContestPattern().then((p: string) => setPattern(p ?? '')).catch(() => {}); }, []);
// Live spots per entry — prefix-matched, newest first, deduped per band+mode
// (one line per slot; the freshest spot represents it).
const spotsFor = useMemo(() => {
const map = new Map<string, ClusterSpot[]>();
for (const e of entries) map.set(e.callsign, []);
for (const s of spots) {
for (const e of entries) {
if (matchesEntry(s.dx_call ?? '', e.callsign)) { map.get(e.callsign)!.push(s); break; }
}
}
for (const [k, list] of map) {
const seen = new Set<string>();
map.set(k, list.filter((s) => {
const key = `${(s.band ?? '')}|${inferSpotMode(s.comment ?? '', s.freq_hz)}|${s.dx_call}`;
if (seen.has(key)) return false;
seen.add(key);
return true;
}));
}
return map;
}, [spots, entries]);
// The worked answers, refreshed when the visible slots change. Debounced: a
// spot burst must cost one round trip, not one per spot.
const queryTimer = useRef<number | undefined>(undefined);
useEffect(() => {
if (queryTimer.current) window.clearTimeout(queryTimer.current);
queryTimer.current = window.setTimeout(async () => {
const queries: { call: string; band: string; mode: string; contest: boolean }[] = [];
const keys: string[] = [];
for (const e of entries) {
for (const s of spotsFor.get(e.callsign) ?? []) {
const mode = inferSpotMode(s.comment ?? '', s.freq_hz) || '';
queries.push({ call: s.dx_call, band: s.band ?? '', mode, contest: e.isContest });
keys.push(`${s.dx_call}|${s.band ?? ''}|${mode}|${e.isContest ? 1 : 0}`);
}
}
if (queries.length === 0) { setWorked({}); return; }
try {
const res: boolean[] = (await WatchlistWorkedSlots(queries as any)) ?? [];
// MERGED, not replaced: replacing made every already-answered key
// momentarily unknown on each refresh, which re-hid settled lines.
setWorked((prev) => {
const next = { ...prev };
keys.forEach((k, i) => { next[k] = !!res[i]; });
return next;
});
} catch { /* the badges just stay conservative */ }
}, 150) as unknown as number;
return () => { if (queryTimer.current) window.clearTimeout(queryTimer.current); };
}, [spotsFor, entries]);
const wkey = (e: WLEntry, s: ClusterSpot) =>
`${s.dx_call}|${s.band ?? ''}|${inferSpotMode(s.comment ?? '', s.freq_hz) || ''}|${e.isContest ? 1 : 0}`;
const workedFor = (e: WLEntry, s: ClusterSpot): boolean => worked[wkey(e, s)] ?? false;
// A spot whose verdict has not come back yet is NOT drawn. Showing it as
// Needed and withdrawing it half a second later made the list twitch on
// every burst — and nobody needs a spot 400 ms early, they need it settled.
const settled = (e: WLEntry, s: ClusterSpot): boolean => wkey(e, s) in worked;
const add = async () => {
const c = addCall.trim().toUpperCase();
if (!c) return;
try {
await WatchlistAdd(c, addContest);
setAddCall('');
flash(t(addContest ? 'wl.addedContest' : 'wl.added', { call: c }), false);
await refresh();
} catch (e: any) { flash(String(e?.message ?? e), true); }
};
// One click, like the bell and the trophy beside it: removing a watchlist
// entry is cheap to undo (type it again), so it does not earn a confirmation
// the other two buttons do not have.
const remove = async (call: string) => {
try { await WatchlistRemove(call); flash(t('wl.removed', { call }), false); await refresh(); }
catch (e: any) { flash(String(e?.message ?? e), true); }
};
const isOnAir = (e: WLEntry): boolean =>
(spotsFor.get(e.callsign) ?? []).some((s) => {
const ts = Date.parse(String((s as any).received_at ?? ''));
return ts > 0 && Date.now() - ts < ON_AIR_MS;
});
const shown = entries.filter((e) => {
if (family === 'normal' && e.isContest) return false;
if (family === 'contest' && !e.isContest) return false;
if (search && !e.callsign.includes(search.trim().toUpperCase())) return false;
const list = (spotsFor.get(e.callsign) ?? []).filter(modeMatches).filter((s2) => settled(e, s2));
if (activeOnly && list.length === 0) return false;
if (neededOnly && !list.some((s2) => !workedFor(e, s2))) return false;
return true;
});
const counters = useMemo(() => {
let active = 0, needed = 0;
for (const e of entries) {
const list = (spotsFor.get(e.callsign) ?? []).filter(modeMatches).filter((s2) => settled(e, s2));
if (list.length > 0) active++;
if (list.some((s2) => !workedFor(e, s2))) needed++;
}
return { total: entries.length, active, needed };
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [entries, spotsFor, worked, modeFilter]);
// The cluster's own badge for a spot, read from the shared status index.
const dxccBadge = (s: ClusterSpot): { label: string; color: string } | null => {
const st = spotStatus[spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz)];
switch (st?.status) {
case 'new': return { label: t('wl.newDxcc'), color: 'var(--danger)' };
case 'new-band-mode': return { label: t('clg2.newBandMode'), color: 'var(--danger)' };
case 'new-band': return { label: t('clg2.newBand'), color: 'var(--warning)' };
case 'new-mode': return { label: t('clg2.newMode'), color: 'var(--caution)' };
case 'new-slot': return { label: t('clg2.newSlot'), color: '#5AC8FA' };
default: return null;
}
};
const chip = (color: string, text: string, extra?: string) => (
<span className={cn('px-1.5 py-0.5 rounded text-[10px] font-bold border', extra)}
style={{ color, borderColor: `color-mix(in srgb, ${color} 40%, transparent)`, background: `color-mix(in srgb, ${color} 12%, transparent)` }}>
{text}
</span>
);
return (
// Capped and centred: a card is a reading surface, and callsign-to-badge
// lines stretched across a 34-inch window are not readable, they are long.
<div className="flex flex-col min-h-0 flex-1 gap-2 p-2 w-full max-w-5xl mx-auto">
{/* Header: the counters alone, centred — they are the tab's headline.
Everything one INTERACTS with lives on the second row. */}
<div className="flex items-center justify-center gap-2 text-sm text-muted-foreground">
<Eye className="size-4 text-primary shrink-0" />
<span>
{t('wl.cTotal')} <b className="text-foreground">{counters.total}</b>
<span className="mx-1.5 opacity-50">|</span>
{t('wl.cActive')} <b className="text-info">{counters.active}</b>
<span className="mx-1.5 opacity-50">|</span>
{t('wl.cNeeded')} <b className="text-warning">{counters.needed}</b>
</span>
</div>
{/* toolbar */}
<div className="flex items-start justify-between gap-x-3 gap-y-1.5 flex-wrap">
<div className="flex items-center gap-2 shrink-0">
<Input className="h-8 w-40 font-mono placeholder:font-sans placeholder:normal-case" placeholder={t('wl.addPh')} value={addCall}
onChange={(e) => setAddCall(e.target.value.toUpperCase())}
onKeyDown={(e) => { if (e.key === 'Enter') void add(); }} />
<label className="flex items-center gap-1.5 text-xs cursor-pointer" title={t('wl.contestHint')}>
<Checkbox checked={addContest} onCheckedChange={(c) => setAddContest(!!c)} />
<Trophy className="size-3.5 text-warning" /> {t('wl.addAsContest')}
</label>
<Button size="sm" className="h-8" onClick={() => void add()} disabled={!addCall.trim()}>
<Plus className="size-3.5" /> {t('wl.add')}
</Button>
<Input className="h-8 w-28 font-mono placeholder:font-sans placeholder:normal-case" placeholder={t('wl.patternPh')}
title={t('wl.patternHint')}
value={pattern}
onChange={(e) => setPattern(e.target.value.toUpperCase())}
onBlur={() => { void SetWatchlistContestPattern(pattern.trim()); }} />
</div>
<div className="flex items-center gap-2 shrink-0">
<div className="relative">
<Search className="size-3.5 absolute left-2 top-1/2 -translate-y-1/2 text-muted-foreground" />
<Input className="h-8 w-28 pl-7 text-sm" placeholder={t('wl.searchPh')} value={search}
onChange={(e) => setSearch(e.target.value)} />
</div>
{/* families kept together, told apart — per review of the DXHunter port,
no global contest mode: each entry carries its own rule. */}
<div className="inline-flex rounded-md border border-border overflow-hidden text-xs">
{([['all', t('wl.famAll')], ['normal', t('wl.famNormal')], ['contest', t('wl.famContest')]] as const).map(([k, label]) => (
<button key={k} type="button" onClick={() => setFamily(k)}
className={cn('px-2 py-1 border-l border-border first:border-l-0',
family === k ? 'bg-accent font-medium' : 'text-muted-foreground hover:bg-accent/50')}>
{label}
</button>
))}
</div>
<select value={modeFilter} onChange={(e) => setModeFilter(e.target.value)}
title={t('wl.modeFilter')}
className="h-7 px-1.5 rounded-md border border-border bg-background text-xs text-foreground">
{['ALL', 'CW', 'SSB', 'FT8', 'FT4', 'RTTY', 'DIGI'].map((m) => (
<option key={m} value={m}>{m === 'ALL' ? t('wl.allModes') : m}</option>
))}
</select>
<button type="button" onClick={() => setActiveOnly((v) => !v)}
className={cn('px-2 py-1 rounded-md border text-xs', activeOnly ? 'bg-accent border-border font-medium' : 'border-border text-muted-foreground hover:bg-accent/50')}>
{t('wl.activeOnly')}
</button>
<button type="button" onClick={() => setNeededOnly((v) => !v)}
className={cn('px-2 py-1 rounded-md border text-xs', neededOnly ? 'bg-accent border-border font-medium' : 'border-border text-muted-foreground hover:bg-accent/50')}>
{t('wl.neededOnly')}
</button>
</div>
</div>
{error && <div className="text-xs text-danger px-1">{error}</div>}
{notice && <div className="text-xs text-success px-1">{notice}</div>}
{/* cards */}
<div className="flex-1 min-h-0 overflow-y-auto space-y-2 pr-1">
{shown.length === 0 ? (
<div className="text-sm text-muted-foreground text-center pt-16 max-w-md mx-auto leading-relaxed">
{entries.length === 0 ? t('wl.empty') : t('wl.noneMatch')}
</div>
) : shown.map((e) => {
const all = (spotsFor.get(e.callsign) ?? []).filter(modeMatches).filter((s2) => settled(e, s2));
const needed = all.filter((s) => !workedFor(e, s)).length;
// Needed-only hides the worked LINES as well as the all-worked cards:
// a filter that says needed and still lists five green Worked rows is
// answering a different question than the one asked.
const list = neededOnly ? all.filter((s) => !workedFor(e, s)) : all;
return (
<div key={e.callsign}
className={cn('rounded-lg border bg-card p-3',
needed > 0 ? 'border-warning/50' : 'border-border',
e.isContest && 'border-l-4 border-l-warning')}>
<div className="flex items-center gap-2 flex-wrap">
<span className="text-lg font-bold font-mono text-primary">{e.callsign}</span>
{isOnAir(e) && chip('var(--danger)', t('wl.onAir'), 'animate-pulse')}
{e.isContest && (
<span className="inline-flex items-center gap-1 px-1.5 py-0.5 rounded text-[10px] font-bold bg-warning-muted text-warning-muted-foreground border border-warning-border"
title={t('wl.contestHint')}>
<Trophy className="size-3" /> {t('wl.contest')}
</span>
)}
{e.isExpedition && chip('var(--chart-5)', t('wl.expedition'))}
{e.clubLogTotalQSOs > 0 && <span className="text-[11px] text-muted-foreground">{e.clubLogTotalQSOs.toLocaleString()} QSOs{e.clubLogQSOs24h > 0 ? ` · ${e.clubLogQSOs24h}/24h` : ''}</span>}
{e.clubLogHasOQRS && chip('var(--success)', 'OQRS')}
{e.clubLogLiveStream && (
<a href="#" onClick={(ev) => { ev.preventDefault(); void OpenExternalURL(`https://clublog.org/livestream/${e.callsign.replace('*', '')}`); }}
className="px-1.5 py-0.5 rounded text-[10px] font-bold border text-info border-info/40 bg-info/10 hover:bg-info/20">Live</a>
)}
{list.length > 0 && (needed > 0
? chip('var(--warning)', e.isContest ? t('wl.nToday', { n: needed }) : t('wl.nNeeded', { n: needed }))
: chip('var(--success)', e.isContest ? t('wl.workedToday') : t('wl.allWorked')))}
{e.lastSeenStr && e.lastSeenStr !== 'Never' && (
<span className="text-[11px] text-muted-foreground">· {e.lastSeenStr}</span>
)}
{e.spotCount > 0 && (
<span className="text-[11px] text-muted-foreground/70">· {t('wl.totalSpots', { n: e.spotCount })}</span>
)}
<div className="flex-1" />
<button type="button" title={t('wl.toggleContest')}
onClick={() => void WatchlistSetContest(e.callsign, !e.isContest).then(refresh)}
className={cn('p-1 rounded hover:bg-muted', e.isContest ? 'text-warning' : 'text-muted-foreground/40')}>
<Trophy className="size-3.5" />
</button>
<button type="button" title={e.notify ? t('wl.notifyOff') : t('wl.notifyOn')}
onClick={() => void WatchlistSetNotify(e.callsign, !e.notify).then(refresh)}
className={cn('p-1 rounded hover:bg-muted', e.notify ? 'text-warning' : 'text-muted-foreground/40')}>
{e.notify ? <Bell className="size-3.5" /> : <BellOff className="size-3.5" />}
</button>
<button type="button" title={t('wl.remove')}
onClick={() => void remove(e.callsign)}
className="p-1 rounded hover:bg-muted text-muted-foreground/40 hover:text-danger">
<Trash2 className="size-3.5" />
</button>
</div>
{list.length > 0 ? (
<div className="mt-2 space-y-1 max-h-52 overflow-y-auto">
{list.slice(0, 12).map((s, i) => {
const done = workedFor(e, s);
const badge = dxccBadge(s);
const mode = inferSpotMode(s.comment ?? '', s.freq_hz);
return (
<button key={i} type="button"
onClick={() => onSpotSelect?.(s)}
onDoubleClick={() => onSpotClick?.(s)}
title={t('wl.spotTip')}
className={cn('w-full flex items-center gap-2 px-2 py-1.5 rounded text-[11px] bg-muted/40 hover:bg-muted text-left',
!done && 'border-l-2 border-warning')}>
{done && <span className='font-bold shrink-0 text-success'></span>}
<span className="font-mono font-bold text-info shrink-0">{s.dx_call}</span>
<span className="text-muted-foreground truncate flex-1 min-w-0 max-w-56">{(s as any).country ?? ''}</span>
<span className="px-1.5 rounded bg-muted shrink-0">{s.band}</span>
{mode && <span className="px-1.5 rounded shrink-0" style={{ color: 'var(--chart-5)', background: 'color-mix(in srgb, var(--chart-5) 12%, transparent)' }}>{mode}</span>}
<span className="font-mono text-muted-foreground shrink-0">{(s.freq_hz / 1e6).toFixed(4)}</span>
{badge && chip(badge.color, badge.label)}
<div className="flex-1" />
{done
? chip('var(--success)', e.isContest ? t('wl.todayOk') : t('wl.worked'))
: chip('var(--warning)', e.isContest ? t('wl.workToday') : t('wl.needed'))}
<span className="text-muted-foreground/70 shrink-0">{s.time_utc ?? ''}</span>
</button>
);
})}
</div>
) : (
<div className="mt-2 text-[11px] text-muted-foreground text-center py-1.5 bg-muted/30 rounded">
{t('wl.noSpots')}
</div>
)}
</div>
);
})}
</div>
</div>
);
}
File diff suppressed because one or more lines are too long
+5 -5
View File
@@ -36,17 +36,17 @@ export function inferSpotMode(comment: string, freqHz: number): string {
type Seg = [number, number, string]; type Seg = [number, number, string];
const segs: Seg[] = [ const segs: Seg[] = [
[1.8, 1.838, 'CW'], [1.838, 1.84, 'FT8'], [1.84, 2.0, 'SSB'], [1.8, 1.838, 'CW'], [1.838, 1.84, 'FT8'], [1.84, 2.0, 'SSB'],
[3.5, 3.58, 'CW'], [3.573, 3.576, 'FT8'], [3.58, 3.6, 'DATA'], [3.6, 4.0, 'SSB'], [3.573, 3.575, 'FT8'], [3.575, 3.578, 'FT4'], [3.5, 3.58, 'CW'], [3.58, 3.6, 'DATA'], [3.6, 4.0, 'SSB'],
[5.3, 5.5, 'SSB'], [5.357, 5.36, 'FT8'], [5.3, 5.5, 'SSB'],
[7.0, 7.04, 'CW'], [7.074, 7.077, 'FT8'], [7.0475, 7.0485, 'FT4'], [7.0, 7.04, 'CW'], [7.074, 7.077, 'FT8'], [7.0475, 7.0485, 'FT4'],
[7.04, 7.1, 'DATA'], [7.1, 7.3, 'SSB'], [7.04, 7.1, 'DATA'], [7.1, 7.3, 'SSB'],
[10.1, 10.13, 'CW'], [10.13, 10.15, 'DATA'], [10.136, 10.139, 'FT8'], [10.14, 10.143, 'FT4'], [10.1, 10.13, 'CW'], [10.13, 10.15, 'DATA'],
[14.0, 14.07, 'CW'], [14.074, 14.077, 'FT8'], [14.08, 14.0815, 'FT4'], [14.0, 14.07, 'CW'], [14.074, 14.077, 'FT8'], [14.08, 14.0815, 'FT4'],
[14.07, 14.1, 'DATA'], [14.1, 14.35, 'SSB'], [14.07, 14.1, 'DATA'], [14.1, 14.35, 'SSB'],
[18.068, 18.095, 'CW'], [18.1, 18.103, 'FT8'], [18.095, 18.11, 'DATA'], [18.11, 18.168, 'SSB'], [18.1, 18.103, 'FT8'], [18.104, 18.107, 'FT4'], [18.068, 18.095, 'CW'], [18.095, 18.11, 'DATA'], [18.11, 18.168, 'SSB'],
[21.0, 21.07, 'CW'], [21.074, 21.077, 'FT8'], [21.14, 21.143, 'FT4'], [21.0, 21.07, 'CW'], [21.074, 21.077, 'FT8'], [21.14, 21.143, 'FT4'],
[21.07, 21.15, 'DATA'], [21.15, 21.45, 'SSB'], [21.07, 21.15, 'DATA'], [21.15, 21.45, 'SSB'],
[24.89, 24.915, 'CW'], [24.915, 24.917, 'FT8'], [24.915, 24.94, 'DATA'], [24.94, 24.99, 'SSB'], [24.915, 24.918, 'FT8'], [24.919, 24.922, 'FT4'], [24.89, 24.915, 'CW'], [24.915, 24.94, 'DATA'], [24.94, 24.99, 'SSB'],
[28.0, 28.07, 'CW'], [28.074, 28.077, 'FT8'], [28.18, 28.183, 'FT4'], [28.0, 28.07, 'CW'], [28.074, 28.077, 'FT8'], [28.18, 28.183, 'FT4'],
[28.07, 28.3, 'DATA'], [28.3, 29.7, 'SSB'], [28.07, 28.3, 'DATA'], [28.3, 29.7, 'SSB'],
[50.0, 50.1, 'CW'], [50.313, 50.316, 'FT8'], [50.318, 50.321, 'FT4'], [50.0, 50.1, 'CW'], [50.313, 50.316, 'FT8'], [50.318, 50.321, 'FT4'],
+29 -3
View File
@@ -11,7 +11,25 @@
// //
// They compose deliberately: mute what is done, light up what is not. // They compose deliberately: mute what is done, light up what is not.
export type SpotDisplayOptions = { muteWorked: boolean; slotHighlight: boolean }; export type SpotDisplayOptions = {
muteWorked: boolean; slotHighlight: boolean;
// Chase switches (Settings → DX Cluster), ON by default. An operator who does
// not chase parks does not want NEW POTA shouting from every activator spot:
// off, the marker is withdrawn at the display layer — a "new band + new POTA"
// spot simply reads NEW BAND — and the reference column goes quiet. The facts
// keep being computed; only the telling stops, so ticking the box back on
// needs no rescan.
chasePota: boolean; chaseSota: boolean;
};
// chasePota/chaseSota read the switches directly — for the places that show a
// REFERENCE rather than a status (the POTA and SOTA columns).
export function chasePota(): boolean {
try { return localStorage.getItem('opslog.chasePota') !== '0'; } catch { return true; }
}
export function chaseSota(): boolean {
try { return localStorage.getItem('opslog.chaseSota') !== '0'; } catch { return true; }
}
// Both options are withdrawn from the filter panel for now. The machinery below // Both options are withdrawn from the filter panel for now. The machinery below
// is deliberately kept whole — it is correct and hard-won — so putting the two // is deliberately kept whole — it is correct and hard-won — so putting the two
@@ -23,14 +41,19 @@ export type SpotDisplayOptions = { muteWorked: boolean; slotHighlight: boolean }
export const SPOT_DISPLAY_OPTIONS_EXPOSED = false; export const SPOT_DISPLAY_OPTIONS_EXPOSED = false;
export function readSpotDisplayOptions(): SpotDisplayOptions { export function readSpotDisplayOptions(): SpotDisplayOptions {
if (!SPOT_DISPLAY_OPTIONS_EXPOSED) return { muteWorked: false, slotHighlight: false }; // The EXPOSED flag only withdraws the two original switches; the chase
// switches are live regardless.
if (!SPOT_DISPLAY_OPTIONS_EXPOSED) {
return { muteWorked: false, slotHighlight: false, chasePota: chasePota(), chaseSota: chaseSota() };
}
try { try {
return { return {
muteWorked: localStorage.getItem('opslog.clusterMuteWorked') === '1', muteWorked: localStorage.getItem('opslog.clusterMuteWorked') === '1',
slotHighlight: localStorage.getItem('opslog.clusterSlotHighlight') === '1', slotHighlight: localStorage.getItem('opslog.clusterSlotHighlight') === '1',
chasePota: chasePota(), chaseSota: chaseSota(),
}; };
} catch { } catch {
return { muteWorked: false, slotHighlight: false }; return { muteWorked: false, slotHighlight: false, chasePota: true, chaseSota: true };
} }
} }
@@ -72,6 +95,9 @@ export function applySpotDisplay<T extends Entry>(s: T, o: SpotDisplayOptions):
if (o.muteWorked) { if (o.muteWorked) {
e = { ...e, worked_call: false } as NonNullable<T>; e = { ...e, worked_call: false } as NonNullable<T>;
} }
if (!o.chasePota && e.new_pota) {
e = { ...e, new_pota: false } as NonNullable<T>;
}
return e; return e;
} }
+2
View File
@@ -42,6 +42,8 @@ const PORTABLE_KEYS = [
'opslog.clusterModeFilter', 'opslog.clusterSearch', 'opslog.clusterHideWorked', 'opslog.clusterModeFilter', 'opslog.clusterSearch', 'opslog.clusterHideWorked',
'opslog.distanceMiles', // distances shown in statute miles rather than km 'opslog.distanceMiles', // distances shown in statute miles rather than km
'opslog.iaruRegion', // IARU region (1/2/3) — band edges and segments on the band maps 'opslog.iaruRegion', // IARU region (1/2/3) — band edges and segments on the band maps
'opslog.chasePota', // show POTA references and the NEW POTA marker on spots
'opslog.chaseSota', // show SOTA references on spots
'opslog.activeTab', // last selected tab 'opslog.activeTab', // last selected tab
'opslog.mainSplit', // Main tab: width share of the left pane (percent) — legacy, read once to seed mainShares 'opslog.mainSplit', // Main tab: width share of the left pane (percent) — legacy, read once to seed mainShares
'opslog.mainShares', // Main tab: column shares per column count, as {2:[..],3:[..],4:[..]} 'opslog.mainShares', // Main tab: column shares per column count, as {2:[..],3:[..],4:[..]}
+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.26.23'; export const APP_VERSION = '0.27.1';
// Author / credits, shown in Help -> About. // Author / credits, shown in Help -> About.
export const APP_AUTHOR = 'F4BPO'; export const APP_AUTHOR = 'F4BPO';
+31
View File
@@ -30,6 +30,7 @@ import {lotwusers} from '../models';
import {lookup} from '../models'; import {lookup} from '../models';
import {netctl} from '../models'; import {netctl} from '../models';
import {scp} from '../models'; import {scp} from '../models';
import {watchlist} from '../models';
export function ACOMSetOperate(arg1:boolean):Promise<void>; export function ACOMSetOperate(arg1:boolean):Promise<void>;
@@ -45,6 +46,8 @@ export function ActivateProfile(arg1:number):Promise<void>;
export function ActiveRadioID():Promise<string>; export function ActiveRadioID():Promise<string>;
export function ActiveRadioMyRig():Promise<string>;
export function AddQSO(arg1:qso.QSO):Promise<number>; export function AddQSO(arg1:qso.QSO):Promise<number>;
export function AmpFanMode(arg1:string,arg2:string):Promise<void>; export function AmpFanMode(arg1:string,arg2:string):Promise<void>;
@@ -403,6 +406,8 @@ export function GetAntGeniusSettings():Promise<main.AntGeniusSettings>;
export function GetAntGeniusStatus():Promise<antgenius.Status>; export function GetAntGeniusStatus():Promise<antgenius.Status>;
export function GetAudioMonitorPref():Promise<boolean>;
export function GetAudioSettings():Promise<main.AudioSettings>; export function GetAudioSettings():Promise<main.AudioSettings>;
export function GetAutostartPrograms():Promise<Array<main.AutostartProgram>>; export function GetAutostartPrograms():Promise<Array<main.AutostartProgram>>;
@@ -601,6 +606,8 @@ export function GetUltrabeamSettings():Promise<main.UltrabeamSettings>;
export function GetUltrabeamStatus():Promise<main.UltrabeamStatusInfo>; export function GetUltrabeamStatus():Promise<main.UltrabeamStatusInfo>;
export function GetWatchlistContestPattern():Promise<string>;
export function GetWebPublishConfig():Promise<webpub.Config>; export function GetWebPublishConfig():Promise<webpub.Config>;
export function GetWebPublishStatus():Promise<main.WebPublishStatus>; export function GetWebPublishStatus():Promise<main.WebPublishStatus>;
@@ -623,6 +630,8 @@ export function HaltDecodeTx(arg1:string,arg2:boolean):Promise<void>;
export function HasBuiltinReferences(arg1:string):Promise<boolean>; export function HasBuiltinReferences(arg1:string):Promise<boolean>;
export function IcomConsolePTT(arg1:boolean):Promise<void>;
export function IcomRefresh():Promise<void>; export function IcomRefresh():Promise<void>;
export function IcomScopeData():Promise<cat.ScopeSweep>; export function IcomScopeData():Promise<cat.ScopeSweep>;
@@ -637,6 +646,8 @@ export function IcomSetANF(arg1:boolean):Promise<void>;
export function IcomSetAPF(arg1:boolean):Promise<void>; export function IcomSetAPF(arg1:boolean):Promise<void>;
export function IcomSetATU(arg1:boolean):Promise<void>;
export function IcomSetAntenna(arg1:number):Promise<void>; export function IcomSetAntenna(arg1:number):Promise<void>;
export function IcomSetAntiVOX(arg1:number):Promise<void>; export function IcomSetAntiVOX(arg1:number):Promise<void>;
@@ -697,6 +708,8 @@ export function IcomSetScopeMode(arg1:boolean):Promise<void>;
export function IcomSetSplit(arg1:boolean):Promise<void>; export function IcomSetSplit(arg1:boolean):Promise<void>;
export function IcomSetSplitOffset(arg1:number):Promise<void>;
export function IcomSetSquelch(arg1:number):Promise<void>; export function IcomSetSquelch(arg1:number):Promise<void>;
export function IcomSetVOX(arg1:boolean):Promise<void>; export function IcomSetVOX(arg1:boolean):Promise<void>;
@@ -1145,6 +1158,8 @@ export function SetKenwoodNB(arg1:boolean):Promise<void>;
export function SetKenwoodNR(arg1:boolean):Promise<void>; export function SetKenwoodNR(arg1:boolean):Promise<void>;
export function SetKenwoodPanelMode(arg1:string):Promise<void>;
export function SetKenwoodPower(arg1:number):Promise<void>; export function SetKenwoodPower(arg1:number):Promise<void>;
export function SetKenwoodPreamp(arg1:boolean):Promise<void>; export function SetKenwoodPreamp(arg1:boolean):Promise<void>;
@@ -1153,6 +1168,8 @@ export function SetKenwoodRFGain(arg1:number):Promise<void>;
export function SetKenwoodRIT(arg1:boolean):Promise<void>; export function SetKenwoodRIT(arg1:boolean):Promise<void>;
export function SetKenwoodRITOffset(arg1:number):Promise<void>;
export function SetKenwoodSquelch(arg1:number):Promise<void>; export function SetKenwoodSquelch(arg1:number):Promise<void>;
export function SetKenwoodTX(arg1:boolean):Promise<void>; export function SetKenwoodTX(arg1:boolean):Promise<void>;
@@ -1223,6 +1240,8 @@ export function SetUIPref(arg1:string,arg2:string):Promise<void>;
export function SetUltrabeamDirection(arg1:number):Promise<void>; export function SetUltrabeamDirection(arg1:number):Promise<void>;
export function SetWatchlistContestPattern(arg1:string):Promise<void>;
export function SetWinkeyerTrace(arg1:boolean):Promise<void>; export function SetWinkeyerTrace(arg1:boolean):Promise<void>;
export function SetWorkedCallVariants(arg1:boolean):Promise<void>; export function SetWorkedCallVariants(arg1:boolean):Promise<void>;
@@ -1353,6 +1372,18 @@ export function UploadCallsign(arg1:string):Promise<string>;
export function UploadQSOsManual(arg1:string,arg2:Array<number>):Promise<void>; export function UploadQSOsManual(arg1:string,arg2:Array<number>):Promise<void>;
export function WatchlistAdd(arg1:string,arg2:boolean):Promise<void>;
export function WatchlistEntries():Promise<Array<watchlist.Entry>>;
export function WatchlistRemove(arg1:string):Promise<void>;
export function WatchlistSetContest(arg1:string,arg2:boolean):Promise<void>;
export function WatchlistSetNotify(arg1:string,arg2:boolean):Promise<void>;
export function WatchlistWorkedSlots(arg1:Array<main.WatchlistSlotQuery>):Promise<Array<boolean>>;
export function WebPublishColumns():Promise<Array<Record<string, string>>>; export function WebPublishColumns():Promise<Array<Record<string, string>>>;
export function WinkeyerBackspace():Promise<void>; export function WinkeyerBackspace():Promise<void>;
+60
View File
@@ -30,6 +30,10 @@ export function ActiveRadioID() {
return window['go']['main']['App']['ActiveRadioID'](); return window['go']['main']['App']['ActiveRadioID']();
} }
export function ActiveRadioMyRig() {
return window['go']['main']['App']['ActiveRadioMyRig']();
}
export function AddQSO(arg1) { export function AddQSO(arg1) {
return window['go']['main']['App']['AddQSO'](arg1); return window['go']['main']['App']['AddQSO'](arg1);
} }
@@ -746,6 +750,10 @@ export function GetAntGeniusStatus() {
return window['go']['main']['App']['GetAntGeniusStatus'](); return window['go']['main']['App']['GetAntGeniusStatus']();
} }
export function GetAudioMonitorPref() {
return window['go']['main']['App']['GetAudioMonitorPref']();
}
export function GetAudioSettings() { export function GetAudioSettings() {
return window['go']['main']['App']['GetAudioSettings'](); return window['go']['main']['App']['GetAudioSettings']();
} }
@@ -1142,6 +1150,10 @@ export function GetUltrabeamStatus() {
return window['go']['main']['App']['GetUltrabeamStatus'](); return window['go']['main']['App']['GetUltrabeamStatus']();
} }
export function GetWatchlistContestPattern() {
return window['go']['main']['App']['GetWatchlistContestPattern']();
}
export function GetWebPublishConfig() { export function GetWebPublishConfig() {
return window['go']['main']['App']['GetWebPublishConfig'](); return window['go']['main']['App']['GetWebPublishConfig']();
} }
@@ -1186,6 +1198,10 @@ export function HasBuiltinReferences(arg1) {
return window['go']['main']['App']['HasBuiltinReferences'](arg1); return window['go']['main']['App']['HasBuiltinReferences'](arg1);
} }
export function IcomConsolePTT(arg1) {
return window['go']['main']['App']['IcomConsolePTT'](arg1);
}
export function IcomRefresh() { export function IcomRefresh() {
return window['go']['main']['App']['IcomRefresh'](); return window['go']['main']['App']['IcomRefresh']();
} }
@@ -1214,6 +1230,10 @@ export function IcomSetAPF(arg1) {
return window['go']['main']['App']['IcomSetAPF'](arg1); return window['go']['main']['App']['IcomSetAPF'](arg1);
} }
export function IcomSetATU(arg1) {
return window['go']['main']['App']['IcomSetATU'](arg1);
}
export function IcomSetAntenna(arg1) { export function IcomSetAntenna(arg1) {
return window['go']['main']['App']['IcomSetAntenna'](arg1); return window['go']['main']['App']['IcomSetAntenna'](arg1);
} }
@@ -1334,6 +1354,10 @@ export function IcomSetSplit(arg1) {
return window['go']['main']['App']['IcomSetSplit'](arg1); return window['go']['main']['App']['IcomSetSplit'](arg1);
} }
export function IcomSetSplitOffset(arg1) {
return window['go']['main']['App']['IcomSetSplitOffset'](arg1);
}
export function IcomSetSquelch(arg1) { export function IcomSetSquelch(arg1) {
return window['go']['main']['App']['IcomSetSquelch'](arg1); return window['go']['main']['App']['IcomSetSquelch'](arg1);
} }
@@ -2230,6 +2254,10 @@ export function SetKenwoodNR(arg1) {
return window['go']['main']['App']['SetKenwoodNR'](arg1); return window['go']['main']['App']['SetKenwoodNR'](arg1);
} }
export function SetKenwoodPanelMode(arg1) {
return window['go']['main']['App']['SetKenwoodPanelMode'](arg1);
}
export function SetKenwoodPower(arg1) { export function SetKenwoodPower(arg1) {
return window['go']['main']['App']['SetKenwoodPower'](arg1); return window['go']['main']['App']['SetKenwoodPower'](arg1);
} }
@@ -2246,6 +2274,10 @@ export function SetKenwoodRIT(arg1) {
return window['go']['main']['App']['SetKenwoodRIT'](arg1); return window['go']['main']['App']['SetKenwoodRIT'](arg1);
} }
export function SetKenwoodRITOffset(arg1) {
return window['go']['main']['App']['SetKenwoodRITOffset'](arg1);
}
export function SetKenwoodSquelch(arg1) { export function SetKenwoodSquelch(arg1) {
return window['go']['main']['App']['SetKenwoodSquelch'](arg1); return window['go']['main']['App']['SetKenwoodSquelch'](arg1);
} }
@@ -2386,6 +2418,10 @@ export function SetUltrabeamDirection(arg1) {
return window['go']['main']['App']['SetUltrabeamDirection'](arg1); return window['go']['main']['App']['SetUltrabeamDirection'](arg1);
} }
export function SetWatchlistContestPattern(arg1) {
return window['go']['main']['App']['SetWatchlistContestPattern'](arg1);
}
export function SetWinkeyerTrace(arg1) { export function SetWinkeyerTrace(arg1) {
return window['go']['main']['App']['SetWinkeyerTrace'](arg1); return window['go']['main']['App']['SetWinkeyerTrace'](arg1);
} }
@@ -2646,6 +2682,30 @@ export function UploadQSOsManual(arg1, arg2) {
return window['go']['main']['App']['UploadQSOsManual'](arg1, arg2); return window['go']['main']['App']['UploadQSOsManual'](arg1, arg2);
} }
export function WatchlistAdd(arg1, arg2) {
return window['go']['main']['App']['WatchlistAdd'](arg1, arg2);
}
export function WatchlistEntries() {
return window['go']['main']['App']['WatchlistEntries']();
}
export function WatchlistRemove(arg1) {
return window['go']['main']['App']['WatchlistRemove'](arg1);
}
export function WatchlistSetContest(arg1, arg2) {
return window['go']['main']['App']['WatchlistSetContest'](arg1, arg2);
}
export function WatchlistSetNotify(arg1, arg2) {
return window['go']['main']['App']['WatchlistSetNotify'](arg1, arg2);
}
export function WatchlistWorkedSlots(arg1) {
return window['go']['main']['App']['WatchlistWorkedSlots'](arg1);
}
export function WebPublishColumns() { export function WebPublishColumns() {
return window['go']['main']['App']['WebPublishColumns'](); return window['go']['main']['App']['WebPublishColumns']();
} }
+86
View File
@@ -983,6 +983,7 @@ export namespace cat {
mode?: string; mode?: string;
transmitting: boolean; transmitting: boolean;
split: boolean; split: boolean;
sub_hz: number;
s_meter: number; s_meter: number;
power_meter: number; power_meter: number;
swr_meter: number; swr_meter: number;
@@ -1006,6 +1007,7 @@ export namespace cat {
att: number; att: number;
filter: number; filter: number;
antenna: number; antenna: number;
atu_on: boolean;
pbt_inner: number; pbt_inner: number;
pbt_outer: number; pbt_outer: number;
manual_notch: boolean; manual_notch: boolean;
@@ -1030,6 +1032,7 @@ export namespace cat {
this.mode = source["mode"]; this.mode = source["mode"];
this.transmitting = source["transmitting"]; this.transmitting = source["transmitting"];
this.split = source["split"]; this.split = source["split"];
this.sub_hz = source["sub_hz"];
this.s_meter = source["s_meter"]; this.s_meter = source["s_meter"];
this.power_meter = source["power_meter"]; this.power_meter = source["power_meter"];
this.swr_meter = source["swr_meter"]; this.swr_meter = source["swr_meter"];
@@ -1053,6 +1056,7 @@ export namespace cat {
this.att = source["att"]; this.att = source["att"];
this.filter = source["filter"]; this.filter = source["filter"];
this.antenna = source["antenna"]; this.antenna = source["antenna"];
this.atu_on = source["atu_on"];
this.pbt_inner = source["pbt_inner"]; this.pbt_inner = source["pbt_inner"];
this.pbt_outer = source["pbt_outer"]; this.pbt_outer = source["pbt_outer"];
this.manual_notch = source["manual_notch"]; this.manual_notch = source["manual_notch"];
@@ -1072,6 +1076,7 @@ export namespace cat {
model?: string; model?: string;
elecraft: boolean; elecraft: boolean;
mode?: string; mode?: string;
data_sub?: string;
transmitting: boolean; transmitting: boolean;
split: boolean; split: boolean;
split_tx_hz: number; split_tx_hz: number;
@@ -1108,6 +1113,7 @@ export namespace cat {
this.model = source["model"]; this.model = source["model"];
this.elecraft = source["elecraft"]; this.elecraft = source["elecraft"];
this.mode = source["mode"]; this.mode = source["mode"];
this.data_sub = source["data_sub"];
this.transmitting = source["transmitting"]; this.transmitting = source["transmitting"];
this.split = source["split"]; this.split = source["split"];
this.split_tx_hz = source["split_tx_hz"]; this.split_tx_hz = source["split_tx_hz"];
@@ -4299,6 +4305,24 @@ export namespace main {
this.text = source["text"]; this.text = source["text"];
} }
} }
export class WatchlistSlotQuery {
call: string;
band: string;
mode: string;
contest: boolean;
static createFrom(source: any = {}) {
return new WatchlistSlotQuery(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.call = source["call"];
this.band = source["band"];
this.mode = source["mode"];
this.contest = source["contest"];
}
}
export class WebPublishStatus { export class WebPublishStatus {
last_run: string; last_run: string;
last_err: string; last_err: string;
@@ -5988,6 +6012,68 @@ export namespace udp {
} }
export namespace watchlist {
export class Entry {
callsign: string;
// Go type: time
lastSeen: any;
lastSeenStr: string;
// Go type: time
addedAt: any;
spotCount: number;
isContest: boolean;
notify: boolean;
isExpedition: boolean;
clubLogQSOs24h: number;
clubLogTotalQSOs: number;
clubLogHasOQRS: boolean;
clubLogLiveStream: boolean;
// Go type: time
clubLogUpdatedAt?: any;
static createFrom(source: any = {}) {
return new Entry(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.callsign = source["callsign"];
this.lastSeen = this.convertValues(source["lastSeen"], null);
this.lastSeenStr = source["lastSeenStr"];
this.addedAt = this.convertValues(source["addedAt"], null);
this.spotCount = source["spotCount"];
this.isContest = source["isContest"];
this.notify = source["notify"];
this.isExpedition = source["isExpedition"];
this.clubLogQSOs24h = source["clubLogQSOs24h"];
this.clubLogTotalQSOs = source["clubLogTotalQSOs"];
this.clubLogHasOQRS = source["clubLogHasOQRS"];
this.clubLogLiveStream = source["clubLogLiveStream"];
this.clubLogUpdatedAt = this.convertValues(source["clubLogUpdatedAt"], null);
}
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 webpub { export namespace webpub {
export class Config { export class Config {
+8 -4
View File
@@ -27,27 +27,31 @@ type modeSeg struct {
var bandPlan = []modeSeg{ var bandPlan = []modeSeg{
{1_800_000, 1_838_000, "CW"}, {1_838_000, 1_840_000, "FT8"}, {1_840_000, 2_000_000, "SSB"}, {1_800_000, 1_838_000, "CW"}, {1_838_000, 1_840_000, "FT8"}, {1_840_000, 2_000_000, "SSB"},
{3_573_000, 3_576_000, "FT8"}, {3_500_000, 3_580_000, "CW"}, {3_573_000, 3_575_000, "FT8"}, {3_575_000, 3_578_000, "FT4"}, {3_500_000, 3_580_000, "CW"},
{3_580_000, 3_600_000, "DATA"}, {3_600_000, 4_000_000, "SSB"}, {3_580_000, 3_600_000, "DATA"}, {3_600_000, 4_000_000, "SSB"},
{5_300_000, 5_500_000, "SSB"}, {5_357_000, 5_360_000, "FT8"}, {5_300_000, 5_500_000, "SSB"},
{7_074_000, 7_077_000, "FT8"}, {7_047_500, 7_048_500, "FT4"}, {7_074_000, 7_077_000, "FT8"}, {7_047_500, 7_048_500, "FT4"},
{7_000_000, 7_040_000, "CW"}, {7_040_000, 7_100_000, "DATA"}, {7_100_000, 7_300_000, "SSB"}, {7_000_000, 7_040_000, "CW"}, {7_040_000, 7_100_000, "DATA"}, {7_100_000, 7_300_000, "SSB"},
// 30 m: CW to 10.130, data above it — and nothing else. No SSB on this band. // 30 m: CW to 10.130, data above it — and nothing else. No SSB on this band.
// The FT8/FT4 watering holes come first, or a 10.136 spot with a bare
// comment reads as generic DATA — which is what every skimmerless spot of a
// DXpedition's 30 m FT8 slot did.
{10_136_000, 10_139_000, "FT8"}, {10_140_000, 10_143_000, "FT4"},
{10_100_000, 10_130_000, "CW"}, {10_130_000, 10_150_000, "DATA"}, {10_100_000, 10_130_000, "CW"}, {10_130_000, 10_150_000, "DATA"},
{14_074_000, 14_077_000, "FT8"}, {14_080_000, 14_081_500, "FT4"}, {14_074_000, 14_077_000, "FT8"}, {14_080_000, 14_081_500, "FT4"},
{14_000_000, 14_070_000, "CW"}, {14_070_000, 14_100_000, "DATA"}, {14_100_000, 14_350_000, "SSB"}, {14_000_000, 14_070_000, "CW"}, {14_070_000, 14_100_000, "DATA"}, {14_100_000, 14_350_000, "SSB"},
{18_100_000, 18_103_000, "FT8"}, {18_100_000, 18_103_000, "FT8"}, {18_104_000, 18_107_000, "FT4"},
{18_068_000, 18_095_000, "CW"}, {18_095_000, 18_110_000, "DATA"}, {18_110_000, 18_168_000, "SSB"}, {18_068_000, 18_095_000, "CW"}, {18_095_000, 18_110_000, "DATA"}, {18_110_000, 18_168_000, "SSB"},
{21_074_000, 21_077_000, "FT8"}, {21_140_000, 21_143_000, "FT4"}, {21_074_000, 21_077_000, "FT8"}, {21_140_000, 21_143_000, "FT4"},
{21_000_000, 21_070_000, "CW"}, {21_070_000, 21_150_000, "DATA"}, {21_150_000, 21_450_000, "SSB"}, {21_000_000, 21_070_000, "CW"}, {21_070_000, 21_150_000, "DATA"}, {21_150_000, 21_450_000, "SSB"},
{24_915_000, 24_917_000, "FT8"}, {24_915_000, 24_918_000, "FT8"}, {24_919_000, 24_922_000, "FT4"},
{24_890_000, 24_915_000, "CW"}, {24_915_000, 24_940_000, "DATA"}, {24_940_000, 24_990_000, "SSB"}, {24_890_000, 24_915_000, "CW"}, {24_915_000, 24_940_000, "DATA"}, {24_940_000, 24_990_000, "SSB"},
{28_074_000, 28_077_000, "FT8"}, {28_180_000, 28_183_000, "FT4"}, {28_074_000, 28_077_000, "FT8"}, {28_180_000, 28_183_000, "FT4"},
+23
View File
@@ -356,6 +356,29 @@ func (m *Manager) StartTXAudio(micDev, toRadioDev string) error {
return nil return nil
} }
// StartTXAudioNetwork pipes the live microphone into a SEND function instead
// of a render device — the talk button when the radio is reached over its own
// link. No ring and no pacing goroutine: the microphone delivers in real time,
// and the sender re-frames to the rig's cadence, so the capture callback IS
// the clock.
func (m *Manager) StartTXAudioNetwork(micDev string, send func([]byte) error) error {
m.mu.Lock()
if m.txStop != nil {
m.mu.Unlock()
return fmt.Errorf("TX audio already running")
}
stop := make(chan struct{})
m.txStop = stop
m.mu.Unlock()
go func() {
if err := captureStream(micDev, stop, func(chunk []byte) { _ = send(chunk) }); err != nil {
LogSink("audio: network TX capture from %q failed: %v", DeviceName(micDev), err)
}
}()
m.notify()
return nil
}
// StopTXAudio stops the TX mic→rig passthrough. // StopTXAudio stops the TX mic→rig passthrough.
func (m *Manager) StopTXAudio() { func (m *Manager) StopTXAudio() {
m.mu.Lock() m.mu.Lock()
+1 -1
View File
@@ -64,4 +64,4 @@ func NetworkPlayerReady() bool { return networkPlayer() != nil }
// comes back with. Named, because "the device could not be opened" would send // comes back with. Named, because "the device could not be opened" would send
// an operator hunting through Windows sound settings for a device that never // an operator hunting through Windows sound settings for a device that never
// existed. // existed.
var errNoNetworkRadio = errors.New("no radio is connected to take the audio — check the CAT link (the radio output only works with a TCI radio)") var errNoNetworkRadio = errors.New("no radio is connected to take the audio — check the CAT link (a TCI radio, or a network Icom with RX audio enabled)")
+11 -4
View File
@@ -572,9 +572,13 @@ type IcomTXState struct {
// Transmit + live status (polled). // Transmit + live status (polled).
Transmitting bool `json:"transmitting"` Transmitting bool `json:"transmitting"`
Split bool `json:"split"` Split bool `json:"split"`
SMeter int `json:"s_meter"` // 0-100 (raw 0-255; S9≈120) // SubHz is the unselected VFO / sub receiver's frequency — shown on the
PowerMeter int `json:"power_meter"` // 0-100 (TX Po) // console's SUB display whether or not split is on: a dual-receiver rig
SWRMeter int `json:"swr_meter"` // 0-100 (TX SWR) // (IC-7610/7760) has a second dial worth seeing at all times.
SubHz int64 `json:"sub_hz"`
SMeter int `json:"s_meter"` // 0-100 (raw 0-255; S9≈120)
PowerMeter int `json:"power_meter"` // 0-100 (TX Po)
SWRMeter int `json:"swr_meter"` // 0-100 (TX SWR)
// RIT / ΔTX (XIT). // RIT / ΔTX (XIT).
RITHz int `json:"rit_hz"` // RIT/XIT offset, signed Hz RITHz int `json:"rit_hz"` // RIT/XIT offset, signed Hz
RITOn bool `json:"rit_on"` RITOn bool `json:"rit_on"`
@@ -598,7 +602,8 @@ type IcomTXState struct {
Att int `json:"att"` // dB attenuation, 0=off Att int `json:"att"` // dB attenuation, 0=off
Filter int `json:"filter"` // 1 | 2 | 3 (FIL1/2/3) Filter int `json:"filter"` // 1 | 2 | 3 (FIL1/2/3)
// Antenna (IC-7610 = ANT1/ANT2). // Antenna (IC-7610 = ANT1/ANT2).
Antenna int `json:"antenna"` // 1 | 2 (0 = unknown) Antenna int `json:"antenna"` // 1 | 2 (0 = unknown)
ATUOn bool `json:"atu_on"` // internal tuner engaged
// Filter fine controls: Twin PBT + manual notch (0-100, 50 = centre). // Filter fine controls: Twin PBT + manual notch (0-100, 50 = centre).
PBTInner int `json:"pbt_inner"` PBTInner int `json:"pbt_inner"`
PBTOuter int `json:"pbt_outer"` PBTOuter int `json:"pbt_outer"`
@@ -636,6 +641,8 @@ type IcomController interface {
SetRFPower(int) error SetRFPower(int) error
SetMicGain(int) error SetMicGain(int) error
SetIcomSplit(bool) error SetIcomSplit(bool) error
SetIcomSplitOffset(bool, int64) error
SetATU(bool) error
TuneATU() error TuneATU() error
SetScope(bool) error // enable/disable the spectrum-scope waveform stream SetScope(bool) error // enable/disable the spectrum-scope waveform stream
SetScopeMode(bool) error // true = fixed span, false = center-on-VFO SetScopeMode(bool) error // true = fixed span, false = center-on-VFO
+7
View File
@@ -36,6 +36,7 @@ const (
CmdVfoFreq = 0x25 // read a specific VFO's freq (sub 0x00 selected, 0x01 unselected) CmdVfoFreq = 0x25 // read a specific VFO's freq (sub 0x00 selected, 0x01 unselected)
CmdPTT = 0x1C // sub 0x00 = PTT CmdPTT = 0x1C // sub 0x00 = PTT
CmdExtra = 0x1A // sub 0x06 = data mode on modern Icoms CmdExtra = 0x1A // sub 0x06 = data mode on modern Icoms
CmdModeDataFil = 0x26 // sub 0x00 = selected VFO: mode + data flag + filter in one frame
CmdReadID = 0x19 // sub 0x00 = rig's own CI-V address (identifies model) CmdReadID = 0x19 // sub 0x00 = rig's own CI-V address (identifies model)
CmdPower = 0x18 // power on/off (sub 0x01 = on, 0x00 = off; on needs an FE wake preamble) CmdPower = 0x18 // power on/off (sub 0x01 = on, 0x00 = off; on needs an FE wake preamble)
@@ -130,6 +131,8 @@ const (
ModeFM = 0x05 ModeFM = 0x05
ModeCWR = 0x07 ModeCWR = 0x07
ModeRTTYR = 0x08 ModeRTTYR = 0x08
ModePSK = 0x12 // native PSK (IC-7610/7760/7851 class; older rigs NAK it)
ModePSKR = 0x13
) )
// Frame builds a complete CI-V frame (preamble … end) for payload, which is the // Frame builds a complete CI-V frame (preamble … end) for payload, which is the
@@ -305,6 +308,8 @@ func ModeToADIF(m byte, data bool) string {
return "CW" return "CW"
case ModeRTTY, ModeRTTYR: case ModeRTTY, ModeRTTYR:
return "RTTY" return "RTTY"
case ModePSK, ModePSKR:
return "PSK31"
case ModeAM: case ModeAM:
return "AM" return "AM"
case ModeFM: case ModeFM:
@@ -357,6 +362,8 @@ func ModelName(addr byte) string {
return "IC-9700" return "IC-9700"
case 0xA4: case 0xA4:
return "IC-705" return "IC-705"
case 0xB2:
return "IC-7760"
case 0xB6: case 0xB6:
return "IC-7300MKII" return "IC-7300MKII"
} }
+132 -11
View File
@@ -22,17 +22,20 @@ package cat
// audio stream is opt-in and entirely separate from control/CI-V. // audio stream is opt-in and entirely separate from control/CI-V.
import ( import (
"fmt"
"net" "net"
"sync" "sync"
"sync/atomic" "sync/atomic"
"time" "time"
) )
// icaAudioOffset is where the PCM payload begins inside an audio data packet // icaAudioOffset is where the PCM payload begins inside an audio data packet.
// (wfview audio_packet: 16-byte common header + ident@0x10 + datalen@0x12 + // CONFIRMED on a real IC-7760 (2026-08-29): 16-byte common header, ident@0x10,
// sendseq@0x14 → audio@0x16). Isolated as a const so a capture-confirmed change // send seq (BE) @0x12, payload length (BE uint32) @0x14 — 0x500 observed on
// is a one-line edit. // every packet — and the PCM starts at 0x18. The 0x16 first guessed from
const icaAudioOffset = 0x16 // wfview's struct swallowed two header bytes into the audio, one broken sample
// per packet: a 50 Hz click track under everything.
const icaAudioOffset = 0x18
// icaDumpFirst is how many initial audio packets to hex-dump to the debug log for // icaDumpFirst is how many initial audio packets to hex-dump to the debug log for
// offset verification. After the layout is confirmed on a real rig this can go to // offset verification. After the layout is confirmed on a real rig this can go to
@@ -54,8 +57,16 @@ type icomAudio struct {
rxLastSeq uint16 rxLastSeq uint16
rxMissing map[uint16]int rxMissing map[uint16]int
dumped int // packets hex-dumped so far (≤ icaDumpFirst) dumped int // packets hex-dumped so far (≤ icaDumpFirst)
lastRx atomic.Int64 // UnixNano of last packet (liveness) pingSeq uint16 // client-ping counter — the rig wants OUR pings too (see icnPing)
started time.Time
// Live-TX state — see SendTXChunk.
txMu sync.Mutex
txRem []byte
txOuter uint16
txSend uint16
lastRx atomic.Int64 // UnixNano of last packet (liveness)
done chan struct{} done chan struct{}
closeOnce sync.Once closeOnce sync.Once
@@ -100,6 +111,7 @@ func dialIcomAudio(host string, sink func([]byte), cancel <-chan struct{}) (*ico
_ = conn.SetReadBuffer(1 << 20) _ = conn.SetReadBuffer(1 << 20)
a := &icomAudio{ a := &icomAudio{
conn: conn, aID: aID, aRemote: aRemote, conn: conn, aID: aID, aRemote: aRemote,
started: time.Now(),
sink: sink, sink: sink,
rxMissing: make(map[uint16]int), rxMissing: make(map[uint16]int),
done: make(chan struct{}), done: make(chan struct{}),
@@ -115,6 +127,7 @@ func dialIcomAudio(host string, sink func([]byte), cancel <-chan struct{}) (*ico
func (a *icomAudio) audioPump() { func (a *icomAudio) audioPump() {
buf := make([]byte, 8192) buf := make([]byte, 8192)
lastIdle := time.Now() lastIdle := time.Now()
lastPing := time.Now()
lastReq := time.Now() lastReq := time.Now()
for { for {
select { select {
@@ -132,12 +145,19 @@ func (a *icomAudio) audioPump() {
case typ == 0x05: // rig-initiated disconnect case typ == 0x05: // rig-initiated disconnect
debugLog.Printf("icom audio: rig sent DISCONNECT — audio stream dropped by the rig") debugLog.Printf("icom audio: rig sent DISCONNECT — audio stream dropped by the rig")
case typ == 0x00 && k > icaAudioOffset: // audio data packet case typ == 0x00 && k > icaAudioOffset: // audio data packet
a.trackRxSeq(icnLE.Uint16(buf[6:])) fresh := a.trackRxSeq(icnLE.Uint16(buf[6:]))
if a.dumped < icaDumpFirst { if a.dumped < icaDumpFirst {
a.dumped++ a.dumped++
debugLog.Printf("icom audio raw #%d: len=%d head=% X", a.dumped, k, buf[:min(icaAudioOffset+8, k)]) debugLog.Printf("icom audio raw #%d: len=%d head=% X", a.dumped, k, buf[:min(icaAudioOffset+8, k)])
} }
if a.sink != nil { // Only a packet that ADVANCES the sequence reaches the sink. A
// duplicate or a late retransmit used to be delivered as if it
// were the next 20 ms of audio: the monitor's capped ring threw
// the surplus away (the speakers stayed clean), but the recorder
// keeps every sample it is given — the file grew longer than the
// QSO and played back slowed and stuttering, each lost-then-
// resent packet heard twice.
if fresh && a.sink != nil {
payload := append([]byte(nil), buf[icaAudioOffset:k]...) payload := append([]byte(nil), buf[icaAudioOffset:k]...)
a.sink(payload) a.sink(payload)
} }
@@ -147,6 +167,11 @@ func (a *icomAudio) audioPump() {
_, _ = a.conn.Write(icnCtrl(0x00, 0, a.aID, a.aRemote)) _, _ = a.conn.Write(icnCtrl(0x00, 0, a.aID, a.aRemote))
lastIdle = time.Now() lastIdle = time.Now()
} }
if time.Since(lastPing) > 500*time.Millisecond {
a.pingSeq++
_, _ = a.conn.Write(icnPing(a.pingSeq, a.aID, a.aRemote, uint32(time.Since(a.started).Milliseconds())))
lastPing = time.Now()
}
if time.Since(lastReq) > 100*time.Millisecond { if time.Since(lastReq) > 100*time.Millisecond {
a.sendRetransmitReq() a.sendRetransmitReq()
lastReq = time.Now() lastReq = time.Now()
@@ -157,26 +182,36 @@ func (a *icomAudio) audioPump() {
// trackRxSeq / sendRetransmitReq mirror icomNet's receive-side retransmit exactly // trackRxSeq / sendRetransmitReq mirror icomNet's receive-side retransmit exactly
// (audio is as loss-sensitive as the scope stream). Duplicated deliberately so // (audio is as loss-sensitive as the scope stream). Duplicated deliberately so
// the audio stream owns its own seq state with no shared locking. // the audio stream owns its own seq state with no shared locking.
func (a *icomAudio) trackRxSeq(seq uint16) { //
// The return value says whether this packet moves the stream FORWARD — the
// only kind the sink may hear. A duplicate is the same 20 ms again; a late
// retransmit would play old audio in the middle of new. Both are accounted
// for here and dropped by the caller.
func (a *icomAudio) trackRxSeq(seq uint16) bool {
if !a.rxHaveSeq { if !a.rxHaveSeq {
a.rxHaveSeq = true a.rxHaveSeq = true
a.rxLastSeq = seq a.rxLastSeq = seq
return return true
} }
switch d := int16(seq - a.rxLastSeq); { switch d := int16(seq - a.rxLastSeq); {
case d == 0: case d == 0:
return false
case d < 0: case d < 0:
delete(a.rxMissing, seq) delete(a.rxMissing, seq)
return false
case d == 1: case d == 1:
a.rxLastSeq = seq a.rxLastSeq = seq
return true
case int(d) <= icnMaxMissing: case int(d) <= icnMaxMissing:
for f := a.rxLastSeq + 1; f != seq; f++ { for f := a.rxLastSeq + 1; f != seq; f++ {
a.rxMissing[f] = 0 a.rxMissing[f] = 0
} }
a.rxLastSeq = seq a.rxLastSeq = seq
return true
default: default:
a.rxMissing = make(map[uint16]int) a.rxMissing = make(map[uint16]int)
a.rxLastSeq = seq a.rxLastSeq = seq
return true
} }
} }
@@ -217,3 +252,89 @@ func (a *icomAudio) sendRetransmitReq() {
_, _ = a.conn.Write(b) _, _ = a.conn.Write(b)
} }
} }
// PlayTX sends one already-decoded message out over the audio session, paced
// at the stream's own 20 ms / 320-sample cadence, and returns when the last
// packet has gone or stop is closed.
//
// The frame mirrors what the rig itself sends on this socket byte for byte —
// ident 0x81 0x01 (LPCM mono 16-bit), a big-endian send sequence at 0x12, the
// payload length at 0x14, PCM from 0x18 — with the IDs swapped for direction.
// PTT is the caller's business, exactly as on the TCI and sound-card paths.
func (a *icomAudio) PlayTX(pcm []byte, rate, ch, bits int, stop <-chan struct{}) error {
mono := decodeToMono(pcm, ch, bits)
if len(mono) == 0 {
return fmt.Errorf("the message is empty")
}
if rate > 0 && rate != 16000 {
mono = resampleLinear(mono, rate, 16000)
}
// Through the SAME framer and counters as the live microphone. Each of the
// two used to number its own packets from 1, and a voice-keyer message sent
// after a talk session re-used sequence numbers the rig had already seen —
// it keyed for the full length of the message and modulated none of it.
const frame = 320 // samples per packet: 20 ms at 16 kHz, the rig's own cadence
tick := time.NewTicker(20 * time.Millisecond)
defer tick.Stop()
buf := make([]byte, frame*2)
for pos := 0; pos < len(mono); pos += frame {
select {
case <-stop:
return nil
case <-a.done:
return fmt.Errorf("the audio stream closed mid-message")
case <-tick.C:
}
for i := 0; i < frame; i++ {
var v float32
if pos+i < len(mono) {
v = mono[pos+i] * 32767
}
if v > 32767 {
v = 32767
} else if v < -32768 {
v = -32768
}
icnLE.PutUint16(buf[i*2:], uint16(int16(v)))
}
if err := a.SendTXChunk(buf); err != nil {
return err
}
}
return nil
}
// Live TX — the microphone, not a recorded message. Chunks arrive at the
// microphone's own real-time pace (16 kHz mono 16-bit, whatever length the
// capture delivers) and are re-framed into the rig's 320-sample packets; the
// remainder waits for the next chunk. Counters and remainder live on the
// stream so a talk session survives across calls.
func (a *icomAudio) SendTXChunk(pcm []byte) error {
a.txMu.Lock()
defer a.txMu.Unlock()
a.txRem = append(a.txRem, pcm...)
const frameBytes = 640
for len(a.txRem) >= frameBytes {
select {
case <-a.done:
return fmt.Errorf("the audio stream closed")
default:
}
pkt := make([]byte, 0x18+frameBytes)
icnLE.PutUint32(pkt[0:], uint32(len(pkt)))
a.txOuter++
icnLE.PutUint16(pkt[6:], a.txOuter)
icnLE.PutUint32(pkt[8:], a.aID)
icnLE.PutUint32(pkt[12:], a.aRemote)
pkt[0x10], pkt[0x11] = 0x81, 0x01
icnBE.PutUint16(pkt[0x12:], a.txSend)
a.txSend++
icnBE.PutUint32(pkt[0x14:], frameBytes)
copy(pkt[0x18:], a.txRem[:frameBytes])
a.txRem = a.txRem[frameBytes:]
if _, err := a.conn.Write(pkt); err != nil {
return fmt.Errorf("sending mic audio to the rig: %w", err)
}
}
return nil
}
+212 -9
View File
@@ -56,6 +56,15 @@ func NewIcomNet(host, user, pass string, civAddr int, digitalDefault string, aud
model: "Icom", model: "Icom",
scopeFixed: true, scopeFixed: true,
} }
// lastNetConnect is when the previous session came up, and it drives a
// deliberate pause: on a real IC-7760 a session sometimes goes deaf on CI-V
// while the rig still holds it half-open, and a session dialled straight
// back in answers for a second and is then strangled when the rig finally
// purges the old one — reconnect, die, reconnect, die, twenty seconds a
// lap and no audio the whole time. When the last session died YOUNG, wait
// out the rig's cleanup before dialling again; a session that lived long
// reconnects immediately, as ever.
var lastNetConnect time.Time
b.open = func() (civTransport, error) { b.open = func() (civTransport, error) {
if strings.TrimSpace(host) == "" { if strings.TrimSpace(host) == "" {
return nil, fmt.Errorf("no rig host configured") return nil, fmt.Errorf("no rig host configured")
@@ -63,7 +72,20 @@ func NewIcomNet(host, user, pass string, civAddr int, digitalDefault string, aud
b.dialMu.Lock() b.dialMu.Lock()
cancel := b.dialCancel cancel := b.dialCancel
b.dialMu.Unlock() b.dialMu.Unlock()
return dialIcomNet(host, user, pass, "OpsLog", b.rigAddr, cancel, audioSink) if !lastNetConnect.IsZero() && time.Since(lastNetConnect) < 90*time.Second {
debugLog.Printf("icom net: the last session died young — pausing 20 s before redialling so the rig can purge it first")
for i := 0; i < 40; i++ {
if icnCanceled(cancel) {
return nil, errDialCanceled
}
time.Sleep(500 * time.Millisecond)
}
}
tr, err := dialIcomNet(host, user, pass, "OpsLog", b.rigAddr, cancel, audioSink)
if err == nil {
lastNetConnect = time.Now()
}
return tr, err
} }
return b return b
} }
@@ -97,6 +119,19 @@ type icomNet struct {
// CAT goroutine) and during dial — never by the pump — so no lock is needed. // CAT goroutine) and during dial — never by the pump — so no lock is needed.
vTracked uint16 vTracked uint16
vCivSeq uint16 vCivSeq uint16
seqMu sync.Mutex // guards vTracked/vCivSeq: the command loop AND the pump's quiet-recovery both send
// Client-ping sequence counters, one per stream, and the connection's epoch
// for the ping timestamps. Owned by their pump goroutines — no locking.
civPingSeq uint16
ctrlPingSeq uint16
started time.Time
// txCiv counts CI-V command packets sent, and txAtData snapshots it at the
// last received CI-V data. Their difference during a silence answers the
// question the reconnects cannot: were we still ASKING when the answers
// stopped? Zero writes-since-data would mean the fault is our own poll
// loop, not the rig — and RS-BA1 showing no such dropouts points that way.
txCiv atomic.Uint32
txAtData atomic.Uint32
rx chan []byte // CI-V byte chunks from civPump → Read (control replies) rx chan []byte // CI-V byte chunks from civPump → Read (control replies)
scopeRx chan []byte // scope (0x27) frames, kept off rx so the panadapter scopeRx chan []byte // scope (0x27) frames, kept off rx so the panadapter
@@ -227,10 +262,13 @@ func (n *icomNet) Write(p []byte) (int, error) {
if icnTrace { if icnTrace {
debugLog.Printf("icom net TX: % X", p) debugLog.Printf("icom net TX: % X", p)
} }
seq := n.vTracked n.seqMu.Lock()
pkt := icnCivData(seq, n.vID, n.vRemote, n.vCivSeq, p) seq, civSeq := n.vTracked, n.vCivSeq
n.vTracked++ n.vTracked++
n.vCivSeq++ n.vCivSeq++
n.seqMu.Unlock()
n.txCiv.Add(1)
pkt := icnCivData(seq, n.vID, n.vRemote, civSeq, p)
n.sentMu.Lock() n.sentMu.Lock()
n.sentBuf[seq] = pkt n.sentBuf[seq] = pkt
delete(n.sentBuf, seq-1024) // keep the buffer bounded (~last 1024 packets) so delete(n.sentBuf, seq-1024) // keep the buffer bounded (~last 1024 packets) so
@@ -281,6 +319,7 @@ func (n *icomNet) Close() error {
func (n *icomNet) ctrlPump() { func (n *icomNet) ctrlPump() {
buf := make([]byte, 4096) buf := make([]byte, 4096)
lastIdle := time.Now() lastIdle := time.Now()
lastCtrlPing := time.Now()
lastToken := time.Now() // token was just granted during dial lastToken := time.Now() // token was just granted during dial
for { for {
select { select {
@@ -321,6 +360,11 @@ func (n *icomNet) ctrlPump() {
} }
// Renew well inside the rig's ~2-min token timeout. 30 s (was 45) leaves room // Renew well inside the rig's ~2-min token timeout. 30 s (was 45) leaves room
// for one lost renewal + its retransmit before the token would lapse. // for one lost renewal + its retransmit before the token would lapse.
if time.Since(lastCtrlPing) > 500*time.Millisecond {
n.ctrlPingSeq++
_, _ = n.ctrl.Write(icnPing(n.ctrlPingSeq, n.cID, n.cRemote, uint32(time.Since(n.started).Milliseconds())))
lastCtrlPing = time.Now()
}
if time.Since(lastToken) > 30*time.Second { if time.Since(lastToken) > 30*time.Second {
n.renewToken() n.renewToken()
lastToken = time.Now() lastToken = time.Now()
@@ -359,6 +403,25 @@ func (n *icomNet) civPump() {
buf := make([]byte, 8192) buf := make([]byte, 8192)
lastIdle := time.Now() lastIdle := time.Now()
lastReq := time.Now() lastReq := time.Now()
// Diagnosis for the recurring 2-3-minute silence a real IC-7760 shows on
// this stream while the control link stays alive: when the stream has been
// quiet for 10 s, say so ONCE, with the last read error — a socket error
// and a rig that stopped talking are different repairs, and the 30 s
// watchdog that follows cannot tell them apart from where it sits.
debugLog.Printf("icom net: client pings armed on the CI-V stream (every 500 ms)")
lastPkt := time.Now()
lastPing := time.Now()
lastData := time.Now() // CI-V payload packets (replies + transceive)
lastScope := time.Time{} // scope frames within those
var lastErr error
quietSaid := false
gaveUp := false
// sawData: this session has heard at least one CI-V payload. A radio in
// STANDBY is silent on CI-V by design — only the transport chats — and the
// quiet-recovery below must not treat that as a fault: it was tearing the
// session down every 15 s, and with it the console and its ON button, so a
// radio that was off when OpsLog started could never be turned on at all.
sawData := false
for { for {
select { select {
case <-n.done: case <-n.done:
@@ -366,7 +429,14 @@ func (n *icomNet) civPump() {
default: default:
} }
_ = n.civ.SetReadDeadline(time.Now().Add(100 * time.Millisecond)) _ = n.civ.SetReadDeadline(time.Now().Add(100 * time.Millisecond))
if k, err := n.civ.Read(buf); err == nil && k >= 16 { k, err := n.civ.Read(buf)
if err != nil {
if e, ok := err.(net.Error); !ok || !e.Timeout() {
lastErr = err // a REAL socket error, not the read deadline
}
}
if err == nil && k >= 16 {
lastPkt = time.Now()
n.markRx() n.markRx()
switch typ := icnLE.Uint16(buf[4:]); { switch typ := icnLE.Uint16(buf[4:]); {
case typ == 0x07: // ping case typ == 0x07: // ping
@@ -379,6 +449,13 @@ func (n *icomNet) civPump() {
n.dead.Store(true) // make Alive() fail now → prompt clean reconnect n.dead.Store(true) // make Alive() fail now → prompt clean reconnect
debugLog.Printf("icom net: rig sent DISCONNECT on CI-V stream — session dropped by the rig") debugLog.Printf("icom net: rig sent DISCONNECT on CI-V stream — session dropped by the rig")
case typ == 0x00 && k > 0x15 && buf[0x10] == 0xc1: // CI-V data case typ == 0x00 && k > 0x15 && buf[0x10] == 0xc1: // CI-V data
if quietSaid {
debugLog.Printf("icom net: CI-V replies are back after %s", time.Since(lastData).Round(time.Second))
quietSaid, gaveUp = false, false
}
sawData = true
lastData = time.Now()
n.txAtData.Store(n.txCiv.Load())
n.trackRxSeq(icnLE.Uint16(buf[6:])) // note gaps for retransmit n.trackRxSeq(icnLE.Uint16(buf[6:])) // note gaps for retransmit
civBytes := buf[0x15:k] civBytes := buf[0x15:k]
cp := append([]byte(nil), civBytes...) cp := append([]byte(nil), civBytes...)
@@ -388,6 +465,7 @@ func (n *icomNet) civPump() {
// feeder in IcomSerial picks them up. Everything else is a control // feeder in IcomSerial picks them up. Everything else is a control
// reply → rx → Read. // reply → rx → Read.
if len(civBytes) >= 5 && civBytes[4] == 0x27 { if len(civBytes) >= 5 && civBytes[4] == 0x27 {
lastScope = time.Now()
icnEnqueueDrop(n.scopeRx, cp) icnEnqueueDrop(n.scopeRx, cp)
break break
} }
@@ -410,14 +488,69 @@ func (n *icomNet) civPump() {
} }
} }
} }
if !quietSaid && sawData && time.Since(lastData) > 10*time.Second {
quietSaid = true
scopeAge := "never"
if !lastScope.IsZero() {
scopeAge = time.Since(lastScope).Round(time.Second).String()
}
debugLog.Printf("icom net: no CI-V DATA for 10 s (transport last heard %s ago; last scope frame %s ago; last socket error: %v; missing-seq backlog: %d; CI-V commands SENT since the last answer: %d)",
time.Since(lastPkt).Round(time.Second), scopeAge, lastErr, len(n.rxMissing), n.txCiv.Load()-n.txAtData.Load())
// And try the gentle repair before the 30 s watchdog tears the whole
// session down: if the rig quietly closed the CI-V data flow (the
// transport is still chatting, so the session itself stands), saying
// "open" again on the same stream is all it should take. Harmless
// when the cause is elsewhere — the watchdog still fires at 30 s.
n.seqMu.Lock()
seq, civSeq := n.vTracked, n.vCivSeq
n.vTracked++
n.vCivSeq++
n.seqMu.Unlock()
ocPkt := icnOpenClose(seq, n.vID, n.vRemote, civSeq, 0x04)
n.sentMu.Lock()
n.sentBuf[seq] = ocPkt
n.sentMu.Unlock()
_, _ = n.civ.Write(ocPkt)
debugLog.Printf("icom net: re-sent the CI-V open on the existing stream")
}
// The reopen was given five seconds. On a real IC-7760 it never works —
// the rig ignores it and only a fresh session brings CI-V back — so
// rather than sit out the 30 s watchdog, fail the link NOW and let the
// manager rebuild it: the outage drops from ~35 s to ~15.
if quietSaid && !gaveUp && time.Since(lastData) > 15*time.Second {
gaveUp = true
n.dead.Store(true)
debugLog.Printf("icom net: the reopen did not bring CI-V back — forcing a fresh session")
}
if time.Since(lastIdle) > 150*time.Millisecond { if time.Since(lastIdle) > 150*time.Millisecond {
_, _ = n.civ.Write(icnCtrl(0x00, 0, n.vID, n.vRemote)) // Idles carry a REAL sequence number, drawn from the same counter as
// the data packets, and sit in the retransmit buffer like them —
// which is how RS-BA1 and wfview number theirs. Ours used seq 0 on
// every idle, seven a second, interleaved with properly-numbered
// data; a rig that follows the sequence tolerates that for a minute
// or so and then stops serving CI-V data on the stream — which is
// the shape of every dropout this loaner IC-7760 has shown, with
// the scope and the TX path both since eliminated.
n.seqMu.Lock()
iseq := n.vTracked
n.vTracked++
n.seqMu.Unlock()
ipkt := icnCtrl(0x00, iseq, n.vID, n.vRemote)
n.sentMu.Lock()
n.sentBuf[iseq] = ipkt
n.sentMu.Unlock()
_, _ = n.civ.Write(ipkt)
lastIdle = time.Now() lastIdle = time.Now()
} }
if time.Since(lastReq) > 100*time.Millisecond { if time.Since(lastReq) > 100*time.Millisecond {
n.sendRetransmitReq() n.sendRetransmitReq()
lastReq = time.Now() lastReq = time.Now()
} }
if time.Since(lastPing) > 500*time.Millisecond {
n.civPingSeq++
_, _ = n.civ.Write(icnPing(n.civPingSeq, n.vID, n.vRemote, uint32(time.Since(n.started).Milliseconds())))
lastPing = time.Now()
}
} }
} }
@@ -661,6 +794,7 @@ func dialIcomNet(host, user, pass, compName string, rigAddr byte, cancel <-chan
cTracked: cTracked, cAuthSeq: cInner, cTracked: cTracked, cAuthSeq: cInner,
cToken: token, cTokReq: tokReq, cToken: token, cTokReq: tokReq,
cSentBuf: make(map[uint16][]byte), cSentBuf: make(map[uint16][]byte),
started: time.Now(),
} }
n.markRx() // the successful handshake counts as initial rig activity n.markRx() // the successful handshake counts as initial rig activity
// openClose(open) starts the CI-V data flow. We intentionally DO NOT power the // openClose(open) starts the CI-V data flow. We intentionally DO NOT power the
@@ -712,6 +846,11 @@ func icnHandshake(c *net.UDPConn, myID uint32, cancel <-chan struct{}) (uint32,
} }
typ := icnLE.Uint16(p[4:]) typ := icnLE.Uint16(p[4:])
sentid := icnLE.Uint32(p[8:]) sentid := icnLE.Uint32(p[8:])
// Every packet the rig sends during the handshake, verbatim. A radio that
// answers SOMETHING unrecognised (a newer model, a different firmware) and
// a radio that answers nothing are different faults, and a silent timeout
// hides which one this is.
icnHandshakeProbe(p)
switch typ { switch typ {
case 0x04: // iAmHere case 0x04: // iAmHere
remoteID = sentid remoteID = sentid
@@ -843,11 +982,20 @@ func icnConnInfo(seq, innerSeq, tokReq uint16, sentid, rcvdid, token uint32, use
copy(b[0x40:0x60], []byte("IC-7610")) copy(b[0x40:0x60], []byte("IC-7610"))
copy(b[0x60:0x70], icnPasscode(user)) copy(b[0x60:0x70], icnPasscode(user))
b[0x70] = rxEnable // rxenable: 1 opens the 50003 RX audio stream, 0 = CI-V only b[0x70] = rxEnable // rxenable: 1 opens the 50003 RX audio stream, 0 = CI-V only
b[0x71] = 0x00 // txenable (Phase 5) // TX rides the same audio session: whenever the operator wants RX audio the
b[0x72] = 0x10 // rxcodec // TX side is opened with it, so the voice keyer can play to the radio with
b[0x73] = 0x04 // txcodec // no cable. Costs nothing when unused — no packets flow until a message is
// actually played.
b[0x71] = rxEnable // txenable
// rxcodec 0x04 = LPCM, ONE channel, 16-BIT — settled by experiment on a
// real IC-7760, one wrong guess at a time: 0x10 produced 1280-byte payloads
// of interleaved 16-bit stereo, 0x02 produced 320-byte payloads of 8-bit
// mono (samples hugging 0x80). 0x04 sits between them in the codec table
// (as in wfview): 16-bit mono, the format the 16 kHz playback path plays.
b[0x72] = 0x04 // rxcodec
b[0x73] = 0x04 // txcodec
icnBE.PutUint32(b[0x74:], 16000) icnBE.PutUint32(b[0x74:], 16000)
icnBE.PutUint32(b[0x78:], 8000) icnBE.PutUint32(b[0x78:], 16000) // TX sample rate — the same 16 kHz everything else here runs at
icnBE.PutUint32(b[0x7c:], uint32(civPort)) icnBE.PutUint32(b[0x7c:], uint32(civPort))
icnBE.PutUint32(b[0x80:], uint32(audioPort)) icnBE.PutUint32(b[0x80:], uint32(audioPort))
icnBE.PutUint32(b[0x84:], 100) icnBE.PutUint32(b[0x84:], 100)
@@ -855,6 +1003,26 @@ func icnConnInfo(seq, innerSeq, tokReq uint16, sentid, rcvdid, token uint32, use
return b return b
} }
// PlayTXAudio plays one voice-keyer message through the 50003 audio session.
// On the transport because the transport owns the session; the IcomSerial
// controller forwards here after a type assertion, exactly as the TCI path
// reaches its radio.
func (n *icomNet) PlayTXAudio(pcm []byte, rate, ch, bits int, stop <-chan struct{}) error {
if n.audio == nil {
return fmt.Errorf("the radio's audio stream is not open — enable RX audio in Settings → CAT first")
}
return n.audio.PlayTX(pcm, rate, ch, bits, stop)
}
// TXAudioSender returns a function that streams live microphone chunks to the
// rig — the talk button's road, where PlayTXAudio is the voice keyer's.
func (n *icomNet) TXAudioSender() (func([]byte) error, error) {
if n.audio == nil {
return nil, fmt.Errorf("the radio's audio stream is not open — enable RX audio in Settings → CAT first")
}
return n.audio.SendTXChunk, nil
}
func icnOpenClose(seq uint16, sentid, rcvdid uint32, civSeq uint16, magic byte) []byte { func icnOpenClose(seq uint16, sentid, rcvdid uint32, civSeq uint16, magic byte) []byte {
b := make([]byte, 0x16) b := make([]byte, 0x16)
icnLE.PutUint32(b[0:], 0x16) icnLE.PutUint32(b[0:], 0x16)
@@ -903,3 +1071,38 @@ func icnPasscode(s string) []byte {
} }
return out return out
} }
// icnHandshakeProbe logs the first packets seen during a control handshake —
// capped hard, because a working handshake would log for ever.
var icnProbeCount int
func icnHandshakeProbe(p []byte) {
if icnProbeCount >= 12 {
return
}
icnProbeCount++
n := len(p)
if n > 32 {
n = 32
}
debugLog.Printf("icom net: handshake rx %d bytes: % X", len(p), p[:n])
}
// icnPing builds a CLIENT ping request (wfview's ping_packet: 0x15 bytes,
// type 0x07, reply=0, a monotonic time at 0x11). The rig answers each one —
// and, decisively, treats them as the client's sign of life: wfview sends one
// every 500 ms on every stream, and OpsLog, which only ever REPLIED to the
// rig's pings, watched the IC-7760 stop serving CI-V data about a minute into
// every session. Same socket answered, same transport alive: the rig had
// simply concluded nobody was listening.
func icnPing(seq uint16, sentid, rcvdid uint32, ms uint32) []byte {
b := make([]byte, 0x15)
icnLE.PutUint32(b[0:], 0x15)
icnLE.PutUint16(b[4:], 0x07)
icnLE.PutUint16(b[6:], seq)
icnLE.PutUint32(b[8:], sentid)
icnLE.PutUint32(b[12:], rcvdid)
b[0x10] = 0x00
icnLE.PutUint32(b[0x11:], ms)
return b
}
+168 -12
View File
@@ -116,7 +116,13 @@ type IcomSerial struct {
// "alive but silent" tolerance below, which used to be // "alive but silent" tolerance below, which used to be
// unbounded and left the display frozen for ever // unbounded and left the display frozen for ever
silentGrace time.Duration // current width of that tolerance (backs off, see ReadState) silentGrace time.Duration // current width of that tolerance (backs off, see ReadState)
dspLoaded bool // readDSP has run since the rig became responsive (loads all // Needle inertia for the TX meters — the CI-V meters are point samples, and
// between two SSB syllables a poll lands on 0 W and a perfect SWR. See
// meterPeak (yaesu_panel.go): power decays like a needle, SWR holds then
// snaps back to the live truth.
powerPeak meterPeak
swrPeak meterPeak
dspLoaded bool // readDSP has run since the rig became responsive (loads all
// the panel's set-once controls once the rig actually answers) // the panel's set-once controls once the rig actually answers)
// When the console last asked for the DSP snapshot. The meters and the // When the console last asked for the DSP snapshot. The meters and the
// front-panel rotation are polled ONLY while something is displaying them: // front-panel rotation are polled ONLY while something is displaying them:
@@ -262,6 +268,21 @@ func (b *IcomSerial) Connect() error {
// non-default address still RENDERS; this flag only drives the SET/read commands // non-default address still RENDERS; this flag only drives the SET/read commands
// (mode, span, edges), which need the 0x00 selector to be accepted on the 7300. // (mode, span, edges), which need the 0x00 selector to be accepted on the 7300.
b.dualScope = idAddr == 0x98 || idAddr == 0xA2 || idAddr == 0x94 b.dualScope = idAddr == 0x98 || idAddr == 0xA2 || idAddr == 0x94
// Silence any LEFTOVER waveform stream, BLIND, before anything else. The
// 0x27 output flag lives in the RADIO and survives sessions; its flood is
// what makes the IC-7760 stop answering CI-V — so waiting for CI-V to
// answer before sending this (the first attempt did) was the egg asking
// the chicken to hatch it. Fire-and-forget: an unanswered set costs one
// frame, and the rig acts on what it decodes whether or not we hear the
// acknowledgement. The front-panel display is deliberately untouched.
// Synchronously: Connect already runs on the CAT goroutine, and a stray
// goroutine writing to the shared link would interleave with the command
// loop. Two forms, because the selector byte differs by model and a NAK
// costs one frame — and the results are LOGGED, because a kill that quietly
// fails leaves the flood running and the next dropout unexplained.
err1 := b.execScope("waveform output off (leftover)", civ.SubScopeOn, 0)
err2 := b.exec(civ.CmdScope, civ.SubScopeOn, 0x00, 0x00) // main-selector form
applog.Printf("icom: waveform-off sent at connect (plain: %v, with selector: %v)", err1, err2)
// Defer the DSP snapshot until the rig actually answers CI-V. Over the network // Defer the DSP snapshot until the rig actually answers CI-V. Over the network
// the rig may still be booting (or off) at Connect, so an immediate readDSP // the rig may still be booting (or off) at Connect, so an immediate readDSP
// would time out and leave every control at 0 / off with no retry. ReadState // would time out and leave every control at 0 / off with no retry. ReadState
@@ -347,7 +368,12 @@ func (b *IcomSerial) ReadState() (RigState, error) {
case readerGone: case readerGone:
debugLog.Printf("icom net: the CI-V reader has exited — the connection is dead however alive the control link looks → reconnecting") debugLog.Printf("icom net: the CI-V reader has exited — the connection is dead however alive the control link looks → reconnecting")
case at.Alive(): case at.Alive():
debugLog.Printf("icom net: control link answers but no CI-V reply for %s → reconnecting. Another program (WSJT-X/OmniRig, the Remote Utility) has most likely taken the CI-V session.", silentFor.Round(time.Second)) // No verdict on WHY: this fires for a session taken by another
// program (WSJT-X, the Remote Utility) AND for a rig that simply
// stopped answering — a real IC-7760 did exactly that once with
// nothing else on the network. Blaming a hijacker sent that
// operator hunting software that was not installed.
debugLog.Printf("icom net: control link answers but no CI-V reply for %s → reconnecting. Either another program took the CI-V session (WSJT-X/OmniRig/Remote Utility), or the rig stopped answering on its own.", silentFor.Round(time.Second))
default: default:
debugLog.Printf("icom net: control link went quiet (no rig packets for >6 s) → reconnecting. If this recurs every ~2-3 min, the rig is invalidating the session (token renewal rejected).") debugLog.Printf("icom net: control link went quiet (no rig packets for >6 s) → reconnecting. If this recurs every ~2-3 min, the rig is invalidating the session (token renewal rejected).")
} }
@@ -396,6 +422,19 @@ func (b *IcomSerial) ReadState() (RigState, error) {
} }
b.dspMu.Lock() b.dspMu.Lock()
b.dsp.Mode = s.Mode b.dsp.Mode = s.Mode
// The console says which SIDEBAND, not the ADIF family: "SSB" on 40 m
// leaves the operator guessing whether the rig is where convention puts
// it. The log keeps SSB; the panel shows what the radio is actually doing.
switch b.curModeByte {
case civ.ModeUSB:
if s.Mode == "SSB" {
b.dsp.Mode = "USB"
}
case civ.ModeLSB:
if s.Mode == "SSB" {
b.dsp.Mode = "LSB"
}
}
b.dspMu.Unlock() b.dspMu.Unlock()
} }
@@ -409,8 +448,13 @@ func (b *IcomSerial) ReadState() (RigState, error) {
// all, for the user's Set* commands. // all, for the user's Set* commands.
if b.pollN%4 == 1 { if b.pollN%4 == 1 {
b.splitOn, b.splitTXFreq = false, 0 b.splitOn, b.splitTXFreq = false, 0
if on, ok := b.readSplit(); ok && on { on, okSplit := b.readSplit()
if txHz, ok2 := b.readTXFreq(); ok2 && txHz > 0 { // The unselected VFO is read split or NOT: on a dual-receiver rig it is
// the sub receiver's dial, and the console showed it blank until split
// was engaged.
if txHz, ok2 := b.readTXFreq(); ok2 && txHz > 0 {
b.setCache(func(st *IcomTXState) { st.SubHz = txHz })
if okSplit && on {
b.splitOn, b.splitTXFreq = true, txHz b.splitOn, b.splitTXFreq = true, txHz
} }
} }
@@ -435,12 +479,16 @@ func (b *IcomSerial) ReadState() (RigState, error) {
sm, _ = b.readMeter(civ.SubMeterS) sm, _ = b.readMeter(civ.SubMeterS)
po, swr = 0, 0 po, swr = 0, 0
if tx { if tx {
now := time.Now()
if v, ok := b.readMeter(civ.SubMeterPo); ok { if v, ok := b.readMeter(civ.SubMeterPo); ok {
po = v po = b.powerPeak.update(v, now)
} }
if v, ok := b.readMeter(civ.SubMeterSWR); ok { if v, ok := b.readMeter(civ.SubMeterSWR); ok {
swr = v swr = b.swrPeak.updateSnap(v, now)
} }
} else {
// Cleared with the carrier, so the next transmission starts fresh.
b.powerPeak, b.swrPeak = meterPeak{}, meterPeak{}
} }
} }
b.dspMu.Lock() b.dspMu.Lock()
@@ -509,6 +557,13 @@ func (b *IcomSerial) refreshFrontPanel() {
b.dsp.Filter = int(f) b.dsp.Filter = int(f)
b.dspMu.Unlock() b.dspMu.Unlock()
} }
case 2:
// Tuner in/out — the radio's own TUNER button changes it mid-session.
if v, ok := b.readSwitchSub(civ.CmdATU, civ.SubATU); ok {
b.dspMu.Lock()
b.dsp.ATUOn = v == 1
b.dspMu.Unlock()
}
} }
} }
@@ -559,6 +614,18 @@ func (b *IcomSerial) SetMode(mode string) error {
} }
// Filter 0x01 (FIL1) is the conventional default for the data-mode set. // Filter 0x01 (FIL1) is the conventional default for the data-mode set.
_ = b.execIdempotent("set data mode", civ.CmdExtra, civ.SubDataMode, dataByte, 0x01) _ = b.execIdempotent("set data mode", civ.CmdExtra, civ.SubDataMode, dataByte, 0x01)
// Trust, then verify: the IC-7760 acknowledges 1A 06 and stays in USB-D
// anyway, which left an operator unable to get back to plain USB at all.
// When the readback disagrees, say it again with 0x26 — mode, data flag and
// filter in one frame, the command the newer rigs actually honour. Only on
// a mismatch, so rigs that predate 0x26 never see it.
if got := b.readDataMode(); got != data {
if err := b.execIdempotent("set mode+data (0x26)", civ.CmdModeDataFil, 0x00, code, dataByte, 0x01); err != nil {
applog.Printf("icom: data flag stuck at %v after mode %s, and 0x26 failed too: %v", got, mode, err)
} else {
applog.Printf("icom: data flag stuck after 1A06, corrected via 0x26 (mode %s)", mode)
}
}
return nil return nil
} }
@@ -1482,6 +1549,12 @@ func (b *IcomSerial) modeCode(mode string) (code byte, data bool, err error) {
return civ.ModeFM, false, nil return civ.ModeFM, false, nil
case "RTTY", "FSK": case "RTTY", "FSK":
return civ.ModeRTTY, false, nil return civ.ModeRTTY, false, nil
case "PSK":
// The console button, not the ADIF mode: the rigs that HAVE a native PSK
// mode (7610/7760/7851 class) get it; a 7300 NAKs 0x12 and the button
// stays dead there, exactly as RS-BA1's does. Soundcard PSK31 stays on
// USB-D below, where every rig can do it.
return civ.ModePSK, false, nil
case "FT8", "FT4", "PSK31", "MFSK", "JS8", "JT65", "JT9", "OLIVIA", "DATA", "DIGITALVOICE": case "FT8", "FT4", "PSK31", "MFSK", "JS8", "JT65", "JT9", "OLIVIA", "DATA", "DIGITALVOICE":
// Digital data modes ride on USB with the data flag set (FT8 etc.). // Digital data modes ride on USB with the data flag set (FT8 etc.).
return civ.ModeUSB, true, nil return civ.ModeUSB, true, nil
@@ -1832,10 +1905,16 @@ func (b *IcomSerial) SetMicGain(p int) error {
} }
func (b *IcomSerial) SetIcomSplit(on bool) error { func (b *IcomSerial) SetIcomSplit(on bool) error {
return b.SetIcomSplitOffset(on, 0)
}
// SetIcomSplitOffset enables split with a CHOSEN TX offset in Hz (0 = the
// usual convention: +1 kHz on CW, +5 kHz otherwise). The console offers
// +1/+5/+10 directly, DXpedition style.
func (b *IcomSerial) SetIcomSplitOffset(on bool, offsetHz int64) error {
if on { if on {
// Enable split with the usual "work him up" TX offset: +1 kHz on CW, // Set the unselected (TX) VFO to RX+offset first, then turn split on.
// +5 kHz otherwise (SSB). Set the unselected (TX) VFO to RX+offset first, // 0x25 0x01 + BCD sets the unselected VFO's frequency.
// then turn split on. 0x25 0x01 + BCD sets the unselected VFO's frequency.
rx := b.curFreq rx := b.curFreq
if rx <= 0 { if rx <= 0 {
if hz, err := b.readFreq(); err == nil { if hz, err := b.readFreq(); err == nil {
@@ -1843,12 +1922,39 @@ func (b *IcomSerial) SetIcomSplit(on bool) error {
} }
} }
if rx > 0 { if rx > 0 {
offset := int64(5000) offset := offsetHz
if b.curModeByte == civ.ModeCW || b.curModeByte == civ.ModeCWR { if offset <= 0 {
offset = 1000 offset = 5000
if b.curModeByte == civ.ModeCW || b.curModeByte == civ.ModeCWR {
offset = 1000
}
} }
_ = b.exec(append([]byte{civ.CmdVfoFreq, civ.SubVfoUnselected}, civ.FreqToBCD(rx+offset)...)...) _ = b.exec(append([]byte{civ.CmdVfoFreq, civ.SubVfoUnselected}, civ.FreqToBCD(rx+offset)...)...)
} }
// And the MODE crosses with it: a split where the TX VFO is still on
// yesterday's mode transmits FM into a CW pileup. 0x26 0x01 sets the
// unselected VFO's mode + data flag in one frame; rigs that predate
// 0x26 NAK it harmlessly and behave as they always did.
if b.curModeByte == 0 {
// A fresh session may not have read the mode yet — ask, or the copy
// below would send mode 0 (LSB) whatever the main is on.
if m, ok := b.readMode(); ok {
b.curModeByte = m
}
}
if b.curModeByte != 0 {
dataByte := byte(0)
if got := b.readDataMode(); got {
dataByte = 1
}
// Logged, not discarded: the first version swallowed the error and a
// real 7760's sub VFO kept yesterday's mode with nothing to show why.
if err := b.exec(civ.CmdModeDataFil, 0x01, b.curModeByte, dataByte, 0x01); err != nil {
applog.Printf("icom: split mode-align (26 01 %02X %d) refused: %v", b.curModeByte, dataByte, err)
} else {
applog.Printf("icom: split mode-align OK (26 01 %02X %d)", b.curModeByte, dataByte)
}
}
} }
if err := b.exec(civ.CmdSplit, boolByte(on)); err != nil { if err := b.exec(civ.CmdSplit, boolByte(on)); err != nil {
return err return err
@@ -1982,6 +2088,17 @@ func (b *IcomSerial) TuneATU() error {
return b.exec(civ.CmdATU, civ.SubATU, 0x02) return b.exec(civ.CmdATU, civ.SubATU, 0x02)
} }
// SetATU engages or DISENGAGES the internal tuner (0x1C 0x01: 1 = in line,
// 0 = through). Tune existed without this, which meant a tuner once engaged
// could not be taken out of line again from the console.
func (b *IcomSerial) SetATU(on bool) error {
if err := b.exec(civ.CmdATU, civ.SubATU, boolByte(on)); err != nil {
return err
}
b.setCache(func(s *IcomTXState) { s.ATUOn = on })
return nil
}
func (b *IcomSerial) setCache(fn func(*IcomTXState)) { func (b *IcomSerial) setCache(fn func(*IcomTXState)) {
b.dspMu.Lock() b.dspMu.Lock()
fn(&b.dsp) fn(&b.dsp)
@@ -2024,3 +2141,42 @@ func agcValue(name string) byte {
} }
return 0 return 0
} }
// PlayTXAudio hands a voice-keyer message to the network audio session, when
// this rig is reached over one. A USB-connected Icom takes its audio through
// its own sound card instead, and says so.
func (b *IcomSerial) PlayTXAudio(pcm []byte, rate, ch, bits int, stop <-chan struct{}) error {
// port is written once per Connect, on the CAT goroutine this is fetched
// from (IcomDo); at worst a reconnect leaves this one connection stale, and
// a stale transport fails fast on its closed done channel.
port := b.port
// A nil port fails the assertions below too — and used to fail them with
// the sound-card message, sending an operator whose radio was simply OFF
// hunting through their audio devices.
if port == nil {
return fmt.Errorf("not connected to the radio — check the CAT link")
}
type txPlayer interface {
PlayTXAudio(pcm []byte, rate, ch, bits int, stop <-chan struct{}) error
}
if p, ok := port.(txPlayer); ok {
return p.PlayTXAudio(pcm, rate, ch, bits, stop)
}
return fmt.Errorf("this rig takes transmit audio through its USB sound card, not the CAT link")
}
// TXAudioSender hands back the network transport's live-mic sender, when this
// rig is reached over one.
func (b *IcomSerial) TXAudioSender() (func([]byte) error, error) {
port := b.port
if port == nil {
return nil, fmt.Errorf("not connected to the radio — check the CAT link")
}
type sender interface {
TXAudioSender() (func([]byte) error, error)
}
if p, ok := port.(sender); ok {
return p.TXAudioSender()
}
return nil, fmt.Errorf("this rig takes transmit audio through its USB sound card, not the CAT link")
}
+81 -1
View File
@@ -35,6 +35,11 @@ type KenwoodTXState struct {
Model string `json:"model,omitempty"` Model string `json:"model,omitempty"`
Elecraft bool `json:"elecraft"` // a K3/K4 rather than a Kenwood Elecraft bool `json:"elecraft"` // a K3/K4 rather than a Kenwood
Mode string `json:"mode,omitempty"` Mode string `json:"mode,omitempty"`
// DataSub is the K3/K4 DATA submode while in DATA mode (DT): "DATA A",
// "AFSK A", "FSK D" or "PSK D". Empty on a Kenwood, and outside DATA. The
// panel's two DATA buttons need it to show WHICH data mode the rig is in —
// FT8 wants DATA A, RTTY wants FSK D, and MD6 alone cannot say which.
DataSub string `json:"data_sub,omitempty"`
Transmitting bool `json:"transmitting"` Transmitting bool `json:"transmitting"`
Split bool `json:"split"` Split bool `json:"split"`
@@ -107,10 +112,12 @@ type KenwoodPanelController interface {
SetKenwoodRIT(bool) error SetKenwoodRIT(bool) error
SetKenwoodXIT(bool) error SetKenwoodXIT(bool) error
NudgeKenwoodRIT(int) error NudgeKenwoodRIT(int) error
SetKenwoodRITOffset(int) error
ClearKenwoodRIT() error ClearKenwoodRIT() error
SetKenwoodTX(bool) error SetKenwoodTX(bool) error
TuneKenwoodATU() error TuneKenwoodATU() error
ToggleKenwoodATU() error ToggleKenwoodATU() error
SetKenwoodPanelMode(string) error
} }
// kenwoodPanelSlowBeat is how many polls pass between full re-reads of the // kenwoodPanelSlowBeat is how many polls pass between full re-reads of the
@@ -212,6 +219,14 @@ func (k *Kenwood) readPanelSettings() {
if v, ok := k.askNum("NR;", "NR", 1); ok { if v, ok := k.askNum("NR;", "NR", 1); ok {
k.panel.NR = v != 0 k.panel.NR = v != 0
} }
// The DATA submode, Elecraft only (a plain Kenwood has no DT and would "?;"
// it). Read every settings beat: the operator changes it from the rig's own
// front panel mid-session, and the two DATA buttons must follow.
if k.elecraft {
if v, ok := k.askNum("DT;", "DT", 1); ok {
k.panel.DataSub = kenwoodDataSubName(v)
}
}
if v, ok := k.askNum("GT;", "GT", 3); ok { if v, ok := k.askNum("GT;", "GT", 3); ok {
k.panel.AGC = kenwoodAGCName(v) k.panel.AGC = kenwoodAGCName(v)
} }
@@ -334,7 +349,7 @@ func (k *Kenwood) readTXMeters() {
if v, ok := k.askNum("SW;", "SW", 3); ok { if v, ok := k.askNum("SW;", "SW", 3); ok {
k.panel.SWRRaw = v k.panel.SWRRaw = v
if v > 0 { if v > 0 {
k.panel.SWR = float64(k.swrPeak.update(v, now)) / 10 k.panel.SWR = float64(k.swrPeak.updateSnap(v, now)) / 10
} }
} }
if k.metersLogged >= 20 { if k.metersLogged >= 20 {
@@ -564,6 +579,16 @@ func (k *Kenwood) SetKenwoodXIT(on bool) error {
// ClearKenwoodRIT zeroes the RIT/XIT offset, both at once — which is what RC // ClearKenwoodRIT zeroes the RIT/XIT offset, both at once — which is what RC
// does and what the operator means by "clear it". // does and what the operator means by "clear it".
// SetKenwoodRITOffset writes the offset as an ABSOLUTE value — what the shared
// ShiftRow control speaks. Nudge stays for the keyboard clarifier; both funnel
// into the same RO write.
func (k *Kenwood) SetKenwoodRITOffset(hz int) error {
k.mu.Lock()
cur := k.panel.RITOffset
k.mu.Unlock()
return k.NudgeKenwoodRIT(hz - cur)
}
func (k *Kenwood) ClearKenwoodRIT() error { func (k *Kenwood) ClearKenwoodRIT() error {
return k.setPanel("RC;") return k.setPanel("RC;")
} }
@@ -650,3 +675,58 @@ func (k *Kenwood) askNum(cmd, prefix string, digits int) (int, bool) {
} }
return n, true return n, true
} }
// kenwoodDataSubName decodes DT (K3/K4 programmer's reference).
func kenwoodDataSubName(v int) string {
switch v {
case 0:
return "DATA A"
case 1:
return "AFSK A"
case 2:
return "FSK D"
case 3:
return "PSK D"
}
return ""
}
// SetKenwoodPanelMode is the panel's mode row: CW / USB / LSB / DATA / RTTY.
//
// It exists because SetMode is the LOGGER's path — it maps an ADIF mode and
// honours the data-mode preference — while a panel button is the operator
// saying exactly what the rig should do. The two DATA cases are the point:
// "DATA" is MD6 + DT0 (DATA A, the soundcard submode FT8/FT4 modulate through)
// and "RTTY" is MD6 + DT2 (FSK D, the K3's direct-keyed RTTY). MD6 alone keeps
// whatever submode a prior session left, which is how a K3 "in DATA" transmits
// FT8 with no audio — the report behind this row.
func (k *Kenwood) SetKenwoodPanelMode(mode string) error {
k.mu.Lock()
defer k.mu.Unlock()
if k.port == nil {
return fmt.Errorf("kenwood: not connected")
}
var cmds []string
switch strings.ToUpper(strings.TrimSpace(mode)) {
case "CW":
cmds = []string{"MD3;"}
case "USB":
cmds = []string{"MD2;"}
case "LSB":
cmds = []string{"MD1;"}
case "DATA":
cmds = []string{"MD6;", "DT0;"}
case "RTTY":
cmds = []string{"MD6;", "DT2;"}
default:
return fmt.Errorf("kenwood panel: unknown mode %q", mode)
}
for _, c := range cmds {
if err := k.write(c); err != nil {
return err
}
}
// Re-read the settings on the next poll so Mode and DataSub confirm at once.
k.panelCycle = kenwoodPanelSlowBeat
return nil
}
+7
View File
@@ -553,6 +553,13 @@ func (o *OmniRig) SetFrequency(hz int64) error {
props := []string{prop, "Freq"} props := []string{prop, "Freq"}
if onSubVFO { if onSubVFO {
props = []string{prop} props = []string{prop}
} else if isYaesu && split&pmSplitOn != 0 && split&pmSplitOff == 0 {
// Yaesu with SPLIT engaged: the generic Freq write lands on the TX
// VFO — an FT-2000 moved B and left A (the receiver) behind, so a
// spot click QSYed the transmitter and nothing audible changed.
// Both VFOs are written: the radio arrives on the spot RX and TX
// together, split left as the operator had it.
props = []string{"FreqA", "FreqB", "Freq"}
} }
for _, p := range props { for _, p := range props {
if _, e := oleutil.PutProperty(o.rig, p, hz32); e != nil { if _, e := oleutil.PutProperty(o.rig, p, hz32); e != nil {
+26 -2
View File
@@ -165,8 +165,7 @@ func (t *TCI) Connect() error {
if t.spotsEnabled { if t.spotsEnabled {
debugLog.Printf("TCI: panorama spots are ON — spots will be sent to the radio") debugLog.Printf("TCI: panorama spots are ON — spots will be sent to the radio")
} }
_ = t.send("rx_sensors_enable:true,200;") t.subscribeSensors("connect")
_ = t.send("tx_sensors_enable:true,200;")
if t.spotsEnabled { if t.spotsEnabled {
// Forget what we thought was on the panorama at the same moment the radio // Forget what we thought was on the panorama at the same moment the radio
// is told to drop it. Kept, the memory would suppress the next spot for // is told to drop it. Kept, the memory would suppress the next spot for
@@ -461,6 +460,24 @@ func (t *TCI) SetTXAudioSource(src string) {
} }
// send writes a command to the WebSocket (one writer at a time). // send writes a command to the WebSocket (one writer at a time).
// subscribeSensors asks the radio to push its meters. Nothing measures anything
// until this goes out — the S-meter, the transmit power and the SWR are all
// subscription-only (TCI §4.4) — and it is sent at connect AND again at every
// "ready", because a subscription sent during the server's initial dump can be
// dropped. 200 ms is the rate the protocol's own examples use.
func (t *TCI) subscribeSensors(when string) {
// Both cases, deliberately. Every other command this backend sends works in
// lower case, but the meters stayed silent on a real SunSDR through two
// rounds of fixes — and the protocol document's own examples are upper case
// (TX_SENSORS_ENABLE:true,200;). A server that is case-insensitive ignores
// the duplicate; one that is not finally hears the subscription.
e1 := t.send("rx_sensors_enable:true,200;")
e2 := t.send("tx_sensors_enable:true,200;")
_ = t.send("RX_SENSORS_ENABLE:true,200;")
_ = t.send("TX_SENSORS_ENABLE:true,200;")
debugLog.Printf("TCI: sensor subscription sent (%s, both cases): rx=%v tx=%v", when, e1, e2)
}
func (t *TCI) send(cmd string) error { func (t *TCI) send(cmd string) error {
t.mu.Lock() t.mu.Lock()
c := t.conn c := t.conn
@@ -567,6 +584,13 @@ func (t *TCI) handle(msg string) {
} }
case "ready", "start": case "ready", "start":
t.ready = true t.ready = true
// (Re)subscribe to the meters HERE, not only at connect. ExpertSDR3
// dumps its whole state and then says "ready"; a unidirectional control
// command sent while that dump is still in flight can be ignored, and
// the report from a real SunSDR — transmit meters still empty after the
// connect-time subscription — has exactly that shape. From a goroutine:
// send takes t.mu, which this handler holds.
go t.subscribeSensors("ready")
case "stop": case "stop":
t.ready = false t.ready = false
case "vfo": case "vfo":
+2 -1
View File
@@ -113,7 +113,8 @@ func (t *TCI) handlePanel(name string, get func(int) string, args string) bool {
// it. What the radio actually announces after the command settles whether // it. What the radio actually announces after the command settles whether
// this is our reading or its doing, and no amount of reasoning will. // this is our reading or its doing, and no amount of reasoning will.
switch name { switch name {
case "mute", "sql_enable", "sql_level", "tx_power", "tx_swr", "tune": case "mute", "sql_enable", "sql_level", "tx_power", "tx_swr", "tune",
"tx_sensors", "rx_sensors", "rx_channel_sensors":
// Logged on arrival so an ANSWER can be told from a SILENCE: the log // Logged on arrival so an ANSWER can be told from a SILENCE: the log
// showed the transmit meters being asked for and nothing coming back, // showed the transmit meters being asked for and nothing coming back,
// which on its own proves nothing — a reply that arrived and failed to // which on its own proves nothing — a reply that arrived and failed to
+19
View File
@@ -905,3 +905,22 @@ func yaesuSplitCommand(cmd, vfo string, on bool) string {
} }
return cmd + "0;" return cmd + "0;"
} }
// updateSnap is update for a meter where lingering is misinformation: the peak
// stands for the hold, then the display returns to the live sample AT ONCE.
// Made for the K3's SWR — the radio throws a brief SWR spike as an FT8 frame
// ends, and the quarter-of-the-gap decay above turned that one bad sample into
// twelve seconds of alarming red on the next transmission. A needle's inertia
// suits a power meter; an SWR reading is a warning light, and a warning that
// fades slowly reads as a fault that is slowly getting better.
func (m *meterPeak) updateSnap(sample int, now time.Time) int {
if sample >= m.val {
m.val, m.at = sample, now
return m.val
}
if now.Sub(m.at) < meterHold {
return m.val
}
m.val, m.at = sample, now
return m.val
}
+71
View File
@@ -868,6 +868,44 @@ var bulkEditableCols = map[string]bool{
// BulkSetField sets one whitelisted column to value on every listed QSO in a // BulkSetField sets one whitelisted column to value on every listed QSO in a
// single statement. value "" clears the field. Returns rows affected. // single statement. value "" clears the field. Returns rows affected.
// bulkEditableIntCols are the NUMERIC columns the bulk editor may touch. Their
// own path, not the text one: the columns are nullable integers, and while
// SQLite would coerce "14" quietly, a shared MySQL logbook would not — and an
// empty string is NULL here, never "".
var bulkEditableIntCols = map[string]bool{
"my_dxcc": true,
"my_cq_zone": true,
"my_itu_zone": true,
}
// BulkSetIntField sets one integer column across the ids; v nil clears it.
func (r *Repo) BulkSetIntField(ctx context.Context, ids []int64, column string, v *int) (int64, error) {
if !bulkEditableIntCols[column] {
return 0, fmt.Errorf("field %q is not bulk-editable", column)
}
if len(ids) == 0 {
return 0, nil
}
ph := make([]string, len(ids))
args := make([]any, 0, len(ids)+2)
var val any
if v != nil {
val = *v
}
args = append(args, val, db.NowISO())
for i, id := range ids {
ph[i] = "?"
args = append(args, id)
}
res, err := r.db.ExecContext(ctx,
"UPDATE qso SET "+column+" = ?, updated_at = ? WHERE id IN ("+strings.Join(ph, ",")+")", args...)
if err != nil {
return 0, fmt.Errorf("bulk set %s: %w", column, err)
}
n, _ := res.RowsAffected()
return n, nil
}
func (r *Repo) BulkSetField(ctx context.Context, ids []int64, column, value string) (int64, error) { func (r *Repo) BulkSetField(ctx context.Context, ids []int64, column, value string) (int64, error) {
if !bulkEditableCols[column] { if !bulkEditableCols[column] {
return 0, fmt.Errorf("field %q is not bulk-editable", column) return 0, fmt.Errorf("field %q is not bulk-editable", column)
@@ -1965,6 +2003,39 @@ func bandStatusCode(callWorked, callConfirmed, entityConfirmed bool) int {
// modeClass collapses ADIF modes into the three buckets DXers care about. // modeClass collapses ADIF modes into the three buckets DXers care about.
// Anything not voice and not CW is treated as digital. // Anything not voice and not CW is treated as digital.
// ModeClass is modeClass for callers outside the package — the watchlist
// judges slots at the same grain the cluster does.
func ModeClass(mode string) string { return modeClass(mode) }
// SlotRow is one (callsign, band, mode) triple from SlotsSince.
type SlotRow struct {
Callsign string
Band string
Mode string
}
// SlotsSince lists the slots of every contact made since the given instant —
// the contest watchlist's "worked today", where the day boundary lives in this
// query's bound and nowhere else.
func (r *Repo) SlotsSince(ctx context.Context, since time.Time) ([]SlotRow, error) {
rows, err := r.db.QueryContext(ctx,
"SELECT callsign, band, mode FROM qso WHERE qso_date >= ?",
since.UTC().Format(isoMillis))
if err != nil {
return nil, err
}
defer rows.Close()
var out []SlotRow
for rows.Next() {
var sr SlotRow
if err := rows.Scan(&sr.Callsign, &sr.Band, &sr.Mode); err != nil {
return nil, err
}
out = append(out, sr)
}
return out, rows.Err()
}
func modeClass(mode string) string { func modeClass(mode string) string {
switch strings.ToUpper(mode) { switch strings.ToUpper(mode) {
case "SSB", "USB", "LSB", "AM", "FM", "DIGITALVOICE", "PHONE": case "SSB", "USB", "LSB", "AM", "FM", "DIGITALVOICE", "PHONE":
+131
View File
@@ -0,0 +1,131 @@
package watchlist
// ClubLog enrichment — phase 2 of the DXHunter port. clublog.org/watch.php
// answers, per callsign: is this an expedition, does it run OQRS, is there a
// LiveStream, the log's QSO total and the last 24 hours' rate. That block has
// been in the Entry schema since phase 1 (the file round-trips DXHunter's);
// this file finally fills it.
import (
"context"
"encoding/json"
"fmt"
"io"
"net/http"
"strings"
"time"
)
// WatchData is clublog.org/watch.php's answer, reduced to what the tab shows.
type WatchData struct {
IsExpedition bool `json:"is_expedition"`
HasOQRS bool `json:"has_oqrs"`
LiveStream bool `json:"livestream"`
ClubLogInfo *struct {
TotalQSOs int `json:"total_qsos"`
} `json:"clublog_info"`
// {} when populated, [] when empty — RawMessage swallows both shapes.
QSOsPerBand json.RawMessage `json:"24h_qsos_per_band_mode"`
}
// QSOs24h sums the per-band/per-mode counts.
func (d *WatchData) QSOs24h() int {
if len(d.QSOsPerBand) == 0 {
return 0
}
var parsed map[string]map[string]int
if err := json.Unmarshal(d.QSOsPerBand, &parsed); err != nil {
return 0 // "[]" for an empty answer lands here, which is the right zero
}
n := 0
for _, modes := range parsed {
for _, c := range modes {
n += c
}
}
return n
}
// FetchWatch asks ClubLog about one callsign. A 404 is "ClubLog has no log for
// this call" — an ordinary answer, not an error.
func FetchWatch(ctx context.Context, client *http.Client, apiKey, callsign string) (*WatchData, error) {
url := fmt.Sprintf("https://clublog.org/watch.php?call=%s&api=%s",
strings.ToUpper(strings.TrimSpace(callsign)), apiKey)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
if err != nil {
return nil, err
}
req.Header.Set("User-Agent", "OpsLog")
resp, err := client.Do(req)
if err != nil {
return nil, err
}
defer resp.Body.Close()
if resp.StatusCode == http.StatusNotFound {
return &WatchData{}, nil
}
if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("clublog watch %s: HTTP %d", callsign, resp.StatusCode)
}
body, err := io.ReadAll(io.LimitReader(resp.Body, 1<<20))
if err != nil {
return nil, err
}
if len(strings.TrimSpace(string(body))) == 0 {
return &WatchData{}, nil
}
var data WatchData
if err := json.Unmarshal(body, &data); err != nil {
return nil, fmt.Errorf("clublog watch %s: %w", callsign, err)
}
return &data, nil
}
// ApplyClubLog writes one answer into the entry and reports whether anything
// the tab shows actually changed — the caller only broadcasts on true.
func (s *Store) ApplyClubLog(callsign string, d *WatchData) bool {
s.mu.Lock()
defer s.mu.Unlock()
e, ok := s.entries[strings.ToUpper(strings.TrimSpace(callsign))]
if !ok {
return false
}
total := e.ClubLogTotalQSOs
if d.ClubLogInfo != nil {
total = d.ClubLogInfo.TotalQSOs
}
q24 := d.QSOs24h()
changed := e.IsExpedition != d.IsExpedition || e.ClubLogHasOQRS != d.HasOQRS ||
e.ClubLogLiveStream != d.LiveStream || e.ClubLogTotalQSOs != total ||
e.ClubLogQSOs24h != q24
e.IsExpedition = d.IsExpedition
e.ClubLogHasOQRS = d.HasOQRS
e.ClubLogLiveStream = d.LiveStream
e.ClubLogTotalQSOs = total
e.ClubLogQSOs24h = q24
e.ClubLogUpdatedAt = time.Now()
s.scheduleSave()
return changed
}
// StaleEntries lists the callsigns whose ClubLog block is due a refresh.
// Expeditions age faster — their totals are the interesting number and move by
// the hour; a quiet call is asked about four times a day at most.
func (s *Store) StaleEntries(expTTL, otherTTL time.Duration) []string {
s.mu.RLock()
defer s.mu.RUnlock()
now := time.Now()
var out []string
for call, e := range s.entries {
// A starred pattern is a family, not a station — ClubLog has no log
// for "VK9*". The base (star stripped) is what gets asked about.
ttl := otherTTL
if e.IsExpedition {
ttl = expTTL
}
if now.Sub(e.ClubLogUpdatedAt) >= ttl {
out = append(out, call)
}
}
return out
}
+268
View File
@@ -0,0 +1,268 @@
// Package watchlist is the DXHunter watchlist, transplanted: a list of
// callsigns (or prefixes) the operator is hunting, matched against the live
// spot stream, with per-entry state that survives restarts.
//
// The JSON file is DXHunter's OWN schema, field for field — including the
// ClubLog expedition block this phase does not fill yet. Deliberate: the
// operator asked to carry their watchlist.json across, and a file that
// round-trips unchanged is the whole of "same format". The file is GLOBAL
// (dataDir, beside nets.json), not per profile: a DXpedition worth hunting is
// worth hunting whichever station is on.
//
// The CONTEST idea is per entry, not a global mode as in DXHunter: an entry
// marked contest is judged against the CURRENT UTC DAY — at midnight UTC
// yesterday's contacts stop counting and every slot reads "work today" again.
// Nothing resets and nothing is stored for it: the day boundary lives in the
// query, which is why it cannot drift or need a timer.
package watchlist
import (
"encoding/json"
"fmt"
"os"
"sort"
"strings"
"sync"
"time"
)
// Entry is one watched callsign. JSON tags match DXHunter's watchlist.json
// exactly — see the package comment before renaming anything.
type Entry struct {
Callsign string `json:"callsign"`
LastSeen time.Time `json:"lastSeen"`
LastSeenStr string `json:"lastSeenStr"`
AddedAt time.Time `json:"addedAt"`
SpotCount int `json:"spotCount"`
IsContest bool `json:"isContest"`
Notify bool `json:"notify"`
// ClubLog expedition enrichment — phase 2. Carried so a DXHunter file
// round-trips; not filled by OpsLog yet.
IsExpedition bool `json:"isExpedition"`
ClubLogQSOs24h int `json:"clubLogQSOs24h"`
ClubLogTotalQSOs int `json:"clubLogTotalQSOs"`
ClubLogHasOQRS bool `json:"clubLogHasOQRS"`
ClubLogLiveStream bool `json:"clubLogLiveStream"`
ClubLogUpdatedAt time.Time `json:"clubLogUpdatedAt,omitempty"`
}
// Store owns the file. All methods are safe for concurrent use; writes are
// debounced so a burst of MarkSeen calls costs one disk write.
type Store struct {
mu sync.RWMutex
entries map[string]*Entry
path string
saveMu sync.Mutex
saveTimer *time.Timer
ioMu sync.Mutex
}
func New(path string) *Store {
s := &Store{entries: map[string]*Entry{}, path: path}
s.load()
return s
}
func (s *Store) load() {
data, err := os.ReadFile(s.path)
if err != nil {
return // absent on first run — created on first save
}
var list []Entry
if err := json.Unmarshal(data, &list); err != nil {
return // a corrupt file must not take the app down; it is left for repair
}
s.mu.Lock()
defer s.mu.Unlock()
for i := range list {
e := list[i]
e.Callsign = strings.ToUpper(strings.TrimSpace(e.Callsign))
if e.Callsign == "" {
continue
}
s.entries[e.Callsign] = &e
}
}
// Entries returns a snapshot, watched-first ordering left to the UI.
func (s *Store) Entries() []Entry {
s.mu.RLock()
defer s.mu.RUnlock()
out := make([]Entry, 0, len(s.entries))
for _, e := range s.entries {
c := *e
c.LastSeenStr = lastSeenLabel(c.LastSeen)
out = append(out, c)
}
sort.Slice(out, func(i, j int) bool { return out[i].Callsign < out[j].Callsign })
return out
}
// Add creates an entry; contest marks it as re-workable every UTC day. A
// trailing * makes the entry a prefix (VK9* catches every VK9…); anywhere else
// the star is refused rather than silently matching nothing.
func (s *Store) Add(callsign string, contest bool) error {
call := strings.ToUpper(strings.TrimSpace(callsign))
if call == "" {
return fmt.Errorf("callsign required")
}
if i := strings.Index(call, "*"); i >= 0 && i != len(call)-1 {
return fmt.Errorf("* is only allowed at the end (VK9*)")
}
if call == "*" {
return fmt.Errorf("a bare * would match every spot")
}
s.mu.Lock()
defer s.mu.Unlock()
if _, ok := s.entries[call]; ok {
return fmt.Errorf("%s is already on the watchlist", call)
}
s.entries[call] = &Entry{Callsign: call, AddedAt: time.Now(), IsContest: contest}
s.scheduleSave()
return nil
}
// Remove deletes an entry.
func (s *Store) Remove(callsign string) error {
call := strings.ToUpper(strings.TrimSpace(callsign))
s.mu.Lock()
defer s.mu.Unlock()
if _, ok := s.entries[call]; !ok {
return fmt.Errorf("%s is not on the watchlist", call)
}
delete(s.entries, call)
s.scheduleSave()
return nil
}
// SetNotify arms or disarms the alert for one entry.
func (s *Store) SetNotify(callsign string, on bool) error {
return s.patch(callsign, func(e *Entry) { e.Notify = on })
}
// SetContest flips the per-entry contest rule.
func (s *Store) SetContest(callsign string, on bool) error {
return s.patch(callsign, func(e *Entry) { e.IsContest = on })
}
func (s *Store) patch(callsign string, fn func(*Entry)) error {
call := strings.ToUpper(strings.TrimSpace(callsign))
s.mu.Lock()
defer s.mu.Unlock()
e, ok := s.entries[call]
if !ok {
return fmt.Errorf("%s is not on the watchlist", call)
}
fn(e)
s.scheduleSave()
return nil
}
// Match returns the entry a spotted callsign belongs to, or "".
//
// EXACT unless the entry says otherwise: N8W matches only N8W, and it takes
// N8W* to catch N8WCR. The first version prefix-matched everything, DXHunter
// style, and a three-letter special-event call swallowed every longer call
// sharing its start — N8W lit up for N8WCR, which is a different station
// entirely. The operator writes the star when they MEAN a family (VK9*, an
// expedition's portable forms via RI0SP*); a bare entry means that call.
func (s *Store) Match(callsign string) (string, bool) {
call := strings.ToUpper(strings.TrimSpace(callsign))
if call == "" {
return "", false
}
s.mu.RLock()
defer s.mu.RUnlock()
for pattern := range s.entries {
if PatternMatches(pattern, call) {
return pattern, true
}
}
return "", false
}
// PatternMatches reports whether one watchlist pattern covers a callsign:
// exact equality, or — with a trailing * — a prefix.
func PatternMatches(pattern, call string) bool {
if p, ok := strings.CutSuffix(pattern, "*"); ok {
return p != "" && strings.HasPrefix(call, p)
}
return call == pattern
}
// MarkSeen records a spot against the matching entry and reports whether the
// entry wants an alert.
func (s *Store) MarkSeen(callsign string) (entry string, notify bool, ok bool) {
pattern, found := s.Match(callsign)
if !found {
return "", false, false
}
s.mu.Lock()
defer s.mu.Unlock()
e := s.entries[pattern]
if e == nil {
return "", false, false
}
e.LastSeen = time.Now()
e.SpotCount++
s.scheduleSave()
return e.Callsign, e.Notify, true
}
// scheduleSave debounces the write: a burst of spots costs one file write two
// seconds after the last of them. Callers hold s.mu.
func (s *Store) scheduleSave() {
s.saveMu.Lock()
defer s.saveMu.Unlock()
if s.saveTimer != nil {
s.saveTimer.Stop()
}
s.saveTimer = time.AfterFunc(2*time.Second, func() { s.persist() })
}
func (s *Store) persist() {
list := s.Entries()
data, err := json.MarshalIndent(list, "", " ")
if err != nil {
return
}
s.ioMu.Lock()
defer s.ioMu.Unlock()
_ = os.WriteFile(s.path, data, 0o644)
}
// Flush writes now — for shutdown, where the two-second debounce would lose
// the last edits.
func (s *Store) Flush() { s.persist() }
// lastSeenLabel is DXHunter's "Just now / 5m ago / 3h ago / 2d ago" string,
// computed at read time so it never goes stale in the file.
func lastSeenLabel(t time.Time) string {
if t.IsZero() {
return "Never"
}
d := time.Since(t)
switch {
case d < time.Minute:
return "Just now"
case d < time.Hour:
return fmt.Sprintf("%dm ago", int(d.Minutes()))
case d < 24*time.Hour:
return fmt.Sprintf("%dh ago", int(d.Hours()))
default:
return fmt.Sprintf("%dd ago", int(d.Hours()/24))
}
}
// Get returns one entry by its exact name — the alert path needs its contest
// flag after MarkSeen named it.
func (s *Store) Get(callsign string) (Entry, bool) {
s.mu.RLock()
defer s.mu.RUnlock()
e, ok := s.entries[strings.ToUpper(strings.TrimSpace(callsign))]
if !ok {
return Entry{}, false
}
return *e, true
}
+92
View File
@@ -0,0 +1,92 @@
package watchlist
import (
"encoding/json"
"os"
"path/filepath"
"testing"
)
func TestGlobMatch(t *testing.T) {
s := New(filepath.Join(t.TempDir(), "watchlist.json"))
if err := s.Add("RI0SP*", false); err != nil {
t.Fatal(err)
}
if err := s.Add("N8W", false); err != nil {
t.Fatal(err)
}
// A starred entry is a family: the expedition's portable forms.
for _, call := range []string{"RI0SP", "RI0SP/MM", "RI0SP/P"} {
if _, ok := s.Match(call); !ok {
t.Errorf("Match(%q) = false, want true", call)
}
}
// A bare entry is THAT call — the reported bug was N8W lighting up for
// N8WCR, a different station entirely.
if _, ok := s.Match("N8W"); !ok {
t.Error("exact entry must match its own call")
}
if _, ok := s.Match("N8WCR"); ok {
t.Error("exact entry must NOT match a longer call")
}
if _, ok := s.Match("RI0S"); ok {
t.Error("a SHORTER call must not match a starred entry")
}
if err := s.Add("VK*9", false); err == nil {
t.Error("a mid-string star must be refused")
}
if err := s.Add("*", false); err == nil {
t.Error("a bare star must be refused")
}
}
func TestDXHunterFileRoundTrips(t *testing.T) {
// A real DXHunter entry, ClubLog block included. It must survive
// load → save byte-meaningfully: same keys, values preserved.
src := `[{"callsign":"C5SP","lastSeen":"0001-01-01T00:00:00Z","lastSeenStr":"Never",
"addedAt":"2026-01-17T00:18:43.89Z","spotCount":7,"isContest":true,"notify":true,
"isExpedition":true,"clubLogQSOs24h":120,"clubLogTotalQSOs":30500,
"clubLogHasOQRS":true,"clubLogLiveStream":true,"clubLogUpdatedAt":"2026-08-28T22:32:18Z"}]`
dir := t.TempDir()
path := filepath.Join(dir, "watchlist.json")
if err := os.WriteFile(path, []byte(src), 0o644); err != nil {
t.Fatal(err)
}
s := New(path)
s.Flush()
out, err := os.ReadFile(path)
if err != nil {
t.Fatal(err)
}
var list []map[string]any
if err := json.Unmarshal(out, &list); err != nil {
t.Fatal(err)
}
if len(list) != 1 {
t.Fatalf("got %d entries", len(list))
}
e := list[0]
for k, want := range map[string]any{
"callsign": "C5SP", "isContest": true, "notify": true,
"isExpedition": true, "clubLogQSOs24h": float64(120),
"clubLogTotalQSOs": float64(30500), "clubLogHasOQRS": true,
} {
if e[k] != want {
t.Errorf("%s = %v, want %v", k, e[k], want)
}
}
}
func TestMarkSeenAndNotify(t *testing.T) {
s := New(filepath.Join(t.TempDir(), "watchlist.json"))
_ = s.Add("HB040A", false)
_ = s.SetNotify("HB040A", true)
entry, notify, ok := s.MarkSeen("HB040A")
if !ok || !notify || entry != "HB040A" {
t.Fatalf("MarkSeen = %q %v %v", entry, notify, ok)
}
list := s.Entries()
if list[0].SpotCount != 1 || list[0].LastSeenStr != "Just now" {
t.Errorf("entry after MarkSeen: %+v", list[0])
}
}
+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.26.23" appVersion = "0.27.1"
// 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.