Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2fd9845b37 | ||
|
|
e851bd97e0 | ||
|
|
b487ca1145 | ||
|
|
27b342a5e7 | ||
|
|
c1cd76bbcf | ||
|
|
4a28b51ade | ||
|
|
130c4e72e0 | ||
|
|
980c54a616 | ||
|
|
1201b44908 | ||
|
|
9c7983b13e | ||
|
|
01d0b8f22b | ||
|
|
dad71e9e4f | ||
|
|
fbe01bf19d | ||
|
|
fc79be7c05 | ||
|
|
4c2638a7e5 | ||
|
|
a501366cbf | ||
|
|
afde919e5b | ||
|
|
98c49f6bbc | ||
|
|
8b9c835ca1 | ||
|
|
37b436f543 | ||
|
|
656af9dae4 | ||
|
|
eff412a9a9 | ||
|
|
ff7227af5b | ||
|
|
3013a2ba08 | ||
|
|
de95a437bb | ||
|
|
85872f8379 | ||
|
|
55a643d9a4 | ||
|
|
949b92d7e7 | ||
|
|
37e9e288ba | ||
|
|
2b8ebd73cb | ||
|
|
f9f8380ece | ||
|
|
10e1504531 | ||
|
|
2e3464104d | ||
|
|
dc8f9c5099 | ||
|
|
08905a1680 | ||
|
|
fd939797dd | ||
|
|
a621a3ee62 | ||
|
|
ae4a56dac1 | ||
|
|
fdc2378191 | ||
|
|
5388f76733 | ||
|
|
ceb88d2e29 | ||
|
|
ec3e60e47b | ||
|
|
5c6df90526 | ||
|
|
deeb654482 | ||
|
|
8e0865a71f | ||
|
|
d4d22eb4b2 | ||
|
|
592dd08835 | ||
|
|
c6294d9eb3 | ||
|
|
848ce68ec5 | ||
|
|
95e57fb812 | ||
|
|
4441b16699 | ||
|
|
5fd3b5b688 | ||
|
|
f582bbab3a | ||
|
|
b40dc8a597 | ||
|
|
14bb92fac0 | ||
|
|
9887b2aa78 | ||
|
|
2adf252942 | ||
|
|
660653ce14 | ||
|
|
f3b607b15a | ||
|
|
ae5aa7b547 | ||
|
|
f50bbc005c | ||
|
|
e8dfa0eaaf | ||
|
|
b53c56d508 | ||
|
|
67c85be23c | ||
|
|
e41a3a4c1c | ||
|
|
e4276ff66e | ||
|
|
1e87081058 | ||
|
|
12b0a861e0 | ||
|
|
712d83a012 | ||
|
|
bd540ef18b | ||
|
|
2f2fced15c | ||
|
|
97ae05d688 | ||
|
|
df1d2767cd | ||
|
|
ed099a660e | ||
|
|
6536d140ba | ||
|
|
6a6b7ad6c2 | ||
|
|
01a23ccb77 | ||
|
|
9b8168370f | ||
|
|
b2b93e2839 | ||
|
|
f9113b6ad3 | ||
|
|
e168ab4148 | ||
|
|
e4412955f0 | ||
|
|
78eb766789 | ||
|
|
d8064cc426 | ||
|
|
bd4f1b2325 | ||
|
|
b38b9030f0 | ||
|
|
efa711af78 | ||
|
|
ea302966d5 | ||
|
|
ea5c2a56cf | ||
|
|
6b0fc48389 | ||
|
|
a27fa08e4e | ||
|
|
27d0952d01 | ||
|
|
4e9b1eebe9 | ||
|
|
0848c275d2 | ||
|
|
ea0789b191 | ||
|
|
1f94d0ef08 | ||
|
|
dd77e7f467 | ||
|
|
60dad353ce | ||
|
|
1b63483596 | ||
|
|
56c103140c | ||
|
|
b60e8285a4 | ||
|
|
0f1424335e | ||
|
|
506a1e6e4c | ||
|
|
8b7756beb4 | ||
|
|
dee4ffce2a | ||
|
|
fbf3cd116b | ||
|
|
b2165173cf | ||
|
|
912d727d7a | ||
|
|
32036a93ed | ||
|
|
7f4b0b78c0 | ||
|
|
775daa233e | ||
|
|
4fb013701b | ||
|
|
2dd68da284 | ||
|
|
65991be09d | ||
|
|
1c4697ecb2 | ||
|
|
ab89611eca | ||
|
|
b952e074f4 | ||
|
|
e01fc39abc | ||
|
|
deabb74393 | ||
|
|
803f4dc4ed | ||
|
|
20784c2fb1 | ||
|
|
83dbdf0539 | ||
|
|
c9d46cfab9 | ||
|
|
c7140fd639 | ||
|
|
c887b77b5f | ||
|
|
b3e398b8d6 | ||
|
|
f4a72da118 | ||
|
|
086581851b | ||
|
|
f8fdfab031 | ||
|
|
3f82da3c18 | ||
|
|
cd557acf81 | ||
|
|
036dc53fe8 | ||
|
|
73806cbd70 | ||
|
|
ee148732dd | ||
|
|
3014796c1d | ||
|
|
405b0e24cf | ||
|
|
778db0542e | ||
|
|
f50806fbd9 | ||
|
|
bcfb3bfd37 | ||
|
|
cb430a22ee | ||
|
|
abfed4afa2 |
@@ -1,322 +1,77 @@
|
|||||||
# OpsLog
|
# Transceiver Control Interface
|
||||||
|
|
||||||
<a href="https://discord.gg/FYM8yw5pT" target="_blank">
|
## Introduction
|
||||||
<img src="https://img.shields.io/badge/Discord-Join%20the%20server-5865F2?logo=discord&logoColor=white" alt="Join our Discord" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
A modern, fast ham-radio logger for Windows — single-strip entry, real-time CAT
|
TCI (Transceiver Control Interface) is a network interface for control, data transfer and
|
||||||
for **OmniRig**, native **FlexRadio/SmartSDR**, native **Icom CI-V** (USB **and**
|
synchronization between transceiver/receiver, contest loggers, digital mode software, skimmers
|
||||||
remote-over-internet, replacing RS-BA1) and **TCI** (SunSDR / Expert Electronics),
|
and other software, as well as external power amplifiers, bandpass filter units, antenna switches,
|
||||||
DX cluster with spot alerts, awards tracking, maps, contest logging, QSL
|
radio controllers and other devices.
|
||||||
management and a QSL-card designer. Built with **Wails v2** (Go backend +
|
|
||||||
React/TypeScript frontend), **pure Go** (no CGO): SQLite for configuration,
|
|
||||||
optional **shared MySQL** for the logbook so several operators can run one log.
|
|
||||||
Fully themeable and bilingual (English / French).
|
|
||||||
|
|
||||||
Developed by **F4BPO**.
|
TCI was created as a modern alternative to the outdated COM port and audio cable
|
||||||
|
interfaces, it uses a full duplex web socket protocol that runs on top of a TCP connection and
|
||||||
|
serves for server-client communications, providing cross-platform connectivity. Transceiver works
|
||||||
|
as a server, all other software and devices as clients. The server and clients can be inside the
|
||||||
|
same computer (program-server, hardware log, etc.-clients) and/or in separate physical devices
|
||||||
|
connected through the local network (classical transceiver, power amplifier, antenna switch, FFT
|
||||||
|
unit, etc.).
|
||||||
|
|
||||||
---
|
The TCI interface contains basic transceiver control commands (analog of CAT system),
|
||||||
|
receives CW macros from clients and broadcasts them, outputs transceiver IQ stream to clients,
|
||||||
|
receives spots from skimmers and Internet clusters, receives/outputs audio signal to work in
|
||||||
|
digital modes.
|
||||||
|
|
||||||
## Building / developing
|
The TCI uses an extensible architecture and can be supplemented with new functions and
|
||||||
|
commands, while keeping the old ones operational. Thus, the TCI interface can be extended and
|
||||||
|
supplemented to meet the specific needs of any software manufacturer and/or device
|
||||||
|
manufacturer (receivers, transceivers, power amplifiers, switches, etc.). The presence of a device
|
||||||
|
identifier allows the manufacturers of transceivers and receivers to switch to the TCI interface
|
||||||
|
while maintaining the device model designation. The extensibility of the TCI interface allows you
|
||||||
|
to create an individual set of commands and functions for each device model, while maintaining
|
||||||
|
the basic command set inherent to all transceivers.
|
||||||
|
|
||||||
- **Dev:** `wails dev` (Vite hot-reload; Go methods reachable at http://localhost:34115).
|
Our company advocates universal unification of data exchange between devices and
|
||||||
- **Build:** `wails build` (use the project's wails v2.11 — `~/go/bin/wails.exe`).
|
software by creating the TCI interface for this purpose. Modern transceivers and software must
|
||||||
- **Regenerate Go↔TS bindings** after changing exported `App` methods:
|
communicate using one protocol - the TCI protocol.
|
||||||
`wails generate module`.
|
|
||||||
- **Release:** `.vscode/release.ps1` (Ctrl+Shift+P → *Tasks: Run Task* →
|
|
||||||
*Release OpsLog*) — bumps the version, pushes source to Gitea, builds the exe
|
|
||||||
and publishes it to Gitea + GitHub releases.
|
|
||||||
|
|
||||||
---
|
## Interface description
|
||||||
|
|
||||||
## Logging
|
Any command represents an ASCII string that contains a command name and a list of
|
||||||
|
arguments corresponding to this command. There are reserved characters that cannot be
|
||||||
|
included in the command name and command arguments.
|
||||||
|
|
||||||
- **Single-strip entry:** callsign, RST tx/rx, name/QTH/grid, band/mode,
|
List of reserved characters: «:», «,», «;».
|
||||||
TX/RX frequency (split), start/end time, comment/note. The contacted entity's
|
|
||||||
**flag** is shown large next to the RST fields.
|
|
||||||
- **Callsign lookup** (QRZ.com / HamQTH) with photo, auto-fill of name/QTH/grid
|
|
||||||
and the QRZ.com tab.
|
|
||||||
- **Offline DXCC** resolution from `cty.dat` (country, CQ/ITU zones, continent),
|
|
||||||
with `/MM` `/AM` `/B` (beacon) and call-area (`/8`, `/W6`) handling, plus
|
|
||||||
ClubLog DXpedition date overrides.
|
|
||||||
- **Recent QSOs**, **Worked-before** matrix (per band/mode slot), bulk re-resolve
|
|
||||||
from cty/QRZ/ClubLog, bulk send to QSL services. A live **selection count**, a
|
|
||||||
**Select all / Unselect all** toggle, and a row limit that keeps the full log
|
|
||||||
fast **but is lifted while a filter is active** (every match is shown, not just
|
|
||||||
the first page).
|
|
||||||
- **Advanced QSO filter builder** (field / operator / value, AND / OR, saved
|
|
||||||
presets) with filtered- and selected-row **ADIF export**.
|
|
||||||
- **Find duplicates** (Tools) — groups QSOs by same call + band + mode (optionally
|
|
||||||
same day / minute) and lets you pick which to delete.
|
|
||||||
- **ADIF 3.1.7 compliant** import/export: a full field dictionary, 30 promoted
|
|
||||||
columns, a generic "extra fields" editor and standard/all export modes.
|
|
||||||
- **Profiles:** every setting is per-profile; each profile can point its logbook
|
|
||||||
at the local SQLite file or a **shared MySQL** database (multi-operator).
|
|
||||||
|
|
||||||
## Maps & antenna
|
Command structure:
|
||||||
|
1. Name of the command;
|
||||||
|
2. Separating character between command name and arguments «:»;
|
||||||
|
3. Separating character between arguments «,»;
|
||||||
|
4. End of the command character «;».
|
||||||
|
|
||||||
- **Main view = two configurable panes** (per profile, Settings → General →
|
If a command has no arguments, an end of command symbol is placed after the command
|
||||||
*Main view*): great-circle map, locator (street) map, the cluster grid, the
|
name. If the command is invalid, it is ignored. The case of letters does not matter.
|
||||||
worked-before grid, recent QSOs, the **FlexRadio controls**, the **Icom
|
|
||||||
console** or the **Net control** panel.
|
|
||||||
- **Great-circle map** with short/long-path distance & azimuth, selectable
|
|
||||||
basemaps (Light / Voyager / Street / Satellite, all key-free and labelled) and
|
|
||||||
the **antenna beam lobe(s)** drawn from the rotor azimuth.
|
|
||||||
- **Rotor compass** (azimuthal-equidistant, click-to-turn) driven by
|
|
||||||
**PstRotator** (UDP), a **4O3A Rotator Genius** (native TCP) or a **microHAM
|
|
||||||
ARCO** controlled natively — no PstRotator needed — over the **LAN** or **USB**
|
|
||||||
using its Yaesu GS-232A protocol.
|
|
||||||
- **Ultrabeam** support (Normal / 180° reverse / Bidirectional): the radiating
|
|
||||||
direction is shown in green and the **mechanical boom** in grey, on both the
|
|
||||||
compass and the map, so you never lose track of where the antenna points.
|
|
||||||
|
|
||||||
## DX Cluster
|
The ExpertSDR3 program acts as a server, which can have several client connections at
|
||||||
|
the same time, they will be synchronized with each other by the server. When connecting to the
|
||||||
|
ExpertSDR3, the client receives the current status of the ExpertSDR3, first sending initialization
|
||||||
|
commands, then parameters to set the status, such as frequency, modulation, etc.
|
||||||
|
|
||||||
- Multiple cluster servers with auto-reconnect, a master for commands.
|
When a parameter change occurs in the ExpertSDR3 (server) program, the server notifies
|
||||||
- **Filter sidebar** (callsign search, hide-worked, group duplicates, band /
|
all connected clients, i.e., clients do not need to poll the server constantly, any change of state
|
||||||
mode / status / source) shared by the Cluster tab and the Main-view cluster
|
will be sent in time to all clients. If the client sends a new state, the server will set it to itself, as
|
||||||
pane, with a show/hide toggle.
|
well as send it to all clients, that is, the server acts as a synchronizer. All clients connected to the
|
||||||
- Per-spot **status** (new / new-band / new-slot / worked), click-to-tune the
|
server will be automatically synchronized. This way of work allows to minimize network load,
|
||||||
rig, and a multi-band **Band Map** (panadapter-style strips). Optionally, all
|
reducing traffic.
|
||||||
**digital modes count as one** (DXCC-style) for the new/new-slot colouring and
|
|
||||||
the worked-before matrix badges (Settings → General).
|
|
||||||
- **POTA** spots are tagged with their park reference (via `api.pota.app`).
|
|
||||||
- **Spot alerts:** rules on call / country / band / mode /
|
|
||||||
spotter, with sound, visual and e-mail notification (Tools → *Alert
|
|
||||||
management*).
|
|
||||||
|
|
||||||
## CAT control
|
The TCI protocol implements the transmission of receiver IQ stream to clients, which is
|
||||||
|
necessary for the work of special skimmer software, they automatically find the station and
|
||||||
|
decode it throughout the band, and it also allows you to record radio signals in the file.
|
||||||
|
|
||||||
Four native backends (Settings → CAT), each with auto-reconnect and a fast,
|
TCI is also used to transmit audio signals of the receiver to clients and to receive audio
|
||||||
non-blocking connect so a powered-off radio never freezes the app:
|
signals from clients, i.e., the client can transmit audio signals to ExpertSDR3 for radio
|
||||||
|
transmission. The audio stream exchange is designed to work with digital modes, where encoding
|
||||||
|
and decoding is performed by third-party software, as well as in voice modes, where audio macros
|
||||||
|
can be broadcasted, which is very much in demand in contest loggers.
|
||||||
|
|
||||||
- **OmniRig** (Rig 1/2, hot-swap) — works with any OmniRig-supported rig.
|
When working in contests, it is important to record all on the air operation, for this purpose
|
||||||
- **FlexRadio (SmartSDR)** over the radio's TCP API — real-time slice freq /
|
the audio stream from the line-output is sent to all clients. The resulting audio stream can be
|
||||||
mode / split, UDP discovery, and **panadapter spots** (cluster spots pushed to
|
recorded to a file or played back with a PC sound card.
|
||||||
the Flex display; a click fills the call and **tunes the rig to the right
|
|
||||||
frequency AND mode**).
|
|
||||||
- **Icom CI-V** — native, over the radio's **USB** port *or* over the internet
|
|
||||||
via the radio's **built-in LAN server** (see *Remote Icom* below). No RS-BA1 or
|
|
||||||
Remote Utility needed.
|
|
||||||
- **TCI** (WebSocket) — SunSDR / ExpertSDR2 and any TCI-compatible server:
|
|
||||||
freq / mode / PTT / split, plus optional panorama spots.
|
|
||||||
|
|
||||||
Mode is taken from the radio; the digital sub-mode (FT4 vs FT8) is inferred from
|
|
||||||
the frequency. **Per-band Flex RX/TX antennas** can be configured and are applied
|
|
||||||
automatically on band change.
|
|
||||||
|
|
||||||
### FlexRadio control tab (SmartSDR-style)
|
|
||||||
|
|
||||||
Shown only when the CAT backend is a FlexRadio:
|
|
||||||
|
|
||||||
- **Transmit:** RF power, tune power, TUNE, MOX, speech processor (NOR/DX/DX+),
|
|
||||||
VOX (+ level + delay), monitor (+ level), mic gain.
|
|
||||||
- **Receive (active slice):** RX/TX **antenna** selectors and a **DAX** toggle
|
|
||||||
(TX audio through DAX, for WSJT-X & co), AGC mode/threshold, audio level,
|
|
||||||
NB / WNB / NR / ANF, and — on **SmartSDR v4** radios (8000 / Aurora series) —
|
|
||||||
the extra DSP tools **NRL, NRS, NRF** (with level) plus **RNN** (AI noise
|
|
||||||
reduction) and **ANFT** (FFT auto-notch), shown automatically when the radio
|
|
||||||
supports them. **RIT / XIT** with wheel / ± tuning.
|
|
||||||
- **Antenna tuner (ATU):** tune / bypass / memories.
|
|
||||||
- **Amplifier:** the amp card follows whichever amplifier is configured, with a
|
|
||||||
dropdown to pick it when **several amplifiers** are set up (e.g. two SPEs run
|
|
||||||
in parallel). See *Amplifiers & switches* below.
|
|
||||||
- **Live meters** over the UDP VITA-49 stream: S-meter (S-units), forward power
|
|
||||||
(W), SWR, ALC, PA temperature, voltage, plus the amplifier's meters.
|
|
||||||
|
|
||||||
### Icom control tab
|
|
||||||
|
|
||||||
Shown when the CAT backend is Icom (USB or network). A full RS-BA1-style console:
|
|
||||||
|
|
||||||
- **Twin VFO readout** (MAIN / SUB) with the big tabular frequency, mode badge,
|
|
||||||
band and RIT/ΔTX offset, and a **mode-button row** (SSB / CW / RTTY / PSK /
|
|
||||||
AM / FM).
|
|
||||||
- **Spectrum scope + waterfall** (panadapter): ON/OFF, CTR/FIX, double-click to
|
|
||||||
tune, and **◀ ⊙ ▶** buttons to centre the scope on the current frequency
|
|
||||||
(±50 kHz) and pan left/right.
|
|
||||||
- **Live meters** always visible: S-meter (click → fill RST), power in watts, SWR.
|
|
||||||
- **Receive DSP:** AF / RF gain, squelch, AGC, preamp, attenuator, filter
|
|
||||||
(FIL1/2/3), NB, NR, ANF and — **on CW only** — the **APF** (audio peak filter).
|
|
||||||
- **Passband / notch:** Twin PBT (inner / outer), manual notch + position.
|
|
||||||
- **Transmit:** RF power, MOX, TUNE, **split with an automatic offset**
|
|
||||||
(+5 kHz on SSB, +1 kHz on CW), and monitor. On **voice modes only**: mic gain,
|
|
||||||
speech compressor, VOX (+ gain + anti-VOX). Controls that don't apply to the
|
|
||||||
current mode are hidden automatically.
|
|
||||||
- **Bands & antenna:** one-touch band buttons and ANT1/ANT2 selection.
|
|
||||||
- **Clarifiers:** RIT and ΔTX with wheel / ± tuning (Ctrl+←/→ nudges RIT).
|
|
||||||
- **Power ON / OFF** buttons (manual by design — the app never wakes the rig on
|
|
||||||
connect).
|
|
||||||
- **CW keying** can run through the radio's own keyer (see *Keyers* below).
|
|
||||||
|
|
||||||
### Remote Icom (over the internet, no RS-BA1)
|
|
||||||
|
|
||||||
OpsLog speaks the IC-7610's built-in network protocol directly — it **replaces
|
|
||||||
both the Icom Remote Utility and RS-BA1**. Enter the radio's IP, the Network
|
|
||||||
User1 name/password and the CI-V address, and the whole Icom console works over
|
|
||||||
the LAN/internet: login + token (auto-renewed), CI-V tunnel, receive-side
|
|
||||||
retransmit for a rock-solid link even with the panadapter streaming, and manual
|
|
||||||
power ON/OFF. (Audio is out of scope — use the radio in USB + a voice link such
|
|
||||||
as Mumble.)
|
|
||||||
|
|
||||||
## Keyers & audio
|
|
||||||
|
|
||||||
- **CW keyer** with macros and F-key macros. The keyer engine is selectable:
|
|
||||||
**WinKeyer** (K1EL WK1/2/3 over a COM port), **FlexRadio CWX** (the radio's
|
|
||||||
built-in keyer over the SmartSDR API — type-ahead and backspace, no WinKeyer or
|
|
||||||
SmartCAT needed), **Icom** (the radio's own keyer over CI-V — no extra hardware,
|
|
||||||
works over the remote link too) or **TCI**.
|
|
||||||
- **Digital Voice Keyer** (DVK): record F1–F6 voice messages and transmit them.
|
|
||||||
- **QSO audio recording:** continuous rolling capture; on *Log QSO* the contact
|
|
||||||
is saved to a per-QSO WAV (`CALL_YYYYMMDD_HHMMSS.wav`); mixes RX + mic.
|
|
||||||
|
|
||||||
## Amplifiers & switches
|
|
||||||
|
|
||||||
- **Amplifiers** — configure **one or several** amps (Settings → Amplifier is a
|
|
||||||
list; e.g. two SPEs run in parallel for more power). Each amp's control card
|
|
||||||
appears on the FlexRadio tab and in **Station Control**, with a dropdown to
|
|
||||||
choose which one it shows; the bottom status bar carries **one clickable chip
|
|
||||||
per amp** (green = OPERATE, orange = STANDBY, red = offline). Supported:
|
|
||||||
- **PowerGenius XL** (4O3A) over direct TCP — operate/standby, fan-mode
|
|
||||||
selector and fault display.
|
|
||||||
- **SPE Expert** (1.3K-FA / 1.5K-FA / 2K-FA) over **USB** (virtual COM) or the
|
|
||||||
**network** (RS232-to-Ethernet bridge) — operate/standby, ON/OFF,
|
|
||||||
Low / Mid / High output level, an output-power bar and live status (band,
|
|
||||||
SWR, PA current, temperature, warnings/alarms).
|
|
||||||
- **ACOM** (500S / 600S / 700S / 1200S / 2020S) over **USB** or the **network**
|
|
||||||
(RS232-to-Ethernet bridge) — operate/standby/off and live telemetry (forward
|
|
||||||
& reflected power, SWR, PA temperature, band, fan, faults). Power-ON works
|
|
||||||
over a serial cable that wires the DTR/RTS lines.
|
|
||||||
- **Antenna Genius** (4O3A) antenna switch over TCP/GSCP — a docked A/B
|
|
||||||
antenna-switch widget.
|
|
||||||
- **Station Control** panel (dockable, drag-to-reorder widgets): the **rotator**,
|
|
||||||
**Ultrabeam** element control and **relay boards** — WebSwitch 1216H, KMTronic,
|
|
||||||
**Denkovi** USB (FT245 D2XX bit-bang, 4 or 8 relays) and generic USB-serial
|
|
||||||
(CH340 / LCUS, A0 protocol) — for station power, antennas and accessories.
|
|
||||||
- **Relay auto-control** (Settings): switch Station-Control relays automatically
|
|
||||||
from the rig frequency / band (like PstRotator) — per relay, a frequency window
|
|
||||||
or a set of bands.
|
|
||||||
|
|
||||||
## QSL & awards
|
|
||||||
|
|
||||||
- **Awards engine:** built-in + custom award definitions (shared **globally**
|
|
||||||
across profiles) — DXCC, WAS / WAZ / WAC, WPX, IOTA / POTA / SOTA / WWFF,
|
|
||||||
**DDFM**, worked/confirmed/validated by band & mode, OR rules and manual
|
|
||||||
reference assignment, live reference detection on call entry, **reference-list
|
|
||||||
import** for totals/names, and a **Rescan** that re-pulls the logbook (picks up
|
|
||||||
fresh LoTW/QRZ confirmations).
|
|
||||||
- **QSL services:** ClubLog (batched ADIF upload), LoTW, QRZ.com, eQSL — upload
|
|
||||||
and **confirmation download** (which auto-refreshes the award stats).
|
|
||||||
- **QSL Card Designer** (see below).
|
|
||||||
- **E-mail eQSL:** right-click a QSO → *Send eQSL by e-mail* via the configured
|
|
||||||
SMTP account. (Outlook/Hotmail disable basic-auth SMTP — use Gmail with an app
|
|
||||||
password, or a Microsoft app password.)
|
|
||||||
|
|
||||||
## Contest logging
|
|
||||||
|
|
||||||
- **Contest tab:** pick a contest (built-in ADIF `CONTEST_ID` list) and an
|
|
||||||
exchange (running serial or a fixed exchange). OpsLog auto-fills `CONTEST_ID`
|
|
||||||
and the sent/received serials (`STX` / `SRX`), enforces a window start/end,
|
|
||||||
flags dupes and keeps a live scoreboard.
|
|
||||||
|
|
||||||
## Statistics
|
|
||||||
|
|
||||||
- **Logbook statistics dashboard:** headline tiles (QSOs, unique callsigns, DXCC
|
|
||||||
entities, continents, % confirmed) plus charts — QSOs **by mode**, a per-band
|
|
||||||
**CW / phone / data** split, **activity over time** (rolling day / 7-day /
|
|
||||||
30-day / 12-month views), by operator and by continent. Date-range, per-operator
|
|
||||||
and per-contest filters, and a **Table** view that mirrors every chart.
|
|
||||||
|
|
||||||
## Multi-operator live status (special events)
|
|
||||||
|
|
||||||
For a multi-op special-event call on a shared MySQL logbook (e.g. **TM74TFR**),
|
|
||||||
publishing is **automatic** — no setting to turn on. Each OpsLog instance
|
|
||||||
heartbeats its current activity (operator call, band, frequency, mode) into a
|
|
||||||
`live_status` table every ~15 s, and drops back to *off air* automatically 5 min
|
|
||||||
after the last logged QSO. A small PHP renderer
|
|
||||||
([`docs/livestatus/tm74-status.php`](docs/livestatus/tm74-status.php)) on your
|
|
||||||
own web server reads that table and produces a live page/image you can embed on
|
|
||||||
the station's **QRZ.com** bio (`<img src="…/tm74-status.php?img=1">`). OpsLog
|
|
||||||
only writes to the DB — it is not a web server.
|
|
||||||
|
|
||||||
## Net control
|
|
||||||
|
|
||||||
- **Directed-net logging** (Tools → Net): a global roster (`nets.json`) plus an
|
|
||||||
in-memory active session — check stations in, then log them individually or the
|
|
||||||
whole net at once (**Log everyone**) using the CAT frequency. **Drag & drop**
|
|
||||||
between the two lists (roster → on-air starts a QSO, on-air → roster logs it),
|
|
||||||
and after each log the next on-air station is selected automatically so you can
|
|
||||||
chain contacts.
|
|
||||||
|
|
||||||
## Appearance & language
|
|
||||||
|
|
||||||
- **Themes:** four complete themes (Warm light, Warm dark, Graphite dark, High
|
|
||||||
contrast) plus **Auto** (follows the OS light/dark preference), selectable in
|
|
||||||
Settings → General. Every panel and every AG-Grid table follows the theme.
|
|
||||||
- **Bilingual:** full **English / French** UI, with a first-run flag chooser and
|
|
||||||
a switcher in Settings → General.
|
|
||||||
|
|
||||||
## Security
|
|
||||||
|
|
||||||
- **Secret vault:** opt-in passphrase encryption of the stored passwords
|
|
||||||
(AES-GCM + PBKDF2). Encrypted values are portable; a single unlock prompt at
|
|
||||||
launch decrypts them for the session.
|
|
||||||
|
|
||||||
## Integrations (outbound)
|
|
||||||
|
|
||||||
- **UDP emitters:** push the current frequency to **PstRotator**, radio info in
|
|
||||||
**N1MM `RadioInfo`** format, or an **ADIF record on each logged QSO** — so
|
|
||||||
external tools (rotator control, digital apps, other loggers) stay in sync.
|
|
||||||
|
|
||||||
## Other
|
|
||||||
|
|
||||||
- **Autostart:** launch external programs (WSJT-X, JTAlert, rotator control…) at
|
|
||||||
OpsLog startup, skipping any already running.
|
|
||||||
- **Backup:** optional database + ADIF backup at shutdown.
|
|
||||||
- **Update check** at startup and every 5 minutes (and on opening Help → About),
|
|
||||||
with a toast (toggleable), plus a **What's new** dialog that shows the changelog
|
|
||||||
(English / French) on the first launch after an update — reopenable any time
|
|
||||||
from the Help menu.
|
|
||||||
- **Anonymous usage telemetry** (a once-a-day heartbeat: random install ID +
|
|
||||||
version + OS — no callsign or QSO data; opt-out in Preferences).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## QSL Card Designer
|
|
||||||
|
|
||||||
Tools → *QSL Card Designer…* turns a few photos into a polished eQSL card:
|
|
||||||
|
|
||||||
1. Pick 1–6 photos (jpeg/png). OpsLog analyzes them offline (detail/luminance
|
|
||||||
grid) and proposes **3 designs** — callsign in the calmest zone of the best
|
|
||||||
photo, operator name, CQ/ITU zones + locator line, country flag, the other
|
|
||||||
photos as bordered inserts, and a per-QSO confirmation box.
|
|
||||||
2. Pick a proposal and fine-tune it: click an element to select, drag to move,
|
|
||||||
change font / style preset (gel gold, gel silver, classic white outline,
|
|
||||||
script, flat) and per-preset knobs in the right panel.
|
|
||||||
3. Save the template (photos are copied into `data/qsl/templates/<id>/`, so the
|
|
||||||
originals can move). One template can be the default per profile.
|
|
||||||
|
|
||||||
Sending: right-click a QSO → *Send eQSL by e-mail*. The card is rendered with
|
|
||||||
that QSO's data, rasterized to a ≤ 800 KB JPEG, archived in `data/qsl/outbox/`
|
|
||||||
and sent through the configured SMTP account to the address found by the
|
|
||||||
QRZ/HamQTH lookup. On success the QSO is stamped `EQSL_SENT=Y` (ADIF). The
|
|
||||||
e-mail subject/body templates live in the designer
|
|
||||||
(`{CALL} {DATE} {BAND} {MODE} {MYCALL}` variables).
|
|
||||||
|
|
||||||
Fonts: Archivo Black, Lilita One, Baloo 2, Oswald, Great Vibes, Allura (all
|
|
||||||
OFL, embedded — licenses in `internal/qslcard/assets/fonts/`); Cooper Black is
|
|
||||||
offered when MS Office installed it. Flags: flag-icons (MIT), embedded for the
|
|
||||||
commonly-worked DXCC entities.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Data & storage
|
|
||||||
|
|
||||||
- **Config** (settings, profiles, rigs/antennas, cluster nodes, lookup cache,
|
|
||||||
award lists, QSL templates) always lives in the local SQLite file under
|
|
||||||
`data/` — instant even when the logbook is on a far-away MySQL.
|
|
||||||
- **Logbook** (QSOs) lives where the active profile points it: the local SQLite
|
|
||||||
file or a per-profile shared **MySQL** database.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
*A French version of this document is available in [README.fr.md](README.fr.md).*
|
|
||||||
|
|||||||
@@ -0,0 +1,129 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// MY_ANTENNA from the Antenna Genius.
|
||||||
|
//
|
||||||
|
// A station with a switch has a truth the log does not: which antenna is
|
||||||
|
// actually connected right now. The working conditions hold what was PLANNED
|
||||||
|
// for the band — the default antenna ticked for 20 m — and that is right until
|
||||||
|
// the operator throws the switch, at which point the log quietly keeps claiming
|
||||||
|
// the other antenna for the rest of the session.
|
||||||
|
//
|
||||||
|
// So, as an option: when the Antenna Genius knows which antenna is selected,
|
||||||
|
// its name wins. The name is the one configured on the device, because that is
|
||||||
|
// the name the operator gave it and the one they will look for in the log.
|
||||||
|
//
|
||||||
|
// WHICH PORT is the whole difficulty. An Antenna Genius has two, A and B, and a
|
||||||
|
// FlexRadio has two transmit antenna jacks, ANT1 and ANT2. The QSO was made on
|
||||||
|
// exactly one of them, and stamping the wrong port's antenna would be worse
|
||||||
|
// than stamping the band default — a wrong answer that looks authoritative. The
|
||||||
|
// radio's own TX antenna selection is what decides.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/antgenius"
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
keyAntGeniusMyAnt = "antgenius.my_antenna" // use the selected antenna as MY_ANTENNA
|
||||||
|
keyAntGeniusPortForA1 = "antgenius.port_for_ant1" // which AG port ANT1 is wired to (1=A, 2=B)
|
||||||
|
)
|
||||||
|
|
||||||
|
// antGeniusPortFor maps the radio's transmit antenna jack to an Antenna Genius
|
||||||
|
// port.
|
||||||
|
//
|
||||||
|
// The wiring is the station's, not something that can be read from either
|
||||||
|
// device: ANT1 usually goes to port A and ANT2 to port B, which is what the
|
||||||
|
// setting defaults to, but a station wired the other way round would otherwise
|
||||||
|
// log every QSO with the other antenna's name.
|
||||||
|
func (a *App) antGeniusPortFor(txAnt string) int {
|
||||||
|
ant1Port := 1
|
||||||
|
if a.settingOr(keyAntGeniusPortForA1, "1") == "2" {
|
||||||
|
ant1Port = 2
|
||||||
|
}
|
||||||
|
other := 3 - ant1Port
|
||||||
|
switch strings.ToUpper(strings.TrimSpace(txAnt)) {
|
||||||
|
case "ANT1", "ANT 1", "1", "A":
|
||||||
|
return ant1Port
|
||||||
|
case "ANT2", "ANT 2", "2", "B":
|
||||||
|
return other
|
||||||
|
}
|
||||||
|
return 0 // XVTR, a rig with one jack, or nothing reported: no port to name
|
||||||
|
}
|
||||||
|
|
||||||
|
// antGeniusAntennaName returns the name of the antenna currently selected on
|
||||||
|
// the port the radio is transmitting through, or "" when it cannot be told.
|
||||||
|
//
|
||||||
|
// Deliberately silent rather than approximate. Every "" here means the log
|
||||||
|
// keeps the band default it would have had anyway, which is a defensible
|
||||||
|
// answer; a guessed port is not.
|
||||||
|
func (a *App) antGeniusAntennaName() string {
|
||||||
|
if a.antgenius == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
st := a.antgenius.GetStatus()
|
||||||
|
if !st.Connected {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
// The jack in use comes from the FlexRadio's own state — TXAnt lives on the
|
||||||
|
// Flex panel state, not on the backend-agnostic RigState, because only a
|
||||||
|
// Flex has named antenna jacks to report.
|
||||||
|
txAnt := ""
|
||||||
|
if a.cat != nil {
|
||||||
|
if fs, ok := a.cat.FlexState(); ok {
|
||||||
|
txAnt = fs.TXAnt
|
||||||
|
}
|
||||||
|
}
|
||||||
|
port := a.antGeniusPortFor(txAnt)
|
||||||
|
if port == 0 {
|
||||||
|
// One switch port in use and no ambiguity about which: a station whose
|
||||||
|
// radio has a single jack still deserves the name. Two ports carrying
|
||||||
|
// different antennas with nothing to choose between them does not.
|
||||||
|
if st.PortA > 0 && st.PortB == 0 {
|
||||||
|
port = 1
|
||||||
|
} else if st.PortB > 0 && st.PortA == 0 {
|
||||||
|
port = 2
|
||||||
|
} else {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
idx := st.PortA
|
||||||
|
if port == 2 {
|
||||||
|
idx = st.PortB
|
||||||
|
}
|
||||||
|
if idx <= 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return antGeniusNameOf(st, idx)
|
||||||
|
}
|
||||||
|
|
||||||
|
// antGeniusNameOf looks an antenna index up in the device's own list.
|
||||||
|
func antGeniusNameOf(st antgenius.Status, idx int) string {
|
||||||
|
for _, ant := range st.Antennas {
|
||||||
|
if ant.Index == idx {
|
||||||
|
return strings.TrimSpace(ant.Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// applyAntGeniusAntenna overrides MY_ANTENNA with the switch's selection, when
|
||||||
|
// the option is on.
|
||||||
|
//
|
||||||
|
// Called at log time rather than while the entry form is open: an operator who
|
||||||
|
// changes antenna mid-QSO is telling us what the contact was actually made on,
|
||||||
|
// and the value that matters is the one at the moment it is logged.
|
||||||
|
func (a *App) applyAntGeniusAntenna(myAntenna *string) {
|
||||||
|
if myAntenna == nil || a.settingOr(keyAntGeniusMyAnt, "") != "1" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
name := a.antGeniusAntennaName()
|
||||||
|
if name == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if *myAntenna != name {
|
||||||
|
applog.Printf("antgenius: MY_ANTENNA %q → %q (the antenna selected on the switch)", *myAntenna, name)
|
||||||
|
}
|
||||||
|
*myAntenna = name
|
||||||
|
}
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/antgenius"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The switch has two ports and the radio two antenna jacks; a QSO was made
|
||||||
|
// through exactly one of them. Naming the wrong port's antenna would be worse
|
||||||
|
// than naming the band default — it is a wrong answer that looks authoritative.
|
||||||
|
func TestAntennaNameComesFromTheDeviceList(t *testing.T) {
|
||||||
|
st := antgenius.Status{
|
||||||
|
Connected: true,
|
||||||
|
PortA: 2,
|
||||||
|
PortB: 5,
|
||||||
|
Antennas: []antgenius.Antenna{
|
||||||
|
{Index: 2, Name: "OB11-5 20/15/10"},
|
||||||
|
{Index: 5, Name: "Vertical 80m"},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
if got := antGeniusNameOf(st, 2); got != "OB11-5 20/15/10" {
|
||||||
|
t.Fatalf("port A antenna = %q", got)
|
||||||
|
}
|
||||||
|
if got := antGeniusNameOf(st, 5); got != "Vertical 80m" {
|
||||||
|
t.Fatalf("port B antenna = %q", got)
|
||||||
|
}
|
||||||
|
// An index the device never described has no name to give, and inventing
|
||||||
|
// one ("Antenna 7") would put a label in the log that exists nowhere else.
|
||||||
|
if got := antGeniusNameOf(st, 7); got != "" {
|
||||||
|
t.Fatalf("unknown index produced %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The jack-to-port wiring is the station's own. Defaulting ANT1 to port A is a
|
||||||
|
// convention, not a fact, so it is a setting — and the mapping has to hold both
|
||||||
|
// ways round.
|
||||||
|
func TestJackToPortMapping(t *testing.T) {
|
||||||
|
app := &App{}
|
||||||
|
// No settings store: settingOr falls back, which is ANT1 → port A.
|
||||||
|
if got := app.antGeniusPortFor("ANT1"); got != 1 {
|
||||||
|
t.Fatalf("ANT1 mapped to port %d, want A(1)", got)
|
||||||
|
}
|
||||||
|
if got := app.antGeniusPortFor("ANT2"); got != 2 {
|
||||||
|
t.Fatalf("ANT2 mapped to port %d, want B(2)", got)
|
||||||
|
}
|
||||||
|
// A jack that is neither — a transverter port, or a rig that reports
|
||||||
|
// nothing — has no port to name, and saying so beats guessing.
|
||||||
|
if got := app.antGeniusPortFor("XVTR"); got != 0 {
|
||||||
|
t.Fatalf("XVTR mapped to port %d, want none", got)
|
||||||
|
}
|
||||||
|
if got := app.antGeniusPortFor(""); got != 0 {
|
||||||
|
t.Fatalf("an unreported jack mapped to port %d, want none", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,6 +18,8 @@ var deniedCallHashes = map[string]struct{}{
|
|||||||
"46fb61e71afb40627cb6493a6a59c9d4d0231ee3cad1a2bf3fcc4cdfce36fabc": {},
|
"46fb61e71afb40627cb6493a6a59c9d4d0231ee3cad1a2bf3fcc4cdfce36fabc": {},
|
||||||
"d1ae6212ec057f9d5c6f379fb57acedac7c94142c9d49667dc04b2016d03d1b6": {},
|
"d1ae6212ec057f9d5c6f379fb57acedac7c94142c9d49667dc04b2016d03d1b6": {},
|
||||||
"0741c9e394b42f43191899105553b47155ddc3026da12b5360701f9c181ff123": {},
|
"0741c9e394b42f43191899105553b47155ddc3026da12b5360701f9c181ff123": {},
|
||||||
|
"ab4926a3a0ab76d41b5b99cd3ad0683584970c341c29427c1dfa4b3c329ce415": {},
|
||||||
|
"9d17c9c213a6cc89c12d7520bcf21c86a0cf43d17e82e74f33f3a77cb865d28a": {},
|
||||||
}
|
}
|
||||||
|
|
||||||
// callDenied reports whether a callsign is on deniedCallHashes. The call is
|
// callDenied reports whether a callsign is on deniedCallHashes. The call is
|
||||||
|
|||||||
@@ -0,0 +1,120 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Elecraft K3/K4 panel bindings.
|
||||||
|
//
|
||||||
|
// The controls the operator asked for and nothing else: power, volume, the
|
||||||
|
// S-meter and SWR, MOX, and an ATU tune. A K3 exposes dozens of commands, but a
|
||||||
|
// panel earns its place by covering what is reached for during a QSO — and each
|
||||||
|
// one added without a radio to test it against is a control that may or may not
|
||||||
|
// do what its label says. See internal/cat/kenwood_panel.go.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"hamlog/internal/cat"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetKenwoodState returns the K3/K4 panel snapshot. Zero value when the active
|
||||||
|
// CAT backend is something else, which is how the UI knows to hide the panel.
|
||||||
|
func (a *App) GetKenwoodState() cat.KenwoodTXState {
|
||||||
|
if a.cat == nil {
|
||||||
|
return cat.KenwoodTXState{}
|
||||||
|
}
|
||||||
|
st, _ := a.cat.KenwoodState()
|
||||||
|
return st
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SetKenwoodPower(w int) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodPower(w) })
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SetKenwoodAFGain(p int) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodAFGain(p) })
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SetKenwoodRFGain(p int) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodRFGain(p) })
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SetKenwoodMicGain(p int) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodMicGain(p) })
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SetKenwoodSquelch(p int) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodSquelch(p) })
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SetKenwoodPreamp(on bool) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodPreamp(on) })
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SetKenwoodAtt(on bool) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodAtt(on) })
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SetKenwoodNB(on bool) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodNB(on) })
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SetKenwoodNR(on bool) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodNR(on) })
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SetKenwoodAGC(name string) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodAGC(name) })
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SetKenwoodFilter(hz int) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodFilter(hz) })
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SetKenwoodAntenna(n int) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodAntenna(n) })
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SetKenwoodRIT(on bool) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodRIT(on) })
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SetKenwoodXIT(on bool) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodXIT(on) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// NudgeKenwoodRIT moves the RIT/XIT offset by delta Hz.
|
||||||
|
func (a *App) NudgeKenwoodRIT(delta int) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.NudgeKenwoodRIT(delta) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClearKenwoodRIT zeroes the RIT and XIT offsets together, which is what the
|
||||||
|
// radio's own RC does and what an operator means by "clear it".
|
||||||
|
func (a *App) ClearKenwoodRIT() error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.ClearKenwoodRIT() })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetKenwoodTX is the panel's MOX.
|
||||||
|
func (a *App) SetKenwoodTX(on bool) error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodTX(on) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// ToggleKenwoodATU puts the tuner in line or bypasses it (the HOLD of the same
|
||||||
|
// front-panel switch the tune uses).
|
||||||
|
func (a *App) ToggleKenwoodATU() error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.ToggleKenwoodATU() })
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) TuneKenwoodATU() error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.TuneKenwoodATU() })
|
||||||
|
}
|
||||||
|
|
||||||
|
// RefreshKenwood re-reads the settings on the next poll — for when a knob was
|
||||||
|
// turned on the radio itself.
|
||||||
|
func (a *App) RefreshKenwood() error {
|
||||||
|
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.RefreshKenwood() })
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) kenwoodPanelDo(fn func(cat.KenwoodPanelController) error) error {
|
||||||
|
if a.cat == nil {
|
||||||
|
return fmt.Errorf("CAT not initialized")
|
||||||
|
}
|
||||||
|
return a.cat.KenwoodPanelDo(fn)
|
||||||
|
}
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// The voice keyer, through the radio's own link.
|
||||||
|
//
|
||||||
|
// Selecting the radio as the "To radio" output makes the voice keyer hand its
|
||||||
|
// messages to the CAT backend instead of a sound card. Everything around it is
|
||||||
|
// unchanged — the same PTT before and after, the same gain, the same files —
|
||||||
|
// which is the point: the audio takes a different road, not a different route.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/audio"
|
||||||
|
"hamlog/internal/cat"
|
||||||
|
)
|
||||||
|
|
||||||
|
// tciTXPlayer hands one message to the radio.
|
||||||
|
//
|
||||||
|
// The controller is fetched on the CAT goroutine and the message is then played
|
||||||
|
// OFF it. Playing on it would hold that goroutine for the length of the
|
||||||
|
// message, and everything else about the rig — frequency, mode, PTT state —
|
||||||
|
// goes through the same place: a ten-second call would freeze the display and
|
||||||
|
// the antenna following for ten seconds. The TCI backend serialises its own
|
||||||
|
// writes, so this is safe to call from here.
|
||||||
|
func (a *App) tciTXPlayer(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.TCIAudioDo(func(t cat.TCIAudioController) error {
|
||||||
|
p, ok := t.(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)
|
||||||
|
}
|
||||||
|
|
||||||
|
// applyTCITXSource tells the radio where to take its transmit audio from,
|
||||||
|
// following the "To radio" device.
|
||||||
|
//
|
||||||
|
// This is the setting an operator would otherwise have to find in ExpertSDR3
|
||||||
|
// and set again for every mode, because it is remembered per mode there. It is
|
||||||
|
// the third argument of TRX, so OpsLog can simply say it each time it keys —
|
||||||
|
// and a radio told nothing keeps the operator's microphone, which is what
|
||||||
|
// every PTT that is not a voice message should do.
|
||||||
|
func (a *App) applyTCITXSource() {
|
||||||
|
if a.cat == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
cfg, _ := a.GetAudioSettings()
|
||||||
|
src := ""
|
||||||
|
if cfg.ToRadio == audio.NetworkDeviceID {
|
||||||
|
src = "tci"
|
||||||
|
}
|
||||||
|
_ = a.cat.TCIAudioDo(func(t cat.TCIAudioController) error {
|
||||||
|
if s, ok := t.(interface{ SetTXAudioSource(string) }); ok {
|
||||||
|
s.SetTXAudioSource(src)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// installTCITXPlayer offers the radio as an audio output, or withdraws it.
|
||||||
|
//
|
||||||
|
// Withdrawing matters as much as offering: a radio that has gone away must stop
|
||||||
|
// being a device the voice keyer will happily "play" to, or a message goes
|
||||||
|
// nowhere and the operator hears their own PTT click and assumes it worked.
|
||||||
|
func (a *App) installTCITXPlayer(on bool) {
|
||||||
|
if !on {
|
||||||
|
audio.SetNetworkPlayer(nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
audio.SetNetworkPlayer(a.tciTXPlayer)
|
||||||
|
a.applyTCITXSource()
|
||||||
|
applog.Printf("tci: the radio is available as an audio output — no virtual cable needed for the voice keyer")
|
||||||
|
}
|
||||||
@@ -0,0 +1,118 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// The TCI control console — bindings.
|
||||||
|
//
|
||||||
|
// Thin on purpose: the state is a snapshot the radio pushed and the setters are
|
||||||
|
// one command each. Everything interesting is in internal/cat/tci_panel.go.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"hamlog/internal/cat"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetTCIPanel returns the console state. Connected=false when the active CAT
|
||||||
|
// backend is not a TCI radio, so the frontend has one thing to look at rather
|
||||||
|
// than an error to distinguish from a disconnected radio.
|
||||||
|
func (a *App) GetTCIPanel() cat.TCIPanelState {
|
||||||
|
if a.cat == nil {
|
||||||
|
return cat.TCIPanelState{}
|
||||||
|
}
|
||||||
|
st, _ := a.cat.TCIPanelState()
|
||||||
|
return st
|
||||||
|
}
|
||||||
|
|
||||||
|
// tciDo is the shape every setter below takes.
|
||||||
|
func (a *App) tciDo(fn func(cat.TCIPanelController) error) error {
|
||||||
|
if a.cat == nil {
|
||||||
|
return fmt.Errorf("CAT not initialized")
|
||||||
|
}
|
||||||
|
return a.cat.TCIPanelDo(fn)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIDrive sets the transmit drive (0-100).
|
||||||
|
func (a *App) SetTCIDrive(v int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetDrive(v) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCITuneDrive sets the drive TUNE uses (0-100).
|
||||||
|
func (a *App) SetTCITuneDrive(v int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetTuneDrive(v) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIMicLevel sets the microphone gain (0-100).
|
||||||
|
func (a *App) SetTCIMicLevel(v int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetMicLevel(v) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIVolume sets the receive volume in dB (0 down to -60).
|
||||||
|
func (a *App) SetTCIVolume(db int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetVolume(db) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIMute mutes or unmutes the receiver.
|
||||||
|
func (a *App) SetTCIMute(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetMute(on) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIAGC picks the AGC speed: off, long, slow, med, fast.
|
||||||
|
func (a *App) SetTCIAGC(mode string) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetAGC(mode) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCISquelch turns the squelch on or off.
|
||||||
|
func (a *App) SetTCISquelch(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetSquelch(on) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCISquelchLevel sets the squelch threshold in dBm.
|
||||||
|
func (a *App) SetTCISquelchLevel(v int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetSquelchLevel(v) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCINB, SetTCINR, SetTCIANF and SetTCIAPF switch the receive processing.
|
||||||
|
func (a *App) SetTCINB(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetNB(on) })
|
||||||
|
}
|
||||||
|
func (a *App) SetTCINR(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetNR(on) })
|
||||||
|
}
|
||||||
|
func (a *App) SetTCIANF(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetANF(on) })
|
||||||
|
}
|
||||||
|
func (a *App) SetTCIAPF(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetAPF(on) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIFilter sets the passband edges in Hz.
|
||||||
|
func (a *App) SetTCIFilter(lo, hi int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetFilter(lo, hi) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIRIT / SetTCIXIT switch the offsets on; the Offset calls move them.
|
||||||
|
func (a *App) SetTCIRIT(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetRIT(on) })
|
||||||
|
}
|
||||||
|
func (a *App) SetTCIXIT(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetXIT(on) })
|
||||||
|
}
|
||||||
|
func (a *App) SetTCIRITOffset(hz int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetRITOffset(hz) })
|
||||||
|
}
|
||||||
|
func (a *App) SetTCIXITOffset(hz int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetXITOffset(hz) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCILock locks the radio's VFO knob.
|
||||||
|
func (a *App) SetTCILock(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetLock(on) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCITune starts or stops the tune carrier.
|
||||||
|
//
|
||||||
|
// IT TRANSMITS, and at tune_drive rather than at drive — which is why the panel
|
||||||
|
// shows those two numbers next to the button rather than hiding one of them in
|
||||||
|
// a menu.
|
||||||
|
func (a *App) SetTCITune(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetTune(on) })
|
||||||
|
}
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Feeding the QSO recorder from the TCI stream.
|
||||||
|
//
|
||||||
|
// The recorder works in 16 kHz mono, which is what its files and its mixing are
|
||||||
|
// built around; TCI delivers 48 kHz stereo float32. The conversion is the whole
|
||||||
|
// of this file, and it happens here rather than in internal/cat because the
|
||||||
|
// radio's job is to hand over what it sent, not to know what the recorder wants.
|
||||||
|
//
|
||||||
|
// Confirmed on a SunSDR (ExpertSDR3 1.5): 2048 samples a frame, 8192 bytes,
|
||||||
|
// four bytes per sample — and a test recording that plays back clean.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/binary"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/audio"
|
||||||
|
"hamlog/internal/cat"
|
||||||
|
)
|
||||||
|
|
||||||
|
// tciRecordSink pushes the receive stream into the QSO recorder.
|
||||||
|
//
|
||||||
|
// Installed whenever the TCI backend starts, and harmless when nothing is
|
||||||
|
// recording: PushRX drops what arrives unless a QSO is being captured, so the
|
||||||
|
// cost while idle is a decimation and a function call.
|
||||||
|
func (a *App) tciRecordSink(rate int, samples []float32) {
|
||||||
|
if a.qsoRec == nil || len(samples) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
a.qsoRec.PushRX(tciToRecorderPCM(rate, samples))
|
||||||
|
}
|
||||||
|
|
||||||
|
// tciToRecorderPCM converts the stream's mono float samples to the recorder's
|
||||||
|
// 16-bit PCM at its own rate.
|
||||||
|
//
|
||||||
|
// Averaging rather than picking every third sample: dropping samples aliases
|
||||||
|
// everything above 8 kHz back down into the voice band, and on a receiver that
|
||||||
|
// is hiss — the one thing a QSO recording has plenty of. A three-tap mean is a
|
||||||
|
// crude low-pass, but it is a low-pass, and it costs two additions.
|
||||||
|
func tciToRecorderPCM(rate int, samples []float32) []byte {
|
||||||
|
if rate <= 0 {
|
||||||
|
rate = 48000
|
||||||
|
}
|
||||||
|
step := rate / audio.RecorderSampleRate
|
||||||
|
if step < 1 {
|
||||||
|
step = 1
|
||||||
|
}
|
||||||
|
out := make([]byte, 0, (len(samples)/step)*2)
|
||||||
|
for i := 0; i+step <= len(samples); i += step {
|
||||||
|
var sum float32
|
||||||
|
for j := 0; j < step; j++ {
|
||||||
|
sum += samples[i+j]
|
||||||
|
}
|
||||||
|
v := sum / float32(step)
|
||||||
|
if v > 1 {
|
||||||
|
v = 1
|
||||||
|
}
|
||||||
|
if v < -1 {
|
||||||
|
v = -1
|
||||||
|
}
|
||||||
|
var b [2]byte
|
||||||
|
binary.LittleEndian.PutUint16(b[:], uint16(int16(v*32767)))
|
||||||
|
out = append(out, b[0], b[1])
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// startTCIRecording opens the receive stream and routes it to the recorder.
|
||||||
|
//
|
||||||
|
// Called when the TCI backend comes up, and only when the operator has asked
|
||||||
|
// for it by choosing the radio as their receive device: opening a 384 kB/s
|
||||||
|
// stream on a station that records nothing is work the radio does for nobody.
|
||||||
|
func (a *App) startTCIRecording() {
|
||||||
|
if a.cat == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// One switch, and it is the one an operator is already looking at: the
|
||||||
|
// "From radio" device. There used to be a tick box here as well, from when
|
||||||
|
// this was an experiment with no device to choose — two controls for one
|
||||||
|
// question, and the second was where nobody would look.
|
||||||
|
cfg, _ := a.GetAudioSettings()
|
||||||
|
if cfg.FromRadio != audio.NetworkDeviceID {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err := a.cat.TCIAudioDo(func(t cat.TCIAudioController) error {
|
||||||
|
if s, ok := t.(interface {
|
||||||
|
SetTCIAudioSink(func(int, []float32))
|
||||||
|
}); ok {
|
||||||
|
s.SetTCIAudioSink(a.tciRecordSink)
|
||||||
|
}
|
||||||
|
return t.StartTCIAudio(0, 48000)
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
applog.Printf("tci: could not open the receive stream for recording: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
applog.Printf("tci: recording the receive audio over TCI — no virtual cable needed")
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/binary"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/audio"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The stream is 48 kHz and the recorder works at 16 — three to one. A
|
||||||
|
// recording that keeps every sample plays back three times too fast, which is
|
||||||
|
// the fault that gets blamed on the decoding rather than on the rate.
|
||||||
|
func TestTheStreamIsResampledToTheRecorderRate(t *testing.T) {
|
||||||
|
const in = 48000
|
||||||
|
samples := make([]float32, in/10) // a tenth of a second
|
||||||
|
pcm := tciToRecorderPCM(in, samples)
|
||||||
|
want := (audio.RecorderSampleRate / 10) * 2 // 16-bit
|
||||||
|
if len(pcm) != want {
|
||||||
|
t.Fatalf("a tenth of a second produced %d bytes, want %d", len(pcm), want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Full scale must arrive as full scale: a conversion that quietly halves the
|
||||||
|
// level turns a recording into evidence of a fault that is not there.
|
||||||
|
func TestFullScaleSurvivesTheConversion(t *testing.T) {
|
||||||
|
samples := make([]float32, 12)
|
||||||
|
for i := range samples {
|
||||||
|
samples[i] = 1
|
||||||
|
}
|
||||||
|
pcm := tciToRecorderPCM(48000, samples)
|
||||||
|
if len(pcm) < 2 {
|
||||||
|
t.Fatal("no samples came out")
|
||||||
|
}
|
||||||
|
v := int16(binary.LittleEndian.Uint16(pcm[:2]))
|
||||||
|
if v < 32000 {
|
||||||
|
t.Fatalf("full scale came out at %d", v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A rate the recorder already works in is passed through rather than mangled by
|
||||||
|
// a division that would round to nothing.
|
||||||
|
func TestAStreamAtTheRecorderRateIsNotDecimated(t *testing.T) {
|
||||||
|
samples := make([]float32, 160)
|
||||||
|
if got, want := len(tciToRecorderPCM(audio.RecorderSampleRate, samples)), 160*2; got != want {
|
||||||
|
t.Fatalf("%d bytes, want %d", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
+2
-2
@@ -19,7 +19,7 @@ type RowColorRule struct {
|
|||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
Color string `json:"color"`
|
Color string `json:"color"`
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
// Channels this rule looks at: qsl (paper), lotw, eqsl, qrz.
|
// Channels this rule looks at: qsl (paper), lotw, eqsl, qrz, hamlog.
|
||||||
//
|
//
|
||||||
// Empty means ALL of them — what an operator expects from a rule they have
|
// Empty means ALL of them — what an operator expects from a rule they have
|
||||||
// not narrowed, and what keeps a config written before this field meaningful.
|
// not narrowed, and what keeps a config written before this field meaningful.
|
||||||
@@ -27,7 +27,7 @@ type RowColorRule struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// The QSL channels a rule can be scoped to.
|
// The QSL channels a rule can be scoped to.
|
||||||
var rowColorChannels = []string{"qsl", "lotw", "eqsl", "qrz"}
|
var rowColorChannels = []string{"qsl", "lotw", "eqsl", "qrz", "hamlog"}
|
||||||
|
|
||||||
// RowColorSettings is the whole appearance block.
|
// RowColorSettings is the whole appearance block.
|
||||||
type RowColorSettings struct {
|
type RowColorSettings struct {
|
||||||
|
|||||||
+226
@@ -0,0 +1,226 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// The first breadcrumbs, written before anything else can fail.
|
||||||
|
//
|
||||||
|
// OpsLog keeps its log in the data folder, which lives beside the executable —
|
||||||
|
// so every fault that happens BEFORE that folder exists is invisible. Reported
|
||||||
|
// from a Windows 10 machine: "the process appears, no data folder is created,
|
||||||
|
// nothing starts", with no file anywhere to say why. There was nothing to read
|
||||||
|
// because the only place we write to had not been created yet.
|
||||||
|
//
|
||||||
|
// This writes to %LOCALAPPDATA%\OpsLog\startup.log instead: a folder Windows
|
||||||
|
// guarantees is writable for the user, whatever OpsLog itself was installed
|
||||||
|
// into. It records the handful of milestones between the process starting and
|
||||||
|
// the window appearing, and nothing else — it is not a second log, it is the
|
||||||
|
// answer to "it does not start".
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"sync/atomic"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// bootLogPath is the file, or "" when even LOCALAPPDATA is unavailable.
|
||||||
|
func bootLogPath() string {
|
||||||
|
dir := os.Getenv("LOCALAPPDATA")
|
||||||
|
if strings.TrimSpace(dir) == "" {
|
||||||
|
dir = os.TempDir()
|
||||||
|
}
|
||||||
|
if dir == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
dir = filepath.Join(dir, "OpsLog")
|
||||||
|
if err := os.MkdirAll(dir, 0o755); err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return filepath.Join(dir, "startup.log")
|
||||||
|
}
|
||||||
|
|
||||||
|
// bootLog appends one line. Never fails loudly: it exists to explain a failure,
|
||||||
|
// so it must not become one.
|
||||||
|
func bootLog(format string, args ...any) {
|
||||||
|
p := bootLogPath()
|
||||||
|
if p == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
f, err := os.OpenFile(p, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
// Trimmed when it gets long. A startup log that grows for two years is a
|
||||||
|
// file nobody opens, and the interesting launch is always the last one.
|
||||||
|
if fi, err := f.Stat(); err == nil && fi.Size() > 256*1024 {
|
||||||
|
f.Close()
|
||||||
|
_ = os.Remove(p)
|
||||||
|
f, err = os.OpenFile(p, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
}
|
||||||
|
fmt.Fprintf(f, "%s %s\n", time.Now().Format("2006-01-02 15:04:05.000"), fmt.Sprintf(format, args...))
|
||||||
|
}
|
||||||
|
|
||||||
|
// bootLogLaunch records what was launched and from where.
|
||||||
|
func bootLogLaunch() {
|
||||||
|
exe, _ := os.Executable()
|
||||||
|
bootLog("launch: %s %v", exe, os.Args[1:])
|
||||||
|
}
|
||||||
|
|
||||||
|
// checkDataDirWritable makes sure the folder OpsLog keeps everything in can
|
||||||
|
// actually be created and written to, and says exactly what failed if not.
|
||||||
|
//
|
||||||
|
// The data folder sits beside the executable, which is fine on a stick or in a
|
||||||
|
// home directory and refused outright under Program Files — where Windows
|
||||||
|
// silently denies the write to anything not elevated. That refusal used to end
|
||||||
|
// the launch with no window and no message.
|
||||||
|
func checkDataDirWritable() error {
|
||||||
|
dir, err := userDataDir()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("cannot work out where to keep the data: %w", err)
|
||||||
|
}
|
||||||
|
if err := os.MkdirAll(dir, 0o755); err != nil {
|
||||||
|
return fmt.Errorf("cannot create the data folder %s: %w", dir, err)
|
||||||
|
}
|
||||||
|
probe := filepath.Join(dir, ".writetest")
|
||||||
|
if err := os.WriteFile(probe, []byte("ok"), 0o644); err != nil {
|
||||||
|
return fmt.Errorf("the data folder %s cannot be written to: %w", dir, err)
|
||||||
|
}
|
||||||
|
_ = os.Remove(probe)
|
||||||
|
bootLog("data dir ok: %s", dir)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// startupReached flips as soon as OnStartup runs — the first moment OpsLog's
|
||||||
|
// own code is executing inside the window's lifecycle.
|
||||||
|
var startupReached atomic.Bool
|
||||||
|
|
||||||
|
// startupStuckMessage is what an operator sees when the window never starts.
|
||||||
|
//
|
||||||
|
// It names the two causes and what to do about each, because "OpsLog is not
|
||||||
|
// responding" sends people to reinstall OpsLog, which is the one thing that
|
||||||
|
// cannot help: the part that has not started is not ours.
|
||||||
|
const startupStuckMessage = "OpsLog started but its window never opened.\n\n" +
|
||||||
|
"This is the WebView2 runtime failing to start, and it is almost always one of two things:\n\n" +
|
||||||
|
"• The Microsoft Edge WebView2 Runtime is missing — install it from Microsoft, then start OpsLog again.\n" +
|
||||||
|
"• An antivirus is blocking msedgewebview2.exe — add OpsLog's folder to its exceptions.\n\n" +
|
||||||
|
"The details are in the OpsLog folder under LOCALAPPDATA (startup.log)."
|
||||||
|
|
||||||
|
// webviewDataPath is where WebView2 keeps its profile.
|
||||||
|
//
|
||||||
|
// Named rather than left to the default, which lands in the ROAMING profile: on
|
||||||
|
// a managed account that folder can be redirected to a network share, and a
|
||||||
|
// WebView2 profile on a share that is slow or unreachable does not fail — it
|
||||||
|
// hangs, which is indistinguishable from a runtime that will not start.
|
||||||
|
//
|
||||||
|
// It also gives the folder a name someone can be told to delete: a corrupt
|
||||||
|
// profile is a real cause of this, and "delete this folder and try again" is
|
||||||
|
// only advice if the folder can be pointed at.
|
||||||
|
func webviewDataPath() string {
|
||||||
|
dir := os.Getenv("LOCALAPPDATA")
|
||||||
|
if strings.TrimSpace(dir) == "" {
|
||||||
|
return "" // let Wails decide; there is nothing better to offer
|
||||||
|
}
|
||||||
|
p := filepath.Join(dir, "OpsLog", "WebView2")
|
||||||
|
if err := os.MkdirAll(p, 0o755); err != nil {
|
||||||
|
bootLog("WebView2 profile folder %s could not be created: %v — leaving it to Wails", p, err)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return p
|
||||||
|
}
|
||||||
|
|
||||||
|
// stuckMarkerPath is written before the window is attempted and removed once it
|
||||||
|
// opens, so the NEXT launch can tell that the last one never got there.
|
||||||
|
func stuckMarkerPath() string {
|
||||||
|
dir := os.Getenv("LOCALAPPDATA")
|
||||||
|
if strings.TrimSpace(dir) == "" {
|
||||||
|
dir = os.TempDir()
|
||||||
|
}
|
||||||
|
return filepath.Join(dir, "OpsLog", ".launching")
|
||||||
|
}
|
||||||
|
|
||||||
|
// lastLaunchHung is set at startup from the marker left by the previous run.
|
||||||
|
var lastLaunchHung bool
|
||||||
|
|
||||||
|
// noteLaunchAttempt records that a window is about to be attempted, and reports
|
||||||
|
// whether the previous attempt ever finished.
|
||||||
|
func noteLaunchAttempt() {
|
||||||
|
p := stuckMarkerPath()
|
||||||
|
if _, err := os.Stat(p); err == nil {
|
||||||
|
lastLaunchHung = true
|
||||||
|
bootLog("the previous launch never opened its window — trying again with GPU acceleration off")
|
||||||
|
}
|
||||||
|
_ = os.MkdirAll(filepath.Dir(p), 0o755)
|
||||||
|
_ = os.WriteFile(p, []byte(time.Now().Format(time.RFC3339)), 0o644)
|
||||||
|
}
|
||||||
|
|
||||||
|
// clearLaunchMarker is called once the window is up: the attempt finished.
|
||||||
|
func clearLaunchMarker() { _ = os.Remove(stuckMarkerPath()) }
|
||||||
|
|
||||||
|
// fixedWebView2Path finds a FIXED-VERSION WebView2 runtime shipped beside
|
||||||
|
// OpsLog, or "" when there is none.
|
||||||
|
//
|
||||||
|
// Microsoft publishes the runtime in two forms. Evergreen installs itself into
|
||||||
|
// Windows and updates itself — the normal case, and the one this looks for
|
||||||
|
// first. FIXED VERSION is a folder of files an application carries with it and
|
||||||
|
// points at, needing no installation and no administrator: it exists precisely
|
||||||
|
// for machines where Evergreen cannot be installed, which is not a rare
|
||||||
|
// situation on a managed, offline or otherwise locked-down Windows.
|
||||||
|
//
|
||||||
|
// So: drop the extracted folder next to OpsLog.exe and it is used. Nothing to
|
||||||
|
// configure — a setting for this would be a question asked of the one operator
|
||||||
|
// least able to answer it, on a machine where nothing starts.
|
||||||
|
func fixedWebView2Path() string {
|
||||||
|
exe, err := os.Executable()
|
||||||
|
if err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
base := filepath.Dir(exe)
|
||||||
|
for _, name := range []string{"WebView2", "WebView2Runtime", "webview2"} {
|
||||||
|
dir := filepath.Join(base, name)
|
||||||
|
if p := findWebView2Binary(dir); p != "" {
|
||||||
|
bootLog("using the fixed-version WebView2 runtime in %s", p)
|
||||||
|
return p
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// findWebView2Binary returns dir (or its single versioned subfolder) when it
|
||||||
|
// holds msedgewebview2.exe — the fixed-version download unpacks with the
|
||||||
|
// version as a folder level, and asking someone to flatten it by hand is one
|
||||||
|
// more step to get wrong.
|
||||||
|
func findWebView2Binary(dir string) string {
|
||||||
|
if fileExists(filepath.Join(dir, "msedgewebview2.exe")) {
|
||||||
|
return dir
|
||||||
|
}
|
||||||
|
entries, err := os.ReadDir(dir)
|
||||||
|
if err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
for _, e := range entries {
|
||||||
|
if !e.IsDir() {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
sub := filepath.Join(dir, e.Name())
|
||||||
|
if fileExists(filepath.Join(sub, "msedgewebview2.exe")) {
|
||||||
|
return sub
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// edgeBlockedMessage is shown when an Edge blocker is found in the way.
|
||||||
|
//
|
||||||
|
// It names the tool rather than the symptom: OpsLog draws its whole interface
|
||||||
|
// with the WebView2 engine, which is Edge's, so a machine where Edge is blocked
|
||||||
|
// cannot run it — and no amount of reinstalling OpsLog will change that.
|
||||||
|
const edgeBlockedMessage = "OpsLog cannot start because Edge is blocked on this PC.\n\n" +
|
||||||
|
"A blocker tool (or a policy) is stopping msedgewebview2.exe from running. " +
|
||||||
|
"OpsLog draws its whole interface with that engine, so it cannot open its window.\n\n" +
|
||||||
|
"Unblock Edge — in the tool that blocked it — and start OpsLog again. " +
|
||||||
|
"The details are in the OpsLog folder under LOCALAPPDATA (startup.log)."
|
||||||
+34
@@ -0,0 +1,34 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// How a Kenwood-dialect radio is reached.
|
||||||
|
//
|
||||||
|
// Three transports, and they are genuinely different things rather than three
|
||||||
|
// spellings of one: a COM port, the same CAT bytes carried over TCP by a serial
|
||||||
|
// bridge, and the radio's own network protocol — which is a session with its own
|
||||||
|
// framing and authentication, and is not implemented here.
|
||||||
|
//
|
||||||
|
// Kept as an explicit setting rather than inferred from which field an operator
|
||||||
|
// happened to fill in. The old code preferred a network address whenever one was
|
||||||
|
// present, which is invisible from the settings page: someone who typed a host
|
||||||
|
// months ago, then set a COM port, had a radio that never answered and nothing
|
||||||
|
// on screen to explain it.
|
||||||
|
|
||||||
|
const (
|
||||||
|
kenwoodLinkUSB = "usb" // a COM port
|
||||||
|
kenwoodLinkBridge = "bridge" // RS-232 to Ethernet: the same CAT bytes over TCP
|
||||||
|
kenwoodLinkNative = "native" // the radio's own network protocol — not supported
|
||||||
|
)
|
||||||
|
|
||||||
|
// kenwoodLinkOr resolves the stored choice, falling back to what an older
|
||||||
|
// install can be read as: a configured host meant the bridge, because that is
|
||||||
|
// what the previous code used it for.
|
||||||
|
func kenwoodLinkOr(link, host string) string {
|
||||||
|
switch link {
|
||||||
|
case kenwoodLinkUSB, kenwoodLinkBridge, kenwoodLinkNative:
|
||||||
|
return link
|
||||||
|
}
|
||||||
|
if host != "" {
|
||||||
|
return kenwoodLinkBridge
|
||||||
|
}
|
||||||
|
return kenwoodLinkUSB
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The transport is a stored choice now, but installs exist that predate it and
|
||||||
|
// hold only a host. Reading those as "bridge" is what keeps a working station
|
||||||
|
// working across the upgrade — the old code used a host for exactly that.
|
||||||
|
func TestTheLinkIsReadFromAnOlderInstall(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
link, host, want string
|
||||||
|
}{
|
||||||
|
{"", "", kenwoodLinkUSB}, // nothing configured
|
||||||
|
{"", "192.168.1.50:4999", kenwoodLinkBridge}, // upgraded: host only
|
||||||
|
{kenwoodLinkUSB, "192.168.1.50:4999", kenwoodLinkUSB}, // chose USB, host left behind
|
||||||
|
{kenwoodLinkBridge, "", kenwoodLinkBridge},
|
||||||
|
{kenwoodLinkNative, "", kenwoodLinkNative},
|
||||||
|
{"nonsense", "", kenwoodLinkUSB}, // a value nobody wrote: fall back, don't guess
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
if got := kenwoodLinkOr(c.link, c.host); got != c.want {
|
||||||
|
t.Errorf("link=%q host=%q → %q, want %q", c.link, c.host, got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The one that matters after the fact: an operator who picks USB while an old
|
||||||
|
// host is still stored must get the COM port. The previous code preferred the
|
||||||
|
// host whenever it was non-empty, which is invisible from the settings page.
|
||||||
|
func TestChoosingUSBBeatsALeftoverHost(t *testing.T) {
|
||||||
|
if got := kenwoodLinkOr(kenwoodLinkUSB, "10.0.0.9:4999"); got != kenwoodLinkUSB {
|
||||||
|
t.Fatalf("a leftover host overrode the operator's choice: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/cat"
|
||||||
|
)
|
||||||
|
|
||||||
|
// What a rigctl client is told when it asks "what frequency is the radio on".
|
||||||
|
//
|
||||||
|
// Hamlib's "f" means the VFO IN USE — where the operator is listening. RigState
|
||||||
|
// follows ADIF, where FreqHz is where we TRANSMIT, and the two are the same
|
||||||
|
// number until split is engaged. They were handed over unchanged, so with split
|
||||||
|
// on every client asking for the dial was given VFO B.
|
||||||
|
//
|
||||||
|
// Reported from a station running an IC-7850 over USB: turning VFO B moved
|
||||||
|
// VFO A. OpsLog was writing nothing to that radio — a client read the dial, was
|
||||||
|
// handed the transmit VFO, and wrote it back as the dial.
|
||||||
|
func TestShareRXFreqAnswersTheListeningVFO(t *testing.T) {
|
||||||
|
const rx, tx = 14195000, 14200500
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
st cat.RigState
|
||||||
|
want int64
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "simplex — the one frequency there is",
|
||||||
|
st: cat.RigState{FreqHz: rx},
|
||||||
|
want: rx,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "split — the RX VFO, not the TX one",
|
||||||
|
st: cat.RigState{Split: true, FreqHz: tx, RxFreqHz: rx},
|
||||||
|
want: rx,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// A backend that reports split without ever filling RxFreqHz would
|
||||||
|
// otherwise be answered with 0, and a client told the radio is on
|
||||||
|
// 0 Hz does something worse than nothing with it.
|
||||||
|
name: "split claimed but no RX frequency known",
|
||||||
|
st: cat.RigState{Split: true, FreqHz: tx},
|
||||||
|
want: tx,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
t.Run(c.name, func(t *testing.T) {
|
||||||
|
if got := shareRXFreq(c.st); got != c.want {
|
||||||
|
t.Errorf("shareRXFreq(%+v) = %d, want %d", c.st, got, c.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// And the pair, stated together: the two questions must not return the same
|
||||||
|
// answer while split is on, or the distinction has been lost somewhere.
|
||||||
|
func TestShareSplitReportsTheOtherVFO(t *testing.T) {
|
||||||
|
st := cat.RigState{Split: true, FreqHz: 14200500, RxFreqHz: 14195000}
|
||||||
|
rxAnswer := shareRXFreq(st)
|
||||||
|
txAnswer := st.FreqHz // what Split() hands back for "i" / get_split_freq
|
||||||
|
if rxAnswer == txAnswer {
|
||||||
|
t.Fatalf("get_freq and get_split_freq both answered %d — a client cannot tell the VFOs apart", rxAnswer)
|
||||||
|
}
|
||||||
|
if rxAnswer != st.RxFreqHz || txAnswer != st.FreqHz {
|
||||||
|
t.Errorf("got rx=%d tx=%d, want rx=%d tx=%d", rxAnswer, txAnswer, st.RxFreqHz, st.FreqHz)
|
||||||
|
}
|
||||||
|
}
|
||||||
+342
@@ -1,4 +1,346 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "0.26.18",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Awards: the band matrix shows the bands you have contacts on — no more, and no longer capped at 70cm. It used to list every band the award permits, so DDFM stood there with empty 6m and 70cm columns, and it could not show 23cm at all whatever the award said.",
|
||||||
|
"Elecraft KPA500 and KPA1500 amplifiers, over serial or — on the KPA1500 — over the network. Operate/standby, on/off, power, SWR, temperature, supply voltage and current, the band, and faults named in plain words rather than as a code. They join the SPE, the Acom and the PowerGenius, so linking several amplifiers works on them too. NEW, AND NOT YET TESTED ON A REAL AMPLIFIER: it is written from Elecraft's programming reference, so please report what it does.",
|
||||||
|
"The Elecraft amplifiers follow the radio's band by themselves, on the link already open — they have a band command of their own, so no second serial port is involved. It can be turned off for an amplifier wired straight to the radio.",
|
||||||
|
"The Light and Voyager maps came up stamped 'API KEY REQUIRED' across the middle. Carto now watermarks its key-free tiles, so both views move to Esri, the provider already behind Street and Satellite. Light looks the same; Voyager is now a topographic map and is named Topo — anyone who had it selected keeps it.",
|
||||||
|
"Ultrabeam / SteppIR over USB: the COM port can be picked from the list again. It used a field you could also type into, and the list could not be selected from at all.",
|
||||||
|
"A control console for SunSDR / ExpertSDR3, as a tab and as a docked pane: drive and tune drive, mic gain, TUNE, power and SWR while transmitting, volume, mute, squelch, NB, NR, ANF, APF in CW, AGC, filters chosen per mode, RIT and XIT, the VFO lock, and an S-meter reading real dBm. Levels can be dragged, scrolled, stepped or typed. It follows the radio's own window — TCI announces every change, whoever made it.",
|
||||||
|
"The Elecraft console can be docked as a main-view pane. It always could; the setting simply never listed it.",
|
||||||
|
"Spot alerts name the right mode. A 30 m FT8 spot raised an alert saying SSB while the cluster list beside it said DATA: the alert engine had its own, coarser band plan, which called everything above 10.130 phone. Both now read the same table, and a frequency the plan does not cover is left unnamed rather than guessed at.",
|
||||||
|
"Awards: editing an award now refreshes its statistics as well as its grid. Changing which confirmations count — LoTW only, LoTW plus cards — left the whole matrix showing the previous rule's numbers, with nothing to say they were stale.",
|
||||||
|
"The DXCC statistics show the Challenge, and say what the two totals mean. The Challenge counts confirmed band-slots on ten bands and 60 m is not one of them — which is the whole of the gap against LoTW's figure. The Total column is entities, the last column is band-slots, and both now say so when hovered.",
|
||||||
|
"Deleted DXCC entities survive an import. A QSO carrying an entity the ARRL has since deleted — Malyj Vysotskij, Czechoslovakia, the German DR and the rest — was being re-stamped from cty.dat, which only knows where a callsign is TODAY: a 2004 R1MVI came back as European Russia and the credit was gone, for a place that can never be worked again. The number in the file is now left alone for those entities."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Diplômes : la matrice des bandes affiche les bandes sur lesquelles on a des contacts — pas davantage, et sans s'arrêter au 70cm. Elle listait toutes les bandes autorisées par le diplôme, si bien que le DDFM restait avec des colonnes 6m et 70cm vides, et ne pouvait pas afficher le 23cm quoi que dise le diplôme.",
|
||||||
|
"Amplificateurs Elecraft KPA500 et KPA1500, en série ou — pour le KPA1500 — par le réseau. Operate/standby, marche/arrêt, puissance, ROS, température, tension et courant d'alimentation, la bande, et les défauts nommés en clair plutôt qu'en code. Ils rejoignent le SPE, l'Acom et le PowerGenius, donc le couplage de plusieurs amplificateurs fonctionne aussi avec eux. NOUVEAU, ET PAS ENCORE TESTÉ SUR UN VRAI AMPLIFICATEUR : c'est écrit d'après la documentation de programmation d'Elecraft, donc merci de signaler ce que ça donne.",
|
||||||
|
"Les amplificateurs Elecraft suivent tout seuls la bande de la radio, sur la liaison déjà ouverte — ils ont leur propre commande de bande, donc aucun second port série n'intervient. Désactivable pour un amplificateur câblé directement à la radio.",
|
||||||
|
"Les cartes Light et Voyager s'affichaient barrées d'un « API KEY REQUIRED ». Carto marque désormais ses tuiles sans clé, donc les deux vues passent chez Esri, le fournisseur déjà derrière Street et Satellite. Light garde son allure ; Voyager devient une carte topographique et s'appelle Topo — ceux qui l'avaient choisie la conservent.",
|
||||||
|
"Ultrabeam / SteppIR en USB : le port COM se choisit à nouveau dans la liste. Le champ était de ceux où l'on peut aussi taper, et la liste ne se laissait pas sélectionner.",
|
||||||
|
"Une console de contrôle pour SunSDR / ExpertSDR3, en onglet et en volet ancré : puissance et puissance d'accord, gain micro, ACCORD, puissance et ROS pendant l'émission, volume, muet, squelch, NB, NR, ANF, APF en CW, AGC, filtres proposés selon le mode, RIT et XIT, verrouillage du VFO, et un S-mètre en vrais dBm. Les niveaux se règlent à la souris, à la molette, par pas ou en tapant la valeur. Elle suit la fenêtre de la radio — TCI annonce chaque changement, quel qu'en soit l'auteur.",
|
||||||
|
"La console Elecraft peut être ancrée comme volet de la vue principale. Elle le pouvait depuis toujours ; le réglage ne la proposait tout simplement pas.",
|
||||||
|
"Les alertes de spot nomment le bon mode. Un spot FT8 sur 30 m déclenchait une alerte annonçant SSB alors que la liste du cluster juste à côté affichait DATA : le moteur d'alertes avait son propre plan de bandes, plus grossier, qui appelait « phonie » tout ce qui dépassait 10,130. Les deux lisent désormais la même table, et une fréquence hors plan reste sans mode plutôt que devinée.",
|
||||||
|
"Diplômes : modifier un diplôme actualise désormais ses statistiques et pas seulement sa grille. Changer les confirmations qui comptent — LoTW seul, LoTW plus cartes — laissait toute la matrice afficher les chiffres de la règle précédente, sans rien pour dire qu'ils étaient périmés.",
|
||||||
|
"Les statistiques DXCC affichent le Challenge et disent ce que sont les deux totaux. Le Challenge compte les créneaux bande confirmés sur dix bandes, dont le 60 m ne fait pas partie — c'est là tout l'écart avec le chiffre de LoTW. La colonne Total, ce sont les entités ; la dernière, les créneaux bande ; les deux le disent au survol.",
|
||||||
|
"Les entités DXCC supprimées survivent à un import. Un QSO portant une entité depuis supprimée par l'ARRL — Malyj Vysotskij, la Tchécoslovaquie, la RDA et les autres — était réécrit d'après cty.dat, qui ne sait que où se trouve un indicatif AUJOURD'HUI : un R1MVI de 2004 revenait en Russie d'Europe et le crédit disparaissait, pour un endroit qu'on ne pourra plus jamais contacter. Le numéro du fichier est désormais conservé pour ces entités."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.17",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Awards, RDA district comparison: each disagreement can now be settled on its own row. Click the district you keep — the log's or the database's — and apply. It is written into the contact's CNTY and its award reference, and the settled rows leave the list.",
|
||||||
|
"The band/mode matrix: a confirmed slot now shows as confirmed. A callsign worked and not confirmed was outranking an entity CONFIRMED on the same band and mode, so a slot that needs nothing was painted as if it still did.",
|
||||||
|
"CAT sharing: a program connected to OpsLog's rigctl server is told the frequency it is LISTENING on. With split engaged it was given the transmit VFO instead, so a client that reads the dial and writes it back — WSJT-X and its like — could move VFO A when VFO B was turned."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Diplômes, comparaison des districts RDA : chaque divergence se règle désormais sur sa propre ligne. Cliquer le district qu'on garde — celui du log ou celui de la base — puis appliquer. Il est écrit dans le CNTY du contact et dans sa référence de diplôme, et les lignes réglées quittent la liste.",
|
||||||
|
"Matrice bandes/modes : une case confirmée s'affiche enfin comme confirmée. Un indicatif travaillé et non confirmé l'emportait sur une entité CONFIRMÉE sur la même bande et le même mode, si bien qu'une case qui ne demandait plus rien était peinte comme s'il manquait encore quelque chose.",
|
||||||
|
"Partage CAT : un programme connecté au serveur rigctl d'OpsLog reçoit la fréquence sur laquelle on ÉCOUTE. En split, c'était le VFO d'émission qui lui était donné, si bien qu'un client qui lit le VFO et le réécrit — WSJT-X et consorts — pouvait déplacer le VFO A quand on tournait le VFO B."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.16",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"TCI transmit needs no setting up in ExpertSDR3 any more. The protocol lets the audio source be named when keying, so OpsLog does it — the voice keyer works in SSB as well as in the digital modes, nothing has to be set per mode in the radio's own window, and the microphone stays the source for every transmission that is not a voice message."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"L'émission TCI ne demande plus aucun réglage dans ExpertSDR3. Le protocole permet de nommer la source audio au moment de passer en émission, et OpsLog le fait — le manipulateur vocal fonctionne en SSB comme en numérique, il n'y a plus rien à régler mode par mode dans la fenêtre de la radio, et le micro reste la source pour toute émission qui n'est pas un message vocal."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.15",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"SunSDR / ExpertSDR3: the radio's audio now travels over the TCI link itself. Pick 'Radio (TCI network audio)' as the From Radio or To Radio device and the QSO recorder and the voice keyer work with no virtual cable, no second sound card and nothing to set up in the Windows mixer.",
|
||||||
|
"For transmit, ExpertSDR3's own transmit audio source must be set to TCI rather than the microphone — it is remembered per mode, so setting it in SSB does not set it in DIGU. OpsLog says so within a fifth of a second rather than transmitting silence.",
|
||||||
|
"Awards, RDA district comparison: the list stays where it was put. It was thrown back to the first row every three seconds, which made a long list of contacts to correct impossible to work through.",
|
||||||
|
"Elecraft console: the SWR bar works. The radio answers SW; with three digits in tenths of a ratio — SW023 is 2.3:1 — and OpsLog was reading four, so every answer was discarded and the bar stayed empty."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"SunSDR / ExpertSDR3 : l'audio de la radio passe désormais par la liaison TCI elle-même. Choisis « Radio (TCI network audio) » comme périphérique From Radio ou To Radio et l'enregistreur de QSO comme le manipulateur vocal fonctionnent sans câble virtuel, sans seconde carte son et sans rien à régler dans le mixeur Windows.",
|
||||||
|
"Pour l'émission, la source audio d'émission d'ExpertSDR3 doit être réglée sur TCI et non sur le micro — elle est mémorisée par mode, donc la régler en SSB ne la règle pas en DIGU. OpsLog le dit en deux dixièmes de seconde au lieu d'émettre du silence.",
|
||||||
|
"Diplômes, comparaison des districts RDA : la liste reste où on l'a laissée. Elle revenait à la première ligne toutes les trois secondes, ce qui rendait impraticable une longue liste de contacts à corriger.",
|
||||||
|
"Console Elecraft : la barre de ROS fonctionne. La radio répond à SW; par trois chiffres en dixièmes de rapport — SW023 vaut 2,3:1 — et OpsLog en lisait quatre, si bien que chaque réponse était jetée et la barre restait vide."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.14",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Elecraft console: the transmit meters are read whenever the RADIO says it is transmitting, not only when OpsLog keyed it. Keying with the front-panel PTT, a footswitch or the mic button left the panel showing a receiver — and the power and SWR bars are read only while transmitting, so for anyone keying by hand they were never read at all.",
|
||||||
|
"Cluster: the list holds still while it is being read. Scrolled away from the top it stops redrawing and shows how many spots are waiting; scrolling back to the top, or clicking the notice, releases it. On a busy evening a spot lands every second or two and the callsign under the pointer had moved by the time the click arrived.",
|
||||||
|
"Cluster command buttons take 500 characters instead of 120. A DXSpider filter listing wanted prefixes runs past a hundred easily, and the field simply stopped accepting keystrokes — saving the command truncated, with nothing to say so.",
|
||||||
|
"Multi-monitor: the saved window position is now checked against the monitors themselves, not the rectangle that spans them. Monitors rarely fill that rectangle, and a window in one of the leftover gaps passed the old test while being invisible. A position that is genuinely lost is moved onto the nearest screen — keeping the window size — instead of being handed back to Windows, and the screen layout is written to the log at every start.",
|
||||||
|
"PowerGenius XL: the amplifier's real state is read at startup. Its status frame carries no 'operate' field — the state is in 'state' — so on the direct GSCP link the flag was never read at all and OpsLog opened claiming STANDBY on an amp that was in line, with the first press of the button then commanding the state it was already in. IDLE means in line, not keyed.",
|
||||||
|
"Antenna Genius: an option to write the SELECTED antenna into MY_ANTENNA, under the name it carries on the switch, ahead of the band default from Operating conditions. Which of the two ports counts is decided by the antenna jack the radio is transmitting on (ANT1/ANT2 on a Flex), with the jack-to-port wiring set once in Preferences — neither device can report it. When the port cannot be told, the log keeps the band default rather than naming an antenna at random.",
|
||||||
|
"The awards tab beside the entry form (F3) now offers only the awards this station follows, and drops the ones switched off — the same list the Awards tab reads. It offered every award that existed, so a station chasing three of them picked references out of a list of twenty.",
|
||||||
|
"CAT settings ask two questions instead of one: WHICH RADIO, then HOW IT IS CONNECTED — and the second only appears where there is a choice to make. OmniRig leads the list, the brands follow alphabetically, and each offers only what it has: USB for a Yaesu or a Xiegu, USB or an RS-232-to-Ethernet bridge for a Kenwood or an Elecraft, USB or its own network protocol for an Icom, and nothing to choose for a FlexRadio or a SunSDR, which are reached one way each. The old list mixed the two questions — 'Icom (USB)' and 'Icom (network)' were separate entries while Kenwood and Elecraft hid the same choice in a field further down — and the example network address named port 4532, which is Hamlib rigctld and the one OpsLog itself serves under Share CAT.",
|
||||||
|
"An editable list of satellites (Preferences → Lists → Satellites). The satellite-name field on the entry form offers them as a dropdown, alphabetically, and still accepts anything typed. SAT_NAME is compared character for character by the awards and by LoTW — AO-91 and AO91 are two different satellites to everything downstream — so a remembered spelling beats one retyped on every pass.",
|
||||||
|
"Awards, RDA district comparison: the conflict list is taller and scrolls, a callsign in it opens the contact, and the compare and fill-districts buttons say they are working. The list was capped at about six visible rows out of two hundred, in a panel that would not scroll to the rest, and nothing in it could be acted on.",
|
||||||
|
"Preferences no longer redraw with the main window. Being a child of the main view, the whole panel was rebuilt on every cluster spot and every CAT update — several times a second on a busy evening — which looked like a page refreshing constantly and made buttons miss their clicks, the element under the pointer being replaced between the press and the release.",
|
||||||
|
"A launch that fails before the window exists now says why, on screen and in a startup log kept outside the data folder. Every fault before that point was invisible — no window, no folder, no file to read — and the causes are named: a missing or blocked WebView2 runtime, an 'Edge blocker' tool stopping the engine OpsLog draws its interface with, a folder Windows refuses to write to, a copy already running. WebView2 also gets its own profile folder on the local disk, retries without GPU acceleration after a launch that hung, and can use a fixed-version runtime dropped beside OpsLog where the installer cannot run."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Console Elecraft : les mesures d'émission sont lues dès que la RADIO se déclare en émission, et plus seulement quand OpsLog l'a mise en émission. Passer en émission par le PTT de façade, une pédale ou le bouton du micro laissait le panneau croire à une réception — et comme les barres de puissance et de ROS ne sont lues qu'en émission, elles ne l'étaient jamais pour qui manipule à la main.",
|
||||||
|
"Cluster : la liste se fige pendant qu'on la lit. Dès qu'on quitte le haut, elle cesse de se redessiner et indique combien de spots attendent ; revenir en haut, ou cliquer sur l'avis, la relâche. Un soir chargé, un spot tombe toutes les une ou deux secondes et l'indicatif sous le pointeur avait bougé avant que le clic n'arrive.",
|
||||||
|
"Les boutons de commande du cluster acceptent 500 caractères au lieu de 120. Un filtre DXSpider qui énumère des préfixes dépasse la centaine sans peine, et le champ cessait simplement d'accepter les frappes — la commande était enregistrée tronquée, sans un mot.",
|
||||||
|
"Multi-écrans : la position enregistrée est désormais vérifiée contre les écrans eux-mêmes, et non contre le rectangle qui les englobe. Les écrans remplissent rarement ce rectangle, et une fenêtre tombée dans un des trous passait l'ancien test tout en étant invisible. Une position réellement perdue est déplacée sur l'écran le plus proche — en conservant la taille de la fenêtre — au lieu d'être rendue à Windows, et la disposition des écrans est écrite dans le journal à chaque démarrage.",
|
||||||
|
"Power Genius XL : l'état réel de l'amplificateur est lu au démarrage. Sa trame d'état ne contient pas de champ « operate » — l'état est dans « state » — si bien que sur la liaison GSCP directe l'indicateur n'était jamais lu : OpsLog s'ouvrait en annonçant STANDBY sur un ampli en ligne, et le premier appui commandait l'état dans lequel il se trouvait déjà. IDLE veut dire en ligne, pas en émission.",
|
||||||
|
"Antenna Genius : une option pour inscrire l'antenne SÉLECTIONNÉE dans MY_ANTENNA, sous le nom qu'elle porte sur le switch, avant l'antenne par défaut des conditions de trafic. C'est la prise d'antenne sur laquelle la radio émet (ANT1/ANT2 sur un Flex) qui décide du port retenu, le câblage prise→port se règlant une fois dans les préférences — aucun des deux appareils ne peut le dire. Quand le port ne peut pas être déterminé, le journal conserve l'antenne par défaut plutôt que d'en nommer une au hasard.",
|
||||||
|
"L'onglet des diplômes à côté de la saisie (F3) ne propose plus que les diplômes suivis par la station, et écarte ceux qui sont désactivés — la même liste que l'onglet Diplômes. Il proposait tous les diplômes existants : une station qui en chasse trois choisissait ses références dans une liste de vingt.",
|
||||||
|
"Les réglages CAT posent deux questions au lieu d'une : QUELLE RADIO, puis COMMENT ELLE EST RELIÉE — la seconde n'apparaissant que là où il y a un choix. OmniRig ouvre la liste, les marques suivent par ordre alphabétique, et chacune ne propose que ce qu'elle a : USB pour un Yaesu ou un Xiegu, USB ou un pont RS-232 vers Ethernet pour un Kenwood ou un Elecraft, USB ou son protocole réseau propre pour un Icom, et rien à choisir pour un FlexRadio ou un SunSDR, qui n'ont qu'une voie chacun. L'ancienne liste mélangeait les deux questions — « Icom (USB) » et « Icom (réseau) » étaient deux entrées tandis que Kenwood et Elecraft cachaient le même choix dans un champ plus bas — et l'exemple d'adresse réseau citait le port 4532, celui de Hamlib rigctld, que OpsLog propose lui-même sous « Partager le CAT ».",
|
||||||
|
"Une liste de satellites éditable (Préférences → Listes → Satellites). Le champ du nom de satellite dans la saisie les propose en liste déroulante, par ordre alphabétique, et accepte toujours ce qu'on tape. SAT_NAME est comparé caractère par caractère par les diplômes et par LoTW — AO-91 et AO91 sont deux satellites différents pour tout ce qui suit — donc une orthographe mémorisée vaut mieux qu'une ressaisie à chaque passage.",
|
||||||
|
"Diplômes, comparaison des districts RDA : la liste des divergences est plus haute et défile, un indicatif y ouvre le contact, et les boutons comparer et remplir les districts disent qu'ils travaillent. Elle était limitée à six lignes visibles environ sur deux cents, dans un panneau qui ne défilait pas pour montrer le reste, et rien n'y était actionnable.",
|
||||||
|
"Les préférences ne se redessinent plus au rythme de la fenêtre principale. Étant un enfant de la vue principale, tout le panneau était reconstruit à chaque spot du cluster et à chaque mise à jour CAT — plusieurs fois par seconde un soir chargé — ce qui donnait l'impression d'une page qui se rafraîchit sans arrêt et faisait rater les clics, l'élément sous le pointeur étant remplacé entre l'appui et le relâchement.",
|
||||||
|
"Un lancement qui échoue avant l'apparition de la fenêtre dit désormais pourquoi, à l'écran et dans un journal de démarrage tenu hors du dossier data. Toute panne survenant avant ce point était invisible — pas de fenêtre, pas de dossier, aucun fichier à lire — et les causes sont nommées : un runtime WebView2 absent ou bloqué, un « bloqueur Edge » qui empêche le moteur avec lequel OpsLog dessine son interface, un dossier où Windows refuse d'écrire, une copie déjà lancée. WebView2 reçoit aussi son propre dossier de profil sur le disque local, réessaie sans accélération GPU après un lancement bloqué, et peut utiliser un runtime en version fixe déposé à côté d'OpsLog là où l'installateur ne peut pas s'exécuter."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.13",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Elecraft console: MOX unkeys again, and the power and SWR bars move while transmitting. The poll stops while the carrier is up — the rig refuses most questions then — and the panel was left believing the radio was still receiving, so pressing MOX a second time sent another transmit command instead of stopping.",
|
||||||
|
"Elecraft console: RIT and XIT can be moved — ±10 and ±100 Hz buttons with the offset shown beside them. A lit RIT button says the feature is on and nothing about where it has put the receiver.",
|
||||||
|
"Elecraft console: a 4.0 kHz filter button, the K3 maximum and the one FT8 wants.",
|
||||||
|
"FT decodes: a station that is new on both the band and the mode now shows both badges. That status had no badge of its own, so those rows passed the BAND and MODE filters and then displayed no reason for being in the list — only their grid or prefix badge, which looked like the filter leaking.",
|
||||||
|
"Two copies of MSHV are now told apart. MSHV calls every instance 'MSHV', and the dial frequency was filed under that name alone — so a second copy on another band overwrote the first, and decodes made on 14.095 came out labelled 2190 m. Instances are identified by their sending socket as well as their name, and a second one is shown as 'MSHV #2'."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Console Elecraft : MOX repasse bien en réception, et les barres de puissance et de ROS bougent pendant l'émission. L'interrogation s'arrête quand la porteuse est levée — la radio refuse alors la plupart des questions — et le panneau croyait donc la radio toujours en réception : un second appui sur MOX envoyait une nouvelle commande d'émission au lieu d'arrêter.",
|
||||||
|
"Console Elecraft : le RIT et le XIT se règlent — boutons ±10 et ±100 Hz avec le décalage affiché à côté. Un bouton RIT allumé dit que la fonction est active et rien sur l'endroit où elle a mis le récepteur.",
|
||||||
|
"Console Elecraft : un bouton de filtre à 4,0 kHz, le maximum du K3 et celui qu'il faut pour le FT8.",
|
||||||
|
"Décodes FT : une station nouvelle à la fois sur la bande et dans le mode affiche maintenant les deux badges. Ce statut n'avait pas de badge à lui : ces lignes passaient les filtres BANDE et MODE puis n'affichaient aucune raison d'être là — seulement leur badge de locator ou de préfixe, ce qui donnait l'impression d'un filtre qui fuyait.",
|
||||||
|
"Deux copies de MSHV sont maintenant distinguées. MSHV nomme chaque instance « MSHV », et la fréquence d'affichage était rangée sous ce seul nom : une seconde copie sur une autre bande écrasait la première, et des décodes faits sur 14.095 ressortaient étiquetés 2190 m. Les instances sont désormais identifiées par leur socket autant que par leur nom, et la seconde s'affiche « MSHV #2 »."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.12",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"When TQSL refuses an upload, the log now carries the exact ADIF record it was given and the station location it was told to sign with. 'No QSOs processed' covers several unrelated causes and the temp file is deleted the moment TQSL returns, so the one piece of evidence that mattered was the one nobody could see.",
|
||||||
|
"An Elecraft console for the K3/K4, in a tab of its own when the CAT backend is Elecraft or Kenwood: power, volume, RF and mic gain, squelch, preamp, attenuator, NB, NR, AGC, filter width, antenna, RIT/XIT with a clear, keyer speed, S-meter, SWR, MOX and an ATU tune. The meter scaling is marked provisional and the raw readings go to the log — it was written from the K3 Programmer's Reference without a radio to hand, and a wrongly scaled SWR bar reports a good match on a bad antenna.",
|
||||||
|
"Type a number in the callsign field and press Enter to move the radio: kHz for a frequency (28500 → 28.500 MHz), or a band on its own (20, 160, 6…). It is where the hands already are — reading a spot and reaching for the frequency box is what loses the station. Ambiguous numbers are read as bands, since 40 kHz and 160 kHz are nowhere anyone tunes.",
|
||||||
|
"Yaesu console: the mic gain is read and written on the rig's own 0-100 scale. It was treated as 0-255, so an FTDX101 set to 80 showed 38 and every attempt to move the slider was refused by the radio and sprang back.",
|
||||||
|
"Yaesu console: the power slider goes to 200 W on the models that make it (FTDX101MP and the like), and follows the radio if it ever reports more than expected. The slider, not the rig, was the 100 W limit.",
|
||||||
|
"Yaesu console: the NAR button (narrow IF filter) is shown only when the radio answers the command, and says what it is. A button that did nothing when pressed read as a fault in the rig.",
|
||||||
|
"The frequency readout now steps the Hz digits under the mouse wheel too, not just the kHz ones — 100, 10 and 1 Hz. Zero-beating a CW signal is a few tens of Hz, and it was the one move the display would not make.",
|
||||||
|
"The split-pile-up chaser only appears in CW: the marker comes from a skimmer decoding a report, so on SSB or FT8 there is nothing for it to chase.",
|
||||||
|
"Cluster: a single click now only fills the callsign, and a DOUBLE click works the spot — QSY, mode and the rest. Running down the list used to drag the radio along with every line looked at.",
|
||||||
|
"Cluster: how many spots the list keeps is now a setting (Preferences → Cluster, beside the spot lifetime). It was fixed at a thousand, and on a busy evening that fills in a couple of minutes — so the cap, not the lifetime, decided when a spot disappeared and a 15-minute lifetime never expired anything.",
|
||||||
|
"Elecraft console: the ATU tune sends the right switch. SWT19 is the ATU row in the K3 reference — TAP starts a tuning cycle, and a HOLD (the new ATU button) puts the tuner in line or bypasses it. It was written as SWT20, which is not an ATU switch at all. Power now takes the K3 range of 0-110 W.",
|
||||||
|
"Elecraft console: the mouse wheel moves the sliders, as it already did on the Flex and Yaesu consoles. Power steps 5 W a notch, the rest one unit."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Quand TQSL refuse un envoi, le journal contient désormais l'enregistrement ADIF exact qui lui a été remis et l'emplacement de station demandé pour la signature. « No QSOs processed » recouvre plusieurs causes sans rapport et le fichier temporaire est supprimé dès que TQSL rend la main : la seule pièce à conviction utile était justement invisible.",
|
||||||
|
"Une console Elecraft pour les K3/K4, dans un onglet dédié quand le CAT est réglé sur Elecraft ou Kenwood : puissance, volume, gain HF et micro, squelch, préampli, atténuateur, NB, NR, AGC, largeur de filtre, antenne, RIT/XIT avec effacement, vitesse du manipulateur, S-mètre, ROS, MOX et accord de l'ATU. L'échelle des mesures est signalée comme provisoire et les valeurs brutes partent dans le journal — la console a été écrite d'après le manuel de programmation du K3, sans radio sous la main, et une barre de ROS mal calibrée annonce un bon accord sur une mauvaise antenne.",
|
||||||
|
"Taper un nombre dans le champ indicatif puis Entrée déplace la radio : en kHz pour une fréquence (28500 → 28.500 MHz), ou une bande seule (20, 160, 6…). C'est là que sont déjà les mains — lire un spot puis aller chercher la case fréquence, c'est ce qui fait perdre la station. Les nombres ambigus sont lus comme des bandes : 40 kHz ou 160 kHz ne sont nulle part où l'on s'accorde.",
|
||||||
|
"Console Yaesu : le gain micro est lu et écrit sur l'échelle 0-100 de la radio. Il était traité en 0-255 : un FTDX101 réglé sur 80 affichait 38, et toute tentative de bouger le curseur était refusée par la radio et revenait en place.",
|
||||||
|
"Console Yaesu : le curseur de puissance monte à 200 W sur les modèles qui la sortent (FTDX101MP et consorts), et suit la radio si elle annonce davantage. C'était le curseur, pas la radio, qui plafonnait à 100 W.",
|
||||||
|
"Console Yaesu : le bouton NAR (filtre FI étroit) n'apparaît que si la radio répond à la commande, et indique ce qu'il fait. Un bouton sans effet passait pour une panne de la radio.",
|
||||||
|
"L'affichage de fréquence fait maintenant défiler aussi les chiffres des Hz à la molette, pas seulement ceux des kHz — 100, 10 et 1 Hz. Se caler au zéro-beat sur un signal CW se joue à quelques dizaines de Hz, et c'était le seul geste que l'affichage refusait.",
|
||||||
|
"Le chasseur de pile-up en split n'apparaît qu'en CW : le marqueur vient d'un skimmer qui décode un report, donc en SSB ou en FT8 il n'a rien à chasser.",
|
||||||
|
"Cluster : un clic simple ne remplit plus que l'indicatif, et le DOUBLE clic travaille le spot — QSY, mode et le reste. Parcourir la liste entraînait la radio à chaque ligne regardée.",
|
||||||
|
"Cluster : le nombre de spots conservés devient un réglage (Préférences → Cluster, à côté de la durée de vie). Il était fixé à mille, et un soir chargé remplit ça en quelques minutes — c'était donc le plafond, et non la durée de vie, qui décidait de la disparition d'un spot, et une durée de 15 minutes n'expirait jamais rien.",
|
||||||
|
"Console Elecraft : l'accord ATU envoie la bonne touche. SWT19 est la ligne ATU du manuel K3 — l'appui bref lance un cycle d'accord, et le maintien (nouveau bouton ATU) met la boîte en ligne ou la contourne. C'était écrit SWT20, qui n'est pas une touche d'ATU. La puissance suit la plage 0-110 W du K3.",
|
||||||
|
"Console Elecraft : la molette agit sur les curseurs, comme elle le faisait déjà sur les consoles Flex et Yaesu. La puissance avance de 5 W par cran, le reste d'une unité."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.11",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Withdrawing deleted QSOs from Club Log is now paced and capped at 25 per deletion. Their delete endpoint is a real-time one, meant for an operator removing a contact they just mis-logged; Club Log watches the rate and blocks the IP of anything that batches through it. Past the cap OpsLog stops and says so — there is no bulk-delete API, and hundreds of removals belong on clublog.org, which has a tool for it.",
|
||||||
|
"Auto-call, withdrawn earlier, is now disarmed where it was remembered: a stored 'enabled' is switched off and written back the first time OpsLog reads it. The running guard already stopped this build from calling anyone, but the stored flag survived — and any build without that guard would key the transmitter for a feature with no switch left to turn it off."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Le retrait des QSO supprimés chez Club Log est désormais cadencé et limité à 25 par suppression. Leur point d'entrée de suppression est temps réel, prévu pour un opérateur qui retire un contact qu'il vient de mal enregistrer ; Club Log surveille le rythme et bloque l'IP de ce qui passe des lots par là. Au-delà de la limite, OpsLog s'arrête et le dit — il n'existe pas d'API de suppression en masse, et des centaines de retraits se font sur clublog.org, qui a l'outil pour ça.",
|
||||||
|
"L'appel automatique, retiré précédemment, est maintenant désarmé là où il était mémorisé : un « activé » enregistré est éteint et réécrit dès la première lecture par OpsLog. Le garde-fou à l'exécution empêchait déjà cette version d'appeler qui que ce soit, mais l'indicateur enregistré survivait — et toute version sans ce garde-fou passait à l'émission pour une fonction dont il ne reste aucun interrupteur."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.10",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"The HAMLOG.online confirmation import now fills the Results view with the contacts it confirmed, flagged new entity / band / mode / slot, and can export the unmatched ones as ADIF. Those are the interesting half: each is a contact their site holds and the log does not confirm — a minute of drift, a portable call, or a QSO genuinely missing.",
|
||||||
|
"Awards: 'county' joins the searchable QSO fields — the CNTY field as it stands. The existing 'us_county' keys the county to its state, which is right for the United States and wrong everywhere else: an RDA district or a Japanese city code is already unique.",
|
||||||
|
"*** FlexRadio: a split pile-up chaser. When a CW skimmer (SDC) marks a report on the panadapter, OpsLog moves the TRANSMIT slice there — where the DX was listening a second ago — plus a signed offset in Hz; the receive slice never moves. The button sits on the FlexRadio panel beside SPLIT, with the offset next to it. Right-click the button to set the marker text — it has to match what SDC is set to write (599 by default, several allowed), so it is edited where it is switched on rather than in a settings page.***",
|
||||||
|
"The radio's spot feed is now subscribed to even when OpsLog draws no spots of its own — that feed is how another program's spots arrive. Clearing the panadapter at connect still only happens when the overlay is OpsLog's: 'spot clear' removes every spot on the radio, a skimmer's included.",
|
||||||
|
"CW keyer: fixed Enter sending nothing on the Icom, Yaesu and Kenwood engines. Send-on-type only exists on the WinKeyer and Flex CWX, but the setting survived a change of engine — so the switch stayed on, invisibly, and the text field believed everything had already been keyed. Macros were unaffected, which is what made it puzzling."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"L'import des confirmations HAMLOG.online alimente maintenant la vue Résultats avec les contacts confirmés, marqués nouvelle entité / bande / mode / slot, et peut exporter les non-rapprochés en ADIF. C'est la moitié intéressante : chacun est un contact que leur site détient et que le journal ne confirme pas — minute décalée, indicatif portable, ou QSO réellement absent.",
|
||||||
|
"Diplômes : « county » rejoint les champs de QSO interrogeables — le champ CNTY tel quel. Le « us_county » existant associe le comté à son État, ce qui est juste aux États-Unis et faux ailleurs : un district RDA ou un code de ville japonais est déjà unique.",
|
||||||
|
"*** FlexRadio : chasseur de pile-up en split. Quand un skimmer CW (SDC) marque un report sur le panadapter, OpsLog déplace la slice d'ÉMISSION dessus — là où le DX écoutait une seconde plus tôt — plus un décalage signé en Hz ; la slice de réception ne bouge jamais. Le bouton est sur le panneau FlexRadio à côté de SPLIT, avec le décalage juste à côté. Clic droit sur le bouton pour régler le texte du marqueur — il doit correspondre à ce que SDC est réglé à écrire (599 par défaut, plusieurs possibles), donc il se modifie là où on l'active plutôt que dans les réglages.***",
|
||||||
|
"Le flux de spots de la radio est désormais suivi même si OpsLog n'affiche aucun spot : c'est par lui qu'arrivent les spots des autres programmes. Le nettoyage du panadapter à la connexion reste réservé au cas où l'affichage est celui d'OpsLog : « spot clear » efface tous les spots de la radio, y compris ceux d'un skimmer.",
|
||||||
|
"Manipulateur CW : correction d'Entrée qui n'envoyait rien sur les moteurs Icom, Yaesu et Kenwood. L'émission au fil de la frappe n'existe que sur le WinKeyer et le Flex CWX, mais le réglage survivait à un changement de moteur — l'interrupteur restait donc actif, invisible, et le champ de texte croyait que tout avait déjà été émis. Les macros n'étaient pas touchées, ce qui rendait la chose incompréhensible."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.9",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Edit QSO: HAMLOG.online joins the QSL Info tab — its own channel in the picker, with sent/received and both dates, and a row in the status table. Its four columns also move from the QSL group to Uploads, next to Club Log and QRZ.com.",
|
||||||
|
"The filter can now match on when a QSO was added to the log ('Added to the log on'), which is the only way to isolate what an import brought in — an import of old contacts carries old QSO dates and otherwise hides inside the log.",
|
||||||
|
"QSL Manager: HAMLOG.online gains 'Import confirmations (ADIF)…'. Their site exports a log, this reads it back and stamps the confirmations on QSOs already present — it never inserts. Importing that same file through the ordinary ADIF import does insert, because it matches on the UTC minute and their export rarely agrees to the minute.",
|
||||||
|
"Deleting QSOs now says how many rows were actually removed, and writes it to the log. A delete that removes nothing used to look exactly like one that worked.",
|
||||||
|
"Deleting QSOs is fast again when 'delete from the remote services' is on. Club Log is only asked about contacts that were actually uploaded to it — asking about the others earned a 403 each time, one network round trip per QSO — the withdrawals now run in the background instead of holding the window, the rows behind a selection are read in one query rather than one per QSO, and repeated refusals stop the run rather than earning a longer block."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Édition de QSO : HAMLOG.online rejoint l'onglet QSL Info — son propre canal dans la liste, avec envoyé/reçu et les deux dates, et une ligne dans le tableau de statut. Ses quatre colonnes passent aussi du groupe QSL au groupe Uploads, à côté de Club Log et QRZ.com.",
|
||||||
|
"Le filtre peut maintenant porter sur la date d'ajout au journal (« Ajouté au journal le »), seul moyen d'isoler ce qu'un import a apporté : un import de vieux contacts porte de vieilles dates de QSO et se fond sinon dans le journal.",
|
||||||
|
"Gestionnaire QSL : HAMLOG.online reçoit « Importer les confirmations (ADIF)… ». Leur site exporte un log, cette fonction le relit et appose les confirmations sur les QSO déjà présents — elle n'ajoute jamais rien. Le même fichier passé par l'import ADIF ordinaire, lui, ajoute : il compare à la minute UTC près et leur export s'accorde rarement à la minute.",
|
||||||
|
"La suppression de QSO indique maintenant combien de lignes ont réellement été supprimées, et l'écrit dans le journal. Une suppression sans effet ressemblait exactement à une suppression réussie.",
|
||||||
|
"La suppression de QSO redevient rapide quand « supprimer aussi des services externes » est activé. Club Log n'est plus interrogé que pour les contacts qui y ont réellement été envoyés — pour les autres il répondait 403, un aller-retour réseau par QSO — les retraits se font désormais en arrière-plan au lieu de bloquer la fenêtre, les lignes d'une sélection sont lues en une seule requête au lieu d'une par QSO, et une série de refus interrompt le traitement au lieu d'aggraver le blocage."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.8",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Yaesu: an ANT row in the rig panel selects the antenna jack, and the choice is remembered for the band it was made on — change band and the antenna follows. There is no page to configure: picking the antenna once on a band says it perfectly well. Rigs with a single socket never show the row.",
|
||||||
|
"HAMLOG.online: QSOs can be uploaded as they are logged, like QRZ.com or Club Log. The API key is checked in the settings before the first contact — the answer names the account it belongs to, so a key pasted from another callsign or an expired one is caught at once instead of after a week of silent refusals.",
|
||||||
|
"HAMLOG.online is also a confirmation source for awards, alongside LoTW, QSL, eQSL and QRZ.com — tick it under Confirmed, under Validated, or both.",
|
||||||
|
"A rig whose serial port is refused now says who is likely holding it — OmniRig stays resident and keeps the port of the rig configured in it, which is what a native backend then never gets. \"Serial port busy\" alone named nobody.",
|
||||||
|
"The row colours in Appearance can be scoped to HAMLOG.online as well, alongside paper, LoTW, eQSL and QRZ.com.",
|
||||||
|
"HAMLOG.online appears in the QSL Manager too: pick it to see every QSO never sent there and upload the backlog in one go. A contact already sent carries the date it went, so a second sweep does not send it twice.",
|
||||||
|
"Right-clicking QSOs offers HAMLOG.online among the upload targets, and the toast names each service properly instead of echoing its internal id.",
|
||||||
|
"Bulk edit can set HAMLOG.online sent and received, each with its status and its date — the same four fields every other service has there. A log uploaded to their site by hand had no way to be marked as sent, so OpsLog kept offering to upload every contact again.",
|
||||||
|
"HAMLOG.online joins the Confirmations defaults and the QSO grid columns — sent and received, each with its status and date, hidden by default like the other extras-backed columns.",
|
||||||
|
"Removed the explanatory paragraph from the Confirmations page.",
|
||||||
|
"HAMLOG.online confirmations are read from the site's own ADIF field, APP_HAMLOG_QSO_CFM, taken from a real export. Import a log downloaded from HAMLOG and its confirmations count for awards straight away, with nothing to rename and no mapping to configure.",
|
||||||
|
"The four HAMLOG.online fields are filterable too, so 'never sent there' is a filter and not a guess.",
|
||||||
|
"RDA: a read-only comparison of the two district sources — the offline RDA database against the CNTY carried by a log imported from HAMLOG.online — reporting how many agree, how many differ, and listing the disagreements with the contact, both districts, and whether the database answer was a dated record or an assumption.",
|
||||||
|
"The QSO right-click menu can now export the selection to ADIF with the OpsLog fields, so the award references (RDA@KR-04 and the like) travel with the contacts. The existing entry still writes standard ADIF for other loggers.",
|
||||||
|
"The filtered-view export gets the same treatment: a second right-click entry writes the whole filtered view to ADIF with the OpsLog fields."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Yaesu : une ligne ANT dans le panneau du poste sélectionne la prise d'antenne, et le choix est mémorisé pour la bande sur laquelle il a été fait — on change de bande, l'antenne suit. Aucune page à configurer : choisir l'antenne une fois sur une bande le dit très bien. Les postes à une seule prise n'affichent jamais la ligne.",
|
||||||
|
"HAMLOG.online : les QSO peuvent être envoyés au fil de leur enregistrement, comme QRZ.com ou Club Log. La clé API se vérifie dans les réglages avant le premier contact — la réponse nomme le compte auquel elle appartient, donc une clé d'un autre indicatif ou expirée se voit tout de suite au lieu d'après une semaine de refus silencieux.",
|
||||||
|
"HAMLOG.online est aussi une source de confirmation pour les diplômes, aux côtés de LoTW, QSL, eQSL et QRZ.com — à cocher dans Confirmé, dans Validé, ou les deux.",
|
||||||
|
"Un poste dont le port série est refusé indique maintenant qui le détient vraisemblablement — OmniRig reste résident et garde le port de la radio configurée chez lui, que le backend natif n'obtient alors jamais. « Serial port busy » ne désignait personne.",
|
||||||
|
"Les couleurs de lignes dans Apparence peuvent aussi être limitées à HAMLOG.online, aux côtés du papier, de LoTW, d'eQSL et de QRZ.com.",
|
||||||
|
"HAMLOG.online figure aussi dans le gestionnaire QSL : on le choisit pour voir tous les QSO jamais envoyés là-bas et expédier l'arriéré d'un coup. Un contact déjà envoyé porte la date de son départ, donc un second passage ne le renvoie pas.",
|
||||||
|
"Le clic droit sur des QSO propose HAMLOG.online parmi les destinations d'envoi, et la notification nomme correctement chaque service au lieu d'afficher son identifiant interne.",
|
||||||
|
"L'édition en masse peut renseigner HAMLOG.online envoyé et reçu, chacun avec son statut et sa date — les mêmes quatre champs que les autres services. Un journal téléversé à la main sur leur site n'avait aucun moyen d'être marqué comme envoyé, et OpsLog proposait donc de renvoyer tous les contacts.",
|
||||||
|
"HAMLOG.online rejoint les valeurs par défaut des Confirmations et les colonnes de la grille des QSO — envoyé et reçu, chacun avec son statut et sa date, masquées par défaut comme les autres colonnes issues des extras.",
|
||||||
|
"Suppression du paragraphe explicatif de la page Confirmations.",
|
||||||
|
"Les confirmations HAMLOG.online sont lues dans le champ ADIF du site lui-même, APP_HAMLOG_QSO_CFM, relevé sur un export réel. Il suffit d'importer un journal téléchargé depuis HAMLOG pour que ses confirmations comptent aussitôt pour les diplômes, sans rien renommer ni configurer.",
|
||||||
|
"Les quatre champs HAMLOG.online sont aussi filtrables, pour que « jamais envoyé là-bas » soit un filtre et non une supposition.",
|
||||||
|
"RDA : une comparaison en lecture seule des deux sources de district — la base RDA hors ligne face au CNTY d'un journal importé depuis HAMLOG.online — indiquant combien concordent, combien divergent, et listant les désaccords avec le contact, les deux districts, et si la réponse de la base était un enregistrement daté ou une hypothèse.",
|
||||||
|
"Le menu contextuel des QSO peut maintenant exporter la sélection en ADIF avec les champs OpsLog, pour que les références de diplômes (RDA@KR-04 et compagnie) suivent les contacts. L'entrée existante écrit toujours de l'ADIF standard pour les autres carnets.",
|
||||||
|
"L'export de la vue filtrée reçoit le même traitement : une seconde entrée du menu contextuel écrit toute la vue filtrée en ADIF avec les champs OpsLog."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.7",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"The NEW badge on a county now shows in the entry form itself, inside the field, and not only on the Info tab — it answers the question at the moment the operator is deciding whether to call.",
|
||||||
|
"OmniRig: a Yaesu is no longer sent OmniRig's SetSimplexMode when tuning. It is a no-op on some (an FT-891 never moved) and harmful on others — on an FT-2000 it turned split on and moved reception to VFO B, which is why OpsLog then showed B instead of A. The direct frequency write, which is what tunes these rigs, is unchanged.",
|
||||||
|
"The basemap buttons on the main map are shifted clear of the zoom controls — Light sat a few pixels from the minus button and was being clicked by mistake.",
|
||||||
|
"Cluster, French interface: the WKD CALL status now reads DÉJÀ QSO instead of DÉJÀ CTC.",
|
||||||
|
"Icom over LAN: the receive audio streamed by the rig now feeds the QSO recorder as well as the speakers. On a network connection Windows sees no radio sound card at all — the audio settings could only offer the PC microphone — so the stream is pushed straight into the recorder, with no virtual cable to set up."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Le badge NOUV du comté s'affiche maintenant dans le formulaire de saisie lui-même, à l'intérieur du champ, et plus seulement dans l'onglet Info — il répond au moment où l'opérateur décide d'appeler ou non.",
|
||||||
|
"OmniRig : le SetSimplexMode d'OmniRig n'est plus envoyé aux Yaesu lors d'un changement de fréquence. Il est sans effet sur certains (un FT-891 ne bougeait pas) et nuisible sur d'autres — sur un FT-2000 il activait le split et faisait passer la réception sur le VFO B, d'où l'affichage du B au lieu du A. L'écriture directe de la fréquence, qui est ce qui accorde réellement ces postes, ne change pas.",
|
||||||
|
"Les boutons de fond de carte sont décalés à l'écart des commandes de zoom — Light était à quelques pixels du bouton moins et se faisait cliquer par erreur.",
|
||||||
|
"Cluster, interface française : le statut « DÉJÀ CTC » devient « DÉJÀ QSO ».",
|
||||||
|
"Icom en réseau : l'audio reçu diffusé par le poste alimente maintenant l'enregistreur de QSO en plus des haut-parleurs. Sur une liaison réseau, Windows ne voit aucune carte son de la radio — les réglages audio ne proposaient que le micro du PC — donc le flux est injecté directement dans l'enregistreur, sans câble virtuel à installer."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.6",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"FT decodes: the continent filter is now a multiple choice — click AF, AS, OC and SA to keep those four. It still lists only the continents actually being decoded, plus any you have selected, so a filter can never strand itself with no chip left to switch it off.",
|
||||||
|
"A QSO logged by WSJT-X, JTDX or MSHV now raises a notice in the corner naming the station. Watching the decodes, nothing else on screen said it had happened: the entry form never cleared, because nobody typed in it.",
|
||||||
|
"Icom CI-V: a reply the rig sent to another controller on the same bus is no longer mistaken for ours, and a PTT command whose acknowledgement goes missing is verified by reading the rig instead of being reported as a failure. WSJT-X and JTDX answer a failed set_ptt with a Rig Control Error and drop the link mid-over, which is what an IC-7850 was doing three times a session. The check itself waits 700 ms rather than the poll's 150: the rig has just failed to answer twice, usually because it is retuning — JTDX moves the transmit frequency and keys in the same breath — and a short probe would fail for the same reason. Both outcomes are logged, so a failure that remains can be told from a fix that did not fire.",
|
||||||
|
"FlexRadio: each spot status can now be kept off the panadapter entirely, with a switch beside its colours — and WSJT-X decode spots obey the same switches and the same colours. The palette governs the panadapter, not just one of the two things that feed it: statuses switched off still piled up on the waterfall because the decodes were pushed by another path.",
|
||||||
|
"Panadapter spot comments now read like DXHunter's: the cluster text, then the spotter, the entity and the status — \"CQ up 2 [F4BPO] [Franz Josef Land] [New Slot]\". The words were running together because SmartSDR splits its command line on spaces; non-breaking spaces get them through.",
|
||||||
|
"\"Already worked\" on a panadapter spot now means the CALLSIGN is in the log, not the entity. An entity worked on that band and mode is no news, and saying \"already worked\" of a station never contacted was wrong.",
|
||||||
|
"FT decodes: a compound MSHV message that answers two stations in one line — \"DM8BJF RR73; F4BPO <RI1FJL> +14\" — is now recognised as addressed to you when your callsign is in the second half.",
|
||||||
|
"Edit QSO: your own transmit power can be edited at last — the field was saved and written back but had no box, so a contact logged at the wrong power could never be corrected. The contacted station's extended locator gained a box for the same reason, and the power labels now say WHOSE power they are.",
|
||||||
|
"FlexRadio: a spot is no longer removed and redrawn when nothing about it has changed. A busy skimmer feed re-spots the same station every few seconds — one two-minute session sent 2128 spot adds, 88 of them for a single callsign — and the panadapter did not move a pixel for any of them.",
|
||||||
|
"Panadapter spot comments are kept within what the radio will accept: SmartSDR was cutting the longest ones mid-word, losing the entity and the status. The cluster's own words are trimmed first, the spotter, entity and status always survive. The column padding of an RBN line is collapsed to single spaces too — kept as non-breaking spaces it opened a gap wide enough to push the rest of the comment off the screen.",
|
||||||
|
"Auto-call is withdrawn — it duplicated DXHunter, which already answers decodes. Clicking a decode to answer it is unchanged.",
|
||||||
|
"The elastic bounce at the end of a list is gone, and a two-finger horizontal swipe no longer navigates the window away from the app. Both are browser behaviours that only appear on a touchpad or a touchscreen.",
|
||||||
|
"The interface zoom now says what it is doing: a badge shows the factor while it changes, clicking it returns to 100%, and View → Zoom in / Zoom out / Actual size makes it findable. Ctrl+wheel and Ctrl+0 always worked, but nothing announced them — zoom by accident and there was no way back.",
|
||||||
|
"Icom CI-V: a frequency or mode change whose acknowledgement goes missing is now verified by reading the rig back, like the PTT already was. All three are commands WSJT-X and JTDX answer with a Rig Control Error and a dropped link, and an IC-7850 log shows a set_freq doing exactly that.",
|
||||||
|
"The log file now rotates while OpsLog is running, not only at startup. It was bounded on the belief that a session writes a few kilobytes; with the CI-V wire trace left on, one wrote 416 MB and nothing would have stopped it before the disk did."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Décodes FT : le filtre par continent est maintenant multiple — clique AF, AS, OC et SA pour garder ces quatre-là. Il ne liste toujours que les continents réellement décodés, plus ceux que tu as sélectionnés, pour qu'un filtre ne puisse pas se bloquer sans pastille pour le désactiver.",
|
||||||
|
"Un QSO enregistré par WSJT-X, JTDX ou MSHV affiche maintenant une notification dans le coin, avec le nom de la station. En regardant les décodes, rien d'autre à l'écran ne le signalait : le formulaire ne se vidait pas, puisque personne n'y avait tapé.",
|
||||||
|
"Icom CI-V : une réponse que la radio adresse à un autre contrôleur du même bus n'est plus prise pour la nôtre, et un ordre de PTT dont l'accusé de réception se perd est vérifié en interrogeant la radio au lieu d'être déclaré en échec. WSJT-X et JTDX répondent à un set_ptt en échec par une erreur de contrôle radio et coupent la liaison en pleine émission — ce que faisait un IC-7850 trois fois par session. La vérification attend 700 ms et non les 150 de la scrutation : la radio vient d'échouer deux fois, en général parce qu'elle se réaccorde — JTDX décale la fréquence d'émission et passe en émission dans la foulée — et une interrogation brève échouerait pour la même raison. Les deux issues sont journalisées, pour distinguer un échec réel d'un correctif qui n'a pas agi.",
|
||||||
|
"FlexRadio : chaque statut de spot peut désormais être totalement exclu du panadapter, par un interrupteur à côté de ses couleurs — et les spots issus des décodes WSJT-X obéissent aux mêmes interrupteurs et aux mêmes couleurs. La palette régit le panadapter, pas seulement l'une des deux sources qui l'alimentent : les statuts décochés continuaient de s'entasser sur la cascade parce que les décodes passaient par un autre chemin.",
|
||||||
|
"Les commentaires des spots du panadapter se lisent maintenant comme ceux de DXHunter : le texte du cluster, puis le spotteur, l'entité et le statut — « CQ up 2 [F4BPO] [Franz Josef Land] [New Slot] ». Les mots se collaient parce que SmartSDR découpe sa ligne de commande sur les espaces ; des espaces insécables les font passer.",
|
||||||
|
"« Déjà contacté » sur un spot du panadapter désigne désormais l'INDICATIF présent dans le journal, et non l'entité. Une entité déjà faite sur cette bande et ce mode n'est pas une nouvelle, et annoncer « déjà contacté » pour une station jamais travaillée était faux.",
|
||||||
|
"Décodes FT : un message composé MSHV qui répond à deux stations sur une seule ligne — « DM8BJF RR73; F4BPO <RI1FJL> +14 » — est maintenant reconnu comme vous étant adressé quand votre indicatif est dans la seconde moitié.",
|
||||||
|
"Édition de QSO : sa propre puissance d'émission est enfin modifiable — le champ était enregistré et réécrit mais n'avait aucune case, donc un contact loggé à la mauvaise puissance ne pouvait pas être corrigé. Le locator étendu du correspondant gagne une case pour la même raison, et les libellés de puissance disent maintenant à QUI elle appartient.",
|
||||||
|
"FlexRadio : un spot n'est plus supprimé puis redessiné quand rien n'a changé. Un flux de skimmers actif re-spotte la même station toutes les quelques secondes — une session de deux minutes envoyait 2128 ajouts, dont 88 pour un seul indicatif — sans que le panadapter bouge d'un pixel.",
|
||||||
|
"Les commentaires des spots du panadapter tiennent maintenant dans ce que la radio accepte : SmartSDR coupait les plus longs en plein mot, perdant l'entité et le statut. Le texte du cluster est rogné en premier, le spotteur, l'entité et le statut survivent toujours. L'alignement en colonnes des lignes RBN est aussi ramené à une seule espace : conservé en espaces insécables, il ouvrait un trou assez large pour repousser le reste du commentaire hors de l'écran.",
|
||||||
|
"L'appel automatique est retiré — il faisait doublon avec DXHunter, qui répond déjà aux décodages. Cliquer un décodage pour répondre ne change pas.",
|
||||||
|
"Le rebond élastique en fin de liste a disparu, et un balayage horizontal à deux doigts ne fait plus quitter l'application. Deux comportements de navigateur qui n'apparaissent qu'au pavé tactile ou sur écran tactile.",
|
||||||
|
"Le zoom de l'interface s'annonce enfin : une pastille affiche le facteur pendant qu'il change, un clic dessus revient à 100 %, et le menu Affichage → Zoom avant / Zoom arrière / Taille réelle le rend trouvable. Ctrl+molette et Ctrl+0 fonctionnaient déjà, mais rien ne le disait — un zoom involontaire et on ne savait plus revenir.",
|
||||||
|
"Icom CI-V : un changement de fréquence ou de mode dont l'accusé de réception se perd est désormais vérifié en interrogeant la radio, comme l'était déjà le PTT. Les trois sont des ordres auxquels WSJT-X et JTDX répondent par une erreur de contrôle radio et une liaison coupée, et un log d'IC-7850 montre un set_freq faire précisément cela.",
|
||||||
|
"Le fichier de log tourne maintenant en cours d'exécution, et plus seulement au démarrage. Sa limite reposait sur l'idée qu'une session écrit quelques kilo-octets ; avec la trace CI-V laissée active, l'une d'elles a écrit 416 Mo sans que rien ne l'arrête avant le disque."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.5",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Fixed the record button going missing after an update, until the audio settings were opened and saved. Whether a manual recording is possible depends on a per-profile setting, and the question was asked once at startup — before the profile was known on a launch that had more work to do.",
|
||||||
|
"Switching profile is quicker on a shared MySQL logbook: the one-off cleanup of unused settings tables is now recorded as done instead of being re-checked on every connection.",
|
||||||
|
"A profile switch now logs how long it took, and any device slower than half a second names itself — a switch that feels sluggish can be diagnosed from the log file.",
|
||||||
|
"Saving an alert rule or a filter preset now says so, with the name, for a few seconds. Both used to save in silence, leaving the dialog looking exactly as it did before the click.",
|
||||||
|
"Awards: the callsigns listed behind an award cell are now links. Clicking one opens the QSL Manager on Paper QSL with that station searched, ready for the card sent/received dates — chasing a missing confirmation no longer means retyping the callsign into another tab.",
|
||||||
|
"Motorised antennas over serial: the line format is now stated explicitly as 8N1, the baud list covers 1200 to 115200, and the first exchange after each connect is dumped to the log — which separates a silent controller from a wrong baud rate from a frame we misread.",
|
||||||
|
"Fixed a motorised antenna on a serial port failing with \"Serial port busy\" for ever. OpsLog was holding the port itself: stopping a client did not wait for its poll loop to leave, and the new client was started while the old one still owned the COM port — every settings save added another loop to the fight.",
|
||||||
|
"A serial antenna controller whose port is held by another program now says so by name in the log, instead of repeating \"Serial port busy\" — a COM port has one owner, usually the manufacturer control window left open.",
|
||||||
|
"Fixed \"Test connection\" on a serial motorised antenna taking the COM port away from the running antenna. A port has one owner, so the test now reports the live link's own status instead of opening a second connection to it.",
|
||||||
|
"A serial antenna controller that never answers now fails after four seconds with \"nothing came back\", instead of freezing the poll loop for minutes with nothing in the log. A silent serial port returns no bytes AND no error, and the buffered reader retried that a hundred times before giving up.",
|
||||||
|
"Ultrabeam over USB now works. The cable presents TWO COM ports and only the second reaches the controller, at 19200 baud — so the speed is now fixed at 19200 and the port field says which one to pick. Stopping a client no longer waits out the read timeout either, so changing port takes effect at once instead of leaving the old one held."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Correction du bouton d'enregistrement disparu après une mise à jour, jusqu'à ce qu'on ouvre et enregistre les réglages audio. La possibilité d'enregistrer dépend d'un réglage par profil, et la question n'était posée qu'une fois au démarrage — avant que le profil soit connu, sur un lancement qui avait plus de travail à faire.",
|
||||||
|
"Le changement de profil est plus rapide sur un journal MySQL partagé : le nettoyage ponctuel des tables de réglages inutilisées est désormais marqué comme fait, au lieu d'être revérifié à chaque connexion.",
|
||||||
|
"Un changement de profil enregistre maintenant sa durée dans le journal, et tout appareil dépassant la demi-seconde se nomme — un changement qui traîne peut donc être diagnostiqué depuis le fichier de log.",
|
||||||
|
"L'enregistrement d'une règle d'alerte ou d'un filtre affiche maintenant une confirmation avec son nom, quelques secondes. Les deux enregistraient en silence, la fenêtre restant identique à ce qu'elle était avant le clic.",
|
||||||
|
"Diplômes : les indicatifs listés derrière une case sont désormais cliquables. Un clic ouvre le gestionnaire QSL sur QSL papier avec la station déjà recherchée, prête pour les dates d'envoi et de réception — relancer une confirmation manquante ne demande plus de retaper l'indicatif dans un autre onglet.",
|
||||||
|
"Antennes motorisées en série : le format de ligne est désormais fixé explicitement en 8N1, la liste des vitesses va de 1200 à 115200, et le premier échange après chaque connexion est écrit dans le log — ce qui distingue un contrôleur muet d'une mauvaise vitesse et d'une trame mal relue.",
|
||||||
|
"Correction d'une antenne motorisée en série qui échouait indéfiniment sur « Serial port busy ». OpsLog occupait le port lui-même : l'arrêt d'un client n'attendait pas la sortie de sa boucle de scrutation, et le nouveau client démarrait alors que l'ancien détenait encore le port COM — chaque enregistrement des réglages ajoutait une boucle à la mêlée.",
|
||||||
|
"Un contrôleur d'antenne en série dont le port est occupé par un autre programme le dit maintenant explicitement dans le log, au lieu de répéter « Serial port busy » — un port COM n'a qu'un propriétaire, le plus souvent la fenêtre de contrôle du fabricant restée ouverte.",
|
||||||
|
"Correction du « Test de connexion » d'une antenne motorisée en série qui prenait le port COM à l'antenne en service. Un port n'a qu'un propriétaire : le test rapporte désormais l'état du lien en cours au lieu d'ouvrir une seconde connexion dessus.",
|
||||||
|
"Un contrôleur d'antenne en série qui ne répond jamais échoue maintenant en quatre secondes sur « rien n'est revenu », au lieu de figer la boucle de scrutation pendant des minutes sans rien écrire dans le log. Un port série muet ne renvoie ni octet ni erreur, et le lecteur tamponné réessayait cent fois avant d'abandonner.",
|
||||||
|
"Ultrabeam en USB fonctionne. Le câble présente DEUX ports COM et seul le second atteint le contrôleur, à 19200 bauds — la vitesse est donc fixée à 19200 et le champ du port indique lequel choisir. L'arrêt d'un client n'attend plus la fin du délai de lecture, donc un changement de port prend effet immédiatement au lieu de laisser l'ancien occupé."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.4",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Clicking a spot on the radio panadapter now carries its POTA park into the Awards tab, like a click in OpsLog does.",
|
||||||
|
"Ultrabeam over serial: the COM port field now has a chevron that opens the list of detected ports. It was a combo box that only opened on a keystroke, so it looked like a plain text box.",
|
||||||
|
"The logbook database now contains only the contacts. Settings, station profiles, award reference lists and the lookup cache were being created in every database, including a shared MySQL logbook, which made the two look interchangeable; the unused tables are dropped on the next start, and any that hold data are left alone.",
|
||||||
|
"And the mirror image: the settings database drops its own unused, empty qso table once the contacts have a database of their own. It is rebuilt automatically if that database is ever pressed into service as the logbook again.",
|
||||||
|
"Settings → Database: a Compact button on each database. SQLite frees deleted pages inside the file and never shrinks it, so this is what gives the disk space back; the result shows the size before and after. A shared MySQL logbook has the button too, running OPTIMIZE TABLE instead."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Cliquer un spot sur le panadapter de la radio reporte maintenant son parc POTA dans l’onglet Diplômes, comme un clic dans OpsLog.",
|
||||||
|
"Ultrabeam en série : le champ du port COM a maintenant un chevron qui ouvre la liste des ports détectés. C'était une liste déroulante qui ne s'ouvrait qu'en tapant, donc indiscernable d'un simple champ texte.",
|
||||||
|
"La base du journal ne contient plus que les contacts. Les réglages, profils station, listes de références et le cache de recherche étaient créés dans toutes les bases, y compris un MySQL partagé, ce qui laissait croire que les deux étaient interchangeables ; les tables inutilisées sont supprimées au prochain démarrage, et celles qui contiennent des données sont laissées telles quelles.",
|
||||||
|
"Et l'inverse : la base de réglages supprime sa propre table qso, vide et inutilisée, dès lors que les contacts ont leur base à eux. Elle est reconstruite automatiquement si cette base doit à nouveau servir de journal.",
|
||||||
|
"Réglages → Base de données : un bouton Compacter sur chaque base. SQLite libère les pages supprimées à l'intérieur du fichier sans jamais le réduire ; c'est donc ce qui rend l'espace disque, et le résultat affiche la taille avant et après. Un journal MySQL partagé a aussi le bouton, avec un OPTIMIZE TABLE à la place."
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.26.3",
|
"version": "0.26.3",
|
||||||
"date": "",
|
"date": "",
|
||||||
|
|||||||
+102
@@ -0,0 +1,102 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Compacting a database.
|
||||||
|
//
|
||||||
|
// SQLite never shrinks a file on its own: deleting rows — or dropping a table,
|
||||||
|
// which is what the schema-role cleanup does — frees pages INSIDE the file and
|
||||||
|
// leaves the file the size it always was. A logbook that held 200 000 imported
|
||||||
|
// QSOs for a day is still a 200 MB file the day after they are gone, and the
|
||||||
|
// only thing that reclaims the space is a VACUUM, which rewrites the database
|
||||||
|
// from scratch.
|
||||||
|
//
|
||||||
|
// Offered as a button rather than done automatically: a VACUUM rewrites the
|
||||||
|
// whole file, needs room for a second copy of it while it runs, and takes real
|
||||||
|
// time on a large logbook. That is a decision for the operator, at a moment they
|
||||||
|
// choose — not something to spring on them during startup.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
)
|
||||||
|
|
||||||
|
// CompactResult is what one compaction did.
|
||||||
|
type CompactResult struct {
|
||||||
|
// Path of the file compacted, empty for MySQL.
|
||||||
|
Path string `json:"path"`
|
||||||
|
// Backend is "sqlite" or "mysql" — a shared server is optimised, not vacuumed.
|
||||||
|
Backend string `json:"backend"`
|
||||||
|
// Before and After are file sizes in bytes; both 0 when there is no file.
|
||||||
|
Before int64 `json:"before"`
|
||||||
|
After int64 `json:"after"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// CompactDatabase reclaims the unused space in one of the two databases.
|
||||||
|
//
|
||||||
|
// target is "settings" or "logbook". They are separate on purpose: they are
|
||||||
|
// different files, of very different sizes, and an operator compacting a 400 MB
|
||||||
|
// logbook has no reason to wait on a 2 MB settings file as well.
|
||||||
|
func (a *App) CompactDatabase(target string) (CompactResult, error) {
|
||||||
|
switch strings.ToLower(strings.TrimSpace(target)) {
|
||||||
|
case "settings":
|
||||||
|
if a.db == nil {
|
||||||
|
return CompactResult{}, fmt.Errorf("the settings database is not open")
|
||||||
|
}
|
||||||
|
return a.vacuumSQLite(a.db, a.dbPath)
|
||||||
|
case "logbook":
|
||||||
|
if a.logDb == nil {
|
||||||
|
return CompactResult{}, fmt.Errorf("the logbook is not open")
|
||||||
|
}
|
||||||
|
if a.dbBackend == "mysql" {
|
||||||
|
// A shared server's storage is the admin's business, and OPTIMIZE TABLE
|
||||||
|
// locks the table for the length of a rebuild — every other operator
|
||||||
|
// waits. Still offered, because a logbook that has had a large import
|
||||||
|
// deleted benefits from it just as much; it simply reports no sizes,
|
||||||
|
// which the server alone knows.
|
||||||
|
if _, err := a.logDb.ExecContext(a.ctx, "OPTIMIZE TABLE qso"); err != nil {
|
||||||
|
return CompactResult{}, fmt.Errorf("optimize qso: %w", err)
|
||||||
|
}
|
||||||
|
applog.Printf("compact: OPTIMIZE TABLE qso on the shared MySQL logbook")
|
||||||
|
return CompactResult{Backend: "mysql"}, nil
|
||||||
|
}
|
||||||
|
// No separate file: the settings database is serving as the logbook, and
|
||||||
|
// compacting it is the same operation.
|
||||||
|
if a.logDbPath == "" {
|
||||||
|
return a.vacuumSQLite(a.db, a.dbPath)
|
||||||
|
}
|
||||||
|
return a.vacuumSQLite(a.logDb, a.logDbPath)
|
||||||
|
}
|
||||||
|
return CompactResult{}, fmt.Errorf("unknown database %q", target)
|
||||||
|
}
|
||||||
|
|
||||||
|
// vacuumSQLite checkpoints the write-ahead log, then rewrites the file.
|
||||||
|
func (a *App) vacuumSQLite(conn *sql.DB, path string) (CompactResult, error) {
|
||||||
|
res := CompactResult{Path: path, Backend: "sqlite", Before: fileSizeOf(path)}
|
||||||
|
// Fold the WAL back into the main file first. Without it the pages freed by a
|
||||||
|
// recent DELETE can still be sitting in the -wal, and the vacuum reports a
|
||||||
|
// saving the file on disk does not show.
|
||||||
|
if _, err := conn.ExecContext(a.ctx, "PRAGMA wal_checkpoint(TRUNCATE)"); err != nil {
|
||||||
|
applog.Printf("compact: wal checkpoint on %s: %v", path, err)
|
||||||
|
}
|
||||||
|
if _, err := conn.ExecContext(a.ctx, "VACUUM"); err != nil {
|
||||||
|
return res, fmt.Errorf("vacuum: %w", err)
|
||||||
|
}
|
||||||
|
res.After = fileSizeOf(path)
|
||||||
|
applog.Printf("compact: %s %d → %d bytes", path, res.Before, res.After)
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// fileSizeOf returns a file's size, or 0 if it cannot be read.
|
||||||
|
func fileSizeOf(path string) int64 {
|
||||||
|
if strings.TrimSpace(path) == "" {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
fi, err := os.Stat(path)
|
||||||
|
if err != nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
return fi.Size()
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
//go:build !windows
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
// fatalBox is Windows-only; elsewhere the terminal carries the message.
|
||||||
|
func fatalBox(title, text string) { println(title + ": " + text) }
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"syscall"
|
||||||
|
"unsafe"
|
||||||
|
)
|
||||||
|
|
||||||
|
// fatalBox shows a message box and returns.
|
||||||
|
//
|
||||||
|
// A GUI-subsystem program has no console: println goes nowhere, and a launch
|
||||||
|
// that ends before the window exists ends in complete silence. Every silent exit
|
||||||
|
// in main now says something here first — an operator who is told "another
|
||||||
|
// OpsLog is already running" can act on it; one who sees nothing files "it does
|
||||||
|
// not start", which is the report nobody can answer.
|
||||||
|
func fatalBox(title, text string) {
|
||||||
|
user32 := syscall.NewLazyDLL("user32.dll")
|
||||||
|
proc := user32.NewProc("MessageBoxW")
|
||||||
|
t, err1 := syscall.UTF16PtrFromString(text)
|
||||||
|
ti, err2 := syscall.UTF16PtrFromString(title)
|
||||||
|
if err1 != nil || err2 != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const mbIconError = 0x00000010
|
||||||
|
proc.Call(0, uintptr(unsafe.Pointer(t)), uintptr(unsafe.Pointer(ti)), mbIconError)
|
||||||
|
}
|
||||||
+187
@@ -0,0 +1,187 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Chasing a split pile-up by the report the DX just sent.
|
||||||
|
//
|
||||||
|
// Working a DXpedition in split means guessing where it is listening. The DX
|
||||||
|
// answers one station, sends "5NN", and moves on; the useful information is
|
||||||
|
// therefore not the callsign it answered but the FREQUENCY that callsign was
|
||||||
|
// transmitting on, because the DX's receiver was there a second ago.
|
||||||
|
//
|
||||||
|
// A CW skimmer already knows this. SDC (Software Defined Connector) decodes the
|
||||||
|
// whole pile-up and marks each report on the panadapter as a spot — the marker
|
||||||
|
// TEXT is configured in SDC by the operator ("599" for a fresh report, "X" for
|
||||||
|
// an older one, by default). Those spots reach OpsLog already: it subscribes to
|
||||||
|
// the radio's spot feed, and every spot another program posts arrives on
|
||||||
|
// Flex.OnForeignSpot.
|
||||||
|
//
|
||||||
|
// So the whole feature is: recognise the marker, move the TRANSMIT slice there,
|
||||||
|
// leave the receive slice on the DX. Nothing here decodes anything.
|
||||||
|
//
|
||||||
|
// Three deliberate choices:
|
||||||
|
//
|
||||||
|
// - the marker text is a SETTING, not a constant. It is chosen in SDC, and
|
||||||
|
// any guess made here would be wrong for the operator who chose otherwise.
|
||||||
|
// - only the transmit slice moves, never the receive slice. Losing the DX is
|
||||||
|
// a worse outcome than a missed call.
|
||||||
|
// - the offset is signed and in Hz, because working "up a bit" from where the
|
||||||
|
// last station was answered is exactly how a pile-up is chased.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/cat"
|
||||||
|
)
|
||||||
|
|
||||||
|
const keyFlexRSTChase = "flex.rst_chase"
|
||||||
|
|
||||||
|
// FlexRSTChase is the whole configuration.
|
||||||
|
type FlexRSTChase struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
// Markers are the skimmer's marker texts, comma-separated ("599,5NN").
|
||||||
|
// Matched against the spot's callsign field, case-insensitively and whole:
|
||||||
|
// a spot IS the marker or it is an ordinary callsign, and a substring rule
|
||||||
|
// would drag in any station whose call happens to contain the digits.
|
||||||
|
Markers string `json:"markers"`
|
||||||
|
// OffsetHz is added to the marker's frequency. Signed: chasing upward from
|
||||||
|
// the last station worked is the usual tactic, downward happens too.
|
||||||
|
OffsetHz int `json:"offset_hz"`
|
||||||
|
// SplitOnly refuses to act when the radio is not in split. On by default:
|
||||||
|
// out of split the transmit slice IS the receive slice, so "move the TX
|
||||||
|
// slice" would take the operator off the DX they are listening to.
|
||||||
|
SplitOnly bool `json:"split_only"`
|
||||||
|
}
|
||||||
|
|
||||||
|
var defaultFlexRSTChase = FlexRSTChase{Enabled: false, Markers: "599", OffsetHz: 0, SplitOnly: true}
|
||||||
|
|
||||||
|
// rstChaseMinGap throttles the moves. A skimmer marks every report it decodes,
|
||||||
|
// and a busy pile-up produces several a second; without a floor the transmit
|
||||||
|
// slice would twitch continuously and never be anywhere long enough to call.
|
||||||
|
const rstChaseMinGap = 700 * time.Millisecond
|
||||||
|
|
||||||
|
// rstChaseMinStep ignores a marker that lands where the slice already is.
|
||||||
|
// Re-sending the same frequency is not free: it is a command to the radio and a
|
||||||
|
// slice status back, several times a second, for no change at all.
|
||||||
|
const rstChaseMinStep = 20 // Hz
|
||||||
|
|
||||||
|
var (
|
||||||
|
rstChaseMu sync.Mutex
|
||||||
|
rstChaseLast time.Time
|
||||||
|
rstChaseFreq int64
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetFlexRSTChase returns the stored configuration (defaults when unset).
|
||||||
|
func (a *App) GetFlexRSTChase() FlexRSTChase {
|
||||||
|
s := defaultFlexRSTChase
|
||||||
|
if a.settings == nil {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
// settingOr, NOT settings.Get with profileScope(): the store already applies
|
||||||
|
// the active profile's prefix, so scoping the key here wrote p3.flex.rst_chase
|
||||||
|
// and read p3.p3.flex.rst_chase — the switch could never be read back on, and
|
||||||
|
// the feature did nothing at all with no sign of why.
|
||||||
|
if v := a.settingOr(keyFlexRSTChase, ""); strings.TrimSpace(v) != "" {
|
||||||
|
_ = json.Unmarshal([]byte(v), &s)
|
||||||
|
}
|
||||||
|
return normRSTChase(s)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SaveFlexRSTChase stores the configuration.
|
||||||
|
func (a *App) SaveFlexRSTChase(s FlexRSTChase) error {
|
||||||
|
b, err := json.Marshal(normRSTChase(s))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
a.setSetting(keyFlexRSTChase, string(b))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetFlexRSTChaseEnabled flips the switch alone.
|
||||||
|
//
|
||||||
|
// Its own binding because this belongs on a button in the panel, not in a
|
||||||
|
// settings page: it is turned on when a DXpedition appears and off when it is
|
||||||
|
// worked, which is a thing done mid-QSO with one hand.
|
||||||
|
func (a *App) SetFlexRSTChaseEnabled(on bool) error {
|
||||||
|
s := a.GetFlexRSTChase()
|
||||||
|
s.Enabled = on
|
||||||
|
return a.SaveFlexRSTChase(s)
|
||||||
|
}
|
||||||
|
|
||||||
|
func normRSTChase(s FlexRSTChase) FlexRSTChase {
|
||||||
|
if strings.TrimSpace(s.Markers) == "" {
|
||||||
|
s.Markers = defaultFlexRSTChase.Markers
|
||||||
|
}
|
||||||
|
// A pile-up is a few kHz wide. Anything past that is a typo (Hz entered as
|
||||||
|
// if it were kHz), and honouring it would transmit far outside the segment.
|
||||||
|
if s.OffsetHz > 10000 {
|
||||||
|
s.OffsetHz = 10000
|
||||||
|
}
|
||||||
|
if s.OffsetHz < -10000 {
|
||||||
|
s.OffsetHz = -10000
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
// rstChaseMarkerSet splits the configured markers into a comparison set.
|
||||||
|
func rstChaseMarkerSet(markers string) map[string]bool {
|
||||||
|
out := map[string]bool{}
|
||||||
|
for _, m := range strings.FieldsFunc(markers, func(r rune) bool { return r == ',' || r == ';' || r == ' ' }) {
|
||||||
|
if m = strings.ToUpper(strings.TrimSpace(m)); m != "" {
|
||||||
|
out[m] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleForeignSpot is what a skimmer's spot arrives at.
|
||||||
|
func (a *App) handleForeignSpot(callsign string, freqHz int64) {
|
||||||
|
cfg := a.GetFlexRSTChase()
|
||||||
|
if !cfg.Enabled || a.cat == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !rstChaseMarkerSet(cfg.Markers)[strings.ToUpper(strings.TrimSpace(callsign))] {
|
||||||
|
return // an ordinary spot: another station's callsign, not a report
|
||||||
|
}
|
||||||
|
// From here on every refusal is logged. A marker WAS recognised, so the
|
||||||
|
// operator is entitled to know why the slice stayed where it was — silence
|
||||||
|
// at this point is indistinguishable from a feature that does not work.
|
||||||
|
if cfg.SplitOnly && !a.cat.State().Split {
|
||||||
|
applog.Printf("rst chase: %s marked at %s, but the radio is not in split — ignored",
|
||||||
|
strings.ToUpper(callsign), hzText(freqHz))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
target := freqHz + int64(cfg.OffsetHz)
|
||||||
|
if target <= 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
now := time.Now()
|
||||||
|
rstChaseMu.Lock()
|
||||||
|
if now.Sub(rstChaseLast) < rstChaseMinGap {
|
||||||
|
rstChaseMu.Unlock()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if rstChaseFreq != 0 && absInt64(target-rstChaseFreq) < rstChaseMinStep {
|
||||||
|
rstChaseMu.Unlock()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
rstChaseLast, rstChaseFreq = now, target
|
||||||
|
rstChaseMu.Unlock()
|
||||||
|
|
||||||
|
if err := a.cat.FlexDo(func(fc cat.FlexController) error {
|
||||||
|
return fc.SetTXSliceFrequency(target)
|
||||||
|
}); err != nil {
|
||||||
|
applog.Printf("rst chase: moving the TX slice to %s failed: %v", hzText(target), err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
applog.Printf("rst chase: %s marked at %s → TX slice to %s (offset %+d Hz)",
|
||||||
|
strings.ToUpper(callsign), hzText(freqHz), hzText(target), cfg.OffsetHz)
|
||||||
|
}
|
||||||
|
|
||||||
|
// hzText renders a frequency the way an operator reads one on a dial.
|
||||||
|
func hzText(hz int64) string {
|
||||||
|
return strconv.FormatFloat(float64(hz)/1000, 'f', 3, 64) + " kHz"
|
||||||
|
}
|
||||||
+365
-62
@@ -18,7 +18,7 @@ import {
|
|||||||
WorkedBefore,
|
WorkedBefore,
|
||||||
SetCompactMode, SetCompactHeight,
|
SetCompactMode, SetCompactHeight,
|
||||||
RotatorGoToPath,
|
RotatorGoToPath,
|
||||||
GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, EntryBandChanged, FlexApplyBandAntenna, FlexApplyBandPower,
|
GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, EntryBandChanged, FlexApplyBandAntenna, FlexApplyBandPower, YaesuApplyBandAntenna,
|
||||||
GetSecretStatus, UnlockSecrets,
|
GetSecretStatus, UnlockSecrets,
|
||||||
RotatorGoTo, RotatorStop, SetActiveRotor,
|
RotatorGoTo, RotatorStop, SetActiveRotor,
|
||||||
GetDBConnectionInfo, GetLogbookRevision,
|
GetDBConnectionInfo, GetLogbookRevision,
|
||||||
@@ -78,6 +78,8 @@ import { WorldMap, LocatorMap } from '@/components/MainMap';
|
|||||||
import { FlexPanel } from '@/components/FlexPanel';
|
import { FlexPanel } from '@/components/FlexPanel';
|
||||||
import { IcomPanel } from '@/components/IcomPanel';
|
import { IcomPanel } from '@/components/IcomPanel';
|
||||||
import { YaesuPanel } from '@/components/YaesuPanel';
|
import { YaesuPanel } from '@/components/YaesuPanel';
|
||||||
|
import { TCIPanel } from '@/components/TCIPanel';
|
||||||
|
import { ElecraftPanel } from '@/components/ElecraftPanel';
|
||||||
import { AntGeniusPanel, type AGStatus } from '@/components/AntGeniusPanel';
|
import { AntGeniusPanel, type AGStatus } from '@/components/AntGeniusPanel';
|
||||||
import { MotorAntennaWidget, type AntStatus } from '@/components/MotorAntennaWidget';
|
import { MotorAntennaWidget, type AntStatus } from '@/components/MotorAntennaWidget';
|
||||||
import { TunerGeniusPanel, type TGStatus } from '@/components/TunerGeniusPanel';
|
import { TunerGeniusPanel, type TGStatus } from '@/components/TunerGeniusPanel';
|
||||||
@@ -94,7 +96,7 @@ 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, readSpotDisplayOptions, spotIsWorked, SPOT_DISPLAY_OPTIONS_EXPOSED } from '@/lib/spotDisplay';
|
||||||
import { AnswerDecode, HaltDecodeTx, LogUIError, FlexTXOnBand, GetMatrixColors, GetRotorPresets, GetRowColors, GetSpotTTLMinutes, IsNewUSCounty } from '../wailsjs/go/main/App';
|
import { AnswerDecode, HaltDecodeTx, LogUIError, FlexTXOnBand, GetMatrixColors, GetRotorPresets, GetRowColors, GetSpotTTLMinutes, GetSpotMax, IsNewUSCounty } from '../wailsjs/go/main/App';
|
||||||
import { applyMatrixColors } from '@/lib/matrixColors';
|
import { applyMatrixColors } from '@/lib/matrixColors';
|
||||||
import { WorkedBeforeGrid } from '@/components/WorkedBeforeGrid';
|
import { WorkedBeforeGrid } from '@/components/WorkedBeforeGrid';
|
||||||
import { NetControlPanel } from '@/components/NetControlPanel';
|
import { NetControlPanel } from '@/components/NetControlPanel';
|
||||||
@@ -243,10 +245,15 @@ function fmtFreqDots(mhzStr: string): string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// FreqWheelDisplay renders a frequency (MHz string) like fmtFreqDots — MHz.kHz.Hz
|
// FreqWheelDisplay renders a frequency (MHz string) like fmtFreqDots — MHz.kHz.Hz
|
||||||
// — but makes the three kHz digits scroll-sensitive: rolling the mouse wheel over
|
// — and makes the kHz AND Hz digits scroll-sensitive: rolling the wheel over a
|
||||||
// the hundreds / tens / units-of-kHz digit steps the frequency by 100 / 10 / 1 kHz
|
// digit steps the frequency by that digit (100/10/1 kHz, then 100/10/1 Hz; up =
|
||||||
// (up = wheel up). onNudge receives the delta in Hz. The MHz and Hz digits are
|
// wheel up). onNudge receives the delta in Hz.
|
||||||
// static (only kHz stepping was requested). Used in the header + compact top bar.
|
//
|
||||||
|
// The Hz digits were static at first, on the grounds that only kHz stepping had
|
||||||
|
// been asked for. An FTDX101 operator put it plainly: the fine tuning is exactly
|
||||||
|
// what a mouse is wanted for — zero-beating a CW signal or nudging onto an SSB
|
||||||
|
// voice is a few tens of Hz, and it was the one move the display would not make.
|
||||||
|
// The MHz digits stay static: a wheel notch that changes band is not fine tuning.
|
||||||
function FreqWheelDisplay({ mhz, onNudge, className, placeholder = '—.———.———' }: {
|
function FreqWheelDisplay({ mhz, onNudge, className, placeholder = '—.———.———' }: {
|
||||||
mhz: string; onNudge: (deltaHz: number) => void; className?: string; placeholder?: string;
|
mhz: string; onNudge: (deltaHz: number) => void; className?: string; placeholder?: string;
|
||||||
}) {
|
}) {
|
||||||
@@ -256,6 +263,7 @@ function FreqWheelDisplay({ mhz, onNudge, className, placeholder = '—.——
|
|||||||
const khz = frac.slice(0, 3); // [hundreds, tens, units] of kHz
|
const khz = frac.slice(0, 3); // [hundreds, tens, units] of kHz
|
||||||
const hz = frac.slice(3, 6);
|
const hz = frac.slice(3, 6);
|
||||||
const stepHz = [100_000, 10_000, 1_000]; // per kHz digit: 100 / 10 / 1 kHz
|
const stepHz = [100_000, 10_000, 1_000]; // per kHz digit: 100 / 10 / 1 kHz
|
||||||
|
const stepHzFine = [100, 10, 1]; // per Hz digit
|
||||||
return (
|
return (
|
||||||
<span className={className}>
|
<span className={className}>
|
||||||
{intPart}.
|
{intPart}.
|
||||||
@@ -267,7 +275,15 @@ function FreqWheelDisplay({ mhz, onNudge, className, placeholder = '—.——
|
|||||||
{d}
|
{d}
|
||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
.{hz}
|
.
|
||||||
|
{hz.split('').map((d, i) => (
|
||||||
|
<span key={'h' + i}
|
||||||
|
onWheel={(e) => { if (e.ctrlKey || e.metaKey) return; e.preventDefault(); e.stopPropagation(); onNudge(e.deltaY < 0 ? stepHzFine[i] : -stepHzFine[i]); }}
|
||||||
|
className="cursor-ns-resize rounded-[2px] hover:bg-primary/25 transition-colors"
|
||||||
|
title="Scroll to change frequency">
|
||||||
|
{d}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -291,6 +307,37 @@ function shortCatError(err?: string): string {
|
|||||||
}
|
}
|
||||||
// bandForMHz maps a dial frequency (MHz) to its ADIF band, or '' if outside
|
// bandForMHz maps a dial frequency (MHz) to its ADIF band, or '' if outside
|
||||||
// every known allocation (used to auto-fill the band when the freq changes).
|
// every known allocation (used to auto-fill the band when the freq changes).
|
||||||
|
// A number typed into the CALLSIGN field is a QSY, not a callsign.
|
||||||
|
//
|
||||||
|
// It is where the hands already are: an operator watching a cluster or a
|
||||||
|
// spotting page reads "28500" and wants to be there, and reaching for the
|
||||||
|
// frequency box — or worse, the mouse — is the part that loses the station. So
|
||||||
|
// the call field takes it, on Enter, and nothing else in the entry form changes.
|
||||||
|
//
|
||||||
|
// Two forms, and the AMBIGUOUS ones resolve to the band deliberately. "160" is
|
||||||
|
// the 160 m band, not 160 kHz; "40" is 40 m, not 40 kHz. Neither number is a
|
||||||
|
// frequency anyone tunes to, so reading them as bands costs nothing and reads
|
||||||
|
// the way an operator says it out loud.
|
||||||
|
const ENTRY_BAND_WORDS: Record<string, string> = {
|
||||||
|
'2200': '2200m', '630': '630m', '160': '160m', '80': '80m', '60': '60m',
|
||||||
|
'40': '40m', '30': '30m', '20': '20m', '17': '17m', '15': '15m', '12': '12m',
|
||||||
|
'10': '10m', '6': '6m', '4': '4m', '2': '2m', '70': '70cm',
|
||||||
|
};
|
||||||
|
|
||||||
|
// entryQSYCommand reads what was typed. Returns null for anything that is not
|
||||||
|
// unambiguously one of the two — a callsign must never be mistaken for a QSY.
|
||||||
|
function entryQSYCommand(text: string): { band?: string; hz?: number } | null {
|
||||||
|
const v = text.trim();
|
||||||
|
if (!/^\d{1,7}$/.test(v)) return null; // digits only: a callsign has letters
|
||||||
|
const band = ENTRY_BAND_WORDS[v];
|
||||||
|
if (band) return { band };
|
||||||
|
const khz = Number(v);
|
||||||
|
// 1500 kHz to 1.3 GHz: below that is not a band anyone works, above it is a
|
||||||
|
// typo. A bare "500" is neither a band nor a frequency, so nothing happens.
|
||||||
|
if (khz >= 1500 && khz <= 1_300_000) return { hz: Math.round(khz * 1000) };
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
function bandForMHz(mhz: number): string {
|
function bandForMHz(mhz: number): string {
|
||||||
if (!mhz || isNaN(mhz)) return '';
|
if (!mhz || isNaN(mhz)) return '';
|
||||||
const plan: [number, number, string][] = [
|
const plan: [number, number, string][] = [
|
||||||
@@ -442,6 +489,11 @@ export default function App() {
|
|||||||
const { t, lang } = useI18n();
|
const { t, lang } = useI18n();
|
||||||
// === Lists from settings (fallback for first paint) ===
|
// === Lists from settings (fallback for first paint) ===
|
||||||
const [bands, setBands] = useState<string[]>(DEFAULT_BANDS);
|
const [bands, setBands] = useState<string[]>(DEFAULT_BANDS);
|
||||||
|
// The station's satellites, for the entry form's SAT_NAME dropdown. Held HERE
|
||||||
|
// and not inside the panel: loadLists() already runs when Preferences close,
|
||||||
|
// so a list edited there reaches the field without a restart — which is what
|
||||||
|
// a panel reading it once at mount could not do.
|
||||||
|
const [satellites, setSatellites] = useState<string[]>([]);
|
||||||
const [modes, setModes] = useState<string[]>(DEFAULT_MODES);
|
const [modes, setModes] = useState<string[]>(DEFAULT_MODES);
|
||||||
const modesRef = useRef(modes);
|
const modesRef = useRef(modes);
|
||||||
useEffect(() => { modesRef.current = modes; }, [modes]);
|
useEffect(() => { modesRef.current = modes; }, [modes]);
|
||||||
@@ -701,6 +753,7 @@ export default function App() {
|
|||||||
'15m': { SSB: 21300000, CW: 21030000, FT8: 21074000, FT4: 21140000, RTTY: 21080000, default: 21300000 },
|
'15m': { SSB: 21300000, CW: 21030000, FT8: 21074000, FT4: 21140000, RTTY: 21080000, default: 21300000 },
|
||||||
'12m': { SSB: 24950000, CW: 24910000, FT8: 24915000, FT4: 24919000, RTTY: 24920000, default: 24950000 },
|
'12m': { SSB: 24950000, CW: 24910000, FT8: 24915000, FT4: 24919000, RTTY: 24920000, default: 24950000 },
|
||||||
'10m': { SSB: 28500000, CW: 28030000, FT8: 28074000, FT4: 28180000, RTTY: 28080000, default: 28500000 },
|
'10m': { SSB: 28500000, CW: 28030000, FT8: 28074000, FT4: 28180000, RTTY: 28080000, default: 28500000 },
|
||||||
|
'4m': { SSB: 70200000, CW: 70100000, FT8: 70154000, default: 70200000 },
|
||||||
'6m': { SSB: 50150000, CW: 50080000, FT8: 50313000, FT4: 50318000, default: 50150000 },
|
'6m': { SSB: 50150000, CW: 50080000, FT8: 50313000, FT4: 50318000, default: 50150000 },
|
||||||
'2m': { SSB: 144300000, CW: 144050000, FT8: 144174000, default: 144300000 },
|
'2m': { SSB: 144300000, CW: 144050000, FT8: 144174000, default: 144300000 },
|
||||||
'70cm': { SSB: 432300000, CW: 432050000, FT8: 432174000, default: 432300000 },
|
'70cm': { SSB: 432300000, CW: 432050000, FT8: 432174000, default: 432300000 },
|
||||||
@@ -891,6 +944,13 @@ export default function App() {
|
|||||||
QSOAudioPlayOnAir().catch((e: any) => setError(String(e?.message ?? e)));
|
QSOAudioPlayOnAir().catch((e: any) => setError(String(e?.message ?? e)));
|
||||||
};
|
};
|
||||||
const refreshManualRecReady = () => { QSOAudioManualReady().then(setManualRecReady).catch(() => {}); };
|
const refreshManualRecReady = () => { QSOAudioManualReady().then(setManualRecReady).catch(() => {}); };
|
||||||
|
// Asked at mount, and asked AGAIN once the backend is really up (see the
|
||||||
|
// initial grid load) and on every profile change. The audio devices are a
|
||||||
|
// per-profile setting, so this question cannot be answered before the active
|
||||||
|
// profile is known — and a "no" then was final, which is why the record button
|
||||||
|
// went missing for a whole session after an update, when startup does more
|
||||||
|
// work and the first ask loses the race. Opening and closing the audio panel
|
||||||
|
// was the only way back.
|
||||||
useEffect(() => { refreshManualRecReady(); }, []);
|
useEffect(() => { refreshManualRecReady(); }, []);
|
||||||
const startManualRecording = () => {
|
const startManualRecording = () => {
|
||||||
QSOAudioManualStart().then((active) => {
|
QSOAudioManualStart().then((active) => {
|
||||||
@@ -1104,6 +1164,17 @@ export default function App() {
|
|||||||
};
|
};
|
||||||
// QSL Manager is a closable tab opened on demand from Tools → QSL Manager.
|
// QSL Manager is a closable tab opened on demand from Tools → QSL Manager.
|
||||||
const [qslTabOpen, setQslTabOpen] = useState(false);
|
const [qslTabOpen, setQslTabOpen] = useState(false);
|
||||||
|
// A callsign sent to the QSL Manager's Paper QSL view from elsewhere (the
|
||||||
|
// awards grid). The counter makes two clicks on the same callsign two
|
||||||
|
// requests — the panel is force-mounted and would otherwise see no change.
|
||||||
|
const [qslPaperReq, setQslPaperReq] = useState<{ call: string; n: number } | undefined>(undefined);
|
||||||
|
function openPaperQSLFor(call: string) {
|
||||||
|
const c = call.trim().toUpperCase();
|
||||||
|
if (!c) return;
|
||||||
|
setQslTabOpen(true);
|
||||||
|
setActiveTab('qsl');
|
||||||
|
setQslPaperReq((r) => ({ call: c, n: (r?.n ?? 0) + 1 }));
|
||||||
|
}
|
||||||
const [qslDesignerOpen, setQslDesignerOpen] = useState(false);
|
const [qslDesignerOpen, setQslDesignerOpen] = useState(false);
|
||||||
const [eqslQsoId, setEqslQsoId] = useState<number | null>(null); // QSO being sent as eQSL
|
const [eqslQsoId, setEqslQsoId] = useState<number | null>(null); // QSO being sent as eQSL
|
||||||
function closeQslTab() {
|
function closeQslTab() {
|
||||||
@@ -1266,11 +1337,22 @@ export default function App() {
|
|||||||
// by z, so it reflows to fill that larger box and then scales back to exactly the
|
// by z, so it reflows to fill that larger box and then scales back to exactly the
|
||||||
// window (more content visible when zoomed out, like a real browser zoom).
|
// window (more content visible when zoomed out, like a real browser zoom).
|
||||||
const appRootRef = useRef<HTMLDivElement>(null);
|
const appRootRef = useRef<HTMLDivElement>(null);
|
||||||
|
// The current factor, shown briefly whenever it changes.
|
||||||
|
//
|
||||||
|
// Ctrl+wheel and Ctrl+0 have worked from the start, and NOTHING said so:
|
||||||
|
// no menu entry, no readout. An operator who zoomed by accident — easy, the
|
||||||
|
// wheel is over a grid and Ctrl is already down for something else — saw the
|
||||||
|
// interface change size with no explanation and no way back. The number is
|
||||||
|
// the fix; the menu entry makes it findable without reading a manual.
|
||||||
|
const [uiZoom, setUiZoom] = useState(1);
|
||||||
|
const [zoomShown, setZoomShown] = useState(false);
|
||||||
|
const zoomHideRef = useRef(0);
|
||||||
|
const setZoomRef = useRef<(z: number) => void>(() => {});
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const KEY = 'opslog.uiZoom';
|
const KEY = 'opslog.uiZoom';
|
||||||
let z = parseFloat(localStorage.getItem(KEY) || '1');
|
let z = parseFloat(localStorage.getItem(KEY) || '1');
|
||||||
if (!Number.isFinite(z) || z <= 0) z = 1;
|
if (!Number.isFinite(z) || z <= 0) z = 1;
|
||||||
const apply = () => {
|
const apply = (announce = false) => {
|
||||||
const el = appRootRef.current;
|
const el = appRootRef.current;
|
||||||
if (!el) return;
|
if (!el) return;
|
||||||
el.style.transformOrigin = '0 0';
|
el.style.transformOrigin = '0 0';
|
||||||
@@ -1278,17 +1360,36 @@ export default function App() {
|
|||||||
el.style.width = `${100 / z}vw`;
|
el.style.width = `${100 / z}vw`;
|
||||||
el.style.height = `${100 / z}vh`;
|
el.style.height = `${100 / z}vh`;
|
||||||
document.documentElement.setAttribute('data-uizoom', String(z));
|
document.documentElement.setAttribute('data-uizoom', String(z));
|
||||||
|
setUiZoom(z);
|
||||||
|
// Only on a CHANGE: showing it at startup would put a badge over the log
|
||||||
|
// every launch, for a number that is almost always 100 %.
|
||||||
|
if (announce) {
|
||||||
|
setZoomShown(true);
|
||||||
|
window.clearTimeout(zoomHideRef.current);
|
||||||
|
zoomHideRef.current = window.setTimeout(() => setZoomShown(false), 1600);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
apply();
|
apply();
|
||||||
|
// The menu and the badge set the factor through here, so there is one
|
||||||
|
// implementation of "zoom to z" and not three.
|
||||||
|
setZoomRef.current = (next: number) => {
|
||||||
|
z = Math.min(2.5, Math.max(0.5, Math.round(next * 10) / 10));
|
||||||
|
localStorage.setItem(KEY, String(z));
|
||||||
|
apply(true);
|
||||||
|
};
|
||||||
const onWheel = (e: WheelEvent) => {
|
const onWheel = (e: WheelEvent) => {
|
||||||
if (!e.ctrlKey && !e.metaKey) return; // plain wheel is left alone (scroll / freq nudge)
|
if (!e.ctrlKey && !e.metaKey) return; // plain wheel is left alone (scroll / freq nudge)
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
z = Math.min(2.5, Math.max(0.5, Math.round((z + (e.deltaY < 0 ? 0.1 : -0.1)) * 10) / 10));
|
z = Math.min(2.5, Math.max(0.5, Math.round((z + (e.deltaY < 0 ? 0.1 : -0.1)) * 10) / 10));
|
||||||
localStorage.setItem(KEY, String(z));
|
localStorage.setItem(KEY, String(z));
|
||||||
apply();
|
apply(true);
|
||||||
};
|
};
|
||||||
const onKey = (e: KeyboardEvent) => {
|
const onKey = (e: KeyboardEvent) => {
|
||||||
if ((e.ctrlKey || e.metaKey) && (e.key === '0')) { e.preventDefault(); z = 1; localStorage.setItem(KEY, '1'); apply(); }
|
if ((e.ctrlKey || e.metaKey) && (e.key === '0')) { e.preventDefault(); z = 1; localStorage.setItem(KEY, '1'); apply(true); }
|
||||||
|
// Ctrl+plus / Ctrl+minus, the shortcuts every other application uses.
|
||||||
|
// '=' as well as '+': on most layouts the plus is the shifted '='.
|
||||||
|
if ((e.ctrlKey || e.metaKey) && (e.key === '+' || e.key === '=')) { e.preventDefault(); setZoomRef.current(z + 0.1); }
|
||||||
|
if ((e.ctrlKey || e.metaKey) && (e.key === '-')) { e.preventDefault(); setZoomRef.current(z - 0.1); }
|
||||||
};
|
};
|
||||||
window.addEventListener('wheel', onWheel, { passive: false });
|
window.addEventListener('wheel', onWheel, { passive: false });
|
||||||
window.addEventListener('keydown', onKey);
|
window.addEventListener('keydown', onKey);
|
||||||
@@ -1568,7 +1669,14 @@ export default function App() {
|
|||||||
const [clusterServers, setClusterServers] = useState<{ id: number; name: string; enabled: boolean; sort_order: number }[]>([]);
|
const [clusterServers, setClusterServers] = useState<{ id: number; name: string; enabled: boolean; sort_order: number }[]>([]);
|
||||||
// Ring buffer — only keep the last N spots; cluster firehose can be heavy.
|
// Ring buffer — only keep the last N spots; cluster firehose can be heavy.
|
||||||
const [spots, setSpots] = useState<ClusterSpot[]>([]);
|
const [spots, setSpots] = useState<ClusterSpot[]>([]);
|
||||||
const SPOTS_CAP = 1000;
|
// How many spots the list holds. A setting rather than a constant: at a
|
||||||
|
// thousand, a busy evening filled the buffer in a couple of minutes, so the
|
||||||
|
// spot LIFETIME never had anything left to expire — the cap was deciding the
|
||||||
|
// lifetime. Kept in a ref as well: the append path runs inside a state updater
|
||||||
|
// that must not close over a stale value.
|
||||||
|
const [spotsCap, setSpotsCap] = useState(1000);
|
||||||
|
const spotsCapRef = useRef(1000);
|
||||||
|
useEffect(() => { spotsCapRef.current = spotsCap; }, [spotsCap]);
|
||||||
// Cluster filter selections persist across restarts (writeUiPref → localStorage
|
// Cluster filter selections persist across restarts (writeUiPref → localStorage
|
||||||
// + DB, so they also travel with a copied data/ folder). Loaders read the cache
|
// + DB, so they also travel with a copied data/ folder). Loaders read the cache
|
||||||
// synchronously at first render; a single effect below writes them back.
|
// synchronously at first render; a single effect below writes them back.
|
||||||
@@ -1813,7 +1921,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' | 'netcontrol' | 'decodes' | 'none';
|
type MainPaneKind = 'map1' | 'map2' | 'cluster' | 'worked' | 'flex' | 'recent' | 'icom' | 'yaesu' | 'elecraft' | 'tci' | 'netcontrol' | 'decodes' | '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');
|
||||||
@@ -1824,7 +1932,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 === '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';
|
||||||
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(() => ''),
|
||||||
@@ -1882,7 +1990,7 @@ export default function App() {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setSpotStatus((prev) => {
|
setSpotStatus((prev) => {
|
||||||
const keys = Object.keys(prev);
|
const keys = Object.keys(prev);
|
||||||
if (keys.length <= SPOTS_CAP * 2) return prev;
|
if (keys.length <= spotsCapRef.current * 2) return prev;
|
||||||
const live = new Set(spots.map((x) => spotStatusKey(x.dx_call, x.band ?? '', x.comment ?? '', x.freq_hz)));
|
const live = new Set(spots.map((x) => spotStatusKey(x.dx_call, x.band ?? '', x.comment ?? '', x.freq_hz)));
|
||||||
// Decoded stations count as live too. They share this cache, and pruning
|
// Decoded stations count as live too. They share this cache, and pruning
|
||||||
// to the cluster spots alone would evict every one of them — on a busy
|
// to the cluster spots alone would evict every one of them — on a busy
|
||||||
@@ -2256,6 +2364,9 @@ export default function App() {
|
|||||||
const [clusterMacros, setClusterMacros] = useState(loadClusterMacros);
|
const [clusterMacros, setClusterMacros] = useState(loadClusterMacros);
|
||||||
useEffect(() => { if (!showSettings) setClusterMacros(loadClusterMacros()); }, [showSettings]);
|
useEffect(() => { if (!showSettings) setClusterMacros(loadClusterMacros()); }, [showSettings]);
|
||||||
const clusterMacrosShown = useMemo(() => visibleClusterMacros(clusterMacros), [clusterMacros]);
|
const clusterMacrosShown = useMemo(() => visibleClusterMacros(clusterMacros), [clusterMacros]);
|
||||||
|
// Auto-call is withdrawn — it duplicated DXHunter, which answers decodes from
|
||||||
|
// the same shack. This flag is the single place that says so at runtime.
|
||||||
|
const AUTO_CALL_ENABLED = false;
|
||||||
const [autoCall, setAutoCall] = useState<AutoCallSettings>(loadAutoCall);
|
const [autoCall, setAutoCall] = useState<AutoCallSettings>(loadAutoCall);
|
||||||
useEffect(() => { if (!showSettings) setAutoCall(loadAutoCall()); }, [showSettings]);
|
useEffect(() => { if (!showSettings) setAutoCall(loadAutoCall()); }, [showSettings]);
|
||||||
// When each callsign was last answered, so a station still calling CQ is not
|
// When each callsign was last answered, so a station still calling CQ is not
|
||||||
@@ -2288,6 +2399,15 @@ export default function App() {
|
|||||||
// backstop below.
|
// backstop below.
|
||||||
const lastTxAtRef = useRef<Map<string, number>>(new Map());
|
const lastTxAtRef = useRef<Map<string, number>>(new Map());
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
// AUTO-CALL IS WITHDRAWN — DXHunter already answers decodes, and two
|
||||||
|
// programs doing it from one shack key over each other. See lib/autocall.ts.
|
||||||
|
//
|
||||||
|
// Returning here rather than deleting the loop: the decision it implements
|
||||||
|
// is the delicate part, argued over and tested, and worth keeping intact.
|
||||||
|
// The guard is what matters — an operator whose stored preference still
|
||||||
|
// says "enabled" must not have their transmitter keyed by a feature they
|
||||||
|
// can no longer see, let alone switch off.
|
||||||
|
if (!AUTO_CALL_ENABLED) return;
|
||||||
if (!autoCall.enabled) return;
|
if (!autoCall.enabled) return;
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
// A QSO is in progress somewhere if ANY receiver is transmitting or still
|
// A QSO is in progress somewhere if ANY receiver is transmitting or still
|
||||||
@@ -2381,6 +2501,9 @@ export default function App() {
|
|||||||
// same thing everywhere — and it gives the memory back.
|
// same thing everywhere — and it gives the memory back.
|
||||||
const [spotTTLMin, setSpotTTLMin] = useState(0);
|
const [spotTTLMin, setSpotTTLMin] = useState(0);
|
||||||
useEffect(() => { GetSpotTTLMinutes().then(setSpotTTLMin).catch(() => {}); }, [showSettings]);
|
useEffect(() => { GetSpotTTLMinutes().then(setSpotTTLMin).catch(() => {}); }, [showSettings]);
|
||||||
|
// Same beat as the lifetime: re-read when Preferences closes, since the two
|
||||||
|
// settings decide between them how long a spot survives.
|
||||||
|
useEffect(() => { GetSpotMax().then((n: number) => { if (n > 0) setSpotsCap(n); }).catch(() => {}); }, [showSettings]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (spotTTLMin <= 0) return; // 0 = keep until the count cap pushes them out
|
if (spotTTLMin <= 0) return; // 0 = keep until the count cap pushes them out
|
||||||
const sweep = () => {
|
const sweep = () => {
|
||||||
@@ -2645,8 +2768,17 @@ export default function App() {
|
|||||||
// Backend-emitted toast messages (e.g. recording auto-send result/skip).
|
// Backend-emitted toast messages (e.g. recording auto-send result/skip).
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const off = EventsOn('toast', (msg: any) => { if (msg) showToast(String(msg)); });
|
const off = EventsOn('toast', (msg: any) => { if (msg) showToast(String(msg)); });
|
||||||
return () => { off(); };
|
// A QSO logged by an external app announces itself: nothing else on screen
|
||||||
}, [showToast]);
|
// says it happened when the operator is watching the decodes rather than the
|
||||||
|
// entry form.
|
||||||
|
const offExt = EventsOn('qso:logged_external', (p: any) => {
|
||||||
|
const call = String(p?.call ?? '').trim();
|
||||||
|
if (!call) return;
|
||||||
|
const bits = [p?.band, p?.mode].filter(Boolean).join(' · ');
|
||||||
|
showToast(`✅ ${t('toast.qsoLogged')} — ${call}${bits ? ` · ${bits}` : ''}`);
|
||||||
|
});
|
||||||
|
return () => { off(); offExt(); };
|
||||||
|
}, [showToast, t]);
|
||||||
|
|
||||||
// Band openings — sporadic E on 6/4/2 m, detected from the spot stream.
|
// Band openings — sporadic E on 6/4/2 m, detected from the spot stream.
|
||||||
//
|
//
|
||||||
@@ -2955,6 +3087,7 @@ export default function App() {
|
|||||||
const l: ListsSettings = await GetListsSettings();
|
const l: ListsSettings = await GetListsSettings();
|
||||||
setRstLists({ phone: (l as any).rst_phone ?? [], cw: (l as any).rst_cw ?? [], digital: (l as any).rst_digital ?? [] });
|
setRstLists({ phone: (l as any).rst_phone ?? [], cw: (l as any).rst_cw ?? [], digital: (l as any).rst_digital ?? [] });
|
||||||
if (l.bands && l.bands.length) setBands(l.bands);
|
if (l.bands && l.bands.length) setBands(l.bands);
|
||||||
|
setSatellites([...(((l as any).satellites ?? []) as string[])].filter(Boolean).sort());
|
||||||
if (l.modes && l.modes.length) {
|
if (l.modes && l.modes.length) {
|
||||||
setModePresets(l.modes);
|
setModePresets(l.modes);
|
||||||
const names = l.modes.map((m) => m.name);
|
const names = l.modes.map((m) => m.name);
|
||||||
@@ -3043,6 +3176,19 @@ export default function App() {
|
|||||||
// Clicking a spot (cluster grid or any band map): tune the rig, set the mode,
|
// Clicking a spot (cluster grid or any band map): tune the rig, set the mode,
|
||||||
// fill the call, pre-fill POTA, (re)start the recording. Shared so every spot
|
// fill the call, pre-fill POTA, (re)start the recording. Shared so every spot
|
||||||
// source behaves identically.
|
// source behaves identically.
|
||||||
|
// Single click on a cluster line: fill the callsign, nothing else.
|
||||||
|
//
|
||||||
|
// Reading the cluster means running down dozens of lines, and while a single
|
||||||
|
// click WORKED the spot every pass dragged the radio with it — one stray click
|
||||||
|
// while looking took the operator off the station they were working. Looking
|
||||||
|
// and going are two different intentions, so they are now two gestures: click
|
||||||
|
// to look the call up, double-click to go there.
|
||||||
|
function handleSpotSelect(s: any) {
|
||||||
|
if (!s?.dx_call?.trim()) return;
|
||||||
|
onCallsignInput(s.dx_call, { force: true });
|
||||||
|
applySpotPOTA((s as any).pota_ref);
|
||||||
|
}
|
||||||
|
|
||||||
function handleSpotClick(s: any) {
|
function handleSpotClick(s: any) {
|
||||||
const m = inferSpotMode(s.comment ?? '', s.freq_hz);
|
const m = inferSpotMode(s.comment ?? '', s.freq_hz);
|
||||||
// Reflect the spot's freq/band in the entry strip IMMEDIATELY (optimistic),
|
// Reflect the spot's freq/band in the entry strip IMMEDIATELY (optimistic),
|
||||||
@@ -3087,6 +3233,7 @@ export default function App() {
|
|||||||
// Same race, same fix: the toolbar options were read once at mount,
|
// Same race, same fix: the toolbar options were read once at mount,
|
||||||
// possibly before the profile was active, and a "no" then was final.
|
// possibly before the profile was active, and a "no" then was final.
|
||||||
refreshChaseNew();
|
refreshChaseNew();
|
||||||
|
refreshManualRecReady();
|
||||||
} else if (!ok && alive && tries++ < 360) {
|
} else if (!ok && alive && tries++ < 360) {
|
||||||
// Quick retries at first (normal startup connects in ~2 s); then keep
|
// Quick retries at first (normal startup connects in ~2 s); then keep
|
||||||
// trying for several minutes, because the very first migration against a
|
// trying for several minutes, because the very first migration against a
|
||||||
@@ -3227,11 +3374,16 @@ export default function App() {
|
|||||||
// backends. The backend no-ops if the band has no configured mapping.
|
// backends. The backend no-ops if the band has no configured mapping.
|
||||||
const lastAntBandRef = useRef('');
|
const lastAntBandRef = useRef('');
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (catState.backend !== 'flex' || locks.band) return;
|
if (locks.band) return;
|
||||||
const b = band.trim();
|
const b = band.trim();
|
||||||
if (!b || b === lastAntBandRef.current) return;
|
if (!b || b === lastAntBandRef.current) return;
|
||||||
lastAntBandRef.current = b;
|
lastAntBandRef.current = b;
|
||||||
FlexApplyBandAntenna(b).catch(() => {});
|
// Flex configures its antennas per band in Preferences; a Yaesu LEARNS
|
||||||
|
// them — the antenna picked on a band is remembered for that band. Two
|
||||||
|
// ways to say the same thing, and each backend keeps the one that suits
|
||||||
|
// it: a Flex names its antennas, a Yaesu has two sockets and a knob.
|
||||||
|
if (catState.backend === 'flex') FlexApplyBandAntenna(b).catch(() => {});
|
||||||
|
if (catState.backend === 'yaesu') YaesuApplyBandAntenna(b).catch(() => {});
|
||||||
}, [band, catState.backend, locks.band]);
|
}, [band, catState.backend, locks.band]);
|
||||||
|
|
||||||
// Per-band, per-mode TX power. Applied on band AND mode changes — the point is
|
// Per-band, per-mode TX power. Applied on band AND mode changes — the point is
|
||||||
@@ -3343,7 +3495,8 @@ export default function App() {
|
|||||||
const filtered = hist(sp) ? next : next.filter((x) => hist(x) || key(x) !== k);
|
const filtered = hist(sp) ? next : next.filter((x) => hist(x) || key(x) !== k);
|
||||||
next = [sp, ...filtered];
|
next = [sp, ...filtered];
|
||||||
}
|
}
|
||||||
return next.length > SPOTS_CAP ? next.slice(0, SPOTS_CAP) : next;
|
const cap = spotsCapRef.current;
|
||||||
|
return next.length > cap ? next.slice(0, cap) : next;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const unsubSpot = EventsOn('cluster:spot', (sp: ClusterSpot) => {
|
const unsubSpot = EventsOn('cluster:spot', (sp: ClusterSpot) => {
|
||||||
@@ -3515,12 +3668,18 @@ export default function App() {
|
|||||||
// An explicit click always wins over whatever call is currently in the field.
|
// An explicit click always wins over whatever call is currently in the field.
|
||||||
const unsubFlexSpot = EventsOn('flex:spot_clicked', (p: any) => {
|
const unsubFlexSpot = EventsOn('flex:spot_clicked', (p: any) => {
|
||||||
const call = String(p?.call ?? '');
|
const call = String(p?.call ?? '');
|
||||||
if (applyUdpCall(call, true)) restartRecordingForNewTarget(call);
|
if (!applyUdpCall(call, true)) return;
|
||||||
|
restartRecordingForNewTarget(call);
|
||||||
|
// The park, like a click in the band map: the radio reports only a
|
||||||
|
// callsign, so the backend looks it up again before sending the event.
|
||||||
|
applySpotPOTA(String(p?.pota_ref ?? ''));
|
||||||
});
|
});
|
||||||
// Clicking a spot on the ExpertSDR (TCI) panorama fills the call, like Flex.
|
// Clicking a spot on the ExpertSDR (TCI) panorama fills the call, like Flex.
|
||||||
const unsubTciSpot = EventsOn('tci:spot_clicked', (p: any) => {
|
const unsubTciSpot = EventsOn('tci:spot_clicked', (p: any) => {
|
||||||
const call = String(p?.call ?? '');
|
const call = String(p?.call ?? '');
|
||||||
if (applyUdpCall(call, true)) restartRecordingForNewTarget(call);
|
if (!applyUdpCall(call, true)) return;
|
||||||
|
restartRecordingForNewTarget(call);
|
||||||
|
applySpotPOTA(String(p?.pota_ref ?? ''));
|
||||||
});
|
});
|
||||||
const unsubBulk = EventsOn('bulkupdate:progress', (p: any) => {
|
const unsubBulk = EventsOn('bulkupdate:progress', (p: any) => {
|
||||||
const total = Number(p?.total ?? 0);
|
const total = Number(p?.total ?? 0);
|
||||||
@@ -3635,6 +3794,8 @@ export default function App() {
|
|||||||
setGridPrefsProfile(id ?? null);
|
setGridPrefsProfile(id ?? null);
|
||||||
setActiveProfileId(typeof id === 'number' ? id : null);
|
setActiveProfileId(typeof id === 'number' ? id : null);
|
||||||
loadStation(); loadLists(); loadCATCfg(); reloadWk(); loadMainPanes(); loadProfileList();
|
loadStation(); loadLists(); loadCATCfg(); reloadWk(); loadMainPanes(); loadProfileList();
|
||||||
|
// The sound devices are per profile: one may record and the next not.
|
||||||
|
refreshManualRecReady();
|
||||||
// The chat is per shared logbook — clear the previous profile's messages
|
// The chat is per shared logbook — clear the previous profile's messages
|
||||||
// and reload for the new logbook (or hide if it isn't a MySQL log).
|
// and reload for the new logbook (or hide if it isn't a MySQL log).
|
||||||
setChatMsgs([]); chatSeen.current.clear(); setChatOnline([]); setChatUnread(0);
|
setChatMsgs([]); chatSeen.current.clear(); setChatOnline([]); setChatUnread(0);
|
||||||
@@ -4034,6 +4195,41 @@ export default function App() {
|
|||||||
setLookupResult(null);
|
setLookupResult(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The Settings dialog is memoised (see SettingsModal), which only helps while
|
||||||
|
// its props hold still. These three would otherwise be new functions on every
|
||||||
|
// App render — several times a second with a cluster running — and the memo
|
||||||
|
// would compare unequal every time and re-render the whole panel anyway.
|
||||||
|
const openEditRef = useRef<(id: number) => void>(() => {});
|
||||||
|
// Refreshed on every render, read only when Settings opens: the dialog gets a
|
||||||
|
// callback whose identity never changes, and still calls the current one.
|
||||||
|
useEffect(() => { openEditRef.current = (id: number) => { void openEdit(id); }; });
|
||||||
|
// The stable wrapper the dialog actually receives.
|
||||||
|
const openQSOFromSettings = useCallback((id: number) => openEditRef.current(id), []);
|
||||||
|
const closeSettings = useCallback(() => {
|
||||||
|
setShowSettings(false);
|
||||||
|
setSettingsSection(undefined);
|
||||||
|
refreshChaseNew();
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, []);
|
||||||
|
const onSettingsSaved = useCallback(() => {
|
||||||
|
loadStation(); loadLists(); loadCATCfg(); reloadWk(); refreshManualRecReady();
|
||||||
|
// Drop the cached spot statuses. They are computed once per call+band+mode
|
||||||
|
// and never expire, so a rule change in Settings — grouping the digital
|
||||||
|
// modes into one slot, above all — left every spot already on screen
|
||||||
|
// showing the answer to the OLD question.
|
||||||
|
setSpotStatus({});
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, []);
|
||||||
|
const onSettingsPaneChanged = useCallback((side: 'left' | 'right' | 'p3' | 'p4' | 'layout', v: string) => {
|
||||||
|
// Applied from the CHOSEN value, never from a re-read of the DB: the write
|
||||||
|
// is async and the layout must not lag a click behind.
|
||||||
|
if (side === 'left') setMainPaneLeft(v as MainPaneKind);
|
||||||
|
else if (side === 'right') setMainPaneRight(v as MainPaneKind);
|
||||||
|
else if (side === 'p3') setMainPane3(v as MainPaneKind);
|
||||||
|
else if (side === 'p4') setMainPane4(v as MainPaneKind);
|
||||||
|
else if (side === 'layout') setMainLayout4(v === 'cols' ? 'cols' : 'quad');
|
||||||
|
}, []);
|
||||||
|
|
||||||
async function openEdit(id: number) {
|
async function openEdit(id: number) {
|
||||||
try { setEditingQSO(await GetQSO(id)); }
|
try { setEditingQSO(await GetQSO(id)); }
|
||||||
catch (e: any) { setError(String(e?.message ?? e)); }
|
catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
@@ -4120,7 +4316,13 @@ export default function App() {
|
|||||||
// background; qslmgr:done refreshes the grid when finished.
|
// background; qslmgr:done refreshes the grid when finished.
|
||||||
async function bulkSendTo(service: string, ids: number[]) {
|
async function bulkSendTo(service: string, ids: number[]) {
|
||||||
if (ids.length === 0) return;
|
if (ids.length === 0) return;
|
||||||
const label = service === 'qrz' ? 'QRZ.com' : service === 'clublog' ? 'Club Log' : service === 'lotw' ? 'LoTW' : service;
|
// Named rather than echoed: an operator who picked a menu entry should see
|
||||||
|
// the same words back, not the internal id.
|
||||||
|
const LABELS: Record<string, string> = {
|
||||||
|
qrz: 'QRZ.com', clublog: 'Club Log', lotw: 'LoTW',
|
||||||
|
hrdlog: 'HRDLog.net', eqsl: 'eQSL.cc', hamlog: 'HAMLOG.online',
|
||||||
|
};
|
||||||
|
const label = LABELS[service] ?? service;
|
||||||
showToast(`Uploading ${ids.length} QSO${ids.length > 1 ? 's' : ''} to ${label}…`);
|
showToast(`Uploading ${ids.length} QSO${ids.length > 1 ? 's' : ''} to ${label}…`);
|
||||||
try { await UploadQSOsManual(service, ids as any); }
|
try { await UploadQSOsManual(service, ids as any); }
|
||||||
catch (e: any) { setError(String(e?.message ?? e)); }
|
catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
@@ -4130,21 +4332,38 @@ export default function App() {
|
|||||||
// fields (optional): a chosen ADIF-tag list — the "choose which fields" export.
|
// fields (optional): a chosen ADIF-tag list — the "choose which fields" export.
|
||||||
// Empty = the standard/full behaviour (all fields, includeAppFields=false here).
|
// Empty = the standard/full behaviour (all fields, includeAppFields=false here).
|
||||||
async function exportFilteredADIF(fields: string[] = []) {
|
async function exportFilteredADIF(fields: string[] = []) {
|
||||||
|
return exportFilteredADIFAs(false, fields);
|
||||||
|
}
|
||||||
|
// The same filtered export, keeping the APP_OPSLOG_* tags — see
|
||||||
|
// exportSelectedADIFFull for why the award references need them.
|
||||||
|
async function exportFilteredADIFFull() {
|
||||||
|
return exportFilteredADIFAs(true, []);
|
||||||
|
}
|
||||||
|
async function exportFilteredADIFAs(includeApp: boolean, fields: string[]) {
|
||||||
try {
|
try {
|
||||||
const path = await SaveADIFFile();
|
const path = await SaveADIFFile();
|
||||||
if (!path) return;
|
if (!path) return;
|
||||||
const f = buildActiveFilter();
|
const f = buildActiveFilter();
|
||||||
const r = await ExportADIFFiltered(path, false, { ...f, limit: 0, offset: 0 } as any, fields);
|
const r = await ExportADIFFiltered(path, includeApp, { ...f, limit: 0, offset: 0 } as any, fields);
|
||||||
showToast(`Exported ${r.count} QSO${r.count > 1 ? 's' : ''} → ${r.path}`);
|
showToast(`Exported ${r.count} QSO${r.count > 1 ? 's' : ''} → ${r.path}`);
|
||||||
} catch (e: any) { setError(String(e?.message ?? e)); }
|
} catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
}
|
}
|
||||||
// Right-click "Export selected to ADIF": only the highlighted rows.
|
// Right-click "Export selected to ADIF": only the highlighted rows.
|
||||||
async function exportSelectedADIF(ids: number[], fields: string[] = []) {
|
async function exportSelectedADIF(ids: number[], fields: string[] = []) {
|
||||||
|
return exportSelectedADIFAs(ids, false, fields);
|
||||||
|
}
|
||||||
|
// The same export, keeping the APP_OPSLOG_* tags. Award references are the
|
||||||
|
// reason it exists: RDA@KR-04 lives in APP_OPSLOG_AWARDREFS, and a standard
|
||||||
|
// export — rightly — leaves every APP_ tag behind.
|
||||||
|
async function exportSelectedADIFFull(ids: number[]) {
|
||||||
|
return exportSelectedADIFAs(ids, true, []);
|
||||||
|
}
|
||||||
|
async function exportSelectedADIFAs(ids: number[], includeApp: boolean, fields: string[]) {
|
||||||
if (ids.length === 0) return;
|
if (ids.length === 0) return;
|
||||||
try {
|
try {
|
||||||
const path = await SaveADIFFile();
|
const path = await SaveADIFFile();
|
||||||
if (!path) return;
|
if (!path) return;
|
||||||
const r = await ExportADIFSelected(path, false, ids as any, fields);
|
const r = await ExportADIFSelected(path, includeApp, ids as any, fields);
|
||||||
showToast(`Exported ${r.count} selected QSO${r.count > 1 ? 's' : ''} → ${r.path}`);
|
showToast(`Exported ${r.count} selected QSO${r.count > 1 ? 's' : ''} → ${r.path}`);
|
||||||
} catch (e: any) { setError(String(e?.message ?? e)); }
|
} catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
}
|
}
|
||||||
@@ -4191,8 +4410,14 @@ export default function App() {
|
|||||||
if (deletingIds.length === 0) return;
|
if (deletingIds.length === 0) return;
|
||||||
const ids = deletingIds;
|
const ids = deletingIds;
|
||||||
try {
|
try {
|
||||||
if (ids.length === 1) await DeleteQSO(ids[0]);
|
// Report what was actually removed rather than assuming it matched what
|
||||||
else await DeleteQSOs(ids as any);
|
// was asked: a delete that silently removes nothing looks exactly like one
|
||||||
|
// that worked, since the rows leave the grid when it reloads either way.
|
||||||
|
if (ids.length === 1) { await DeleteQSO(ids[0]); showToast(t('toast.deletedOne')); }
|
||||||
|
else {
|
||||||
|
const n = await DeleteQSOs(ids as any);
|
||||||
|
showToast(t('toast.deletedN', { n: Number(n ?? 0), asked: ids.length }));
|
||||||
|
}
|
||||||
setDeletingIds([]);
|
setDeletingIds([]);
|
||||||
setSelectedId(null);
|
setSelectedId(null);
|
||||||
setSelectedIds([]);
|
setSelectedIds([]);
|
||||||
@@ -4641,6 +4866,10 @@ export default function App() {
|
|||||||
{ type: 'item', label: t('edit.prefs'), action: 'edit.prefs' },
|
{ type: 'item', label: t('edit.prefs'), action: 'edit.prefs' },
|
||||||
]},
|
]},
|
||||||
{ name: 'view', label: t('menu.view'), items: [
|
{ name: 'view', label: t('menu.view'), items: [
|
||||||
|
{ type: 'item', label: t('view.zoomIn'), action: 'view.zoomin', shortcut: 'Ctrl++' },
|
||||||
|
{ type: 'item', label: t('view.zoomOut'), action: 'view.zoomout', shortcut: 'Ctrl+-' },
|
||||||
|
{ type: 'item', label: t('view.zoomReset'), action: 'view.zoomreset', shortcut: 'Ctrl+0' },
|
||||||
|
{ type: 'separator' },
|
||||||
{ type: 'item', label: t('view.refresh'), action: 'view.refresh', shortcut: 'F5' },
|
{ type: 'item', label: t('view.refresh'), action: 'view.refresh', shortcut: 'F5' },
|
||||||
{ type: 'item', label: t('view.clearFilters'), action: 'view.clearfilters' },
|
{ type: 'item', label: t('view.clearFilters'), action: 'view.clearfilters' },
|
||||||
]},
|
]},
|
||||||
@@ -4689,6 +4918,9 @@ export default function App() {
|
|||||||
case 'file.exportCabrillo': exportCabrillo(); break;
|
case 'file.exportCabrillo': exportCabrillo(); break;
|
||||||
case 'file.deleteall': setShowDeleteAll(true); break;
|
case 'file.deleteall': setShowDeleteAll(true); break;
|
||||||
case 'file.exit': QuitApp(); break;
|
case 'file.exit': QuitApp(); break;
|
||||||
|
case 'view.zoomin': setZoomRef.current(uiZoom + 0.1); break;
|
||||||
|
case 'view.zoomout': setZoomRef.current(uiZoom - 0.1); break;
|
||||||
|
case 'view.zoomreset': setZoomRef.current(1); break;
|
||||||
case 'view.refresh': refresh(); break;
|
case 'view.refresh': refresh(); break;
|
||||||
case 'view.clearfilters': setFilterCallsign(''); setActiveFilter({ conditions: [], match: 'AND' }); break;
|
case 'view.clearfilters': setFilterCallsign(''); setActiveFilter({ conditions: [], match: 'AND' }); break;
|
||||||
case 'edit.edit': if (selectedId !== null) openEdit(selectedId); break;
|
case 'edit.edit': if (selectedId !== null) openEdit(selectedId); break;
|
||||||
@@ -5129,9 +5361,21 @@ export default function App() {
|
|||||||
};
|
};
|
||||||
const geoDetailRow = (
|
const geoDetailRow = (
|
||||||
<div className="flex gap-4 items-end">
|
<div className="flex gap-4 items-end">
|
||||||
<div className="flex flex-col flex-1 min-w-0"><Label className="mb-1 h-3.5">{t('field.cnty')}</Label>
|
{/* The badge sits INSIDE the field: this row is already tight, and a
|
||||||
<Input value={details.cnty ?? ''}
|
county name is short enough to leave room at its right. It answers the
|
||||||
|
question at the moment the operator is deciding whether to call — the
|
||||||
|
same answer the Info tab gives, one tab away from where they are. */}
|
||||||
|
<div className="flex flex-col flex-1 min-w-0 relative"><Label className="mb-1 h-3.5">{t('field.cnty')}</Label>
|
||||||
|
<Input value={details.cnty ?? ''} className={cn(entryNewCounty && 'pr-12')}
|
||||||
onChange={(e) => setDetails((d) => ({ ...d, cnty: e.target.value }))} />
|
onChange={(e) => setDetails((d) => ({ ...d, cnty: e.target.value }))} />
|
||||||
|
{entryNewCounty && (
|
||||||
|
<span
|
||||||
|
title={t('detp.newCountyTip')}
|
||||||
|
className="absolute right-1.5 bottom-1.5 rounded px-1.5 py-0.5 text-[10px] font-bold tracking-wide bg-success text-success-foreground pointer-events-none"
|
||||||
|
>
|
||||||
|
{t('detp.newCounty')}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className="flex flex-col w-[64px] shrink-0"><Label className="mb-1 h-3.5">{t('field.cqz')}</Label>
|
<div className="flex flex-col w-[64px] shrink-0"><Label className="mb-1 h-3.5">{t('field.cqz')}</Label>
|
||||||
<Input value={details.cqz ?? ''} className="font-mono"
|
<Input value={details.cqz ?? ''} className="font-mono"
|
||||||
@@ -5337,6 +5581,25 @@ export default function App() {
|
|||||||
noteManualEdit();
|
noteManualEdit();
|
||||||
SetCATFrequency(Math.round(mhz * 1_000_000)).catch(() => {});
|
SetCATFrequency(Math.round(mhz * 1_000_000)).catch(() => {});
|
||||||
};
|
};
|
||||||
|
// Carry out what was typed in the call field. Bands go through the ordinary
|
||||||
|
// band change, so the antennas, the power table and the outbound integrations
|
||||||
|
// all hear about it exactly as they would from the dropdown.
|
||||||
|
const applyEntryQSY = (q: { band?: string; hz?: number }) => {
|
||||||
|
if (q.band) {
|
||||||
|
onBandUserChange(q.band);
|
||||||
|
showToast(q.band);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const hz = q.hz ?? 0;
|
||||||
|
if (hz <= 0) return;
|
||||||
|
noteManualEdit();
|
||||||
|
setFreqMhz((hz / 1_000_000).toFixed(6));
|
||||||
|
const b = bandForMHz(hz / 1_000_000);
|
||||||
|
if (b) setBand(b);
|
||||||
|
if (catState.enabled && catState.connected) SetCATFrequency(hz).catch(() => {});
|
||||||
|
showToast((hz / 1_000_000).toFixed(3) + ' MHz');
|
||||||
|
};
|
||||||
|
|
||||||
// Mouse-wheel over a kHz digit of the top frequency readout: step the frequency
|
// Mouse-wheel over a kHz digit of the top frequency readout: step the frequency
|
||||||
// and (if CAT is connected) QSY the rig. The display updates optimistically on
|
// and (if CAT is connected) QSY the rig. The display updates optimistically on
|
||||||
// every notch; the actual radio tune is debounced so a fast scroll doesn't flood
|
// every notch; the actual radio tune is debounced so a fast scroll doesn't flood
|
||||||
@@ -5785,14 +6048,6 @@ export default function App() {
|
|||||||
txMsgs={txMsgs}
|
txMsgs={txMsgs}
|
||||||
txState={txState}
|
txState={txState}
|
||||||
txStates={txStates}
|
txStates={txStates}
|
||||||
autoCallOn={autoCall.enabled}
|
|
||||||
// Written through the same key Preferences uses, so the two can never
|
|
||||||
// disagree about whether the machine is armed.
|
|
||||||
onToggleAutoCall={() => setAutoCall((prev) => {
|
|
||||||
const next = { ...prev, enabled: !prev.enabled };
|
|
||||||
writeUiPref(autoCallKey, JSON.stringify(next));
|
|
||||||
return next;
|
|
||||||
})}
|
|
||||||
spotStatus={spotStatus as any}
|
spotStatus={spotStatus as any}
|
||||||
myCall={station.callsign}
|
myCall={station.callsign}
|
||||||
// A click ANSWERS the station: it hands the decode back to WSJT-X/MSHV as
|
// A click ANSWERS the station: it hands the decode back to WSJT-X/MSHV as
|
||||||
@@ -5885,7 +6140,7 @@ export default function App() {
|
|||||||
</div>
|
</div>
|
||||||
<div className="flex-1 min-h-0 flex">
|
<div className="flex-1 min-h-0 flex">
|
||||||
<div className="flex-1 min-w-0 flex flex-col min-h-0">
|
<div className="flex-1 min-w-0 flex flex-col min-h-0">
|
||||||
<ClusterGrid key={`clg-${activeProfileId ?? 'x'}`} rows={clusterRenderedRows as any} spotStatus={spotStatus} onSpotClick={handleSpotClick} />
|
<ClusterGrid key={`clg-${activeProfileId ?? 'x'}`} rows={clusterRenderedRows as any} spotStatus={spotStatus} onSpotClick={handleSpotClick} onSpotSelect={handleSpotSelect} />
|
||||||
</div>
|
</div>
|
||||||
{clusterShowFilters && renderClusterFilters()}
|
{clusterShowFilters && renderClusterFilters()}
|
||||||
</div>
|
</div>
|
||||||
@@ -5897,7 +6152,7 @@ export default function App() {
|
|||||||
<WorkedBeforeGrid key={`wbg-${activeProfileId ?? 'x'}`} wb={wbWithAwards as any} myGrid={station.my_grid} awardCols={awardCols} busy={wbBusy} currentCall={callsign} onRowDoubleClicked={(q) => openEdit(q.id as number)}
|
<WorkedBeforeGrid key={`wbg-${activeProfileId ?? 'x'}`} wb={wbWithAwards as any} myGrid={station.my_grid} awardCols={awardCols} busy={wbBusy} currentCall={callsign} onRowDoubleClicked={(q) => openEdit(q.id as number)}
|
||||||
onUpdateFromCty={bulkUpdateFromCty} onUpdateFromQRZ={bulkUpdateFromQRZ} onUpdateFromClublog={bulkUpdateFromClublog} onUpdateCountyFromULS={ulsReady ? bulkUpdateCountyFromULS : undefined}
|
onUpdateFromCty={bulkUpdateFromCty} onUpdateFromQRZ={bulkUpdateFromQRZ} onUpdateFromClublog={bulkUpdateFromClublog} onUpdateCountyFromULS={ulsReady ? bulkUpdateCountyFromULS : undefined}
|
||||||
onSendTo={bulkSendTo} onSendRecording={bulkSendRecording} onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
|
onSendTo={bulkSendTo} onSendRecording={bulkSendRecording} onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
|
||||||
onBulkEdit={openBulkEdit} onExportSelected={exportSelectedADIF} onExportSelectedFields={exportSelectedFields}
|
onBulkEdit={openBulkEdit} onExportSelected={exportSelectedADIF} onExportSelectedFull={exportSelectedADIFFull} onExportSelectedFields={exportSelectedFields}
|
||||||
onExportCabrilloSelected={exportSelectedCabrillo} onDelete={(ids) => setDeletingIds(ids)} />
|
onExportCabrilloSelected={exportSelectedCabrillo} onDelete={(ids) => setDeletingIds(ids)} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@@ -5914,6 +6169,18 @@ export default function App() {
|
|||||||
<YaesuPanel onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} onKeySpeed={setCWSpeedEverywhere} />
|
<YaesuPanel onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} onKeySpeed={setCWSpeedEverywhere} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
case 'elecraft':
|
||||||
|
return (
|
||||||
|
<div className="h-full w-full min-h-0 rounded-lg overflow-hidden border border-border">
|
||||||
|
<ElecraftPanel onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
case 'tci':
|
||||||
|
return (
|
||||||
|
<div className="h-full w-full min-h-0 rounded-lg overflow-hidden border border-border">
|
||||||
|
<TCIPanel onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
case 'icom':
|
case 'icom':
|
||||||
return (
|
return (
|
||||||
<div className="h-full w-full min-h-0 rounded-lg overflow-hidden border border-border">
|
<div className="h-full w-full min-h-0 rounded-lg overflow-hidden border border-border">
|
||||||
@@ -5954,9 +6221,9 @@ export default function App() {
|
|||||||
onSendRecording={bulkSendRecording}
|
onSendRecording={bulkSendRecording}
|
||||||
onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
|
onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
|
||||||
onBulkEdit={openBulkEdit}
|
onBulkEdit={openBulkEdit}
|
||||||
onExportSelected={exportSelectedADIF}
|
onExportSelected={exportSelectedADIF} onExportSelectedFull={exportSelectedADIFFull}
|
||||||
onExportSelectedFields={exportSelectedFields}
|
onExportSelectedFields={exportSelectedFields}
|
||||||
onExportFiltered={exportFilteredADIF}
|
onExportFiltered={exportFilteredADIF} onExportFilteredFull={exportFilteredADIFFull}
|
||||||
onDelete={(ids) => setDeletingIds(ids)}
|
onDelete={(ids) => setDeletingIds(ids)}
|
||||||
onRowSelected={(ids) => { setSelectedIds(ids); setSelectedId(ids[0] ?? null); }}
|
onRowSelected={(ids) => { setSelectedIds(ids); setSelectedId(ids[0] ?? null); }}
|
||||||
onRowSelectedQso={(r) => setSelQso(r ? { call: String(r.callsign ?? ""), band: String(r.band ?? ""), mode: String(r.mode ?? ""), dxcc: Number(r.dxcc ?? 0) } : null)}
|
onRowSelectedQso={(r) => setSelQso(r ? { call: String(r.callsign ?? ""), band: String(r.band ?? ""), mode: String(r.mode ?? ""), dxcc: Number(r.dxcc ?? 0) } : null)}
|
||||||
@@ -6641,6 +6908,21 @@ export default function App() {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* The zoom factor, while it is changing.
|
||||||
|
Centred at the top, out of the way of the entry form and the toasts,
|
||||||
|
and clickable: the number is only half an answer if the way back to
|
||||||
|
100 % is another thing to know. */}
|
||||||
|
{zoomShown && uiZoom !== 1 && (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setZoomRef.current(1)}
|
||||||
|
title={t('view.zoomResetTip')}
|
||||||
|
className="fixed top-2 left-1/2 -translate-x-1/2 z-[130] rounded-full border border-border bg-card/95 px-3 py-1 text-xs font-mono shadow-lg hover:bg-accent"
|
||||||
|
>
|
||||||
|
{Math.round(uiZoom * 100)}% · {t('view.zoomReset')}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Transient toasts (bottom-right). Errors stack on top of the green
|
{/* Transient toasts (bottom-right). Errors stack on top of the green
|
||||||
success toast; both auto-dismiss. */}
|
success toast; both auto-dismiss. */}
|
||||||
{/* Unlock encrypted passwords (set via Settings → Security). Dismissable:
|
{/* Unlock encrypted passwords (set via Settings → Security). Dismissable:
|
||||||
@@ -6690,6 +6972,16 @@ export default function App() {
|
|||||||
onKeyDown={(e) => {
|
onKeyDown={(e) => {
|
||||||
if (e.key === 'Enter' && (e.target as HTMLElement).tagName === 'INPUT') {
|
if (e.key === 'Enter' && (e.target as HTMLElement).tagName === 'INPUT') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
// A number in the call field is a QSY. Checked BEFORE ESM and before
|
||||||
|
// logging: both would otherwise act on a "callsign" of 28500.
|
||||||
|
if (e.target === callsignRef.current) {
|
||||||
|
const q = entryQSYCommand(callsignRef.current?.value ?? '');
|
||||||
|
if (q) {
|
||||||
|
applyEntryQSY(q);
|
||||||
|
setCallsign(''); // the field goes back to what it is for
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
// ESM (Enter Sends Message): fire the stage-appropriate CW macro instead
|
// ESM (Enter Sends Message): fire the stage-appropriate CW macro instead
|
||||||
// of logging. Falls through to the normal log when ESM isn't active.
|
// of logging. Falls through to the normal log when ESM isn't active.
|
||||||
if (esmHandleEnter(e.target as HTMLElement)) return;
|
if (esmHandleEnter(e.target as HTMLElement)) return;
|
||||||
@@ -6807,6 +7099,7 @@ export default function App() {
|
|||||||
band={band}
|
band={band}
|
||||||
mode={mode}
|
mode={mode}
|
||||||
bands={bands}
|
bands={bands}
|
||||||
|
satellites={satellites}
|
||||||
onEditQso={openEdit}
|
onEditQso={openEdit}
|
||||||
{...(!callsign.trim() && selQso ? {
|
{...(!callsign.trim() && selQso ? {
|
||||||
slotCall: selQso.call, slotBand: selQso.band, slotMode: selQso.mode,
|
slotCall: selQso.call, slotBand: selQso.band, slotMode: selQso.mode,
|
||||||
@@ -7165,6 +7458,8 @@ export default function App() {
|
|||||||
{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>}
|
||||||
|
{(catState.backend === 'elecraft' || catState.backend === 'kenwood') && <TabsTrigger value="elecraft">{t('k3.console')}</TabsTrigger>}
|
||||||
|
{catState.backend === 'tci' && <TabsTrigger value="tci">{t('tcip.console')}</TabsTrigger>}
|
||||||
{statsTabOpen && (
|
{statsTabOpen && (
|
||||||
<TabsTrigger value="stats" className="gap-1.5">
|
<TabsTrigger value="stats" className="gap-1.5">
|
||||||
{t('stats.tab')}
|
{t('stats.tab')}
|
||||||
@@ -7338,9 +7633,9 @@ export default function App() {
|
|||||||
onSendRecording={bulkSendRecording}
|
onSendRecording={bulkSendRecording}
|
||||||
onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
|
onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
|
||||||
onBulkEdit={openBulkEdit}
|
onBulkEdit={openBulkEdit}
|
||||||
onExportSelected={exportSelectedADIF}
|
onExportSelected={exportSelectedADIF} onExportSelectedFull={exportSelectedADIFFull}
|
||||||
onExportSelectedFields={exportSelectedFields}
|
onExportSelectedFields={exportSelectedFields}
|
||||||
onExportFiltered={exportFilteredADIF}
|
onExportFiltered={exportFilteredADIF} onExportFilteredFull={exportFilteredADIFFull}
|
||||||
onExportCabrilloSelected={exportSelectedCabrillo}
|
onExportCabrilloSelected={exportSelectedCabrillo}
|
||||||
onExportCabrilloFiltered={exportFilteredCabrillo}
|
onExportCabrilloFiltered={exportFilteredCabrillo}
|
||||||
onDelete={(ids) => setDeletingIds(ids)}
|
onDelete={(ids) => setDeletingIds(ids)}
|
||||||
@@ -7531,6 +7826,7 @@ export default function App() {
|
|||||||
rows={rendered as any}
|
rows={rendered as any}
|
||||||
spotStatus={spotStatus}
|
spotStatus={spotStatus}
|
||||||
onSpotClick={handleSpotClick}
|
onSpotClick={handleSpotClick}
|
||||||
|
onSpotSelect={handleSpotSelect}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
})()}
|
})()}
|
||||||
@@ -7671,7 +7967,7 @@ export default function App() {
|
|||||||
<WorkedBeforeGrid key={`wbg-${activeProfileId ?? 'x'}`} wb={wbWithAwards as any} myGrid={station.my_grid} awardCols={awardCols} busy={wbBusy} currentCall={callsign} onRowDoubleClicked={(q) => openEdit(q.id as number)}
|
<WorkedBeforeGrid key={`wbg-${activeProfileId ?? 'x'}`} wb={wbWithAwards as any} myGrid={station.my_grid} awardCols={awardCols} busy={wbBusy} currentCall={callsign} onRowDoubleClicked={(q) => openEdit(q.id as number)}
|
||||||
onUpdateFromCty={bulkUpdateFromCty} onUpdateFromQRZ={bulkUpdateFromQRZ} onUpdateFromClublog={bulkUpdateFromClublog} onUpdateCountyFromULS={ulsReady ? bulkUpdateCountyFromULS : undefined} onSendTo={bulkSendTo} onSendRecording={bulkSendRecording}
|
onUpdateFromCty={bulkUpdateFromCty} onUpdateFromQRZ={bulkUpdateFromQRZ} onUpdateFromClublog={bulkUpdateFromClublog} onUpdateCountyFromULS={ulsReady ? bulkUpdateCountyFromULS : undefined} onSendTo={bulkSendTo} onSendRecording={bulkSendRecording}
|
||||||
onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
|
onSendEQSL={(ids) => setEqslQsoId(ids[0] ?? null)}
|
||||||
onBulkEdit={openBulkEdit} onExportSelected={exportSelectedADIF} onExportSelectedFields={exportSelectedFields}
|
onBulkEdit={openBulkEdit} onExportSelected={exportSelectedADIF} onExportSelectedFull={exportSelectedADIFFull} onExportSelectedFields={exportSelectedFields}
|
||||||
onExportCabrilloSelected={exportSelectedCabrillo} onDelete={(ids) => setDeletingIds(ids)} />
|
onExportCabrilloSelected={exportSelectedCabrillo} onDelete={(ids) => setDeletingIds(ids)} />
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
@@ -7682,6 +7978,7 @@ export default function App() {
|
|||||||
<TabsContent value="qsl" forceMount className="mt-0 flex flex-col min-h-0 flex-1 data-[state=inactive]:hidden">
|
<TabsContent value="qsl" forceMount className="mt-0 flex flex-col min-h-0 flex-1 data-[state=inactive]:hidden">
|
||||||
<QSLManagerPanel
|
<QSLManagerPanel
|
||||||
onEditQSO={openEdit}
|
onEditQSO={openEdit}
|
||||||
|
paperRequest={qslPaperReq}
|
||||||
// The same row actions the Recent QSOs grid offers. Only the
|
// The same row actions the Recent QSOs grid offers. Only the
|
||||||
// selection-based exports: exporting "the filter" would mean
|
// selection-based exports: exporting "the filter" would mean
|
||||||
// the Recent-QSOs filter, not the rows shown here.
|
// the Recent-QSOs filter, not the rows shown here.
|
||||||
@@ -7787,7 +8084,8 @@ export default function App() {
|
|||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
<TabsContent value="awards" className="flex-1 min-h-0 p-0">
|
<TabsContent value="awards" className="flex-1 min-h-0 p-0">
|
||||||
<AwardsPanel onEditQSO={openEdit} onAwardsChanged={() => setAwardsVersion((v) => v + 1)} />
|
<AwardsPanel onEditQSO={openEdit} onAwardsChanged={() => setAwardsVersion((v) => v + 1)}
|
||||||
|
onPaperQSL={openPaperQSLFor} />
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
{statsTabOpen && (
|
{statsTabOpen && (
|
||||||
@@ -7842,6 +8140,23 @@ export default function App() {
|
|||||||
</TabsContent>
|
</TabsContent>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Elecraft K3/K4 console. Shown for the Kenwood backend too: the
|
||||||
|
K3 speaks that dialect and the panel reads whatever answers. */}
|
||||||
|
{(catState.backend === 'elecraft' || catState.backend === 'kenwood') && (
|
||||||
|
<TabsContent value="elecraft" className="flex-1 min-h-0 p-0">
|
||||||
|
<ElecraftPanel onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
|
||||||
|
</TabsContent>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* The SunSDR console. Everything on it is state the radio pushes
|
||||||
|
over TCI unasked, so unlike the serial consoles it costs nothing
|
||||||
|
to keep open. */}
|
||||||
|
{catState.backend === 'tci' && (
|
||||||
|
<TabsContent value="tci" className="flex-1 min-h-0 p-0">
|
||||||
|
<TCIPanel onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
|
||||||
|
</TabsContent>
|
||||||
|
)}
|
||||||
|
|
||||||
{catState.backend === 'icom' && (
|
{catState.backend === 'icom' && (
|
||||||
<TabsContent value="icom" className="flex-1 min-h-0 p-0">
|
<TabsContent value="icom" className="flex-1 min-h-0 p-0">
|
||||||
<IcomPanel isNetwork={catBackend === 'icom-net'} onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
|
<IcomPanel isNetwork={catBackend === 'icom-net'} onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
|
||||||
@@ -8232,28 +8547,16 @@ export default function App() {
|
|||||||
|
|
||||||
{showSettings && (
|
{showSettings && (
|
||||||
<SettingsModal
|
<SettingsModal
|
||||||
|
onEditQSO={openQSOFromSettings}
|
||||||
initialSection={settingsSection}
|
initialSection={settingsSection}
|
||||||
onClose={() => { setShowSettings(false); setSettingsSection(undefined); refreshChaseNew(); }}
|
onClose={closeSettings}
|
||||||
onSaved={() => {
|
onSaved={onSettingsSaved}
|
||||||
loadStation(); loadLists(); loadCATCfg(); reloadWk(); refreshManualRecReady();
|
onMainPaneChanged={onSettingsPaneChanged}
|
||||||
// Drop the cached spot statuses. They are computed once per
|
|
||||||
// call+band+mode and never expire, so a rule change in Settings —
|
|
||||||
// grouping the digital modes into one slot, above all — left every
|
|
||||||
// spot already on screen showing the answer to the OLD question.
|
|
||||||
setSpotStatus({});
|
|
||||||
}}
|
|
||||||
onMainPaneChanged={(side, v) => {
|
|
||||||
// Applied from the CHOSEN value, never from a re-read of the DB:
|
|
||||||
// the write is async and the layout must not lag a click behind.
|
|
||||||
if (side === 'left') setMainPaneLeft(v as MainPaneKind);
|
|
||||||
else if (side === 'right') setMainPaneRight(v as MainPaneKind);
|
|
||||||
else if (side === 'p3') setMainPane3(v as MainPaneKind);
|
|
||||||
else if (side === 'p4') setMainPane4(v as MainPaneKind);
|
|
||||||
else if (side === 'layout') setMainLayout4(v === 'cols' ? 'cols' : 'quad');
|
|
||||||
}}
|
|
||||||
flexAvailable={catState.backend === 'flex'}
|
flexAvailable={catState.backend === 'flex'}
|
||||||
icomAvailable={catState.backend === 'icom'}
|
icomAvailable={catState.backend === 'icom'}
|
||||||
yaesuAvailable={catState.backend === 'yaesu'}
|
yaesuAvailable={catState.backend === 'yaesu'}
|
||||||
|
elecraftAvailable={catState.backend === 'elecraft' || catState.backend === 'kenwood'}
|
||||||
|
tciAvailable={catState.backend === 'tci'}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { Bell, Plus, Trash2, Volume2, Mail, Eye, X, Search } from 'lucide-react';
|
import { Bell, Plus, Trash2, Volume2, Mail, Eye, X, Search } from 'lucide-react';
|
||||||
import {
|
import {
|
||||||
Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription,
|
Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription,
|
||||||
@@ -102,17 +102,40 @@ export function AlertsModal({ onClose, bands, modes, countries }: {
|
|||||||
return alerts.Rule.createFrom({ ...d, [key]: next });
|
return alerts.Rule.createFrom({ ...d, [key]: next });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Saving used to be silent: the dialog stays open and the rule looks exactly
|
||||||
|
// as it did a second earlier, so there was nothing to tell an operator whether
|
||||||
|
// the click had registered. A line that says so, and clears itself.
|
||||||
|
const [savedMsg, setSavedMsg] = useState('');
|
||||||
|
const savedTimer = useRef(0);
|
||||||
|
function flashSaved(text: string) {
|
||||||
|
setSavedMsg(text);
|
||||||
|
window.clearTimeout(savedTimer.current);
|
||||||
|
savedTimer.current = window.setTimeout(() => setSavedMsg(''), 3000);
|
||||||
|
}
|
||||||
|
useEffect(() => () => window.clearTimeout(savedTimer.current), []);
|
||||||
|
|
||||||
async function save() {
|
async function save() {
|
||||||
if (!draft) return;
|
if (!draft) return;
|
||||||
if (!draft.name.trim()) { setErr(t('altm.giveName')); return; }
|
if (!draft.name.trim()) { setErr(t('altm.giveName')); return; }
|
||||||
try { const saved = await SaveAlertRule(draft); await refresh(); loadDraft(saved as Rule); setErr(''); }
|
try {
|
||||||
catch (e: any) { setErr(String(e?.message ?? e)); }
|
const saved = await SaveAlertRule(draft);
|
||||||
|
await refresh();
|
||||||
|
loadDraft(saved as Rule);
|
||||||
|
setErr('');
|
||||||
|
flashSaved(t('altm.saved', { name: draft.name.trim() }));
|
||||||
|
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
}
|
}
|
||||||
async function del() {
|
async function del() {
|
||||||
if (!draft) return;
|
if (!draft) return;
|
||||||
if (!draft.id) { loadDraft(null); return; }
|
if (!draft.id) { loadDraft(null); return; }
|
||||||
if (!window.confirm(t('altm.deleteConfirm', { name: draft.name }))) return;
|
if (!window.confirm(t('altm.deleteConfirm', { name: draft.name }))) return;
|
||||||
try { await DeleteAlertRule(draft.id); loadDraft(null); await refresh(); }
|
try {
|
||||||
|
const name = draft.name;
|
||||||
|
await DeleteAlertRule(draft.id);
|
||||||
|
loadDraft(null);
|
||||||
|
await refresh();
|
||||||
|
flashSaved(t('altm.deleted', { name }));
|
||||||
|
}
|
||||||
catch (e: any) { setErr(String(e?.message ?? e)); }
|
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -257,6 +280,7 @@ export function AlertsModal({ onClose, bands, modes, countries }: {
|
|||||||
{/* Editor actions */}
|
{/* Editor actions */}
|
||||||
<div className="flex items-center gap-2 px-3 py-2 border-t border-border/60">
|
<div className="flex items-center gap-2 px-3 py-2 border-t border-border/60">
|
||||||
{err && <span className="text-[11px] text-danger flex-1 truncate">{err}</span>}
|
{err && <span className="text-[11px] text-danger flex-1 truncate">{err}</span>}
|
||||||
|
{!err && savedMsg && <span className="text-[11px] text-success flex-1 truncate">{savedMsg}</span>}
|
||||||
<div className="flex-1" />
|
<div className="flex-1" />
|
||||||
<Button variant="ghost" size="sm" className="text-danger" onClick={del}><Trash2 className="size-3.5" /> {t('altm.delete')}</Button>
|
<Button variant="ghost" size="sm" className="text-danger" onClick={del}><Trash2 className="size-3.5" /> {t('altm.delete')}</Button>
|
||||||
<Button size="sm" onClick={save}>{t('altm.saveRule')}</Button>
|
<Button size="sm" onClick={save}>{t('altm.saveRule')}</Button>
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ function powerLevelLabel(pl?: string): string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
type Amp = { id: string; name: string; type?: string; spe?: any; acom?: any; pgxl?: any };
|
type Amp = { id: string; name: string; type?: string; spe?: any; acom?: any; kpa?: any; pgxl?: any };
|
||||||
|
|
||||||
export function AmpCard({ amp, flex, t }: { amp: Amp; flex: any; t: (k: string, v?: any) => string }) {
|
export function AmpCard({ amp, flex, t }: { amp: Amp; flex: any; t: (k: string, v?: any) => string }) {
|
||||||
// Peak-hold so the jittery VITA-49 meters read steadily (own ref per card).
|
// Peak-hold so the jittery VITA-49 meters read steadily (own ref per card).
|
||||||
@@ -64,6 +64,7 @@ export function AmpCard({ amp, flex, t }: { amp: Amp; flex: any; t: (k: string,
|
|||||||
|
|
||||||
const isSPE = !!amp.spe;
|
const isSPE = !!amp.spe;
|
||||||
const isACOM = !!amp.acom;
|
const isACOM = !!amp.acom;
|
||||||
|
const isKPA = !!amp.kpa;
|
||||||
|
|
||||||
if (isSPE) {
|
if (isSPE) {
|
||||||
const spe = amp.spe;
|
const spe = amp.spe;
|
||||||
@@ -127,7 +128,7 @@ export function AmpCard({ amp, flex, t }: { amp: Amp; flex: any; t: (k: string,
|
|||||||
if (isACOM) {
|
if (isACOM) {
|
||||||
const acom = amp.acom;
|
const acom = amp.acom;
|
||||||
return (
|
return (
|
||||||
<Card icon={Flame} ckey="amplifier" title={`${t('flxp.amplifier')} · ${amp.name || `ACOM${acom.model ? ' ' + acom.model : ''}`}`} accent="#ea580c">
|
<Card icon={Flame} ckey="amplifier" title={`${t('flxp.amplifier')} · ${amp.name || `Acom${acom.model ? ' ' + acom.model : ''}`}`} accent="#ea580c">
|
||||||
<div className="flex items-center gap-3 flex-wrap">
|
<div className="flex items-center gap-3 flex-wrap">
|
||||||
<button type="button" disabled={!acom.connected}
|
<button type="button" disabled={!acom.connected}
|
||||||
onClick={() => AmpOperate(amp.id, !acom.operate).catch(() => {})}
|
onClick={() => AmpOperate(amp.id, !acom.operate).catch(() => {})}
|
||||||
@@ -168,6 +169,53 @@ export function AmpCard({ amp, flex, t }: { amp: Amp; flex: any; t: (k: string,
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isKPA) {
|
||||||
|
const kpa = amp.kpa;
|
||||||
|
return (
|
||||||
|
<Card icon={Flame} ckey="amplifier" title={`${t('flxp.amplifier')} · ${amp.name || kpa.model || 'Elecraft'}`} accent="#ea580c">
|
||||||
|
<div className="flex items-center gap-3 flex-wrap">
|
||||||
|
<button type="button" disabled={!kpa.connected}
|
||||||
|
onClick={() => AmpOperate(amp.id, !kpa.operate).catch(() => {})}
|
||||||
|
title={kpa.fault_text ? t('flxp.kpaClearsFault') : undefined}
|
||||||
|
className={cn('px-4 py-2 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||||
|
kpa.operate ? 'bg-warning text-warning-foreground border-warning shadow-[0_0_14px] shadow-warning/50' : 'bg-card text-warning border-warning hover:bg-warning-muted')}>
|
||||||
|
{kpa.operate ? 'OPERATE' : 'STANDBY'}
|
||||||
|
</button>
|
||||||
|
{/* The amplifier answers while its main supplies are off — a sleeping
|
||||||
|
microcontroller stays awake for exactly that — so ON is offered
|
||||||
|
over the network as well, unlike the SPE and Acom. */}
|
||||||
|
<div className="inline-flex rounded-lg overflow-hidden border-2 border-success/70">
|
||||||
|
<button type="button" disabled={!kpa.connected}
|
||||||
|
onClick={() => AmpPower(amp.id, true).catch(() => {})}
|
||||||
|
className="px-3 py-2 text-sm font-bold bg-card text-success hover:bg-success/15 disabled:opacity-30">ON</button>
|
||||||
|
<button type="button" disabled={!kpa.connected}
|
||||||
|
onClick={() => AmpPower(amp.id, false).catch(() => {})}
|
||||||
|
className="px-3 py-2 text-sm font-bold bg-card text-danger border-l-2 border-success/70 hover:bg-danger/15 disabled:opacity-30">OFF</button>
|
||||||
|
</div>
|
||||||
|
<span className={cn('inline-flex items-center gap-1.5 text-sm', kpa.connected ? 'text-muted-foreground' : 'text-danger')}>
|
||||||
|
<span className={cn('size-2 rounded-full', kpa.connected ? 'bg-success' : 'bg-danger')} />
|
||||||
|
{kpa.connected ? (kpa.tuning ? t('flxp.kpaTuning') : (kpa.power_on ? 'ON' : 'OFF')) : t('flxp.acomOffline')}
|
||||||
|
</span>
|
||||||
|
{kpa.connected && (
|
||||||
|
<span className="text-sm font-mono text-muted-foreground tabular-nums">
|
||||||
|
{kpa.band ? `${kpa.band} · ` : ''}{kpa.fwd_w}W · SWR {Number(kpa.swr ?? 0).toFixed(1)} · {kpa.temp_c}°C · {kpa.volt_v}V {kpa.cur_a}A
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
<div className="flex-1" />
|
||||||
|
{kpa.fault_text && (
|
||||||
|
<span className="px-2 py-1 rounded bg-danger-muted text-danger-muted-foreground text-xs font-bold">⚠ {kpa.fault_text}</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{kpa.connected && (
|
||||||
|
<MeterBar label={t('flxp.outputPower')} value={Number(kpa.fwd_w) || 0} unit="W"
|
||||||
|
lo={0} hi={String(kpa.model).includes('500') ? 500 : 1500}
|
||||||
|
display={`${Number(kpa.fwd_w) || 0} W`}
|
||||||
|
segColor={(f) => (f > 0.9 ? '#dc2626' : f > 0.75 ? '#f59e0b' : '#ea580c')} />
|
||||||
|
)}
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// PowerGenius XL — OPERATE + meters ride on the Flex; fan mode on the GSCP link.
|
// PowerGenius XL — OPERATE + meters ride on the Flex; fan mode on the GSCP link.
|
||||||
const pg = amp.pgxl || {};
|
const pg = amp.pgxl || {};
|
||||||
const viaFlex = !!flex?.amp_available;
|
const viaFlex = !!flex?.amp_available;
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import { AmpOperate, AmpPower, AmpPowerLevel, AmpFanMode, FlexAmpOperate } from
|
|||||||
// With several amplifiers configured the caller passes a selection ("all" or an
|
// With several amplifiers configured the caller passes a selection ("all" or an
|
||||||
// amp id) chosen from the toolbar icon's dropdown.
|
// amp id) chosen from the toolbar icon's dropdown.
|
||||||
|
|
||||||
type Amp = { id: string; name: string; type?: string; spe?: any; acom?: any; pgxl?: any };
|
type Amp = { id: string; name: string; type?: string; spe?: any; acom?: any; kpa?: any; pgxl?: any };
|
||||||
|
|
||||||
// Full-scale watts for the output bar, from the model string.
|
// Full-scale watts for the output bar, from the model string.
|
||||||
function maxW(model?: string, fallback = 1300): number {
|
function maxW(model?: string, fallback = 1300): number {
|
||||||
@@ -92,27 +92,39 @@ function OperateButton({ operate, disabled, onClick, t }: {
|
|||||||
function AmpBlock({ amp, flex, showName, t }: {
|
function AmpBlock({ amp, flex, showName, t }: {
|
||||||
amp: Amp; flex: any; showName: boolean; t: (k: string, v?: any) => string;
|
amp: Amp; flex: any; showName: boolean; t: (k: string, v?: any) => string;
|
||||||
}) {
|
}) {
|
||||||
const spe = amp.spe, acom = amp.acom;
|
const spe = amp.spe, acom = amp.acom, kpaAmp = amp.kpa;
|
||||||
const hold = usePeakHold();
|
const hold = usePeakHold();
|
||||||
|
|
||||||
if (spe || acom) {
|
// One block for the three amplifiers OpsLog drives over its own link. They
|
||||||
const s = spe || acom;
|
// report the same handful of things under different names, so the differences
|
||||||
|
// are named here rather than spread through the markup.
|
||||||
|
if (spe || acom || kpaAmp) {
|
||||||
|
const s = spe || acom || kpaAmp;
|
||||||
// The amp reports zero watts on receive, so its TX flag clears the meter as
|
// The amp reports zero watts on receive, so its TX flag clears the meter as
|
||||||
// soon as the operator lets go — and the radio's own flag, when we have one,
|
// soon as the operator lets go — and the radio's own flag, when we have one,
|
||||||
// gets there first (the amp is polled on its own slower cycle).
|
// gets there first (the amp is polled on its own slower cycle).
|
||||||
const txing = typeof flex?.transmitting === 'boolean' ? flex.transmitting : s.tx !== false;
|
const txing = typeof flex?.transmitting === 'boolean' ? flex.transmitting : s.tx !== false;
|
||||||
const w = hold('w', Number(spe ? s.output_w : s.fwd_w) || 0, txing);
|
const w = hold('w', Number(spe ? s.output_w : s.fwd_w) || 0, txing);
|
||||||
const swr = Number(spe ? s.swr_ant : s.swr) || 0;
|
const swr = Number(spe ? s.swr_ant : s.swr) || 0;
|
||||||
const hi = spe ? maxW(s.model) : (Number(s.max_w) || 800);
|
// The full-scale mark. A KPA500 reading against a 1500 W scale would look
|
||||||
|
// idle at full output, so the model decides it.
|
||||||
|
const hi = spe ? maxW(s.model)
|
||||||
|
: kpaAmp ? (String(s.model).includes('500') ? 500 : 1500)
|
||||||
|
: (Number(s.max_w) || 800);
|
||||||
// Power ON drives the remote-on control lines, so it stays available while
|
// Power ON drives the remote-on control lines, so it stays available while
|
||||||
// the amplifier is off and reporting nothing — but only over a serial link.
|
// the amplifier is off and reporting nothing — but only over a serial link.
|
||||||
const canPowerOn = spe ? (s.connected || s.transport === 'serial') : (s.port_open && s.transport === 'serial');
|
// A KPA answers ^ON while its main supplies are off — the sleeping
|
||||||
|
// microcontroller stays awake for exactly that — so power-on is available
|
||||||
|
// whenever the link itself is up, over serial and over the network alike.
|
||||||
|
const canPowerOn = spe ? (s.connected || s.transport === 'serial')
|
||||||
|
: kpaAmp ? !!s.connected
|
||||||
|
: (s.port_open && s.transport === 'serial');
|
||||||
return (
|
return (
|
||||||
<div className="h-full flex flex-col gap-1.5">
|
<div className="h-full flex flex-col gap-1.5">
|
||||||
{showName && (
|
{showName && (
|
||||||
<div className="flex items-center gap-1.5">
|
<div className="flex items-center gap-1.5">
|
||||||
<span className={cn('size-1.5 rounded-full shrink-0', s.connected ? 'bg-success shadow-[0_0_6px_rgba(16,185,129,0.8)]' : 'bg-danger')} />
|
<span className={cn('size-1.5 rounded-full shrink-0', s.connected ? 'bg-success shadow-[0_0_6px_rgba(16,185,129,0.8)]' : 'bg-danger')} />
|
||||||
<span className="text-[10px] font-bold uppercase tracking-wider truncate">{amp.name || (spe ? 'SPE' : 'ACOM')}</span>
|
<span className="text-[10px] font-bold uppercase tracking-wider truncate">{amp.name || (spe ? 'SPE' : kpaAmp ? (s.model || 'KPA') : 'Acom')}</span>
|
||||||
{s.connected && s.band && <span className="ml-auto text-[9px] text-muted-foreground shrink-0">{s.band}</span>}
|
{s.connected && s.band && <span className="ml-auto text-[9px] text-muted-foreground shrink-0">{s.band}</span>}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@@ -155,11 +167,17 @@ function AmpBlock({ amp, flex, showName, t }: {
|
|||||||
) : (
|
) : (
|
||||||
<div className="text-[10px] text-center text-muted-foreground italic py-1">{t('ampw.offline')}</div>
|
<div className="text-[10px] text-center text-muted-foreground italic py-1">{t('ampw.offline')}</div>
|
||||||
)}
|
)}
|
||||||
{(s.warnings || s.alarms || s.err_text) && (
|
{(s.warnings || s.alarms || s.err_text || s.fault_text) && (
|
||||||
<div className="rounded-md border border-danger-border bg-danger-muted text-danger-muted-foreground text-[9px] px-1.5 py-0.5 text-center break-words">
|
<div className="rounded-md border border-danger-border bg-danger-muted text-danger-muted-foreground text-[9px] px-1.5 py-0.5 text-center break-words">
|
||||||
{s.err_text || `${s.warnings || ''} ${s.alarms || ''}`.trim()}
|
{s.fault_text || s.err_text || `${s.warnings || ''} ${s.alarms || ''}`.trim()}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
{/* Said where the fault is read, because it is the way out of it: on a
|
||||||
|
KPA, going to OPERATE clears the current fault — everything except
|
||||||
|
temperature, which clears by cooling. */}
|
||||||
|
{kpaAmp && s.fault_text && (
|
||||||
|
<div className="text-[9px] text-center text-muted-foreground">{t('ampw.kpaClear')}</div>
|
||||||
|
)}
|
||||||
<PowerMeter label={t('flxp.outputPower')} watts={s.connected ? w : 0} maxWatts={hi} />
|
<PowerMeter label={t('flxp.outputPower')} watts={s.connected ? w : 0} maxWatts={hi} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -29,9 +29,9 @@ const LABELS: Record<string, string> = {
|
|||||||
|
|
||||||
// The channels a rule can be scoped to. "worked" is the catch-all — it means
|
// The channels a rule can be scoped to. "worked" is the catch-all — it means
|
||||||
// nothing on ANY channel — so narrowing it would say nothing.
|
// nothing on ANY channel — so narrowing it would say nothing.
|
||||||
const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
|
const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz', 'hamlog'] as const;
|
||||||
const CHANNEL_LABELS: Record<string, string> = {
|
const CHANNEL_LABELS: Record<string, string> = {
|
||||||
qsl: 'appr.chQsl', lotw: 'LoTW', eqsl: 'eQSL', qrz: 'QRZ.com',
|
qsl: 'appr.chQsl', lotw: 'LoTW', eqsl: 'eQSL', qrz: 'QRZ.com', hamlog: 'HAMLOG.online',
|
||||||
};
|
};
|
||||||
|
|
||||||
// MatrixColorsSection recolours the band/mode matrix — the PH/CW/DIG grid in the
|
// MatrixColorsSection recolours the band/mode matrix — the PH/CW/DIG grid in the
|
||||||
|
|||||||
@@ -68,7 +68,8 @@ const AWARD_TYPES = ['REFERENCE', 'QSOFIELDS', 'CALLSIGN'];
|
|||||||
const NO_FIELD = '__none__';
|
const NO_FIELD = '__none__';
|
||||||
const CONFIRM_SRC = [
|
const CONFIRM_SRC = [
|
||||||
{ id: 'lotw', label: 'LoTW' }, { id: 'qsl', label: 'QSL' }, { id: 'eqsl', label: 'eQSL' },
|
{ id: 'lotw', label: 'LoTW' }, { id: 'qsl', label: 'QSL' }, { id: 'eqsl', label: 'eQSL' },
|
||||||
{ id: 'qrzcom', label: 'QRZ.com' }, { id: 'custom', label: 'Custom' },
|
{ id: 'qrzcom', label: 'QRZ.com' }, { id: 'hamlog', label: 'HAMLOG.online' },
|
||||||
|
{ id: 'custom', label: 'Custom' },
|
||||||
];
|
];
|
||||||
const BANDS = ['2190m','630m','160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','4m','2m','1.25m','70cm','33cm','23cm','13cm','9cm','6cm','3cm','1.25cm','6mm','4mm','2.5mm','2mm','1mm'];
|
const BANDS = ['2190m','630m','160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','4m','2m','1.25m','70cm','33cm','23cm','13cm','9cm','6cm','3cm','1.25cm','6mm','4mm','2.5mm','2mm','1mm'];
|
||||||
const MODES = ['CW','SSB','USB','LSB','AM','FM','RTTY','PSK31','FT8','FT4','JT65','JT9','MFSK','OLIVIA','DIGITALVOICE'];
|
const MODES = ['CW','SSB','USB','LSB','AM','FM','RTTY','PSK31','FT8','FT4','JT65','JT9','MFSK','OLIVIA','DIGITALVOICE'];
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
import { X, Plus, Loader2 } from 'lucide-react';
|
import { X, Plus, Loader2 } from 'lucide-react';
|
||||||
import { SearchAwardReferences, GetAwardDefs, GetAwardReferenceMeta, AwardRefsNew } from '../../wailsjs/go/main/App';
|
import { SearchAwardReferences, GetAwardDefs, GetAwardReferenceMeta, AwardRefsNew, GetTrackedAwards } from '../../wailsjs/go/main/App';
|
||||||
import {
|
import {
|
||||||
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
||||||
} from '@/components/ui/select';
|
} from '@/components/ui/select';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
|
||||||
type AwardRef = { code: string; name: string; dxcc: number; group: string; subgrp: string };
|
type AwardRef = { code: string; name: string; dxcc: number; group: string; subgrp: string };
|
||||||
type AwardDef = { code: string; name: string; field?: string; dxcc_filter?: number[] | null; dynamic?: boolean };
|
type AwardDef = { code: string; name: string; field?: string; dxcc_filter?: number[] | null; dynamic?: boolean; valid?: boolean };
|
||||||
type Meta = { code: string; count: number; can_update: boolean };
|
type Meta = { code: string; count: number; can_update: boolean };
|
||||||
|
|
||||||
// Fields auto-derived from structured QSO data — their awards (DXCC/WAZ/WAS/…)
|
// Fields auto-derived from structured QSO data — their awards (DXCC/WAZ/WAS/…)
|
||||||
@@ -94,11 +94,16 @@ export function AwardRefSelector({ dxcc, value, onChange, fieldValues, heightCla
|
|||||||
}
|
}
|
||||||
}, [value]);
|
}, [value]);
|
||||||
|
|
||||||
|
// The awards the operator FOLLOWS, exactly as the Awards tab reads them.
|
||||||
|
// This panel used to offer every award that existed, so a station chasing
|
||||||
|
// three of them was picking references out of a list of twenty.
|
||||||
|
const [tracked, setTracked] = useState<Set<string>>(new Set());
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
Promise.all([GetAwardDefs(), GetAwardReferenceMeta()])
|
Promise.all([GetAwardDefs(), GetAwardReferenceMeta(), GetTrackedAwards()])
|
||||||
.then(([d, m]) => {
|
.then(([d, m, tr]) => {
|
||||||
setDefs((d ?? []) as any);
|
setDefs((d ?? []) as any);
|
||||||
setMetas(Object.fromEntries(((m ?? []) as Meta[]).map((x) => [String(x.code).toUpperCase(), x])));
|
setMetas(Object.fromEntries(((m ?? []) as Meta[]).map((x) => [String(x.code).toUpperCase(), x])));
|
||||||
|
setTracked(new Set(((tr ?? []) as string[]).map((c) => String(c).toUpperCase())));
|
||||||
})
|
})
|
||||||
.catch(() => {});
|
.catch(() => {});
|
||||||
}, []);
|
}, []);
|
||||||
@@ -111,6 +116,12 @@ export function AwardRefSelector({ dxcc, value, onChange, fieldValues, heightCla
|
|||||||
return defs.filter((d) => {
|
return defs.filter((d) => {
|
||||||
// Computed awards (field = dxcc/cqz/…) are derived automatically.
|
// Computed awards (field = dxcc/cqz/…) are derived automatically.
|
||||||
if (COMPUTED_FIELDS.has(String(d.field ?? '').toLowerCase())) return false;
|
if (COMPUTED_FIELDS.has(String(d.field ?? '').toLowerCase())) return false;
|
||||||
|
// Switched off in the award editor: not a candidate for anything.
|
||||||
|
if (d.valid === false) return false;
|
||||||
|
// Followed awards only, when a selection has been made. An empty
|
||||||
|
// selection means "all of them" — the same rule the Awards tab uses, so
|
||||||
|
// the two lists cannot disagree about what this station chases.
|
||||||
|
if (tracked.size > 0 && !tracked.has(String(d.code).toUpperCase())) return false;
|
||||||
const scope = d.dxcc_filter ?? [];
|
const scope = d.dxcc_filter ?? [];
|
||||||
if (scope.length > 0 && (!dxcc || !scope.includes(dxcc))) return false;
|
if (scope.length > 0 && (!dxcc || !scope.includes(dxcc))) return false;
|
||||||
// Offer the award even when its reference list isn't loaded yet: a custom
|
// Offer the award even when its reference list isn't loaded yet: a custom
|
||||||
@@ -122,7 +133,7 @@ export function AwardRefSelector({ dxcc, value, onChange, fieldValues, heightCla
|
|||||||
return true;
|
return true;
|
||||||
}).map((d) => ({ code: d.code, name: d.name, field: String(d.field ?? '').toLowerCase() }))
|
}).map((d) => ({ code: d.code, name: d.name, field: String(d.field ?? '').toLowerCase() }))
|
||||||
.sort((a, b) => a.code.localeCompare(b.code));
|
.sort((a, b) => a.code.localeCompare(b.code));
|
||||||
}, [defs, metas, dxcc]);
|
}, [defs, metas, dxcc, tracked]);
|
||||||
|
|
||||||
// Keep the selected award valid as the offered list changes with the call.
|
// Keep the selected award valid as the offered list changes with the call.
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
@@ -29,7 +29,32 @@ type AwardResult = {
|
|||||||
type AwardStatRow = { label: string; cells: number[]; total: number; grand_total: number };
|
type AwardStatRow = { label: string; cells: number[]; total: number; grand_total: number };
|
||||||
type AwardStats = { code: string; bands: string[]; rows: AwardStatRow[] };
|
type AwardStats = { code: string; bands: string[]; rows: AwardStatRow[] };
|
||||||
|
|
||||||
// Fixed band columns for the matrix view (Log4OM-style).
|
// Every band the matrix can show, in the order they belong in.
|
||||||
|
//
|
||||||
|
// The columns are the intersection of this with what the award covers, so a
|
||||||
|
// band missing HERE cannot appear at all whatever the award says — which is how
|
||||||
|
// DDFM, a French award worked well into the microwaves, ended at 70cm with no
|
||||||
|
// 23cm column and no way to ask for one.
|
||||||
|
//
|
||||||
|
// Mirrors bandOrder in internal/award — the same list in frequency order. The
|
||||||
|
// two are kept apart because they answer different questions (that one sorts an
|
||||||
|
// award's own band counts, this one lays out columns), but a band added to one
|
||||||
|
// belongs in the other.
|
||||||
|
// The DXCC Challenge counts one point per CONFIRMED entity per band, over ten
|
||||||
|
// bands — and 60 m is NOT one of them. That is the whole of the gap an operator
|
||||||
|
// notices between OpsLog and LoTW: 3229 here against 3004 there, and 224 of the
|
||||||
|
// difference is the 60 m column.
|
||||||
|
//
|
||||||
|
// Worked out from the confirmed row rather than asked of the backend, because
|
||||||
|
// that row IS the answer: the Challenge is its sum over these ten bands.
|
||||||
|
const CHALLENGE_BANDS = ['160m', '80m', '40m', '30m', '20m', '17m', '15m', '12m', '10m', '6m'];
|
||||||
|
|
||||||
|
const ALL_BANDS = ['2190m','630m','160m','80m','60m','40m','30m','20m','17m','15m','12m','10m',
|
||||||
|
'6m','4m','2m','1.25m','70cm','33cm','23cm','13cm','9cm','6cm','3cm','1.25cm','6mm','4mm','2.5mm','2mm','1mm'];
|
||||||
|
|
||||||
|
// What to show when there is nothing to narrow it down: an award with no band
|
||||||
|
// list and no contacts yet. The classic set — the whole of ALL_BANDS would be
|
||||||
|
// twenty-nine columns of mostly nothing.
|
||||||
const GRID_BANDS = ['160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','2m','70cm'];
|
const GRID_BANDS = ['160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','2m','70cm'];
|
||||||
|
|
||||||
// Per-band status for a reference, highest first.
|
// Per-band status for a reference, highest first.
|
||||||
@@ -68,7 +93,11 @@ function ProgressBar({ worked, confirmed, total }: { worked: number; confirmed:
|
|||||||
// detection only means anything for those — see the Missing refs button.
|
// detection only means anything for those — see the Missing refs button.
|
||||||
type AwardListItem = { code: string; name: string; valid?: boolean; bands?: string[]; emission?: string[]; scoped?: boolean };
|
type AwardListItem = { code: string; name: string; valid?: boolean; bands?: string[]; emission?: string[]; scoped?: boolean };
|
||||||
|
|
||||||
export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: number) => void; onAwardsChanged?: () => void } = {}) {
|
export function AwardsPanel({ onEditQSO, onAwardsChanged, onPaperQSL }: {
|
||||||
|
onEditQSO?: (id: number) => void;
|
||||||
|
onAwardsChanged?: () => void;
|
||||||
|
onPaperQSL?: (call: string) => void;
|
||||||
|
} = {}) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [awardList, setAwardList] = useState<AwardListItem[]>([]);
|
const [awardList, setAwardList] = useState<AwardListItem[]>([]);
|
||||||
// Computed results are cached per award code — each award is scanned only the
|
// Computed results are cached per award code — each award is scanned only the
|
||||||
@@ -176,26 +205,46 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
useEffect(() => { if (selected) compute(selected); /* eslint-disable-next-line react-hooks/exhaustive-deps */ }, [modeFilter]);
|
useEffect(() => { if (selected) compute(selected); /* eslint-disable-next-line react-hooks/exhaustive-deps */ }, [modeFilter]);
|
||||||
|
|
||||||
// Bands relevant to the selected award, used by BOTH the grid and the stats
|
// Bands relevant to the selected award, used by BOTH the grid and the stats
|
||||||
// matrix so neither is padded with bands the award doesn't use. Rule: the
|
// matrix so neither is padded with bands nothing was worked on. Rule: the
|
||||||
// award's explicit valid_bands if it has any (e.g. WAPC = 40/20/15/10m); else
|
// bands this operator HAS contacts on for this award; failing that, the
|
||||||
// the bands the operator actually has contacts on (so DXCC, which has no band
|
// award's own list of permitted bands. Empty set = no basis at all → callers
|
||||||
// restriction, shows 160m–6m instead of empty VHF/UHF columns). Empty set =
|
// fall back to the classic columns.
|
||||||
// no basis yet → callers fall back to all bands.
|
|
||||||
const awardBands = useMemo(() => {
|
const awardBands = useMemo(() => {
|
||||||
const vb = (awardList.find((a) => a.code === selected)?.bands ?? []).map((b) => b.toLowerCase());
|
// The bands with CONTACTS on them come first, whatever the award declares.
|
||||||
if (vb.length > 0) return new Set(vb);
|
//
|
||||||
const worked = (current?.bands ?? [])
|
// It used to take the declared list when there was one, which put up a
|
||||||
|
// column for every band the award permits — DDFM allows 6m and 70cm, so
|
||||||
|
// both stood there empty on a station that has never worked a French
|
||||||
|
// department on either. An always-blank column reads as a gap in the log
|
||||||
|
// rather than as a band the operator never tried.
|
||||||
|
const worked = new Set((current?.bands ?? [])
|
||||||
.filter((b) => (b.worked ?? 0) > 0)
|
.filter((b) => (b.worked ?? 0) > 0)
|
||||||
.map((b) => String(b.band).toLowerCase());
|
.map((b) => String(b.band).toLowerCase()));
|
||||||
return new Set(worked);
|
if (worked.size > 0) return worked;
|
||||||
|
// Nothing worked yet: the award's own list is the honest answer — it says
|
||||||
|
// what this award is played on, which is the only thing there is to show.
|
||||||
|
return new Set((awardList.find((a) => a.code === selected)?.bands ?? []).map((b) => b.toLowerCase()));
|
||||||
}, [awardList, selected, current]);
|
}, [awardList, selected, current]);
|
||||||
|
|
||||||
const gridBands = useMemo(() => {
|
const gridBands = useMemo(() => {
|
||||||
if (awardBands.size === 0) return GRID_BANDS;
|
if (awardBands.size === 0) return GRID_BANDS;
|
||||||
const filtered = GRID_BANDS.filter((b) => awardBands.has(b));
|
// Filtered from ALL_BANDS, so a band the award covers gets its column even
|
||||||
|
// when it is one the classic set never listed.
|
||||||
|
const filtered = ALL_BANDS.filter((b) => awardBands.has(b));
|
||||||
return filtered.length ? filtered : GRID_BANDS;
|
return filtered.length ? filtered : GRID_BANDS;
|
||||||
}, [awardBands]);
|
}, [awardBands]);
|
||||||
|
|
||||||
|
const challenge = useMemo(() => {
|
||||||
|
if (!stats || selected.toUpperCase() !== 'DXCC') return null;
|
||||||
|
const row = stats.rows.find((r) => r.label === 'CONFIRMED');
|
||||||
|
if (!row) return null;
|
||||||
|
let total = 0;
|
||||||
|
stats.bands.forEach((b, i) => {
|
||||||
|
if (CHALLENGE_BANDS.includes(String(b).toLowerCase())) total += Number(row.cells[i]) || 0;
|
||||||
|
});
|
||||||
|
return total;
|
||||||
|
}, [stats, selected]);
|
||||||
|
|
||||||
// Stats rows to show: drop the mode-category rows (CW / DIGITAL / PHONE) the
|
// Stats rows to show: drop the mode-category rows (CW / DIGITAL / PHONE) the
|
||||||
// award doesn't cover. The "ALL" rows (no suffix) always show; a category row
|
// award doesn't cover. The "ALL" rows (no suffix) always show; a category row
|
||||||
// shows only when the award has no emission restriction or lists that emission.
|
// shows only when the award has no emission restriction or lists that emission.
|
||||||
@@ -315,7 +364,13 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
{t('awp.rescan')}
|
{t('awp.rescan')}
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<AwardEditor open={editing} onClose={() => setEditing(false)} onSaved={() => { setByCode({}); loadList(); onAwardsChanged?.(); }} />
|
{/* setRescanTick as well as setByCode. The grid was refreshed on save
|
||||||
|
and the statistics matrix was not, so changing which confirmations
|
||||||
|
count — LoTW only, LoTW plus cards — left the whole table showing
|
||||||
|
the previous rule's numbers with nothing to say they were stale.
|
||||||
|
That is how a setting comes to look as though it does nothing. */}
|
||||||
|
<AwardEditor open={editing} onClose={() => setEditing(false)}
|
||||||
|
onSaved={() => { setByCode({}); setRescanTick((t) => t + 1); loadList(); onAwardsChanged?.(); }} />
|
||||||
{/* Quick selector — scales when there are many awards. */}
|
{/* Quick selector — scales when there are many awards. */}
|
||||||
{awardList.length > 0 && (
|
{awardList.length > 0 && (
|
||||||
<div className="px-2 py-2 border-b border-border/40">
|
<div className="px-2 py-2 border-b border-border/40">
|
||||||
@@ -469,8 +524,8 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
<tr className="bg-card">
|
<tr className="bg-card">
|
||||||
<th className="sticky left-0 z-20 bg-card text-left py-1.5 pr-3 font-medium border-b border-border">{t('awp.statistic')}</th>
|
<th className="sticky left-0 z-20 bg-card text-left py-1.5 pr-3 font-medium border-b border-border">{t('awp.statistic')}</th>
|
||||||
{statsBandIdx.map((i) => <th key={stats.bands[i]} className="py-1.5 px-1 font-mono font-medium border-b border-border text-center w-11">{stats.bands[i]}</th>)}
|
{statsBandIdx.map((i) => <th key={stats.bands[i]} className="py-1.5 px-1 font-mono font-medium border-b border-border text-center w-11">{stats.bands[i]}</th>)}
|
||||||
<th className="py-1.5 px-2 font-medium border-b border-border text-center">{t('awp.total')}</th>
|
<th className="py-1.5 px-2 font-medium border-b border-border text-center" title={t('awp.totalHint')}>{t('awp.total')}</th>
|
||||||
<th className="py-1.5 px-2 font-medium border-b border-border text-center">{t('awp.grand')}</th>
|
<th className="py-1.5 px-2 font-medium border-b border-border text-center" title={t('awp.grandHint')}>{t('awp.grand')}</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -489,6 +544,19 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
{challenge !== null && (
|
||||||
|
<tfoot>
|
||||||
|
<tr>
|
||||||
|
<td className="sticky left-0 bg-card py-1.5 pr-3 font-semibold whitespace-nowrap" title={t('awp.challengeHint')}>
|
||||||
|
{t('awp.challenge')}
|
||||||
|
</td>
|
||||||
|
<td colSpan={statsBandIdx.length} className="py-1.5 text-[11px] text-muted-foreground">
|
||||||
|
{t('awp.challengeBands')}
|
||||||
|
</td>
|
||||||
|
<td className="text-center py-1.5 px-2 font-mono font-bold text-success" colSpan={2}>{challenge}</td>
|
||||||
|
</tr>
|
||||||
|
</tfoot>
|
||||||
|
)}
|
||||||
</table>
|
</table>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@@ -604,7 +672,7 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{cell && current && (
|
{cell && current && (
|
||||||
<CellQSOModal code={current.code} cell={cell} modeClass={modeFilter === 'all' ? '' : modeFilter} onClose={() => setCell(null)} />
|
<CellQSOModal code={current.code} cell={cell} modeClass={modeFilter === 'all' ? '' : modeFilter} onClose={() => setCell(null)} onPaperQSL={onPaperQSL} />
|
||||||
)}
|
)}
|
||||||
{showMissing && current && (
|
{showMissing && current && (
|
||||||
<MissingQSOModal code={current.code} name={current.name} onClose={() => setShowMissing(false)} onEditQSO={onEditQSO} />
|
<MissingQSOModal code={current.code} name={current.name} onClose={() => setShowMissing(false)} onEditQSO={onEditQSO} />
|
||||||
@@ -835,7 +903,14 @@ function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; nam
|
|||||||
}
|
}
|
||||||
|
|
||||||
// CellQSOModal lists the QSOs behind one award-grid cell (reference × band).
|
// CellQSOModal lists the QSOs behind one award-grid cell (reference × band).
|
||||||
function CellQSOModal({ code, cell, modeClass, onClose }: { code: string; cell: { ref: string; band: string; name?: string }; modeClass: string; onClose: () => void }) {
|
function CellQSOModal({ code, cell, modeClass, onClose, onPaperQSL }: {
|
||||||
|
code: string; cell: { ref: string; band: string; name?: string }; modeClass: string;
|
||||||
|
onClose: () => void;
|
||||||
|
// Send this callsign to the QSL Manager's Paper QSL view. Chasing a
|
||||||
|
// confirmation starts here — an unconfirmed entity, the contact behind it —
|
||||||
|
// and used to continue by retyping the callsign into another tab.
|
||||||
|
onPaperQSL?: (call: string) => void;
|
||||||
|
}) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [qsos, setQsos] = useState<any[]>([]);
|
const [qsos, setQsos] = useState<any[]>([]);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
@@ -872,7 +947,15 @@ function CellQSOModal({ code, cell, modeClass, onClose }: { code: string; cell:
|
|||||||
{qsos.map((q, i) => (
|
{qsos.map((q, i) => (
|
||||||
<tr key={q.id ?? i} className="border-b border-border/30">
|
<tr key={q.id ?? i} className="border-b border-border/30">
|
||||||
<td className="py-1 px-3 font-mono">{fmt(q.qso_date)}</td>
|
<td className="py-1 px-3 font-mono">{fmt(q.qso_date)}</td>
|
||||||
<td className="py-1 pr-2 font-mono font-semibold">{q.callsign}</td>
|
<td className="py-1 pr-2 font-mono font-semibold">
|
||||||
|
{onPaperQSL ? (
|
||||||
|
<button type="button" className="hover:underline text-primary"
|
||||||
|
title={t('awp.paperQslTip')}
|
||||||
|
onClick={() => { onPaperQSL(String(q.callsign ?? '')); onClose(); }}>
|
||||||
|
{q.callsign}
|
||||||
|
</button>
|
||||||
|
) : q.callsign}
|
||||||
|
</td>
|
||||||
<td className="py-1 pr-2">{q.band}</td>
|
<td className="py-1 pr-2">{q.band}</td>
|
||||||
<td className="py-1 pr-2">{q.mode}</td>
|
<td className="py-1 pr-2">{q.mode}</td>
|
||||||
<td className="py-1 pr-3 text-muted-foreground">{[isQSLConfirmed(q.lotw_rcvd) && 'LoTW', isQSLConfirmed(q.qsl_rcvd) && 'QSL', isQSLConfirmed(q.eqsl_rcvd) && 'eQSL'].filter(Boolean).join(', ')}</td>
|
<td className="py-1 pr-3 text-muted-foreground">{[isQSLConfirmed(q.lotw_rcvd) && 'LoTW', isQSLConfirmed(q.qsl_rcvd) && 'QSL', isQSLConfirmed(q.eqsl_rcvd) && 'eQSL'].filter(Boolean).join(', ')}</td>
|
||||||
|
|||||||
@@ -48,6 +48,12 @@ const FIELDS: FieldDef[] = [
|
|||||||
{ id: 'clublog_sent_date', label: 'bulk.fClublogSentDate', group: 'QSL / upload', kind: 'date' },
|
{ id: 'clublog_sent_date', label: 'bulk.fClublogSentDate', group: 'QSL / upload', kind: 'date' },
|
||||||
{ id: 'hrdlog_sent', label: 'bulk.fHrdlogSent', group: 'QSL / upload', kind: 'status' },
|
{ id: 'hrdlog_sent', label: 'bulk.fHrdlogSent', group: 'QSL / upload', kind: 'status' },
|
||||||
{ id: 'hrdlog_sent_date', label: 'bulk.fHrdlogSentDate', group: 'QSL / upload', kind: 'date' },
|
{ id: 'hrdlog_sent_date', label: 'bulk.fHrdlogSentDate', group: 'QSL / upload', kind: 'date' },
|
||||||
|
// HAMLOG.online: no promoted column, written into extras_json (see
|
||||||
|
// qso.bulkEditableExtras). Status and date, like every other service here.
|
||||||
|
{ id: 'hamlog_sent', label: 'bulk.fHamlogSent', group: 'QSL / upload', kind: 'status' },
|
||||||
|
{ id: 'hamlog_sent_date', label: 'bulk.fHamlogSentDate', group: 'QSL / upload', kind: 'date' },
|
||||||
|
{ id: 'hamlog_rcvd', label: 'bulk.fHamlogRcvd', group: 'QSL / upload', kind: 'status' },
|
||||||
|
{ id: 'hamlog_rcvd_date', label: 'bulk.fHamlogRcvdDate', group: 'QSL / upload', kind: 'date' },
|
||||||
// My station / operator
|
// My station / operator
|
||||||
{ id: 'station_callsign', label: 'bulk.fStationCall', group: 'My station', kind: 'text', upper: true },
|
{ id: 'station_callsign', label: 'bulk.fStationCall', group: 'My station', kind: 'text', upper: true },
|
||||||
{ id: 'operator', label: 'bulk.fOperator', group: 'My station', kind: 'text', upper: true },
|
{ id: 'operator', label: 'bulk.fOperator', group: 'My station', kind: 'text', upper: true },
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import {
|
import {
|
||||||
AllCommunityModule, ModuleRegistry,
|
AllCommunityModule, ModuleRegistry,
|
||||||
type ColDef, type ColumnState, type GridReadyEvent, type RowClickedEvent,
|
type ColDef, type ColumnState, type GridReadyEvent, type RowClickedEvent, type RowDoubleClickedEvent,
|
||||||
} from 'ag-grid-community';
|
} from 'ag-grid-community';
|
||||||
import { hamlogGridTheme } from '@/lib/gridTheme';
|
import { hamlogGridTheme } from '@/lib/gridTheme';
|
||||||
import { AgGridReact } from 'ag-grid-react';
|
import { AgGridReact } from 'ag-grid-react';
|
||||||
@@ -75,7 +75,13 @@ export type SpotStatusEntry = {
|
|||||||
type Props = {
|
type Props = {
|
||||||
rows: ClusterSpot[];
|
rows: ClusterSpot[];
|
||||||
spotStatus: Record<string, SpotStatusEntry>;
|
spotStatus: Record<string, SpotStatusEntry>;
|
||||||
|
// A DOUBLE click works the spot: QSY, mode, callsign, the lot.
|
||||||
onSpotClick?: (s: ClusterSpot) => void;
|
onSpotClick?: (s: ClusterSpot) => void;
|
||||||
|
// A SINGLE click only fills the callsign. Reading the cluster means passing
|
||||||
|
// over dozens of lines, and every pass used to drag the radio with it — one
|
||||||
|
// stray click while looking took the operator off the station they were
|
||||||
|
// working. Looking and going are now two different gestures.
|
||||||
|
onSpotSelect?: (s: ClusterSpot) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
const COL_STATE_KEY = 'hamlog.clusterColState.v1';
|
const COL_STATE_KEY = 'hamlog.clusterColState.v1';
|
||||||
@@ -500,7 +506,7 @@ const GROUP_ORDER = ['Spot', 'Geo'];
|
|||||||
const CLG_GRP_KEYS: Record<string, string> = { Spot: 'clg2.grpSpot', Geo: 'clg2.grpGeo' };
|
const CLG_GRP_KEYS: Record<string, string> = { Spot: 'clg2.grpSpot', Geo: 'clg2.grpGeo' };
|
||||||
const groupLabel = (t: TFn, g: string): string => t(CLG_GRP_KEYS[g] ?? g);
|
const groupLabel = (t: TFn, g: string): string => t(CLG_GRP_KEYS[g] ?? g);
|
||||||
|
|
||||||
export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
|
export function ClusterGrid({ rows, spotStatus, onSpotClick, onSpotSelect }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const gridRef = useRef<any>(null);
|
const gridRef = useRef<any>(null);
|
||||||
const [pickerOpen, setPickerOpen] = useState(false);
|
const [pickerOpen, setPickerOpen] = useState(false);
|
||||||
@@ -582,7 +588,49 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
|
|||||||
if (state) saveState(COL_STATE_KEY, state);
|
if (state) saveState(COL_STATE_KEY, state);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
// HOLDING THE LIST STILL WHILE IT IS BEING READ.
|
||||||
|
//
|
||||||
|
// A busy evening puts a spot on the list every second or two, each landing at
|
||||||
|
// the top and pushing everything below it down. At the top of the list that is
|
||||||
|
// exactly right — it is what makes the panel live. A few rows down it makes
|
||||||
|
// the panel unusable: the callsign under the pointer has moved by the time the
|
||||||
|
// click lands, and the operator ends up chasing the row they wanted.
|
||||||
|
//
|
||||||
|
// So the grid freezes as soon as it is scrolled away from the top, and says
|
||||||
|
// how many spots are waiting. Scrolling back to the top releases it, as does
|
||||||
|
// clicking the notice. Nothing is lost — the spots keep arriving in the shared
|
||||||
|
// list; this only decides when the GRID is allowed to redraw with them.
|
||||||
|
const [held, setHeld] = useState<ClusterSpot[] | null>(null);
|
||||||
|
const shown = held ?? rows;
|
||||||
|
|
||||||
|
// How many arrived since the freeze. Counted by finding the frozen top row in
|
||||||
|
// the live list rather than by comparing lengths: the list is a ring buffer,
|
||||||
|
// so once it is full the length stops growing and a length comparison would
|
||||||
|
// report nothing new for the rest of the evening.
|
||||||
|
const spotID = (r: ClusterSpot) => `${(r as any).received_at}-${r.dx_call}-${(r as any).source_id}`;
|
||||||
|
const waiting = useMemo(() => {
|
||||||
|
if (!held || held.length === 0) return 0;
|
||||||
|
const top = spotID(held[0]);
|
||||||
|
const i = rows.findIndex((r) => spotID(r) === top);
|
||||||
|
return i < 0 ? rows.length : i; // fell out of the buffer: everything is new
|
||||||
|
}, [held, rows]);
|
||||||
|
|
||||||
|
const onBodyScroll = (e: { top: number }) => {
|
||||||
|
const down = e.top > 4; // a pixel or two of overscroll is not "scrolled down"
|
||||||
|
if (!down && held) setHeld(null);
|
||||||
|
if (down && !held) setHeld(rows);
|
||||||
|
};
|
||||||
|
|
||||||
|
const release = () => {
|
||||||
|
setHeld(null);
|
||||||
|
gridRef.current?.api?.ensureIndexVisible(0, 'top');
|
||||||
|
};
|
||||||
|
|
||||||
function handleRowClicked(e: RowClickedEvent<ClusterSpot>) {
|
function handleRowClicked(e: RowClickedEvent<ClusterSpot>) {
|
||||||
|
if (e.data && onSpotSelect) onSpotSelect(e.data);
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleRowDoubleClicked(e: RowDoubleClickedEvent<ClusterSpot>) {
|
||||||
if (e.data && onSpotClick) onSpotClick(e.data);
|
if (e.data && onSpotClick) onSpotClick(e.data);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -636,7 +684,7 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
|
|||||||
<AgGridReact<ClusterSpot>
|
<AgGridReact<ClusterSpot>
|
||||||
ref={gridRef}
|
ref={gridRef}
|
||||||
theme={hamlogTheme}
|
theme={hamlogTheme}
|
||||||
rowData={rows}
|
rowData={shown}
|
||||||
columnDefs={columnDefs}
|
columnDefs={columnDefs}
|
||||||
defaultColDef={defaultColDef}
|
defaultColDef={defaultColDef}
|
||||||
context={context}
|
context={context}
|
||||||
@@ -647,11 +695,21 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
|
|||||||
onColumnVisible={saveColumnState}
|
onColumnVisible={saveColumnState}
|
||||||
onSortChanged={saveColumnState}
|
onSortChanged={saveColumnState}
|
||||||
onRowClicked={handleRowClicked}
|
onRowClicked={handleRowClicked}
|
||||||
|
onRowDoubleClicked={handleRowDoubleClicked}
|
||||||
|
onBodyScroll={onBodyScroll}
|
||||||
animateRows={false}
|
animateRows={false}
|
||||||
suppressCellFocus
|
suppressCellFocus
|
||||||
getRowId={(p) => `${(p.data as any).received_at}-${(p.data as any).dx_call}-${(p.data as any).source_id}`}
|
getRowId={(p) => `${(p.data as any).received_at}-${(p.data as any).dx_call}-${(p.data as any).source_id}`}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
{/* Only when something is actually waiting: a frozen list with nothing
|
||||||
|
new to show needs no announcement. */}
|
||||||
|
{waiting > 0 && (
|
||||||
|
<button type="button" onClick={release}
|
||||||
|
className="absolute left-1/2 -translate-x-1/2 top-1 z-10 rounded-full border border-primary bg-primary px-3 py-1 text-[11px] font-semibold text-primary-foreground shadow-lg hover:opacity-90">
|
||||||
|
{t('clg2.newSpots', { n: waiting })}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Dialog open={pickerOpen} onOpenChange={setPickerOpen}>
|
<Dialog open={pickerOpen} onOpenChange={setPickerOpen}>
|
||||||
|
|||||||
@@ -316,6 +316,22 @@ const ENTITY_BADGE: Record<string, { label: string; cls: string }> = {
|
|||||||
'new-call': { label: 'dec.stCall', cls: 'bg-muted text-muted-foreground' },
|
'new-call': { label: 'dec.stCall', cls: 'bg-muted text-muted-foreground' },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// entityBadgesFor turns a status into the badges that describe it.
|
||||||
|
//
|
||||||
|
// A LIST, because "new-band-mode" is two facts at once — new on this band and
|
||||||
|
// new in this mode — and the map above has an entry for neither. It was read
|
||||||
|
// with a single lookup, which returned nothing for that status: those rows
|
||||||
|
// passed the BAND and MODE filters and then showed no reason for being there,
|
||||||
|
// which is precisely what was reported. catsOf has always split the status into
|
||||||
|
// its two categories; this is the same split, on the screen.
|
||||||
|
function entityBadgesFor(status: string): { label: string; cls: string }[] {
|
||||||
|
if (status === 'new-band-mode') {
|
||||||
|
return [ENTITY_BADGE['new-band'], ENTITY_BADGE['new-mode']];
|
||||||
|
}
|
||||||
|
const one = ENTITY_BADGE[status];
|
||||||
|
return one ? [one] : [];
|
||||||
|
}
|
||||||
|
|
||||||
// The orthogonal ones: a station already worked for its entity can still be a
|
// The orthogonal ones: a station already worked for its entity can still be a
|
||||||
// new grid, a new prefix or a park never logged.
|
// new grid, a new prefix or a park never logged.
|
||||||
//
|
//
|
||||||
@@ -531,7 +547,14 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
|
|||||||
});
|
});
|
||||||
const [bandSel, setBandSel] = usePersisted('bandSel', '');
|
const [bandSel, setBandSel] = usePersisted('bandSel', '');
|
||||||
const [modeSel, setModeSel] = usePersisted('modeSel', '');
|
const [modeSel, setModeSel] = usePersisted('modeSel', '');
|
||||||
const [contSel, setContSel] = usePersisted('contSel', '');
|
// Continents are a MULTI-selection, not one at a time: the useful filter is
|
||||||
|
// "everything except NA and EU", which a single-choice dropdown cannot say —
|
||||||
|
// it can only name one continent to keep. Stored as a list (a Set does not
|
||||||
|
// survive JSON), empty meaning no filter at all.
|
||||||
|
const [contList, setContList] = usePersisted<string[]>('contList', []);
|
||||||
|
const contSel = useMemo(() => new Set(contList), [contList]);
|
||||||
|
const toggleCont = (c: string) =>
|
||||||
|
setContList(contSel.has(c) ? contList.filter((x) => x !== c) : [...contList, c].sort());
|
||||||
const [minSnr, setMinSnr] = usePersisted('minSnr', '');
|
const [minSnr, setMinSnr] = usePersisted('minSnr', '');
|
||||||
const [search, setSearch] = usePersisted('search', '');
|
const [search, setSearch] = usePersisted('search', '');
|
||||||
|
|
||||||
@@ -554,8 +577,21 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
|
|||||||
const calling = (txState?.dx_call ?? '').toUpperCase();
|
const calling = (txState?.dx_call ?? '').toUpperCase();
|
||||||
const answersMe = (msg?: string): boolean => {
|
const answersMe = (msg?: string): boolean => {
|
||||||
if (!me || !msg) return false;
|
if (!me || !msg) return false;
|
||||||
const first = msg.trim().split(/\s+/)[0]?.replace(/[<>]/g, '').toUpperCase();
|
// EVERY segment, not just the first.
|
||||||
return !!first && first === me;
|
//
|
||||||
|
// MSHV answers two stations in one transmission and sends them as one line:
|
||||||
|
//
|
||||||
|
// DM8BJF RR73; F4BPO <RI1FJL> +14
|
||||||
|
//
|
||||||
|
// The second half is addressed to F4BPO, and reading only the start of the
|
||||||
|
// line missed it — the operator being answered saw no badge at all, which is
|
||||||
|
// the one moment this badge exists for. Each ';' segment is its own message
|
||||||
|
// and names its own recipient first.
|
||||||
|
for (const part of msg.split(';')) {
|
||||||
|
const first = part.trim().split(/\s+/)[0]?.replace(/[<>]/g, '').toUpperCase();
|
||||||
|
if (first && first === me) return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
// The choices are built from what is actually on the feed, and a selector with
|
// The choices are built from what is actually on the feed, and a selector with
|
||||||
@@ -576,6 +612,15 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
|
|||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [decodes, spotStatus]);
|
}, [decodes, spotStatus]);
|
||||||
|
|
||||||
|
// The chips are the continents on the feed — a selector with nothing to choose
|
||||||
|
// is furniture — PLUS anything currently selected. Without that second half a
|
||||||
|
// filter can strand itself: pick AF, the last African station stops decoding,
|
||||||
|
// and the list empties with no chip left to switch it back off.
|
||||||
|
const contChips = useMemo(
|
||||||
|
() => [...new Set([...conts, ...contList])].sort(),
|
||||||
|
[conts, contList],
|
||||||
|
);
|
||||||
|
|
||||||
const filtered = useMemo(() => {
|
const filtered = useMemo(() => {
|
||||||
const q = search.trim().toUpperCase();
|
const q = search.trim().toUpperCase();
|
||||||
const floor = minSnr.trim() === '' ? null : parseInt(minSnr, 10);
|
const floor = minSnr.trim() === '' ? null : parseInt(minSnr, 10);
|
||||||
@@ -594,7 +639,7 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
|
|||||||
for (const c of cats) if (have.has(c)) { hit = true; break; }
|
for (const c of cats) if (have.has(c)) { hit = true; break; }
|
||||||
if (!hit) return false;
|
if (!hit) return false;
|
||||||
}
|
}
|
||||||
if (contSel && e?.continent !== contSel) return false;
|
if (contSel.size > 0 && !(e?.continent && contSel.has(e.continent))) return false;
|
||||||
if (q && !(d.call.includes(q) || (d.grid ?? '').toUpperCase().includes(q) || (d.msg ?? '').toUpperCase().includes(q))) return false;
|
if (q && !(d.call.includes(q) || (d.grid ?? '').toUpperCase().includes(q) || (d.msg ?? '').toUpperCase().includes(q))) return false;
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
@@ -627,11 +672,11 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
|
|||||||
|
|
||||||
const resetFilters = () => {
|
const resetFilters = () => {
|
||||||
setCqOnly(false); setLotwOnly(false); setBandSel('');
|
setCqOnly(false); setLotwOnly(false); setBandSel('');
|
||||||
setModeSel(''); setContSel(''); setMinSnr(''); setSearch('');
|
setModeSel(''); setContList([]); setMinSnr(''); setSearch('');
|
||||||
setCats(new Set());
|
setCats(new Set());
|
||||||
try { localStorage.setItem(CAT_KEY, '[]'); } catch { /* not worth failing over */ }
|
try { localStorage.setItem(CAT_KEY, '[]'); } catch { /* not worth failing over */ }
|
||||||
};
|
};
|
||||||
const anyFilter = cqOnly || lotwOnly || cats.size > 0 || !!bandSel || !!modeSel || !!contSel || !!minSnr || !!search.trim();
|
const anyFilter = cqOnly || lotwOnly || cats.size > 0 || !!bandSel || !!modeSel || contSel.size > 0 || !!minSnr || !!search.trim();
|
||||||
|
|
||||||
const sel = 'h-8 rounded-lg border border-border bg-background px-2 text-sm';
|
const sel = 'h-8 rounded-lg border border-border bg-background px-2 text-sm';
|
||||||
const chip = (on: boolean, tone = 'primary') => cn(
|
const chip = (on: boolean, tone = 'primary') => cn(
|
||||||
@@ -700,11 +745,28 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
|
|||||||
{modes.map((m) => <option key={m} value={m}>{m}</option>)}
|
{modes.map((m) => <option key={m} value={m}>{m}</option>)}
|
||||||
</select>
|
</select>
|
||||||
)}
|
)}
|
||||||
{conts.length > 1 && (
|
{/* Toggles, like the category badges above — the same gesture for the
|
||||||
<select className={sel} value={contSel} onChange={(e) => setContSel(e.target.value)}>
|
same kind of question. None lit is every continent, which is what an
|
||||||
<option value="">{t('dec.allConts')}</option>
|
empty filter has always meant here. */}
|
||||||
{conts.map((c) => <option key={c} value={c}>{c}</option>)}
|
{contChips.length > 1 && (
|
||||||
</select>
|
<span className="flex items-center gap-1 pl-1 border-l border-border/60 ml-1" title={t('dec.contsHint')}>
|
||||||
|
{contChips.map((c) => {
|
||||||
|
const on = contSel.has(c);
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
key={c}
|
||||||
|
type="button"
|
||||||
|
onClick={() => toggleCont(c)}
|
||||||
|
className={cn(
|
||||||
|
'rounded border px-1.5 py-0.5 text-[11px] font-bold uppercase tracking-wide transition-all',
|
||||||
|
on ? 'border-primary text-primary' : 'border-border text-muted-foreground opacity-50 hover:opacity-100',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
{c}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</span>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<label className="flex items-center gap-1.5 text-sm text-muted-foreground">
|
<label className="flex items-center gap-1.5 text-sm text-muted-foreground">
|
||||||
@@ -765,21 +827,6 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
|
|||||||
filter. Halt goes LAST — it is the one that must be findable without
|
filter. Halt goes LAST — it is the one that must be findable without
|
||||||
reading, and the end of the row is the one position that never moves
|
reading, and the end of the row is the one position that never moves
|
||||||
as filters come and go. */}
|
as filters come and go. */}
|
||||||
{onToggleAutoCall && (
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={onToggleAutoCall}
|
|
||||||
title={t('dec.autoCallTip')}
|
|
||||||
className={cn('h-8 px-2.5 rounded-lg text-sm inline-flex items-center gap-1.5 border',
|
|
||||||
// Lit when it is armed, because what matters at a glance is not
|
|
||||||
// "where is the switch" but "is this thing about to transmit".
|
|
||||||
autoCallOn
|
|
||||||
? 'border-warning bg-warning text-warning-foreground'
|
|
||||||
: 'border-border text-muted-foreground hover:bg-muted hover:text-foreground')}
|
|
||||||
>
|
|
||||||
<Bot className="size-3.5" /> {t('dec.autoCall')}
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
{onHalt && (
|
{onHalt && (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@@ -973,10 +1020,10 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
|
|||||||
{g.decodes.map((d, i) => {
|
{g.decodes.map((d, i) => {
|
||||||
const e = statusOf(d);
|
const e = statusOf(d);
|
||||||
const st = e?.status && e.status !== 'worked' ? e.status : '';
|
const st = e?.status && e.status !== 'worked' ? e.status : '';
|
||||||
const entity = st ? ENTITY_BADGE[st] : undefined;
|
const entities = st ? entityBadgesFor(st) : [];
|
||||||
const extras = EXTRA_BADGES.filter((b) => !!e?.[b.key]);
|
const extras = EXTRA_BADGES.filter((b) => !!e?.[b.key]);
|
||||||
const mine = !!me && d.call === me;
|
const mine = !!me && d.call === me;
|
||||||
const hot = !!entity || extras.length > 0;
|
const hot = entities.length > 0 || extras.length > 0;
|
||||||
// Someone answering us outranks everything else on the screen.
|
// Someone answering us outranks everything else on the screen.
|
||||||
const replying = answersMe(d.msg);
|
const replying = answersMe(d.msg);
|
||||||
// The station we are calling, so it can be picked out of a slot
|
// The station we are calling, so it can be picked out of a slot
|
||||||
@@ -1065,11 +1112,11 @@ export function DecodesPanel({ decodes, txMsgs, txState, txStates, spotStatus, o
|
|||||||
{t('dec.wkd')}
|
{t('dec.wkd')}
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
{entity && (
|
{entities.map((b) => (
|
||||||
<span className={cn('rounded px-1 py-px text-[10px] font-bold uppercase tracking-wide shrink-0', entity.cls)}>
|
<span key={b.label} className={cn('rounded px-1 py-px text-[10px] font-bold uppercase tracking-wide shrink-0', b.cls)}>
|
||||||
{t(entity.label)}
|
{t(b.label)}
|
||||||
</span>
|
</span>
|
||||||
)}
|
))}
|
||||||
{extras.map((b) => {
|
{extras.map((b) => {
|
||||||
// A square WORKED but not yet confirmed is a different job
|
// A square WORKED but not yet confirmed is a different job
|
||||||
// from one never worked: a QSL to chase, not a QSO to make.
|
// from one never worked: a QSL to chase, not a QSO to make.
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import {
|
|||||||
} from '@/components/ui/select';
|
} from '@/components/ui/select';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
import { Combobox } from '@/components/ui/combobox';
|
||||||
import { pathBetween, pathBetweenLatLon, gridToLatLon } from '@/lib/maidenhead';
|
import { pathBetween, pathBetweenLatLon, gridToLatLon } from '@/lib/maidenhead';
|
||||||
import { BandSlotGrid } from '@/components/BandSlotGrid';
|
import { BandSlotGrid } from '@/components/BandSlotGrid';
|
||||||
import { AwardRefSelector } from '@/components/AwardRefSelector';
|
import { AwardRefSelector } from '@/components/AwardRefSelector';
|
||||||
@@ -70,6 +71,10 @@ interface Props {
|
|||||||
band: string;
|
band: string;
|
||||||
mode: string;
|
mode: string;
|
||||||
bands?: string[]; // configured bands for the worked-before matrix columns
|
bands?: string[]; // configured bands for the worked-before matrix columns
|
||||||
|
// The station's satellites, for the SAT_NAME dropdown. Passed in rather than
|
||||||
|
// read here: the list lives in Preferences, and App already reloads it when
|
||||||
|
// Preferences close — a panel reading it once at mount would need a restart.
|
||||||
|
satellites?: string[];
|
||||||
// When the entry form is empty and a QSO is selected in the log grid, the
|
// When the entry form is empty and a QSO is selected in the log grid, the
|
||||||
// Stats (F1) matrix shows THAT contact's entity instead of sitting blank.
|
// Stats (F1) matrix shows THAT contact's entity instead of sitting blank.
|
||||||
// Only the matrix is redirected — every other tab still edits the live entry.
|
// Only the matrix is redirected — every other tab still edits the live entry.
|
||||||
@@ -150,7 +155,7 @@ function Field({ label, span = 1, className, children }: { label: string; span?:
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth, name, country, comment, note, details, onChange, wb, wbBusy, band, mode, bands, slotCall, slotBand, slotMode, slotWb, slotWbBusy, tab, onTab, keyerActive, onEditQso }: Props) {
|
export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth, name, country, comment, note, details, onChange, wb, wbBusy, band, mode, bands, satellites = [], slotCall, slotBand, slotMode, slotWb, slotWbBusy, tab, onTab, keyerActive, onEditQso }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [internalOpen, setInternalOpen] = useState<TabName>('stats');
|
const [internalOpen, setInternalOpen] = useState<TabName>('stats');
|
||||||
const open = tab ?? internalOpen; // controlled when `tab` is provided
|
const open = tab ?? internalOpen; // controlled when `tab` is provided
|
||||||
@@ -478,7 +483,25 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth,
|
|||||||
{satelliteMode && (
|
{satelliteMode && (
|
||||||
<>
|
<>
|
||||||
<Field label={t('detp.satName')} span={3}>
|
<Field label={t('detp.satName')} span={3}>
|
||||||
<Input value={details.sat_name} onChange={(e) => onChange({ sat_name: e.target.value })} />
|
{/* The station's own satellites, in alphabetical order, with the
|
||||||
|
box still open to anything typed: SAT_NAME is compared
|
||||||
|
character for character by the awards and by LoTW, so a
|
||||||
|
remembered spelling beats a fresh one every pass — but a bird
|
||||||
|
worked once and never added to the list must not be
|
||||||
|
impossible to log. */}
|
||||||
|
{/* showToggle: without the chevron this control is a text box that
|
||||||
|
happens to open on a keystroke, which nobody discovers — and
|
||||||
|
is exactly what "there is still no dropdown" meant.
|
||||||
|
allowFreeText: the list is the station's own, so a bird
|
||||||
|
worked once and never added to it must still be loggable. */}
|
||||||
|
<Combobox
|
||||||
|
value={details.sat_name}
|
||||||
|
options={satellites}
|
||||||
|
placeholder={t('detp.satName')}
|
||||||
|
showToggle
|
||||||
|
allowFreeText
|
||||||
|
onChange={(v) => onChange({ sat_name: v })}
|
||||||
|
/>
|
||||||
</Field>
|
</Field>
|
||||||
<Field label={t('detp.satelliteMode')} span={3}>
|
<Field label={t('detp.satelliteMode')} span={3}>
|
||||||
<Input value={details.sat_mode} onChange={(e) => onChange({ sat_mode: e.target.value })} />
|
<Input value={details.sat_mode} onChange={(e) => onChange({ sat_mode: e.target.value })} />
|
||||||
|
|||||||
@@ -0,0 +1,326 @@
|
|||||||
|
import { useEffect, useRef, useState } from 'react';
|
||||||
|
import { Radio, Power, Activity, AudioLines, SlidersHorizontal } from 'lucide-react';
|
||||||
|
import {
|
||||||
|
GetKenwoodState, RefreshKenwood, SetKenwoodPower, SetKenwoodAFGain, SetKenwoodTX, TuneKenwoodATU,
|
||||||
|
SetKenwoodRFGain, SetKenwoodMicGain, SetKenwoodSquelch, SetKenwoodPreamp, SetKenwoodAtt,
|
||||||
|
SetKenwoodNB, SetKenwoodNR, SetKenwoodAGC, SetKenwoodFilter, SetKenwoodAntenna,
|
||||||
|
SetKenwoodRIT, SetKenwoodXIT, ClearKenwoodRIT, SetKenwoodKeySpeed, ToggleKenwoodATU, NudgeKenwoodRIT,
|
||||||
|
GetCATState,
|
||||||
|
} from '../../wailsjs/go/main/App';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
import { sMeterRST } from '@/lib/rst';
|
||||||
|
import { MeterBar } from '@/components/MeterBar';
|
||||||
|
import { WheelRange } from '@/components/WheelRange';
|
||||||
|
|
||||||
|
type KenwoodState = {
|
||||||
|
available: boolean; model?: string; elecraft: boolean; mode?: string;
|
||||||
|
transmitting: boolean; split: boolean; split_tx_hz?: number;
|
||||||
|
s_meter: number; s_meter_raw: number;
|
||||||
|
power_meter: number; swr: number; swr_raw: number;
|
||||||
|
rf_power: number; af_gain: number; rf_gain: number; mic_gain: number; squelch: number;
|
||||||
|
preamp: boolean; att: boolean; nb: boolean; nr: boolean; agc?: string;
|
||||||
|
filter_hz: number; antenna: number; rit: boolean; xit: boolean; rit_offset: number; key_speed: number;
|
||||||
|
meters_provisional: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
const ZERO: KenwoodState = {
|
||||||
|
available: false, elecraft: false, transmitting: false, split: false,
|
||||||
|
s_meter: 0, s_meter_raw: 0, power_meter: 0, swr: 0, swr_raw: 0,
|
||||||
|
rf_power: 0, af_gain: 0, rf_gain: 0, mic_gain: 0, squelch: 0,
|
||||||
|
preamp: false, att: false, nb: false, nr: false,
|
||||||
|
filter_hz: 0, antenna: 0, rit: false, xit: false, rit_offset: 0, key_speed: 0,
|
||||||
|
meters_provisional: true,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Filter widths worth a button. CW work happens at 200-500 Hz, SSB at 2.4-2.8
|
||||||
|
// kHz; the rest of the range is reachable from the radio's own knob, and a
|
||||||
|
// panel offering thirty widths is slower to use than the knob it replaces.
|
||||||
|
// 4.0k is the K3 maximum and the one FT8 wants: a 2.8 kHz filter clips the
|
||||||
|
// top of the FT8 sub-band, and the decodes that go missing are the ones
|
||||||
|
// nobody notices are missing.
|
||||||
|
const FILTERS = [200, 400, 700, 1000, 1800, 2400, 2800, 4000];
|
||||||
|
|
||||||
|
// Raw S-meter → S units. The K3 answers 0-21 across S0…S9+60; S9 is taken at
|
||||||
|
// raw 9 and each step above it as 6 dB. PROVISIONAL, like the rest of the
|
||||||
|
// scaling: the raw value is on screen and in the log, so a real radio settles
|
||||||
|
// it rather than this comment.
|
||||||
|
const S9_RAW = 9;
|
||||||
|
const DB_PER_RAW = 6;
|
||||||
|
function sParts(rawV: number): { s: number; over: number; label: string } {
|
||||||
|
if (rawV >= S9_RAW) {
|
||||||
|
const over = Math.max(0, Math.round((rawV - S9_RAW) * DB_PER_RAW));
|
||||||
|
return { s: 9, over, label: over > 0 ? `S9+${over}` : 'S9' };
|
||||||
|
}
|
||||||
|
const s = Math.max(0, Math.min(9, rawV));
|
||||||
|
return { s, over: 0, label: `S${s}` };
|
||||||
|
}
|
||||||
|
|
||||||
|
// Segment colour, printed the way a radio's own meter is: green up to S9, amber
|
||||||
|
// through the S9+ range, red once the signal would be reported as 59+20 or more.
|
||||||
|
function sSegColor(frac: number) {
|
||||||
|
if (frac > 0.78) return '#dc2626';
|
||||||
|
if (frac > 0.55) return '#f59e0b';
|
||||||
|
return '#16a34a';
|
||||||
|
}
|
||||||
|
|
||||||
|
// The card shell the Yaesu and Icom consoles use, so the three read alike.
|
||||||
|
function Card({ icon: Icon, title, children }: { icon: any; title: string; children: React.ReactNode }) {
|
||||||
|
return (
|
||||||
|
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden">
|
||||||
|
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
|
||||||
|
<Icon className="size-4 text-primary" />
|
||||||
|
<span className="text-xs font-bold uppercase tracking-wider text-foreground/80">{title}</span>
|
||||||
|
</div>
|
||||||
|
<div className="p-3 space-y-3">{children}</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// One button shape for every on/off control, so the panel reads as one
|
||||||
|
// instrument instead of a collection of differently-styled switches.
|
||||||
|
function Toggle({ label, on, off, onClick }: { label: string; on: boolean; off: boolean; onClick: () => void }) {
|
||||||
|
return (
|
||||||
|
<button type="button" disabled={off} onClick={onClick}
|
||||||
|
className={cn('px-2 py-1 rounded-md text-[11px] font-bold tracking-wide border transition-all disabled:opacity-30',
|
||||||
|
on ? 'bg-primary text-primary-foreground border-primary' : 'bg-card text-muted-foreground border-border hover:border-primary/60')}>
|
||||||
|
{label}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ElecraftPanel({ onReportRST }: { onReportRST?: (rst: string) => void }) {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const [st, setSt] = useState<KenwoodState>(ZERO);
|
||||||
|
const [freqHz, setFreqHz] = useState(0);
|
||||||
|
const [err, setErr] = useState('');
|
||||||
|
// Optimistic overlay: a slider must follow the finger, not the poll. Dropped
|
||||||
|
// once the radio has had time to answer with the value it actually took.
|
||||||
|
const [local, setLocal] = useState<{ rf_power?: number; af_gain?: number; rf_gain?: number; mic_gain?: number; squelch?: number; key_speed?: number }>({});
|
||||||
|
const localAtRef = useRef(0);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let alive = true;
|
||||||
|
const tick = async () => {
|
||||||
|
try {
|
||||||
|
const s = (await GetKenwoodState()) as KenwoodState;
|
||||||
|
const c = (await GetCATState()) as any;
|
||||||
|
if (!alive) return;
|
||||||
|
setSt(s);
|
||||||
|
setFreqHz(c?.split && c?.freq_rx_hz > 0 ? c.freq_rx_hz : (c?.freq_hz ?? 0));
|
||||||
|
if (Date.now() - localAtRef.current > 1200) setLocal({});
|
||||||
|
setErr('');
|
||||||
|
} catch (e: any) {
|
||||||
|
if (alive) setErr(String(e?.message ?? e));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
tick();
|
||||||
|
const id = window.setInterval(tick, 500);
|
||||||
|
return () => { alive = false; window.clearInterval(id); };
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const view = { ...st, ...local };
|
||||||
|
const off = !st.available;
|
||||||
|
|
||||||
|
const setErrMsg = (e: any) => setErr(String(e?.message ?? e));
|
||||||
|
|
||||||
|
const put = (patch: typeof local, run: () => Promise<any>) => {
|
||||||
|
setLocal((p) => ({ ...p, ...patch }));
|
||||||
|
localAtRef.current = Date.now();
|
||||||
|
run().catch((e) => setErr(String(e?.message ?? e)));
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="h-full min-h-0 overflow-auto bg-background">
|
||||||
|
{/* Same wrapper as the Yaesu, Icom and Flex consoles: capped width and
|
||||||
|
CENTRED. A console stretched across a 2000 px window puts a slider a
|
||||||
|
hand's width from its own label, and the panel stops reading as one
|
||||||
|
instrument. */}
|
||||||
|
<div className="max-w-5xl mx-auto p-3 space-y-3">
|
||||||
|
{/* VFO + status */}
|
||||||
|
<div className="rounded-xl border border-border bg-card shadow-sm px-4 py-3 flex items-center justify-between gap-3 flex-wrap">
|
||||||
|
<div>
|
||||||
|
<div className="text-[10px] font-bold uppercase tracking-wider text-muted-foreground flex items-center gap-1.5">
|
||||||
|
<Radio className="size-3.5" />
|
||||||
|
{st.elecraft ? 'Elecraft' : 'Kenwood'} {st.model}
|
||||||
|
<span className={cn('size-2 rounded-full', off ? 'bg-muted-foreground/40' : 'bg-success')} />
|
||||||
|
</div>
|
||||||
|
<div className="text-2xl font-mono tabular-nums font-bold">
|
||||||
|
{freqHz > 0 ? (freqHz / 1e6).toFixed(6) : '—'}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button type="button" className="text-[11px] text-muted-foreground hover:text-foreground flex items-center gap-1"
|
||||||
|
onClick={() => RefreshKenwood().catch(() => {})} title={t('k3.refreshHint')}>
|
||||||
|
<SlidersHorizontal className="size-3.5" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{off && <div className="text-xs text-muted-foreground px-1">{t('k3.waiting')}</div>}
|
||||||
|
{!!err && <div className="text-[11px] text-danger px-1">{err}</div>}
|
||||||
|
|
||||||
|
{/* Meters */}
|
||||||
|
<Card icon={Activity} title={t('k3.meters')}>
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-3 gap-2">
|
||||||
|
<MeterBar label="S-METER" value={view.transmitting ? 0 : view.s_meter} lo={0} hi={100}
|
||||||
|
accent="#16a34a" segColor={sSegColor}
|
||||||
|
display={view.transmitting ? '—' : sParts(view.s_meter_raw).label}
|
||||||
|
onClick={() => {
|
||||||
|
if (view.transmitting || !onReportRST) return;
|
||||||
|
const sp = sParts(view.s_meter_raw);
|
||||||
|
onReportRST(sMeterRST(sp.s, sp.over, view.mode));
|
||||||
|
}}
|
||||||
|
title={t('k3.sMeterHint', { raw: String(view.s_meter_raw) })} />
|
||||||
|
<MeterBar label="PWR" value={view.transmitting ? view.power_meter : 0} lo={0} hi={100} accent="#0ea5e9" />
|
||||||
|
{/* 0 means "not measured", and it must not render as a perfect 1.0:
|
||||||
|
a match that looks ideal on an antenna nobody has measured is the one
|
||||||
|
reading that can cost a radio. */}
|
||||||
|
<MeterBar label="SWR" value={view.transmitting && view.swr > 0 ? view.swr : 1} lo={1} hi={4}
|
||||||
|
accent="#f59e0b"
|
||||||
|
display={view.transmitting && view.swr > 0 ? view.swr.toFixed(1) : '—'} />
|
||||||
|
</div>
|
||||||
|
{view.meters_provisional && (
|
||||||
|
<p className="text-[10px] text-muted-foreground">{t('k3.provisional')}</p>
|
||||||
|
)}
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
{/* MOX + TUNE */}
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<button type="button" disabled={off}
|
||||||
|
onClick={() => SetKenwoodTX(!view.transmitting).catch((e) => setErr(String(e?.message ?? e)))}
|
||||||
|
className={cn('flex-1 px-3 py-2.5 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||||
|
view.transmitting
|
||||||
|
? 'bg-danger text-danger-foreground border-danger shadow-[0_0_14px] shadow-danger/50'
|
||||||
|
: 'bg-card text-danger border-danger hover:bg-danger-muted')}>
|
||||||
|
<Power className="size-4 inline mr-1 -mt-0.5" /> MOX
|
||||||
|
</button>
|
||||||
|
<button type="button" disabled={off}
|
||||||
|
onClick={() => TuneKenwoodATU().catch((e) => setErr(String(e?.message ?? e)))}
|
||||||
|
title={t('k3.tuneHint')}
|
||||||
|
className="flex-1 px-3 py-2.5 rounded-lg text-sm font-extrabold tracking-wide border-2 border-warning text-warning bg-card hover:bg-warning-muted transition-all disabled:opacity-30">
|
||||||
|
<Activity className="size-4 inline mr-1 -mt-0.5" /> TUNE
|
||||||
|
</button>
|
||||||
|
{/* The HOLD of the same switch: tuner in line or bypassed. Two buttons
|
||||||
|
because they are two things on the radio — tuning is a cycle you
|
||||||
|
start, bypassing is a state you leave it in. */}
|
||||||
|
<button type="button" disabled={off}
|
||||||
|
onClick={() => ToggleKenwoodATU().catch(setErrMsg)}
|
||||||
|
title={t('k3.atuHint')}
|
||||||
|
className="px-3 py-2.5 rounded-lg text-sm font-extrabold tracking-wide border-2 border-border text-muted-foreground bg-card hover:bg-muted transition-all disabled:opacity-30">
|
||||||
|
ATU
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Levels — two columns, so a slider stays beside the label it belongs to
|
||||||
|
instead of running the width of the window. */}
|
||||||
|
<Card icon={SlidersHorizontal} title={t('k3.levels')}>
|
||||||
|
<div className="grid grid-cols-1 lg:grid-cols-2 gap-x-6 gap-y-2">
|
||||||
|
<label className="flex items-center gap-2 text-xs">
|
||||||
|
<span className="w-16 shrink-0 text-muted-foreground">{t('k3.power')}</span>
|
||||||
|
<WheelRange min={0} max={110} step={5} disabled={off}
|
||||||
|
value={view.rf_power ?? 0}
|
||||||
|
onChange={(n) => put({ rf_power: n }, () => SetKenwoodPower(n))} />
|
||||||
|
<span className="w-12 text-right font-mono tabular-nums">{view.rf_power ?? 0} W</span>
|
||||||
|
</label>
|
||||||
|
<label className="flex items-center gap-2 text-xs">
|
||||||
|
<span className="w-16 shrink-0 text-muted-foreground flex items-center gap-1">
|
||||||
|
<AudioLines className="size-3.5" /> {t('k3.volume')}
|
||||||
|
</span>
|
||||||
|
<WheelRange min={0} max={100} disabled={off}
|
||||||
|
value={view.af_gain ?? 0}
|
||||||
|
onChange={(n) => put({ af_gain: n }, () => SetKenwoodAFGain(n))} />
|
||||||
|
<span className="w-12 text-right font-mono tabular-nums">{view.af_gain ?? 0}</span>
|
||||||
|
</label>
|
||||||
|
<label className="flex items-center gap-2 text-xs">
|
||||||
|
<span className="w-16 shrink-0 text-muted-foreground">{t('k3.rfGain')}</span>
|
||||||
|
<WheelRange min={0} max={100} disabled={off}
|
||||||
|
value={view.rf_gain ?? 0}
|
||||||
|
onChange={(n) => put({ rf_gain: n }, () => SetKenwoodRFGain(n))} />
|
||||||
|
<span className="w-12 text-right font-mono tabular-nums">{view.rf_gain ?? 0}</span>
|
||||||
|
</label>
|
||||||
|
<label className="flex items-center gap-2 text-xs">
|
||||||
|
<span className="w-16 shrink-0 text-muted-foreground">{t('k3.micGain')}</span>
|
||||||
|
<WheelRange min={0} max={100} disabled={off}
|
||||||
|
value={view.mic_gain ?? 0}
|
||||||
|
onChange={(n) => put({ mic_gain: n }, () => SetKenwoodMicGain(n))} />
|
||||||
|
<span className="w-12 text-right font-mono tabular-nums">{view.mic_gain ?? 0}</span>
|
||||||
|
</label>
|
||||||
|
<label className="flex items-center gap-2 text-xs">
|
||||||
|
<span className="w-16 shrink-0 text-muted-foreground">{t('k3.squelch')}</span>
|
||||||
|
<WheelRange min={0} max={100} disabled={off}
|
||||||
|
value={view.squelch ?? 0}
|
||||||
|
onChange={(n) => put({ squelch: n }, () => SetKenwoodSquelch(n))} />
|
||||||
|
<span className="w-12 text-right font-mono tabular-nums">{view.squelch ?? 0}</span>
|
||||||
|
</label>
|
||||||
|
{/* CW keyer speed — the radio's own keyer, the one the K3 sends with. */}
|
||||||
|
<label className="flex items-center gap-2 text-xs">
|
||||||
|
<span className="w-16 shrink-0 text-muted-foreground">{t('k3.keySpeed')}</span>
|
||||||
|
<WheelRange min={8} max={50} disabled={off}
|
||||||
|
value={view.key_speed || 20}
|
||||||
|
onChange={(n) => put({ key_speed: n }, () => SetKenwoodKeySpeed(n))} />
|
||||||
|
<span className="w-12 text-right font-mono tabular-nums">{view.key_speed || 0} wpm</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
{/* Receive chain. Toggles, because that is what they are on the radio:
|
||||||
|
one press each, and the state comes back from the rig rather than from
|
||||||
|
what the button was asked to do. */}
|
||||||
|
<Card icon={AudioLines} title={t('k3.receive')}>
|
||||||
|
<div className="space-y-2">
|
||||||
|
<div className="flex flex-wrap items-center gap-1.5">
|
||||||
|
<Toggle label="PRE" on={view.preamp} off={off} onClick={() => SetKenwoodPreamp(!view.preamp).catch(setErrMsg)} />
|
||||||
|
<Toggle label="ATT" on={view.att} off={off} onClick={() => SetKenwoodAtt(!view.att).catch(setErrMsg)} />
|
||||||
|
<Toggle label="NB" on={view.nb} off={off} onClick={() => SetKenwoodNB(!view.nb).catch(setErrMsg)} />
|
||||||
|
<Toggle label="NR" on={view.nr} off={off} onClick={() => SetKenwoodNR(!view.nr).catch(setErrMsg)} />
|
||||||
|
<span className="w-2" />
|
||||||
|
{['OFF', 'SLOW', 'FAST'].map((a) => (
|
||||||
|
<Toggle key={a} label={a} on={(view.agc || '').toUpperCase() === a} off={off}
|
||||||
|
onClick={() => SetKenwoodAGC(a).catch(setErrMsg)} />
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* RIT / XIT. Clear zeroes both offsets at once — the radio's own RC,
|
||||||
|
and what an operator means by "clear it". */}
|
||||||
|
<div className="flex flex-wrap items-center gap-1.5">
|
||||||
|
<Toggle label="RIT" on={view.rit} off={off} onClick={() => SetKenwoodRIT(!view.rit).catch(setErrMsg)} />
|
||||||
|
<Toggle label="XIT" on={view.xit} off={off} onClick={() => SetKenwoodXIT(!view.xit).catch(setErrMsg)} />
|
||||||
|
{/* The offset itself. A lit RIT button says the feature is on and
|
||||||
|
nothing about where it has put the receiver. */}
|
||||||
|
{[-100, -10, 10, 100].map((d) => (
|
||||||
|
<Toggle key={d} label={(d > 0 ? '+' : '') + d} on={false} off={off}
|
||||||
|
onClick={() => NudgeKenwoodRIT(d).catch(setErrMsg)} />
|
||||||
|
))}
|
||||||
|
<span className="text-[11px] font-mono tabular-nums text-muted-foreground w-16">
|
||||||
|
{view.rit_offset > 0 ? '+' : ''}{view.rit_offset || 0} Hz
|
||||||
|
</span>
|
||||||
|
<Toggle label={t('k3.clear')} on={false} off={off} onClick={() => ClearKenwoodRIT().catch(setErrMsg)} />
|
||||||
|
{/* Antenna only when the radio answered AN — a K3 without the internal
|
||||||
|
ATU has one socket and no switch to offer. */}
|
||||||
|
{view.antenna > 0 && (<>
|
||||||
|
<span className="w-2" />
|
||||||
|
<span className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('k3.antenna')}</span>
|
||||||
|
{[1, 2].map((n) => (
|
||||||
|
<Toggle key={n} label={'ANT' + n} on={view.antenna === n} off={off}
|
||||||
|
onClick={() => SetKenwoodAntenna(n).catch(setErrMsg)} />
|
||||||
|
))}
|
||||||
|
</>)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Filter width */}
|
||||||
|
<div className="flex flex-wrap items-center gap-1.5">
|
||||||
|
<span className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('k3.filter')}</span>
|
||||||
|
{FILTERS.map((hz) => (
|
||||||
|
<Toggle key={hz} label={hz >= 1000 ? (hz / 1000).toFixed(1) + 'k' : String(hz)}
|
||||||
|
on={view.filter_hz === hz} off={off}
|
||||||
|
onClick={() => SetKenwoodFilter(hz).catch(setErrMsg)} />
|
||||||
|
))}
|
||||||
|
{view.filter_hz > 0 && (
|
||||||
|
<span className="text-[10px] font-mono text-muted-foreground">{view.filter_hz} Hz</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { Plus, Trash2, Save, FolderOpen, X } from 'lucide-react';
|
import { Plus, Trash2, Save, FolderOpen, X } from 'lucide-react';
|
||||||
import { writeUiPref } from '@/lib/uiPref';
|
import { writeUiPref } from '@/lib/uiPref';
|
||||||
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog';
|
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog';
|
||||||
@@ -33,6 +33,8 @@ type FieldType = 'text' | 'number' | 'date' | 'adifdate';
|
|||||||
const FIELDS: { value: string; label: string; type: FieldType }[] = [
|
const FIELDS: { value: string; label: string; type: FieldType }[] = [
|
||||||
{ value: 'callsign', label: 'fltb.fCallsign', type: 'text' },
|
{ value: 'callsign', label: 'fltb.fCallsign', type: 'text' },
|
||||||
{ value: 'qso_date', label: 'fltb.fDate', type: 'date' },
|
{ value: 'qso_date', label: 'fltb.fDate', type: 'date' },
|
||||||
|
// When the record entered the logbook — the way to isolate what an import added.
|
||||||
|
{ value: 'created_at', label: 'fltb.fCreated', type: 'date' },
|
||||||
{ value: 'qso_date_off', label: 'fltb.fEndDate', type: 'date' },
|
{ value: 'qso_date_off', label: 'fltb.fEndDate', type: 'date' },
|
||||||
{ value: 'band', label: 'fltb.fBand', type: 'text' },
|
{ value: 'band', label: 'fltb.fBand', type: 'text' },
|
||||||
{ value: 'band_rx', label: 'fltb.fRxBand', type: 'text' },
|
{ value: 'band_rx', label: 'fltb.fRxBand', type: 'text' },
|
||||||
@@ -86,6 +88,12 @@ const FIELDS: { value: string; label: string; type: FieldType }[] = [
|
|||||||
{ value: 'clublog_qso_upload_date', label: 'fltb.fClublogSentDate', type: 'adifdate' },
|
{ value: 'clublog_qso_upload_date', label: 'fltb.fClublogSentDate', type: 'adifdate' },
|
||||||
{ value: 'hrdlog_qso_upload_status', label: 'fltb.fHrdlogSent', type: 'text' },
|
{ value: 'hrdlog_qso_upload_status', label: 'fltb.fHrdlogSent', type: 'text' },
|
||||||
{ value: 'hrdlog_qso_upload_date', label: 'fltb.fHrdlogSentDate', type: 'adifdate' },
|
{ value: 'hrdlog_qso_upload_date', label: 'fltb.fHrdlogSentDate', type: 'adifdate' },
|
||||||
|
// HAMLOG.online: no promoted column, filtered through extras_json (see
|
||||||
|
// qso.filterableExtras).
|
||||||
|
{ value: 'hamlog_sent', label: 'fltb.fHamlogSent', type: 'text' },
|
||||||
|
{ value: 'hamlog_sent_date', label: 'fltb.fHamlogSentDate', type: 'adifdate' },
|
||||||
|
{ value: 'hamlog_rcvd', label: 'fltb.fHamlogRcvd', type: 'text' },
|
||||||
|
{ value: 'hamlog_rcvd_date', label: 'fltb.fHamlogRcvdDate', type: 'adifdate' },
|
||||||
{ value: 'contest_id', label: 'fltb.fContestId', type: 'text' },
|
{ value: 'contest_id', label: 'fltb.fContestId', type: 'text' },
|
||||||
{ value: 'srx', label: 'fltb.fSerialRcvd', type: 'number' },
|
{ value: 'srx', label: 'fltb.fSerialRcvd', type: 'number' },
|
||||||
{ value: 'stx', label: 'fltb.fSerialSent', type: 'number' },
|
{ value: 'stx', label: 'fltb.fSerialSent', type: 'number' },
|
||||||
@@ -192,6 +200,17 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
|||||||
|
|
||||||
function apply() { onApply(buildFilter()); }
|
function apply() { onApply(buildFilter()); }
|
||||||
|
|
||||||
|
// Same silence as the alert rules: the preset landed in the list, but the list
|
||||||
|
// is not where the operator is looking when they press Save.
|
||||||
|
const [savedMsg, setSavedMsg] = useState('');
|
||||||
|
const savedTimer = useRef(0);
|
||||||
|
function flashSaved(text: string) {
|
||||||
|
setSavedMsg(text);
|
||||||
|
window.clearTimeout(savedTimer.current);
|
||||||
|
savedTimer.current = window.setTimeout(() => setSavedMsg(''), 3000);
|
||||||
|
}
|
||||||
|
useEffect(() => () => window.clearTimeout(savedTimer.current), []);
|
||||||
|
|
||||||
function saveCurrentPreset() {
|
function saveCurrentPreset() {
|
||||||
const name = presetName.trim();
|
const name = presetName.trim();
|
||||||
if (!name) return;
|
if (!name) return;
|
||||||
@@ -199,6 +218,7 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
|||||||
savePresets(next);
|
savePresets(next);
|
||||||
setPresets(next);
|
setPresets(next);
|
||||||
setPresetName('');
|
setPresetName('');
|
||||||
|
flashSaved(t('fltb.presetSaved', { name }));
|
||||||
}
|
}
|
||||||
function loadPreset(name: string) {
|
function loadPreset(name: string) {
|
||||||
const f = presets[name];
|
const f = presets[name];
|
||||||
@@ -335,6 +355,7 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
|||||||
<Button variant="outline" size="sm" className="h-8" disabled={!presetName.trim()} onClick={saveCurrentPreset}>
|
<Button variant="outline" size="sm" className="h-8" disabled={!presetName.trim()} onClick={saveCurrentPreset}>
|
||||||
<Save className="size-3.5 mr-1" /> {t('fltb.savePreset')}
|
<Save className="size-3.5 mr-1" /> {t('fltb.savePreset')}
|
||||||
</Button>
|
</Button>
|
||||||
|
{savedMsg && <span className="text-[11px] text-success truncate">{savedMsg}</span>}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import {
|
|||||||
GetTunerGeniusStatus, GetTunerGeniusSettings,
|
GetTunerGeniusStatus, GetTunerGeniusSettings,
|
||||||
GetAmpStatuses, AmpOperate, AmpPower, AmpPowerLevel,
|
GetAmpStatuses, AmpOperate, AmpPower, AmpPowerLevel,
|
||||||
FlexSetAGCMode, FlexSetAGCThreshold, FlexSetAudioLevel, FlexSetMute, FlexSetRXAntenna, FlexSetTXAntenna, FlexSetSplit, FlexSetActiveSlice, FlexSetTXSlice,
|
FlexSetAGCMode, FlexSetAGCThreshold, FlexSetAudioLevel, FlexSetMute, FlexSetRXAntenna, FlexSetTXAntenna, FlexSetSplit, FlexSetActiveSlice, FlexSetTXSlice,
|
||||||
|
GetFlexRSTChase, SaveFlexRSTChase, SetFlexRSTChaseEnabled,
|
||||||
FlexSetRIT, FlexSetRITFreq, FlexSetXIT, FlexSetXITFreq,
|
FlexSetRIT, FlexSetRITFreq, FlexSetXIT, FlexSetXITFreq,
|
||||||
FlexSetNB, FlexSetNBLevel, FlexSetNR, FlexSetNRLevel, FlexSetANF, FlexSetANFLevel,
|
FlexSetNB, FlexSetNBLevel, FlexSetNR, FlexSetNRLevel, FlexSetANF, FlexSetANFLevel,
|
||||||
FlexSetLMSNR, FlexSetLMSNRLevel, FlexSetLMSANF, FlexSetLMSANFLevel,
|
FlexSetLMSNR, FlexSetLMSNRLevel, FlexSetLMSANF, FlexSetLMSANFLevel,
|
||||||
@@ -304,6 +305,25 @@ function powerLevelLabel(pl?: string): string {
|
|||||||
// host can keep the WinKeyer (which actually sends the macros) in sync.
|
// host can keep the WinKeyer (which actually sends the macros) in sync.
|
||||||
export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number) => void; onReportRST?: (rst: string) => void } = {}) {
|
export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number) => void; onReportRST?: (rst: string) => void } = {}) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
// Split-pile-up chaser (see flexrstchase.go). Held here so the button can
|
||||||
|
// paint its state without polling the backend for it.
|
||||||
|
const [rstChase, setRstChase] = useState<{ enabled: boolean; markers: string; offset_hz: number; split_only: boolean }>(
|
||||||
|
{ enabled: false, markers: '599', offset_hz: 0, split_only: true });
|
||||||
|
const [rstChaseOffsetText, setRstChaseOffsetText] = useState('0');
|
||||||
|
// The marker text is edited as raw text and only parsed on blur: it is a
|
||||||
|
// comma-separated list, and normalising it on every keystroke would eat the
|
||||||
|
// comma the moment it is typed.
|
||||||
|
const [rstChaseMarkersText, setRstChaseMarkersText] = useState('599');
|
||||||
|
// The marker field is summoned by right-clicking the button, not parked on
|
||||||
|
// the row: it is set once to agree with SDC and then never touched, while the
|
||||||
|
// row it was sitting in is the busiest in the panel.
|
||||||
|
const [rstChaseEditing, setRstChaseEditing] = useState(false);
|
||||||
|
useEffect(() => {
|
||||||
|
GetFlexRSTChase().then((c: any) => {
|
||||||
|
if (!c) return;
|
||||||
|
setRstChase(c); setRstChaseOffsetText(String(c.offset_hz ?? 0)); setRstChaseMarkersText(String(c.markers ?? '599'));
|
||||||
|
}).catch(() => {});
|
||||||
|
}, []);
|
||||||
const [st, setSt] = useState<FlexState>(ZERO);
|
const [st, setSt] = useState<FlexState>(ZERO);
|
||||||
// Extra/"advanced" DSP rows (WNB + the SmartSDR v4 NRL/NRS/NRF/ANFL/AI-FFT
|
// Extra/"advanced" DSP rows (WNB + the SmartSDR v4 NRL/NRS/NRF/ANFL/AI-FFT
|
||||||
// block) collapse behind a button so the RECEIVE card doesn't grow tall — only
|
// block) collapse behind a button so the RECEIVE card doesn't grow tall — only
|
||||||
@@ -652,6 +672,64 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
|||||||
st.split ? 'bg-info text-info-foreground border-info shadow-[0_0_12px] shadow-info/50' : 'bg-card text-info border-info hover:bg-info-muted')}>
|
st.split ? 'bg-info text-info-foreground border-info shadow-[0_0_12px] shadow-info/50' : 'bg-card text-info border-info hover:bg-info-muted')}>
|
||||||
SPLIT
|
SPLIT
|
||||||
</button>
|
</button>
|
||||||
|
{/* The split chaser. On the panel and not in a settings page:
|
||||||
|
it is switched on when a DXpedition appears and off when it is
|
||||||
|
in the log, which is done mid-QSO with one hand. The offset
|
||||||
|
sits beside it because it is the one number retuned while
|
||||||
|
chasing — everything else about the feature is configured once. */}
|
||||||
|
{/* CW ONLY. The marker comes from a skimmer decoding a CW report,
|
||||||
|
so on SSB or FT8 there is nothing to chase — and a switch that
|
||||||
|
cannot fire is an invitation to wonder why it does nothing. */}
|
||||||
|
{isCW && (<>
|
||||||
|
<button type="button" disabled={off}
|
||||||
|
title={t('flxp.rstChaseHint', { m: rstChase.markers })}
|
||||||
|
onContextMenu={(e) => { e.preventDefault(); setRstChaseEditing(true); }}
|
||||||
|
onClick={() => { const on = !rstChase.enabled; setRstChase({ ...rstChase, enabled: on }); SetFlexRSTChaseEnabled(on).catch(() => {}); }}
|
||||||
|
className={cn('px-3 py-1.5 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||||
|
rstChase.enabled ? 'bg-success text-success-foreground border-success shadow-[0_0_12px] shadow-success/50' : 'bg-card text-success border-success hover:bg-success-muted')}>
|
||||||
|
{rstChase.markers.split(',')[0].trim() || '599'}
|
||||||
|
</button>
|
||||||
|
{/* The marker is whatever SDC was told to write — "599", "5NN", or
|
||||||
|
several. It has to agree with the skimmer or nothing ever fires,
|
||||||
|
so it is edited here rather than in a settings page — but only
|
||||||
|
when asked for, since it is set once and then left alone. */}
|
||||||
|
{rstChaseEditing && (
|
||||||
|
<input type="text" autoFocus value={rstChaseMarkersText}
|
||||||
|
onChange={(e) => setRstChaseMarkersText(e.target.value)}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === 'Enter') (e.target as HTMLInputElement).blur();
|
||||||
|
if (e.key === 'Escape') { setRstChaseMarkersText(rstChase.markers); setRstChaseEditing(false); }
|
||||||
|
}}
|
||||||
|
onBlur={() => {
|
||||||
|
const v = rstChaseMarkersText.trim() || '599';
|
||||||
|
setRstChaseMarkersText(v);
|
||||||
|
setRstChaseEditing(false);
|
||||||
|
if (v === rstChase.markers) return;
|
||||||
|
const next = { ...rstChase, markers: v };
|
||||||
|
setRstChase(next); SaveFlexRSTChase(next as any).catch(() => {});
|
||||||
|
}}
|
||||||
|
title={t('flxp.rstChaseMarkerHint')}
|
||||||
|
className="w-16 h-6 rounded border border-input bg-background px-1 text-[11px] font-mono uppercase" />
|
||||||
|
)}
|
||||||
|
{rstChase.enabled && (
|
||||||
|
<label className="flex items-center gap-1 text-[11px] text-muted-foreground whitespace-nowrap ml-2">
|
||||||
|
{t('flxp.rstChaseOffset')}
|
||||||
|
<input type="number" step={10} value={rstChaseOffsetText}
|
||||||
|
onChange={(e) => setRstChaseOffsetText(e.target.value)}
|
||||||
|
onBlur={() => {
|
||||||
|
// Kept as text while typing: normalising every keystroke
|
||||||
|
// makes a minus sign impossible to enter.
|
||||||
|
const n = Math.round(Number(rstChaseOffsetText));
|
||||||
|
const v = Number.isFinite(n) ? n : 0;
|
||||||
|
setRstChaseOffsetText(String(v));
|
||||||
|
const next = { ...rstChase, offset_hz: v };
|
||||||
|
setRstChase(next); SaveFlexRSTChase(next as any).catch(() => {});
|
||||||
|
}}
|
||||||
|
className="w-16 h-6 rounded border border-input bg-background px-1.5 text-[11px] font-mono" />
|
||||||
|
Hz
|
||||||
|
</label>
|
||||||
|
)}
|
||||||
|
</>)}
|
||||||
{st.split && !!st.tx_freq_hz && (
|
{st.split && !!st.tx_freq_hz && (
|
||||||
<span className="text-[11px] font-mono text-muted-foreground whitespace-nowrap">
|
<span className="text-[11px] font-mono text-muted-foreground whitespace-nowrap">
|
||||||
TX {(st.tx_freq_hz / 1e6).toFixed(3)}
|
TX {(st.tx_freq_hz / 1e6).toFixed(3)}
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ import {
|
|||||||
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 { MeterBar } from '@/components/MeterBar';
|
||||||
|
import { ShiftRow } from '@/components/ShiftRow';
|
||||||
|
|
||||||
type IcomState = {
|
type IcomState = {
|
||||||
available: boolean; model?: string; mode?: string;
|
available: boolean; model?: string; mode?: string;
|
||||||
@@ -248,39 +250,6 @@ function Meter({ label, value, accent, scale, onClick, title }: { label: string;
|
|||||||
return <div className="flex items-center gap-2">{body}</div>;
|
return <div className="flex items-center gap-2">{body}</div>;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ShiftRow — a RIT / ΔTX offset control: on/off chip + a wheel-adjustable signed
|
|
||||||
// offset (±10 Hz per notch or per ± button) + a clear (0) button.
|
|
||||||
function ShiftRow({ label, on, hz, accent, onToggle, onDelta, onClear }: {
|
|
||||||
label: string; on: boolean; hz: number; accent: string;
|
|
||||||
onToggle: () => void; onDelta: (d: number) => void; onClear: () => void;
|
|
||||||
}) {
|
|
||||||
const ref = useRef<HTMLDivElement>(null);
|
|
||||||
const cb = useRef(onDelta); cb.current = onDelta;
|
|
||||||
useEffect(() => {
|
|
||||||
const el = ref.current;
|
|
||||||
if (!el) return;
|
|
||||||
const onWheel = (e: WheelEvent) => { e.preventDefault(); cb.current(e.deltaY < 0 ? 10 : -10); };
|
|
||||||
el.addEventListener('wheel', onWheel, { passive: false });
|
|
||||||
return () => el.removeEventListener('wheel', onWheel);
|
|
||||||
}, []);
|
|
||||||
return (
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<Chip on={on} onClick={onToggle} label={label} />
|
|
||||||
<div ref={ref} title="Wheel / ± to shift"
|
|
||||||
className={cn('flex-1 flex items-center justify-between rounded-md border px-1 py-0.5 select-none cursor-ns-resize',
|
|
||||||
on ? 'border-border bg-muted/40' : 'border-border/60 bg-muted/20 opacity-60')}>
|
|
||||||
<button type="button" onClick={() => onDelta(-10)} className="px-2 text-sm font-bold text-muted-foreground hover:text-foreground">−</button>
|
|
||||||
<span className="text-sm font-mono font-bold tabular-nums" style={{ color: on ? accent : undefined }}>
|
|
||||||
{hz > 0 ? '+' : hz < 0 ? '−' : ''}{Math.abs(hz)} Hz
|
|
||||||
</span>
|
|
||||||
<button type="button" onClick={() => onDelta(10)} className="px-2 text-sm font-bold text-muted-foreground hover:text-foreground">+</button>
|
|
||||||
</div>
|
|
||||||
<button type="button" onClick={onClear}
|
|
||||||
className="w-8 shrink-0 py-1 rounded-md text-[11px] font-bold border border-border bg-card text-muted-foreground hover:bg-muted">0</button>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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.
|
||||||
@@ -797,10 +766,10 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
|
|||||||
<Card icon={SlidersHorizontal} title={t('icmp.clarifiers')} accent="#8b5cf6">
|
<Card icon={SlidersHorizontal} title={t('icmp.clarifiers')} accent="#8b5cf6">
|
||||||
<ShiftRow label="RIT" accent="#8b5cf6" on={st.rit_on} hz={st.rit_hz}
|
<ShiftRow label="RIT" accent="#8b5cf6" on={st.rit_on} hz={st.rit_hz}
|
||||||
onToggle={() => set({ rit_on: !st.rit_on }, () => IcomSetRITOn(!st.rit_on))}
|
onToggle={() => set({ rit_on: !st.rit_on }, () => IcomSetRITOn(!st.rit_on))}
|
||||||
onDelta={(d) => setRit(st.rit_hz + d)} onClear={() => setRit(0)} />
|
onSet={setRit} />
|
||||||
<ShiftRow label="ΔTX" accent="#f59e0b" on={st.xit_on} hz={st.rit_hz}
|
<ShiftRow label="ΔTX" accent="#f59e0b" on={st.xit_on} hz={st.rit_hz}
|
||||||
onToggle={() => set({ xit_on: !st.xit_on }, () => IcomSetXITOn(!st.xit_on))}
|
onToggle={() => set({ xit_on: !st.xit_on }, () => IcomSetXITOn(!st.xit_on))}
|
||||||
onDelta={(d) => setRit(st.rit_hz + d)} onClear={() => setRit(0)} />
|
onSet={setRit} />
|
||||||
<p className="text-[11px] text-muted-foreground">{t('icmp.ritHint')}</p>
|
<p className="text-[11px] text-muted-foreground">{t('icmp.ritHint')}</p>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import { WheelRange } from '@/components/WheelRange';
|
||||||
|
|
||||||
|
// LevelRow — a named level with a slider, a value you can type into, and ±.
|
||||||
|
//
|
||||||
|
// Shared, like ShiftRow, and for the same complaint: the consoles each drew
|
||||||
|
// their levels their own way. This is the wide shape — one row per level, the
|
||||||
|
// slider taking the width it needs — rather than two half-width sliders side by
|
||||||
|
// side, which is what "c'est laid et elles sont toutes petites" was about.
|
||||||
|
//
|
||||||
|
// Four ways to move it, so nobody has to learn ours: drag, wheel over the
|
||||||
|
// track, ± for one step, or click the number and type. Typing matters for the
|
||||||
|
// levels TCI reports in real units — a squelch at -95 dBm is a value an
|
||||||
|
// operator knows, not a position to hunt for with a mouse.
|
||||||
|
export function LevelRow({
|
||||||
|
label, value, min = 0, max = 100, step = 1, unit = '', accent, disabled, onSet,
|
||||||
|
}: {
|
||||||
|
label: string;
|
||||||
|
value: number;
|
||||||
|
min?: number;
|
||||||
|
max?: number;
|
||||||
|
step?: number;
|
||||||
|
unit?: string;
|
||||||
|
accent?: string;
|
||||||
|
disabled?: boolean;
|
||||||
|
onSet: (v: number) => void;
|
||||||
|
}) {
|
||||||
|
const [editing, setEditing] = useState<string | null>(null);
|
||||||
|
const clamp = (v: number) => Math.max(min, Math.min(max, v));
|
||||||
|
const commit = (raw: string) => {
|
||||||
|
setEditing(null);
|
||||||
|
const v = parseInt(raw.replace(/[^0-9+-]/g, ''), 10);
|
||||||
|
if (!Number.isNaN(v)) onSet(clamp(v));
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<span className="w-24 shrink-0 text-[11px] font-bold uppercase tracking-wider text-muted-foreground">
|
||||||
|
{label}
|
||||||
|
</span>
|
||||||
|
<WheelRange
|
||||||
|
min={min} max={max} step={step} value={value} disabled={disabled} accent={accent}
|
||||||
|
onChange={onSet}
|
||||||
|
className="h-2.5 flex-1 [&::-webkit-slider-thumb]:size-4"
|
||||||
|
/>
|
||||||
|
<div className={cn('flex items-center gap-0.5 shrink-0', disabled && 'opacity-40')}>
|
||||||
|
<button type="button" disabled={disabled} onClick={() => onSet(clamp(value - step))}
|
||||||
|
className="px-1.5 text-sm font-bold text-muted-foreground hover:text-foreground disabled:opacity-40">−</button>
|
||||||
|
{editing !== null ? (
|
||||||
|
<input
|
||||||
|
autoFocus
|
||||||
|
value={editing}
|
||||||
|
onChange={(e) => setEditing(e.target.value)}
|
||||||
|
onBlur={(e) => commit(e.target.value)}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === 'Enter') commit((e.target as HTMLInputElement).value);
|
||||||
|
else if (e.key === 'Escape') setEditing(null);
|
||||||
|
}}
|
||||||
|
className="w-14 rounded border border-border bg-background px-1 text-right text-xs font-mono tabular-nums outline-none"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<button type="button" disabled={disabled} onClick={() => setEditing(String(value))}
|
||||||
|
className="w-14 text-right text-xs font-mono tabular-nums hover:text-primary disabled:cursor-default">
|
||||||
|
{value}{unit}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
<button type="button" disabled={disabled} onClick={() => onSet(clamp(value + step))}
|
||||||
|
className="px-1.5 text-sm font-bold text-muted-foreground hover:text-foreground disabled:opacity-40">+</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -42,8 +42,18 @@ function unwrapLon(ring: [number, number][]): [number, number][] {
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
const CARTO_LIGHT = 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png';
|
// CARTO IS GONE, and it went the same way OpenStreetMap did.
|
||||||
const CARTO_ATTR = '© OpenStreetMap © CARTO';
|
//
|
||||||
|
// Their key-free basemaps now serve tiles stamped "API KEY REQUIRED" across
|
||||||
|
// the middle of the map — reported by an operator whose Light and Voyager views
|
||||||
|
// came up watermarked. They still answer 200 with a real image, which is why
|
||||||
|
// nothing here could detect it: the map looks like it is working and simply
|
||||||
|
// says otherwise in large grey letters.
|
||||||
|
//
|
||||||
|
// So both are replaced by Esri layers, the same provider already behind Street
|
||||||
|
// and Satellite. That is deliberate: a second key-free provider is a second
|
||||||
|
// chance to be cut off, and this one has already been serving the other two
|
||||||
|
// views for as long as OpsLog has had a map.
|
||||||
|
|
||||||
// NOT tile.openstreetmap.org. Those are OpenStreetMap's VOLUNTEER-run servers,
|
// NOT tile.openstreetmap.org. Those are OpenStreetMap's VOLUNTEER-run servers,
|
||||||
// and their usage policy does not cover a desktop application handed to an
|
// and their usage policy does not cover a desktop application handed to an
|
||||||
@@ -55,17 +65,33 @@ const CARTO_ATTR = '© OpenStreetMap © CARTO';
|
|||||||
// still credits OpenStreetMap) and Esri. Anything added here later must be
|
// still credits OpenStreetMap) and Esri. Anything added here later must be
|
||||||
// checked the same way — a free tile URL is not the same thing as a tile URL we
|
// checked the same way — a free tile URL is not the same thing as a tile URL we
|
||||||
// are allowed to ship.
|
// are allowed to ship.
|
||||||
const ESRI_STREET = 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}';
|
const ESRI = 'https://server.arcgisonline.com/ArcGIS/rest/services';
|
||||||
|
const ESRI_STREET = ESRI + '/World_Street_Map/MapServer/tile/{z}/{y}/{x}';
|
||||||
const ESRI_STREET_ATTR = 'Tiles © Esri — Source: Esri, HERE, Garmin, © OpenStreetMap contributors';
|
const ESRI_STREET_ATTR = 'Tiles © Esri — Source: Esri, HERE, Garmin, © OpenStreetMap contributors';
|
||||||
|
|
||||||
|
// The plain background the old Carto "Light" was: a pale canvas that lets the
|
||||||
|
// paths and the spots carry the colour. Its names come on a separate
|
||||||
|
// transparent layer, the same arrangement the satellite view already uses.
|
||||||
|
const ESRI_LIGHT = ESRI + '/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}';
|
||||||
|
const ESRI_LIGHT_LABELS = ESRI + '/Canvas/World_Light_Gray_Reference/MapServer/tile/{z}/{y}/{x}';
|
||||||
|
const ESRI_LIGHT_ATTR = 'Tiles © Esri — Esri, DeLorme, NAVTEQ';
|
||||||
|
|
||||||
// Selectable basemaps for the world (great-circle) map. All key-free and all
|
// Selectable basemaps for the world (great-circle) map. All key-free and all
|
||||||
// LABELLED (country/continent names). `labelsUrl` adds a transparent place-name
|
// LABELLED (country/continent names). `labelsUrl` adds a transparent place-name
|
||||||
// overlay on top of an imagery basemap (so satellite keeps its names too).
|
// overlay on top of an imagery basemap (so satellite keeps its names too).
|
||||||
export type BasemapKey = 'light' | 'voyager' | 'street' | 'satellite';
|
export type BasemapKey = 'light' | 'voyager' | 'street' | 'satellite';
|
||||||
export const BASEMAPS: Record<BasemapKey, { label: string; url: string; attr: string; subdomains?: string; labelsUrl?: string }> = {
|
// maxNativeZoom is where a layer RUNS OUT of tiles. Leaflet then upscales the
|
||||||
light: { label: 'Light', url: CARTO_LIGHT, attr: CARTO_ATTR, subdomains: 'abcd' },
|
// last real one instead of asking for a level that does not exist, which is the
|
||||||
voyager: { label: 'Voyager', url: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png',
|
// difference between a slightly soft map and a blank grey square: the light
|
||||||
attr: CARTO_ATTR, subdomains: 'abcd' },
|
// canvas stops at 16 where the imagery and the topo go on to 19.
|
||||||
|
export const BASEMAPS: Record<BasemapKey, { label: string; url: string; attr: string; subdomains?: string; labelsUrl?: string; maxNativeZoom?: number }> = {
|
||||||
|
light: { label: 'Light', url: ESRI_LIGHT, attr: ESRI_LIGHT_ATTR, labelsUrl: ESRI_LIGHT_LABELS, maxNativeZoom: 16 },
|
||||||
|
// The key is still "voyager" so that everyone who chose it keeps their view
|
||||||
|
// rather than being silently moved to another one. What it draws is Esri's
|
||||||
|
// topographic map: terrain under the labels, which is what made Voyager worth
|
||||||
|
// choosing over the plain canvas.
|
||||||
|
voyager: { label: 'Topo', url: ESRI + '/World_Topo_Map/MapServer/tile/{z}/{y}/{x}',
|
||||||
|
attr: 'Tiles © Esri — Esri, HERE, Garmin, USGS, NGA, © OpenStreetMap contributors' },
|
||||||
street: { label: 'Street', url: ESRI_STREET, attr: ESRI_STREET_ATTR },
|
street: { label: 'Street', url: ESRI_STREET, attr: ESRI_STREET_ATTR },
|
||||||
satellite: { label: 'Satellite', url: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
satellite: { label: 'Satellite', url: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
||||||
attr: 'Tiles © Esri — Source: Esri, Maxar, Earthstar Geographics',
|
attr: 'Tiles © Esri — Source: Esri, Maxar, Earthstar Geographics',
|
||||||
@@ -100,7 +126,8 @@ export function addBasemap(
|
|||||||
if (labels.current) { m.removeLayer(labels.current); labels.current = null; }
|
if (labels.current) { m.removeLayer(labels.current); labels.current = null; }
|
||||||
const bm = BASEMAPS[key];
|
const bm = BASEMAPS[key];
|
||||||
const tileOpts: L.TileLayerOptions = {
|
const tileOpts: L.TileLayerOptions = {
|
||||||
maxZoom: 19, updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1,
|
maxZoom: 19, maxNativeZoom: bm.maxNativeZoom ?? 19,
|
||||||
|
updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1,
|
||||||
noWrap: !!opts?.noWrap,
|
noWrap: !!opts?.noWrap,
|
||||||
...(opts?.bounds ? { bounds: opts.bounds } : {}),
|
...(opts?.bounds ? { bounds: opts.bounds } : {}),
|
||||||
};
|
};
|
||||||
@@ -366,7 +393,10 @@ export function WorldMap({ fromGrid, toGrid, fromLabel, toLabel, beamAzimuths, b
|
|||||||
<div className="relative isolate h-full w-full rounded-lg overflow-hidden border border-border">
|
<div className="relative isolate h-full w-full rounded-lg overflow-hidden border border-border">
|
||||||
<div ref={worldRef} className="absolute inset-0" />
|
<div ref={worldRef} className="absolute inset-0" />
|
||||||
{/* Basemap picker — Light / Street / Satellite (key-free tiles). */}
|
{/* Basemap picker — Light / Street / Satellite (key-free tiles). */}
|
||||||
<div className="absolute top-1 left-12 z-[500] flex rounded-md overflow-hidden shadow border border-border backdrop-blur">
|
{/* Clear of the zoom buttons, not merely next to them: at left-12 the
|
||||||
|
first basemap sat a few pixels from the − button and operators kept
|
||||||
|
hitting Light when they meant to zoom out. */}
|
||||||
|
<div className="absolute top-1 left-[4.5rem] z-[500] flex rounded-md overflow-hidden shadow border border-border backdrop-blur">
|
||||||
{(Object.keys(BASEMAPS) as BasemapKey[]).map((k) => (
|
{(Object.keys(BASEMAPS) as BasemapKey[]).map((k) => (
|
||||||
<button
|
<button
|
||||||
key={k}
|
key={k}
|
||||||
@@ -445,8 +475,12 @@ export function LocatorMap({ toGrid, toLabel }: LocatorProps) {
|
|||||||
// single ring of buffer tiles. Requesting tiles as fast as the pointer
|
// single ring of buffer tiles. Requesting tiles as fast as the pointer
|
||||||
// moves is what gets an app blocked, and the next provider is under no
|
// moves is what gets an app blocked, and the next provider is under no
|
||||||
// more obligation to tolerate it than the last one was.
|
// more obligation to tolerate it than the last one was.
|
||||||
L.tileLayer(CARTO_LIGHT, {
|
L.tileLayer(ESRI_LIGHT, {
|
||||||
attribution: CARTO_ATTR, subdomains: 'abcd', maxZoom: 19,
|
attribution: ESRI_LIGHT_ATTR, maxZoom: 19, maxNativeZoom: 16,
|
||||||
|
updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1,
|
||||||
|
}).addTo(m);
|
||||||
|
L.tileLayer(ESRI_LIGHT_LABELS, {
|
||||||
|
maxZoom: 19, maxNativeZoom: 16,
|
||||||
updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1,
|
updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1,
|
||||||
}).addTo(m);
|
}).addTo(m);
|
||||||
locatorOverlay.current = L.layerGroup().addTo(m);
|
locatorOverlay.current = L.layerGroup().addTo(m);
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import {
|
|||||||
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
||||||
} from '@/components/ui/select';
|
} from '@/components/ui/select';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { FindQSOsForUpload, UploadQSOsManual, DownloadConfirmations, CancelConfirmations, SyncPOTAHunterLog, ListQSO, BulkUpdateQSL, UploadCallsign, GetSlotStats } from '../../wailsjs/go/main/App';
|
import { FindQSOsForUpload, UploadQSOsManual, DownloadConfirmations, CancelConfirmations, ImportHamlogConfirmations, ExportHamlogUnmatched, OpenADIFFile, SaveADIFFile, SyncPOTAHunterLog, ListQSO, BulkUpdateQSL, UploadCallsign, GetSlotStats } from '../../wailsjs/go/main/App';
|
||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
import { RecentQSOsGrid } from '@/components/RecentQSOsGrid';
|
import { RecentQSOsGrid } from '@/components/RecentQSOsGrid';
|
||||||
import { EventsOn } from '../../wailsjs/runtime/runtime';
|
import { EventsOn } from '../../wailsjs/runtime/runtime';
|
||||||
@@ -41,6 +41,7 @@ const SERVICES = [
|
|||||||
{ v: 'hrdlog', label: 'HRDLog.net' },
|
{ v: 'hrdlog', label: 'HRDLog.net' },
|
||||||
{ v: 'eqsl', label: 'eQSL.cc' },
|
{ v: 'eqsl', label: 'eQSL.cc' },
|
||||||
{ v: 'lotw', label: 'LoTW' },
|
{ v: 'lotw', label: 'LoTW' },
|
||||||
|
{ v: 'hamlog', label: 'HAMLOG.online' },
|
||||||
{ v: 'pota', label: 'POTA hunter log' },
|
{ v: 'pota', label: 'POTA hunter log' },
|
||||||
{ v: 'paper', label: 'Paper QSL' },
|
{ v: 'paper', label: 'Paper QSL' },
|
||||||
];
|
];
|
||||||
@@ -134,9 +135,14 @@ export type GridActions = {
|
|||||||
onDelete?: (ids: number[]) => void;
|
onDelete?: (ids: number[]) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
export function QSLManagerPanel({ onEditQSO, actions }: {
|
export function QSLManagerPanel({ onEditQSO, actions, paperRequest }: {
|
||||||
onEditQSO?: (id: number) => void;
|
onEditQSO?: (id: number) => void;
|
||||||
actions?: GridActions;
|
actions?: GridActions;
|
||||||
|
// A callsign to open the Paper QSL view on, sent from elsewhere in the app
|
||||||
|
// (the awards grid). Carries a counter rather than being a bare string: the
|
||||||
|
// panel is force-mounted and keeps its state, so asking twice for the SAME
|
||||||
|
// callsign has to be two requests, not one unchanged prop.
|
||||||
|
paperRequest?: { call: string; n: number };
|
||||||
} = {}) {
|
} = {}) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [service, setService] = useState('lotw');
|
const [service, setService] = useState('lotw');
|
||||||
@@ -198,6 +204,27 @@ export function QSLManagerPanel({ onEditQSO, actions }: {
|
|||||||
}, [paperCall]);
|
}, [paperCall]);
|
||||||
|
|
||||||
|
|
||||||
|
// Honour an incoming request: switch to Paper QSL, fill the callsign, search.
|
||||||
|
// The search runs from the effect below once paperCall has actually changed —
|
||||||
|
// searchPaper closes over paperCall, so calling it here would search the
|
||||||
|
// PREVIOUS callsign.
|
||||||
|
// The pending request's callsign, so the search fires for THAT callsign and
|
||||||
|
// for nothing else: the effect below also wakes on every keystroke in the
|
||||||
|
// field, and searching on each of them would query the log letter by letter.
|
||||||
|
const pendingPaperCall = useRef('');
|
||||||
|
useEffect(() => {
|
||||||
|
const call = paperRequest?.call?.trim().toUpperCase();
|
||||||
|
if (!call) return;
|
||||||
|
setService('paper');
|
||||||
|
setPaperCall(call);
|
||||||
|
pendingPaperCall.current = call;
|
||||||
|
}, [paperRequest?.call, paperRequest?.n]);
|
||||||
|
useEffect(() => {
|
||||||
|
if (!pendingPaperCall.current || paperCall !== pendingPaperCall.current) return;
|
||||||
|
pendingPaperCall.current = '';
|
||||||
|
searchPaper();
|
||||||
|
}, [paperCall, searchPaper]);
|
||||||
|
|
||||||
async function applyPaper() {
|
async function applyPaper() {
|
||||||
const ids = paperRows.filter((r) => paperSel.has(r.id)).map((r) => r.id);
|
const ids = paperRows.filter((r) => paperSel.has(r.id)).map((r) => r.id);
|
||||||
if (ids.length === 0) return;
|
if (ids.length === 0) return;
|
||||||
@@ -323,6 +350,34 @@ export function QSLManagerPanel({ onEditQSO, actions }: {
|
|||||||
catch (e: any) { setLogLines((p) => [...p, 'Error: ' + String(e?.message ?? e)]); setBusy(false); }
|
catch (e: any) { setLogLines((p) => [...p, 'Error: ' + String(e?.message ?? e)]); setBusy(false); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// HAMLOG.online has no download verb — their agent protocol only uploads —
|
||||||
|
// so confirmations come back as an ADIF exported from their site. It is read
|
||||||
|
// here rather than through the ordinary ADIF import because that one matches
|
||||||
|
// on the UTC minute and INSERTS whatever fails to match: a few hundred copies
|
||||||
|
// of contacts already in the log. This path only ever stamps QSOs it finds.
|
||||||
|
async function importHamlogCfm() {
|
||||||
|
const path = await OpenADIFFile();
|
||||||
|
if (!path) return;
|
||||||
|
setLogLines([]); setBusy(true); setLogAction('download'); setShowLog(true);
|
||||||
|
try { await ImportHamlogConfirmations(path); }
|
||||||
|
catch (e: any) { setLogLines((p) => [...p, 'Error: ' + String(e?.message ?? e)]); setBusy(false); }
|
||||||
|
}
|
||||||
|
|
||||||
|
// The unmatched half of an import. Offered as a file because a few hundred
|
||||||
|
// discrepancies are a list to work through, not something to read in a log
|
||||||
|
// window.
|
||||||
|
async function exportHamlogUnmatched() {
|
||||||
|
try {
|
||||||
|
const path = await SaveADIFFile();
|
||||||
|
if (!path) return;
|
||||||
|
const n = await ExportHamlogUnmatched(path);
|
||||||
|
setLogLines((p) => [...p, `Exported ${n} unmatched confirmation(s) → ${path}`]);
|
||||||
|
setShowLog(true);
|
||||||
|
} catch (e: any) {
|
||||||
|
setLogLines((p) => [...p, 'Error: ' + String(e?.message ?? e)]); setShowLog(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function viewResults() {
|
function viewResults() {
|
||||||
setShowLog(false);
|
setShowLog(false);
|
||||||
if (logAction === 'upload') selectRequired();
|
if (logAction === 'upload') selectRequired();
|
||||||
@@ -639,11 +694,25 @@ export function QSLManagerPanel({ onEditQSO, actions }: {
|
|||||||
{service !== 'pota' && service !== 'paper' && (
|
{service !== 'pota' && service !== 'paper' && (
|
||||||
<div className="flex items-center justify-between gap-2 px-3 py-2 border-t border-border bg-muted/20 shrink-0">
|
<div className="flex items-center justify-between gap-2 px-3 py-2 border-t border-border bg-muted/20 shrink-0">
|
||||||
<div className="flex items-center gap-2 flex-wrap">
|
<div className="flex items-center gap-2 flex-wrap">
|
||||||
|
{service === 'hamlog' ? (
|
||||||
|
<>
|
||||||
|
<Button variant="outline" size="sm" onClick={importHamlogCfm} disabled={busy}
|
||||||
|
title={t('qslm.hamlogImportTitle')}>
|
||||||
|
<DownloadCloud className="size-3.5" /> {t('qslm.hamlogImportCfm')}
|
||||||
|
</Button>
|
||||||
|
<Button variant="outline" size="sm" onClick={exportHamlogUnmatched} disabled={busy}
|
||||||
|
title={t('qslm.hamlogUnmatchedTitle')}>
|
||||||
|
<UploadCloud className="size-3.5 rotate-180" /> {t('qslm.hamlogUnmatched')}
|
||||||
|
</Button>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
<Button variant="outline" size="sm" onClick={download} disabled={busy}
|
<Button variant="outline" size="sm" onClick={download} disabled={busy}
|
||||||
title={t('qslm.downloadTitle')}>
|
title={t('qslm.downloadTitle')}>
|
||||||
<DownloadCloud className="size-3.5" /> {t('qslm.downloadConf')}
|
<DownloadCloud className="size-3.5" /> {t('qslm.downloadConf')}
|
||||||
</Button>
|
</Button>
|
||||||
|
)}
|
||||||
{/* Date window */}
|
{/* Date window */}
|
||||||
|
{service !== 'hamlog' && (<>
|
||||||
<Select value={sinceMode} onValueChange={(v) => setSinceMode(v as any)}>
|
<Select value={sinceMode} onValueChange={(v) => setSinceMode(v as any)}>
|
||||||
<SelectTrigger className="h-8 w-[150px] text-xs" title={t('qslm.downloadRangeTitle')}>
|
<SelectTrigger className="h-8 w-[150px] text-xs" title={t('qslm.downloadRangeTitle')}>
|
||||||
<SelectValue />
|
<SelectValue />
|
||||||
@@ -667,6 +736,7 @@ export function QSLManagerPanel({ onEditQSO, actions }: {
|
|||||||
<Checkbox checked={addNotFound} onCheckedChange={(c) => setAddNotFound(!!c)} />
|
<Checkbox checked={addNotFound} onCheckedChange={(c) => setAddNotFound(!!c)} />
|
||||||
{t('qslm.addNotFound')}
|
{t('qslm.addNotFound')}
|
||||||
</label>
|
</label>
|
||||||
|
</>)}
|
||||||
</div>
|
</div>
|
||||||
<Button size="sm" onClick={upload} disabled={selectedCount === 0 || busy}>
|
<Button size="sm" onClick={upload} disabled={selectedCount === 0 || busy}>
|
||||||
<UploadCloud className="size-3.5" /> {t('qslm.uploadTo', { n: selectedCount, service: serviceLabel })}
|
<UploadCloud className="size-3.5" /> {t('qslm.uploadTo', { n: selectedCount, service: serviceLabel })}
|
||||||
|
|||||||
@@ -18,8 +18,11 @@ type Props = {
|
|||||||
onSendEQSL?: (ids: number[]) => void;
|
onSendEQSL?: (ids: number[]) => void;
|
||||||
onBulkEdit?: (ids: number[]) => void;
|
onBulkEdit?: (ids: number[]) => void;
|
||||||
onExportSelected?: (ids: number[]) => void;
|
onExportSelected?: (ids: number[]) => void;
|
||||||
|
// Same rows, but keeping the APP_OPSLOG_* tags — award references above all.
|
||||||
|
onExportSelectedFull?: (ids: number[]) => void;
|
||||||
onExportSelectedFields?: (ids: number[]) => void;
|
onExportSelectedFields?: (ids: number[]) => void;
|
||||||
onExportFiltered?: () => void;
|
onExportFiltered?: () => void;
|
||||||
|
onExportFilteredFull?: () => void;
|
||||||
onExportCabrilloSelected?: (ids: number[]) => void;
|
onExportCabrilloSelected?: (ids: number[]) => void;
|
||||||
onExportCabrilloFiltered?: () => void;
|
onExportCabrilloFiltered?: () => void;
|
||||||
onDelete?: (ids: number[]) => void;
|
onDelete?: (ids: number[]) => void;
|
||||||
@@ -31,6 +34,7 @@ const UPLOAD_TARGETS: { service: string; name: string }[] = [
|
|||||||
{ service: 'hrdlog', name: 'HRDLog.net' },
|
{ service: 'hrdlog', name: 'HRDLog.net' },
|
||||||
{ service: 'eqsl', name: 'eQSL.cc' },
|
{ service: 'eqsl', name: 'eQSL.cc' },
|
||||||
{ service: 'lotw', name: 'LoTW' },
|
{ service: 'lotw', name: 'LoTW' },
|
||||||
|
{ service: 'hamlog', name: 'HAMLOG.online' },
|
||||||
];
|
];
|
||||||
|
|
||||||
// Lightweight right-click menu for the QSO grids. AG Grid's native context
|
// Lightweight right-click menu for the QSO grids. AG Grid's native context
|
||||||
@@ -39,7 +43,7 @@ const UPLOAD_TARGETS: { service: string; name: string }[] = [
|
|||||||
// or picks a command. (We deliberately do NOT close on scroll/resize: the QSO
|
// or picks a command. (We deliberately do NOT close on scroll/resize: the QSO
|
||||||
// list auto-refreshes and AG Grid fires internal scroll events on refresh,
|
// list auto-refreshes and AG Grid fires internal scroll events on refresh,
|
||||||
// which used to dismiss the menu the instant it appeared.)
|
// which used to dismiss the menu the instant it appeared.)
|
||||||
export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete }: Props) {
|
export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFull, onExportSelectedFields, onExportFiltered, onExportFilteredFull, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const boxRef = useRef<HTMLDivElement>(null);
|
const boxRef = useRef<HTMLDivElement>(null);
|
||||||
// Starts at the cursor; the layout effect corrects it once the real size is
|
// Starts at the cursor; the layout effect corrects it once the real size is
|
||||||
@@ -189,6 +193,20 @@ export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ
|
|||||||
<span>{t('qctx.exportSelectedAdif', { n })}</span>
|
<span>{t('qctx.exportSelectedAdif', { n })}</span>
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
|
{/* The same rows WITH the OpsLog fields.
|
||||||
|
The export above is standard ADIF — what another logger should be
|
||||||
|
given — and it drops every APP_ tag, award references included. A
|
||||||
|
backup, or a move to another OpsLog, needs them: RDA@KR-04 lives in
|
||||||
|
APP_OPSLOG_AWARDREFS and nowhere else. */}
|
||||||
|
{onExportSelectedFull && (
|
||||||
|
<button
|
||||||
|
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
||||||
|
onClick={() => { onExportSelectedFull(menu.ids); onClose(); }}
|
||||||
|
>
|
||||||
|
<FileDown className="size-4 text-info" />
|
||||||
|
<span>{t('qctx.exportSelectedAdifFull', { n })}</span>
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
{onExportSelectedFields && (
|
{onExportSelectedFields && (
|
||||||
<button
|
<button
|
||||||
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
||||||
@@ -207,6 +225,15 @@ export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ
|
|||||||
<span>{t('qctx.exportFilteredAdif')}</span>
|
<span>{t('qctx.exportFilteredAdif')}</span>
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
|
{onExportFilteredFull && (
|
||||||
|
<button
|
||||||
|
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
||||||
|
onClick={() => { onExportFilteredFull(); onClose(); }}
|
||||||
|
>
|
||||||
|
<FileDown className="size-4 text-info" />
|
||||||
|
<span>{t('qctx.exportFilteredAdifFull')}</span>
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
{onExportCabrilloSelected && (
|
{onExportCabrilloSelected && (
|
||||||
<button
|
<button
|
||||||
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
||||||
|
|||||||
@@ -85,6 +85,19 @@ const CONF_LABEL_KEYS: Record<string, string> = {
|
|||||||
// the channel picker and the status table alongside the rest.
|
// the channel picker and the status table alongside the rest.
|
||||||
const OPSLOG_CONF = 'OPSLOG';
|
const OPSLOG_CONF = 'OPSLOG';
|
||||||
|
|
||||||
|
// HAMLOG.online. Out of CONFIRMATIONS for the same reason as the OpsLog card —
|
||||||
|
// it is stored in the ADIF extras, not in QSO columns — but it is an upload
|
||||||
|
// service like QRZ.com or Club Log, so it gets the ordinary sent/received/date
|
||||||
|
// editor rather than a special one. The received key is THEIR field name, the
|
||||||
|
// one their ADIF export writes; see award.HamlogQSLKey.
|
||||||
|
const HAMLOG_CONF = 'HAMLOG';
|
||||||
|
const HAMLOG_KEYS = {
|
||||||
|
sent: 'APP_OPSLOG_HAMLOG_SENT',
|
||||||
|
sentDate: 'APP_OPSLOG_HAMLOG_SENT_DATE',
|
||||||
|
rcvd: 'APP_HAMLOG_QSO_CFM',
|
||||||
|
rcvdDate: 'APP_OPSLOG_HAMLOG_QSL_DATE',
|
||||||
|
};
|
||||||
|
|
||||||
// Colour-coded status cell for the confirmation grid.
|
// Colour-coded status cell for the confirmation grid.
|
||||||
function StatusCell({ value }: { value?: string }) {
|
function StatusCell({ value }: { value?: string }) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
@@ -626,6 +639,7 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
</div>
|
</div>
|
||||||
<div className="flex items-end gap-2">
|
<div className="flex items-end gap-2">
|
||||||
<div className="flex flex-col flex-1"><Label>{t('qedit.grid')}</Label><Input value={draft.grid ?? ''} onChange={(e) => set('grid', e.target.value)} className="font-mono uppercase" /></div>
|
<div className="flex flex-col flex-1"><Label>{t('qedit.grid')}</Label><Input value={draft.grid ?? ''} onChange={(e) => set('grid', e.target.value)} className="font-mono uppercase" /></div>
|
||||||
|
<div className="flex flex-col w-24"><Label>{t('qedit.gridExt')}</Label><Input title={t('qedit.gridExtTip')} value={draft.gridsquare_ext ?? ''} onChange={(e) => set('gridsquare_ext', e.target.value)} className="font-mono uppercase" /></div>
|
||||||
<div className="flex flex-col w-24"><Label>PFX</Label><Input readOnly value={pfxOf(draft.callsign ?? '')} className="font-mono bg-muted/40" /></div>
|
<div className="flex flex-col w-24"><Label>PFX</Label><Input readOnly value={pfxOf(draft.callsign ?? '')} className="font-mono bg-muted/40" /></div>
|
||||||
</div>
|
</div>
|
||||||
<div><Label>{t('qedit.comment')}</Label><Input value={draft.comment ?? ''} onChange={(e) => set('comment', e.target.value)}
|
<div><Label>{t('qedit.comment')}</Label><Input value={draft.comment ?? ''} onChange={(e) => set('comment', e.target.value)}
|
||||||
@@ -714,6 +728,16 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
const def = CONFIRMATIONS.find((c) => c.key === confSel) ?? CONFIRMATIONS[0];
|
const def = CONFIRMATIONS.find((c) => c.key === confSel) ?? CONFIRMATIONS[0];
|
||||||
const val = (k?: keyof QSOForm) => (k ? ((draft as any)[k] ?? '') : '');
|
const val = (k?: keyof QSOForm) => (k ? ((draft as any)[k] ?? '') : '');
|
||||||
const put = (k: keyof QSOForm | undefined, v: any) => { if (k) (set as any)(k, v); };
|
const put = (k: keyof QSOForm | undefined, v: any) => { if (k) (set as any)(k, v); };
|
||||||
|
// The extras-backed channel reads and writes the same way, one
|
||||||
|
// level down. Save merges the extras rather than replacing them,
|
||||||
|
// so an emptied field keeps its stored value — which is why the
|
||||||
|
// statuses are written as explicit Y/N and never removed.
|
||||||
|
const exVal = (k: string) => String(draft.extras?.[k] ?? '');
|
||||||
|
const exPut = (k: string, v: any) => {
|
||||||
|
const next = { ...(draft.extras ?? {}) };
|
||||||
|
next[k] = String(v ?? '');
|
||||||
|
set('extras', next as any);
|
||||||
|
};
|
||||||
return (
|
return (
|
||||||
<div className="flex gap-6">
|
<div className="flex gap-6">
|
||||||
{/* Left: edit one confirmation channel at a time */}
|
{/* Left: edit one confirmation channel at a time */}
|
||||||
@@ -730,11 +754,24 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
generic sent/received/date grid, which has no field
|
generic sent/received/date grid, which has no field
|
||||||
to bind to. */}
|
to bind to. */}
|
||||||
<SelectItem value={OPSLOG_CONF}>{t('qedit.confOpsLog')}</SelectItem>
|
<SelectItem value={OPSLOG_CONF}>{t('qedit.confOpsLog')}</SelectItem>
|
||||||
|
<SelectItem value={HAMLOG_CONF}>HAMLOG.online</SelectItem>
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{confSel === OPSLOG_CONF ? (
|
{confSel === HAMLOG_CONF ? (
|
||||||
|
<>
|
||||||
|
<div className="grid grid-cols-2 gap-3">
|
||||||
|
<div><Label>{t('qedit.sent')}</Label><QslSelect value={exVal(HAMLOG_KEYS.sent)} onChange={(v) => exPut(HAMLOG_KEYS.sent, v)} /></div>
|
||||||
|
<div><Label>{t('qedit.received')}</Label><QslSelect value={exVal(HAMLOG_KEYS.rcvd)} onChange={(v) => exPut(HAMLOG_KEYS.rcvd, v)} /></div>
|
||||||
|
<div><Label>{t('qedit.dateSent')}</Label><AdifDateInput value={exVal(HAMLOG_KEYS.sentDate)} onChange={(v) => exPut(HAMLOG_KEYS.sentDate, v)} /></div>
|
||||||
|
<div><Label>{t('qedit.dateReceived')}</Label><AdifDateInput value={exVal(HAMLOG_KEYS.rcvdDate)} onChange={(v) => exPut(HAMLOG_KEYS.rcvdDate, v)} /></div>
|
||||||
|
</div>
|
||||||
|
<p className="text-[11px] text-muted-foreground">
|
||||||
|
{t('qedit.qslPanelHint')} <strong>{t('qedit.saveChanges')}</strong>.
|
||||||
|
</p>
|
||||||
|
</>
|
||||||
|
) : confSel === OPSLOG_CONF ? (
|
||||||
/* OpsLog's own card. "Sent" is stamped when the card
|
/* OpsLog's own card. "Sent" is stamped when the card
|
||||||
actually goes out, so it is shown, not offered: ticking
|
actually goes out, so it is shown, not offered: ticking
|
||||||
it by hand would record something that never happened.
|
it by hand would record something that never happened.
|
||||||
@@ -826,6 +863,12 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
<td className="w-24"><StatusCell value={opslogQslSent ? 'Y' : 'N'} /></td>
|
<td className="w-24"><StatusCell value={opslogQslSent ? 'Y' : 'N'} /></td>
|
||||||
<td className="w-24"><StatusCell value={qslReceived ? 'Y' : 'N'} /></td>
|
<td className="w-24"><StatusCell value={qslReceived ? 'Y' : 'N'} /></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
{/* HAMLOG.online — extras again, same hand-written row. */}
|
||||||
|
<tr className="text-xs">
|
||||||
|
<td className="font-medium pr-3 py-0.5 whitespace-nowrap">HAMLOG.online</td>
|
||||||
|
<td className="w-24"><StatusCell value={exVal(HAMLOG_KEYS.sent)} /></td>
|
||||||
|
<td className="w-24"><StatusCell value={exVal(HAMLOG_KEYS.rcvd)} /></td>
|
||||||
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
@@ -867,7 +910,7 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
<F label={t('qedit.stationCallsign')} span={3}><Input value={draft.station_callsign ?? ''} onChange={(e) => set('station_callsign', e.target.value)} /></F>
|
<F label={t('qedit.stationCallsign')} span={3}><Input value={draft.station_callsign ?? ''} onChange={(e) => set('station_callsign', e.target.value)} /></F>
|
||||||
<F label={t('qedit.operator')} span={3}><Input value={draft.operator ?? ''} onChange={(e) => set('operator', e.target.value)} /></F>
|
<F label={t('qedit.operator')} span={3}><Input value={draft.operator ?? ''} onChange={(e) => set('operator', e.target.value)} /></F>
|
||||||
<F label={t('qedit.myGrid')}><Input value={draft.my_grid ?? ''} onChange={(e) => set('my_grid', e.target.value)} /></F>
|
<F label={t('qedit.myGrid')}><Input value={draft.my_grid ?? ''} onChange={(e) => set('my_grid', e.target.value)} /></F>
|
||||||
<F label={t('qedit.gridExt')}><Input value={draft.my_gridsquare_ext ?? ''} onChange={(e) => set('my_gridsquare_ext', e.target.value)} /></F>
|
<F label={t('qedit.myGridExt')}><Input title={t('qedit.gridExtTip')} value={draft.my_gridsquare_ext ?? ''} onChange={(e) => set('my_gridsquare_ext', e.target.value)} /></F>
|
||||||
<F label={t('qedit.country')} span={2}><Combobox value={draft.my_country ?? ''} options={countries} placeholder={t('qedit.country')} onChange={(v) => set('my_country', v)} /></F>
|
<F label={t('qedit.country')} span={2}><Combobox value={draft.my_country ?? ''} options={countries} placeholder={t('qedit.country')} onChange={(v) => set('my_country', v)} /></F>
|
||||||
<F label={t('qedit.state')}><Input value={draft.my_state ?? ''} onChange={(e) => set('my_state', e.target.value)} /></F>
|
<F label={t('qedit.state')}><Input value={draft.my_state ?? ''} onChange={(e) => set('my_state', e.target.value)} /></F>
|
||||||
<F label={t('qedit.county')}><Input value={draft.my_cnty ?? ''} onChange={(e) => set('my_cnty', e.target.value)} /></F>
|
<F label={t('qedit.county')}><Input value={draft.my_cnty ?? ''} onChange={(e) => set('my_cnty', e.target.value)} /></F>
|
||||||
@@ -903,6 +946,10 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
<div>
|
<div>
|
||||||
<p className="text-[11px] font-semibold text-muted-foreground uppercase tracking-wider mb-2">{t('qedit.powerWeather')}</p>
|
<p className="text-[11px] font-semibold text-muted-foreground uppercase tracking-wider mb-2">{t('qedit.powerWeather')}</p>
|
||||||
<div className="grid grid-cols-6 gap-3">
|
<div className="grid grid-cols-6 gap-3">
|
||||||
|
{/* YOUR power first, then theirs. tx_pwr was saved by this
|
||||||
|
editor but had no field: a contact logged at the wrong
|
||||||
|
power could be read back and never corrected. */}
|
||||||
|
<F label={t('qedit.txPower')}><Input type="number" value={draft.tx_pwr ?? ''} onChange={(e) => set('tx_pwr', numOrUndef(e.target.value) as any)} /></F>
|
||||||
<F label={t('qedit.rxPower')}><Input type="number" value={draft.rx_pwr ?? ''} onChange={(e) => set('rx_pwr', numOrUndef(e.target.value) as any)} /></F>
|
<F label={t('qedit.rxPower')}><Input type="number" value={draft.rx_pwr ?? ''} onChange={(e) => set('rx_pwr', numOrUndef(e.target.value) as any)} /></F>
|
||||||
<F label={t('qedit.distance')}><Input type="number" value={draft.distance ?? ''} onChange={(e) => set('distance', numOrUndef(e.target.value) as any)} /></F>
|
<F label={t('qedit.distance')}><Input type="number" value={draft.distance ?? ''} onChange={(e) => set('distance', numOrUndef(e.target.value) as any)} /></F>
|
||||||
<F label={t('qedit.aIndex')}><Input type="number" value={draft.a_index ?? ''} onChange={(e) => set('a_index', numOrUndef(e.target.value) as any)} /></F>
|
<F label={t('qedit.aIndex')}><Input type="number" value={draft.a_index ?? ''} onChange={(e) => set('a_index', numOrUndef(e.target.value) as any)} /></F>
|
||||||
|
|||||||
@@ -70,8 +70,10 @@ type Props = {
|
|||||||
onSendEQSL?: (ids: number[]) => void;
|
onSendEQSL?: (ids: number[]) => void;
|
||||||
onBulkEdit?: (ids: number[]) => void;
|
onBulkEdit?: (ids: number[]) => void;
|
||||||
onExportSelected?: (ids: number[]) => void;
|
onExportSelected?: (ids: number[]) => void;
|
||||||
|
onExportSelectedFull?: (ids: number[]) => void;
|
||||||
onExportSelectedFields?: (ids: number[]) => void;
|
onExportSelectedFields?: (ids: number[]) => void;
|
||||||
onExportFiltered?: () => void;
|
onExportFiltered?: () => void;
|
||||||
|
onExportFilteredFull?: () => void;
|
||||||
onExportCabrilloSelected?: (ids: number[]) => void;
|
onExportCabrilloSelected?: (ids: number[]) => void;
|
||||||
onExportCabrilloFiltered?: () => void;
|
onExportCabrilloFiltered?: () => void;
|
||||||
onDelete?: (ids: number[]) => void;
|
onDelete?: (ids: number[]) => void;
|
||||||
@@ -207,6 +209,14 @@ export const makeColCatalog = (t: TFn, myGrid?: string): ColEntry[] => [
|
|||||||
{ group: 'QSL', label: t('rqg.c.opslog_qsl_card_sent'), colId: 'opslog_qsl_card_sent', headerName: t('rqg.c.opslog_qsl_card_sent'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return (e['APP_OPSLOG_QSL_SENT'] || e['APP_OPSLOG_QSL_CARD_SENT']) ? 'Y' : 'N'; }, defaultVisible: true },
|
{ group: 'QSL', label: t('rqg.c.opslog_qsl_card_sent'), colId: 'opslog_qsl_card_sent', headerName: t('rqg.c.opslog_qsl_card_sent'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return (e['APP_OPSLOG_QSL_SENT'] || e['APP_OPSLOG_QSL_CARD_SENT']) ? 'Y' : 'N'; }, defaultVisible: true },
|
||||||
// App-specific: operator marked a QSL as RECEIVED for this QSO (drives PSE/TNX).
|
// App-specific: operator marked a QSL as RECEIVED for this QSO (drives PSE/TNX).
|
||||||
{ group: 'QSL', label: t('rqg.c.opslog_qsl_card_rcvd'), colId: 'opslog_qsl_card_rcvd', headerName: t('rqg.c.opslog_qsl_card_rcvd'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_OPSLOG_QSL_RCVD'] ? 'Y' : 'N'; }, defaultVisible: false },
|
{ group: 'QSL', label: t('rqg.c.opslog_qsl_card_rcvd'), colId: 'opslog_qsl_card_rcvd', headerName: t('rqg.c.opslog_qsl_card_rcvd'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_OPSLOG_QSL_RCVD'] ? 'Y' : 'N'; }, defaultVisible: false },
|
||||||
|
// HAMLOG.online. No promoted column — the ADIF standard names a field for
|
||||||
|
// hamlog.EU and none for hamlog.ONLINE — so these read the extras, exactly
|
||||||
|
// like the OpsLog card columns above. Hidden by default: a column per
|
||||||
|
// service, shown to everyone, is how a grid becomes unreadable.
|
||||||
|
{ group: 'Uploads', label: t('rqg.c.hamlog_sent'), colId: 'hamlog_sent', headerName: t('rqg.h.hamlog_sent'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_OPSLOG_HAMLOG_SENT'] || 'N'; }, defaultVisible: false },
|
||||||
|
{ group: 'Uploads', label: t('rqg.c.hamlog_sent_date'), colId: 'hamlog_sent_date', headerName: t('rqg.h.hamlog_sent_date'), width: 110, valueGetter: (p) => fmtDateOnly((p.data as any)?.extras?.['APP_OPSLOG_HAMLOG_SENT_DATE']), defaultVisible: false },
|
||||||
|
{ group: 'Uploads', label: t('rqg.c.hamlog_rcvd'), colId: 'hamlog_rcvd', headerName: t('rqg.h.hamlog_rcvd'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_HAMLOG_QSO_CFM'] || e['APP_OPSLOG_HAMLOG_QSL'] || 'N'; }, defaultVisible: false },
|
||||||
|
{ group: 'Uploads', label: t('rqg.c.hamlog_rcvd_date'), colId: 'hamlog_rcvd_date', headerName: t('rqg.h.hamlog_rcvd_date'), width: 110, valueGetter: (p) => fmtDateOnly((p.data as any)?.extras?.['APP_OPSLOG_HAMLOG_QSL_DATE']), defaultVisible: false },
|
||||||
// App-specific: when the QSO's audio recording was e-mailed to the station.
|
// App-specific: when the QSO's audio recording was e-mailed to the station.
|
||||||
{ group: 'QSL', label: t('rqg.c.opslog_recording_sent'), colId: 'opslog_recording_sent', headerName: t('rqg.h.opslog_recording_sent'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_OPSLOG_RECORDING_SENT'] ? 'Y' : 'N'; }, defaultVisible: false },
|
{ group: 'QSL', label: t('rqg.c.opslog_recording_sent'), colId: 'opslog_recording_sent', headerName: t('rqg.h.opslog_recording_sent'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_OPSLOG_RECORDING_SENT'] ? 'Y' : 'N'; }, defaultVisible: false },
|
||||||
|
|
||||||
@@ -309,7 +319,7 @@ const sanitizeAwardCols = (st: any[] | null | undefined): any[] =>
|
|||||||
return rest;
|
return rest;
|
||||||
});
|
});
|
||||||
|
|
||||||
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols, rowColors }: Props) {
|
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFull, onExportSelectedFields, onExportFiltered, onExportFilteredFull, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols, rowColors }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const gridRef = useRef<any>(null);
|
const gridRef = useRef<any>(null);
|
||||||
const [pickerOpen, setPickerOpen] = useState(false);
|
const [pickerOpen, setPickerOpen] = useState(false);
|
||||||
@@ -741,8 +751,10 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
|||||||
onSendEQSL={onSendEQSL}
|
onSendEQSL={onSendEQSL}
|
||||||
onBulkEdit={onBulkEdit}
|
onBulkEdit={onBulkEdit}
|
||||||
onExportSelected={onExportSelected}
|
onExportSelected={onExportSelected}
|
||||||
|
onExportSelectedFull={onExportSelectedFull}
|
||||||
onExportSelectedFields={onExportSelectedFields}
|
onExportSelectedFields={onExportSelectedFields}
|
||||||
onExportFiltered={onExportFiltered}
|
onExportFiltered={onExportFiltered}
|
||||||
|
onExportFilteredFull={onExportFilteredFull}
|
||||||
onExportCabrilloSelected={onExportCabrilloSelected}
|
onExportCabrilloSelected={onExportCabrilloSelected}
|
||||||
onExportCabrilloFiltered={onExportCabrilloFiltered}
|
onExportCabrilloFiltered={onExportCabrilloFiltered}
|
||||||
onDelete={onDelete}
|
onDelete={onDelete}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,91 @@
|
|||||||
|
import { useEffect, useRef, useState } from 'react';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
|
// ShiftRow — the RIT / XIT offset control, shared by the radio consoles.
|
||||||
|
//
|
||||||
|
// It began inside the Icom panel and is here because the next console needed
|
||||||
|
// exactly it. Consoles that each invent their own way of nudging an offset make
|
||||||
|
// an operator learn the same thing twice, which is the complaint that moved it:
|
||||||
|
// "none of the consoles look alike".
|
||||||
|
//
|
||||||
|
// Three ways to move it, because operators reach for different ones: the ± keys,
|
||||||
|
// the wheel over the number, and TYPING a value straight in. The last one is
|
||||||
|
// what a button row cannot do — 'put me 300 Hz down' is one keystroke sequence,
|
||||||
|
// not thirty clicks.
|
||||||
|
export function ShiftRow({ label, on, hz, accent, disabled, step = 10, onToggle, onSet }: {
|
||||||
|
label: string;
|
||||||
|
on: boolean;
|
||||||
|
hz: number;
|
||||||
|
accent: string;
|
||||||
|
disabled?: boolean;
|
||||||
|
step?: number;
|
||||||
|
onToggle: () => void;
|
||||||
|
onSet: (hz: number) => void;
|
||||||
|
}) {
|
||||||
|
const ref = useRef<HTMLDivElement>(null);
|
||||||
|
const [editing, setEditing] = useState<string | null>(null);
|
||||||
|
const cb = useRef(onSet); cb.current = onSet;
|
||||||
|
const cur = useRef({ hz, on, disabled }); cur.current = { hz, on, disabled };
|
||||||
|
|
||||||
|
// Wheel over the row. A native non-passive listener, because React's onWheel
|
||||||
|
// is passive and cannot preventDefault — without that the panel scrolls under
|
||||||
|
// the pointer while the number changes.
|
||||||
|
useEffect(() => {
|
||||||
|
const el = ref.current;
|
||||||
|
if (!el) return;
|
||||||
|
const onWheel = (e: WheelEvent) => {
|
||||||
|
const c = cur.current;
|
||||||
|
if (c.disabled || !c.on) return;
|
||||||
|
e.preventDefault();
|
||||||
|
cb.current(c.hz + (e.deltaY < 0 ? step : -step));
|
||||||
|
};
|
||||||
|
el.addEventListener('wheel', onWheel, { passive: false });
|
||||||
|
return () => el.removeEventListener('wheel', onWheel);
|
||||||
|
}, [step]);
|
||||||
|
|
||||||
|
const commit = (raw: string) => {
|
||||||
|
setEditing(null);
|
||||||
|
const v = parseInt(raw.replace(/[^0-9+-]/g, ''), 10);
|
||||||
|
if (!Number.isNaN(v)) onSet(v);
|
||||||
|
};
|
||||||
|
|
||||||
|
const dead = disabled || !on;
|
||||||
|
return (
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<button type="button" onClick={onToggle} disabled={disabled}
|
||||||
|
className={cn('w-14 shrink-0 px-2 py-1 rounded-md text-[11px] font-bold border transition-colors disabled:opacity-30',
|
||||||
|
on ? 'bg-success border-success text-success-foreground' : 'bg-card text-muted-foreground border-border hover:bg-muted')}>
|
||||||
|
{label}
|
||||||
|
</button>
|
||||||
|
<div ref={ref} title="Wheel, ± or type"
|
||||||
|
className={cn('flex-1 flex items-center justify-between rounded-md border px-1 py-0.5 select-none',
|
||||||
|
dead ? 'border-border/60 bg-muted/20 opacity-60' : 'border-border bg-muted/40 cursor-ns-resize')}>
|
||||||
|
<button type="button" disabled={dead} onClick={() => onSet(hz - step)}
|
||||||
|
className="px-2 text-sm font-bold text-muted-foreground hover:text-foreground disabled:opacity-40">−</button>
|
||||||
|
{editing !== null ? (
|
||||||
|
<input
|
||||||
|
autoFocus
|
||||||
|
value={editing}
|
||||||
|
onChange={(e) => setEditing(e.target.value)}
|
||||||
|
onBlur={(e) => commit(e.target.value)}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === 'Enter') commit((e.target as HTMLInputElement).value);
|
||||||
|
else if (e.key === 'Escape') setEditing(null);
|
||||||
|
}}
|
||||||
|
className="w-20 bg-transparent text-center text-sm font-mono font-bold tabular-nums outline-none"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<button type="button" disabled={dead} onClick={() => setEditing(String(hz))}
|
||||||
|
className="text-sm font-mono font-bold tabular-nums disabled:cursor-default"
|
||||||
|
style={{ color: on ? accent : undefined }}>
|
||||||
|
{hz > 0 ? '+' : hz < 0 ? '−' : ''}{Math.abs(hz)} Hz
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
<button type="button" disabled={dead} onClick={() => onSet(hz + step)}
|
||||||
|
className="px-2 text-sm font-bold text-muted-foreground hover:text-foreground disabled:opacity-40">+</button>
|
||||||
|
</div>
|
||||||
|
<button type="button" disabled={dead} onClick={() => onSet(0)}
|
||||||
|
className="w-8 shrink-0 py-1 rounded-md text-[11px] font-bold border border-border bg-card text-muted-foreground hover:bg-muted disabled:opacity-30">0</button>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,411 @@
|
|||||||
|
import { useEffect, useRef, useState } from 'react';
|
||||||
|
import { Radio, Activity, AudioLines, SlidersHorizontal, Mic } from 'lucide-react';
|
||||||
|
import {
|
||||||
|
GetTCIPanel, GetCATState,
|
||||||
|
SetTCIDrive, SetTCITuneDrive, SetTCIMicLevel, SetTCIVolume, SetTCIMute,
|
||||||
|
SetTCIAGC, SetTCISquelch, SetTCISquelchLevel,
|
||||||
|
SetTCINB, SetTCINR, SetTCIANF, SetTCIAPF, SetTCIFilter,
|
||||||
|
SetTCIRIT, SetTCIXIT, SetTCIRITOffset, SetTCIXITOffset, SetTCILock, SetTCITune,
|
||||||
|
} from '../../wailsjs/go/main/App';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
import { sMeterRST } from '@/lib/rst';
|
||||||
|
import { MeterBar } from '@/components/MeterBar';
|
||||||
|
import { WheelRange } from '@/components/WheelRange';
|
||||||
|
import { ShiftRow } from '@/components/ShiftRow';
|
||||||
|
import { LevelRow } from '@/components/LevelRow';
|
||||||
|
|
||||||
|
type TCIState = {
|
||||||
|
connected: boolean; device?: string; protocol?: string;
|
||||||
|
drive: number; tune_drive: number; mic_level: number; tx_enabled: boolean; tx: boolean; tuning: boolean;
|
||||||
|
volume: number; mute: boolean; agc?: string; squelch_on: boolean; squelch: number;
|
||||||
|
nb: boolean; nr: boolean; anf: boolean; apf: boolean;
|
||||||
|
filter_lo: number; filter_hi: number;
|
||||||
|
rit: boolean; rit_offset: number; xit: boolean; xit_offset: number; lock: boolean; split: boolean;
|
||||||
|
smeter: number; modulations?: string[];
|
||||||
|
tx_power_w: number; tx_swr: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
const ZERO: TCIState = {
|
||||||
|
connected: false, drive: 0, tune_drive: 0, mic_level: 0, tx_enabled: false, tx: false, tuning: false,
|
||||||
|
volume: 0, mute: false, squelch_on: false, squelch: 0,
|
||||||
|
nb: false, nr: false, anf: false, apf: false, filter_lo: 0, filter_hi: 0,
|
||||||
|
rit: false, rit_offset: 0, xit: false, xit_offset: 0, lock: false, split: false, smeter: 0,
|
||||||
|
tx_power_w: 0, tx_swr: 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
// The widths worth a button, PER MODE — because 250 Hz is useless in SSB and
|
||||||
|
// 2.8 kHz is useless in CW, and a row offering both is a row where half the
|
||||||
|
// buttons are never pressed.
|
||||||
|
//
|
||||||
|
// CW gets the narrow end, where the difference between 250 and 500 is the
|
||||||
|
// difference between one signal and three. Voice gets the range a passband is
|
||||||
|
// actually shaped over. Digital sits between: wide enough for a whole FT8
|
||||||
|
// sub-band, narrow enough for RTTY.
|
||||||
|
const WIDTHS_CW = [100, 250, 400, 500, 700, 1000, 1800];
|
||||||
|
const WIDTHS_SSB = [1800, 2100, 2400, 2700, 2800, 3000, 3500];
|
||||||
|
const WIDTHS_DIGI = [500, 1000, 1800, 2400, 2800, 3000, 3500];
|
||||||
|
|
||||||
|
// widthsFor picks the row from the mode the radio reports.
|
||||||
|
function widthsFor(mode: string): number[] {
|
||||||
|
if (/CW/i.test(mode)) return WIDTHS_CW;
|
||||||
|
if (/SSB|USB|LSB|AM|FM/i.test(mode)) return WIDTHS_SSB;
|
||||||
|
return WIDTHS_DIGI;
|
||||||
|
}
|
||||||
|
|
||||||
|
// isCW says whether the CW-only controls belong on screen at all.
|
||||||
|
function isCW(mode: string): boolean { return /CW/i.test(mode); }
|
||||||
|
|
||||||
|
function widthLabel(w: number): string {
|
||||||
|
return w >= 1000 ? `${(w / 1000).toFixed(1)}k` : String(w);
|
||||||
|
}
|
||||||
|
|
||||||
|
// edgesFor turns a width into the pair TCI wants: 0 to the width, and nothing
|
||||||
|
// clever.
|
||||||
|
//
|
||||||
|
// It centred narrow filters on the CW note first — 250 became 575-825 — on the
|
||||||
|
// reasoning that a CW filter should contain the note. That reasoning may even be
|
||||||
|
// right for a radio, but it is not what the button says, and a button that does
|
||||||
|
// not do what it says is worse than one that does something simple. 250 means
|
||||||
|
// 0-250. The two edges are editable underneath for anything else.
|
||||||
|
function edgesFor(w: number, _mode: string): { lo: number; hi: number } {
|
||||||
|
return { lo: 0, hi: w };
|
||||||
|
}
|
||||||
|
|
||||||
|
// dBm → S units. TCI reports a real signal level rather than a meter position,
|
||||||
|
// which is the useful way round: S9 is -73 dBm by the IARU definition and every
|
||||||
|
// S unit below it is 6 dB, so this is arithmetic rather than a calibration
|
||||||
|
// table — nothing here is provisional the way the K3's meter reading is.
|
||||||
|
function sParts(dbm: number): { s: number; over: number; label: string } {
|
||||||
|
if (dbm === 0) return { s: 0, over: 0, label: '—' };
|
||||||
|
if (dbm >= -73) {
|
||||||
|
const over = Math.round((dbm + 73) / 10) * 10;
|
||||||
|
return { s: 9, over, label: over > 0 ? `S9+${over}` : 'S9' };
|
||||||
|
}
|
||||||
|
const s = Math.max(0, Math.min(9, Math.round(9 + (dbm + 73) / 6)));
|
||||||
|
return { s, over: 0, label: `S${s}` };
|
||||||
|
}
|
||||||
|
|
||||||
|
// The meter bar wants 0-100; -127 dBm is the bottom of the scale and -13 dBm
|
||||||
|
// (S9+60) the top.
|
||||||
|
function sBar(dbm: number): number {
|
||||||
|
if (dbm === 0) return 0;
|
||||||
|
return Math.max(0, Math.min(100, ((dbm + 127) / 114) * 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
function sSegColor(frac: number): string {
|
||||||
|
return frac > 0.75 ? '#dc2626' : frac > 0.55 ? '#f59e0b' : '#16a34a';
|
||||||
|
}
|
||||||
|
|
||||||
|
function Card({ icon: Icon, title, children }: { icon: any; title: string; children: React.ReactNode }) {
|
||||||
|
return (
|
||||||
|
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden">
|
||||||
|
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
|
||||||
|
<Icon className="size-4 text-primary" />
|
||||||
|
<span className="text-xs font-bold uppercase tracking-wider text-foreground/80">{title}</span>
|
||||||
|
</div>
|
||||||
|
<div className="p-3 space-y-3">{children}</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// One button shape for every on/off control, as on the other consoles.
|
||||||
|
function Toggle({ label, on, off, onClick, title }: {
|
||||||
|
label: string; on: boolean; off: boolean; onClick: () => void; title?: string;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<button type="button" disabled={off} onClick={onClick} title={title}
|
||||||
|
className={cn('rounded-lg border-2 px-2 py-1.5 text-xs font-bold transition-all disabled:opacity-30',
|
||||||
|
on ? 'bg-primary text-primary-foreground border-primary shadow-[0_0_10px] shadow-primary/40'
|
||||||
|
: 'bg-card text-muted-foreground border-border hover:bg-muted')}>
|
||||||
|
{label}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function Row({ label, value, children }: { label: string; value: string; children: React.ReactNode }) {
|
||||||
|
return (
|
||||||
|
<div className="space-y-1">
|
||||||
|
<div className="flex items-baseline justify-between">
|
||||||
|
<span className="text-[10px] font-bold uppercase tracking-wider text-muted-foreground">{label}</span>
|
||||||
|
<span className="text-xs font-mono tabular-nums">{value}</span>
|
||||||
|
</div>
|
||||||
|
{children}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function TCIPanel({ onReportRST }: { onReportRST?: (rst: string) => void } = {}) {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const [st, setSt] = useState<TCIState>(ZERO);
|
||||||
|
const [freqHz, setFreqHz] = useState(0);
|
||||||
|
const [mode, setMode] = useState('');
|
||||||
|
const [err, setErr] = useState('');
|
||||||
|
|
||||||
|
// OPTIMISTIC, like the Icom console — and for a reason found on a real radio.
|
||||||
|
//
|
||||||
|
// This panel used to show only what the radio reported back, on the principle
|
||||||
|
// that the radio is the truth. But ExpertSDR3 does not echo every setting it
|
||||||
|
// is given: press MED and the radio changes, says nothing, and the button
|
||||||
|
// stays lit on SLOW. Waiting for an answer that never comes reads as a dead
|
||||||
|
// control.
|
||||||
|
//
|
||||||
|
// So a change is shown at once and held for a moment. Whatever the radio
|
||||||
|
// announces afterwards — the new value, or a refusal that leaves the old one
|
||||||
|
// — wins once the hold expires, which keeps a clamped or rejected setting
|
||||||
|
// honest without making every working one look broken.
|
||||||
|
// Held UNTIL THE RADIO SPEAKS, not for a fixed moment.
|
||||||
|
//
|
||||||
|
// A timeout was wrong in both directions. Too short and a setting the radio
|
||||||
|
// never echoes — AGC is one — snapped back to its old value a second after
|
||||||
|
// the click. Too long and a setting the radio REFUSES looked accepted: a real
|
||||||
|
// log shows this one answering 'sql_enable:0,false' and then, eighty
|
||||||
|
// milliseconds later, 'sql_enable:0,true' — it puts the squelch straight back
|
||||||
|
// on. Holding through that would have shown the operator a lie.
|
||||||
|
//
|
||||||
|
// So the requested value stands while the radio says nothing about it, and
|
||||||
|
// the instant it reports ANY change for that setting, its word replaces ours.
|
||||||
|
const holdRef = useRef<Record<string, { v: any; reported: any }>>({});
|
||||||
|
const [, forceRender] = useState(0);
|
||||||
|
const hold = <T,>(key: string, reported: T): T => {
|
||||||
|
const h = holdRef.current[key];
|
||||||
|
if (!h) return reported;
|
||||||
|
// The radio has said something different from what it was saying when the
|
||||||
|
// click happened — whether that is our value or a refusal, it is now the
|
||||||
|
// truth and the hold is over.
|
||||||
|
if (reported !== h.reported) {
|
||||||
|
delete holdRef.current[key];
|
||||||
|
return reported;
|
||||||
|
}
|
||||||
|
return h.v as T;
|
||||||
|
};
|
||||||
|
const setHold = (key: string, v: any, reported: any) => {
|
||||||
|
holdRef.current[key] = { v, reported };
|
||||||
|
forceRender((n) => n + 1);
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let alive = true;
|
||||||
|
const tick = async () => {
|
||||||
|
try {
|
||||||
|
const p: any = await GetTCIPanel();
|
||||||
|
if (!alive) return;
|
||||||
|
setSt(p as TCIState);
|
||||||
|
const cs: any = await GetCATState();
|
||||||
|
if (!alive) return;
|
||||||
|
setFreqHz(Number(cs?.rx_freq_hz) || Number(cs?.freq_hz) || 0);
|
||||||
|
setMode(String(cs?.mode || ''));
|
||||||
|
} catch (e: any) {
|
||||||
|
if (alive) setErr(String(e?.message ?? e));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
tick();
|
||||||
|
const id = window.setInterval(tick, 400);
|
||||||
|
return () => { alive = false; window.clearInterval(id); };
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const off = !st.connected;
|
||||||
|
|
||||||
|
const call = (fn: () => Promise<any>) => { fn().catch((e: any) => setErr(String(e?.message ?? e))); };
|
||||||
|
|
||||||
|
const drive = hold('drive', st.drive);
|
||||||
|
const tuneDrive = hold('tune_drive', st.tune_drive);
|
||||||
|
const mic = hold('mic', st.mic_level);
|
||||||
|
const vol = hold('vol', st.volume);
|
||||||
|
const sql = hold('sql', st.squelch);
|
||||||
|
const agc = hold('agc', st.agc || '');
|
||||||
|
const nb = hold('nb', st.nb), nr = hold('nr', st.nr);
|
||||||
|
const anf = hold('anf', st.anf), apf = hold('apf', st.apf);
|
||||||
|
const sqlOn = hold('sql_on', st.squelch_on), muted = hold('mute', st.mute);
|
||||||
|
const rit = hold('rit', st.rit), xit = hold('xit', st.xit);
|
||||||
|
const ritHz = hold('rit_hz', st.rit_offset), xitHz = hold('xit_hz', st.xit_offset);
|
||||||
|
const s = sParts(st.smeter);
|
||||||
|
|
||||||
|
// Ctrl+Left/Right shifts the RIT by ±10 Hz, the same keys the Icom console
|
||||||
|
// uses. Two consoles for two radios should not need two habits.
|
||||||
|
const ritRef = useRef({ on: false, hz: 0, off: true });
|
||||||
|
ritRef.current = { on: rit, hz: ritHz, off };
|
||||||
|
useEffect(() => {
|
||||||
|
const onKey = (e: KeyboardEvent) => {
|
||||||
|
if (!e.ctrlKey || (e.key !== 'ArrowLeft' && e.key !== 'ArrowRight')) return;
|
||||||
|
const r = ritRef.current;
|
||||||
|
if (r.off || !r.on) return;
|
||||||
|
e.preventDefault();
|
||||||
|
const v = r.hz + (e.key === 'ArrowRight' ? 10 : -10);
|
||||||
|
setHold('rit_hz', v, ritRef.current.hz);
|
||||||
|
SetTCIRITOffset(v).catch(() => {});
|
||||||
|
};
|
||||||
|
window.addEventListener('keydown', onKey);
|
||||||
|
return () => window.removeEventListener('keydown', onKey);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="h-full min-h-0 overflow-auto bg-background">
|
||||||
|
{/* Capped and centred, like the Elecraft, Yaesu, Icom and Flex consoles.
|
||||||
|
Stretched across a wide window a console puts each slider a hand's
|
||||||
|
width from its own label and stops reading as one instrument. */}
|
||||||
|
<div className="max-w-5xl mx-auto p-3 space-y-3">
|
||||||
|
{/* VFO + identity */}
|
||||||
|
<div className="rounded-xl border border-border bg-card shadow-sm px-4 py-3 flex items-center justify-between gap-3 flex-wrap">
|
||||||
|
<div>
|
||||||
|
<div className="text-[10px] font-bold uppercase tracking-wider text-muted-foreground flex items-center gap-1.5">
|
||||||
|
<Radio className="size-3.5" />
|
||||||
|
{st.device || 'SunSDR'} {st.protocol ? `· ${st.protocol}` : ''}
|
||||||
|
<span className={cn('size-2 rounded-full', off ? 'bg-muted-foreground/40' : 'bg-success')} />
|
||||||
|
</div>
|
||||||
|
<div className="text-2xl font-mono tabular-nums font-bold">
|
||||||
|
{freqHz > 0 ? (freqHz / 1e6).toFixed(6) : '—'}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
{st.tx && <span className="rounded-md bg-danger px-2 py-1 text-[11px] font-bold text-danger-foreground">TX</span>}
|
||||||
|
{st.split && <span className="rounded-md border border-border px-2 py-1 text-[11px] font-bold">SPLIT</span>}
|
||||||
|
<Toggle label={t('tcip.lock')} on={st.lock} off={off} onClick={() => call(() => SetTCILock(!st.lock))} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{off && <div className="text-xs text-muted-foreground px-1">{t('tcip.waiting')}</div>}
|
||||||
|
{!!err && <div className="text-[11px] text-danger px-1">{err}</div>}
|
||||||
|
|
||||||
|
{/* Meters. The S-meter while receiving, power and SWR while
|
||||||
|
transmitting — the radio answers TX_POWER and TX_SWR only when it is
|
||||||
|
keyed, so showing them the rest of the time would be showing the
|
||||||
|
last thing that happened as if it were now.
|
||||||
|
There is no temperature: the protocol has no such command, and a
|
||||||
|
made-up figure on a transmitter is the kind somebody trusts. */}
|
||||||
|
<Card icon={Activity} title={t('tcip.meters')}>
|
||||||
|
<MeterBar label="S-METER" value={st.tx || st.tuning ? 0 : sBar(st.smeter)} lo={0} hi={100}
|
||||||
|
accent="#16a34a" segColor={sSegColor}
|
||||||
|
display={st.tx || st.tuning ? '—' : `${s.label} ${st.smeter} dBm`}
|
||||||
|
onClick={() => {
|
||||||
|
if (st.tx || !onReportRST) return;
|
||||||
|
onReportRST(sMeterRST(s.s, s.over, mode));
|
||||||
|
}}
|
||||||
|
title={t('tcip.sMeterHint')} />
|
||||||
|
{(st.tx || st.tuning) && (
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-2">
|
||||||
|
<MeterBar label="PWR" value={st.tx_power_w} lo={0} hi={Math.max(10, Math.ceil(st.tx_power_w / 10) * 10)}
|
||||||
|
accent="#0ea5e9" display={`${st.tx_power_w.toFixed(1)} W`} />
|
||||||
|
{/* 0 is "not measured yet", and it must not draw as a perfect
|
||||||
|
match: an SWR of 1.0 on an antenna nobody has measured is the
|
||||||
|
one reading an operator should not be handed. */}
|
||||||
|
<MeterBar label="SWR" value={st.tx_swr > 0 ? Math.min(100, (st.tx_swr - 1) * 50) : 0} lo={0} hi={100}
|
||||||
|
accent="#f59e0b" display={st.tx_swr > 0 ? st.tx_swr.toFixed(1) : '—'}
|
||||||
|
segColor={(f) => (f > 0.5 ? '#dc2626' : f > 0.25 ? '#f59e0b' : '#16a34a')} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
{/* Transmit */}
|
||||||
|
<Card icon={SlidersHorizontal} title={t('tcip.transmit')}>
|
||||||
|
{/* One level per ROW, full width. Two half-width sliders side by side
|
||||||
|
left each of them a couple of centimetres long — small enough that
|
||||||
|
setting 15% took aim. */}
|
||||||
|
<LevelRow label={t('tcip.drive')} unit="%" value={drive} disabled={off}
|
||||||
|
onSet={(v) => { setHold('drive', v, st.drive); call(() => SetTCIDrive(v)); }} />
|
||||||
|
<LevelRow label={t('tcip.tuneDrive')} unit="%" value={tuneDrive} disabled={off} accent="#f59e0b"
|
||||||
|
onSet={(v) => { setHold('tune_drive', v, st.tune_drive); call(() => SetTCITuneDrive(v)); }} />
|
||||||
|
<div className="flex items-center gap-2 flex-wrap">
|
||||||
|
{/* TUNE transmits, and at the tune drive rather than the main one —
|
||||||
|
which is why both numbers are above the button rather than one of
|
||||||
|
them being in a menu somewhere. */}
|
||||||
|
<button type="button" disabled={off || !st.tx_enabled}
|
||||||
|
onClick={() => call(() => SetTCITune(!st.tuning))}
|
||||||
|
className={cn('rounded-lg border-2 px-4 py-2 text-sm font-extrabold tracking-wide transition-all disabled:opacity-30',
|
||||||
|
st.tuning ? 'bg-warning text-warning-foreground border-warning shadow-[0_0_14px] shadow-warning/50'
|
||||||
|
: 'bg-card text-warning border-warning hover:bg-warning-muted')}>
|
||||||
|
{st.tuning ? t('tcip.tuning') : t('tcip.tune')}
|
||||||
|
</button>
|
||||||
|
{!st.tx_enabled && !off && (
|
||||||
|
<span className="text-[11px] text-muted-foreground">{t('tcip.txDisabled')}</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<LevelRow label={t('tcip.mic')} unit="%" value={mic} disabled={off} accent="#a855f7"
|
||||||
|
onSet={(v) => { setHold('mic', v, st.mic_level); call(() => SetTCIMicLevel(v)); }} />
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
{/* Receive */}
|
||||||
|
<Card icon={AudioLines} title={t('tcip.receive')}>
|
||||||
|
{/* Both in the radio's OWN units — volume in dB, negative, and the
|
||||||
|
squelch as a dBm threshold — so the numbers match the ones in
|
||||||
|
ExpertSDR3's window rather than being percentages of something. */}
|
||||||
|
<LevelRow label={t('tcip.volume')} unit=" dB" min={-60} max={0} value={vol} disabled={off}
|
||||||
|
onSet={(v) => { setHold('vol', v, st.volume); call(() => SetTCIVolume(v)); }} />
|
||||||
|
<LevelRow label={t('tcip.squelch')} unit=" dBm" min={-140} max={0} value={sql}
|
||||||
|
disabled={off || !sqlOn} accent="#38bdf8"
|
||||||
|
onSet={(v) => { setHold('sql', v, st.squelch); call(() => SetTCISquelchLevel(v)); }} />
|
||||||
|
<div className={cn('grid gap-2', isCW(mode) ? 'grid-cols-3 sm:grid-cols-6' : 'grid-cols-3 sm:grid-cols-5')}>
|
||||||
|
<Toggle label="NB" on={nb} off={off} onClick={() => { setHold('nb', !nb, st.nb); call(() => SetTCINB(!nb)); }} />
|
||||||
|
<Toggle label="NR" on={nr} off={off} onClick={() => { setHold('nr', !nr, st.nr); call(() => SetTCINR(!nr)); }} />
|
||||||
|
<Toggle label="ANF" on={anf} off={off} onClick={() => { setHold('anf', !anf, st.anf); call(() => SetTCIANF(!anf)); }} />
|
||||||
|
{/* APF is an audio PEAK filter — it rings a single tone out of the
|
||||||
|
noise, which is a CW tool and nothing else. Shown only there:
|
||||||
|
off CW it is not a control, it is a puzzle. */}
|
||||||
|
{isCW(mode) && (
|
||||||
|
<Toggle label="APF" on={apf} off={off} onClick={() => { setHold('apf', !apf, st.apf); call(() => SetTCIAPF(!apf)); }} />
|
||||||
|
)}
|
||||||
|
<Toggle label="SQL" on={sqlOn} off={off} onClick={() => { setHold('sql_on', !sqlOn, st.squelch_on); call(() => SetTCISquelch(!sqlOn)); }} />
|
||||||
|
<Toggle label={t('tcip.mute')} on={muted} off={off} onClick={() => { setHold('mute', !muted, st.mute); call(() => SetTCIMute(!muted)); }} />
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<span className="text-[10px] font-bold uppercase tracking-wider text-muted-foreground">{t('tcip.agc')}</span>
|
||||||
|
{/* LONG is gone. The protocol accepts it, but it is a hang time
|
||||||
|
nobody reaches for between overs, and a fifth button that has to
|
||||||
|
be explained is worse than four that do not. */}
|
||||||
|
<div className="grid grid-cols-4 gap-2">
|
||||||
|
{['off', 'slow', 'med', 'fast'].map((m) => (
|
||||||
|
<Toggle key={m} label={m.toUpperCase()} on={agc === m} off={off}
|
||||||
|
onClick={() => { setHold('agc', m, st.agc || ''); call(() => SetTCIAGC(m)); }} />
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<div className="flex items-baseline justify-between">
|
||||||
|
<span className="text-[10px] font-bold uppercase tracking-wider text-muted-foreground">{t('tcip.filter')}</span>
|
||||||
|
<span className="text-xs font-mono tabular-nums">{st.filter_lo}–{st.filter_hi} Hz</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2 pb-1">
|
||||||
|
<LevelRow label="LO" unit=" Hz" min={-5000} max={5000} step={10}
|
||||||
|
value={st.filter_lo} disabled={off}
|
||||||
|
onSet={(v) => call(() => SetTCIFilter(v, st.filter_hi))} />
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2 pb-1">
|
||||||
|
<LevelRow label="HI" unit=" Hz" min={-5000} max={5000} step={10}
|
||||||
|
value={st.filter_hi} disabled={off}
|
||||||
|
onSet={(v) => call(() => SetTCIFilter(st.filter_lo, v))} />
|
||||||
|
</div>
|
||||||
|
<div className="grid grid-cols-4 sm:grid-cols-7 gap-2">
|
||||||
|
{widthsFor(mode).map((w) => {
|
||||||
|
const e = edgesFor(w, mode);
|
||||||
|
// Lit by the WIDTH the radio is actually using, not by an exact
|
||||||
|
// pair of edges: the operator may have moved one edge on the
|
||||||
|
// radio, and a button that only lights on our own numbers would
|
||||||
|
// go dark for a filter that is plainly 500 Hz wide.
|
||||||
|
const on = Math.abs((st.filter_hi - st.filter_lo) - w) <= 50;
|
||||||
|
return (
|
||||||
|
<Toggle key={w} label={widthLabel(w)} on={on} off={off}
|
||||||
|
title={`${e.lo}–${e.hi} Hz`}
|
||||||
|
onClick={() => call(() => SetTCIFilter(e.lo, e.hi))} />
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
{/* RIT / XIT — the SAME control the Icom console uses, now shared
|
||||||
|
rather than reinvented: a chip, a signed offset you can type into,
|
||||||
|
scroll on, or step with ±, and a zero. Ctrl+←/→ shifts the RIT. */}
|
||||||
|
<Card icon={Mic} title="RIT / XIT">
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
|
||||||
|
<ShiftRow label="RIT" on={rit} hz={ritHz} accent="#38bdf8" disabled={off}
|
||||||
|
onToggle={() => { setHold('rit', !rit, st.rit); call(() => SetTCIRIT(!rit)); }}
|
||||||
|
onSet={(v) => { setHold('rit_hz', v, st.rit_offset); call(() => SetTCIRITOffset(v)); }} />
|
||||||
|
<ShiftRow label="XIT" on={xit} hz={xitHz} accent="#f59e0b" disabled={off}
|
||||||
|
onToggle={() => { setHold('xit', !xit, st.xit); call(() => SetTCIXIT(!xit)); }}
|
||||||
|
onSet={(v) => { setHold('xit_hz', v, st.xit_offset); call(() => SetTCIXITOffset(v)); }} />
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
import { useEffect, useRef } from 'react';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
|
// A range slider the mouse wheel can move.
|
||||||
|
//
|
||||||
|
// Dragging a 4-pixel-tall slider to change the power by five watts is a fussy
|
||||||
|
// gesture; rolling the wheel over it is not, and it is what an operator reaches
|
||||||
|
// for after using the Flex and Yaesu consoles, which have had it for a while.
|
||||||
|
//
|
||||||
|
// React's own onWheel is registered PASSIVE, so preventDefault() inside it is
|
||||||
|
// ignored and the panel scrolls under the pointer while the value changes. The
|
||||||
|
// listener therefore has to be attached natively with { passive: false }, and
|
||||||
|
// the live values read through refs — the listener is installed once and would
|
||||||
|
// otherwise capture the first render's value for ever.
|
||||||
|
//
|
||||||
|
// The Flex and Yaesu panels each grew their own copy of this before it was worth
|
||||||
|
// sharing. They are left alone deliberately: they work, they are in daily use,
|
||||||
|
// and their styling differs in small ways that a merge would have to guess at.
|
||||||
|
export function WheelRange({ value, onChange, min = 0, max = 100, step = 1, disabled, accent = 'var(--primary)', className }: {
|
||||||
|
value: number; onChange: (v: number) => void;
|
||||||
|
min?: number; max?: number; step?: number; disabled?: boolean; accent?: string; className?: string;
|
||||||
|
}) {
|
||||||
|
const v = Math.max(min, Math.min(max, value));
|
||||||
|
const pct = max > min ? ((v - min) / (max - min)) * 100 : 0;
|
||||||
|
const ref = useRef<HTMLInputElement>(null);
|
||||||
|
const valRef = useRef(v); valRef.current = v;
|
||||||
|
const cbRef = useRef(onChange); cbRef.current = onChange;
|
||||||
|
const disRef = useRef(disabled); disRef.current = disabled;
|
||||||
|
const stepRef = useRef(step); stepRef.current = step;
|
||||||
|
const minRef = useRef(min); minRef.current = min;
|
||||||
|
const maxRef = useRef(max); maxRef.current = max;
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const el = ref.current;
|
||||||
|
if (!el) return;
|
||||||
|
const onWheel = (e: WheelEvent) => {
|
||||||
|
if (disRef.current) return;
|
||||||
|
e.preventDefault();
|
||||||
|
const d = e.deltaY < 0 ? stepRef.current : -stepRef.current;
|
||||||
|
const nv = Math.max(minRef.current, Math.min(maxRef.current, valRef.current + d));
|
||||||
|
if (nv !== valRef.current) cbRef.current(nv);
|
||||||
|
};
|
||||||
|
el.addEventListener('wheel', onWheel, { passive: false });
|
||||||
|
return () => el.removeEventListener('wheel', onWheel);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<input
|
||||||
|
ref={ref}
|
||||||
|
type="range" min={min} max={max} step={step} value={v} disabled={disabled}
|
||||||
|
onChange={(e) => onChange(parseInt(e.target.value, 10))}
|
||||||
|
className={cn('flex-1 h-1.5 rounded-full appearance-none cursor-pointer disabled:opacity-30 disabled:cursor-default',
|
||||||
|
'[&::-webkit-slider-thumb]:appearance-none [&::-webkit-slider-thumb]:size-3.5 [&::-webkit-slider-thumb]:rounded-full',
|
||||||
|
'[&::-webkit-slider-thumb]:bg-card [&::-webkit-slider-thumb]:border-2 [&::-webkit-slider-thumb]:shadow-sm [&::-webkit-slider-thumb]:cursor-pointer',
|
||||||
|
className)}
|
||||||
|
style={{
|
||||||
|
background: `linear-gradient(to right, ${accent} ${pct}%, color-mix(in srgb, var(--foreground) 18%, transparent) ${pct}%)`,
|
||||||
|
borderColor: accent,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -73,9 +73,17 @@ export function WinkeyerPanel({
|
|||||||
|
|
||||||
const connected = status.connected;
|
const connected = status.connected;
|
||||||
|
|
||||||
|
// Send-on-type only exists where the engine can key one character at a time:
|
||||||
|
// the WinKeyer and Flex CWX. The stored preference survives an engine change,
|
||||||
|
// though, and an Icom or Yaesu operator inherited a hidden switch that was on
|
||||||
|
// — the checkbox is not shown for them, so nothing keyed as they typed AND
|
||||||
|
// Enter sent nothing either, since it believes the text has already gone.
|
||||||
|
// Macros kept working, which is exactly how it looked from the outside.
|
||||||
|
const liveType = sendOnType && (source === 'winkeyer' || source === 'flex');
|
||||||
|
|
||||||
function sendText() {
|
function sendText() {
|
||||||
const t = cwText.trim();
|
const t = cwText.trim();
|
||||||
if (t && !sendOnType) onSend(t); // in send-on-type the text already went out
|
if (t && !liveType) onSend(t); // in send-on-type the text already went out
|
||||||
setCwText('');
|
setCwText('');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,7 +91,7 @@ export function WinkeyerPanel({
|
|||||||
// WinKeyer backspace for each deleted char (removes it from the buffer if it
|
// WinKeyer backspace for each deleted char (removes it from the buffer if it
|
||||||
// hasn't been keyed yet). Only end-of-string edits are mirrored live.
|
// hasn't been keyed yet). Only end-of-string edits are mirrored live.
|
||||||
function onCwChange(v: string) {
|
function onCwChange(v: string) {
|
||||||
if (sendOnType && connected) {
|
if (liveType && connected) {
|
||||||
const old = cwText;
|
const old = cwText;
|
||||||
if (v.length > old.length && v.startsWith(old)) {
|
if (v.length > old.length && v.startsWith(old)) {
|
||||||
onSendRaw(v.slice(old.length));
|
onSendRaw(v.slice(old.length));
|
||||||
@@ -200,13 +208,13 @@ export function WinkeyerPanel({
|
|||||||
value={cwText}
|
value={cwText}
|
||||||
onChange={(e) => onCwChange(e.target.value)}
|
onChange={(e) => onCwChange(e.target.value)}
|
||||||
onKeyDown={(e) => { if (e.key === 'Enter') { e.preventDefault(); sendText(); } }}
|
onKeyDown={(e) => { if (e.key === 'Enter') { e.preventDefault(); sendText(); } }}
|
||||||
placeholder={sendOnType ? t('wkp.phLive') : t('wkp.phEnter')}
|
placeholder={liveType ? t('wkp.phLive') : t('wkp.phEnter')}
|
||||||
disabled={!connected}
|
disabled={!connected}
|
||||||
className="font-mono uppercase"
|
className="font-mono uppercase"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<Button size="sm" className="h-8" onClick={sendText} disabled={!connected}>
|
<Button size="sm" className="h-8" onClick={sendText} disabled={!connected}>
|
||||||
<Send className="size-3.5" /> {sendOnType ? t('wkp.clear') : t('wkp.send')}
|
<Send className="size-3.5" /> {liveType ? t('wkp.clear') : t('wkp.send')}
|
||||||
</Button>
|
</Button>
|
||||||
<Button variant="destructive" size="sm" className="h-8" onClick={onStop} disabled={!connected} title={t('wkp.abort')}>
|
<Button variant="destructive" size="sm" className="h-8" onClick={onStop} disabled={!connected} title={t('wkp.abort')}>
|
||||||
<Square className="size-3.5" /> {t('wkp.stop')}
|
<Square className="size-3.5" /> {t('wkp.stop')}
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ type Props = {
|
|||||||
onSendEQSL?: (ids: number[]) => void;
|
onSendEQSL?: (ids: number[]) => void;
|
||||||
onBulkEdit?: (ids: number[]) => void;
|
onBulkEdit?: (ids: number[]) => void;
|
||||||
onExportSelected?: (ids: number[]) => void;
|
onExportSelected?: (ids: number[]) => void;
|
||||||
|
onExportSelectedFull?: (ids: number[]) => void;
|
||||||
onExportSelectedFields?: (ids: number[]) => void;
|
onExportSelectedFields?: (ids: number[]) => void;
|
||||||
onExportCabrilloSelected?: (ids: number[]) => void;
|
onExportCabrilloSelected?: (ids: number[]) => void;
|
||||||
onDelete?: (ids: number[]) => void;
|
onDelete?: (ids: number[]) => void;
|
||||||
@@ -58,7 +59,7 @@ function fmtDate(s: any): string {
|
|||||||
return `${d.getUTCFullYear()}-${p(d.getUTCMonth() + 1)}-${p(d.getUTCDate())}`;
|
return `${d.getUTCFullYear()}-${p(d.getUTCMonth() + 1)}-${p(d.getUTCDate())}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function WorkedBeforeGrid({ wb, myGrid, busy, currentCall, onRowDoubleClicked, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportCabrilloSelected, onDelete, awardCols }: Props) {
|
export function WorkedBeforeGrid({ wb, myGrid, busy, currentCall, onRowDoubleClicked, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFull, onExportSelectedFields, onExportCabrilloSelected, onDelete, awardCols }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const gridRef = useRef<any>(null);
|
const gridRef = useRef<any>(null);
|
||||||
const [pickerOpen, setPickerOpen] = useState(false);
|
const [pickerOpen, setPickerOpen] = useState(false);
|
||||||
@@ -279,6 +280,7 @@ export function WorkedBeforeGrid({ wb, myGrid, busy, currentCall, onRowDoubleCli
|
|||||||
onSendEQSL={onSendEQSL}
|
onSendEQSL={onSendEQSL}
|
||||||
onBulkEdit={onBulkEdit}
|
onBulkEdit={onBulkEdit}
|
||||||
onExportSelected={onExportSelected}
|
onExportSelected={onExportSelected}
|
||||||
|
onExportSelectedFull={onExportSelectedFull}
|
||||||
onExportSelectedFields={onExportSelectedFields}
|
onExportSelectedFields={onExportSelectedFields}
|
||||||
onExportCabrilloSelected={onExportCabrilloSelected}
|
onExportCabrilloSelected={onExportCabrilloSelected}
|
||||||
onDelete={onDelete}
|
onDelete={onDelete}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { Radio, AudioLines, Mic, Activity, SlidersHorizontal, Antenna } from 'lu
|
|||||||
import {
|
import {
|
||||||
GetYaesuState, RefreshYaesuPanel,
|
GetYaesuState, RefreshYaesuPanel,
|
||||||
SetYaesuPower, SetYaesuMicGain, SetYaesuAFGain, SetYaesuRFGain, SetYaesuSquelch,
|
SetYaesuPower, SetYaesuMicGain, SetYaesuAFGain, SetYaesuRFGain, SetYaesuSquelch,
|
||||||
SetYaesuAGC, SetYaesuPreamp, SetYaesuAtt, SetYaesuNB, SetYaesuNR, SetYaesuNRLevel,
|
SetYaesuAGC, SetYaesuPreamp, SetYaesuAtt, SetYaesuAntenna, SetYaesuNB, SetYaesuNR, SetYaesuNRLevel,
|
||||||
SetYaesuNarrow, SetYaesuVOX, SetYaesuSplit, SetYaesuBand, TuneYaesuATU,
|
SetYaesuNarrow, SetYaesuVOX, SetYaesuSplit, SetYaesuBand, TuneYaesuATU,
|
||||||
SetYaesuModeRaw, SetYaesuSplitOffset, SetYaesuKeySpeed, SetYaesuBreakIn, YaesuZeroIn, GetCATState,
|
SetYaesuModeRaw, SetYaesuSplitOffset, SetYaesuKeySpeed, SetYaesuBreakIn, YaesuZeroIn, GetCATState,
|
||||||
} from '../../wailsjs/go/main/App';
|
} from '../../wailsjs/go/main/App';
|
||||||
@@ -17,8 +17,9 @@ type YaesuState = {
|
|||||||
transmitting: boolean; split: boolean;
|
transmitting: boolean; split: 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; af_gain: number; rf_gain: number; squelch: number;
|
rf_power: number; mic_gain: number; af_gain: number; rf_gain: number; squelch: number;
|
||||||
agc?: string; preamp: number; att: number;
|
agc?: string; preamp: number; att: number; antenna: number;
|
||||||
nb: boolean; nr: boolean; nr_level: number; narrow: boolean; vox: boolean;
|
nb: boolean; nr: boolean; nr_level: number; narrow: boolean; narrow_supported?: boolean; vox: boolean;
|
||||||
|
max_power?: number;
|
||||||
split_tx_hz?: number; key_speed?: number; break_in?: boolean; swr?: number; power_w?: number;
|
split_tx_hz?: number; key_speed?: number; break_in?: boolean; swr?: number; power_w?: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -26,7 +27,7 @@ const ZERO: YaesuState = {
|
|||||||
available: false, transmitting: false, split: false,
|
available: false, transmitting: false, split: false,
|
||||||
s_meter: 0, power_meter: 0, swr_meter: 0,
|
s_meter: 0, power_meter: 0, swr_meter: 0,
|
||||||
rf_power: 0, mic_gain: 0, af_gain: 0, rf_gain: 0, squelch: 0,
|
rf_power: 0, mic_gain: 0, af_gain: 0, rf_gain: 0, squelch: 0,
|
||||||
preamp: 0, att: 0, nb: false, nr: false, nr_level: 0, narrow: false, vox: false,
|
preamp: 0, att: 0, antenna: 0, nb: false, nr: false, nr_level: 0, narrow: false, vox: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Band buttons use the rig's OWN band memory (CAT "BS"), not a frequency we
|
// Band buttons use the rig's OWN band memory (CAT "BS"), not a frequency we
|
||||||
@@ -74,6 +75,10 @@ function activeMode(raw?: string): { id: string; side: 'U' | 'L' } | null {
|
|||||||
// IPO bypasses the preamp entirely (best on a quiet, high-signal band), AMP1 and
|
// IPO bypasses the preamp entirely (best on a quiet, high-signal band), AMP1 and
|
||||||
// AMP2 add gain. Presenting it as a toggle would hide the middle position.
|
// AMP2 add gain. Presenting it as a toggle would hide the middle position.
|
||||||
const PREAMPS = [{ v: '0', l: 'IPO' }, { v: '1', l: 'AMP1' }, { v: '2', l: 'AMP2' }];
|
const PREAMPS = [{ v: '0', l: 'IPO' }, { v: '1', l: 'AMP1' }, { v: '2', l: 'AMP2' }];
|
||||||
|
// Three jacks is the most any of these rigs has (FTDX101); an FTDX10 answers
|
||||||
|
// with 1 or 2 and the third button simply never gets used. A rig with a single
|
||||||
|
// socket answers nothing at all and reports 0, and the row is not drawn.
|
||||||
|
const ANTENNAS = [{ v: '1', l: 'ANT1' }, { v: '2', l: 'ANT2' }, { v: '3', l: 'ANT3' }];
|
||||||
const AGCS = [{ v: 'FAST', l: 'FAST' }, { v: 'MID', l: 'MID' }, { v: 'SLOW', l: 'SLOW' }, { v: 'AUTO', l: 'AUTO' }];
|
const AGCS = [{ v: 'FAST', l: 'FAST' }, { v: 'MID', l: 'MID' }, { v: 'SLOW', l: 'SLOW' }, { v: 'AUTO', l: 'AUTO' }];
|
||||||
// The attenuator is a three-step pad on these rigs (6/12/18 dB), not a toggle.
|
// The attenuator is a three-step pad on these rigs (6/12/18 dB), not a toggle.
|
||||||
const ATTS = [{ v: '0', l: 'OFF' }, { v: '6', l: '6dB' }, { v: '12', l: '12dB' }, { v: '18', l: '18dB' }];
|
const ATTS = [{ v: '0', l: 'OFF' }, { v: '6', l: '6dB' }, { v: '12', l: '12dB' }, { v: '18', l: '18dB' }];
|
||||||
@@ -424,6 +429,16 @@ export function YaesuPanel({ onReportRST, onKeySpeed }: {
|
|||||||
<Row label="ATT">
|
<Row label="ATT">
|
||||||
<Segmented value={String(view.att)} options={ATTS} onChange={(v) => push('att', parseInt(v, 10), () => SetYaesuAtt(parseInt(v, 10)))} />
|
<Segmented value={String(view.att)} options={ATTS} onChange={(v) => push('att', parseInt(v, 10), () => SetYaesuAtt(parseInt(v, 10)))} />
|
||||||
</Row>
|
</Row>
|
||||||
|
{/* Only on a rig that HAS a choice: 0 means the AN command went
|
||||||
|
unanswered, which is what a single-socket FT-891 does. And the
|
||||||
|
choice is remembered for the band it was made on — no table to
|
||||||
|
fill in anywhere, the backend learns it here. */}
|
||||||
|
{view.antenna > 0 && (
|
||||||
|
<Row label="ANT">
|
||||||
|
<Segmented value={String(view.antenna)} options={ANTENNAS}
|
||||||
|
onChange={(v) => push('antenna', parseInt(v, 10), () => SetYaesuAntenna(parseInt(v, 10)))} />
|
||||||
|
</Row>
|
||||||
|
)}
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
{/* Noise + filter */}
|
{/* Noise + filter */}
|
||||||
@@ -431,7 +446,13 @@ export function YaesuPanel({ onReportRST, onKeySpeed }: {
|
|||||||
<div className="flex items-center gap-2 flex-wrap">
|
<div className="flex items-center gap-2 flex-wrap">
|
||||||
<Chip on={view.nb} onClick={() => push('nb', !view.nb, () => SetYaesuNB(!view.nb))} label="NB" />
|
<Chip on={view.nb} onClick={() => push('nb', !view.nb, () => SetYaesuNB(!view.nb))} label="NB" />
|
||||||
<Chip on={view.nr} onClick={() => push('nr', !view.nr, () => SetYaesuNR(!view.nr))} label="DNR" />
|
<Chip on={view.nr} onClick={() => push('nr', !view.nr, () => SetYaesuNR(!view.nr))} label="DNR" />
|
||||||
<Chip on={view.narrow} onClick={() => push('narrow', !view.narrow, () => SetYaesuNarrow(!view.narrow))} label="NAR" />
|
{/* NAR is the narrow IF filter. Shown only when the rig ANSWERED NA:
|
||||||
|
a button that does nothing when pressed reads as a fault in the
|
||||||
|
radio, which is how it was reported from an FTDX101. */}
|
||||||
|
{view.narrow_supported && (
|
||||||
|
<Chip on={view.narrow} onClick={() => push('narrow', !view.narrow, () => SetYaesuNarrow(!view.narrow))}
|
||||||
|
label="NAR" title={t('yaesu.narrowHint')} />
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<Row label="DNR">
|
<Row label="DNR">
|
||||||
{/* 1-15 on the rig, shown as-is rather than rescaled to a percentage:
|
{/* 1-15 on the rig, shown as-is rather than rescaled to a percentage:
|
||||||
@@ -448,7 +469,7 @@ export function YaesuPanel({ onReportRST, onKeySpeed }: {
|
|||||||
<Row label="PWR">
|
<Row label="PWR">
|
||||||
{/* Watts, not a percentage: the rig reports and takes watts, and a
|
{/* Watts, not a percentage: the rig reports and takes watts, and a
|
||||||
percentage would be a second unit to reconcile every time. */}
|
percentage would be a second unit to reconcile every time. */}
|
||||||
<Slider value={view.rf_power || 5} min={5} max={100} accent="var(--destructive)"
|
<Slider value={view.rf_power || 5} min={5} max={Math.max(100, view.max_power || 100)} accent="var(--destructive)"
|
||||||
onChange={(v) => push('rf_power', v, () => SetYaesuPower(v))} />
|
onChange={(v) => push('rf_power', v, () => SetYaesuPower(v))} />
|
||||||
<span className="w-10 text-right text-xs font-mono tabular-nums text-muted-foreground">{view.rf_power}W</span>
|
<span className="w-10 text-right text-xs font-mono tabular-nums text-muted-foreground">{view.rf_power}W</span>
|
||||||
</Row>
|
</Row>
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
import { useEffect, useRef, useState } from 'react';
|
import { useEffect, useLayoutEffect, useRef, useState } from 'react';
|
||||||
|
import { createPortal } from 'react-dom';
|
||||||
|
import { ChevronDown } from 'lucide-react';
|
||||||
import { Input } from './input';
|
import { Input } from './input';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
@@ -7,6 +9,7 @@ import { cn } from '@/lib/utils';
|
|||||||
// can't hold a typo'd value that isn't in the list.
|
// can't hold a typo'd value that isn't in the list.
|
||||||
export function Combobox({
|
export function Combobox({
|
||||||
value, onChange, options, placeholder, className, allowFreeText = false, commitOnType = false,
|
value, onChange, options, placeholder, className, allowFreeText = false, commitOnType = false,
|
||||||
|
showToggle = false,
|
||||||
}: {
|
}: {
|
||||||
value: string;
|
value: string;
|
||||||
onChange: (v: string) => void;
|
onChange: (v: string) => void;
|
||||||
@@ -18,10 +21,26 @@ export function Combobox({
|
|||||||
// fields read live by other actions — e.g. RST, so a CW macro sent without
|
// fields read live by other actions — e.g. RST, so a CW macro sent without
|
||||||
// leaving the field uses the value just typed.
|
// leaving the field uses the value just typed.
|
||||||
commitOnType?: boolean;
|
commitOnType?: boolean;
|
||||||
|
// Draw a chevron that opens the full list on click.
|
||||||
|
//
|
||||||
|
// Without it this control is indistinguishable from a plain text box: it opens
|
||||||
|
// only on a keystroke or ArrowDown, both of which have to be known about
|
||||||
|
// first. That is fine for a field whose list is a convenience (RST), and wrong
|
||||||
|
// for one whose list is the ANSWER — the COM ports actually present on this
|
||||||
|
// machine, which nobody can be expected to recall.
|
||||||
|
showToggle?: boolean;
|
||||||
}) {
|
}) {
|
||||||
const [open, setOpen] = useState(false);
|
const [open, setOpen] = useState(false);
|
||||||
const [query, setQuery] = useState('');
|
const [query, setQuery] = useState('');
|
||||||
|
// Opened by the chevron rather than by typing: the whole list is on offer, not
|
||||||
|
// the part matching what is already in the field — a box holding COM7 would
|
||||||
|
// otherwise "open" onto COM7 alone.
|
||||||
|
const [browse, setBrowse] = useState(false);
|
||||||
const ref = useRef<HTMLDivElement>(null);
|
const ref = useRef<HTMLDivElement>(null);
|
||||||
|
// Where the portalled menu goes. Measured from the field itself, and
|
||||||
|
// re-measured while it is open, so scrolling the panel underneath does not
|
||||||
|
// leave the list floating over the wrong row.
|
||||||
|
const [menuPos, setMenuPos] = useState({ top: 0, left: 0, width: 0 });
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
function onDoc(e: MouseEvent) {
|
function onDoc(e: MouseEvent) {
|
||||||
@@ -31,20 +50,44 @@ export function Combobox({
|
|||||||
return () => document.removeEventListener('mousedown', onDoc);
|
return () => document.removeEventListener('mousedown', onDoc);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const filtered = open
|
useLayoutEffect(() => {
|
||||||
? options.filter((o) => o.toLowerCase().includes(query.toLowerCase())).slice(0, 60)
|
if (!open) return;
|
||||||
: [];
|
const place = () => {
|
||||||
|
const el = ref.current;
|
||||||
|
if (!el) return;
|
||||||
|
const r = el.getBoundingClientRect();
|
||||||
|
// Opens UPWARD when there is not enough room below — which is exactly
|
||||||
|
// where these fields tend to sit, at the bottom of a panel.
|
||||||
|
const height = 240;
|
||||||
|
const below = window.innerHeight - r.bottom;
|
||||||
|
const top = below < height + 8 ? Math.max(4, r.top - height - 4) : r.bottom + 4;
|
||||||
|
setMenuPos({ top, left: r.left, width: r.width });
|
||||||
|
};
|
||||||
|
place();
|
||||||
|
window.addEventListener('scroll', place, true);
|
||||||
|
window.addEventListener('resize', place);
|
||||||
|
return () => {
|
||||||
|
window.removeEventListener('scroll', place, true);
|
||||||
|
window.removeEventListener('resize', place);
|
||||||
|
};
|
||||||
|
}, [open]);
|
||||||
|
|
||||||
|
const filtered = !open ? []
|
||||||
|
: browse ? options.slice(0, 60)
|
||||||
|
: options.filter((o) => o.toLowerCase().includes(query.toLowerCase())).slice(0, 60);
|
||||||
|
|
||||||
function commit(v: string) {
|
function commit(v: string) {
|
||||||
onChange(v);
|
onChange(v);
|
||||||
setQuery(v);
|
setQuery(v);
|
||||||
setOpen(false);
|
setOpen(false);
|
||||||
|
setBrowse(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
function onBlur() {
|
function onBlur() {
|
||||||
// Defer so a click on an option registers first.
|
// Defer so a click on an option registers first.
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
setOpen(false);
|
setOpen(false);
|
||||||
|
setBrowse(false);
|
||||||
const trimmed = query.trim();
|
const trimmed = query.trim();
|
||||||
const exact = options.find((o) => o.toLowerCase() === trimmed.toLowerCase());
|
const exact = options.find((o) => o.toLowerCase() === trimmed.toLowerCase());
|
||||||
// Only fire onChange when the value actually changed — committing an
|
// Only fire onChange when the value actually changed — committing an
|
||||||
@@ -68,6 +111,7 @@ export function Combobox({
|
|||||||
const v = e.target.value;
|
const v = e.target.value;
|
||||||
setQuery(v);
|
setQuery(v);
|
||||||
setOpen(true);
|
setOpen(true);
|
||||||
|
setBrowse(false); // typing filters again
|
||||||
// Commit-on-type pushes the value live to the parent (so a CW macro sent
|
// Commit-on-type pushes the value live to the parent (so a CW macro sent
|
||||||
// without leaving the field uses what was just typed). With free text that's
|
// without leaving the field uses what was just typed). With free text that's
|
||||||
// any input; a restricted field (allowFreeText=false) commits ONLY a value
|
// any input; a restricted field (allowFreeText=false) commits ONLY a value
|
||||||
@@ -76,16 +120,44 @@ export function Combobox({
|
|||||||
if (commitOnType && (allowFreeText || options.some((o) => o.toLowerCase() === v.trim().toLowerCase()))) onChange(v);
|
if (commitOnType && (allowFreeText || options.some((o) => o.toLowerCase() === v.trim().toLowerCase()))) onChange(v);
|
||||||
}}
|
}}
|
||||||
onBlur={onBlur}
|
onBlur={onBlur}
|
||||||
|
className={showToggle ? 'pr-7' : undefined}
|
||||||
onKeyDown={(e) => {
|
onKeyDown={(e) => {
|
||||||
if ((e.key === 'ArrowDown' || e.key === 'Alt') && !open) { setOpen(true); }
|
if ((e.key === 'ArrowDown' || e.key === 'Alt') && !open) { setOpen(true); setBrowse(true); }
|
||||||
else if (e.key === 'Enter' && open && filtered.length > 0) { e.preventDefault(); commit(filtered[0]); }
|
else if (e.key === 'Enter' && open && filtered.length > 0) { e.preventDefault(); commit(filtered[0]); }
|
||||||
else if (e.key === 'Escape') { setQuery(value); setOpen(false); }
|
else if (e.key === 'Escape') { setQuery(value); setOpen(false); }
|
||||||
// Tab: just let it move on; onBlur commits/closes. Options are
|
// Tab: just let it move on; onBlur commits/closes. Options are
|
||||||
// tabIndex=-1 so a single Tab leaves the field.
|
// tabIndex=-1 so a single Tab leaves the field.
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
{open && filtered.length > 0 && (
|
{showToggle && (
|
||||||
<div className="absolute z-50 mt-1 max-h-60 w-full overflow-auto rounded-md border border-border bg-card shadow-lg text-xs">
|
<button
|
||||||
|
type="button"
|
||||||
|
tabIndex={-1}
|
||||||
|
aria-label="Show list"
|
||||||
|
className="absolute inset-y-0 right-0 flex w-7 items-center justify-center text-muted-foreground hover:text-foreground"
|
||||||
|
// mousedown, not click: the input's blur fires first otherwise and
|
||||||
|
// closes the list the same instant this opens it.
|
||||||
|
onMouseDown={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
if (open) { setOpen(false); setBrowse(false); return; }
|
||||||
|
setQuery(value);
|
||||||
|
setBrowse(true);
|
||||||
|
setOpen(true);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<ChevronDown className="size-3.5" />
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
{/* THE MENU IS PORTALLED to the body, and positioned from the field's own
|
||||||
|
rectangle. As an absolutely-positioned child it was clipped by whichever
|
||||||
|
scrolling or overflow-hidden box it happened to sit in: in the details
|
||||||
|
panel it was cut off after the first row, and a list showing one entry
|
||||||
|
of eight is worse than no list at all. */}
|
||||||
|
{open && filtered.length > 0 && createPortal(
|
||||||
|
<div
|
||||||
|
style={{ position: 'fixed', top: menuPos.top, left: menuPos.left, width: menuPos.width }}
|
||||||
|
className="z-[100] max-h-60 overflow-auto rounded-md border border-border bg-card shadow-lg text-xs"
|
||||||
|
>
|
||||||
{filtered.map((o) => (
|
{filtered.map((o) => (
|
||||||
<button
|
<button
|
||||||
key={o}
|
key={o}
|
||||||
@@ -97,7 +169,8 @@ export function Combobox({
|
|||||||
{o}
|
{o}
|
||||||
</button>
|
</button>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>,
|
||||||
|
document.body,
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,5 +1,18 @@
|
|||||||
// Auto-call: let OpsLog answer a decode without the operator clicking it.
|
// Auto-call: let OpsLog answer a decode without the operator clicking it.
|
||||||
//
|
//
|
||||||
|
// WITHDRAWN FROM THE INTERFACE, because DXHunter already does it.
|
||||||
|
//
|
||||||
|
// Two programs from the same shack deciding on their own to answer the same
|
||||||
|
// decode is worse than either doing it alone: they cannot see each other, so
|
||||||
|
// they key over one another, and afterwards there is no telling which of them
|
||||||
|
// called. The duplicate is the one to remove, and DXHunter is where this lives.
|
||||||
|
//
|
||||||
|
// There is no switch in Preferences and no button on the decodes toolbar, and
|
||||||
|
// App.tsx returns before the loop can run. The file is kept whole: the rules
|
||||||
|
// below are the delicate part, argued over and tested, and rewriting them from
|
||||||
|
// memory later would be worse than leaving them here. Reinstating the feature
|
||||||
|
// means restoring all three — the settings page, the button, and the guard.
|
||||||
|
//
|
||||||
// This KEYS THE TRANSMITTER on its own, which is why the rules here are written
|
// This KEYS THE TRANSMITTER on its own, which is why the rules here are written
|
||||||
// as a series of refusals rather than a search for a reason to call. Everything
|
// as a series of refusals rather than a search for a reason to call. Everything
|
||||||
// below has to be true; anything unknown means no.
|
// below has to be true; anything unknown means no.
|
||||||
@@ -59,13 +72,26 @@ export function loadAutoCall(): AutoCallSettings {
|
|||||||
const raw = localStorage.getItem(AC_KEY);
|
const raw = localStorage.getItem(AC_KEY);
|
||||||
if (!raw) return { ...defaultAutoCall };
|
if (!raw) return { ...defaultAutoCall };
|
||||||
const v = JSON.parse(raw);
|
const v = JSON.parse(raw);
|
||||||
return {
|
const out: AutoCallSettings = {
|
||||||
...defaultAutoCall,
|
...defaultAutoCall,
|
||||||
...v,
|
...v,
|
||||||
criteria: { ...emptyCriteria, ...(v?.criteria ?? {}) },
|
criteria: { ...emptyCriteria, ...(v?.criteria ?? {}) },
|
||||||
watchCriteria: { ...emptyCriteria, ...(v?.watchCriteria ?? {}) },
|
watchCriteria: { ...emptyCriteria, ...(v?.watchCriteria ?? {}) },
|
||||||
watch: Array.isArray(v?.watch) ? v.watch : [],
|
watch: Array.isArray(v?.watch) ? v.watch : [],
|
||||||
};
|
};
|
||||||
|
// DISARMED ON SIGHT, and written back disabled.
|
||||||
|
//
|
||||||
|
// The runtime guard in App.tsx stops this build from calling anyone, but it
|
||||||
|
// leaves "enabled": true sitting in storage, where any build without the
|
||||||
|
// guard — an older one an operator reinstalls, a machine that upgrades
|
||||||
|
// later — reads it and keys the transmitter for a feature with no switch
|
||||||
|
// left to turn off. A withdrawn feature that keys a radio has to be
|
||||||
|
// disarmed where it is REMEMBERED, not only where it runs.
|
||||||
|
if (out.enabled) {
|
||||||
|
out.enabled = false;
|
||||||
|
try { localStorage.setItem(AC_KEY, JSON.stringify(out)); } catch { /* private mode: the guard still holds */ }
|
||||||
|
}
|
||||||
|
return out;
|
||||||
} catch { return { ...defaultAutoCall }; }
|
} catch { return { ...defaultAutoCall }; }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -154,9 +180,20 @@ export function shouldAutoCall(
|
|||||||
if (!call) return no('no callsign');
|
if (!call) return no('no callsign');
|
||||||
// Never answer ourselves, however the decode reached us.
|
// Never answer ourselves, however the decode reached us.
|
||||||
if (opts.myCall && call === opts.myCall.trim().toUpperCase()) return no('own callsign');
|
if (opts.myCall && call === opts.myCall.trim().toUpperCase()) return no('own callsign');
|
||||||
// Only a CQ. Answering a station mid-QSO is both rude and futile — WSJT-X
|
// NOT limited to a CQ, deliberately.
|
||||||
// actions a Reply only for CQ and QRZ anyway.
|
//
|
||||||
if (!d.cq) return no('not a CQ');
|
// It used to be, on the reasoning that answering a station mid-QSO is calling
|
||||||
|
// over somebody. That reasoning ignored the case the feature exists for: a
|
||||||
|
// DXpedition running a pileup never sends CQ at all — it works caller after
|
||||||
|
// caller — so the rule sat out the one contact auto-call was turned on for. A
|
||||||
|
// new entity on 15 m FT8, decode after decode, and not a single transmission.
|
||||||
|
//
|
||||||
|
// WHEN to transmit is not ours to decide either: the Reply goes to the
|
||||||
|
// decoder, and MSHV starts at once while JTDX waits for a CQ. Two correct
|
||||||
|
// behaviours, both belonging to the program that owns the timing. Here the
|
||||||
|
// question is only whether the station is one the operator wants — the
|
||||||
|
// criteria below answer that, and the cooldown and the busy check keep it from
|
||||||
|
// calling twice.
|
||||||
// Not while ANY receiver is mid-QSO — transmitting, or holding a DX call it
|
// Not while ANY receiver is mid-QSO — transmitting, or holding a DX call it
|
||||||
// has not finished with. Starting a second exchange before the first is done
|
// has not finished with. Starting a second exchange before the first is done
|
||||||
// is what turned this into a machine that called without stopping.
|
// is what turned this into a machine that called without stopping.
|
||||||
|
|||||||
+52
-54
File diff suppressed because one or more lines are too long
@@ -26,7 +26,7 @@ export type RowColorSettings = {
|
|||||||
// otherwise keep striping underneath whatever we do per row.
|
// otherwise keep striping underneath whatever we do per row.
|
||||||
const ZEBRA_DEFAULT = 'color-mix(in srgb, var(--muted) 40%, var(--card))';
|
const ZEBRA_DEFAULT = 'color-mix(in srgb, var(--muted) 40%, var(--card))';
|
||||||
|
|
||||||
export const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
|
export const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz', 'hamlog'] as const;
|
||||||
|
|
||||||
// The two QSO fields behind each channel. QRZ.com and Club Log call theirs an
|
// The two QSO fields behind each channel. QRZ.com and Club Log call theirs an
|
||||||
// "upload status" rather than a QSL flag, but they carry the same Y / R letters.
|
// "upload status" rather than a QSL flag, but they carry the same Y / R letters.
|
||||||
@@ -37,6 +37,24 @@ const FIELDS: Record<string, { sent: string; rcvd: string }> = {
|
|||||||
qrz: { sent: 'qrzcom_qso_upload_status', rcvd: 'qrzcom_qso_download_status' },
|
qrz: { sent: 'qrzcom_qso_upload_status', rcvd: 'qrzcom_qso_download_status' },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// HAMLOG.online has no column of its own: the ADIF standard names a field for
|
||||||
|
// hamlog.EU and none for hamlog.ONLINE, so its state lives in the extras — see
|
||||||
|
// internal/award/award.go, which reads the same keys for award confirmations.
|
||||||
|
// One vocabulary, two readers.
|
||||||
|
const HAMLOG_SENT = 'APP_OPSLOG_HAMLOG_SENT';
|
||||||
|
const HAMLOG_RCVD = ['APP_HAMLOG_QSO_CFM', 'APP_OPSLOG_HAMLOG_QSL', 'APP_HAMLOG_QSL', 'APP_HAMLOGONLINE_QSL', 'HAMLOG_QSL_RCVD'];
|
||||||
|
|
||||||
|
// hamlogState reads a row's extras. Any value that is not an explicit "no"
|
||||||
|
// counts, because their export could carry a date or a match id rather than Y.
|
||||||
|
function hamlogState(q: any, which: 'sent' | 'rcvd'): boolean {
|
||||||
|
const e = (q?.extras ?? {}) as Record<string, string>;
|
||||||
|
const keys = which === 'sent' ? [HAMLOG_SENT] : HAMLOG_RCVD;
|
||||||
|
return keys.some((k) => {
|
||||||
|
const v = String(e[k] ?? '').trim();
|
||||||
|
return v !== '' && v.toUpperCase() !== 'N' && v.toUpperCase() !== 'NO';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// ADIF QSL fields are single letters. Y is the only one that means "yes";
|
// ADIF QSL fields are single letters. Y is the only one that means "yes";
|
||||||
// R (requested) and Q (queued) mean it has not gone out yet — a different state,
|
// R (requested) and Q (queued) mean it has not gone out yet — a different state,
|
||||||
// and the one an operator looks for when deciding what to send.
|
// and the one an operator looks for when deciding what to send.
|
||||||
@@ -55,14 +73,18 @@ function ruleMatches(q: any, r: RowColorRule): boolean {
|
|||||||
const cs = chansOf(r);
|
const cs = chansOf(r);
|
||||||
switch (r.id) {
|
switch (r.id) {
|
||||||
case 'confirmed':
|
case 'confirmed':
|
||||||
return cs.some((c) => yes(q[FIELDS[c]?.rcvd]));
|
return cs.some((c) => (c === 'hamlog' ? hamlogState(q, 'rcvd') : yes(q[FIELDS[c]?.rcvd])));
|
||||||
case 'sent':
|
case 'sent':
|
||||||
return cs.some((c) => yes(q[FIELDS[c]?.sent]));
|
return cs.some((c) => (c === 'hamlog' ? hamlogState(q, 'sent') : yes(q[FIELDS[c]?.sent])));
|
||||||
case 'to_send':
|
case 'to_send':
|
||||||
return cs.some((c) => owed(q[FIELDS[c]?.sent]));
|
// Nothing to request from HAMLOG: a QSO is either uploaded or it is not,
|
||||||
|
// there is no "card asked for" state to be owed.
|
||||||
|
return cs.some((c) => c !== 'hamlog' && owed(q[FIELDS[c]?.sent]));
|
||||||
case 'worked':
|
case 'worked':
|
||||||
// The catch-all: nothing sent, nothing asked for, nothing back.
|
// The catch-all: nothing sent, nothing asked for, nothing back.
|
||||||
return !CHANNELS.some((c) => yes(q[FIELDS[c].rcvd]) || yes(q[FIELDS[c].sent]) || owed(q[FIELDS[c].sent]));
|
return !CHANNELS.some((c) => (c === 'hamlog'
|
||||||
|
? hamlogState(q, 'rcvd') || hamlogState(q, 'sent')
|
||||||
|
: yes(q[FIELDS[c].rcvd]) || yes(q[FIELDS[c].sent]) || owed(q[FIELDS[c].sent])));
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -991,6 +991,18 @@
|
|||||||
@layer base {
|
@layer base {
|
||||||
* { @apply border-border; }
|
* { @apply border-border; }
|
||||||
html, body, #root { height: 100%; }
|
html, body, #root { height: 100%; }
|
||||||
|
/* No rubber-band, and no swipe-to-navigate.
|
||||||
|
|
||||||
|
Chromium lets a scroll that has reached the end pull the content a few
|
||||||
|
pixels and spring back, and a two-finger horizontal swipe means "go back a
|
||||||
|
page". Both are browser behaviours that have no meaning in a logbook: the
|
||||||
|
first makes a table wobble at the bottom of a list, and the second can
|
||||||
|
navigate the WebView away from the app entirely — a blank window and a
|
||||||
|
restart. Neither shows up with a mouse, which is why they went unnoticed;
|
||||||
|
they arrive with a precision touchpad or a touchscreen.
|
||||||
|
|
||||||
|
A no-op wherever the effects don't occur. */
|
||||||
|
html, body { overscroll-behavior: none; }
|
||||||
/* Root rem base. Tailwind sizing (text/heights/padding/gaps) is in rem, so
|
/* Root rem base. Tailwind sizing (text/heights/padding/gaps) is in rem, so
|
||||||
this is the single global density knob — shrinks the whole UI uniformly
|
this is the single global density knob — shrinks the whole UI uniformly
|
||||||
while Leaflet maps (px-based) stay correct. Default browser base is 16px. */
|
while Leaflet maps (px-based) stay correct. Default browser base is 16px. */
|
||||||
@@ -1055,3 +1067,15 @@
|
|||||||
filter: invert(1) brightness(1.8);
|
filter: invert(1) brightness(1.8);
|
||||||
opacity: 0.9;
|
opacity: 0.9;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Every scrollable pane keeps its overscroll to itself.
|
||||||
|
|
||||||
|
"contain" (not "none") on the inside: the pane still scrolls normally, it
|
||||||
|
simply stops passing the leftover motion up to its parent — which is how
|
||||||
|
scrolling a grid to its end used to tug the panel behind it. */
|
||||||
|
.overflow-auto,
|
||||||
|
.overflow-y-auto,
|
||||||
|
.overflow-x-auto,
|
||||||
|
.overflow-scroll {
|
||||||
|
overscroll-behavior: contain;
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,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.3';
|
export const APP_VERSION = '0.26.18';
|
||||||
|
|
||||||
// Author / credits, shown in Help -> About.
|
// Author / credits, shown in Help -> About.
|
||||||
export const APP_AUTHOR = 'F4BPO';
|
export const APP_AUTHOR = 'F4BPO';
|
||||||
|
|||||||
Vendored
+112
@@ -65,6 +65,8 @@ export function ApplyAwardPreset(arg1:string,arg2:string):Promise<number>;
|
|||||||
|
|
||||||
export function ApplyAwardUpdate(arg1:string):Promise<void>;
|
export function ApplyAwardUpdate(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function ApplyRDAChoices(arg1:Array<main.RDAChoice>):Promise<main.RDAApplyResult>;
|
||||||
|
|
||||||
export function AssignAwardRefToQSOs(arg1:string,arg2:string,arg3:Array<number>):Promise<number>;
|
export function AssignAwardRefToQSOs(arg1:string,arg2:string,arg3:Array<number>):Promise<number>;
|
||||||
|
|
||||||
export function AudioApplyLevels(arg1:number,arg2:number):Promise<void>;
|
export function AudioApplyLevels(arg1:number,arg2:number):Promise<void>;
|
||||||
@@ -117,12 +119,20 @@ export function ChatAvailable():Promise<boolean>;
|
|||||||
|
|
||||||
export function CheckForUpdate():Promise<main.UpdateInfo>;
|
export function CheckForUpdate():Promise<main.UpdateInfo>;
|
||||||
|
|
||||||
|
export function CheckHamlogKey(arg1:string):Promise<string>;
|
||||||
|
|
||||||
|
export function ClearKenwoodRIT():Promise<void>;
|
||||||
|
|
||||||
export function ClearLookupCache():Promise<void>;
|
export function ClearLookupCache():Promise<void>;
|
||||||
|
|
||||||
export function CloseAutostartPrograms():Promise<void>;
|
export function CloseAutostartPrograms():Promise<void>;
|
||||||
|
|
||||||
export function ClusterSpotStatuses(arg1:Array<main.SpotQuery>):Promise<Array<main.SpotStatus>>;
|
export function ClusterSpotStatuses(arg1:Array<main.SpotQuery>):Promise<Array<main.SpotStatus>>;
|
||||||
|
|
||||||
|
export function CompactDatabase(arg1:string):Promise<main.CompactResult>;
|
||||||
|
|
||||||
|
export function CompareRDASources():Promise<main.RDACompareResult>;
|
||||||
|
|
||||||
export function ComputeQSOAwardRefs(arg1:qso.QSO):Promise<Array<main.QSOAwardRef>>;
|
export function ComputeQSOAwardRefs(arg1:qso.QSO):Promise<Array<main.QSOAwardRef>>;
|
||||||
|
|
||||||
export function ComputeStationInfo(arg1:string,arg2:string):Promise<main.StationInfoComputed>;
|
export function ComputeStationInfo(arg1:string,arg2:string):Promise<main.StationInfoComputed>;
|
||||||
@@ -227,6 +237,8 @@ export function ExportCabrilloFiltered(arg1:string,arg2:qso.QueryFilter):Promise
|
|||||||
|
|
||||||
export function ExportCabrilloSelected(arg1:string,arg2:Array<number>):Promise<main.CabrilloResult>;
|
export function ExportCabrilloSelected(arg1:string,arg2:Array<number>):Promise<main.CabrilloResult>;
|
||||||
|
|
||||||
|
export function ExportHamlogUnmatched(arg1:string):Promise<number>;
|
||||||
|
|
||||||
export function FilterFields():Promise<Array<string>>;
|
export function FilterFields():Promise<Array<string>>;
|
||||||
|
|
||||||
export function FindDuplicates(arg1:number):Promise<Array<main.DuplicateGroup>>;
|
export function FindDuplicates(arg1:number):Promise<Array<main.DuplicateGroup>>;
|
||||||
@@ -369,6 +381,8 @@ export function FlexTune(arg1:boolean):Promise<void>;
|
|||||||
|
|
||||||
export function FlexZoomForSpot(arg1:string,arg2:number):Promise<void>;
|
export function FlexZoomForSpot(arg1:string,arg2:number):Promise<void>;
|
||||||
|
|
||||||
|
export function ForgetYaesuBandAntenna(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function GetACOMStatus():Promise<acom.Status>;
|
export function GetACOMStatus():Promise<acom.Status>;
|
||||||
|
|
||||||
export function GetADIFMonitor():Promise<main.ADIFMonitorConfig>;
|
export function GetADIFMonitor():Promise<main.ADIFMonitorConfig>;
|
||||||
@@ -461,6 +475,8 @@ export function GetFlexBandAntennas():Promise<Record<string, main.FlexBandAnt>>;
|
|||||||
|
|
||||||
export function GetFlexBandPower():Promise<Record<string, main.FlexBandPower>>;
|
export function GetFlexBandPower():Promise<Record<string, main.FlexBandPower>>;
|
||||||
|
|
||||||
|
export function GetFlexRSTChase():Promise<main.FlexRSTChase>;
|
||||||
|
|
||||||
export function GetFlexState():Promise<cat.FlexTXState>;
|
export function GetFlexState():Promise<cat.FlexTXState>;
|
||||||
|
|
||||||
export function GetFlexZoom():Promise<main.FlexZoomSettings>;
|
export function GetFlexZoom():Promise<main.FlexZoomSettings>;
|
||||||
@@ -475,6 +491,8 @@ export function GetGridScopeSettings():Promise<main.GridScopeSettings>;
|
|||||||
|
|
||||||
export function GetIcomState():Promise<cat.IcomTXState>;
|
export function GetIcomState():Promise<cat.IcomTXState>;
|
||||||
|
|
||||||
|
export function GetKenwoodState():Promise<cat.KenwoodTXState>;
|
||||||
|
|
||||||
export function GetLinkedAmps():Promise<Array<string>>;
|
export function GetLinkedAmps():Promise<Array<string>>;
|
||||||
|
|
||||||
export function GetListsSettings():Promise<main.ListsSettings>;
|
export function GetListsSettings():Promise<main.ListsSettings>;
|
||||||
@@ -547,6 +565,8 @@ export function GetSolarData():Promise<solar.Data>;
|
|||||||
|
|
||||||
export function GetSpotColors():Promise<main.SpotColors>;
|
export function GetSpotColors():Promise<main.SpotColors>;
|
||||||
|
|
||||||
|
export function GetSpotMax():Promise<number>;
|
||||||
|
|
||||||
export function GetSpotTTLMinutes():Promise<number>;
|
export function GetSpotTTLMinutes():Promise<number>;
|
||||||
|
|
||||||
export function GetStartupStatus():Promise<main.StartupStatus>;
|
export function GetStartupStatus():Promise<main.StartupStatus>;
|
||||||
@@ -557,6 +577,8 @@ export function GetStationSettings():Promise<main.StationSettings>;
|
|||||||
|
|
||||||
export function GetStationStatus():Promise<Array<main.StationDeviceStatus>>;
|
export function GetStationStatus():Promise<Array<main.StationDeviceStatus>>;
|
||||||
|
|
||||||
|
export function GetTCIPanel():Promise<cat.TCIPanelState>;
|
||||||
|
|
||||||
export function GetTelemetryEnabled():Promise<boolean>;
|
export function GetTelemetryEnabled():Promise<boolean>;
|
||||||
|
|
||||||
export function GetTrackedAwards():Promise<Array<string>>;
|
export function GetTrackedAwards():Promise<Array<string>>;
|
||||||
@@ -583,6 +605,8 @@ export function GetWinkeyerStatus():Promise<winkeyer.Status>;
|
|||||||
|
|
||||||
export function GetWorkedCallVariants():Promise<boolean>;
|
export function GetWorkedCallVariants():Promise<boolean>;
|
||||||
|
|
||||||
|
export function GetYaesuBandAntennas():Promise<Record<string, number>>;
|
||||||
|
|
||||||
export function GetYaesuState():Promise<cat.YaesuTXState>;
|
export function GetYaesuState():Promise<cat.YaesuTXState>;
|
||||||
|
|
||||||
export function GridSquares(arg1:string):Promise<Array<qso.GridSquare>>;
|
export function GridSquares(arg1:string):Promise<Array<qso.GridSquare>>;
|
||||||
@@ -683,6 +707,8 @@ export function ImportAwardReferencesText(arg1:string,arg2:string):Promise<numbe
|
|||||||
|
|
||||||
export function ImportAwards():Promise<main.AwardImportResult>;
|
export function ImportAwards():Promise<main.AwardImportResult>;
|
||||||
|
|
||||||
|
export function ImportHamlogConfirmations(arg1:string):Promise<main.HamlogCfmResult>;
|
||||||
|
|
||||||
export function InspectAwardImport():Promise<main.AwardImportPreview>;
|
export function InspectAwardImport():Promise<main.AwardImportPreview>;
|
||||||
|
|
||||||
export function IsNewUSCounty(arg1:string,arg2:string):Promise<boolean>;
|
export function IsNewUSCounty(arg1:string,arg2:string):Promise<boolean>;
|
||||||
@@ -781,6 +807,8 @@ export function NetSetDefaults(arg1:string,arg2:string,arg3:string,arg4:string):
|
|||||||
|
|
||||||
export function NetUpdateActive(arg1:qso.QSO):Promise<void>;
|
export function NetUpdateActive(arg1:qso.QSO):Promise<void>;
|
||||||
|
|
||||||
|
export function NudgeKenwoodRIT(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function OpenADIFFile():Promise<string>;
|
export function OpenADIFFile():Promise<string>;
|
||||||
|
|
||||||
export function OpenAwardsFolder():Promise<void>;
|
export function OpenAwardsFolder():Promise<void>;
|
||||||
@@ -883,6 +911,8 @@ export function RecomputeAwardRefsForCode(arg1:string):Promise<number>;
|
|||||||
|
|
||||||
export function RefreshCtyDat():Promise<main.CtyDatInfo>;
|
export function RefreshCtyDat():Promise<main.CtyDatInfo>;
|
||||||
|
|
||||||
|
export function RefreshKenwood():Promise<void>;
|
||||||
|
|
||||||
export function RefreshSolar():Promise<void>;
|
export function RefreshSolar():Promise<void>;
|
||||||
|
|
||||||
export function RefreshYaesuPanel():Promise<void>;
|
export function RefreshYaesuPanel():Promise<void>;
|
||||||
@@ -977,6 +1007,8 @@ export function SaveFlexBandAntennas(arg1:Record<string, main.FlexBandAnt>):Prom
|
|||||||
|
|
||||||
export function SaveFlexBandPower(arg1:Record<string, main.FlexBandPower>):Promise<void>;
|
export function SaveFlexBandPower(arg1:Record<string, main.FlexBandPower>):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveFlexRSTChase(arg1:main.FlexRSTChase):Promise<void>;
|
||||||
|
|
||||||
export function SaveFlexZoom(arg1:main.FlexZoomSettings):Promise<void>;
|
export function SaveFlexZoom(arg1:main.FlexZoomSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveFolderSync(arg1:main.FolderSyncConfig):Promise<void>;
|
export function SaveFolderSync(arg1:main.FolderSyncConfig):Promise<void>;
|
||||||
@@ -1079,8 +1111,40 @@ export function SetCompactMode(arg1:boolean):Promise<void>;
|
|||||||
|
|
||||||
export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
|
export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
|
||||||
|
|
||||||
|
export function SetFlexRSTChaseEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodAFGain(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodAGC(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodAntenna(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodAtt(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodFilter(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetKenwoodKeySpeed(arg1:number):Promise<void>;
|
export function SetKenwoodKeySpeed(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodMicGain(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodNB(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodNR(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodPower(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodPreamp(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodRFGain(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodRIT(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodSquelch(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodTX(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodXIT(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetLinkedAmps(arg1:Array<string>):Promise<void>;
|
export function SetLinkedAmps(arg1:Array<string>):Promise<void>;
|
||||||
|
|
||||||
export function SetMotorFollow(arg1:boolean,arg2:number,arg3:string):Promise<void>;
|
export function SetMotorFollow(arg1:boolean,arg2:number,arg3:string):Promise<void>;
|
||||||
@@ -1093,8 +1157,48 @@ export function SetPassphrase(arg1:string):Promise<void>;
|
|||||||
|
|
||||||
export function SetScpEnabled(arg1:boolean):Promise<void>;
|
export function SetScpEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetSpotMax(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetSpotTTLMinutes(arg1:number):Promise<void>;
|
export function SetSpotTTLMinutes(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIAGC(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIANF(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIAPF(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIDrive(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIFilter(arg1:number,arg2:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCILock(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIMicLevel(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIMute(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCINB(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCINR(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIRIT(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIRITOffset(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCISquelch(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCISquelchLevel(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCITune(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCITuneDrive(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIVolume(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIXIT(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIXITOffset(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetTelemetryEnabled(arg1:boolean):Promise<void>;
|
export function SetTelemetryEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetUIPref(arg1:string,arg2:string):Promise<void>;
|
export function SetUIPref(arg1:string,arg2:string):Promise<void>;
|
||||||
@@ -1109,6 +1213,8 @@ export function SetYaesuAFGain(arg1:number):Promise<void>;
|
|||||||
|
|
||||||
export function SetYaesuAGC(arg1:string):Promise<void>;
|
export function SetYaesuAGC(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function SetYaesuAntenna(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetYaesuAtt(arg1:number):Promise<void>;
|
export function SetYaesuAtt(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetYaesuBand(arg1:string):Promise<void>;
|
export function SetYaesuBand(arg1:string):Promise<void>;
|
||||||
@@ -1185,6 +1291,10 @@ export function TestUltrabeam(arg1:main.UltrabeamSettings):Promise<void>;
|
|||||||
|
|
||||||
export function TestWebPublishFTP(arg1:webpub.Config):Promise<string>;
|
export function TestWebPublishFTP(arg1:webpub.Config):Promise<string>;
|
||||||
|
|
||||||
|
export function ToggleKenwoodATU():Promise<void>;
|
||||||
|
|
||||||
|
export function TuneKenwoodATU():Promise<void>;
|
||||||
|
|
||||||
export function TuneYaesuATU():Promise<void>;
|
export function TuneYaesuATU():Promise<void>;
|
||||||
|
|
||||||
export function TunerGeniusActivate(arg1:number):Promise<void>;
|
export function TunerGeniusActivate(arg1:number):Promise<void>;
|
||||||
@@ -1237,6 +1347,8 @@ export function WinkeyerTraceEnabled():Promise<boolean>;
|
|||||||
|
|
||||||
export function WorkedBefore(arg1:string,arg2:number):Promise<qso.WorkedBefore>;
|
export function WorkedBefore(arg1:string,arg2:number):Promise<qso.WorkedBefore>;
|
||||||
|
|
||||||
|
export function YaesuApplyBandAntenna(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function YaesuSendCW(arg1:string):Promise<void>;
|
export function YaesuSendCW(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function YaesuStopCW():Promise<void>;
|
export function YaesuStopCW():Promise<void>;
|
||||||
|
|||||||
@@ -70,6 +70,10 @@ export function ApplyAwardUpdate(arg1) {
|
|||||||
return window['go']['main']['App']['ApplyAwardUpdate'](arg1);
|
return window['go']['main']['App']['ApplyAwardUpdate'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function ApplyRDAChoices(arg1) {
|
||||||
|
return window['go']['main']['App']['ApplyRDAChoices'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function AssignAwardRefToQSOs(arg1, arg2, arg3) {
|
export function AssignAwardRefToQSOs(arg1, arg2, arg3) {
|
||||||
return window['go']['main']['App']['AssignAwardRefToQSOs'](arg1, arg2, arg3);
|
return window['go']['main']['App']['AssignAwardRefToQSOs'](arg1, arg2, arg3);
|
||||||
}
|
}
|
||||||
@@ -174,6 +178,14 @@ export function CheckForUpdate() {
|
|||||||
return window['go']['main']['App']['CheckForUpdate']();
|
return window['go']['main']['App']['CheckForUpdate']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function CheckHamlogKey(arg1) {
|
||||||
|
return window['go']['main']['App']['CheckHamlogKey'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ClearKenwoodRIT() {
|
||||||
|
return window['go']['main']['App']['ClearKenwoodRIT']();
|
||||||
|
}
|
||||||
|
|
||||||
export function ClearLookupCache() {
|
export function ClearLookupCache() {
|
||||||
return window['go']['main']['App']['ClearLookupCache']();
|
return window['go']['main']['App']['ClearLookupCache']();
|
||||||
}
|
}
|
||||||
@@ -186,6 +198,14 @@ export function ClusterSpotStatuses(arg1) {
|
|||||||
return window['go']['main']['App']['ClusterSpotStatuses'](arg1);
|
return window['go']['main']['App']['ClusterSpotStatuses'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function CompactDatabase(arg1) {
|
||||||
|
return window['go']['main']['App']['CompactDatabase'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function CompareRDASources() {
|
||||||
|
return window['go']['main']['App']['CompareRDASources']();
|
||||||
|
}
|
||||||
|
|
||||||
export function ComputeQSOAwardRefs(arg1) {
|
export function ComputeQSOAwardRefs(arg1) {
|
||||||
return window['go']['main']['App']['ComputeQSOAwardRefs'](arg1);
|
return window['go']['main']['App']['ComputeQSOAwardRefs'](arg1);
|
||||||
}
|
}
|
||||||
@@ -394,6 +414,10 @@ export function ExportCabrilloSelected(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['ExportCabrilloSelected'](arg1, arg2);
|
return window['go']['main']['App']['ExportCabrilloSelected'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function ExportHamlogUnmatched(arg1) {
|
||||||
|
return window['go']['main']['App']['ExportHamlogUnmatched'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function FilterFields() {
|
export function FilterFields() {
|
||||||
return window['go']['main']['App']['FilterFields']();
|
return window['go']['main']['App']['FilterFields']();
|
||||||
}
|
}
|
||||||
@@ -678,6 +702,10 @@ export function FlexZoomForSpot(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['FlexZoomForSpot'](arg1, arg2);
|
return window['go']['main']['App']['FlexZoomForSpot'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function ForgetYaesuBandAntenna(arg1) {
|
||||||
|
return window['go']['main']['App']['ForgetYaesuBandAntenna'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function GetACOMStatus() {
|
export function GetACOMStatus() {
|
||||||
return window['go']['main']['App']['GetACOMStatus']();
|
return window['go']['main']['App']['GetACOMStatus']();
|
||||||
}
|
}
|
||||||
@@ -862,6 +890,10 @@ export function GetFlexBandPower() {
|
|||||||
return window['go']['main']['App']['GetFlexBandPower']();
|
return window['go']['main']['App']['GetFlexBandPower']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetFlexRSTChase() {
|
||||||
|
return window['go']['main']['App']['GetFlexRSTChase']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetFlexState() {
|
export function GetFlexState() {
|
||||||
return window['go']['main']['App']['GetFlexState']();
|
return window['go']['main']['App']['GetFlexState']();
|
||||||
}
|
}
|
||||||
@@ -890,6 +922,10 @@ export function GetIcomState() {
|
|||||||
return window['go']['main']['App']['GetIcomState']();
|
return window['go']['main']['App']['GetIcomState']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetKenwoodState() {
|
||||||
|
return window['go']['main']['App']['GetKenwoodState']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetLinkedAmps() {
|
export function GetLinkedAmps() {
|
||||||
return window['go']['main']['App']['GetLinkedAmps']();
|
return window['go']['main']['App']['GetLinkedAmps']();
|
||||||
}
|
}
|
||||||
@@ -1034,6 +1070,10 @@ export function GetSpotColors() {
|
|||||||
return window['go']['main']['App']['GetSpotColors']();
|
return window['go']['main']['App']['GetSpotColors']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetSpotMax() {
|
||||||
|
return window['go']['main']['App']['GetSpotMax']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetSpotTTLMinutes() {
|
export function GetSpotTTLMinutes() {
|
||||||
return window['go']['main']['App']['GetSpotTTLMinutes']();
|
return window['go']['main']['App']['GetSpotTTLMinutes']();
|
||||||
}
|
}
|
||||||
@@ -1054,6 +1094,10 @@ export function GetStationStatus() {
|
|||||||
return window['go']['main']['App']['GetStationStatus']();
|
return window['go']['main']['App']['GetStationStatus']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetTCIPanel() {
|
||||||
|
return window['go']['main']['App']['GetTCIPanel']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetTelemetryEnabled() {
|
export function GetTelemetryEnabled() {
|
||||||
return window['go']['main']['App']['GetTelemetryEnabled']();
|
return window['go']['main']['App']['GetTelemetryEnabled']();
|
||||||
}
|
}
|
||||||
@@ -1106,6 +1150,10 @@ export function GetWorkedCallVariants() {
|
|||||||
return window['go']['main']['App']['GetWorkedCallVariants']();
|
return window['go']['main']['App']['GetWorkedCallVariants']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetYaesuBandAntennas() {
|
||||||
|
return window['go']['main']['App']['GetYaesuBandAntennas']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetYaesuState() {
|
export function GetYaesuState() {
|
||||||
return window['go']['main']['App']['GetYaesuState']();
|
return window['go']['main']['App']['GetYaesuState']();
|
||||||
}
|
}
|
||||||
@@ -1306,6 +1354,10 @@ export function ImportAwards() {
|
|||||||
return window['go']['main']['App']['ImportAwards']();
|
return window['go']['main']['App']['ImportAwards']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function ImportHamlogConfirmations(arg1) {
|
||||||
|
return window['go']['main']['App']['ImportHamlogConfirmations'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function InspectAwardImport() {
|
export function InspectAwardImport() {
|
||||||
return window['go']['main']['App']['InspectAwardImport']();
|
return window['go']['main']['App']['InspectAwardImport']();
|
||||||
}
|
}
|
||||||
@@ -1502,6 +1554,10 @@ export function NetUpdateActive(arg1) {
|
|||||||
return window['go']['main']['App']['NetUpdateActive'](arg1);
|
return window['go']['main']['App']['NetUpdateActive'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function NudgeKenwoodRIT(arg1) {
|
||||||
|
return window['go']['main']['App']['NudgeKenwoodRIT'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function OpenADIFFile() {
|
export function OpenADIFFile() {
|
||||||
return window['go']['main']['App']['OpenADIFFile']();
|
return window['go']['main']['App']['OpenADIFFile']();
|
||||||
}
|
}
|
||||||
@@ -1706,6 +1762,10 @@ export function RefreshCtyDat() {
|
|||||||
return window['go']['main']['App']['RefreshCtyDat']();
|
return window['go']['main']['App']['RefreshCtyDat']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function RefreshKenwood() {
|
||||||
|
return window['go']['main']['App']['RefreshKenwood']();
|
||||||
|
}
|
||||||
|
|
||||||
export function RefreshSolar() {
|
export function RefreshSolar() {
|
||||||
return window['go']['main']['App']['RefreshSolar']();
|
return window['go']['main']['App']['RefreshSolar']();
|
||||||
}
|
}
|
||||||
@@ -1894,6 +1954,10 @@ export function SaveFlexBandPower(arg1) {
|
|||||||
return window['go']['main']['App']['SaveFlexBandPower'](arg1);
|
return window['go']['main']['App']['SaveFlexBandPower'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveFlexRSTChase(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveFlexRSTChase'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveFlexZoom(arg1) {
|
export function SaveFlexZoom(arg1) {
|
||||||
return window['go']['main']['App']['SaveFlexZoom'](arg1);
|
return window['go']['main']['App']['SaveFlexZoom'](arg1);
|
||||||
}
|
}
|
||||||
@@ -2098,10 +2162,74 @@ export function SetDVKLabel(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['SetDVKLabel'](arg1, arg2);
|
return window['go']['main']['App']['SetDVKLabel'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetFlexRSTChaseEnabled(arg1) {
|
||||||
|
return window['go']['main']['App']['SetFlexRSTChaseEnabled'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodAFGain(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodAFGain'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodAGC(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodAGC'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodAntenna(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodAntenna'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodAtt(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodAtt'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodFilter(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodFilter'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetKenwoodKeySpeed(arg1) {
|
export function SetKenwoodKeySpeed(arg1) {
|
||||||
return window['go']['main']['App']['SetKenwoodKeySpeed'](arg1);
|
return window['go']['main']['App']['SetKenwoodKeySpeed'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodMicGain(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodMicGain'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodNB(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodNB'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodNR(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodNR'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodPower(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodPower'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodPreamp(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodPreamp'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodRFGain(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodRFGain'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodRIT(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodRIT'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodSquelch(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodSquelch'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodTX(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodTX'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodXIT(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodXIT'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetLinkedAmps(arg1) {
|
export function SetLinkedAmps(arg1) {
|
||||||
return window['go']['main']['App']['SetLinkedAmps'](arg1);
|
return window['go']['main']['App']['SetLinkedAmps'](arg1);
|
||||||
}
|
}
|
||||||
@@ -2126,10 +2254,90 @@ export function SetScpEnabled(arg1) {
|
|||||||
return window['go']['main']['App']['SetScpEnabled'](arg1);
|
return window['go']['main']['App']['SetScpEnabled'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetSpotMax(arg1) {
|
||||||
|
return window['go']['main']['App']['SetSpotMax'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetSpotTTLMinutes(arg1) {
|
export function SetSpotTTLMinutes(arg1) {
|
||||||
return window['go']['main']['App']['SetSpotTTLMinutes'](arg1);
|
return window['go']['main']['App']['SetSpotTTLMinutes'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetTCIAGC(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIAGC'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIANF(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIANF'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIAPF(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIAPF'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIDrive(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIDrive'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIFilter(arg1, arg2) {
|
||||||
|
return window['go']['main']['App']['SetTCIFilter'](arg1, arg2);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCILock(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCILock'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIMicLevel(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIMicLevel'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIMute(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIMute'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCINB(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCINB'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCINR(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCINR'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIRIT(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIRIT'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIRITOffset(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIRITOffset'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCISquelch(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCISquelch'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCISquelchLevel(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCISquelchLevel'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCITune(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCITune'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCITuneDrive(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCITuneDrive'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIVolume(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIVolume'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIXIT(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIXIT'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIXITOffset(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIXITOffset'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetTelemetryEnabled(arg1) {
|
export function SetTelemetryEnabled(arg1) {
|
||||||
return window['go']['main']['App']['SetTelemetryEnabled'](arg1);
|
return window['go']['main']['App']['SetTelemetryEnabled'](arg1);
|
||||||
}
|
}
|
||||||
@@ -2158,6 +2366,10 @@ export function SetYaesuAGC(arg1) {
|
|||||||
return window['go']['main']['App']['SetYaesuAGC'](arg1);
|
return window['go']['main']['App']['SetYaesuAGC'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetYaesuAntenna(arg1) {
|
||||||
|
return window['go']['main']['App']['SetYaesuAntenna'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetYaesuAtt(arg1) {
|
export function SetYaesuAtt(arg1) {
|
||||||
return window['go']['main']['App']['SetYaesuAtt'](arg1);
|
return window['go']['main']['App']['SetYaesuAtt'](arg1);
|
||||||
}
|
}
|
||||||
@@ -2310,6 +2522,14 @@ export function TestWebPublishFTP(arg1) {
|
|||||||
return window['go']['main']['App']['TestWebPublishFTP'](arg1);
|
return window['go']['main']['App']['TestWebPublishFTP'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function ToggleKenwoodATU() {
|
||||||
|
return window['go']['main']['App']['ToggleKenwoodATU']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function TuneKenwoodATU() {
|
||||||
|
return window['go']['main']['App']['TuneKenwoodATU']();
|
||||||
|
}
|
||||||
|
|
||||||
export function TuneYaesuATU() {
|
export function TuneYaesuATU() {
|
||||||
return window['go']['main']['App']['TuneYaesuATU']();
|
return window['go']['main']['App']['TuneYaesuATU']();
|
||||||
}
|
}
|
||||||
@@ -2414,6 +2634,10 @@ export function WorkedBefore(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['WorkedBefore'](arg1, arg2);
|
return window['go']['main']['App']['WorkedBefore'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function YaesuApplyBandAntenna(arg1) {
|
||||||
|
return window['go']['main']['App']['YaesuApplyBandAntenna'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function YaesuSendCW(arg1) {
|
export function YaesuSendCW(arg1) {
|
||||||
return window['go']['main']['App']['YaesuSendCW'](arg1);
|
return window['go']['main']['App']['YaesuSendCW'](arg1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1067,6 +1067,74 @@ export namespace cat {
|
|||||||
this.anti_vox = source["anti_vox"];
|
this.anti_vox = source["anti_vox"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class KenwoodTXState {
|
||||||
|
available: boolean;
|
||||||
|
model?: string;
|
||||||
|
elecraft: boolean;
|
||||||
|
mode?: string;
|
||||||
|
transmitting: boolean;
|
||||||
|
split: boolean;
|
||||||
|
split_tx_hz: number;
|
||||||
|
s_meter: number;
|
||||||
|
s_meter_raw: number;
|
||||||
|
power_meter: number;
|
||||||
|
swr: number;
|
||||||
|
swr_raw: number;
|
||||||
|
rf_power: number;
|
||||||
|
af_gain: number;
|
||||||
|
rf_gain: number;
|
||||||
|
mic_gain: number;
|
||||||
|
squelch: number;
|
||||||
|
preamp: boolean;
|
||||||
|
att: boolean;
|
||||||
|
nb: boolean;
|
||||||
|
nr: boolean;
|
||||||
|
agc?: string;
|
||||||
|
filter_hz: number;
|
||||||
|
antenna: number;
|
||||||
|
rit: boolean;
|
||||||
|
xit: boolean;
|
||||||
|
rit_offset: number;
|
||||||
|
key_speed: number;
|
||||||
|
meters_provisional: boolean;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new KenwoodTXState(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.available = source["available"];
|
||||||
|
this.model = source["model"];
|
||||||
|
this.elecraft = source["elecraft"];
|
||||||
|
this.mode = source["mode"];
|
||||||
|
this.transmitting = source["transmitting"];
|
||||||
|
this.split = source["split"];
|
||||||
|
this.split_tx_hz = source["split_tx_hz"];
|
||||||
|
this.s_meter = source["s_meter"];
|
||||||
|
this.s_meter_raw = source["s_meter_raw"];
|
||||||
|
this.power_meter = source["power_meter"];
|
||||||
|
this.swr = source["swr"];
|
||||||
|
this.swr_raw = source["swr_raw"];
|
||||||
|
this.rf_power = source["rf_power"];
|
||||||
|
this.af_gain = source["af_gain"];
|
||||||
|
this.rf_gain = source["rf_gain"];
|
||||||
|
this.mic_gain = source["mic_gain"];
|
||||||
|
this.squelch = source["squelch"];
|
||||||
|
this.preamp = source["preamp"];
|
||||||
|
this.att = source["att"];
|
||||||
|
this.nb = source["nb"];
|
||||||
|
this.nr = source["nr"];
|
||||||
|
this.agc = source["agc"];
|
||||||
|
this.filter_hz = source["filter_hz"];
|
||||||
|
this.antenna = source["antenna"];
|
||||||
|
this.rit = source["rit"];
|
||||||
|
this.xit = source["xit"];
|
||||||
|
this.rit_offset = source["rit_offset"];
|
||||||
|
this.key_speed = source["key_speed"];
|
||||||
|
this.meters_provisional = source["meters_provisional"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class RigState {
|
export class RigState {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
connected: boolean;
|
connected: boolean;
|
||||||
@@ -1142,6 +1210,76 @@ export namespace cat {
|
|||||||
this.fixed = source["fixed"];
|
this.fixed = source["fixed"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class TCIPanelState {
|
||||||
|
connected: boolean;
|
||||||
|
device?: string;
|
||||||
|
protocol?: string;
|
||||||
|
drive: number;
|
||||||
|
tune_drive: number;
|
||||||
|
mic_level: number;
|
||||||
|
tx_enabled: boolean;
|
||||||
|
tx: boolean;
|
||||||
|
tuning: boolean;
|
||||||
|
volume: number;
|
||||||
|
mute: boolean;
|
||||||
|
agc?: string;
|
||||||
|
squelch_on: boolean;
|
||||||
|
squelch: number;
|
||||||
|
nb: boolean;
|
||||||
|
nr: boolean;
|
||||||
|
anf: boolean;
|
||||||
|
apf: boolean;
|
||||||
|
filter_lo: number;
|
||||||
|
filter_hi: number;
|
||||||
|
rit: boolean;
|
||||||
|
rit_offset: number;
|
||||||
|
xit: boolean;
|
||||||
|
xit_offset: number;
|
||||||
|
lock: boolean;
|
||||||
|
split: boolean;
|
||||||
|
smeter: number;
|
||||||
|
tx_power_w: number;
|
||||||
|
tx_swr: number;
|
||||||
|
modulations?: string[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new TCIPanelState(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.connected = source["connected"];
|
||||||
|
this.device = source["device"];
|
||||||
|
this.protocol = source["protocol"];
|
||||||
|
this.drive = source["drive"];
|
||||||
|
this.tune_drive = source["tune_drive"];
|
||||||
|
this.mic_level = source["mic_level"];
|
||||||
|
this.tx_enabled = source["tx_enabled"];
|
||||||
|
this.tx = source["tx"];
|
||||||
|
this.tuning = source["tuning"];
|
||||||
|
this.volume = source["volume"];
|
||||||
|
this.mute = source["mute"];
|
||||||
|
this.agc = source["agc"];
|
||||||
|
this.squelch_on = source["squelch_on"];
|
||||||
|
this.squelch = source["squelch"];
|
||||||
|
this.nb = source["nb"];
|
||||||
|
this.nr = source["nr"];
|
||||||
|
this.anf = source["anf"];
|
||||||
|
this.apf = source["apf"];
|
||||||
|
this.filter_lo = source["filter_lo"];
|
||||||
|
this.filter_hi = source["filter_hi"];
|
||||||
|
this.rit = source["rit"];
|
||||||
|
this.rit_offset = source["rit_offset"];
|
||||||
|
this.xit = source["xit"];
|
||||||
|
this.xit_offset = source["xit_offset"];
|
||||||
|
this.lock = source["lock"];
|
||||||
|
this.split = source["split"];
|
||||||
|
this.smeter = source["smeter"];
|
||||||
|
this.tx_power_w = source["tx_power_w"];
|
||||||
|
this.tx_swr = source["tx_swr"];
|
||||||
|
this.modulations = source["modulations"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class YaesuTXState {
|
export class YaesuTXState {
|
||||||
available: boolean;
|
available: boolean;
|
||||||
model?: string;
|
model?: string;
|
||||||
@@ -1154,12 +1292,15 @@ export namespace cat {
|
|||||||
power_meter: number;
|
power_meter: number;
|
||||||
swr_meter: number;
|
swr_meter: number;
|
||||||
rf_power: number;
|
rf_power: number;
|
||||||
|
max_power: number;
|
||||||
|
narrow_supported: boolean;
|
||||||
mic_gain: number;
|
mic_gain: number;
|
||||||
af_gain: number;
|
af_gain: number;
|
||||||
rf_gain: number;
|
rf_gain: number;
|
||||||
squelch: number;
|
squelch: number;
|
||||||
agc?: string;
|
agc?: string;
|
||||||
preamp: number;
|
preamp: number;
|
||||||
|
antenna: number;
|
||||||
att: number;
|
att: number;
|
||||||
nb: boolean;
|
nb: boolean;
|
||||||
nr: boolean;
|
nr: boolean;
|
||||||
@@ -1188,12 +1329,15 @@ export namespace cat {
|
|||||||
this.power_meter = source["power_meter"];
|
this.power_meter = source["power_meter"];
|
||||||
this.swr_meter = source["swr_meter"];
|
this.swr_meter = source["swr_meter"];
|
||||||
this.rf_power = source["rf_power"];
|
this.rf_power = source["rf_power"];
|
||||||
|
this.max_power = source["max_power"];
|
||||||
|
this.narrow_supported = source["narrow_supported"];
|
||||||
this.mic_gain = source["mic_gain"];
|
this.mic_gain = source["mic_gain"];
|
||||||
this.af_gain = source["af_gain"];
|
this.af_gain = source["af_gain"];
|
||||||
this.rf_gain = source["rf_gain"];
|
this.rf_gain = source["rf_gain"];
|
||||||
this.squelch = source["squelch"];
|
this.squelch = source["squelch"];
|
||||||
this.agc = source["agc"];
|
this.agc = source["agc"];
|
||||||
this.preamp = source["preamp"];
|
this.preamp = source["preamp"];
|
||||||
|
this.antenna = source["antenna"];
|
||||||
this.att = source["att"];
|
this.att = source["att"];
|
||||||
this.nb = source["nb"];
|
this.nb = source["nb"];
|
||||||
this.nr = source["nr"];
|
this.nr = source["nr"];
|
||||||
@@ -1367,6 +1511,7 @@ export namespace extsvc {
|
|||||||
hrdlog: ServiceConfig;
|
hrdlog: ServiceConfig;
|
||||||
eqsl: ServiceConfig;
|
eqsl: ServiceConfig;
|
||||||
cloudlog: ServiceConfig;
|
cloudlog: ServiceConfig;
|
||||||
|
hamlog: ServiceConfig;
|
||||||
delete_remote: boolean;
|
delete_remote: boolean;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
@@ -1381,6 +1526,7 @@ export namespace extsvc {
|
|||||||
this.hrdlog = this.convertValues(source["hrdlog"], ServiceConfig);
|
this.hrdlog = this.convertValues(source["hrdlog"], ServiceConfig);
|
||||||
this.eqsl = this.convertValues(source["eqsl"], ServiceConfig);
|
this.eqsl = this.convertValues(source["eqsl"], ServiceConfig);
|
||||||
this.cloudlog = this.convertValues(source["cloudlog"], ServiceConfig);
|
this.cloudlog = this.convertValues(source["cloudlog"], ServiceConfig);
|
||||||
|
this.hamlog = this.convertValues(source["hamlog"], ServiceConfig);
|
||||||
this.delete_remote = source["delete_remote"];
|
this.delete_remote = source["delete_remote"];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1424,6 +1570,51 @@ export namespace extsvc {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export namespace kpa {
|
||||||
|
|
||||||
|
export class Status {
|
||||||
|
connected: boolean;
|
||||||
|
transport: string;
|
||||||
|
model?: string;
|
||||||
|
last_error?: string;
|
||||||
|
power_on: boolean;
|
||||||
|
operate: boolean;
|
||||||
|
fwd_w: number;
|
||||||
|
swr: number;
|
||||||
|
volt_v: number;
|
||||||
|
cur_a: number;
|
||||||
|
temp_c: number;
|
||||||
|
band?: string;
|
||||||
|
tuning: boolean;
|
||||||
|
fault_code: number;
|
||||||
|
fault_text?: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Status(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.connected = source["connected"];
|
||||||
|
this.transport = source["transport"];
|
||||||
|
this.model = source["model"];
|
||||||
|
this.last_error = source["last_error"];
|
||||||
|
this.power_on = source["power_on"];
|
||||||
|
this.operate = source["operate"];
|
||||||
|
this.fwd_w = source["fwd_w"];
|
||||||
|
this.swr = source["swr"];
|
||||||
|
this.volt_v = source["volt_v"];
|
||||||
|
this.cur_a = source["cur_a"];
|
||||||
|
this.temp_c = source["temp_c"];
|
||||||
|
this.band = source["band"];
|
||||||
|
this.tuning = source["tuning"];
|
||||||
|
this.fault_code = source["fault_code"];
|
||||||
|
this.fault_text = source["fault_text"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
export namespace lookup {
|
export namespace lookup {
|
||||||
|
|
||||||
export class Result {
|
export class Result {
|
||||||
@@ -1625,6 +1816,7 @@ export namespace main {
|
|||||||
pgxl?: powergenius.Status;
|
pgxl?: powergenius.Status;
|
||||||
spe?: spe.Status;
|
spe?: spe.Status;
|
||||||
acom?: acom.Status;
|
acom?: acom.Status;
|
||||||
|
kpa?: kpa.Status;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new AmpStatus(source);
|
return new AmpStatus(source);
|
||||||
@@ -1638,6 +1830,7 @@ export namespace main {
|
|||||||
this.pgxl = this.convertValues(source["pgxl"], powergenius.Status);
|
this.pgxl = this.convertValues(source["pgxl"], powergenius.Status);
|
||||||
this.spe = this.convertValues(source["spe"], spe.Status);
|
this.spe = this.convertValues(source["spe"], spe.Status);
|
||||||
this.acom = this.convertValues(source["acom"], acom.Status);
|
this.acom = this.convertValues(source["acom"], acom.Status);
|
||||||
|
this.kpa = this.convertValues(source["kpa"], kpa.Status);
|
||||||
}
|
}
|
||||||
|
|
||||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||||
@@ -1662,6 +1855,8 @@ export namespace main {
|
|||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
host: string;
|
host: string;
|
||||||
password: string;
|
password: string;
|
||||||
|
use_for_my_antenna: boolean;
|
||||||
|
ant1_port: number;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new AntGeniusSettings(source);
|
return new AntGeniusSettings(source);
|
||||||
@@ -1672,6 +1867,8 @@ export namespace main {
|
|||||||
this.enabled = source["enabled"];
|
this.enabled = source["enabled"];
|
||||||
this.host = source["host"];
|
this.host = source["host"];
|
||||||
this.password = source["password"];
|
this.password = source["password"];
|
||||||
|
this.use_for_my_antenna = source["use_for_my_antenna"];
|
||||||
|
this.ant1_port = source["ant1_port"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class AudioSettings {
|
export class AudioSettings {
|
||||||
@@ -2072,6 +2269,7 @@ export namespace main {
|
|||||||
yaesu_baud: number;
|
yaesu_baud: number;
|
||||||
kenwood_host: string;
|
kenwood_host: string;
|
||||||
kenwood_port: string;
|
kenwood_port: string;
|
||||||
|
kenwood_link: string;
|
||||||
kenwood_baud: number;
|
kenwood_baud: number;
|
||||||
kenwood_data_mode: string;
|
kenwood_data_mode: string;
|
||||||
yaesu_low_lines: boolean;
|
yaesu_low_lines: boolean;
|
||||||
@@ -2123,6 +2321,7 @@ export namespace main {
|
|||||||
this.yaesu_baud = source["yaesu_baud"];
|
this.yaesu_baud = source["yaesu_baud"];
|
||||||
this.kenwood_host = source["kenwood_host"];
|
this.kenwood_host = source["kenwood_host"];
|
||||||
this.kenwood_port = source["kenwood_port"];
|
this.kenwood_port = source["kenwood_port"];
|
||||||
|
this.kenwood_link = source["kenwood_link"];
|
||||||
this.kenwood_baud = source["kenwood_baud"];
|
this.kenwood_baud = source["kenwood_baud"];
|
||||||
this.kenwood_data_mode = source["kenwood_data_mode"];
|
this.kenwood_data_mode = source["kenwood_data_mode"];
|
||||||
this.yaesu_low_lines = source["yaesu_low_lines"];
|
this.yaesu_low_lines = source["yaesu_low_lines"];
|
||||||
@@ -2295,6 +2494,24 @@ export namespace main {
|
|||||||
this.count = source["count"];
|
this.count = source["count"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class CompactResult {
|
||||||
|
path: string;
|
||||||
|
backend: string;
|
||||||
|
before: number;
|
||||||
|
after: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new CompactResult(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.path = source["path"];
|
||||||
|
this.backend = source["backend"];
|
||||||
|
this.before = source["before"];
|
||||||
|
this.after = source["after"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class ContestBandRow {
|
export class ContestBandRow {
|
||||||
band: string;
|
band: string;
|
||||||
count: number;
|
count: number;
|
||||||
@@ -2515,6 +2732,24 @@ export namespace main {
|
|||||||
this.body = source["body"];
|
this.body = source["body"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class FlexRSTChase {
|
||||||
|
enabled: boolean;
|
||||||
|
markers: string;
|
||||||
|
offset_hz: number;
|
||||||
|
split_only: boolean;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new FlexRSTChase(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.markers = source["markers"];
|
||||||
|
this.offset_hz = source["offset_hz"];
|
||||||
|
this.split_only = source["split_only"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class FlexZoomSettings {
|
export class FlexZoomSettings {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
cw_khz: number;
|
cw_khz: number;
|
||||||
@@ -2677,6 +2912,28 @@ export namespace main {
|
|||||||
return a;
|
return a;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class HamlogCfmResult {
|
||||||
|
total: number;
|
||||||
|
confirmed: number;
|
||||||
|
matched: number;
|
||||||
|
by_class: number;
|
||||||
|
unmatched: number;
|
||||||
|
samples: string[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new HamlogCfmResult(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.total = source["total"];
|
||||||
|
this.confirmed = source["confirmed"];
|
||||||
|
this.matched = source["matched"];
|
||||||
|
this.by_class = source["by_class"];
|
||||||
|
this.unmatched = source["unmatched"];
|
||||||
|
this.samples = source["samples"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class ModePreset {
|
export class ModePreset {
|
||||||
name: string;
|
name: string;
|
||||||
default_rst_sent?: string;
|
default_rst_sent?: string;
|
||||||
@@ -2699,6 +2956,7 @@ export namespace main {
|
|||||||
rst_phone: string[];
|
rst_phone: string[];
|
||||||
rst_cw: string[];
|
rst_cw: string[];
|
||||||
rst_digital: string[];
|
rst_digital: string[];
|
||||||
|
satellites: string[];
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new ListsSettings(source);
|
return new ListsSettings(source);
|
||||||
@@ -2711,6 +2969,7 @@ export namespace main {
|
|||||||
this.rst_phone = source["rst_phone"];
|
this.rst_phone = source["rst_phone"];
|
||||||
this.rst_cw = source["rst_cw"];
|
this.rst_cw = source["rst_cw"];
|
||||||
this.rst_digital = source["rst_digital"];
|
this.rst_digital = source["rst_digital"];
|
||||||
|
this.satellites = source["satellites"];
|
||||||
}
|
}
|
||||||
|
|
||||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||||
@@ -3010,6 +3269,8 @@ export namespace main {
|
|||||||
hrdlog_status: string;
|
hrdlog_status: string;
|
||||||
qrzcom_status: string;
|
qrzcom_status: string;
|
||||||
qrzcom_confirmed: string;
|
qrzcom_confirmed: string;
|
||||||
|
hamlog_status: string;
|
||||||
|
hamlog_confirmed: string;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new QSLDefaults(source);
|
return new QSLDefaults(source);
|
||||||
@@ -3027,6 +3288,8 @@ export namespace main {
|
|||||||
this.hrdlog_status = source["hrdlog_status"];
|
this.hrdlog_status = source["hrdlog_status"];
|
||||||
this.qrzcom_status = source["qrzcom_status"];
|
this.qrzcom_status = source["qrzcom_status"];
|
||||||
this.qrzcom_confirmed = source["qrzcom_confirmed"];
|
this.qrzcom_confirmed = source["qrzcom_confirmed"];
|
||||||
|
this.hamlog_status = source["hamlog_status"];
|
||||||
|
this.hamlog_confirmed = source["hamlog_confirmed"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class QSLEmailTemplates {
|
export class QSLEmailTemplates {
|
||||||
@@ -3203,6 +3466,109 @@ export namespace main {
|
|||||||
this.team_last60 = source["team_last60"];
|
this.team_last60 = source["team_last60"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class RDAApplyResult {
|
||||||
|
applied: number;
|
||||||
|
failed: number;
|
||||||
|
message: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new RDAApplyResult(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.applied = source["applied"];
|
||||||
|
this.failed = source["failed"];
|
||||||
|
this.message = source["message"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class RDAChoice {
|
||||||
|
qso_id: number;
|
||||||
|
district: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new RDAChoice(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.qso_id = source["qso_id"];
|
||||||
|
this.district = source["district"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class RDAConflict {
|
||||||
|
qso_id: number;
|
||||||
|
callsign: string;
|
||||||
|
date: string;
|
||||||
|
band: string;
|
||||||
|
mode: string;
|
||||||
|
from_log: string;
|
||||||
|
from_db: string;
|
||||||
|
dated: boolean;
|
||||||
|
confirmed: boolean;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new RDAConflict(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.qso_id = source["qso_id"];
|
||||||
|
this.callsign = source["callsign"];
|
||||||
|
this.date = source["date"];
|
||||||
|
this.band = source["band"];
|
||||||
|
this.mode = source["mode"];
|
||||||
|
this.from_log = source["from_log"];
|
||||||
|
this.from_db = source["from_db"];
|
||||||
|
this.dated = source["dated"];
|
||||||
|
this.confirmed = source["confirmed"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class RDACompareResult {
|
||||||
|
scanned: number;
|
||||||
|
both_known: number;
|
||||||
|
agree: number;
|
||||||
|
disagree: number;
|
||||||
|
only_log: number;
|
||||||
|
only_db: number;
|
||||||
|
neither: number;
|
||||||
|
conflicts: RDAConflict[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new RDACompareResult(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.scanned = source["scanned"];
|
||||||
|
this.both_known = source["both_known"];
|
||||||
|
this.agree = source["agree"];
|
||||||
|
this.disagree = source["disagree"];
|
||||||
|
this.only_log = source["only_log"];
|
||||||
|
this.only_db = source["only_db"];
|
||||||
|
this.neither = source["neither"];
|
||||||
|
this.conflicts = this.convertValues(source["conflicts"], RDAConflict);
|
||||||
|
}
|
||||||
|
|
||||||
|
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||||
|
if (!a) {
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
if (a.slice && a.map) {
|
||||||
|
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||||
|
} else if ("object" === typeof a) {
|
||||||
|
if (asMap) {
|
||||||
|
for (const key of Object.keys(a)) {
|
||||||
|
a[key] = new classs(a[key]);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
return new classs(a);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export class RelayAutoRule {
|
export class RelayAutoRule {
|
||||||
device_id: string;
|
device_id: string;
|
||||||
relay: number;
|
relay: number;
|
||||||
@@ -3445,6 +3811,7 @@ export namespace main {
|
|||||||
export class SpotColor {
|
export class SpotColor {
|
||||||
text: string;
|
text: string;
|
||||||
bg?: string;
|
bg?: string;
|
||||||
|
hide?: boolean;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new SpotColor(source);
|
return new SpotColor(source);
|
||||||
@@ -3454,6 +3821,7 @@ export namespace main {
|
|||||||
if ('string' === typeof source) source = JSON.parse(source);
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
this.text = source["text"];
|
this.text = source["text"];
|
||||||
this.bg = source["bg"];
|
this.bg = source["bg"];
|
||||||
|
this.hide = source["hide"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class SpotColors {
|
export class SpotColors {
|
||||||
|
|||||||
@@ -0,0 +1,64 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The build gate is only as good as the moments it runs at.
|
||||||
|
//
|
||||||
|
// It used to run at startup alone, on the profile active then — and a fresh
|
||||||
|
// install has NO callsign at that point. The operator typed theirs afterwards,
|
||||||
|
// so a denied call ran for the whole session and reached the telemetry, which
|
||||||
|
// reads the very same field. Every place that can make a denied callsign the
|
||||||
|
// ACTIVE one has to re-ask.
|
||||||
|
func TestCallGateRunsWhereverTheActiveCallsignChanges(t *testing.T) {
|
||||||
|
src, err := os.ReadFile("app.go")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for _, fn := range []string{
|
||||||
|
"func (a *App) startup(ctx context.Context) {", // launch
|
||||||
|
"func (a *App) SaveStationSettings(s StationSettings) error {", // the call is entered here
|
||||||
|
"func (a *App) SaveProfile(p profile.Profile) (profile.Profile, error) {",
|
||||||
|
"func (a *App) ActivateProfile(id int64) error {",
|
||||||
|
} {
|
||||||
|
body := funcBody(t, string(src), fn)
|
||||||
|
if !strings.Contains(body, "enforceCallGate(") {
|
||||||
|
t.Errorf("%s can change the active callsign but never re-checks the gate", fn)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The hashes are the whole mechanism: a truncated or re-cased entry silently
|
||||||
|
// matches nothing, and nothing in the running program would ever say so.
|
||||||
|
func TestDeniedCallHashesAreWellFormed(t *testing.T) {
|
||||||
|
if len(deniedCallHashes) == 0 {
|
||||||
|
t.Fatal("the deny list is empty — the gate has stopped gating")
|
||||||
|
}
|
||||||
|
for h := range deniedCallHashes {
|
||||||
|
if len(h) != 64 {
|
||||||
|
t.Errorf("hash %q is %d chars, want 64", h, len(h))
|
||||||
|
}
|
||||||
|
if h != strings.ToLower(h) {
|
||||||
|
t.Errorf("hash %q is not lower-case, so it can never match", h)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A slashed call must reduce to the real one, or /P is a way round the gate.
|
||||||
|
func TestDenyBaseCall(t *testing.T) {
|
||||||
|
for in, want := range map[string]string{
|
||||||
|
"f4xyz": "F4XYZ",
|
||||||
|
" F4XYZ ": "F4XYZ",
|
||||||
|
"F4XYZ/P": "F4XYZ",
|
||||||
|
"TM/F4XYZ": "F4XYZ",
|
||||||
|
"F4XYZ/MM": "F4XYZ",
|
||||||
|
"": "",
|
||||||
|
} {
|
||||||
|
if got := denyBaseCall(in); got != want {
|
||||||
|
t.Errorf("denyBaseCall(%q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+264
@@ -0,0 +1,264 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Reading confirmations back from a HAMLOG.online ADIF export.
|
||||||
|
//
|
||||||
|
// Their agent protocol only uploads — it has no verb for asking what has been
|
||||||
|
// confirmed — so the return path is a file: their site exports an ADIF, and the
|
||||||
|
// operator feeds it back here.
|
||||||
|
//
|
||||||
|
// That file must NOT be imported the ordinary way. A plain import matches a
|
||||||
|
// record to a local QSO on callsign + UTC MINUTE + band + mode, and their
|
||||||
|
// export is rebuilt from their own database: a minute of rounding, SSB where
|
||||||
|
// the log says USB, and the key no longer matches. "Update duplicates" then
|
||||||
|
// does what it is told — no duplicate found, so it inserts — and a few hundred
|
||||||
|
// copies of contacts the operator already had land in the log. That is exactly
|
||||||
|
// what happened once, and it is why this path exists instead.
|
||||||
|
//
|
||||||
|
// So: match only, never insert. Confirmations are stamped onto the QSOs already
|
||||||
|
// in the log, and anything that cannot be matched is REPORTED rather than
|
||||||
|
// added, because an unmatched confirmation is a question about the log (a
|
||||||
|
// minute off, a portable call) and not a contact to create.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
|
||||||
|
|
||||||
|
"hamlog/internal/adif"
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/award"
|
||||||
|
"hamlog/internal/qso"
|
||||||
|
)
|
||||||
|
|
||||||
|
// hamlogUnmatchedMax bounds what is kept for export. A whole log's worth of
|
||||||
|
// unmatched records means the file belongs to another station, not that the
|
||||||
|
// operator wants 50 000 of them written back out.
|
||||||
|
const hamlogUnmatchedMax = 20000
|
||||||
|
|
||||||
|
// HamlogCfmResult is what the import did.
|
||||||
|
type HamlogCfmResult struct {
|
||||||
|
Total int `json:"total"` // records read from the file
|
||||||
|
Confirmed int `json:"confirmed"` // records carrying HAMLOG's confirmation flag
|
||||||
|
Matched int `json:"matched"` // local QSOs stamped
|
||||||
|
ByClass int `json:"by_class"` // matched on mode CLASS rather than exact mode
|
||||||
|
Unmatched int `json:"unmatched"` // confirmations with no local QSO
|
||||||
|
// Samples names a few unmatched contacts, so "12 unmatched" can be looked
|
||||||
|
// into rather than merely worried about. The full list is kept for export —
|
||||||
|
// see ExportHamlogUnmatched — because 395 of them is not a sample-sized
|
||||||
|
// problem: it is a list to work through.
|
||||||
|
Samples []string `json:"samples"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// hamlogCfmSamples caps the reported list — enough to see the pattern, not so
|
||||||
|
// many that the dialog becomes a log file.
|
||||||
|
const hamlogCfmSamples = 30
|
||||||
|
|
||||||
|
// ImportHamlogConfirmations stamps the confirmations from a HAMLOG.online ADIF
|
||||||
|
// export onto the matching local QSOs. It inserts nothing.
|
||||||
|
func (a *App) ImportHamlogConfirmations(path string) (HamlogCfmResult, error) {
|
||||||
|
var res HamlogCfmResult
|
||||||
|
if a.qso == nil {
|
||||||
|
return res, fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(path) == "" {
|
||||||
|
return res, fmt.Errorf("empty path")
|
||||||
|
}
|
||||||
|
f, err := os.Open(path)
|
||||||
|
if err != nil {
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
|
||||||
|
ctx := a.ctx
|
||||||
|
if ctx == nil {
|
||||||
|
ctx = context.Background()
|
||||||
|
}
|
||||||
|
// The same two indexes the LoTW download uses: the exact key, then the
|
||||||
|
// mode-CLASS key for the contacts whose mode was written differently at the
|
||||||
|
// other end (FT8 exported as DATA, SSB where the log says USB).
|
||||||
|
keyIDs, err := a.qso.DedupeKeyIDs(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return res, fmt.Errorf("read local log: %w", err)
|
||||||
|
}
|
||||||
|
classIDs, _ := a.qso.DedupeClassKeyIDs(ctx)
|
||||||
|
|
||||||
|
emit := func(line string) {
|
||||||
|
if a.ctx != nil {
|
||||||
|
wruntime.EventsEmit(a.ctx, "qslmgr:log", line)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
emit("Reading " + path + "…")
|
||||||
|
|
||||||
|
// What already counts towards an award, so each confirmation can be flagged
|
||||||
|
// NEW. LoTW and paper QSL are the two award-valid sources; a HAMLOG
|
||||||
|
// confirmation is "new" when it lands on a slot neither of them holds — which
|
||||||
|
// is the only sense in which it changes anything.
|
||||||
|
sets, _ := a.qso.ConfirmedSlots(ctx, []string{"lotw_rcvd", "qsl_rcvd"})
|
||||||
|
var items []ConfirmationItem
|
||||||
|
var unmatched []qso.QSO
|
||||||
|
|
||||||
|
perr := adif.Parse(f, func(rec adif.Record) error {
|
||||||
|
q, ok := adif.RecordToQSO(rec)
|
||||||
|
if !ok {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
res.Total++
|
||||||
|
// Only the records they actually confirmed. The export carries the whole
|
||||||
|
// log, and stamping "confirmed" on all of it would turn every uploaded
|
||||||
|
// contact into a confirmed one.
|
||||||
|
if !hamlogRecordConfirmed(rec) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
res.Confirmed++
|
||||||
|
|
||||||
|
minute := q.QSODate.UTC().Format("2006-01-02T15:04")
|
||||||
|
id, found := keyIDs[qso.DedupeKey(q.Callsign, minute, q.Band, q.Mode)]
|
||||||
|
if !found {
|
||||||
|
// id 0 means the class key is ambiguous — several local QSOs share
|
||||||
|
// it — and guessing between them would stamp the wrong one.
|
||||||
|
if cid, ok := classIDs[qso.DedupeClassKey(q.Callsign, minute, q.Band, q.Mode)]; ok && cid != 0 {
|
||||||
|
id, found = cid, true
|
||||||
|
res.ByClass++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
res.Unmatched++
|
||||||
|
if len(res.Samples) < hamlogCfmSamples {
|
||||||
|
res.Samples = append(res.Samples, fmt.Sprintf("%s · %s · %s · %s",
|
||||||
|
q.Callsign, q.QSODate.UTC().Format("2006-01-02 15:04Z"), q.Band, q.Mode))
|
||||||
|
}
|
||||||
|
if len(unmatched) < hamlogUnmatchedMax {
|
||||||
|
unmatched = append(unmatched, q)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
date := hamlogCfmDate(rec)
|
||||||
|
if e := a.qso.SetExtra(ctx, id, award.HamlogQSLKey, "Y"); e != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
_ = a.qso.SetExtra(ctx, id, hamlogQSLDateKey, date)
|
||||||
|
// A confirmed contact is by definition one they hold, so the sent side
|
||||||
|
// is true whether or not OpsLog is what uploaded it — a log uploaded
|
||||||
|
// from their website would otherwise read "never sent, yet confirmed".
|
||||||
|
_ = a.qso.SetExtra(ctx, id, hamlogSentKey, "Y")
|
||||||
|
res.Matched++
|
||||||
|
|
||||||
|
// Feed the Results view, the same rows the LoTW download produces: an
|
||||||
|
// import that only prints counts leaves the operator with no way to see
|
||||||
|
// WHICH contacts were confirmed, which is the reason they ran it.
|
||||||
|
a.enrichContactedFromCty(&q) // country/dxcc, for the entity flags
|
||||||
|
it := ConfirmationItem{
|
||||||
|
Callsign: q.Callsign,
|
||||||
|
QSODate: q.QSODate.UTC().Format(time.RFC3339),
|
||||||
|
Band: q.Band,
|
||||||
|
Mode: q.Mode,
|
||||||
|
Country: q.Country,
|
||||||
|
}
|
||||||
|
if q.DXCC != nil && *q.DXCC != 0 {
|
||||||
|
n := *q.DXCC
|
||||||
|
it.NewDXCC = !sets.DXCC[n]
|
||||||
|
it.NewBand = !sets.Band[qso.BandKey(n, q.Band)]
|
||||||
|
it.NewMode = !sets.Mode[qso.ModeClassKey(n, q.Mode)]
|
||||||
|
it.NewSlot = !sets.Slot[qso.SlotClassKey(n, q.Band, q.Mode)]
|
||||||
|
// Fold it in, so a repeat inside the same file isn't flagged twice.
|
||||||
|
sets.DXCC[n] = true
|
||||||
|
sets.Band[qso.BandKey(n, q.Band)] = true
|
||||||
|
sets.Mode[qso.ModeClassKey(n, q.Mode)] = true
|
||||||
|
sets.Slot[qso.SlotClassKey(n, q.Band, q.Mode)] = true
|
||||||
|
}
|
||||||
|
items = append(items, it)
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
if perr != nil {
|
||||||
|
return res, perr
|
||||||
|
}
|
||||||
|
a.invalidateAwardStats() // confirmations move award counts
|
||||||
|
// Kept for ExportHamlogUnmatched. Held rather than written now: the operator
|
||||||
|
// decides whether a list of 395 is worth a file.
|
||||||
|
a.hamlogUnmatchedMu.Lock()
|
||||||
|
a.hamlogUnmatched = unmatched
|
||||||
|
a.hamlogUnmatchedMu.Unlock()
|
||||||
|
if a.ctx != nil {
|
||||||
|
wruntime.EventsEmit(a.ctx, "qslmgr:confirmations", items)
|
||||||
|
}
|
||||||
|
applog.Printf("hamlog cfm import: %d records, %d confirmed, %d matched (%d by mode class), %d unmatched",
|
||||||
|
res.Total, res.Confirmed, res.Matched, res.ByClass, res.Unmatched)
|
||||||
|
emit(fmt.Sprintf("%d records read, %d confirmed by HAMLOG.online, %d matched in the log (%d by mode class), %d unmatched",
|
||||||
|
res.Total, res.Confirmed, res.Matched, res.ByClass, res.Unmatched))
|
||||||
|
for _, s := range res.Samples {
|
||||||
|
emit(" unmatched: " + s)
|
||||||
|
}
|
||||||
|
if res.Unmatched > len(res.Samples) {
|
||||||
|
emit(fmt.Sprintf(" …and %d more — use \"Export unmatched (ADIF)…\" to get the whole list.",
|
||||||
|
res.Unmatched-len(res.Samples)))
|
||||||
|
}
|
||||||
|
if a.ctx != nil {
|
||||||
|
wruntime.EventsEmit(a.ctx, "qslmgr:done", map[string]any{"uploaded": res.Matched, "total": res.Confirmed})
|
||||||
|
}
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExportHamlogUnmatched writes the confirmations the last import could not
|
||||||
|
// place onto a QSO.
|
||||||
|
//
|
||||||
|
// They are the interesting half of the result: each one is a contact HAMLOG
|
||||||
|
// believes it holds and this log does not agree about — a minute of drift, a
|
||||||
|
// portable call, a band written differently, or a QSO genuinely missing. A
|
||||||
|
// count cannot be worked through; a file can be opened, sorted and compared.
|
||||||
|
//
|
||||||
|
// Written as ADIF because that is what every other tool reads, and because it
|
||||||
|
// can be handed straight back to an import once the discrepancies are settled.
|
||||||
|
func (a *App) ExportHamlogUnmatched(path string) (int, error) {
|
||||||
|
a.hamlogUnmatchedMu.Lock()
|
||||||
|
rows := a.hamlogUnmatched
|
||||||
|
a.hamlogUnmatchedMu.Unlock()
|
||||||
|
if len(rows) == 0 {
|
||||||
|
return 0, fmt.Errorf("nothing to export: the last import left no unmatched confirmations")
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(path) == "" {
|
||||||
|
return 0, fmt.Errorf("empty path")
|
||||||
|
}
|
||||||
|
recs := make([]string, 0, len(rows))
|
||||||
|
for i := range rows {
|
||||||
|
recs = append(recs, adif.FullRecordADIF(rows[i]))
|
||||||
|
}
|
||||||
|
if err := os.WriteFile(path, []byte(adif.BatchRecordsADIF(recs)), 0o644); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
applog.Printf("hamlog cfm import: exported %d unmatched confirmation(s) to %s", len(rows), path)
|
||||||
|
return len(rows), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// hamlogQSLDateKey stamps WHEN the confirmation was read back. Their export
|
||||||
|
// carries no confirmation date of its own, so this is the import date — which
|
||||||
|
// is honest about what it knows, unlike borrowing the QSO date.
|
||||||
|
const hamlogQSLDateKey = "APP_OPSLOG_HAMLOG_QSL_DATE"
|
||||||
|
|
||||||
|
// hamlogRecordConfirmed reads their flag off a raw ADIF record. The primary key
|
||||||
|
// is the one their own export writes; the alternates are the names OpsLog and
|
||||||
|
// other tools have used, so a file that went through another logger still reads.
|
||||||
|
func hamlogRecordConfirmed(rec adif.Record) bool {
|
||||||
|
keys := append([]string{award.HamlogQSLKey}, award.HamlogAltKeys()...)
|
||||||
|
for _, k := range keys {
|
||||||
|
v := strings.ToUpper(strings.TrimSpace(rec[strings.ToLower(k)]))
|
||||||
|
if v != "" && v != "N" && v != "NO" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// hamlogCfmDate is the date to stamp: the import date, in ADIF form.
|
||||||
|
func hamlogCfmDate(rec adif.Record) string {
|
||||||
|
// If a future export ever carries one, take it rather than today's date.
|
||||||
|
for _, k := range []string{"app_hamlog_qso_cfm_date", "qslrdate"} {
|
||||||
|
if v := strings.TrimSpace(rec[k]); len(v) == 8 {
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return time.Now().UTC().Format("20060102")
|
||||||
|
}
|
||||||
+18
-26
@@ -264,9 +264,18 @@ func matchWildcard(pattern, v string) bool {
|
|||||||
return re.MatchString(v)
|
return re.MatchString(v)
|
||||||
}
|
}
|
||||||
|
|
||||||
// InferMode guesses a spot's mode from its comment and frequency. Cluster spots
|
// InferMode works out a spot's mode from its comment, then from the band plan.
|
||||||
// don't carry a mode field, so we read common tags (FT8/FT4/CW/RTTY/…) then fall
|
//
|
||||||
// back to the digital watering holes and the band-plan CW/phone split.
|
// Cluster lines carry no mode field, so this is all there is — and it feeds the
|
||||||
|
// alert rules, the FlexRadio panadapter colours and the spot the radio is told
|
||||||
|
// about. It used to end with a bare "return SSB" for anything its handful of CW
|
||||||
|
// ranges did not cover, which is how a 30 m FT8 spot at 10131.5 raised an alert
|
||||||
|
// announcing SSB while the cluster list beside it said DATA.
|
||||||
|
//
|
||||||
|
// The comment still wins when it names a mode: a spotter who wrote FT8 knows
|
||||||
|
// better than any table. Below that is the shared band plan (bandplan.go), and
|
||||||
|
// below THAT is nothing — an empty mode, which callers read as "unknown" rather
|
||||||
|
// than as a claim.
|
||||||
func InferMode(comment string, freqHz int64) string {
|
func InferMode(comment string, freqHz int64) string {
|
||||||
c := strings.ToUpper(comment)
|
c := strings.ToUpper(comment)
|
||||||
switch {
|
switch {
|
||||||
@@ -280,30 +289,13 @@ func InferMode(comment string, freqHz int64) string {
|
|||||||
return "PSK"
|
return "PSK"
|
||||||
case strings.Contains(c, "JS8"):
|
case strings.Contains(c, "JS8"):
|
||||||
return "JS8"
|
return "JS8"
|
||||||
case strings.Contains(c, "CW"):
|
// WPM is as good as the word CW: nothing else is reported in words per
|
||||||
|
// minute, and RBN spots carry it on every line.
|
||||||
|
case strings.Contains(c, "CW"), strings.Contains(c, "WPM"):
|
||||||
return "CW"
|
return "CW"
|
||||||
case strings.Contains(c, "SSB") || strings.Contains(c, "USB") || strings.Contains(c, "LSB") || strings.Contains(c, "PH"):
|
case strings.Contains(c, "SSB"), strings.Contains(c, "USB"),
|
||||||
|
strings.Contains(c, "LSB"), strings.Contains(c, "PH"):
|
||||||
return "SSB"
|
return "SSB"
|
||||||
}
|
}
|
||||||
khz := float64(freqHz) / 1000
|
return modeFromFrequency(freqHz)
|
||||||
// FT8 watering holes (…074) and FT4 (…080/…140) as a fallback.
|
|
||||||
for _, f := range []float64{1840, 3573, 7074, 10136, 14074, 18100, 21074, 24915, 28074, 50313} {
|
|
||||||
if khz >= f-1 && khz <= f+3 {
|
|
||||||
return "FT8"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Band-plan CW segments (bottom of each band).
|
|
||||||
switch {
|
|
||||||
case khz >= 1810 && khz <= 1840,
|
|
||||||
khz >= 3500 && khz <= 3570,
|
|
||||||
khz >= 7000 && khz <= 7040,
|
|
||||||
khz >= 10100 && khz <= 10130,
|
|
||||||
khz >= 14000 && khz <= 14070,
|
|
||||||
khz >= 18068 && khz <= 18095,
|
|
||||||
khz >= 21000 && khz <= 21070,
|
|
||||||
khz >= 24890 && khz <= 24910,
|
|
||||||
khz >= 28000 && khz <= 28070:
|
|
||||||
return "CW"
|
|
||||||
}
|
|
||||||
return "SSB"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
package alerts
|
||||||
|
|
||||||
|
// The band plan behind InferMode, and why it is written out segment by segment.
|
||||||
|
//
|
||||||
|
// A cluster line carries no mode, so it has to be inferred — and OpsLog was
|
||||||
|
// inferring it TWICE, in two places, from two different tables. The frontend
|
||||||
|
// knew that 10.130-10.150 is the 30 m data segment; this side only knew a CW
|
||||||
|
// range that stopped at 10.130 and called everything after it SSB. So a spot at
|
||||||
|
// 10131.5 showed as DATA in the cluster list and raised an alert saying SSB.
|
||||||
|
// Reported with a screenshot of exactly that, on RI1FJL.
|
||||||
|
//
|
||||||
|
// The two tables are now the same table, transcribed from the frontend's
|
||||||
|
// (frontend/src/lib/spot.ts) with its segment boundaries kept intact. They stay
|
||||||
|
// two files because they are two languages, and the test next door is what
|
||||||
|
// keeps them one answer.
|
||||||
|
|
||||||
|
// modeSeg is one stretch of a band, in Hz, and what is worked there.
|
||||||
|
type modeSeg struct {
|
||||||
|
loHz, hiHz int64
|
||||||
|
mode string
|
||||||
|
}
|
||||||
|
|
||||||
|
// bandPlan is scanned IN ORDER, so a narrow watering hole listed before the
|
||||||
|
// wide segment it sits inside wins — FT8 at 14.074 before the 14.070-14.100
|
||||||
|
// data block. Order is the whole mechanism here; sorting this table by
|
||||||
|
// frequency would quietly turn every FT8 hole into "DATA".
|
||||||
|
var bandPlan = []modeSeg{
|
||||||
|
{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_580_000, 3_600_000, "DATA"}, {3_600_000, 4_000_000, "SSB"},
|
||||||
|
|
||||||
|
{5_300_000, 5_500_000, "SSB"},
|
||||||
|
|
||||||
|
{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"},
|
||||||
|
|
||||||
|
// 30 m: CW to 10.130, data above it — and nothing else. No SSB on this band.
|
||||||
|
{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_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_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_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_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_000_000, 28_070_000, "CW"}, {28_070_000, 28_300_000, "DATA"}, {28_300_000, 29_700_000, "SSB"},
|
||||||
|
|
||||||
|
{50_313_000, 50_316_000, "FT8"}, {50_318_000, 50_321_000, "FT4"},
|
||||||
|
{50_000_000, 50_100_000, "CW"}, {50_100_000, 50_500_000, "SSB"},
|
||||||
|
|
||||||
|
{144_174_000, 144_177_000, "FT8"},
|
||||||
|
{144_000_000, 144_150_000, "CW"}, {144_150_000, 144_500_000, "SSB"},
|
||||||
|
}
|
||||||
|
|
||||||
|
// modeFromFrequency returns what the band plan says is worked at freqHz, or ""
|
||||||
|
// where it says nothing.
|
||||||
|
//
|
||||||
|
// Empty rather than a guess: a spot outside every listed segment is on a band
|
||||||
|
// this table does not cover, and answering "SSB" for it is how a 30 m data spot
|
||||||
|
// came to raise an SSB alert.
|
||||||
|
func modeFromFrequency(freqHz int64) string {
|
||||||
|
for _, s := range bandPlan {
|
||||||
|
if freqHz >= s.loHz && freqHz < s.hiHz {
|
||||||
|
return s.mode
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
package alerts
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The spot that started it: RI1FJL on 10131.5, an FT8 station in the 30 m data
|
||||||
|
// segment. The cluster list showed DATA and the alert announced SSB, because
|
||||||
|
// this side's table stopped its CW range at 10.130 and called everything above
|
||||||
|
// it phone.
|
||||||
|
func TestInferModeDoesNotCallThirtyMetresSSB(t *testing.T) {
|
||||||
|
if got := InferMode("", 10_131_500); got != "DATA" {
|
||||||
|
t.Errorf("10131.5 kHz → %q, want DATA (there is no SSB on 30 m)", got)
|
||||||
|
}
|
||||||
|
// And the CW half of the same band still reads as CW.
|
||||||
|
if got := InferMode("", 10_110_000); got != "CW" {
|
||||||
|
t.Errorf("10110 kHz → %q, want CW", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The comment beats the band plan. A spotter who names the mode knows something
|
||||||
|
// no table does — an FT8 station calling outside the usual watering hole, a CW
|
||||||
|
// operation in a data segment during a contest.
|
||||||
|
func TestInferModeTrustsTheCommentFirst(t *testing.T) {
|
||||||
|
cases := map[string]struct {
|
||||||
|
comment string
|
||||||
|
freqHz int64
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
"FT8 said outright": {"-14 dB FT8", 14_200_000, "FT8"},
|
||||||
|
"CW in a data segment": {"CW 599", 14_080_000, "CW"},
|
||||||
|
"RBN reports WPM not CW": {"18 dB 25 WPM CQ", 14_080_000, "CW"},
|
||||||
|
"phone below the split": {"SSB net", 7_010_000, "SSB"},
|
||||||
|
}
|
||||||
|
for name, c := range cases {
|
||||||
|
t.Run(name, func(t *testing.T) {
|
||||||
|
if got := InferMode(c.comment, c.freqHz); got != c.want {
|
||||||
|
t.Errorf("InferMode(%q, %d) = %q, want %q", c.comment, c.freqHz, got, c.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The watering holes are listed before the wide data blocks they sit inside, and
|
||||||
|
// the table is scanned in order — so sorting it by frequency would quietly turn
|
||||||
|
// every FT8 hole into "DATA". This is what would fail if somebody did.
|
||||||
|
func TestBandPlanKeepsTheWateringHolesAheadOfTheDataBlocks(t *testing.T) {
|
||||||
|
holes := map[int64]string{
|
||||||
|
3_573_500: "FT8",
|
||||||
|
7_074_500: "FT8",
|
||||||
|
7_048_000: "FT4",
|
||||||
|
14_074_500: "FT8",
|
||||||
|
14_080_500: "FT4",
|
||||||
|
21_074_500: "FT8",
|
||||||
|
28_074_500: "FT8",
|
||||||
|
50_313_500: "FT8",
|
||||||
|
}
|
||||||
|
for hz, want := range holes {
|
||||||
|
if got := modeFromFrequency(hz); got != want {
|
||||||
|
t.Errorf("%d Hz → %q, want %q", hz, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Nothing is claimed for a frequency the plan does not cover. Answering "SSB"
|
||||||
|
// for whatever fell through is the exact fault this file exists to fix.
|
||||||
|
func TestModeFromFrequencyIsSilentWhenItDoesNotKnow(t *testing.T) {
|
||||||
|
for _, hz := range []int64{500_000, 6_000_000, 70_200_000, 432_100_000} {
|
||||||
|
if got := modeFromFrequency(hz); got != "" {
|
||||||
|
t.Errorf("%d Hz → %q, want \"\" (outside the plan)", hz, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,9 +20,15 @@ var (
|
|||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
file *os.File
|
file *os.File
|
||||||
path string
|
path string
|
||||||
|
written int64 // bytes in the CURRENT file, for the size check in Printf
|
||||||
crashFile *os.File // kept open so the runtime can write a crash traceback to it
|
crashFile *os.File // kept open so the runtime can write a crash traceback to it
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// maxLogBytes is where the file rolls over, at startup AND while running.
|
||||||
|
// A variable, not a constant, so the rotation can be exercised in a test without
|
||||||
|
// writing ten megabytes to do it.
|
||||||
|
var maxLogBytes int64 = 10 * 1024 * 1024
|
||||||
|
|
||||||
// Init opens (creates) the log file in dataDir. On rotation we truncate
|
// Init opens (creates) the log file in dataDir. On rotation we truncate
|
||||||
// at startup if the file is too big; for now it's a single file, no
|
// at startup if the file is too big; for now it's a single file, no
|
||||||
// rolling — the volume is low (a few KB per session).
|
// rolling — the volume is low (a few KB per session).
|
||||||
@@ -47,11 +53,11 @@ func Init(dataDir string) (string, error) {
|
|||||||
_ = os.Rename(oldLog, logPath)
|
_ = os.Rename(oldLog, logPath)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Rotate (don't delete) once the file grows past ~10MB: rename it to
|
// Rotate (don't delete) once the file grows past maxLogBytes: rename it to
|
||||||
// opslog.log.1 so the PREVIOUS session's log survives. Deleting it outright used
|
// opslog.log.1 so the PREVIOUS session's log survives. Deleting it outright used
|
||||||
// to erase exactly the diagnostics we needed when a user reported an issue from
|
// to erase exactly the diagnostics we needed when a user reported an issue from
|
||||||
// the session that just ended. One generation kept — enough, without unbounded growth.
|
// the session that just ended. One generation kept — enough, without unbounded growth.
|
||||||
if fi, err := os.Stat(logPath); err == nil && fi.Size() > 10*1024*1024 {
|
if fi, err := os.Stat(logPath); err == nil && fi.Size() > maxLogBytes {
|
||||||
_ = os.Remove(logPath + ".1") // drop the older generation
|
_ = os.Remove(logPath + ".1") // drop the older generation
|
||||||
if err := os.Rename(logPath, logPath+".1"); err != nil {
|
if err := os.Rename(logPath, logPath+".1"); err != nil {
|
||||||
_ = os.Remove(logPath) // rename failed (locked?) → fall back to the old behaviour
|
_ = os.Remove(logPath) // rename failed (locked?) → fall back to the old behaviour
|
||||||
@@ -96,13 +102,57 @@ func Printf(format string, args ...any) {
|
|||||||
msg = msg[:len(msg)-1]
|
msg = msg[:len(msg)-1]
|
||||||
}
|
}
|
||||||
if file != nil {
|
if file != nil {
|
||||||
fmt.Fprintf(file, "%s %s\n", stamp, msg)
|
n, _ := fmt.Fprintf(file, "%s %s\n", stamp, msg)
|
||||||
|
written += int64(n)
|
||||||
|
rotateIfBigLocked()
|
||||||
}
|
}
|
||||||
// Also dump to stderr in case the binary was launched with a console
|
// Also dump to stderr in case the binary was launched with a console
|
||||||
// attached (wails dev, custom build).
|
// attached (wails dev, custom build).
|
||||||
fmt.Fprintf(os.Stderr, "%s %s\n", stamp, msg)
|
fmt.Fprintf(os.Stderr, "%s %s\n", stamp, msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// rotateIfBigLocked rolls the file over mid-session once it passes maxLogBytes.
|
||||||
|
//
|
||||||
|
// The check used to happen at STARTUP only, on the reasonable belief that a
|
||||||
|
// session writes a few kilobytes. The CI-V wire trace disproved it: left on for
|
||||||
|
// a day it wrote 416 MB, and nothing would have stopped it before the disk did.
|
||||||
|
// A log that has to be rotated by quitting the program is not a bound.
|
||||||
|
//
|
||||||
|
// Same one-generation scheme as the startup rotation, so the previous stretch
|
||||||
|
// survives — which is the half an operator usually needs, the part just before
|
||||||
|
// the thing they are reporting.
|
||||||
|
//
|
||||||
|
// Caller holds mu.
|
||||||
|
func rotateIfBigLocked() {
|
||||||
|
if written < maxLogBytes || file == nil || path == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fmt.Fprintf(file, "%s ── log reached %d MB, rotating to %s.1 ──\n",
|
||||||
|
time.Now().Format("15:04:05.000"), maxLogBytes/(1024*1024), filepath.Base(path))
|
||||||
|
_ = file.Close()
|
||||||
|
file = nil
|
||||||
|
_ = os.Remove(path + ".1")
|
||||||
|
if err := os.Rename(path, path+".1"); err != nil {
|
||||||
|
// Rename refused (the file is held open elsewhere, a virus scanner): keep
|
||||||
|
// writing to the old handle rather than losing the log entirely, and try
|
||||||
|
// again in another maxLogBytes rather than on every single line.
|
||||||
|
f, oerr := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644)
|
||||||
|
if oerr == nil {
|
||||||
|
file = f
|
||||||
|
}
|
||||||
|
written = 0
|
||||||
|
return
|
||||||
|
}
|
||||||
|
f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644)
|
||||||
|
if err != nil {
|
||||||
|
return // nothing more to be done; the next Printf simply writes nowhere
|
||||||
|
}
|
||||||
|
file = f
|
||||||
|
written = 0
|
||||||
|
fmt.Fprintf(file, "%s ── continued from %s.1 ──\n",
|
||||||
|
time.Now().Format("15:04:05.000"), filepath.Base(path))
|
||||||
|
}
|
||||||
|
|
||||||
// Path returns where the file is so the UI can surface it.
|
// Path returns where the file is so the UI can surface it.
|
||||||
func Path() string {
|
func Path() string {
|
||||||
mu.Lock()
|
mu.Lock()
|
||||||
@@ -118,4 +168,19 @@ func Close() {
|
|||||||
_ = file.Close()
|
_ = file.Close()
|
||||||
file = nil
|
file = nil
|
||||||
}
|
}
|
||||||
|
// The crash file is held open for the whole run so the runtime can dump a
|
||||||
|
// traceback into it without allocating; on the way out it has to be released
|
||||||
|
// like any other handle, or the data directory cannot be moved or removed.
|
||||||
|
if crashFile != nil {
|
||||||
|
// The RUNTIME holds its own duplicate of this handle (SetCrashOutput), so
|
||||||
|
// closing ours releases nothing on Windows — the data directory stays
|
||||||
|
// locked. Hand the runtime a nil first. Anything fatal in the last moments
|
||||||
|
// of shutdown is no longer captured, which is the right trade at a point
|
||||||
|
// where the databases are already closed.
|
||||||
|
_ = debug.SetCrashOutput(nil, debug.CrashOptions{})
|
||||||
|
_ = crashFile.Close()
|
||||||
|
crashFile = nil
|
||||||
|
}
|
||||||
|
path = ""
|
||||||
|
written = 0
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package applog
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The log has to be bounded WHILE RUNNING, not only at startup. The CI-V wire
|
||||||
|
// trace left on for a day wrote 416 MB, and nothing would have stopped it
|
||||||
|
// before the disk did.
|
||||||
|
func TestRotatesMidSession(t *testing.T) {
|
||||||
|
orig := maxLogBytes
|
||||||
|
maxLogBytes = 8 * 1024 // small, so the test costs milliseconds
|
||||||
|
defer func() { maxLogBytes = orig }()
|
||||||
|
|
||||||
|
dir := t.TempDir()
|
||||||
|
p, err := Init(dir)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer Close()
|
||||||
|
|
||||||
|
line := strings.Repeat("x", 256)
|
||||||
|
for i := 0; i < 100; i++ { // ~25 KB: several times the limit
|
||||||
|
Printf("%s", line)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := os.Stat(p + ".1"); err != nil {
|
||||||
|
t.Fatalf("no previous generation kept: %v", err)
|
||||||
|
}
|
||||||
|
fi, err := os.Stat(p)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if fi.Size() > maxLogBytes {
|
||||||
|
t.Fatalf("current log is %d bytes, over the %d limit — it did not roll over", fi.Size(), maxLogBytes)
|
||||||
|
}
|
||||||
|
// The new file says where the rest went: a log that starts mid-sentence with
|
||||||
|
// no explanation is how an operator concludes the app lost its history.
|
||||||
|
b, err := os.ReadFile(p)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if !strings.Contains(string(b), "continued from "+filepath.Base(p)+".1") {
|
||||||
|
t.Error("the new file does not point at the one it continues")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -157,7 +157,21 @@ func (m *Manager) Play(deviceID, path string, gainPct int) error {
|
|||||||
// instantly, the PTT is released 120 ms later, and NOTHING says why —
|
// instantly, the PTT is released 120 ms later, and NOTHING says why —
|
||||||
// which is exactly what a station heard as "it plays once, then never
|
// which is exactly what a station heard as "it plays once, then never
|
||||||
// again": the call succeeded, the sound did not.
|
// again": the call succeeded, the sound did not.
|
||||||
if err := playPCM(deviceID, pcm, rate, ch, bits, stop); err != nil {
|
play := func() error { return playPCM(deviceID, pcm, rate, ch, bits, stop) }
|
||||||
|
if deviceID == NetworkDeviceID {
|
||||||
|
// Straight to the radio over its own link. Decided HERE rather than
|
||||||
|
// inside playPCM because there is no Windows endpoint to open: asked
|
||||||
|
// for one, the system complains about a missing device instead of
|
||||||
|
// saying the true thing, which is that no radio is connected.
|
||||||
|
fn := networkPlayer()
|
||||||
|
play = func() error {
|
||||||
|
if fn == nil {
|
||||||
|
return errNoNetworkRadio
|
||||||
|
}
|
||||||
|
return fn(pcm, rate, ch, bits, stop)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := play(); err != nil {
|
||||||
LogSink("audio: playback on %q failed: %v", DeviceName(deviceID), err)
|
LogSink("audio: playback on %q failed: %v", DeviceName(deviceID), err)
|
||||||
}
|
}
|
||||||
m.mu.Lock()
|
m.mu.Lock()
|
||||||
|
|||||||
@@ -0,0 +1,67 @@
|
|||||||
|
package audio
|
||||||
|
|
||||||
|
// Playing a message through the RADIO instead of a sound card.
|
||||||
|
//
|
||||||
|
// A SunSDR takes its transmit audio over TCI, on the same socket as the
|
||||||
|
// commands, so the voice keyer can hand it the message directly: no virtual
|
||||||
|
// cable, no second sound card, no Windows mixer between the recording and the
|
||||||
|
// air. To everything above, that radio is simply another output device.
|
||||||
|
//
|
||||||
|
// The device it presents itself as is a name rather than a WASAPI endpoint id,
|
||||||
|
// which is why Play checks for it before opening anything: there is no endpoint
|
||||||
|
// to open, and asking Windows for one produces a confusing error about a device
|
||||||
|
// that does not exist rather than the truth, which is that nothing is connected
|
||||||
|
// to the radio.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
// NetworkDeviceID is the id the radio-over-network output carries in the
|
||||||
|
// settings and in the device lists. A fixed string, not a Windows endpoint id:
|
||||||
|
// it is chosen by us and must survive a radio being switched off and on.
|
||||||
|
const NetworkDeviceID = "net:radio"
|
||||||
|
|
||||||
|
// NetworkPlayer sends already-decoded PCM to the radio, returning when the
|
||||||
|
// message has been played or when stop is closed.
|
||||||
|
//
|
||||||
|
// It carries the same arguments as the sound-card path so that Play can hand
|
||||||
|
// over whatever it read, and the radio can decide what converting it needs —
|
||||||
|
// the sample rate a WAV was recorded at is not the radio's business until the
|
||||||
|
// moment it has to be resampled.
|
||||||
|
type NetworkPlayer func(pcm []byte, rate, ch, bits int, stop <-chan struct{}) error
|
||||||
|
|
||||||
|
var (
|
||||||
|
netMu sync.RWMutex
|
||||||
|
netPlayer NetworkPlayer
|
||||||
|
)
|
||||||
|
|
||||||
|
// SetNetworkPlayer installs (or clears, with nil) the radio's transmit path.
|
||||||
|
//
|
||||||
|
// Package-level rather than per-Manager: there is one radio, the CAT backend
|
||||||
|
// owns it, and a Manager that happened to be built before the radio connected
|
||||||
|
// would otherwise be permanently unable to reach it.
|
||||||
|
func SetNetworkPlayer(fn NetworkPlayer) {
|
||||||
|
netMu.Lock()
|
||||||
|
netPlayer = fn
|
||||||
|
netMu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// networkPlayer returns the installed player, or nil.
|
||||||
|
func networkPlayer() NetworkPlayer {
|
||||||
|
netMu.RLock()
|
||||||
|
defer netMu.RUnlock()
|
||||||
|
return netPlayer
|
||||||
|
}
|
||||||
|
|
||||||
|
// NetworkPlayerReady says whether a radio is currently able to take transmit
|
||||||
|
// audio, so the settings panel can offer the option honestly rather than
|
||||||
|
// listing a device that would fail when used.
|
||||||
|
func NetworkPlayerReady() bool { return networkPlayer() != nil }
|
||||||
|
|
||||||
|
// errNoNetworkRadio is what a message played to a radio that is not there
|
||||||
|
// 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
|
||||||
|
// 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)")
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package audio
|
||||||
|
|
||||||
|
// RecorderSampleRate is the rate the QSO recorder works in.
|
||||||
|
//
|
||||||
|
// Exported because a source that is NOT a sound card — the TCI receive stream,
|
||||||
|
// the Icom network audio — has to resample into it, and hard-coding 16000 at
|
||||||
|
// each of those call sites is how one of them ends up at the wrong speed after
|
||||||
|
// this constant is ever changed.
|
||||||
|
const RecorderSampleRate = sampleRate
|
||||||
@@ -168,7 +168,48 @@ func (r *Recorder) Start(fromDev, micDev string, prerollSec int) error {
|
|||||||
twoSrc := r.twoSrc
|
twoSrc := r.twoSrc
|
||||||
r.mu.Unlock()
|
r.mu.Unlock()
|
||||||
|
|
||||||
// Capture goroutine(s) feed the per-source queues.
|
// The radio side is either CAPTURED from a sound device or PUSHED in from
|
||||||
|
// somewhere else. Over the network there is no sound device at all: an
|
||||||
|
// IC-705 reached by LAN streams its receive audio over the Icom protocol,
|
||||||
|
// and the operator's audio settings can only offer the PC's own microphone
|
||||||
|
// and speakers. fromDev == PushedSource says "someone else will feed me",
|
||||||
|
// and PushRX is how they do it.
|
||||||
|
if fromDev == PushedSource {
|
||||||
|
LogSink("recorder: radio audio is pushed in (network), not captured from a device")
|
||||||
|
} else {
|
||||||
|
r.startRadioCapture(fromDev, stop)
|
||||||
|
}
|
||||||
|
if twoSrc {
|
||||||
|
r.startMicCapture(micDev, stop)
|
||||||
|
}
|
||||||
|
r.finishStart(fromDev, micDev, twoSrc, stop)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// PushedSource is the "device" name that means the radio audio arrives through
|
||||||
|
// PushRX instead of a capture stream.
|
||||||
|
const PushedSource = "\x00pushed"
|
||||||
|
|
||||||
|
// PushRX feeds one chunk of 16-bit mono PCM from a non-device source.
|
||||||
|
//
|
||||||
|
// Safe to call when nothing is recording — the samples are dropped, which is
|
||||||
|
// what should happen: the network stream runs whenever the rig is connected,
|
||||||
|
// and the recorder only wants it between BeginQSO and the save.
|
||||||
|
func (r *Recorder) PushRX(pcm []byte) {
|
||||||
|
r.mu.Lock()
|
||||||
|
running := r.running
|
||||||
|
r.mu.Unlock()
|
||||||
|
if !running || len(pcm) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
sm := bytesToInt16(pcm)
|
||||||
|
r.srcMu.Lock()
|
||||||
|
r.bufA = append(r.bufA, sm...)
|
||||||
|
r.lastA = time.Now()
|
||||||
|
r.srcMu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *Recorder) startRadioCapture(fromDev string, stop chan struct{}) {
|
||||||
r.wg.Add(1)
|
r.wg.Add(1)
|
||||||
go func() {
|
go func() {
|
||||||
defer r.wg.Done()
|
defer r.wg.Done()
|
||||||
@@ -187,7 +228,9 @@ func (r *Recorder) Start(fromDev, micDev string, prerollSec int) error {
|
|||||||
LogSink("recorder: capture from %q failed: %v", DeviceName(fromDev), err)
|
LogSink("recorder: capture from %q failed: %v", DeviceName(fromDev), err)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
if twoSrc {
|
}
|
||||||
|
|
||||||
|
func (r *Recorder) startMicCapture(micDev string, stop chan struct{}) {
|
||||||
r.wg.Add(1)
|
r.wg.Add(1)
|
||||||
go func() {
|
go func() {
|
||||||
defer r.wg.Done()
|
defer r.wg.Done()
|
||||||
@@ -204,6 +247,8 @@ func (r *Recorder) Start(fromDev, micDev string, prerollSec int) error {
|
|||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// finishStart logs what is being recorded and arms the silence watchdog.
|
||||||
|
func (r *Recorder) finishStart(fromDev, micDev string, twoSrc bool, stop chan struct{}) {
|
||||||
// Name the devices being recorded FROM, once, at the start.
|
// Name the devices being recorded FROM, once, at the start.
|
||||||
//
|
//
|
||||||
// A station with two radios has two sets of endpoints, and the recorder will
|
// A station with two radios has two sets of endpoints, and the recorder will
|
||||||
@@ -262,7 +307,6 @@ func (r *Recorder) Start(fromDev, micDev string, prerollSec int) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// mixTick drains the source queues, mixes what's available, and appends to the
|
// mixTick drains the source queues, mixes what's available, and appends to the
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import (
|
|||||||
// any device regardless of its native mix format.
|
// any device regardless of its native mix format.
|
||||||
const (
|
const (
|
||||||
sampleRate = 16000
|
sampleRate = 16000
|
||||||
|
|
||||||
channels = 1
|
channels = 1
|
||||||
bitsPerSample = 16
|
bitsPerSample = 16
|
||||||
blockAlign = channels * bitsPerSample / 8 // bytes per frame (=2)
|
blockAlign = channels * bitsPerSample / 8 // bytes per frame (=2)
|
||||||
|
|||||||
+65
-2
@@ -109,7 +109,7 @@ type Def struct {
|
|||||||
Emission []string `json:"emission,omitempty"` // CW | DIGITAL | PHONE (empty = all)
|
Emission []string `json:"emission,omitempty"` // CW | DIGITAL | PHONE (empty = all)
|
||||||
|
|
||||||
// --- Confirmation ---
|
// --- Confirmation ---
|
||||||
Confirm []string `json:"confirm"` // worked-confirmed: lotw|qsl|eqsl|qrzcom|custom
|
Confirm []string `json:"confirm"` // worked-confirmed: lotw|qsl|eqsl|qrzcom|hamlog|custom
|
||||||
Validate []string `json:"validate,omitempty"` // validated/granted sources
|
Validate []string `json:"validate,omitempty"` // validated/granted sources
|
||||||
// The "custom" source, for confirmations OpsLog has no dedicated column for:
|
// The "custom" source, for confirmations OpsLog has no dedicated column for:
|
||||||
// ConfirmField names a QSO field or an ADIF extras key, ConfirmValue the
|
// ConfirmField names a QSO field or an ADIF extras key, ConfirmValue the
|
||||||
@@ -344,7 +344,7 @@ func Migrate(defs []Def) ([]Def, bool) {
|
|||||||
func Fields() []string {
|
func Fields() []string {
|
||||||
return []string{
|
return []string{
|
||||||
"dxcc", "cqz", "ituz", "prefix", "callsign",
|
"dxcc", "cqz", "ituz", "prefix", "callsign",
|
||||||
"state", "us_county", "cont", "country", "grid", "grid4",
|
"state", "county", "us_county", "cont", "country", "grid", "grid4",
|
||||||
"iota", "sota_ref", "pota_ref", "wwff",
|
"iota", "sota_ref", "pota_ref", "wwff",
|
||||||
"name", "qth", "address", "comment", "note",
|
"name", "qth", "address", "comment", "note",
|
||||||
}
|
}
|
||||||
@@ -1373,6 +1373,13 @@ func fieldRaw(field string, q *qso.QSO) string {
|
|||||||
return q.Callsign
|
return q.Callsign
|
||||||
case "state":
|
case "state":
|
||||||
return q.State
|
return q.State
|
||||||
|
case "county":
|
||||||
|
// CNTY as it stands, with nothing prepended. us_county below answers a
|
||||||
|
// different question — it keys the county to its state, because two US
|
||||||
|
// states each have a Jefferson County. Outside the United States that
|
||||||
|
// prefixing is wrong: an RDA district (RO-19) and a Japanese city code
|
||||||
|
// are already unique, and a state is not what qualifies them.
|
||||||
|
return q.County
|
||||||
case "us_county":
|
case "us_county":
|
||||||
return USCountyKey(q.State, q.County)
|
return USCountyKey(q.State, q.County)
|
||||||
case "cont":
|
case "cont":
|
||||||
@@ -1481,6 +1488,18 @@ func confirmed(q *qso.QSO, sources []string, d *Def) bool {
|
|||||||
if isYes(q.QRZComDownloadStatus) {
|
if isYes(q.QRZComDownloadStatus) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
case "hamlog":
|
||||||
|
// HAMLOG.online, a first-class source rather than something to express
|
||||||
|
// through "custom" — its confirmations feed its own award programme
|
||||||
|
// and operators reach for it the same way they reach for LoTW.
|
||||||
|
//
|
||||||
|
// Read from the ADIF EXTRAS, not a column: the ADIF standard names a
|
||||||
|
// field for hamlog.EU (HAMLOGEU_QSO_UPLOAD_STATUS) and none for
|
||||||
|
// hamlog.ONLINE, and borrowing the other site's field would write a
|
||||||
|
// falsehood into every exported log.
|
||||||
|
if hamlogConfirmed(q) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
case "custom":
|
case "custom":
|
||||||
if customConfirmed(q, d) {
|
if customConfirmed(q, d) {
|
||||||
return true
|
return true
|
||||||
@@ -1490,6 +1509,46 @@ func confirmed(q *qso.QSO, sources []string, d *Def) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// HamlogQSLKey is where a HAMLOG.online confirmation is recorded.
|
||||||
|
//
|
||||||
|
// THEIR field name, taken from a real export:
|
||||||
|
//
|
||||||
|
// <APP_HAMLOG_QSO_CFM:1>Y
|
||||||
|
//
|
||||||
|
// Using the site's own key rather than one of ours is what makes an import
|
||||||
|
// simply work: a log downloaded from HAMLOG carries its confirmations into
|
||||||
|
// OpsLog with nothing to rename and no mapping to configure. The guesses this
|
||||||
|
// replaced (APP_HAMLOG_QSL and friends) were all wrong, which is the argument
|
||||||
|
// for reading a real file before naming a field.
|
||||||
|
const HamlogQSLKey = "APP_HAMLOG_QSO_CFM"
|
||||||
|
|
||||||
|
// hamlogAltKeys are older or hand-written spellings still honoured on read.
|
||||||
|
// APP_OPSLOG_HAMLOG_QSL is the one OpsLog itself wrote before a real export was
|
||||||
|
// available; a log stamped with it keeps counting.
|
||||||
|
var hamlogAltKeys = []string{"APP_OPSLOG_HAMLOG_QSL", "APP_HAMLOG_QSL", "APP_HAMLOGONLINE_QSL", "HAMLOG_QSL_RCVD"}
|
||||||
|
|
||||||
|
// hamlogConfirmed reports whether a QSO carries a HAMLOG.online confirmation.
|
||||||
|
//
|
||||||
|
// Any non-empty value counts, except an explicit "N": their export could carry
|
||||||
|
// a date, a Y, or a match id, and demanding one of them would silently confirm
|
||||||
|
// nothing on the two shapes we guessed wrong.
|
||||||
|
func hamlogConfirmed(q *qso.QSO) bool {
|
||||||
|
if q == nil || q.Extras == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, k := range append([]string{HamlogQSLKey}, hamlogAltKeys...) {
|
||||||
|
v := strings.TrimSpace(q.Extras[k])
|
||||||
|
if v == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if strings.EqualFold(v, "N") || strings.EqualFold(v, "NO") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
// customConfirmed answers the operator-defined confirmation source: the field
|
// customConfirmed answers the operator-defined confirmation source: the field
|
||||||
// named by ConfirmField, optionally required to hold one of ConfirmValue's
|
// named by ConfirmField, optionally required to hold one of ConfirmValue's
|
||||||
// comma-separated values.
|
// comma-separated values.
|
||||||
@@ -1580,3 +1639,7 @@ func sortedBands(m map[string]int) []string {
|
|||||||
})
|
})
|
||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// HamlogAltKeys exposes the alternate spellings so a reader outside this package
|
||||||
|
// (the confirmations import) accepts exactly what the award engine accepts.
|
||||||
|
func HamlogAltKeys() []string { return append([]string(nil), hamlogAltKeys...) }
|
||||||
|
|||||||
@@ -64,3 +64,61 @@ func TestConfirmedSources(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// HAMLOG.online is a named confirmation source, not something to express through
|
||||||
|
// "custom": an award ticks it the way it ticks LoTW.
|
||||||
|
func TestHamlogConfirmationSource(t *testing.T) {
|
||||||
|
def := Def{Confirm: []string{"hamlog"}, Validate: []string{"hamlog"}}
|
||||||
|
yes := func(extras map[string]string) bool {
|
||||||
|
return Confirmed(&qso.QSO{Extras: extras}, def, def.Confirm)
|
||||||
|
}
|
||||||
|
if !yes(map[string]string{HamlogQSLKey: "Y"}) {
|
||||||
|
t.Error("our own key did not confirm")
|
||||||
|
}
|
||||||
|
// Their export's field name is unpublished, so the plausible shapes count too.
|
||||||
|
if !yes(map[string]string{"APP_HAMLOG_QSL": "20260823"}) {
|
||||||
|
t.Error("a date in an alternative key did not confirm")
|
||||||
|
}
|
||||||
|
// A value is not a confirmation when it says no.
|
||||||
|
if yes(map[string]string{HamlogQSLKey: "N"}) {
|
||||||
|
t.Error(`"N" was taken as a confirmation`)
|
||||||
|
}
|
||||||
|
if yes(map[string]string{HamlogQSLKey: " "}) {
|
||||||
|
t.Error("blank was taken as a confirmation")
|
||||||
|
}
|
||||||
|
if yes(nil) || yes(map[string]string{"SOMETHING_ELSE": "Y"}) {
|
||||||
|
t.Error("confirmed with nothing to confirm it")
|
||||||
|
}
|
||||||
|
// And it does not leak into an award that never asked for it.
|
||||||
|
other := Def{Confirm: []string{"lotw"}}
|
||||||
|
if Confirmed(&qso.QSO{Extras: map[string]string{HamlogQSLKey: "Y"}}, other, other.Confirm) {
|
||||||
|
t.Error("a hamlog confirmation counted for an award that only accepts LoTW")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The field name is theirs, taken from a real export:
|
||||||
|
//
|
||||||
|
// <APP_HAMLOG_QSO_CFM:1>Y
|
||||||
|
//
|
||||||
|
// Pinned as a test because it was GUESSED wrong first — an import that carries
|
||||||
|
// its confirmations into OpsLog with nothing to rename is the whole point, and
|
||||||
|
// a renamed constant would break it in silence.
|
||||||
|
func TestHamlogUsesTheSitesOwnFieldName(t *testing.T) {
|
||||||
|
if HamlogQSLKey != "APP_HAMLOG_QSO_CFM" {
|
||||||
|
t.Fatalf("HamlogQSLKey = %q — their export writes APP_HAMLOG_QSO_CFM", HamlogQSLKey)
|
||||||
|
}
|
||||||
|
def := Def{Confirm: []string{"hamlog"}}
|
||||||
|
// The record as HAMLOG exports it.
|
||||||
|
q := &qso.QSO{Extras: map[string]string{
|
||||||
|
"APP_HAMLOG_R150COUNTRY": "Russia",
|
||||||
|
"APP_HAMLOG_QSO_CFM": "Y",
|
||||||
|
}}
|
||||||
|
if !Confirmed(q, def, def.Confirm) {
|
||||||
|
t.Error("a real HAMLOG export did not confirm")
|
||||||
|
}
|
||||||
|
// Anything OpsLog stamped before that export existed keeps counting.
|
||||||
|
old := &qso.QSO{Extras: map[string]string{"APP_OPSLOG_HAMLOG_QSL": "Y"}}
|
||||||
|
if !Confirmed(old, def, def.Confirm) {
|
||||||
|
t.Error("a QSO stamped with the older key stopped counting")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
package award
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/qso"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A district lives in CNTY as-is; the US award field keys it to the state
|
||||||
|
// because county names repeat across states. Confusing the two silently breaks
|
||||||
|
// whichever award is not American.
|
||||||
|
func TestCountyFieldIsRawWhileUSCountyIsKeyed(t *testing.T) {
|
||||||
|
q := &qso.QSO{State: "TX", County: "RO-19"}
|
||||||
|
if got := fieldRaw("county", q); got != "RO-19" {
|
||||||
|
t.Fatalf("county = %q, want RO-19", got)
|
||||||
|
}
|
||||||
|
if got := fieldRaw("us_county", q); got == "RO-19" {
|
||||||
|
t.Fatalf("us_county should key the county to its state, got %q", got)
|
||||||
|
}
|
||||||
|
var found bool
|
||||||
|
for _, f := range Fields() {
|
||||||
|
if f == "county" {
|
||||||
|
found = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
t.Fatal("county missing from the award field list")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -487,6 +487,8 @@ type FlexController interface {
|
|||||||
// keeps freqMHz inside it, re-centring when it must. See Flex.ZoomPan.
|
// keeps freqMHz inside it, re-centring when it must. See Flex.ZoomPan.
|
||||||
ZoomPan(bandwidthMHz, freqMHz float64, centre bool) error
|
ZoomPan(bandwidthMHz, freqMHz float64, centre bool) error
|
||||||
SetTXSlice(int) error // make slice idx the transmitter (tx=1)
|
SetTXSlice(int) error // make slice idx the transmitter (tx=1)
|
||||||
|
// SetTXSliceFrequency moves the TRANSMIT slice only — split pile-up chasing.
|
||||||
|
SetTXSliceFrequency(int64) error
|
||||||
SetSplit(bool) error
|
SetSplit(bool) error
|
||||||
SetNB(bool) error
|
SetNB(bool) error
|
||||||
SetNBLevel(int) error
|
SetNBLevel(int) error
|
||||||
@@ -988,6 +990,30 @@ type KenwoodController interface {
|
|||||||
SetKeySpeed(int) error
|
SetKeySpeed(int) error
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// KenwoodState returns the K3/K4 panel snapshot, or (zero, false) when the
|
||||||
|
// active backend is not a Kenwood-dialect rig.
|
||||||
|
func (m *Manager) KenwoodState() (KenwoodTXState, bool) {
|
||||||
|
m.mu.RLock()
|
||||||
|
b := m.backend
|
||||||
|
m.mu.RUnlock()
|
||||||
|
if kc, ok := b.(KenwoodPanelController); ok {
|
||||||
|
return kc.KenwoodState(), true
|
||||||
|
}
|
||||||
|
return KenwoodTXState{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
// KenwoodPanelDo dispatches a K3/K4 panel control onto the CAT goroutine, so a
|
||||||
|
// panel click and the poll loop never share the serial port at the same instant.
|
||||||
|
func (m *Manager) KenwoodPanelDo(fn func(KenwoodPanelController) error) error {
|
||||||
|
return m.exec(func(b Backend) error {
|
||||||
|
kc, ok := b.(KenwoodPanelController)
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("active CAT backend is not a Kenwood/Elecraft")
|
||||||
|
}
|
||||||
|
return fn(kc)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// KenwoodDo dispatches a Kenwood control onto the CAT goroutine.
|
// KenwoodDo dispatches a Kenwood control onto the CAT goroutine.
|
||||||
func (m *Manager) KenwoodDo(fn func(KenwoodController) error) error {
|
func (m *Manager) KenwoodDo(fn func(KenwoodController) error) error {
|
||||||
return m.exec(func(b Backend) error {
|
return m.exec(func(b Backend) error {
|
||||||
|
|||||||
+161
-5
@@ -60,6 +60,9 @@ type Flex struct {
|
|||||||
txRawLogged bool // log the first raw transmit status once (field-name audit)
|
txRawLogged bool // log the first raw transmit status once (field-name audit)
|
||||||
|
|
||||||
spotsEnabled bool // push cluster spots + manage the panadapter overlay
|
spotsEnabled bool // push cluster spots + manage the panadapter overlay
|
||||||
|
// foreignSpotSeen counts what probeForeignSpot has already reported, so a
|
||||||
|
// skimmer posting all evening cannot turn the log into its own transcript.
|
||||||
|
foreignSpotSeen int
|
||||||
spotIdx map[int]bool // panadapter spot indices currently known to the radio
|
spotIdx map[int]bool // panadapter spot indices currently known to the radio
|
||||||
pendingSpot map[int]string // seq → callsign, awaiting the spot index in the R response
|
pendingSpot map[int]string // seq → callsign, awaiting the spot index in the R response
|
||||||
pendingSpotMode map[int]string // seq → ADIF mode, paired with pendingSpot
|
pendingSpotMode map[int]string // seq → ADIF mode, paired with pendingSpot
|
||||||
@@ -74,6 +77,15 @@ type Flex struct {
|
|||||||
// end up outside the new window — see ZoomPan.
|
// end up outside the new window — see ZoomPan.
|
||||||
panWindow map[string]panView
|
panWindow map[string]panView
|
||||||
|
|
||||||
|
// spotSig is what each live spot LOOKS like, and when it was drawn. A
|
||||||
|
// callsign spotted again with the same frequency, colour and comment does not
|
||||||
|
// need to be removed and re-added: the panadapter would not change by one
|
||||||
|
// pixel, and a busy RBN feed re-spots the same station every few seconds. One
|
||||||
|
// two-minute session sent 2 128 adds and 1 634 removes, 88 of them for a
|
||||||
|
// single callsign — see SendSpot.
|
||||||
|
spotSig map[string]string
|
||||||
|
spotSent map[string]time.Time
|
||||||
|
|
||||||
spotByCall map[string]int // callsign → live spot index, so re-spotting a call replaces its old spot (WSJT decodes re-fire every cycle)
|
spotByCall map[string]int // callsign → live spot index, so re-spotting a call replaces its old spot (WSJT decodes re-fire every cycle)
|
||||||
sentCmds map[int]string // seq → command text, so an R<seq> error names the command
|
sentCmds map[int]string // seq → command text, so an R<seq> error names the command
|
||||||
|
|
||||||
@@ -83,6 +95,16 @@ type Flex struct {
|
|||||||
// the spot, since the radio's own notification carries only an index. The host
|
// the spot, since the radio's own notification carries only an index. The host
|
||||||
// wires this to fill the entry form and to size the panadapter. Set before Connect.
|
// wires this to fill the entry form and to size the panadapter. Set before Connect.
|
||||||
OnSpotClick func(callsign string, freqHz int64, mode string)
|
OnSpotClick func(callsign string, freqHz int64, mode string)
|
||||||
|
|
||||||
|
// OnForeignSpot is called for every spot posted to the radio by a program
|
||||||
|
// OTHER than OpsLog, with the spot's callsign field and its frequency.
|
||||||
|
//
|
||||||
|
// A CW skimmer posts what it decodes, so the marker a DX operator's report
|
||||||
|
// leaves on the panadapter arrives here — that is what the split chaser acts
|
||||||
|
// on. Deliberately raw: this package reports what the radio said and does not
|
||||||
|
// decide what a marker looks like, because the marker text is configured in
|
||||||
|
// the skimmer, by the operator, and only they know what they chose.
|
||||||
|
OnForeignSpot func(callsign string, freqHz int64)
|
||||||
}
|
}
|
||||||
|
|
||||||
// panView is one panadapter's visible window, in MHz.
|
// panView is one panadapter's visible window, in MHz.
|
||||||
@@ -205,7 +227,7 @@ func NewFlex(host string, port int, spotsEnabled bool) *Flex {
|
|||||||
return &Flex{
|
return &Flex{
|
||||||
host: strings.TrimSpace(host), port: port,
|
host: strings.TrimSpace(host), port: port,
|
||||||
slices: map[int]*flexSlice{}, spotsEnabled: spotsEnabled,
|
slices: map[int]*flexSlice{}, spotsEnabled: spotsEnabled,
|
||||||
spotIdx: map[int]bool{}, pendingSpot: map[int]string{}, pendingSpotMode: map[int]string{}, spotCall: map[int]string{}, spotMode: map[int]string{}, spotFreq: map[int]int64{}, pendingSpotFreq: map[int]int64{}, panWindow: map[string]panView{}, spotByCall: map[string]int{}, pendingSplit: map[int]bool{},
|
spotIdx: map[int]bool{}, pendingSpot: map[int]string{}, pendingSpotMode: map[int]string{}, spotCall: map[int]string{}, spotMode: map[int]string{}, spotFreq: map[int]int64{}, pendingSpotFreq: map[int]int64{}, panWindow: map[string]panView{}, spotSig: map[string]string{}, spotSent: map[string]time.Time{}, spotByCall: map[string]int{}, pendingSplit: map[int]bool{},
|
||||||
meterMeta: map[int]meterInfo{}, meterVal: map[int]float64{}, meterSub: map[int]bool{},
|
meterMeta: map[int]meterInfo{}, meterVal: map[int]float64{}, meterSub: map[int]bool{},
|
||||||
sentCmds: map[int]string{}, txSetAt: map[string]time.Time{},
|
sentCmds: map[int]string{}, txSetAt: map[string]time.Time{},
|
||||||
pinnedSlice: -1,
|
pinnedSlice: -1,
|
||||||
@@ -269,11 +291,18 @@ func (f *Flex) Connect() error {
|
|||||||
f.send("sub pan all") // panadapter centre/bandwidth, so a zoom knows where the display already is
|
f.send("sub pan all") // panadapter centre/bandwidth, so a zoom knows where the display already is
|
||||||
f.send("sub client all") // learn the GUI client (SmartSDR) so we can bind to it (below)
|
f.send("sub client all") // learn the GUI client (SmartSDR) so we can bind to it (below)
|
||||||
f.startMeters(conn) // open the UDP VITA-49 stream for live meters
|
f.startMeters(conn) // open the UDP VITA-49 stream for live meters
|
||||||
if f.spotsEnabled {
|
// Always subscribed, even when OpsLog draws no spots of its own: the feed is
|
||||||
// Subscribe so the radio pushes existing spots (we learn their indices),
|
// read-only and it is how the spots posted by OTHER programs arrive — a CW
|
||||||
// then wipe the panadapter so stale spots from a previous session or
|
// skimmer's decoded reports, which the split chaser acts on. Tying the
|
||||||
// another logger are cleared before we start adding our own.
|
// subscription to our own overlay meant a station using SDC and no OpsLog
|
||||||
|
// spots heard nothing at all.
|
||||||
f.send("sub spot all")
|
f.send("sub spot all")
|
||||||
|
if f.spotsEnabled {
|
||||||
|
// Wipe the panadapter so stale spots from a previous session or another
|
||||||
|
// logger are cleared before we start adding our own. Only when the
|
||||||
|
// overlay is ours to manage: "spot clear" removes EVERY spot on the
|
||||||
|
// radio, a skimmer's included, and taking those away from an operator
|
||||||
|
// who never asked us to draw anything would be pure vandalism.
|
||||||
go f.clearSpotsOnConnect(conn)
|
go f.clearSpotsOnConnect(conn)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
@@ -859,6 +888,13 @@ func (f *Flex) handleStatus(payload string) {
|
|||||||
}
|
}
|
||||||
f.mu.Lock()
|
f.mu.Lock()
|
||||||
if removed {
|
if removed {
|
||||||
|
// The radio expired or dropped this spot: forget what it looked
|
||||||
|
// like, or the next identical spot would be skipped as "already
|
||||||
|
// drawn" and the station would never come back.
|
||||||
|
if c, ok := f.spotCall[idx]; ok {
|
||||||
|
delete(f.spotSig, strings.ToUpper(c))
|
||||||
|
delete(f.spotSent, strings.ToUpper(c))
|
||||||
|
}
|
||||||
delete(f.spotIdx, idx)
|
delete(f.spotIdx, idx)
|
||||||
delete(f.spotCall, idx)
|
delete(f.spotCall, idx)
|
||||||
delete(f.spotMode, idx)
|
delete(f.spotMode, idx)
|
||||||
@@ -867,6 +903,10 @@ func (f *Flex) handleStatus(payload string) {
|
|||||||
f.spotIdx[idx] = true
|
f.spotIdx[idx] = true
|
||||||
}
|
}
|
||||||
f.mu.Unlock()
|
f.mu.Unlock()
|
||||||
|
if !removed {
|
||||||
|
f.probeForeignSpot(payload)
|
||||||
|
f.reportForeignSpot(payload)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
debugLog.Printf("Flex: status %s", payload)
|
debugLog.Printf("Flex: status %s", payload)
|
||||||
}
|
}
|
||||||
@@ -1361,6 +1401,105 @@ func (f *Flex) ZoomPan(bandwidthMHz, freqMHz float64, centre bool) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// foreignSpotProbeMax bounds the probe below. Enough lines to see what another
|
||||||
|
// program writes into a spot, few enough that a running skimmer — which posts
|
||||||
|
// hundreds an hour — cannot fill the log file with them.
|
||||||
|
const foreignSpotProbeMax = 60
|
||||||
|
|
||||||
|
// probeForeignSpot records, verbatim, the spots this radio receives from
|
||||||
|
// programs OTHER than OpsLog.
|
||||||
|
//
|
||||||
|
// A CW skimmer (SDC, for one) posts what it decodes as panadapter spots, the
|
||||||
|
// exchange included: chasing a split pileup means finding the "5NN" the DX just
|
||||||
|
// sent and moving the transmit slice there. Acting on that requires knowing
|
||||||
|
// exactly what the spot looks like — which field carries the text, whether the
|
||||||
|
// report is the callsign or the comment, what source names the skimmer — and no
|
||||||
|
// amount of reasoning substitutes for reading real lines off a real radio.
|
||||||
|
//
|
||||||
|
// So this logs and does nothing else. It is deliberately not a feature.
|
||||||
|
func (f *Flex) probeForeignSpot(payload string) {
|
||||||
|
if strings.Contains(payload, "source=OpsLog") {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
f.mu.Lock()
|
||||||
|
if f.foreignSpotSeen >= foreignSpotProbeMax {
|
||||||
|
f.mu.Unlock()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
f.foreignSpotSeen++
|
||||||
|
n := f.foreignSpotSeen
|
||||||
|
f.mu.Unlock()
|
||||||
|
debugLog.Printf("flex: foreign spot %d/%d: %s", n, foreignSpotProbeMax, payload)
|
||||||
|
if n == foreignSpotProbeMax {
|
||||||
|
debugLog.Printf("flex: that is enough foreign spots to go on — no more will be logged this session")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// reportForeignSpot hands another program's spot to OnForeignSpot.
|
||||||
|
//
|
||||||
|
// Off the reader goroutine, like OnSpotClick: the handler tunes the radio, and
|
||||||
|
// a command sent from inside the reader would deadlock against the socket it is
|
||||||
|
// reading.
|
||||||
|
func (f *Flex) reportForeignSpot(payload string) {
|
||||||
|
if strings.Contains(payload, "source=OpsLog") {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
handler := f.OnForeignSpot
|
||||||
|
if handler == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var call string
|
||||||
|
var hz int64
|
||||||
|
for _, kv := range strings.Fields(payload) {
|
||||||
|
eq := strings.IndexByte(kv, '=')
|
||||||
|
if eq <= 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
switch kv[:eq] {
|
||||||
|
case "callsign":
|
||||||
|
call = kv[eq+1:]
|
||||||
|
case "rx_freq":
|
||||||
|
if mhz, err := strconv.ParseFloat(kv[eq+1:], 64); err == nil {
|
||||||
|
hz = int64(math.Round(mhz * 1e6))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if call == "" || hz <= 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
go handler(call, hz)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTXSliceFrequency tunes the TRANSMIT slice, leaving the receive slice where
|
||||||
|
// it is. That distinction is the whole point in split: the operator listens to
|
||||||
|
// the DX on one slice and moves the other around the pile-up.
|
||||||
|
func (f *Flex) SetTXSliceFrequency(hz int64) error {
|
||||||
|
if hz <= 0 {
|
||||||
|
return fmt.Errorf("flex: invalid frequency")
|
||||||
|
}
|
||||||
|
f.mu.Lock()
|
||||||
|
idx := -1
|
||||||
|
for i, s := range f.slices {
|
||||||
|
if s != nil && s.inUse && s.tx {
|
||||||
|
idx = i
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if idx >= 0 && f.slices[idx] != nil {
|
||||||
|
f.slices[idx].freqHz = hz // optimistic, like SetFrequency
|
||||||
|
}
|
||||||
|
connected := f.conn != nil
|
||||||
|
f.mu.Unlock()
|
||||||
|
if idx < 0 {
|
||||||
|
return fmt.Errorf("flex: no transmit slice")
|
||||||
|
}
|
||||||
|
if !connected {
|
||||||
|
return fmt.Errorf("flex: not connected")
|
||||||
|
}
|
||||||
|
f.send(fmt.Sprintf("slice t %d %.6f", idx, float64(hz)/1e6))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// SendSpot renders a cluster spot on the panadapter via "spot add". Spots carry
|
// SendSpot renders a cluster spot on the panadapter via "spot add". Spots carry
|
||||||
// a lifetime so the radio expires them on its own (the API has no "spot clear").
|
// a lifetime so the radio expires them on its own (the API has no "spot clear").
|
||||||
// Per the SmartSDR API, spaces inside a field value are encoded as 0x7F.
|
// Per the SmartSDR API, spaces inside a field value are encoded as 0x7F.
|
||||||
@@ -1390,7 +1529,22 @@ func (f *Flex) SendSpot(s SpotInfo) error {
|
|||||||
// and Go mutexes aren't reentrant (calling send while locked deadlocks the
|
// and Go mutexes aren't reentrant (calling send while locked deadlocks the
|
||||||
// whole Flex goroutine → the radio drops OFFLINE).
|
// whole Flex goroutine → the radio drops OFFLINE).
|
||||||
upperCall := strings.ToUpper(s.Callsign)
|
upperCall := strings.ToUpper(s.Callsign)
|
||||||
|
// Unchanged and still fresh → leave it alone.
|
||||||
|
//
|
||||||
|
// Refreshed once past half its lifetime, so a long-lived spot still gets its
|
||||||
|
// timer wound on and never quietly expires off the panadapter; anything that
|
||||||
|
// actually differs (a new frequency, a status that has changed colour, a
|
||||||
|
// different comment) is redrawn at once.
|
||||||
|
sig := fmt.Sprintf("%d|%s|%s|%s|%s", s.FreqHz, s.Mode, s.Color, s.BackgroundColor, s.Comment)
|
||||||
f.mu.Lock()
|
f.mu.Lock()
|
||||||
|
if prev, ok := f.spotSig[upperCall]; ok && prev == sig {
|
||||||
|
if at, ok := f.spotSent[upperCall]; ok && time.Since(at) < time.Duration(life)*time.Second/2 {
|
||||||
|
f.mu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
f.spotSig[upperCall] = sig
|
||||||
|
f.spotSent[upperCall] = time.Now()
|
||||||
old, hadOld := f.spotByCall[upperCall]
|
old, hadOld := f.spotByCall[upperCall]
|
||||||
if hadOld {
|
if hadOld {
|
||||||
delete(f.spotByCall, upperCall)
|
delete(f.spotByCall, upperCall)
|
||||||
@@ -1464,6 +1618,8 @@ func (f *Flex) ClearSpots() error {
|
|||||||
f.spotCall = map[int]string{}
|
f.spotCall = map[int]string{}
|
||||||
f.spotMode = map[int]string{}
|
f.spotMode = map[int]string{}
|
||||||
f.spotFreq = map[int]int64{}
|
f.spotFreq = map[int]int64{}
|
||||||
|
f.spotSig = map[string]string{}
|
||||||
|
f.spotSent = map[string]time.Time{}
|
||||||
f.spotByCall = map[string]int{}
|
f.spotByCall = map[string]int{}
|
||||||
connected := f.conn != nil
|
connected := f.conn != nil
|
||||||
f.mu.Unlock()
|
f.mu.Unlock()
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
package cat
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/cat/civ"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A CI-V bus can carry a second controller, and the rig answers each of them on
|
||||||
|
// the same wire. A reply addressed to somebody else must not be taken for ours —
|
||||||
|
// on an IC-7850 one arrived between a PTT command and its acknowledgement, the
|
||||||
|
// acknowledgement was never matched, and the failure was handed to JTDX as a rig
|
||||||
|
// control error.
|
||||||
|
func TestForeignCIVRepliesAreIgnored(t *testing.T) {
|
||||||
|
const rig = 0x8E
|
||||||
|
frames, _ := civ.Scan([]byte{
|
||||||
|
0xFE, 0xFE, 0x01, rig, 0x1C, 0x00, 0x01, 0xFD, // to controller 01 — not ours
|
||||||
|
0xFE, 0xFE, civ.AddrController, rig, 0xFB, 0xFD, // to us: the acknowledgement
|
||||||
|
0xFE, 0xFE, 0x00, rig, 0x00, 0x00, 0x25, 0x09, 0x14, 0x00, 0xFD, // transceive broadcast
|
||||||
|
})
|
||||||
|
if len(frames) != 3 {
|
||||||
|
t.Fatalf("scanned %d frames, want 3", len(frames))
|
||||||
|
}
|
||||||
|
var kept []civ.Decoded
|
||||||
|
for _, f := range frames {
|
||||||
|
if f.From != rig {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if f.To != civ.AddrController && f.To != 0x00 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
kept = append(kept, f)
|
||||||
|
}
|
||||||
|
if len(kept) != 2 {
|
||||||
|
t.Fatalf("kept %d frames, want 2 (ours + the broadcast)", len(kept))
|
||||||
|
}
|
||||||
|
if kept[0].Cmd != 0xFB {
|
||||||
|
t.Errorf("the acknowledgement was not the first kept frame: % X", kept[0].Cmd)
|
||||||
|
}
|
||||||
|
if kept[1].To != 0x00 {
|
||||||
|
t.Errorf("the transceive broadcast was dropped")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -189,7 +189,7 @@ func NewIcomSerial(portName string, baud, civAddr int, digitalDefault string) *I
|
|||||||
}
|
}
|
||||||
p, err := serial.Open(b.portName, &serial.Mode{BaudRate: b.baud})
|
p, err := serial.Open(b.portName, &serial.Mode{BaudRate: b.baud})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("open %s @ %d baud: %w", b.portName, b.baud, err)
|
return nil, fmt.Errorf("open %s @ %d baud: %w%s", b.portName, b.baud, err, busyHint(b.portName, err))
|
||||||
}
|
}
|
||||||
return p, nil
|
return p, nil
|
||||||
}
|
}
|
||||||
@@ -514,8 +514,21 @@ func (b *IcomSerial) SetFrequency(hz int64) error {
|
|||||||
return fmt.Errorf("invalid frequency")
|
return fmt.Errorf("invalid frequency")
|
||||||
}
|
}
|
||||||
b.lastSetFreq, b.lastSetFreqAt = hz, time.Now()
|
b.lastSetFreq, b.lastSetFreqAt = hz, time.Now()
|
||||||
return b.execIdempotent(fmt.Sprintf("set frequency %d Hz", hz),
|
err := b.execIdempotent(fmt.Sprintf("set frequency %d Hz", hz),
|
||||||
append([]byte{civ.CmdSetFreq}, civ.FreqToBCD(hz)...)...)
|
append([]byte{civ.CmdSetFreq}, civ.FreqToBCD(hz)...)...)
|
||||||
|
// Same reasoning as SetPTT: a lost acknowledgement is not a failed command,
|
||||||
|
// and WSJT-X or JTDX answer a failed set_freq by dropping the link — an
|
||||||
|
// IC-7850 log shows exactly that at 15:16:15, the disconnect four seconds
|
||||||
|
// later. The rig is asked what frequency it is on rather than being called a
|
||||||
|
// failure on the strength of a missing "FB".
|
||||||
|
if err == nil || !errors.Is(err, errIcomAckLost) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if got, rerr := b.readFreq(); rerr == nil && got == hz {
|
||||||
|
applog.Printf("icom: frequency %d Hz not acknowledged, but the rig is on it — treating as done", hz)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *IcomSerial) SetMode(mode string) error {
|
func (b *IcomSerial) SetMode(mode string) error {
|
||||||
@@ -526,8 +539,17 @@ func (b *IcomSerial) SetMode(mode string) error {
|
|||||||
// Set the base mode (keeping the rig's current filter by sending only the
|
// Set the base mode (keeping the rig's current filter by sending only the
|
||||||
// mode byte), then set the data-mode flag for digital modes.
|
// mode byte), then set the data-mode flag for digital modes.
|
||||||
if err := b.execIdempotent("set mode "+mode, civ.CmdSetMode, code); err != nil {
|
if err := b.execIdempotent("set mode "+mode, civ.CmdSetMode, code); err != nil {
|
||||||
|
// A lost acknowledgement is not a refused mode — see SetPTT. The mode is
|
||||||
|
// readable, so ask rather than report a failure that would cost the
|
||||||
|
// digital application its connection.
|
||||||
|
if !errors.Is(err, errIcomAckLost) {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if got, ok := b.readMode(); !ok || got != code {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
applog.Printf("icom: mode %s not acknowledged, but the rig reports it — treating as done", mode)
|
||||||
|
}
|
||||||
dataByte := byte(0)
|
dataByte := byte(0)
|
||||||
if data {
|
if data {
|
||||||
dataByte = 1
|
dataByte = 1
|
||||||
@@ -569,12 +591,43 @@ func (b *IcomSerial) execIdempotent(what string, payload ...byte) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// SetPTT keys or unkeys the transmitter (CI-V 0x1C 0x00).
|
// SetPTT keys or unkeys the transmitter (CI-V 0x1C 0x00).
|
||||||
|
// A lost acknowledgement is NOT proof the rig ignored us, and treating it as one
|
||||||
|
// is expensive: OpsLog fronts a Hamlib rigctl port, so the failure is handed
|
||||||
|
// straight to WSJT-X or JTDX, which answer a failed set_ptt with a Rig Control
|
||||||
|
// Error and drop the link mid-over. An IC-7850 log showed exactly that, three
|
||||||
|
// times in a session, on a CI-V bus with a second controller corrupting frames.
|
||||||
|
//
|
||||||
|
// So when the acknowledgement does not arrive, ASK the rig what it is doing. PTT
|
||||||
|
// is readable (0x1C 0x00), the answer is unambiguous, and a rig that is keyed
|
||||||
|
// received the command whatever became of its reply.
|
||||||
func (b *IcomSerial) SetPTT(on bool) error {
|
func (b *IcomSerial) SetPTT(on bool) error {
|
||||||
state := byte(0)
|
state := byte(0)
|
||||||
if on {
|
if on {
|
||||||
state = 1
|
state = 1
|
||||||
}
|
}
|
||||||
return b.execIdempotent(fmt.Sprintf("PTT %v", on), civ.CmdPTT, civ.SubPTT, state)
|
err := b.execIdempotent(fmt.Sprintf("PTT %v", on), civ.CmdPTT, civ.SubPTT, state)
|
||||||
|
if err == nil || !errors.Is(err, errIcomAckLost) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// A GENEROUS window for the verification, not the poll's 150 ms.
|
||||||
|
//
|
||||||
|
// The rig has just failed to answer twice in 800 ms, and the reason seen on a
|
||||||
|
// real IC-7850 is that it was retuning: JTDX moves the transmit frequency and
|
||||||
|
// keys in the same breath. Asking it again with the short probe timeout would
|
||||||
|
// fail for exactly the same reason and prove nothing.
|
||||||
|
keyed, ok := b.readTXWithin(icomPTTVerifyTimeout)
|
||||||
|
if ok && keyed == on {
|
||||||
|
applog.Printf("icom: PTT %v not acknowledged, but the rig reports it — treating as done", on)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// Logged either way, because "the fix did not work" and "the rig really did
|
||||||
|
// not key" look identical from outside and need telling apart.
|
||||||
|
if ok {
|
||||||
|
applog.Printf("icom: PTT %v not acknowledged, and the rig reports %v — reporting the failure", on, keyed)
|
||||||
|
} else {
|
||||||
|
applog.Printf("icom: PTT %v not acknowledged, and the rig did not answer the check either", on)
|
||||||
|
}
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetPower turns the transceiver on or off (CI-V 0x18). Power-ON is prefixed with
|
// SetPower turns the transceiver on or off (CI-V 0x18). Power-ON is prefixed with
|
||||||
@@ -686,6 +739,19 @@ func (b *IcomSerial) reader(port civTransport, done chan struct{}) {
|
|||||||
if f.From != b.rigAddr {
|
if f.From != b.rigAddr {
|
||||||
continue // echo of our own command
|
continue // echo of our own command
|
||||||
}
|
}
|
||||||
|
// Addressed to US, or broadcast.
|
||||||
|
//
|
||||||
|
// A CI-V bus can carry a second controller — RS-BA1, wfview, another
|
||||||
|
// logger — and the rig answers each of them in turn on the same wire.
|
||||||
|
// Those replies come FROM the rig, so the check above lets them through,
|
||||||
|
// and one can be taken for the answer to our own command: an IC-7850 log
|
||||||
|
// showed "FE FE 01 8E …" (to controller 01) arriving between our PTT
|
||||||
|
// command and its acknowledgement, with bus collisions around it.
|
||||||
|
// Transceive broadcasts (to 0x00) stay welcome — that is how the rig
|
||||||
|
// announces a knob turn.
|
||||||
|
if f.To != civ.AddrController && f.To != 0x00 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
if f.Cmd == civ.CmdScope {
|
if f.Cmd == civ.CmdScope {
|
||||||
b.route(b.specCh, f)
|
b.route(b.specCh, f)
|
||||||
continue
|
continue
|
||||||
@@ -1273,16 +1339,30 @@ func (b *IcomSerial) readTXFreq() (int64, bool) {
|
|||||||
|
|
||||||
// readTX reads the transmit state (CI-V 0x1C 0x00): non-zero data = keyed.
|
// readTX reads the transmit state (CI-V 0x1C 0x00): non-zero data = keyed.
|
||||||
func (b *IcomSerial) readTX() bool {
|
func (b *IcomSerial) readTX() bool {
|
||||||
if err := b.write(civ.CmdPTT, civ.SubPTT); err != nil {
|
on, _ := b.readTXWithin(icomDSPTimeout)
|
||||||
return false
|
return on
|
||||||
}
|
}
|
||||||
f, err := b.recv(icomDSPTimeout, func(d civ.Decoded) bool {
|
|
||||||
|
// icomPTTVerifyTimeout is how long the PTT check waits. Long, deliberately: it
|
||||||
|
// runs only after a command was already given up on, so it costs nothing in the
|
||||||
|
// normal case and everything depends on it in the abnormal one.
|
||||||
|
const icomPTTVerifyTimeout = 700 * time.Millisecond
|
||||||
|
|
||||||
|
// readTXWithin reads the transmit state, reporting whether the rig ANSWERED.
|
||||||
|
//
|
||||||
|
// The two are different questions and the caller usually needs both: "not
|
||||||
|
// transmitting" and "did not say" are the same bool but not the same fact.
|
||||||
|
func (b *IcomSerial) readTXWithin(timeout time.Duration) (on bool, answered bool) {
|
||||||
|
if err := b.write(civ.CmdPTT, civ.SubPTT); err != nil {
|
||||||
|
return false, false
|
||||||
|
}
|
||||||
|
f, err := b.recv(timeout, func(d civ.Decoded) bool {
|
||||||
return d.Cmd == civ.CmdPTT && len(d.Data) >= 2 && d.Data[0] == civ.SubPTT
|
return d.Cmd == civ.CmdPTT && len(d.Data) >= 2 && d.Data[0] == civ.SubPTT
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false
|
return false, false
|
||||||
}
|
}
|
||||||
return f.Data[1] != 0
|
return f.Data[1] != 0, true
|
||||||
}
|
}
|
||||||
|
|
||||||
// readMeter reads a meter (CI-V 0x15) and returns it scaled to 0-100.
|
// readMeter reads a meter (CI-V 0x15) and returns it scaled to 0-100.
|
||||||
|
|||||||
+51
-2
@@ -91,6 +91,23 @@ type Kenwood struct {
|
|||||||
keyWPM int // CW keyer speed, for pacing the KY buffer (see kenwood_cw.go)
|
keyWPM int // CW keyer speed, for pacing the KY buffer (see kenwood_cw.go)
|
||||||
// Commands this rig answered "?;" to — asked once, then never again.
|
// Commands this rig answered "?;" to — asked once, then never again.
|
||||||
unsupported map[string]bool
|
unsupported map[string]bool
|
||||||
|
// noLatch suspends that memory while a refusal is expected to be about
|
||||||
|
// timing rather than capability (see ask).
|
||||||
|
noLatch bool
|
||||||
|
|
||||||
|
// Panel state — the K3/K4 control panel, see kenwood_panel.go. Read on the
|
||||||
|
// same serialised link as everything else, on a slow beat for the settings
|
||||||
|
// and every poll for the meters.
|
||||||
|
panel KenwoodTXState
|
||||||
|
// The icon/status word, for working out which bit says "ATU in line" — see
|
||||||
|
// probeIcons. Kept so only CHANGES are logged.
|
||||||
|
lastIcons string
|
||||||
|
iconProbes int
|
||||||
|
panelCycle int
|
||||||
|
panelLoaded bool
|
||||||
|
metersLogged int
|
||||||
|
powerPeak meterPeak
|
||||||
|
swrPeak meterPeak
|
||||||
|
|
||||||
// rx holds bytes read but not yet consumed, ACROSS calls to ask.
|
// rx holds bytes read but not yet consumed, ACROSS calls to ask.
|
||||||
//
|
//
|
||||||
@@ -210,7 +227,7 @@ func (k *Kenwood) Connect() error {
|
|||||||
if k.host != "" {
|
if k.host != "" {
|
||||||
return fmt.Errorf("kenwood: connect %s: %w", k.host, err)
|
return fmt.Errorf("kenwood: connect %s: %w", k.host, err)
|
||||||
}
|
}
|
||||||
return fmt.Errorf("kenwood: open %s @ %d baud: %w", k.portName, k.baud, err)
|
return fmt.Errorf("kenwood: open %s @ %d baud: %w%s", k.portName, k.baud, err, busyHint(k.portName, err))
|
||||||
}
|
}
|
||||||
p.SetReadTimeout(300 * time.Millisecond)
|
p.SetReadTimeout(300 * time.Millisecond)
|
||||||
k.port = p
|
k.port = p
|
||||||
@@ -256,6 +273,15 @@ func (k *Kenwood) Connect() error {
|
|||||||
// commands back produces the same). Say which of the two it is, and quote
|
// commands back produces the same). Say which of the two it is, and quote
|
||||||
// what came back, because that is the fact that decides where to look.
|
// what came back, because that is the fact that decides where to look.
|
||||||
if seen := k.heard; seen != "" {
|
if seen := k.heard; seen != "" {
|
||||||
|
// Over a NETWORK link, baud means nothing and saying "check the baud
|
||||||
|
// rate" sends the operator to a setting that cannot be the cause.
|
||||||
|
// The usual mistake there is a different protocol on the other end:
|
||||||
|
// Hamlib's rigctld (4532) answers text, so it looks alive and never
|
||||||
|
// replies to ID;. OpsLog itself serves that port under "Share CAT",
|
||||||
|
// which makes it an easy number to reach for.
|
||||||
|
if k.host != "" {
|
||||||
|
return fmt.Errorf("kenwood: %s is sending data but no reply to ID; or IF; — got %q. That end is not speaking the radio's CAT: point this at a serial-over-network bridge or the radio's own raw CAT port, not at Hamlib rigctld (4532)", k.host, seen)
|
||||||
|
}
|
||||||
return fmt.Errorf("kenwood: %s is sending data but no reply to ID; or IF; — got %q. Check the baud rate (set to %d here) and that nothing else is echoing the port", k.where(), seen, k.baud)
|
return fmt.Errorf("kenwood: %s is sending data but no reply to ID; or IF; — got %q. Check the baud rate (set to %d here) and that nothing else is echoing the port", k.where(), seen, k.baud)
|
||||||
}
|
}
|
||||||
if k.host != "" {
|
if k.host != "" {
|
||||||
@@ -299,6 +325,15 @@ func (k *Kenwood) ReadState() (RigState, error) {
|
|||||||
if k.tx && !k.txAt.IsZero() && time.Since(k.txAt) < 30*time.Second {
|
if k.tx && !k.txAt.IsZero() && time.Since(k.txAt) < 30*time.Second {
|
||||||
s := k.lastState
|
s := k.lastState
|
||||||
s.Connected = true
|
s.Connected = true
|
||||||
|
// The panel still has to be told the radio is transmitting, and the
|
||||||
|
// transmit meters still have to be read — this early return used to skip
|
||||||
|
// both. The panel therefore showed MOX unlit while the rig was keyed, so
|
||||||
|
// pressing it again sent ANOTHER transmit command instead of unkeying,
|
||||||
|
// and the K3 stayed in TX. The power and SWR bars never moved either,
|
||||||
|
// for the same reason: the only moment they mean anything is the one
|
||||||
|
// moment they were not being read.
|
||||||
|
k.panel.Transmitting = true
|
||||||
|
k.readTXMeters()
|
||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
raw, err := k.ask("IF;")
|
raw, err := k.ask("IF;")
|
||||||
@@ -422,6 +457,15 @@ func (k *Kenwood) ReadState() (RigState, error) {
|
|||||||
k.curRXFreq = s.RxFreqHz
|
k.curRXFreq = s.RxFreqHz
|
||||||
}
|
}
|
||||||
k.lastState = s // cache for the transmit window, where we can't poll
|
k.lastState = s // cache for the transmit window, where we can't poll
|
||||||
|
// The panel rides on the same poll and the same held mutex: its own reader
|
||||||
|
// would have to take turns on the serial port, and the K3 is slow enough
|
||||||
|
// that two readers taking turns is what makes a dial lag.
|
||||||
|
// f.TX, not k.tx: the radio is the one that knows it is transmitting. k.tx
|
||||||
|
// only records that OPSLOG keyed it, so a carrier raised with the front-panel
|
||||||
|
// PTT, a footswitch or the mic button left the panel showing a receiver — and
|
||||||
|
// the transmit meters, which are read only while transmitting, were never
|
||||||
|
// read at all for anyone who keys the radio by hand.
|
||||||
|
k.readPanel(s.Mode, s.Split, s.FreqHz, f.TX)
|
||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -649,7 +693,12 @@ func (k *Kenwood) ask(cmd string) (string, error) {
|
|||||||
// NOT "unsupported". Latching them off would blind the poll loop for
|
// NOT "unsupported". Latching them off would blind the poll loop for
|
||||||
// good and read as "lost the rig". Only remember the OPTIONAL commands
|
// good and read as "lost the rig". Only remember the OPTIONAL commands
|
||||||
// (FR/FT/…) so the poll loop stops paying a 600 ms timeout for those.
|
// (FR/FT/…) so the poll loop stops paying a 600 ms timeout for those.
|
||||||
if want != "IF" && want != "ID" {
|
// While TRANSMITTING the rig refuses a great deal that it answers
|
||||||
|
// perfectly well on receive, so a "?;" then says nothing about what
|
||||||
|
// the radio supports. Latching it would silence a meter for the rest
|
||||||
|
// of the session on the strength of one badly timed question — and
|
||||||
|
// the meters are read precisely while transmitting.
|
||||||
|
if want != "IF" && want != "ID" && !k.noLatch {
|
||||||
k.unsupported[want] = true
|
k.unsupported[want] = true
|
||||||
debugLog.Printf("kenwood: this rig does not support %q — not asking again", cmd)
|
debugLog.Printf("kenwood: this rig does not support %q — not asking again", cmd)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,652 @@
|
|||||||
|
package cat
|
||||||
|
|
||||||
|
// Elecraft K3/K4 control panel — power, volume, S-meter, SWR, MOX and ATU tune.
|
||||||
|
//
|
||||||
|
// Built on the Kenwood-dialect backend, because a K3 speaks it: plain ASCII,
|
||||||
|
// every command terminated by ';'. What is Elecraft-specific is the vocabulary
|
||||||
|
// below, taken from the K3 Programmer's Reference; the K4 accepts the same set.
|
||||||
|
//
|
||||||
|
// NO K3 WAS AVAILABLE WHILE WRITING THIS, and that shapes it:
|
||||||
|
//
|
||||||
|
// - The commands that SET something are the ones the reference documents
|
||||||
|
// unambiguously and whose effect is visible and reversible (PC, AG, TX/RX).
|
||||||
|
// - The meters are the opposite: their scaling differs between models and
|
||||||
|
// firmware, and a wrongly scaled SWR bar is worse than none — it reports a
|
||||||
|
// good match on a bad antenna. So the raw answers are LOGGED, for a real
|
||||||
|
// radio to settle, and until then the panel says the scaling is provisional.
|
||||||
|
//
|
||||||
|
// SWR is settled: SW; answers three digits in tenths of a ratio ("SW023;" =
|
||||||
|
// 2.3:1), from Elecraft's release note. The power meter is still read from the
|
||||||
|
// bargraph and still provisional.
|
||||||
|
//
|
||||||
|
// The same discipline as the Yaesu meters, which were guessed wrong twice and
|
||||||
|
// only settled when an FTDX10 keyed a carrier at two known power levels.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// KenwoodTXState is what the panel shows.
|
||||||
|
type KenwoodTXState struct {
|
||||||
|
Available bool `json:"available"`
|
||||||
|
Model string `json:"model,omitempty"`
|
||||||
|
Elecraft bool `json:"elecraft"` // a K3/K4 rather than a Kenwood
|
||||||
|
Mode string `json:"mode,omitempty"`
|
||||||
|
|
||||||
|
Transmitting bool `json:"transmitting"`
|
||||||
|
Split bool `json:"split"`
|
||||||
|
SplitTXHz int64 `json:"split_tx_hz"`
|
||||||
|
|
||||||
|
// SMeter is 0-100 for the bar. SMeterRaw is what the rig actually answered,
|
||||||
|
// kept because the scaling is not yet confirmed on a real K3 and a number
|
||||||
|
// nobody can check is worth less than the reading it came from.
|
||||||
|
SMeter int `json:"s_meter"`
|
||||||
|
SMeterRaw int `json:"s_meter_raw"`
|
||||||
|
// PowerMeter is 0-100 while transmitting. SWR is the ratio; 0 means "not
|
||||||
|
// measured", NOT a perfect match.
|
||||||
|
PowerMeter int `json:"power_meter"`
|
||||||
|
SWR float64 `json:"swr"`
|
||||||
|
SWRRaw int `json:"swr_raw"`
|
||||||
|
|
||||||
|
RFPower int `json:"rf_power"` // watts, the PC setting
|
||||||
|
AFGain int `json:"af_gain"` // 0-100
|
||||||
|
RFGain int `json:"rf_gain"` // 0-100
|
||||||
|
MicGain int `json:"mic_gain"` // 0-100
|
||||||
|
Squelch int `json:"squelch"` // 0-100
|
||||||
|
|
||||||
|
// Receive controls. Preamp and attenuator are the K3's single-step ones
|
||||||
|
// (PA/RA); a rig that answers neither leaves them false and the row shows
|
||||||
|
// the state it read, not a state it assumed.
|
||||||
|
Preamp bool `json:"preamp"`
|
||||||
|
Att bool `json:"att"`
|
||||||
|
NB bool `json:"nb"`
|
||||||
|
NR bool `json:"nr"`
|
||||||
|
AGC string `json:"agc,omitempty"` // "OFF", "SLOW", "FAST"
|
||||||
|
// FilterHz is the DSP bandwidth in Hz (the K3 reports it in 10 Hz units).
|
||||||
|
FilterHz int `json:"filter_hz"`
|
||||||
|
// Antenna is 1 or 2 on a K3 with the internal ATU, 0 when the rig does not
|
||||||
|
// answer AN — which is also how the panel knows to hide the row rather than
|
||||||
|
// offer a switch that goes nowhere.
|
||||||
|
Antenna int `json:"antenna"`
|
||||||
|
|
||||||
|
RIT bool `json:"rit"`
|
||||||
|
XIT bool `json:"xit"`
|
||||||
|
// RITOffset is the RIT/XIT offset in Hz — the number the buttons move and
|
||||||
|
// the one an operator is actually reading when they look at RIT at all. A
|
||||||
|
// lit RIT button with no offset beside it says the feature is on and
|
||||||
|
// nothing about where it has put the receiver.
|
||||||
|
RITOffset int `json:"rit_offset"`
|
||||||
|
KeySpeed int `json:"key_speed"` // WPM
|
||||||
|
|
||||||
|
// MetersProvisional says the meter scaling has not been confirmed against a
|
||||||
|
// real radio. The panel says so rather than presenting a guess as a
|
||||||
|
// measurement.
|
||||||
|
MetersProvisional bool `json:"meters_provisional"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// KenwoodPanelController is the K3/K4 panel capability. Separate from
|
||||||
|
// KenwoodController (the CW keyer) so a backend can offer one without the other.
|
||||||
|
type KenwoodPanelController interface {
|
||||||
|
KenwoodState() KenwoodTXState
|
||||||
|
RefreshKenwood() error
|
||||||
|
SetKenwoodPower(int) error
|
||||||
|
SetKenwoodAFGain(int) error
|
||||||
|
SetKenwoodRFGain(int) error
|
||||||
|
SetKenwoodMicGain(int) error
|
||||||
|
SetKenwoodSquelch(int) error
|
||||||
|
SetKenwoodPreamp(bool) error
|
||||||
|
SetKenwoodAtt(bool) error
|
||||||
|
SetKenwoodNB(bool) error
|
||||||
|
SetKenwoodNR(bool) error
|
||||||
|
SetKenwoodAGC(string) error
|
||||||
|
SetKenwoodFilter(int) error
|
||||||
|
SetKenwoodAntenna(int) error
|
||||||
|
SetKenwoodRIT(bool) error
|
||||||
|
SetKenwoodXIT(bool) error
|
||||||
|
NudgeKenwoodRIT(int) error
|
||||||
|
ClearKenwoodRIT() error
|
||||||
|
SetKenwoodTX(bool) error
|
||||||
|
TuneKenwoodATU() error
|
||||||
|
ToggleKenwoodATU() error
|
||||||
|
}
|
||||||
|
|
||||||
|
// kenwoodPanelSlowBeat is how many polls pass between full re-reads of the
|
||||||
|
// settings. The meters are read every poll; a power setting is not.
|
||||||
|
const kenwoodPanelSlowBeat = 8
|
||||||
|
|
||||||
|
// KenwoodState returns the panel snapshot.
|
||||||
|
func (k *Kenwood) KenwoodState() KenwoodTXState {
|
||||||
|
k.mu.Lock()
|
||||||
|
defer k.mu.Unlock()
|
||||||
|
st := k.panel
|
||||||
|
st.Available = k.port != nil
|
||||||
|
st.Model = k.model
|
||||||
|
st.Elecraft = k.elecraft
|
||||||
|
return st
|
||||||
|
}
|
||||||
|
|
||||||
|
// RefreshKenwood forces the settings to be re-read on the next poll, so a value
|
||||||
|
// changed on the radio's own front panel shows up at once.
|
||||||
|
func (k *Kenwood) RefreshKenwood() error {
|
||||||
|
k.mu.Lock()
|
||||||
|
k.panelCycle = kenwoodPanelSlowBeat
|
||||||
|
k.mu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// readPanel refreshes the panel. Called from ReadState with the mutex HELD, so
|
||||||
|
// it shares the same serialised link as everything else.
|
||||||
|
func (k *Kenwood) readPanel(mode string, split bool, txHz int64, txNow bool) {
|
||||||
|
k.panel.Mode = mode
|
||||||
|
k.panel.Split = split
|
||||||
|
k.panel.SplitTXHz = 0
|
||||||
|
if split {
|
||||||
|
k.panel.SplitTXHz = txHz
|
||||||
|
}
|
||||||
|
k.panel.Transmitting = k.tx || txNow
|
||||||
|
k.panel.MetersProvisional = true
|
||||||
|
|
||||||
|
if k.panel.Transmitting {
|
||||||
|
k.readTXMeters()
|
||||||
|
} else {
|
||||||
|
// Cleared, not frozen: a power bar left standing after the carrier drops
|
||||||
|
// reads as a live transmission.
|
||||||
|
k.panel.PowerMeter = 0
|
||||||
|
k.panel.SWR, k.panel.SWRRaw = 0, 0
|
||||||
|
k.powerPeak, k.swrPeak = meterPeak{}, meterPeak{}
|
||||||
|
// The S-meter only means anything while receiving.
|
||||||
|
if v, ok := k.askNum("SM;", "SM", 4); ok {
|
||||||
|
k.panel.SMeterRaw = v
|
||||||
|
k.panel.SMeter = kenwoodSMeterPercent(v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
k.panelCycle++
|
||||||
|
if k.panelLoaded && k.panelCycle < kenwoodPanelSlowBeat {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
k.panelCycle = 0
|
||||||
|
k.panelLoaded = true
|
||||||
|
k.readPanelSettings()
|
||||||
|
}
|
||||||
|
|
||||||
|
// readPanelSettings re-reads what a knob can change.
|
||||||
|
func (k *Kenwood) readPanelSettings() {
|
||||||
|
// PC is watts on both the K3 and the Kenwoods — a setting, not a scale.
|
||||||
|
if v, ok := k.askNum("PC;", "PC", 3); ok {
|
||||||
|
k.panel.RFPower = v
|
||||||
|
}
|
||||||
|
// AF gain. The K3 answers three digits 000-255; a Kenwood answers AG0nnn,
|
||||||
|
// which is why the plain form is tried first and the addressed one after.
|
||||||
|
if v, ok := k.askNum("AG;", "AG", 3); ok {
|
||||||
|
k.panel.AFGain = scale255(v)
|
||||||
|
} else if v, ok := k.askNum("AG0;", "AG0", 3); ok {
|
||||||
|
k.panel.AFGain = scale255(v)
|
||||||
|
}
|
||||||
|
// RF gain. The K3 counts 000-250 in dB of reduction; a Kenwood uses the
|
||||||
|
// familiar 0-255. Both are shown as a percentage, so the slider means the
|
||||||
|
// same thing on either radio.
|
||||||
|
if v, ok := k.askNum("RG;", "RG", 3); ok {
|
||||||
|
k.panel.RFGain = scalePercent(v, k.rfGainFull())
|
||||||
|
}
|
||||||
|
if v, ok := k.askNum("MG;", "MG", 3); ok {
|
||||||
|
k.panel.MicGain = scalePercent(v, k.micGainFull())
|
||||||
|
}
|
||||||
|
if v, ok := k.askNum("SQ;", "SQ", 3); ok {
|
||||||
|
k.panel.Squelch = scalePercent(v, k.squelchFull())
|
||||||
|
} else if v, ok := k.askNum("SQ0;", "SQ0", 3); ok {
|
||||||
|
k.panel.Squelch = scale255(v)
|
||||||
|
}
|
||||||
|
if v, ok := k.askNum("PA;", "PA", 1); ok {
|
||||||
|
k.panel.Preamp = v != 0
|
||||||
|
}
|
||||||
|
if v, ok := k.askNum("RA;", "RA", 2); ok {
|
||||||
|
k.panel.Att = v != 0
|
||||||
|
}
|
||||||
|
if v, ok := k.askNum("NB;", "NB", 1); ok {
|
||||||
|
k.panel.NB = v != 0
|
||||||
|
}
|
||||||
|
if v, ok := k.askNum("NR;", "NR", 1); ok {
|
||||||
|
k.panel.NR = v != 0
|
||||||
|
}
|
||||||
|
if v, ok := k.askNum("GT;", "GT", 3); ok {
|
||||||
|
k.panel.AGC = kenwoodAGCName(v)
|
||||||
|
}
|
||||||
|
// Filter width. The K3 answers BW in 10 Hz units (BW0270 = 2.7 kHz); a
|
||||||
|
// Kenwood that does not implement it says nothing and the row stays as it
|
||||||
|
// was rather than showing a zero-width filter.
|
||||||
|
if v, ok := k.askNum("BW;", "BW", 4); ok && v > 0 {
|
||||||
|
k.panel.FilterHz = v * 10
|
||||||
|
}
|
||||||
|
// Antenna. Only a K3 with the internal ATU answers; 0 means "this radio has
|
||||||
|
// no antenna switching", which is what hides the row.
|
||||||
|
if v, ok := k.askNum("AN;", "AN", 1); ok {
|
||||||
|
k.panel.Antenna = v
|
||||||
|
}
|
||||||
|
if v, ok := k.askNum("RT;", "RT", 1); ok {
|
||||||
|
k.panel.RIT = v != 0
|
||||||
|
}
|
||||||
|
if v, ok := k.askNum("XT;", "XT", 1); ok {
|
||||||
|
k.panel.XIT = v != 0
|
||||||
|
}
|
||||||
|
// RO carries a sign, so it is read as a whole rather than through askNum.
|
||||||
|
if r, err := k.ask("RO;"); err == nil {
|
||||||
|
if hz, ok := parseKenwoodOffset(r); ok {
|
||||||
|
k.panel.RITOffset = hz
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if v, ok := k.askNum("KS;", "KS", 3); ok {
|
||||||
|
k.panel.KeySpeed = v
|
||||||
|
}
|
||||||
|
k.probeIcons()
|
||||||
|
}
|
||||||
|
|
||||||
|
// The full-scale value of the analogue controls differs between an Elecraft and
|
||||||
|
// a Kenwood, and using one rig's scale on the other silently halves or doubles
|
||||||
|
// every setting. Kept as three small functions rather than a table so each one
|
||||||
|
// carries the range it comes from.
|
||||||
|
func (k *Kenwood) rfGainFull() int {
|
||||||
|
if k.elecraft {
|
||||||
|
return 250 // K3: 000-250, dB of reduction
|
||||||
|
}
|
||||||
|
return 255
|
||||||
|
}
|
||||||
|
|
||||||
|
func (k *Kenwood) micGainFull() int {
|
||||||
|
if k.elecraft {
|
||||||
|
return 60 // K3: 000-060
|
||||||
|
}
|
||||||
|
return 255
|
||||||
|
}
|
||||||
|
|
||||||
|
func (k *Kenwood) squelchFull() int {
|
||||||
|
if k.elecraft {
|
||||||
|
return 29 // K3: 000-029
|
||||||
|
}
|
||||||
|
return 255
|
||||||
|
}
|
||||||
|
|
||||||
|
// scalePercent turns a raw value into 0-100 against its own full scale.
|
||||||
|
func scalePercent(v, full int) int {
|
||||||
|
if full <= 0 || v <= 0 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
if v >= full {
|
||||||
|
return 100
|
||||||
|
}
|
||||||
|
return v * 100 / full
|
||||||
|
}
|
||||||
|
|
||||||
|
// kenwoodAGCName decodes GT. The K3 answers 000 (off), 002 (slow) or 004
|
||||||
|
// (fast); a Kenwood uses the same three values for the same three states.
|
||||||
|
func kenwoodAGCName(v int) string {
|
||||||
|
switch {
|
||||||
|
case v == 0:
|
||||||
|
return "OFF"
|
||||||
|
case v <= 2:
|
||||||
|
return "SLOW"
|
||||||
|
default:
|
||||||
|
return "FAST"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// kenwoodAGCValue is the inverse, for the buttons.
|
||||||
|
func kenwoodAGCValue(name string) int {
|
||||||
|
switch strings.ToUpper(strings.TrimSpace(name)) {
|
||||||
|
case "OFF":
|
||||||
|
return 0
|
||||||
|
case "SLOW":
|
||||||
|
return 2
|
||||||
|
default:
|
||||||
|
return 4
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// kenwoodMeterProbes are the candidate meter commands, asked once per
|
||||||
|
// transmission burst so a real radio can settle what they mean.
|
||||||
|
//
|
||||||
|
// They are NOT interchangeable — BG is a bargraph position, SM during transmit
|
||||||
|
// is something else again — which is exactly why the log records which one
|
||||||
|
// answered and what it said, next to the power SETTING: the meter that tracks a
|
||||||
|
// known carrier at two different power levels is the power meter, and no amount
|
||||||
|
// of reading the reference settles that as well as one transmission does.
|
||||||
|
// SW is no longer among them: it is known, read above, and asking again during
|
||||||
|
// a transmission costs a round trip on the one link the carrier depends on.
|
||||||
|
var kenwoodMeterProbes = []string{"SM;", "SMH;", "BG;", "PO;", "TQ;"}
|
||||||
|
|
||||||
|
// readTXMeters reads the transmit meters.
|
||||||
|
func (k *Kenwood) readTXMeters() {
|
||||||
|
now := time.Now()
|
||||||
|
// Refusals here are about WHEN the question was asked, not about what the
|
||||||
|
// radio can do: a K3 says "?;" to plenty while the carrier is up.
|
||||||
|
k.noLatch = true
|
||||||
|
defer func() { k.noLatch = false }()
|
||||||
|
if v, ok := k.askNum("BG;", "BG", 2); ok {
|
||||||
|
k.panel.PowerMeter = k.powerPeak.update(kenwoodBargraphPercent(v), now)
|
||||||
|
}
|
||||||
|
// SW; — SETTLED, from Elecraft's own release note: three digits, tenths of a
|
||||||
|
// ratio. "SW023;" is 2.3:1, and "SW999;" is the 99.9:1 it reports instead of
|
||||||
|
// infinity. This was reading FOUR digits, so every answer failed to parse
|
||||||
|
// and the bar stayed empty — which is why a tester saw no SWR at all.
|
||||||
|
if v, ok := k.askNum("SW;", "SW", 3); ok {
|
||||||
|
k.panel.SWRRaw = v
|
||||||
|
if v > 0 {
|
||||||
|
k.panel.SWR = float64(k.swrPeak.update(v, now)) / 10
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if k.metersLogged >= 20 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
k.metersLogged++
|
||||||
|
// The RAW answers, not parsed numbers: a command that answers in a shape we
|
||||||
|
// did not expect is the interesting case, and a parsed "-" hides it behind
|
||||||
|
// the same dash as a command the radio refused.
|
||||||
|
raw := make([]string, 0, len(kenwoodMeterProbes))
|
||||||
|
for _, cmd := range kenwoodMeterProbes {
|
||||||
|
if r, err := k.ask(cmd); err == nil {
|
||||||
|
raw = append(raw, strings.TrimSuffix(cmd, ";")+"→"+strings.TrimSuffix(r, ";"))
|
||||||
|
} else {
|
||||||
|
raw = append(raw, strings.TrimSuffix(cmd, ";")+"→refused")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
debugLog.Printf("kenwood: TX meters at PC=%dW: %s (compare two power settings, and a known SWR)",
|
||||||
|
k.panel.RFPower, strings.Join(raw, " "))
|
||||||
|
}
|
||||||
|
|
||||||
|
// kenwoodSMeterPercent turns the S-meter answer into a bar percentage.
|
||||||
|
//
|
||||||
|
// The K3 reports 0-21 across S0…S9+60, which is not a linear dB scale but is
|
||||||
|
// what its own display shows — and matching the radio's own bar is something an
|
||||||
|
// operator can check at a glance. A Kenwood answers 0-30 on the same command;
|
||||||
|
// both are covered by clamping rather than by guessing which rig is on the
|
||||||
|
// other end.
|
||||||
|
func kenwoodSMeterPercent(v int) int {
|
||||||
|
switch {
|
||||||
|
case v <= 0:
|
||||||
|
return 0
|
||||||
|
case v >= 30:
|
||||||
|
return 100
|
||||||
|
}
|
||||||
|
return v * 100 / 21
|
||||||
|
}
|
||||||
|
|
||||||
|
// kenwoodBargraphPercent scales the K3 bargraph (0-12 segments) to the bar.
|
||||||
|
func kenwoodBargraphPercent(v int) int {
|
||||||
|
switch {
|
||||||
|
case v <= 0:
|
||||||
|
return 0
|
||||||
|
case v >= 12:
|
||||||
|
return 100
|
||||||
|
}
|
||||||
|
return v * 100 / 12
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetKenwoodPower sets the transmit power, in watts.
|
||||||
|
//
|
||||||
|
// A K3 takes PC000-110: 110 rather than 100 because the radio will make a
|
||||||
|
// little over its rated output and the reference says so. A Kenwood of the
|
||||||
|
// TS-890 sort goes to 200, so the ceiling follows the radio rather than being
|
||||||
|
// one number that is wrong for one of them.
|
||||||
|
func (k *Kenwood) SetKenwoodPower(w int) error {
|
||||||
|
max := 200
|
||||||
|
if k.elecraft {
|
||||||
|
max = 110
|
||||||
|
}
|
||||||
|
if w < 0 {
|
||||||
|
w = 0
|
||||||
|
}
|
||||||
|
if w > max {
|
||||||
|
w = max
|
||||||
|
}
|
||||||
|
return k.setPanel(fmt.Sprintf("PC%03d;", w))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetKenwoodAFGain sets the volume, 0-100, scaled to the rig's 0-255.
|
||||||
|
func (k *Kenwood) SetKenwoodAFGain(p int) error {
|
||||||
|
if p < 0 {
|
||||||
|
p = 0
|
||||||
|
}
|
||||||
|
if p > 100 {
|
||||||
|
p = 100
|
||||||
|
}
|
||||||
|
return k.setPanel(fmt.Sprintf("AG%03d;", p*255/100))
|
||||||
|
}
|
||||||
|
|
||||||
|
// probeIcons logs the K3's icon/status word whenever it changes.
|
||||||
|
//
|
||||||
|
// There is no command that asks "is the ATU in line": the reference says the
|
||||||
|
// front-panel switch functions show up as icon changes readable through IC (or
|
||||||
|
// DS), which means the answer is a bit in a word nobody here can name yet. So
|
||||||
|
// the word is logged when it changes, and an operator toggling the ATU while
|
||||||
|
// watching the log hands us the bit — after which the ATU button can light up
|
||||||
|
// honestly instead of guessing from what it last sent.
|
||||||
|
func (k *Kenwood) probeIcons() {
|
||||||
|
if k.iconProbes >= 40 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
r, err := k.ask("IC;")
|
||||||
|
if err != nil {
|
||||||
|
k.iconProbes = 40 // this rig has no IC; stop asking
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if r == k.lastIcons {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
k.lastIcons = r
|
||||||
|
k.iconProbes++
|
||||||
|
debugLog.Printf("kenwood: icon status changed → %s (toggle ATU/PRE/ATT while watching this line to name the bits)", r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetKenwoodRFGain sets the RF gain, 0-100 of the rig's own scale.
|
||||||
|
func (k *Kenwood) SetKenwoodRFGain(p int) error {
|
||||||
|
return k.setPanel(fmt.Sprintf("RG%03d;", clampPercentTo(p, k.rfGainFull())))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (k *Kenwood) SetKenwoodMicGain(p int) error {
|
||||||
|
return k.setPanel(fmt.Sprintf("MG%03d;", clampPercentTo(p, k.micGainFull())))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (k *Kenwood) SetKenwoodSquelch(p int) error {
|
||||||
|
return k.setPanel(fmt.Sprintf("SQ%03d;", clampPercentTo(p, k.squelchFull())))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (k *Kenwood) SetKenwoodPreamp(on bool) error {
|
||||||
|
return k.setPanel(fmt.Sprintf("PA%d;", boolDigit(on)))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetKenwoodAtt switches the attenuator. Two digits: the K3 reads RA01 as its
|
||||||
|
// single 10 dB pad, and a Kenwood with several steps takes the first one.
|
||||||
|
func (k *Kenwood) SetKenwoodAtt(on bool) error {
|
||||||
|
if on {
|
||||||
|
return k.setPanel("RA01;")
|
||||||
|
}
|
||||||
|
return k.setPanel("RA00;")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (k *Kenwood) SetKenwoodNB(on bool) error {
|
||||||
|
return k.setPanel(fmt.Sprintf("NB%d;", boolDigit(on)))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (k *Kenwood) SetKenwoodNR(on bool) error {
|
||||||
|
return k.setPanel(fmt.Sprintf("NR%d;", boolDigit(on)))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (k *Kenwood) SetKenwoodAGC(name string) error {
|
||||||
|
return k.setPanel(fmt.Sprintf("GT%03d;", kenwoodAGCValue(name)))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetKenwoodFilter sets the DSP bandwidth in Hz — sent in the K3's 10 Hz units.
|
||||||
|
func (k *Kenwood) SetKenwoodFilter(hz int) error {
|
||||||
|
if hz < 50 {
|
||||||
|
hz = 50
|
||||||
|
}
|
||||||
|
if hz > 4000 {
|
||||||
|
hz = 4000
|
||||||
|
}
|
||||||
|
return k.setPanel(fmt.Sprintf("BW%04d;", hz/10))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetKenwoodAntenna selects antenna 1 or 2 (a K3 with the internal ATU).
|
||||||
|
func (k *Kenwood) SetKenwoodAntenna(n int) error {
|
||||||
|
if n < 1 {
|
||||||
|
n = 1
|
||||||
|
}
|
||||||
|
if n > 2 {
|
||||||
|
n = 2
|
||||||
|
}
|
||||||
|
return k.setPanel(fmt.Sprintf("AN%d;", n))
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseKenwoodOffset reads "RO+0100;" / "RO-0250;" into Hz.
|
||||||
|
func parseKenwoodOffset(frame string) (int, bool) {
|
||||||
|
body := strings.TrimSuffix(strings.TrimPrefix(frame, "RO"), ";")
|
||||||
|
if len(body) < 2 {
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
sign := 1
|
||||||
|
switch body[0] {
|
||||||
|
case '-':
|
||||||
|
sign = -1
|
||||||
|
body = body[1:]
|
||||||
|
case '+':
|
||||||
|
body = body[1:]
|
||||||
|
}
|
||||||
|
n, err := strconv.Atoi(strings.TrimSpace(body))
|
||||||
|
if err != nil {
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
return sign * n, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// NudgeKenwoodRIT moves the RIT/XIT offset by delta Hz.
|
||||||
|
//
|
||||||
|
// The offset is SET rather than stepped, because RO is where the radio keeps
|
||||||
|
// it and stepping commands differ across the family. The panel's own reading is
|
||||||
|
// the starting point, so two quick presses do not both start from the same
|
||||||
|
// stale value.
|
||||||
|
func (k *Kenwood) NudgeKenwoodRIT(delta int) error {
|
||||||
|
k.mu.Lock()
|
||||||
|
cur := k.panel.RITOffset
|
||||||
|
k.mu.Unlock()
|
||||||
|
next := cur + delta
|
||||||
|
// A pile-up is chased with a few hundred hertz of RIT; ±5 kHz is already
|
||||||
|
// past anything an offset is for, and past what the rig accepts.
|
||||||
|
if next > 5000 {
|
||||||
|
next = 5000
|
||||||
|
}
|
||||||
|
if next < -5000 {
|
||||||
|
next = -5000
|
||||||
|
}
|
||||||
|
sign := "+"
|
||||||
|
if next < 0 {
|
||||||
|
sign = "-"
|
||||||
|
}
|
||||||
|
mag := next
|
||||||
|
if mag < 0 {
|
||||||
|
mag = -mag
|
||||||
|
}
|
||||||
|
k.mu.Lock()
|
||||||
|
k.panel.RITOffset = next // optimistic, like the sliders
|
||||||
|
k.mu.Unlock()
|
||||||
|
return k.setPanel(fmt.Sprintf("RO%s%04d;", sign, mag))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (k *Kenwood) SetKenwoodRIT(on bool) error {
|
||||||
|
return k.setPanel(fmt.Sprintf("RT%d;", boolDigit(on)))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (k *Kenwood) SetKenwoodXIT(on bool) error {
|
||||||
|
return k.setPanel(fmt.Sprintf("XT%d;", boolDigit(on)))
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClearKenwoodRIT zeroes the RIT/XIT offset, both at once — which is what RC
|
||||||
|
// does and what the operator means by "clear it".
|
||||||
|
func (k *Kenwood) ClearKenwoodRIT() error {
|
||||||
|
return k.setPanel("RC;")
|
||||||
|
}
|
||||||
|
|
||||||
|
// clampPercentTo maps 0-100 onto a rig's own full scale.
|
||||||
|
func clampPercentTo(p, full int) int {
|
||||||
|
if p < 0 {
|
||||||
|
p = 0
|
||||||
|
}
|
||||||
|
if p > 100 {
|
||||||
|
p = 100
|
||||||
|
}
|
||||||
|
return p * full / 100
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetKenwoodTX keys or unkeys the transmitter — the panel's MOX.
|
||||||
|
//
|
||||||
|
// Goes through SetPTT rather than writing TX;/RX; here, so the backend's own
|
||||||
|
// idea of transmitting stays true: it suppresses polling while the carrier is
|
||||||
|
// up, and a panel that keyed behind its back would leave it polling a rig that
|
||||||
|
// answers "?;" to everything.
|
||||||
|
func (k *Kenwood) SetKenwoodTX(on bool) error {
|
||||||
|
return k.SetPTT(on)
|
||||||
|
}
|
||||||
|
|
||||||
|
// The K3 has no dedicated "tune" command: the reference exposes the front panel
|
||||||
|
// instead, through SWT (tap) and SWH (hold) with a switch number from Table 7.
|
||||||
|
// Switch 19 is the ATU row — TAP starts a tuning cycle, HOLD puts the tuner in
|
||||||
|
// or out of line.
|
||||||
|
//
|
||||||
|
// It was written as SWT20 first, from memory of the reference rather than from
|
||||||
|
// the table, and 20 is not an ATU switch at all. Corrected against Table 7 of
|
||||||
|
// the K3 Programmer's Reference, which an operator read out for us. Every send
|
||||||
|
// is still logged: a switch-emulation command presses a real button on a real
|
||||||
|
// front panel, so what OpsLog sent must be recoverable afterwards.
|
||||||
|
const (
|
||||||
|
kenwoodATUTune = "SWT19;" // tap ATU TUNE — start a tuning cycle
|
||||||
|
kenwoodATUToggle = "SWH19;" // hold ATU — tuner in line / bypassed
|
||||||
|
)
|
||||||
|
|
||||||
|
// TuneKenwoodATU starts an ATU tuning cycle.
|
||||||
|
func (k *Kenwood) TuneKenwoodATU() error {
|
||||||
|
debugLog.Printf("kenwood: ATU tune — sending %q (K3 Table 7: tap of the ATU TUNE switch)", kenwoodATUTune)
|
||||||
|
return k.setPanel(kenwoodATUTune)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ToggleKenwoodATU puts the tuner in line or bypasses it — the HOLD of the same
|
||||||
|
// switch, which is how it is done on the radio itself.
|
||||||
|
func (k *Kenwood) ToggleKenwoodATU() error {
|
||||||
|
debugLog.Printf("kenwood: ATU in/out — sending %q (K3 Table 7: hold of the ATU switch)", kenwoodATUToggle)
|
||||||
|
return k.setPanel(kenwoodATUToggle)
|
||||||
|
}
|
||||||
|
|
||||||
|
// setPanel writes one command and schedules a settings re-read, so the panel
|
||||||
|
// shows what the radio did rather than what it was asked to do.
|
||||||
|
func (k *Kenwood) setPanel(cmd string) error {
|
||||||
|
k.mu.Lock()
|
||||||
|
defer k.mu.Unlock()
|
||||||
|
if k.port == nil {
|
||||||
|
return fmt.Errorf("kenwood: not connected")
|
||||||
|
}
|
||||||
|
if err := k.write(cmd); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
k.panelCycle = kenwoodPanelSlowBeat // re-read on the next poll
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// askNum asks a command and parses its numeric body. ask() already remembers
|
||||||
|
// what this rig answered "?;" to and refuses to ask it again, so an unsupported
|
||||||
|
// meter costs one timeout for the life of the session, not one per poll.
|
||||||
|
func (k *Kenwood) askNum(cmd, prefix string, digits int) (int, bool) {
|
||||||
|
r, err := k.ask(cmd)
|
||||||
|
if err != nil {
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
body := strings.TrimSuffix(strings.TrimPrefix(r, prefix), ";")
|
||||||
|
if len(body) < digits {
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
n, err := strconv.Atoi(strings.TrimSpace(body[:digits]))
|
||||||
|
if err != nil {
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
return n, true
|
||||||
|
}
|
||||||
@@ -500,10 +500,30 @@ func (o *OmniRig) SetFrequency(hz int64) error {
|
|||||||
// deliberately; a spot click is a request to change frequency, not to change
|
// deliberately; a spot click is a request to change frequency, not to change
|
||||||
// VFO. On SUB the direct FreqB write below does the whole job.
|
// VFO. On SUB the direct FreqB write below does the whole job.
|
||||||
onSubVFO := vfo == "B" || vfo == "BB" || vfo == "BA"
|
onSubVFO := vfo == "B" || vfo == "BB" || vfo == "BA"
|
||||||
|
// …and NEVER on a Yaesu.
|
||||||
|
//
|
||||||
|
// On Yaesu the call is useless at best: an FT-891 logged "SetSimplexMode OK"
|
||||||
|
// on every spot click while FreqA never moved (see below — the direct property
|
||||||
|
// write is what actually tunes these rigs). On an FT-2000 it is worse than
|
||||||
|
// useless. From a log of one QSY, before and after the call:
|
||||||
|
//
|
||||||
|
// Vfo="AB"(0x80) Split=0x10000 (off) → the operator's state
|
||||||
|
// Vfo="BA"(0x100) Split=0x8000 (ON) → after SetSimplexMode
|
||||||
|
//
|
||||||
|
// The rig-agnostic "receive and transmit HERE, simplex" method turned split ON
|
||||||
|
// and moved reception to VFO B, which is exactly what the operator reported:
|
||||||
|
// OpsLog showing B instead of A. OpsLog was not misreading the radio — it was
|
||||||
|
// reading it correctly after having moved it itself.
|
||||||
|
//
|
||||||
|
// Restricted to Yaesu because that is where the evidence is: on Icom the call
|
||||||
|
// is authoritative and the direct write is the unreliable one.
|
||||||
|
isYaesu := isYaesuRig(rigType)
|
||||||
simplexOK := false
|
simplexOK := false
|
||||||
switch {
|
switch {
|
||||||
case onSubVFO:
|
case onSubVFO:
|
||||||
debugLog.Printf("OmniRig.SetFrequency: on VFO %q — skipping SetSimplexMode so the rig stays on SUB", vfo)
|
debugLog.Printf("OmniRig.SetFrequency: on VFO %q — skipping SetSimplexMode so the rig stays on SUB", vfo)
|
||||||
|
case isYaesu:
|
||||||
|
debugLog.Printf("OmniRig.SetFrequency: %q is a Yaesu — skipping SetSimplexMode (a no-op on some, and on an FT-2000 it turns split on and jumps to VFO B); the direct write below does the work", rigType)
|
||||||
default:
|
default:
|
||||||
if _, err := oleutil.CallMethod(o.rig, "SetSimplexMode", int32(hz32)); err == nil {
|
if _, err := oleutil.CallMethod(o.rig, "SetSimplexMode", int32(hz32)); err == nil {
|
||||||
simplexOK = true
|
simplexOK = true
|
||||||
|
|||||||
@@ -125,3 +125,24 @@ func TestOmniRigWriteTarget(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetSimplexMode is skipped on Yaesu, and that is not a preference.
|
||||||
|
//
|
||||||
|
// On an FT-891 it returned OK on every spot click while the rig never moved. On
|
||||||
|
// an FT-2000 it did something worse — a log of one QSY shows the state going
|
||||||
|
// from Vfo="AB" split off to Vfo="BA" split ON, so the operator's reception
|
||||||
|
// jumped to VFO B and OpsLog, reading the radio correctly, displayed B. The
|
||||||
|
// direct FreqA/Freq write does the tuning on these rigs.
|
||||||
|
func TestYaesuRigsAreRecognisedForTheSimplexSkip(t *testing.T) {
|
||||||
|
for _, yes := range []string{"FT-2000", "FT-891", "FTDX10", "ftdx101", " FT-991A "} {
|
||||||
|
if !isYaesuRig(yes) {
|
||||||
|
t.Errorf("%q not recognised as a Yaesu — SetSimplexMode would still be called on it", yes)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Everything else keeps the call: on Icom it is the authoritative one.
|
||||||
|
for _, no := range []string{"IC-7610", "TS-590", "K3", "", "Flex-6600"} {
|
||||||
|
if isYaesuRig(no) {
|
||||||
|
t.Errorf("%q wrongly treated as a Yaesu", no)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package cat
|
||||||
|
|
||||||
|
// "Serial port busy" is a true statement that helps nobody.
|
||||||
|
//
|
||||||
|
// A COM port has exactly one owner, and when a rig's port is refused the owner
|
||||||
|
// is almost always another program on the same desktop — most often OmniRig,
|
||||||
|
// which stays resident once any application has activated it and keeps the port
|
||||||
|
// of the rig configured in it. An operator switching from OmniRig to a native
|
||||||
|
// backend therefore hits this the moment they save: OpsLog is now asking for a
|
||||||
|
// port OmniRig never let go of. The message named none of that.
|
||||||
|
//
|
||||||
|
// It also happens the other way round, and the wording says so rather than
|
||||||
|
// accusing: a digital application (WSJT-X, JTDX, MSHV) configured on the rig's
|
||||||
|
// port directly, rather than through OpsLog's CAT sharing, holds it just as
|
||||||
|
// firmly.
|
||||||
|
|
||||||
|
import "strings"
|
||||||
|
|
||||||
|
// busyHint returns a sentence to append to an open error, or "" when the error
|
||||||
|
// is not about the port being taken.
|
||||||
|
//
|
||||||
|
// Deliberately not a wrapped error: this is advice for a human reading a log,
|
||||||
|
// and it must not change how any caller compares the error.
|
||||||
|
func busyHint(port string, err error) string {
|
||||||
|
if err == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
msg := strings.ToLower(err.Error())
|
||||||
|
busy := strings.Contains(msg, "busy") ||
|
||||||
|
strings.Contains(msg, "access is denied") ||
|
||||||
|
strings.Contains(msg, "denied") ||
|
||||||
|
strings.Contains(msg, "in use")
|
||||||
|
if !busy {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return " — another program holds " + port +
|
||||||
|
". OmniRig is the usual one (it stays running and keeps the port of the rig configured in it, so a native backend can never have it);" +
|
||||||
|
" a digital application pointed straight at the rig instead of at OpsLog's CAT sharing does the same. Close it, then reconnect."
|
||||||
|
}
|
||||||
+128
-3
@@ -34,6 +34,20 @@ type TCI struct {
|
|||||||
OnSpotClick func(callsign string, freqHz int64)
|
OnSpotClick func(callsign string, freqHz int64)
|
||||||
unhandledSeen map[string]bool // log each unknown TCI message type once
|
unhandledSeen map[string]bool // log each unknown TCI message type once
|
||||||
|
|
||||||
|
// panel is the control-console state — everything the radio announces about
|
||||||
|
// itself that is not frequency or mode. See tci_panel.go.
|
||||||
|
panel tciPanel
|
||||||
|
|
||||||
|
// audio holds the receive-audio stream — see tci_audio.go. TCI carries it
|
||||||
|
// on this same WebSocket, which is what lets a SunSDR record and decode
|
||||||
|
// without a virtual audio cable in the way.
|
||||||
|
audio tciAudio
|
||||||
|
|
||||||
|
// One writer at a time. send() held the lock only long enough to READ conn,
|
||||||
|
// which was enough while every command came from the poll loop — a stream of
|
||||||
|
// audio frames from a second goroutine is not, and gorilla panics on a
|
||||||
|
// concurrent write rather than corrupting the socket quietly.
|
||||||
|
wmu sync.Mutex // serialises writes to the socket (text AND binary)
|
||||||
mu sync.Mutex // guards conn + writes + state
|
mu sync.Mutex // guards conn + writes + state
|
||||||
conn *websocket.Conn
|
conn *websocket.Conn
|
||||||
dialCancel context.CancelFunc // cancels an in-flight Connect dial (Interrupt/Stop)
|
dialCancel context.CancelFunc // cancels an in-flight Connect dial (Interrupt/Stop)
|
||||||
@@ -57,6 +71,13 @@ type TCI struct {
|
|||||||
// never sends TX_ENABLE at all, from being treated as refusing: without a
|
// never sends TX_ENABLE at all, from being treated as refusing: without a
|
||||||
// word from the radio we key and let it decide.
|
// word from the radio we key and let it decide.
|
||||||
txAllowed bool
|
txAllowed bool
|
||||||
|
// txSource is the TRX third argument: "tci" while OpsLog has audio to send,
|
||||||
|
// empty for the operator's microphone. See SetPTT.
|
||||||
|
txSource string
|
||||||
|
// drive is the radio's transmit drive, 0-100. Kept because a quiet
|
||||||
|
// transmission has two possible causes — our level or the radio's — and a
|
||||||
|
// log that names both settles it in one line instead of an evening.
|
||||||
|
drive int
|
||||||
txAllowedKnown bool
|
txAllowedKnown bool
|
||||||
|
|
||||||
lastSig string // last logged state signature (log only on change)
|
lastSig string // last logged state signature (log only on change)
|
||||||
@@ -283,6 +304,22 @@ func (t *TCI) ReadState() (RigState, error) {
|
|||||||
} else {
|
} else {
|
||||||
st.FreqHz = t.freqA
|
st.FreqHz = t.freqA
|
||||||
}
|
}
|
||||||
|
// The transmit meters are asked for, not pushed: TX_POWER and TX_SWR are
|
||||||
|
// read-only commands the radio answers when asked, and asking is only worth
|
||||||
|
// anything while it is keyed. Fired and forgotten from here — the answers
|
||||||
|
// arrive on the reader like everything else — and only while transmitting,
|
||||||
|
// so a receiving station pays nothing for a meter nobody is watching.
|
||||||
|
// Keyed by PTT **or** by TUNE. A tune carrier is exactly when the meters
|
||||||
|
// matter most — it is the carrier an operator is watching an SWR on — and
|
||||||
|
// asking only on t.tx left them at zero for the whole tune, because the
|
||||||
|
// radio reports tuning as its own state and not as a transmission.
|
||||||
|
if t.tx || t.panel.st.Tuning {
|
||||||
|
tx := t
|
||||||
|
go func() {
|
||||||
|
_ = tx.send("tx_power;")
|
||||||
|
_ = tx.send("tx_swr;")
|
||||||
|
}()
|
||||||
|
}
|
||||||
st.Mode = tciModeToADIF(t.mode, t.digitalDefault)
|
st.Mode = tciModeToADIF(t.mode, t.digitalDefault)
|
||||||
if st.FreqHz > 0 {
|
if st.FreqHz > 0 {
|
||||||
st.Band = BandFromHz(st.FreqHz)
|
st.Band = BandFromHz(st.FreqHz)
|
||||||
@@ -330,9 +367,49 @@ func (t *TCI) SetPTT(on bool) error {
|
|||||||
"check the frequency is inside a transmit band and that TX is enabled in ExpertSDR")
|
"check the frequency is inside a transmit band and that TX is enabled in ExpertSDR")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// THE THIRD ARGUMENT NAMES THE AUDIO SOURCE, and it is the whole answer to
|
||||||
|
// "why does the radio ignore what I send it".
|
||||||
|
//
|
||||||
|
// TCI 2.0 §TRX: "The signal for transmitting is always taken from the
|
||||||
|
// microphone selected in the ExpertSDR3. If a third-party software connected
|
||||||
|
// via TCI wants to transmit its audio signal, you must specify the third
|
||||||
|
// argument - TCI." Without it the radio never sends a single chrono frame,
|
||||||
|
// whatever the mode and whatever is configured in its window — which is
|
||||||
|
// exactly what a night of experiments showed and misread as "digital modes
|
||||||
|
// only".
|
||||||
|
//
|
||||||
|
// Sent only when a transmission is ours to feed. A plain trx keeps the
|
||||||
|
// operator's own microphone, which is what every other PTT in OpsLog means.
|
||||||
|
t.mu.Lock()
|
||||||
|
src := t.txSource
|
||||||
|
t.mu.Unlock()
|
||||||
|
if on && src != "" {
|
||||||
|
return t.send(fmt.Sprintf("trx:0,true,%s;", src))
|
||||||
|
}
|
||||||
return t.send(fmt.Sprintf("trx:0,%t;", on))
|
return t.send(fmt.Sprintf("trx:0,%t;", on))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetTXAudioSource says where the radio should take its transmit audio from
|
||||||
|
// while OpsLog keys it: "tci" for the stream this program sends, "" for the
|
||||||
|
// microphone the operator chose in ExpertSDR3.
|
||||||
|
//
|
||||||
|
// Set from the audio settings — it follows the "To radio" device — so keying
|
||||||
|
// for a voice message and keying for anything else behave differently on
|
||||||
|
// purpose: only the first one takes the audio away from the microphone.
|
||||||
|
func (t *TCI) SetTXAudioSource(src string) {
|
||||||
|
t.mu.Lock()
|
||||||
|
changed := t.txSource != src
|
||||||
|
t.txSource = src
|
||||||
|
t.mu.Unlock()
|
||||||
|
if changed {
|
||||||
|
if src == "" {
|
||||||
|
debugLog.Printf("TCI: transmit audio will come from the radio's own microphone")
|
||||||
|
} else {
|
||||||
|
debugLog.Printf("TCI: transmit audio will be taken from %s when OpsLog keys the radio", src)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// send writes a command to the WebSocket (one writer at a time).
|
// send writes a command to the WebSocket (one writer at a time).
|
||||||
func (t *TCI) send(cmd string) error {
|
func (t *TCI) send(cmd string) error {
|
||||||
t.mu.Lock()
|
t.mu.Lock()
|
||||||
@@ -341,6 +418,8 @@ func (t *TCI) send(cmd string) error {
|
|||||||
if c == nil {
|
if c == nil {
|
||||||
return fmt.Errorf("tci: not connected")
|
return fmt.Errorf("tci: not connected")
|
||||||
}
|
}
|
||||||
|
t.wmu.Lock()
|
||||||
|
defer t.wmu.Unlock()
|
||||||
_ = c.SetWriteDeadline(time.Now().Add(3 * time.Second))
|
_ = c.SetWriteDeadline(time.Now().Add(3 * time.Second))
|
||||||
if err := c.WriteMessage(websocket.TextMessage, []byte(cmd)); err != nil {
|
if err := c.WriteMessage(websocket.TextMessage, []byte(cmd)); err != nil {
|
||||||
debugLog.Printf("TCI: send %q failed: %v", cmd, err)
|
debugLog.Printf("TCI: send %q failed: %v", cmd, err)
|
||||||
@@ -354,10 +433,18 @@ func (t *TCI) send(cmd string) error {
|
|||||||
// connection closes.
|
// connection closes.
|
||||||
func (t *TCI) reader(conn *websocket.Conn) {
|
func (t *TCI) reader(conn *websocket.Conn) {
|
||||||
for {
|
for {
|
||||||
_, data, err := conn.ReadMessage()
|
mt, data, err := conn.ReadMessage()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
// TEXT frames are commands, BINARY frames are streams. The type used to
|
||||||
|
// be ignored and every frame split on ';' — harmless only for as long as
|
||||||
|
// no stream was ever opened, since audio bytes would then have been fed
|
||||||
|
// to the command parser a hundred times a second.
|
||||||
|
if wsMessageIsBinary(mt) {
|
||||||
|
t.handleBinary(data)
|
||||||
|
continue
|
||||||
|
}
|
||||||
// A frame may carry several ";"-terminated commands.
|
// A frame may carry several ";"-terminated commands.
|
||||||
for _, cmd := range strings.Split(string(data), ";") {
|
for _, cmd := range strings.Split(string(data), ";") {
|
||||||
t.handle(strings.TrimSpace(cmd))
|
t.handle(strings.TrimSpace(cmd))
|
||||||
@@ -390,9 +477,32 @@ func (t *TCI) handle(msg string) {
|
|||||||
}
|
}
|
||||||
t.mu.Lock()
|
t.mu.Lock()
|
||||||
defer t.mu.Unlock()
|
defer t.mu.Unlock()
|
||||||
switch strings.ToLower(name) {
|
lower := strings.ToLower(name)
|
||||||
|
// The console's own messages first. Most of them were being logged once as
|
||||||
|
// unhandled and thrown away — the radio has been announcing its drive, its
|
||||||
|
// filters and its noise blanker since the first connection.
|
||||||
|
if t.handlePanel(lower, get, args) {
|
||||||
|
// Still falls through for the few the rig state also needs (split, tune),
|
||||||
|
// which is why this does not return.
|
||||||
|
switch lower {
|
||||||
|
case "split_enable", "trx", "modulation", "vfo":
|
||||||
|
default:
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
switch lower {
|
||||||
case "device":
|
case "device":
|
||||||
t.device = strings.TrimSpace(args)
|
t.device = strings.TrimSpace(args)
|
||||||
|
// The radio ANNOUNCES its audio format at connect —
|
||||||
|
// "audio_stream_sample_type:float32" and "audio_stream_channels:2" — which
|
||||||
|
// is better evidence than anything derived from a frame, and it arrives
|
||||||
|
// before the first frame does. Both were being logged as unhandled.
|
||||||
|
case "audio_stream_sample_type":
|
||||||
|
t.audio.declaredType = strings.TrimSpace(args)
|
||||||
|
case "audio_stream_channels":
|
||||||
|
if n, err := strconv.Atoi(strings.TrimSpace(args)); err == nil && n > 0 && n <= 8 {
|
||||||
|
t.audio.declaredChans = n
|
||||||
|
}
|
||||||
case "ready", "start":
|
case "ready", "start":
|
||||||
t.ready = true
|
t.ready = true
|
||||||
case "stop":
|
case "stop":
|
||||||
@@ -421,7 +531,22 @@ func (t *TCI) handle(msg string) {
|
|||||||
}
|
}
|
||||||
case "trx":
|
case "trx":
|
||||||
if get(0) == "0" {
|
if get(0) == "0" {
|
||||||
|
was := t.tx
|
||||||
t.tx = get(1) == "true"
|
t.tx = get(1) == "true"
|
||||||
|
// Said out loud, every time. The transmit side of TCI can only be
|
||||||
|
// written from a log of a real transmission, and the first one came
|
||||||
|
// back without a single line to say whether the radio had even been
|
||||||
|
// keyed — which left the interesting question, why no transmit
|
||||||
|
// frames, indistinguishable from nobody having pressed anything.
|
||||||
|
if was != t.tx {
|
||||||
|
t.noteTXTransition(t.tx)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case "drive":
|
||||||
|
if get(0) == "0" {
|
||||||
|
if v, err := strconv.Atoi(get(1)); err == nil {
|
||||||
|
t.drive = v
|
||||||
|
}
|
||||||
}
|
}
|
||||||
case "tx_enable":
|
case "tx_enable":
|
||||||
if get(0) == "0" {
|
if get(0) == "0" {
|
||||||
@@ -432,7 +557,7 @@ func (t *TCI) handle(msg string) {
|
|||||||
t.txAllowed, t.txAllowedKnown = allowed, true
|
t.txAllowed, t.txAllowedKnown = allowed, true
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
lname := strings.ToLower(name)
|
lname := lower
|
||||||
// A click on one of our panorama spots comes back as
|
// A click on one of our panorama spots comes back as
|
||||||
// CLICKED_ON_SPOT:<call>,<hz> (legacy)
|
// CLICKED_ON_SPOT:<call>,<hz> (legacy)
|
||||||
// RX_CLICKED_ON_SPOT:<rx>,<ch>,<call>,<hz>
|
// RX_CLICKED_ON_SPOT:<rx>,<ch>,<call>,<hz>
|
||||||
|
|||||||
@@ -0,0 +1,424 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package cat
|
||||||
|
|
||||||
|
// TCI audio — receiving the radio's audio over the same WebSocket that carries
|
||||||
|
// the commands, so a SunSDR needs no virtual audio cable.
|
||||||
|
//
|
||||||
|
// TCI mixes two kinds of frame on one socket: TEXT frames are the commands
|
||||||
|
// ("trx:0,true;"), BINARY frames are streams. A binary frame is a fixed header
|
||||||
|
// followed by float32 samples:
|
||||||
|
//
|
||||||
|
// uint32 receiver which receiver the stream belongs to
|
||||||
|
// uint32 sampleRate Hz
|
||||||
|
// uint32 format 0 = float32
|
||||||
|
// uint32 codec 0 = uncompressed
|
||||||
|
// uint32 crc unused in practice
|
||||||
|
// uint32 length samples in the payload
|
||||||
|
// uint32 type which stream this is (see tciStream*)
|
||||||
|
// uint32 reserved[9]
|
||||||
|
// float32 payload[…] stereo, interleaved
|
||||||
|
//
|
||||||
|
// The stream is asked for with "audio_samplerate:" then "audio_start:<rx>;",
|
||||||
|
// and stopped with "audio_stop:<rx>;".
|
||||||
|
//
|
||||||
|
// NOTHING HERE IS CONFIRMED ON A RADIO YET. The layout above is read from the
|
||||||
|
// TCI documentation, and the stream-type numbers in particular are the sort of
|
||||||
|
// detail a document gets right and a memory of it does not — so every header is
|
||||||
|
// logged for the first few seconds of a session, and the numbers the radio
|
||||||
|
// actually sends will settle it. Same discipline as the Yaesu meters and the
|
||||||
|
// Flex spot feed: measure on the real thing, then write the constant down.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/binary"
|
||||||
|
"fmt"
|
||||||
|
"math"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/gorilla/websocket"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TCI stream types. RX audio is the one this file consumes; the others are
|
||||||
|
// named so a log line says what arrived rather than "type 3".
|
||||||
|
const (
|
||||||
|
tciStreamIQ = 0
|
||||||
|
tciStreamRXAudio = 1
|
||||||
|
tciStreamTXAudio = 2
|
||||||
|
tciStreamTXChrono = 3
|
||||||
|
)
|
||||||
|
|
||||||
|
// tciHeaderWords is the header length in uint32 words (7 named + 9 reserved).
|
||||||
|
const tciHeaderWords = 16
|
||||||
|
|
||||||
|
// tciHeaderBytes is the same in bytes.
|
||||||
|
const tciHeaderBytes = tciHeaderWords * 4
|
||||||
|
|
||||||
|
// tciAudioProbeMax bounds the header logging. Enough frames to see the shape
|
||||||
|
// and the rate; few enough that an evening of listening does not fill the log.
|
||||||
|
const tciAudioProbeMax = 40
|
||||||
|
|
||||||
|
// TCIAudioStatus is what the panel polls while testing the stream.
|
||||||
|
type TCIAudioStatus struct {
|
||||||
|
Running bool `json:"running"`
|
||||||
|
SampleRate int `json:"sample_rate"`
|
||||||
|
Frames int64 `json:"frames"` // binary frames accepted
|
||||||
|
Samples int64 `json:"samples"` // audio samples decoded
|
||||||
|
// PeakDB is the loudest sample of the last second, in dBFS: the one number
|
||||||
|
// that says "audio is really arriving" rather than "a socket is open".
|
||||||
|
PeakDB float64 `json:"peak_db"`
|
||||||
|
LastErr string `json:"last_err,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// tciAudio is the receive-side state, kept on the backend so it lives exactly
|
||||||
|
// as long as the connection does.
|
||||||
|
type tciAudio struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
want bool // the host asked for audio
|
||||||
|
rx int // which receiver
|
||||||
|
rate int
|
||||||
|
frames int64
|
||||||
|
samples int64
|
||||||
|
peak float64
|
||||||
|
peakAt time.Time
|
||||||
|
probeByType map[int]int
|
||||||
|
// countByType counts EVERY frame per stream type, capped by nothing.
|
||||||
|
// The probe above stops logging after forty frames of a type; these keep
|
||||||
|
// counting, so a transmission that produced no transmit frames at all can
|
||||||
|
// be reported as a fact rather than inferred from an absence of lines.
|
||||||
|
countByType map[int]int64
|
||||||
|
lastErr string
|
||||||
|
// widthLogged keeps the one-line note about the sample width to once a
|
||||||
|
// session — it is a fact about the radio, not an event.
|
||||||
|
widthLogged bool
|
||||||
|
// txMark is the per-type frame count when transmission began, so the census
|
||||||
|
// at the end reports the pass rather than the whole session.
|
||||||
|
txMark map[int]int64
|
||||||
|
|
||||||
|
// txFeed supplies the next frame of transmit audio when the radio asks for
|
||||||
|
// one, or is nil when nothing is being sent. Set under this same lock, and
|
||||||
|
// read on the reader goroutine — the radio's request and our answer are two
|
||||||
|
// halves of one exchange and must not straddle a race.
|
||||||
|
txFeed func(samples int) []byte
|
||||||
|
txSent int64
|
||||||
|
txShort int64 // requests the feed could not fill (it had run out)
|
||||||
|
|
||||||
|
// What the radio SAID about its stream at connect (audio_stream_sample_type,
|
||||||
|
// audio_stream_channels). Its own declaration, and it arrives before the
|
||||||
|
// first frame — the frame arithmetic below stays as the check on it rather
|
||||||
|
// than as the only source.
|
||||||
|
declaredType string
|
||||||
|
declaredChans int
|
||||||
|
|
||||||
|
// OnSamples receives decoded MONO samples (the two channels averaged) at
|
||||||
|
// the negotiated rate. Mono because everything downstream — the QSO
|
||||||
|
// recorder, the CW decoder — works on one channel, and a receiver's two
|
||||||
|
// channels carry the same audio.
|
||||||
|
OnSamples func(rate int, samples []float32)
|
||||||
|
}
|
||||||
|
|
||||||
|
// StartTCIAudio asks the radio to stream receiver rx's audio.
|
||||||
|
func (t *TCI) StartTCIAudio(rx, rate int) error {
|
||||||
|
if rate <= 0 {
|
||||||
|
rate = 48000
|
||||||
|
}
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
t.audio.want = true
|
||||||
|
t.audio.rx = rx
|
||||||
|
t.audio.rate = rate
|
||||||
|
t.audio.frames, t.audio.samples, t.audio.peak = 0, 0, 0
|
||||||
|
t.audio.lastErr = ""
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
|
||||||
|
// Sample rate first: the radio applies it to the stream it is about to
|
||||||
|
// open, and asking afterwards restarts the stream on some firmware.
|
||||||
|
if err := t.send(fmt.Sprintf("audio_samplerate:%d;", rate)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// Said rather than assumed. float32 and two channels are the documented
|
||||||
|
// defaults and what this radio streams, but a default is a thing another
|
||||||
|
// program can have changed — they share the radio, not just the protocol —
|
||||||
|
// and a stream arriving in a format the decoder was not expecting is heard
|
||||||
|
// as noise, not as a mistake.
|
||||||
|
_ = t.send("audio_stream_sample_type:float32;")
|
||||||
|
_ = t.send("audio_stream_channels:2;")
|
||||||
|
return t.send(fmt.Sprintf("audio_start:%d;", rx))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIAudioSink installs (or removes) the consumer of the decoded samples.
|
||||||
|
//
|
||||||
|
// One sink, not a list: today it is a test recording, tomorrow the QSO
|
||||||
|
// recorder, and two consumers of a live stream would need a policy about which
|
||||||
|
// one wins that nothing yet has an opinion about.
|
||||||
|
func (t *TCI) SetTCIAudioSink(fn func(rate int, samples []float32)) {
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
t.audio.OnSamples = fn
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// StopTCIAudio closes the stream.
|
||||||
|
func (t *TCI) StopTCIAudio() error {
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
t.audio.want = false
|
||||||
|
rx := t.audio.rx
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
return t.send(fmt.Sprintf("audio_stop:%d;", rx))
|
||||||
|
}
|
||||||
|
|
||||||
|
// TCIAudioStatus reports what has arrived.
|
||||||
|
func (t *TCI) TCIAudioStatus() TCIAudioStatus {
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
defer t.audio.mu.Unlock()
|
||||||
|
st := TCIAudioStatus{
|
||||||
|
Running: t.audio.want,
|
||||||
|
SampleRate: t.audio.rate,
|
||||||
|
Frames: t.audio.frames,
|
||||||
|
Samples: t.audio.samples,
|
||||||
|
LastErr: t.audio.lastErr,
|
||||||
|
}
|
||||||
|
// A peak older than a second is not a level, it is a memory. Reported as
|
||||||
|
// silence rather than left standing, so a stream that has stopped arriving
|
||||||
|
// looks stopped.
|
||||||
|
if time.Since(t.audio.peakAt) < time.Second && t.audio.peak > 0 {
|
||||||
|
st.PeakDB = 20 * math.Log10(t.audio.peak)
|
||||||
|
} else {
|
||||||
|
st.PeakDB = -99
|
||||||
|
}
|
||||||
|
return st
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleBinary decodes one binary WebSocket frame.
|
||||||
|
//
|
||||||
|
// Called from the reader goroutine. Anything malformed is counted and dropped:
|
||||||
|
// a stream frame is not worth breaking the command connection over, and the
|
||||||
|
// command connection is what keeps the radio usable.
|
||||||
|
func (t *TCI) handleBinary(data []byte) {
|
||||||
|
if len(data) < tciHeaderBytes {
|
||||||
|
t.audioErr(fmt.Sprintf("binary frame of %d bytes is shorter than a header", len(data)))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
le := binary.LittleEndian
|
||||||
|
receiver := int(le.Uint32(data[0:]))
|
||||||
|
rate := int(le.Uint32(data[4:]))
|
||||||
|
format := le.Uint32(data[8:])
|
||||||
|
codec := le.Uint32(data[12:])
|
||||||
|
length := int(le.Uint32(data[20:]))
|
||||||
|
stype := int(le.Uint32(data[24:]))
|
||||||
|
|
||||||
|
// Counted PER STREAM TYPE, not overall.
|
||||||
|
//
|
||||||
|
// A single counter was spent on the first forty receive-audio frames, which
|
||||||
|
// arrive twenty-four times a second — so a transmit-chrono or transmit-audio
|
||||||
|
// frame, the two this needs to see before the voice keyer can be written,
|
||||||
|
// would never have been logged at all. They only appear once the operator
|
||||||
|
// keys the radio, long after any global budget is gone.
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
if t.audio.probeByType == nil {
|
||||||
|
t.audio.probeByType = map[int]int{}
|
||||||
|
}
|
||||||
|
if t.audio.countByType == nil {
|
||||||
|
t.audio.countByType = map[int]int64{}
|
||||||
|
}
|
||||||
|
t.audio.countByType[stype]++
|
||||||
|
probe := t.audio.probeByType[stype]
|
||||||
|
if probe < tciAudioProbeMax {
|
||||||
|
t.audio.probeByType[stype]++
|
||||||
|
}
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
if probe < tciAudioProbeMax {
|
||||||
|
debugLog.Printf("TCI: binary frame — rx=%d rate=%d format=%d codec=%d length=%d type=%d payload=%d bytes",
|
||||||
|
receiver, rate, format, codec, length, stype, len(data)-tciHeaderBytes)
|
||||||
|
}
|
||||||
|
|
||||||
|
if stype == tciStreamTXChrono {
|
||||||
|
// The radio asking for the next frame of transmit audio. It is empty —
|
||||||
|
// the whole message IS the request — and it carries the size it wants in
|
||||||
|
// the header's length field, so the answer is written from what it says
|
||||||
|
// rather than from what we assumed.
|
||||||
|
t.serveChrono(rate, length)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if stype != tciStreamRXAudio {
|
||||||
|
// IQ and transmit audio. The latter is ours to send, not to receive:
|
||||||
|
// counted above, and dropped.
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if codec != 0 {
|
||||||
|
t.audioErr(fmt.Sprintf("stream is codec=%d, and nothing here decodes a compressed stream", codec))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// The FORMAT number is decided by measurement, not by the number itself.
|
||||||
|
//
|
||||||
|
// A real SunSDR answered format=3, where the code expected 0 — and 0 was a
|
||||||
|
// guess from reading the documentation, which is exactly the kind of detail
|
||||||
|
// a memory of a document gets wrong. Rather than swap one magic number for
|
||||||
|
// another, the sample width is derived from what arrived: the header says
|
||||||
|
// how many samples the payload holds, so the bytes per sample follow from
|
||||||
|
// dividing. That is true whatever number the format field carries, on this
|
||||||
|
// firmware and the next.
|
||||||
|
payload := data[tciHeaderBytes:]
|
||||||
|
if len(payload) == 0 || length <= 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
width := len(payload) / length
|
||||||
|
var n int
|
||||||
|
switch width {
|
||||||
|
case 4:
|
||||||
|
n = len(payload) / 4 // float32
|
||||||
|
case 2:
|
||||||
|
n = len(payload) / 2 // 16-bit PCM
|
||||||
|
default:
|
||||||
|
t.audioErr(fmt.Sprintf("frame carries %d bytes for %d samples (format=%d) — not a width this reads",
|
||||||
|
len(payload), length, format))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if n == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Under the lock like the rest of the counters: the reader is the only
|
||||||
|
// writer today, but a fact about the radio that is read from another
|
||||||
|
// goroutine has no business being the one field left unguarded.
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
first := !t.audio.widthLogged
|
||||||
|
t.audio.widthLogged = true
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
if first {
|
||||||
|
debugLog.Printf("TCI: audio is %d bytes per sample at %d Hz (format field says %d)", width, rate, format)
|
||||||
|
}
|
||||||
|
// Stereo interleaved → mono. Both channels of a receiver carry the same
|
||||||
|
// audio, and everything downstream works on one.
|
||||||
|
// How many channels are interleaved. The radio says so at connect; two is
|
||||||
|
// the fallback, which is what every SunSDR seen so far streams.
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
chans := t.audio.declaredChans
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
if chans <= 0 {
|
||||||
|
chans = 2
|
||||||
|
}
|
||||||
|
mono := make([]float32, 0, n/chans+1)
|
||||||
|
var peak float64
|
||||||
|
sample := func(i int) float32 {
|
||||||
|
if width == 2 {
|
||||||
|
// 16-bit PCM, scaled to the same -1…1 the rest of the audio path
|
||||||
|
// works in, so a change of format cannot change what a level means.
|
||||||
|
return float32(int16(le.Uint16(payload[i*2:]))) / 32768
|
||||||
|
}
|
||||||
|
return math.Float32frombits(le.Uint32(payload[i*4:]))
|
||||||
|
}
|
||||||
|
for i := 0; i+chans-1 < n; i += chans {
|
||||||
|
var sum float32
|
||||||
|
for c := 0; c < chans; c++ {
|
||||||
|
sum += sample(i + c)
|
||||||
|
}
|
||||||
|
v := sum / float32(chans)
|
||||||
|
if a := math.Abs(float64(v)); a > peak {
|
||||||
|
peak = a
|
||||||
|
}
|
||||||
|
mono = append(mono, v)
|
||||||
|
}
|
||||||
|
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
t.audio.frames++
|
||||||
|
t.audio.samples += int64(len(mono))
|
||||||
|
if rate > 0 {
|
||||||
|
t.audio.rate = rate
|
||||||
|
}
|
||||||
|
if peak > t.audio.peak || time.Since(t.audio.peakAt) > time.Second {
|
||||||
|
t.audio.peak = peak
|
||||||
|
t.audio.peakAt = time.Now()
|
||||||
|
}
|
||||||
|
cb := t.audio.OnSamples
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
|
||||||
|
if cb != nil {
|
||||||
|
cb(rate, mono)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// audioErr records a decoding complaint, once, so the panel can show it without
|
||||||
|
// the log filling with the same line at fifty frames a second.
|
||||||
|
func (t *TCI) audioErr(msg string) {
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
first := t.audio.lastErr != msg
|
||||||
|
t.audio.lastErr = msg
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
if first {
|
||||||
|
debugLog.Printf("TCI: audio: %s", msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// resumeAudio re-opens the stream after a reconnect, if the host had asked for
|
||||||
|
// it. A dropped WebSocket takes the audio with it, and an operator who switched
|
||||||
|
// recording on does not expect to switch it on again.
|
||||||
|
func (t *TCI) resumeAudio() {
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
want, rx, rate := t.audio.want, t.audio.rx, t.audio.rate
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
if !want {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := t.StartTCIAudio(rx, rate); err != nil {
|
||||||
|
debugLog.Printf("TCI: re-opening the audio stream failed: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// wsMessageIsBinary keeps the type test in one place — the reader used to
|
||||||
|
// ignore the message type entirely and split every frame on ';', which would
|
||||||
|
// have fed audio bytes to the command parser the moment a stream was opened.
|
||||||
|
func wsMessageIsBinary(mt int) bool { return mt == websocket.BinaryMessage }
|
||||||
|
|
||||||
|
// noteTXTransition reports what the stream did across a transmission.
|
||||||
|
//
|
||||||
|
// The voice keyer needs two numbers the documentation does not give: the size
|
||||||
|
// and the cadence of the frames the radio expects while transmitting. They can
|
||||||
|
// only be read off a real transmission — and the first attempt came back with a
|
||||||
|
// log that said nothing at all, which is ambiguous: either no transmit frames
|
||||||
|
// arrived, or they arrived and went unlogged.
|
||||||
|
//
|
||||||
|
// So the boundaries are marked and every stream type is counted. A pass that
|
||||||
|
// produces "type 1: 240, and nothing else" is a RESULT — it says the radio
|
||||||
|
// sends no chrono unless something more is asked of it — where a log with no
|
||||||
|
// transmit lines in it was merely a silence.
|
||||||
|
func (t *TCI) noteTXTransition(on bool) {
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
if t.audio.countByType == nil {
|
||||||
|
t.audio.countByType = map[int]int64{}
|
||||||
|
}
|
||||||
|
if on {
|
||||||
|
// Let the transmit types speak again on every pass: forty frames is a
|
||||||
|
// budget spent long before the operator gets round to keying.
|
||||||
|
if t.audio.probeByType != nil {
|
||||||
|
delete(t.audio.probeByType, tciStreamTXAudio)
|
||||||
|
delete(t.audio.probeByType, tciStreamTXChrono)
|
||||||
|
}
|
||||||
|
t.audio.txMark = map[int]int64{}
|
||||||
|
for k, v := range t.audio.countByType {
|
||||||
|
t.audio.txMark[k] = v
|
||||||
|
}
|
||||||
|
streaming := t.audio.want
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
debugLog.Printf("TCI: TRANSMIT started — watching for transmit-audio (type %d) and chrono (type %d) frames; receive stream is %s",
|
||||||
|
tciStreamTXAudio, tciStreamTXChrono, map[bool]string{true: "open", false: "CLOSED (tick the TCI recording option, or the radio has no reason to stream)"}[streaming])
|
||||||
|
return
|
||||||
|
}
|
||||||
|
names := map[int]string{
|
||||||
|
tciStreamIQ: "IQ",
|
||||||
|
tciStreamRXAudio: "receive audio",
|
||||||
|
tciStreamTXAudio: "transmit audio",
|
||||||
|
tciStreamTXChrono: "transmit chrono",
|
||||||
|
}
|
||||||
|
var parts []string
|
||||||
|
for _, k := range []int{tciStreamIQ, tciStreamRXAudio, tciStreamTXAudio, tciStreamTXChrono} {
|
||||||
|
if n := t.audio.countByType[k] - t.audio.txMark[k]; n > 0 {
|
||||||
|
parts = append(parts, fmt.Sprintf("%s (type %d): %d", names[k], k, n))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
if len(parts) == 0 {
|
||||||
|
debugLog.Printf("TCI: TRANSMIT ended — NO binary frames of any type arrived during it")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
debugLog.Printf("TCI: TRANSMIT ended — frames during the pass: %s", strings.Join(parts, ", "))
|
||||||
|
}
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package cat
|
||||||
|
|
||||||
|
import "fmt"
|
||||||
|
|
||||||
|
// TCIAudioController is the receive-audio capability of the TCI backend, kept
|
||||||
|
// as an interface for the same reason as the Flex and Yaesu ones: the host asks
|
||||||
|
// the manager, and a station running something else gets a clear "this backend
|
||||||
|
// does not do that" instead of a nil dereference.
|
||||||
|
type TCIAudioController interface {
|
||||||
|
StartTCIAudio(rx, rate int) error
|
||||||
|
StopTCIAudio() error
|
||||||
|
TCIAudioStatus() TCIAudioStatus
|
||||||
|
}
|
||||||
|
|
||||||
|
// TCIAudioState returns the stream's state, or (zero, false) when the active
|
||||||
|
// backend is not a TCI radio.
|
||||||
|
func (m *Manager) TCIAudioState() (TCIAudioStatus, bool) {
|
||||||
|
m.mu.RLock()
|
||||||
|
b := m.backend
|
||||||
|
m.mu.RUnlock()
|
||||||
|
if tc, ok := b.(TCIAudioController); ok {
|
||||||
|
return tc.TCIAudioStatus(), true
|
||||||
|
}
|
||||||
|
return TCIAudioStatus{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
// TCIAudioDo dispatches an audio command onto the CAT goroutine, like every
|
||||||
|
// other backend-specific control.
|
||||||
|
func (m *Manager) TCIAudioDo(fn func(TCIAudioController) error) error {
|
||||||
|
return m.exec(func(b Backend) error {
|
||||||
|
tc, ok := b.(TCIAudioController)
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("active CAT backend is not a TCI radio")
|
||||||
|
}
|
||||||
|
return fn(tc)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// TCIPanelController is the control console of a TCI radio — everything the
|
||||||
|
// panel reads and everything it sets.
|
||||||
|
//
|
||||||
|
// Listed one by one rather than accepted as *TCI, for the same reason the audio
|
||||||
|
// controller is: the manager hands out capabilities, not backends, and a
|
||||||
|
// station on OmniRig asking for the TCI console gets a sentence instead of a
|
||||||
|
// crash.
|
||||||
|
type TCIPanelController interface {
|
||||||
|
TCIPanel() TCIPanelState
|
||||||
|
SetDrive(v int) error
|
||||||
|
SetTuneDrive(v int) error
|
||||||
|
SetMicLevel(v int) error
|
||||||
|
SetVolume(db int) error
|
||||||
|
SetMute(on bool) error
|
||||||
|
SetAGC(mode string) error
|
||||||
|
SetSquelch(on bool) error
|
||||||
|
SetSquelchLevel(v int) error
|
||||||
|
SetNB(on bool) error
|
||||||
|
SetNR(on bool) error
|
||||||
|
SetANF(on bool) error
|
||||||
|
SetAPF(on bool) error
|
||||||
|
SetFilter(lo, hi int) error
|
||||||
|
SetRIT(on bool) error
|
||||||
|
SetXIT(on bool) error
|
||||||
|
SetRITOffset(hz int) error
|
||||||
|
SetXITOffset(hz int) error
|
||||||
|
SetLock(on bool) error
|
||||||
|
SetTune(on bool) error
|
||||||
|
}
|
||||||
|
|
||||||
|
// TCIPanelState returns the console snapshot, or (zero, false) when the active
|
||||||
|
// backend is not a TCI radio.
|
||||||
|
//
|
||||||
|
// Read WITHOUT going through the CAT goroutine: the state is a cached copy of
|
||||||
|
// what the radio pushed, guarded by its own lock, and the panel polls it several
|
||||||
|
// times a second. Queueing that behind whatever the poll loop is doing would put
|
||||||
|
// the console's smoothness at the mercy of a rig command's timeout.
|
||||||
|
func (m *Manager) TCIPanelState() (TCIPanelState, bool) {
|
||||||
|
m.mu.RLock()
|
||||||
|
b := m.backend
|
||||||
|
m.mu.RUnlock()
|
||||||
|
if tc, ok := b.(TCIPanelController); ok {
|
||||||
|
return tc.TCIPanel(), true
|
||||||
|
}
|
||||||
|
return TCIPanelState{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
// TCIPanelDo dispatches one console command onto the CAT goroutine, where every
|
||||||
|
// other write to the radio goes.
|
||||||
|
func (m *Manager) TCIPanelDo(fn func(TCIPanelController) error) error {
|
||||||
|
return m.exec(func(b Backend) error {
|
||||||
|
tc, ok := b.(TCIPanelController)
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("the active CAT backend is not a TCI radio")
|
||||||
|
}
|
||||||
|
return fn(tc)
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -0,0 +1,381 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package cat
|
||||||
|
|
||||||
|
// The TCI control panel: what the radio already tells us, gathered up.
|
||||||
|
//
|
||||||
|
// This is the cheapest panel in OpsLog, and the reason is worth saying. A K3 is
|
||||||
|
// asked — every value on its console costs a command and a reply on a serial
|
||||||
|
// line, which is why that panel reads its settings in a rotation and its meters
|
||||||
|
// only while it is on screen. TCI PUSHES: the radio announces its drive, its
|
||||||
|
// volume, its filters, its noise blanker and everything else when a client
|
||||||
|
// connects, and again whenever any of them changes, whoever changed it. There
|
||||||
|
// is nothing to poll.
|
||||||
|
//
|
||||||
|
// So this file is mostly a place to PUT what was already arriving and being
|
||||||
|
// logged as "(unhandled once)". The setters are the same names sent back the
|
||||||
|
// other way, which is how TCI works throughout: one vocabulary, both directions.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TCIPanelState is the whole console in one snapshot, polled by the frontend.
|
||||||
|
//
|
||||||
|
// Values the radio has not mentioned keep their zero, which is why the
|
||||||
|
// "Known" flags exist for the ones where zero is a real setting: a squelch at 0
|
||||||
|
// and a squelch never reported are different, and a panel that cannot tell them
|
||||||
|
// apart draws a control that lies until the operator touches it.
|
||||||
|
type TCIPanelState struct {
|
||||||
|
Connected bool `json:"connected"`
|
||||||
|
Device string `json:"device,omitempty"` // what the radio calls itself
|
||||||
|
Protocol string `json:"protocol,omitempty"` // "ExpertSDR3,1.5"
|
||||||
|
|
||||||
|
// Transmit.
|
||||||
|
Drive int `json:"drive"` // 0-100
|
||||||
|
TuneDrive int `json:"tune_drive"` // 0-100, used by TUNE
|
||||||
|
MicLevel int `json:"mic_level"` // 0-100
|
||||||
|
TXEnabled bool `json:"tx_enabled"` // the radio's own permission (tx_enable)
|
||||||
|
TX bool `json:"tx"`
|
||||||
|
Tuning bool `json:"tuning"`
|
||||||
|
|
||||||
|
// Receive.
|
||||||
|
Volume int `json:"volume"` // dB, negative — TCI's own scale
|
||||||
|
Mute bool `json:"mute"`
|
||||||
|
AGC string `json:"agc,omitempty"` // off/long/slow/med/fast
|
||||||
|
SquelchOn bool `json:"squelch_on"`
|
||||||
|
Squelch int `json:"squelch"` // dBm threshold
|
||||||
|
NB bool `json:"nb"`
|
||||||
|
NR bool `json:"nr"`
|
||||||
|
ANF bool `json:"anf"`
|
||||||
|
APF bool `json:"apf"`
|
||||||
|
|
||||||
|
// Filter edges in Hz, relative to the carrier (TCI's own convention).
|
||||||
|
FilterLo int `json:"filter_lo"`
|
||||||
|
FilterHi int `json:"filter_hi"`
|
||||||
|
|
||||||
|
// Tuning aids.
|
||||||
|
RIT bool `json:"rit"`
|
||||||
|
RITOffset int `json:"rit_offset"`
|
||||||
|
XIT bool `json:"xit"`
|
||||||
|
XITOffset int `json:"xit_offset"`
|
||||||
|
Lock bool `json:"lock"`
|
||||||
|
Split bool `json:"split"`
|
||||||
|
|
||||||
|
// SMeter is the last reported signal level in dBm — the radio pushes it
|
||||||
|
// several times a second while receiving.
|
||||||
|
SMeter int `json:"smeter"`
|
||||||
|
|
||||||
|
// TXPowerW and TXSWR are the transmit meters. READ-ONLY in TCI, and only
|
||||||
|
// answered while transmitting — asked for on every poll of a keyed radio,
|
||||||
|
// see ReadState.
|
||||||
|
//
|
||||||
|
// There is no temperature in this protocol. The command list has TX_POWER
|
||||||
|
// and TX_SWR and nothing thermal at all, so a temperature reading here would
|
||||||
|
// have to be invented, and an invented temperature on a transmitter is the
|
||||||
|
// kind of number somebody trusts.
|
||||||
|
TXPowerW float64 `json:"tx_power_w"`
|
||||||
|
TXSWR float64 `json:"tx_swr"`
|
||||||
|
|
||||||
|
// Modulations is what this radio will accept, straight from its own
|
||||||
|
// announcement, so the mode buttons are the radio's and not a guess.
|
||||||
|
Modulations []string `json:"modulations,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// tciPanel is the backing state. Guarded by TCI.mu with everything else it
|
||||||
|
// arrives alongside.
|
||||||
|
type tciPanel struct {
|
||||||
|
st TCIPanelState
|
||||||
|
// logged counts what has been written per message type — see handlePanel.
|
||||||
|
logged map[string]int
|
||||||
|
}
|
||||||
|
|
||||||
|
// handlePanel takes the messages the console cares about.
|
||||||
|
//
|
||||||
|
// Returns false when the message is none of its business, so the caller can go
|
||||||
|
// on to its own cases and to the unknown-message log. Called with t.mu held.
|
||||||
|
func (t *TCI) handlePanel(name string, get func(int) string, args string) bool {
|
||||||
|
// Most of these are per-receiver ("sql_level:0,20"), and OpsLog follows
|
||||||
|
// receiver 0 throughout. A message for another receiver is accepted as
|
||||||
|
// handled and dropped: it is understood, it is simply not ours.
|
||||||
|
forRX0 := func() bool { return get(0) == "0" || get(0) == "" }
|
||||||
|
num := func(s string) (int, bool) {
|
||||||
|
n, err := strconv.Atoi(strings.TrimSpace(s))
|
||||||
|
return n, err == nil
|
||||||
|
}
|
||||||
|
yes := func(s string) bool { return strings.EqualFold(strings.TrimSpace(s), "true") }
|
||||||
|
|
||||||
|
p := &t.panel.st
|
||||||
|
// Mute and squelch are LOGGED as they change, because a report from a real
|
||||||
|
// radio says pressing MUTE lights the squelch and nothing here can explain
|
||||||
|
// it. What the radio actually announces after the command settles whether
|
||||||
|
// this is our reading or its doing, and no amount of reasoning will.
|
||||||
|
switch name {
|
||||||
|
case "mute", "sql_enable", "sql_level", "tx_power", "tx_swr", "tune":
|
||||||
|
// 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,
|
||||||
|
// which on its own proves nothing — a reply that arrived and failed to
|
||||||
|
// parse leaves exactly the same trace as one that never came.
|
||||||
|
//
|
||||||
|
// Capped per message type. The meters are asked for four times a second
|
||||||
|
// while transmitting, and a diagnostic that fills an evening's log is
|
||||||
|
// one that gets switched off instead of read.
|
||||||
|
if t.panel.logged == nil {
|
||||||
|
t.panel.logged = map[string]int{}
|
||||||
|
}
|
||||||
|
if n := t.panel.logged[name]; n < 20 {
|
||||||
|
t.panel.logged[name] = n + 1
|
||||||
|
debugLog.Printf("TCI: %s:%s", name, args)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
switch name {
|
||||||
|
case "protocol":
|
||||||
|
p.Protocol = strings.TrimSpace(args)
|
||||||
|
case "drive":
|
||||||
|
if n, ok := num(get(1)); ok && forRX0() {
|
||||||
|
p.Drive = n
|
||||||
|
} else if n, ok := num(get(0)); ok && get(1) == "" {
|
||||||
|
// Some firmware sends "drive:85" with no receiver index.
|
||||||
|
p.Drive = n
|
||||||
|
}
|
||||||
|
case "tune_drive":
|
||||||
|
if n, ok := num(get(1)); ok && forRX0() {
|
||||||
|
p.TuneDrive = n
|
||||||
|
} else if n, ok := num(get(0)); ok && get(1) == "" {
|
||||||
|
p.TuneDrive = n
|
||||||
|
}
|
||||||
|
case "mic_level":
|
||||||
|
if n, ok := num(get(0)); ok {
|
||||||
|
p.MicLevel = n
|
||||||
|
}
|
||||||
|
case "volume":
|
||||||
|
if n, ok := num(get(0)); ok {
|
||||||
|
p.Volume = n
|
||||||
|
}
|
||||||
|
case "mute":
|
||||||
|
// Both shapes. This radio reports "mute:0,false" and the reference shows
|
||||||
|
// "mute:true" elsewhere — reading only one of them left the button
|
||||||
|
// showing the opposite of the truth, which is worse than showing
|
||||||
|
// nothing.
|
||||||
|
if get(1) != "" {
|
||||||
|
p.Mute = yes(get(1))
|
||||||
|
} else {
|
||||||
|
p.Mute = yes(get(0))
|
||||||
|
}
|
||||||
|
case "agc_mode":
|
||||||
|
if forRX0() {
|
||||||
|
p.AGC = strings.ToLower(strings.TrimSpace(get(1)))
|
||||||
|
}
|
||||||
|
case "sql_enable":
|
||||||
|
if forRX0() {
|
||||||
|
p.SquelchOn = yes(get(1))
|
||||||
|
}
|
||||||
|
case "sql_level":
|
||||||
|
if n, ok := num(get(1)); ok && forRX0() {
|
||||||
|
p.Squelch = n
|
||||||
|
}
|
||||||
|
case "rx_nb_enable":
|
||||||
|
if forRX0() {
|
||||||
|
p.NB = yes(get(1))
|
||||||
|
}
|
||||||
|
case "rx_nr_enable":
|
||||||
|
if forRX0() {
|
||||||
|
p.NR = yes(get(1))
|
||||||
|
}
|
||||||
|
case "rx_anf_enable":
|
||||||
|
if forRX0() {
|
||||||
|
p.ANF = yes(get(1))
|
||||||
|
}
|
||||||
|
case "rx_apf_enable":
|
||||||
|
if forRX0() {
|
||||||
|
p.APF = yes(get(1))
|
||||||
|
}
|
||||||
|
case "rx_filter_band":
|
||||||
|
if forRX0() {
|
||||||
|
if lo, ok := num(get(1)); ok {
|
||||||
|
p.FilterLo = lo
|
||||||
|
}
|
||||||
|
if hi, ok := num(get(2)); ok {
|
||||||
|
p.FilterHi = hi
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case "rit_enable":
|
||||||
|
if forRX0() {
|
||||||
|
p.RIT = yes(get(1))
|
||||||
|
}
|
||||||
|
case "xit_enable":
|
||||||
|
if forRX0() {
|
||||||
|
p.XIT = yes(get(1))
|
||||||
|
}
|
||||||
|
case "rit_offset":
|
||||||
|
if n, ok := num(get(1)); ok && forRX0() {
|
||||||
|
p.RITOffset = n
|
||||||
|
}
|
||||||
|
case "xit_offset":
|
||||||
|
if n, ok := num(get(1)); ok && forRX0() {
|
||||||
|
p.XITOffset = n
|
||||||
|
}
|
||||||
|
case "lock":
|
||||||
|
if forRX0() {
|
||||||
|
p.Lock = yes(get(1))
|
||||||
|
}
|
||||||
|
case "tx_power":
|
||||||
|
if v, err := strconv.ParseFloat(strings.TrimSpace(get(0)), 64); err == nil {
|
||||||
|
p.TXPowerW = v
|
||||||
|
}
|
||||||
|
case "tx_swr":
|
||||||
|
if v, err := strconv.ParseFloat(strings.TrimSpace(get(0)), 64); err == nil {
|
||||||
|
p.TXSWR = v
|
||||||
|
}
|
||||||
|
case "rx_smeter":
|
||||||
|
if n, ok := num(get(1)); ok && forRX0() {
|
||||||
|
p.SMeter = n
|
||||||
|
}
|
||||||
|
case "tune":
|
||||||
|
if forRX0() {
|
||||||
|
p.Tuning = yes(get(1))
|
||||||
|
}
|
||||||
|
case "modulations_list":
|
||||||
|
p.Modulations = splitAndTrim(args)
|
||||||
|
default:
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// splitAndTrim turns "usb,lsb,cw" into a slice, upper-cased for display.
|
||||||
|
func splitAndTrim(s string) []string {
|
||||||
|
parts := strings.Split(s, ",")
|
||||||
|
out := make([]string, 0, len(parts))
|
||||||
|
for _, p := range parts {
|
||||||
|
if v := strings.ToUpper(strings.TrimSpace(p)); v != "" {
|
||||||
|
out = append(out, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// TCIPanel returns the console snapshot.
|
||||||
|
func (t *TCI) TCIPanel() TCIPanelState {
|
||||||
|
t.mu.Lock()
|
||||||
|
defer t.mu.Unlock()
|
||||||
|
st := t.panel.st
|
||||||
|
st.Connected = t.conn != nil
|
||||||
|
st.Device = t.device
|
||||||
|
st.TX = t.tx
|
||||||
|
st.Split = t.split
|
||||||
|
st.TXEnabled = t.txAllowed || !t.txAllowedKnown
|
||||||
|
return st
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Setters ───────────────────────────────────────────────────────────────
|
||||||
|
//
|
||||||
|
// Every one of them is a SET in the same vocabulary the radio reports in, and
|
||||||
|
// none of them updates the cached state: the radio answers with the new value,
|
||||||
|
// and taking its word rather than our own is what keeps the panel honest when a
|
||||||
|
// setting is refused, clamped, or changed from the radio's own window a second
|
||||||
|
// later.
|
||||||
|
|
||||||
|
// SetDrive sets the transmit drive, 0-100.
|
||||||
|
//
|
||||||
|
// THE TRX INDEX IS PART OF THE COMMAND — "drive:0,15;", not "drive:15;". Sent
|
||||||
|
// without it the radio simply ignores it: no error, no answer, the power
|
||||||
|
// unchanged. The rule is the one the radio's own reports follow, and it was
|
||||||
|
// there to read all along: this radio announces "drive:0,85" at connect.
|
||||||
|
func (t *TCI) SetDrive(v int) error { return t.send(fmt.Sprintf("drive:0,%d;", clampTCIPct(v))) }
|
||||||
|
|
||||||
|
// SetTuneDrive sets the drive used by TUNE, 0-100. Indexed, like drive.
|
||||||
|
func (t *TCI) SetTuneDrive(v int) error {
|
||||||
|
return t.send(fmt.Sprintf("tune_drive:0,%d;", clampTCIPct(v)))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetMicLevel sets the microphone gain, 0-100.
|
||||||
|
// Mic gain and volume are the two that are NOT indexed — the radio reports
|
||||||
|
// them as "mic_level:100" and "volume:-12", with no receiver in front. Sending
|
||||||
|
// the shape the radio speaks in is the whole rule here.
|
||||||
|
func (t *TCI) SetMicLevel(v int) error { return t.send(fmt.Sprintf("mic_level:%d;", clampTCIPct(v))) }
|
||||||
|
|
||||||
|
// SetVolume sets the receive volume in dB. TCI's scale is negative — 0 is full
|
||||||
|
// and -60 is inaudible — so this is NOT clamped to a percentage.
|
||||||
|
func (t *TCI) SetVolume(db int) error {
|
||||||
|
if db > 0 {
|
||||||
|
db = 0
|
||||||
|
}
|
||||||
|
if db < -60 {
|
||||||
|
db = -60
|
||||||
|
}
|
||||||
|
return t.send(fmt.Sprintf("volume:%d;", db))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetMute mutes or unmutes the receiver. Indexed — the radio reports
|
||||||
|
// "mute:0,false", and a mute sent without the index goes nowhere.
|
||||||
|
func (t *TCI) SetMute(on bool) error { return t.send(fmt.Sprintf("mute:0,%t;", on)) }
|
||||||
|
|
||||||
|
// SetAGC picks the AGC speed: off, long, slow, med, fast.
|
||||||
|
func (t *TCI) SetAGC(mode string) error {
|
||||||
|
m := strings.ToLower(strings.TrimSpace(mode))
|
||||||
|
switch m {
|
||||||
|
case "off", "long", "slow", "med", "fast":
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("unknown AGC mode %q", mode)
|
||||||
|
}
|
||||||
|
return t.send(fmt.Sprintf("agc_mode:0,%s;", m))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetSquelch turns the squelch on or off.
|
||||||
|
func (t *TCI) SetSquelch(on bool) error { return t.send(fmt.Sprintf("sql_enable:0,%t;", on)) }
|
||||||
|
|
||||||
|
// SetSquelchLevel sets the threshold in dBm.
|
||||||
|
func (t *TCI) SetSquelchLevel(v int) error { return t.send(fmt.Sprintf("sql_level:0,%d;", v)) }
|
||||||
|
|
||||||
|
// SetNB, SetNR, SetANF, SetAPF switch the receive processing.
|
||||||
|
func (t *TCI) SetNB(on bool) error { return t.send(fmt.Sprintf("rx_nb_enable:0,%t;", on)) }
|
||||||
|
func (t *TCI) SetNR(on bool) error { return t.send(fmt.Sprintf("rx_nr_enable:0,%t;", on)) }
|
||||||
|
func (t *TCI) SetANF(on bool) error { return t.send(fmt.Sprintf("rx_anf_enable:0,%t;", on)) }
|
||||||
|
func (t *TCI) SetAPF(on bool) error { return t.send(fmt.Sprintf("rx_apf_enable:0,%t;", on)) }
|
||||||
|
|
||||||
|
// SetFilter sets the passband edges in Hz.
|
||||||
|
func (t *TCI) SetFilter(lo, hi int) error {
|
||||||
|
if lo > hi {
|
||||||
|
lo, hi = hi, lo
|
||||||
|
}
|
||||||
|
return t.send(fmt.Sprintf("rx_filter_band:0,%d,%d;", lo, hi))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetRIT / SetXIT switch the offsets on, SetRITOffset / SetXITOffset move them.
|
||||||
|
func (t *TCI) SetRIT(on bool) error { return t.send(fmt.Sprintf("rit_enable:0,%t;", on)) }
|
||||||
|
func (t *TCI) SetXIT(on bool) error { return t.send(fmt.Sprintf("xit_enable:0,%t;", on)) }
|
||||||
|
func (t *TCI) SetRITOffset(hz int) error { return t.send(fmt.Sprintf("rit_offset:0,%d;", hz)) }
|
||||||
|
func (t *TCI) SetXITOffset(hz int) error { return t.send(fmt.Sprintf("xit_offset:0,%d;", hz)) }
|
||||||
|
|
||||||
|
// SetLock locks the VFO knob on the radio.
|
||||||
|
func (t *TCI) SetLock(on bool) error { return t.send(fmt.Sprintf("lock:0,%t;", on)) }
|
||||||
|
|
||||||
|
// SetTune starts or stops the tune carrier.
|
||||||
|
//
|
||||||
|
// It TRANSMITS, at tune_drive rather than at drive — which is the setting to
|
||||||
|
// check before pressing it, and why the panel shows the two side by side.
|
||||||
|
//
|
||||||
|
// The state is recorded HERE rather than waited for. This radio does not echo
|
||||||
|
// "tune:0,true", so the panel had no way of knowing a tune was running: the
|
||||||
|
// button stayed on TUNE and every further press sent another START, which is
|
||||||
|
// why it could not be switched off again. Whatever the radio says afterwards
|
||||||
|
// still wins — it simply never says anything.
|
||||||
|
func (t *TCI) SetTune(on bool) error {
|
||||||
|
t.mu.Lock()
|
||||||
|
t.panel.st.Tuning = on
|
||||||
|
t.mu.Unlock()
|
||||||
|
return t.send(fmt.Sprintf("tune:0,%t;", on))
|
||||||
|
}
|
||||||
|
|
||||||
|
func clampTCIPct(v int) int {
|
||||||
|
if v < 0 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
if v > 100 {
|
||||||
|
return 100
|
||||||
|
}
|
||||||
|
return v
|
||||||
|
}
|
||||||
@@ -0,0 +1,189 @@
|
|||||||
|
package cat
|
||||||
|
|
||||||
|
// Playing a recorded message to the radio over TCI — the voice keyer's path.
|
||||||
|
//
|
||||||
|
// The same exchange the tone probe established, with a WAV in place of the
|
||||||
|
// sine: the radio asks for a frame, we answer with the next slice of the
|
||||||
|
// message, and it sets the pace. What is added here is the conversion, because
|
||||||
|
// a recording is whatever the microphone gave it — 16-bit, often mono, often
|
||||||
|
// not 48 kHz — and the radio wants interleaved float32 at the stream's rate.
|
||||||
|
//
|
||||||
|
// The message is converted ONCE, up front, rather than per frame. A voice
|
||||||
|
// message is a few hundred kilobytes; resampling it inside the callback would
|
||||||
|
// put arithmetic on the path that has 21 ms to answer, and a late frame is a
|
||||||
|
// gap in what goes out.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/binary"
|
||||||
|
"fmt"
|
||||||
|
"math"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// tciTXFirstAskTimeout is how long to wait for the radio to ask for the first
|
||||||
|
// frame before giving up.
|
||||||
|
//
|
||||||
|
// It answers within a frame or two when it is going to answer at all, so this
|
||||||
|
// is generous. When it stays quiet the cause is always the same — the transmit
|
||||||
|
// audio source is the microphone rather than TCI — and a fifth of a second of
|
||||||
|
// carrier is a cheap way to find that out.
|
||||||
|
const tciTXFirstAskTimeout = 200 * time.Millisecond
|
||||||
|
|
||||||
|
// PlayTXAudio sends one message and returns when it has all been handed over,
|
||||||
|
// or when stop is closed.
|
||||||
|
//
|
||||||
|
// The PTT is NOT touched here. The voice keyer keys before calling and unkeys
|
||||||
|
// after, exactly as it does with a sound card, so the transmission is bracketed
|
||||||
|
// by the same code whichever way the audio travels.
|
||||||
|
func (t *TCI) PlayTXAudio(pcm []byte, rate, ch, bits int, stop <-chan struct{}) error {
|
||||||
|
t.mu.Lock()
|
||||||
|
connected := t.conn != nil
|
||||||
|
t.mu.Unlock()
|
||||||
|
if !connected {
|
||||||
|
return fmt.Errorf("not connected to the radio")
|
||||||
|
}
|
||||||
|
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
outRate := t.audio.rate
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
if outRate <= 0 {
|
||||||
|
outRate = 48000
|
||||||
|
}
|
||||||
|
|
||||||
|
mono := decodeToMono(pcm, ch, bits)
|
||||||
|
if len(mono) == 0 {
|
||||||
|
return fmt.Errorf("the message is empty")
|
||||||
|
}
|
||||||
|
if rate > 0 && rate != outRate {
|
||||||
|
mono = resampleLinear(mono, rate, outRate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Served from here on. The callback does nothing but copy and interleave,
|
||||||
|
// which is what keeps it inside the frame interval.
|
||||||
|
pos := 0
|
||||||
|
done := make(chan struct{})
|
||||||
|
var closed bool
|
||||||
|
t.setTXFeed(func(samples int) []byte {
|
||||||
|
if samples <= 0 {
|
||||||
|
samples = 2048
|
||||||
|
}
|
||||||
|
pairs := samples / 2
|
||||||
|
if pos >= len(mono) {
|
||||||
|
if !closed {
|
||||||
|
closed = true
|
||||||
|
close(done)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
payload := make([]byte, samples*4)
|
||||||
|
le := binary.LittleEndian
|
||||||
|
for i := 0; i < pairs; i++ {
|
||||||
|
var v float32
|
||||||
|
if pos < len(mono) {
|
||||||
|
v = mono[pos]
|
||||||
|
pos++
|
||||||
|
}
|
||||||
|
bits := math.Float32bits(v)
|
||||||
|
le.PutUint32(payload[(i*2)*4:], bits) // left
|
||||||
|
le.PutUint32(payload[(i*2+1)*4:], bits) // right
|
||||||
|
}
|
||||||
|
return payload
|
||||||
|
})
|
||||||
|
defer t.setTXFeed(nil)
|
||||||
|
|
||||||
|
// Nothing asked for in a fifth of a second means nothing is listening.
|
||||||
|
// Reported plainly: the message would otherwise go out as silence, and a
|
||||||
|
// voice keyer that transmits silence is worse than one that refuses.
|
||||||
|
deadline := time.Now().Add(tciTXFirstAskTimeout)
|
||||||
|
for time.Now().Before(deadline) {
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
asked := t.audio.txSent > 0
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
if asked {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
case <-stop:
|
||||||
|
return nil
|
||||||
|
case <-time.After(10 * time.Millisecond):
|
||||||
|
}
|
||||||
|
}
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
asked := t.audio.txSent
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
if asked == 0 {
|
||||||
|
return fmt.Errorf("the radio did not ask for any audio — set its transmit audio source to TCI instead of the microphone")
|
||||||
|
}
|
||||||
|
|
||||||
|
// The radio drains the message at real time, so this waits for the feed to
|
||||||
|
// run out. The cap is the message's own length with a second to spare: a
|
||||||
|
// radio that stops asking mid-message must not hold the transmitter up.
|
||||||
|
limit := time.Duration(float64(len(mono))/float64(outRate)*float64(time.Second)) + time.Second
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
case <-stop:
|
||||||
|
case <-time.After(limit):
|
||||||
|
debugLog.Printf("TCI: the radio stopped asking for audio before the message ended")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// decodeToMono turns interleaved PCM into one channel of -1…1 floats.
|
||||||
|
func decodeToMono(pcm []byte, ch, bits int) []float32 {
|
||||||
|
if ch <= 0 {
|
||||||
|
ch = 1
|
||||||
|
}
|
||||||
|
switch bits {
|
||||||
|
case 16:
|
||||||
|
frame := ch * 2
|
||||||
|
out := make([]float32, 0, len(pcm)/frame+1)
|
||||||
|
for i := 0; i+frame <= len(pcm); i += frame {
|
||||||
|
var sum float32
|
||||||
|
for c := 0; c < ch; c++ {
|
||||||
|
v := int16(uint16(pcm[i+c*2]) | uint16(pcm[i+c*2+1])<<8)
|
||||||
|
sum += float32(v) / 32768
|
||||||
|
}
|
||||||
|
out = append(out, sum/float32(ch))
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
case 8:
|
||||||
|
// Unsigned, centred on 128 — the one format where silence is not zero.
|
||||||
|
out := make([]float32, 0, len(pcm)/ch+1)
|
||||||
|
for i := 0; i+ch <= len(pcm); i += ch {
|
||||||
|
var sum float32
|
||||||
|
for c := 0; c < ch; c++ {
|
||||||
|
sum += (float32(pcm[i+c]) - 128) / 128
|
||||||
|
}
|
||||||
|
out = append(out, sum/float32(ch))
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// resampleLinear moves samples from one rate to another.
|
||||||
|
//
|
||||||
|
// Linear interpolation, which is crude and entirely adequate here: a voice
|
||||||
|
// recording at 16 kHz going to 48 kHz is being INTERPOLATED, and interpolation
|
||||||
|
// invents no frequencies to alias. Going the other way would want a filter
|
||||||
|
// first, but a message recorded above the radio's stream rate is not a case
|
||||||
|
// that arises — the recorder works at 16 kHz and radios stream at 48.
|
||||||
|
func resampleLinear(in []float32, from, to int) []float32 {
|
||||||
|
if from <= 0 || to <= 0 || from == to || len(in) == 0 {
|
||||||
|
return in
|
||||||
|
}
|
||||||
|
ratio := float64(from) / float64(to)
|
||||||
|
n := int(float64(len(in)) / ratio)
|
||||||
|
out := make([]float32, n)
|
||||||
|
for i := 0; i < n; i++ {
|
||||||
|
src := float64(i) * ratio
|
||||||
|
j := int(src)
|
||||||
|
frac := float32(src - float64(j))
|
||||||
|
if j+1 < len(in) {
|
||||||
|
out[i] = in[j]*(1-frac) + in[j+1]*frac
|
||||||
|
} else {
|
||||||
|
out[i] = in[len(in)-1]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
@@ -0,0 +1,117 @@
|
|||||||
|
package cat
|
||||||
|
|
||||||
|
// Sending audio TO the radio over TCI.
|
||||||
|
//
|
||||||
|
// Three transmissions on a real SunSDR settled how this works, and none of it
|
||||||
|
// was guessable from the documentation:
|
||||||
|
//
|
||||||
|
// 1. The radio asks for audio only when the transmission is the CLIENT'S. With
|
||||||
|
// the operator keying the microphone it sent 282 receive frames and nothing
|
||||||
|
// else, over six seconds.
|
||||||
|
// 2. It asks only when its TRANSMIT AUDIO SOURCE is TCI rather than the
|
||||||
|
// microphone. This first read as "digital modes only" — SSB produced
|
||||||
|
// nothing four times over, DIGU answered at once — but the mode was a
|
||||||
|
// coincidence: ExpertSDR3 keeps that source setting per mode, and it was on
|
||||||
|
// the microphone in SSB. Which is why nothing is refused on the strength of
|
||||||
|
// the mode: the radio is asked, and it answers by asking or by staying
|
||||||
|
// quiet.
|
||||||
|
// 3. The chrono is a REQUEST, not a clock to follow. It carries no payload —
|
||||||
|
// the message itself is the ask — and it names the size it wants in the
|
||||||
|
// header's length field: 2048 samples, two channels interleaved, arriving
|
||||||
|
// 47 times a second. Which is 1024 sample-pairs at 48 kHz, exactly real
|
||||||
|
// time, measured rather than assumed.
|
||||||
|
//
|
||||||
|
// So audio is sent in ANSWER to chrono, never on a timer of our own. A timer
|
||||||
|
// was the first attempt and the radio ignored every frame of it: 234 sent, none
|
||||||
|
// used. Answering the request is what makes the difference, and it also means
|
||||||
|
// the radio sets the pace — no drift, no buffer to tune.
|
||||||
|
//
|
||||||
|
// All of it was established with a tone probe — key the radio, push a sine,
|
||||||
|
// watch — which is gone now that it has served its purpose: it answered the
|
||||||
|
// three questions above, confirmed 80 W out on a real SunSDR, and had no
|
||||||
|
// business in front of an operator once the voice keyer worked. What is left is
|
||||||
|
// the exchange it discovered, with tci_tx_play.go supplying the message.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/binary"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/gorilla/websocket"
|
||||||
|
)
|
||||||
|
|
||||||
|
// sendBinaryFrame writes one TCI binary frame: the 16-word header the radio's
|
||||||
|
// own frames carry, then the payload.
|
||||||
|
func (t *TCI) sendBinaryFrame(stype, rx, rate, length int, payload []byte) error {
|
||||||
|
t.mu.Lock()
|
||||||
|
c := t.conn
|
||||||
|
t.mu.Unlock()
|
||||||
|
if c == nil {
|
||||||
|
return fmt.Errorf("tci: not connected")
|
||||||
|
}
|
||||||
|
buf := make([]byte, tciHeaderBytes+len(payload))
|
||||||
|
le := binary.LittleEndian
|
||||||
|
le.PutUint32(buf[0:], uint32(rx))
|
||||||
|
le.PutUint32(buf[4:], uint32(rate))
|
||||||
|
// format=3, codec=0: mirrored from what this radio SENDS. The field is
|
||||||
|
// documented as an enumeration whose numbering did not survive contact with
|
||||||
|
// the firmware — the receive stream answers 3 for four-byte floats — so the
|
||||||
|
// only defensible choice is to speak back exactly what was spoken to us.
|
||||||
|
le.PutUint32(buf[8:], 3)
|
||||||
|
le.PutUint32(buf[12:], 0)
|
||||||
|
le.PutUint32(buf[16:], 0) // crc — the radio sends 0 and does not check ours
|
||||||
|
le.PutUint32(buf[20:], uint32(length))
|
||||||
|
le.PutUint32(buf[24:], uint32(stype))
|
||||||
|
copy(buf[tciHeaderBytes:], payload)
|
||||||
|
|
||||||
|
t.wmu.Lock()
|
||||||
|
defer t.wmu.Unlock()
|
||||||
|
_ = c.SetWriteDeadline(time.Now().Add(3 * time.Second))
|
||||||
|
return c.WriteMessage(websocket.BinaryMessage, buf)
|
||||||
|
}
|
||||||
|
|
||||||
|
// serveChrono answers one request for transmit audio.
|
||||||
|
//
|
||||||
|
// Called from the reader goroutine, so it does the least it can: take the
|
||||||
|
// frame from whatever is feeding, and write it. A feed that has run out returns
|
||||||
|
// nil and the request is counted rather than answered with silence — silence
|
||||||
|
// would be indistinguishable from a working stream on a meter.
|
||||||
|
func (t *TCI) serveChrono(rate, samples int) {
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
feed := t.audio.txFeed
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
if feed == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if samples <= 0 {
|
||||||
|
samples = 2048
|
||||||
|
}
|
||||||
|
payload := feed(samples)
|
||||||
|
if payload == nil {
|
||||||
|
// Answered with silence rather than left unanswered. TCI 2.0 §3.4: "the
|
||||||
|
// client may not send a response or may send a signal with zero counts,
|
||||||
|
// which corresponds to no signal - this option is preferable."
|
||||||
|
payload = make([]byte, samples*4)
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
t.audio.txShort++
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
}
|
||||||
|
if rate <= 0 {
|
||||||
|
rate = 48000
|
||||||
|
}
|
||||||
|
if err := t.sendBinaryFrame(tciStreamTXAudio, 0, rate, samples, payload); err != nil {
|
||||||
|
debugLog.Printf("TCI: could not send transmit audio: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
t.audio.txSent++
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// setTXFeed installs (or clears) the source of transmit audio.
|
||||||
|
func (t *TCI) setTXFeed(fn func(samples int) []byte) {
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
t.audio.txFeed = fn
|
||||||
|
t.audio.txSent, t.audio.txShort = 0, 0
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
}
|
||||||
@@ -95,7 +95,7 @@ func (x *Xiegu) Connect() error {
|
|||||||
}
|
}
|
||||||
p, err := serial.Open(x.portName, &serial.Mode{BaudRate: x.baud})
|
p, err := serial.Open(x.portName, &serial.Mode{BaudRate: x.baud})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("xiegu: open %s @ %d baud: %w", x.portName, x.baud, err)
|
return fmt.Errorf("xiegu: open %s @ %d baud: %w%s", x.portName, x.baud, err, busyHint(x.portName, err))
|
||||||
}
|
}
|
||||||
p.SetReadTimeout(200 * time.Millisecond)
|
p.SetReadTimeout(200 * time.Millisecond)
|
||||||
// Deassert DTR and RTS.
|
// Deassert DTR and RTS.
|
||||||
|
|||||||
@@ -159,7 +159,7 @@ func (y *Yaesu) Connect() error {
|
|||||||
}
|
}
|
||||||
p, err := serial.Open(y.portName, &serial.Mode{BaudRate: y.baud})
|
p, err := serial.Open(y.portName, &serial.Mode{BaudRate: y.baud})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("yaesu: open %s @ %d baud: %w", y.portName, y.baud, err)
|
return fmt.Errorf("yaesu: open %s @ %d baud: %w%s", y.portName, y.baud, err, busyHint(y.portName, err))
|
||||||
}
|
}
|
||||||
// The modem lines are only touched when the operator asks for it — see the
|
// The modem lines are only touched when the operator asks for it — see the
|
||||||
// note on Kenwood.lowerLines. Both defaults break somebody's station.
|
// note on Kenwood.lowerLines. Both defaults break somebody's station.
|
||||||
|
|||||||
@@ -44,12 +44,24 @@ type YaesuTXState struct {
|
|||||||
SWRMeter int `json:"swr_meter"` // 0-100, TX only
|
SWRMeter int `json:"swr_meter"` // 0-100, TX only
|
||||||
|
|
||||||
RFPower int `json:"rf_power"` // watts
|
RFPower int `json:"rf_power"` // watts
|
||||||
|
// MaxPower is what this model can actually be set to, so the slider stops
|
||||||
|
// where the radio does. An FTDX101MP is a 200 W transmitter and its operator
|
||||||
|
// could not ask for more than 100 W — the slider, not the rig, was the limit.
|
||||||
|
MaxPower int `json:"max_power"`
|
||||||
|
// NarrowSupported says the rig answered NA at all. A button that reports a
|
||||||
|
// state the radio never gave, and does nothing when pressed, is worse than
|
||||||
|
// an absent one: it looks like a fault in the radio.
|
||||||
|
NarrowSupported bool `json:"narrow_supported"`
|
||||||
MicGain int `json:"mic_gain"` // 0-100
|
MicGain int `json:"mic_gain"` // 0-100
|
||||||
AFGain int `json:"af_gain"` // 0-100
|
AFGain int `json:"af_gain"` // 0-100
|
||||||
RFGain int `json:"rf_gain"` // 0-100
|
RFGain int `json:"rf_gain"` // 0-100
|
||||||
Squelch int `json:"squelch"` // 0-100
|
Squelch int `json:"squelch"` // 0-100
|
||||||
AGC string `json:"agc,omitempty"`
|
AGC string `json:"agc,omitempty"`
|
||||||
Preamp int `json:"preamp"` // 0=IPO, 1=AMP1, 2=AMP2
|
Preamp int `json:"preamp"` // 0=IPO, 1=AMP1, 2=AMP2
|
||||||
|
// Antenna is the selected jack, 1-3, or 0 when the rig has no AN command —
|
||||||
|
// an FT-891 or FT-991A has a single socket and answers nothing. 0 is what
|
||||||
|
// tells the panel to draw no selector at all rather than a dead one.
|
||||||
|
Antenna int `json:"antenna"`
|
||||||
Att int `json:"att"` // 0=off, else dB
|
Att int `json:"att"` // 0=off, else dB
|
||||||
NB bool `json:"nb"`
|
NB bool `json:"nb"`
|
||||||
NR bool `json:"nr"`
|
NR bool `json:"nr"`
|
||||||
@@ -80,6 +92,7 @@ type YaesuController interface {
|
|||||||
SetYaesuSquelch(int) error
|
SetYaesuSquelch(int) error
|
||||||
SetYaesuAGC(string) error
|
SetYaesuAGC(string) error
|
||||||
SetYaesuPreamp(int) error
|
SetYaesuPreamp(int) error
|
||||||
|
SetYaesuAntenna(int) error
|
||||||
SetYaesuAtt(int) error
|
SetYaesuAtt(int) error
|
||||||
SetYaesuNB(bool) error
|
SetYaesuNB(bool) error
|
||||||
SetYaesuNR(bool) error
|
SetYaesuNR(bool) error
|
||||||
@@ -105,9 +118,29 @@ func (y *Yaesu) YaesuState() YaesuTXState {
|
|||||||
st := y.panel
|
st := y.panel
|
||||||
st.Available = y.port != nil
|
st.Available = y.port != nil
|
||||||
st.Model = y.model
|
st.Model = y.model
|
||||||
|
st.MaxPower = yaesuMaxPower(y.model, st.RFPower)
|
||||||
return st
|
return st
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// yaesuMaxPower is how far the power slider may go on this model.
|
||||||
|
//
|
||||||
|
// The rig itself is never asked — there is no CAT command for "how much power
|
||||||
|
// can you make" — so it comes from the model name, with one safeguard: a rig
|
||||||
|
// REPORTING more than the table expects is believed, because it has just proved
|
||||||
|
// what it can do. Anything unknown gets 100 W, which is the family default and
|
||||||
|
// errs towards asking for too little.
|
||||||
|
func yaesuMaxPower(model string, reported int) int {
|
||||||
|
max := 100
|
||||||
|
switch {
|
||||||
|
case strings.Contains(model, "101MP"), strings.Contains(model, "5000"), strings.Contains(model, "9000"):
|
||||||
|
max = 200
|
||||||
|
}
|
||||||
|
if reported > max {
|
||||||
|
max = reported
|
||||||
|
}
|
||||||
|
return max
|
||||||
|
}
|
||||||
|
|
||||||
// readPanel refreshes the meters, and the settings on the slower beat. Called
|
// readPanel refreshes the meters, and the settings on the slower beat. Called
|
||||||
// from ReadState with the mutex HELD, so it shares the same serialised link.
|
// from ReadState with the mutex HELD, so it shares the same serialised link.
|
||||||
func (y *Yaesu) readPanel(mode string, split bool, txHz int64) {
|
func (y *Yaesu) readPanel(mode string, split bool, txHz int64) {
|
||||||
@@ -221,8 +254,15 @@ func (y *Yaesu) readPanelSettings() {
|
|||||||
if v, ok := y.askNum("PC;", "PC", 3); ok {
|
if v, ok := y.askNum("PC;", "PC", 3); ok {
|
||||||
y.panel.RFPower = v // watts, not a 0-255 scale
|
y.panel.RFPower = v // watts, not a 0-255 scale
|
||||||
}
|
}
|
||||||
|
// MIC GAIN IS 0-100, not 0-255.
|
||||||
|
//
|
||||||
|
// It was read through the 0-255 scale like the audio gains, so an FTDX101
|
||||||
|
// set to 80 showed 38 — and worse, writing sent 80 → 204, outside the range
|
||||||
|
// the rig accepts, so the setting was refused and the slider sprang back to
|
||||||
|
// where it had been. Reported from a real FTDX101; the CAT reference gives
|
||||||
|
// MG000-100 for the whole current family.
|
||||||
if v, ok := y.askNum("MG;", "MG", 3); ok {
|
if v, ok := y.askNum("MG;", "MG", 3); ok {
|
||||||
y.panel.MicGain = scale255(v)
|
y.panel.MicGain = clampInt(v, 0, 100)
|
||||||
}
|
}
|
||||||
if v, ok := y.askNum("AG0;", "AG0", 3); ok {
|
if v, ok := y.askNum("AG0;", "AG0", 3); ok {
|
||||||
y.panel.AFGain = scale255(v)
|
y.panel.AFGain = scale255(v)
|
||||||
@@ -239,6 +279,24 @@ func (y *Yaesu) readPanelSettings() {
|
|||||||
if v, ok := y.askNum("PA0;", "PA0", 1); ok {
|
if v, ok := y.askNum("PA0;", "PA0", 1); ok {
|
||||||
y.panel.Preamp = v
|
y.panel.Preamp = v
|
||||||
}
|
}
|
||||||
|
// ANTENNA. "AN0;" → "AN01;" — the first digit is the receiver (0 = main,
|
||||||
|
// 1 = sub on an FTDX101), the second the jack. A rig with one socket does
|
||||||
|
// not implement it and simply says nothing, which askNum reports as
|
||||||
|
// not-ok — and 0 then means "no antenna switching here".
|
||||||
|
if v, ok := y.askNum("AN0;", "AN0", 1); ok {
|
||||||
|
if y.panel.Antenna == 0 {
|
||||||
|
debugLog.Printf("yaesu: antenna select available (AN0; → %d)", v)
|
||||||
|
}
|
||||||
|
y.panel.Antenna = v
|
||||||
|
} else {
|
||||||
|
// Said once, at the first read: an operator who expects the ANT row and
|
||||||
|
// does not get it should find the reason in the log rather than wonder
|
||||||
|
// whether OpsLog forgot the feature.
|
||||||
|
if y.panel.Antenna != -1 {
|
||||||
|
debugLog.Printf("yaesu: no answer to AN0; — this rig has no antenna selection, the ANT row stays hidden")
|
||||||
|
}
|
||||||
|
y.panel.Antenna = -1
|
||||||
|
}
|
||||||
if v, ok := y.askNum("RA0;", "RA0", 1); ok {
|
if v, ok := y.askNum("RA0;", "RA0", 1); ok {
|
||||||
y.panel.Att = yaesuAttDB(v)
|
y.panel.Att = yaesuAttDB(v)
|
||||||
}
|
}
|
||||||
@@ -253,6 +311,7 @@ func (y *Yaesu) readPanelSettings() {
|
|||||||
}
|
}
|
||||||
if v, ok := y.askNum("NA0;", "NA0", 1); ok {
|
if v, ok := y.askNum("NA0;", "NA0", 1); ok {
|
||||||
y.panel.Narrow = v != 0
|
y.panel.Narrow = v != 0
|
||||||
|
y.panel.NarrowSupported = true
|
||||||
}
|
}
|
||||||
if v, ok := y.askNum("VX;", "VX", 1); ok {
|
if v, ok := y.askNum("VX;", "VX", 1); ok {
|
||||||
y.panel.VOX = v != 0
|
y.panel.VOX = v != 0
|
||||||
@@ -333,7 +392,7 @@ func (y *Yaesu) SetYaesuPower(w int) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (y *Yaesu) SetYaesuMicGain(p int) error {
|
func (y *Yaesu) SetYaesuMicGain(p int) error {
|
||||||
return y.setAndRefresh(fmt.Sprintf("MG%03d;", from100(p)))
|
return y.setAndRefresh(fmt.Sprintf("MG%03d;", clampInt(p, 0, 100)))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (y *Yaesu) SetYaesuAFGain(p int) error {
|
func (y *Yaesu) SetYaesuAFGain(p int) error {
|
||||||
@@ -356,6 +415,17 @@ func (y *Yaesu) SetYaesuPreamp(n int) error {
|
|||||||
return y.setAndRefresh(fmt.Sprintf("PA0%d;", clampInt(n, 0, 2)))
|
return y.setAndRefresh(fmt.Sprintf("PA0%d;", clampInt(n, 0, 2)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetYaesuAntenna selects an antenna jack (1-3) on the main receiver.
|
||||||
|
//
|
||||||
|
// Verified against the FTDX10 command set; the FTDX101 adds a third jack and a
|
||||||
|
// sub receiver, which is the "0" in AN0 — the day someone drives a sub receiver
|
||||||
|
// from here it becomes a parameter rather than a constant. A rig without the
|
||||||
|
// command ignores it, and readPanelSettings then keeps Antenna at 0, so the
|
||||||
|
// control never appears in the first place.
|
||||||
|
func (y *Yaesu) SetYaesuAntenna(n int) error {
|
||||||
|
return y.setAndRefresh(fmt.Sprintf("AN0%d;", clampInt(n, 1, 3)))
|
||||||
|
}
|
||||||
|
|
||||||
func (y *Yaesu) SetYaesuAtt(db int) error {
|
func (y *Yaesu) SetYaesuAtt(db int) error {
|
||||||
return y.setAndRefresh(fmt.Sprintf("RA0%d;", yaesuAttCode(db)))
|
return y.setAndRefresh(fmt.Sprintf("RA0%d;", yaesuAttCode(db)))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
package cat
|
package cat
|
||||||
|
|
||||||
import "testing"
|
import (
|
||||||
|
"fmt"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
func TestParseYaesuFreq(t *testing.T) {
|
func TestParseYaesuFreq(t *testing.T) {
|
||||||
cases := []struct {
|
cases := []struct {
|
||||||
@@ -380,3 +383,26 @@ func TestYaesuModeVFOSuffix(t *testing.T) {
|
|||||||
t.Errorf("setting CW on main sends %q, want MD03;", cmd)
|
t.Errorf("setting CW on main sends %q, want MD03;", cmd)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The antenna command, as the FTDX10 reference gives it: AN + receiver + jack.
|
||||||
|
// The jack is clamped rather than trusted — a panel bug that sent AN09 would be
|
||||||
|
// answered by the rig with silence, and the operator would be left wondering
|
||||||
|
// which antenna they were on.
|
||||||
|
func TestYaesuAntennaCommand(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
in int
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{1, "AN01;"},
|
||||||
|
{2, "AN02;"},
|
||||||
|
{3, "AN03;"},
|
||||||
|
{0, "AN01;"}, // below range → the first jack
|
||||||
|
{9, "AN03;"}, // above range → the last
|
||||||
|
{-1, "AN01;"},
|
||||||
|
} {
|
||||||
|
got := fmt.Sprintf("AN0%d;", clampInt(tc.in, 1, 3))
|
||||||
|
if got != tc.want {
|
||||||
|
t.Errorf("antenna %d → %q, want %q", tc.in, got, tc.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+25
-4
@@ -147,7 +147,17 @@ func NowISO() string { return time.Now().UTC().Format("2006-01-02T15:04:05.000Z"
|
|||||||
|
|
||||||
// Open opens (and creates if needed) the SQLite database at the given path,
|
// Open opens (and creates if needed) the SQLite database at the given path,
|
||||||
// enables performance PRAGMAs, and applies embedded migrations.
|
// enables performance PRAGMAs, and applies embedded migrations.
|
||||||
func Open(path string) (*sql.DB, error) {
|
//
|
||||||
|
// This is the SETTINGS database, which gets the full schema — see roles.go for
|
||||||
|
// why. Use OpenLogbook for a database that holds contacts only.
|
||||||
|
func Open(path string) (*sql.DB, error) { return open(path, RoleAll) }
|
||||||
|
|
||||||
|
// OpenLogbook opens a SQLite logbook: the qso table and nothing from the
|
||||||
|
// settings side, and any unused settings tables an earlier version left in it
|
||||||
|
// are dropped if they are empty.
|
||||||
|
func OpenLogbook(path string) (*sql.DB, error) { return open(path, RoleLogbook) }
|
||||||
|
|
||||||
|
func open(path string, role Role) (*sql.DB, error) {
|
||||||
// Escape only the two characters a path could contain that the DSN would
|
// Escape only the two characters a path could contain that the DSN would
|
||||||
// otherwise read as its query/fragment delimiters. Windows separators
|
// otherwise read as its query/fragment delimiters. Windows separators
|
||||||
// (\\ and the drive ':') are left intact — url.PathEscape would mangle them.
|
// (\\ and the drive ':') are left intact — url.PathEscape would mangle them.
|
||||||
@@ -162,10 +172,12 @@ func Open(path string) (*sql.DB, error) {
|
|||||||
return nil, fmt.Errorf("ping sqlite: %w", err)
|
return nil, fmt.Errorf("ping sqlite: %w", err)
|
||||||
}
|
}
|
||||||
Dialect = "sqlite"
|
Dialect = "sqlite"
|
||||||
if err := migrate(conn, nil, path, filepath.Base(path)); err != nil {
|
label := filepath.Base(path)
|
||||||
|
if err := migrate(conn, nil, path, label, role); err != nil {
|
||||||
_ = conn.Close()
|
_ = conn.Close()
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
pruneForeignTables(conn, role, label)
|
||||||
return conn, nil
|
return conn, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -236,7 +248,7 @@ func backupBeforeRewrite(conn *sql.DB, dbPath, migration string) {
|
|||||||
// interleaved migration runs in one log were indistinguishable — an operator
|
// interleaved migration runs in one log were indistinguishable — an operator
|
||||||
// reported "migrations are very slow" and the lines gave no way to tell one
|
// reported "migrations are very slow" and the lines gave no way to tell one
|
||||||
// database migrated three times from three databases migrated once.
|
// database migrated three times from three databases migrated once.
|
||||||
func migrate(conn *sql.DB, translate func(string) string, dbPath, label string) error {
|
func migrate(conn *sql.DB, translate func(string) string, dbPath, label string, role Role) error {
|
||||||
// A non-nil translator means this is the MySQL connection (use the
|
// A non-nil translator means this is the MySQL connection (use the
|
||||||
// per-statement, FK-aware path); nil means a SQLite connection. This is
|
// per-statement, FK-aware path); nil means a SQLite connection. This is
|
||||||
// determined by the caller's argument, NOT the global Dialect, so the
|
// determined by the caller's argument, NOT the global Dialect, so the
|
||||||
@@ -331,10 +343,19 @@ func migrate(conn *sql.DB, translate func(string) string, dbPath, label string)
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("begin tx for %s: %w", name, err)
|
return fmt.Errorf("begin tx for %s: %w", name, err)
|
||||||
}
|
}
|
||||||
if _, err := tx.Exec(sqlText); err != nil {
|
// Statement by statement rather than one Exec of the whole file: the role
|
||||||
|
// filter works per statement, and a settings-table statement must not
|
||||||
|
// reach a logbook database (see roles.go). Still one transaction, so the
|
||||||
|
// file remains atomic.
|
||||||
|
for _, stmt := range splitStatements(sqlText) {
|
||||||
|
if !keepForRole(stmt, role) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, err := tx.Exec(stmt); err != nil {
|
||||||
_ = tx.Rollback()
|
_ = tx.Rollback()
|
||||||
return fmt.Errorf("apply migration %s: %w", name, err)
|
return fmt.Errorf("apply migration %s: %w", name, err)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if _, err := tx.Exec(`INSERT INTO schema_migrations(name) VALUES(?)`, name); err != nil {
|
if _, err := tx.Exec(`INSERT INTO schema_migrations(name) VALUES(?)`, name); err != nil {
|
||||||
_ = tx.Rollback()
|
_ = tx.Rollback()
|
||||||
return fmt.Errorf("record migration %s: %w", name, err)
|
return fmt.Errorf("record migration %s: %w", name, err)
|
||||||
|
|||||||
@@ -252,7 +252,7 @@ func OpenMySQL(c MySQLConfig) (*sql.DB, error) {
|
|||||||
return nil, rerr
|
return nil, rerr
|
||||||
}
|
}
|
||||||
// Then apply only the migrations it's missing.
|
// Then apply only the migrations it's missing.
|
||||||
err = migrate(conn, mysqlDDL, "", "mysql:"+name)
|
err = migrate(conn, mysqlDDL, "", "mysql:"+name, RoleLogbook)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
_ = conn.Close()
|
_ = conn.Close()
|
||||||
@@ -343,7 +343,9 @@ func applyMySQLBaseline(conn *sql.DB) error {
|
|||||||
// database. Labelled so its (fast) migration lines are not mistaken for a
|
// database. Labelled so its (fast) migration lines are not mistaken for a
|
||||||
// real database being migrated — in one operator's log this pass sat between
|
// real database being migrated — in one operator's log this pass sat between
|
||||||
// two slow MySQL runs and looked like a third database.
|
// two slow MySQL runs and looked like a third database.
|
||||||
if err := migrate(mem, nil, "", "baseline:memory"); err != nil {
|
// RoleLogbook: the baseline defines what a FRESH shared logbook gets, and a
|
||||||
|
// logbook has no business holding settings or station profiles.
|
||||||
|
if err := migrate(mem, nil, "", "baseline:memory", RoleLogbook); err != nil {
|
||||||
return fmt.Errorf("build baseline schema: %w", err)
|
return fmt.Errorf("build baseline schema: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,321 @@
|
|||||||
|
package db
|
||||||
|
|
||||||
|
// Which tables belong in which database.
|
||||||
|
//
|
||||||
|
// OpsLog keeps settings and contacts apart — a settings database (settings.db /
|
||||||
|
// opslog.db) and a logbook (logbook.db, a per-profile file, or a shared MySQL).
|
||||||
|
// The SEPARATION of the data was real from the start; the SCHEMA was not: every
|
||||||
|
// target got the whole migration set, so a shared MySQL logbook grew a settings
|
||||||
|
// table and a station_profiles table that nothing ever wrote to. An operator
|
||||||
|
// inspecting the server with phpMyAdmin had no way to tell which copy was
|
||||||
|
// authoritative — a fair question, and the reason for this file.
|
||||||
|
//
|
||||||
|
// So a migration statement is now filtered by the ROLE of the database it is
|
||||||
|
// being applied to. Only two rules, and both fail safe:
|
||||||
|
//
|
||||||
|
// - RoleAll (the settings database) applies everything, exactly as before.
|
||||||
|
// It has to: a legacy single-file installation holds its QSOs there, and it
|
||||||
|
// still serves as the logbook when no separate one could be created.
|
||||||
|
// - RoleLogbook applies everything EXCEPT statements aimed at a table on the
|
||||||
|
// settings side. A table this file does not know about is kept, in both —
|
||||||
|
// an unrecognised future table behaves as it does today rather than
|
||||||
|
// silently going missing from one database.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Role is what a database is for.
|
||||||
|
type Role int
|
||||||
|
|
||||||
|
const (
|
||||||
|
// RoleAll applies every migration statement. The settings database.
|
||||||
|
RoleAll Role = iota
|
||||||
|
// RoleLogbook applies only what the contacts need.
|
||||||
|
RoleLogbook
|
||||||
|
)
|
||||||
|
|
||||||
|
// settingsTables are owned by the settings database. Every one of them is
|
||||||
|
// reached through the settings connection in app.go — grep NewRepo/NewStore
|
||||||
|
// there: only qso.NewRepo is given the logbook connection.
|
||||||
|
//
|
||||||
|
// Ordered children-before-parents, because pruneForeignTables drops them in
|
||||||
|
// this order and operating_antennas has a foreign key into operating_stations.
|
||||||
|
var settingsTables = []string{
|
||||||
|
"operating_antenna_bands",
|
||||||
|
"operating_antennas",
|
||||||
|
"operating_antennas_new",
|
||||||
|
"operating_stations",
|
||||||
|
"operating_stations_new",
|
||||||
|
"award_references",
|
||||||
|
"qsl_templates",
|
||||||
|
"cluster_servers",
|
||||||
|
"integrations_udp",
|
||||||
|
"callsign_cache",
|
||||||
|
"station_profiles",
|
||||||
|
"settings",
|
||||||
|
}
|
||||||
|
|
||||||
|
// keepForRole reports whether one migration statement applies to this role.
|
||||||
|
func keepForRole(stmt string, role Role) bool {
|
||||||
|
if role == RoleAll {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
t := stmtTable(stmt)
|
||||||
|
if t == "" {
|
||||||
|
return true // not a table statement (PRAGMA, or a shape we don't parse)
|
||||||
|
}
|
||||||
|
for _, s := range settingsTables {
|
||||||
|
if t == s {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// stmtTable returns the lower-cased table a statement acts on, or "".
|
||||||
|
//
|
||||||
|
// Deliberately literal: it recognises the handful of statement shapes the
|
||||||
|
// migrations actually use, and returns "" for anything else — which keeps the
|
||||||
|
// statement. Guessing would be the only way to drop something by accident.
|
||||||
|
func stmtTable(stmt string) string {
|
||||||
|
f := strings.Fields(strings.ToLower(stmt))
|
||||||
|
at := func(i int) string {
|
||||||
|
if i < len(f) {
|
||||||
|
return f[i]
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
// Skip the leading keywords that carry no table name.
|
||||||
|
switch {
|
||||||
|
case at(0) == "create" || at(0) == "drop":
|
||||||
|
// CREATE [UNIQUE] INDEX <name> ON <table> …
|
||||||
|
// CREATE TABLE [IF NOT EXISTS] <table> … / DROP TABLE [IF EXISTS] <t>
|
||||||
|
//
|
||||||
|
// The "ON" search is confined to an INDEX statement on purpose: a CREATE
|
||||||
|
// TABLE body is full of "ON DELETE CASCADE", and scanning the whole
|
||||||
|
// statement for "on" once made every foreign-keyed table report itself as
|
||||||
|
// a table named "delete" — unrecognised, therefore kept, therefore created
|
||||||
|
// in a logbook that had no use for it.
|
||||||
|
if at(1) == "index" || (at(1) == "unique" && at(2) == "index") {
|
||||||
|
for i, w := range f {
|
||||||
|
if w == "on" && i+1 < len(f) {
|
||||||
|
return cleanIdent(f[i+1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
i := 1
|
||||||
|
for at(i) == "unique" || at(i) == "table" || at(i) == "index" ||
|
||||||
|
at(i) == "if" || at(i) == "not" || at(i) == "exists" || at(i) == "view" {
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return cleanIdent(at(i))
|
||||||
|
case at(0) == "alter":
|
||||||
|
return cleanIdent(at(2)) // ALTER TABLE <table> …
|
||||||
|
case at(0) == "insert" || at(0) == "replace":
|
||||||
|
i := 1
|
||||||
|
for at(i) == "or" || at(i) == "ignore" || at(i) == "into" || at(i) == "replace" {
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return cleanIdent(at(i))
|
||||||
|
case at(0) == "update":
|
||||||
|
return cleanIdent(at(1))
|
||||||
|
case at(0) == "delete":
|
||||||
|
return cleanIdent(at(2)) // DELETE FROM <table>
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// cleanIdent strips quoting and anything glued to the name — "qso(id)" from an
|
||||||
|
// index, `settings` from the MySQL translation, "qso;" from a split statement.
|
||||||
|
func cleanIdent(s string) string {
|
||||||
|
s = strings.TrimSpace(s)
|
||||||
|
if i := strings.IndexAny(s, "(;"); i >= 0 {
|
||||||
|
s = s[:i]
|
||||||
|
}
|
||||||
|
return strings.Trim(s, "`\"'[]")
|
||||||
|
}
|
||||||
|
|
||||||
|
// pruneForeignTables removes settings tables from a logbook database that an
|
||||||
|
// earlier version created there.
|
||||||
|
//
|
||||||
|
// ONLY WHEN EMPTY, without exception. A table with rows in it is data, whatever
|
||||||
|
// this file thinks it is for: a profile pointing at a legacy combined database
|
||||||
|
// as its logbook is a real configuration, and dropping its profiles because the
|
||||||
|
// schema now says they belong elsewhere would be destroying a log-keeping
|
||||||
|
// operator's work on the strength of a tidiness rule.
|
||||||
|
//
|
||||||
|
// Best effort throughout: a logbook the user cannot drop tables in (a restricted
|
||||||
|
// MySQL grant) keeps its empty tables and works exactly as it does today.
|
||||||
|
func pruneForeignTables(conn *sql.DB, role Role, label string) {
|
||||||
|
if role != RoleLogbook || conn == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Once per database, recorded like a migration.
|
||||||
|
//
|
||||||
|
// The check itself is a COUNT(*) per settings table — twelve round trips,
|
||||||
|
// which is nothing locally and is paid on EVERY open of a remote MySQL
|
||||||
|
// logbook, including every profile switch. There is nothing to find after the
|
||||||
|
// first pass: the role filter means no settings table is ever created in a
|
||||||
|
// logbook again.
|
||||||
|
if _, err := conn.Exec(`INSERT INTO schema_migrations(name) VALUES(?)`, prunedMarker); err != nil {
|
||||||
|
return // already recorded (primary key), or the table is not writable
|
||||||
|
}
|
||||||
|
dropped := 0
|
||||||
|
for _, t := range settingsTables {
|
||||||
|
var n int
|
||||||
|
// A missing table errors here, which is the "nothing to do" answer.
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM ` + quoteIdent(t)).Scan(&n); err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if n != 0 {
|
||||||
|
logf("db[%s]: keeping %s — it has %d row(s)", label, t, n)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`DROP TABLE ` + quoteIdent(t)); err != nil {
|
||||||
|
logf("db[%s]: could not drop unused %s: %v", label, t, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
dropped++
|
||||||
|
}
|
||||||
|
if dropped > 0 {
|
||||||
|
logf("db[%s]: dropped %d unused settings table(s) — this database holds contacts only", label, dropped)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// prunedMarker records, in schema_migrations, that a logbook has had its unused
|
||||||
|
// settings tables removed. Named like a migration and stored beside them because
|
||||||
|
// that is exactly what it is: a one-off schema step, and the applied set is
|
||||||
|
// already read in a single query at every open.
|
||||||
|
const prunedMarker = "_opslog_pruned_settings_tables"
|
||||||
|
|
||||||
|
// quoteIdent quotes one of OUR OWN table names for either dialect. Backticks
|
||||||
|
// work in MySQL and in SQLite alike, which is why the migrations use them.
|
||||||
|
func quoteIdent(s string) string { return "`" + s + "`" }
|
||||||
|
|
||||||
|
// DropRedundantSettingsTables removes the settings tables from a logbook
|
||||||
|
// database EVEN IF THEY HAVE ROWS.
|
||||||
|
//
|
||||||
|
// Reserved for the one case where those rows are provably a stale duplicate:
|
||||||
|
// the logbook file was seeded by VACUUM INTO from the old combined database
|
||||||
|
// (see the split at startup), so every profile and every setting in it is a
|
||||||
|
// copy of what the settings database still holds and is authoritative for.
|
||||||
|
// Nothing reads them — the settings connection is a different file entirely —
|
||||||
|
// and leaving them behind is what made the two databases look interchangeable.
|
||||||
|
//
|
||||||
|
// The caller must have established that authority. pruneForeignTables is the
|
||||||
|
// safe default for every other situation.
|
||||||
|
func DropRedundantSettingsTables(conn *sql.DB, label string) {
|
||||||
|
if conn == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
dropped := 0
|
||||||
|
for _, t := range settingsTables {
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM ` + quoteIdent(t)).Scan(new(int)); err != nil {
|
||||||
|
continue // not there: nothing to do
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`DROP TABLE ` + quoteIdent(t)); err != nil {
|
||||||
|
logf("db[%s]: could not drop redundant %s: %v", label, t, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
dropped++
|
||||||
|
}
|
||||||
|
if dropped > 0 {
|
||||||
|
logf("db[%s]: dropped %d settings table(s) copied by the logbook split — the settings database keeps the originals", label, dropped)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnsureQSOTable recreates the contacts table if it is missing.
|
||||||
|
//
|
||||||
|
// It exists so dropping an EMPTY qso table from the settings database is a
|
||||||
|
// reversible act. The settings database can still be pressed into service as the
|
||||||
|
// logbook — that is the fallback when no separate logbook file can be created —
|
||||||
|
// and the migrations that would have built the table are recorded as applied, so
|
||||||
|
// nothing would ever build it again. This does, from the same migrations, on
|
||||||
|
// demand.
|
||||||
|
//
|
||||||
|
// The schema is derived rather than duplicated: the migrations are replayed on a
|
||||||
|
// throwaway in-memory SQLite whose sqlite_master then holds the FINAL shape of
|
||||||
|
// the table with every ALTER-added column folded in. Same trick as the MySQL
|
||||||
|
// baseline, and for the same reason — there is no second schema to drift.
|
||||||
|
//
|
||||||
|
// SQLite only: the shared MySQL logbook is never the settings database.
|
||||||
|
func EnsureQSOTable(conn *sql.DB) error {
|
||||||
|
if conn == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(new(int)); err == nil {
|
||||||
|
return nil // already there
|
||||||
|
}
|
||||||
|
stmts, err := qsoSchemaDDL()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, st := range stmts {
|
||||||
|
if _, err := conn.Exec(st); err != nil {
|
||||||
|
return fmt.Errorf("recreate qso table: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
logf("db: recreated the qso table — this database is being used as the logbook")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// qsoSchemaDDL returns the CREATE statements for the qso table and its indexes,
|
||||||
|
// in that order.
|
||||||
|
func qsoSchemaDDL() ([]string, error) {
|
||||||
|
mem, err := sql.Open("sqlite", "file:opslog_qsoschema?mode=memory&cache=shared")
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("open schema sqlite: %w", err)
|
||||||
|
}
|
||||||
|
defer mem.Close()
|
||||||
|
if err := migrate(mem, nil, "", "qso-schema:memory", RoleLogbook); err != nil {
|
||||||
|
return nil, fmt.Errorf("build qso schema: %w", err)
|
||||||
|
}
|
||||||
|
rows, err := mem.Query(`SELECT type, sql FROM sqlite_master
|
||||||
|
WHERE sql IS NOT NULL AND tbl_name = 'qso'`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
var tables, indexes []string
|
||||||
|
for rows.Next() {
|
||||||
|
var typ, s string
|
||||||
|
if err := rows.Scan(&typ, &s); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if typ == "table" {
|
||||||
|
tables = append(tables, s)
|
||||||
|
} else {
|
||||||
|
indexes = append(indexes, s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(tables) == 0 {
|
||||||
|
return nil, fmt.Errorf("qso table not found in the derived schema")
|
||||||
|
}
|
||||||
|
return append(tables, indexes...), rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// DropEmptyQSOTable removes the contacts table from a database that is not the
|
||||||
|
// logbook — the settings database, once its QSOs live in their own file.
|
||||||
|
//
|
||||||
|
// Only when empty, and reversible: EnsureQSOTable builds it again the moment
|
||||||
|
// this database is asked to serve as the logbook.
|
||||||
|
func DropEmptyQSOTable(conn *sql.DB, label string) {
|
||||||
|
if conn == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var n int
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
|
||||||
|
return // not there: nothing to do
|
||||||
|
}
|
||||||
|
if n != 0 {
|
||||||
|
return // contacts: this table is data, whatever the schema says
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`DROP TABLE qso`); err != nil {
|
||||||
|
logf("db[%s]: could not drop the unused qso table: %v", label, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
logf("db[%s]: dropped the unused qso table — the contacts live in their own database", label)
|
||||||
|
}
|
||||||
@@ -0,0 +1,283 @@
|
|||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"path/filepath"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestStmtTable(t *testing.T) {
|
||||||
|
cases := map[string]string{
|
||||||
|
"CREATE TABLE station_profiles (\n id INTEGER PRIMARY KEY)": "station_profiles",
|
||||||
|
"CREATE TABLE IF NOT EXISTS settings (`key` TEXT PRIMARY KEY)": "settings",
|
||||||
|
"CREATE UNIQUE INDEX idx_qso_uid ON qso(sync_uid)": "qso",
|
||||||
|
"CREATE INDEX idx_ref ON award_references (award_code)": "award_references",
|
||||||
|
"ALTER TABLE qso ADD COLUMN ant_path TEXT NOT NULL DEFAULT ''": "qso",
|
||||||
|
"ALTER TABLE `station_profiles` ADD COLUMN my_cq_zone TEXT": "station_profiles",
|
||||||
|
"INSERT INTO settings(`key`, value) VALUES('x','y')": "settings",
|
||||||
|
"INSERT OR IGNORE INTO cluster_servers(name) VALUES('dxc')": "cluster_servers",
|
||||||
|
"UPDATE qso SET callsign = UPPER(callsign)": "qso",
|
||||||
|
"DELETE FROM operating_antennas WHERE station_id IS NULL": "operating_antennas",
|
||||||
|
"DROP TABLE IF EXISTS operating_stations_new": "operating_stations_new",
|
||||||
|
"PRAGMA foreign_keys = off": "",
|
||||||
|
"": "",
|
||||||
|
}
|
||||||
|
for in, want := range cases {
|
||||||
|
if got := stmtTable(in); got != want {
|
||||||
|
t.Errorf("stmtTable(%.40q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestKeepForRole(t *testing.T) {
|
||||||
|
// The settings database takes everything, exactly as before this existed.
|
||||||
|
for _, s := range []string{"CREATE TABLE settings (a TEXT)", "CREATE TABLE qso (a TEXT)"} {
|
||||||
|
if !keepForRole(s, RoleAll) {
|
||||||
|
t.Fatalf("RoleAll dropped %q", s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// A logbook takes the contacts and refuses the settings side.
|
||||||
|
if !keepForRole("CREATE INDEX i ON qso(callsign)", RoleLogbook) {
|
||||||
|
t.Fatal("logbook dropped a qso statement")
|
||||||
|
}
|
||||||
|
if keepForRole("CREATE TABLE station_profiles (id INTEGER)", RoleLogbook) {
|
||||||
|
t.Fatal("logbook accepted station_profiles")
|
||||||
|
}
|
||||||
|
// An unrecognised statement — a future table, a PRAGMA — is kept, so a new
|
||||||
|
// migration behaves as it does today rather than vanishing from one database.
|
||||||
|
if !keepForRole("CREATE TABLE something_new (id INTEGER)", RoleLogbook) {
|
||||||
|
t.Fatal("logbook dropped an unknown table")
|
||||||
|
}
|
||||||
|
if !keepForRole("PRAGMA foreign_keys = off", RoleLogbook) {
|
||||||
|
t.Fatal("logbook dropped a PRAGMA")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// tablesIn lists the tables of an open database.
|
||||||
|
func tablesIn(t *testing.T, path string) []string {
|
||||||
|
t.Helper()
|
||||||
|
conn, err := Open(path) // RoleAll: opening must not change what is there
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
rows, err := conn.Query(`SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'`)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
var out []string
|
||||||
|
for rows.Next() {
|
||||||
|
var n string
|
||||||
|
if err := rows.Scan(&n); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
out = append(out, n)
|
||||||
|
}
|
||||||
|
sort.Strings(out)
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// A logbook opened through OpenLogbook holds the contacts and nothing else.
|
||||||
|
func TestOpenLogbookSchema(t *testing.T) {
|
||||||
|
path := filepath.Join(t.TempDir(), "logbook.db")
|
||||||
|
conn, err := OpenLogbook(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var n int
|
||||||
|
// The one table that matters has to be there and has to be usable.
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
|
||||||
|
t.Fatalf("qso table unusable: %v", err)
|
||||||
|
}
|
||||||
|
for _, forbidden := range settingsTables {
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM ` + quoteIdent(forbidden)).Scan(&n); err == nil {
|
||||||
|
t.Errorf("%s was created in a logbook database", forbidden)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
conn.Close()
|
||||||
|
|
||||||
|
// Reopening as a logbook is idempotent, and the migrations already recorded
|
||||||
|
// as applied must not be re-run into a half-schema.
|
||||||
|
conn2, err := OpenLogbook(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("reopen: %v", err)
|
||||||
|
}
|
||||||
|
if err := conn2.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
|
||||||
|
t.Fatalf("qso lost on reopen: %v", err)
|
||||||
|
}
|
||||||
|
conn2.Close()
|
||||||
|
}
|
||||||
|
|
||||||
|
// An existing logbook that an older version filled with the whole schema loses
|
||||||
|
// the unused tables — and keeps any that hold rows.
|
||||||
|
func TestPruneKeepsNonEmptyTables(t *testing.T) {
|
||||||
|
path := filepath.Join(t.TempDir(), "legacy.db")
|
||||||
|
conn, err := Open(path) // the old behaviour: every table everywhere
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`INSERT INTO station_profiles(name) VALUES('Home')`); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
conn.Close()
|
||||||
|
|
||||||
|
if got := tablesIn(t, path); len(got) < 10 {
|
||||||
|
t.Fatalf("expected a full legacy schema, got %v", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
conn, err = OpenLogbook(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
var n int
|
||||||
|
// Rows are data: this one stays, whatever the schema says it is for.
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM station_profiles`).Scan(&n); err != nil || n != 1 {
|
||||||
|
t.Fatalf("station_profiles dropped with a row in it (err=%v n=%d)", err, n)
|
||||||
|
}
|
||||||
|
// The empty ones go.
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM settings`).Scan(&n); err == nil {
|
||||||
|
t.Error("empty settings table survived in a logbook")
|
||||||
|
}
|
||||||
|
// And the contacts are untouched throughout.
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
|
||||||
|
t.Fatalf("qso table lost: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A CREATE TABLE body is full of "ON DELETE CASCADE": the index rule must not
|
||||||
|
// read it as a table name, or the table goes unrecognised and gets created in
|
||||||
|
// every database.
|
||||||
|
func TestStmtTableForeignKeyBody(t *testing.T) {
|
||||||
|
stmt := `CREATE TABLE operating_stations (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
profile_id INTEGER NOT NULL,
|
||||||
|
FOREIGN KEY (profile_id) REFERENCES station_profiles(id) ON DELETE CASCADE
|
||||||
|
)`
|
||||||
|
if got := stmtTable(stmt); got != "operating_stations" {
|
||||||
|
t.Fatalf("got %q", got)
|
||||||
|
}
|
||||||
|
if keepForRole(stmt, RoleLogbook) {
|
||||||
|
t.Fatal("a settings table reached a logbook database")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The settings database loses its unused qso table — and gets it back, in full,
|
||||||
|
// the moment it has to serve as the logbook again.
|
||||||
|
func TestDropAndRecreateQSOTable(t *testing.T) {
|
||||||
|
path := filepath.Join(t.TempDir(), "settings.db")
|
||||||
|
conn, err := Open(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
|
||||||
|
// A contact in it is data: the table must survive.
|
||||||
|
if _, err := conn.Exec(`INSERT INTO qso(callsign, qso_date, band, mode)
|
||||||
|
VALUES('F4BPO','2026-01-01T12:00:00Z','20m','SSB')`); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
DropEmptyQSOTable(conn, "settings")
|
||||||
|
var n int
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil || n != 1 {
|
||||||
|
t.Fatalf("dropped a qso table holding a contact (err=%v n=%d)", err, n)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Empty, so it goes.
|
||||||
|
if _, err := conn.Exec(`DELETE FROM qso`); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
DropEmptyQSOTable(conn, "settings")
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err == nil {
|
||||||
|
t.Fatal("empty qso table survived")
|
||||||
|
}
|
||||||
|
|
||||||
|
// And comes back complete when this database is pressed into service as the
|
||||||
|
// logbook — a late column and an index included, not just a bare table.
|
||||||
|
if err := EnsureQSOTable(conn); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`INSERT INTO qso(callsign, qso_date, band, mode, ant_path, sync_uid)
|
||||||
|
VALUES('F1TRF','2026-01-02T13:00:00Z','40m','CW','S','uid-1')`); err != nil {
|
||||||
|
t.Fatalf("recreated qso table is incomplete: %v", err)
|
||||||
|
}
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil || n != 1 {
|
||||||
|
t.Fatalf("recreated table unusable (err=%v n=%d)", err, n)
|
||||||
|
}
|
||||||
|
// Idempotent: a second call on a live table must not touch it.
|
||||||
|
if err := EnsureQSOTable(conn); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil || n != 1 {
|
||||||
|
t.Fatalf("EnsureQSOTable disturbed an existing table (err=%v n=%d)", err, n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A brand-new logbook — the case of a fresh install, or the "New database"
|
||||||
|
// button — is right from the first open: the contacts and the migration ledger,
|
||||||
|
// nothing else. Pinned as an exact list so an accidentally unfiltered future
|
||||||
|
// migration shows up here rather than in an operator's phpMyAdmin.
|
||||||
|
func TestFreshLogbookHasOnlyContactTables(t *testing.T) {
|
||||||
|
path := filepath.Join(t.TempDir(), "fresh.db")
|
||||||
|
conn, err := OpenLogbook(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
rows, err := conn.Query(`SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'`)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var got []string
|
||||||
|
for rows.Next() {
|
||||||
|
var n string
|
||||||
|
if err := rows.Scan(&n); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got = append(got, n)
|
||||||
|
}
|
||||||
|
rows.Close()
|
||||||
|
conn.Close()
|
||||||
|
sort.Strings(got)
|
||||||
|
want := []string{"qso", "schema_migrations"}
|
||||||
|
if strings.Join(got, ",") != strings.Join(want, ",") {
|
||||||
|
t.Fatalf("fresh logbook holds %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The cleanup is a one-off, recorded like a migration: it must not be repeated
|
||||||
|
// at every connection. Twelve COUNT(*) round trips on a remote MySQL is a cost
|
||||||
|
// paid at every profile switch for something that can no longer be found.
|
||||||
|
func TestPruneRunsOnlyOnce(t *testing.T) {
|
||||||
|
path := filepath.Join(t.TempDir(), "once.db")
|
||||||
|
conn, err := Open(path) // full legacy schema
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
conn.Close()
|
||||||
|
|
||||||
|
conn, err = OpenLogbook(path) // first open: the cleanup happens
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var n int
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM settings`).Scan(&n); err == nil {
|
||||||
|
t.Fatal("first open did not clean up")
|
||||||
|
}
|
||||||
|
// Put one back by hand. A second pass would remove it again; a cleanup that
|
||||||
|
// knows it is done leaves it alone.
|
||||||
|
if _, err := conn.Exec("CREATE TABLE `settings` (`key` TEXT PRIMARY KEY, value TEXT)"); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
conn.Close()
|
||||||
|
|
||||||
|
conn, err = OpenLogbook(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM settings`).Scan(&n); err != nil {
|
||||||
|
t.Fatal("the cleanup ran a second time — it is not recorded as done")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
package dxcc
|
||||||
|
|
||||||
|
// The DELETED DXCC entities, and why a lookup table needs to know about them.
|
||||||
|
//
|
||||||
|
// cty.dat answers one question: what entity is this callsign in TODAY. That is
|
||||||
|
// the right answer for a spot and the wrong one for a log. R1MVI was Malyj
|
||||||
|
// Vysotskij Island, entity 151, until the ARRL deleted it in February 2012;
|
||||||
|
// today the same callsign resolves to European Russia, 54. A 2004 contact
|
||||||
|
// re-stamped from cty.dat therefore loses the entity it was made with — and
|
||||||
|
// with it a DXCC credit that cannot be worked again, because the place no
|
||||||
|
// longer counts.
|
||||||
|
//
|
||||||
|
// Reported by an operator importing a Logger32 export: his ADIF said
|
||||||
|
// <DXCC:3>151 and OpsLog stored 54.
|
||||||
|
//
|
||||||
|
// So this list exists to be able to say "that number belongs to something that
|
||||||
|
// no longer exists, leave it alone". It is the ADIF specification's own
|
||||||
|
// enumeration of deleted entities, and it does not change except when the ARRL
|
||||||
|
// deletes another one.
|
||||||
|
var deletedEntities = map[int]string{
|
||||||
|
2: "Abu Ail Is.",
|
||||||
|
8: "Aldabra",
|
||||||
|
19: "Bajo Nuevo",
|
||||||
|
23: "Blenheim Reef",
|
||||||
|
25: "British North Borneo",
|
||||||
|
26: "British Somaliland",
|
||||||
|
28: "Canal Zone",
|
||||||
|
30: "Celebe & Molucca Is.",
|
||||||
|
39: "Comoros",
|
||||||
|
42: "Damao, Diu",
|
||||||
|
44: "Desroches",
|
||||||
|
55: "Farquhar",
|
||||||
|
57: "French Equatorial Africa",
|
||||||
|
58: "French Indo-China",
|
||||||
|
59: "French West Africa",
|
||||||
|
67: "French India",
|
||||||
|
68: "Kuwait/Saudi Arabia Neutral Zone",
|
||||||
|
81: "Germany",
|
||||||
|
85: "Bonaire, Curacao",
|
||||||
|
93: "Geyser Reef",
|
||||||
|
101: "Goa",
|
||||||
|
102: "Gold Coast, Togoland",
|
||||||
|
113: "Ifni",
|
||||||
|
115: "Italian Somaliland",
|
||||||
|
119: "Java",
|
||||||
|
127: "Kamaran Is.",
|
||||||
|
128: "Karelo-Finnish Republic",
|
||||||
|
134: "Kingman Reef",
|
||||||
|
139: "Kuria Muria I.",
|
||||||
|
151: "Malyj Vysotskij I.",
|
||||||
|
154: "Yemen Arab Republic",
|
||||||
|
155: "Malaya",
|
||||||
|
164: "Manchuria",
|
||||||
|
178: "Minerva Reef",
|
||||||
|
183: "Netherlands Borneo",
|
||||||
|
184: "Netherlands New Guinea",
|
||||||
|
186: "Newfoundland, Labrador",
|
||||||
|
193: "Okinawa (Ryukyu Is.)",
|
||||||
|
194: "Okino Tori-shima",
|
||||||
|
196: "Palestine",
|
||||||
|
200: "Portuguese Timor",
|
||||||
|
208: "Ruanda-Urundi",
|
||||||
|
210: "Saar",
|
||||||
|
218: "Czechoslovakia",
|
||||||
|
220: "Sarawak",
|
||||||
|
226: "Saudi Arabia/Iraq Neutral Zone",
|
||||||
|
228: "Serrana Bank & Roncador Cay",
|
||||||
|
229: "German Democratic Republic",
|
||||||
|
231: "Sikkim",
|
||||||
|
243: "People's Democratic Rep. of Yemen",
|
||||||
|
244: "Southern Sudan",
|
||||||
|
255: "St. Maarten, Saba, St. Eustatius",
|
||||||
|
258: "Sumatra",
|
||||||
|
261: "Swan Is.",
|
||||||
|
264: "Tangier",
|
||||||
|
267: "Territory of New Guinea",
|
||||||
|
268: "Tibet",
|
||||||
|
271: "Trieste",
|
||||||
|
307: "Zanzibar",
|
||||||
|
488: "Walvis Bay",
|
||||||
|
493: "Penguin Is.",
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsDeleted reports whether a DXCC entity number names an entity the ARRL has
|
||||||
|
// deleted.
|
||||||
|
//
|
||||||
|
// The one thing every caller does with a true answer is the same: stop. A
|
||||||
|
// deleted entity cannot be looked up from a callsign, cannot be worked again,
|
||||||
|
// and cannot be corrected by anything that only knows about today.
|
||||||
|
func IsDeleted(n int) bool {
|
||||||
|
_, ok := deletedEntities[n]
|
||||||
|
return ok
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeletedName is what entity n was called, or "" if it is not a deleted entity.
|
||||||
|
// Used to say WHICH entity was preserved rather than only that one was.
|
||||||
|
func DeletedName(n int) string { return deletedEntities[n] }
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
package dxcc
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The contact that reported this: R1MVI, worked in 2004 on Malyj Vysotskij
|
||||||
|
// Island, entity 151, deleted in February 2012. cty.dat resolves that callsign
|
||||||
|
// to European Russia (54) today, so anything that re-stamps an old QSO from a
|
||||||
|
// callsign has to know to stop here.
|
||||||
|
func TestMalyjVysotskijIsKnownDeleted(t *testing.T) {
|
||||||
|
if !IsDeleted(151) {
|
||||||
|
t.Fatal("151 (Malyj Vysotskij I.) must be known as deleted — the whole guard hangs on it")
|
||||||
|
}
|
||||||
|
if got := DeletedName(151); got == "" {
|
||||||
|
t.Error("a deleted entity should be able to say what it was called")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The guard must not fire on entities that are alive, or every log would freeze
|
||||||
|
// at whatever DXCC number it was imported with — including the wrong ones.
|
||||||
|
func TestLiveEntitiesAreNotTreatedAsDeleted(t *testing.T) {
|
||||||
|
live := map[int]string{
|
||||||
|
54: "European Russia — what R1MVI resolves to today",
|
||||||
|
227: "France",
|
||||||
|
291: "United States",
|
||||||
|
339: "Japan",
|
||||||
|
1: "Canada",
|
||||||
|
}
|
||||||
|
for n, what := range live {
|
||||||
|
if IsDeleted(n) {
|
||||||
|
t.Errorf("%d (%s) must not be listed as deleted", n, what)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if got := DeletedName(54); got != "" {
|
||||||
|
t.Errorf("DeletedName(54) = %q, want empty", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A few more from the ADIF enumeration, so a careless edit to the table is
|
||||||
|
// caught rather than discovered by an operator whose credits moved.
|
||||||
|
func TestSomeOtherDeletedEntities(t *testing.T) {
|
||||||
|
for _, n := range []int{218 /* Czechoslovakia */, 229 /* German DR */, 255 /* St. Maarten, Saba, St. Eustatius */, 28 /* Canal Zone */} {
|
||||||
|
if !IsDeleted(n) {
|
||||||
|
t.Errorf("%d should be a deleted entity", n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -36,6 +36,8 @@ const (
|
|||||||
// ServiceCloudlog covers Cloudlog AND its fork Wavelog: same API contract,
|
// ServiceCloudlog covers Cloudlog AND its fork Wavelog: same API contract,
|
||||||
// only the instance URL differs, so one service handles both.
|
// only the instance URL differs, so one service handles both.
|
||||||
ServiceCloudlog Service = "cloudlog"
|
ServiceCloudlog Service = "cloudlog"
|
||||||
|
// ServiceHamlog is HAMLOG.online — one API key, an ADIF record per QSO.
|
||||||
|
ServiceHamlog Service = "hamlog"
|
||||||
)
|
)
|
||||||
|
|
||||||
// UploadMode selects when an auto-upload fires after a QSO is saved.
|
// UploadMode selects when an auto-upload fires after a QSO is saved.
|
||||||
@@ -130,6 +132,7 @@ type ExternalServices struct {
|
|||||||
HRDLog ServiceConfig `json:"hrdlog"`
|
HRDLog ServiceConfig `json:"hrdlog"`
|
||||||
EQSL ServiceConfig `json:"eqsl"`
|
EQSL ServiceConfig `json:"eqsl"`
|
||||||
Cloudlog ServiceConfig `json:"cloudlog"`
|
Cloudlog ServiceConfig `json:"cloudlog"`
|
||||||
|
Hamlog ServiceConfig `json:"hamlog"`
|
||||||
|
|
||||||
// DeleteRemote asks OpsLog to withdraw a QSO from QRZ.com and Club Log when
|
// DeleteRemote asks OpsLog to withdraw a QSO from QRZ.com and Club Log when
|
||||||
// it is deleted locally. Off unless the operator turns it on: neither
|
// it is deleted locally. Off unless the operator turns it on: neither
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user