Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
91b5af1c7b | ||
|
|
4fd70f6a9d | ||
|
|
51e279887d | ||
|
|
7e08553e6e | ||
|
|
3564eecc36 | ||
|
|
3e7f3832e0 | ||
|
|
34b60f9f20 | ||
|
|
b7bfd39652 | ||
|
|
6a1103bf5f | ||
|
|
91653bca57 | ||
|
|
6be0f43dd0 | ||
|
|
370fde42f7 | ||
|
|
e5ff30823d | ||
|
|
9e86d57dac | ||
|
|
00bfee4ed2 | ||
|
|
f4bc55cd41 | ||
|
|
3a9dda13c4 | ||
|
|
9b677c6b35 | ||
|
|
933d601c03 | ||
|
|
b4f0e0bc29 | ||
|
|
9f384402fa | ||
|
|
18b69ee8b4 | ||
|
|
8c1b7af5b3 | ||
|
|
6e953ab1f4 | ||
|
|
88202efddb | ||
|
|
3f15608c59 | ||
|
|
e6a6f04ccf | ||
|
|
3b1a8ef01a | ||
|
|
fd097a647f | ||
|
|
b2bd818ac4 | ||
|
|
d71d09cbb6 | ||
|
|
557fb162c3 | ||
|
|
77a2350240 | ||
|
|
2b3d118d84 | ||
|
|
638ffcb326 | ||
|
|
bf4fba484a | ||
|
|
3ea7f44fd1 | ||
|
|
384925f24a | ||
|
|
898323c49f | ||
|
|
48345a22fc | ||
|
|
b83d55cc32 | ||
|
|
76e4288b9e | ||
|
|
246ecf23ba | ||
|
|
1717677056 | ||
|
|
15159f38a5 | ||
|
|
6a28344e93 | ||
|
|
a14ade9277 | ||
|
|
513ab178ec | ||
|
|
e3aeeae616 | ||
|
|
a5cfecbf76 | ||
|
|
7d644d05cc | ||
|
|
75510a1161 | ||
|
|
1a0a349fb3 | ||
|
|
5e09b6a796 | ||
|
|
d6a2e84eed | ||
|
|
7b0ef0ba97 | ||
|
|
aa871a07b7 | ||
|
|
89584f173d | ||
|
|
a71e48f811 | ||
|
|
5c4f101402 | ||
|
|
ede9461010 | ||
|
|
e6ca7a8bdd | ||
|
|
9be3f9147b | ||
|
|
f7f801cdb7 | ||
|
|
43f15f1a2c | ||
|
|
2c5416500f | ||
|
|
fcdc5809e6 | ||
|
|
7254950162 | ||
|
|
1668455ff4 | ||
|
|
c07b746d4b | ||
|
|
d128dabc19 | ||
|
|
2823f3e401 | ||
|
|
1070637c40 | ||
|
|
13de53772b | ||
|
|
6b04072e52 | ||
|
|
64b8ba7fdc | ||
|
|
a9ca50b2dd | ||
|
|
512b5fd35b | ||
|
|
77e3d011a0 | ||
|
|
b7dd8d4852 | ||
|
|
4c75680689 | ||
|
|
5aac28f564 | ||
|
|
c91c8c3b47 | ||
|
|
968da5488c | ||
|
|
1b5b0c2e90 | ||
|
|
0385aed760 |
@@ -46,3 +46,4 @@ cat.log
|
||||
.env.local
|
||||
*.pem
|
||||
*.key
|
||||
*.syso
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
# CLAUDE.md
|
||||
|
||||
This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
|
||||
|
||||
## What this is
|
||||
|
||||
OpsLog is a Windows ham-radio logger built with **Wails v2** — Go backend, React/TypeScript frontend, compiled into a single `.exe`. Author F4BPO. See `README.md` for the user-facing feature list and `wiki/` for end-user documentation.
|
||||
|
||||
**Pure Go, no CGO** — SQLite is `modernc.org/sqlite`, serial is `go.bug.st/serial`. Any dependency requiring cgo breaks the build; check before adding one.
|
||||
|
||||
## Commands
|
||||
|
||||
```bash
|
||||
wails dev # hot-reload dev (Go methods also reachable at http://localhost:34115)
|
||||
wails build # full build → build/bin/OpsLog.exe (~25 s)
|
||||
wails generate module # REQUIRED after changing exported App methods (regenerates TS bindings)
|
||||
|
||||
go build ./... # fast Go-only check
|
||||
go test ./... # all Go tests
|
||||
go test ./internal/steppir/ -run TestApplyPendingDirHold -v # one test
|
||||
gofmt -w <file>
|
||||
|
||||
cd frontend && npx tsc --noEmit # frontend typecheck alone (wails build does this too)
|
||||
```
|
||||
|
||||
Release: `.vscode/release.ps1` (Ctrl+Shift+P → *Tasks: Run Task* → *Release OpsLog*) — bumps the version, pushes to Gitea, builds and publishes to Gitea + GitHub.
|
||||
|
||||
Prefer `wails build` for final validation: it is the only command that exercises Go, the TS typecheck, the bindings and the asset embed together.
|
||||
|
||||
## Navigating app.go
|
||||
|
||||
`app.go` is ~14 000 lines and holds nearly every Wails binding. **Do not read it linearly** — it is organised into banner-delimited sections:
|
||||
|
||||
```bash
|
||||
grep -n "^// ──\|^// ---" app.go # table of contents
|
||||
```
|
||||
|
||||
Sections map to features (`── Motorized antenna (Ultrabeam / SteppIR) ──`, `── NET Control ──`, `── DX-cluster spot alerts ──`, …). Find the banner, then read that range. The `App` struct (~line 448) is the other useful landmark: its fields document every subsystem and carry substantial explanatory comments.
|
||||
|
||||
Smaller root files split off self-contained areas: `app_cw.go`, `app_qsl_designer.go`, `app_secret.go`, `chat.go`, `offline.go`, `relayauto.go`, `adifwatch.go`, `livestatus.go`, `update.go`, `telemetry.go`.
|
||||
|
||||
## Architecture
|
||||
|
||||
### Wails binding boundary
|
||||
|
||||
Exported methods on `*App` are the entire frontend API. Adding or changing a signature requires `wails generate module`, which writes `frontend/wailsjs/go/main/App.d.ts` and `models.ts`. Parameters and return types must be Wails-serializable — the generator prints `Not found: time.Time` noise for unsupported types (that particular message is long-standing and harmless).
|
||||
|
||||
Backend→frontend push uses Wails events (`runtime.EventsEmit` / `EventsOn`), e.g. `qso:logged`, `update:progress`. Most hardware status is **polled** by the frontend on an interval rather than pushed.
|
||||
|
||||
### Two separate databases
|
||||
|
||||
This split is easy to get wrong and matters:
|
||||
|
||||
- **`a.db`** — settings database (`settings.db` / `opslog.db`). Always SQLite. Holds settings and profiles. Its location is chosen by the user and recorded in `data/config.json`.
|
||||
- **`a.logDb`** — the logbook (QSOs). Either a per-profile SQLite file, the default `logbook.db`, or a **shared MySQL** so several operators log into one database. `a.dbBackend` says which.
|
||||
|
||||
QSOs never go to `a.db`. `internal/db` holds the connection helpers and the MySQL specifics; `internal/qso` is the repository.
|
||||
|
||||
Remote MySQL is the slow path: startup deliberately brings CAT/rig links up **before** connecting the logbook, and hot paths (cluster spot enrichment, alert matching) avoid per-row queries — hence the in-memory `wcbm` worked-index and the `clusterEvents` queue that keeps the telnet socket draining.
|
||||
|
||||
### Per-profile settings scoping
|
||||
|
||||
`internal/settings.Store` is a key/value store over the settings DB. Every key is transparently prefixed with the active profile (`p3.`), so each station profile has a complete independent set. Two consequences:
|
||||
|
||||
- `App.settingsScoped` (atomic) gates reads until the active profile is known. Anything reading settings early must respect it or it reads the wrong scope.
|
||||
- Settings keys are declared as `key<Thing>` string constants near the top of `app.go` (~180 of them) — grep `key[A-Z].*= "` to find one.
|
||||
|
||||
Password-type keys are encrypted at rest when the secret vault is unlocked (`internal/secret`); a locked vault returns `""` rather than ciphertext, and callers treat that as "not configured".
|
||||
|
||||
### Hardware device pattern
|
||||
|
||||
The codebase talks to ~20 devices (rigs, amplifiers, antenna controllers, switches, keyers, rotators). They all follow the same shape — match it when adding one:
|
||||
|
||||
1. **`internal/<device>/`** — a self-contained package exposing a `Client` with `New(...)`, `Start()`, `Stop()`, `GetStatus()`. The client owns its own goroutine: a reconnecting poll loop, a mutex serialising the shared connection, and a cached last-known `Status`. Transports are usually TCP *or* serial behind one `io.ReadWriteCloser`.
|
||||
2. **Settings** — `key<Thing>*` constants plus `Get<Thing>Settings()` / `Save<Thing>Settings()` bindings in `app.go`.
|
||||
3. **Lifecycle** — a `start<Thing>()` method that tears down any existing client and rebuilds it from settings; called at startup and again whenever settings are saved.
|
||||
4. **Status binding** — `Get<Thing>Status()`, polled by the frontend.
|
||||
5. **UI** — a settings panel in `frontend/src/components/SettingsModal.tsx` and a live widget in `frontend/src/components/`.
|
||||
|
||||
`internal/steppir` and `internal/antgenius` are compact, well-commented references. Wire-protocol packages carry the byte layout in the package doc comment and pin it with table tests against **real captured frames** — keep that up, since a wrong byte silently mistunes an antenna.
|
||||
|
||||
Where two devices are interchangeable (Ultrabeam / SteppIR), `app.go` defines a small interface (`motorAntenna`) plus thin per-device adapters rather than branching everywhere.
|
||||
|
||||
### CAT
|
||||
|
||||
`internal/cat` (~7 000 lines, the largest package) is the rig abstraction: OmniRig, native FlexRadio/SmartSDR, native Icom CI-V (USB **and** remote-over-internet), and TCI (SunSDR / Expert Electronics). `cat.Manager` exposes a backend-agnostic `State()`; backend-specific features are reached through typed escapes such as `FlexDo(func(cat.FlexController) error)`. Check `State().Backend` before using one.
|
||||
|
||||
### Logging
|
||||
|
||||
`internal/applog` — Wails builds with the Windows GUI subsystem, so `fmt.Println` is discarded. Use `applog.Printf` (or plain `log.Printf` inside `internal/` packages) so output reaches the rotating log file in the user data dir. That file is usually the only evidence available when diagnosing a user's hardware problem.
|
||||
|
||||
## Conventions
|
||||
|
||||
**Changelog is mandatory.** Every user-visible change gets an entry in `changelog.json`, **in both `en` and `fr`**, in the same session as the change. Keep entries to one or two sentences — rationale belongs in the commit message. New work goes under the next version number; the release script bumps the version constants.
|
||||
|
||||
**Version lives in two places** and must stay in lockstep: `appVersion` in `telemetry.go` and `APP_VERSION` in `frontend/src/version.ts`.
|
||||
|
||||
**Bilingual UI.** Every user-visible string goes through `t()` from `frontend/src/lib/i18n.tsx` (~700 keys), with both English and French provided. No hardcoded display strings.
|
||||
|
||||
**Commit messages must not include a `Co-Authored-By` line or any mention of the model.**
|
||||
|
||||
**Comments explain *why*, not *what*.** The existing code documents the reasoning behind non-obvious decisions — which protocol source was trusted, what field failure a workaround addresses, why an ordering matters. Match that: a comment that restates the code is noise, a comment recording the hard-won reason is why this codebase is navigable.
|
||||
|
||||
## Gotchas
|
||||
|
||||
- **Adding a promoted ADIF field touches five places in lockstep.** `internal/adif` promotes ~30 ADIF fields to real QSO columns; miss one and imports silently drop data. All of: the struct field, column list, insert args and scan in `internal/qso/qso.go`; the dictionary entry (`Promoted: true`) in `internal/adif/fields.go`; the `adifPromoted` list *and* the assignment in `internal/adif/import.go`; the writer in `internal/adif/export.go`; then the frontend column in `RecentQSOsGrid.tsx` with its EN+FR i18n keys. Trace an existing field (e.g. `ant_path`) across the repo as a template.
|
||||
- **Generated files — don't hand-edit.** `internal/dxcc/dxcc_names_gen.go` (cty.dat joined to the ARRL/ADIF entity list) and `internal/awardref/uscounties_gen.go` (emitted by `cmd/cntygen` from the FIPS county CSV; a one-shot generator, not part of the build).
|
||||
- **Single-instance guard** (`main.go`): a second process would open its own CAT and antenna-follow loops and the two would fight over the rig frequency.
|
||||
- **Frontend controlled inputs**: several editors normalise a value on every keystroke (trim, split, filter). Binding an input directly to the normalised form makes Enter/Space appear dead — keep raw text in local state and derive the stored value from it.
|
||||
+45
-19
@@ -4,8 +4,8 @@
|
||||
<img src="https://img.shields.io/badge/Discord-Rejoindre%20le%20serveur-5865F2?logo=discord&logoColor=white" alt="Rejoindre notre Discord" />
|
||||
</a>
|
||||
|
||||
Un logiciel de log radioamateur moderne et rapide pour Windows — saisie façon
|
||||
Log4OM, CAT en temps réel pour **OmniRig**, **FlexRadio/SmartSDR** natif,
|
||||
Un logiciel de log radioamateur moderne et rapide pour Windows — saisie en
|
||||
bandeau unique, CAT en temps réel pour **OmniRig**, **FlexRadio/SmartSDR** natif,
|
||||
**Icom CI-V** natif (USB **et** à distance par internet, en remplacement de
|
||||
RS-BA1) et **TCI** (SunSDR / Expert Electronics), cluster DX avec alertes de
|
||||
spots, suivi des diplômes, cartes, log de concours, gestion des QSL et un
|
||||
@@ -32,7 +32,7 @@ Développé par **F4BPO**.
|
||||
|
||||
## Journalisation
|
||||
|
||||
- **Bandeau de saisie façon Log4OM :** indicatif, RST émis/reçu, nom/QTH/locator,
|
||||
- **Bandeau de saisie unique :** indicatif, RST émis/reçu, nom/QTH/locator,
|
||||
bande/mode, fréquence TX/RX (split), heure de début/fin, commentaire/note. Le
|
||||
**drapeau** de l'entité contactée est affiché en grand à côté des champs RST.
|
||||
- **Recherche d'indicatif** (QRZ.com / HamQTH) avec photo, pré-remplissage du
|
||||
@@ -42,7 +42,10 @@ Développé par **F4BPO**.
|
||||
district (`/8`, `/W6`), plus les dérogations DXpédition de ClubLog par dates.
|
||||
- **QSO récents**, matrice **déjà contactés** (par créneau bande/mode),
|
||||
re-résolution en masse depuis cty/QRZ/ClubLog, envoi en masse vers les services
|
||||
QSL.
|
||||
QSL. Un **compteur de sélection** en direct, une bascule **Tout sélectionner /
|
||||
Tout désélectionner**, et une limite d'affichage qui garde le journal complet
|
||||
rapide **mais qui saute dès qu'un filtre est actif** (toutes les correspondances
|
||||
sont montrées, pas seulement la première page).
|
||||
- **Constructeur de filtres QSO avancé** (champ / opérateur / valeur, ET / OU,
|
||||
préréglages enregistrés) avec **export ADIF** des lignes filtrées ou
|
||||
sélectionnées.
|
||||
@@ -67,7 +70,9 @@ Développé par **F4BPO**.
|
||||
légendés) et le(s) **lobe(s) du faisceau d'antenne** tracés depuis l'azimut du
|
||||
rotor.
|
||||
- **Compas de rotor** (azimutal équidistant, clic pour tourner) piloté par
|
||||
PstRotator.
|
||||
**PstRotator** (UDP), un **Rotator Genius 4O3A** (TCP natif) ou un **microHAM
|
||||
ARCO** contrôlé nativement — sans PstRotator — via le **réseau** ou l'**USB**
|
||||
avec son protocole Yaesu GS-232A.
|
||||
- **Support Ultrabeam** (Normal / inversé 180° / bidirectionnel) : la direction
|
||||
rayonnée est en vert et le **boom mécanique** en gris, à la fois sur le compas
|
||||
et sur la carte, pour toujours savoir où pointe l'antenne.
|
||||
@@ -81,10 +86,12 @@ Développé par **F4BPO**.
|
||||
Cluster et le volet cluster de la vue principale, avec bascule affichage/masquage.
|
||||
- **Statut** par spot (nouveau / nouvelle bande / nouveau créneau / contacté),
|
||||
clic pour accorder la radio, et une **bandmap** multi-bandes (bandes façon
|
||||
panadapter).
|
||||
panadapter). En option, tous les **modes numériques comptent comme un seul**
|
||||
(style DXCC) pour le coloriage nouveau/nouveau-créneau et les badges de la
|
||||
matrice des déjà-contactés (Réglages → Général).
|
||||
- Les spots **POTA** sont étiquetés avec leur référence de parc (via
|
||||
`api.pota.app`).
|
||||
- **Alertes de spots** (façon Log4OM) : règles sur indicatif / pays / bande /
|
||||
- **Alertes de spots :** règles sur indicatif / pays / bande /
|
||||
mode / spotter, avec notification sonore, visuelle et e-mail (Outils →
|
||||
*Gestion des alertes*).
|
||||
|
||||
@@ -97,7 +104,8 @@ connexion rapide non bloquante — une radio éteinte ne fige jamais l'applicati
|
||||
supportée par OmniRig.
|
||||
- **FlexRadio (SmartSDR)** via l'API TCP de la radio — fréquence / mode / split
|
||||
de la slice en temps réel, découverte UDP, et **spots panadapter** (les spots
|
||||
du cluster poussés sur l'écran Flex, clic → remplir l'indicatif).
|
||||
du cluster poussés sur l'écran Flex ; un clic remplit l'indicatif et **accorde
|
||||
la radio sur la bonne fréquence ET le bon mode**).
|
||||
- **Icom CI-V** — natif, via le port **USB** de la radio *ou* par internet via le
|
||||
**serveur LAN intégré** de la radio (voir *Icom à distance* ci-dessous). Ni
|
||||
RS-BA1 ni Remote Utility nécessaires.
|
||||
@@ -114,12 +122,17 @@ Affiché uniquement quand le backend CAT est une FlexRadio :
|
||||
|
||||
- **Émission :** puissance RF, puissance d'accord, TUNE, MOX, processeur de
|
||||
parole (NOR/DX/DX+), VOX (+ niveau + délai), moniteur (+ niveau), gain micro.
|
||||
- **Réception (slice active) :** mode/seuil AGC, niveau audio, NB / NR / ANF.
|
||||
- **Réception (slice active) :** sélecteurs d'**antenne** RX/TX et une bascule
|
||||
**DAX** (audio d'émission via DAX, pour WSJT-X & co), mode/seuil AGC, niveau
|
||||
audio, NB / WNB / NR / ANF, et — sur les radios **SmartSDR v4** (séries 8000 /
|
||||
Aurora) — les filtres DSP supplémentaires **NRL, NRS, NRF** (avec niveau) plus
|
||||
**RNN** (réduction de bruit par IA) et **ANFT** (notch automatique FFT),
|
||||
affichés automatiquement si la radio les supporte. **RIT / XIT** avec accord
|
||||
molette / ±.
|
||||
- **Coupleur d'antenne (ATU) :** accord / bypass / mémoires.
|
||||
- **Amplificateur :** la carte de commande suit l'ampli configuré —
|
||||
**PowerGenius XL** (operate/standby, mode ventilateur, défaut) ou
|
||||
**SPE Expert** (operate/standby, Marche/Arrêt, niveau Low/Mid/High, barre de
|
||||
puissance de sortie, bande & température).
|
||||
- **Amplificateur :** la carte de commande suit l'ampli configuré, avec une liste
|
||||
déroulante pour le choisir quand **plusieurs amplificateurs** sont configurés
|
||||
(p. ex. deux SPE en parallèle). Voir *Amplis & commutateurs* ci-dessous.
|
||||
- **Mesures en direct** via le flux UDP VITA-49 : S-mètre (unités S), puissance
|
||||
directe (W), ROS, ALC, température PA, tension, plus les mesures de l'ampli.
|
||||
|
||||
@@ -178,14 +191,23 @@ avec le panadapter en flux, et Marche/Arrêt manuel. (L'audio est hors périmèt
|
||||
|
||||
## Amplis & commutateurs
|
||||
|
||||
- **Amplificateurs** (Réglages → Amplificateur — la carte de commande apparaît
|
||||
sur l'onglet FlexRadio, ou seule quand ni Flex ni Icom n'est actif) :
|
||||
- **Amplificateurs** — configurez **un ou plusieurs** amplis (Réglages →
|
||||
Amplificateur est une liste ; p. ex. deux SPE en parallèle pour plus de
|
||||
puissance). La carte de chaque ampli apparaît sur l'onglet FlexRadio et dans
|
||||
**Station Control**, avec une liste déroulante pour choisir lequel afficher ; la
|
||||
barre de statut du bas porte **une pastille cliquable par ampli** (vert =
|
||||
OPERATE, orange = STANDBY, rouge = hors ligne). Supportés :
|
||||
- **PowerGenius XL** (4O3A) en TCP direct — operate/standby, sélecteur de mode
|
||||
ventilateur et affichage des défauts.
|
||||
- **SPE Expert** (1.3K-FA / 1.5K-FA / 2K-FA) via **USB** (COM virtuel) ou le
|
||||
**réseau** (pont RS232-Ethernet) — operate/standby, Marche/Arrêt, niveau de
|
||||
sortie Low / Mid / High, une barre de puissance et le statut en direct (bande,
|
||||
ROS, courant PA, température, avertissements/alarmes).
|
||||
- **ACOM** (500S / 600S / 700S / 1200S / 2020S) via **USB** ou le **réseau**
|
||||
(pont RS232-Ethernet) — operate/standby/arrêt et télémétrie en direct
|
||||
(puissance directe & réfléchie, ROS, température PA, bande, ventilateur,
|
||||
défauts). La mise en marche fonctionne via un câble série reliant les lignes
|
||||
DTR/RTS.
|
||||
- Commutateur d'antenne **Antenna Genius** (4O3A) via TCP/GSCP — un widget de
|
||||
commutation A/B ancré.
|
||||
- Panneau **Station Control** (ancrable, widgets réordonnables par glisser) : le
|
||||
@@ -235,10 +257,11 @@ avec le panadapter en flux, et Marche/Arrêt manuel. (L'audio est hors périmèt
|
||||
## Statut opérateur en direct (événements spéciaux)
|
||||
|
||||
Pour un indicatif d'événement spécial multi-op sur un journal MySQL partagé (ex.
|
||||
**TM74TFR**) : Réglages → Général → *Publier le statut opérateur en direct*.
|
||||
**TM74TFR**), la publication est **automatique** — aucun réglage à activer.
|
||||
Chaque instance OpsLog envoie un battement de cœur de son activité (indicatif de
|
||||
l'opérateur, bande, fréquence, mode) dans une table `live_status` toutes les
|
||||
~15 s. Un petit rendu PHP
|
||||
~15 s, et repasse *hors antenne* automatiquement 5 min après le dernier QSO
|
||||
logué. Un petit rendu PHP
|
||||
([`docs/livestatus/tm74-status.php`](docs/livestatus/tm74-status.php)) sur votre
|
||||
propre serveur web lit cette table et produit une page/image en direct que vous
|
||||
pouvez intégrer sur la bio **QRZ.com** de la station
|
||||
@@ -248,8 +271,11 @@ ce n'est pas un serveur web.
|
||||
## Net control
|
||||
|
||||
- **Log de net dirigé** (Outils → Net) : un roster global (`nets.json`) plus une
|
||||
session active en mémoire — pointez les stations présentes, puis loguez tout le
|
||||
net d'un coup en utilisant la fréquence CAT.
|
||||
session active en mémoire — pointez les stations présentes, puis loguez-les une
|
||||
par une ou tout le net d'un coup (**Logger tout le monde**) en utilisant la
|
||||
fréquence CAT. **Glisser-déposer** entre les deux listes (roster → on air démarre
|
||||
un QSO, on air → roster l'enregistre), et après chaque log la station on air
|
||||
suivante est sélectionnée automatiquement pour enchaîner les contacts.
|
||||
|
||||
## Apparence & langue
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<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 — Log4OM-style entry, real-time CAT
|
||||
A modern, fast ham-radio logger for Windows — single-strip entry, real-time CAT
|
||||
for **OmniRig**, native **FlexRadio/SmartSDR**, native **Icom CI-V** (USB **and**
|
||||
remote-over-internet, replacing RS-BA1) and **TCI** (SunSDR / Expert Electronics),
|
||||
DX cluster with spot alerts, awards tracking, maps, contest logging, QSL
|
||||
@@ -31,7 +31,7 @@ Developed by **F4BPO**.
|
||||
|
||||
## Logging
|
||||
|
||||
- **Log4OM-style entry strip:** callsign, RST tx/rx, name/QTH/grid, band/mode,
|
||||
- **Single-strip entry:** callsign, RST tx/rx, name/QTH/grid, band/mode,
|
||||
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
|
||||
@@ -40,7 +40,10 @@ Developed by **F4BPO**.
|
||||
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.
|
||||
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
|
||||
@@ -59,7 +62,10 @@ Developed by **F4BPO**.
|
||||
- **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.
|
||||
- **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.
|
||||
@@ -71,9 +77,11 @@ Developed by **F4BPO**.
|
||||
mode / status / source) shared by the Cluster tab and the Main-view cluster
|
||||
pane, with a show/hide toggle.
|
||||
- Per-spot **status** (new / new-band / new-slot / worked), click-to-tune the
|
||||
rig, and a multi-band **Band Map** (panadapter-style strips).
|
||||
rig, and a multi-band **Band Map** (panadapter-style strips). Optionally, all
|
||||
**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** (Log4OM-style): rules on call / country / band / mode /
|
||||
- **Spot alerts:** rules on call / country / band / mode /
|
||||
spotter, with sound, visual and e-mail notification (Tools → *Alert
|
||||
management*).
|
||||
|
||||
@@ -85,7 +93,8 @@ non-blocking connect so a powered-off radio never freezes the app:
|
||||
- **OmniRig** (Rig 1/2, hot-swap) — works with any OmniRig-supported rig.
|
||||
- **FlexRadio (SmartSDR)** over the radio's TCP API — real-time slice freq /
|
||||
mode / split, UDP discovery, and **panadapter spots** (cluster spots pushed to
|
||||
the Flex display, click → fill the call).
|
||||
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.
|
||||
@@ -102,12 +111,16 @@ 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):** AGC mode/threshold, audio level, NB / NR / ANF.
|
||||
- **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 —
|
||||
**PowerGenius XL** (operate/standby, fan mode, fault) or **SPE Expert**
|
||||
(operate/standby, ON/OFF, Low/Mid/High level, output-power bar, band &
|
||||
temperature).
|
||||
- **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.
|
||||
|
||||
@@ -158,14 +171,21 @@ as Mumble.)
|
||||
|
||||
## Amplifiers & switches
|
||||
|
||||
- **Amplifiers** (Settings → Amplifier — the control card appears on the
|
||||
FlexRadio tab, or on its own when neither Flex nor Icom is active):
|
||||
- **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**,
|
||||
@@ -208,10 +228,11 @@ as Mumble.)
|
||||
|
||||
## Multi-operator live status (special events)
|
||||
|
||||
For a multi-op special-event call on a shared MySQL logbook (e.g. **TM74TFR**):
|
||||
Settings → General → *Publish live operator status*. Each OpsLog instance
|
||||
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. A small PHP renderer
|
||||
`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
|
||||
@@ -220,8 +241,11 @@ 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 the whole net at once
|
||||
using the CAT frequency.
|
||||
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
|
||||
|
||||
|
||||
@@ -0,0 +1,149 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"hamlog/internal/applog"
|
||||
"hamlog/internal/audio"
|
||||
"hamlog/internal/cwdecode"
|
||||
|
||||
wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
|
||||
)
|
||||
|
||||
// CW decoder: taps the RX audio device (the same "From radio" capture the DVK
|
||||
// and QSO recorder use) and streams decoded Morse text to the UI. It is started
|
||||
// only by the frontend, and only while the entry mode is CW.
|
||||
//
|
||||
// Pitch targeting: the single-channel decoder is far more reliable when it locks
|
||||
// to a KNOWN pitch (a narrow filter at the signal frequency, like a skimmer)
|
||||
// instead of auto-searching for the loudest tone. So we follow the radio's CW
|
||||
// pitch (FlexRadio cw_pitch) when available — or a manual override — and fall
|
||||
// back to auto-search otherwise.
|
||||
|
||||
// cwTargetPitch returns the pitch (Hz) the decoder should lock to: the manual
|
||||
// override if set, else the FlexRadio's CW pitch when it's in CW, else 0 (auto).
|
||||
func (a *App) cwTargetPitch() int {
|
||||
if a.cwPitchHz > 0 {
|
||||
return a.cwPitchHz
|
||||
}
|
||||
if a.cat != nil {
|
||||
if st, ok := a.cat.FlexState(); ok && st.Available {
|
||||
// Only trust the radio's pitch when it's actually in CW.
|
||||
if st.Mode == "CW" || st.Mode == "CWL" || st.Mode == "CWU" {
|
||||
if st.CWPitch > 0 {
|
||||
return st.CWPitch
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// StartCWDecoder begins decoding CW from the configured RX audio device. The
|
||||
// frontend calls this when the decoder toggle is on AND the mode is CW. Safe to
|
||||
// call repeatedly; a second call is a no-op while already running.
|
||||
func (a *App) StartCWDecoder() error {
|
||||
a.cwMu.Lock()
|
||||
defer a.cwMu.Unlock()
|
||||
if a.cwStop != nil {
|
||||
return nil // already running
|
||||
}
|
||||
dev := ""
|
||||
if a.settings != nil {
|
||||
dev, _ = a.settings.Get(a.ctx, keyAudioFromRadio)
|
||||
}
|
||||
if dev == "" {
|
||||
return fmt.Errorf("no RX audio device configured (set \"From radio\" in Audio settings)")
|
||||
}
|
||||
|
||||
dec := cwdecode.New(audio.SampleRate,
|
||||
func(text string) {
|
||||
if a.ctx != nil {
|
||||
wruntime.EventsEmit(a.ctx, "cw:text", text)
|
||||
}
|
||||
},
|
||||
func(st cwdecode.Status) {
|
||||
if a.ctx != nil {
|
||||
wruntime.EventsEmit(a.ctx, "cw:status", st)
|
||||
}
|
||||
},
|
||||
)
|
||||
dec.SetTarget(a.cwTargetPitch())
|
||||
a.cwDecoder = dec
|
||||
|
||||
stop := make(chan struct{})
|
||||
a.cwStop = stop
|
||||
go func() {
|
||||
if err := audio.StreamCapture(dev, stop, dec.Process); err != nil {
|
||||
applog.Printf("cw: capture failed: %v", err)
|
||||
if a.ctx != nil {
|
||||
wruntime.EventsEmit(a.ctx, "cw:error", err.Error())
|
||||
}
|
||||
}
|
||||
a.cwMu.Lock()
|
||||
if a.cwStop == stop {
|
||||
a.cwStop = nil
|
||||
a.cwDecoder = nil
|
||||
}
|
||||
a.cwMu.Unlock()
|
||||
}()
|
||||
// Follow the radio's CW pitch live (every second) while this run is active.
|
||||
go a.cwFollowPitch(stop, dec)
|
||||
return nil
|
||||
}
|
||||
|
||||
// cwFollowPitch keeps the decoder locked to the current target pitch until stop.
|
||||
func (a *App) cwFollowPitch(stop <-chan struct{}, dec *cwdecode.Decoder) {
|
||||
t := time.NewTicker(time.Second)
|
||||
defer t.Stop()
|
||||
for {
|
||||
select {
|
||||
case <-stop:
|
||||
return
|
||||
case <-t.C:
|
||||
dec.SetTarget(a.cwTargetPitch())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// StopCWDecoder halts the CW decoder if running.
|
||||
func (a *App) StopCWDecoder() {
|
||||
a.cwMu.Lock()
|
||||
stop := a.cwStop
|
||||
a.cwStop = nil
|
||||
a.cwDecoder = nil
|
||||
a.cwMu.Unlock()
|
||||
if stop != nil {
|
||||
close(stop)
|
||||
}
|
||||
}
|
||||
|
||||
// CWDecoderRunning reports whether the decoder is currently capturing.
|
||||
func (a *App) CWDecoderRunning() bool {
|
||||
a.cwMu.Lock()
|
||||
defer a.cwMu.Unlock()
|
||||
return a.cwStop != nil
|
||||
}
|
||||
|
||||
// SetCWDecoderPitch sets a manual decode pitch (Hz); 0 returns to auto (follow
|
||||
// the Flex CW pitch, or search). Applies live to a running decoder.
|
||||
func (a *App) SetCWDecoderPitch(hz int) {
|
||||
if hz < 0 {
|
||||
hz = 0
|
||||
}
|
||||
a.cwMu.Lock()
|
||||
a.cwPitchHz = hz
|
||||
dec := a.cwDecoder
|
||||
a.cwMu.Unlock()
|
||||
if dec != nil {
|
||||
dec.SetTarget(a.cwTargetPitch())
|
||||
}
|
||||
}
|
||||
|
||||
// GetCWDecoderPitch returns the manual override (0 = auto / follow Flex).
|
||||
func (a *App) GetCWDecoderPitch() int {
|
||||
a.cwMu.Lock()
|
||||
defer a.cwMu.Unlock()
|
||||
return a.cwPitchHz
|
||||
}
|
||||
+250
@@ -1,4 +1,254 @@
|
||||
[
|
||||
{
|
||||
"version": "0.21.3",
|
||||
"date": "2026-07-25",
|
||||
"en": [
|
||||
"SteppIR: the direction button no longer snaps back to Normal a few seconds after you select 180° or Bidirectional. OpsLog was reading status frames the controller had queued up minutes earlier; it now flushes them before each poll and holds the direction you chose until the controller confirms it.",
|
||||
"Alert rules: Enter and Space now work in the callsigns box — you can type a list one call per line again.",
|
||||
"Fixed the US county database (USA-CA) download, broken since the FCC moved its weekly files on 24 July 2026. OpsLog now locates the file instead of assuming a fixed address, so it keeps working when the FCC reshuffles its download directories.",
|
||||
"Tuner Genius XL: the power and SWR meters now fill the card instead of leaving a third of it empty. In Station Control the amplifier and tuner cards span the dashboard, so their meters are readable.",
|
||||
"The Audio devices settings panel is now translated — it was still entirely in English.",
|
||||
"Award management: the editor no longer spills outside its window. Wide rows now scroll inside the panel, and the button bar wraps instead of stretching the dialog (it overflowed in French, where the labels are longer).",
|
||||
"Tuner Genius XL: the power and SWR meters now peak-hold like the amplifier's. They were showing raw 400 ms samples, so on SSB they fell to zero between syllables and looked like a dropped connection.",
|
||||
"Fixed recovering name/QTH/locator from the last QSO when you don't use QRZ/HamQTH: the callsign resolved from cty.dat faster than the logbook could answer, so the recovery found no history and never retried. It could also, on a slow logbook, fill in the PREVIOUS station's details — it is now tied to the callsign it belongs to.",
|
||||
"Big logbooks: finding a callsign in your history no longer scans the whole log. The query could not use the callsign index — on a 190 000-QSO log that made it ~70x slower, on every keystroke, slow enough that the entry strip gave up before the history arrived.",
|
||||
"One-off with this update: OpsLog has stored every callsign in your logbook in UPPER CASE — that is what lets the lookup above use the index. It changes letter case and nothing else, and runs once. Because the auto-updater migrates before you get to read this, a copy of your logbook was saved next to it first (logbook.db.pre-0024_normalise_callsign.bak) — delete it once you are happy.",
|
||||
"The diagnostic log now also records what the entry strip does (auto-fill decisions), so a problem that only happens on your station can be reported from the log file instead of guessed at.",
|
||||
"Worked-before grid: the right-click menu now offers bulk edit and the ADIF/Cabrillo export of the selected rows, like the Recent QSOs grid — no need to go looking for the same QSOs in the main log to change them.",
|
||||
"Tuner Genius XL: the SWR meter no longer stays frozen on the last transmission once you stop transmitting.",
|
||||
"Portable callsigns (F4LYI/M, .../P) are looked up on QRZ/HamQTH again. They need two requests — the full form, then the home call — and the time limit only allowed one, so they always fell back to cty.dat even though the operator was listed.",
|
||||
"LoTW download: a rejected login now says so, instead of pasting a fragment of the ARRL web page into the error.",
|
||||
"French UI: field names in the filter builder and bulk edit are back in English. They are ADIF field names — a standard vocabulary — and translating them made it harder to relate a filter to an export or to another logger. The operators and buttons around them stay translated.",
|
||||
"Bulk edit: added Owner callsign. It was filterable but not bulk-editable, because unlike the other fields it has no dedicated column and lives among the ADIF extras; editing it now merges into those and leaves the rest of them alone.",
|
||||
"Some installations opened with the window invisible: the saved size was sanity-checked but the saved position never was, so a window last closed on a monitor that is no longer attached reopened off-screen every time, with no way back. The position is now checked against the monitors actually present.",
|
||||
"Icom console: it now follows the radio, not just drives it. AGC, attenuator, preamp and filter were read once when connecting and never again, so switching AGC from FAST to MID on the rig left the panel showing FAST for good. They are re-read continuously now, one per poll cycle so the CAT link stays free for your own commands.",
|
||||
"Icom: fixed the CI-V model table. The IC-7800 (6Ah) and IC-7700 (74h) were missing, and their addresses were assigned to the wrong radios — 80h is the IC-7410 and 88h the IC-7100. On an IC-7800 that also meant a 20 dB attenuator button the radio does not have, instead of its real 6/12/18 dB steps.",
|
||||
"Icom console: the band row now highlights the band the radio is actually on. The buttons only ever sent a frequency and never showed where you were.",
|
||||
"Voice keyer PTT: the CAT option was labelled \"CAT (OmniRig)\", so operators on an Icom CI-V, FlexRadio or TCI rig assumed it was not for them and fell back to RTS/DTR or VOX. It has always driven whichever CAT backend is active — every one of them supports PTT. It now reads \"CAT — Icom CI-V (USB serial)\" and so on, naming the link you actually configured.",
|
||||
"OmniRig: the frequency now follows the VFO you are actually on. It always read VFO A when the rig reported one, so pressing SUB VFO on an FTDX101D left OpsLog showing the main VFO — and the band and the logged frequency with it.",
|
||||
"OmniRig split: the PM_SPLITON flag is now read as a bit rather than compared for exact equality, so a rig that reports it alongside another flag is no longer seen as simplex. Split still requires two distinct VFOs in the same band, which keeps a stale VFO B from faking one.",
|
||||
"CAT connection failures are now written to the diagnostic log. The status pill condenses everything to a few words (\"OmniRig not found\"), and the real reason — the COM error code, the serial or TCP error — previously existed only in a tooltip, so it never reached a bug report. Logged once per distinct message.",
|
||||
"OmniRig running as administrator while OpsLog is not (or the reverse) is now detected and named. Windows keeps the two privilege levels apart, so OpsLog could not reach OmniRig even with its window open on screen — and reported \"OmniRig not found\", which sent people hunting for a driver or COM-port fault. It now says to start both the same way, and stops repeating the failure in the log every five seconds."
|
||||
],
|
||||
"fr": [
|
||||
"SteppIR : le bouton de direction ne repasse plus sur Normal quelques secondes après avoir choisi 180° ou Bidirectionnel. OpsLog lisait des trames d'état que le contrôleur avait empilées plusieurs minutes plus tôt ; elles sont désormais purgées avant chaque interrogation, et la direction choisie est conservée jusqu'à confirmation du contrôleur.",
|
||||
"Règles d'alerte : Entrée et Espace fonctionnent de nouveau dans la zone des indicatifs — on peut ressaisir une liste, un indicatif par ligne.",
|
||||
"Correction du téléchargement de la base des comtés américains (USA-CA), cassé depuis le déplacement des fichiers hebdomadaires par la FCC le 24 juillet 2026. OpsLog localise désormais le fichier au lieu de supposer une adresse fixe, et continuera donc de fonctionner lors des prochains remaniements de leurs répertoires.",
|
||||
"Tuner Genius XL : les jauges de puissance et de ROS occupent toute la carte au lieu d'en laisser un tiers vide. Dans Station Control, les cartes ampli et tuner s'étendent sur toute la largeur du tableau de bord pour que leurs jauges soient lisibles.",
|
||||
"Le panneau de réglages « Périphériques audio » est désormais traduit — il était resté entièrement en anglais.",
|
||||
"Gestion des diplômes : l'éditeur ne déborde plus de sa fenêtre. Les lignes trop larges défilent à l'intérieur du panneau et la barre de boutons passe à la ligne au lieu d'élargir la boîte de dialogue (elle débordait en français, où les libellés sont plus longs).",
|
||||
"Tuner Genius XL : les jauges de puissance et de ROS maintiennent la crête, comme celles de l'ampli. Elles affichaient l'échantillon brut toutes les 400 ms et retombaient donc à zéro entre les syllabes en BLU, ce qui ressemblait à une perte de connexion.",
|
||||
"Correction de la récupération du nom/QTH/locator depuis le dernier QSO quand on n'utilise pas QRZ/HamQTH : l'indicatif était résolu par cty.dat plus vite que le log ne répondait, la récupération ne trouvait donc aucun historique et ne réessayait jamais. Sur un log lent, elle pouvait aussi reprendre les données de la station PRÉCÉDENTE — elle est désormais liée à l'indicatif concerné.",
|
||||
"Gros logs : retrouver un indicatif dans l'historique ne parcourt plus tout le log. La requête ne pouvait pas utiliser l'index sur l'indicatif — sur un log de 190 000 QSO, ~70× plus lent que nécessaire, à chaque frappe, et assez lentement pour que la saisie renonce avant l'arrivée de l'historique.",
|
||||
"Une seule fois, avec cette mise à jour : OpsLog a mis tous les indicatifs de votre log en MAJUSCULES — c'est ce qui permet à la recherche ci-dessus d'utiliser l'index. Seule la casse des lettres change, et l'opération ne se produit qu'une fois. Comme la mise à jour automatique s'exécute avant que vous puissiez lire ceci, une copie de votre log a été enregistrée à côté au préalable (logbook.db.pre-0024_normalise_callsign.bak) — supprimez-la quand vous serez rassuré.",
|
||||
"Le journal de diagnostic enregistre désormais aussi ce que fait le bandeau de saisie (décisions de remplissage automatique), pour qu'un problème qui n'arrive que chez vous puisse être rapporté depuis le fichier de log au lieu d'être deviné.",
|
||||
"Grille « Déjà contacté » : le menu du clic droit propose maintenant la modification en masse et l'export ADIF/Cabrillo des lignes sélectionnées, comme la grille des QSO récents — plus besoin d'aller rechercher les mêmes QSO dans le log principal pour les modifier.",
|
||||
"Tuner Genius XL : la jauge de ROS ne reste plus figée sur la dernière émission une fois que vous cessez d'émettre.",
|
||||
"Les indicatifs portables (F4LYI/M, .../P) sont de nouveau trouvés sur QRZ/HamQTH. Ils nécessitent deux requêtes — la forme complète, puis l'indicatif de base — et le délai n'en autorisait qu'une : on retombait donc toujours sur cty.dat alors que l'opérateur y était bien référencé.",
|
||||
"Téléchargement LoTW : un login refusé est désormais annoncé comme tel, au lieu de recopier un fragment de la page web de l'ARRL dans l'erreur.",
|
||||
"Interface française : les noms de champs du constructeur de filtres et de la modification en masse repassent en anglais. Ce sont des noms de champs ADIF — un vocabulaire standard — et les traduire compliquait le rapprochement avec un export ou un autre logiciel. Les opérateurs et les boutons autour restent traduits.",
|
||||
"Modification en masse : ajout de « Owner callsign ». Il était filtrable mais pas modifiable en masse car, contrairement aux autres champs, il n'a pas de colonne dédiée et vit parmi les champs ADIF supplémentaires ; sa modification s'y intègre désormais sans toucher aux autres.",
|
||||
"Chez certains, la fenêtre s'ouvrait invisible : la taille enregistrée était contrôlée mais jamais la position, si bien qu'une fenêtre fermée sur un écran depuis débranché se réouvrait hors champ à chaque fois, sans retour possible. La position est désormais vérifiée contre les écrans réellement présents.",
|
||||
"Console Icom : elle suit désormais la radio et ne fait plus que la piloter. AGC, atténuateur, préampli et filtre étaient lus une seule fois à la connexion et plus jamais ensuite : passer l'AGC de FAST à MID sur le poste laissait le panneau sur FAST définitivement. Ils sont maintenant relus en continu, un par cycle d'interrogation pour laisser la liaison CAT libre pour vos propres commandes.",
|
||||
"Icom : correction de la table des modèles CI-V. L'IC-7800 (6Ah) et l'IC-7700 (74h) étaient absents, et leurs adresses attribuées aux mauvais postes — 80h est l'IC-7410 et 88h l'IC-7100. Sur un IC-7800, cela donnait aussi un bouton d'atténuateur 20 dB que la radio ne possède pas, au lieu de ses vrais crans 6/12/18 dB.",
|
||||
"Console Icom : la rangée des bandes met en évidence celle sur laquelle le poste se trouve réellement. Les boutons ne faisaient qu'envoyer une fréquence, sans jamais indiquer où l'on était.",
|
||||
"PTT du manipulateur vocal : l'option CAT était libellée « CAT (OmniRig) », si bien que les opérateurs en Icom CI-V, FlexRadio ou TCI la croyaient hors de portée et se rabattaient sur RTS/DTR ou le VOX. Elle a toujours piloté le backend CAT actif, quel qu'il soit — tous gèrent le PTT. Elle affiche désormais « CAT — Icom CI-V (USB série) » et ainsi de suite, en nommant la liaison réellement configurée.",
|
||||
"OmniRig : la fréquence suit désormais le VFO réellement actif. Le VFO A était toujours lu dès que le poste en rapportait un, si bien qu'appuyer sur SUB VFO sur un FTDX101D laissait OpsLog sur le VFO principal — et avec lui la bande et la fréquence enregistrée.",
|
||||
"Split OmniRig : le drapeau PM_SPLITON est lu comme un bit au lieu d'être comparé par égalité exacte, donc un poste qui le rapporte accompagné d'un autre drapeau n'est plus vu comme simplex. Le split exige toujours deux VFO distincts sur la même bande, ce qui évite qu'un VFO B périmé en simule un.",
|
||||
"Les échecs de connexion CAT sont désormais écrits dans le journal de diagnostic. La pastille d'état condense tout en quelques mots (« OmniRig not found ») et la vraie raison — le code d'erreur COM, l'erreur série ou TCP — n'existait que dans une infobulle : elle n'arrivait donc jamais jusqu'à un rapport de bug. Journalisé une fois par message distinct.",
|
||||
"OmniRig lancé en administrateur alors qu'OpsLog ne l'est pas (ou l'inverse) est désormais détecté et nommé. Windows sépare les deux niveaux de privilège : OpsLog ne pouvait donc pas atteindre OmniRig, fenêtre ouverte à l'écran, et annonçait « OmniRig not found » — de quoi partir chercher un problème de pilote ou de port COM. Il indique maintenant de lancer les deux de la même façon, et cesse de répéter l'échec dans le journal toutes les cinq secondes."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.21.2",
|
||||
"date": "2026-07-25",
|
||||
"en": [
|
||||
"Fixed OpsLog disrupting another Flex client: it could bind to 'SmartSDR CAT' (or DAX) instead of the real GUI client, which made SmartSDR CAT keep disconnecting/reconnecting from the radio while OpsLog was open. OpsLog now only binds to the actual SmartSDR/Maestro GUI client (e.g. a FlexRadio 'M' integrated screen).",
|
||||
"New: Super Check Partial + N+1 callsign helper (like N1MM/DXLog). Enable it in Settings → General to download the community MASTER.SCP list; a docked two-column widget then shows, as you type a call, the known calls that contain it (Partial) and the calls one character away (N+1) — click one to fix a busted call.",
|
||||
"When a callsign isn't found on QRZ/HamQTH (or you don't use a lookup service), the name, QTH, locator and address are recovered from the last time you worked that station — and the precise locator from that QSO is used instead of the coarse cty.dat country centroid. A real QRZ/HamQTH hit still wins."
|
||||
],
|
||||
"fr": [
|
||||
"Correction : OpsLog pouvait perturber un autre client Flex — il pouvait se « binder » sur « SmartSDR CAT » (ou DAX) au lieu du vrai client GUI, ce qui faisait décrocher/reconnecter SmartSDR CAT de la radio en boucle tant qu'OpsLog était ouvert. OpsLog ne se binde désormais qu'au vrai client GUI SmartSDR/Maestro (ex. l'écran intégré d'un FlexRadio « M »).",
|
||||
"Nouveau : assistant indicatifs Super Check Partial + N+1 (façon N1MM/DXLog). Active-le dans Réglages → Général pour télécharger la liste communautaire MASTER.SCP ; un widget ancré en 2 colonnes affiche alors, pendant que tu tapes, les indicatifs connus qui contiennent ta saisie (Partiel) et ceux à une lettre près (N+1) — clique pour corriger un call busté.",
|
||||
"Quand un indicatif est introuvable sur QRZ/HamQTH (ou si tu n'utilises pas de service de lookup), le nom, le QTH, le locator et l'adresse sont récupérés du dernier QSO avec cette station — et c'est le locator précis de ce QSO qui est utilisé, pas le centroïde du pays de cty.dat. Un vrai résultat QRZ/HamQTH reste prioritaire."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.21.1",
|
||||
"date": "2026-07-24",
|
||||
"en": [
|
||||
"Ctrl + mouse wheel zoom is now remembered across restarts (Ctrl+0 resets to 100%).",
|
||||
"Log grid: award column widths are now saved like the other columns, so a width you set survives a restart.",
|
||||
"CW keyer widget: added an F9 macro slot, and empty macros are now hidden (like the voice keyer) — fill them in Settings → CW Keyer.",
|
||||
"New: ESM (Enter Sends Message) for CW, N1MM-style. Enable it in Settings → CW Keyer. With the keyer on in CW, Enter fires a macro by QSO stage instead of logging: empty callsign → F1 (CQ); callsign entered → F2 (report) and focus jumps to RST; Enter in RST → F3 (TU), which logs the QSO if the macro contains <LOGQSO>.",
|
||||
"The top frequency readout is now scroll-tunable: roll the mouse wheel over the hundreds / tens / units-of-kHz digit to step the frequency by 100 / 10 / 1 kHz, and the rig follows over CAT.",
|
||||
"New: 4O3A Tuner Genius XL control. Enable it in Settings → Tuner Genius (IP only; port is fixed at 9010). Live SWR and forward power with Tune, Bypass and Operate/Standby, the two channels A/B (source, frequency and antenna) shown and click-selectable. Available as a docked widget, a card in the FlexRadio panel (like the PowerGenius) and a card in Station Control. Controlled directly over TCP, so it uses just one of the box's connection slots.",
|
||||
"FlexRadio panel tidy-up: cards collapse from the chevron in their header (Transmit and Receive fold together), all meters are the same size, the MIC and COMP meters only show in phone modes, and the S-meter dBm now sits next to the S-value instead of on a second line.",
|
||||
"Fixed the colour theme sometimes reverting to the default when reopening OpsLog — it's now restored reliably.",
|
||||
"ADIF export field picker: the per-group All / None buttons work again.",
|
||||
"Station Control: cards now pack tightly into balanced columns instead of leaving big gaps under shorter panels — a cleaner, more even dashboard.",
|
||||
"Main-view band map: Ctrl+↑ / Ctrl+↓ jumps to the next spot above / below the current frequency and tunes to it.",
|
||||
"QSO details → Awards: the 'this contact will count for' list is now compact (CODE@REF chips, full name on hover) with a capped height, so it no longer hides the awards you've selected.",
|
||||
"Fixed award references (in the entry strip's Awards tab) not clearing when the callsign changes — clicking one spot then another no longer keeps the previous station's references."
|
||||
],
|
||||
"fr": [
|
||||
"Le zoom Ctrl + molette est maintenant conservé après un redémarrage (Ctrl+0 remet à 100 %).",
|
||||
"Grille du log : les largeurs des colonnes de diplômes sont désormais sauvegardées comme les autres colonnes, une largeur réglée survit au redémarrage.",
|
||||
"Widget keyer CW : ajout d'un emplacement de macro F9, et les macros vides sont maintenant masquées (comme le keyer vocal) — remplis-les dans Réglages → Keyer CW.",
|
||||
"Nouveau : ESM (Entrée envoie le message) en CW, façon N1MM. À activer dans Réglages → Keyer CW. Avec le keyer actif en CW, Entrée envoie un macro selon l'étape du QSO au lieu de loguer : indicatif vide → F1 (CQ) ; indicatif saisi → F2 (report) et le focus passe au RST ; Entrée dans le RST → F3 (TU), qui logue le QSO si le macro contient <LOGQSO>.",
|
||||
"L'affichage de fréquence en haut est maintenant accordable à la molette : roule la molette sur le chiffre des centaines / dizaines / unités de kHz pour changer la fréquence par pas de 100 / 10 / 1 kHz, et la radio suit en CAT.",
|
||||
"Nouveau : contrôle du 4O3A Tuner Genius XL. Active-le dans Réglages → Tuner Genius (IP seulement ; port fixé à 9010). ROS et puissance directe en direct avec Accord, Bypass et Operate/Standby, et les deux canaux A/B (source, fréquence et antenne) affichés et sélectionnables d'un clic. Disponible en widget ancré, en carte dans le panneau FlexRadio (comme le PowerGenius) et en carte dans Station Control. Piloté directement en TCP, il n'utilise qu'une des connexions de la boîte.",
|
||||
"Nettoyage du panneau FlexRadio : les cartes se replient via le chevron de leur en-tête (Transmit et Receive se replient ensemble), tous les meters ont la même taille, les meters MIC et COMP ne s'affichent qu'en phonie, et le dBm du S-mètre est maintenant à côté de la valeur S plutôt que sur une deuxième ligne.",
|
||||
"Correction du thème qui revenait parfois au défaut à la réouverture d'OpsLog — il est maintenant restauré de façon fiable.",
|
||||
"Sélecteur de champs à l'export ADIF : les boutons Tout / Aucun par groupe refonctionnent.",
|
||||
"Station Control : les cartes se rangent en colonnes équilibrées et se tassent au lieu de laisser de gros trous sous les panneaux plus courts — tableau de bord plus propre et régulier.",
|
||||
"Band map de l'écran principal : Ctrl+↑ / Ctrl+↓ saute au spot suivant au-dessus / en dessous de la fréquence courante et s'y accorde.",
|
||||
"Détails du QSO → Diplômes : la liste « ce contact comptera pour » est maintenant compacte (pastilles CODE@REF, nom complet au survol) et de hauteur limitée, elle ne masque plus les diplômes sélectionnés.",
|
||||
"Correction des références de diplômes (onglet Diplômes de la bande de saisie) qui ne se vidaient pas au changement d'indicatif — cliquer un spot puis un autre ne garde plus les références de la station précédente."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.21.0",
|
||||
"date": "2026-07-24",
|
||||
"en": [
|
||||
"⚠️ IMPORTANT — ARCHITECTURE CHANGE. OpsLog now keeps your settings/profiles and your QSO logbook in SEPARATE database files (before, everything was in one file). On the first launch after this update, your existing database is split AUTOMATICALLY and non-destructively: your contacts are copied into a new logbook file (logbook.db) while the originals stay untouched in the settings database as a backup — nothing is deleted, no QSO is lost. Existing installs keep their opslog.db as the settings database; fresh installs name it settings.db. As a precaution, back up your OpsLog data folder before updating. Afterwards, Settings → Database shows the settings database and this profile's logbook as two separate sections.",
|
||||
"Your QSOs and your settings now live in separate files: settings + profiles stay in the settings database, while contacts go to a dedicated logbook file (existing logs are migrated automatically, originals kept as a backup). A profile can also point at its own logbook file — ideal for a visiting operator, whose contacts stay out of your log without ever touching your settings or profiles. The Database panel now clearly shows the two, with an 'Open folder' shortcut, and a logbook file can be renamed/relocated (its QSOs move with it)."
|
||||
],
|
||||
"fr": [
|
||||
"⚠️ IMPORTANT — CHANGEMENT D'ARCHITECTURE. OpsLog stocke désormais tes réglages/profils et ton journal de QSO dans des fichiers de base de données SÉPARÉS (avant, tout était dans un seul fichier). Au premier lancement après cette mise à jour, ta base existante est scindée AUTOMATIQUEMENT et sans destruction : tes contacts sont copiés dans un nouveau fichier journal (logbook.db) tandis que les originaux restent intacts dans la base de réglages en sauvegarde — rien n'est supprimé, aucun QSO n'est perdu. Les installs existantes gardent leur opslog.db comme base de réglages ; les nouvelles installs la nomment settings.db. Par précaution, sauvegarde ton dossier de données OpsLog avant de mettre à jour. Ensuite, Réglages → Base de données affiche la base de réglages et le journal de ce profil en deux sections distinctes.",
|
||||
"Tes QSO et tes réglages sont désormais dans des fichiers séparés : réglages + profils dans la base de réglages, contacts dans un fichier journal dédié (les journaux existants sont migrés automatiquement, les originaux gardés en sauvegarde). Un profil peut aussi pointer vers son propre fichier journal — idéal pour un opérateur de passage, dont les contacts restent hors de ton journal sans jamais toucher tes réglages ni profils. Le panneau Base de données montre maintenant clairement les deux, avec un raccourci « Ouvrir le dossier », et un fichier journal peut être renommé/déplacé (ses QSO le suivent)."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.20.12",
|
||||
"date": "2026-07-24",
|
||||
"en": [
|
||||
"Fixed a motorized-antenna bug that could leave a FlexRadio permanently unable to transmit (‘Interlock is preventing transmission’). With a SteppIR whose status frequency reads intermittently (it flipped between the commanded frequency and its home value), the ‘follow the rig’ loop re-sent a tune command on almost every poll, and each command re-armed the ‘block TX while the antenna moves’ window — so the interlock never released. The follow loop now keys its deadband off the rig’s frequency (only re-tuning when the RADIO actually QSYs), immune to a flaky antenna status. Also dropped an ‘interlock set reason=’ command that SmartSDR rejects (it’s read-only) and only produced a harmless error line — the transmit-inhibit itself is unchanged and still holds TX safely while the elements move. New: a SteppIR ‘Tunable range’ setting (Settings → Hardware → Antenna, default 13–54 MHz = 20 m–6 m) — on a band outside it OpsLog leaves the antenna and TX completely alone, so tuning to 30 m on a 20 m–6 m SteppIR no longer tries to move it or touches the interlock.",
|
||||
"New built-in award: The Helvetia 26 Award (H26) — the 26 cantons of Switzerland (USKA), matched from the QSO's address or QTH on HF. Each canton also recognises its main cities (Genève, Lausanne, Zürich, Bellinzona…), since operators rarely write the canton itself.",
|
||||
"FlexRadio panel: the RECEIVE card is shorter again. All the noise controls added recently made it tower, so only the everyday ones — NB, NR, ANF — now stay visible; WNB and the SmartSDR v4 DSP block (NRL/NRS/NRF/ANFL and the AI/FFT RNN & ANFT) tuck behind a 'DSP' button you expand when you need them. The button carries a dot and highlights when one of the hidden controls is switched on, so nothing active is ever out of sight, and its open/closed state is remembered.",
|
||||
"ADIF export can now pick exactly which fields to write. The global 'Export to ADIF' dialog gains a third choice, 'Choose fields…', alongside 'Standard ADIF fields' and 'All OpsLog fields'; and right-clicking selected QSOs adds 'Export selected — choose fields…'. The picker separates the official ADIF 3.1.7 fields (grouped by category) from OpsLog / non-standard tags actually present in your log, with All/None per group and a one-click reset to defaults. Your selection is remembered for next time.",
|
||||
"Fixed 'Incorrect string value' (MySQL error 1366) when a QSO contained non-Latin characters — Cyrillic (Я), Polish ł, etc. — e.g. updating from QRZ. It happened when the shared MySQL database had been pre-created by the hosting panel as latin1, so OpsLog's tables couldn't store those letters. OpsLog now converts the database and its tables to utf8mb4 on connect (once, automatically), and everything stores correctly. Local SQLite logbooks were never affected.",
|
||||
"NET Control: the on-air list now follows a mic-pass order you control instead of log time. A pinned '#' column numbers the round, ⬆⬇ buttons move the selected station up/down the queue, new check-ins join the end, and 'Log & end' advances to the next in line. The order is remembered per net. Header sorting is disabled on this list so a click can't shuffle the round.",
|
||||
"The CW decoder (RX audio → text) is back, with a rebuilt decoding engine. The first version struggled on real signals; the new one adds a windowed tone detector, an adaptive dB envelope with noise squelch, two-way debouncing (a brief fade inside a dash no longer shatters it into dots), per-character dit/dah classification (even the first letter of an over decodes at any speed), and gap-fed speed tracking. It rides QSB, ignores QRM on other pitches, follows 12–40 WPM and sloppy hand keying — all proven by a synthetic-signal test suite. Tools → CW decoder (or the ear button): decodes while the mode is CW, with WPM/pitch/level display, pitch lock (follows the FlexRadio CW pitch automatically), and click-a-word to fill the callsign. Weak signals in heavy QRM remain hard — that's CW Skimmer territory — but clean-to-moderate signals now decode solidly.",
|
||||
"Finished translating the Settings dialog: several panels that had stayed in English are now French too — the CW Keyer panel (and its long serial-engine paragraph removed for clarity), Password encryption, the ClubLog exceptions / Most Wanted blocks in General, and the External services tabs (HRDLOG, eQSL, LoTW, POTA).",
|
||||
"Serial CW keyer: fixed the rig dropping to RX between words during a macro (PTT not held). On USB-serial interfaces like the Yaesu SCU-17 (CP210x), the previous method of driving the DTR/RTS lines would drop the held RTS (PTT) as soon as DTR (CW) toggled. OpsLog now drives the lines with the direct Win32 method N1MM/WSJT use (EscapeCommFunction), so RTS stays asserted for the whole transmission. 'Key PTT line' also defaults on for the Serial engine, and PTT / key-line / speed changes apply immediately without reconnecting the keyer.",
|
||||
"New (Settings → General): show the ClubLog 'Most Wanted' rank in the entry-strip band matrix. When on, a 'MW #rank' pill appears next to the DXCC entity name (1 = the most wanted entity), coloured hotter the more wanted it is. The list is fetched from ClubLog and personalised to your callsign, refreshed daily.",
|
||||
"Fixed the colour theme sometimes resetting to light after an update/relaunch: an update can clear the WebView's localStorage, and the fallback that restores the theme from the local settings database gave up after ~2.4s — occasionally too soon during the brief startup window before that store is ready. It now keeps retrying until the store actually answers, so a dark theme is reliably restored."
|
||||
],
|
||||
"fr": [
|
||||
"Correction d'un bug d'antenne motorisée qui pouvait laisser un FlexRadio définitivement incapable d'émettre (« Interlock is preventing transmission »). Avec une SteppIR dont la fréquence de statut se lit par intermittence (elle alternait entre la fréquence commandée et sa valeur de repos), la boucle de suivi renvoyait un ordre d'accord à presque chaque cycle, et chaque ordre réarmait la fenêtre « bloquer l'émission pendant que l'antenne bouge » — l'interlock ne se relâchait donc jamais. La boucle de suivi se base maintenant sur la fréquence de la RADIO (elle ne réaccorde que quand le poste change réellement de fréquence), insensible à un statut d'antenne erratique. Retrait aussi d'une commande « interlock set reason= » que SmartSDR refuse (champ en lecture seule) et qui ne produisait qu'une ligne d'erreur sans effet — l'inhibition d'émission elle-même est inchangée et protège toujours pendant le mouvement des éléments. Nouveau : un réglage « Plage accordable » pour la SteppIR (Réglages → Matériel → Antenne, défaut 13-54 MHz = 20 m-6 m) — sur une bande hors de cette plage, OpsLog laisse totalement l'antenne et l'émission tranquilles, donc passer sur 30 m avec une SteppIR 20 m-6 m ne tente plus de la bouger ni ne touche à l'interlock.",
|
||||
"Nouveau diplôme intégré : The Helvetia 26 Award (H26) — les 26 cantons de Suisse (USKA), reconnus depuis l'adresse ou le QTH du QSO en HF. Chaque canton reconnaît aussi ses principales villes (Genève, Lausanne, Zürich, Bellinzone…), car les opérateurs écrivent rarement le canton lui-même.",
|
||||
"Panneau FlexRadio : la carte RÉCEPTION est de nouveau plus compacte. Tous les contrôles de bruit ajoutés récemment la faisaient s'allonger, donc seuls ceux du quotidien — NB, NR, ANF — restent visibles ; le WNB et le bloc DSP SmartSDR v4 (NRL/NRS/NRF/ANFL ainsi que RNN & ANFT IA/FFT) se replient derrière un bouton « DSP » que tu déplies au besoin. Le bouton porte un point et s'illumine quand l'un des contrôles masqués est activé, pour ne jamais perdre de vue quelque chose d'actif, et son état ouvert/fermé est mémorisé.",
|
||||
"L'export ADIF permet maintenant de choisir précisément les champs à écrire. La fenêtre globale « Exporter en ADIF » gagne un troisième choix, « Choisir les champs… », à côté de « Champs ADIF standard » et « Tous les champs OpsLog » ; et le clic droit sur des QSO sélectionnés ajoute « Exporter la sélection — choisir les champs… ». Le sélecteur sépare les champs ADIF 3.1.7 officiels (regroupés par catégorie) des balises OpsLog / non standard réellement présentes dans ton log, avec Tout/Aucun par groupe et un retour aux valeurs par défaut en un clic. Ta sélection est mémorisée pour la prochaine fois.",
|
||||
"Correction de « Incorrect string value » (erreur MySQL 1366) quand un QSO contenait des caractères non latins — cyrillique (Я), polonais ł, etc. — p. ex. lors d'une mise à jour depuis QRZ. Ça arrivait quand la base MySQL partagée avait été pré-créée en latin1 par le panel d'hébergement, empêchant les tables d'OpsLog de stocker ces lettres. OpsLog convertit désormais la base et ses tables en utf8mb4 à la connexion (une seule fois, automatiquement), et tout s'enregistre correctement. Les logbooks SQLite locaux n'étaient pas concernés.",
|
||||
"NET Control : la liste on-air suit maintenant un ordre de passage du micro que tu contrôles, au lieu de l'heure de log. Une colonne « # » épinglée numérote le tour, les boutons ⬆⬇ montent/descendent la station sélectionnée dans la file, les nouveaux arrivants rejoignent la fin, et « Logger & terminer » passe au suivant. L'ordre est mémorisé par NET. Le tri par en-tête est désactivé sur cette liste pour qu'un clic ne bouscule pas le tour.",
|
||||
"Le décodeur CW (audio RX → texte) est de retour, avec un moteur de décodage reconstruit. La première version peinait sur les vrais signaux ; la nouvelle ajoute un détecteur de tonalité fenêtré, une enveloppe dB adaptative avec squelch de bruit, un anti-rebond bilatéral (un bref fading dans un trait ne le brise plus en points), une classification point/trait par caractère (même la première lettre d'un over se décode à n'importe quelle vitesse) et un suivi de vitesse nourri par les espaces. Il tient le QSB, ignore le QRM sur d'autres tonalités, suit de 12 à 40 WPM et la manipulation humaine approximative — le tout prouvé par une suite de tests sur signaux synthétiques. Outils → Décodeur CW (ou le bouton oreille) : décode quand le mode est CW, avec affichage WPM/tonalité/niveau, verrouillage de tonalité (suit automatiquement le pitch CW du FlexRadio) et clic-sur-un-mot pour remplir l'indicatif. Les signaux faibles dans un fort QRM restent difficiles — c'est le territoire de CW Skimmer — mais les signaux propres à moyens se décodent maintenant solidement.",
|
||||
"Fin de la traduction de la fenêtre Réglages : plusieurs panneaux restés en anglais sont maintenant en français aussi — le Manipulateur CW (et son long paragraphe moteur série retiré pour l'alléger), le Chiffrement des mots de passe, les blocs Exceptions ClubLog / Most Wanted dans Général, et les onglets Services externes (HRDLOG, eQSL, LoTW, POTA).",
|
||||
"Keyer CW série : correction de la radio qui retombait en RX entre les mots pendant une macro (PTT non tenu). Sur les interfaces USB-série comme le Yaesu SCU-17 (CP210x), l'ancienne méthode de pilotage des lignes DTR/RTS faisait retomber le RTS (PTT) dès que DTR (CW) basculait. OpsLog pilote maintenant les lignes avec la méthode Win32 directe qu'utilisent N1MM/WSJT (EscapeCommFunction), donc RTS reste asserté toute l'émission. « Key PTT line » est aussi activé par défaut pour le moteur Série, et les changements PTT / ligne / vitesse s'appliquent immédiatement sans reconnecter le keyer.",
|
||||
"Nouveau (Réglages → Général) : afficher le rang « Most Wanted » de ClubLog dans la matrice de bandes de la barre de saisie. Activé, une pastille « MW #rang » apparaît à côté du nom de l'entité DXCC (1 = l'entité la plus recherchée), d'autant plus colorée qu'elle est recherchée. La liste est récupérée depuis ClubLog et personnalisée selon ton indicatif, rafraîchie quotidiennement.",
|
||||
"Correction du thème de couleur qui revenait parfois au clair après une mise à jour/relancement : une mise à jour peut vider le localStorage de la WebView, et le repli qui restaure le thème depuis la base de réglages locale abandonnait après ~2,4s — parfois trop tôt pendant le court instant de démarrage avant que ce store soit prêt. Il réessaie maintenant jusqu'à ce que le store réponde vraiment, donc un thème sombre est restauré de façon fiable."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.20.11",
|
||||
"date": "2026-07-23",
|
||||
"en": [
|
||||
"Fixed clicking a spot / band-map entry not moving the radio on Yaesu (and other non-Icom) rigs controlled through OmniRig — e.g. the FT-891. OpsLog tuned via OmniRig's SetSimplexMode, which on these rigs returns success but silently doesn't move the VFO (mode changes worked, so it looked like a puzzle). It now also writes the VFO frequency property directly, which does move them. Icom rigs are unchanged (there SetSimplexMode is the reliable path).",
|
||||
"New CW keyer engine: 'Serial port (DTR=CW / RTS=PTT)'. OpsLog can now key CW by toggling a serial control line itself — the hardware-keying method N1MM/WSJT use with a Yaesu SCU-17 and generic keying interfaces — without a K1EL WinKeyer. Settings → CW Keyer → Keyer engine: pick 'Serial port', choose the keying COM port and whether CW is on DTR (PTT on RTS) or swapped. Speed, Farnsworth, lead-in/tail and PTT keying all apply; macros, auto-CQ and <LOGQSO> work exactly as with the WinKeyer. An 'Invert keying (active-LOW)' option is there for interfaces that key backwards / transmit at rest.",
|
||||
"Fixed the spectrum scope never displaying on the IC-7300: its CI-V waveform frames actually carry the same leading main-scope selector byte as the dual-scope IC-7610/9700, but OpsLog assumed the 7300 omitted it — so it read the frame sequence number from the wrong byte (always 0), discarded every frame, and drew nothing. The frame layout is now detected from the data itself, so the 7300 (and other single-scope Icoms) render correctly, in both center and fixed modes. The IC-7610/9700 are unaffected.",
|
||||
"IC-7300 scope: the center/fixed mode and edge-frequency commands now include the selector byte the rig requires, so switching the scope between center-on-VFO and fixed span from OpsLog is accepted instead of being rejected.",
|
||||
"Closing OpsLog no longer switches off the scope display on the radio itself: turning the scope off used to send both 'stop CI-V data' and 'display off', so quitting blanked a local IC-7300's own scope screen. It now only stops the CI-V data stream on disable and never touches the radio's display (the display-on command is sent solely when enabling)."
|
||||
],
|
||||
"fr": [
|
||||
"Correction : cliquer un spot / une entrée de band-map ne changeait pas la fréquence sur les Yaesu (et autres radios non-Icom) pilotées via OmniRig — p. ex. le FT-891. OpsLog accordait via SetSimplexMode d'OmniRig, qui sur ces radios renvoie « OK » mais ne bouge pas le VFO (le changement de mode marchait, d'où l'énigme). Il écrit maintenant aussi directement la propriété fréquence du VFO, ce qui les fait bien QSY. Les Icom sont inchangés (là, SetSimplexMode reste la bonne méthode).",
|
||||
"Nouveau moteur de keyer CW : « Port série (DTR=CW / RTS=PTT) ». OpsLog peut désormais manipuler la CW en basculant lui-même une ligne de contrôle série — la méthode de keying matériel qu'utilisent N1MM/WSJT avec un Yaesu SCU-17 et les interfaces génériques — sans WinKeyer K1EL. Réglages → Keyer CW → Moteur : choisis « Port série », le port COM de keying et si la CW est sur DTR (PTT sur RTS) ou l'inverse. Vitesse, Farnsworth, lead-in/tail et PTT s'appliquent ; les macros, l'auto-CQ et <LOGQSO> fonctionnent exactement comme avec le WinKeyer. Une option « Inverser le keying (actif-BAS) » est prévue pour les interfaces qui manipulent à l'envers / émettent au repos.",
|
||||
"Correction du scope spectral qui ne s'affichait jamais sur l'IC-7300 : ses trames de forme d'onde CI-V portent en réalité le même octet sélecteur de scope en tête que les IC-7610/9700 (dual-scope), mais OpsLog supposait que le 7300 ne l'envoyait pas — il lisait donc le numéro de séquence de la trame sur le mauvais octet (toujours 0), jetait toutes les trames et ne dessinait rien. La disposition des trames est maintenant détectée à partir des données elles-mêmes, donc le 7300 (et les autres Icom mono-scope) s'affichent correctement, en mode centre comme en fixe. Les IC-7610/9700 ne sont pas affectés.",
|
||||
"Scope IC-7300 : les commandes de mode centre/fixe et de fréquences de bords incluent maintenant l'octet sélecteur requis par la radio, donc basculer le scope entre centre-sur-VFO et span fixe depuis OpsLog est accepté au lieu d'être rejeté.",
|
||||
"Fermer OpsLog n'éteint plus le scope sur la radio elle-même : couper le scope envoyait à la fois « stop données CI-V » et « affichage OFF », donc quitter éteignait l'écran scope d'un IC-7300 local. Désormais seule la diffusion des données CI-V est coupée à la désactivation, l'affichage de la radio n'est jamais touché (la commande d'allumage n'est envoyée qu'à l'activation)."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.20.10",
|
||||
"date": "2026-07-23",
|
||||
"en": [
|
||||
"Clicking an OpsLog spot on the FlexRadio panadapter now switches the mode too, not just the frequency: cluster spots (which carry no mode) get one inferred from the comment or the band plan, and every spot's mode is sent to the radio as a real SmartSDR mode (SSB resolves to USB/LSB by frequency), so the click tunes AND sets the mode.",
|
||||
"Station Control is now a clean dashboard of fixed-width panels that wrap to fill the window. Each panel has a grip handle on its left edge — drag it to move the panel anywhere, and the order is remembered. Relay buttons are compact. The amplifier panel is now the exact same card as the FlexRadio panel's (OPERATE/STANDBY, ON/OFF, power level, output-power bar and live FWD/drain-current/temperature meters), and if you run several amplifiers they all appear — one card each, no dropdown.",
|
||||
"Station Control: the Ultrabeam element list now shows the right number of elements (3 for a 3-element beam) instead of extra bogus rows that came from over-reading the controller's reply.",
|
||||
"Fixed the FlexRadio amplifier meters showing twice after the amp was power-cycled — the old (stale) meters are now cleared when the amplifier is torn down, so only the fresh set remains.",
|
||||
"Fixed QSO audio recordings silently not being saved: the recording snapshot had moved onto the background (post-log) path, where it raced the entry-form clearing that cancels the recorder — so the audio was discarded before it was captured. The snapshot is now taken the instant you log, before the form clears; the file encoding still happens in the background.",
|
||||
"Digital Voice Keyer: an Auto CQ (like the CW keyer's auto-call) repeats a CQ-labelled voice message on a timer until you stop it, play another slot or press ESC. The DVK now also refuses to transmit on non-phone modes (CW/FT8/RTTY…) — the buttons grey out and it won't key the rig with speech on a data mode.",
|
||||
"The Digital Voice Keyer (DVK) panel now stays open across a relaunch if you had it open — it used to reset to closed every time.",
|
||||
"FlexRadio meter scales now match SmartSDR: MIC (level) tops out at 0 dB and COMP (compression) tops out at -25 dB (was -20).",
|
||||
"New Help → 'Send log to F4BPO' (shown only when you have an SMTP server configured in Settings → E-mail): e-mails OpsLog's diagnostic logs (current session, previous session and any crash log) straight to the developer, so a problem you hit in the field can be looked at without hunting for the log files by hand.",
|
||||
"Bulk edit can now set the frequency: pick 'Frequency (MHz)', enter e.g. 7.155, and every selected QSO gets that frequency with its band recomputed to match. Handy for fixing a run that was logged on a stale/default frequency (e.g. 7.000) after CAT control dropped. Out-of-band values are rejected so a typo can't corrupt the batch.",
|
||||
"Fixed the Cluster spot list appearing to 'freeze' at the UTC midnight rollover: the Time column was sorted as plain text, so a spot at 0001Z sorted below 2359Z and new spots after 0000Z dropped to the bottom of the list instead of the top — it looked like the cluster had stopped. The column now sorts by actual arrival time, which crosses midnight correctly.",
|
||||
"Fixed the spectrum scope being blank on the IC-7300 (and other single-scope Icoms) when the scope was in center / VFO-following mode: the multi-frame waveform header read the second frequency field as an absolute high edge, but in center mode it is a span, so the display got an invalid range and drew nothing. It now interprets center+span vs low+high edges the same way the IC-7610 path already did. FIXED mode was unaffected."
|
||||
],
|
||||
"fr": [
|
||||
"Cliquer sur un spot OpsLog du panadapter FlexRadio change maintenant aussi le mode, plus seulement la fréquence : les spots cluster (qui n'ont pas de mode) en reçoivent un déduit du commentaire ou du plan de bande, et le mode de chaque spot est envoyé à la radio comme un vrai mode SmartSDR (SSB devient USB/LSB selon la fréquence), donc le clic accorde ET règle le mode.",
|
||||
"Station Control est maintenant un tableau de bord de panneaux à largeur fixe qui s'alignent pour remplir la fenêtre. Chaque panneau a une poignée sur son bord gauche — glisse-la pour déplacer le panneau où tu veux, et l'ordre est mémorisé. Les boutons relais sont compacts. Le panneau amplificateur est désormais exactement la même carte que celle du panneau FlexRadio (OPERATE/STANDBY, ON/OFF, niveau de puissance, barre de puissance de sortie et mesures en direct puissance directe/courant de drain/température), et si tu utilises plusieurs amplis ils apparaissent tous — une carte chacun, sans liste déroulante.",
|
||||
"Station Control : la liste des éléments Ultrabeam affiche maintenant le bon nombre d'éléments (3 pour une beam 3 éléments) au lieu de lignes fantômes issues d'une sur-lecture de la réponse du contrôleur.",
|
||||
"Correction des mesures de l'amplificateur FlexRadio affichées en double après un cycle d'alimentation de l'ampli — les anciennes mesures (périmées) sont maintenant effacées quand l'amplificateur est retiré, seul le jeu à jour reste.",
|
||||
"Correction des enregistrements audio des QSO qui n'étaient plus sauvegardés : la capture de l'enregistrement était passée sur le chemin d'arrière-plan (après le log), où elle entrait en concurrence avec le vidage du formulaire qui annule l'enregistreur — l'audio était donc jeté avant d'être capturé. La capture se fait maintenant à l'instant du log, avant le vidage du formulaire ; l'encodage du fichier reste en arrière-plan.",
|
||||
"Manipulateur vocal (DVK) : un Auto CQ (comme l'auto-call du keyer CW) répète un message vocal libellé CQ à intervalle régulier jusqu'à l'arrêt, la lecture d'un autre slot ou ÉCHAP. Le DVK refuse aussi désormais d'émettre hors phonie (CW/FT8/RTTY…) — les boutons sont grisés et il ne manipule plus la radio avec de la voix sur un mode data.",
|
||||
"Le panneau Digital Voice Keyer (DVK) reste maintenant ouvert après un relancement si vous l'aviez ouvert — il se refermait à chaque démarrage.",
|
||||
"Les échelles des meters FlexRadio collent maintenant à SmartSDR : MIC (niveau) plafonne à 0 dB et COMP (compression) à -25 dB (au lieu de -20).",
|
||||
"Nouveau Aide → « Envoyer le journal à F4BPO » (affiché seulement si un serveur SMTP est configuré dans Réglages → E-mail) : envoie par e-mail les journaux de diagnostic d'OpsLog (session en cours, session précédente et éventuel journal de crash) directement au développeur, pour qu'un problème rencontré sur le terrain puisse être examiné sans avoir à chercher les fichiers de journal à la main.",
|
||||
"L'édition groupée permet maintenant de définir la fréquence : choisis « Fréquence (MHz) », saisis p. ex. 7.155, et chaque QSO sélectionné reçoit cette fréquence avec sa bande recalculée en conséquence. Pratique pour corriger une série loguée sur une fréquence par défaut/figée (p. ex. 7.000) après une perte du CAT. Les valeurs hors bande sont refusées pour qu'une faute de frappe ne corrompe pas le lot.",
|
||||
"Correction de la liste des spots Cluster qui semblait « se figer » au passage de minuit UTC : la colonne Heure était triée comme du texte, donc un spot à 0001Z se retrouvait sous 2359Z et les nouveaux spots après 0000Z tombaient en bas de la liste au lieu du haut — on aurait dit que le cluster s'était arrêté. La colonne trie désormais selon l'heure d'arrivée réelle, qui franchit minuit correctement.",
|
||||
"Correction du scope spectral vide sur l'IC-7300 (et autres Icom mono-scope) quand le scope était en mode centre / suivi du VFO : l'en-tête de forme d'onde multi-trames lisait le second champ de fréquence comme un bord haut absolu, alors qu'en mode centre c'est un span — l'affichage recevait donc une plage invalide et ne dessinait rien. Il interprète maintenant centre+span vs bords bas+haut comme le faisait déjà le chemin de l'IC-7610. Le mode FIXED n'était pas affecté."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.20.9",
|
||||
"date": "2026-07-22",
|
||||
"en": [
|
||||
"The PGXL amplifier chip and Station Control widget now read the OPERATE state from the FlexRadio (like the Flex panel) — the chip no longer shows STANDBY while the amp is operating, and clicking it toggles the amp through the radio.",
|
||||
"Right-click 'Send to LoTW / QRZ / Club Log…' now reports its result as a notification — a failed upload (e.g. TQSL not configured) was completely silent outside the QSL Manager, which looked like nothing was sent.",
|
||||
"The number of selected QSOs is now always visible at the top of the log grid — no need to open the right-click menu to see it.",
|
||||
"NET Control: the worked-before list gets the same right-click menu as Recent QSOs (update from cty/QRZ/Club Log, send to services, recording e-mail, eQSL, delete).",
|
||||
"Leaving compact mode restores the window's previous size AND position (it used to snap to a fixed size wherever the compact strip had been dragged).",
|
||||
"The advanced filter's 'My callsign' field is renamed 'Station callsign' so it is findable under its ADIF name (it filters STATION_CALLSIGN).",
|
||||
"Filtering now shows EVERY match: the on-screen row limit (Max) only applies to the unfiltered log — a filter matching 200 QSOs displays all 200 even with Max at 100 (safety cap 10,000, with a warning to narrow the filter beyond that).",
|
||||
"New 'Select all' button in the log grid toolbar — selects every displayed row (respecting active column filters) in one click, ready for send-to-LoTW, bulk edit or export; once everything is selected it flips to 'Unselect all'.",
|
||||
"NET Control: drag & drop between the two lists — drag a roster station onto the on-air list to start its QSO, and drag an on-air station onto the roster to log it (same as the Log & end button).",
|
||||
"New option (Settings → General): 'Group digital modes as one (DXCC-style)' — when on, the matrix newness badges and the cluster new/new-band/new-mode/new-slot colouring treat FT8/FT4/RTTY/PSK… as a single Digital mode, matching how DXCC counts; when off (default), each digital mode remains its own potential slot.",
|
||||
"Multiple amplifiers: Settings → Amplifier is now a LIST — configure several amps (e.g. two SPEs run in parallel), each with its own name and connection. The amp cards in the Flex panel and Station Control get a dropdown to pick which amp they show, and the bottom status bar shows one clickable chip per amp. Existing single-amp setups migrate automatically.",
|
||||
"FlexRadio panel: the SmartSDR v4 DSP filters are now controllable — NRL and ANFL (legacy LMS), NRS (spectral subtraction), NRF (noise reduction with filter) with their level sliders, plus RNN (AI noise reduction) and ANFT (FFT auto-notch) toggles. The section appears automatically on radios that support them (8000/Aurora series). Layout rebalanced: RIT/XIT moved to the Transmit column and the antenna selection now sits at the top of the Receive column, alongside a new DAX button (SmartSDR's transmit-bar DAX toggle — TX audio from DAX, for WSJT-X & co)."
|
||||
],
|
||||
"fr": [
|
||||
"La pastille ampli PGXL et le widget Station Control lisent maintenant l'état OPERATE depuis le FlexRadio (comme le panneau Flex) — la pastille n'affiche plus STANDBY quand l'ampli est en service, et un clic bascule l'ampli via la radio.",
|
||||
"Le clic droit « Send to LoTW / QRZ / Club Log… » affiche maintenant son résultat en notification — un envoi échoué (p. ex. TQSL non configuré) était totalement silencieux hors du QSL Manager, comme si rien n'était parti.",
|
||||
"Le nombre de QSO sélectionnés est maintenant toujours visible en haut de la grille du log — plus besoin d'ouvrir le menu clic droit pour le voir.",
|
||||
"NET Control : la liste worked-before dispose du même menu clic droit que QSO récents (mise à jour cty/QRZ/Club Log, envoi aux services, e-mail d'enregistrement, eQSL, suppression).",
|
||||
"Quitter le mode compact restaure la taille ET la position précédentes de la fenêtre (avant, elle reprenait une taille fixe là où la barre compacte avait été déplacée).",
|
||||
"Le champ « Mon indicatif » du filtre avancé est renommé « Station callsign » pour être trouvable sous son nom ADIF (il filtre STATION_CALLSIGN).",
|
||||
"Le filtrage affiche maintenant TOUTES les correspondances : la limite d'affichage (Max) ne s'applique qu'au log non filtré — un filtre qui matche 200 QSO les affiche tous les 200 même avec Max à 100 (plafond de sécurité 10 000, avec un avertissement pour affiner au-delà).",
|
||||
"Nouveau bouton « Tout sélectionner » dans la barre d'outils de la grille — sélectionne toutes les lignes affichées (en respectant les filtres de colonnes actifs) en un clic, prêt pour l'envoi LoTW, le bulk edit ou l'export ; une fois tout sélectionné il devient « Tout désélectionner ».",
|
||||
"NET Control : glisser-déposer entre les deux listes — glisser une station du roster vers la liste on air démarre son QSO, et glisser une station on air vers le roster l'enregistre au log (comme le bouton Logger & terminer).",
|
||||
"Nouvelle option (Réglages → Général) : « Regrouper les modes digitaux en un seul (style DXCC) » — activée, les badges de nouveauté de la matrice et le coloriage cluster new/new-band/new-mode/new-slot traitent FT8/FT4/RTTY/PSK… comme un seul mode Digital, comme le DXCC ; désactivée (défaut), chaque mode digital reste un slot potentiel distinct.",
|
||||
"Plusieurs amplificateurs : Réglages → Amplificateur est maintenant une LISTE — configurez plusieurs amplis (p. ex. deux SPE en parallèle), chacun avec son nom et sa connexion. Les cartes ampli du panneau Flex et de Station Control ont une liste déroulante pour choisir lequel afficher, et la barre du bas montre une pastille cliquable par ampli. Les configurations mono-ampli existantes migrent automatiquement.",
|
||||
"Panneau FlexRadio : les filtres DSP SmartSDR v4 sont maintenant pilotables — NRL et ANFL (LMS legacy), NRS (soustraction spectrale), NRF (réduction de bruit avec filtre) avec leurs curseurs de niveau, plus les interrupteurs RNN (réduction de bruit par IA) et ANFT (notch automatique FFT). La section apparaît automatiquement sur les radios qui les supportent (séries 8000/Aurora). Mise en page rééquilibrée : RIT/XIT passent dans la colonne Transmit et la sélection d'antennes s'affiche en haut de la colonne Receive, avec un nouveau bouton DAX (le toggle DAX du bandeau transmit de SmartSDR — audio d'émission via DAX, pour WSJT-X & co)."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.20.8",
|
||||
"date": "2026-07-21",
|
||||
"en": [
|
||||
"New: microHAM ARCO rotator controlled natively — no PstRotator needed. Over the LAN or over USB: set the ARCO's CONTROL PROTOCOL (LAN or USB) to 'Yaesu GS-232A' and pick 'microHAM ARCO' in Settings → Rotator.",
|
||||
"Amplifier without a FlexRadio: the amplifier controls (OPERATE/STANDBY, ON/OFF, live power/SWR/temperature) now also live in the Station Control tab, and a status chip sits in the bottom bar next to Cluster/CAT/Rotator — green ON AIR = OPERATE, orange = STANDBY, red = offline. Clicking the chip toggles OPERATE/STANDBY on all three amps (PowerGenius XL included, over its direct network link).",
|
||||
"NET Control: after logging a station, the next on-air station is selected automatically (chain log → log → log), and a new 'Log everyone' button logs every on-air station at once when the net ends.",
|
||||
"Switching to a profile whose MySQL database is unreachable now shows a clear warning — before, OpsLog silently stayed on the previous logbook and QSOs could land in the wrong log.",
|
||||
"The ON AIR badge is back for local (SQLite) logbooks — it had disappeared with the removal of the live-status option."
|
||||
],
|
||||
"fr": [
|
||||
"Nouveau : rotator microHAM ARCO contrôlé en natif — sans PstRotator. Par le réseau ou par USB : régler le CONTROL PROTOCOL de l'ARCO (LAN ou USB) sur « Yaesu GS-232A » et choisir « microHAM ARCO » dans Réglages → Rotator.",
|
||||
"Amplificateur sans FlexRadio : les commandes d'ampli (OPERATE/STANDBY, ON/OFF, puissance/ROS/température en direct) sont maintenant aussi dans l'onglet Station Control, et une pastille de statut s'affiche dans la barre du bas à côté de Cluster/CAT/Rotator — vert = OPERATE, orange = STANDBY, rouge = hors ligne. Un clic sur la pastille bascule OPERATE/STANDBY sur les trois amplis (PowerGenius XL compris, via son lien réseau direct).",
|
||||
"NET Control : après avoir loggé une station, la station on air suivante est sélectionnée automatiquement (enchaînement log → log → log), et un nouveau bouton « Logger tout le monde » enregistre toutes les stations on air d'un coup à la fin du net.",
|
||||
"Passer sur un profil dont la base MySQL est injoignable affiche maintenant un avertissement clair — avant, OpsLog restait silencieusement sur l'ancien logbook et les QSO pouvaient partir dans le mauvais log.",
|
||||
"Le badge ON AIR est de retour pour les logbooks locaux (SQLite) — il avait disparu avec la suppression de l'option de statut en direct."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.20.7",
|
||||
"date": "2026-07-21",
|
||||
|
||||
+729
-61
File diff suppressed because it is too large
Load Diff
@@ -70,6 +70,13 @@ export function AlertsModal({ onClose, bands, modes, countries }: {
|
||||
const { t } = useI18n();
|
||||
const [rules, setRules] = useState<Rule[]>([]);
|
||||
const [draft, setDraft] = useState<Rule | null>(null);
|
||||
// Raw text of the callsigns box, kept separately from draft.calls. The list is
|
||||
// normalised (trim + drop empties) on the way into the rule, so binding the
|
||||
// textarea straight to calls.join('\n') round-trips every keystroke through
|
||||
// that normalisation — a trailing newline or space is stripped before React
|
||||
// re-renders, and Enter/Space appear to do nothing. Editing the raw text and
|
||||
// deriving the list from it keeps typing intact.
|
||||
const [callsText, setCallsText] = useState('');
|
||||
const [tab, setTab] = useState('def'); // active editor tab (reset to Definition on new/select)
|
||||
const [emailTo, setEmailTo] = useState('');
|
||||
const [err, setErr] = useState('');
|
||||
@@ -80,6 +87,12 @@ export function AlertsModal({ onClose, bands, modes, countries }: {
|
||||
}, []);
|
||||
useEffect(() => { refresh(); GetAlertEmailTo().then((v) => setEmailTo(v || '')).catch(() => {}); }, [refresh]);
|
||||
|
||||
// loadDraft opens a rule in the editor — always through here, so the raw
|
||||
// callsigns text is re-seeded from whatever rule is now being edited.
|
||||
const loadDraft = (r: Rule | null) => {
|
||||
setDraft(r);
|
||||
setCallsText((r?.calls ?? []).join('\n'));
|
||||
};
|
||||
const patch = (p: Partial<Rule>) => setDraft((d) => (d ? alerts.Rule.createFrom({ ...d, ...p }) : d));
|
||||
const toggleIn = (key: keyof Rule, v: string) => setDraft((d) => {
|
||||
if (!d) return d;
|
||||
@@ -92,14 +105,14 @@ export function AlertsModal({ onClose, bands, modes, countries }: {
|
||||
async function save() {
|
||||
if (!draft) return;
|
||||
if (!draft.name.trim()) { setErr(t('altm.giveName')); return; }
|
||||
try { const saved = await SaveAlertRule(draft); await refresh(); setDraft(saved as Rule); setErr(''); }
|
||||
try { const saved = await SaveAlertRule(draft); await refresh(); loadDraft(saved as Rule); setErr(''); }
|
||||
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||
}
|
||||
async function del() {
|
||||
if (!draft) return;
|
||||
if (!draft.id) { setDraft(null); return; }
|
||||
if (!draft.id) { loadDraft(null); return; }
|
||||
if (!window.confirm(t('altm.deleteConfirm', { name: draft.name }))) return;
|
||||
try { await DeleteAlertRule(draft.id); setDraft(null); await refresh(); }
|
||||
try { await DeleteAlertRule(draft.id); loadDraft(null); await refresh(); }
|
||||
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||
}
|
||||
|
||||
@@ -116,12 +129,12 @@ export function AlertsModal({ onClose, bands, modes, countries }: {
|
||||
<div className="w-56 shrink-0 flex flex-col border border-border rounded-md">
|
||||
<div className="flex items-center gap-1 px-2 py-1.5 border-b border-border/60">
|
||||
<span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground flex-1">{t('altm.rules')}</span>
|
||||
<Button variant="ghost" size="sm" className="h-6 px-1.5" onClick={() => { setDraft(emptyRule()); setTab('def'); }}><Plus className="size-3.5" /></Button>
|
||||
<Button variant="ghost" size="sm" className="h-6 px-1.5" onClick={() => { loadDraft(emptyRule()); setTab('def'); }}><Plus className="size-3.5" /></Button>
|
||||
</div>
|
||||
<div className="flex-1 overflow-y-auto p-1">
|
||||
{rules.length === 0 && <div className="text-[11px] text-muted-foreground px-2 py-4 text-center">{t('altm.noRules')}</div>}
|
||||
{rules.map((r) => (
|
||||
<button key={r.id} onClick={() => { setDraft(alerts.Rule.createFrom(r)); setTab('def'); }}
|
||||
<button key={r.id} onClick={() => { loadDraft(alerts.Rule.createFrom(r)); setTab('def'); }}
|
||||
className={cn('w-full text-left px-2 py-1.5 rounded text-xs flex items-center gap-1.5',
|
||||
draft?.id === r.id ? 'bg-accent text-accent-foreground font-semibold' : 'hover:bg-muted/60')}>
|
||||
<span className={cn('size-1.5 rounded-full shrink-0', r.enabled ? 'bg-success' : 'bg-muted-foreground/40')} />
|
||||
@@ -187,8 +200,11 @@ export function AlertsModal({ onClose, bands, modes, countries }: {
|
||||
<Label className="text-xs">{t('altm.callsigns')}</Label>
|
||||
<textarea className="w-full h-52 rounded-md border border-border bg-background p-2 text-xs font-mono resize-none"
|
||||
placeholder={'DL1ABC\nIW3*\n*/P'}
|
||||
value={(draft.calls ?? []).join('\n')}
|
||||
onChange={(e) => patch({ calls: e.target.value.split('\n').map((x) => x.trim()).filter(Boolean) })} />
|
||||
value={callsText}
|
||||
onChange={(e) => {
|
||||
setCallsText(e.target.value);
|
||||
patch({ calls: e.target.value.split('\n').map((x) => x.trim()).filter(Boolean) });
|
||||
}} />
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<Label className="text-xs">{t('altm.countries')}</Label>
|
||||
|
||||
@@ -0,0 +1,230 @@
|
||||
import { useRef, useState } from 'react';
|
||||
import { Flame, ChevronDown } from 'lucide-react';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { MeterBar } from '@/components/MeterBar';
|
||||
import { AmpOperate, AmpPower, AmpPowerLevel, AmpFanMode, FlexAmpOperate } from '../../wailsjs/go/main/App';
|
||||
|
||||
// AmpCard renders the amplifier card exactly like the one in the FlexRadio panel,
|
||||
// so Station Control (and anywhere else that needs it) shows the SAME card instead
|
||||
// of a stripped-down variant. It handles all three amp families:
|
||||
// • SPE Expert / ACOM — driven by OpsLog's own serial/TCP link (amp.spe/amp.acom)
|
||||
// • PowerGenius XL — OPERATE + meters come from the Flex (which reports the
|
||||
// amp), fan mode from the direct GSCP link (amp.pgxl)
|
||||
// Controls use the multi-amp API (AmpOperate/AmpPower/… by amp id) so several amps
|
||||
// can each get their own card.
|
||||
|
||||
function Card({ icon: Icon, title, accent, children, ckey }: { icon: any; title: string; accent?: string; children: React.ReactNode; ckey?: string }) {
|
||||
// Collapsible with persisted state — same behaviour as the FlexRadio panel's Card.
|
||||
const storeKey = 'opslog.cardOpen.' + (ckey || title);
|
||||
const [open, setOpen] = useState(() => localStorage.getItem(storeKey) !== '0');
|
||||
const toggle = () => setOpen((o) => { const n = !o; localStorage.setItem(storeKey, n ? '1' : '0'); return n; });
|
||||
return (
|
||||
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden">
|
||||
<button type="button" onClick={toggle}
|
||||
className={cn('w-full flex items-center gap-2 px-3 py-2 bg-muted/30 hover:bg-muted/50 transition-colors text-left', open && 'border-b border-border/60')}>
|
||||
<Icon className="size-4" style={{ color: accent ?? 'var(--primary)' }} />
|
||||
<span className="text-xs font-bold uppercase tracking-wider text-foreground/80">{title}</span>
|
||||
<ChevronDown className={cn('ml-auto size-4 text-muted-foreground transition-transform', !open && '-rotate-90')} />
|
||||
</button>
|
||||
{open && <div className="p-3 space-y-3">{children}</div>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// speMaxW / powerLevelLabel — same helpers the Flex panel uses.
|
||||
function speMaxW(model?: string): number {
|
||||
const m = (model || '').toUpperCase();
|
||||
if (m.includes('20K') || m.includes('2K')) return 2000;
|
||||
if (m.includes('15K')) return 1500;
|
||||
return 1300;
|
||||
}
|
||||
function powerLevelLabel(pl?: string): string {
|
||||
switch ((pl || '').trim().toUpperCase()) {
|
||||
case 'L': return 'Low';
|
||||
case 'M': return 'Mid';
|
||||
case 'H': return 'High';
|
||||
default: return pl || '';
|
||||
}
|
||||
}
|
||||
|
||||
type Amp = { id: string; name: string; type?: string; spe?: any; acom?: any; pgxl?: any };
|
||||
|
||||
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).
|
||||
const peak = useRef<Record<string, { v: number; t: number }>>({});
|
||||
const peakHold = (key: string, val: number) => {
|
||||
const now = Date.now();
|
||||
const p = peak.current[key];
|
||||
if (!p || val >= p.v || now - p.t > 2000) { peak.current[key] = { v: val, t: now }; return val; }
|
||||
return p.v;
|
||||
};
|
||||
|
||||
const isSPE = !!amp.spe;
|
||||
const isACOM = !!amp.acom;
|
||||
|
||||
if (isSPE) {
|
||||
const spe = amp.spe;
|
||||
return (
|
||||
<Card icon={Flame} ckey="amplifier" title={`${t('flxp.amplifier')} · ${amp.name || `SPE${spe.model ? ' ' + spe.model : ''}`}`} accent="#ea580c">
|
||||
<div className="flex items-center gap-3 flex-wrap">
|
||||
<button type="button" disabled={!spe.connected}
|
||||
onClick={() => AmpOperate(amp.id, !spe.operate).catch(() => {})}
|
||||
className={cn('px-4 py-2 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||
spe.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')}>
|
||||
{spe.operate ? 'OPERATE' : 'STANDBY'}
|
||||
</button>
|
||||
<div className="inline-flex rounded-lg overflow-hidden border-2 border-success/70">
|
||||
<button type="button" disabled={!spe.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={!spe.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>
|
||||
<div className="inline-flex rounded-lg overflow-hidden border border-border">
|
||||
{(['L', 'M', 'H'] as const).map((lvl, i) => {
|
||||
const active = (spe.power_level || '').trim().toUpperCase() === lvl;
|
||||
return (
|
||||
<button key={lvl} type="button" disabled={!spe.connected}
|
||||
onClick={() => AmpPowerLevel(amp.id, lvl).catch(() => {})}
|
||||
className={cn('px-3 py-2 text-sm font-bold disabled:opacity-30', i > 0 && 'border-l border-border',
|
||||
active ? 'bg-primary text-primary-foreground' : 'bg-card text-muted-foreground hover:bg-muted')}>
|
||||
{powerLevelLabel(lvl)}
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
<span className={cn('inline-flex items-center gap-1.5 text-sm', spe.connected ? 'text-muted-foreground' : 'text-danger')}>
|
||||
<span className={cn('size-2 rounded-full', spe.connected ? 'bg-success' : 'bg-danger')} />
|
||||
{spe.connected ? (spe.tx ? 'TX' : 'RX') : t('flxp.speOffline')}
|
||||
</span>
|
||||
{spe.connected && (
|
||||
<span className="text-sm font-mono text-muted-foreground tabular-nums">
|
||||
{spe.band ? `${spe.band} · ` : ''}{spe.output_w}W · SWR {Number(spe.swr_ant ?? 0).toFixed(1)} · {spe.temp_c}°C · {powerLevelLabel(spe.power_level)}
|
||||
</span>
|
||||
)}
|
||||
<div className="flex-1" />
|
||||
{(spe.warnings || spe.alarms) && (
|
||||
<span className="px-2 py-1 rounded bg-danger-muted text-danger-muted-foreground text-xs font-bold">⚠ {spe.warnings} {spe.alarms}</span>
|
||||
)}
|
||||
</div>
|
||||
{spe.connected && (
|
||||
<MeterBar label={t('flxp.outputPower')} value={Number(spe.output_w) || 0} unit="W"
|
||||
lo={0} hi={speMaxW(spe.model)}
|
||||
display={`${Number(spe.output_w) || 0} W`}
|
||||
segColor={(f) => (f > 0.9 ? '#dc2626' : f > 0.75 ? '#f59e0b' : '#ea580c')} />
|
||||
)}
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
|
||||
if (isACOM) {
|
||||
const acom = amp.acom;
|
||||
return (
|
||||
<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">
|
||||
<button type="button" disabled={!acom.connected}
|
||||
onClick={() => AmpOperate(amp.id, !acom.operate).catch(() => {})}
|
||||
className={cn('px-4 py-2 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||
acom.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')}>
|
||||
{acom.operate ? 'OPERATE' : 'STANDBY'}
|
||||
</button>
|
||||
<div className="inline-flex rounded-lg overflow-hidden border-2 border-success/70">
|
||||
<button type="button" disabled={!(acom.port_open && acom.transport === 'serial')}
|
||||
onClick={() => AmpPower(amp.id, true).catch(() => {})}
|
||||
title={acom.transport === 'serial' ? 'Power on (DTR/RTS pulse — needs the power-on pins wired)' : 'Power-on needs the serial DTR/RTS lines — not available over a network bridge'}
|
||||
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={!acom.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', acom.connected ? 'text-muted-foreground' : 'text-danger')}>
|
||||
<span className={cn('size-2 rounded-full', acom.connected ? 'bg-success' : 'bg-danger')} />
|
||||
{acom.connected ? acom.state : t('flxp.acomOffline')}
|
||||
</span>
|
||||
{acom.connected && (
|
||||
<span className="text-sm font-mono text-muted-foreground tabular-nums">
|
||||
{acom.band ? `${acom.band} · ` : ''}{acom.fwd_w}W · SWR {Number(acom.swr ?? 0).toFixed(1)} · {acom.temp_c}°C · Fan {acom.fan}
|
||||
</span>
|
||||
)}
|
||||
<div className="flex-1" />
|
||||
{acom.err_text && (
|
||||
<span className="px-2 py-1 rounded bg-danger-muted text-danger-muted-foreground text-xs font-bold">⚠ {acom.err_text}</span>
|
||||
)}
|
||||
</div>
|
||||
{acom.connected && (
|
||||
<MeterBar label={t('flxp.outputPower')} value={Number(acom.fwd_w) || 0} unit="W"
|
||||
lo={0} hi={Number(acom.max_w) || 800}
|
||||
display={`${Number(acom.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.
|
||||
const pg = amp.pgxl || {};
|
||||
const viaFlex = !!flex?.amp_available;
|
||||
const operate = viaFlex ? !!flex?.amp_operate : !!pg.operate;
|
||||
const connected = !!pg.connected || viaFlex;
|
||||
const fault = flex?.amp_fault;
|
||||
return (
|
||||
<Card icon={Flame} ckey="amplifier" title={`${t('flxp.amplifier')}${flex?.amp_model ? ' · ' + flex.amp_model : (pg.model ? ' · ' + pg.model : '')} · ${amp.name}`} accent="#ea580c">
|
||||
<div className="flex items-center gap-3 flex-wrap">
|
||||
<button type="button" disabled={!connected}
|
||||
onClick={() => (viaFlex ? FlexAmpOperate(!operate) : AmpOperate(amp.id, !operate)).catch(() => {})}
|
||||
className={cn('px-4 py-2 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||
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')}>
|
||||
{operate ? 'OPERATE' : 'STANDBY'}
|
||||
</button>
|
||||
<span className="text-xs text-muted-foreground">
|
||||
{operate ? t('flxp.ampInLine') : t('flxp.ampBypassed')}
|
||||
</span>
|
||||
{(pg.host || pg.connected) && (
|
||||
<label className="flex items-center gap-1.5 text-xs" title={pg.connected ? t('flxp.pgConnected') : (pg.last_error || t('flxp.pgOffline'))}>
|
||||
<span className={cn('size-1.5 rounded-full', pg.connected ? 'bg-success shadow-[0_0_6px_rgba(16,185,129,0.8)]' : 'bg-danger')} />
|
||||
<span className="text-muted-foreground">{t('flxp.fan')}</span>
|
||||
<select
|
||||
disabled={!pg.connected}
|
||||
value={(pg.fan_mode || 'CONTEST').toUpperCase()}
|
||||
onChange={(e) => AmpFanMode(amp.id, e.target.value).catch(() => {})}
|
||||
className="h-8 rounded-md border border-warning-border bg-card px-2 text-xs font-semibold text-warning outline-none focus:border-warning disabled:opacity-40"
|
||||
>
|
||||
<option value="STANDARD">{t('flxp.fanStandard')}</option>
|
||||
<option value="CONTEST">{t('flxp.fanContest')}</option>
|
||||
<option value="BROADCAST">{t('flxp.fanBroadcast')}</option>
|
||||
</select>
|
||||
</label>
|
||||
)}
|
||||
<div className="flex-1" />
|
||||
{fault && fault !== 'NONE' && (
|
||||
<span className="px-2 py-1 rounded bg-danger-muted text-danger-muted-foreground text-xs font-bold">{t('flxp.fault')}: {fault}</span>
|
||||
)}
|
||||
</div>
|
||||
{/* Amplifier meters (FWD / ID / TEMP …) from the FlexRadio UDP stream. */}
|
||||
{viaFlex && (() => {
|
||||
const meters = (flex?.meters as any[]) || [];
|
||||
const dbmToW = (d: number) => Math.pow(10, (d - 30) / 10);
|
||||
const amps = meters.filter((m) => (m.src || '').toUpperCase().includes('AMP')
|
||||
&& !/^(RL|DRV)$/i.test((m.name || '').trim()));
|
||||
if (amps.length === 0) return null;
|
||||
return (
|
||||
<div className="grid grid-cols-2 sm:grid-cols-3 gap-2 mt-2 pt-2 border-t border-border/50">
|
||||
{amps.map((m) => {
|
||||
if (/fwd|pwr/i.test(m.name || '') && /dbm/i.test(m.unit || '')) {
|
||||
return <MeterBar key={m.id} label={m.name || `AMP ${m.id}`} value={peakHold(`amp${m.id}`, dbmToW(m.value))} unit="W" lo={0} hi={2000} accent="#dc2626" />;
|
||||
}
|
||||
const acc = /temp|degc|degf/i.test(`${m.unit}${m.name}`) ? '#ea580c' : /volt/i.test(m.unit || '') ? '#2563eb' : '#16a34a';
|
||||
let lo = m.lo, hi = m.hi;
|
||||
if (/amp/i.test(m.unit || '') || /^ID$|current/i.test(m.name || '')) {
|
||||
lo = 0;
|
||||
hi = m.hi >= 25 ? m.hi : 25;
|
||||
}
|
||||
return <MeterBar key={m.id} label={m.name || `AMP ${m.id}`} value={peakHold(`amp${m.id}`, m.value)} unit={m.unit} lo={lo} hi={hi} accent={acc} />;
|
||||
})}
|
||||
</div>
|
||||
);
|
||||
})()}
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
@@ -377,7 +377,7 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
||||
|
||||
<div className="grid grid-cols-[220px_1fr] min-h-0 overflow-hidden">
|
||||
{/* Left: award list */}
|
||||
<div className="border-r flex flex-col min-h-0">
|
||||
<div className="border-r flex flex-col min-w-0 min-h-0">
|
||||
<div className="p-2 border-b">
|
||||
<div className="relative">
|
||||
<Search className="absolute left-2 top-1/2 -translate-y-1/2 size-3.5 text-muted-foreground" />
|
||||
@@ -422,8 +422,14 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
{/* Right: tabbed editor for selected award */}
|
||||
<div className="flex flex-col min-h-0 overflow-hidden">
|
||||
{/* Right: tabbed editor for selected award.
|
||||
min-w-0 is load-bearing: this sits in a `1fr` grid track, and a 1fr
|
||||
track has min-width:auto — it refuses to shrink below its content's
|
||||
intrinsic width, so a wide row (the band/mode chip lists, a long
|
||||
translated label) grew the track and pushed the whole editor out
|
||||
past the dialog instead of scrolling inside it. Same reason on the
|
||||
Tabs below: a flex item defaults to min-width:auto too. */}
|
||||
<div className="flex flex-col min-w-0 min-h-0 overflow-hidden">
|
||||
{err && <div onClick={() => setErr('')} title={t('awed.clickToDismiss')} className="mx-4 mt-3 text-xs text-destructive bg-destructive/10 border border-destructive/30 rounded px-3 py-1.5 whitespace-pre-line break-all cursor-pointer">{err}</div>}
|
||||
{/* A fix shipped for an award this operator has customised. We did NOT
|
||||
apply it — that would destroy their work — so we offer it, and say
|
||||
@@ -459,7 +465,7 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
||||
{!cur ? (
|
||||
<div className="flex-1 grid place-items-center text-sm text-muted-foreground">{t('awed.selectOrCreate')}</div>
|
||||
) : (
|
||||
<Tabs defaultValue="info" className="flex flex-col min-h-0 overflow-hidden">
|
||||
<Tabs defaultValue="info" className="flex flex-col min-w-0 min-h-0 overflow-hidden">
|
||||
<TabsList className="px-3 justify-start">
|
||||
<TabsTrigger value="info">{t('awed.tabInfo')}</TabsTrigger>
|
||||
<TabsTrigger value="type">{t('awed.tabType')}</TabsTrigger>
|
||||
@@ -729,7 +735,11 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<DialogFooter className="px-5 py-3 border-t !flex-row">
|
||||
{/* Eight buttons on one unwrappable row fitted in English and overflowed
|
||||
in French, where the labels are half again as long. Wrap instead of
|
||||
widening the dialog; gap-2 replaces the base sm:space-x-2, whose
|
||||
margin-left approach leaves no vertical gap once a row wraps. */}
|
||||
<DialogFooter className="px-5 py-3 border-t !flex-row flex-wrap sm:space-x-0 gap-2">
|
||||
<Button variant="ghost" onClick={reset}><RotateCcw className="size-3.5 mr-1" /> {t('awed.resetDefaults')}</Button>
|
||||
<Button variant="outline" onClick={exportAwards} title={t('awed.exportTitle')}>
|
||||
<Download className="size-3.5 mr-1" /> {t('awed.export')}
|
||||
|
||||
@@ -216,8 +216,8 @@ export function AwardRefSelector({ dxcc, value, onChange, fieldValues, heightCla
|
||||
<span className="font-mono truncate text-[11px]">{selectedRef?.subgrp || '—'}</span>
|
||||
</div>
|
||||
|
||||
{/* Selected ref chip */}
|
||||
{selectedRef ? (
|
||||
{/* Selected ref chip (nothing shown until one is picked) */}
|
||||
{selectedRef && (
|
||||
<div className="flex items-center gap-1.5 h-6 px-2 rounded border border-success-border bg-success-muted text-success-muted-foreground text-xs min-w-0">
|
||||
<span className="font-mono font-semibold shrink-0">{selectedRef.code}</span>
|
||||
<span className="truncate text-[10px] text-success-muted-foreground">{selectedRef.name}</span>
|
||||
@@ -225,10 +225,6 @@ export function AwardRefSelector({ dxcc, value, onChange, fieldValues, heightCla
|
||||
<X className="size-3" />
|
||||
</button>
|
||||
</div>
|
||||
) : (
|
||||
<div className="h-6 flex items-center px-2 text-[11px] text-muted-foreground italic border border-dashed border-border rounded">
|
||||
{t('awrs.pickReference')}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Add — references are always scoped to the contacted DXCC */}
|
||||
|
||||
@@ -41,6 +41,10 @@ interface Props {
|
||||
// globally from the band-map tab toolbar.
|
||||
hideDigital?: boolean;
|
||||
fitToBand?: boolean;
|
||||
// keyNav enables Ctrl+↑ / Ctrl+↓ to hop to the next spot above / below the rig
|
||||
// frequency (and tune to it). Only the docked Main-view band map sets this, so
|
||||
// the multi-band Band Map tab (several maps) doesn't fight over the shortcut.
|
||||
keyNav?: boolean;
|
||||
}
|
||||
|
||||
const BAND_RANGES: Record<string, [number, number]> = {
|
||||
@@ -153,7 +157,7 @@ const BOT_PAD = 14; // the top-most freq label isn't clipped at y=0
|
||||
// last; ties broken by closeness to the rig freq).
|
||||
const MAX_VISIBLE_SPOTS = 30;
|
||||
|
||||
export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false }: Props) {
|
||||
export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, keyNav = false }: Props) {
|
||||
const { t } = useI18n();
|
||||
const range = BAND_RANGES[band];
|
||||
const segments = SEGMENT_COLORS[band] ?? [];
|
||||
@@ -362,6 +366,38 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
||||
scrollerRef.current.scrollTop = Math.max(0, y - containerH / 2);
|
||||
}
|
||||
|
||||
// Ctrl+↑ / Ctrl+↓ hop to the next spot above / below the rig frequency and tune
|
||||
// to it. Higher freq is UP on the map (see freqToY), so ↑ = next higher spot.
|
||||
// Only active on the docked Main-view map (keyNav) and ignored while typing.
|
||||
useEffect(() => {
|
||||
if (!keyNav) return;
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (!e.ctrlKey || e.altKey || e.metaKey) return;
|
||||
if (e.key !== 'ArrowUp' && e.key !== 'ArrowDown') return;
|
||||
const ae = document.activeElement as HTMLElement | null;
|
||||
const tag = (ae?.tagName || '').toLowerCase();
|
||||
if (tag === 'input' || tag === 'textarea' || tag === 'select' || ae?.isContentEditable) return;
|
||||
const list = spots
|
||||
.filter((s) => (s.band ?? '') === band && s.freq_hz > 0)
|
||||
.slice()
|
||||
.sort((a, b) => a.freq_hz - b.freq_hz);
|
||||
if (!list.length) return;
|
||||
const cur = currentFreqHz || (lo + hi) * 500; // mid-band kHz→Hz when no rig freq
|
||||
const EPS = 50; // Hz, so we don't re-pick the spot we're already sitting on
|
||||
let target: Spot | undefined;
|
||||
if (e.key === 'ArrowUp') {
|
||||
target = list.find((s) => s.freq_hz > cur + EPS);
|
||||
} else {
|
||||
for (let i = list.length - 1; i >= 0; i--) { if (list[i].freq_hz < cur - EPS) { target = list[i]; break; } }
|
||||
}
|
||||
if (!target) return;
|
||||
e.preventDefault();
|
||||
onSpotClick(target);
|
||||
};
|
||||
window.addEventListener('keydown', onKey);
|
||||
return () => window.removeEventListener('keydown', onKey);
|
||||
}, [keyNav, spots, band, currentFreqHz, lo, hi, onSpotClick]);
|
||||
|
||||
const currentKHz = currentFreqHz ? currentFreqHz / 1000 : 0;
|
||||
const showRigPointer = currentKHz >= lo && currentKHz <= hi;
|
||||
const rigY = freqToY(currentKHz);
|
||||
|
||||
@@ -94,6 +94,7 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
||||
const dxcc = wb?.dxcc ?? 0;
|
||||
const dxccName = wb?.dxcc_name ?? '';
|
||||
const dxccCount = wb?.dxcc_count ?? 0;
|
||||
const mwRank = wb?.mw_rank ?? 0; // ClubLog Most Wanted rank (1 = most wanted; 0 = off/unknown)
|
||||
const callCount = wb?.count ?? 0; // QSOs with this exact callsign
|
||||
const hasDxcc = dxcc > 0;
|
||||
const newOne = hasDxcc && dxccCount === 0;
|
||||
@@ -109,14 +110,21 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
||||
// "Newness" of the current band+mode entry, for the award/DX-chase badges.
|
||||
// Derived straight from the entity's real band_status (all bands it was
|
||||
// worked on — not just the operator's configured column list).
|
||||
// Newness uses the ACTUAL mode (FT8 / FT4 / RTTY…), not the PH/CW/DIG class:
|
||||
// DIG is a group, so FT4 after FT8 is genuinely a new mode. dxcc_band_modes
|
||||
// lists every real (band, mode) the entity was worked on.
|
||||
// By default newness uses the ACTUAL mode (FT8 / FT4 / RTTY…): DIG is a
|
||||
// group, so FT4 after FT8 is genuinely a new mode. The operator can opt into
|
||||
// DXCC-style grouping instead (Settings → General), where all digital modes
|
||||
// count as ONE — then FT4 after FT8 is just "worked".
|
||||
const groupDigital = localStorage.getItem('opslog.groupDigitalSlots') === '1';
|
||||
const normMode = (m: string): string => {
|
||||
const u = (m || '').toUpperCase().trim();
|
||||
if (!groupDigital) return u;
|
||||
return u === '' || u === 'CW' || PHONE_MODES.has(u) ? u : 'DIG';
|
||||
};
|
||||
const bandModes = (wb?.dxcc_band_modes ?? []) as { band: string; mode: string }[];
|
||||
const curMode = (currentMode || '').toUpperCase().trim();
|
||||
const curMode = normMode(currentMode);
|
||||
const bandWorked = bandModes.some((bm) => bm.band === currentBand); // entity worked on this band (any mode)
|
||||
const modeWorked = !!curMode && bandModes.some((bm) => (bm.mode || '').toUpperCase() === curMode); // …in this exact mode (any band)
|
||||
const slotWorked = !!curMode && bandModes.some((bm) => bm.band === currentBand && (bm.mode || '').toUpperCase() === curMode);
|
||||
const modeWorked = !!curMode && bandModes.some((bm) => normMode(bm.mode) === curMode); // …in this (normalised) mode (any band)
|
||||
const slotWorked = !!curMode && bandModes.some((bm) => bm.band === currentBand && normMode(bm.mode) === curMode);
|
||||
// Mutually-exclusive badges, shown only when the entity is worked but this
|
||||
// exact band+mode is NOT yet:
|
||||
// New Band & Mode = both the band AND the mode are new for this entity.
|
||||
@@ -129,6 +137,20 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
||||
const newMode = slotNew && bandWorked && !modeWorked;
|
||||
const newSlot = slotNew && bandWorked && modeWorked;
|
||||
|
||||
// ClubLog Most Wanted rank pill (shown next to the entity name when the feature
|
||||
// is on). Hotter colour the more wanted the entity is.
|
||||
const mwBadge = mwRank > 0 ? (
|
||||
<Badge
|
||||
title={`ClubLog Most Wanted #${mwRank}`}
|
||||
className={cn('px-1.5 py-0 text-[10px] font-bold shrink-0',
|
||||
mwRank <= 100 ? 'bg-danger text-danger-foreground'
|
||||
: mwRank <= 250 ? 'bg-warning text-warning-foreground'
|
||||
: 'bg-muted text-muted-foreground')}
|
||||
>
|
||||
MW #{mwRank}
|
||||
</Badge>
|
||||
) : null;
|
||||
|
||||
return (
|
||||
<section
|
||||
className={cn(
|
||||
@@ -147,12 +169,14 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
||||
<strong className="text-warning-muted-foreground font-semibold">{dxccName || `DXCC #${dxcc}`}</strong>
|
||||
{' '}· never worked this entity
|
||||
</span>
|
||||
{mwBadge}
|
||||
</>
|
||||
) : hasDxcc ? (
|
||||
<>
|
||||
<Badge className="bg-primary text-primary-foreground px-3 py-1 text-xs normal-case font-semibold tracking-normal">
|
||||
{dxccName || `DXCC #${dxcc}`}
|
||||
</Badge>
|
||||
{mwBadge}
|
||||
<span className="text-xs text-muted-foreground">
|
||||
<strong className="text-foreground font-semibold">{dxccCount}</strong>{' '}
|
||||
QSO{dxccCount > 1 ? 's' : ''} with this entity
|
||||
|
||||
@@ -12,7 +12,7 @@ import {
|
||||
} from '@/components/ui/select';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
|
||||
type FieldKind = 'status' | 'text';
|
||||
type FieldKind = 'status' | 'text' | 'freq';
|
||||
type FieldDef = { id: string; label: string; group: string; kind: FieldKind; upper?: boolean };
|
||||
|
||||
// Fields a bulk edit may target. status → Y/N/R/I dropdown; text → free input.
|
||||
@@ -34,6 +34,8 @@ const FIELDS: FieldDef[] = [
|
||||
// My station / operator
|
||||
{ id: 'station_callsign', label: 'bulk.fStationCall', group: 'My station', kind: 'text', upper: true },
|
||||
{ id: 'operator', label: 'bulk.fOperator', group: 'My station', kind: 'text', upper: true },
|
||||
// No promoted column: written into extras_json (see qso.bulkEditableExtras).
|
||||
{ id: 'owner_callsign', label: 'bulk.fOwnerCallsign', group: 'My station', kind: 'text', upper: true },
|
||||
{ id: 'my_grid', label: 'bulk.fMyGrid', group: 'My station', kind: 'text', upper: true },
|
||||
{ id: 'my_antenna', label: 'bulk.fMyAntenna', group: 'My station', kind: 'text' },
|
||||
{ id: 'my_rig', label: 'bulk.fMyRig', group: 'My station', kind: 'text' },
|
||||
@@ -74,6 +76,9 @@ const FIELDS: FieldDef[] = [
|
||||
{ id: 'sig', label: 'bulk.fSig', group: 'Contacted station', kind: 'text' },
|
||||
{ id: 'sig_info', label: 'bulk.fSigInfo', group: 'Contacted station', kind: 'text' },
|
||||
// Misc
|
||||
// Frequency (MHz) — sets freq_hz AND recomputes band. Main use: fixing a batch
|
||||
// logged on a stale/default frequency after CAT dropped.
|
||||
{ id: 'freq', label: 'bulk.fFreq', group: 'Misc', kind: 'freq' },
|
||||
{ id: 'comment', label: 'bulk.fComment', group: 'Misc', kind: 'text' },
|
||||
{ id: 'notes', label: 'bulk.fNotes', group: 'Misc', kind: 'text' },
|
||||
{ id: 'rig', label: 'bulk.fRig', group: 'Misc', kind: 'text' },
|
||||
@@ -180,7 +185,8 @@ export function BulkEditModal({ open, ids, onClose, onApplied }: Props) {
|
||||
<Input
|
||||
className="h-8 text-xs"
|
||||
value={textValue}
|
||||
placeholder={t('bulk.clearPlaceholder')}
|
||||
inputMode={def.kind === 'freq' ? 'decimal' : undefined}
|
||||
placeholder={def.kind === 'freq' ? t('bulk.freqPlaceholder') : t('bulk.clearPlaceholder')}
|
||||
onChange={(e) => setTextValue(def.upper ? e.target.value.toUpperCase() : e.target.value)}
|
||||
/>
|
||||
)}
|
||||
@@ -188,7 +194,7 @@ export function BulkEditModal({ open, ids, onClose, onApplied }: Props) {
|
||||
|
||||
<div className="text-[11px] text-muted-foreground">
|
||||
{t('bulk.willSet')} <span className="font-semibold">{t(def.label)}</span> ={' '}
|
||||
<span className="font-mono">{effectiveValue === '' ? t('bulk.blank') : effectiveValue}</span> {t('bulk.onQsos', { n: ids.length })}
|
||||
<span className="font-mono">{effectiveValue === '' ? t('bulk.blank') : effectiveValue}{def.kind === 'freq' && effectiveValue !== '' ? ' MHz' : ''}</span> {t('bulk.onQsos', { n: ids.length })}
|
||||
</div>
|
||||
{error && <div className="text-xs text-danger">{error}</div>}
|
||||
</div>
|
||||
|
||||
@@ -149,6 +149,16 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
headerName: t('clg2.c.time'), field: 'time_utc' as any, width: 80, cellClass: 'font-mono',
|
||||
defaultVisible: true,
|
||||
sort: 'desc',
|
||||
// Sort by the real arrival timestamp, NOT the "HHMMZ" display string. A
|
||||
// lexical sort of time_utc breaks at the UTC day rollover: "0001Z" sorts
|
||||
// below "2359Z", so spots received just after midnight fell to the bottom
|
||||
// and looked like the cluster had stopped. received_at is a full datetime
|
||||
// that keeps ordering correct across 0000Z.
|
||||
comparator: (_a: any, _b: any, nodeA: any, nodeB: any) => {
|
||||
const ta = Date.parse(nodeA?.data?.received_at ?? '') || 0;
|
||||
const tb = Date.parse(nodeB?.data?.received_at ?? '') || 0;
|
||||
return ta - tb;
|
||||
},
|
||||
cellStyle: { color: 'var(--muted-foreground)' },
|
||||
},
|
||||
{
|
||||
|
||||
@@ -306,11 +306,11 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, detai
|
||||
heightClass="flex-1 min-h-0"
|
||||
/>
|
||||
{detected.length > 0 && (
|
||||
<div className="mt-2 text-[11px] text-muted-foreground shrink-0">
|
||||
<div className="mt-2 text-[11px] text-muted-foreground shrink-0 max-h-14 overflow-y-auto leading-snug border-t border-border/50 pt-1.5">
|
||||
<span className="font-medium text-foreground/70">{t('detp.detected')}</span>{' '}
|
||||
{detected.map((r) => (
|
||||
<span key={`${r.code}@${r.ref}`} className="inline-block mr-2 font-mono">
|
||||
{r.code}{r.ref ? `@${r.ref}` : ''}{r.name ? <span className="text-muted-foreground/70"> {r.name}</span> : null}
|
||||
<span key={`${r.code}@${r.ref}`} className="inline-block mr-1.5 font-mono whitespace-nowrap" title={r.name ?? ''}>
|
||||
<span className="text-foreground/80">{r.code}{r.ref ? `@${r.ref}` : ''}</span>
|
||||
</span>
|
||||
))}
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Mic, Square, X, Radio } from 'lucide-react';
|
||||
import { Mic, Square, X, Radio, Repeat } from 'lucide-react';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
@@ -12,14 +12,20 @@ type Props = {
|
||||
onPlay: (slot: number) => void;
|
||||
onStop: () => void;
|
||||
onClose: () => void;
|
||||
autoCq: boolean;
|
||||
autoCqSecs: number;
|
||||
onToggleAutoCq: (on: boolean) => void;
|
||||
onSetAutoCqSecs: (n: number) => void;
|
||||
phoneOk: boolean; // false when the rig is on a non-phone mode → DVK TX blocked
|
||||
};
|
||||
|
||||
// Operating panel for the Digital Voice Keyer — transmits the recorded F1–F6
|
||||
// voice messages to the rig ("To Radio"). Mirrors the WinKeyer panel's slot in
|
||||
// the reserved area. Recording/labeling lives in Settings → Audio.
|
||||
export function DvkPanel({ messages, status, onPlay, onStop, onClose }: Props) {
|
||||
export function DvkPanel({ messages, status, onPlay, onStop, onClose, autoCq, autoCqSecs, onToggleAutoCq, onSetAutoCqSecs, phoneOk }: Props) {
|
||||
const { t } = useI18n();
|
||||
const anyAudio = messages.some((m) => m.has_audio);
|
||||
const recorded = messages.filter((m) => m.has_audio);
|
||||
const anyAudio = recorded.length > 0;
|
||||
return (
|
||||
<div className="h-full flex flex-col rounded-lg border border-border bg-card shadow-sm overflow-hidden">
|
||||
<div className="flex items-center gap-2 px-3 py-1.5 border-b border-border bg-muted/40 shrink-0">
|
||||
@@ -43,29 +49,54 @@ export function DvkPanel({ messages, status, onPlay, onStop, onClose }: Props) {
|
||||
{t('dvkp.noMsgPre')} <strong>{t('dvkp.settingsPath')}</strong> {t('dvkp.noMsgPost')}
|
||||
</div>
|
||||
) : (
|
||||
<div className="grid grid-cols-1 gap-1">
|
||||
{messages.map((m) => (
|
||||
// Only the recorded slots are shown. Two columns filling top-to-bottom
|
||||
// (rows sized to the count) — use the width instead of scrolling, so the
|
||||
// panel keeps the same height as the other reserved-area widgets.
|
||||
<div className="grid grid-flow-col gap-1"
|
||||
style={{ gridTemplateRows: `repeat(${Math.max(1, Math.ceil(recorded.length / 2))}, minmax(0, auto))` }}>
|
||||
{recorded.map((m) => (
|
||||
<button
|
||||
key={m.slot}
|
||||
type="button"
|
||||
disabled={!m.has_audio}
|
||||
disabled={!phoneOk}
|
||||
onClick={() => onPlay(m.slot)}
|
||||
title={m.has_audio ? t('dvkp.transmit', { slot: m.slot, label: m.label ? ' — ' + m.label : '', dur: m.duration_sec.toFixed(1) }) : t('dvkp.empty', { slot: m.slot })}
|
||||
title={!phoneOk ? t('dvkp.notPhone') : t('dvkp.transmit', { slot: m.slot, label: m.label ? ' — ' + m.label : '', dur: m.duration_sec.toFixed(1) })}
|
||||
className={cn(
|
||||
'flex items-center gap-1.5 rounded-md border px-2 py-1 text-left transition-colors',
|
||||
m.has_audio
|
||||
phoneOk
|
||||
? 'border-border bg-background hover:border-primary/60 hover:bg-accent/30 cursor-pointer'
|
||||
: 'border-dashed border-border/60 text-muted-foreground/50 cursor-not-allowed',
|
||||
)}
|
||||
>
|
||||
<span className="font-mono text-[11px] font-bold text-primary shrink-0">F{m.slot}</span>
|
||||
<span className="text-xs truncate flex-1">{m.label || (m.has_audio ? t('dvkp.message') : '—')}</span>
|
||||
{m.has_audio && <span className="text-[9px] text-muted-foreground shrink-0">{m.duration_sec.toFixed(1)}s</span>}
|
||||
<span className="text-xs truncate flex-1">{m.label || t('dvkp.message')}</span>
|
||||
{(m.label || '').toUpperCase().includes('CQ') && autoCq && <Repeat className="size-3 text-primary shrink-0" />}
|
||||
<span className="text-[9px] text-muted-foreground shrink-0">{m.duration_sec.toFixed(1)}s</span>
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Auto-CQ footer — repeats a CQ-labelled slot on a timer. Greyed out on a
|
||||
non-phone mode (the DVK won't transmit there). */}
|
||||
<div className="shrink-0 border-t border-border bg-muted/30 px-2 py-1.5 flex items-center gap-2">
|
||||
<label className={cn('flex items-center gap-1.5 text-[11px] cursor-pointer', !phoneOk && 'opacity-50')} title={phoneOk ? t('dvkp.autoCqHint') : t('dvkp.notPhone')}>
|
||||
<input type="checkbox" className="accent-primary" checked={autoCq} disabled={!phoneOk}
|
||||
onChange={(e) => onToggleAutoCq(e.target.checked)} />
|
||||
<Repeat className="size-3" /> {t('dvkp.autoCq')}
|
||||
</label>
|
||||
<div className="flex-1" />
|
||||
<span className="text-[10px] text-muted-foreground">{t('dvkp.gap')}</span>
|
||||
<input type="number" min={0} max={120} value={autoCqSecs}
|
||||
onChange={(e) => onSetAutoCqSecs(parseInt(e.target.value, 10))}
|
||||
className="w-12 h-6 rounded border border-input bg-background px-1 text-[11px] font-mono text-center" />
|
||||
<span className="text-[10px] text-muted-foreground">s</span>
|
||||
</div>
|
||||
|
||||
{!phoneOk && (
|
||||
<div className="shrink-0 bg-warning-muted text-warning-muted-foreground text-[10px] px-2 py-1 text-center">{t('dvkp.notPhone')}</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,139 @@
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import {
|
||||
Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, DialogFooter,
|
||||
} from '@/components/ui/dialog';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Checkbox } from '@/components/ui/checkbox';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
import { writeUiPref } from '@/lib/uiPref';
|
||||
import { ADIFFields, ADIFExtraFields } from '@/../wailsjs/go/main/App';
|
||||
import { adif } from '@/../wailsjs/go/models';
|
||||
|
||||
type FieldDef = adif.FieldDef;
|
||||
const PREF_KEY = 'opslog.exportFields';
|
||||
|
||||
// One category card with its checkboxes + All/None. Defined at MODULE scope (not
|
||||
// inside ExportFieldsDialog) so its component identity is stable across renders —
|
||||
// an inner component is re-created every render, remounting the whole subtree and
|
||||
// making the All/None buttons and checkboxes feel dead.
|
||||
function GroupCard({ title, tags, warn, sel, allLabel, noneLabel, onAll, onNone, onToggle }: {
|
||||
title: string; tags: string[]; warn?: boolean; sel: Set<string>;
|
||||
allLabel: string; noneLabel: string;
|
||||
onAll: (tags: string[]) => void; onNone: (tags: string[]) => void; onToggle: (name: string, on: boolean) => void;
|
||||
}) {
|
||||
return (
|
||||
<div className={`rounded-md border p-2 ${warn ? 'border-warning-border/50 bg-warning-muted/20' : 'border-border/60'}`}>
|
||||
<div className="flex items-center justify-between mb-1 gap-2">
|
||||
<span className={`text-[11px] font-semibold uppercase tracking-wide ${warn ? 'text-warning-muted-foreground' : 'text-muted-foreground'}`}>{title}</span>
|
||||
<span className="flex gap-1.5 shrink-0">
|
||||
<button type="button" className="text-[10px] text-primary hover:underline" onClick={() => onAll(tags)}>{allLabel}</button>
|
||||
<button type="button" className="text-[10px] text-muted-foreground hover:underline" onClick={() => onNone(tags)}>{noneLabel}</button>
|
||||
</span>
|
||||
</div>
|
||||
{tags.map((name) => (
|
||||
<label key={name} className="flex items-center gap-1.5 text-[11px] cursor-pointer py-0.5">
|
||||
<Checkbox checked={sel.has(name)} onCheckedChange={(c) => onToggle(name, !!c)} />
|
||||
<span className="font-mono break-all">{name}</span>
|
||||
</label>
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// ExportFieldsDialog lets the operator pick exactly which ADIF fields an export
|
||||
// writes. Two groups: the official ADIF 3.1.7 dictionary (grouped by category)
|
||||
// and the OpsLog / non-standard tags actually present in the log's extras. The
|
||||
// chosen set is returned to the parent (which runs the selected/global export)
|
||||
// and persisted so it's the default next time.
|
||||
export function ExportFieldsDialog({ open, count, onExport, onClose }: {
|
||||
open: boolean;
|
||||
count: number; // how many QSOs the pending export covers
|
||||
onExport: (fields: string[]) => void;
|
||||
onClose: () => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const [official, setOfficial] = useState<FieldDef[]>([]);
|
||||
const [extras, setExtras] = useState<string[]>([]);
|
||||
const [sel, setSel] = useState<Set<string>>(new Set());
|
||||
|
||||
const defaultSet = (flds: FieldDef[]) =>
|
||||
new Set(flds.filter((d) => d.promoted && !d.deprecated).map((d) => d.name));
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
let cancelled = false;
|
||||
(async () => {
|
||||
const [f, e] = await Promise.all([ADIFFields(), ADIFExtraFields()]);
|
||||
if (cancelled) return;
|
||||
const flds = (f ?? []) as FieldDef[];
|
||||
setOfficial(flds);
|
||||
setExtras((e ?? []) as string[]);
|
||||
let saved: string[] | null = null;
|
||||
try { const raw = localStorage.getItem(PREF_KEY); if (raw) saved = JSON.parse(raw); } catch { /* ignore */ }
|
||||
setSel(saved && saved.length ? new Set(saved.map((x) => x.toUpperCase())) : defaultSet(flds));
|
||||
})().catch(() => {});
|
||||
return () => { cancelled = true; };
|
||||
}, [open]);
|
||||
|
||||
// Official fields grouped by category (deprecated ones are import-only → hidden).
|
||||
const groups = useMemo(() => {
|
||||
const m = new Map<string, FieldDef[]>();
|
||||
for (const d of official) {
|
||||
if (d.deprecated) continue;
|
||||
const g = d.category || 'Misc';
|
||||
(m.get(g) ?? m.set(g, []).get(g)!).push(d);
|
||||
}
|
||||
return [...m.entries()];
|
||||
}, [official]);
|
||||
|
||||
const toggle = (name: string, on: boolean) =>
|
||||
setSel((s) => { const n = new Set(s); if (on) n.add(name); else n.delete(name); return n; });
|
||||
const setMany = (names: string[], on: boolean) =>
|
||||
setSel((s) => { const n = new Set(s); for (const x of names) { if (on) n.add(x); else n.delete(x); } return n; });
|
||||
|
||||
const doExport = () => {
|
||||
const fields = [...sel];
|
||||
writeUiPref(PREF_KEY, JSON.stringify(fields));
|
||||
onExport(fields);
|
||||
};
|
||||
|
||||
const allLabel = t('exf.all');
|
||||
const noneLabel = t('exf.none');
|
||||
const cardProps = {
|
||||
sel, allLabel, noneLabel,
|
||||
onAll: (tags: string[]) => setMany(tags, true),
|
||||
onNone: (tags: string[]) => setMany(tags, false),
|
||||
onToggle: toggle,
|
||||
};
|
||||
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={(o) => { if (!o) onClose(); }}>
|
||||
<DialogContent className="max-w-4xl">
|
||||
<DialogHeader>
|
||||
<DialogTitle>{t('exf.title')}</DialogTitle>
|
||||
<DialogDescription>{t('exf.desc')}</DialogDescription>
|
||||
</DialogHeader>
|
||||
|
||||
<div className="flex items-center gap-2 px-1 text-[11px] text-muted-foreground">
|
||||
<span>{t('exf.chosen', { n: sel.size })}</span>
|
||||
<Button variant="ghost" size="sm" className="ml-auto h-6 text-[11px]" onClick={() => setSel(defaultSet(official))}>
|
||||
{t('exf.defaults')}
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-3 gap-3 max-h-[56vh] overflow-y-auto pr-1">
|
||||
{/* OpsLog / non-standard group first (most relevant to keep or drop). */}
|
||||
{extras.length > 0 && <GroupCard title={t('exf.opslogGroup')} tags={extras} warn {...cardProps} />}
|
||||
{groups.map(([g, list]) => (
|
||||
<GroupCard key={g} title={g} tags={list.map((d) => d.name)} {...cardProps} />
|
||||
))}
|
||||
</div>
|
||||
|
||||
<DialogFooter>
|
||||
<Button variant="outline" onClick={onClose}>{t('exf.cancel')}</Button>
|
||||
<Button disabled={sel.size === 0} onClick={doExport}>{t('exf.export', { n: count })}</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
);
|
||||
}
|
||||
@@ -1,14 +1,17 @@
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { Radio, Zap, Power, AudioLines, Flame, Gauge, Volume2, VolumeX } from 'lucide-react';
|
||||
import { Radio, Zap, Power, AudioLines, Flame, Gauge, Volume2, VolumeX, ChevronDown, SlidersHorizontal } from 'lucide-react';
|
||||
import {
|
||||
GetFlexState, FlexSetPower, FlexSetTunePower, FlexTune, FlexSetVox, FlexSetVoxLevel, FlexSetVoxDelay,
|
||||
FlexSetProcessor, FlexSetProcessorLevel, FlexSetMon, FlexSetMonLevel, FlexSetMic,
|
||||
FlexMox, FlexAmpOperate,
|
||||
GetPGXLStatus, PGXLSetFanMode, GetPGXLSettings, GetSPEStatus, SPESetOperate, SPESetPower, SPESetPowerLevel,
|
||||
GetACOMStatus, ACOMSetOperate, ACOMSetPower,
|
||||
GetPGXLStatus, PGXLSetFanMode,
|
||||
GetTunerGeniusStatus, GetTunerGeniusSettings,
|
||||
GetAmpStatuses, AmpOperate, AmpPower, AmpPowerLevel,
|
||||
FlexSetAGCMode, FlexSetAGCThreshold, FlexSetAudioLevel, FlexSetMute, FlexSetRXAntenna, FlexSetTXAntenna, FlexSetSplit, FlexSetActiveSlice, FlexSetTXSlice,
|
||||
FlexSetRIT, FlexSetRITFreq, FlexSetXIT, FlexSetXITFreq,
|
||||
FlexSetNB, FlexSetNBLevel, FlexSetNR, FlexSetNRLevel, FlexSetANF, FlexSetANFLevel,
|
||||
FlexSetLMSNR, FlexSetLMSNRLevel, FlexSetLMSANF, FlexSetLMSANFLevel,
|
||||
FlexSetSpeexNR, FlexSetSpeexNRLevel, FlexSetRNN, FlexSetANFT, FlexSetNRF, FlexSetNRFLevel, FlexSetTXDAX,
|
||||
FlexSetWNB, FlexSetWNBLevel, FlexSetTXFilter, FlexSetMicProfile,
|
||||
FlexSetAPF, FlexSetAPFLevel, FlexSetCWSpeed, FlexSetCWPitch, FlexSetCWBreakInDelay,
|
||||
FlexSetCWSidetone, FlexSetSidetoneLevel, FlexSetCWFilter, FlexSetFilter,
|
||||
@@ -17,6 +20,9 @@ import { EventsOn } from '../../wailsjs/runtime/runtime';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
import { sMeterRST } from '@/lib/rst';
|
||||
import { TunerCard } from '@/components/TunerCard';
|
||||
import { MeterBar } from '@/components/MeterBar';
|
||||
import type { TGStatus } from '@/components/TunerGeniusPanel';
|
||||
|
||||
type FlexState = {
|
||||
available: boolean; model?: string;
|
||||
@@ -31,6 +37,11 @@ type FlexState = {
|
||||
rit: boolean; rit_freq: number; xit: boolean; xit_freq: number;
|
||||
nb: boolean; nb_level: number; nr: boolean; nr_level: number; anf: boolean; anf_level: number;
|
||||
wnb: boolean; wnb_level: number;
|
||||
// SmartSDR v4 DSP (8000/Aurora) — dsp_v4 is true once the radio reports them.
|
||||
lms_nr?: boolean; lms_nr_level?: number; lms_anf?: boolean; lms_anf_level?: number;
|
||||
speex_nr?: boolean; speex_nr_level?: number; rnn?: boolean; anft?: boolean;
|
||||
nrf?: boolean; nrf_level?: number; dsp_v4?: boolean;
|
||||
dax_ch?: number; tx_dax?: boolean;
|
||||
tx_filter_low: number; tx_filter_high: number; mic_profile?: string; mic_profiles?: string[];
|
||||
mode?: string;
|
||||
cw_speed: number; cw_pitch: number; cw_break_in_delay: number; cw_sidetone: boolean; cw_mon_level: number;
|
||||
@@ -212,54 +223,29 @@ function OffsetRow({ label, on, onToggle, hz, onHz, disabled, title }: {
|
||||
// MeterBar — a segmented "LED" instrument bar (radio look) scaled by lo/hi.
|
||||
// `display` overrides the numeric readout; `segColor` colours segments by their
|
||||
// 0..1 position (zones); the top ~18% light red by default (overload/peak).
|
||||
const METER_SEGMENTS = 26;
|
||||
function MeterBar({ label, value, unit, lo, hi, accent = '#16a34a', extra, display, segColor, onClick, title, compact }: {
|
||||
label: string; value: number; unit?: string; lo: number; hi: number; accent?: string; extra?: string; display?: string;
|
||||
segColor?: (frac: number) => string; onClick?: () => void; title?: string; compact?: boolean;
|
||||
function Card({ icon: Icon, title, accent, children, ckey, open: openProp, onToggle }: {
|
||||
icon: any; title: string; accent?: string; children: React.ReactNode; ckey?: string;
|
||||
open?: boolean; onToggle?: () => void; // controlled mode — lets sibling cards share one collapse state
|
||||
}) {
|
||||
const span = hi - lo;
|
||||
const pct = span > 0 ? Math.max(0, Math.min(100, ((value - lo) / span) * 100)) : 0;
|
||||
const lit = Math.round((pct / 100) * METER_SEGMENTS);
|
||||
return (
|
||||
<div onClick={onClick} title={title}
|
||||
className={cn('rounded-lg border border-border/70 bg-gradient-to-b from-card to-muted/40 shadow-sm min-w-0',
|
||||
compact ? 'px-2 py-1' : 'px-2.5 py-2',
|
||||
onClick && 'cursor-pointer hover:border-primary/60 hover:from-muted/40')}>
|
||||
<div className={cn('flex items-baseline justify-between gap-1', compact ? 'mb-1' : 'mb-1.5')}>
|
||||
<span className="text-[10px] font-bold uppercase tracking-wider text-muted-foreground truncate">{label}</span>
|
||||
<span className={cn('font-mono font-bold tabular-nums whitespace-nowrap text-foreground/90', compact ? 'text-xs' : 'text-sm')}>
|
||||
{display !== undefined ? display : (
|
||||
<>{Math.abs(value) >= 100 ? value.toFixed(0) : value.toFixed(1)}<span className="text-muted-foreground text-[10px] ml-0.5">{unit}</span></>
|
||||
)}
|
||||
</span>
|
||||
</div>
|
||||
{/* LED bar — recessed track + gradient segments for a cleaner instrument look. */}
|
||||
<div className={cn('flex gap-[2px] items-stretch rounded-[3px] bg-black/10 p-[2px]', compact ? 'h-2' : 'h-3')}>
|
||||
{Array.from({ length: METER_SEGMENTS }).map((_, i) => {
|
||||
const on = i < lit;
|
||||
const frac = i / METER_SEGMENTS;
|
||||
const col = segColor ? segColor(frac) : (frac > 0.82 ? '#dc2626' : accent);
|
||||
return (
|
||||
<div key={i} className="flex-1 rounded-[2px] transition-colors duration-100"
|
||||
style={on
|
||||
? { background: `linear-gradient(to bottom, ${col}, ${col}cc)`, boxShadow: `0 0 4px ${col}88` }
|
||||
: { background: '#cfc6ad', opacity: 0.35 }} />
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
{extra && !compact && <div className="text-[10px] text-muted-foreground/70 mt-1 text-right font-mono">{extra}</div>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function Card({ icon: Icon, title, accent, children }: { icon: any; title: string; accent?: string; children: React.ReactNode }) {
|
||||
// Collapsible: a chevron in the header hides the body. Uncontrolled by default,
|
||||
// persisting per card (keyed by ckey, falling back to the title); when `open`/
|
||||
// `onToggle` are supplied the parent owns the state (e.g. linked TX/RX cards).
|
||||
const storeKey = 'opslog.cardOpen.' + (ckey || title);
|
||||
const [openState, setOpenState] = useState(() => localStorage.getItem(storeKey) !== '0');
|
||||
const controlled = openProp !== undefined;
|
||||
const open = controlled ? openProp : openState;
|
||||
const toggle = controlled
|
||||
? (onToggle ?? (() => {}))
|
||||
: () => setOpenState((o) => { const n = !o; localStorage.setItem(storeKey, n ? '1' : '0'); return n; });
|
||||
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">
|
||||
<button type="button" onClick={toggle}
|
||||
className={cn('w-full flex items-center gap-2 px-3 py-2 bg-muted/30 hover:bg-muted/50 transition-colors text-left', open && 'border-b border-border/60')}>
|
||||
<Icon className="size-4" style={{ color: accent ?? 'var(--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>
|
||||
<ChevronDown className={cn('ml-auto size-4 text-muted-foreground transition-transform', !open && '-rotate-90')} />
|
||||
</button>
|
||||
{open && <div className="p-3 space-y-3">{children}</div>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -288,6 +274,11 @@ function powerLevelLabel(pl?: string): string {
|
||||
export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number) => void; onReportRST?: (rst: string) => void } = {}) {
|
||||
const { t } = useI18n();
|
||||
const [st, setSt] = useState<FlexState>(ZERO);
|
||||
// Extra/"advanced" DSP rows (WNB + the SmartSDR v4 NRL/NRS/NRF/ANFL/AI-FFT
|
||||
// block) collapse behind a button so the RECEIVE card doesn't grow tall — only
|
||||
// NB/NR/ANF stay visible by default. Remembered across sessions.
|
||||
const [dspOpen, setDspOpen] = useState<boolean>(() => localStorage.getItem('opslog.flexDspOpen') === '1');
|
||||
const toggleDsp = () => setDspOpen((o) => { const n = !o; localStorage.setItem('opslog.flexDspOpen', n ? '1' : '0'); return n; });
|
||||
const hold = useRef<Record<string, number>>({});
|
||||
// Keep the host's keyer speed (used for CW-length estimates and the keyer panel)
|
||||
// in step with the radio's ACTUAL CW speed — including when it's changed on the
|
||||
@@ -342,39 +333,50 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
return () => { alive = false; window.clearInterval(id); };
|
||||
}, []);
|
||||
|
||||
// Configured amplifier type (pgxl / spe*), so we show the SPE control when the
|
||||
// operator runs an SPE Expert instead of the PowerGenius.
|
||||
const [ampType, setAmpType] = useState<string>('pgxl');
|
||||
const [ampEnabled, setAmpEnabled] = useState(false);
|
||||
// TRANSMIT + RECEIVE share ONE collapse state (they sit side by side, so folding
|
||||
// one folds the other and keeps the row tidy). Persisted like the other cards.
|
||||
const [txrxOpen, setTxrxOpen] = useState(() => localStorage.getItem('opslog.cardOpen.txrx') !== '0');
|
||||
const toggleTxrx = () => setTxrxOpen((o) => { const n = !o; localStorage.setItem('opslog.cardOpen.txrx', n ? '1' : '0'); return n; });
|
||||
|
||||
// Tuner Genius XL direct connection — its own card in the Flex panel (like PGXL).
|
||||
const [tg, setTg] = useState<TGStatus>({ connected: false });
|
||||
const [tgEnabled, setTgEnabled] = useState(false);
|
||||
useEffect(() => {
|
||||
let alive = true;
|
||||
const load = () => GetPGXLSettings().then((s: any) => { if (alive) { setAmpType(s?.type || 'pgxl'); setAmpEnabled(!!s?.enabled); } }).catch(() => {});
|
||||
load();
|
||||
const id = window.setInterval(load, 5000);
|
||||
const tick = async () => {
|
||||
try { const en: any = await GetTunerGeniusSettings(); if (alive) setTgEnabled(!!en?.enabled); } catch {}
|
||||
try { const s: any = await GetTunerGeniusStatus(); if (alive && s) setTg(s as TGStatus); } catch {}
|
||||
};
|
||||
tick();
|
||||
const id = window.setInterval(tick, 500); // fast so meters track TX (see App.tsx)
|
||||
return () => { alive = false; window.clearInterval(id); };
|
||||
}, []);
|
||||
const isACOM = ampEnabled && ampType.startsWith('acom');
|
||||
const isSPE = ampEnabled && !isACOM && ampType !== 'pgxl';
|
||||
// SPE Expert live status (only polled when an SPE amp is configured).
|
||||
const [spe, setSpe] = useState<any>({ connected: false });
|
||||
|
||||
// Configured amplifiers (Settings → Amplifier) — possibly SEVERAL (some ops
|
||||
// run two SPEs in parallel). The card shows ONE at a time; the dropdown picks
|
||||
// which, and the choice is remembered per panel.
|
||||
const [ampList, setAmpList] = useState<any[]>([]);
|
||||
const [ampSel, setAmpSel] = useState<string>(() => localStorage.getItem('opslog.ampSel.flex') || '');
|
||||
useEffect(() => {
|
||||
if (!isSPE) return;
|
||||
let alive = true;
|
||||
const tick = () => GetSPEStatus().then((s: any) => alive && setSpe(s || { connected: false })).catch(() => {});
|
||||
const tick = () => GetAmpStatuses().then((l: any) => alive && setAmpList((l ?? []) as any[])).catch(() => {});
|
||||
tick();
|
||||
const id = window.setInterval(tick, 1500);
|
||||
return () => { alive = false; window.clearInterval(id); };
|
||||
}, [isSPE]);
|
||||
// ACOM live status (only polled when an ACOM amp is configured).
|
||||
const [acom, setAcom] = useState<any>({ connected: false });
|
||||
useEffect(() => {
|
||||
if (!isACOM) return;
|
||||
let alive = true;
|
||||
const tick = () => GetACOMStatus().then((s: any) => alive && setAcom(s || { connected: false })).catch(() => {});
|
||||
tick();
|
||||
const id = window.setInterval(tick, 1500);
|
||||
return () => { alive = false; window.clearInterval(id); };
|
||||
}, [isACOM]);
|
||||
}, []);
|
||||
const selAmp = ampList.find((a: any) => a.id === ampSel) ?? ampList[0];
|
||||
const isSPE = !!selAmp?.spe;
|
||||
const isACOM = !!selAmp?.acom;
|
||||
const spe = selAmp?.spe ?? { connected: false };
|
||||
const acom = selAmp?.acom ?? { connected: false };
|
||||
const ampPicker = ampList.length > 1 && selAmp ? (
|
||||
<select value={selAmp.id}
|
||||
onChange={(e) => { setAmpSel(e.target.value); localStorage.setItem('opslog.ampSel.flex', e.target.value); }}
|
||||
title={t('flxp.ampPick')}
|
||||
className="h-8 rounded-md border border-border bg-card px-2 text-xs font-semibold outline-none">
|
||||
{ampList.map((a: any) => <option key={a.id} value={a.id}>{a.name}</option>)}
|
||||
</select>
|
||||
) : null;
|
||||
|
||||
const change = (key: keyof FlexState, val: number | boolean | string, send: () => Promise<any>) => {
|
||||
hold.current[key] = Date.now() + 900;
|
||||
@@ -418,6 +420,9 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
return () => off();
|
||||
}, [st.rit, st.rit_freq]);
|
||||
const isCW = (st.mode || '').toUpperCase().includes('CW');
|
||||
// Phone (voice) modes — MIC / COMP meters only make sense here, so they're
|
||||
// hidden in CW and digital.
|
||||
const isPhone = /\b(SSB|USB|LSB|AM|FM|DFM|NFM)\b/i.test(st.mode || '');
|
||||
const PROC = [{ v: '0', l: 'NOR' }, { v: '1', l: 'DX' }, { v: '2', l: 'DX+' }];
|
||||
const AGC = [{ v: 'off', l: 'OFF' }, { v: 'slow', l: 'SLOW' }, { v: 'med', l: 'MED' }, { v: 'fast', l: 'FAST' }];
|
||||
const CW_BW = [100, 200, 300, 400, 500];
|
||||
@@ -546,21 +551,22 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
};
|
||||
const cur = [
|
||||
sig && (() => { const dbm = peakHold('s', sig.value); const s = sUnit(dbm); return (
|
||||
<MeterBar key="s" label="S-METER" value={s.bar} lo={0} hi={19} accent="#16a34a" display={s.display} extra={`${dbm.toFixed(1)} dBm`}
|
||||
// dBm sits inline next to the S-value (no separate line below) to save height.
|
||||
<MeterBar key="s" label="S-METER" value={s.bar} lo={0} hi={19} accent="#16a34a" display={`${s.display} | ${dbm.toFixed(0)} dBm`}
|
||||
title={onReportRST ? t('rst.clickToFill') : undefined}
|
||||
onClick={onReportRST ? () => onReportRST(sMeterRST(s.s, s.over, st.mode)) : undefined}
|
||||
segColor={(fr) => { const sval = fr * 19; return sval < 9 ? '#16a34a' : sval < 12.33 ? '#f59e0b' : '#dc2626'; }} />
|
||||
); })(),
|
||||
fwd && (() => { const w = peakHold('p', isDbm(fwd) ? dbmToW(fwd.value) : fwd.value); return (
|
||||
<MeterBar key="p" label="PWR" unit="W" lo={0} hi={120} accent="#dc2626"
|
||||
value={w} extra={isDbm(fwd) ? `${fwd.value.toFixed(1)} dBm` : undefined} />
|
||||
<MeterBar key="p" label="PWR" unit="W" lo={0} hi={120} accent="#dc2626" value={w} />
|
||||
); })(),
|
||||
swr && <MeterBar key="w" label="SWR" value={peakHold('w', swr.value)} unit="" lo={1} hi={3} accent="#d97706" />,
|
||||
// Mic input level: fixed -40..+10 dB scale, RED from 0 dB up (overdrive).
|
||||
mic && <MeterBar key="mic" label="MIC" value={peakHold('mic', mic.value)} unit={mic.unit || 'dB'} lo={-40} hi={10} accent="#16a34a"
|
||||
// Mic input level in dBFS — SmartSDR's scale is -40…0 dB. Phone modes only.
|
||||
isPhone && mic && <MeterBar key="mic" label="MIC" value={peakHold('mic', mic.value)} unit={mic.unit || 'dB'} lo={-40} hi={0} accent="#16a34a"
|
||||
segColor={(fr) => (fr >= 0.8 ? '#dc2626' : fr >= 0.7 ? '#f59e0b' : '#16a34a')} />,
|
||||
// Speech compression (dB of gain reduction).
|
||||
comp && <MeterBar key="comp" label="COMP" value={peakHold('comp', comp.value)} unit={comp.unit || 'dB'} lo={0} hi={(comp.hi && comp.hi > 0) ? comp.hi : 25} accent="#0891b2" />,
|
||||
// Speech compression — original working meter, only the top of the
|
||||
// scale changed from the radio-reported 20 to 25 (SmartSDR's -25 max).
|
||||
isPhone && comp && <MeterBar key="comp" label="COMP" value={peakHold('comp', comp.value)} unit={comp.unit || 'dB'} lo={0} hi={25} accent="#0891b2" />,
|
||||
].filter(Boolean);
|
||||
return (
|
||||
<div className="grid grid-cols-2 sm:grid-cols-3 gap-2">{cur}</div>
|
||||
@@ -577,7 +583,7 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
{/* TX + RX columns */}
|
||||
<div className="grid grid-cols-1 lg:grid-cols-2 gap-3">
|
||||
{/* TRANSMIT */}
|
||||
<Card icon={Zap} title={t('flxp.transmit')} accent="#dc2626">
|
||||
<Card icon={Zap} title={t('flxp.transmit')} accent="#dc2626" open={txrxOpen} onToggle={toggleTxrx}>
|
||||
<div className="flex items-center gap-3">
|
||||
<span className="w-20 shrink-0 text-xs font-medium text-muted-foreground">{t('flxp.rfPower')}</span>
|
||||
<Slider value={st.rf_power} disabled={off} accent="#dc2626" onChange={(v) => change('rf_power', v, () => FlexSetPower(v))} />
|
||||
@@ -702,12 +708,24 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
onLevel={(v) => change('cw_mon_level', v, () => FlexSetSidetoneLevel(v))} />
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* RIT/XIT live on the TRANSMIT side to balance the two columns — the
|
||||
RECEIVE card grew tall with the v4 DSP rows. */}
|
||||
<div className="space-y-1.5 border-t border-border/60 pt-3">
|
||||
<OffsetRow label="RIT" on={st.rit} disabled={rxOff} hz={st.rit_freq} title={t('flxp.ritHint')}
|
||||
onToggle={() => change('rit', !st.rit, () => FlexSetRIT(!st.rit))}
|
||||
onHz={(v) => change('rit_freq', v, () => FlexSetRITFreq(v))} />
|
||||
<OffsetRow label="XIT" on={st.xit} disabled={rxOff} hz={st.xit_freq} title={t('flxp.xitHint')}
|
||||
onToggle={() => change('xit', !st.xit, () => FlexSetXIT(!st.xit))}
|
||||
onHz={(v) => change('xit_freq', v, () => FlexSetXITFreq(v))} />
|
||||
</div>
|
||||
</Card>
|
||||
|
||||
{/* RECEIVE */}
|
||||
<Card icon={AudioLines} title={t('flxp.receiveActive')} accent="#0891b2">
|
||||
<Card icon={AudioLines} title={t('flxp.receiveActive')} accent="#0891b2" open={txrxOpen} onToggle={toggleTxrx}>
|
||||
{/* Antenna selection sits at the very top of the RX column. */}
|
||||
{((st.ant_list?.length ?? 0) > 0 || (st.tx_ant_list?.length ?? 0) > 0) && (
|
||||
<div className="flex items-center gap-2">
|
||||
<div className="flex items-center gap-2 pb-3 border-b border-border/60">
|
||||
<span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground">Ant</span>
|
||||
<div className="flex items-center gap-1.5 flex-1 min-w-0">
|
||||
<span className="text-[10px] text-muted-foreground">RX</span>
|
||||
@@ -722,21 +740,17 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
className="h-7 flex-1 min-w-0 rounded-md border border-input bg-background px-1.5 text-xs font-mono disabled:opacity-40">
|
||||
{((st.tx_ant_list?.length ? st.tx_ant_list : st.ant_list) ?? []).map((a) => <option key={a} value={a}>{a}</option>)}
|
||||
</select>
|
||||
{/* DAX on/off — SmartSDR's transmit-bar DAX button (TX audio from
|
||||
DAX, e.g. WSJT-X). "transmit set dax=", not the slice channel. */}
|
||||
<button type="button" disabled={off} title={t('flxp.daxHint')}
|
||||
onClick={() => change('tx_dax', !st.tx_dax, () => FlexSetTXDAX(!st.tx_dax))}
|
||||
className={cn('h-7 px-2.5 shrink-0 rounded-md border text-[11px] font-bold transition-colors disabled:opacity-40',
|
||||
st.tx_dax ? 'bg-info text-info-foreground border-info' : 'bg-card text-muted-foreground border-border hover:bg-muted')}>
|
||||
DAX
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
{/* RIT / XIT — on the RECEIVE side: RIT is what you reach for while
|
||||
listening (chasing a station that drifts off your transmit frequency),
|
||||
so it belongs with the other things you touch mid-QSO. Both act on the
|
||||
ACTIVE slice and follow slice focus like every control here. */}
|
||||
<div className="space-y-1.5 pb-3 border-b border-border/60">
|
||||
<OffsetRow label="RIT" on={st.rit} disabled={rxOff} hz={st.rit_freq} title={t('flxp.ritHint')}
|
||||
onToggle={() => change('rit', !st.rit, () => FlexSetRIT(!st.rit))}
|
||||
onHz={(v) => change('rit_freq', v, () => FlexSetRITFreq(v))} />
|
||||
<OffsetRow label="XIT" on={st.xit} disabled={rxOff} hz={st.xit_freq} title={t('flxp.xitHint')}
|
||||
onToggle={() => change('xit', !st.xit, () => FlexSetXIT(!st.xit))}
|
||||
onHz={(v) => change('xit_freq', v, () => FlexSetXITFreq(v))} />
|
||||
</div>
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground">AGC</span>
|
||||
<Segmented value={(st.agc_mode || 'med').toLowerCase()} options={AGC} disabled={rxOff}
|
||||
@@ -760,13 +774,28 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
<span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.agc_threshold}</span>
|
||||
</div>
|
||||
<div className="border-t border-border/60 pt-3 space-y-3">
|
||||
{/* Core noise controls stay visible; WNB + the SmartSDR v4 DSP block
|
||||
hide behind the 'DSP' toggle so the card doesn't tower. When any
|
||||
hidden control is ON we badge the toggle so it's not forgotten. */}
|
||||
{(() => {
|
||||
const hiddenOn = st.wnb || (st.dsp_v4 && (!!st.lms_nr || !!st.speex_nr || !!st.nrf || (!isCW && !!st.lms_anf) || !!st.rnn || (!isCW && !!st.anft)));
|
||||
return (
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-[11px] font-bold text-muted-foreground">{t('flxp.dspNoise')}</span>
|
||||
<button type="button" onClick={toggleDsp} title={t('flxp.dspMore')}
|
||||
className={cn('flex items-center gap-1 h-6 px-2 rounded-md border text-[10px] font-bold uppercase tracking-wide transition-colors',
|
||||
hiddenOn && !dspOpen ? 'bg-primary/15 text-primary border-primary/40' : 'bg-card text-muted-foreground border-border hover:bg-muted')}>
|
||||
<SlidersHorizontal className="size-3" />
|
||||
DSP
|
||||
{hiddenOn && !dspOpen && <span className="ml-0.5 size-1.5 rounded-full bg-primary" />}
|
||||
<ChevronDown className={cn('size-3 transition-transform', dspOpen && 'rotate-180')} />
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
})()}
|
||||
<LevelRow label="NB" on={st.nb} disabled={rxOff} value={st.nb_level} accent="amber" sliderAccent="#d97706"
|
||||
onToggle={() => change('nb', !st.nb, () => FlexSetNB(!st.nb))}
|
||||
onLevel={(v) => change('nb_level', v, () => FlexSetNBLevel(v))} />
|
||||
{/* WNB — wideband noise blanker (the extra hardware NR the Flex has). */}
|
||||
<LevelRow label="WNB" on={st.wnb} disabled={rxOff} value={st.wnb_level} accent="amber" sliderAccent="#f59e0b"
|
||||
onToggle={() => change('wnb', !st.wnb, () => FlexSetWNB(!st.wnb))}
|
||||
onLevel={(v) => change('wnb_level', v, () => FlexSetWNBLevel(v))} />
|
||||
<LevelRow label="NR" on={st.nr} disabled={rxOff} value={st.nr_level} accent="cyan" sliderAccent="#0891b2"
|
||||
onToggle={() => change('nr', !st.nr, () => FlexSetNR(!st.nr))}
|
||||
onLevel={(v) => change('nr_level', v, () => FlexSetNRLevel(v))} />
|
||||
@@ -776,6 +805,58 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
onToggle={() => change('anf', !st.anf, () => FlexSetANF(!st.anf))}
|
||||
onLevel={(v) => change('anf_level', v, () => FlexSetANFLevel(v))} />
|
||||
)}
|
||||
{/* Advanced / supplementary DSP — collapsed by default. WNB (wideband
|
||||
noise blanker) plus the SmartSDR v4 block (8000/Aurora): NRL/ANFL
|
||||
(legacy LMS), NRS (spectral subtraction), NRF (NR w/ filter), RNN
|
||||
(AI NR), ANFT (FFT notch). The v4 rows only exist when the radio
|
||||
reports those slice keys (older 6000s never do). */}
|
||||
{dspOpen && (
|
||||
<div className="space-y-3 border-t border-dashed border-border/50 pt-3">
|
||||
{/* WNB — wideband noise blanker (the extra hardware NR the Flex has). */}
|
||||
<LevelRow label="WNB" on={st.wnb} disabled={rxOff} value={st.wnb_level} accent="amber" sliderAccent="#f59e0b"
|
||||
onToggle={() => change('wnb', !st.wnb, () => FlexSetWNB(!st.wnb))}
|
||||
onLevel={(v) => change('wnb_level', v, () => FlexSetWNBLevel(v))} />
|
||||
{st.dsp_v4 && (
|
||||
<>
|
||||
<LevelRow label="NRL" on={!!st.lms_nr} disabled={rxOff} value={st.lms_nr_level ?? 0} accent="cyan" sliderAccent="#0e7490"
|
||||
onToggle={() => change('lms_nr', !st.lms_nr, () => FlexSetLMSNR(!st.lms_nr))}
|
||||
onLevel={(v) => change('lms_nr_level', v, () => FlexSetLMSNRLevel(v))} />
|
||||
<LevelRow label="NRS" on={!!st.speex_nr} disabled={rxOff} value={st.speex_nr_level ?? 0} accent="cyan" sliderAccent="#06b6d4"
|
||||
onToggle={() => change('speex_nr', !st.speex_nr, () => FlexSetSpeexNR(!st.speex_nr))}
|
||||
onLevel={(v) => change('speex_nr_level', v, () => FlexSetSpeexNRLevel(v))} />
|
||||
<LevelRow label="NRF" on={!!st.nrf} disabled={rxOff} value={st.nrf_level ?? 0} accent="cyan" sliderAccent="#0369a1"
|
||||
onToggle={() => change('nrf', !st.nrf, () => FlexSetNRF(!st.nrf))}
|
||||
onLevel={(v) => change('nrf_level', v, () => FlexSetNRFLevel(v))} />
|
||||
{/* Notch filters target carriers in voice — hidden in CW like ANF. */}
|
||||
{!isCW && (
|
||||
<LevelRow label="ANFL" on={!!st.lms_anf} disabled={rxOff} value={st.lms_anf_level ?? 0} accent="violet" sliderAccent="#8b5cf6"
|
||||
onToggle={() => change('lms_anf', !st.lms_anf, () => FlexSetLMSANF(!st.lms_anf))}
|
||||
onLevel={(v) => change('lms_anf_level', v, () => FlexSetLMSANFLevel(v))} />
|
||||
)}
|
||||
{/* RNN and ANFT are on/off only — no level in the API. */}
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground" title={t('flxp.dspV4Hint')}>AI/FFT</span>
|
||||
<button type="button" disabled={rxOff}
|
||||
title={t('flxp.rnnHint')}
|
||||
onClick={() => change('rnn', !st.rnn, () => FlexSetRNN(!st.rnn))}
|
||||
className={cn('px-2.5 py-1 rounded-md border text-[11px] font-bold transition-colors disabled:opacity-30',
|
||||
st.rnn ? 'bg-primary text-primary-foreground border-primary' : 'bg-card text-muted-foreground border-border hover:bg-muted')}>
|
||||
RNN
|
||||
</button>
|
||||
{!isCW && (
|
||||
<button type="button" disabled={rxOff}
|
||||
title={t('flxp.anftHint')}
|
||||
onClick={() => change('anft', !st.anft, () => FlexSetANFT(!st.anft))}
|
||||
className={cn('px-2.5 py-1 rounded-md border text-[11px] font-bold transition-colors disabled:opacity-30',
|
||||
st.anft ? 'bg-primary text-primary-foreground border-primary' : 'bg-card text-muted-foreground border-border hover:bg-muted')}>
|
||||
ANFT
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
{isCW && (
|
||||
<div className="border-t border-border/60 pt-3 space-y-3">
|
||||
@@ -830,10 +911,11 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
The Flex doesn't report SPE amps, so this card is driven by OpsLog's own
|
||||
SPE link rather than the Flex amplifier object. */}
|
||||
{isSPE && (
|
||||
<Card icon={Flame} title={`${t('flxp.amplifier')} · SPE${spe.model ? ' ' + spe.model : ''}`} accent="#ea580c">
|
||||
<Card icon={Flame} ckey="amplifier" title={`${t('flxp.amplifier')} · ${selAmp?.name || `SPE${spe.model ? ' ' + spe.model : ''}`}`} accent="#ea580c">
|
||||
<div className="flex items-center gap-3 flex-wrap">
|
||||
{ampPicker}
|
||||
<button type="button" disabled={!spe.connected}
|
||||
onClick={() => SPESetOperate(!spe.operate).catch(() => {})}
|
||||
onClick={() => AmpOperate(selAmp.id, !spe.operate).catch(() => {})}
|
||||
className={cn('px-4 py-2 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||
spe.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')}>
|
||||
{spe.operate ? 'OPERATE' : 'STANDBY'}
|
||||
@@ -841,10 +923,10 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
{/* Power ON / OFF (best-guess keystrokes from the APG — verify on hw). */}
|
||||
<div className="inline-flex rounded-lg overflow-hidden border-2 border-success/70">
|
||||
<button type="button" disabled={!spe.connected}
|
||||
onClick={() => SPESetPower(true).catch(() => {})}
|
||||
onClick={() => AmpPower(selAmp.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={!spe.connected}
|
||||
onClick={() => SPESetPower(false).catch(() => {})}
|
||||
onClick={() => AmpPower(selAmp.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>
|
||||
{/* Output power level: Low / Mid / High. */}
|
||||
@@ -853,7 +935,7 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
const active = (spe.power_level || '').trim().toUpperCase() === lvl;
|
||||
return (
|
||||
<button key={lvl} type="button" disabled={!spe.connected}
|
||||
onClick={() => SPESetPowerLevel(lvl).catch(() => {})}
|
||||
onClick={() => AmpPowerLevel(selAmp.id, lvl).catch(() => {})}
|
||||
className={cn('px-3 py-2 text-sm font-bold disabled:opacity-30', i > 0 && 'border-l border-border',
|
||||
active ? 'bg-primary text-primary-foreground' : 'bg-card text-muted-foreground hover:bg-muted')}>
|
||||
{powerLevelLabel(lvl)}
|
||||
@@ -887,10 +969,11 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
{/* ACOM amplifier (serial/TCP) — shown when it's the configured amp. Driven
|
||||
by OpsLog's own ACOM link (the Flex doesn't report ACOM amps). */}
|
||||
{isACOM && (
|
||||
<Card icon={Flame} title={`${t('flxp.amplifier')} · ACOM${acom.model ? ' ' + acom.model : ''}`} accent="#ea580c">
|
||||
<Card icon={Flame} ckey="amplifier" title={`${t('flxp.amplifier')} · ${selAmp?.name || `ACOM${acom.model ? ' ' + acom.model : ''}`}`} accent="#ea580c">
|
||||
<div className="flex items-center gap-3 flex-wrap">
|
||||
{ampPicker}
|
||||
<button type="button" disabled={!acom.connected}
|
||||
onClick={() => ACOMSetOperate(!acom.operate).catch(() => {})}
|
||||
onClick={() => AmpOperate(selAmp.id, !acom.operate).catch(() => {})}
|
||||
className={cn('px-4 py-2 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||
acom.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')}>
|
||||
{acom.operate ? 'OPERATE' : 'STANDBY'}
|
||||
@@ -899,11 +982,11 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
is off (the port stays open), so gate on port_open not connected. */}
|
||||
<div className="inline-flex rounded-lg overflow-hidden border-2 border-success/70">
|
||||
<button type="button" disabled={!(acom.port_open && acom.transport === 'serial')}
|
||||
onClick={() => ACOMSetPower(true).catch(() => {})}
|
||||
onClick={() => AmpPower(selAmp.id, true).catch(() => {})}
|
||||
title={acom.transport === 'serial' ? 'Power on (DTR/RTS pulse — needs the power-on pins wired)' : 'Power-on needs the serial DTR/RTS lines — not available over a network bridge'}
|
||||
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={!acom.connected}
|
||||
onClick={() => ACOMSetPower(false).catch(() => {})}
|
||||
onClick={() => AmpPower(selAmp.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', acom.connected ? 'text-muted-foreground' : 'text-danger')}>
|
||||
@@ -933,8 +1016,9 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
PowerGenius is the selected amp type. Running an SPE Expert or ACOM hides
|
||||
this Flex-reported card so two amps don't both show. */}
|
||||
{st.amp_available && !isSPE && !isACOM && (
|
||||
<Card icon={Flame} title={`${t('flxp.amplifier')}${st.amp_model ? ' · ' + st.amp_model : ''}`} accent="#ea580c">
|
||||
<Card icon={Flame} ckey="amplifier" title={`${t('flxp.amplifier')}${st.amp_model ? ' · ' + st.amp_model : ''}`} accent="#ea580c">
|
||||
<div className="flex items-center gap-3">
|
||||
{ampPicker}
|
||||
<button type="button" disabled={off}
|
||||
onClick={() => change('amp_operate', !st.amp_operate, () => FlexAmpOperate(!st.amp_operate))}
|
||||
className={cn('px-4 py-2 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||
@@ -947,7 +1031,7 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
{/* Fan mode — shown when the PowerGenius is configured (Settings →
|
||||
PowerGenius). The dot shows the direct-connection state; the
|
||||
selector is disabled until connected (hover it for the error). */}
|
||||
{ampType === 'pgxl' && (pg.host || pg.connected) && (
|
||||
{selAmp?.type === 'pgxl' && (pg.host || pg.connected) && (
|
||||
<label className="flex items-center gap-1.5 text-xs" title={pg.connected ? t('flxp.pgConnected') : (pg.last_error || t('flxp.pgOffline'))}>
|
||||
<span className={cn('size-1.5 rounded-full', pg.connected ? 'bg-success shadow-[0_0_6px_rgba(16,185,129,0.8)]' : 'bg-danger')} />
|
||||
<span className="text-muted-foreground">{t('flxp.fan')}</span>
|
||||
@@ -980,7 +1064,7 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
<div className="grid grid-cols-2 sm:grid-cols-3 gap-2 mt-2 pt-2 border-t border-border/50">
|
||||
{amp.map((m) => {
|
||||
if (/fwd|pwr/i.test(m.name || '') && /dbm/i.test(m.unit || '')) {
|
||||
return <MeterBar key={m.id} compact label={m.name || `AMP ${m.id}`} value={peakHold(`amp${m.id}`, dbmToW(m.value))} unit="W" lo={0} hi={2000} accent="#dc2626" />;
|
||||
return <MeterBar key={m.id} label={m.name || `AMP ${m.id}`} value={peakHold(`amp${m.id}`, dbmToW(m.value))} unit="W" lo={0} hi={2000} accent="#dc2626" />;
|
||||
}
|
||||
const acc = /temp|degc|degf/i.test(`${m.unit}${m.name}`) ? '#ea580c' : /volt/i.test(m.unit || '') ? '#2563eb' : '#16a34a';
|
||||
// Drain current (ID): the PGXL reports a full-scale far too small
|
||||
@@ -993,7 +1077,7 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
lo = 0;
|
||||
hi = m.hi >= 25 ? m.hi : 25;
|
||||
}
|
||||
return <MeterBar key={m.id} compact label={m.name || `AMP ${m.id}`} value={peakHold(`amp${m.id}`, m.value)} unit={m.unit} lo={lo} hi={hi} accent={acc} />;
|
||||
return <MeterBar key={m.id} label={m.name || `AMP ${m.id}`} value={peakHold(`amp${m.id}`, m.value)} unit={m.unit} lo={lo} hi={hi} accent={acc} />;
|
||||
})}
|
||||
</div>
|
||||
);
|
||||
@@ -1001,6 +1085,10 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
||||
</Card>
|
||||
)}
|
||||
|
||||
{/* Tuner Genius XL — 4O3A ATU, its own card when enabled (Settings →
|
||||
Tuner Genius). Same card shown in Station Control. */}
|
||||
{tgEnabled && <TunerCard status={tg} t={t} />}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -73,6 +73,24 @@ function attOptions(model?: string): { v: string; l: string }[] {
|
||||
return [OFF, { v: '20', l: '20dB' }]; // IC-7300 / IC-705 / IC-7100 / default
|
||||
}
|
||||
|
||||
// bandOfHz names the amateur band a frequency falls in, so the band row can show
|
||||
// where the rig actually is. The buttons only ever SENT a frequency and carried
|
||||
// no active state at all, so nothing was highlighted whatever the rig reported.
|
||||
// Edges are the ITU/IARU band limits, wide enough to cover regional differences —
|
||||
// out-of-band (transverter IF, general coverage RX) matches nothing, as it should.
|
||||
function bandOfHz(hz?: number): string {
|
||||
if (!hz || hz <= 0) return '';
|
||||
const mhz = hz / 1_000_000;
|
||||
const bands: [string, number, number][] = [
|
||||
['160', 1.8, 2.0], ['80', 3.5, 4.0], ['60', 5.25, 5.45], ['40', 7.0, 7.3],
|
||||
['30', 10.1, 10.15], ['20', 14.0, 14.35], ['17', 18.068, 18.168],
|
||||
['15', 21.0, 21.45], ['12', 24.89, 24.99], ['10', 28.0, 29.7],
|
||||
['6', 50.0, 54.0], ['4', 70.0, 70.5], ['2', 144.0, 148.0], ['70', 430.0, 450.0],
|
||||
];
|
||||
for (const [name, lo, hi] of bands) if (mhz >= lo && mhz <= hi) return name;
|
||||
return '';
|
||||
}
|
||||
|
||||
// fmtVFO renders a Hz frequency the way an Icom front panel does:
|
||||
// MHz "." 3-digit-kHz "." 2-digit-(10 Hz). 21032000 → "21.032.00".
|
||||
function fmtVFO(hz?: number): string {
|
||||
@@ -731,12 +749,19 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
|
||||
{/* Band buttons + antenna selection. */}
|
||||
<Card icon={Antenna} title={t('icmp.bandsAntenna')} accent="#0891b2">
|
||||
<div className="grid grid-cols-5 gap-1.5">
|
||||
{BANDS.map((b) => (
|
||||
{BANDS.map((b) => {
|
||||
const here = bandOfHz(mainHz) === b.l;
|
||||
return (
|
||||
<button key={b.l} type="button" onClick={() => SetCATFrequency(b.hz).catch(() => {})}
|
||||
className="px-1 py-1.5 rounded-md text-[11px] font-bold border border-border bg-card text-foreground hover:bg-muted transition-colors">
|
||||
title={here ? t('icmp.bandCurrent', { b: b.l }) : undefined}
|
||||
className={cn('px-1 py-1.5 rounded-md text-[11px] font-bold border transition-colors',
|
||||
here
|
||||
? 'border-primary bg-primary text-primary-foreground shadow-[0_0_8px] shadow-primary/40'
|
||||
: 'border-border bg-card text-foreground hover:bg-muted')}>
|
||||
{b.l}
|
||||
</button>
|
||||
))}
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
<Row label={t('icmp.antenna')}>
|
||||
<Segmented value={String(st.antenna)} options={[{ v: '1', l: 'ANT1' }, { v: '2', l: 'ANT2' }]}
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
import { cn } from '@/lib/utils';
|
||||
|
||||
// MeterBar is the ONE LED-bar meter used across the FlexRadio panel, the amplifier
|
||||
// cards and the Tuner Genius card, so every meter renders at exactly the same size
|
||||
// (segment count, bar height, padding). Keep it the single source of truth — don't
|
||||
// re-declare a local copy in a panel, or the meters drift out of sync.
|
||||
export const METER_SEGMENTS = 26;
|
||||
|
||||
export function MeterBar({ label, value, unit, lo, hi, accent = '#16a34a', extra, display, segColor, onClick, title, compact }: {
|
||||
label: string; value: number; unit?: string; lo: number; hi: number; accent?: string; extra?: string; display?: string;
|
||||
segColor?: (frac: number) => string; onClick?: () => void; title?: string; compact?: boolean;
|
||||
}) {
|
||||
const span = hi - lo;
|
||||
const pct = span > 0 ? Math.max(0, Math.min(100, ((value - lo) / span) * 100)) : 0;
|
||||
const lit = Math.round((pct / 100) * METER_SEGMENTS);
|
||||
return (
|
||||
<div onClick={onClick} title={title}
|
||||
className={cn('rounded-lg border border-border/70 bg-gradient-to-b from-card to-muted/40 shadow-sm min-w-0',
|
||||
compact ? 'px-2 py-1' : 'px-2.5 py-2',
|
||||
onClick && 'cursor-pointer hover:border-primary/60 hover:from-muted/40')}>
|
||||
<div className={cn('flex items-baseline justify-between gap-1', compact ? 'mb-1' : 'mb-1.5')}>
|
||||
<span className="text-[10px] font-bold uppercase tracking-wider text-muted-foreground truncate">{label}</span>
|
||||
<span className={cn('font-mono font-bold tabular-nums whitespace-nowrap text-foreground/90', compact ? 'text-xs' : 'text-sm')}>
|
||||
{display !== undefined ? display : (
|
||||
<>{Math.abs(value) >= 100 ? value.toFixed(0) : value.toFixed(1)}<span className="text-muted-foreground text-[10px] ml-0.5">{unit}</span></>
|
||||
)}
|
||||
</span>
|
||||
</div>
|
||||
{/* LED bar — recessed track + gradient segments for a cleaner instrument look. */}
|
||||
<div className={cn('flex gap-[2px] items-stretch rounded-[3px] bg-black/10 p-[2px]', compact ? 'h-2' : 'h-3')}>
|
||||
{Array.from({ length: METER_SEGMENTS }).map((_, i) => {
|
||||
const on = i < lit;
|
||||
const frac = i / METER_SEGMENTS;
|
||||
const col = segColor ? segColor(frac) : (frac > 0.82 ? '#dc2626' : accent);
|
||||
return (
|
||||
<div key={i} className="flex-1 rounded-[2px] transition-colors duration-100"
|
||||
style={on
|
||||
? { background: `linear-gradient(to bottom, ${col}, ${col}cc)`, boxShadow: `0 0 4px ${col}88` }
|
||||
: { background: '#cfc6ad', opacity: 0.35 }} />
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
{extra && !compact && <div className="text-[10px] text-muted-foreground/70 mt-1 text-right font-mono">{extra}</div>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -5,7 +5,7 @@ import {
|
||||
} from 'ag-grid-community';
|
||||
import { hamlogGridTheme } from '@/lib/gridTheme';
|
||||
import { AgGridReact } from 'ag-grid-react';
|
||||
import { Plus, Trash2, Radio, PlusCircle, MinusCircle, Search, UserPlus, History } from 'lucide-react';
|
||||
import { Plus, Trash2, Radio, PlusCircle, MinusCircle, Search, UserPlus, History, ChevronUp, ChevronDown } from 'lucide-react';
|
||||
import {
|
||||
Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter, DialogDescription,
|
||||
} from '@/components/ui/dialog';
|
||||
@@ -42,14 +42,28 @@ function fmtTimeOn(s: any): string {
|
||||
|
||||
const emptyStation = (): Station => netctl.Station.createFrom({ callsign: '' });
|
||||
|
||||
// The right-click actions of the main Recent QSOs grid (update from cty/QRZ/
|
||||
// Club Log, send to services, recording e-mail, eQSL, delete) — passed down so
|
||||
// the worked-before grid here offers the SAME context menu on logged QSOs.
|
||||
type QSOMenuHandlers = {
|
||||
onUpdateFromCty?: (ids: number[]) => void;
|
||||
onUpdateFromQRZ?: (ids: number[]) => void;
|
||||
onUpdateFromClublog?: (ids: number[]) => void;
|
||||
onSendTo?: (service: string, ids: number[]) => void;
|
||||
onSendRecording?: (ids: number[]) => void;
|
||||
onSendEQSL?: (ids: number[]) => void;
|
||||
onDelete?: (ids: number[]) => void;
|
||||
};
|
||||
|
||||
type Props = {
|
||||
onLogged?: () => void;
|
||||
countries?: string[];
|
||||
bands?: string[];
|
||||
modes?: string[];
|
||||
qsoMenuHandlers?: QSOMenuHandlers;
|
||||
};
|
||||
|
||||
export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
|
||||
export function NetControlPanel({ onLogged, countries, bands, modes, qsoMenuHandlers }: Props) {
|
||||
const { t } = useI18n();
|
||||
const [nets, setNets] = useState<Net[]>([]);
|
||||
const [selId, setSelId] = useState<string>('');
|
||||
@@ -61,6 +75,8 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
|
||||
// Full-QSO edit modal for an on-air draft (same one Recent QSOs uses).
|
||||
const [editingDraft, setEditingDraft] = useState<QSOForm | null>(null);
|
||||
const [selectedActiveIds, setSelectedActiveIds] = useState<number[]>([]);
|
||||
// Programmatic row selection in the on-air grid (auto-advance after logging).
|
||||
const [selectRow, setSelectRow] = useState<{ id: number; seq: number }>({ id: 0, seq: 0 });
|
||||
|
||||
// Add/edit-contact dialog.
|
||||
const [contactOpen, setContactOpen] = useState(false);
|
||||
@@ -68,6 +84,34 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
|
||||
const [looking, setLooking] = useState(false);
|
||||
|
||||
const rosterGrid = useRef<any>(null);
|
||||
// Cross-grid drag & drop: roster row → on-air grid puts the station on air;
|
||||
// on-air row → roster grid logs it (same as the "Log & end" button). AG-Grid
|
||||
// external drop zones need each grid's api + the OTHER grid's container div.
|
||||
const onAirApi = useRef<any>(null);
|
||||
const onAirWrap = useRef<HTMLDivElement | null>(null);
|
||||
const rosterWrap = useRef<HTMLDivElement | null>(null);
|
||||
const dropZonesDone = useRef({ roster: false, onair: false });
|
||||
// Callbacks live in refs so the drop-zone closures (registered once) always
|
||||
// call the CURRENT activate/deactivate, not a stale first-render one.
|
||||
const activateRef = useRef<(call: string) => void>(() => {});
|
||||
const deactivateRef = useRef<(id?: number) => void>(() => {});
|
||||
const wireDropZones = useCallback(() => {
|
||||
const rApi = rosterGrid.current?.api;
|
||||
if (rApi && onAirWrap.current && !dropZonesDone.current.roster) {
|
||||
dropZonesDone.current.roster = true;
|
||||
rApi.addRowDropZone({
|
||||
getContainer: () => onAirWrap.current!,
|
||||
onDragStop: (p: any) => { const call = p.node?.data?.callsign; if (call) activateRef.current(call); },
|
||||
});
|
||||
}
|
||||
if (onAirApi.current && rosterWrap.current && !dropZonesDone.current.onair) {
|
||||
dropZonesDone.current.onair = true;
|
||||
onAirApi.current.addRowDropZone({
|
||||
getContainer: () => rosterWrap.current!,
|
||||
onDragStop: (p: any) => { const id = p.node?.data?.id; if (id != null) deactivateRef.current(id); },
|
||||
});
|
||||
}
|
||||
}, []);
|
||||
|
||||
// Worked-before for the clicked station (see if/when we contacted it before).
|
||||
const [wbCall, setWbCall] = useState('');
|
||||
@@ -122,6 +166,53 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
|
||||
catch { /* ignore */ }
|
||||
}, []);
|
||||
|
||||
// ---- Mic pass order ------------------------------------------------------
|
||||
// The on-air grid shows the stations in the order the mic goes around — NOT
|
||||
// by log time. The order is owned here as a list of draft ids: new check-ins
|
||||
// join at the END of the queue, logged/cancelled ones drop out, and the ⬆⬇
|
||||
// buttons move the selected station. Persisted per net so a panel remount
|
||||
// (tab switch) keeps the round.
|
||||
const [orderIds, setOrderIds] = useState<number[]>([]);
|
||||
const orderKey = openId ? `opslog.netOrder.${openId}` : '';
|
||||
// Load the saved order when a net opens.
|
||||
useEffect(() => {
|
||||
if (!orderKey) { setOrderIds([]); return; }
|
||||
try { setOrderIds(JSON.parse(localStorage.getItem(orderKey) || '[]')); }
|
||||
catch { setOrderIds([]); }
|
||||
}, [orderKey]);
|
||||
// Reconcile with the live list: keep known ids in their order, append new
|
||||
// ones, drop the gone. Persist.
|
||||
useEffect(() => {
|
||||
setOrderIds((cur) => {
|
||||
const liveIds = active.map((a) => a.id as number).filter((id) => id != null);
|
||||
const liveSet = new Set(liveIds);
|
||||
const kept = cur.filter((id) => liveSet.has(id));
|
||||
const keptSet = new Set(kept);
|
||||
const next = [...kept, ...liveIds.filter((id) => !keptSet.has(id))];
|
||||
if (next.length === cur.length && next.every((v, i) => v === cur[i])) return cur;
|
||||
if (orderKey) { try { localStorage.setItem(orderKey, JSON.stringify(next)); } catch { /* quota */ } }
|
||||
return next;
|
||||
});
|
||||
}, [active, orderKey]);
|
||||
const activeOrdered = useMemo(() => {
|
||||
const byId = new Map(active.map((a) => [a.id as number, a]));
|
||||
return orderIds.map((id) => byId.get(id)).filter(Boolean) as QSOForm[];
|
||||
}, [active, orderIds]);
|
||||
// Move the selected on-air station up/down the queue.
|
||||
const moveSelected = useCallback((dir: -1 | 1) => {
|
||||
const id = selectedActiveIds[0];
|
||||
if (id == null) return;
|
||||
setOrderIds((cur) => {
|
||||
const i = cur.indexOf(id);
|
||||
const j = i + dir;
|
||||
if (i < 0 || j < 0 || j >= cur.length) return cur;
|
||||
const next = [...cur];
|
||||
[next[i], next[j]] = [next[j], next[i]];
|
||||
if (orderKey) { try { localStorage.setItem(orderKey, JSON.stringify(next)); } catch { /* quota */ } }
|
||||
return next;
|
||||
});
|
||||
}, [selectedActiveIds, orderKey]);
|
||||
|
||||
useEffect(() => { refreshNets(); }, [refreshNets]);
|
||||
useEffect(() => { refreshRoster(selId); }, [selId, refreshRoster]);
|
||||
useEffect(() => { if (isOpen) refreshActive(); else setActive([]); }, [isOpen, refreshActive]);
|
||||
@@ -177,10 +268,38 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
|
||||
catch (e: any) { setError(String(e?.message ?? e)); }
|
||||
}
|
||||
// Active → logged (end QSO, removed from session, written to the logbook).
|
||||
// Then auto-select the NEXT station in the mic-pass order, so the operator
|
||||
// can chain "log → log → log" without re-clicking a row each time.
|
||||
async function deactivate(id?: number) {
|
||||
if (id == null) return;
|
||||
try { await NetDeactivate(id); await refreshActive(); onLogged?.(); }
|
||||
catch (e: any) { setError(String(e?.message ?? e)); }
|
||||
const next = activeOrdered.find((a) => a.id !== id); // computed BEFORE the list shrinks
|
||||
try {
|
||||
await NetDeactivate(id);
|
||||
await refreshActive();
|
||||
onLogged?.();
|
||||
if (next?.id != null) {
|
||||
setSelectRow((s) => ({ id: next.id as number, seq: s.seq + 1 }));
|
||||
setSelectedActiveIds([next.id as number]);
|
||||
showWorkedBefore(next.callsign, (next as any).dxcc ?? 0);
|
||||
}
|
||||
} catch (e: any) { setError(String(e?.message ?? e)); }
|
||||
}
|
||||
// Keep the drop-zone closures pointed at the CURRENT handlers.
|
||||
activateRef.current = activate;
|
||||
deactivateRef.current = deactivate;
|
||||
|
||||
// Log EVERYONE still on air (end of net): each draft is written to the logbook
|
||||
// exactly as the single-log button would.
|
||||
async function logAll() {
|
||||
if (active.length === 0) return;
|
||||
if (!window.confirm(t('ncp.logAllConfirm', { n: active.length }))) return;
|
||||
try {
|
||||
for (const a of [...active]) {
|
||||
if (a.id != null) await NetDeactivate(a.id as number);
|
||||
}
|
||||
await refreshActive();
|
||||
onLogged?.();
|
||||
} catch (e: any) { setError(String(e?.message ?? e)); await refreshActive(); }
|
||||
}
|
||||
|
||||
// Edit-modal handlers (operate on the in-memory draft, not the DB).
|
||||
@@ -232,7 +351,8 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
|
||||
}
|
||||
|
||||
const rosterCols = useMemo<ColDef<Station>[]>(() => [
|
||||
{ headerName: t('ncp.colCallsign'), field: 'callsign', width: 110, cellClass: 'font-mono font-semibold' },
|
||||
// rowDrag: drag a roster station onto the on-air grid to start its QSO.
|
||||
{ headerName: t('ncp.colCallsign'), field: 'callsign', width: 110, cellClass: 'font-mono font-semibold', rowDrag: true },
|
||||
{ headerName: t('ncp.colName'), field: 'name', flex: 1 },
|
||||
{ headerName: 'QTH', field: 'qth', flex: 1 },
|
||||
{ headerName: t('ncp.colCountry'), field: 'country', width: 130 },
|
||||
@@ -281,11 +401,15 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
|
||||
{t('ncp.onAirActive')}
|
||||
<span className="ml-auto font-normal normal-case opacity-90">{t('ncp.activeHint')}</span>
|
||||
</div>
|
||||
<div className="flex flex-col min-h-0 flex-1">
|
||||
<div ref={onAirWrap} className="flex flex-col min-h-0 flex-1">
|
||||
<RecentQSOsGrid
|
||||
rows={active}
|
||||
total={active.length}
|
||||
rows={activeOrdered}
|
||||
total={activeOrdered.length}
|
||||
storageKey="net.onair"
|
||||
selectRowSignal={selectRow}
|
||||
rowDragCall
|
||||
passOrder
|
||||
onGridApi={(api) => { onAirApi.current = api; wireDropZones(); }}
|
||||
onRowClicked={(q) => showWorkedBefore(q.callsign, (q as any).dxcc ?? 0)}
|
||||
onRowDoubleClicked={(q) => setEditingDraft(q)}
|
||||
onRowSelected={setSelectedActiveIds}
|
||||
@@ -297,6 +421,22 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
|
||||
onClick={() => { if (selectedActiveIds[0] != null) deactivate(selectedActiveIds[0]); }}>
|
||||
<MinusCircle className="size-3.5" /> {t('ncp.logEndSelected')}
|
||||
</Button>
|
||||
{/* Mic pass order: move the selected station up/down the round. */}
|
||||
<div className="flex items-center gap-0.5 pl-1 border-l border-border/50">
|
||||
<Button variant="ghost" size="icon" className="size-7" title={t('ncp.moveUp')}
|
||||
disabled={selectedActiveIds[0] == null || orderIds.indexOf(selectedActiveIds[0]) <= 0}
|
||||
onClick={() => moveSelected(-1)}>
|
||||
<ChevronUp className="size-4" />
|
||||
</Button>
|
||||
<Button variant="ghost" size="icon" className="size-7" title={t('ncp.moveDown')}
|
||||
disabled={selectedActiveIds[0] == null || orderIds.indexOf(selectedActiveIds[0]) >= orderIds.length - 1}
|
||||
onClick={() => moveSelected(1)}>
|
||||
<ChevronDown className="size-4" />
|
||||
</Button>
|
||||
</div>
|
||||
<Button variant="ghost" size="sm" className="h-7 text-[11px] ml-auto" onClick={logAll}>
|
||||
<MinusCircle className="size-3.5" /> {t('ncp.logAll', { n: active.length })}
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -330,6 +470,7 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
|
||||
rows={(wb.entries ?? []) as any}
|
||||
total={wb.count}
|
||||
storageKey="net.wb"
|
||||
{...qsoMenuHandlers}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
@@ -343,7 +484,7 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
|
||||
{t('ncp.netUsersRoster')}
|
||||
<span className="ml-auto font-normal normal-case opacity-90">{t('ncp.rosterHint')}</span>
|
||||
</div>
|
||||
<div style={{ flex: 1, minHeight: 0, position: 'relative' }}>
|
||||
<div ref={rosterWrap} style={{ flex: 1, minHeight: 0, position: 'relative' }}>
|
||||
<div style={{ position: 'absolute', inset: 0 }}>
|
||||
<AgGridReact<Station>
|
||||
ref={rosterGrid}
|
||||
@@ -352,6 +493,7 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
|
||||
columnDefs={rosterCols}
|
||||
defaultColDef={defaultColDef}
|
||||
rowSelection={{ mode: 'multiRow', checkboxes: false, headerCheckbox: false, enableClickSelection: true }}
|
||||
onGridReady={() => wireDropZones()}
|
||||
onRowClicked={(e) => e.data && showWorkedBefore(e.data.callsign, (e.data as any).dxcc ?? 0)}
|
||||
onRowDoubleClicked={(e) => e.data && activate(e.data.callsign)}
|
||||
animateRows={false}
|
||||
|
||||
@@ -15,6 +15,7 @@ type Props = {
|
||||
onSendEQSL?: (ids: number[]) => void;
|
||||
onBulkEdit?: (ids: number[]) => void;
|
||||
onExportSelected?: (ids: number[]) => void;
|
||||
onExportSelectedFields?: (ids: number[]) => void;
|
||||
onExportFiltered?: () => void;
|
||||
onExportCabrilloSelected?: (ids: number[]) => void;
|
||||
onExportCabrilloFiltered?: () => void;
|
||||
@@ -35,7 +36,7 @@ const UPLOAD_TARGETS: { service: string; name: string }[] = [
|
||||
// or picks a command. (We deliberately do NOT close on scroll/resize: the QSO
|
||||
// list auto-refreshes and AG Grid fires internal scroll events on refresh,
|
||||
// which used to dismiss the menu the instant it appeared.)
|
||||
export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete }: Props) {
|
||||
export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete }: Props) {
|
||||
const { t } = useI18n();
|
||||
useEffect(() => {
|
||||
if (!menu) return;
|
||||
@@ -137,6 +138,15 @@ export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ
|
||||
<span>{t('qctx.exportSelectedAdif', { n })}</span>
|
||||
</button>
|
||||
)}
|
||||
{onExportSelectedFields && (
|
||||
<button
|
||||
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
||||
onClick={() => { onExportSelectedFields(menu.ids); onClose(); }}
|
||||
>
|
||||
<FileDown className="size-4 text-info" />
|
||||
<span>{t('qctx.exportSelectedFields', { n })}</span>
|
||||
</button>
|
||||
)}
|
||||
{onExportFiltered && (
|
||||
<button
|
||||
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
||||
|
||||
@@ -5,7 +5,7 @@ import {
|
||||
} from 'ag-grid-community';
|
||||
import { hamlogGridTheme } from '@/lib/gridTheme';
|
||||
import { AgGridReact } from 'ag-grid-react';
|
||||
import { Columns3, FilterX } from 'lucide-react';
|
||||
import { Columns3, FilterX, ListChecks } from 'lucide-react';
|
||||
import type { QSOForm } from '@/types';
|
||||
import { QSOContextMenu, type QSOMenuState } from './QSOContextMenu';
|
||||
import {
|
||||
@@ -30,6 +30,19 @@ type Props = {
|
||||
// Bump this number to programmatically select every row (e.g. after a search
|
||||
// in the QSL Manager, where the default is "all selected").
|
||||
selectAllSignal?: number;
|
||||
// Bump `seq` to programmatically select the single row with this id (e.g. NET
|
||||
// Control auto-advancing to the next on-air station after logging one).
|
||||
selectRowSignal?: { id: number; seq: number };
|
||||
// Show a row-drag handle on the callsign column (NET Control: drag an on-air
|
||||
// row onto the roster to log it). Pair with onGridApi so the parent can
|
||||
// register external drop zones via api.addRowDropZone.
|
||||
rowDragCall?: boolean;
|
||||
// Pass-order mode (NET Control on-air queue): the ROW ORDER GIVEN IN `rows`
|
||||
// is the display order — a pinned "#" column numbers it, and all column
|
||||
// sorting is disabled (including saved sorts) so the queue can't be shuffled
|
||||
// by a header click. The parent owns/reorders the array.
|
||||
passOrder?: boolean;
|
||||
onGridApi?: (api: any) => void;
|
||||
// storageKey scopes the persisted column layout/visibility. Omit for the main
|
||||
// log (keeps the historical keys); pass a distinct value (e.g. "net.onair") to
|
||||
// reuse this grid elsewhere with its OWN independent column config.
|
||||
@@ -45,6 +58,7 @@ type Props = {
|
||||
onSendEQSL?: (ids: number[]) => void;
|
||||
onBulkEdit?: (ids: number[]) => void;
|
||||
onExportSelected?: (ids: number[]) => void;
|
||||
onExportSelectedFields?: (ids: number[]) => void;
|
||||
onExportFiltered?: () => void;
|
||||
onExportCabrilloSelected?: (ids: number[]) => void;
|
||||
onExportCabrilloFiltered?: () => void;
|
||||
@@ -249,7 +263,7 @@ export const groupLabel = (t: TFn, g: string): string => t(GRP_KEYS[g] ?? g);
|
||||
const stripAwardCols = (st: any[] | null | undefined): any[] =>
|
||||
(st ?? []).filter((s) => !String(s?.colId ?? '').startsWith('award_'));
|
||||
|
||||
export function RecentQSOsGrid({ rows, selectAllSignal, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols }: Props) {
|
||||
export function RecentQSOsGrid({ rows, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols }: Props) {
|
||||
const { t } = useI18n();
|
||||
const gridRef = useRef<any>(null);
|
||||
const [pickerOpen, setPickerOpen] = useState(false);
|
||||
@@ -257,6 +271,8 @@ export function RecentQSOsGrid({ rows, selectAllSignal, storageKey, onRowDoubleC
|
||||
// (e.g. the Net panel) keeps its own layout independent of the main log.
|
||||
const colStateKey = storageKey ? `hamlog.qsoColState.${storageKey}` : BASE_COLSTATE_KEY;
|
||||
const [menu, setMenu] = useState<QSOMenuState>(null);
|
||||
const [selCount, setSelCount] = useState(0); // live selection count shown in the toolbar
|
||||
const [dispCount, setDispCount] = useState(0); // rows currently displayed (post column filters) — drives Select all ↔ Unselect all
|
||||
|
||||
// Localized column catalog — rebuilt when the language changes.
|
||||
const COL_CATALOG = useMemo(() => makeColCatalog(t), [t]);
|
||||
@@ -312,17 +328,66 @@ export function RecentQSOsGrid({ rows, selectAllSignal, storageKey, onRowDoubleC
|
||||
saveState(AWARD_SHOWN_KEY, [...next]);
|
||||
}, []);
|
||||
|
||||
// Award-column WIDTHS are persisted separately too, for the same reason as
|
||||
// visibility: award columns are stripped from AG Grid's saved column-state
|
||||
// round-trip, so their width would otherwise reset to the default on reopen.
|
||||
// Stored as an array of { code, width } (code upper-cased); mirrored to the DB.
|
||||
const AWARD_WIDTH_KEY = storageKey ? `hamlog.awardColWidths.${storageKey}` : 'hamlog.awardColWidths';
|
||||
const awardWidthsRef = useRef<Record<string, number>>({});
|
||||
const awardWidthsInit = useRef(false);
|
||||
if (!awardWidthsInit.current) {
|
||||
awardWidthsInit.current = true;
|
||||
for (const it of (loadLocal(AWARD_WIDTH_KEY) ?? []) as any[]) {
|
||||
if (it?.code && it?.width) awardWidthsRef.current[String(it.code).toUpperCase()] = Number(it.width);
|
||||
}
|
||||
}
|
||||
// Fresh machine: hydrate widths from the portable DB copy, seed the cache, and
|
||||
// apply them to any award columns already on screen.
|
||||
useEffect(() => {
|
||||
if (loadLocal(AWARD_WIDTH_KEY)) return;
|
||||
loadRemote(AWARD_WIDTH_KEY).then((remote) => {
|
||||
if (!remote || !remote.length) return;
|
||||
for (const it of remote as any[]) {
|
||||
if (it?.code && it?.width) awardWidthsRef.current[String(it.code).toUpperCase()] = Number(it.width);
|
||||
}
|
||||
seedLocal(AWARD_WIDTH_KEY, remote);
|
||||
const api = gridRef.current?.api;
|
||||
if (api && awardCols?.length) {
|
||||
const ups = awardCols
|
||||
.map((a) => ({ key: `award_${a.code}`, newWidth: awardWidthsRef.current[a.code.toUpperCase()] }))
|
||||
.filter((u) => !!u.newWidth);
|
||||
if (ups.length) api.setColumnWidths(ups);
|
||||
}
|
||||
});
|
||||
}, []);
|
||||
|
||||
const columnDefs = useMemo<ColDef<QSOForm>[]>(() => {
|
||||
restoringRef.current = true;
|
||||
const base = COL_CATALOG.map((c) => {
|
||||
const { group: _g, label: _l, defaultVisible, ...rest } = c;
|
||||
return { ...rest, hide: !defaultVisible };
|
||||
const col: ColDef<QSOForm> = { ...rest, hide: !defaultVisible };
|
||||
if (rowDragCall && ((rest as any).colId === 'callsign' || (rest as any).field === 'callsign')) {
|
||||
col.rowDrag = true;
|
||||
}
|
||||
if (passOrder) {
|
||||
delete (col as any).sort; // e.g. the date column's default 'desc'
|
||||
col.sortable = false;
|
||||
}
|
||||
return col;
|
||||
});
|
||||
if (passOrder) {
|
||||
base.unshift({
|
||||
colId: '__order', headerName: '#', width: 46, pinned: 'left',
|
||||
sortable: false, resizable: false, suppressMovable: true, filter: false,
|
||||
cellClass: 'font-mono text-muted-foreground tabular-nums',
|
||||
valueGetter: (p) => (p.node?.rowIndex ?? 0) + 1,
|
||||
} as ColDef<QSOForm>);
|
||||
}
|
||||
const awards: ColDef<QSOForm>[] = (awardCols ?? []).map((a) => ({
|
||||
colId: `award_${a.code}`,
|
||||
headerName: a.code,
|
||||
headerTooltip: t('rqg.awardTip', { name: a.name }),
|
||||
width: 110,
|
||||
width: awardWidthsRef.current[a.code.toUpperCase()] ?? 110,
|
||||
cellClass: 'text-[11px]',
|
||||
// Visibility comes from the persisted award-code set, so a column the user
|
||||
// showed reappears on reopen and one they didn't stays hidden.
|
||||
@@ -330,7 +395,7 @@ export function RecentQSOsGrid({ rows, selectAllSignal, storageKey, onRowDoubleC
|
||||
valueGetter: (p) => (p.data as any)?.award_refs?.[a.code.toUpperCase()] ?? '',
|
||||
}));
|
||||
return [...base, ...awards];
|
||||
}, [awardCols, COL_CATALOG, t, awardShown]);
|
||||
}, [awardCols, COL_CATALOG, t, awardShown, rowDragCall, passOrder]);
|
||||
|
||||
// Enforce award-column visibility via the API after the columns (re)appear —
|
||||
// colDef.hide alone isn't honoured by AG Grid for a column that already exists,
|
||||
@@ -338,28 +403,41 @@ export function RecentQSOsGrid({ rows, selectAllSignal, storageKey, onRowDoubleC
|
||||
useEffect(() => {
|
||||
const api = gridRef.current?.api;
|
||||
if (!api || !awardCols?.length) return;
|
||||
const widthUps: { key: string; newWidth: number }[] = [];
|
||||
for (const a of awardCols) {
|
||||
const want = awardShown.has(a.code.toUpperCase());
|
||||
const col = api.getColumn(`award_${a.code}`);
|
||||
if (col && col.isVisible() !== want) api.setColumnsVisible([`award_${a.code}`], want);
|
||||
// Re-apply the saved width — AG Grid keeps an existing column's width across
|
||||
// a columnDefs rebuild instead of re-reading colDef.width (same quirk as hide).
|
||||
const w = awardWidthsRef.current[a.code.toUpperCase()];
|
||||
if (col && w && Math.round(col.getActualWidth()) !== w) widthUps.push({ key: `award_${a.code}`, newWidth: w });
|
||||
}
|
||||
if (widthUps.length) api.setColumnWidths(widthUps);
|
||||
}, [awardCols, awardShown]);
|
||||
|
||||
const defaultColDef = useMemo<ColDef>(() => ({
|
||||
sortable: true,
|
||||
sortable: !passOrder,
|
||||
resizable: true,
|
||||
filter: true,
|
||||
suppressMovable: false,
|
||||
}), []);
|
||||
}), [passOrder]);
|
||||
|
||||
// In pass-order mode a saved sort (from before the mode existed, or synced
|
||||
// from elsewhere) must not shuffle the queue — strip sorts when restoring.
|
||||
const sanitizeState = useCallback((state: any[]) => (
|
||||
passOrder ? state.map((s) => ({ ...s, sort: null })) : state
|
||||
), [passOrder]);
|
||||
|
||||
function onGridReady(e: GridReadyEvent) {
|
||||
onGridApi?.(e.api);
|
||||
const local = loadLocal(colStateKey);
|
||||
if (local) e.api.applyColumnState({ state: stripAwardCols(local) as ColumnState[], applyOrder: true });
|
||||
if (local) e.api.applyColumnState({ state: sanitizeState(stripAwardCols(local)) as ColumnState[], applyOrder: true });
|
||||
// Fall back to the portable DB copy when the local cache is empty
|
||||
// (fresh machine / after a reinstall), then re-seed the cache.
|
||||
loadRemote(colStateKey).then((remote) => {
|
||||
if (remote && !local) {
|
||||
e.api.applyColumnState({ state: stripAwardCols(remote) as ColumnState[], applyOrder: true });
|
||||
e.api.applyColumnState({ state: sanitizeState(stripAwardCols(remote)) as ColumnState[], applyOrder: true });
|
||||
seedLocal(colStateKey, remote);
|
||||
}
|
||||
});
|
||||
@@ -368,14 +446,38 @@ export function RecentQSOsGrid({ rows, selectAllSignal, storageKey, onRowDoubleC
|
||||
// null when no column filter is active, so "Showing X of Y" reflects them.
|
||||
const reportFilteredCount = useCallback((e: { api?: any }) => {
|
||||
const api = e?.api ?? gridRef.current?.api;
|
||||
if (api?.getDisplayedRowCount) setDispCount(api.getDisplayedRowCount());
|
||||
// Pass-order "#" is a rowIndex-based valueGetter; AG-Grid keeps the same
|
||||
// row node across a reorder (getRowId by id), so the number is cached and
|
||||
// stale until we force it. Refresh it on every model update (a reorder
|
||||
// fires one). force:true bypasses the value cache.
|
||||
if (passOrder && api?.refreshCells) {
|
||||
api.refreshCells({ columns: ['__order'], force: true });
|
||||
}
|
||||
if (!api || !onFilteredCountChange) return;
|
||||
onFilteredCountChange(api.isAnyFilterPresent?.() ? api.getDisplayedRowCount() : null);
|
||||
}, [onFilteredCountChange]);
|
||||
}, [onFilteredCountChange, passOrder]);
|
||||
const saveColumnState = useCallback(() => {
|
||||
if (restoringRef.current) return; // ignore the events fired by a column rebuild
|
||||
const state = gridRef.current?.api?.getColumnState();
|
||||
if (state) saveState(colStateKey, stripAwardCols(state));
|
||||
}, []);
|
||||
if (!state) return;
|
||||
saveState(colStateKey, stripAwardCols(state));
|
||||
// Award columns are stripped above, so persist their widths on the side.
|
||||
let changed = false;
|
||||
for (const s of state) {
|
||||
const id = String((s as any)?.colId ?? '');
|
||||
if (id.startsWith('award_') && (s as any).width) {
|
||||
const code = id.slice('award_'.length).toUpperCase();
|
||||
if (awardWidthsRef.current[code] !== (s as any).width) {
|
||||
awardWidthsRef.current[code] = (s as any).width;
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (changed) {
|
||||
saveState(AWARD_WIDTH_KEY, Object.entries(awardWidthsRef.current).map(([code, width]) => ({ code, width })));
|
||||
}
|
||||
}, [colStateKey, AWARD_WIDTH_KEY]);
|
||||
|
||||
// columnDefs is rebuilt whenever the award columns load OR the user toggles an
|
||||
// award column (both change the memo → restoringRef flips true at line 316). Each
|
||||
@@ -387,7 +489,7 @@ export function RecentQSOsGrid({ rows, selectAllSignal, storageKey, onRowDoubleC
|
||||
useEffect(() => {
|
||||
const api = gridRef.current?.api;
|
||||
const local = loadLocal(colStateKey);
|
||||
if (api && local) api.applyColumnState({ state: stripAwardCols(local) as ColumnState[], applyOrder: true });
|
||||
if (api && local) api.applyColumnState({ state: sanitizeState(stripAwardCols(local)) as ColumnState[], applyOrder: true });
|
||||
// Re-enable saving once AG Grid has settled the column events from the rebuild.
|
||||
const t = window.setTimeout(() => { restoringRef.current = false; }, 0);
|
||||
return () => window.clearTimeout(t);
|
||||
@@ -397,7 +499,10 @@ export function RecentQSOsGrid({ rows, selectAllSignal, storageKey, onRowDoubleC
|
||||
if (e.data && onRowDoubleClicked) onRowDoubleClicked(e.data);
|
||||
}
|
||||
function onSelectionChanged() {
|
||||
const sel = (gridRef.current?.api?.getSelectedRows() as QSOForm[] | undefined) ?? [];
|
||||
const api = gridRef.current?.api;
|
||||
const sel = (api?.getSelectedRows() as QSOForm[] | undefined) ?? [];
|
||||
setSelCount(sel.length);
|
||||
setDispCount(api?.getDisplayedRowCount?.() ?? 0);
|
||||
onRowSelected?.(sel.map((r) => r.id as number).filter((id) => id != null));
|
||||
}
|
||||
// Select every row when the caller bumps selectAllSignal (QSL Manager search).
|
||||
@@ -406,6 +511,21 @@ export function RecentQSOsGrid({ rows, selectAllSignal, storageKey, onRowDoubleC
|
||||
gridRef.current?.api?.selectAll();
|
||||
}, [selectAllSignal]);
|
||||
|
||||
// Select ONE row by id when the caller bumps selectRowSignal.seq. Deferred a
|
||||
// tick so a row-data refresh in the same render settles first.
|
||||
useEffect(() => {
|
||||
if (!selectRowSignal || selectRowSignal.seq === 0) return;
|
||||
const t = window.setTimeout(() => {
|
||||
const api = gridRef.current?.api;
|
||||
if (!api) return;
|
||||
api.deselectAll();
|
||||
api.forEachNode((n: any) => {
|
||||
if (n.data?.id === selectRowSignal.id) n.setSelected(true);
|
||||
});
|
||||
}, 0);
|
||||
return () => window.clearTimeout(t);
|
||||
}, [selectRowSignal?.seq]);
|
||||
|
||||
// ── Column picker (visibility) ──
|
||||
// Drives AG Grid via setColumnsVisible(). We don't keep a parallel React
|
||||
// state for "which columns are visible" — AG Grid's column state is the
|
||||
@@ -462,6 +582,32 @@ export function RecentQSOsGrid({ rows, selectAllSignal, storageKey, onRowDoubleC
|
||||
return (
|
||||
<>
|
||||
<div className="flex items-center justify-end gap-2 px-2.5 py-1 border-b border-border/60 bg-muted/20">
|
||||
{/* Live selection count — visible without opening the context menu. */}
|
||||
{selCount > 0 && (
|
||||
<span className="mr-auto text-[11px] font-semibold text-primary tabular-nums px-1.5">
|
||||
{t('rqg.selectedCount', { n: selCount })}
|
||||
</span>
|
||||
)}
|
||||
{/* Select every loaded row that passes the active column filters — so a
|
||||
filtered view can be selected in one click (then send to LoTW, bulk
|
||||
edit, export…). Once everything is selected the same button flips to
|
||||
"Unselect all". */}
|
||||
{(() => {
|
||||
const allSelected = selCount > 0 && dispCount > 0 && selCount >= dispCount;
|
||||
return (
|
||||
<Button variant="ghost" size="sm" className="h-7 text-[11px]"
|
||||
title={allSelected ? t('rqg.unselectAllTitle') : t('rqg.selectAllTitle')}
|
||||
onClick={() => {
|
||||
const api: any = gridRef.current?.api;
|
||||
if (!api) return;
|
||||
if (allSelected) api.deselectAll();
|
||||
else if (typeof api.selectAllFiltered === 'function') api.selectAllFiltered();
|
||||
else api.selectAll('filtered');
|
||||
}}>
|
||||
<ListChecks className="size-3.5" /> {allSelected ? t('rqg.unselectAll') : t('rqg.selectAll')}
|
||||
</Button>
|
||||
);
|
||||
})()}
|
||||
<Button variant="ghost" size="sm" className="h-7 text-[11px]" onClick={() => gridRef.current?.api?.setFilterModel(null)}
|
||||
title={t('rqg.clearFiltersTitle')}>
|
||||
<FilterX className="size-3.5" /> {t('rqg.clearFilters')}
|
||||
@@ -510,6 +656,7 @@ export function RecentQSOsGrid({ rows, selectAllSignal, storageKey, onRowDoubleC
|
||||
onSendEQSL={onSendEQSL}
|
||||
onBulkEdit={onBulkEdit}
|
||||
onExportSelected={onExportSelected}
|
||||
onExportSelectedFields={onExportSelectedFields}
|
||||
onExportFiltered={onExportFiltered}
|
||||
onExportCabrilloSelected={onExportCabrilloSelected}
|
||||
onExportCabrilloFiltered={onExportCabrilloFiltered}
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
import { SpellCheck, X } from 'lucide-react';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
|
||||
export type ScpResult = { partial?: string[]; nplus1?: string[] };
|
||||
|
||||
// ScpPanel — Super Check Partial + N+1 callsign helper, split in two columns.
|
||||
// Left: master calls that CONTAIN what you've typed (spot/correct a call). Right:
|
||||
// calls one edit away (busted-call check). Clicking a suggestion fills the entry.
|
||||
export function ScpPanel({ result, currentCall, count, onPick, onClose }: {
|
||||
result: ScpResult;
|
||||
currentCall: string;
|
||||
count: number; // master-list size (0 = list not downloaded yet)
|
||||
onPick: (call: string) => void;
|
||||
onClose: () => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const cur = (currentCall || '').trim().toUpperCase();
|
||||
const partial = result.partial ?? [];
|
||||
const nplus1 = result.nplus1 ?? [];
|
||||
|
||||
const Col = ({ title, tone, calls, empty }: { title: string; tone: string; calls: string[]; empty: string }) => (
|
||||
<div className="flex-1 min-w-0 flex flex-col">
|
||||
<div className={cn('text-[10px] font-bold uppercase tracking-wider px-1.5 py-1 border-b border-border/50', tone)}>{title}</div>
|
||||
<div className="flex-1 min-h-0 overflow-y-auto p-1 space-y-0.5">
|
||||
{calls.length === 0 ? (
|
||||
<div className="text-[10px] text-muted-foreground/70 italic px-1 py-1">{empty}</div>
|
||||
) : calls.map((c) => (
|
||||
<button key={c} type="button" onClick={() => onPick(c)}
|
||||
title={t('scp.fill', { call: c })}
|
||||
className={cn('w-full text-left rounded px-1.5 py-0.5 font-mono text-xs transition-colors',
|
||||
c === cur ? 'bg-success/20 text-success font-bold'
|
||||
: 'hover:bg-primary/15 text-foreground/90')}>
|
||||
{c}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
return (
|
||||
<div className="h-full flex flex-col rounded-xl border border-border bg-gradient-to-b from-card to-muted/30 shadow-sm overflow-hidden">
|
||||
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/40 shrink-0">
|
||||
<SpellCheck className={cn('size-4', count > 0 ? 'text-primary' : 'text-muted-foreground')} />
|
||||
<span className="text-xs font-bold uppercase tracking-[0.18em] text-foreground/80">{t('scp.title')}</span>
|
||||
<span className="flex-1" />
|
||||
<button type="button" onClick={onClose} className="text-muted-foreground hover:text-foreground transition-colors" title={t('scp.close')}>
|
||||
<X className="size-3.5" />
|
||||
</button>
|
||||
</div>
|
||||
{count === 0 ? (
|
||||
<div className="flex-1 min-h-0 flex items-center justify-center text-[11px] text-muted-foreground italic text-center px-3">
|
||||
{t('scp.noList')}
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex-1 min-h-0 flex divide-x divide-border/60">
|
||||
<Col title={t('scp.partial')} tone="text-primary" calls={partial} empty={t('scp.typeMore')} />
|
||||
<Col title="N+1" tone="text-warning" calls={nplus1} empty={t('scp.none')} />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
||||
import { useCallback, useEffect, useRef, useState } from 'react';
|
||||
import { Plus, Pencil, Trash2, Power, PlugZap, Loader2, Check, X, Compass, Square, Antenna as AntennaIcon, ArrowDownToLine, Minus, RefreshCw } from 'lucide-react';
|
||||
import { Plus, Pencil, Trash2, Power, PlugZap, Loader2, Check, X, Compass, Square, Antenna as AntennaIcon, ArrowDownToLine, Minus, RefreshCw, GripVertical } from 'lucide-react';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { Label } from '@/components/ui/label';
|
||||
@@ -8,11 +8,16 @@ import { cn } from '@/lib/utils';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
import { writeUiPref } from '@/lib/uiPref';
|
||||
import { RotorCompass } from '@/components/RotorCompass';
|
||||
import { AmpCard } from '@/components/AmpCard';
|
||||
import { TunerCard } from '@/components/TunerCard';
|
||||
import type { TGStatus } from '@/components/TunerGeniusPanel';
|
||||
import {
|
||||
GetStationDevices, SaveStationDevices, GetStationStatus, StationSetRelay,
|
||||
GetRotatorHeading, RotatorGoTo, RotatorStop,
|
||||
GetUltrabeamStatus, SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements,
|
||||
ListDenkoviDevices, ListSerialPorts, TestStationDevice,
|
||||
GetAmpStatuses, GetFlexState,
|
||||
GetTunerGeniusStatus, GetTunerGeniusSettings,
|
||||
} from '../../wailsjs/go/main/App';
|
||||
|
||||
type RotatorProps = { centerLat?: number | null; centerLon?: number | null; bearing?: number | null };
|
||||
@@ -205,9 +210,11 @@ function MotorAntennaWidget({ ant, refetch, t }: { ant: AntStatus; refetch: () =
|
||||
<p className="text-[11px] text-muted-foreground">{t('station.noLengths')}</p>
|
||||
) : (
|
||||
<div className="space-y-1.5">
|
||||
{/* Hide 0-length elements — an Ultrabeam reports 6 slots but a
|
||||
3-element beam only uses the first few. */}
|
||||
{lengths.map((mm, i) => ({ mm, i })).filter((e) => e.mm > 0).map(({ mm, i }) => (
|
||||
{/* The READ_BANDS reply is undocumented and its 16-bit parse picks
|
||||
up structural bytes past the real data (varying by band), which
|
||||
made 6+ bogus "elements" appear. Ultrabeam beams are 3-element,
|
||||
and ModifyElement addresses elements 0..2 — so show just those. */}
|
||||
{lengths.map((mm, i) => ({ mm, i })).slice(0, 3).map(({ mm, i }) => (
|
||||
<div key={i} className="flex items-center gap-2">
|
||||
<span className="text-xs w-20 shrink-0 text-muted-foreground truncate">{elementName(i, t)}</span>
|
||||
<button type="button" disabled={!ant.connected || busyEl !== null}
|
||||
@@ -259,7 +266,41 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
|
||||
try { const v = JSON.parse(localStorage.getItem('opslog.stationOrder') || '[]'); return Array.isArray(v) ? v : []; } catch { return []; }
|
||||
});
|
||||
const dragId = useRef<string | null>(null);
|
||||
// Max columns per row (persisted). "Auto" fills the window; a number caps the
|
||||
// row so cards wrap onto further lines even when there's horizontal room.
|
||||
const [cols, setCols] = useState<string>(() => localStorage.getItem('opslog.stationCols') || 'auto');
|
||||
// Amplifiers (Settings → Amplifier): shown here so operators without a
|
||||
// FlexRadio panel still get the controls. EVERY configured amp gets its own
|
||||
// card (identical to the Flex panel's) — no dropdown. Polled fast (1.5s) so the
|
||||
// FlexRadio meters read live; the Flex state rides along because a PGXL's
|
||||
// OPERATE/meters come from the radio, not the direct GSCP link.
|
||||
const [amps, setAmps] = useState<any[]>([]);
|
||||
const [flexState, setFlexState] = useState<any>(null);
|
||||
useEffect(() => {
|
||||
let alive = true;
|
||||
const load = () => Promise.all([
|
||||
GetAmpStatuses().catch(() => []),
|
||||
GetFlexState().catch(() => null),
|
||||
]).then(([l, fx]: any[]) => { if (alive) { setAmps((l ?? []) as any[]); setFlexState(fx); } });
|
||||
load();
|
||||
const id = window.setInterval(load, 1500);
|
||||
return () => { alive = false; window.clearInterval(id); };
|
||||
}, []);
|
||||
// Tuner Genius XL (4O3A): a card here too, so operators without a FlexRadio
|
||||
// panel still get the controls. Re-read the enabled flag so it appears/hides
|
||||
// without a restart.
|
||||
const [tg, setTg] = useState<TGStatus>({ connected: false });
|
||||
const [tgEnabled, setTgEnabled] = useState(false);
|
||||
useEffect(() => {
|
||||
let alive = true;
|
||||
const load = async () => {
|
||||
try { const en: any = await GetTunerGeniusSettings(); if (alive) setTgEnabled(!!en?.enabled); } catch {}
|
||||
try { const s: any = await GetTunerGeniusStatus(); if (alive && s) setTg(s as TGStatus); } catch {}
|
||||
};
|
||||
load();
|
||||
const id = window.setInterval(load, 500); // fast so meters track TX (see App.tsx)
|
||||
return () => { alive = false; window.clearInterval(id); };
|
||||
}, []);
|
||||
|
||||
const loadDevices = useCallback(async () => {
|
||||
try { setDevices(((await GetStationDevices()) ?? []) as Device[]); } catch { /* db not ready */ }
|
||||
@@ -346,25 +387,26 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
|
||||
<button className="text-muted-foreground hover:text-destructive" title={t('station.delete')}
|
||||
onClick={() => removeDevice(dev.id)}><Trash2 className="size-3.5" /></button>
|
||||
</div>
|
||||
<div className="p-3 grid grid-cols-2 gap-2">
|
||||
{/* Compact one-line relay buttons at a FIXED width so they don't stretch
|
||||
across the whole card — they wrap to fill the available width instead. */}
|
||||
<div className="p-2 flex flex-wrap gap-1.5">
|
||||
{relays.map((r) => {
|
||||
const key = `${dev.id}:${r.number}`;
|
||||
const label = r.label || `${t('station.relay')} ${r.number}`;
|
||||
return (
|
||||
<button key={r.number} type="button" disabled={!st?.connected}
|
||||
title={label}
|
||||
onClick={() => toggle(dev, r.number, !r.on)}
|
||||
className={cn('flex items-center gap-2 rounded-lg border px-2.5 py-2 text-left transition-colors disabled:opacity-40',
|
||||
className={cn('w-[150px] flex items-center gap-1.5 rounded-md border px-2 py-1 text-left transition-colors disabled:opacity-40',
|
||||
r.on ? 'bg-success/15 border-success/50' : 'bg-muted/30 border-border hover:bg-muted')}>
|
||||
<span className={cn('flex items-center justify-center size-7 rounded-md shrink-0',
|
||||
<span className={cn('flex items-center justify-center size-5 rounded shrink-0',
|
||||
r.on ? 'bg-success text-success-foreground' : 'bg-muted-foreground/15 text-muted-foreground')}>
|
||||
{busy[key] ? <Loader2 className="size-3.5 animate-spin" /> : <Power className="size-3.5" />}
|
||||
{busy[key] ? <Loader2 className="size-3 animate-spin" /> : <Power className="size-3" />}
|
||||
</span>
|
||||
<span className="min-w-0">
|
||||
<span className="block text-xs font-medium truncate">{label}</span>
|
||||
<span className={cn('block text-[10px] font-semibold', r.on ? 'text-success' : 'text-muted-foreground')}>
|
||||
<span className="flex-1 min-w-0 text-xs font-medium truncate">{label}</span>
|
||||
<span className={cn('text-[9px] font-bold shrink-0', r.on ? 'text-success' : 'text-muted-foreground/50')}>
|
||||
{r.on ? t('station.on') : t('station.off')}
|
||||
</span>
|
||||
</span>
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
@@ -373,36 +415,38 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
|
||||
);
|
||||
};
|
||||
|
||||
const widgets: { id: string; node: React.ReactNode }[] = [];
|
||||
// `wide` cards span the whole dashboard instead of sitting in one masonry
|
||||
// column. The amplifier and tuner carry meter rows and a channel selector that
|
||||
// are unreadable squeezed into a ~430px column — they are the same cards the
|
||||
// FlexRadio panel shows full-width, and they need that room here too.
|
||||
const widgets: { id: string; node: React.ReactNode; wide?: boolean }[] = [];
|
||||
if (rot.enabled) {
|
||||
widgets.push({ id: 'rotator', node: <RotatorWidget hd={rot} refetch={pollRot} centerLat={centerLat} centerLon={centerLon} bearing={bearing} t={t} /> });
|
||||
}
|
||||
if (ant.enabled) {
|
||||
widgets.push({ id: 'antenna', node: <MotorAntennaWidget ant={ant} refetch={pollAnt} t={t} /> });
|
||||
}
|
||||
// One card per configured amplifier (identical to the Flex panel's card).
|
||||
for (const amp of amps) widgets.push({ id: `amp:${amp.id}`, node: <AmpCard amp={amp} flex={flexState} t={t} />, wide: true });
|
||||
// Tuner Genius XL card (identical to the Flex panel's).
|
||||
if (tgEnabled) widgets.push({ id: 'tuner', node: <TunerCard status={tg} t={t} />, wide: true });
|
||||
for (const dev of devices) widgets.push({ id: dev.id, node: deviceCard(dev) });
|
||||
|
||||
const rank = (id: string) => { const i = order.indexOf(id); return i < 0 ? 1e6 : i; };
|
||||
const ordered = widgets.map((w, i) => ({ ...w, i })).sort((a, b) => (rank(a.id) - rank(b.id)) || (a.i - b.i));
|
||||
const widgetIds = ordered.map((w) => w.id);
|
||||
|
||||
const noDevices = devices.length === 0 && !rot.enabled && !ant.enabled;
|
||||
|
||||
// Column count controls the layout: with 4 widgets, choosing "2" lays them out
|
||||
// 2×2 — which linear drag-reorder alone can't do, since the grid auto-flows to
|
||||
// fill however many columns are available.
|
||||
const gridCols: Record<string, string> = {
|
||||
auto: 'sm:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4',
|
||||
'1': 'grid-cols-1', '2': 'grid-cols-2', '3': 'grid-cols-3', '4': 'grid-cols-4',
|
||||
};
|
||||
const noDevices = devices.length === 0 && !rot.enabled && !ant.enabled && amps.length === 0 && !tgEnabled;
|
||||
|
||||
return (
|
||||
<div className="flex-1 min-h-0 overflow-auto p-4">
|
||||
<div className="flex items-center justify-between mb-3">
|
||||
<h2 className="text-sm font-bold uppercase tracking-wider text-muted-foreground">{t('station.title')}</h2>
|
||||
<div className="flex items-center gap-2">
|
||||
{/* Max columns per row: Auto fills the window; 1/2/3/4 cap the row so a
|
||||
card can sit on a further line even with horizontal room to spare. */}
|
||||
<div className="flex items-center rounded-md border border-border overflow-hidden text-[11px]">
|
||||
{(['auto', '2', '3', '4'] as const).map((c) => (
|
||||
{(['auto', '1', '2', '3', '4'] as const).map((c) => (
|
||||
<button key={c} type="button"
|
||||
onClick={() => { setCols(c); writeUiPref('opslog.stationCols', c); }}
|
||||
className={cn('px-2 py-1 font-medium', cols === c ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:bg-muted')}>
|
||||
@@ -422,14 +466,31 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className={cn('grid gap-3 items-start', gridCols[cols] ?? gridCols.auto)}>
|
||||
{/* Masonry dashboard: fixed-width cards flow into balanced CSS columns so
|
||||
they pack tightly by height (no ragged gaps under short cards). "Auto"
|
||||
fits as many ~430px columns as the window allows; a fixed count caps the
|
||||
container width to that many columns. Each card has a grip handle (left
|
||||
rail) as the drag initiator (the body is full of buttons). */}
|
||||
<div style={{ columnWidth: '430px', columnGap: '1rem', columnFill: 'balance',
|
||||
...(cols !== 'auto' ? { maxWidth: `${Number(cols) * 446}px` } : {}) }}>
|
||||
{ordered.map((w) => (
|
||||
<div key={w.id} draggable
|
||||
// column-span:all lifts a wide card out of the columns and across the
|
||||
// full container, while keeping it in document order — so drag-reorder
|
||||
// still works between wide and normal cards. Capped so it stays a card
|
||||
// and not a banner on an ultra-wide window.
|
||||
<div key={w.id} className="flex items-stretch break-inside-avoid mb-4"
|
||||
style={w.wide ? { columnSpan: 'all', maxWidth: '900px' } : undefined}
|
||||
onDragOver={(e) => { if (dragId.current) { e.preventDefault(); e.dataTransfer.dropEffect = 'move'; } }}
|
||||
onDrop={(e) => { if (dragId.current) { e.preventDefault(); onDrop(w.id); } }}>
|
||||
<div draggable
|
||||
onDragStart={(e) => { dragId.current = w.id; e.dataTransfer.effectAllowed = 'move'; }}
|
||||
onDragOver={(e) => { e.preventDefault(); e.dataTransfer.dropEffect = 'move'; }}
|
||||
onDrop={(e) => { e.preventDefault(); onDrop(w.id); }}
|
||||
className={cn('cursor-grab active:cursor-grabbing', dragId.current === w.id && 'opacity-60')}>
|
||||
{w.node}
|
||||
onDragEnd={() => { dragId.current = null; }}
|
||||
title={t('station.dragMove')}
|
||||
className={cn('flex items-center shrink-0 px-0.5 rounded-l-xl cursor-grab active:cursor-grabbing text-muted-foreground/30 hover:text-muted-foreground hover:bg-muted/40 transition-colors',
|
||||
dragId.current === w.id && 'opacity-60')}>
|
||||
<GripVertical className="size-4" />
|
||||
</div>
|
||||
<div className="flex-1 min-w-0">{w.node}</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,167 @@
|
||||
import { useRef, useState } from 'react';
|
||||
import { Gauge, Radio, ChevronDown } from 'lucide-react';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { MeterBar } from '@/components/MeterBar';
|
||||
import type { TGStatus, TGChannel } from '@/components/TunerGeniusPanel';
|
||||
import { TunerGeniusAutotune, TunerGeniusSetBypass, TunerGeniusSetOperate, TunerGeniusActivate } from '../../wailsjs/go/main/App';
|
||||
|
||||
// TunerCard renders the 4O3A Tuner Genius XL exactly like the amplifier card
|
||||
// (AmpCard) so Station Control and the FlexRadio panel show the SAME card. It
|
||||
// mirrors the native app's two channels (A / B) with their source, frequency and
|
||||
// antenna, a live PWR / SWR pair, and the Tune / Bypass / Operate actions. It
|
||||
// drives the backend directly (no local state) — the caller's ~1.5s poll
|
||||
// reconciles the display, just like AmpCard. Meters come from the shared MeterBar
|
||||
// so they're the exact same size as the Flex/amp meters.
|
||||
|
||||
function Card({ icon: Icon, title, accent, children, ckey }: { icon: any; title: string; accent?: string; children: React.ReactNode; ckey?: string }) {
|
||||
// Collapsible with persisted state — same behaviour as the FlexRadio panel's Card.
|
||||
const storeKey = 'opslog.cardOpen.' + (ckey || title);
|
||||
const [open, setOpen] = useState(() => localStorage.getItem(storeKey) !== '0');
|
||||
const toggle = () => setOpen((o) => { const n = !o; localStorage.setItem(storeKey, n ? '1' : '0'); return n; });
|
||||
return (
|
||||
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden">
|
||||
<button type="button" onClick={toggle}
|
||||
className={cn('w-full flex items-center gap-2 px-3 py-2 bg-muted/30 hover:bg-muted/50 transition-colors text-left', open && 'border-b border-border/60')}>
|
||||
<Icon className="size-4" style={{ color: accent ?? 'var(--primary)' }} />
|
||||
<span className="text-xs font-bold uppercase tracking-wider text-foreground/80">{title}</span>
|
||||
<ChevronDown className={cn('ml-auto size-4 text-muted-foreground transition-transform', !open && '-rotate-90')} />
|
||||
</button>
|
||||
{open && <div className="p-3 space-y-3">{children}</div>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// ChannelButton — one of the two RF channels (A / B). Clicking it makes that
|
||||
// channel active. Shows the source (RF Sense / Flex / CAT…), frequency and
|
||||
// antenna, matching the two rows of the native 4O3A app.
|
||||
function ChannelButton({ letter, ch, active, ptt, threeWay, onSelect, t }: {
|
||||
letter: 'A' | 'B'; ch: TGChannel; active: boolean; ptt: boolean; threeWay: boolean;
|
||||
onSelect: () => void; t: (k: string, v?: any) => string;
|
||||
}) {
|
||||
const cls = ptt
|
||||
? 'bg-gradient-to-b from-red-500 to-rose-600 text-white border-red-400/50 shadow-[0_0_10px_rgba(244,63,94,0.5)]'
|
||||
: active
|
||||
? 'bg-gradient-to-b from-emerald-500 to-emerald-600 text-white border-emerald-400/50 shadow-[0_0_9px_rgba(16,185,129,0.4)]'
|
||||
: 'bg-card text-foreground/80 border-border hover:bg-muted';
|
||||
const src = ch.mode_str || '—';
|
||||
const freq = ch.freq_mhz && ch.freq_mhz > 0 ? `${ch.freq_mhz.toFixed(3)} MHz` : '—';
|
||||
return (
|
||||
<button type="button" onClick={onSelect}
|
||||
title={active ? t('tgp.chActive', { letter }) : t('tgp.chSelect', { letter })}
|
||||
className={cn('flex-1 min-w-0 rounded-lg border px-2 py-1.5 text-left transition-all active:scale-[0.98]', cls)}>
|
||||
<div className="flex items-center gap-1.5">
|
||||
<span className="font-extrabold text-sm">{letter}</span>
|
||||
<span className="text-[11px] font-semibold truncate opacity-90">{src}</span>
|
||||
{ptt && <span className="ml-auto text-[9px] font-bold uppercase">TX</span>}
|
||||
{!ptt && active && <span className="ml-auto text-[9px] font-bold uppercase opacity-90">{t('tgp.chActiveTag')}</span>}
|
||||
</div>
|
||||
<div className="flex items-center gap-1.5 mt-0.5">
|
||||
<span className="font-mono text-[11px] tabular-nums truncate">{freq}</span>
|
||||
{ch.antenna != null && ch.antenna > 0 && (threeWay || ch.antenna > 0) && (
|
||||
<span className="ml-auto text-[10px] font-semibold whitespace-nowrap opacity-90">{t('tgp.ant')} {ch.antenna}</span>
|
||||
)}
|
||||
</div>
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
||||
export function TunerCard({ status, t }: { status: TGStatus; t: (k: string, v?: any) => string }) {
|
||||
// Peak-hold, exactly as AmpCard does it. Both cards read the same transmitter,
|
||||
// but the tuner is sampled by a 400 ms TCP poll: on SSB that lands in the gaps
|
||||
// between syllables as often as on a peak, so the raw reading collapses to zero
|
||||
// several times a second mid-transmission and reads as a dropped link. The
|
||||
// amplifier looked steady next to it only because it already smoothed this way.
|
||||
// Hold the highest value seen, decaying after 2 s so it follows a real drop.
|
||||
const peak = useRef<Record<string, { v: number; t: number }>>({});
|
||||
const peakHold = (key: string, val: number) => {
|
||||
const now = Date.now();
|
||||
const p = peak.current[key];
|
||||
if (!p || val >= p.v || now - p.t > 2000) { peak.current[key] = { v: val, t: now }; return val; }
|
||||
return p.v;
|
||||
};
|
||||
|
||||
const connected = !!status.connected;
|
||||
const rawVswr = status.vswr && status.vswr > 0 ? status.vswr : undefined;
|
||||
const rawFwdW = status.fwd_w && status.fwd_w >= 1 ? status.fwd_w : 0;
|
||||
const fwdW = peakHold('fwd', rawFwdW);
|
||||
|
||||
// SWR needs RF to mean anything: sampled on receive the device reports a
|
||||
// meaningless 1.00, which would wipe the figure the operator actually wants —
|
||||
// the one measured while transmitting. So show the live value during TX, keep it
|
||||
// briefly afterwards so it can be read, then let it go.
|
||||
//
|
||||
// That expiry is the point: the first version of this held the last TX value
|
||||
// with no timeout at all, so the meter sat frozen on the previous transmission
|
||||
// indefinitely — reading 1.39:1 with the radio plainly in RX and 0 W forward.
|
||||
// Same 2 s window as the power peak above, so the two meters clear together.
|
||||
const swrHold = useRef<{ v: number; t: number } | null>(null);
|
||||
if (rawFwdW >= 1 && rawVswr) swrHold.current = { v: rawVswr, t: Date.now() };
|
||||
const heldSwr = swrHold.current;
|
||||
const vswr = rawFwdW >= 1
|
||||
? rawVswr
|
||||
: heldSwr && Date.now() - heldSwr.t < 2000
|
||||
? heldSwr.v
|
||||
: undefined;
|
||||
const active = status.active ?? 1;
|
||||
const a: TGChannel = status.a ?? {};
|
||||
const b: TGChannel = status.b ?? {};
|
||||
|
||||
const title = `${t('tgp.title')}${status.host ? ' · ' + status.host : ''}`;
|
||||
return (
|
||||
<Card icon={Gauge} title={title} accent="#f59e0b">
|
||||
<div className="flex items-center gap-3 flex-wrap">
|
||||
<button type="button" disabled={!connected}
|
||||
onClick={() => TunerGeniusSetOperate(!status.operate).catch(() => {})}
|
||||
className={cn('px-4 py-2 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||
status.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')}>
|
||||
{status.operate ? 'OPERATE' : 'STANDBY'}
|
||||
</button>
|
||||
<button type="button" disabled={!connected}
|
||||
onClick={() => TunerGeniusAutotune().catch(() => {})}
|
||||
className={cn('inline-flex items-center gap-1.5 px-4 py-2 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||
status.tuning ? 'bg-amber-500 text-white border-amber-500 shadow-[0_0_14px] shadow-amber-500/50 animate-pulse' : 'bg-card text-amber-600 border-amber-500 hover:bg-amber-500/10')}>
|
||||
<Radio className="size-4" />{status.tuning ? t('tgp.tuning') : t('tgp.tune')}
|
||||
</button>
|
||||
<button type="button" disabled={!connected}
|
||||
onClick={() => TunerGeniusSetBypass(!status.bypass).catch(() => {})}
|
||||
className={cn('px-4 py-2 rounded-lg text-sm font-bold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||
status.bypass ? 'bg-sky-500 text-white border-sky-500 shadow-[0_0_12px] shadow-sky-500/40' : 'bg-card text-sky-600 border-sky-500/70 hover:bg-sky-500/10')}>
|
||||
{t('tgp.bypass')}
|
||||
</button>
|
||||
<span className={cn('inline-flex items-center gap-1.5 text-sm', connected ? 'text-muted-foreground' : 'text-danger')}>
|
||||
<span className={cn('size-2 rounded-full', connected ? 'bg-success' : 'bg-danger')} />
|
||||
{connected ? (status.bypass ? t('tgp.bypassed') : t('tgp.inLine')) : t('tgp.offline')}
|
||||
</span>
|
||||
<div className="flex-1" />
|
||||
{status.message && (
|
||||
<span className="px-2 py-1 rounded bg-warning-muted text-warning-muted-foreground text-xs font-bold">⚠ {status.message}</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{connected && (
|
||||
<>
|
||||
{/* Channel A / B selector — click to make active (activate ch=1/2). */}
|
||||
<div className="flex items-stretch gap-2">
|
||||
<ChannelButton letter="A" ch={a} active={active === 1} ptt={!!a.ptt} threeWay={!!status.three_way}
|
||||
onSelect={() => TunerGeniusActivate(1).catch(() => {})} t={t} />
|
||||
<ChannelButton letter="B" ch={b} active={active === 2} ptt={!!b.ptt} threeWay={!!status.three_way}
|
||||
onSelect={() => TunerGeniusActivate(2).catch(() => {})} t={t} />
|
||||
</div>
|
||||
|
||||
{/* PWR + SWR meters, each taking half the card. The amp card's grid is
|
||||
3-wide because it shows three meters; copying it here left the tuner's
|
||||
two meters in the first two of three columns, with a third of the card
|
||||
empty to the right of SWR. */}
|
||||
<div className="grid grid-cols-2 gap-2">
|
||||
<MeterBar label={t('tgp.power')} value={fwdW} unit="W" lo={0} hi={2000}
|
||||
display={fwdW >= 1 ? `${Math.round(fwdW)} W` : '—'}
|
||||
segColor={(f) => (f > 0.9 ? '#dc2626' : f > 0.75 ? '#f59e0b' : '#ea580c')} />
|
||||
<MeterBar label={t('tgp.swr')} value={vswr ?? 1} lo={1} hi={3}
|
||||
display={vswr ? `${vswr.toFixed(2)}:1` : '—'}
|
||||
segColor={(f) => (f > 0.5 ? '#dc2626' : f > 0.25 ? '#f59e0b' : '#16a34a')} />
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,176 @@
|
||||
import { Gauge, X, Power, Radio } from 'lucide-react';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
|
||||
export type TGChannel = {
|
||||
ptt?: boolean; band?: number; mode?: number; mode_str?: string; flex?: string;
|
||||
freq_mhz?: number; bypass?: boolean; antenna?: number;
|
||||
};
|
||||
export type TGStatus = {
|
||||
connected: boolean; host?: string; last_error?: string;
|
||||
fwd_dbm?: number; fwd_w?: number; swr_db?: number; vswr?: number; freq_mhz?: number;
|
||||
operate?: boolean; bypass?: boolean; tuning?: boolean; active?: number;
|
||||
antenna?: number; three_way?: boolean; message?: string;
|
||||
a?: TGChannel; b?: TGChannel;
|
||||
relay_c1?: number; relay_l?: number; relay_c2?: number;
|
||||
};
|
||||
|
||||
// swrColour picks a status colour for the VSWR readout: green ≤1.5, amber ≤2.0,
|
||||
// red above (the usual "safe / caution / high" ATU thresholds).
|
||||
function swrColour(vswr?: number): string {
|
||||
if (!vswr || vswr <= 0) return 'text-muted-foreground';
|
||||
if (vswr <= 1.5) return 'text-success';
|
||||
if (vswr <= 2.0) return 'text-warning';
|
||||
return 'text-danger';
|
||||
}
|
||||
|
||||
// ChanRow — a compact A/B channel line in the docked widget. Highlights the
|
||||
// active channel (green) or TX (red), shows the source + frequency + antenna,
|
||||
// and clicking it makes that channel active.
|
||||
function ChanRow({ letter, ch, active, onSelect, t }: {
|
||||
letter: 'A' | 'B'; ch: TGChannel; active: boolean; onSelect: () => void;
|
||||
t: (k: string, v?: any) => string;
|
||||
}) {
|
||||
const ptt = !!ch.ptt;
|
||||
const cls = ptt
|
||||
? 'bg-gradient-to-r from-red-500 to-rose-600 text-white border-red-400/40'
|
||||
: active
|
||||
? 'bg-gradient-to-r from-emerald-500 to-emerald-600 text-white border-emerald-400/40'
|
||||
: 'bg-card/70 text-foreground/80 border-border hover:bg-muted/60';
|
||||
const src = ch.mode_str || '—';
|
||||
const freq = ch.freq_mhz && ch.freq_mhz > 0 ? `${ch.freq_mhz.toFixed(3)}` : '—';
|
||||
return (
|
||||
<button type="button" onClick={onSelect}
|
||||
title={active ? t('tgp.chActive', { letter }) : t('tgp.chSelect', { letter })}
|
||||
className={cn('w-full flex items-center gap-1.5 rounded-lg border px-2 py-1 text-left transition-all active:scale-[0.98]', cls)}>
|
||||
<span className="font-extrabold text-xs w-3 shrink-0">{letter}</span>
|
||||
<span className="text-[10px] font-semibold truncate opacity-90 w-12 shrink-0">{src}</span>
|
||||
<span className="font-mono text-[10px] tabular-nums truncate flex-1">{freq}</span>
|
||||
{ch.antenna != null && ch.antenna > 0 && (
|
||||
<span className="text-[9px] font-semibold whitespace-nowrap opacity-90 shrink-0">{t('tgp.ant')}{ch.antenna}</span>
|
||||
)}
|
||||
{ptt && <span className="text-[9px] font-bold uppercase shrink-0">TX</span>}
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
||||
// TunerGeniusPanel — compact docked widget for a 4O3A Tuner Genius XL ATU. Shows
|
||||
// the live SWR / forward power, the two RF channels (A / B, click to activate),
|
||||
// and Tune / Bypass / Operate. A fuller card (TunerCard) is shown in the FlexRadio
|
||||
// panel and Station Control.
|
||||
export function TunerGeniusPanel({ status, onTune, onBypass, onOperate, onActivate, onClose }: {
|
||||
status: TGStatus;
|
||||
onTune: () => void;
|
||||
onBypass: (on: boolean) => void;
|
||||
onOperate: (on: boolean) => void;
|
||||
onActivate: (ch: number) => void;
|
||||
onClose: () => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const vswr = status.vswr && status.vswr > 0 ? status.vswr : undefined;
|
||||
const active = status.active ?? 1;
|
||||
|
||||
return (
|
||||
<div className="h-full flex flex-col rounded-xl border border-border bg-gradient-to-b from-card to-muted/30 shadow-sm overflow-hidden">
|
||||
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/40 shrink-0">
|
||||
<Gauge className={cn('size-4', status.connected ? 'text-success drop-shadow-[0_0_3px_rgba(16,185,129,0.55)]' : 'text-muted-foreground')} />
|
||||
<span className="text-xs font-bold uppercase tracking-[0.18em] text-foreground/80">Tuner Genius</span>
|
||||
<span className="flex-1" />
|
||||
<span className="inline-flex items-center gap-1.5 text-[10px] font-mono uppercase tracking-wider">
|
||||
<span className={cn('size-1.5 rounded-full', status.connected ? 'bg-success shadow-[0_0_6px_rgba(16,185,129,0.8)] animate-pulse' : 'bg-danger')} />
|
||||
<span className={status.connected ? 'text-success' : 'text-danger'}>{status.connected ? t('tgp.online') : t('tgp.offline')}</span>
|
||||
</span>
|
||||
<button type="button" onClick={onClose} className="ml-1 text-muted-foreground hover:text-foreground transition-colors" title={t('tgp.close')}>
|
||||
<X className="size-3.5" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{!status.connected ? (
|
||||
<div className="flex-1 min-h-0 flex flex-col items-center justify-center text-xs gap-2 p-3">
|
||||
<div className="text-muted-foreground italic animate-pulse">{t('tgp.connecting')}</div>
|
||||
{status.last_error && <div className="text-danger font-mono text-[10px] break-words text-center px-2">{status.last_error}</div>}
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex-1 min-h-0 overflow-y-auto p-2.5 space-y-2.5">
|
||||
{/* SWR + forward power readouts */}
|
||||
<div className="grid grid-cols-2 gap-2">
|
||||
<div className="rounded-lg border border-border bg-card/70 px-2 py-1.5 text-center">
|
||||
<div className="text-[9px] uppercase tracking-wider text-muted-foreground">{t('tgp.swr')}</div>
|
||||
<div className={cn('text-lg font-bold font-mono leading-tight', swrColour(vswr))}>
|
||||
{vswr ? `${vswr.toFixed(2)}:1` : '—'}
|
||||
</div>
|
||||
</div>
|
||||
<div className="rounded-lg border border-border bg-card/70 px-2 py-1.5 text-center">
|
||||
<div className="text-[9px] uppercase tracking-wider text-muted-foreground">{t('tgp.power')}</div>
|
||||
<div className="text-lg font-bold font-mono leading-tight text-foreground/80">
|
||||
{status.fwd_w && status.fwd_w >= 1 ? `${Math.round(status.fwd_w)} W` : '—'}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Channel A / B — click to activate */}
|
||||
<div className="space-y-1">
|
||||
<ChanRow letter="A" ch={status.a ?? {}} active={active === 1} onSelect={() => onActivate(1)} t={t} />
|
||||
<ChanRow letter="B" ch={status.b ?? {}} active={active === 2} onSelect={() => onActivate(2)} t={t} />
|
||||
</div>
|
||||
|
||||
{status.message && (
|
||||
<div className="rounded-lg border border-warning-border bg-warning-muted text-warning-muted-foreground text-[10px] px-2 py-1 text-center break-words">
|
||||
{status.message}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Tune */}
|
||||
<button
|
||||
type="button"
|
||||
onClick={onTune}
|
||||
disabled={status.tuning}
|
||||
title={t('tgp.tuneHint')}
|
||||
className={cn(
|
||||
'w-full rounded-lg text-sm font-bold py-2 border transition-all active:scale-[0.98]',
|
||||
status.tuning
|
||||
? 'bg-gradient-to-b from-amber-400 to-amber-600 text-white border-amber-300/60 shadow-[0_0_10px_rgba(245,158,11,0.5)] animate-pulse'
|
||||
: 'bg-gradient-to-b from-primary/90 to-primary text-primary-foreground border-primary/40 hover:brightness-110',
|
||||
)}
|
||||
>
|
||||
<span className="inline-flex items-center justify-center gap-2">
|
||||
<Radio className="size-4" />
|
||||
{status.tuning ? t('tgp.tuning') : t('tgp.tune')}
|
||||
</span>
|
||||
</button>
|
||||
|
||||
{/* Bypass + Operate toggles */}
|
||||
<div className="grid grid-cols-2 gap-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => onBypass(!status.bypass)}
|
||||
title={t('tgp.bypassHint')}
|
||||
className={cn(
|
||||
'rounded-lg text-xs font-bold py-1.5 border transition-all active:scale-95',
|
||||
status.bypass
|
||||
? 'bg-gradient-to-b from-sky-400 to-sky-600 text-white border-sky-300/60 shadow-[0_0_9px_rgba(14,165,233,0.45)]'
|
||||
: 'bg-card text-muted-foreground border-border hover:bg-muted hover:text-foreground',
|
||||
)}
|
||||
>
|
||||
{t('tgp.bypass')}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => onOperate(!status.operate)}
|
||||
title={t('tgp.operateHint')}
|
||||
className={cn(
|
||||
'inline-flex items-center justify-center gap-1.5 rounded-lg text-xs font-bold py-1.5 border transition-all active:scale-95',
|
||||
status.operate
|
||||
? 'bg-gradient-to-b from-emerald-400 to-emerald-600 text-white border-emerald-300/60 shadow-[0_0_9px_rgba(16,185,129,0.45)]'
|
||||
: 'bg-card text-muted-foreground border-border hover:bg-muted hover:text-foreground',
|
||||
)}
|
||||
>
|
||||
<Power className="size-3.5" />
|
||||
{status.operate ? t('tgp.operate') : t('tgp.standby')}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -230,9 +230,14 @@ export function WinkeyerPanel({
|
||||
{autoCall && <span className="text-[10px] text-warning/80">{t('wkp.loopHint')}</span>}
|
||||
</div>
|
||||
|
||||
{/* Macro buttons F1… — single-line (F-key + label) to keep the panel short. */}
|
||||
{/* Macro buttons F1… — single-line (F-key + label) to keep the panel short.
|
||||
Empty macros (no label AND no text) are hidden, like the voice keyer;
|
||||
the F-number stays tied to the macro's real index so shortcuts match. */}
|
||||
<div className="grid grid-cols-3 gap-1">
|
||||
{macros.map((m, i) => (
|
||||
{macros
|
||||
.map((m, i) => ({ m, i }))
|
||||
.filter(({ m }) => `${m.label ?? ''}${m.text ?? ''}`.trim() !== '')
|
||||
.map(({ m, i }) => (
|
||||
<button
|
||||
key={i}
|
||||
type="button"
|
||||
|
||||
@@ -35,6 +35,10 @@ type Props = {
|
||||
onSendTo?: (service: string, ids: number[]) => void;
|
||||
onSendRecording?: (ids: number[]) => void;
|
||||
onSendEQSL?: (ids: number[]) => void;
|
||||
onBulkEdit?: (ids: number[]) => void;
|
||||
onExportSelected?: (ids: number[]) => void;
|
||||
onExportSelectedFields?: (ids: number[]) => void;
|
||||
onExportCabrilloSelected?: (ids: number[]) => void;
|
||||
onDelete?: (ids: number[]) => void;
|
||||
// One column per defined award (cell = the reference this QSO counts for).
|
||||
awardCols?: { code: string; name: string }[];
|
||||
@@ -50,7 +54,7 @@ function fmtDate(s: any): string {
|
||||
return `${d.getUTCFullYear()}-${p(d.getUTCMonth() + 1)}-${p(d.getUTCDate())}`;
|
||||
}
|
||||
|
||||
export function WorkedBeforeGrid({ wb, busy, currentCall, onRowDoubleClicked, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onDelete, awardCols }: Props) {
|
||||
export function WorkedBeforeGrid({ wb, busy, currentCall, onRowDoubleClicked, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportCabrilloSelected, onDelete, awardCols }: Props) {
|
||||
const { t } = useI18n();
|
||||
const gridRef = useRef<any>(null);
|
||||
const [pickerOpen, setPickerOpen] = useState(false);
|
||||
@@ -247,6 +251,11 @@ export function WorkedBeforeGrid({ wb, busy, currentCall, onRowDoubleClicked, on
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Same menu as Recent QSOs, minus the two "filtered" exports: there they
|
||||
mean "the whole logbook under the active column filters", but this grid
|
||||
is a per-callsign view rather than a filter over the log, so the entry
|
||||
would quietly export everything — not what it would appear to do here.
|
||||
The selection-based exports and bulk edit apply unchanged. */}
|
||||
<QSOContextMenu
|
||||
menu={menu}
|
||||
onClose={() => setMenu(null)}
|
||||
@@ -256,6 +265,10 @@ export function WorkedBeforeGrid({ wb, busy, currentCall, onRowDoubleClicked, on
|
||||
onSendTo={onSendTo}
|
||||
onSendRecording={onSendRecording}
|
||||
onSendEQSL={onSendEQSL}
|
||||
onBulkEdit={onBulkEdit}
|
||||
onExportSelected={onExportSelected}
|
||||
onExportSelectedFields={onExportSelectedFields}
|
||||
onExportCabrilloSelected={onExportCabrilloSelected}
|
||||
onDelete={onDelete}
|
||||
/>
|
||||
|
||||
|
||||
+191
-27
File diff suppressed because one or more lines are too long
@@ -73,16 +73,24 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
|
||||
const load = () => {
|
||||
tries += 1;
|
||||
GetUIPref(LS_KEY).then((raw) => {
|
||||
// Backend ANSWERED (settings store ready). Apply a valid stored value; an
|
||||
// empty/invalid one means the theme is genuinely unset → keep the default.
|
||||
// Either way we're done — do NOT retry (retrying only matters while the
|
||||
// backend is still starting, which now surfaces as a rejected promise).
|
||||
if (cancelled || userPicked.current) return;
|
||||
const v = raw as ThemeChoice;
|
||||
if (v && ALL.includes(v)) {
|
||||
try { localStorage.setItem(LS_KEY, v); } catch { /* quota */ }
|
||||
applyThemeToDom(v); // idempotent — safe to call unconditionally
|
||||
setThemeState(v);
|
||||
return; // restored
|
||||
}
|
||||
if (tries < 8) window.setTimeout(load, 300); // empty (unset or backend not ready yet) → retry
|
||||
}).catch(() => { if (!cancelled && tries < 8) window.setTimeout(load, 300); });
|
||||
}).catch(() => {
|
||||
// Settings store not ready yet — a brief startup window before the backend
|
||||
// has opened the local DB and built the store (the frontend can query it
|
||||
// first). Keep retrying well past the old 2.4s cap so a dark theme isn't
|
||||
// lost to the light default after an update cleared localStorage.
|
||||
if (!cancelled && !userPicked.current && tries < 120) window.setTimeout(load, 300);
|
||||
});
|
||||
};
|
||||
load();
|
||||
return () => { cancelled = true; };
|
||||
|
||||
@@ -25,6 +25,7 @@ const PORTABLE_KEYS = [
|
||||
'opslog.mapAutoZoomDX', // Main map: auto-zoom to the DX (vs free pan/zoom)
|
||||
'opslog.mapView', // Main map: remembered free-pan view (lat/lon/zoom)
|
||||
'opslog.lookupOnBlur', // run the callsign lookup on blur instead of while typing
|
||||
'opslog.groupDigitalSlots', // matrix + cluster: all digital modes count as ONE (DXCC-style) instead of per-mode slots
|
||||
'opslog.clusterShowFilters', // cluster filter sidebar shown (tab + Main pane)
|
||||
'opslog.mapBasemap', // world map basemap (light / street / satellite)
|
||||
// Cluster filter selections — restored on reopen.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// Single source of truth for the app version shown in the UI (header + About).
|
||||
// Bump this on a release (the release script updates it alongside telemetry.go).
|
||||
export const APP_VERSION = '0.20.7';
|
||||
export const APP_VERSION = '0.21.3';
|
||||
|
||||
// Author / credits, shown in Help -> About.
|
||||
export const APP_AUTHOR = 'F4BPO';
|
||||
|
||||
Vendored
+95
-3
@@ -14,6 +14,7 @@ import {extsvc} from '../models';
|
||||
import {powergenius} from '../models';
|
||||
import {spe} from '../models';
|
||||
import {solar} from '../models';
|
||||
import {tunergenius} from '../models';
|
||||
import {winkeyer} from '../models';
|
||||
import {alerts} from '../models';
|
||||
import {audio} from '../models';
|
||||
@@ -23,11 +24,14 @@ import {udp} from '../models';
|
||||
import {lotwusers} from '../models';
|
||||
import {lookup} from '../models';
|
||||
import {netctl} from '../models';
|
||||
import {scp} from '../models';
|
||||
|
||||
export function ACOMSetOperate(arg1:boolean):Promise<void>;
|
||||
|
||||
export function ACOMSetPower(arg1:boolean):Promise<void>;
|
||||
|
||||
export function ADIFExtraFields():Promise<Array<string>>;
|
||||
|
||||
export function ADIFFields():Promise<Array<adif.FieldDef>>;
|
||||
|
||||
export function ADIFVersion():Promise<string>;
|
||||
@@ -36,6 +40,14 @@ export function ActivateProfile(arg1:number):Promise<void>;
|
||||
|
||||
export function AddQSO(arg1:qso.QSO):Promise<number>;
|
||||
|
||||
export function AmpFanMode(arg1:string,arg2:string):Promise<void>;
|
||||
|
||||
export function AmpOperate(arg1:string,arg2:boolean):Promise<void>;
|
||||
|
||||
export function AmpPower(arg1:string,arg2:boolean):Promise<void>;
|
||||
|
||||
export function AmpPowerLevel(arg1:string,arg2:string):Promise<void>;
|
||||
|
||||
export function AntGeniusActivate(arg1:number,arg2:number):Promise<void>;
|
||||
|
||||
export function AntGeniusDeselect(arg1:number):Promise<void>;
|
||||
@@ -78,6 +90,8 @@ export function BulkUpdateField(arg1:Array<number>,arg2:string,arg3:string):Prom
|
||||
|
||||
export function BulkUpdateQSL(arg1:Array<number>,arg2:main.QSLBulkUpdate):Promise<number>;
|
||||
|
||||
export function CWDecoderRunning():Promise<boolean>;
|
||||
|
||||
export function ChatAvailable():Promise<boolean>;
|
||||
|
||||
export function CheckForUpdate():Promise<main.UpdateInfo>;
|
||||
@@ -154,21 +168,25 @@ export function DownloadAndApplyUpdate(arg1:string):Promise<void>;
|
||||
|
||||
export function DownloadClublogCty():Promise<main.ClublogCtyInfo>;
|
||||
|
||||
export function DownloadClublogMostWanted():Promise<main.ClublogMostWantedInfo>;
|
||||
|
||||
export function DownloadConfirmations(arg1:string,arg2:boolean,arg3:string):Promise<void>;
|
||||
|
||||
export function DownloadLoTWUsers():Promise<number>;
|
||||
|
||||
export function DownloadScp():Promise<number>;
|
||||
|
||||
export function DownloadULSCounties():Promise<void>;
|
||||
|
||||
export function DuplicateProfile(arg1:number,arg2:string):Promise<profile.Profile>;
|
||||
|
||||
export function ExplainAward(arg1:string,arg2:string):Promise<Array<main.AwardExplain>>;
|
||||
|
||||
export function ExportADIF(arg1:string,arg2:boolean):Promise<adif.ExportResult>;
|
||||
export function ExportADIF(arg1:string,arg2:boolean,arg3:Array<string>):Promise<adif.ExportResult>;
|
||||
|
||||
export function ExportADIFFiltered(arg1:string,arg2:boolean,arg3:qso.QueryFilter):Promise<adif.ExportResult>;
|
||||
export function ExportADIFFiltered(arg1:string,arg2:boolean,arg3:qso.QueryFilter,arg4:Array<string>):Promise<adif.ExportResult>;
|
||||
|
||||
export function ExportADIFSelected(arg1:string,arg2:boolean,arg3:Array<number>):Promise<adif.ExportResult>;
|
||||
export function ExportADIFSelected(arg1:string,arg2:boolean,arg3:Array<number>,arg4:Array<string>):Promise<adif.ExportResult>;
|
||||
|
||||
export function ExportAward(arg1:string):Promise<string>;
|
||||
|
||||
@@ -210,6 +228,8 @@ export function FlexSetANF(arg1:boolean):Promise<void>;
|
||||
|
||||
export function FlexSetANFLevel(arg1:number):Promise<void>;
|
||||
|
||||
export function FlexSetANFT(arg1:boolean):Promise<void>;
|
||||
|
||||
export function FlexSetAPF(arg1:boolean):Promise<void>;
|
||||
|
||||
export function FlexSetAPFLevel(arg1:number):Promise<void>;
|
||||
@@ -230,10 +250,20 @@ export function FlexSetCWSidetone(arg1:boolean):Promise<void>;
|
||||
|
||||
export function FlexSetCWSpeed(arg1:number):Promise<void>;
|
||||
|
||||
export function FlexSetDAX(arg1:number):Promise<void>;
|
||||
|
||||
export function FlexSetFilter(arg1:number,arg2:number):Promise<void>;
|
||||
|
||||
export function FlexSetKeySpeed(arg1:number):Promise<void>;
|
||||
|
||||
export function FlexSetLMSANF(arg1:boolean):Promise<void>;
|
||||
|
||||
export function FlexSetLMSANFLevel(arg1:number):Promise<void>;
|
||||
|
||||
export function FlexSetLMSNR(arg1:boolean):Promise<void>;
|
||||
|
||||
export function FlexSetLMSNRLevel(arg1:number):Promise<void>;
|
||||
|
||||
export function FlexSetMic(arg1:number):Promise<void>;
|
||||
|
||||
export function FlexSetMicProfile(arg1:string):Promise<void>;
|
||||
@@ -250,6 +280,10 @@ export function FlexSetNBLevel(arg1:number):Promise<void>;
|
||||
|
||||
export function FlexSetNR(arg1:boolean):Promise<void>;
|
||||
|
||||
export function FlexSetNRF(arg1:boolean):Promise<void>;
|
||||
|
||||
export function FlexSetNRFLevel(arg1:number):Promise<void>;
|
||||
|
||||
export function FlexSetNRLevel(arg1:number):Promise<void>;
|
||||
|
||||
export function FlexSetPower(arg1:number):Promise<void>;
|
||||
@@ -262,14 +296,22 @@ export function FlexSetRIT(arg1:boolean):Promise<void>;
|
||||
|
||||
export function FlexSetRITFreq(arg1:number):Promise<void>;
|
||||
|
||||
export function FlexSetRNN(arg1:boolean):Promise<void>;
|
||||
|
||||
export function FlexSetRXAntenna(arg1:string):Promise<void>;
|
||||
|
||||
export function FlexSetSidetoneLevel(arg1:number):Promise<void>;
|
||||
|
||||
export function FlexSetSpeexNR(arg1:boolean):Promise<void>;
|
||||
|
||||
export function FlexSetSpeexNRLevel(arg1:number):Promise<void>;
|
||||
|
||||
export function FlexSetSplit(arg1:boolean):Promise<void>;
|
||||
|
||||
export function FlexSetTXAntenna(arg1:string):Promise<void>;
|
||||
|
||||
export function FlexSetTXDAX(arg1:boolean):Promise<void>;
|
||||
|
||||
export function FlexSetTXFilter(arg1:number,arg2:number):Promise<void>;
|
||||
|
||||
export function FlexSetTXSlice(arg1:number):Promise<void>;
|
||||
@@ -302,6 +344,10 @@ export function GetActiveProfile():Promise<profile.Profile>;
|
||||
|
||||
export function GetAlertEmailTo():Promise<string>;
|
||||
|
||||
export function GetAmpStatuses():Promise<Array<main.AmpStatus>>;
|
||||
|
||||
export function GetAmplifiers():Promise<Array<main.AmpConfig>>;
|
||||
|
||||
export function GetAntGeniusSettings():Promise<main.AntGeniusSettings>;
|
||||
|
||||
export function GetAntGeniusStatus():Promise<antgenius.Status>;
|
||||
@@ -330,6 +376,8 @@ export function GetCATSettings():Promise<main.CATSettings>;
|
||||
|
||||
export function GetCATState():Promise<cat.RigState>;
|
||||
|
||||
export function GetCWDecoderPitch():Promise<number>;
|
||||
|
||||
export function GetCatalogCodes():Promise<Array<string>>;
|
||||
|
||||
export function GetChangelog():Promise<Array<main.ChangelogEntry>>;
|
||||
@@ -338,6 +386,8 @@ export function GetChatHistory(arg1:number):Promise<Array<main.ChatMessage>>;
|
||||
|
||||
export function GetClublogCtyInfo():Promise<main.ClublogCtyInfo>;
|
||||
|
||||
export function GetClublogMostWantedInfo():Promise<main.ClublogMostWantedInfo>;
|
||||
|
||||
export function GetClusterAutoConnect():Promise<boolean>;
|
||||
|
||||
export function GetClusterStatus():Promise<Array<cluster.ServerStatus>>;
|
||||
@@ -412,6 +462,8 @@ export function GetRotatorSettings():Promise<main.RotatorSettings>;
|
||||
|
||||
export function GetSPEStatus():Promise<spe.Status>;
|
||||
|
||||
export function GetScpStatus():Promise<main.ScpStatus>;
|
||||
|
||||
export function GetSecretStatus():Promise<main.SecretStatus>;
|
||||
|
||||
export function GetSlotStats():Promise<qso.SlotStats>;
|
||||
@@ -428,6 +480,10 @@ export function GetStationStatus():Promise<Array<main.StationDeviceStatus>>;
|
||||
|
||||
export function GetTelemetryEnabled():Promise<boolean>;
|
||||
|
||||
export function GetTunerGeniusSettings():Promise<main.TunerGeniusSettings>;
|
||||
|
||||
export function GetTunerGeniusStatus():Promise<tunergenius.Status>;
|
||||
|
||||
export function GetUIPref(arg1:string):Promise<string>;
|
||||
|
||||
export function GetUltrabeamSettings():Promise<main.UltrabeamSettings>;
|
||||
@@ -630,6 +686,8 @@ export function OperatingDefaultForBand(arg1:string):Promise<operating.BandDefau
|
||||
|
||||
export function PGXLSetFanMode(arg1:string):Promise<void>;
|
||||
|
||||
export function PGXLSetOperate(arg1:boolean):Promise<void>;
|
||||
|
||||
export function PickADIFMonitorFile():Promise<string>;
|
||||
|
||||
export function PickAudioFolder():Promise<string>;
|
||||
@@ -698,6 +756,8 @@ export function RemovePassphrase(arg1:string):Promise<void>;
|
||||
|
||||
export function RenameDatabase(arg1:string):Promise<void>;
|
||||
|
||||
export function RenameLogbook(arg1:string):Promise<void>;
|
||||
|
||||
export function RenderEQSL(arg1:number,arg2:number):Promise<string>;
|
||||
|
||||
export function ReplaceAwardReferences(arg1:string,arg2:Array<awardref.Ref>):Promise<number>;
|
||||
@@ -716,6 +776,8 @@ export function RestartQSORecorder():Promise<void>;
|
||||
|
||||
export function RetryOfflineSync():Promise<number>;
|
||||
|
||||
export function RevealDataFolder():Promise<void>;
|
||||
|
||||
export function RotatorGoTo(arg1:number,arg2:number):Promise<void>;
|
||||
|
||||
export function RotatorPark():Promise<void>;
|
||||
@@ -724,6 +786,8 @@ export function RotatorStop():Promise<void>;
|
||||
|
||||
export function RunBackupNow():Promise<string>;
|
||||
|
||||
export function SMTPConfigured():Promise<boolean>;
|
||||
|
||||
export function SPESetOperate(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SPESetPower(arg1:boolean):Promise<void>;
|
||||
@@ -736,6 +800,8 @@ export function SaveADIFMonitor(arg1:main.ADIFMonitorConfig):Promise<void>;
|
||||
|
||||
export function SaveAlertRule(arg1:alerts.Rule):Promise<alerts.Rule>;
|
||||
|
||||
export function SaveAmplifiers(arg1:Array<main.AmpConfig>):Promise<void>;
|
||||
|
||||
export function SaveAntGeniusSettings(arg1:main.AntGeniusSettings):Promise<void>;
|
||||
|
||||
export function SaveAudioSettings(arg1:main.AudioSettings):Promise<void>;
|
||||
@@ -786,12 +852,16 @@ export function SaveStationDevices(arg1:Array<main.StationDevice>):Promise<void>
|
||||
|
||||
export function SaveStationSettings(arg1:main.StationSettings):Promise<void>;
|
||||
|
||||
export function SaveTunerGeniusSettings(arg1:main.TunerGeniusSettings):Promise<void>;
|
||||
|
||||
export function SaveUDPIntegration(arg1:udp.Config):Promise<udp.Config>;
|
||||
|
||||
export function SaveUltrabeamSettings(arg1:main.UltrabeamSettings):Promise<void>;
|
||||
|
||||
export function SaveWinkeyerSettings(arg1:main.WinkeyerSettings):Promise<void>;
|
||||
|
||||
export function ScpLookup(arg1:string):Promise<scp.Result>;
|
||||
|
||||
export function SearchAwardReferences(arg1:string,arg2:string,arg3:number,arg4:number):Promise<Array<awardref.Ref>>;
|
||||
|
||||
export function SendChatMessage(arg1:string):Promise<main.ChatMessage>;
|
||||
@@ -802,6 +872,8 @@ export function SendClusterSpot(arg1:string,arg2:number,arg3:string):Promise<voi
|
||||
|
||||
export function SendEQSL(arg1:number,arg2:number,arg3:string):Promise<void>;
|
||||
|
||||
export function SendLogToDeveloper():Promise<void>;
|
||||
|
||||
export function SendQSORecordingEmail(arg1:number):Promise<void>;
|
||||
|
||||
export function SetAlertEmailTo(arg1:string):Promise<void>;
|
||||
@@ -810,8 +882,12 @@ export function SetCATFrequency(arg1:number):Promise<void>;
|
||||
|
||||
export function SetCATMode(arg1:string):Promise<void>;
|
||||
|
||||
export function SetCWDecoderPitch(arg1:number):Promise<void>;
|
||||
|
||||
export function SetClublogCtyEnabled(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetClublogMostWantedEnabled(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetClusterAutoConnect(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetCompactMode(arg1:boolean):Promise<void>;
|
||||
@@ -820,14 +896,20 @@ export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
|
||||
|
||||
export function SetPassphrase(arg1:string):Promise<void>;
|
||||
|
||||
export function SetScpEnabled(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetTelemetryEnabled(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetUIPref(arg1:string,arg2:string):Promise<void>;
|
||||
|
||||
export function SetUltrabeamDirection(arg1:number):Promise<void>;
|
||||
|
||||
export function StartCWDecoder():Promise<void>;
|
||||
|
||||
export function StationSetRelay(arg1:string,arg2:number,arg3:boolean):Promise<void>;
|
||||
|
||||
export function StopCWDecoder():Promise<void>;
|
||||
|
||||
export function SwitchCATRig(arg1:number):Promise<void>;
|
||||
|
||||
export function SyncPOTAHunterLog(arg1:boolean,arg2:boolean):Promise<main.POTASyncResult>;
|
||||
@@ -856,6 +938,16 @@ export function TestStationDevice(arg1:main.StationDevice):Promise<main.StationT
|
||||
|
||||
export function TestUltrabeam(arg1:main.UltrabeamSettings):Promise<void>;
|
||||
|
||||
export function TunerGeniusActivate(arg1:number):Promise<void>;
|
||||
|
||||
export function TunerGeniusAutotune():Promise<void>;
|
||||
|
||||
export function TunerGeniusSetBypass(arg1:boolean):Promise<void>;
|
||||
|
||||
export function TunerGeniusSetOperate(arg1:boolean):Promise<void>;
|
||||
|
||||
export function UILog(arg1:string):Promise<void>;
|
||||
|
||||
export function ULSStatus():Promise<main.ULSStatusResult>;
|
||||
|
||||
export function UltrabeamRetract():Promise<void>;
|
||||
|
||||
@@ -10,6 +10,10 @@ export function ACOMSetPower(arg1) {
|
||||
return window['go']['main']['App']['ACOMSetPower'](arg1);
|
||||
}
|
||||
|
||||
export function ADIFExtraFields() {
|
||||
return window['go']['main']['App']['ADIFExtraFields']();
|
||||
}
|
||||
|
||||
export function ADIFFields() {
|
||||
return window['go']['main']['App']['ADIFFields']();
|
||||
}
|
||||
@@ -26,6 +30,22 @@ export function AddQSO(arg1) {
|
||||
return window['go']['main']['App']['AddQSO'](arg1);
|
||||
}
|
||||
|
||||
export function AmpFanMode(arg1, arg2) {
|
||||
return window['go']['main']['App']['AmpFanMode'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function AmpOperate(arg1, arg2) {
|
||||
return window['go']['main']['App']['AmpOperate'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function AmpPower(arg1, arg2) {
|
||||
return window['go']['main']['App']['AmpPower'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function AmpPowerLevel(arg1, arg2) {
|
||||
return window['go']['main']['App']['AmpPowerLevel'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function AntGeniusActivate(arg1, arg2) {
|
||||
return window['go']['main']['App']['AntGeniusActivate'](arg1, arg2);
|
||||
}
|
||||
@@ -110,6 +130,10 @@ export function BulkUpdateQSL(arg1, arg2) {
|
||||
return window['go']['main']['App']['BulkUpdateQSL'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function CWDecoderRunning() {
|
||||
return window['go']['main']['App']['CWDecoderRunning']();
|
||||
}
|
||||
|
||||
export function ChatAvailable() {
|
||||
return window['go']['main']['App']['ChatAvailable']();
|
||||
}
|
||||
@@ -262,6 +286,10 @@ export function DownloadClublogCty() {
|
||||
return window['go']['main']['App']['DownloadClublogCty']();
|
||||
}
|
||||
|
||||
export function DownloadClublogMostWanted() {
|
||||
return window['go']['main']['App']['DownloadClublogMostWanted']();
|
||||
}
|
||||
|
||||
export function DownloadConfirmations(arg1, arg2, arg3) {
|
||||
return window['go']['main']['App']['DownloadConfirmations'](arg1, arg2, arg3);
|
||||
}
|
||||
@@ -270,6 +298,10 @@ export function DownloadLoTWUsers() {
|
||||
return window['go']['main']['App']['DownloadLoTWUsers']();
|
||||
}
|
||||
|
||||
export function DownloadScp() {
|
||||
return window['go']['main']['App']['DownloadScp']();
|
||||
}
|
||||
|
||||
export function DownloadULSCounties() {
|
||||
return window['go']['main']['App']['DownloadULSCounties']();
|
||||
}
|
||||
@@ -282,16 +314,16 @@ export function ExplainAward(arg1, arg2) {
|
||||
return window['go']['main']['App']['ExplainAward'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function ExportADIF(arg1, arg2) {
|
||||
return window['go']['main']['App']['ExportADIF'](arg1, arg2);
|
||||
export function ExportADIF(arg1, arg2, arg3) {
|
||||
return window['go']['main']['App']['ExportADIF'](arg1, arg2, arg3);
|
||||
}
|
||||
|
||||
export function ExportADIFFiltered(arg1, arg2, arg3) {
|
||||
return window['go']['main']['App']['ExportADIFFiltered'](arg1, arg2, arg3);
|
||||
export function ExportADIFFiltered(arg1, arg2, arg3, arg4) {
|
||||
return window['go']['main']['App']['ExportADIFFiltered'](arg1, arg2, arg3, arg4);
|
||||
}
|
||||
|
||||
export function ExportADIFSelected(arg1, arg2, arg3) {
|
||||
return window['go']['main']['App']['ExportADIFSelected'](arg1, arg2, arg3);
|
||||
export function ExportADIFSelected(arg1, arg2, arg3, arg4) {
|
||||
return window['go']['main']['App']['ExportADIFSelected'](arg1, arg2, arg3, arg4);
|
||||
}
|
||||
|
||||
export function ExportAward(arg1) {
|
||||
@@ -374,6 +406,10 @@ export function FlexSetANFLevel(arg1) {
|
||||
return window['go']['main']['App']['FlexSetANFLevel'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetANFT(arg1) {
|
||||
return window['go']['main']['App']['FlexSetANFT'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetAPF(arg1) {
|
||||
return window['go']['main']['App']['FlexSetAPF'](arg1);
|
||||
}
|
||||
@@ -414,6 +450,10 @@ export function FlexSetCWSpeed(arg1) {
|
||||
return window['go']['main']['App']['FlexSetCWSpeed'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetDAX(arg1) {
|
||||
return window['go']['main']['App']['FlexSetDAX'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetFilter(arg1, arg2) {
|
||||
return window['go']['main']['App']['FlexSetFilter'](arg1, arg2);
|
||||
}
|
||||
@@ -422,6 +462,22 @@ export function FlexSetKeySpeed(arg1) {
|
||||
return window['go']['main']['App']['FlexSetKeySpeed'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetLMSANF(arg1) {
|
||||
return window['go']['main']['App']['FlexSetLMSANF'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetLMSANFLevel(arg1) {
|
||||
return window['go']['main']['App']['FlexSetLMSANFLevel'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetLMSNR(arg1) {
|
||||
return window['go']['main']['App']['FlexSetLMSNR'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetLMSNRLevel(arg1) {
|
||||
return window['go']['main']['App']['FlexSetLMSNRLevel'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetMic(arg1) {
|
||||
return window['go']['main']['App']['FlexSetMic'](arg1);
|
||||
}
|
||||
@@ -454,6 +510,14 @@ export function FlexSetNR(arg1) {
|
||||
return window['go']['main']['App']['FlexSetNR'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetNRF(arg1) {
|
||||
return window['go']['main']['App']['FlexSetNRF'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetNRFLevel(arg1) {
|
||||
return window['go']['main']['App']['FlexSetNRFLevel'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetNRLevel(arg1) {
|
||||
return window['go']['main']['App']['FlexSetNRLevel'](arg1);
|
||||
}
|
||||
@@ -478,6 +542,10 @@ export function FlexSetRITFreq(arg1) {
|
||||
return window['go']['main']['App']['FlexSetRITFreq'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetRNN(arg1) {
|
||||
return window['go']['main']['App']['FlexSetRNN'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetRXAntenna(arg1) {
|
||||
return window['go']['main']['App']['FlexSetRXAntenna'](arg1);
|
||||
}
|
||||
@@ -486,6 +554,14 @@ export function FlexSetSidetoneLevel(arg1) {
|
||||
return window['go']['main']['App']['FlexSetSidetoneLevel'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetSpeexNR(arg1) {
|
||||
return window['go']['main']['App']['FlexSetSpeexNR'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetSpeexNRLevel(arg1) {
|
||||
return window['go']['main']['App']['FlexSetSpeexNRLevel'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetSplit(arg1) {
|
||||
return window['go']['main']['App']['FlexSetSplit'](arg1);
|
||||
}
|
||||
@@ -494,6 +570,10 @@ export function FlexSetTXAntenna(arg1) {
|
||||
return window['go']['main']['App']['FlexSetTXAntenna'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetTXDAX(arg1) {
|
||||
return window['go']['main']['App']['FlexSetTXDAX'](arg1);
|
||||
}
|
||||
|
||||
export function FlexSetTXFilter(arg1, arg2) {
|
||||
return window['go']['main']['App']['FlexSetTXFilter'](arg1, arg2);
|
||||
}
|
||||
@@ -558,6 +638,14 @@ export function GetAlertEmailTo() {
|
||||
return window['go']['main']['App']['GetAlertEmailTo']();
|
||||
}
|
||||
|
||||
export function GetAmpStatuses() {
|
||||
return window['go']['main']['App']['GetAmpStatuses']();
|
||||
}
|
||||
|
||||
export function GetAmplifiers() {
|
||||
return window['go']['main']['App']['GetAmplifiers']();
|
||||
}
|
||||
|
||||
export function GetAntGeniusSettings() {
|
||||
return window['go']['main']['App']['GetAntGeniusSettings']();
|
||||
}
|
||||
@@ -614,6 +702,10 @@ export function GetCATState() {
|
||||
return window['go']['main']['App']['GetCATState']();
|
||||
}
|
||||
|
||||
export function GetCWDecoderPitch() {
|
||||
return window['go']['main']['App']['GetCWDecoderPitch']();
|
||||
}
|
||||
|
||||
export function GetCatalogCodes() {
|
||||
return window['go']['main']['App']['GetCatalogCodes']();
|
||||
}
|
||||
@@ -630,6 +722,10 @@ export function GetClublogCtyInfo() {
|
||||
return window['go']['main']['App']['GetClublogCtyInfo']();
|
||||
}
|
||||
|
||||
export function GetClublogMostWantedInfo() {
|
||||
return window['go']['main']['App']['GetClublogMostWantedInfo']();
|
||||
}
|
||||
|
||||
export function GetClusterAutoConnect() {
|
||||
return window['go']['main']['App']['GetClusterAutoConnect']();
|
||||
}
|
||||
@@ -778,6 +874,10 @@ export function GetSPEStatus() {
|
||||
return window['go']['main']['App']['GetSPEStatus']();
|
||||
}
|
||||
|
||||
export function GetScpStatus() {
|
||||
return window['go']['main']['App']['GetScpStatus']();
|
||||
}
|
||||
|
||||
export function GetSecretStatus() {
|
||||
return window['go']['main']['App']['GetSecretStatus']();
|
||||
}
|
||||
@@ -810,6 +910,14 @@ export function GetTelemetryEnabled() {
|
||||
return window['go']['main']['App']['GetTelemetryEnabled']();
|
||||
}
|
||||
|
||||
export function GetTunerGeniusSettings() {
|
||||
return window['go']['main']['App']['GetTunerGeniusSettings']();
|
||||
}
|
||||
|
||||
export function GetTunerGeniusStatus() {
|
||||
return window['go']['main']['App']['GetTunerGeniusStatus']();
|
||||
}
|
||||
|
||||
export function GetUIPref(arg1) {
|
||||
return window['go']['main']['App']['GetUIPref'](arg1);
|
||||
}
|
||||
@@ -1214,6 +1322,10 @@ export function PGXLSetFanMode(arg1) {
|
||||
return window['go']['main']['App']['PGXLSetFanMode'](arg1);
|
||||
}
|
||||
|
||||
export function PGXLSetOperate(arg1) {
|
||||
return window['go']['main']['App']['PGXLSetOperate'](arg1);
|
||||
}
|
||||
|
||||
export function PickADIFMonitorFile() {
|
||||
return window['go']['main']['App']['PickADIFMonitorFile']();
|
||||
}
|
||||
@@ -1350,6 +1462,10 @@ export function RenameDatabase(arg1) {
|
||||
return window['go']['main']['App']['RenameDatabase'](arg1);
|
||||
}
|
||||
|
||||
export function RenameLogbook(arg1) {
|
||||
return window['go']['main']['App']['RenameLogbook'](arg1);
|
||||
}
|
||||
|
||||
export function RenderEQSL(arg1, arg2) {
|
||||
return window['go']['main']['App']['RenderEQSL'](arg1, arg2);
|
||||
}
|
||||
@@ -1386,6 +1502,10 @@ export function RetryOfflineSync() {
|
||||
return window['go']['main']['App']['RetryOfflineSync']();
|
||||
}
|
||||
|
||||
export function RevealDataFolder() {
|
||||
return window['go']['main']['App']['RevealDataFolder']();
|
||||
}
|
||||
|
||||
export function RotatorGoTo(arg1, arg2) {
|
||||
return window['go']['main']['App']['RotatorGoTo'](arg1, arg2);
|
||||
}
|
||||
@@ -1402,6 +1522,10 @@ export function RunBackupNow() {
|
||||
return window['go']['main']['App']['RunBackupNow']();
|
||||
}
|
||||
|
||||
export function SMTPConfigured() {
|
||||
return window['go']['main']['App']['SMTPConfigured']();
|
||||
}
|
||||
|
||||
export function SPESetOperate(arg1) {
|
||||
return window['go']['main']['App']['SPESetOperate'](arg1);
|
||||
}
|
||||
@@ -1426,6 +1550,10 @@ export function SaveAlertRule(arg1) {
|
||||
return window['go']['main']['App']['SaveAlertRule'](arg1);
|
||||
}
|
||||
|
||||
export function SaveAmplifiers(arg1) {
|
||||
return window['go']['main']['App']['SaveAmplifiers'](arg1);
|
||||
}
|
||||
|
||||
export function SaveAntGeniusSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveAntGeniusSettings'](arg1);
|
||||
}
|
||||
@@ -1526,6 +1654,10 @@ export function SaveStationSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveStationSettings'](arg1);
|
||||
}
|
||||
|
||||
export function SaveTunerGeniusSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveTunerGeniusSettings'](arg1);
|
||||
}
|
||||
|
||||
export function SaveUDPIntegration(arg1) {
|
||||
return window['go']['main']['App']['SaveUDPIntegration'](arg1);
|
||||
}
|
||||
@@ -1538,6 +1670,10 @@ export function SaveWinkeyerSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveWinkeyerSettings'](arg1);
|
||||
}
|
||||
|
||||
export function ScpLookup(arg1) {
|
||||
return window['go']['main']['App']['ScpLookup'](arg1);
|
||||
}
|
||||
|
||||
export function SearchAwardReferences(arg1, arg2, arg3, arg4) {
|
||||
return window['go']['main']['App']['SearchAwardReferences'](arg1, arg2, arg3, arg4);
|
||||
}
|
||||
@@ -1558,6 +1694,10 @@ export function SendEQSL(arg1, arg2, arg3) {
|
||||
return window['go']['main']['App']['SendEQSL'](arg1, arg2, arg3);
|
||||
}
|
||||
|
||||
export function SendLogToDeveloper() {
|
||||
return window['go']['main']['App']['SendLogToDeveloper']();
|
||||
}
|
||||
|
||||
export function SendQSORecordingEmail(arg1) {
|
||||
return window['go']['main']['App']['SendQSORecordingEmail'](arg1);
|
||||
}
|
||||
@@ -1574,10 +1714,18 @@ export function SetCATMode(arg1) {
|
||||
return window['go']['main']['App']['SetCATMode'](arg1);
|
||||
}
|
||||
|
||||
export function SetCWDecoderPitch(arg1) {
|
||||
return window['go']['main']['App']['SetCWDecoderPitch'](arg1);
|
||||
}
|
||||
|
||||
export function SetClublogCtyEnabled(arg1) {
|
||||
return window['go']['main']['App']['SetClublogCtyEnabled'](arg1);
|
||||
}
|
||||
|
||||
export function SetClublogMostWantedEnabled(arg1) {
|
||||
return window['go']['main']['App']['SetClublogMostWantedEnabled'](arg1);
|
||||
}
|
||||
|
||||
export function SetClusterAutoConnect(arg1) {
|
||||
return window['go']['main']['App']['SetClusterAutoConnect'](arg1);
|
||||
}
|
||||
@@ -1594,6 +1742,10 @@ export function SetPassphrase(arg1) {
|
||||
return window['go']['main']['App']['SetPassphrase'](arg1);
|
||||
}
|
||||
|
||||
export function SetScpEnabled(arg1) {
|
||||
return window['go']['main']['App']['SetScpEnabled'](arg1);
|
||||
}
|
||||
|
||||
export function SetTelemetryEnabled(arg1) {
|
||||
return window['go']['main']['App']['SetTelemetryEnabled'](arg1);
|
||||
}
|
||||
@@ -1606,10 +1758,18 @@ export function SetUltrabeamDirection(arg1) {
|
||||
return window['go']['main']['App']['SetUltrabeamDirection'](arg1);
|
||||
}
|
||||
|
||||
export function StartCWDecoder() {
|
||||
return window['go']['main']['App']['StartCWDecoder']();
|
||||
}
|
||||
|
||||
export function StationSetRelay(arg1, arg2, arg3) {
|
||||
return window['go']['main']['App']['StationSetRelay'](arg1, arg2, arg3);
|
||||
}
|
||||
|
||||
export function StopCWDecoder() {
|
||||
return window['go']['main']['App']['StopCWDecoder']();
|
||||
}
|
||||
|
||||
export function SwitchCATRig(arg1) {
|
||||
return window['go']['main']['App']['SwitchCATRig'](arg1);
|
||||
}
|
||||
@@ -1666,6 +1826,26 @@ export function TestUltrabeam(arg1) {
|
||||
return window['go']['main']['App']['TestUltrabeam'](arg1);
|
||||
}
|
||||
|
||||
export function TunerGeniusActivate(arg1) {
|
||||
return window['go']['main']['App']['TunerGeniusActivate'](arg1);
|
||||
}
|
||||
|
||||
export function TunerGeniusAutotune() {
|
||||
return window['go']['main']['App']['TunerGeniusAutotune']();
|
||||
}
|
||||
|
||||
export function TunerGeniusSetBypass(arg1) {
|
||||
return window['go']['main']['App']['TunerGeniusSetBypass'](arg1);
|
||||
}
|
||||
|
||||
export function TunerGeniusSetOperate(arg1) {
|
||||
return window['go']['main']['App']['TunerGeniusSetOperate'](arg1);
|
||||
}
|
||||
|
||||
export function UILog(arg1) {
|
||||
return window['go']['main']['App']['UILog'](arg1);
|
||||
}
|
||||
|
||||
export function ULSStatus() {
|
||||
return window['go']['main']['App']['ULSStatus']();
|
||||
}
|
||||
|
||||
@@ -777,6 +777,19 @@ export namespace cat {
|
||||
anf_level: number;
|
||||
wnb: boolean;
|
||||
wnb_level: number;
|
||||
lms_nr: boolean;
|
||||
lms_nr_level: number;
|
||||
lms_anf: boolean;
|
||||
lms_anf_level: number;
|
||||
speex_nr: boolean;
|
||||
speex_nr_level: number;
|
||||
rnn: boolean;
|
||||
anft: boolean;
|
||||
nrf: boolean;
|
||||
nrf_level: number;
|
||||
dsp_v4: boolean;
|
||||
dax_ch: number;
|
||||
tx_dax: boolean;
|
||||
rit: boolean;
|
||||
rit_freq: number;
|
||||
xit: boolean;
|
||||
@@ -844,6 +857,19 @@ export namespace cat {
|
||||
this.anf_level = source["anf_level"];
|
||||
this.wnb = source["wnb"];
|
||||
this.wnb_level = source["wnb_level"];
|
||||
this.lms_nr = source["lms_nr"];
|
||||
this.lms_nr_level = source["lms_nr_level"];
|
||||
this.lms_anf = source["lms_anf"];
|
||||
this.lms_anf_level = source["lms_anf_level"];
|
||||
this.speex_nr = source["speex_nr"];
|
||||
this.speex_nr_level = source["speex_nr_level"];
|
||||
this.rnn = source["rnn"];
|
||||
this.anft = source["anft"];
|
||||
this.nrf = source["nrf"];
|
||||
this.nrf_level = source["nrf_level"];
|
||||
this.dsp_v4 = source["dsp_v4"];
|
||||
this.dax_ch = source["dax_ch"];
|
||||
this.tx_dax = source["tx_dax"];
|
||||
this.rit = source["rit"];
|
||||
this.rit_freq = source["rit_freq"];
|
||||
this.xit = source["xit"];
|
||||
@@ -1400,6 +1426,74 @@ export namespace main {
|
||||
}
|
||||
}
|
||||
|
||||
export class AmpConfig {
|
||||
id: string;
|
||||
name: string;
|
||||
enabled: boolean;
|
||||
type: string;
|
||||
transport: string;
|
||||
host: string;
|
||||
port: number;
|
||||
com_port: string;
|
||||
baud: number;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new AmpConfig(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
this.name = source["name"];
|
||||
this.enabled = source["enabled"];
|
||||
this.type = source["type"];
|
||||
this.transport = source["transport"];
|
||||
this.host = source["host"];
|
||||
this.port = source["port"];
|
||||
this.com_port = source["com_port"];
|
||||
this.baud = source["baud"];
|
||||
}
|
||||
}
|
||||
export class AmpStatus {
|
||||
id: string;
|
||||
name: string;
|
||||
type: string;
|
||||
pgxl?: powergenius.Status;
|
||||
spe?: spe.Status;
|
||||
acom?: acom.Status;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new AmpStatus(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
this.name = source["name"];
|
||||
this.type = source["type"];
|
||||
this.pgxl = this.convertValues(source["pgxl"], powergenius.Status);
|
||||
this.spe = this.convertValues(source["spe"], spe.Status);
|
||||
this.acom = this.convertValues(source["acom"], acom.Status);
|
||||
}
|
||||
|
||||
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 AntGeniusSettings {
|
||||
enabled: boolean;
|
||||
host: string;
|
||||
@@ -1855,6 +1949,26 @@ export namespace main {
|
||||
this.count = source["count"];
|
||||
}
|
||||
}
|
||||
export class ClublogMostWantedInfo {
|
||||
enabled: boolean;
|
||||
loaded: boolean;
|
||||
callsign: string;
|
||||
date: string;
|
||||
count: number;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new ClublogMostWantedInfo(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.enabled = source["enabled"];
|
||||
this.loaded = source["loaded"];
|
||||
this.callsign = source["callsign"];
|
||||
this.date = source["date"];
|
||||
this.count = source["count"];
|
||||
}
|
||||
}
|
||||
export class ContestBandRow {
|
||||
band: string;
|
||||
count: number;
|
||||
@@ -1995,6 +2109,7 @@ export namespace main {
|
||||
path: string;
|
||||
default_path: string;
|
||||
is_custom: boolean;
|
||||
logbook_default_path: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new DatabaseSettings(source);
|
||||
@@ -2005,6 +2120,7 @@ export namespace main {
|
||||
this.path = source["path"];
|
||||
this.default_path = source["default_path"];
|
||||
this.is_custom = source["is_custom"];
|
||||
this.logbook_default_path = source["logbook_default_path"];
|
||||
}
|
||||
}
|
||||
export class DuplicateGroup {
|
||||
@@ -2201,6 +2317,7 @@ export namespace main {
|
||||
user: string;
|
||||
password: string;
|
||||
database: string;
|
||||
sqlite_path?: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new MySQLSettings(source);
|
||||
@@ -2214,6 +2331,7 @@ export namespace main {
|
||||
this.user = source["user"];
|
||||
this.password = source["password"];
|
||||
this.database = source["database"];
|
||||
this.sqlite_path = source["sqlite_path"];
|
||||
}
|
||||
}
|
||||
export class OfflineStatus {
|
||||
@@ -2583,6 +2701,8 @@ export namespace main {
|
||||
port: number;
|
||||
has_elevation: boolean;
|
||||
rotator_num: number;
|
||||
transport: string;
|
||||
com_port: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new RotatorSettings(source);
|
||||
@@ -2596,6 +2716,24 @@ export namespace main {
|
||||
this.port = source["port"];
|
||||
this.has_elevation = source["has_elevation"];
|
||||
this.rotator_num = source["rotator_num"];
|
||||
this.transport = source["transport"];
|
||||
this.com_port = source["com_port"];
|
||||
}
|
||||
}
|
||||
export class ScpStatus {
|
||||
enabled: boolean;
|
||||
count: number;
|
||||
updated?: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new ScpStatus(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.enabled = source["enabled"];
|
||||
this.count = source["count"];
|
||||
this.updated = source["updated"];
|
||||
}
|
||||
}
|
||||
export class SecretStatus {
|
||||
@@ -2817,6 +2955,22 @@ export namespace main {
|
||||
this.error = source["error"];
|
||||
}
|
||||
}
|
||||
export class TunerGeniusSettings {
|
||||
enabled: boolean;
|
||||
host: string;
|
||||
password: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new TunerGeniusSettings(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.enabled = source["enabled"];
|
||||
this.host = source["host"];
|
||||
this.password = source["password"];
|
||||
}
|
||||
}
|
||||
export class ULSStatusResult {
|
||||
count: number;
|
||||
updated_at: string;
|
||||
@@ -2842,6 +2996,8 @@ export namespace main {
|
||||
follow: boolean;
|
||||
step_khz: number;
|
||||
tx_inhibit: boolean;
|
||||
freq_min_mhz: number;
|
||||
freq_max_mhz: number;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new UltrabeamSettings(source);
|
||||
@@ -2859,6 +3015,8 @@ export namespace main {
|
||||
this.follow = source["follow"];
|
||||
this.step_khz = source["step_khz"];
|
||||
this.tx_inhibit = source["tx_inhibit"];
|
||||
this.freq_min_mhz = source["freq_min_mhz"];
|
||||
this.freq_max_mhz = source["freq_max_mhz"];
|
||||
}
|
||||
}
|
||||
export class UltrabeamStatusInfo {
|
||||
@@ -2937,9 +3095,13 @@ export namespace main {
|
||||
autospace: boolean;
|
||||
use_ptt: boolean;
|
||||
serial_echo: boolean;
|
||||
type: string;
|
||||
cw_key_line: string;
|
||||
cw_invert: boolean;
|
||||
engine: string;
|
||||
esc_clears_call: boolean;
|
||||
send_on_type: boolean;
|
||||
esm: boolean;
|
||||
macros: WKMacro[];
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
@@ -2963,9 +3125,13 @@ export namespace main {
|
||||
this.autospace = source["autospace"];
|
||||
this.use_ptt = source["use_ptt"];
|
||||
this.serial_echo = source["serial_echo"];
|
||||
this.type = source["type"];
|
||||
this.cw_key_line = source["cw_key_line"];
|
||||
this.cw_invert = source["cw_invert"];
|
||||
this.engine = source["engine"];
|
||||
this.esc_clears_call = source["esc_clears_call"];
|
||||
this.send_on_type = source["send_on_type"];
|
||||
this.esm = source["esm"];
|
||||
this.macros = this.convertValues(source["macros"], WKMacro);
|
||||
}
|
||||
|
||||
@@ -3208,6 +3374,7 @@ export namespace powergenius {
|
||||
state?: string;
|
||||
fan_mode?: string;
|
||||
temperature: number;
|
||||
operate: boolean;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Status(source);
|
||||
@@ -3221,6 +3388,7 @@ export namespace powergenius {
|
||||
this.state = source["state"];
|
||||
this.fan_mode = source["fan_mode"];
|
||||
this.temperature = source["temperature"];
|
||||
this.operate = source["operate"];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3235,6 +3403,7 @@ export namespace profile {
|
||||
user: string;
|
||||
password: string;
|
||||
database: string;
|
||||
path?: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new ProfileDB(source);
|
||||
@@ -3248,6 +3417,7 @@ export namespace profile {
|
||||
this.user = source["user"];
|
||||
this.password = source["password"];
|
||||
this.database = source["database"];
|
||||
this.path = source["path"];
|
||||
}
|
||||
}
|
||||
export class Profile {
|
||||
@@ -4119,6 +4289,7 @@ export namespace qso {
|
||||
dxcc_bands: string[];
|
||||
dxcc_modes: string[];
|
||||
dxcc_band_modes: BandMode[];
|
||||
mw_rank?: number;
|
||||
band_status: BandStatus[];
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
@@ -4143,6 +4314,7 @@ export namespace qso {
|
||||
this.dxcc_bands = source["dxcc_bands"];
|
||||
this.dxcc_modes = source["dxcc_modes"];
|
||||
this.dxcc_band_modes = this.convertValues(source["dxcc_band_modes"], BandMode);
|
||||
this.mw_rank = source["mw_rank"];
|
||||
this.band_status = this.convertValues(source["band_status"], BandStatus);
|
||||
}
|
||||
|
||||
@@ -4167,6 +4339,25 @@ export namespace qso {
|
||||
|
||||
}
|
||||
|
||||
export namespace scp {
|
||||
|
||||
export class Result {
|
||||
partial: string[];
|
||||
nplus1: string[];
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Result(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.partial = source["partial"];
|
||||
this.nplus1 = source["nplus1"];
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export namespace solar {
|
||||
|
||||
export class Data {
|
||||
@@ -4274,6 +4465,105 @@ export namespace spe {
|
||||
|
||||
}
|
||||
|
||||
export namespace tunergenius {
|
||||
|
||||
export class Channel {
|
||||
ptt: boolean;
|
||||
band: number;
|
||||
mode: number;
|
||||
mode_str: string;
|
||||
flex: string;
|
||||
freq_mhz: number;
|
||||
bypass: boolean;
|
||||
antenna: number;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Channel(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.ptt = source["ptt"];
|
||||
this.band = source["band"];
|
||||
this.mode = source["mode"];
|
||||
this.mode_str = source["mode_str"];
|
||||
this.flex = source["flex"];
|
||||
this.freq_mhz = source["freq_mhz"];
|
||||
this.bypass = source["bypass"];
|
||||
this.antenna = source["antenna"];
|
||||
}
|
||||
}
|
||||
export class Status {
|
||||
connected: boolean;
|
||||
host?: string;
|
||||
last_error?: string;
|
||||
fwd_dbm: number;
|
||||
fwd_w: number;
|
||||
swr_db: number;
|
||||
vswr: number;
|
||||
operate: boolean;
|
||||
bypass: boolean;
|
||||
tuning: boolean;
|
||||
active: number;
|
||||
three_way: boolean;
|
||||
a: Channel;
|
||||
b: Channel;
|
||||
relay_c1: number;
|
||||
relay_l: number;
|
||||
relay_c2: number;
|
||||
freq_mhz: number;
|
||||
antenna: number;
|
||||
message?: 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.host = source["host"];
|
||||
this.last_error = source["last_error"];
|
||||
this.fwd_dbm = source["fwd_dbm"];
|
||||
this.fwd_w = source["fwd_w"];
|
||||
this.swr_db = source["swr_db"];
|
||||
this.vswr = source["vswr"];
|
||||
this.operate = source["operate"];
|
||||
this.bypass = source["bypass"];
|
||||
this.tuning = source["tuning"];
|
||||
this.active = source["active"];
|
||||
this.three_way = source["three_way"];
|
||||
this.a = this.convertValues(source["a"], Channel);
|
||||
this.b = this.convertValues(source["b"], Channel);
|
||||
this.relay_c1 = source["relay_c1"];
|
||||
this.relay_l = source["relay_l"];
|
||||
this.relay_c2 = source["relay_c2"];
|
||||
this.freq_mhz = source["freq_mhz"];
|
||||
this.antenna = source["antenna"];
|
||||
this.message = source["message"];
|
||||
}
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
}
|
||||
if (a.slice && a.map) {
|
||||
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||
} else if ("object" === typeof a) {
|
||||
if (asMap) {
|
||||
for (const key of Object.keys(a)) {
|
||||
a[key] = new classs(a[key]);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
return new classs(a);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export namespace udp {
|
||||
|
||||
export class Config {
|
||||
|
||||
+162
-131
@@ -34,6 +34,12 @@ type Exporter struct {
|
||||
// export destined for another logger; set true for a full OpsLog→OpsLog
|
||||
// round-trip that preserves everything.
|
||||
IncludeAppFields bool
|
||||
|
||||
// Fields, when non-nil, restricts the export to exactly these ADIF tags
|
||||
// (uppercase) — the "choose which fields to export" mode. nil = write every
|
||||
// field (the standard/full behaviour above). When set it overrides
|
||||
// IncludeAppFields: an APP_/vendor tag is written iff it's in the set.
|
||||
Fields map[string]bool
|
||||
}
|
||||
|
||||
// iterator streams QSOs through fn. The three concrete sources (all, filtered,
|
||||
@@ -100,7 +106,7 @@ func (e *Exporter) writeDoc(ctx context.Context, w io.Writer, iter iterator) (in
|
||||
|
||||
count := 0
|
||||
err := iter(ctx, func(q qso.QSO) error {
|
||||
writeRecord(bw, q, e.IncludeAppFields)
|
||||
writeRecord(bw, q, e.IncludeAppFields, e.Fields)
|
||||
count++
|
||||
return nil
|
||||
})
|
||||
@@ -115,7 +121,7 @@ func SingleRecordADIF(q qso.QSO) string {
|
||||
var b strings.Builder
|
||||
bw := bufio.NewWriter(&b)
|
||||
// Uploads target other services — keep it standard (no app-specific tags).
|
||||
writeRecord(bw, q, false)
|
||||
writeRecord(bw, q, false, nil)
|
||||
bw.Flush()
|
||||
return b.String()
|
||||
}
|
||||
@@ -127,7 +133,7 @@ func SingleRecordADIF(q qso.QSO) string {
|
||||
func FullRecordADIF(q qso.QSO) string {
|
||||
var b strings.Builder
|
||||
bw := bufio.NewWriter(&b)
|
||||
writeRecord(bw, q, true)
|
||||
writeRecord(bw, q, true, nil)
|
||||
bw.Flush()
|
||||
return b.String()
|
||||
}
|
||||
@@ -155,161 +161,181 @@ func BatchRecordsADIF(records []string) string {
|
||||
// Empty fields are omitted. MODE/SUBMODE are massaged so a "promoted"
|
||||
// mode (e.g. FT4 stored without a parent) is exported as the canonical
|
||||
// pair MODE=MFSK SUBMODE=FT4 — round-trips cleanly with strict loggers.
|
||||
func writeRecord(bw *bufio.Writer, q qso.QSO, includeApp bool) {
|
||||
func writeRecord(bw *bufio.Writer, q qso.QSO, includeApp bool, allow map[string]bool) {
|
||||
// allow == nil → write every promoted field (standard/full behaviour).
|
||||
// Otherwise a promoted tag is written only when it's in the chosen set.
|
||||
// w/wi/wf wrap the raw writers with that gate so the ~150 field lines below
|
||||
// stay one-liners.
|
||||
ok := func(tag string) bool { return allow == nil || allow[tag] }
|
||||
w := func(tag, v string) {
|
||||
if ok(tag) {
|
||||
writeField(bw, tag, v)
|
||||
}
|
||||
}
|
||||
wi := func(tag string, p *int) {
|
||||
if ok(tag) {
|
||||
writeIntPtr(bw, tag, p)
|
||||
}
|
||||
}
|
||||
wf := func(tag string, p *float64, decimals int) {
|
||||
if ok(tag) {
|
||||
writeFloatPtr(bw, tag, p, decimals)
|
||||
}
|
||||
}
|
||||
// --- Core ---
|
||||
writeField(bw, "CALL", q.Callsign)
|
||||
w("CALL", q.Callsign)
|
||||
|
||||
if !q.QSODate.IsZero() {
|
||||
writeField(bw, "QSO_DATE", q.QSODate.UTC().Format("20060102"))
|
||||
writeField(bw, "TIME_ON", q.QSODate.UTC().Format("150405"))
|
||||
w("QSO_DATE", q.QSODate.UTC().Format("20060102"))
|
||||
w("TIME_ON", q.QSODate.UTC().Format("150405"))
|
||||
}
|
||||
if !q.QSODateOff.IsZero() {
|
||||
writeField(bw, "QSO_DATE_OFF", q.QSODateOff.UTC().Format("20060102"))
|
||||
writeField(bw, "TIME_OFF", q.QSODateOff.UTC().Format("150405"))
|
||||
w("QSO_DATE_OFF", q.QSODateOff.UTC().Format("20060102"))
|
||||
w("TIME_OFF", q.QSODateOff.UTC().Format("150405"))
|
||||
}
|
||||
writeField(bw, "BAND", q.Band)
|
||||
writeField(bw, "BAND_RX", q.BandRX)
|
||||
w("BAND", q.Band)
|
||||
w("BAND_RX", q.BandRX)
|
||||
|
||||
mode, submode := modeForExport(q.Mode, q.Submode)
|
||||
writeField(bw, "MODE", mode)
|
||||
writeField(bw, "SUBMODE", submode)
|
||||
w("MODE", mode)
|
||||
w("SUBMODE", submode)
|
||||
|
||||
if q.FreqHz != nil && *q.FreqHz > 0 {
|
||||
writeField(bw, "FREQ", strconv.FormatFloat(float64(*q.FreqHz)/1_000_000, 'f', 6, 64))
|
||||
w("FREQ", strconv.FormatFloat(float64(*q.FreqHz)/1_000_000, 'f', 6, 64))
|
||||
}
|
||||
if q.FreqRXHz != nil && *q.FreqRXHz > 0 {
|
||||
writeField(bw, "FREQ_RX", strconv.FormatFloat(float64(*q.FreqRXHz)/1_000_000, 'f', 6, 64))
|
||||
w("FREQ_RX", strconv.FormatFloat(float64(*q.FreqRXHz)/1_000_000, 'f', 6, 64))
|
||||
}
|
||||
|
||||
writeField(bw, "RST_SENT", q.RSTSent)
|
||||
writeField(bw, "RST_RCVD", q.RSTRcvd)
|
||||
w("RST_SENT", q.RSTSent)
|
||||
w("RST_RCVD", q.RSTRcvd)
|
||||
|
||||
// --- Contacted ---
|
||||
writeField(bw, "NAME", q.Name)
|
||||
writeField(bw, "QTH", q.QTH)
|
||||
writeField(bw, "ADDRESS", q.Address)
|
||||
writeField(bw, "EMAIL", q.Email)
|
||||
writeField(bw, "WEB", q.Web)
|
||||
writeField(bw, "GRIDSQUARE", q.Grid)
|
||||
writeField(bw, "GRIDSQUARE_EXT", q.GridExt)
|
||||
writeField(bw, "VUCC_GRIDS", q.VUCCGrids)
|
||||
writeField(bw, "COUNTRY", q.Country)
|
||||
writeField(bw, "STATE", q.State)
|
||||
writeField(bw, "CNTY", q.County)
|
||||
writeIntPtr(bw, "DXCC", q.DXCC)
|
||||
writeField(bw, "CONT", q.Continent)
|
||||
writeIntPtr(bw, "CQZ", q.CQZ)
|
||||
writeIntPtr(bw, "ITUZ", q.ITUZ)
|
||||
writeField(bw, "IOTA", q.IOTA)
|
||||
writeField(bw, "SOTA_REF", q.SOTARef)
|
||||
writeField(bw, "POTA_REF", q.POTARef)
|
||||
writeIntPtr(bw, "AGE", q.Age)
|
||||
writeFloatPtr(bw, "LAT", q.Lat, 6)
|
||||
writeFloatPtr(bw, "LON", q.Lon, 6)
|
||||
writeField(bw, "RIG", q.Rig)
|
||||
writeField(bw, "ANT", q.Ant)
|
||||
w("NAME", q.Name)
|
||||
w("QTH", q.QTH)
|
||||
w("ADDRESS", q.Address)
|
||||
w("EMAIL", q.Email)
|
||||
w("WEB", q.Web)
|
||||
w("GRIDSQUARE", q.Grid)
|
||||
w("GRIDSQUARE_EXT", q.GridExt)
|
||||
w("VUCC_GRIDS", q.VUCCGrids)
|
||||
w("COUNTRY", q.Country)
|
||||
w("STATE", q.State)
|
||||
w("CNTY", q.County)
|
||||
wi("DXCC", q.DXCC)
|
||||
w("CONT", q.Continent)
|
||||
wi("CQZ", q.CQZ)
|
||||
wi("ITUZ", q.ITUZ)
|
||||
w("IOTA", q.IOTA)
|
||||
w("SOTA_REF", q.SOTARef)
|
||||
w("POTA_REF", q.POTARef)
|
||||
wi("AGE", q.Age)
|
||||
wf("LAT", q.Lat, 6)
|
||||
wf("LON", q.Lon, 6)
|
||||
w("RIG", q.Rig)
|
||||
w("ANT", q.Ant)
|
||||
|
||||
// --- QSL / LoTW / eQSL / Clublog / HRDLog ---
|
||||
writeField(bw, "QSL_SENT", q.QSLSent)
|
||||
writeField(bw, "QSL_RCVD", q.QSLRcvd)
|
||||
writeField(bw, "QSLSDATE", q.QSLSentDate)
|
||||
writeField(bw, "QSLRDATE", q.QSLRcvdDate)
|
||||
writeField(bw, "QSL_VIA", q.QSLVia)
|
||||
writeField(bw, "QSLMSG", q.QSLMsg)
|
||||
writeField(bw, "QSLMSG_RCVD", q.QSLMsgRcvd)
|
||||
writeField(bw, "LOTW_QSL_SENT", q.LOTWSent)
|
||||
writeField(bw, "LOTW_QSL_RCVD", q.LOTWRcvd)
|
||||
writeField(bw, "LOTW_QSLSDATE", q.LOTWSentDate)
|
||||
writeField(bw, "LOTW_QSLRDATE", q.LOTWRcvdDate)
|
||||
writeField(bw, "EQSL_QSL_SENT", q.EQSLSent)
|
||||
writeField(bw, "EQSL_QSL_RCVD", q.EQSLRcvd)
|
||||
writeField(bw, "EQSL_QSLSDATE", q.EQSLSentDate)
|
||||
writeField(bw, "EQSL_QSLRDATE", q.EQSLRcvdDate)
|
||||
writeField(bw, "CLUBLOG_QSO_UPLOAD_DATE", q.ClublogUploadDate)
|
||||
writeField(bw, "CLUBLOG_QSO_UPLOAD_STATUS", q.ClublogUploadStatus)
|
||||
writeField(bw, "HRDLOG_QSO_UPLOAD_DATE", q.HRDLogUploadDate)
|
||||
writeField(bw, "HRDLOG_QSO_UPLOAD_STATUS", q.HRDLogUploadStatus)
|
||||
writeField(bw, "QRZCOM_QSO_UPLOAD_DATE", q.QRZComUploadDate)
|
||||
writeField(bw, "QRZCOM_QSO_UPLOAD_STATUS", q.QRZComUploadStatus)
|
||||
writeField(bw, "QRZCOM_QSO_DOWNLOAD_DATE", q.QRZComDownloadDate)
|
||||
writeField(bw, "QRZCOM_QSO_DOWNLOAD_STATUS", q.QRZComDownloadStatus)
|
||||
w("QSL_SENT", q.QSLSent)
|
||||
w("QSL_RCVD", q.QSLRcvd)
|
||||
w("QSLSDATE", q.QSLSentDate)
|
||||
w("QSLRDATE", q.QSLRcvdDate)
|
||||
w("QSL_VIA", q.QSLVia)
|
||||
w("QSLMSG", q.QSLMsg)
|
||||
w("QSLMSG_RCVD", q.QSLMsgRcvd)
|
||||
w("LOTW_QSL_SENT", q.LOTWSent)
|
||||
w("LOTW_QSL_RCVD", q.LOTWRcvd)
|
||||
w("LOTW_QSLSDATE", q.LOTWSentDate)
|
||||
w("LOTW_QSLRDATE", q.LOTWRcvdDate)
|
||||
w("EQSL_QSL_SENT", q.EQSLSent)
|
||||
w("EQSL_QSL_RCVD", q.EQSLRcvd)
|
||||
w("EQSL_QSLSDATE", q.EQSLSentDate)
|
||||
w("EQSL_QSLRDATE", q.EQSLRcvdDate)
|
||||
w("CLUBLOG_QSO_UPLOAD_DATE", q.ClublogUploadDate)
|
||||
w("CLUBLOG_QSO_UPLOAD_STATUS", q.ClublogUploadStatus)
|
||||
w("HRDLOG_QSO_UPLOAD_DATE", q.HRDLogUploadDate)
|
||||
w("HRDLOG_QSO_UPLOAD_STATUS", q.HRDLogUploadStatus)
|
||||
w("QRZCOM_QSO_UPLOAD_DATE", q.QRZComUploadDate)
|
||||
w("QRZCOM_QSO_UPLOAD_STATUS", q.QRZComUploadStatus)
|
||||
w("QRZCOM_QSO_DOWNLOAD_DATE", q.QRZComDownloadDate)
|
||||
w("QRZCOM_QSO_DOWNLOAD_STATUS", q.QRZComDownloadStatus)
|
||||
|
||||
// --- Contest ---
|
||||
writeField(bw, "CONTEST_ID", q.ContestID)
|
||||
writeIntPtr(bw, "SRX", q.SRX)
|
||||
writeIntPtr(bw, "STX", q.STX)
|
||||
writeField(bw, "SRX_STRING", q.SRXString)
|
||||
writeField(bw, "STX_STRING", q.STXString)
|
||||
writeField(bw, "CHECK", q.Check)
|
||||
writeField(bw, "PRECEDENCE", q.Precedence)
|
||||
writeField(bw, "ARRL_SECT", q.ARRLSect)
|
||||
w("CONTEST_ID", q.ContestID)
|
||||
wi("SRX", q.SRX)
|
||||
wi("STX", q.STX)
|
||||
w("SRX_STRING", q.SRXString)
|
||||
w("STX_STRING", q.STXString)
|
||||
w("CHECK", q.Check)
|
||||
w("PRECEDENCE", q.Precedence)
|
||||
w("ARRL_SECT", q.ARRLSect)
|
||||
|
||||
// --- Satellite / propagation ---
|
||||
writeField(bw, "PROP_MODE", q.PropMode)
|
||||
writeField(bw, "SAT_NAME", q.SatName)
|
||||
writeField(bw, "SAT_MODE", q.SatMode)
|
||||
writeFloatPtr(bw, "ANT_AZ", q.AntAz, 1)
|
||||
writeFloatPtr(bw, "ANT_EL", q.AntEl, 1)
|
||||
writeField(bw, "ANT_PATH", q.AntPath)
|
||||
w("PROP_MODE", q.PropMode)
|
||||
w("SAT_NAME", q.SatName)
|
||||
w("SAT_MODE", q.SatMode)
|
||||
wf("ANT_AZ", q.AntAz, 1)
|
||||
wf("ANT_EL", q.AntEl, 1)
|
||||
w("ANT_PATH", q.AntPath)
|
||||
|
||||
// --- My station / operator ---
|
||||
writeField(bw, "STATION_CALLSIGN", q.StationCallsign)
|
||||
writeField(bw, "OPERATOR", q.Operator)
|
||||
writeField(bw, "MY_GRIDSQUARE", q.MyGrid)
|
||||
writeField(bw, "MY_GRIDSQUARE_EXT", q.MyGridExt)
|
||||
writeField(bw, "MY_COUNTRY", q.MyCountry)
|
||||
writeField(bw, "MY_STATE", q.MyState)
|
||||
writeField(bw, "MY_CNTY", q.MyCounty)
|
||||
writeField(bw, "MY_IOTA", q.MyIOTA)
|
||||
writeField(bw, "MY_SOTA_REF", q.MySOTARef)
|
||||
writeField(bw, "MY_POTA_REF", q.MyPOTARef)
|
||||
writeIntPtr(bw, "MY_DXCC", q.MyDXCC)
|
||||
writeIntPtr(bw, "MY_CQ_ZONE", q.MyCQZone)
|
||||
writeIntPtr(bw, "MY_ITU_ZONE", q.MyITUZone)
|
||||
writeFloatPtr(bw, "MY_LAT", q.MyLat, 6)
|
||||
writeFloatPtr(bw, "MY_LON", q.MyLon, 6)
|
||||
writeField(bw, "MY_STREET", q.MyStreet)
|
||||
writeField(bw, "MY_CITY", q.MyCity)
|
||||
writeField(bw, "MY_POSTAL_CODE", q.MyPostalCode)
|
||||
writeField(bw, "MY_RIG", q.MyRig)
|
||||
writeField(bw, "MY_ANTENNA", q.MyAntenna)
|
||||
w("STATION_CALLSIGN", q.StationCallsign)
|
||||
w("OPERATOR", q.Operator)
|
||||
w("MY_GRIDSQUARE", q.MyGrid)
|
||||
w("MY_GRIDSQUARE_EXT", q.MyGridExt)
|
||||
w("MY_COUNTRY", q.MyCountry)
|
||||
w("MY_STATE", q.MyState)
|
||||
w("MY_CNTY", q.MyCounty)
|
||||
w("MY_IOTA", q.MyIOTA)
|
||||
w("MY_SOTA_REF", q.MySOTARef)
|
||||
w("MY_POTA_REF", q.MyPOTARef)
|
||||
wi("MY_DXCC", q.MyDXCC)
|
||||
wi("MY_CQ_ZONE", q.MyCQZone)
|
||||
wi("MY_ITU_ZONE", q.MyITUZone)
|
||||
wf("MY_LAT", q.MyLat, 6)
|
||||
wf("MY_LON", q.MyLon, 6)
|
||||
w("MY_STREET", q.MyStreet)
|
||||
w("MY_CITY", q.MyCity)
|
||||
w("MY_POSTAL_CODE", q.MyPostalCode)
|
||||
w("MY_RIG", q.MyRig)
|
||||
w("MY_ANTENNA", q.MyAntenna)
|
||||
|
||||
// --- Misc ---
|
||||
writeFloatPtr(bw, "TX_PWR", q.TXPower, 1)
|
||||
writeField(bw, "COMMENT", q.Comment)
|
||||
writeField(bw, "NOTES", q.Notes)
|
||||
wf("TX_PWR", q.TXPower, 1)
|
||||
w("COMMENT", q.Comment)
|
||||
w("NOTES", q.Notes)
|
||||
|
||||
// --- ADIF 3.1.7 additional promoted fields ---
|
||||
writeField(bw, "SIG", q.SIG)
|
||||
writeField(bw, "SIG_INFO", q.SIGInfo)
|
||||
writeField(bw, "MY_SIG", q.MySIG)
|
||||
writeField(bw, "MY_SIG_INFO", q.MySIGInfo)
|
||||
writeField(bw, "WWFF_REF", q.WWFFRef)
|
||||
writeField(bw, "MY_WWFF_REF", q.MyWWFFRef)
|
||||
writeFloatPtr(bw, "DISTANCE", q.Distance, 1)
|
||||
writeFloatPtr(bw, "RX_PWR", q.RXPower, 1)
|
||||
writeFloatPtr(bw, "A_INDEX", q.AIndex, 0)
|
||||
writeFloatPtr(bw, "K_INDEX", q.KIndex, 0)
|
||||
writeFloatPtr(bw, "SFI", q.SFI, 0)
|
||||
writeField(bw, "SKCC", q.SKCC)
|
||||
writeField(bw, "FISTS", q.FISTS)
|
||||
writeField(bw, "TEN_TEN", q.TenTen)
|
||||
writeField(bw, "CONTACTED_OP", q.ContactedOp)
|
||||
writeField(bw, "EQ_CALL", q.EqCall)
|
||||
writeField(bw, "PFX", q.PFX)
|
||||
writeField(bw, "MY_NAME", q.MyName)
|
||||
writeField(bw, "CLASS", q.Class)
|
||||
writeField(bw, "DARC_DOK", q.DarcDOK)
|
||||
writeField(bw, "MY_DARC_DOK", q.MyDarcDOK)
|
||||
writeField(bw, "REGION", q.Region)
|
||||
writeField(bw, "SILENT_KEY", q.SilentKey)
|
||||
writeField(bw, "SWL", q.SWL)
|
||||
writeField(bw, "QSO_COMPLETE", q.QSOComplete)
|
||||
writeField(bw, "QSO_RANDOM", q.QSORandom)
|
||||
writeField(bw, "CREDIT_GRANTED", q.CreditGranted)
|
||||
writeField(bw, "CREDIT_SUBMITTED", q.CreditSubmitted)
|
||||
writeField(bw, "MY_ARRL_SECT", q.MyARRLSect)
|
||||
writeField(bw, "MY_VUCC_GRIDS", q.MyVUCCGrids)
|
||||
w("SIG", q.SIG)
|
||||
w("SIG_INFO", q.SIGInfo)
|
||||
w("MY_SIG", q.MySIG)
|
||||
w("MY_SIG_INFO", q.MySIGInfo)
|
||||
w("WWFF_REF", q.WWFFRef)
|
||||
w("MY_WWFF_REF", q.MyWWFFRef)
|
||||
wf("DISTANCE", q.Distance, 1)
|
||||
wf("RX_PWR", q.RXPower, 1)
|
||||
wf("A_INDEX", q.AIndex, 0)
|
||||
wf("K_INDEX", q.KIndex, 0)
|
||||
wf("SFI", q.SFI, 0)
|
||||
w("SKCC", q.SKCC)
|
||||
w("FISTS", q.FISTS)
|
||||
w("TEN_TEN", q.TenTen)
|
||||
w("CONTACTED_OP", q.ContactedOp)
|
||||
w("EQ_CALL", q.EqCall)
|
||||
w("PFX", q.PFX)
|
||||
w("MY_NAME", q.MyName)
|
||||
w("CLASS", q.Class)
|
||||
w("DARC_DOK", q.DarcDOK)
|
||||
w("MY_DARC_DOK", q.MyDarcDOK)
|
||||
w("REGION", q.Region)
|
||||
w("SILENT_KEY", q.SilentKey)
|
||||
w("SWL", q.SWL)
|
||||
w("QSO_COMPLETE", q.QSOComplete)
|
||||
w("QSO_RANDOM", q.QSORandom)
|
||||
w("CREDIT_GRANTED", q.CreditGranted)
|
||||
w("CREDIT_SUBMITTED", q.CreditSubmitted)
|
||||
w("MY_ARRL_SECT", q.MyARRLSect)
|
||||
w("MY_VUCC_GRIDS", q.MyVUCCGrids)
|
||||
|
||||
// --- Extras (unpromoted ADIF fields preserved verbatim) ---
|
||||
// Standard mode emits ONLY valid ADIF-spec fields, so it drops APP_*
|
||||
@@ -318,7 +344,12 @@ func writeRecord(bw *bufio.Writer, q qso.QSO, includeApp bool) {
|
||||
// extra for a lossless OpsLog round-trip.
|
||||
for k, v := range q.Extras {
|
||||
tag := strings.ToUpper(k)
|
||||
if !includeApp && (strings.HasPrefix(tag, "APP_") || !IsStandardField(tag)) {
|
||||
if allow != nil {
|
||||
// Chosen-fields mode: the set alone decides (incl. APP_/vendor tags).
|
||||
if !allow[tag] {
|
||||
continue
|
||||
}
|
||||
} else if !includeApp && (strings.HasPrefix(tag, "APP_") || !IsStandardField(tag)) {
|
||||
continue
|
||||
}
|
||||
writeField(bw, tag, v)
|
||||
|
||||
@@ -34,7 +34,7 @@ func TestPromotedFieldsRoundTrip(t *testing.T) {
|
||||
var buf bytes.Buffer
|
||||
bw := bufio.NewWriter(&buf)
|
||||
bw.WriteString("<EOH>\n")
|
||||
writeRecord(bw, in, true)
|
||||
writeRecord(bw, in, true, nil)
|
||||
bw.Flush()
|
||||
|
||||
var rec Record
|
||||
@@ -115,7 +115,7 @@ func TestStandardExportDropsNonStandard(t *testing.T) {
|
||||
func renderRecord(q qso.QSO, includeApp bool) string {
|
||||
var buf bytes.Buffer
|
||||
bw := bufio.NewWriter(&buf)
|
||||
writeRecord(bw, q, includeApp)
|
||||
writeRecord(bw, q, includeApp, nil)
|
||||
bw.Flush()
|
||||
return buf.String()
|
||||
}
|
||||
|
||||
@@ -0,0 +1,286 @@
|
||||
{
|
||||
"def": {
|
||||
"code": "H26",
|
||||
"name": "The Helvetia 26 Award HF",
|
||||
"description": "26 Cantons of Switzerland",
|
||||
"valid": true,
|
||||
"url": "https://uska.ch/en/contest/uska-diplome/",
|
||||
"ref_url": "https://uska.ch/en/contest/uska-diplome/",
|
||||
"valid_from": "1980-01-01",
|
||||
"valid_to": "9999-12-01",
|
||||
"ref_display": "name",
|
||||
"type": "QSOFIELDS",
|
||||
"field": "address",
|
||||
"match_by": "description",
|
||||
"pattern": "",
|
||||
"or_rules": [
|
||||
{
|
||||
"field": "qth",
|
||||
"match_by": "description"
|
||||
}
|
||||
],
|
||||
"dxcc_filter": [
|
||||
287
|
||||
],
|
||||
"valid_bands": [
|
||||
"2190m",
|
||||
"630m",
|
||||
"160m",
|
||||
"80m",
|
||||
"40m",
|
||||
"30m",
|
||||
"20m",
|
||||
"17m",
|
||||
"15m",
|
||||
"12m",
|
||||
"10m"
|
||||
],
|
||||
"confirm": [
|
||||
"lotw",
|
||||
"qsl"
|
||||
],
|
||||
"validate": [
|
||||
"lotw",
|
||||
"qsl"
|
||||
],
|
||||
"total": 0,
|
||||
"builtin": true,
|
||||
"version": 3
|
||||
},
|
||||
"references": [
|
||||
{
|
||||
"code": "AG",
|
||||
"name": "Aargau",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Aarau|Baden|Wettingen|Wohlen|Rheinfelden|Zofingen|Lenzburg|Brugg|Oftringen|Suhr|Spreitenbach)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "AI",
|
||||
"name": "Appenzell Innerrhoden",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Appenzell|Oberegg)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "AR",
|
||||
"name": "Appenzell Ausserrhoden",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Herisau|Teufen|Speicher|Heiden|Gais|Urnäsch|Waldstatt)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "BE",
|
||||
"name": "Bern",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Bern|Berne|Thun|Biel|Bienne|Köniz|Burgdorf|Langenthal|Steffisburg|Münsingen|Spiez|Interlaken|Ostermundigen|Lyss|Zollikofen)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "BL",
|
||||
"name": "Basel-Landschaft",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Liestal|Allschwil|Reinach|Muttenz|Pratteln|Binningen|Münchenstein|Birsfelden|Aesch|Sissach|Oberwil)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "BS",
|
||||
"name": "Basel-Stadt",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Basel|Bâle|Bale|Riehen|Bettingen)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "FR",
|
||||
"name": "Fribourg",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Fribourg|Freiburg|Bulle|Marly|Düdingen|Estavayer|Murten|Morat|Villars-sur-Glâne|Guin)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "GE",
|
||||
"name": "Geneva",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Genève|Geneve|Sezenove|Chene-Bourg|Chene Bourg|Geneva|Genf|Carouge|Vernier|Lancy|Meyrin|Onex|Thônex|Thonex|Versoix|Bernex|Plan-les-Ouates)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "GL",
|
||||
"name": "Glarus",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Glarus|Glaris|Näfels|Netstal|Ennenda|Mollis)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "GR",
|
||||
"name": "Graubünden (Grisons)",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Chur|Coire|Kueblis|Davos|Sankt Moritz|St\\.? Moritz|Landquart|Arosa|Klosters|Ilanz|Thusis|Poschiavo|Domat|Ems)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "JU",
|
||||
"name": "Jura",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Delémont|Delemont|Porrentruy|Bassecourt|Courroux|Saignelégier|Alle)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "LU",
|
||||
"name": "Lucerne",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Luzern|Lucerne|Emmen|Kriens|Horw|Ebikon|Sursee|Hochdorf|Willisau|Rothenburg)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "NE",
|
||||
"name": "Neuchâtel",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Neuchâtel|Neuchatel|Neuenburg|La Chaux-de-Fonds|Chaux-de-Fonds|Le Locle|Peseux|Boudry|Colombier|Marin)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "NW",
|
||||
"name": "Nidwalden",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Stans|Hergiswil|Buochs|Stansstad|Beckenried|Ennetbürgen)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "OW",
|
||||
"name": "Obwalden",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Sarnen|Kerns|Alpnach|Engelberg|Sachseln|Giswil)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "SG",
|
||||
"name": "St. Gallen",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Sankt Gallen|Saint-Gall|Rapperswil|Wil|Gossau|Rorschach|Uzwil|Flawil|Altstätten|Jona)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "SH",
|
||||
"name": "Schaffhausen",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Schaffhausen|Schaffhouse|Neuhausen|Stein am Rhein|Thayngen)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "SO",
|
||||
"name": "Solothurn",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Solothurn|Soleure|Olten|Grenchen|Zuchwil|Dornach|Oensingen|Balsthal|Biberist)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "SZ",
|
||||
"name": "Schwyz",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Schwyz|Einsiedeln|Freienbach|Küssnacht|Arth|Lachen|Wollerau|Brunnen|Goldau)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "TG",
|
||||
"name": "Thurgau",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Frauenfeld|Kreuzlingen|Arbon|Amriswil|Weinfelden|Romanshorn|Sirnach|Aadorf|Münchwilen)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "TI",
|
||||
"name": "Ticino",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Lugano|Bellinzona|Locarno|Mendrisio|Chiasso|Biasca|Ascona|Losone|Minusio|Giubiasco|Massagno)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "UR",
|
||||
"name": "Uri",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Altdorf|Schattdorf|Erstfeld|Andermatt|Flüelen|Bürglen)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "VD",
|
||||
"name": "Vaud",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Lausanne|Chavornay|Blonay|Saint-Cergue|St-Cergue|St Cergue|Yverdon|Gingins|Montreux|Nyon|Vevey|Renens|Morges|Gland|Pully|Prilly|Ecublens|Aigle|Payerne|Rolle|Lutry|Bussigny)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "VS",
|
||||
"name": "Valais",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Sion|Sitten|Martigny|Monthey|Sierre|Brig|Brigue|Naters|Visp|Viège|Conthey|Fully|Verbier|Zermatt|Crans-Montana|Saas-Fee|Savièse|Bagnes)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "ZG",
|
||||
"name": "Zug",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Zug|Zoug|Baar|Cham|Steinhausen|Risch|Rotkreuz|Hünenberg|Unterägeri|Oberägeri)\\b",
|
||||
"valid": true
|
||||
},
|
||||
{
|
||||
"code": "ZH",
|
||||
"name": "Zurich",
|
||||
"dxcc": 287,
|
||||
"group": "",
|
||||
"subgrp": "",
|
||||
"pattern": "\\b(Zürich|Zurich|Winterthur|Uster|Dübendorf|Dietikon|Wetzikon|Kloten|Wädenswil|Horgen|Thalwil|Opfikon|Küsnacht|Meilen|Bülach|Regensdorf|Schlieren|Adliswil|Volketswil)\\b",
|
||||
"valid": true
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -304,6 +304,22 @@ type FlexTXState struct {
|
||||
ANFLevel int `json:"anf_level"`
|
||||
WNB bool `json:"wnb"`
|
||||
WNBLevel int `json:"wnb_level"`
|
||||
// SmartSDR v4 DSP (8000/Aurora series): NRL/ANFL (legacy LMS), NRS
|
||||
// (spectral subtraction), RNN (AI NR), ANFT (FFT notch), NRF (NR w/filter).
|
||||
// DSPV4 is true once the radio reported any of these keys — gates the UI.
|
||||
LMSNR bool `json:"lms_nr"`
|
||||
LMSNRLevel int `json:"lms_nr_level"`
|
||||
LMSANF bool `json:"lms_anf"`
|
||||
LMSANFLevel int `json:"lms_anf_level"`
|
||||
SpeexNR bool `json:"speex_nr"`
|
||||
SpeexNRLevel int `json:"speex_nr_level"`
|
||||
RNN bool `json:"rnn"`
|
||||
ANFT bool `json:"anft"`
|
||||
NRF bool `json:"nrf"`
|
||||
NRFLevel int `json:"nrf_level"`
|
||||
DSPV4 bool `json:"dsp_v4"`
|
||||
DAXCh int `json:"dax_ch"` // DAX audio channel of the active slice (0 = off, 1-8)
|
||||
TXDAX bool `json:"tx_dax"` // DAX is the TX audio source (SmartSDR transmit-bar DAX button)
|
||||
// RIT/XIT — offsets applied to the active slice's RX / TX frequency without
|
||||
// moving the slice. The offset survives the switch being turned off, so
|
||||
// re-enabling restores it, exactly like the radio's own knob.
|
||||
@@ -386,6 +402,19 @@ type FlexController interface {
|
||||
SetAPFLevel(int) error
|
||||
SetWNB(bool) error
|
||||
SetWNBLevel(int) error
|
||||
// SmartSDR v4 DSP (8000/Aurora): NRL / ANFL / NRS / RNN / ANFT / NRF.
|
||||
SetLMSNR(bool) error
|
||||
SetLMSNRLevel(int) error
|
||||
SetLMSANF(bool) error
|
||||
SetLMSANFLevel(int) error
|
||||
SetSpeexNR(bool) error
|
||||
SetSpeexNRLevel(int) error
|
||||
SetRNN(bool) error
|
||||
SetANFT(bool) error
|
||||
SetNRF(bool) error
|
||||
SetNRFLevel(int) error
|
||||
SetDAX(int) error // slice RX DAX channel 0 (off) - 8
|
||||
SetTXDAX(bool) error // TX audio from DAX (transmit set dax=)
|
||||
SetRIT(bool) error
|
||||
SetRITFreq(int) error
|
||||
SetXIT(bool) error
|
||||
@@ -620,15 +649,29 @@ func (m *Manager) run(b Backend, stop, done chan struct{}, cmds chan func(), pol
|
||||
const reconnectEvery = 5 * time.Second
|
||||
connected := false
|
||||
var lastAttempt time.Time
|
||||
var lastConnErr string // last connect failure logged, so the retry loop says it once
|
||||
tryConnect := func() {
|
||||
if connected || time.Since(lastAttempt) < reconnectEvery {
|
||||
return
|
||||
}
|
||||
lastAttempt = time.Now()
|
||||
if err := b.Connect(); err != nil {
|
||||
// Log it — the message used to live only in RigState.Error, i.e. in a
|
||||
// tooltip. The status pill condenses everything to "OmniRig not found",
|
||||
// so a user reporting that had no way to tell us WHY: the COM HRESULT,
|
||||
// the serial error, the refused TCP connect, all invisible. Logged once
|
||||
// per distinct message so the retry loop doesn't flood the file.
|
||||
if msg := err.Error(); msg != lastConnErr {
|
||||
lastConnErr = msg
|
||||
debugLog.Printf("%s connect failed: %s", b.Name(), msg)
|
||||
}
|
||||
m.update(RigState{Enabled: true, Backend: b.Name(), Connected: false, Error: err.Error(), UpdatedAt: time.Now()})
|
||||
return
|
||||
}
|
||||
if lastConnErr != "" {
|
||||
debugLog.Printf("%s connected (after: %s)", b.Name(), lastConnErr)
|
||||
lastConnErr = ""
|
||||
}
|
||||
connected = true
|
||||
}
|
||||
tryConnect()
|
||||
|
||||
+27
-6
@@ -307,22 +307,43 @@ func ModeToADIF(m byte, data bool) string {
|
||||
|
||||
// ModelName maps a rig's default CI-V address (from CmdReadID) to a readable
|
||||
// model. Unknown addresses fall back to a hex label.
|
||||
//
|
||||
// The name is not cosmetic: the UI derives model-dependent behaviour from it —
|
||||
// notably the attenuator steps, which are 6/12/18 dB on the big rigs and a single
|
||||
// 20 dB on the small ones. An address missing here therefore shows the WRONG
|
||||
// attenuator buttons, and the rig NAKs them.
|
||||
//
|
||||
// Two entries here used to be wrong in a way that pointed at each other: 0x80 was
|
||||
// labelled IC-7800 (it is the IC-7410) and 0x88 IC-7700 (it is the IC-7100), while
|
||||
// the real IC-7800 (0x6A) and IC-7700 (0x74) were absent — so a 7800 came up as
|
||||
// "Icom (0x6A)" with a 20 dB attenuator it does not have.
|
||||
//
|
||||
// Addresses cross-checked against the TR4W CI-V table and an independent
|
||||
// published list; both agree on every value below.
|
||||
func ModelName(addr byte) string {
|
||||
switch addr {
|
||||
case 0x6A:
|
||||
return "IC-7800"
|
||||
case 0x74:
|
||||
return "IC-7700"
|
||||
case 0x7A:
|
||||
return "IC-7600"
|
||||
case 0x7C:
|
||||
return "IC-9100"
|
||||
case 0x80:
|
||||
return "IC-7410"
|
||||
case 0x88:
|
||||
return "IC-7100"
|
||||
case 0x8E:
|
||||
return "IC-7851" // shared with the IC-7850
|
||||
case 0x94:
|
||||
return "IC-7300"
|
||||
case 0x98:
|
||||
return "IC-7610"
|
||||
case 0x7C:
|
||||
return "IC-9100"
|
||||
case 0xA2:
|
||||
return "IC-9700"
|
||||
case 0xA4:
|
||||
return "IC-705"
|
||||
case 0x88:
|
||||
return "IC-7700"
|
||||
case 0x80:
|
||||
return "IC-7800"
|
||||
}
|
||||
return fmt.Sprintf("Icom (0x%02X)", addr)
|
||||
}
|
||||
|
||||
@@ -130,3 +130,35 @@ func TestModelName(t *testing.T) {
|
||||
t.Errorf("ModelName(0x12) = %q, want fallback", got)
|
||||
}
|
||||
}
|
||||
|
||||
// CI-V addresses are hardware constants: a wrong one means the console shows the
|
||||
// wrong model, and with it the wrong attenuator steps (6/12/18 dB on the big
|
||||
// rigs, a single 20 dB on the small ones) — buttons the rig then NAKs.
|
||||
//
|
||||
// Two entries here were previously wrong in a way that pointed at each other:
|
||||
// 0x80 was labelled IC-7800 (it is the IC-7410) and 0x88 IC-7700 (it is the
|
||||
// IC-7100), while the real IC-7800 (0x6A) and IC-7700 (0x74) were missing — so an
|
||||
// IC-7800 came up as "Icom (0x6A)" with a 20 dB attenuator it does not have.
|
||||
func TestModelNameAddresses(t *testing.T) {
|
||||
for addr, want := range map[byte]string{
|
||||
0x6A: "IC-7800",
|
||||
0x74: "IC-7700",
|
||||
0x7A: "IC-7600",
|
||||
0x7C: "IC-9100",
|
||||
0x80: "IC-7410",
|
||||
0x88: "IC-7100",
|
||||
0x8E: "IC-7851",
|
||||
0x94: "IC-7300",
|
||||
0x98: "IC-7610",
|
||||
0xA2: "IC-9700",
|
||||
0xA4: "IC-705",
|
||||
} {
|
||||
if got := ModelName(addr); got != want {
|
||||
t.Errorf("ModelName(0x%02X) = %q, want %q", addr, got, want)
|
||||
}
|
||||
}
|
||||
// An unknown address must stay identifiable rather than masquerade as a model.
|
||||
if got := ModelName(0x42); got != "Icom (0x42)" {
|
||||
t.Errorf("ModelName(0x42) = %q, want the hex fallback", got)
|
||||
}
|
||||
}
|
||||
|
||||
+157
-10
@@ -90,6 +90,22 @@ type flexSlice struct {
|
||||
apfLevel int
|
||||
wnb bool // wideband noise blanker
|
||||
wnbLevel int
|
||||
// SmartSDR v4 DSP (8000/Aurora series). Key names per the FlexLib slice
|
||||
// docs: lms_nr(NRL) / lms_anf(ANFL) / speex_nr(NRS) / rnnoise(RNN) /
|
||||
// anft(ANFT) / nrf(NRF). Older radios never report them — dspV4 flips true
|
||||
// the first time any of these keys appears, and gates the extra UI rows.
|
||||
lmsNR bool // NRL — legacy LMS noise reduction
|
||||
lmsNRLevel int
|
||||
lmsANF bool // ANFL — legacy LMS auto-notch
|
||||
lmsANFLevel int
|
||||
speexNR bool // NRS — spectral subtraction NR
|
||||
speexNRLevel int
|
||||
rnnoise bool // RNN — AI noise reduction (on/off only)
|
||||
anft bool // ANFT — FFT-based auto-notch (on/off only)
|
||||
nrf bool // NRF — noise reduction w/ filter
|
||||
nrfLevel int
|
||||
dspV4 bool
|
||||
daxCh int // DAX audio channel for this slice (0 = off, 1-8)
|
||||
rit bool // receive incremental tuning enabled
|
||||
ritFreq int // RIT offset in Hz (negative = down)
|
||||
xit bool // transmit incremental tuning enabled
|
||||
@@ -120,6 +136,7 @@ type flexTX struct {
|
||||
micLevel int
|
||||
filterLow int // TX filter low cut (Hz)
|
||||
filterHigh int // TX filter high cut (Hz)
|
||||
dax bool // TX audio comes from DAX (SmartSDR's transmit-bar DAX button)
|
||||
atuStatus string
|
||||
atuMemories bool
|
||||
// CW keyer params (set via the top-level "cw" commands).
|
||||
@@ -431,6 +448,8 @@ func (f *Flex) handleStatus(payload string) {
|
||||
f.tx.tunePower = atoiDefault(val, f.tx.tunePower)
|
||||
case "tune":
|
||||
f.tx.tune = val == "1"
|
||||
case "dax":
|
||||
f.tx.dax = val == "1"
|
||||
case "vox_enable":
|
||||
f.tx.voxEnable = val == "1"
|
||||
case "vox_level":
|
||||
@@ -499,7 +518,14 @@ func (f *Flex) handleStatus(payload string) {
|
||||
alreadyBound := f.boundClientID != ""
|
||||
f.mu.Unlock()
|
||||
lp := strings.ToLower(program)
|
||||
isGUI := program == "" || strings.Contains(lp, "smartsdr") || strings.Contains(lp, "maestro")
|
||||
// The real GUI client is SmartSDR (Windows) or Maestro. Its non-GUI
|
||||
// helpers "SmartSDR CAT" and "SmartSDR DAX" also carry "smartsdr" in the
|
||||
// name, so exclude them — and require an explicit GUI name (dropping the
|
||||
// old program=="" fallback that could match CAT before its program field
|
||||
// arrived). Binding to CAT/DAX is invalid and the radio was seen to drop
|
||||
// SmartSDR CAT (connect/disconnect loop) when a logger did this.
|
||||
isGUI := (strings.Contains(lp, "smartsdr") || strings.Contains(lp, "maestro")) &&
|
||||
!strings.Contains(lp, "cat") && !strings.Contains(lp, "dax")
|
||||
if !disconnected && clientID != "" && !alreadyBound && isGUI {
|
||||
f.mu.Lock()
|
||||
f.boundClientID = clientID
|
||||
@@ -630,6 +656,18 @@ func (f *Flex) handleStatus(payload string) {
|
||||
}
|
||||
if removed {
|
||||
f.amp = flexAmp{}
|
||||
// The amp's meters (FWD / ID / TEMP …) don't always get an individual
|
||||
// "meter removed" push, so power-cycling the amp left the OLD meter
|
||||
// ids in the maps while the re-registered amp added NEW ones — the
|
||||
// panel then showed every amp meter twice. Drop every AMP-sourced
|
||||
// meter here so only the fresh set survives.
|
||||
for id, mi := range f.meterMeta {
|
||||
if strings.Contains(strings.ToUpper(mi.src), "AMP") {
|
||||
delete(f.meterMeta, id)
|
||||
delete(f.meterVal, id)
|
||||
delete(f.meterSub, id)
|
||||
}
|
||||
}
|
||||
}
|
||||
f.mu.Unlock()
|
||||
}
|
||||
@@ -641,6 +679,26 @@ func (f *Flex) handleStatus(payload string) {
|
||||
f.meterRawLogged = true
|
||||
debugLog.Printf("Flex: meter status raw: %s", payload)
|
||||
}
|
||||
// Meter removal — "meter <id> removed": drop it so a stale value can't
|
||||
// linger (e.g. after an amp/slice is torn down).
|
||||
removedMeter := false
|
||||
for _, tok := range fields[1:] {
|
||||
if tok == "removed" || tok == "in_use=0" {
|
||||
removedMeter = true
|
||||
}
|
||||
}
|
||||
if removedMeter {
|
||||
f.mu.Lock()
|
||||
for _, tok := range fields[1:] {
|
||||
if n, err := strconv.Atoi(strings.TrimSpace(tok)); err == nil {
|
||||
delete(f.meterMeta, n)
|
||||
delete(f.meterVal, n)
|
||||
delete(f.meterSub, n)
|
||||
}
|
||||
}
|
||||
f.mu.Unlock()
|
||||
return
|
||||
}
|
||||
var newIDs []int
|
||||
f.mu.Lock()
|
||||
for _, tok := range fields[1:] {
|
||||
@@ -809,6 +867,28 @@ func (f *Flex) handleStatus(payload string) {
|
||||
s.wnb = val == "1"
|
||||
case "wnb_level":
|
||||
s.wnbLevel = atoiDefault(val, s.wnbLevel)
|
||||
case "lms_nr":
|
||||
s.lmsNR, s.dspV4 = val == "1", true
|
||||
case "lms_nr_level":
|
||||
s.lmsNRLevel, s.dspV4 = atoiDefault(val, s.lmsNRLevel), true
|
||||
case "lms_anf":
|
||||
s.lmsANF, s.dspV4 = val == "1", true
|
||||
case "lms_anf_level":
|
||||
s.lmsANFLevel, s.dspV4 = atoiDefault(val, s.lmsANFLevel), true
|
||||
case "speex_nr":
|
||||
s.speexNR, s.dspV4 = val == "1", true
|
||||
case "speex_nr_level":
|
||||
s.speexNRLevel, s.dspV4 = atoiDefault(val, s.speexNRLevel), true
|
||||
case "rnnoise":
|
||||
s.rnnoise, s.dspV4 = val == "1", true
|
||||
case "anft":
|
||||
s.anft, s.dspV4 = val == "1", true
|
||||
case "nrf":
|
||||
s.nrf, s.dspV4 = val == "1", true
|
||||
case "nrf_level":
|
||||
s.nrfLevel, s.dspV4 = atoiDefault(val, s.nrfLevel), true
|
||||
case "dax":
|
||||
s.daxCh = atoiDefault(val, s.daxCh)
|
||||
case "rit_on":
|
||||
s.rit = val == "1"
|
||||
case "rit_freq":
|
||||
@@ -1121,7 +1201,11 @@ func (f *Flex) SendSpot(s SpotInfo) error {
|
||||
}
|
||||
cmd := fmt.Sprintf("spot add rx_freq=%.6f callsign=%s color=%s source=OpsLog lifetime_seconds=%d trigger_action=Tune timestamp=%d",
|
||||
float64(s.FreqHz)/1e6, call, color, life, time.Now().Unix())
|
||||
if m := flexEncode(s.Mode); m != "" {
|
||||
// Convert to a real Flex mode (USB/LSB/CW/DIGU/…): SmartSDR only switches the
|
||||
// slice mode on a spot click when mode= is one of ITS mode names — "SSB" or a
|
||||
// bare cluster label is ignored, so the mode wouldn't change. adifModeToFlex
|
||||
// also resolves SSB→USB/LSB from the spot frequency.
|
||||
if m := flexEncode(adifModeToFlex(s.Mode, s.FreqHz)); m != "" {
|
||||
cmd += " mode=" + m
|
||||
}
|
||||
if c := flexEncode(s.Comment); c != "" {
|
||||
@@ -1274,6 +1358,7 @@ func (f *Flex) FlexState() FlexTXState {
|
||||
MicLevel: f.tx.micLevel,
|
||||
TXFilterLow: f.tx.filterLow,
|
||||
TXFilterHigh: f.tx.filterHigh,
|
||||
TXDAX: f.tx.dax,
|
||||
MicProfile: f.micProfile,
|
||||
MicProfiles: f.micProfiles,
|
||||
ATUStatus: f.tx.atuStatus,
|
||||
@@ -1328,6 +1413,18 @@ func (f *Flex) FlexState() FlexTXState {
|
||||
st.APFLevel = rx.apfLevel
|
||||
st.WNB = rx.wnb
|
||||
st.WNBLevel = rx.wnbLevel
|
||||
st.LMSNR = rx.lmsNR
|
||||
st.LMSNRLevel = rx.lmsNRLevel
|
||||
st.LMSANF = rx.lmsANF
|
||||
st.LMSANFLevel = rx.lmsANFLevel
|
||||
st.SpeexNR = rx.speexNR
|
||||
st.SpeexNRLevel = rx.speexNRLevel
|
||||
st.RNN = rx.rnnoise
|
||||
st.ANFT = rx.anft
|
||||
st.NRF = rx.nrf
|
||||
st.NRFLevel = rx.nrfLevel
|
||||
st.DSPV4 = rx.dspV4
|
||||
st.DAXCh = rx.daxCh
|
||||
st.RIT = rx.rit
|
||||
st.RITFreq = rx.ritFreq
|
||||
st.XIT = rx.xit
|
||||
@@ -1396,6 +1493,28 @@ func (f *Flex) sendSlice(param string, val any) error {
|
||||
rx.apf = val == "1"
|
||||
case "apf_level":
|
||||
rx.apfLevel = toInt(val)
|
||||
case "lms_nr":
|
||||
rx.lmsNR = val == "1"
|
||||
case "lms_nr_level":
|
||||
rx.lmsNRLevel = toInt(val)
|
||||
case "lms_anf":
|
||||
rx.lmsANF = val == "1"
|
||||
case "lms_anf_level":
|
||||
rx.lmsANFLevel = toInt(val)
|
||||
case "speex_nr":
|
||||
rx.speexNR = val == "1"
|
||||
case "speex_nr_level":
|
||||
rx.speexNRLevel = toInt(val)
|
||||
case "rnnoise":
|
||||
rx.rnnoise = val == "1"
|
||||
case "anft":
|
||||
rx.anft = val == "1"
|
||||
case "nrf":
|
||||
rx.nrf = val == "1"
|
||||
case "nrf_level":
|
||||
rx.nrfLevel = toInt(val)
|
||||
case "dax":
|
||||
rx.daxCh = toInt(val)
|
||||
case "rxant":
|
||||
rx.rxAnt = fmt.Sprint(val)
|
||||
case "txant":
|
||||
@@ -1515,6 +1634,7 @@ func (f *Flex) SetNR(on bool) error { return f.sendSlice("nr", boolFlex(on))
|
||||
func (f *Flex) SetNRLevel(l int) error { return f.sendSlice("nr_level", clampLevel(l)) }
|
||||
func (f *Flex) SetANF(on bool) error { return f.sendSlice("anf", boolFlex(on)) }
|
||||
func (f *Flex) SetANFLevel(l int) error { return f.sendSlice("anf_level", clampLevel(l)) }
|
||||
|
||||
// RIT/XIT — an offset applied to the RX (RIT) or TX (XIT) frequency of the active
|
||||
// slice, without moving the slice itself. SmartSDR keeps the offset even while the
|
||||
// switch is off, so turning RIT back on restores the last offset — same as the
|
||||
@@ -1537,6 +1657,37 @@ func clampOffset(hz int) int {
|
||||
|
||||
func (f *Flex) SetAPF(on bool) error { return f.sendSlice("apf", boolFlex(on)) }
|
||||
func (f *Flex) SetAPFLevel(l int) error { return f.sendSlice("apf_level", clampLevel(l)) }
|
||||
|
||||
// SmartSDR v4 DSP (8000/Aurora series) — the extra noise tools SmartSDR ships
|
||||
// beyond nb/nr/anf/wnb. Key names per the FlexLib slice command docs.
|
||||
func (f *Flex) SetLMSNR(on bool) error { return f.sendSlice("lms_nr", boolFlex(on)) }
|
||||
func (f *Flex) SetLMSNRLevel(l int) error { return f.sendSlice("lms_nr_level", clampLevel(l)) }
|
||||
func (f *Flex) SetLMSANF(on bool) error { return f.sendSlice("lms_anf", boolFlex(on)) }
|
||||
func (f *Flex) SetLMSANFLevel(l int) error { return f.sendSlice("lms_anf_level", clampLevel(l)) }
|
||||
func (f *Flex) SetSpeexNR(on bool) error { return f.sendSlice("speex_nr", boolFlex(on)) }
|
||||
func (f *Flex) SetSpeexNRLevel(l int) error { return f.sendSlice("speex_nr_level", clampLevel(l)) }
|
||||
func (f *Flex) SetRNN(on bool) error { return f.sendSlice("rnnoise", boolFlex(on)) }
|
||||
func (f *Flex) SetANFT(on bool) error { return f.sendSlice("anft", boolFlex(on)) }
|
||||
func (f *Flex) SetNRF(on bool) error { return f.sendSlice("nrf", boolFlex(on)) }
|
||||
func (f *Flex) SetNRFLevel(l int) error { return f.sendSlice("nrf_level", clampLevel(l)) }
|
||||
|
||||
// SetDAX routes the active slice's RX audio to a DAX channel (0 = off, 1-8) —
|
||||
// the SmartSDR slice "DAX" selector, e.g. to feed WSJT-X via DAX audio.
|
||||
func (f *Flex) SetDAX(ch int) error {
|
||||
if ch < 0 {
|
||||
ch = 0
|
||||
}
|
||||
if ch > 8 {
|
||||
ch = 8
|
||||
}
|
||||
return f.sendSlice("dax", ch)
|
||||
}
|
||||
|
||||
// SetTXDAX toggles DAX as the TRANSMIT audio source — SmartSDR's transmit-bar
|
||||
// DAX button ("transmit set dax="), the one used to send WSJT-X audio.
|
||||
func (f *Flex) SetTXDAX(on bool) error {
|
||||
return f.txSet("transmit set dax="+boolFlex(on), "dax", func(t *flexTX) { t.dax = on })
|
||||
}
|
||||
func (f *Flex) SetWNB(on bool) error { return f.sendSlice("wnb", boolFlex(on)) }
|
||||
func (f *Flex) SetWNBLevel(l int) error { return f.sendSlice("wnb_level", clampLevel(l)) }
|
||||
|
||||
@@ -1745,15 +1896,11 @@ func (f *Flex) SetTune(on bool) error {
|
||||
// SmartSDR refuses to transmit while inhibit is set, so it holds even against a
|
||||
// footswitch or an external keyer, which a software PTT block could not.
|
||||
//
|
||||
// It also labels the interlock reason "OpsLog" so SmartSDR shows WHY TX is
|
||||
// blocked. The reason is best-effort (a separate interlock object); the inhibit
|
||||
// is what actually blocks TX, so a rig that ignores the reason still stays safe.
|
||||
// `transmit set inhibit=` is the whole mechanism. We used to also send
|
||||
// `interlock set reason=OpsLog` to label WHY TX was blocked, but `reason` is a
|
||||
// read-only status field on the interlock object — writing it is rejected
|
||||
// (cmd error 5000002D on SmartSDR v1.4/v3) and does nothing, so it's dropped.
|
||||
func (f *Flex) SetTXInhibit(on bool) error {
|
||||
if on {
|
||||
f.send("interlock set reason=OpsLog")
|
||||
} else {
|
||||
f.send("interlock set reason=")
|
||||
}
|
||||
return f.txSet("transmit set inhibit="+boolFlex(on), "inhibit", func(t *flexTX) { t.inhibit = on })
|
||||
}
|
||||
|
||||
|
||||
+93
-17
@@ -224,11 +224,14 @@ func (b *IcomSerial) Connect() error {
|
||||
idAddr = f.Data[1]
|
||||
}
|
||||
}
|
||||
// Dual-scope rigs (IC-7610/9700) prefix each waveform frame with a main/sub
|
||||
// selector byte; single-scope rigs (IC-7300…) do not. Decide from the
|
||||
// IDENTIFIED model, NOT the configured address: an IC-7300 run at 0x98 must
|
||||
// still parse single-scope frames (this was the "scope blank on the 7300" bug).
|
||||
b.dualScope = idAddr == 0x98 || idAddr == 0xA2
|
||||
// Whether the rig's scope protocol carries a leading main/sub SELECTOR byte on
|
||||
// every 0x27 frame and command. The IC-7610/9700 (dual scope) do — and the logs
|
||||
// prove the IC-7300 does too (frames arrive as `27 00 00 <seq> <total> …` and a
|
||||
// mode read answers `27 14 00 <mode>`), even though it has a single scope. The
|
||||
// waveform parser auto-detects this per-frame regardless, so a 7300 at a
|
||||
// non-default address still RENDERS; this flag only drives the SET/read commands
|
||||
// (mode, span, edges), which need the 0x00 selector to be accepted on the 7300.
|
||||
b.dualScope = idAddr == 0x98 || idAddr == 0xA2 || idAddr == 0x94
|
||||
// Defer the DSP snapshot until the rig actually answers CI-V. Over the network
|
||||
// the rig may still be booting (or off) at Connect, so an immediate readDSP
|
||||
// would time out and leave every control at 0 / off with no retry. ReadState
|
||||
@@ -371,10 +374,54 @@ func (b *IcomSerial) ReadState() (RigState, error) {
|
||||
if !b.dspLoaded {
|
||||
b.readDSP()
|
||||
b.dspLoaded = true
|
||||
} else {
|
||||
b.refreshFrontPanel()
|
||||
}
|
||||
return s, nil
|
||||
}
|
||||
|
||||
// refreshFrontPanel re-reads the few controls an operator actually reaches for on
|
||||
// the rig itself, so the console follows the radio instead of only driving it.
|
||||
//
|
||||
// readDSP loads everything but runs ONCE per connection (dspLoaded), which left
|
||||
// the panel showing whatever was set at connect: switch AGC from FAST to MID on
|
||||
// the front panel and OpsLog still said FAST, indefinitely. Commands worked, so
|
||||
// the link was plainly fine — only this direction was missing.
|
||||
//
|
||||
// ONE read per poll cycle, in rotation. The full snapshot is ~30 CI-V round trips
|
||||
// and refreshing it wholesale would hog the CAT thread for seconds at a time —
|
||||
// including the operator's own Set* commands, which is far worse than a stale
|
||||
// label. The rotation completes in 8 cycles; anything not covered here is still a
|
||||
// connect-time or ↻ Refresh read.
|
||||
func (b *IcomSerial) refreshFrontPanel() {
|
||||
switch b.pollN % 8 {
|
||||
case 1:
|
||||
if v, ok := b.readSwitch(civ.SubSwAGC); ok {
|
||||
b.dspMu.Lock()
|
||||
b.dsp.AGC = agcName(v)
|
||||
b.dspMu.Unlock()
|
||||
}
|
||||
case 3:
|
||||
if v, ok := b.readAtt(); ok {
|
||||
b.dspMu.Lock()
|
||||
b.dsp.Att = v
|
||||
b.dspMu.Unlock()
|
||||
}
|
||||
case 5:
|
||||
if v, ok := b.readSwitch(civ.SubSwPreamp); ok {
|
||||
b.dspMu.Lock()
|
||||
b.dsp.Preamp = int(v)
|
||||
b.dspMu.Unlock()
|
||||
}
|
||||
case 7:
|
||||
if _, f, ok := b.readModeFilter(); ok {
|
||||
b.dspMu.Lock()
|
||||
b.dsp.Filter = int(f)
|
||||
b.dspMu.Unlock()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (b *IcomSerial) SetFrequency(hz int64) error {
|
||||
if hz <= 0 {
|
||||
return fmt.Errorf("invalid frequency")
|
||||
@@ -603,12 +650,20 @@ func (b *IcomSerial) scopeLoop(spec chan civ.Decoded, done chan struct{}) {
|
||||
rawN++
|
||||
applog.Printf("icom scope raw #%d: len=%d data=[% X]", rawN, len(f.Data), f.Data)
|
||||
}
|
||||
// Frame layout after the 0x00 sub-command byte is one of:
|
||||
// [selector][seq][total][data…] (IC-7610/9700 AND, as the logs prove,
|
||||
// the IC-7300 — selector 0x00 = main)
|
||||
// [seq][total][data…] (a rig with no selector byte)
|
||||
// The sequence starts at 1, so a 0x00 at Data[1] can only be the main-scope
|
||||
// selector — never a valid sequence. Keying this off the rig ADDRESS was the
|
||||
// long-standing "blank scope on the IC-7300" bug: the 7300 DOES send the
|
||||
// selector, so idx stayed 1, seq was read as 0x00, and every frame was
|
||||
// dropped. Detect it from the byte itself instead — address-independent.
|
||||
idx := 1
|
||||
if b.dualScope {
|
||||
if len(f.Data) < 2 || f.Data[1] != 0x00 {
|
||||
continue // only the MAIN scope
|
||||
}
|
||||
idx = 2
|
||||
if len(f.Data) >= 2 && f.Data[1] == 0x00 {
|
||||
idx = 2 // leading main-scope selector byte present
|
||||
} else if b.dualScope {
|
||||
continue // dual-scope rig SUB frame (selector != 0x00) — main only
|
||||
}
|
||||
if len(f.Data) < idx+2 {
|
||||
continue
|
||||
@@ -661,9 +716,23 @@ func (b *IcomSerial) scopeLoop(spec chan civ.Decoded, done chan struct{}) {
|
||||
if seq == 1 { // header frame — begins a new sweep, no waveform data
|
||||
regions = make(map[byte][]byte)
|
||||
total = tot
|
||||
if len(region) >= 11 { // [info][low 5][high 5]
|
||||
low := civ.BCDToFreq(region[1:6])
|
||||
high := civ.BCDToFreq(region[6:11])
|
||||
if len(region) >= 11 { // [info][freq1 5-BCD][freq2 5-BCD]
|
||||
// Same center/fixed disambiguation as the single-frame (net) path:
|
||||
// FIXED sends [low-edge][high-edge] (both absolute), CENTER sends
|
||||
// [center][span]. Tell them apart by magnitude — a second value
|
||||
// BIGGER than the first is a real high edge; a smaller one is a
|
||||
// span. Without this, an IC-7300 in center (VFO-following) mode set
|
||||
// high = span (e.g. 100 kHz), so high < low and the panadapter had
|
||||
// no valid range to map the trace onto → blank scope. FIXED mode
|
||||
// parsed fine, which is why only center mode was broken.
|
||||
v1 := civ.BCDToFreq(region[1:6])
|
||||
v2 := civ.BCDToFreq(region[6:11])
|
||||
var low, high int64
|
||||
if v2 > v1 {
|
||||
low, high = v1, v2 // absolute low/high edges (fixed)
|
||||
} else {
|
||||
low, high = v1-v2/2, v1+v2/2 // centre + span (centre-on-VFO)
|
||||
}
|
||||
b.scopeMu.Lock()
|
||||
b.scopeLow, b.scopeHigh = low, high
|
||||
b.scopeMu.Unlock()
|
||||
@@ -711,12 +780,19 @@ func (b *IcomSerial) SetScope(on bool) error {
|
||||
// but nothing shows, compare its `icom scope raw` frames against this.
|
||||
applog.Printf("icom scope: enable on rig=%q addr=0x%02X dualScope=%v (expect %s frame layout)",
|
||||
b.model, b.rigAddr, b.dualScope, map[bool]string{true: "27 00 [MS] [seq] [total] …", false: "27 00 [seq] [total] …"}[b.dualScope])
|
||||
// Turn the scope DISPLAY on — needed so the rig actually streams (esp. when
|
||||
// remote and we can't touch the front panel). ONLY on enable: we must never
|
||||
// switch the display OFF, because that is the operator's own scope on the
|
||||
// radio, and closing OpsLog (SetScope(false)) blanking a local IC-7300's
|
||||
// screen is exactly the regression this avoids. Some firmwares don't ack a
|
||||
// 0x27 set; a timeout isn't fatal, so log and continue.
|
||||
if err := b.exec(civ.CmdScope, civ.SubScopeOnOff, 0x01); err != nil {
|
||||
applog.Printf("icom scope: display on ack: %v", err)
|
||||
}
|
||||
// Some firmwares don't ack 0x27 sets; a timeout here isn't fatal, so log and
|
||||
// continue rather than abort the second command.
|
||||
if err := b.exec(civ.CmdScope, civ.SubScopeOnOff, boolByte(on)); err != nil {
|
||||
applog.Printf("icom scope: display on=%v ack: %v", on, err)
|
||||
}
|
||||
// Waveform data OUTPUT over CI-V: enabled with the scope, and — crucially —
|
||||
// the ONLY thing we switch off on disable, so the radio's own scope display is
|
||||
// left exactly as the operator had it.
|
||||
if err := b.exec(civ.CmdScope, civ.SubScopeOn, boolByte(on)); err != nil {
|
||||
applog.Printf("icom scope: output on=%v ack: %v", on, err)
|
||||
}
|
||||
|
||||
+19
-4
@@ -4,6 +4,7 @@ import (
|
||||
"log"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
)
|
||||
|
||||
// LogSink, when set by the host app at startup, receives every CAT debug
|
||||
@@ -15,13 +16,21 @@ var LogSink func(format string, args ...any)
|
||||
// catLogger forwards Printf either to the host LogSink (preferred) or to a
|
||||
// local file/stderr fallback. Keeps the call sites (debugLog.Printf(...))
|
||||
// unchanged.
|
||||
type catLogger struct{ fallback *log.Logger }
|
||||
type catLogger struct {
|
||||
once sync.Once
|
||||
fallback *log.Logger
|
||||
}
|
||||
|
||||
func (c *catLogger) Printf(format string, args ...any) {
|
||||
if LogSink != nil {
|
||||
LogSink("cat: "+format, args...)
|
||||
return
|
||||
}
|
||||
// Only now, on a line that genuinely has nowhere else to go, is the fallback
|
||||
// file opened. It used to be created at package init, so every installation
|
||||
// grew an %APPDATA%\OpsLog\cat.log that nothing ever wrote to once the app
|
||||
// wired LogSink — a decoy for anyone told to "check the CAT log".
|
||||
c.once.Do(func() { c.fallback = openFallbackLog() })
|
||||
if c.fallback != nil {
|
||||
c.fallback.Printf(format, args...)
|
||||
}
|
||||
@@ -30,7 +39,7 @@ func (c *catLogger) Printf(format string, args ...any) {
|
||||
// debugLog writes CAT debug events so users can diagnose mode/freq mismatches
|
||||
// without rebuilding with a console. Once LogSink is set, lines flow into the
|
||||
// main opslog.log.
|
||||
var debugLog = &catLogger{fallback: openFallbackLog()}
|
||||
var debugLog = &catLogger{}
|
||||
|
||||
func openFallbackLog() *log.Logger {
|
||||
base, err := os.UserConfigDir()
|
||||
@@ -49,9 +58,15 @@ func openFallbackLog() *log.Logger {
|
||||
return log.New(f, "", log.LstdFlags|log.Lmicroseconds)
|
||||
}
|
||||
|
||||
// DebugLogPath returns where the fallback cat.log lives, for surfacing in the
|
||||
// UI / docs. When LogSink is wired, CAT lines are in the main app log instead.
|
||||
// DebugLogPath returns where the fallback cat.log lives, or "" when CAT lines are
|
||||
// going to the app log instead — which is the normal case, and the answer callers
|
||||
// actually need. It previously returned the path unconditionally, so the one place
|
||||
// that displayed it sent operators to an empty file in %APPDATA% while their CAT
|
||||
// diagnostics sat in data\opslog.log.
|
||||
func DebugLogPath() string {
|
||||
if LogSink != nil {
|
||||
return "" // lines go to the unified app log; there is no separate cat.log
|
||||
}
|
||||
base, err := os.UserConfigDir()
|
||||
if err != nil {
|
||||
return ""
|
||||
|
||||
+170
-44
@@ -34,6 +34,11 @@ type OmniRig struct {
|
||||
lastSig string // last logged Split/VFO signature — only log on change
|
||||
rigType string // OmniRig's RigType string (the .ini title), e.g. "IC-7610"
|
||||
|
||||
// connLogged holds the connect failure already written to the log, so the
|
||||
// 5-second reconnect loop reports a persistent problem once instead of
|
||||
// forever. Cleared on success.
|
||||
connLogged string
|
||||
|
||||
// lastSetFreq is the frequency most recently COMMANDED via SetFrequency.
|
||||
// SetMode uses it to pick USB vs LSB for "SSB" instead of reading OmniRig's
|
||||
// async Freq property, which still reports the OLD band for a poll or two
|
||||
@@ -53,8 +58,55 @@ func NewOmniRig(rigNum int) *OmniRig {
|
||||
|
||||
func (o *OmniRig) Name() string { return "omnirig" }
|
||||
|
||||
// elevationHint recognises the COM refusal that happens when OmniRig runs
|
||||
// elevated (as administrator) and OpsLog does not — or the reverse. Windows keeps
|
||||
// the two integrity levels apart, so the client cannot bind to the running
|
||||
// server's object and COM falls back to launching a fresh one, which then needs
|
||||
// elevation the client cannot grant.
|
||||
//
|
||||
// It is worth naming explicitly: the operator SEES OmniRig running, with its
|
||||
// settings window open, so "OmniRig not found" reads as nonsense and sends them
|
||||
// hunting for a driver or COM-port problem that does not exist. The fix is thirty
|
||||
// seconds of work once you know what to look for.
|
||||
func elevationHint(err error) string {
|
||||
if err == nil {
|
||||
return ""
|
||||
}
|
||||
msg := strings.ToLower(err.Error())
|
||||
// Matched on the HRESULT text in whatever language Windows is running in, so
|
||||
// the code is checked too: 0x800702E4 = ERROR_ELEVATION_REQUIRED.
|
||||
if strings.Contains(msg, "elevation") || strings.Contains(msg, "élévation") ||
|
||||
strings.Contains(msg, "0x800702e4") || strings.Contains(msg, "access denied") ||
|
||||
strings.Contains(msg, "accès refusé") {
|
||||
return "OmniRig and OpsLog are running at different privilege levels — Windows keeps them apart, " +
|
||||
"so OpsLog cannot reach OmniRig even though it is running. Start BOTH the same way: either " +
|
||||
"un-tick \"Run as administrator\" on the OmniRig shortcut (and its Compatibility tab), or run " +
|
||||
"OpsLog as administrator too"
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// logConnFailure writes a connect failure once per distinct cause. The reconnect
|
||||
// loop retries every 5 seconds forever, and a station whose OmniRig was simply
|
||||
// elevated had this filling its log at roughly 1500 lines an hour — which buries
|
||||
// the very diagnostics someone would go looking for.
|
||||
func (o *OmniRig) logConnFailure(msg string) {
|
||||
if o.connLogged == msg {
|
||||
return
|
||||
}
|
||||
o.connLogged = msg
|
||||
debugLog.Printf("OmniRig Rig%d: %s", o.RigNum, msg)
|
||||
}
|
||||
|
||||
func (o *OmniRig) Connect() error {
|
||||
debugLog.Printf("OmniRig.Connect Rig%d — log path: %s", o.RigNum, DebugLogPath())
|
||||
// This used to announce DebugLogPath() on every attempt — the path of the
|
||||
// FALLBACK cat.log, which nothing writes to once the app has wired LogSink and
|
||||
// everything goes to data\opslog.log. It pointed operators at an empty file in
|
||||
// %APPDATA% while the lines they wanted were somewhere else entirely. Dropped;
|
||||
// and logged once per failure run rather than every 5-second retry.
|
||||
if o.connLogged == "" {
|
||||
debugLog.Printf("OmniRig.Connect Rig%d", o.RigNum)
|
||||
}
|
||||
if err := ole.CoInitializeEx(0, ole.COINIT_APARTMENTTHREADED); err != nil {
|
||||
// 0x1 = S_FALSE → COM already initialised on this thread, fine.
|
||||
if oerr, ok := err.(*ole.OleError); !ok || oerr.Code() != 0x00000001 {
|
||||
@@ -62,15 +114,43 @@ func (o *OmniRig) Connect() error {
|
||||
}
|
||||
}
|
||||
|
||||
unk, err := oleutil.CreateObject("Omnirig.OmnirigX")
|
||||
if err != nil {
|
||||
return fmt.Errorf("Omnirig.OmnirigX not available — is OmniRig installed and running?: %w", err)
|
||||
}
|
||||
omnirig, err := unk.QueryInterface(ole.IID_IDispatch)
|
||||
const progID = "Omnirig.OmnirigX"
|
||||
var omnirig *ole.IDispatch
|
||||
unk, err := oleutil.CreateObject(progID)
|
||||
if err == nil {
|
||||
omnirig, err = unk.QueryInterface(ole.IID_IDispatch)
|
||||
unk.Release()
|
||||
if err != nil {
|
||||
return fmt.Errorf("query interface: %w", err)
|
||||
}
|
||||
} else {
|
||||
// A privilege mismatch is final — retrying, or trying the 32-bit server,
|
||||
// cannot cross an integrity boundary. Say what to do instead of dressing it
|
||||
// up as "not installed", which is what sends operators looking in the wrong
|
||||
// place entirely.
|
||||
if hint := elevationHint(err); hint != "" {
|
||||
o.logConnFailure(hint)
|
||||
return fmt.Errorf("%s (Windows said: %v)", hint, err)
|
||||
}
|
||||
// Otherwise it may be a partial registration; try activating the 32-bit
|
||||
// server explicitly before giving up (see omnirig_activate32.go).
|
||||
disp, err32 := createOmniRig32(progID)
|
||||
if err32 != nil {
|
||||
o.logConnFailure(fmt.Sprintf("CreateObject(%s) failed: %v; 32-bit activation also failed: %v", progID, err, err32))
|
||||
// Name the version requirement. HB9RYZ's OmniRig v2.1 is a different
|
||||
// product that its own author states is not compatible with v1, and it
|
||||
// does not provide v1's IOmniRigX interface — so an operator who has
|
||||
// only v2 installed sees OmniRig running and OpsLog failing, with
|
||||
// nothing to connect the two facts.
|
||||
return fmt.Errorf("OmniRig (v1) not reachable: %w — OpsLog needs OmniRig v1.19/v1.20 "+
|
||||
"(VE3NEA/Alex), the interface every logger uses. HB9RYZ's OmniRig v2.1 is a separate, "+
|
||||
"incompatible product and cannot serve OpsLog; the two may be installed side by side, "+
|
||||
"but v1 must be present and running", err)
|
||||
}
|
||||
debugLog.Printf("OmniRig: reached via explicit 32-bit activation after CreateObject failed (%v)", err)
|
||||
omnirig = disp
|
||||
}
|
||||
o.connLogged = "" // connected: re-arm the one-shot failure logging
|
||||
|
||||
rigVar, err := oleutil.GetProperty(omnirig, fmt.Sprintf("Rig%d", o.RigNum))
|
||||
if err != nil {
|
||||
@@ -80,10 +160,26 @@ func (o *OmniRig) Connect() error {
|
||||
o.omnirig = omnirig
|
||||
o.rig = rigVar.ToIDispatch()
|
||||
|
||||
// Log WHICH OmniRig answered. There are two incompatible products called
|
||||
// OmniRig: v1.19/1.20 (Alex, VE3NEA), whose IOmniRigX interface every logger
|
||||
// including OpsLog uses, and HB9RYZ's v2.1, which its own author states is "not
|
||||
// compatible" with v1 and works only with programs written for it. They can
|
||||
// coexist, and OmniRig's own window looks much the same either way — so an
|
||||
// operator running only v2 sees OmniRig on screen, sees OpsLog fail, and has no
|
||||
// way to know the two were never going to talk. These two version numbers
|
||||
// settle it in one line of a bug report.
|
||||
var iv, sv int64 = -1, -1
|
||||
if v, err := oleutil.GetProperty(o.omnirig, "InterfaceVersion"); err == nil {
|
||||
iv = v.Val
|
||||
}
|
||||
if v, err := oleutil.GetProperty(o.omnirig, "SoftwareVersion"); err == nil {
|
||||
sv = v.Val
|
||||
}
|
||||
if rt, err := oleutil.GetProperty(o.rig, "RigType"); err == nil {
|
||||
o.rigType = rt.ToString()
|
||||
debugLog.Printf("OmniRig connected to Rig%d type=%q", o.RigNum, o.rigType)
|
||||
}
|
||||
debugLog.Printf("OmniRig connected: Rig%d type=%q (OmniRig interface=%d software=%d)",
|
||||
o.RigNum, o.rigType, iv, sv)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -169,50 +265,69 @@ func (o *OmniRig) ReadState() (RigState, error) {
|
||||
}())
|
||||
}
|
||||
|
||||
// A genuine split: the rig explicitly flags PM_SPLITON, the two VFOs are
|
||||
// distinct and non-zero, AND they're in the same band. The same-band test
|
||||
// kills the common false positive where VFO B just holds a leftover from
|
||||
// another band (a "28 MHz / 7 MHz split" is nonsensical), which on the
|
||||
// FT-710 / TS-570 otherwise froze the main/TX freq on the wrong VFO.
|
||||
genuineSplit := splitRaw == pmSplitOn &&
|
||||
freqA != 0 && freqB != 0 && freqA != freqB &&
|
||||
BandFromHz(freqA) == BandFromHz(freqB)
|
||||
s.FreqHz, s.RxFreqHz, s.Split = resolveOmniRigVFOs(freqMain, freqA, freqB, s.Vfo, splitRaw)
|
||||
return s, nil
|
||||
}
|
||||
|
||||
if genuineSplit {
|
||||
// ADIF: FreqHz = TX, RxFreqHz = RX. Determine which VFO is RX from the
|
||||
// ACTIVE frequency (OmniRig's generic Freq — the VFO you're listening on):
|
||||
// RX = the active VFO, TX = the other one. This is far more reliable than
|
||||
// trusting OmniRig's Vfo AB/BA enum, which several rigs (e.g. Yaesu FTDX10)
|
||||
// report inverted — the split then showed TX/RX swapped.
|
||||
s.Split = true
|
||||
// resolveOmniRigVFOs turns OmniRig's four readings into the ADIF pair
|
||||
// (FreqHz = TX, RxFreqHz = RX) plus a split flag.
|
||||
//
|
||||
// Pure and separate from ReadState because it encodes rig-specific rules that
|
||||
// contradict each other — what fixes a Yaesu can break an Icom — and the only way
|
||||
// to change it safely is with every known rig's behaviour pinned in a test. COM
|
||||
// cannot be exercised from a test; this can.
|
||||
func resolveOmniRigVFOs(freqMain, freqA, freqB int64, vfo string, splitRaw int64) (txHz, rxHz int64, split bool) {
|
||||
// PM_SPLITON is tested as a BIT, not by equality. OmniRig's Split is a flag
|
||||
// word: an exact `== 0x8000` holds only for a rig whose ini sets that bit and
|
||||
// nothing else, and silently reports "no split" for any rig reporting the bit
|
||||
// alongside another. Requiring ON set and OFF clear keeps the two states apart
|
||||
// (both flags are non-zero, so a bare `!= 0` would read OFF as split) while
|
||||
// tolerating extra bits.
|
||||
splitFlagged := splitRaw&pmSplitOn != 0 && splitRaw&pmSplitOff == 0
|
||||
|
||||
// A genuine split also needs two distinct, non-zero VFOs in the SAME band. The
|
||||
// band test kills the common false positive where VFO B merely holds a
|
||||
// leftover from another band (a "28 MHz / 7 MHz split" is nonsensical), which
|
||||
// on the FT-710 / TS-570 otherwise froze the TX freq on the wrong VFO.
|
||||
if splitFlagged && freqA != 0 && freqB != 0 && freqA != freqB &&
|
||||
BandFromHz(freqA) == BandFromHz(freqB) {
|
||||
// RX is the VFO being listened on — identified from the generic Freq rather
|
||||
// than from the Vfo AB/BA enum, which several rigs (Yaesu FTDX10) report
|
||||
// inverted, showing TX and RX swapped.
|
||||
switch {
|
||||
case freqMain != 0 && freqMain == freqA:
|
||||
s.RxFreqHz, s.FreqHz = freqA, freqB // listening on A → TX on B
|
||||
return freqB, freqA, true // listening on A → TX on B
|
||||
case freqMain != 0 && freqMain == freqB:
|
||||
s.RxFreqHz, s.FreqHz = freqB, freqA // listening on B → TX on A
|
||||
case s.Vfo == "BA":
|
||||
s.FreqHz, s.RxFreqHz = freqA, freqB // fall back to the Vfo enum
|
||||
return freqA, freqB, true // listening on B → TX on A
|
||||
case vfo == "BA":
|
||||
return freqA, freqB, true // fall back to the Vfo enum
|
||||
default:
|
||||
s.FreqHz, s.RxFreqHz = freqB, freqA
|
||||
return freqB, freqA, true
|
||||
}
|
||||
} else {
|
||||
// Simplex: read VFO A first, fall back to the generic Freq — exactly like
|
||||
// DXHunter/WSJT-X. PM_FREQA rigs (Yaesu, Kenwood) populate FreqA; some
|
||||
// Icoms (IC-9100 etc.) only populate the generic Freq. On the IC-7610
|
||||
// OmniRig's generic Freq reports VFO B (its Main/Sub model confuses the
|
||||
// stock ini), so keying off FreqA gives the operator the VFO they expect.
|
||||
s.Split = false
|
||||
s.RxFreqHz = 0
|
||||
}
|
||||
|
||||
// Simplex. The VFO the rig says is ACTIVE comes first: preferring freqA
|
||||
// unconditionally (as this did) meant the displayed frequency never left VFO
|
||||
// A — press SUB VFO on an FTDX101D and the radio receives on B while OpsLog
|
||||
// went on showing A, taking the band and the logged frequency with it.
|
||||
//
|
||||
// Only a VFO OmniRig explicitly names is honoured, so a rig that does not
|
||||
// report the enum keeps exactly the previous fallback order. That matters for
|
||||
// the IC-7610, whose stock ini reports the generic Freq as VFO B; and for the
|
||||
// PM_FREQA rigs (Yaesu, Kenwood) versus the Icoms (IC-9100) that populate only
|
||||
// the generic Freq.
|
||||
switch {
|
||||
case (vfo == "B" || vfo == "BB") && freqB != 0:
|
||||
return freqB, 0, false
|
||||
case (vfo == "A" || vfo == "AA") && freqA != 0:
|
||||
return freqA, 0, false
|
||||
case freqA != 0:
|
||||
s.FreqHz = freqA
|
||||
return freqA, 0, false
|
||||
case freqMain != 0:
|
||||
s.FreqHz = freqMain
|
||||
return freqMain, 0, false
|
||||
default:
|
||||
s.FreqHz = freqB
|
||||
return freqB, 0, false
|
||||
}
|
||||
}
|
||||
return s, nil
|
||||
}
|
||||
|
||||
func (o *OmniRig) SetFrequency(hz int64) error {
|
||||
@@ -267,12 +382,23 @@ func (o *OmniRig) SetFrequency(hz int64) error {
|
||||
// method (RX=TX=freq, simplex). It works on rigs — notably Icom (IC-9100) —
|
||||
// where direct FreqA/FreqB writes are accepted but never move the radio.
|
||||
// Clearing split is the right thing when tuning to a spot anyway.
|
||||
simplexOK := false
|
||||
if _, err := oleutil.CallMethod(o.rig, "SetSimplexMode", int32(hz32)); err == nil {
|
||||
simplexOK = true
|
||||
debugLog.Printf("OmniRig.SetFrequency: SetSimplexMode(%d) OK", hz32)
|
||||
} else {
|
||||
debugLog.Printf("OmniRig.SetFrequency: SetSimplexMode unavailable (%v) — using property writes", err)
|
||||
// Fallback: write the active VFO's property AND the generic Freq
|
||||
// (always — some .ini honour only one, and split here is often misread).
|
||||
debugLog.Printf("OmniRig.SetFrequency: SetSimplexMode unavailable (%v)", err)
|
||||
}
|
||||
|
||||
// On Yaesu / Kenwood (and anything non-Icom), SetSimplexMode frequently returns
|
||||
// OK but is a SILENT NO-OP — the rig never moves. Confirmed on an FT-891 over
|
||||
// OmniRig: every spot click logged "SetSimplexMode OK" yet FreqA stayed put,
|
||||
// while SetMode on the same .ini worked fine (so the CAT link is healthy).
|
||||
// Writing the VFO frequency PROPERTY directly DOES move them, so also do that
|
||||
// here. It is skipped on Icom, where the direct write is the unreliable one and
|
||||
// could nudge the wrong Main/Sub VFO — there SetSimplexMode is authoritative.
|
||||
isIcom := strings.HasPrefix(strings.ToUpper(strings.TrimSpace(rigType)), "IC")
|
||||
if !isIcom || !simplexOK {
|
||||
prop := "FreqA"
|
||||
switch vfo {
|
||||
case "B", "BB", "BA":
|
||||
@@ -287,7 +413,7 @@ func (o *OmniRig) SetFrequency(hz int64) error {
|
||||
okAny = true
|
||||
}
|
||||
}
|
||||
if !okAny {
|
||||
if !simplexOK && !okAny {
|
||||
return fmt.Errorf("OmniRig: no writable frequency property for this rig")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
package cat
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"syscall"
|
||||
"unsafe"
|
||||
|
||||
ole "github.com/go-ole/go-ole"
|
||||
"golang.org/x/sys/windows/registry"
|
||||
)
|
||||
|
||||
// Last-resort activation path for OmniRig, used only when the normal
|
||||
// CreateObject fails.
|
||||
//
|
||||
// OmniRig is a 32-bit program and its installer splits its COM identity across
|
||||
// registry views — on a working machine the ProgID sits in the 64-bit view while
|
||||
// the CLSID and its LocalServer32 exist only under WOW6432Node. That LOOKS like
|
||||
// it should break a 64-bit client, and it was my first theory for "OmniRig not
|
||||
// found"; measuring it on a machine with exactly that layout disproved it. COM
|
||||
// resolves an out-of-process server across views by itself, and the plain
|
||||
// CreateObject succeeds.
|
||||
//
|
||||
// What this still covers is the case where the ProgID is not visible to us at all
|
||||
// (a partial or 32-bit-only registration), where CreateObject has nothing to
|
||||
// resolve. Here we read the CLSID from BOTH views ourselves and activate the
|
||||
// 32-bit local server explicitly. CLSCTX_ACTIVATE_32_BIT_SERVER is the documented
|
||||
// flag for that; go-ole hard-codes CLSCTX_SERVER and keeps CoCreateInstance
|
||||
// unexported, hence the direct call.
|
||||
//
|
||||
// It costs nothing when the normal path works, and the reason it ran at all is
|
||||
// logged — so if it ever rescues a real installation we will see it.
|
||||
const clsctxActivate32BitServer = 0x40000
|
||||
|
||||
var (
|
||||
modole32 = syscall.NewLazyDLL("ole32.dll")
|
||||
procCoCreateInst32 = modole32.NewProc("CoCreateInstance")
|
||||
)
|
||||
|
||||
// omnirigCLSIDFromRegistry reads OmniRig's CLSID from the ProgID key, looking in
|
||||
// the 64-bit view first and then the 32-bit one. Returned as a GUID ready for
|
||||
// CoCreateInstance.
|
||||
func omnirigCLSIDFromRegistry(progID string) (*ole.GUID, error) {
|
||||
for _, access := range []uint32{registry.QUERY_VALUE, registry.QUERY_VALUE | registry.WOW64_32KEY} {
|
||||
k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Classes\`+progID+`\CLSID`, access)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
s, _, err := k.GetStringValue("")
|
||||
k.Close()
|
||||
if err != nil || s == "" {
|
||||
continue
|
||||
}
|
||||
if g := ole.NewGUID(s); g != nil {
|
||||
return g, nil
|
||||
}
|
||||
}
|
||||
return nil, fmt.Errorf("no CLSID registered for %s in either registry view", progID)
|
||||
}
|
||||
|
||||
// createOmniRig32 activates OmniRig's 32-bit out-of-process server explicitly,
|
||||
// bypassing the 64-bit registry lookup that CoCreateInstance would otherwise do.
|
||||
func createOmniRig32(progID string) (*ole.IDispatch, error) {
|
||||
clsid, err := omnirigCLSIDFromRegistry(progID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var unk *ole.IUnknown
|
||||
hr, _, _ := procCoCreateInst32.Call(
|
||||
uintptr(unsafe.Pointer(clsid)),
|
||||
0, // no aggregation
|
||||
uintptr(ole.CLSCTX_LOCAL_SERVER|clsctxActivate32BitServer),
|
||||
uintptr(unsafe.Pointer(ole.IID_IUnknown)),
|
||||
uintptr(unsafe.Pointer(&unk)))
|
||||
if hr != 0 {
|
||||
return nil, fmt.Errorf("CoCreateInstance(32-bit local server) failed: %w", ole.NewError(hr))
|
||||
}
|
||||
disp, err := unk.QueryInterface(ole.IID_IDispatch)
|
||||
unk.Release()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("query IDispatch: %w", err)
|
||||
}
|
||||
return disp, nil
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package cat
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// The COM refusal when OmniRig runs elevated and OpsLog does not (or the reverse)
|
||||
// must be recognised and named. It reached a user as "OmniRig not found" while
|
||||
// OmniRig sat visibly on screen with its settings window open — so the report was
|
||||
// a driver hunt that could never succeed.
|
||||
//
|
||||
// Windows returns this text localised, so the match cannot rely on English alone;
|
||||
// the HRESULT (0x800702E4 = ERROR_ELEVATION_REQUIRED) is accepted too.
|
||||
func TestElevationHint(t *testing.T) {
|
||||
recognised := []string{
|
||||
"L’opération demandée nécessite une élévation.", // as logged, fr-FR
|
||||
"The requested operation requires elevation.",
|
||||
"Access denied",
|
||||
"Accès refusé",
|
||||
"CoCreateInstance failed: 0x800702E4",
|
||||
}
|
||||
for _, msg := range recognised {
|
||||
if elevationHint(errors.New(msg)) == "" {
|
||||
t.Errorf("not recognised as a privilege problem: %q", msg)
|
||||
}
|
||||
}
|
||||
|
||||
// Unrelated failures must NOT be blamed on elevation, or the advice sends the
|
||||
// operator to the wrong place just as surely.
|
||||
for _, msg := range []string{
|
||||
"Classe non enregistrée",
|
||||
"REGDB_E_CLASSNOTREG",
|
||||
"no CLSID registered for Omnirig.OmnirigX in either registry view",
|
||||
"open COM3: Access is den", // truncated word must not match "access denied"
|
||||
} {
|
||||
if h := elevationHint(errors.New(msg)); h != "" {
|
||||
t.Errorf("%q wrongly reported as a privilege problem: %s", msg, h)
|
||||
}
|
||||
}
|
||||
|
||||
if elevationHint(nil) != "" {
|
||||
t.Error("nil error must yield no hint")
|
||||
}
|
||||
}
|
||||
|
||||
// The reconnect loop runs every 5 s forever; a persistent failure must be logged
|
||||
// once, not 1500 times an hour.
|
||||
func TestLogConnFailureOnlyOncePerCause(t *testing.T) {
|
||||
var lines []string
|
||||
prev := LogSink
|
||||
LogSink = func(format string, args ...any) { lines = append(lines, format) }
|
||||
defer func() { LogSink = prev }()
|
||||
|
||||
o := &OmniRig{RigNum: 1}
|
||||
for i := 0; i < 20; i++ {
|
||||
o.logConnFailure("requires elevation")
|
||||
}
|
||||
if len(lines) != 1 {
|
||||
t.Errorf("logged %d times, want 1", len(lines))
|
||||
}
|
||||
// A DIFFERENT cause must still be reported.
|
||||
o.logConnFailure("class not registered")
|
||||
if len(lines) != 2 {
|
||||
t.Errorf("a new cause was not logged: %d lines", len(lines))
|
||||
}
|
||||
// And after reconnecting, the same cause may be reported again.
|
||||
o.connLogged = ""
|
||||
o.logConnFailure("requires elevation")
|
||||
if len(lines) != 3 {
|
||||
t.Errorf("after a reconnect the cause should log again: %d lines", len(lines))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
package cat
|
||||
|
||||
import "testing"
|
||||
|
||||
// Every known rig's OmniRig behaviour, pinned. These rules genuinely contradict
|
||||
// each other between models, so a change that fixes one rig must be shown not to
|
||||
// break another — that is what this table is for.
|
||||
func TestResolveOmniRigVFOs(t *testing.T) {
|
||||
const (
|
||||
a14200 = 14200000
|
||||
b14205 = 14205000
|
||||
b21000 = 21000000
|
||||
)
|
||||
|
||||
cases := []struct {
|
||||
name string
|
||||
main, fa, fb int64
|
||||
vfo string
|
||||
split int64
|
||||
wantTX, wantRX int64
|
||||
wantSplit bool
|
||||
}{
|
||||
// The reported failure: FTDX101D, SUB VFO pressed. OmniRig names VFO B and
|
||||
// reports it as the generic Freq; freqA still holds the main VFO. Preferring
|
||||
// freqA meant the display never followed the operator to B.
|
||||
{"FTDX101D on SUB VFO", b14205, a14200, b14205, "B", pmSplitOff, b14205, 0, false},
|
||||
{"FTDX101D on MAIN VFO", a14200, a14200, b14205, "A", pmSplitOff, a14200, 0, false},
|
||||
|
||||
// Non-regression: a rig that does not report the VFO enum keeps the old
|
||||
// order — freqA, then the generic Freq, then freqB.
|
||||
{"no VFO enum, freqA populated (Yaesu/Kenwood)", a14200, a14200, 0, "", pmSplitOff, a14200, 0, false},
|
||||
{"no VFO enum, only generic Freq (IC-9100)", a14200, 0, 0, "", pmSplitOff, a14200, 0, false},
|
||||
{"IC-7610: generic Freq reports B, enum says A", b14205, a14200, b14205, "A", pmSplitOff, a14200, 0, false},
|
||||
|
||||
// Split: PM_SPLITON must be read as a BIT. An exact == 0x8000 reported "no
|
||||
// split" for any rig that sets the flag alongside another bit.
|
||||
{"split, ON flag alone", a14200, a14200, b14205, "AB", pmSplitOn, b14205, a14200, true},
|
||||
{"split, ON flag with extra bits set", a14200, a14200, b14205, "AB", pmSplitOn | 0x40, b14205, a14200, true},
|
||||
{"listening on B → TX on A", b14205, a14200, b14205, "BA", pmSplitOn, a14200, b14205, true},
|
||||
|
||||
// Split must NOT be inferred when the rig says OFF, nor from a stale VFO B
|
||||
// left on another band (the FT-710 / TS-570 false positive).
|
||||
{"OFF flag, two distinct VFOs", a14200, a14200, b14205, "A", pmSplitOff, a14200, 0, false},
|
||||
{"ON flag but VFOs on different bands", a14200, a14200, b21000, "AB", pmSplitOn, a14200, 0, false},
|
||||
{"ON flag but both VFOs identical", a14200, a14200, a14200, "AB", pmSplitOn, a14200, 0, false},
|
||||
{"ON and OFF both set — ambiguous, treat as no split", a14200, a14200, b14205, "A", pmSplitOn | pmSplitOff, a14200, 0, false},
|
||||
}
|
||||
|
||||
for _, c := range cases {
|
||||
tx, rx, split := resolveOmniRigVFOs(c.main, c.fa, c.fb, c.vfo, c.split)
|
||||
if tx != c.wantTX || rx != c.wantRX || split != c.wantSplit {
|
||||
t.Errorf("%s:\n got TX=%d RX=%d split=%v\n want TX=%d RX=%d split=%v",
|
||||
c.name, tx, rx, split, c.wantTX, c.wantRX, c.wantSplit)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,194 @@
|
||||
package clublog
|
||||
|
||||
// mostwanted.go — the ClubLog "Most Wanted" DXCC ranking. ClubLog publishes, per
|
||||
// callsign, how wanted each DXCC entity is (rank 1 = the single most wanted, e.g.
|
||||
// P5 North Korea). We fetch it, invert it to a DXCC-number → rank map, cache it on
|
||||
// disk (personalised to the operator's callsign) and refresh daily. The rank is
|
||||
// surfaced next to the entity in the entry-strip band/slot matrix.
|
||||
//
|
||||
// Endpoint (same one DXHunter uses): mostwanted.php?api=1 returns JSON
|
||||
// { "1": "344", "2": "123", ... } rank → ADIF (DXCC) number
|
||||
// Passing &callsign=<CALL> personalises the ranking to that operator's log.
|
||||
// api=1 is just the "return JSON" flag — no API key is needed here.
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
const mwURL = "https://clublog.org/mostwanted.php?api=1"
|
||||
const mwFile = "clublog_mostwanted.json"
|
||||
|
||||
// mwUserAgent — ClubLog's nginx 403s the default Go user-agent, so set a real one.
|
||||
const mwUserAgent = "OpsLog (amateur radio logger)"
|
||||
|
||||
// mwCache is the on-disk shape (ranks keyed by DXCC number as a string for JSON).
|
||||
type mwCache struct {
|
||||
Callsign string `json:"callsign"`
|
||||
FetchedAt time.Time `json:"fetched_at"`
|
||||
Ranks map[string]int `json:"ranks"`
|
||||
}
|
||||
|
||||
// MostWanted owns the on-disk cache and the parsed DXCC-number → rank map.
|
||||
type MostWanted struct {
|
||||
dir string
|
||||
|
||||
mu sync.RWMutex
|
||||
ranks map[int]int // dxcc number → rank (1 = most wanted)
|
||||
call string // callsign the current ranks were fetched for
|
||||
fetched time.Time
|
||||
}
|
||||
|
||||
func NewMostWanted(dataDir string) *MostWanted {
|
||||
return &MostWanted{dir: dataDir, ranks: map[int]int{}}
|
||||
}
|
||||
|
||||
func (m *MostWanted) path() string { return filepath.Join(m.dir, mwFile) }
|
||||
|
||||
// Rank returns the most-wanted rank for a DXCC number, or 0 if unknown/unloaded.
|
||||
func (m *MostWanted) Rank(dxcc int) int {
|
||||
if dxcc <= 0 {
|
||||
return 0
|
||||
}
|
||||
m.mu.RLock()
|
||||
defer m.mu.RUnlock()
|
||||
return m.ranks[dxcc]
|
||||
}
|
||||
|
||||
// Ranks returns a copy of the whole DXCC-number → rank map.
|
||||
func (m *MostWanted) Ranks() map[int]int {
|
||||
m.mu.RLock()
|
||||
defer m.mu.RUnlock()
|
||||
out := make(map[int]int, len(m.ranks))
|
||||
for k, v := range m.ranks {
|
||||
out[k] = v
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// Info reports the callsign the list was fetched for, its date, and entity count.
|
||||
func (m *MostWanted) Info() (call, date string, count int) {
|
||||
m.mu.RLock()
|
||||
defer m.mu.RUnlock()
|
||||
d := ""
|
||||
if !m.fetched.IsZero() {
|
||||
d = m.fetched.Format("2006-01-02")
|
||||
}
|
||||
return m.call, d, len(m.ranks)
|
||||
}
|
||||
|
||||
func (m *MostWanted) Loaded() bool {
|
||||
m.mu.RLock()
|
||||
defer m.mu.RUnlock()
|
||||
return len(m.ranks) > 0
|
||||
}
|
||||
|
||||
// LoadFromDisk reads the cached JSON into memory. Does NOT download.
|
||||
func (m *MostWanted) LoadFromDisk() error {
|
||||
b, err := os.ReadFile(m.path())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var c mwCache
|
||||
if err := json.Unmarshal(b, &c); err != nil {
|
||||
return err
|
||||
}
|
||||
ranks := make(map[int]int, len(c.Ranks))
|
||||
for k, v := range c.Ranks {
|
||||
if n, err := strconv.Atoi(k); err == nil && n > 0 && v > 0 {
|
||||
ranks[n] = v
|
||||
}
|
||||
}
|
||||
m.mu.Lock()
|
||||
m.ranks = ranks
|
||||
m.call = c.Callsign
|
||||
m.fetched = c.FetchedAt
|
||||
m.mu.Unlock()
|
||||
return nil
|
||||
}
|
||||
|
||||
// NeedsRefresh reports whether the list is empty, older than maxAge, or was
|
||||
// fetched for a DIFFERENT callsign (the ranking is personalised, so a profile
|
||||
// switch invalidates it).
|
||||
func (m *MostWanted) NeedsRefresh(callsign string, maxAge time.Duration) bool {
|
||||
m.mu.RLock()
|
||||
defer m.mu.RUnlock()
|
||||
if len(m.ranks) == 0 {
|
||||
return true
|
||||
}
|
||||
if !strings.EqualFold(strings.TrimSpace(callsign), m.call) {
|
||||
return true
|
||||
}
|
||||
return time.Since(m.fetched) > maxAge
|
||||
}
|
||||
|
||||
// Download fetches the most-wanted list for callsign, writes it atomically, and
|
||||
// swaps it into memory.
|
||||
func (m *MostWanted) Download(ctx context.Context, callsign string) error {
|
||||
if err := os.MkdirAll(m.dir, 0o755); err != nil {
|
||||
return err
|
||||
}
|
||||
call := strings.ToUpper(strings.TrimSpace(callsign))
|
||||
url := mwURL
|
||||
if call != "" {
|
||||
url += "&callsign=" + call
|
||||
}
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
req.Header.Set("User-Agent", mwUserAgent)
|
||||
client := &http.Client{Timeout: 30 * time.Second}
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
return fmt.Errorf("download: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return fmt.Errorf("clublog mostwanted HTTP %d", resp.StatusCode)
|
||||
}
|
||||
body, err := io.ReadAll(io.LimitReader(resp.Body, 1<<20))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// { "1": "344", "2": "123", ... } — rank → ADIF (DXCC) number.
|
||||
var raw map[string]string
|
||||
if err := json.Unmarshal(body, &raw); err != nil {
|
||||
return fmt.Errorf("clublog mostwanted parse: %w", err)
|
||||
}
|
||||
ranks := make(map[int]int, len(raw))
|
||||
strRanks := make(map[string]int, len(raw))
|
||||
for rankStr, adif := range raw {
|
||||
rank, e1 := strconv.Atoi(strings.TrimSpace(rankStr))
|
||||
dxcc, e2 := strconv.Atoi(strings.TrimSpace(adif))
|
||||
if e1 == nil && e2 == nil && rank > 0 && dxcc > 0 {
|
||||
ranks[dxcc] = rank
|
||||
strRanks[adif] = rank
|
||||
}
|
||||
}
|
||||
if len(ranks) == 0 {
|
||||
return fmt.Errorf("clublog mostwanted: empty/invalid response")
|
||||
}
|
||||
now := time.Now()
|
||||
if b, err := json.Marshal(mwCache{Callsign: call, FetchedAt: now, Ranks: strRanks}); err == nil {
|
||||
tmp := m.path() + ".tmp"
|
||||
if os.WriteFile(tmp, b, 0o644) == nil {
|
||||
_ = os.Rename(tmp, m.path())
|
||||
}
|
||||
}
|
||||
m.mu.Lock()
|
||||
m.ranks = ranks
|
||||
m.call = call
|
||||
m.fetched = now
|
||||
m.mu.Unlock()
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,697 @@
|
||||
// Package cwdecode is a real-time CW (Morse) decoder: it turns a stream of
|
||||
// mono PCM samples into decoded text.
|
||||
//
|
||||
// This is the second generation of the decoder. The first one worked on clean
|
||||
// machine keying but fell apart on real signals; every stage below exists to
|
||||
// fix a specific failure of that version (and of naïve Goertzel decoders in
|
||||
// general):
|
||||
//
|
||||
// audio ─ Hamming-windowed Goertzel bank ─ pitch lock ─ dB envelope with
|
||||
// separate noise-floor / peak trackers ─ hysteresis slicer + SNR squelch ─
|
||||
// DEBOUNCED mark/space stream ─ two-cluster dit/dah length tracking ─
|
||||
// element / character / word segmentation ─ Morse table ─ text
|
||||
//
|
||||
// The fixes that matter, in order of impact:
|
||||
//
|
||||
// 1. Debounced transitions BOTH ways. The old decoder rejected too-short
|
||||
// marks but not too-short SPACES, so a one-hop fade inside a dah (QSB,
|
||||
// static crash) split it into two dits — the single biggest source of
|
||||
// garbage on real signals. Here a state flip must persist for a glitch
|
||||
// time (~0.3 dit) before it is committed; shorter flips are folded back
|
||||
// into the surrounding element.
|
||||
//
|
||||
// 2. Two-cluster timing. Dit and dah lengths are tracked as two separate
|
||||
// moving centres with the decision boundary at their geometric mean,
|
||||
// instead of one EMA "dot length" that both classifies marks and is
|
||||
// updated by that same classification (a feedback loop that spiralled to
|
||||
// "all dits at 60 WPM" the moment it started mis-classifying). The
|
||||
// inter-element gaps also feed the dit centre — spaces are timing
|
||||
// evidence too, and hand keying is often more regular in its gaps than
|
||||
// in its dits.
|
||||
//
|
||||
// 3. dB-domain envelope. Peak and noise floor are tracked in dB with
|
||||
// asymmetric attack/decay, the slicer runs at 55%/38% of the span with
|
||||
// hysteresis, and a minimum-span squelch (6 dB) keeps pure noise from
|
||||
// keying at all. In the old linear-magnitude scheme weak signals lived
|
||||
// in the bottom few percent of the scale and QSB swallowed them.
|
||||
//
|
||||
// 4. Windowed Goertzel. A Hamming window tames spectral leakage so a strong
|
||||
// tone doesn't bleed across the whole bank and corrupt both the noise
|
||||
// estimate and the lock choice.
|
||||
//
|
||||
// Kept from the first version because they were right: the pitch LOCK (decode
|
||||
// one tone, ignore QRM at other pitches), pitch targeting (follow the radio's
|
||||
// known CW pitch instead of searching — SetTarget), tiered acquisition
|
||||
// (strong signals lock on the first hop so their opening dit isn't eaten),
|
||||
// the floor frozen during key-down (a rising floor mid-dah fragments it), and
|
||||
// the end-of-over flush when the lock releases.
|
||||
//
|
||||
// Deliberately dependency-free and fed by plain []int16 so the whole pipeline
|
||||
// is unit-tested with synthetic signals (see cwdecode_test.go: clean keying at
|
||||
// several speeds, added noise, QSB fading, QRM on a nearby pitch, and a
|
||||
// noise-only squelch test).
|
||||
//
|
||||
// Honest expectations: on clean or moderately noisy signals this decodes
|
||||
// solidly; very weak signals in heavy QRM remain hard for any envelope
|
||||
// decoder — the tools that shine there (CW Skimmer, SDC) use probabilistic
|
||||
// sequence estimation on top. This stage is designed so such a layer could be
|
||||
// added later without touching the DSP.
|
||||
package cwdecode
|
||||
|
||||
import (
|
||||
"math"
|
||||
"sort"
|
||||
"sync/atomic"
|
||||
)
|
||||
|
||||
// Status is a periodic snapshot for the UI (pitch lock, speed, signal).
|
||||
type Status struct {
|
||||
WPM int `json:"wpm"`
|
||||
Pitch int `json:"pitch"` // Hz of the locked tone (0 = not locked)
|
||||
Level float64 `json:"level"` // 0..1 input audio level (RMS) for the meter
|
||||
Active bool `json:"active"` // a tone is currently keyed down
|
||||
}
|
||||
|
||||
// Decoder consumes PCM and emits decoded characters via onChar (one or more
|
||||
// characters at a time, including " " for word gaps) and periodic onStatus.
|
||||
// Process must be called from a single goroutine; SetTarget is safe to call
|
||||
// concurrently.
|
||||
type Decoder struct {
|
||||
fs int
|
||||
hop int // samples between analyses (~6 ms)
|
||||
win int // Goertzel window length (~20 ms)
|
||||
hopMs float64 // hop duration in ms
|
||||
biasMs float64 // envelope widening caused by the analysis window (see below)
|
||||
|
||||
window []float64 // Hamming window, len win
|
||||
ring []float64 // circular raw-sample buffer, len win
|
||||
rpos int // next write position in ring
|
||||
filled int // samples written so far (until >= win)
|
||||
acc int // samples since last analysis
|
||||
|
||||
ws []float64 // scratch: windowed samples for this hop
|
||||
|
||||
// Search bank (only run while unlocked / untargeted).
|
||||
freqs []float64
|
||||
coeffs []float64
|
||||
mags []float64 // dB per bin
|
||||
nbuf []float64 // scratch for the median
|
||||
|
||||
// Fixed-pitch target (Hz). 0 = auto-search; >0 = decode exactly this pitch
|
||||
// and ignore everything else (e.g. follow the radio's CW pitch). Set live
|
||||
// from another goroutine, so it's atomic.
|
||||
targetHz atomic.Int32
|
||||
targetFor float64 // freq the cached target coeff was computed for
|
||||
targetCoeff float64
|
||||
|
||||
// Pitch lock.
|
||||
lockIdx int // bin index while auto-locked; -1 = unlocked
|
||||
candIdx int
|
||||
candHops int
|
||||
quietHops int // consecutive key-up hops while locked (drives release)
|
||||
bankTick int // hops since the bank last ran while locked
|
||||
betterHops int // evidence that a different bin is the real signal
|
||||
|
||||
// Envelope (dB domain) on the locked/target tone.
|
||||
floorDB, peakDB float64
|
||||
bankNoiseDB float64 // broadband reference: EMA of the bank median
|
||||
haveBankNoise bool
|
||||
envSeeded bool
|
||||
rawKey bool // slicer output this hop
|
||||
|
||||
// Debounced mark/space state machine.
|
||||
key bool // committed state (true = mark)
|
||||
stableHops int // hops in the committed state
|
||||
pendHops int // consecutive hops the raw state has disagreed
|
||||
|
||||
// Two-cluster element timing (ms).
|
||||
muDit, muDah float64
|
||||
marksSeen int
|
||||
|
||||
// Character assembly. Element DURATIONS are stored and only classified
|
||||
// into dits/dahs when the character is flushed: by then the character's
|
||||
// own marks are all known, and a bimodal batch carries its own dit/dah
|
||||
// boundary — so even the very first character of an over decodes
|
||||
// correctly at any speed, before the global clusters have converged.
|
||||
elemMs []float64
|
||||
charEmitted bool
|
||||
wordEmitted bool
|
||||
textSince bool // something was decoded since lock (guards leading spaces)
|
||||
|
||||
lastPitch float64
|
||||
lastRMS float64
|
||||
|
||||
statusEvery int
|
||||
sinceStatus int
|
||||
|
||||
onChar func(string)
|
||||
onStatus func(Status)
|
||||
}
|
||||
|
||||
var morse = map[string]byte{
|
||||
".-": 'A', "-...": 'B', "-.-.": 'C', "-..": 'D', ".": 'E', "..-.": 'F',
|
||||
"--.": 'G', "....": 'H', "..": 'I', ".---": 'J', "-.-": 'K', ".-..": 'L',
|
||||
"--": 'M', "-.": 'N', "---": 'O', ".--.": 'P', "--.-": 'Q', ".-.": 'R',
|
||||
"...": 'S', "-": 'T', "..-": 'U', "...-": 'V', ".--": 'W', "-..-": 'X',
|
||||
"-.--": 'Y', "--..": 'Z',
|
||||
"-----": '0', ".----": '1', "..---": '2', "...--": '3', "....-": '4',
|
||||
".....": '5', "-....": '6', "--...": '7', "---..": '8', "----.": '9',
|
||||
".-.-.-": '.', "--..--": ',', "..--..": '?', "-..-.": '/', "-...-": '=',
|
||||
".-.-.": '+', "-.-.--": '!', "---...": ':', "-....-": '-', ".--.-.": '@',
|
||||
}
|
||||
|
||||
// Tunables (hops are ~6 ms).
|
||||
const (
|
||||
minDitMs = 20.0 // 60 WPM ceiling
|
||||
maxDitMs = 240.0 // 5 WPM floor
|
||||
seedDit = 60.0 // 20 WPM seed before any marks are seen
|
||||
|
||||
acqStrongDB = 12.0 // lock on the FIRST hop above this SNR (don't eat the opening dit)
|
||||
acqWeakDB = 8.5 // lock after sustained hops above this SNR
|
||||
// Successive analysis windows overlap ~70%, so consecutive hops are highly
|
||||
// correlated — a noise spike easily "persists" 2–3 hops. Requiring ~2 full
|
||||
// window lengths of persistence makes a false noise lock genuinely rare.
|
||||
acqWeakHops = 6
|
||||
|
||||
squelchDB = 6.0 // minimum peak-floor span to key at all
|
||||
// The span alone can't reject pure noise: a noise bin's dB level swings
|
||||
// ±5–6 dB, which the peak/floor trackers happily turn into a keyable
|
||||
// span. The second squelch is ABSOLUTE: the envelope peak must stand well
|
||||
// above the broadband noise reference (the bank median) — a keyed tone
|
||||
// does, noise never sustainably does.
|
||||
snrSquelchDB = 9.5
|
||||
|
||||
// The slicer's span is CAPPED: with a very quiet background (high SNR, or
|
||||
// digitally silent test signals) the raw floor sits so far below the peak
|
||||
// that the off-threshold lands in the analysis window's skirts — every
|
||||
// mark then stretches by almost a full window and every gap shrinks,
|
||||
// until character gaps fall below the segmentation threshold and letters
|
||||
// merge. Capping the usable span keeps the slicer crossing near the
|
||||
// signal edges regardless of how quiet the background is.
|
||||
spanCapDB = 30.0
|
||||
|
||||
onFrac = 0.55 // slicer thresholds as a fraction of the (capped) span…
|
||||
offFrac = 0.38 // …with hysteresis
|
||||
|
||||
charGapDits = 2.2 // gap > this ⇒ character boundary (geom. mean of 1 & 3 ≈ 1.7, plus margin for sloppy fists)
|
||||
wordGapDits = 4.6 // gap > this ⇒ word boundary (geom. mean of 3 & 7)
|
||||
)
|
||||
|
||||
// New builds a decoder for the given sample rate. onChar receives decoded text
|
||||
// incrementally; onStatus receives ~10 snapshots/second. Either may be nil.
|
||||
func New(sampleRate int, onChar func(string), onStatus func(Status)) *Decoder {
|
||||
if sampleRate <= 0 {
|
||||
sampleRate = 16000
|
||||
}
|
||||
d := &Decoder{
|
||||
fs: sampleRate,
|
||||
hop: sampleRate * 5 / 1000, // 5 ms — resolves dits up to ~50 WPM
|
||||
win: sampleRate * 16 / 1000, // 16 ms window (≈80 Hz bandwidth with Hamming; a 20 ms window left 40 WPM inter-element gaps with almost no envelope dip)
|
||||
lockIdx: -1,
|
||||
candIdx: -1,
|
||||
muDit: seedDit,
|
||||
muDah: 3 * seedDit,
|
||||
onChar: onChar,
|
||||
onStatus: onStatus,
|
||||
}
|
||||
if d.hop < 1 {
|
||||
d.hop = 1
|
||||
}
|
||||
if d.win < 4*d.hop {
|
||||
d.win = 4 * d.hop
|
||||
}
|
||||
d.hopMs = float64(d.hop) / float64(d.fs) * 1000
|
||||
// Even with the span cap, the analysis window widens every mark and
|
||||
// narrows every gap by roughly half a window on each edge (the tone leaks
|
||||
// into windows that straddle an edge). Durations are de-biased by this
|
||||
// constant so the timing clusters and gap thresholds see true lengths.
|
||||
d.biasMs = 0.6 * float64(d.win) / float64(d.fs) * 1000
|
||||
d.statusEvery = int(math.Max(1, 100/d.hopMs)) // ~10 Hz
|
||||
d.ring = make([]float64, d.win)
|
||||
d.ws = make([]float64, d.win)
|
||||
// Hamming window: −43 dB sidelobes keep a strong tone from bleeding across
|
||||
// the bank (rectangular Goertzel leaks at −13 dB, enough to fool the lock).
|
||||
d.window = make([]float64, d.win)
|
||||
for i := range d.window {
|
||||
d.window[i] = 0.54 - 0.46*math.Cos(2*math.Pi*float64(i)/float64(d.win-1))
|
||||
}
|
||||
// Candidate CW tones: 400–1000 Hz every 30 Hz. Deliberately NOT lower:
|
||||
// low-frequency hum/rumble rises toward DC and would win the argmax.
|
||||
for f := 400.0; f <= 1000.0; f += 30 {
|
||||
d.freqs = append(d.freqs, f)
|
||||
d.coeffs = append(d.coeffs, 2*math.Cos(2*math.Pi*f/float64(d.fs)))
|
||||
}
|
||||
d.mags = make([]float64, len(d.freqs))
|
||||
d.nbuf = make([]float64, len(d.freqs))
|
||||
return d
|
||||
}
|
||||
|
||||
// SetTarget fixes the decode pitch to hz (an exact-frequency detector, not the
|
||||
// nearest search bin), or returns to auto-search when hz <= 0. Safe to call
|
||||
// concurrently.
|
||||
func (d *Decoder) SetTarget(hz int) { d.targetHz.Store(int32(hz)) }
|
||||
|
||||
// Reset clears decode state (e.g. when the user re-arms the decoder).
|
||||
func (d *Decoder) Reset() {
|
||||
d.rpos, d.filled, d.acc = 0, 0, 0
|
||||
d.lockIdx, d.candIdx, d.candHops, d.quietHops = -1, -1, 0, 0
|
||||
d.envSeeded, d.rawKey, d.key = false, false, false
|
||||
d.haveBankNoise = false
|
||||
d.stableHops, d.pendHops = 0, 0
|
||||
d.bankTick, d.betterHops = 0, 0
|
||||
d.muDit, d.muDah, d.marksSeen = seedDit, 3*seedDit, 0
|
||||
d.elemMs = d.elemMs[:0]
|
||||
d.charEmitted, d.wordEmitted, d.textSince = true, true, false
|
||||
}
|
||||
|
||||
// Process feeds a block of mono samples through the decoder.
|
||||
func (d *Decoder) Process(samples []int16) {
|
||||
for _, s := range samples {
|
||||
d.ring[d.rpos] = float64(s)
|
||||
d.rpos++
|
||||
if d.rpos == d.win {
|
||||
d.rpos = 0
|
||||
}
|
||||
if d.filled < d.win {
|
||||
d.filled++
|
||||
}
|
||||
d.acc++
|
||||
if d.acc >= d.hop && d.filled >= d.win {
|
||||
d.acc = 0
|
||||
d.hopStep()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// goertzelDB returns the tone power (dB, arbitrary reference) of the windowed
|
||||
// scratch buffer at the detector coefficient c.
|
||||
func (d *Decoder) goertzelDB(c float64) float64 {
|
||||
var s1, s2 float64
|
||||
for _, x := range d.ws {
|
||||
s0 := x + c*s1 - s2
|
||||
s2 = s1
|
||||
s1 = s0
|
||||
}
|
||||
p := s1*s1 + s2*s2 - c*s1*s2
|
||||
if p < 1e-12 {
|
||||
p = 1e-12
|
||||
}
|
||||
return 10 * math.Log10(p)
|
||||
}
|
||||
|
||||
// hopStep runs one analysis hop: tone detection, envelope, slicer, timing.
|
||||
func (d *Decoder) hopStep() {
|
||||
// Materialize the window (oldest→newest; order is irrelevant for power)
|
||||
// and the RMS level for the UI meter.
|
||||
var sumSq float64
|
||||
for i := 0; i < d.win; i++ {
|
||||
x := d.ring[(d.rpos+i)%d.win]
|
||||
d.ws[i] = x * d.window[i]
|
||||
sumSq += x * x
|
||||
}
|
||||
d.lastRMS = math.Min(1, math.Sqrt(sumSq/float64(d.win))/32768*4)
|
||||
|
||||
toneDB, haveTone := 0.0, false
|
||||
|
||||
if th := float64(d.targetHz.Load()); th > 0 {
|
||||
// Fixed pitch: one exact-frequency detector, like a skimmer channel.
|
||||
if th != d.targetFor {
|
||||
d.targetFor = th
|
||||
d.targetCoeff = 2 * math.Cos(2*math.Pi*th/float64(d.fs))
|
||||
d.envSeeded = false // re-seed the envelope for the new channel
|
||||
}
|
||||
toneDB = d.goertzelDB(d.targetCoeff)
|
||||
d.lastPitch = th
|
||||
d.lockIdx = -1 // targeting supersedes the auto lock
|
||||
haveTone = true
|
||||
// Refresh the broadband noise reference for the absolute squelch.
|
||||
d.bankTick++
|
||||
if d.bankTick >= 8 {
|
||||
d.bankTick = 0
|
||||
for i, c := range d.coeffs {
|
||||
d.mags[i] = d.goertzelDB(c)
|
||||
}
|
||||
copy(d.nbuf, d.mags)
|
||||
sort.Float64s(d.nbuf)
|
||||
d.updateBankNoise(d.nbuf[len(d.nbuf)/2])
|
||||
}
|
||||
} else if d.lockIdx >= 0 {
|
||||
// Auto-locked: only the locked bin is needed per hop.
|
||||
toneDB = d.goertzelDB(d.coeffs[d.lockIdx])
|
||||
d.lastPitch = d.freqs[d.lockIdx]
|
||||
haveTone = true
|
||||
// Supervised re-lock: periodically sweep the whole bank anyway. If a
|
||||
// clearly stronger tone lives on a DIFFERENT pitch and keeps doing so,
|
||||
// the current lock is wrong (locked onto noise, or the operator moved)
|
||||
// — jump to the real signal instead of decoding garbage until the
|
||||
// quiet-release finally fires.
|
||||
d.bankTick++
|
||||
if d.bankTick >= 8 {
|
||||
d.bankTick = 0
|
||||
bestIdx, bestDB := -1, math.Inf(-1)
|
||||
for i, c := range d.coeffs {
|
||||
m := d.goertzelDB(c)
|
||||
d.mags[i] = m
|
||||
if i >= d.lockIdx-1 && i <= d.lockIdx+1 {
|
||||
continue
|
||||
}
|
||||
if m > bestDB {
|
||||
bestDB, bestIdx = m, i
|
||||
}
|
||||
}
|
||||
copy(d.nbuf, d.mags)
|
||||
sort.Float64s(d.nbuf)
|
||||
d.updateBankNoise(d.nbuf[len(d.nbuf)/2])
|
||||
if bestIdx >= 0 && bestDB > toneDB+6 {
|
||||
d.betterHops += 2
|
||||
} else if d.betterHops > 0 {
|
||||
d.betterHops--
|
||||
}
|
||||
if d.betterHops >= 24 && bestIdx >= 0 { // ~12 confirmations over ~1 s
|
||||
d.flushPending()
|
||||
copy(d.nbuf, d.mags)
|
||||
sort.Float64s(d.nbuf)
|
||||
d.lockIdx = bestIdx
|
||||
// Seed the envelope honestly: floor from the bank median, NOT
|
||||
// peak−cap — fabricating a full span would let a noise re-lock
|
||||
// key freely until the trackers converged.
|
||||
d.floorDB, d.peakDB = d.nbuf[len(d.nbuf)/2], bestDB
|
||||
d.quietHops, d.bankTick, d.betterHops = 0, 0, 0
|
||||
d.marksSeen = 0
|
||||
d.elemMs = d.elemMs[:0]
|
||||
d.charEmitted, d.wordEmitted, d.textSince = true, true, false
|
||||
d.key, d.stableHops, d.pendHops = false, 0, 0
|
||||
toneDB = d.goertzelDB(d.coeffs[d.lockIdx])
|
||||
d.lastPitch = d.freqs[d.lockIdx]
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Unlocked: run the whole bank, estimate noise, hunt for a tone.
|
||||
maxIdx, maxDB := 0, math.Inf(-1)
|
||||
for i, c := range d.coeffs {
|
||||
m := d.goertzelDB(c)
|
||||
d.mags[i] = m
|
||||
if m > maxDB {
|
||||
maxDB, maxIdx = m, i
|
||||
}
|
||||
}
|
||||
copy(d.nbuf, d.mags)
|
||||
sort.Float64s(d.nbuf)
|
||||
noise := d.nbuf[len(d.nbuf)/2] // median: robust to a few strong tones
|
||||
d.updateBankNoise(noise)
|
||||
snr := maxDB - noise
|
||||
|
||||
near := d.candIdx >= 0 && maxIdx >= d.candIdx-1 && maxIdx <= d.candIdx+1
|
||||
if near {
|
||||
d.candHops++
|
||||
} else {
|
||||
d.candIdx, d.candHops = maxIdx, 1
|
||||
}
|
||||
// Tiered acquisition: a clearly strong tone locks on the FIRST hop (so
|
||||
// its opening dit isn't eaten), a marginal one must persist a few hops
|
||||
// (so we don't lock onto a noise spike).
|
||||
if snr > acqStrongDB || (d.candHops >= acqWeakHops && snr > acqWeakDB) {
|
||||
d.lockIdx = maxIdx
|
||||
d.floorDB, d.peakDB = noise, maxDB
|
||||
d.envSeeded = true
|
||||
d.quietHops = 0
|
||||
d.bankTick, d.betterHops = 0, 0
|
||||
d.marksSeen = 0 // relearn speed quickly for this signal (keep muDit as seed)
|
||||
d.elemMs = d.elemMs[:0]
|
||||
d.charEmitted, d.wordEmitted, d.textSince = true, true, false
|
||||
d.key, d.stableHops, d.pendHops = false, 0, 0
|
||||
toneDB = maxDB
|
||||
d.lastPitch = d.freqs[maxIdx]
|
||||
haveTone = true
|
||||
} else {
|
||||
d.lastPitch = 0
|
||||
}
|
||||
}
|
||||
|
||||
if !haveTone {
|
||||
d.rawKey = false
|
||||
d.emitStatus()
|
||||
return
|
||||
}
|
||||
if !d.envSeeded {
|
||||
// First hop on a targeted channel: seed from the current reading.
|
||||
d.floorDB, d.peakDB = toneDB, toneDB+squelchDB
|
||||
d.envSeeded = true
|
||||
}
|
||||
|
||||
// ---- Envelope: separate floor / peak trackers, dB domain. ----
|
||||
// Floor drops fast, but only RISES while keyed up: a floor creeping up
|
||||
// under a long dah shrinks the span until the dah fragments into dits.
|
||||
if toneDB < d.floorDB {
|
||||
d.floorDB += (toneDB - d.floorDB) * 0.3
|
||||
} else if !d.rawKey {
|
||||
d.floorDB += (toneDB - d.floorDB) * 0.015
|
||||
}
|
||||
// Peak attacks fast and decays slowly toward current conditions (~1.5 s),
|
||||
// so QSB is followed without collapsing across ordinary word gaps.
|
||||
if toneDB > d.peakDB {
|
||||
d.peakDB += (toneDB - d.peakDB) * 0.4
|
||||
} else {
|
||||
d.peakDB += (toneDB - d.peakDB) * 0.004
|
||||
}
|
||||
if d.peakDB < d.floorDB {
|
||||
d.peakDB = d.floorDB
|
||||
}
|
||||
|
||||
// ---- Slicer with hysteresis + SNR squelch. ----
|
||||
if d.peakDB-d.floorDB < squelchDB ||
|
||||
(d.haveBankNoise && d.peakDB < d.bankNoiseDB+snrSquelchDB) {
|
||||
d.rawKey = false
|
||||
} else {
|
||||
// Cap the usable span so the slicer crossings stay near the keying
|
||||
// edges even over a dead-quiet background (see spanCapDB).
|
||||
effFloor := math.Max(d.floorDB, d.peakDB-spanCapDB)
|
||||
span := d.peakDB - effFloor
|
||||
if d.rawKey {
|
||||
d.rawKey = toneDB > effFloor+offFrac*span
|
||||
} else {
|
||||
d.rawKey = toneDB > effFloor+onFrac*span
|
||||
}
|
||||
}
|
||||
|
||||
// ---- Auto-lock release after a long quiet spell. ----
|
||||
if d.lockIdx >= 0 {
|
||||
if d.rawKey {
|
||||
d.quietHops = 0
|
||||
} else {
|
||||
d.quietHops++
|
||||
// Long enough to survive slow-speed word gaps (7 dits), short
|
||||
// enough to retune to a new signal within a few seconds.
|
||||
release := int(math.Max(2000, 12*d.muDit) / d.hopMs)
|
||||
if d.quietHops > release {
|
||||
d.flushPending()
|
||||
d.lockIdx, d.candIdx, d.candHops = -1, -1, 0
|
||||
d.rawKey = false
|
||||
d.lastPitch = 0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
d.timing()
|
||||
d.emitStatus()
|
||||
}
|
||||
|
||||
// updateBankNoise folds a fresh bank-median reading into the broadband noise
|
||||
// reference used by the absolute squelch.
|
||||
func (d *Decoder) updateBankNoise(medianDB float64) {
|
||||
if !d.haveBankNoise {
|
||||
d.bankNoiseDB, d.haveBankNoise = medianDB, true
|
||||
return
|
||||
}
|
||||
d.bankNoiseDB += (medianDB - d.bankNoiseDB) * 0.2
|
||||
}
|
||||
|
||||
// glitchHops is the debounce time in hops: ~0.3 dit, clamped to 1..3 hops
|
||||
// (6–19 ms) so it neither swallows fast dits nor passes static crashes.
|
||||
func (d *Decoder) glitchHops() int {
|
||||
g := int(math.Round(0.3 * d.muDit / d.hopMs))
|
||||
if g < 1 {
|
||||
g = 1
|
||||
}
|
||||
if g > 3 {
|
||||
g = 3
|
||||
}
|
||||
return g
|
||||
}
|
||||
|
||||
// timing runs the debounced mark/space state machine for one hop.
|
||||
func (d *Decoder) timing() {
|
||||
if d.rawKey == d.key {
|
||||
// Agreement folds any pending flip back into the committed state:
|
||||
// a sub-glitch dropout inside a dah (or spike inside a gap) vanishes.
|
||||
d.stableHops += 1 + d.pendHops
|
||||
d.pendHops = 0
|
||||
} else {
|
||||
d.pendHops++
|
||||
if d.pendHops > d.glitchHops() {
|
||||
seg := d.stableHops
|
||||
wasMark := d.key
|
||||
d.key = d.rawKey
|
||||
d.stableHops = d.pendHops
|
||||
d.pendHops = 0
|
||||
if wasMark {
|
||||
d.endMark(seg)
|
||||
} else {
|
||||
d.endSpace(seg)
|
||||
}
|
||||
if d.key {
|
||||
d.charEmitted, d.wordEmitted = false, false
|
||||
}
|
||||
}
|
||||
}
|
||||
if !d.key {
|
||||
d.spaceProgress()
|
||||
}
|
||||
}
|
||||
|
||||
// endMark stores a finished key-down run for the character batch. Cluster
|
||||
// updates deliberately do NOT happen here: attributing a mark to the dit or
|
||||
// dah centre with the still-converging global boundary poisons the clusters
|
||||
// (a dah-led character at an unexpected speed lands its dahs in the dit
|
||||
// centre, which then oscillates). Both classification AND cluster updates
|
||||
// happen per character in flushChar, where the batch's own contrast makes
|
||||
// the attribution reliable.
|
||||
func (d *Decoder) endMark(hops int) {
|
||||
ms := float64(hops)*d.hopMs - d.biasMs // de-bias the window widening
|
||||
if ms < 0.5*minDitMs {
|
||||
return // debounce residue — not a credible element
|
||||
}
|
||||
d.elemMs = append(d.elemMs, ms)
|
||||
// Bootstrap: a first mark SHORTER than the seeded dit can only be a dit of
|
||||
// a faster sender — jump the estimate straight there instead of easing in.
|
||||
if d.marksSeen == 0 && ms < d.muDit {
|
||||
d.muDit = math.Max(ms, minDitMs)
|
||||
}
|
||||
d.marksSeen++
|
||||
if len(d.elemMs) > 8 {
|
||||
d.elemMs = d.elemMs[:0] // no Morse character is that long — noise run
|
||||
}
|
||||
}
|
||||
|
||||
// endSpace runs when a mark begins: the finished gap, if it was clearly an
|
||||
// inter-element one, is extra evidence for the dit length (gaps are often
|
||||
// steadier than dits in hand keying).
|
||||
func (d *Decoder) endSpace(hops int) {
|
||||
ms := float64(hops)*d.hopMs + d.biasMs // gaps shrink by what marks gained
|
||||
if d.marksSeen < 1 || ms < 0.35*d.muDit || ms > 1.7*d.muDit {
|
||||
return
|
||||
}
|
||||
// Early on, gaps are the FASTEST way to find the true dit length (the very
|
||||
// first inter-element gap is one, whatever the first mark was); once the
|
||||
// clusters have settled they are just a gentle refinement.
|
||||
alpha := 0.08
|
||||
if d.marksSeen < 8 {
|
||||
alpha = 0.35
|
||||
}
|
||||
d.muDit += (ms - d.muDit) * alpha
|
||||
d.muDit = math.Min(math.Max(d.muDit, minDitMs), maxDitMs)
|
||||
}
|
||||
|
||||
// spaceProgress emits the pending character / word space LIVE once the current
|
||||
// gap crosses each boundary (instead of waiting for the next mark), so text
|
||||
// appears as it is sent.
|
||||
func (d *Decoder) spaceProgress() {
|
||||
gapMs := float64(d.stableHops)*d.hopMs + d.biasMs
|
||||
if !d.charEmitted && gapMs > charGapDits*d.muDit {
|
||||
d.flushChar()
|
||||
d.charEmitted = true
|
||||
}
|
||||
if !d.wordEmitted && gapMs > wordGapDits*d.muDit {
|
||||
if d.textSince && d.onChar != nil {
|
||||
d.onChar(" ")
|
||||
}
|
||||
d.wordEmitted = true
|
||||
}
|
||||
}
|
||||
|
||||
// flushChar classifies the accumulated mark durations into dits/dahs and
|
||||
// emits the character. Classification happens HERE, not as marks arrive: a
|
||||
// character whose own marks are clearly bimodal carries its own dit/dah
|
||||
// boundary (their geometric mean), which decodes correctly even before the
|
||||
// global clusters have converged — the first character of an over included.
|
||||
// Unimodal characters (EEE, TTT, 555…) fall back to the global boundary.
|
||||
func (d *Decoder) flushChar() {
|
||||
if len(d.elemMs) == 0 {
|
||||
return
|
||||
}
|
||||
lo, hi := d.elemMs[0], d.elemMs[0]
|
||||
for _, v := range d.elemMs[1:] {
|
||||
lo = math.Min(lo, v)
|
||||
hi = math.Max(hi, v)
|
||||
}
|
||||
b := math.Sqrt(d.muDit * d.muDah)
|
||||
if hi >= 2*lo {
|
||||
b = math.Sqrt(lo * hi) // the batch is bimodal: trust its own contrast
|
||||
}
|
||||
alpha := 0.18
|
||||
if d.marksSeen <= 8 {
|
||||
alpha = 0.45 // converge fast on a new sender
|
||||
}
|
||||
pat := make([]byte, len(d.elemMs))
|
||||
for i, v := range d.elemMs {
|
||||
if v < b {
|
||||
pat[i] = '.'
|
||||
d.muDit += (v - d.muDit) * alpha
|
||||
} else {
|
||||
pat[i] = '-'
|
||||
d.muDah += (v - d.muDah) * alpha
|
||||
}
|
||||
}
|
||||
// Ratio guards: dah stays 2–4.8 dits; dit stays within speed limits.
|
||||
d.muDit = math.Min(math.Max(d.muDit, minDitMs), maxDitMs)
|
||||
if d.muDah < 2.0*d.muDit {
|
||||
d.muDah = 2.0 * d.muDit
|
||||
}
|
||||
if d.muDah > 4.8*d.muDit {
|
||||
d.muDah = 4.8 * d.muDit
|
||||
}
|
||||
d.elemMs = d.elemMs[:0]
|
||||
if c, ok := morse[string(pat)]; ok {
|
||||
if d.onChar != nil {
|
||||
d.onChar(string(c))
|
||||
}
|
||||
d.textSince = true
|
||||
} else if len(pat) <= 7 {
|
||||
// Morse-shaped but unknown → flag it; longer runs are noise, drop.
|
||||
if d.onChar != nil {
|
||||
d.onChar("?")
|
||||
}
|
||||
d.textSince = true
|
||||
}
|
||||
}
|
||||
|
||||
// flushPending finishes the in-progress character and word at end-of-over
|
||||
// (lock release), so the last word isn't left hanging until the next signal.
|
||||
func (d *Decoder) flushPending() {
|
||||
if !d.charEmitted {
|
||||
d.flushChar()
|
||||
d.charEmitted = true
|
||||
}
|
||||
if !d.wordEmitted && d.textSince && d.onChar != nil {
|
||||
d.onChar(" ")
|
||||
d.wordEmitted = true
|
||||
}
|
||||
}
|
||||
|
||||
func (d *Decoder) emitStatus() {
|
||||
d.sinceStatus++
|
||||
if d.sinceStatus < d.statusEvery || d.onStatus == nil {
|
||||
return
|
||||
}
|
||||
d.sinceStatus = 0
|
||||
wpm := 0
|
||||
if d.muDit > 0 && (d.lockIdx >= 0 || d.targetHz.Load() > 0) {
|
||||
wpm = int(math.Round(1200 / d.muDit))
|
||||
}
|
||||
d.onStatus(Status{
|
||||
WPM: wpm,
|
||||
Pitch: int(math.Round(d.lastPitch)),
|
||||
Level: d.lastRMS,
|
||||
Active: d.rawKey,
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,326 @@
|
||||
package cwdecode
|
||||
|
||||
import (
|
||||
"math"
|
||||
"math/rand"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// ---- Synthesizer -----------------------------------------------------------
|
||||
|
||||
func charToMorse() map[byte]string {
|
||||
m := map[byte]string{}
|
||||
for code, ch := range morse {
|
||||
m[ch] = code
|
||||
}
|
||||
return m
|
||||
}
|
||||
|
||||
// keyMessage synthesizes keyed CW for msg with raised-cosine edges (5 ms), so
|
||||
// the signal has realistic click-free envelopes rather than hard steps.
|
||||
func keyMessage(msg string, fs, wpm int, pitch, amp float64) []int16 {
|
||||
dot := fs * 1200 / (wpm * 1000) // samples per dit
|
||||
edge := fs * 5 / 1000 // 5 ms shaping
|
||||
c2m := charToMorse()
|
||||
var out []float64
|
||||
phase := 0.0
|
||||
dphi := 2 * math.Pi * pitch / float64(fs)
|
||||
|
||||
tone := func(n int) {
|
||||
for i := 0; i < n; i++ {
|
||||
g := 1.0
|
||||
if i < edge {
|
||||
g = 0.5 - 0.5*math.Cos(math.Pi*float64(i)/float64(edge))
|
||||
} else if n-1-i < edge {
|
||||
g = 0.5 - 0.5*math.Cos(math.Pi*float64(n-1-i)/float64(edge))
|
||||
}
|
||||
out = append(out, amp*g*math.Sin(phase))
|
||||
phase += dphi
|
||||
}
|
||||
}
|
||||
silence := func(n int) {
|
||||
for i := 0; i < n; i++ {
|
||||
out = append(out, 0)
|
||||
}
|
||||
}
|
||||
|
||||
silence(fs / 4) // lead-in for envelope warm-up
|
||||
for i := 0; i < len(msg); i++ {
|
||||
ch := msg[i]
|
||||
if ch == ' ' {
|
||||
silence(4 * dot) // + trailing 3 from the previous char = 7 total
|
||||
continue
|
||||
}
|
||||
code := c2m[ch]
|
||||
for j := 0; j < len(code); j++ {
|
||||
if code[j] == '.' {
|
||||
tone(dot)
|
||||
} else {
|
||||
tone(3 * dot)
|
||||
}
|
||||
silence(dot)
|
||||
}
|
||||
silence(2 * dot) // + trailing element gap = 3 total
|
||||
}
|
||||
silence(fs / 2)
|
||||
return toInt16(out)
|
||||
}
|
||||
|
||||
func toInt16(x []float64) []int16 {
|
||||
out := make([]int16, len(x))
|
||||
for i, v := range x {
|
||||
if v > 32767 {
|
||||
v = 32767
|
||||
} else if v < -32768 {
|
||||
v = -32768
|
||||
}
|
||||
out[i] = int16(v)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func addNoise(s []int16, sigma float64, seed int64) []int16 {
|
||||
r := rand.New(rand.NewSource(seed))
|
||||
out := make([]int16, len(s))
|
||||
for i, v := range s {
|
||||
out[i] = int16(math.Max(-32768, math.Min(32767, float64(v)+r.NormFloat64()*sigma)))
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// applyQSB modulates the amplitude between lo..1.0 at rate Hz (slow fading).
|
||||
func applyQSB(s []int16, fs int, rate, lo float64) []int16 {
|
||||
out := make([]int16, len(s))
|
||||
for i, v := range s {
|
||||
g := lo + (1-lo)*(0.5+0.5*math.Sin(2*math.Pi*rate*float64(i)/float64(fs)))
|
||||
out[i] = int16(float64(v) * g)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// applyDropouts blanks brief windows (ms long) every period ms — static-crash
|
||||
// style holes that land inside dahs and gaps alike.
|
||||
func applyDropouts(s []int16, fs int, everyMs, holeMs int) []int16 {
|
||||
out := make([]int16, len(s))
|
||||
copy(out, s)
|
||||
every := fs * everyMs / 1000
|
||||
hole := fs * holeMs / 1000
|
||||
for start := every; start+hole < len(out); start += every {
|
||||
for i := start; i < start+hole; i++ {
|
||||
out[i] = 0
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func mix(a, b []int16) []int16 {
|
||||
n := len(a)
|
||||
if len(b) > n {
|
||||
n = len(b)
|
||||
}
|
||||
out := make([]int16, n)
|
||||
for i := 0; i < n; i++ {
|
||||
var v int
|
||||
if i < len(a) {
|
||||
v += int(a[i])
|
||||
}
|
||||
if i < len(b) {
|
||||
v += int(b[i])
|
||||
}
|
||||
if v > 32767 {
|
||||
v = 32767
|
||||
} else if v < -32768 {
|
||||
v = -32768
|
||||
}
|
||||
out[i] = int16(v)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// decode runs samples through a fresh decoder in live-sized chunks.
|
||||
func decode(t *testing.T, samples []int16, targetHz int) string {
|
||||
t.Helper()
|
||||
var sb strings.Builder
|
||||
d := New(16000, func(s string) { sb.WriteString(s) }, nil)
|
||||
if targetHz > 0 {
|
||||
d.SetTarget(targetHz)
|
||||
}
|
||||
for i := 0; i < len(samples); i += 256 {
|
||||
end := i + 256
|
||||
if end > len(samples) {
|
||||
end = len(samples)
|
||||
}
|
||||
d.Process(samples[i:end])
|
||||
}
|
||||
return strings.ToUpper(sb.String())
|
||||
}
|
||||
|
||||
func wantContains(t *testing.T, got, want, label string) {
|
||||
t.Helper()
|
||||
if !strings.Contains(got, want) {
|
||||
t.Fatalf("%s: decoded %q, want it to contain %q", label, got, want)
|
||||
}
|
||||
}
|
||||
|
||||
// ---- Tests -----------------------------------------------------------------
|
||||
|
||||
func TestCleanSignalSpeeds(t *testing.T) {
|
||||
const fs = 16000
|
||||
for _, wpm := range []int{12, 18, 25, 32, 40} {
|
||||
got := decode(t, keyMessage("CQ TEST DE F4BPO K", fs, wpm, 700, 9000), 0)
|
||||
wantContains(t, got, "CQ TEST DE F4BPO K", "clean @"+itoa(wpm)+"wpm")
|
||||
}
|
||||
}
|
||||
|
||||
func TestOtherPitches(t *testing.T) {
|
||||
const fs = 16000
|
||||
for _, pitch := range []float64{450, 600, 850} {
|
||||
got := decode(t, keyMessage("PARIS PARIS", fs, 22, pitch, 9000), 0)
|
||||
wantContains(t, got, "PARIS PARIS", "pitch")
|
||||
}
|
||||
}
|
||||
|
||||
func TestWithNoise(t *testing.T) {
|
||||
const fs = 16000
|
||||
clean := keyMessage("CQ CQ DE HB9HBY", fs, 22, 700, 9000)
|
||||
noisy := addNoise(clean, 2000, 1) // ≈13 dB tone/noise in the audio band
|
||||
got := decode(t, noisy, 0)
|
||||
wantContains(t, got, "CQ CQ DE HB9HBY", "noise")
|
||||
}
|
||||
|
||||
// QSB fading between 35% and 100% amplitude — the adaptive dB envelope must
|
||||
// ride it. The old linear envelope lost the faded halves entirely.
|
||||
func TestQSBFading(t *testing.T) {
|
||||
const fs = 16000
|
||||
clean := keyMessage("CQ CQ CQ DE F4BPO F4BPO", fs, 20, 700, 12000)
|
||||
faded := applyQSB(clean, fs, 0.4, 0.35)
|
||||
got := decode(t, faded, 0)
|
||||
wantContains(t, got, "DE F4BPO", "qsb")
|
||||
}
|
||||
|
||||
// Brief 10 ms holes punched every 150 ms — they land inside dahs. Without the
|
||||
// two-sided debounce every hit dah shatters into dits (the old decoder's
|
||||
// single worst failure on real signals).
|
||||
func TestDropoutsInsideDahs(t *testing.T) {
|
||||
const fs = 16000
|
||||
clean := keyMessage("TEST TEST TEST", fs, 18, 700, 9000)
|
||||
holed := applyDropouts(clean, fs, 150, 10)
|
||||
got := decode(t, holed, 0)
|
||||
wantContains(t, got, "TEST TEST", "dropouts")
|
||||
}
|
||||
|
||||
// QRM: a second, slightly weaker keyed signal at 950 Hz. The pitch lock must
|
||||
// hold the 700 Hz target and ignore the interferer.
|
||||
func TestQRMAutoLock(t *testing.T) {
|
||||
const fs = 16000
|
||||
target := keyMessage("PARIS PARIS PARIS", fs, 20, 700, 9000)
|
||||
qrm := keyMessage("QRZ QRZ QRZ QRZ QRZ", fs, 26, 950, 5000)
|
||||
got := decode(t, mix(target, qrm), 0)
|
||||
wantContains(t, got, "PARIS", "qrm-auto")
|
||||
}
|
||||
|
||||
// Targeted mode: with two comparable signals, SetTarget must decode the chosen
|
||||
// one even though the other is as strong.
|
||||
func TestQRMTargeted(t *testing.T) {
|
||||
const fs = 16000
|
||||
want := keyMessage("SOS SOS SOS", fs, 20, 600, 8000)
|
||||
other := keyMessage("QRL QRL QRL QRL", fs, 24, 900, 8000)
|
||||
got := decode(t, mix(want, other), 600)
|
||||
wantContains(t, got, "SOS SOS", "qrm-target")
|
||||
}
|
||||
|
||||
// Pure noise must stay silent: the squelch keys nothing, so no text at all.
|
||||
func TestNoiseOnlySquelch(t *testing.T) {
|
||||
const fs = 16000
|
||||
noise := addNoise(make([]int16, fs*6), 3000, 7)
|
||||
got := strings.TrimSpace(decode(t, noise, 0))
|
||||
if len(got) > 2 { // tolerate at most a stray flagged char
|
||||
t.Fatalf("squelch: decoded %q from pure noise, want (almost) nothing", got)
|
||||
}
|
||||
}
|
||||
|
||||
// keyMessageJitter synthesizes hand-sent CW: every element and gap duration
|
||||
// is jittered (elements ±je, gaps ±jg, uniform), like a human fist.
|
||||
func keyMessageJitter(msg string, fs, wpm int, pitch, amp, je, jg float64, seed int64) []int16 {
|
||||
r := rand.New(rand.NewSource(seed))
|
||||
dot := float64(fs) * 1200 / (float64(wpm) * 1000)
|
||||
edge := fs * 5 / 1000
|
||||
c2m := charToMorse()
|
||||
var out []float64
|
||||
phase := 0.0
|
||||
dphi := 2 * math.Pi * pitch / float64(fs)
|
||||
jit := func(n float64, j float64) int { return int(n * (1 + (r.Float64()*2-1)*j)) }
|
||||
tone := func(n int) {
|
||||
for i := 0; i < n; i++ {
|
||||
g := 1.0
|
||||
if i < edge {
|
||||
g = 0.5 - 0.5*math.Cos(math.Pi*float64(i)/float64(edge))
|
||||
} else if n-1-i < edge {
|
||||
g = 0.5 - 0.5*math.Cos(math.Pi*float64(n-1-i)/float64(edge))
|
||||
}
|
||||
out = append(out, amp*g*math.Sin(phase))
|
||||
phase += dphi
|
||||
}
|
||||
}
|
||||
silence := func(n int) {
|
||||
for i := 0; i < n; i++ {
|
||||
out = append(out, 0)
|
||||
}
|
||||
}
|
||||
silence(fs / 4)
|
||||
for i := 0; i < len(msg); i++ {
|
||||
ch := msg[i]
|
||||
if ch == ' ' {
|
||||
silence(jit(4*dot, jg))
|
||||
continue
|
||||
}
|
||||
code := c2m[ch]
|
||||
for j := 0; j < len(code); j++ {
|
||||
if code[j] == '.' {
|
||||
tone(jit(dot, je))
|
||||
} else {
|
||||
tone(jit(3*dot, je))
|
||||
}
|
||||
silence(jit(dot, jg))
|
||||
}
|
||||
silence(jit(2*dot, jg))
|
||||
}
|
||||
silence(fs / 2)
|
||||
return toInt16(out)
|
||||
}
|
||||
|
||||
// Hand keying: ±20% element jitter, ±25% gap jitter — a sloppy but readable
|
||||
// human fist. The batch classifier and the gap-fed dit tracking must ride it.
|
||||
func TestHandKeying(t *testing.T) {
|
||||
const fs = 16000
|
||||
for seed := int64(1); seed <= 3; seed++ {
|
||||
s := keyMessageJitter("CQ CQ DE HB9HBY HB9HBY K", fs, 22, 700, 9000, 0.20, 0.25, seed)
|
||||
got := decode(t, s, 0)
|
||||
wantContains(t, got, "HB9HBY", "hand-keying")
|
||||
}
|
||||
}
|
||||
|
||||
// Speed change mid-over: the cluster tracker must follow 25 → 15 WPM.
|
||||
func TestSpeedChange(t *testing.T) {
|
||||
const fs = 16000
|
||||
fast := keyMessage("CQ CQ CQ DE F4BPO", fs, 25, 700, 9000)
|
||||
slow := keyMessage("UR RST 599 599", fs, 15, 700, 9000)
|
||||
got := decode(t, append(fast, slow...), 0)
|
||||
wantContains(t, got, "F4BPO", "speed-fast-part")
|
||||
wantContains(t, got, "599", "speed-slow-part")
|
||||
}
|
||||
|
||||
func itoa(n int) string {
|
||||
if n == 0 {
|
||||
return "0"
|
||||
}
|
||||
var b [8]byte
|
||||
i := len(b)
|
||||
for n > 0 {
|
||||
i--
|
||||
b[i] = byte('0' + n%10)
|
||||
n /= 10
|
||||
}
|
||||
return string(b[i:])
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package cwdecode
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// TestDebugTrace prints the element stream for a chosen case — a development
|
||||
// aid, not an assertion test. Run with: go test -run TestDebugTrace -v
|
||||
func TestDebugTrace(t *testing.T) {
|
||||
if testing.Short() {
|
||||
t.Skip("debug aid")
|
||||
}
|
||||
const fs = 16000
|
||||
samples := keyMessage("CQ TEST DE F4BPO K", fs, 40, 700, 9000)
|
||||
var d *Decoder
|
||||
d = New(fs, func(s string) { fmt.Printf("EMIT %q (muDit=%.0f muDah=%.0f)\n", s, d.muDit, d.muDah) }, nil)
|
||||
lastMarks := 0
|
||||
for i := 0; i < len(samples); i += 256 {
|
||||
end := i + 256
|
||||
if end > len(samples) {
|
||||
end = len(samples)
|
||||
}
|
||||
d.Process(samples[i:end])
|
||||
if d.marksSeen != lastMarks {
|
||||
lastMarks = d.marksSeen
|
||||
fmt.Printf("mark#%d elems=%v muDit=%.0f muDah=%.0f\n", d.marksSeen, d.elemMs, d.muDit, d.muDah)
|
||||
}
|
||||
}
|
||||
}
|
||||
+74
-3
@@ -5,6 +5,7 @@ import (
|
||||
"database/sql"
|
||||
"embed"
|
||||
"fmt"
|
||||
"os"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -143,7 +144,6 @@ func SetDialect(d string) {
|
||||
// same INSERT/UPDATE works on both backends.
|
||||
func NowISO() string { return time.Now().UTC().Format("2006-01-02T15:04:05.000Z") }
|
||||
|
||||
|
||||
// Open opens (and creates if needed) the SQLite database at the given path,
|
||||
// enables performance PRAGMAs, and applies embedded migrations.
|
||||
func Open(path string) (*sql.DB, error) {
|
||||
@@ -161,18 +161,77 @@ func Open(path string) (*sql.DB, error) {
|
||||
return nil, fmt.Errorf("ping sqlite: %w", err)
|
||||
}
|
||||
Dialect = "sqlite"
|
||||
if err := migrate(conn, nil); err != nil {
|
||||
if err := migrate(conn, nil, path); err != nil {
|
||||
_ = conn.Close()
|
||||
return nil, err
|
||||
}
|
||||
return conn, nil
|
||||
}
|
||||
|
||||
// LogSink receives this package's diagnostic lines. The app points it at
|
||||
// applog.Printf at startup (same pattern as cat / audio / extsvc); left nil in
|
||||
// tests and in the CLI tools under cmd/, where it is simply discarded.
|
||||
var LogSink func(format string, args ...any)
|
||||
|
||||
// logMigration records a migration that has just been applied, and how long it
|
||||
// took — the only trace an operator has that a data-rewriting migration ran.
|
||||
func logMigration(name string, start time.Time) {
|
||||
logf("db: migration %s applied in %s", name, time.Since(start).Round(time.Millisecond))
|
||||
}
|
||||
|
||||
func logf(format string, args ...any) {
|
||||
if LogSink != nil {
|
||||
LogSink(format, args...)
|
||||
}
|
||||
}
|
||||
|
||||
// dataRewriteMarker flags a migration that rewrites existing user rows rather
|
||||
// than only altering the schema. Put it on its own line in the .sql file, and a
|
||||
// safety copy of the logbook is taken before it runs.
|
||||
const dataRewriteMarker = "-- opslog:rewrites-data"
|
||||
|
||||
// backupBeforeRewrite takes a one-off copy of the logbook before a migration
|
||||
// that rewrites user rows.
|
||||
//
|
||||
// It exists because the auto-updater gives the operator no say: the new build
|
||||
// relaunches and migrates before the changelog explaining it is ever shown, so
|
||||
// "back up first" is advice nobody can act on. The app takes the copy instead.
|
||||
//
|
||||
// Skipped when there is nothing to protect — a shared MySQL (no file to copy;
|
||||
// that server is the admin's to back up), the settings database, and a
|
||||
// freshly-created empty logbook all have no QSOs at stake.
|
||||
func backupBeforeRewrite(conn *sql.DB, dbPath, migration string) {
|
||||
if dbPath == "" {
|
||||
return
|
||||
}
|
||||
var n int
|
||||
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil || n == 0 {
|
||||
return
|
||||
}
|
||||
dest := dbPath + ".pre-" + strings.TrimSuffix(migration, ".sql") + ".bak"
|
||||
if _, err := os.Stat(dest); err == nil {
|
||||
return // a copy from an earlier attempt is already there — never overwrite it
|
||||
}
|
||||
// VACUUM INTO rather than copying the file: it writes a consistent,
|
||||
// self-contained snapshot even with WAL pages still outstanding, which a
|
||||
// plain file copy would silently miss. It cannot run inside a transaction,
|
||||
// so it happens here, before the migration opens one. The destination is
|
||||
// spliced (VACUUM INTO takes no bound parameter), with quotes doubled.
|
||||
start := time.Now()
|
||||
if _, err := conn.Exec(`VACUUM INTO '` + strings.ReplaceAll(dest, "'", "''") + `'`); err != nil {
|
||||
// Not fatal: the migration itself is a single atomic transaction, so
|
||||
// failing to take a belt-and-braces copy is no reason to block the update.
|
||||
logf("db: could not back up before %s: %v — continuing (the migration is atomic)", migration, err)
|
||||
return
|
||||
}
|
||||
logf("db: backed up %d QSO(s) to %s in %s before %s", n, dest, time.Since(start).Round(time.Millisecond), migration)
|
||||
}
|
||||
|
||||
// migrate applies all embedded *.sql migrations in alphabetical order,
|
||||
// skipping those already applied. Intentionally minimal in-house system
|
||||
// (no external dependency). translate, when non-nil, rewrites each statement
|
||||
// for a non-SQLite backend (see mysqlDDL); nil means run the SQLite DDL as-is.
|
||||
func migrate(conn *sql.DB, translate func(string) string) error {
|
||||
func migrate(conn *sql.DB, translate func(string) string, dbPath string) error {
|
||||
// A non-nil translator means this is the MySQL connection (use the
|
||||
// per-statement, FK-aware path); nil means a SQLite connection. This is
|
||||
// determined by the caller's argument, NOT the global Dialect, so the
|
||||
@@ -219,12 +278,22 @@ func migrate(conn *sql.DB, translate func(string) string) error {
|
||||
if applied[name] {
|
||||
continue // already applied
|
||||
}
|
||||
// Timed, and logged only once it has actually succeeded (below). Most
|
||||
// migrations are instant DDL, but some rewrite user rows — 0024 upper-cases
|
||||
// every callsign — and on a large logbook that is exactly what an operator
|
||||
// wants confirmed afterwards: that it ran, once, and what it cost.
|
||||
start := time.Now()
|
||||
content, err := migrationsFS.ReadFile("migrations/" + name)
|
||||
if err != nil {
|
||||
return fmt.Errorf("read migration %s: %w", name, err)
|
||||
}
|
||||
sqlText := translate(string(content))
|
||||
|
||||
// A migration that rewrites user rows gets a safety copy taken first.
|
||||
if strings.Contains(string(content), dataRewriteMarker) {
|
||||
backupBeforeRewrite(conn, dbPath, name)
|
||||
}
|
||||
|
||||
// MySQL implicitly commits each DDL statement, so a wrapping transaction
|
||||
// gives no atomicity — a mid-file failure would leave columns/tables
|
||||
// behind, unrecorded, and every restart would re-run and choke on
|
||||
@@ -238,6 +307,7 @@ func migrate(conn *sql.DB, translate func(string) string) error {
|
||||
if _, err := conn.Exec(`INSERT INTO schema_migrations(name) VALUES(?)`, name); err != nil {
|
||||
return fmt.Errorf("record migration %s: %w", name, err)
|
||||
}
|
||||
logMigration(name, start)
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -257,6 +327,7 @@ func migrate(conn *sql.DB, translate func(string) string) error {
|
||||
if err := tx.Commit(); err != nil {
|
||||
return fmt.Errorf("commit migration %s: %w", name, err)
|
||||
}
|
||||
logMigration(name, start)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -0,0 +1,161 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
const mig0024 = "0024_normalise_callsign.sql"
|
||||
|
||||
// openWithUnappliedRewrite builds a logbook that already holds QSOs and has not
|
||||
// yet had the callsign-normalising migration applied — i.e. exactly what an
|
||||
// existing installation looks like the moment the auto-updater relaunches it.
|
||||
func openWithUnappliedRewrite(t *testing.T, rows [][2]string) string {
|
||||
t.Helper()
|
||||
p := filepath.Join(t.TempDir(), "logbook.db")
|
||||
conn, err := Open(p)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, r := range rows {
|
||||
if _, err := conn.Exec(
|
||||
`INSERT INTO qso (callsign, qso_date, band, mode) VALUES (?, ?, '20m', 'SSB')`, r[0], r[1]); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
// Rewind so the migration runs against real data on the next Open.
|
||||
if _, err := conn.Exec(`DELETE FROM schema_migrations WHERE name = ?`, mig0024); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := conn.Close(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return p
|
||||
}
|
||||
|
||||
func callsigns(t *testing.T, path string) []string {
|
||||
t.Helper()
|
||||
conn, err := sql.Open("sqlite", "file:"+path)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer conn.Close()
|
||||
rows, err := conn.Query(`SELECT callsign FROM qso ORDER BY id`)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer rows.Close()
|
||||
var out []string
|
||||
for rows.Next() {
|
||||
var c string
|
||||
if err := rows.Scan(&c); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
out = append(out, c)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// The auto-updater migrates before the operator ever sees the changelog, so the
|
||||
// app has to take the safety copy itself. The copy must hold the data as it was
|
||||
// BEFORE the rewrite — a copy of the already-migrated rows would be worthless.
|
||||
func TestRewriteMigrationBacksUpOriginalData(t *testing.T) {
|
||||
p := openWithUnappliedRewrite(t, [][2]string{
|
||||
{"f5lit", "2026-07-01"},
|
||||
{" Pa3Eyf ", "2026-07-02"},
|
||||
{"F4BPO", "2026-07-03"},
|
||||
})
|
||||
|
||||
var logged []string
|
||||
LogSink = func(f string, a ...any) { logged = append(logged, fmt.Sprintf(f, a...)) }
|
||||
defer func() { LogSink = nil }()
|
||||
|
||||
conn, err := Open(p)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
conn.Close()
|
||||
|
||||
// The live logbook is normalised.
|
||||
if got, want := callsigns(t, p), []string{"F5LIT", "PA3EYF", "F4BPO"}; strings.Join(got, ",") != strings.Join(want, ",") {
|
||||
t.Errorf("logbook callsigns = %v, want %v", got, want)
|
||||
}
|
||||
|
||||
// The backup exists, next to the logbook, named after the migration.
|
||||
backup := p + ".pre-0024_normalise_callsign.bak"
|
||||
if _, err := os.Stat(backup); err != nil {
|
||||
t.Fatalf("no safety copy at %s: %v\nlogged:\n%s", backup, err, strings.Join(logged, "\n"))
|
||||
}
|
||||
// …and it holds the ORIGINAL rows, untouched.
|
||||
if got, want := callsigns(t, backup), []string{"f5lit", " Pa3Eyf ", "F4BPO"}; strings.Join(got, ",") != strings.Join(want, ",") {
|
||||
t.Errorf("backup callsigns = %v, want the pre-migration values %v", got, want)
|
||||
}
|
||||
|
||||
var sawBackup bool
|
||||
for _, l := range logged {
|
||||
if strings.Contains(l, "backed up 3 QSO(s)") {
|
||||
sawBackup = true
|
||||
}
|
||||
}
|
||||
if !sawBackup {
|
||||
t.Errorf("the backup was not logged; got:\n%s", strings.Join(logged, "\n"))
|
||||
}
|
||||
}
|
||||
|
||||
// No QSOs, nothing to protect: the settings database and a freshly created
|
||||
// logbook must not litter the folder with pointless copies.
|
||||
func TestRewriteMigrationSkipsBackupWhenNoQSOs(t *testing.T) {
|
||||
p := openWithUnappliedRewrite(t, nil)
|
||||
conn, err := Open(p)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
conn.Close()
|
||||
if _, err := os.Stat(p + ".pre-0024_normalise_callsign.bak"); err == nil {
|
||||
t.Error("an empty database should not be backed up")
|
||||
}
|
||||
}
|
||||
|
||||
// schema_migrations is what makes "runs once" a guarantee rather than a promise:
|
||||
// a second launch must neither re-run the rewrite nor take a second copy.
|
||||
func TestRewriteMigrationRunsOnce(t *testing.T) {
|
||||
p := openWithUnappliedRewrite(t, [][2]string{{"f5lit", "2026-07-01"}})
|
||||
conn, err := Open(p)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
conn.Close()
|
||||
|
||||
backup := p + ".pre-0024_normalise_callsign.bak"
|
||||
first, err := os.Stat(backup)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
var logged []string
|
||||
LogSink = func(f string, a ...any) { logged = append(logged, fmt.Sprintf(f, a...)) }
|
||||
defer func() { LogSink = nil }()
|
||||
|
||||
conn2, err := Open(p) // second launch
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
conn2.Close()
|
||||
|
||||
for _, l := range logged {
|
||||
if strings.Contains(l, mig0024) {
|
||||
t.Errorf("migration ran again on the second launch: %s", l)
|
||||
}
|
||||
}
|
||||
second, err := os.Stat(backup)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !first.ModTime().Equal(second.ModTime()) {
|
||||
t.Error("the existing safety copy was overwritten on the second launch")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
-- opslog:rewrites-data
|
||||
-- Normalise stored callsigns so lookups can use idx_qso_callsign.
|
||||
--
|
||||
-- WorkedBefore matched rows with `upper(trim(callsign)) = ?`. Wrapping the
|
||||
-- column in functions makes the predicate non-sargable: SQLite cannot use the
|
||||
-- index and falls back to scanning. Measured on a 190 000-row logbook, the
|
||||
-- COUNT went from 0.3 ms (SEARCH ... USING INDEX) to 20.8 ms (SCAN), and the
|
||||
-- entries query — which needs every column, so not even a covering index helps
|
||||
-- — scans the whole table. That runs on every keystroke of a callsign, and it
|
||||
-- made the entry strip's history arrive too late to auto-fill the name and
|
||||
-- locator from the previous QSO. Small logbooks never showed it.
|
||||
--
|
||||
-- Add, bulk insert and Update have always upper-cased and trimmed the callsign,
|
||||
-- so this only rewrites rows left by older versions or foreign imports, and the
|
||||
-- queries can then compare the column directly.
|
||||
--
|
||||
-- SQLite compares case-sensitively, so the WHERE finds exactly the rows that
|
||||
-- need it. MySQL's default collation is case- and trailing-space-insensitive:
|
||||
-- there the UPDATE is largely a no-op and equally unnecessary, because `=`
|
||||
-- already matches those rows through the index.
|
||||
UPDATE qso SET callsign = upper(trim(callsign))
|
||||
WHERE callsign <> upper(trim(callsign));
|
||||
+51
-2
@@ -200,16 +200,65 @@ func OpenMySQL(c MySQLConfig) (*sql.DB, error) {
|
||||
err = applyMySQLBaseline(conn)
|
||||
} else {
|
||||
// Existing database: apply only the migrations it's missing.
|
||||
err = migrate(conn, mysqlDDL)
|
||||
err = migrate(conn, mysqlDDL, "")
|
||||
}
|
||||
if err != nil {
|
||||
_ = conn.Close()
|
||||
Dialect = "sqlite" // migration failed; we'll fall back to SQLite
|
||||
return nil, err
|
||||
}
|
||||
// Guarantee the schema can store non-Latin text (Cyrillic, Polish ł, …).
|
||||
// Best-effort: never block access to the logbook over the charset probe.
|
||||
if err := ensureMySQLUTF8MB4(conn, name); err != nil {
|
||||
fmt.Printf("OpsLog: utf8mb4 conversion: %v\n", err)
|
||||
}
|
||||
return conn, nil
|
||||
}
|
||||
|
||||
// ensureMySQLUTF8MB4 makes the database default and every OpsLog table utf8mb4,
|
||||
// converting any that isn't. It repairs databases pre-created as latin1 or
|
||||
// utf8mb3 by a hosting panel (cPanel/o2switch default), where OpsLog's
|
||||
// "CREATE DATABASE IF NOT EXISTS … utf8mb4" was a no-op and the tables inherited
|
||||
// a charset that can't store non-Latin callsigns/names/QTHs — the MySQL 1366
|
||||
// "Incorrect string value: '\xD0\xAF'" (Cyrillic Я) seen updating a QSO from QRZ.
|
||||
//
|
||||
// Idempotent and cheap on a healthy database: one information_schema probe finds
|
||||
// the tables with a non-utf8mb4 text column, and only those are converted (none
|
||||
// on an already-correct DB). Conversion is safe for the wide qso table because
|
||||
// the bulk of its columns are off-page TEXT (see the row-size note above); only
|
||||
// the ~20 indexed VARCHARs sit in-row, well under InnoDB's 65535-byte limit even
|
||||
// at 4 bytes/char.
|
||||
func ensureMySQLUTF8MB4(conn *sql.DB, dbName string) error {
|
||||
// Fix the database default so any FUTURE table is utf8mb4 too.
|
||||
_, _ = conn.Exec("ALTER DATABASE `" + dbName + "` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci")
|
||||
|
||||
rows, err := conn.Query(`
|
||||
SELECT DISTINCT TABLE_NAME
|
||||
FROM information_schema.COLUMNS
|
||||
WHERE TABLE_SCHEMA = ?
|
||||
AND CHARACTER_SET_NAME IS NOT NULL
|
||||
AND CHARACTER_SET_NAME <> 'utf8mb4'`, dbName)
|
||||
if err != nil {
|
||||
return fmt.Errorf("probe charsets: %w", err)
|
||||
}
|
||||
var tables []string
|
||||
for rows.Next() {
|
||||
var t string
|
||||
if err := rows.Scan(&t); err == nil && validDBIdent(t) {
|
||||
tables = append(tables, t)
|
||||
}
|
||||
}
|
||||
rows.Close()
|
||||
|
||||
var firstErr error
|
||||
for _, t := range tables {
|
||||
if _, err := conn.Exec("ALTER TABLE `" + t + "` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci"); err != nil && firstErr == nil {
|
||||
firstErr = fmt.Errorf("convert %s: %w", t, err)
|
||||
}
|
||||
}
|
||||
return firstErr
|
||||
}
|
||||
|
||||
// isFreshMySQL reports whether the database has no OpsLog schema yet (no qso
|
||||
// table), so the baseline fast-path applies. A partially-migrated database is
|
||||
// NOT fresh and goes through the incremental migrator.
|
||||
@@ -238,7 +287,7 @@ func applyMySQLBaseline(conn *sql.DB) error {
|
||||
return fmt.Errorf("open baseline sqlite: %w", err)
|
||||
}
|
||||
defer mem.Close()
|
||||
if err := migrate(mem, nil); err != nil {
|
||||
if err := migrate(mem, nil, ""); err != nil {
|
||||
return fmt.Errorf("build baseline schema: %w", err)
|
||||
}
|
||||
|
||||
|
||||
+14
-2
@@ -41,6 +41,16 @@ func (c Config) opts() []mail.Option {
|
||||
|
||||
// Send delivers a plain-text email to `to`, optionally attaching a file.
|
||||
func Send(cfg Config, to, subject, body, attachPath string) error {
|
||||
var attach []string
|
||||
if attachPath != "" {
|
||||
attach = []string{attachPath}
|
||||
}
|
||||
return SendFiles(cfg, to, subject, body, attach)
|
||||
}
|
||||
|
||||
// SendFiles is like Send but attaches any number of files (missing paths are
|
||||
// skipped by the mail library at send time).
|
||||
func SendFiles(cfg Config, to, subject, body string, attachPaths []string) error {
|
||||
if cfg.Host == "" {
|
||||
return fmt.Errorf("SMTP server not configured")
|
||||
}
|
||||
@@ -65,8 +75,10 @@ func Send(cfg Config, to, subject, body, attachPath string) error {
|
||||
}
|
||||
m.Subject(subject)
|
||||
m.SetBodyString(mail.TypeTextPlain, body)
|
||||
if attachPath != "" {
|
||||
m.AttachFile(attachPath)
|
||||
for _, p := range attachPaths {
|
||||
if p != "" {
|
||||
m.AttachFile(p)
|
||||
}
|
||||
}
|
||||
client, err := mail.NewClient(cfg.Host, cfg.opts()...)
|
||||
if err != nil {
|
||||
|
||||
+26
-5
@@ -65,11 +65,32 @@ func DownloadLoTWConfirmations(ctx context.Context, client *http.Client, cfg Ser
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return "", fmt.Errorf("lotw: http %d", resp.StatusCode)
|
||||
}
|
||||
// LoTW returns a plain-text error (not ADIF) on bad login.
|
||||
// Not ADIF. Two very different failures land here, and telling them apart is
|
||||
// the difference between a fixable message and a wall of markup.
|
||||
if !strings.Contains(strings.ToUpper(text), "<EOH>") && !strings.Contains(strings.ToLower(text), "<eor>") {
|
||||
msg := strings.TrimSpace(text)
|
||||
trimmed := strings.TrimSpace(text)
|
||||
// Keep the whole thing in the log — that is where a real diagnosis happens,
|
||||
// and a 200-character excerpt of an HTML page tells nobody anything.
|
||||
snippet := trimmed
|
||||
if len(snippet) > 2000 {
|
||||
snippet = snippet[:2000]
|
||||
}
|
||||
LogSink("lotw: expected ADIF, got %d bytes of non-ADIF; first 2000: %s", len(text), snippet)
|
||||
|
||||
// LoTW answers a REJECTED LOGIN with its ordinary web page rather than an
|
||||
// error string, so an HTML body here means the credentials were not
|
||||
// accepted — not that the download is broken.
|
||||
lower := strings.ToLower(trimmed)
|
||||
if strings.HasPrefix(lower, "<!doctype html") || strings.HasPrefix(lower, "<html") || strings.Contains(lower, "logbook of the world</title>") {
|
||||
return "", fmt.Errorf("LoTW returned its web page instead of a log, which is how it answers a login it did not accept. " +
|
||||
"Check the username and password in Settings → External services: LoTW wants your lotw.arrl.org WEBSITE login, " +
|
||||
"not your callsign certificate or your ARRL member number")
|
||||
}
|
||||
|
||||
// Anything else: a plain-text complaint from LoTW, or a maintenance notice.
|
||||
msg := trimmed
|
||||
if len(msg) > 200 {
|
||||
msg = msg[:200]
|
||||
msg = msg[:200] + "…"
|
||||
}
|
||||
return "", fmt.Errorf("lotw: unexpected response: %s", msg)
|
||||
}
|
||||
@@ -220,8 +241,8 @@ func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord stri
|
||||
// AppCompat RUNASADMIN entry), but OpsLog isn't elevated so Windows
|
||||
// refuses to launch it. Actionable message instead of the raw error.
|
||||
return UploadResult{}, fmt.Errorf(
|
||||
"lotw: Windows won't launch tqsl.exe because it's marked \"Run as administrator\". " +
|
||||
"Fix: right-click %q → Properties → Compatibility → UNTICK \"Run this program as an administrator\" (Apply). " +
|
||||
"lotw: Windows won't launch tqsl.exe because it's marked \"Run as administrator\". "+
|
||||
"Fix: right-click %q → Properties → Compatibility → UNTICK \"Run this program as an administrator\" (Apply). "+
|
||||
"Or run OpsLog itself as administrator.", tqsl)
|
||||
} else {
|
||||
return UploadResult{}, fmt.Errorf("lotw: run tqsl: %w", runErr)
|
||||
|
||||
@@ -19,3 +19,44 @@ func TestHomeCall(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Mobile and maritime-mobile suffixes: /M is the case that surfaced in the field
|
||||
// (F4LYI/M resolved only to cty.dat while F4LYI resolved on QRZ), so pin the
|
||||
// whole suffix family — the home call is what the provider record is filed under.
|
||||
func TestHomeCallSuffixes(t *testing.T) {
|
||||
for call, want := range map[string]string{
|
||||
"F4LYI/M": "F4LYI",
|
||||
"F4LYI/MM": "F4LYI",
|
||||
"F4LYI/AM": "F4LYI",
|
||||
"F4LYI/QRP": "F4LYI",
|
||||
"F4LYI/A": "F4LYI",
|
||||
"F4LYI/B": "F4LYI",
|
||||
} {
|
||||
if got := homeCall(call); got != want {
|
||||
t.Errorf("homeCall(%q) = %q, want %q", call, got, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Operational suffixes must resolve to the bare call WITHOUT a provider query on
|
||||
// the slashed form; entity- and area-changing forms must not be stripped.
|
||||
func TestStripOpSuffix(t *testing.T) {
|
||||
strip := map[string]string{
|
||||
"F4LYI/M": "F4LYI", "F4LYI/MM": "F4LYI", "F4LYI/AM": "F4LYI",
|
||||
"F4LYI/P": "F4LYI", "F4LYI/QRP": "F4LYI", "F4LYI/p": "F4LYI",
|
||||
"F4BPO/M/P": "F4BPO",
|
||||
}
|
||||
for call, want := range strip {
|
||||
got, ok := stripOpSuffix(call)
|
||||
if !ok || got != want {
|
||||
t.Errorf("stripOpSuffix(%q) = %q,%v — want %q,true", call, got, ok, want)
|
||||
}
|
||||
}
|
||||
// These change the entity or the call area: they are real, separately
|
||||
// registered forms and must be queried exactly as entered.
|
||||
for _, call := range []string{"JW/OR1A", "VP8/F4BPO", "F4BPO/8", "DL/F4NIE", "OH2BH", "F4BPO/W6"} {
|
||||
if got, ok := stripOpSuffix(call); ok {
|
||||
t.Errorf("stripOpSuffix(%q) stripped to %q — it changes entity/area and must be kept", call, got)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -109,6 +109,13 @@ func (m *Manager) Lookup(ctx context.Context, callsign string) (Result, error) {
|
||||
}
|
||||
|
||||
var lastErr error
|
||||
// An operational suffix (/M, /P, …) is never registered as such: skip the
|
||||
// futile query on the slashed form and let the home-call pass below do the one
|
||||
// request that can actually answer.
|
||||
_, opOnly := stripOpSuffix(call)
|
||||
if opOnly {
|
||||
LogSink("lookup: %s carries only an operational suffix — querying the bare call", call)
|
||||
} else {
|
||||
for _, p := range providers {
|
||||
r, err := p.Lookup(ctx, call)
|
||||
if err == nil {
|
||||
@@ -126,6 +133,7 @@ func (m *Manager) Lookup(ctx context.Context, callsign string) (Result, error) {
|
||||
}
|
||||
lastErr = fmt.Errorf("%s: %w", p.Name(), err)
|
||||
}
|
||||
}
|
||||
|
||||
// Portable / slashed call not found under its full form: the operator's
|
||||
// record lives under the HOME call (JW/OR1A → OR1A, DL/F4NIE → F4NIE). Look
|
||||
@@ -135,6 +143,10 @@ func (m *Manager) Lookup(ctx context.Context, callsign string) (Result, error) {
|
||||
for _, p := range providers {
|
||||
r, err := p.Lookup(ctx, home)
|
||||
if err != nil {
|
||||
// Logged, because this is where a portable lookup silently dies: the
|
||||
// error is swallowed to try the next provider, and the operator only
|
||||
// ever sees the cty.dat fallback with no clue why.
|
||||
LogSink("lookup: %s → home call %s failed on %s: %v", call, home, p.Name(), err)
|
||||
continue
|
||||
}
|
||||
r.Callsign = call
|
||||
@@ -177,6 +189,46 @@ func (m *Manager) Lookup(ctx context.Context, callsign string) (Result, error) {
|
||||
return Result{}, lastErr
|
||||
}
|
||||
|
||||
// LogSink receives this package's diagnostic lines (which call was actually
|
||||
// queried, and why a lookup fell back). Set to applog.Printf by the app.
|
||||
var LogSink = func(string, ...any) {}
|
||||
|
||||
// opSuffixes are OPERATIONAL suffixes: they describe how the operator is working
|
||||
// — mobile, maritime, aeronautical, portable, low power — not who they are or
|
||||
// where. No provider has a record filed under "F4LYI/M", so querying that form
|
||||
// is a round trip that cannot succeed.
|
||||
//
|
||||
// It was worse than merely wasted: it spent the lookup's time budget, so the
|
||||
// home-call retry that followed ran out of time and the entry fell back to
|
||||
// cty.dat for every /M and /P call, even though the operator was on QRZ. These
|
||||
// go straight to the bare callsign instead.
|
||||
//
|
||||
// Everything else after a slash is NOT this: JW/, VP8/ change the DXCC entity,
|
||||
// and /8 or /W6 change the call area. Those forms can be registered in their own
|
||||
// right and must be looked up exactly as entered.
|
||||
var opSuffixes = map[string]bool{"M": true, "MM": true, "AM": true, "P": true, "QRP": true}
|
||||
|
||||
// stripOpSuffix returns the bare callsign when call carries nothing but
|
||||
// operational suffixes ("F4LYI/M" → "F4LYI", true). Reports false for anything
|
||||
// that changes entity or area ("JW/OR1A", "F4BPO/8"), and for a call whose base
|
||||
// part isn't callsign-shaped.
|
||||
func stripOpSuffix(call string) (string, bool) {
|
||||
if !strings.ContainsRune(call, '/') {
|
||||
return call, false
|
||||
}
|
||||
parts := strings.Split(call, "/")
|
||||
base := strings.TrimSpace(parts[0])
|
||||
if len(base) < 3 || !strings.ContainsAny(base, "0123456789") {
|
||||
return call, false // "JW/OR1A": the first part is a prefix, not the callsign
|
||||
}
|
||||
for _, p := range parts[1:] {
|
||||
if !opSuffixes[strings.ToUpper(strings.TrimSpace(p))] {
|
||||
return call, false
|
||||
}
|
||||
}
|
||||
return base, true
|
||||
}
|
||||
|
||||
// homeCall extracts the operator's home callsign from a slashed/portable call
|
||||
// so its provider record (name/QTH/QSL) can be fetched when the full form isn't
|
||||
// registered: JW/OR1A → OR1A, DL/F4NIE → F4NIE, F4BPO/P → F4BPO, VP8/F4BPO →
|
||||
@@ -266,12 +318,30 @@ func fillFromDXCC(r *Result, dxcc DXCCResolver) bool {
|
||||
return false
|
||||
}
|
||||
filled := false
|
||||
if country != "" { r.Country = country; filled = true }
|
||||
if cont != "" { r.Continent = cont; filled = true }
|
||||
if cqz != 0 { r.CQZ = cqz; filled = true }
|
||||
if ituz != 0 { r.ITUZ = ituz; filled = true }
|
||||
if lat != 0 && r.Lat == 0 { r.Lat = lat; filled = true }
|
||||
if lon != 0 && r.Lon == 0 { r.Lon = lon; filled = true }
|
||||
if country != "" {
|
||||
r.Country = country
|
||||
filled = true
|
||||
}
|
||||
if cont != "" {
|
||||
r.Continent = cont
|
||||
filled = true
|
||||
}
|
||||
if cqz != 0 {
|
||||
r.CQZ = cqz
|
||||
filled = true
|
||||
}
|
||||
if ituz != 0 {
|
||||
r.ITUZ = ituz
|
||||
filled = true
|
||||
}
|
||||
if lat != 0 && r.Lat == 0 {
|
||||
r.Lat = lat
|
||||
filled = true
|
||||
}
|
||||
if lon != 0 && r.Lon == 0 {
|
||||
r.Lon = lon
|
||||
filled = true
|
||||
}
|
||||
// cty.dat is authoritative for the *operating* entity: it strips benign
|
||||
// suffixes (/P /M /MM /QRP /A …) and honours real prefixes (DL/F4NIE).
|
||||
// Use its DXCC# when known — this overrides the provider's home-call
|
||||
@@ -279,7 +349,10 @@ func fillFromDXCC(r *Result, dxcc DXCCResolver) bool {
|
||||
// France's 227). Only when cty.dat can't map a slashed call do we drop
|
||||
// the provider's number rather than mislabel.
|
||||
if dxccNum != 0 {
|
||||
if r.DXCC != dxccNum { r.DXCC = dxccNum; filled = true }
|
||||
if r.DXCC != dxccNum {
|
||||
r.DXCC = dxccNum
|
||||
filled = true
|
||||
}
|
||||
} else if strings.ContainsRune(r.Callsign, '/') && r.DXCC != 0 {
|
||||
r.DXCC = 0
|
||||
filled = true
|
||||
|
||||
@@ -15,6 +15,8 @@ import (
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
"hamlog/internal/applog"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -33,6 +35,7 @@ type Status struct {
|
||||
State string `json:"state,omitempty"` // IDLE / TRANSMIT_A …
|
||||
FanMode string `json:"fan_mode,omitempty"` // STANDARD / CONTEST / BROADCAST
|
||||
Temperature float64 `json:"temperature"`
|
||||
Operate bool `json:"operate"` // OPERATE vs STANDBY (optimistic until the amp reports it)
|
||||
}
|
||||
|
||||
type Client struct {
|
||||
@@ -45,6 +48,7 @@ type Client struct {
|
||||
|
||||
statusMu sync.RWMutex
|
||||
status Status
|
||||
lastRaw string // last raw status payload — logged on change so unknown fields (operate?) can be mapped from a real amp
|
||||
// Optimistic fan mode kept until the amp's status poll confirms it (or it
|
||||
// ages out) — otherwise a stale poll right after a change reverts the UI.
|
||||
fanPending string
|
||||
@@ -119,8 +123,15 @@ func (c *Client) SetOperate(on bool) error {
|
||||
if on {
|
||||
v = "1"
|
||||
}
|
||||
_, err := c.command("operate=" + v)
|
||||
if _, err := c.command("operate=" + v); err != nil {
|
||||
return err
|
||||
}
|
||||
// Optimistic: the status poll's "operate" field (when the firmware reports
|
||||
// one) confirms or corrects this.
|
||||
c.statusMu.Lock()
|
||||
c.status.Operate = on
|
||||
c.statusMu.Unlock()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Client) pollLoop() {
|
||||
@@ -215,6 +226,12 @@ func (c *Client) parse(resp string) {
|
||||
c.statusMu.Lock()
|
||||
c.status.Connected = true
|
||||
c.status.LastError = ""
|
||||
// Log each DISTINCT status payload once: the PGXL's field set isn't fully
|
||||
// documented, so this is how we learn the real key for e.g. operate/standby.
|
||||
if data != c.lastRaw {
|
||||
c.lastRaw = data
|
||||
applog.Printf("pgxl: status raw=%q", data)
|
||||
}
|
||||
for _, pair := range strings.Fields(data) {
|
||||
kv := strings.SplitN(pair, "=", 2)
|
||||
if len(kv) != 2 {
|
||||
@@ -223,6 +240,8 @@ func (c *Client) parse(resp string) {
|
||||
switch kv[0] {
|
||||
case "state":
|
||||
c.status.State = kv[1]
|
||||
case "operate":
|
||||
c.status.Operate = kv[1] == "1"
|
||||
case "fanmode":
|
||||
dev := strings.ToUpper(kv[1])
|
||||
// Honour a recent optimistic change until the amp confirms it.
|
||||
|
||||
@@ -26,6 +26,13 @@ type ProfileDB struct {
|
||||
User string `json:"user"`
|
||||
Password string `json:"password"`
|
||||
Database string `json:"database"`
|
||||
// Path is a per-profile SQLite logbook FILE, distinct from the shared app
|
||||
// database (opslog.db, which always holds settings + profiles). Empty =
|
||||
// the shared database is used as the logbook (the historical default). Set =
|
||||
// this profile's QSOs live in their own .db, so a visiting operator's contacts
|
||||
// don't mix into yours and switching it never touches your config. Only used
|
||||
// when Backend != "mysql".
|
||||
Path string `json:"path,omitempty"`
|
||||
}
|
||||
|
||||
// Profile is one operating configuration. A user typically keeps a few:
|
||||
|
||||
@@ -0,0 +1,114 @@
|
||||
package qso
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
_ "modernc.org/sqlite"
|
||||
)
|
||||
|
||||
// openBulkTestDB builds the minimum of the qso table this needs. It does not go
|
||||
// through db.Open (that would pull the whole migration set and an import cycle);
|
||||
// the columns BulkSetExtra touches are extras_json and updated_at.
|
||||
func openBulkTestDB(t *testing.T) *sql.DB {
|
||||
t.Helper()
|
||||
conn, err := sql.Open("sqlite", "file:"+filepath.Join(t.TempDir(), "t.db"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { conn.Close() })
|
||||
if _, err := conn.Exec(`CREATE TABLE qso (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
callsign TEXT NOT NULL,
|
||||
extras_json TEXT,
|
||||
updated_at TEXT
|
||||
)`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return conn
|
||||
}
|
||||
|
||||
func extras(t *testing.T, conn *sql.DB, id int64) map[string]any {
|
||||
t.Helper()
|
||||
var raw sql.NullString
|
||||
if err := conn.QueryRow(`SELECT extras_json FROM qso WHERE id = ?`, id).Scan(&raw); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !raw.Valid || raw.String == "" {
|
||||
return map[string]any{}
|
||||
}
|
||||
var m map[string]any
|
||||
if err := json.Unmarshal([]byte(raw.String), &m); err != nil {
|
||||
t.Fatalf("extras_json is not valid JSON (%q): %v", raw.String, err)
|
||||
}
|
||||
return m
|
||||
}
|
||||
|
||||
// OWNER_CALLSIGN has no promoted column, so bulk-editing it means merging a key
|
||||
// into extras_json. The thing that must not happen is collateral damage: the
|
||||
// other ADIF extras on the same QSO have to survive.
|
||||
func TestBulkSetExtraPreservesOtherExtras(t *testing.T) {
|
||||
conn := openBulkTestDB(t)
|
||||
r := &Repo{db: conn}
|
||||
ctx := context.Background()
|
||||
|
||||
// Two QSOs with existing extras, one with none at all (NULL column).
|
||||
conn.Exec(`INSERT INTO qso (callsign, extras_json) VALUES ('F5LIT', '{"SILENT_KEY":"Y","ANT_PATH":"S"}')`)
|
||||
conn.Exec(`INSERT INTO qso (callsign, extras_json) VALUES ('PA3EYF', '{"ANT_PATH":"L"}')`)
|
||||
conn.Exec(`INSERT INTO qso (callsign, extras_json) VALUES ('F4BPO', NULL)`)
|
||||
|
||||
n, err := r.BulkSetExtra(ctx, []int64{1, 2, 3}, "OWNER_CALLSIGN", "TM2Q")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if n != 3 {
|
||||
t.Errorf("updated %d rows, want 3", n)
|
||||
}
|
||||
|
||||
e1 := extras(t, conn, 1)
|
||||
if e1["OWNER_CALLSIGN"] != "TM2Q" {
|
||||
t.Errorf("row 1 OWNER_CALLSIGN = %v, want TM2Q", e1["OWNER_CALLSIGN"])
|
||||
}
|
||||
if e1["SILENT_KEY"] != "Y" || e1["ANT_PATH"] != "S" {
|
||||
t.Errorf("row 1 lost its other extras: %v", e1)
|
||||
}
|
||||
// A NULL extras_json must become a valid object, not stay null or hold "null".
|
||||
if e3 := extras(t, conn, 3); e3["OWNER_CALLSIGN"] != "TM2Q" {
|
||||
t.Errorf("row 3 (extras_json was NULL) = %v, want OWNER_CALLSIGN=TM2Q", e3)
|
||||
}
|
||||
}
|
||||
|
||||
// Clearing the field must REMOVE the key: a blank extra would otherwise be
|
||||
// carried into every ADIF export from then on.
|
||||
func TestBulkSetExtraEmptyRemovesKey(t *testing.T) {
|
||||
conn := openBulkTestDB(t)
|
||||
r := &Repo{db: conn}
|
||||
conn.Exec(`INSERT INTO qso (callsign, extras_json) VALUES ('F5LIT', '{"OWNER_CALLSIGN":"TM2Q","ANT_PATH":"S"}')`)
|
||||
|
||||
if _, err := r.BulkSetExtra(context.Background(), []int64{1}, "OWNER_CALLSIGN", ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
e := extras(t, conn, 1)
|
||||
if _, present := e["OWNER_CALLSIGN"]; present {
|
||||
t.Errorf("OWNER_CALLSIGN should be gone, got %v", e)
|
||||
}
|
||||
if e["ANT_PATH"] != "S" {
|
||||
t.Errorf("clearing one extra removed another: %v", e)
|
||||
}
|
||||
}
|
||||
|
||||
// The frontend field id must resolve to the ADIF key, and nothing else must slip
|
||||
// through — this map is the whitelist guarding a spliced JSON path.
|
||||
func TestBulkExtraKeyWhitelist(t *testing.T) {
|
||||
if got := BulkExtraKey("owner_callsign"); got != "OWNER_CALLSIGN" {
|
||||
t.Errorf(`BulkExtraKey("owner_callsign") = %q, want "OWNER_CALLSIGN"`, got)
|
||||
}
|
||||
for _, bad := range []string{"", "callsign", "notes", "OWNER_CALLSIGN", "owner_callsign'"} {
|
||||
if got := BulkExtraKey(bad); got != "" {
|
||||
t.Errorf("BulkExtraKey(%q) = %q, want empty", bad, got)
|
||||
}
|
||||
}
|
||||
}
|
||||
+140
-7
@@ -366,6 +366,42 @@ func decodeExtras(s string) map[string]string {
|
||||
return m
|
||||
}
|
||||
|
||||
// DistinctExtraKeys returns the set of keys present across stored QSO extras
|
||||
// (the non-promoted ADIF tags kept verbatim), scanning the most recent `sample`
|
||||
// rows that have any extras. Capped so it stays fast on a large remote logbook —
|
||||
// the extras vocabulary is small and stable, so a recent sample finds it all.
|
||||
func (r *Repo) DistinctExtraKeys(ctx context.Context, sample int) ([]string, error) {
|
||||
if sample <= 0 {
|
||||
sample = 5000
|
||||
}
|
||||
rows, err := r.db.QueryContext(ctx,
|
||||
`SELECT extras_json FROM qso
|
||||
WHERE extras_json IS NOT NULL AND extras_json <> '' AND extras_json <> '{}'
|
||||
ORDER BY id DESC LIMIT ?`, sample)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
seen := map[string]bool{}
|
||||
for rows.Next() {
|
||||
var s sql.NullString
|
||||
if err := rows.Scan(&s); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for k := range decodeExtras(s.String) {
|
||||
seen[k] = true
|
||||
}
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out := make([]string, 0, len(seen))
|
||||
for k := range seen {
|
||||
out = append(out, k)
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// Add inserts a QSO and returns its ID.
|
||||
func (r *Repo) Add(ctx context.Context, q QSO) (int64, error) {
|
||||
q.Callsign = strings.ToUpper(strings.TrimSpace(q.Callsign))
|
||||
@@ -792,6 +828,81 @@ func (r *Repo) BulkSetField(ctx context.Context, ids []int64, column, value stri
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// bulkEditableExtras whitelists ADIF fields that are bulk-editable but live in
|
||||
// extras_json rather than in a promoted column. Key = the frontend's field id,
|
||||
// value = the uppercase ADIF key inside the JSON object.
|
||||
//
|
||||
// OWNER_CALLSIGN is the case that prompted this: it was already filterable (see
|
||||
// filterableExtras) but could not be bulk-edited, because BulkSetField writes a
|
||||
// column and there is no owner_callsign column.
|
||||
var bulkEditableExtras = map[string]string{
|
||||
"owner_callsign": "OWNER_CALLSIGN",
|
||||
}
|
||||
|
||||
// BulkExtraKey maps a frontend field id to its ADIF key in extras_json, or "".
|
||||
func BulkExtraKey(field string) string { return bulkEditableExtras[field] }
|
||||
|
||||
// BulkSetExtra sets one whitelisted extras_json field on every listed QSO,
|
||||
// leaving the other extras untouched. An empty value REMOVES the key rather than
|
||||
// storing a blank — an empty extra would otherwise be carried into every export.
|
||||
//
|
||||
// json_set / json_remove exist under those names in both SQLite and MySQL and
|
||||
// take the same '$.KEY' path syntax, so one statement serves both backends.
|
||||
func (r *Repo) BulkSetExtra(ctx context.Context, ids []int64, adifKey, value string) (int64, error) {
|
||||
if adifKey == "" {
|
||||
return 0, fmt.Errorf("empty extras key")
|
||||
}
|
||||
if len(ids) == 0 {
|
||||
return 0, nil
|
||||
}
|
||||
ph := make([]string, len(ids))
|
||||
args := make([]any, 0, len(ids)+2)
|
||||
expr := `json_set(COALESCE(extras_json, '{}'), '$.` + adifKey + `', ?)`
|
||||
if value == "" {
|
||||
expr = `json_remove(COALESCE(extras_json, '{}'), '$.` + adifKey + `')`
|
||||
} else {
|
||||
args = append(args, value)
|
||||
}
|
||||
args = append(args, db.NowISO())
|
||||
for i, id := range ids {
|
||||
ph[i] = "?"
|
||||
args = append(args, id)
|
||||
}
|
||||
res, err := r.db.ExecContext(ctx,
|
||||
`UPDATE qso SET extras_json = `+expr+`, updated_at = ? WHERE id IN (`+strings.Join(ph, ",")+`)`,
|
||||
args...)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("bulk set extra %s: %w", adifKey, err)
|
||||
}
|
||||
n, _ := res.RowsAffected()
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// BulkSetFrequency sets freq_hz AND band together on every listed QSO. Kept
|
||||
// separate from BulkSetField because frequency is numeric and must keep the band
|
||||
// consistent — the main use is fixing a batch that was logged on a stale/default
|
||||
// frequency after CAT dropped. freqHz "" is not allowed (caller validates).
|
||||
func (r *Repo) BulkSetFrequency(ctx context.Context, ids []int64, freqHz int64, band string) (int64, error) {
|
||||
if len(ids) == 0 {
|
||||
return 0, nil
|
||||
}
|
||||
ph := make([]string, len(ids))
|
||||
args := make([]any, 0, len(ids)+3)
|
||||
args = append(args, freqHz, band, db.NowISO())
|
||||
for i, id := range ids {
|
||||
ph[i] = "?"
|
||||
args = append(args, id)
|
||||
}
|
||||
res, err := r.db.ExecContext(ctx,
|
||||
`UPDATE qso SET freq_hz = ?, band = ?, updated_at = ? WHERE id IN (`+strings.Join(ph, ",")+`)`,
|
||||
args...)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("bulk set frequency: %w", err)
|
||||
}
|
||||
n, _ := res.RowsAffected()
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// SetExtra merges ONE key into a QSO's extras JSON without rewriting the rest of
|
||||
// the row. A slow caller that only wants to stamp its own app field (e-mailing a
|
||||
// QSL card, saving a recording) must not do a full-row Update: the row it read may
|
||||
@@ -1345,6 +1456,10 @@ type WorkedBefore struct {
|
||||
DXCCModes []string `json:"dxcc_modes"`
|
||||
DXCCBandModes []BandMode `json:"dxcc_band_modes"`
|
||||
|
||||
// MWRank is the ClubLog "Most Wanted" rank for this entity (1 = most wanted),
|
||||
// 0 when unknown or the feature is off. Populated by the app layer, not here.
|
||||
MWRank int `json:"mw_rank,omitempty"`
|
||||
|
||||
// Status grid driving the band×class matrix in the UI. One entry per
|
||||
// (band, class) where ANY QSO exists in this DXCC. Only the highest
|
||||
// status for that cell is kept (call_c > call_w > dxcc_c > dxcc_w).
|
||||
@@ -1371,6 +1486,17 @@ func modeClass(mode string) string {
|
||||
}
|
||||
}
|
||||
|
||||
// GroupDigitalMode collapses every digital mode into the single "DIG" bucket
|
||||
// (FT8, FT4, RTTY, PSK… all become one mode) while leaving phone modes and CW
|
||||
// untouched. Used as the optional slot normaliser when the operator prefers
|
||||
// DXCC-style mode classes over per-mode slots (Settings → General).
|
||||
func GroupDigitalMode(mode string) string {
|
||||
if modeClass(mode) == "DIG" {
|
||||
return "DIG"
|
||||
}
|
||||
return strings.ToUpper(mode)
|
||||
}
|
||||
|
||||
// BandMode is a (band, mode) pair used for the NEW SLOT check.
|
||||
type BandMode struct {
|
||||
Band string `json:"band"`
|
||||
@@ -1402,14 +1528,14 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int)
|
||||
|
||||
// ---- Per-callsign stats ----
|
||||
if err := r.db.QueryRowContext(ctx,
|
||||
`SELECT COUNT(*) FROM qso WHERE upper(trim(callsign)) = ?`, wb.Callsign).Scan(&wb.Count); err != nil {
|
||||
`SELECT COUNT(*) FROM qso WHERE callsign = ?`, wb.Callsign).Scan(&wb.Count); err != nil {
|
||||
return wb, fmt.Errorf("count worked: %w", err)
|
||||
}
|
||||
if wb.Count > 0 {
|
||||
// Pull the full QSO records (same columns as the Recent QSOs list) so
|
||||
// the Worked-before grid can offer the same rich column picker.
|
||||
rows, err := r.db.QueryContext(ctx, `SELECT `+selectCols+`
|
||||
FROM qso WHERE upper(trim(callsign)) = ?
|
||||
FROM qso WHERE callsign = ?
|
||||
ORDER BY qso_date DESC, id DESC
|
||||
LIMIT ?`, wb.Callsign, maxWorkedEntries)
|
||||
if err != nil {
|
||||
@@ -1444,7 +1570,7 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int)
|
||||
if wb.Count > maxWorkedEntries {
|
||||
var firstStr sql.NullString
|
||||
_ = r.db.QueryRowContext(ctx,
|
||||
`SELECT MIN(qso_date) FROM qso WHERE upper(trim(callsign)) = ?`, wb.Callsign).Scan(&firstStr)
|
||||
`SELECT MIN(qso_date) FROM qso WHERE callsign = ?`, wb.Callsign).Scan(&firstStr)
|
||||
if firstStr.Valid {
|
||||
wb.First = parseTimeLoose(firstStr.String)
|
||||
}
|
||||
@@ -1469,7 +1595,7 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int)
|
||||
var d sql.NullInt64
|
||||
_ = r.db.QueryRowContext(ctx, `
|
||||
SELECT dxcc FROM qso
|
||||
WHERE upper(trim(callsign)) = ? AND dxcc IS NOT NULL
|
||||
WHERE callsign = ? AND dxcc IS NOT NULL
|
||||
ORDER BY qso_date DESC LIMIT 1`, wb.Callsign).Scan(&d)
|
||||
if d.Valid {
|
||||
dxcc = int(d.Int64)
|
||||
@@ -1538,8 +1664,8 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int)
|
||||
// WorkedBefore call, blanking the matrix in the UI.
|
||||
statusRows, err := r.db.QueryContext(ctx, `
|
||||
SELECT band, mode,
|
||||
MAX(CASE WHEN upper(trim(callsign)) = ? THEN 1 ELSE 0 END),
|
||||
MAX(CASE WHEN upper(trim(callsign)) = ?
|
||||
MAX(CASE WHEN callsign = ? THEN 1 ELSE 0 END),
|
||||
MAX(CASE WHEN callsign = ?
|
||||
AND (lotw_rcvd = 'Y' OR qsl_rcvd = 'Y' OR eqsl_rcvd = 'Y')
|
||||
THEN 1 ELSE 0 END),
|
||||
MAX(CASE WHEN lotw_rcvd = 'Y' OR qsl_rcvd = 'Y' OR eqsl_rcvd = 'Y'
|
||||
@@ -1802,7 +1928,11 @@ type EntitySlot struct {
|
||||
// 0 (unresolvable) skips the QSO.
|
||||
//
|
||||
// One DB scan regardless of input size. Cheap to call per cluster batch.
|
||||
func (r *Repo) EntitySlotMap(ctx context.Context, keyFor func(call string, storedDXCC int, country string) int) (map[int]*EntitySlot, error) {
|
||||
//
|
||||
// normMode (nil = identity) maps each QSO's mode before it is stored as a
|
||||
// Modes/Slots key — pass GroupDigitalMode to collapse all digital modes into
|
||||
// one bucket. Callers must normalise their lookup mode the same way.
|
||||
func (r *Repo) EntitySlotMap(ctx context.Context, keyFor func(call string, storedDXCC int, country string) int, normMode func(string) string) (map[int]*EntitySlot, error) {
|
||||
rows, err := r.db.QueryContext(ctx,
|
||||
`SELECT callsign, coalesce(dxcc,0), lower(coalesce(country,'')), lower(band), upper(mode) FROM qso
|
||||
WHERE band IS NOT NULL AND band != ''
|
||||
@@ -1827,6 +1957,9 @@ func (r *Repo) EntitySlotMap(ctx context.Context, keyFor func(call string, store
|
||||
if key == 0 {
|
||||
continue
|
||||
}
|
||||
if normMode != nil {
|
||||
mode = normMode(mode)
|
||||
}
|
||||
e, ok := out[key]
|
||||
if !ok {
|
||||
e = &EntitySlot{
|
||||
|
||||
@@ -0,0 +1,143 @@
|
||||
// Package gs232 drives rotator controllers that speak the Yaesu GS-232A
|
||||
// protocol, over a raw TCP socket or a serial COM port. The target device is
|
||||
// the microHAM ARCO: both its LAN "CONTROL PROTOCOL" setting (a TCP port) and
|
||||
// its USB port ("USB CONTROL PROTOCOL", a virtual COM where the baud rate is
|
||||
// irrelevant) can be set to speak Yaesu GS-232A — so OpsLog controls it
|
||||
// directly, no PstRotator in between. ARCO accepts up to four parallel LAN
|
||||
// connections, and commands are single CR-terminated lines, so short
|
||||
// per-call connections (same idiom as the other rotator backends) work fine.
|
||||
//
|
||||
// GS-232A subset used:
|
||||
//
|
||||
// Maaa<CR> move to azimuth aaa (000-450)
|
||||
// S<CR> stop rotation
|
||||
// C<CR> query azimuth — replies "+0aaa" (GS-232A) or "AZ=aaa" (GS-232B
|
||||
// flavour); both are parsed.
|
||||
package gs232
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"net"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"go.bug.st/serial"
|
||||
)
|
||||
|
||||
const (
|
||||
dialTimeout = 3 * time.Second
|
||||
ioTimeout = 2 * time.Second
|
||||
)
|
||||
|
||||
// Client is a stateless per-call sender, mirroring the pst/rotgenius idiom.
|
||||
// Exactly one of (Host, Port) or ComPort is used, per Transport.
|
||||
type Client struct {
|
||||
Host string
|
||||
Port int
|
||||
ComPort string // serial transport: "COM5" etc. (ARCO USB virtual COM — any baud)
|
||||
}
|
||||
|
||||
// New returns a TCP Client with sane defaults applied for empty fields. There
|
||||
// is no standard port: the number is whatever the user typed into the ARCO's
|
||||
// LAN CONTROL PROTOCOL setting — 4001 is only a placeholder.
|
||||
func New(host string, port int) *Client {
|
||||
if host == "" {
|
||||
host = "127.0.0.1"
|
||||
}
|
||||
if port <= 0 || port > 65535 {
|
||||
port = 4001
|
||||
}
|
||||
return &Client{Host: host, Port: port}
|
||||
}
|
||||
|
||||
// NewSerial returns a Client talking over the ARCO's USB virtual COM port. The
|
||||
// baud rate is irrelevant on USB per the ARCO manual (8N1 framing matters); we
|
||||
// open at 9600 which also suits a real RS-232 hookup left at its default.
|
||||
func NewSerial(comPort string) *Client {
|
||||
return &Client{ComPort: comPort}
|
||||
}
|
||||
|
||||
// roundTrip opens a connection (TCP or serial per the client's config), sends
|
||||
// one CR-terminated command and (when wantReply) reads one CR/LF-terminated
|
||||
// reply line.
|
||||
func (c *Client) roundTrip(cmd string, wantReply bool) (string, error) {
|
||||
var conn io.ReadWriteCloser
|
||||
if c.ComPort != "" {
|
||||
sp, err := serial.Open(c.ComPort, &serial.Mode{BaudRate: 9600})
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("open ARCO %s: %w", c.ComPort, err)
|
||||
}
|
||||
_ = sp.SetReadTimeout(200 * time.Millisecond)
|
||||
conn = sp
|
||||
} else {
|
||||
nc, err := net.DialTimeout("tcp", net.JoinHostPort(c.Host, strconv.Itoa(c.Port)), dialTimeout)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("connect ARCO %s:%d: %w", c.Host, c.Port, err)
|
||||
}
|
||||
_ = nc.SetDeadline(time.Now().Add(ioTimeout))
|
||||
conn = nc
|
||||
}
|
||||
defer conn.Close()
|
||||
if _, err := conn.Write([]byte(cmd + "\r")); err != nil {
|
||||
return "", fmt.Errorf("send %q: %w", cmd, err)
|
||||
}
|
||||
if !wantReply {
|
||||
return "", nil
|
||||
}
|
||||
buf := make([]byte, 64)
|
||||
var sb strings.Builder
|
||||
deadline := time.Now().Add(ioTimeout)
|
||||
for time.Now().Before(deadline) {
|
||||
n, err := conn.Read(buf)
|
||||
if n > 0 {
|
||||
sb.Write(buf[:n])
|
||||
if strings.ContainsAny(sb.String(), "\r\n") {
|
||||
break
|
||||
}
|
||||
}
|
||||
// A serial read that times out returns (0, nil) — keep polling until the
|
||||
// overall deadline; a real error ends the read.
|
||||
if err != nil {
|
||||
break
|
||||
}
|
||||
}
|
||||
line := strings.TrimSpace(sb.String())
|
||||
if line == "" {
|
||||
return "", fmt.Errorf("no reply to %q", cmd)
|
||||
}
|
||||
return line, nil
|
||||
}
|
||||
|
||||
// GoTo points the antenna at the given azimuth (0-359). GS-232A takes M000-M450
|
||||
// (overlap rotators accept >360); we normalise to [0,360).
|
||||
func (c *Client) GoTo(az int) error {
|
||||
az = ((az % 360) + 360) % 360
|
||||
_, err := c.roundTrip(fmt.Sprintf("M%03d", az), false)
|
||||
return err
|
||||
}
|
||||
|
||||
// Stop interrupts any in-progress rotation.
|
||||
func (c *Client) Stop() error {
|
||||
_, err := c.roundTrip("S", false)
|
||||
return err
|
||||
}
|
||||
|
||||
// azRe matches both reply flavours: "+0aaa" (GS-232A) and "AZ=aaa" (GS-232B).
|
||||
var azRe = regexp.MustCompile(`(?:\+0|AZ=)(\d{3})`)
|
||||
|
||||
// Heading queries the current azimuth. Returns the raw reply for diagnostics.
|
||||
func (c *Client) Heading() (az int, raw string, err error) {
|
||||
raw, err = c.roundTrip("C", true)
|
||||
if err != nil {
|
||||
return 0, raw, err
|
||||
}
|
||||
m := azRe.FindStringSubmatch(raw)
|
||||
if m == nil {
|
||||
return 0, raw, fmt.Errorf("unrecognised azimuth reply %q", raw)
|
||||
}
|
||||
az, _ = strconv.Atoi(m[1])
|
||||
return az % 360, raw, nil
|
||||
}
|
||||
@@ -0,0 +1,270 @@
|
||||
// Package scp provides Super Check Partial (SCP) and N+1 callsign suggestions
|
||||
// from the community MASTER.SCP master file (supercheckpartial.com) — the same
|
||||
// aid contest loggers (N1MM, DXLog, Log4OM) show to catch/correct a busted call.
|
||||
//
|
||||
// - Partial (SCP): every master call that CONTAINS what you've typed, so a
|
||||
// mistyped or half-copied call surfaces the real ones.
|
||||
// - N+1: master calls exactly one edit away (one char substituted, added or
|
||||
// removed) from the full call you typed — the classic "did I bust it?" check.
|
||||
//
|
||||
// The list is downloaded once and cached on disk so it survives restarts.
|
||||
package scp
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"bytes"
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sort"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
// masterURL is the community Super Check Partial master file: one callsign per
|
||||
// line, '#'-prefixed header lines. ~50k+ active contest/DX calls.
|
||||
const masterURL = "https://www.supercheckpartial.com/MASTER.SCP"
|
||||
|
||||
const cacheFile = "MASTER.SCP"
|
||||
|
||||
// Result is the two suggestion lists for a typed fragment.
|
||||
type Result struct {
|
||||
Partial []string `json:"partial"` // master calls containing the fragment
|
||||
NPlus1 []string `json:"nplus1"` // master calls one edit away from the full call
|
||||
}
|
||||
|
||||
// Manager holds the parsed call list + cache location.
|
||||
type Manager struct {
|
||||
mu sync.RWMutex
|
||||
calls []string // UPPER, de-duplicated, sorted
|
||||
updated time.Time // when the cache was last refreshed
|
||||
dir string
|
||||
client *http.Client
|
||||
}
|
||||
|
||||
// NewManager loads any on-disk cache and returns a ready manager.
|
||||
func NewManager(dataDir string) *Manager {
|
||||
m := &Manager{
|
||||
dir: dataDir,
|
||||
client: &http.Client{Timeout: 60 * time.Second},
|
||||
}
|
||||
m.loadCache()
|
||||
return m
|
||||
}
|
||||
|
||||
func (m *Manager) path() string { return filepath.Join(m.dir, cacheFile) }
|
||||
|
||||
func (m *Manager) loadCache() {
|
||||
data, err := os.ReadFile(m.path())
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
m.parse(data)
|
||||
if fi, e := os.Stat(m.path()); e == nil {
|
||||
m.mu.Lock()
|
||||
m.updated = fi.ModTime()
|
||||
m.mu.Unlock()
|
||||
}
|
||||
}
|
||||
|
||||
// Download fetches the latest MASTER.SCP, caches it and replaces the in-memory
|
||||
// list. Returns the number of callsigns loaded.
|
||||
func (m *Manager) Download(ctx context.Context) (int, error) {
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, masterURL, nil)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
req.Header.Set("User-Agent", "OpsLog")
|
||||
resp, err := m.client.Do(req)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("scp: request failed: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return 0, fmt.Errorf("scp: http %d", resp.StatusCode)
|
||||
}
|
||||
body, err := io.ReadAll(io.LimitReader(resp.Body, 32*1024*1024))
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("scp: read: %w", err)
|
||||
}
|
||||
n := m.parse(body)
|
||||
if n == 0 {
|
||||
return 0, fmt.Errorf("scp: file parsed to 0 callsigns")
|
||||
}
|
||||
_ = os.WriteFile(m.path(), body, 0o644) // best-effort cache
|
||||
m.mu.Lock()
|
||||
m.updated = time.Now()
|
||||
m.mu.Unlock()
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// parse loads the SCP bytes into the sorted call slice and returns the count.
|
||||
func (m *Manager) parse(data []byte) int {
|
||||
seen := make(map[string]struct{}, 1<<17)
|
||||
sc := bufio.NewScanner(bytes.NewReader(data))
|
||||
sc.Buffer(make([]byte, 1024*1024), 1024*1024)
|
||||
for sc.Scan() {
|
||||
line := strings.ToUpper(strings.TrimSpace(sc.Text()))
|
||||
if line == "" || strings.HasPrefix(line, "#") {
|
||||
continue // blank / header comment
|
||||
}
|
||||
// A call token only (the master file is one call per line, but guard
|
||||
// against stray trailing fields).
|
||||
if i := strings.IndexAny(line, " \t,;"); i >= 0 {
|
||||
line = line[:i]
|
||||
}
|
||||
if !plausibleCall(line) {
|
||||
continue
|
||||
}
|
||||
seen[line] = struct{}{}
|
||||
}
|
||||
if len(seen) == 0 {
|
||||
return 0
|
||||
}
|
||||
calls := make([]string, 0, len(seen))
|
||||
for c := range seen {
|
||||
calls = append(calls, c)
|
||||
}
|
||||
sort.Strings(calls)
|
||||
m.mu.Lock()
|
||||
m.calls = calls
|
||||
m.mu.Unlock()
|
||||
return len(calls)
|
||||
}
|
||||
|
||||
// plausibleCall keeps a token that looks like a callsign: length 3–12, at least
|
||||
// one digit and one letter, only A–Z/0–9//.
|
||||
func plausibleCall(s string) bool {
|
||||
if len(s) < 3 || len(s) > 12 {
|
||||
return false
|
||||
}
|
||||
hasDigit, hasAlpha := false, false
|
||||
for i := 0; i < len(s); i++ {
|
||||
c := s[i]
|
||||
switch {
|
||||
case c >= '0' && c <= '9':
|
||||
hasDigit = true
|
||||
case c >= 'A' && c <= 'Z':
|
||||
hasAlpha = true
|
||||
case c == '/':
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
return hasDigit && hasAlpha
|
||||
}
|
||||
|
||||
// Lookup returns the Partial (substring) and N+1 (one-edit) suggestions for the
|
||||
// typed fragment. limit caps EACH list. Partial needs ≥2 chars; N+1 needs ≥3
|
||||
// (a plausible whole call) and is skipped otherwise.
|
||||
func (m *Manager) Lookup(fragment string, limit int) Result {
|
||||
q := strings.ToUpper(strings.TrimSpace(fragment))
|
||||
if len(q) < 2 {
|
||||
return Result{}
|
||||
}
|
||||
if limit <= 0 {
|
||||
limit = 50
|
||||
}
|
||||
m.mu.RLock()
|
||||
calls := m.calls
|
||||
m.mu.RUnlock()
|
||||
|
||||
wantN1 := len(q) >= 3
|
||||
type pm struct {
|
||||
call string
|
||||
prefix bool
|
||||
}
|
||||
var partial []pm
|
||||
var nplus1 []string
|
||||
for _, c := range calls {
|
||||
if c == q {
|
||||
partial = append(partial, pm{c, true}) // exact = strongest match
|
||||
continue
|
||||
}
|
||||
if idx := strings.Index(c, q); idx >= 0 {
|
||||
partial = append(partial, pm{c, idx == 0})
|
||||
}
|
||||
if wantN1 && len(nplus1) < limit*2 && editDistanceOne(q, c) {
|
||||
nplus1 = append(nplus1, c)
|
||||
}
|
||||
}
|
||||
// Prefix matches first, then the rest (both already alphabetical since `calls`
|
||||
// is sorted and we scanned in order).
|
||||
sort.SliceStable(partial, func(i, j int) bool {
|
||||
if partial[i].prefix != partial[j].prefix {
|
||||
return partial[i].prefix
|
||||
}
|
||||
return false
|
||||
})
|
||||
out := Result{Partial: []string{}, NPlus1: []string{}}
|
||||
for _, p := range partial {
|
||||
if len(out.Partial) >= limit {
|
||||
break
|
||||
}
|
||||
out.Partial = append(out.Partial, p.call)
|
||||
}
|
||||
if len(nplus1) > limit {
|
||||
nplus1 = nplus1[:limit]
|
||||
}
|
||||
out.NPlus1 = append(out.NPlus1, nplus1...)
|
||||
return out
|
||||
}
|
||||
|
||||
// editDistanceOne reports whether a and b are exactly one edit apart (one
|
||||
// substitution, insertion or deletion) — never equal (distance 0 returns false).
|
||||
func editDistanceOne(a, b string) bool {
|
||||
la, lb := len(a), len(b)
|
||||
if la == lb {
|
||||
diff := 0
|
||||
for i := 0; i < la; i++ {
|
||||
if a[i] != b[i] {
|
||||
diff++
|
||||
if diff > 1 {
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
return diff == 1
|
||||
}
|
||||
// Ensure a is the shorter one; lengths must differ by exactly 1.
|
||||
if la > lb {
|
||||
a, b = b, a
|
||||
la, lb = lb, la
|
||||
}
|
||||
if lb-la != 1 {
|
||||
return false
|
||||
}
|
||||
// b is a with one extra char: walk both, allowing a single skip in b.
|
||||
i, j, skipped := 0, 0, false
|
||||
for i < la && j < lb {
|
||||
if a[i] == b[j] {
|
||||
i++
|
||||
j++
|
||||
continue
|
||||
}
|
||||
if skipped {
|
||||
return false
|
||||
}
|
||||
skipped = true
|
||||
j++ // skip the extra char in the longer string
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// Count returns how many callsigns are loaded.
|
||||
func (m *Manager) Count() int {
|
||||
m.mu.RLock()
|
||||
defer m.mu.RUnlock()
|
||||
return len(m.calls)
|
||||
}
|
||||
|
||||
// Updated returns when the list was last refreshed (zero if never).
|
||||
func (m *Manager) Updated() time.Time {
|
||||
m.mu.RLock()
|
||||
defer m.mu.RUnlock()
|
||||
return m.updated
|
||||
}
|
||||
+127
-9
@@ -23,7 +23,9 @@
|
||||
package steppir
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/binary"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
@@ -34,6 +36,10 @@ import (
|
||||
"go.bug.st/serial"
|
||||
)
|
||||
|
||||
// errBadFrame marks a reply that isn't a well-formed status frame. It means
|
||||
// "ignore this poll", not "the link is down".
|
||||
var errBadFrame = errors.New("steppir: malformed status frame")
|
||||
|
||||
// Direction values, matching the app-wide convention (also used by Ultrabeam):
|
||||
// 0 normal, 1 reverse (180°), 2 bidirectional.
|
||||
const (
|
||||
@@ -49,6 +55,15 @@ const (
|
||||
wireBi = 0x80
|
||||
)
|
||||
|
||||
// pendingDirTTL is how long a commanded direction is trusted over the
|
||||
// controller's own report. The elements physically re-tune to swap director and
|
||||
// reflector, and the SDA only reports the new pattern once it starts that move,
|
||||
// so a few seconds is not enough — 4 s (the original value) had the UI snapping
|
||||
// back to "normal" while the antenna was on its way to 180°. Long enough to
|
||||
// cover a real move, short enough that a command the controller never received
|
||||
// self-corrects instead of lying forever.
|
||||
const pendingDirTTL = 45 * time.Second
|
||||
|
||||
// Transport says how to reach the controller.
|
||||
type Transport struct {
|
||||
Mode string // "tcp" | "serial"
|
||||
@@ -84,9 +99,20 @@ type Client struct {
|
||||
lastStatus *Status
|
||||
lastSetKHz int
|
||||
|
||||
// lastRaw holds the previous raw status frame so we only log a status line
|
||||
// when the controller's reply actually changes — enough to diagnose a stuck
|
||||
// "motors moving" read (which drives the app's TX-inhibit interlock) without
|
||||
// spamming the log every 2 s poll.
|
||||
lastRaw []byte
|
||||
|
||||
// A just-commanded direction is held until the controller's poll reports it —
|
||||
// the motors take a second or two, and a stale poll would otherwise snap the
|
||||
// UI back. Same trick as the Ultrabeam client.
|
||||
//
|
||||
// The hold is deliberately long (pendingDirTTL). It is not just a UI nicety:
|
||||
// the follow loop re-tunes with the direction it reads back from this status,
|
||||
// so a single stale poll reading "normal" would make OpsLog command the
|
||||
// antenna out of 180° all by itself.
|
||||
pendingDir int
|
||||
pendingDirAt time.Time
|
||||
pendingDirSet bool
|
||||
@@ -182,6 +208,12 @@ func (c *Client) pollLoop() {
|
||||
c.connMu.Unlock()
|
||||
|
||||
st, err := c.queryStatus()
|
||||
if errors.Is(err, errBadFrame) {
|
||||
// Framing glitch, not a dead link: skip this tick and keep the
|
||||
// previous status. Dropping the connection here would blink the
|
||||
// UI to "disconnected" over one garbled reply.
|
||||
continue
|
||||
}
|
||||
if err != nil {
|
||||
log.Printf("steppir: status query failed, reconnecting: %v", err)
|
||||
c.closeConn()
|
||||
@@ -190,19 +222,32 @@ func (c *Client) pollLoop() {
|
||||
}
|
||||
st.Connected = true
|
||||
c.statusMu.Lock()
|
||||
if c.pendingDirSet {
|
||||
if time.Since(c.pendingDirAt) > 4*time.Second || st.Direction == c.pendingDir {
|
||||
c.pendingDirSet = false
|
||||
} else {
|
||||
st.Direction = c.pendingDir
|
||||
}
|
||||
}
|
||||
c.applyPendingDir(st)
|
||||
c.lastStatus = st
|
||||
c.statusMu.Unlock()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// applyPendingDir replaces a freshly polled direction with the one the operator
|
||||
// last commanded, until the controller confirms it (or the hold expires). The
|
||||
// caller holds statusMu.
|
||||
func (c *Client) applyPendingDir(st *Status) {
|
||||
if !c.pendingDirSet {
|
||||
return
|
||||
}
|
||||
switch {
|
||||
case st.Direction == c.pendingDir:
|
||||
c.pendingDirSet = false // confirmed — trust the controller's reports again
|
||||
case time.Since(c.pendingDirAt) > pendingDirTTL:
|
||||
c.pendingDirSet = false
|
||||
log.Printf("steppir: controller never confirmed direction %d (still reports %d) — dropping the hold",
|
||||
c.pendingDir, st.Direction)
|
||||
default:
|
||||
st.Direction = c.pendingDir
|
||||
}
|
||||
}
|
||||
|
||||
func (c *Client) setDisconnected() {
|
||||
c.statusMu.Lock()
|
||||
c.lastStatus = &Status{Connected: false}
|
||||
@@ -225,6 +270,56 @@ func setDeadline(conn io.ReadWriteCloser, d time.Duration) {
|
||||
}
|
||||
}
|
||||
|
||||
// setReadTimeout bounds a single read on either transport, so a drain can tell
|
||||
// "nothing more queued" from "still arriving" without blocking.
|
||||
func setReadTimeout(conn io.ReadWriteCloser, d time.Duration) {
|
||||
switch t := conn.(type) {
|
||||
case net.Conn:
|
||||
_ = t.SetReadDeadline(time.Now().Add(d))
|
||||
case serial.Port:
|
||||
_ = t.SetReadTimeout(d)
|
||||
}
|
||||
}
|
||||
|
||||
// restoreTimeouts puts the normal exchange timeouts back after a drain shortened
|
||||
// them.
|
||||
func restoreTimeouts(conn io.ReadWriteCloser) {
|
||||
setDeadline(conn, 3*time.Second) // TCP: read + write
|
||||
setReadTimeout(conn, 2*time.Second)
|
||||
}
|
||||
|
||||
// drain throws away everything already sitting in the input buffer and returns
|
||||
// how many bytes it discarded.
|
||||
//
|
||||
// This is the fix for the antenna's state appearing tens of seconds out of date.
|
||||
// The SDA controller does not only answer "?A" — it also pushes status frames on
|
||||
// its own (front-panel changes, autotrack moves, each command it processes). We
|
||||
// consume exactly one frame per poll, so every unsolicited frame adds one to a
|
||||
// backlog that only ever grows: reading 11 bytes then returns a frame from
|
||||
// minutes ago. The field log showed it plainly — two consecutive polls 4 s apart
|
||||
// reporting 28280 kHz then 14200 kHz, a frequency last used hours earlier, and a
|
||||
// 180° command not showing up in the status for ~40 s (long after the UI had
|
||||
// given up waiting and snapped the button back to "normal"). Emptying the buffer
|
||||
// immediately before each query means the frame we then read is the answer to
|
||||
// THIS query.
|
||||
func drain(conn io.ReadWriteCloser) int {
|
||||
buf := make([]byte, 512)
|
||||
total := 0
|
||||
// Bounded so a controller that streams continuously can't hold the poll
|
||||
// goroutine here forever. 32 × 512 B is ~1500 frames — far more backlog than
|
||||
// any real link builds up, and it only costs one 30 ms timeout when the
|
||||
// buffer is already empty (reads return immediately while data is queued).
|
||||
for i := 0; i < 32; i++ {
|
||||
setReadTimeout(conn, 30*time.Millisecond)
|
||||
n, err := conn.Read(buf)
|
||||
total += n
|
||||
if err != nil || n == 0 { // timeout / nothing left
|
||||
break
|
||||
}
|
||||
}
|
||||
return total
|
||||
}
|
||||
|
||||
func (c *Client) queryStatus() (*Status, error) {
|
||||
c.connMu.Lock()
|
||||
conn := c.conn
|
||||
@@ -234,7 +329,12 @@ func (c *Client) queryStatus() (*Status, error) {
|
||||
}
|
||||
c.ioMu.Lock()
|
||||
defer c.ioMu.Unlock()
|
||||
setDeadline(conn, 3*time.Second)
|
||||
// Discard any frame the controller pushed on its own since the last poll, so
|
||||
// what we read below is this query's answer and not a stale backlog entry.
|
||||
if n := drain(conn); n > 0 {
|
||||
log.Printf("steppir: discarded %d stale byte(s) queued by the controller before polling", n)
|
||||
}
|
||||
restoreTimeouts(conn)
|
||||
if _, err := conn.Write([]byte("?A\r")); err != nil {
|
||||
return nil, fmt.Errorf("write status cmd: %w", err)
|
||||
}
|
||||
@@ -242,7 +342,25 @@ func (c *Client) queryStatus() (*Status, error) {
|
||||
if _, err := io.ReadFull(conn, buf); err != nil {
|
||||
return nil, fmt.Errorf("read status: %w", err)
|
||||
}
|
||||
return parseStatus(buf)
|
||||
// Reject anything that isn't a framed reply rather than decoding garbage into
|
||||
// a frequency and a direction the app would then act on.
|
||||
if buf[0] != '@' || buf[1] != 'A' || buf[10] != 0x0D {
|
||||
log.Printf("steppir: ignoring malformed status frame % X", buf)
|
||||
drain(conn) // resync: drop the rest of whatever we landed mid-way through
|
||||
restoreTimeouts(conn)
|
||||
return nil, errBadFrame
|
||||
}
|
||||
st, err := parseStatus(buf)
|
||||
// Log the raw frame + decode whenever it changes. The motor byte (buf[6]) is
|
||||
// what decides st.MotorsMoving, and that in turn drives the app's "block TX
|
||||
// while moving" interlock — so if a controller (e.g. with its INHIBIT engaged)
|
||||
// reports a byte we misread as perpetual motion, this line makes it visible.
|
||||
if err == nil && !bytes.Equal(buf, c.lastRaw) {
|
||||
c.lastRaw = append(c.lastRaw[:0], buf...)
|
||||
log.Printf("steppir: status ← % X (freq=%d kHz dir=%d moving=%d motorByte=0x%02X dirByte=0x%02X)",
|
||||
buf, st.Frequency, st.Direction, st.MotorsMoving, buf[6], buf[7])
|
||||
}
|
||||
return st, err
|
||||
}
|
||||
|
||||
// parseStatus decodes an 11-byte status frame.
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
package steppir
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/binary"
|
||||
"errors"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
// The exact bytes are the correctness checksum. If buildSet ever drifts from the
|
||||
@@ -104,3 +108,120 @@ func TestParseStatus(t *testing.T) {
|
||||
t.Error("active-motors 0xFF (command received) must not read as moving")
|
||||
}
|
||||
}
|
||||
|
||||
// fakeConn stands in for the controller link. rx holds bytes the "controller"
|
||||
// has already sent (what the client will read), tx collects what the client
|
||||
// wrote, and a "?A" query queues `reply` into rx the way the SDA answers.
|
||||
//
|
||||
// Reads never block: an empty rx returns (0, nil), which is exactly how
|
||||
// go.bug.st/serial reports a read timeout, so drain() sees the same
|
||||
// nothing-left signal it gets from real hardware.
|
||||
type fakeConn struct {
|
||||
mu sync.Mutex
|
||||
rx bytes.Buffer
|
||||
tx bytes.Buffer
|
||||
reply []byte
|
||||
}
|
||||
|
||||
func (f *fakeConn) Read(p []byte) (int, error) {
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
if f.rx.Len() == 0 {
|
||||
return 0, nil
|
||||
}
|
||||
return f.rx.Read(p)
|
||||
}
|
||||
|
||||
func (f *fakeConn) Write(p []byte) (int, error) {
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
f.tx.Write(p)
|
||||
if bytes.Contains(p, []byte("?A")) {
|
||||
f.rx.Write(f.reply)
|
||||
}
|
||||
return len(p), nil
|
||||
}
|
||||
|
||||
func (f *fakeConn) Close() error { return nil }
|
||||
|
||||
var (
|
||||
// 50.150 MHz, normal — the "stuck at 6 m" frame that kept turning up in
|
||||
// F4BPO's friend's log long after the rig had left the band.
|
||||
frame6mNormal = []byte{0x40, 0x41, 0x00, 0x4C, 0x85, 0xD8, 0x00, 0x07, 0x30, 0x38, 0x0D}
|
||||
// 14.250 MHz, 180° — what the controller actually reports right now.
|
||||
frame20m180 = []byte{0x40, 0x41, 0x00, 0x15, 0xBE, 0x68, 0x00, 0x47, 0x30, 0x38, 0x0D}
|
||||
)
|
||||
|
||||
// The controller pushes status frames unsolicited, so they pile up between polls.
|
||||
// Reading one frame per poll then returns state from minutes ago — which is how a
|
||||
// 180° command could take ~40 s to show up in the UI, and how two polls 4 s apart
|
||||
// reported 28 MHz then 14 MHz. queryStatus must empty the backlog first.
|
||||
func TestQueryStatusDiscardsQueuedFrames(t *testing.T) {
|
||||
fc := &fakeConn{reply: frame20m180}
|
||||
fc.rx.Write(frame6mNormal) // two frames the controller pushed on its own
|
||||
fc.rx.Write(frame6mNormal)
|
||||
|
||||
c := &Client{conn: fc}
|
||||
st, err := c.queryStatus()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if st.Frequency != 14250 {
|
||||
t.Errorf("freq = %d kHz, want 14250 — a stale queued frame was read instead of this poll's reply", st.Frequency)
|
||||
}
|
||||
if st.Direction != Dir180 {
|
||||
t.Errorf("direction = %d, want %d (180°)", st.Direction, Dir180)
|
||||
}
|
||||
}
|
||||
|
||||
// A reply we land on mid-frame must be rejected, not decoded into a bogus
|
||||
// frequency and direction the follow loop would then act on — and it must not
|
||||
// look like a dead link either (errBadFrame keeps the connection).
|
||||
func TestQueryStatusRejectsMalformedFrame(t *testing.T) {
|
||||
shifted := append(append([]byte{}, frame20m180[3:]...), 0x40, 0x41, 0x00) // 11 bytes, wrong header
|
||||
c := &Client{conn: &fakeConn{reply: shifted}}
|
||||
if _, err := c.queryStatus(); !errors.Is(err, errBadFrame) {
|
||||
t.Fatalf("err = %v, want errBadFrame", err)
|
||||
}
|
||||
}
|
||||
|
||||
// The direction the operator just commanded is shown until the controller
|
||||
// confirms it. The hold used to be 4 s — two polls — so the button snapped back
|
||||
// to Normal while the elements were still swapping over to 180°.
|
||||
func TestApplyPendingDirHold(t *testing.T) {
|
||||
c := &Client{pendingDir: Dir180, pendingDirAt: time.Now(), pendingDirSet: true}
|
||||
|
||||
// Controller still reports the old pattern: keep showing what was commanded.
|
||||
st := &Status{Direction: DirNormal}
|
||||
c.applyPendingDir(st)
|
||||
if st.Direction != Dir180 {
|
||||
t.Fatalf("direction = %d, want %d while the move is pending", st.Direction, Dir180)
|
||||
}
|
||||
if !c.pendingDirSet {
|
||||
t.Fatal("hold released before the controller confirmed")
|
||||
}
|
||||
|
||||
// Still holding well past the old 4 s window — a SteppIR takes longer than
|
||||
// that to report a pattern change.
|
||||
c.pendingDirAt = time.Now().Add(-10 * time.Second)
|
||||
st = &Status{Direction: DirNormal}
|
||||
c.applyPendingDir(st)
|
||||
if st.Direction != Dir180 {
|
||||
t.Fatalf("direction = %d after 10 s, want %d — the hold expired too early", st.Direction, Dir180)
|
||||
}
|
||||
|
||||
// Controller confirms: release the hold and trust its reports again.
|
||||
st = &Status{Direction: Dir180}
|
||||
c.applyPendingDir(st)
|
||||
if c.pendingDirSet {
|
||||
t.Fatal("hold should be released once the controller reports the commanded direction")
|
||||
}
|
||||
|
||||
// A command the controller never acted on must not lie forever.
|
||||
c.pendingDir, c.pendingDirAt, c.pendingDirSet = DirBi, time.Now().Add(-pendingDirTTL-time.Second), true
|
||||
st = &Status{Direction: DirNormal}
|
||||
c.applyPendingDir(st)
|
||||
if st.Direction != DirNormal || c.pendingDirSet {
|
||||
t.Fatalf("expired hold should fall back to the controller: direction = %d, pending = %v", st.Direction, c.pendingDirSet)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
package tunergenius
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"net"
|
||||
"os"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
// captureLog redirects the stream applog.Printf always writes to, and returns a
|
||||
// stop function yielding what was logged. Reading only after stop keeps the
|
||||
// collector goroutine and the test off the same slice.
|
||||
func captureLog() func() []string {
|
||||
orig := os.Stderr
|
||||
r, w, _ := os.Pipe()
|
||||
os.Stderr = w
|
||||
var lines []string
|
||||
done := make(chan struct{})
|
||||
go func() {
|
||||
sc := bufio.NewScanner(r)
|
||||
for sc.Scan() {
|
||||
lines = append(lines, sc.Text())
|
||||
}
|
||||
close(done)
|
||||
}()
|
||||
return func() []string {
|
||||
os.Stderr = orig
|
||||
w.Close()
|
||||
<-done
|
||||
r.Close()
|
||||
return lines
|
||||
}
|
||||
}
|
||||
|
||||
// A tuner that answers, then vanishes mid-session. A drop used to leave no trace
|
||||
// at all, so "did the tuner disconnect, or is the meter just reading a gap
|
||||
// between syllables?" was unanswerable from the log. It must now log — and log
|
||||
// ONCE, not on every 400 ms retry.
|
||||
func TestLinkDownLoggedOnceNotPerRetry(t *testing.T) {
|
||||
ln, err := net.Listen("tcp", "127.0.0.1:0")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
port := ln.Addr().(*net.TCPAddr).Port
|
||||
|
||||
die := make(chan struct{})
|
||||
go func() {
|
||||
conn, err := ln.Accept()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
conn.Write([]byte("V1.2.11\n"))
|
||||
buf := make([]byte, 256)
|
||||
for {
|
||||
n, err := conn.Read(buf)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
id := strings.TrimPrefix(strings.SplitN(string(buf[:n]), "|", 2)[0], "C")
|
||||
conn.Write([]byte("R" + id + "|0|status state=1 fwd=60.7 swr=-25 active=1\n"))
|
||||
select {
|
||||
case <-die:
|
||||
conn.Close()
|
||||
ln.Close()
|
||||
return
|
||||
default:
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
stop := captureLog()
|
||||
c := New("127.0.0.1", port, "")
|
||||
if err := c.Start(); err != nil {
|
||||
stop()
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
time.Sleep(1200 * time.Millisecond)
|
||||
connected := c.GetStatus().Connected
|
||||
close(die)
|
||||
time.Sleep(2 * time.Second) // ~5 poll cycles with the tuner gone
|
||||
c.Stop()
|
||||
lines := stop()
|
||||
|
||||
if !connected {
|
||||
t.Fatal("the client never reached the fake tuner — the rest of the test is meaningless")
|
||||
}
|
||||
down := 0
|
||||
for _, l := range lines {
|
||||
if strings.Contains(l, "link DOWN") {
|
||||
down++
|
||||
}
|
||||
}
|
||||
t.Logf("logged:\n%s", strings.Join(lines, "\n"))
|
||||
if down != 1 {
|
||||
t.Errorf("got %d 'link DOWN' lines, want exactly 1 — the poll retries many times in a 3 s outage and must not repeat itself", down)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,518 @@
|
||||
// Package tunergenius drives a 4O3A Tuner Genius XL over its TCP text API
|
||||
// (fixed port 9010 — the same port the device also uses for UDP discovery
|
||||
// broadcasts). It's the same "Genius Series" line protocol as the PowerGenius
|
||||
// XL / Antenna Genius: on connect the device sends a banner ("V1.1.8" or
|
||||
// "V1.1.8 AUTH" when reached from outside the LAN); commands are
|
||||
// "C<seq>|<command>\n" and replies are "R<seq>|<code>|<message>" (code 0 = OK).
|
||||
// The status reply is pushed back as "S<seq>|status <k=v …>", and unsolicited
|
||||
// "M|<message>" info/warning lines can arrive at any time.
|
||||
//
|
||||
// Protocol reference: 4O3A "TUNER GENIUS XL — PROTOCOL DESCRIPTION".
|
||||
package tunergenius
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"fmt"
|
||||
"math"
|
||||
"net"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
"hamlog/internal/applog"
|
||||
)
|
||||
|
||||
const (
|
||||
// DefaultPort is fixed on the device (both the TCP control channel and the
|
||||
// UDP discovery broadcast use 9010).
|
||||
DefaultPort = 9010
|
||||
|
||||
dialTimeout = 5 * time.Second
|
||||
ioTimeout = 3 * time.Second
|
||||
// Poll fast so the meters track TX like the amplifier does (the amp's numbers
|
||||
// ride the real-time Flex UDP stream; the tuner is a synchronous TCP poll, so
|
||||
// a slow interval made its SWR/power lag noticeably behind).
|
||||
pollEvery = 400 * time.Millisecond
|
||||
)
|
||||
|
||||
// Channel is the live state of one of the tuner's two RF channels (A / B). The
|
||||
// Tuner Genius XL is a dual (SO2R) coupler, so each channel tracks its own
|
||||
// source, band, frequency and antenna — mirroring the two rows the native 4O3A
|
||||
// app shows.
|
||||
type Channel struct {
|
||||
PTT bool `json:"ptt"` // this channel is keyed
|
||||
Band int `json:"band"` // band as reported by the device (0 = unknown)
|
||||
Mode int `json:"mode"` // 0=RF Sense 1=FLEX 2=CAT 3=P2B 4=BCD
|
||||
ModeStr string `json:"mode_str"` // human-readable mode/source
|
||||
Flex string `json:"flex"` // bound Flex radio nickname (FLEX mode)
|
||||
FreqMHz float64 `json:"freq_mhz"` // current frequency
|
||||
Bypass bool `json:"bypass"` // this channel bypassed
|
||||
Antenna int `json:"antenna"` // antenna in use (3WAY / SO2R-with-AG; 0 = n/a)
|
||||
}
|
||||
|
||||
// Status is the snapshot the UI renders. Power/SWR come from the device's
|
||||
// "status" reply; the booleans mirror the tuner's operating state.
|
||||
type Status struct {
|
||||
Connected bool `json:"connected"`
|
||||
Host string `json:"host,omitempty"`
|
||||
LastError string `json:"last_error,omitempty"`
|
||||
|
||||
FwdDbm float64 `json:"fwd_dbm"` // forward power [dBm], as reported
|
||||
FwdW float64 `json:"fwd_w"` // forward power [W], derived from dBm
|
||||
SwrDb float64 `json:"swr_db"` // return loss [dB] as reported (negative = good match)
|
||||
Vswr float64 `json:"vswr"` // VSWR ratio, derived from swr_db (1.0 = perfect)
|
||||
|
||||
Operate bool `json:"operate"` // state == OPERATE (1) vs STANDBY (0)
|
||||
Bypass bool `json:"bypass"` // device global bypass engaged
|
||||
Tuning bool `json:"tuning"` // autotune in progress
|
||||
Active int `json:"active"` // active channel (1 = A, 2 = B)
|
||||
ThreeWay bool `json:"three_way"` // 3-way (vs SO2R) hardware variant
|
||||
|
||||
A Channel `json:"a"` // channel A
|
||||
B Channel `json:"b"` // channel B
|
||||
|
||||
RelayC1 int `json:"relay_c1"` // tuner network position (0–255)
|
||||
RelayL int `json:"relay_l"`
|
||||
RelayC2 int `json:"relay_c2"`
|
||||
|
||||
// FreqMHz / Antenna mirror the ACTIVE channel, kept for the compact docked
|
||||
// widget that shows a single readout.
|
||||
FreqMHz float64 `json:"freq_mhz"`
|
||||
Antenna int `json:"antenna"`
|
||||
|
||||
Message string `json:"message,omitempty"` // last M| warning/info (empty = cleared)
|
||||
}
|
||||
|
||||
// modeName maps the device's numeric mode/source to a label.
|
||||
func modeName(m int) string {
|
||||
switch m {
|
||||
case 0:
|
||||
return "RF Sense"
|
||||
case 1:
|
||||
return "Flex"
|
||||
case 2:
|
||||
return "CAT"
|
||||
case 3:
|
||||
return "P2B"
|
||||
case 4:
|
||||
return "BCD"
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
type Client struct {
|
||||
host string
|
||||
port int
|
||||
password string // remote-access code; sent as "auth <code>" when the banner announces AUTH
|
||||
|
||||
mu sync.Mutex // serialises command send/recv on the connection
|
||||
conn net.Conn
|
||||
reader *bufio.Reader
|
||||
|
||||
statusMu sync.RWMutex
|
||||
status Status
|
||||
lastRaw string // last raw status payload — logged on change to map fields against real hardware
|
||||
|
||||
cmdID atomic.Int64
|
||||
stop chan struct{}
|
||||
running bool
|
||||
}
|
||||
|
||||
func New(host string, port int, password string) *Client {
|
||||
if port <= 0 || port > 65535 {
|
||||
port = DefaultPort
|
||||
}
|
||||
return &Client{
|
||||
host: host,
|
||||
port: port,
|
||||
password: strings.TrimSpace(password),
|
||||
stop: make(chan struct{}),
|
||||
status: Status{Host: host},
|
||||
}
|
||||
}
|
||||
|
||||
func (c *Client) Start() error {
|
||||
c.running = true
|
||||
go c.pollLoop()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Client) Stop() {
|
||||
if !c.running {
|
||||
return
|
||||
}
|
||||
c.running = false
|
||||
close(c.stop)
|
||||
c.mu.Lock()
|
||||
if c.conn != nil {
|
||||
c.conn.Close()
|
||||
c.conn = nil
|
||||
c.reader = nil
|
||||
}
|
||||
c.mu.Unlock()
|
||||
}
|
||||
|
||||
func (c *Client) GetStatus() Status {
|
||||
c.statusMu.RLock()
|
||||
defer c.statusMu.RUnlock()
|
||||
return c.status
|
||||
}
|
||||
|
||||
func (c *Client) setStatus(fn func(*Status)) {
|
||||
c.statusMu.Lock()
|
||||
fn(&c.status)
|
||||
c.statusMu.Unlock()
|
||||
}
|
||||
|
||||
// SetOperate puts the tuner in OPERATE (1) or STANDBY (0).
|
||||
func (c *Client) SetOperate(on bool) error {
|
||||
if _, err := c.command("operate set=" + boolNum(on)); err != nil {
|
||||
return err
|
||||
}
|
||||
c.setStatus(func(s *Status) { s.Operate = on }) // optimistic; the poll confirms
|
||||
return nil
|
||||
}
|
||||
|
||||
// SetBypass engages (1) or clears (0) the device's global bypass (antenna
|
||||
// connected straight through, tuner out of line).
|
||||
func (c *Client) SetBypass(on bool) error {
|
||||
if _, err := c.command("bypass set=" + boolNum(on)); err != nil {
|
||||
return err
|
||||
}
|
||||
c.setStatus(func(s *Status) { s.Bypass = on })
|
||||
return nil
|
||||
}
|
||||
|
||||
// Autotune starts an automatic tuning cycle on the active channel. The rig must
|
||||
// be keyed into a carrier for the tuner to measure SWR — the device asserts its
|
||||
// own PTT OUT if "tune PTT" is enabled in its setup.
|
||||
func (c *Client) Autotune() error {
|
||||
if _, err := c.command("autotune"); err != nil {
|
||||
return err
|
||||
}
|
||||
c.setStatus(func(s *Status) { s.Tuning = true }) // optimistic until the poll clears it
|
||||
return nil
|
||||
}
|
||||
|
||||
// Activate selects the active channel. On SO2R hardware ch is 1 (A) or 2 (B);
|
||||
// on the 3-way variant it selects the antenna (1/2/3).
|
||||
func (c *Client) Activate(ch int) error {
|
||||
if ch < 1 {
|
||||
return fmt.Errorf("tunergenius: invalid channel %d", ch)
|
||||
}
|
||||
key := "ch"
|
||||
if c.GetStatus().ThreeWay {
|
||||
key = "ant"
|
||||
}
|
||||
_, err := c.command(fmt.Sprintf("activate %s=%d", key, ch))
|
||||
return err
|
||||
}
|
||||
|
||||
func (c *Client) pollLoop() {
|
||||
t := time.NewTicker(pollEvery)
|
||||
defer t.Stop()
|
||||
// Outage bookkeeping. A dropped link used to be entirely silent: the poll just
|
||||
// set Connected=false and retried, so "did the tuner disconnect, or is the
|
||||
// meter simply reading a gap between syllables?" could not be answered from
|
||||
// the log. Now an outage logs once when it starts and once when it ends, with
|
||||
// how long it lasted.
|
||||
//
|
||||
// Once, not every retry: the poll comes round every 400 ms, and a tuner that
|
||||
// is switched off would otherwise bury the log. These are local to the one
|
||||
// goroutine that polls — ensureConnected has no other caller — so they need no
|
||||
// locking.
|
||||
var downSince time.Time
|
||||
for {
|
||||
select {
|
||||
case <-c.stop:
|
||||
return
|
||||
case <-t.C:
|
||||
fresh := false
|
||||
if c.needConnect() {
|
||||
if err := c.ensureConnected(); err != nil {
|
||||
if downSince.IsZero() {
|
||||
downSince = time.Now()
|
||||
applog.Printf("tunergenius: link DOWN — cannot reach %s:%d: %v (retrying)", c.host, c.port, err)
|
||||
}
|
||||
c.setStatus(func(s *Status) { s.Connected = false; s.LastError = "dial: " + err.Error() })
|
||||
continue
|
||||
}
|
||||
fresh = true
|
||||
if !downSince.IsZero() {
|
||||
applog.Printf("tunergenius: link RESTORED after %s down", time.Since(downSince).Round(time.Second))
|
||||
downSince = time.Time{}
|
||||
}
|
||||
}
|
||||
// One-shot on a fresh link: learn the hardware variant (3-way vs SO2R).
|
||||
if fresh {
|
||||
_, _ = c.command("info")
|
||||
}
|
||||
if _, err := c.command("status"); err != nil {
|
||||
if downSince.IsZero() {
|
||||
downSince = time.Now()
|
||||
applog.Printf("tunergenius: link DOWN — poll failed: %v", err)
|
||||
}
|
||||
c.dropConn()
|
||||
c.setStatus(func(s *Status) { s.Connected = false; s.LastError = err.Error() })
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// needConnect reports whether the TCP link is currently down (so the poll loop
|
||||
// knows a fresh connect + one-shot info query is needed).
|
||||
func (c *Client) needConnect() bool {
|
||||
c.mu.Lock()
|
||||
defer c.mu.Unlock()
|
||||
return c.conn == nil
|
||||
}
|
||||
|
||||
func (c *Client) ensureConnected() error {
|
||||
c.mu.Lock()
|
||||
defer c.mu.Unlock()
|
||||
if c.conn != nil {
|
||||
return nil
|
||||
}
|
||||
conn, err := net.DialTimeout("tcp", net.JoinHostPort(c.host, strconv.Itoa(c.port)), dialTimeout)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
c.conn = conn
|
||||
c.reader = bufio.NewReader(conn)
|
||||
// Banner: "V1.1.8" (LAN) or "V1.1.8 AUTH" (remote → authentication required).
|
||||
_ = conn.SetReadDeadline(time.Now().Add(ioTimeout))
|
||||
banner, _ := c.reader.ReadString('\n')
|
||||
banner = strings.TrimSpace(banner)
|
||||
applog.Printf("tunergenius: connected %s → %s, banner=%q", conn.LocalAddr(), conn.RemoteAddr(), banner)
|
||||
if strings.Contains(banner, "AUTH") {
|
||||
if c.password == "" {
|
||||
applog.Printf("tunergenius: device requires AUTH but no remote code set (Settings → Tuner Genius)")
|
||||
} else if err := c.authLocked(); err != nil {
|
||||
c.conn.Close()
|
||||
c.conn, c.reader = nil, nil
|
||||
return err
|
||||
}
|
||||
}
|
||||
c.setStatus(func(s *Status) { s.Connected = true; s.LastError = ""; s.Host = c.host })
|
||||
return nil
|
||||
}
|
||||
|
||||
// authLocked sends "auth <code>" and checks the reply. Must be called with c.mu
|
||||
// held (during ensureConnected). Note the device replies R<seq>|0|... for BOTH
|
||||
// success ("auth OK") and failure ("Unauthorized"), so the message text — not
|
||||
// the response code — decides.
|
||||
func (c *Client) authLocked() error {
|
||||
id := c.cmdID.Add(1)
|
||||
_ = c.conn.SetWriteDeadline(time.Now().Add(ioTimeout))
|
||||
if _, err := fmt.Fprintf(c.conn, "C%d|auth %s\n", id, c.password); err != nil {
|
||||
return err
|
||||
}
|
||||
_ = c.conn.SetReadDeadline(time.Now().Add(ioTimeout))
|
||||
line, err := c.reader.ReadString('\n')
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
line = strings.TrimSpace(line)
|
||||
if strings.Contains(strings.ToLower(line), "unauthorized") {
|
||||
return fmt.Errorf("tunergenius: authentication failed — check the remote code")
|
||||
}
|
||||
applog.Printf("tunergenius: authenticated")
|
||||
return nil
|
||||
}
|
||||
|
||||
// command sends "C<id>|<cmd>\n" and returns the matching reply line, updating
|
||||
// the status snapshot from whatever status/message lines arrive. Unsolicited
|
||||
// "M|" info lines that precede the reply are consumed (they update Message).
|
||||
func (c *Client) command(cmd string) (string, error) {
|
||||
c.mu.Lock()
|
||||
defer c.mu.Unlock()
|
||||
if c.conn == nil || c.reader == nil {
|
||||
return "", fmt.Errorf("tunergenius: not connected")
|
||||
}
|
||||
id := c.cmdID.Add(1)
|
||||
_ = c.conn.SetWriteDeadline(time.Now().Add(ioTimeout))
|
||||
if _, err := fmt.Fprintf(c.conn, "C%d|%s\n", id, cmd); err != nil {
|
||||
return "", err
|
||||
}
|
||||
// Read until the command's reply (R…/S…); consume async M| lines along the way.
|
||||
for i := 0; i < 8; i++ {
|
||||
_ = c.conn.SetReadDeadline(time.Now().Add(ioTimeout))
|
||||
line, err := c.reader.ReadString('\n')
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
line = strings.TrimSpace(line)
|
||||
if line == "" {
|
||||
continue
|
||||
}
|
||||
c.parse(line)
|
||||
if line[0] == 'R' || line[0] == 'S' {
|
||||
return line, nil
|
||||
}
|
||||
}
|
||||
return "", fmt.Errorf("tunergenius: no reply to %q", cmd)
|
||||
}
|
||||
|
||||
func (c *Client) dropConn() {
|
||||
c.mu.Lock()
|
||||
if c.conn != nil {
|
||||
c.conn.Close()
|
||||
c.conn = nil
|
||||
c.reader = nil
|
||||
}
|
||||
c.mu.Unlock()
|
||||
}
|
||||
|
||||
// parse handles the three line shapes: "R<id>|<code>|<msg>", "S<id>|status …"
|
||||
// and "M|<message>".
|
||||
func (c *Client) parse(resp string) {
|
||||
// Async info/warning: "M|<message>" (empty message = cleared).
|
||||
if strings.HasPrefix(resp, "M|") {
|
||||
msg := strings.TrimSpace(strings.TrimPrefix(resp, "M|"))
|
||||
c.setStatus(func(s *Status) { s.Message = msg })
|
||||
return
|
||||
}
|
||||
var data string
|
||||
switch {
|
||||
case strings.HasPrefix(resp, "R"):
|
||||
p := strings.SplitN(resp, "|", 3)
|
||||
if len(p) < 3 {
|
||||
return
|
||||
}
|
||||
data = p[2]
|
||||
case strings.HasPrefix(resp, "S"):
|
||||
p := strings.SplitN(resp, "|", 2)
|
||||
if len(p) < 2 {
|
||||
return
|
||||
}
|
||||
data = p[1]
|
||||
default:
|
||||
return
|
||||
}
|
||||
// "info …" carries the hardware variant (3way=1 on the 3-way model, absent on
|
||||
// SO2R) — parsed once so the UI knows whether channels are A/B or antennas.
|
||||
if strings.HasPrefix(data, "info") {
|
||||
tw := strings.Contains(data, "3way=1")
|
||||
c.statusMu.Lock()
|
||||
c.status.ThreeWay = tw
|
||||
c.statusMu.Unlock()
|
||||
return
|
||||
}
|
||||
// Only the "status …" payload carries the live state we render.
|
||||
if !strings.HasPrefix(data, "status") {
|
||||
return
|
||||
}
|
||||
if data != c.lastRaw {
|
||||
c.lastRaw = data
|
||||
applog.Printf("tunergenius: status raw=%q", data)
|
||||
}
|
||||
c.applyStatus(data)
|
||||
}
|
||||
|
||||
// applyStatus maps the "status k=v …" fields onto the snapshot, filling both
|
||||
// channels (A/B) plus the global power/SWR and operating state.
|
||||
func (c *Client) applyStatus(data string) {
|
||||
kv := map[string]string{}
|
||||
for _, tok := range strings.Fields(data) {
|
||||
if p := strings.SplitN(tok, "=", 2); len(p) == 2 {
|
||||
kv[p[0]] = p[1]
|
||||
}
|
||||
}
|
||||
active := atoiDefault(kv["active"], 1)
|
||||
|
||||
c.statusMu.Lock()
|
||||
defer c.statusMu.Unlock()
|
||||
c.status.Connected = true
|
||||
c.status.LastError = ""
|
||||
c.status.Active = active
|
||||
c.status.Operate = kv["state"] == "1"
|
||||
c.status.Bypass = kv["bypass"] == "1"
|
||||
c.status.Tuning = kv["tuning"] == "1"
|
||||
c.status.RelayC1 = atoiDefault(kv["relayC1"], 0)
|
||||
c.status.RelayL = atoiDefault(kv["relayL"], 0)
|
||||
c.status.RelayC2 = atoiDefault(kv["relayC2"], 0)
|
||||
|
||||
if v, ok := parseFloat(kv["fwd"]); ok {
|
||||
c.status.FwdDbm = v
|
||||
c.status.FwdW = dbmToWatts(v)
|
||||
}
|
||||
if v, ok := parseFloat(kv["swr"]); ok {
|
||||
c.status.SwrDb = v
|
||||
c.status.Vswr = returnLossToVswr(v)
|
||||
}
|
||||
|
||||
c.status.A = channelFrom(kv, "A")
|
||||
c.status.B = channelFrom(kv, "B")
|
||||
|
||||
// Mirror the active channel into the flat fields the compact widget uses.
|
||||
act := c.status.A
|
||||
if active == 2 {
|
||||
act = c.status.B
|
||||
}
|
||||
c.status.FreqMHz = act.FreqMHz
|
||||
c.status.Antenna = act.Antenna
|
||||
}
|
||||
|
||||
// channelFrom extracts one channel's fields (suffix "A" or "B") from the parsed
|
||||
// status map.
|
||||
func channelFrom(kv map[string]string, suffix string) Channel {
|
||||
mode := atoiDefault(kv["mode"+suffix], 0)
|
||||
freq, _ := parseFloat(kv["freq"+suffix])
|
||||
return Channel{
|
||||
PTT: kv["ptt"+suffix] == "1",
|
||||
Band: atoiDefault(kv["band"+suffix], 0),
|
||||
Mode: mode,
|
||||
ModeStr: modeName(mode),
|
||||
Flex: strings.TrimSpace(kv["flex"+suffix]),
|
||||
FreqMHz: freq,
|
||||
Bypass: kv["bypass"+suffix] == "1",
|
||||
Antenna: atoiDefault(kv["ant"+suffix], 0),
|
||||
}
|
||||
}
|
||||
|
||||
func boolNum(on bool) string {
|
||||
if on {
|
||||
return "1"
|
||||
}
|
||||
return "0"
|
||||
}
|
||||
|
||||
func atoiDefault(s string, def int) int {
|
||||
if n, err := strconv.Atoi(strings.TrimSpace(s)); err == nil {
|
||||
return n
|
||||
}
|
||||
return def
|
||||
}
|
||||
|
||||
func parseFloat(s string) (float64, bool) {
|
||||
if s == "" {
|
||||
return 0, false
|
||||
}
|
||||
v, err := strconv.ParseFloat(strings.TrimSpace(s), 64)
|
||||
return v, err == nil
|
||||
}
|
||||
|
||||
// dbmToWatts converts a power reading in dBm to watts (0 dBm = 1 mW).
|
||||
func dbmToWatts(dbm float64) float64 {
|
||||
return math.Pow(10, (dbm-30)/10)
|
||||
}
|
||||
|
||||
// returnLossToVswr converts the device's "swr" field — a return loss in dB,
|
||||
// reported as a negative number (e.g. -60 = an excellent 60 dB match) — into a
|
||||
// conventional VSWR ratio. A near-zero return loss (bad match) yields a large
|
||||
// VSWR; a large negative one yields ~1.0.
|
||||
func returnLossToVswr(swrDb float64) float64 {
|
||||
rl := math.Abs(swrDb)
|
||||
rho := math.Pow(10, -rl/20) // reflection coefficient magnitude
|
||||
if rho >= 1 {
|
||||
return 99.9
|
||||
}
|
||||
vswr := (1 + rho) / (1 - rho)
|
||||
if vswr > 99.9 || math.IsInf(vswr, 0) || math.IsNaN(vswr) {
|
||||
return 99.9
|
||||
}
|
||||
return vswr
|
||||
}
|
||||
+145
-2
@@ -27,10 +27,13 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"math"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"sort"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
@@ -46,6 +49,14 @@ var errFCCMaintenance = errors.New("fcc uls under maintenance")
|
||||
const (
|
||||
fccAmateurURL = "https://data.fcc.gov/download/pub/uls/complete/l_amat.zip"
|
||||
geoNamesURL = "https://download.geonames.org/export/zip/US.zip"
|
||||
|
||||
// fccULSDir is the parent listing the weekly files live under. It is browsed
|
||||
// to recover from the FCC moving the file — see resolveFCCAmateurURL.
|
||||
fccULSDir = "https://data.fcc.gov/download/pub/uls/"
|
||||
|
||||
// fccAmateurFile is the weekly full-database filename, constant across the
|
||||
// FCC's directory reshuffles.
|
||||
fccAmateurFile = "l_amat.zip"
|
||||
)
|
||||
|
||||
// Location is a resolved callsign's home county + grid.
|
||||
@@ -170,10 +181,19 @@ func (s *Store) Import(ctx context.Context, tmpDir string, prog Progress) error
|
||||
return fmt.Errorf("GeoNames crosswalk is empty")
|
||||
}
|
||||
|
||||
// 2) FCC ULS full amateur database (large).
|
||||
// 2) FCC ULS full amateur database (large). The address is resolved rather
|
||||
// than assumed — the FCC moves this file between directories.
|
||||
prog("Locating FCC ULS database", 0)
|
||||
amatURL, err := resolveFCCAmateurURL(ctx)
|
||||
if err != nil {
|
||||
return err // already a user-facing explanation
|
||||
}
|
||||
if amatURL != fccAmateurURL {
|
||||
log.Printf("uls: FCC weekly file not at its usual address, using %s", amatURL)
|
||||
}
|
||||
prog("Downloading FCC ULS database", 0)
|
||||
amatPath := filepath.Join(tmpDir, "opslog_l_amat.zip")
|
||||
if err := download(ctx, fccAmateurURL, amatPath, func(pct int) { prog("Downloading FCC ULS database", pct) }); err != nil {
|
||||
if err := download(ctx, amatURL, amatPath, func(pct int) { prog("Downloading FCC ULS database", pct) }); err != nil {
|
||||
return fmt.Errorf("download FCC ULS: %w", err)
|
||||
}
|
||||
defer os.Remove(amatPath)
|
||||
@@ -323,6 +343,129 @@ func parseGeoNames(zipPath string) (map[string]zipRow, error) {
|
||||
return out, sc.Err()
|
||||
}
|
||||
|
||||
// resolveFCCAmateurURL returns a URL that actually serves the weekly amateur
|
||||
// database, working around the FCC relocating it.
|
||||
//
|
||||
// The canonical path is .../uls/complete/l_amat.zip and it is tried first. On
|
||||
// 2026-07-24 the FCC renamed that whole directory to "complete.07242026" and
|
||||
// left an empty "complete" behind, so every weekly file for every radio service
|
||||
// (not just amateur) started redirecting to a generic fcc.gov help page — the
|
||||
// county database became un-downloadable for everyone. The file itself was
|
||||
// intact the whole time, one directory across.
|
||||
//
|
||||
// Rather than hard-code that dated directory — it looks like a pre-migration
|
||||
// snapshot, and pinning it would break again the moment the FCC restores or
|
||||
// re-snapshots — we browse the parent listing and pick the most recent
|
||||
// "complete*" directory that actually holds the file. That survives the
|
||||
// canonical path coming back (tried first, so it wins), a differently-dated
|
||||
// snapshot next time, and anything else short of the file being withdrawn.
|
||||
func resolveFCCAmateurURL(ctx context.Context) (string, error) {
|
||||
if ok, _ := servesFile(ctx, fccAmateurURL); ok {
|
||||
return fccAmateurURL, nil
|
||||
}
|
||||
dirs, err := listFCCCompleteDirs(ctx)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("the FCC weekly download moved and the directory listing could not be read (%w) — try again later, or check %s", err, fccULSDir)
|
||||
}
|
||||
// Newest first: the listing is alphabetical, and the dated names sort in an
|
||||
// arbitrary order (MMDDYYYY), so try them all rather than trusting the order.
|
||||
for _, d := range dirs {
|
||||
u := fccULSDir + d + fccAmateurFile
|
||||
if ok, _ := servesFile(ctx, u); ok {
|
||||
return u, nil
|
||||
}
|
||||
}
|
||||
return "", fmt.Errorf("the FCC no longer serves %s at its usual address, and no alternate directory under %s has it either — the FCC has changed its downloads; please report this", fccAmateurFile, fccULSDir)
|
||||
}
|
||||
|
||||
// servesFile reports whether url returns a real file rather than a redirect to
|
||||
// an HTML error page. The FCC answers a missing file with 302 → a help page, so
|
||||
// a plain status check on the final response is not enough: we must refuse to
|
||||
// follow the bounce and insist on a non-HTML body.
|
||||
func servesFile(ctx context.Context, url string) (bool, error) {
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodHead, url, nil)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
client := &http.Client{
|
||||
Timeout: 30 * time.Second,
|
||||
CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse },
|
||||
}
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return false, fmt.Errorf("HTTP %d", resp.StatusCode)
|
||||
}
|
||||
if ct := resp.Header.Get("Content-Type"); strings.Contains(strings.ToLower(ct), "html") {
|
||||
return false, fmt.Errorf("served HTML, not a file")
|
||||
}
|
||||
return true, nil
|
||||
}
|
||||
|
||||
// listFCCCompleteDirs returns the "complete*/" subdirectory names in the ULS
|
||||
// download area (e.g. "complete/", "complete.07242026/"), newest-looking last.
|
||||
func listFCCCompleteDirs(ctx context.Context) ([]string, error) {
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, fccULSDir, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
client := &http.Client{Timeout: 30 * time.Second}
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return nil, fmt.Errorf("HTTP %d", resp.StatusCode)
|
||||
}
|
||||
body, err := io.ReadAll(io.LimitReader(resp.Body, 1<<20))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return parseCompleteDirs(string(body)), nil
|
||||
}
|
||||
|
||||
// completeDirRe matches an Apache-style listing link to a "complete…" directory.
|
||||
var completeDirRe = regexp.MustCompile(`(?i)href="(complete[^"/]*/)"`)
|
||||
|
||||
// parseCompleteDirs pulls the candidate directory names out of a listing page.
|
||||
// Split out from the fetch so it can be tested against a captured listing.
|
||||
func parseCompleteDirs(html string) []string {
|
||||
seen := map[string]bool{}
|
||||
var out []string
|
||||
for _, m := range completeDirRe.FindAllStringSubmatch(html, -1) {
|
||||
d := m[1]
|
||||
if d == "complete/" || seen[d] { // canonical path was already tried
|
||||
continue
|
||||
}
|
||||
seen[d] = true
|
||||
out = append(out, d)
|
||||
}
|
||||
// Dated snapshots (complete.MMDDYYYY) — prefer the most recent by date, so a
|
||||
// stale older snapshot is never picked over a fresh one.
|
||||
sort.Slice(out, func(i, j int) bool { return snapshotDate(out[i]).After(snapshotDate(out[j])) })
|
||||
return out
|
||||
}
|
||||
|
||||
var snapshotDateRe = regexp.MustCompile(`(\d{8})`)
|
||||
|
||||
// snapshotDate extracts the MMDDYYYY stamp from "complete.07242026/"; a name
|
||||
// without one sorts as the zero time (tried last).
|
||||
func snapshotDate(dir string) time.Time {
|
||||
m := snapshotDateRe.FindStringSubmatch(dir)
|
||||
if m == nil {
|
||||
return time.Time{}
|
||||
}
|
||||
t, err := time.Parse("01022006", m[1])
|
||||
if err != nil {
|
||||
return time.Time{}
|
||||
}
|
||||
return t
|
||||
}
|
||||
|
||||
// download streams url to dest, reporting percent when the content length is
|
||||
// known and prog is non-nil.
|
||||
func download(ctx context.Context, url, dest string, prog func(pct int)) error {
|
||||
|
||||
@@ -12,7 +12,7 @@ func TestGrid6(t *testing.T) {
|
||||
}{
|
||||
{38.90, -77.03, "FM18lw"}, // Washington DC
|
||||
{40.71, -74.00, "FN30xr"}, // New York
|
||||
{34.05, -118.24, "DM04vd"},// Los Angeles
|
||||
{34.05, -118.24, "DM04vd"}, // Los Angeles
|
||||
}
|
||||
for _, c := range cases {
|
||||
if got := grid6(c.lat, c.lon); got[:4] != c.want[:4] {
|
||||
@@ -40,3 +40,57 @@ func TestParseGeoNames(t *testing.T) {
|
||||
t.Errorf("ZIP 20500 = %+v (ok=%v)", r, ok)
|
||||
}
|
||||
}
|
||||
|
||||
// The real listing captured from data.fcc.gov on 2026-07-25, the day after the
|
||||
// FCC renamed complete/ to complete.07242026/ and left an empty complete/
|
||||
// behind — which broke the county-database download for every user.
|
||||
const fccListing2026 = `<html><head><title>Index of /download/pub/uls</title></head><body>
|
||||
<h1>Index of /download/pub/uls</h1>
|
||||
<table><tr><th>Name</th><th>Last modified</th><th>Size</th></tr>
|
||||
<tr><td><a href="/download/pub/">Parent Directory</a></td><td> </td><td>-</td></tr>
|
||||
<tr><td><a href="UAT/">UAT/</a></td><td>2025-04-08 19:30</td><td>-</td></tr>
|
||||
<tr><td><a href="complete.07242026/">complete.07242026/</a></td><td>2026-07-24 20:15</td><td>-</td></tr>
|
||||
<tr><td><a href="complete/">complete/</a></td><td>2026-07-25 21:15</td><td>-</td></tr>
|
||||
<tr><td><a href="daily/">daily/</a></td><td>2026-07-25 21:15</td><td>-</td></tr>
|
||||
</table></body></html>`
|
||||
|
||||
func TestParseCompleteDirs(t *testing.T) {
|
||||
got := parseCompleteDirs(fccListing2026)
|
||||
if len(got) != 1 || got[0] != "complete.07242026/" {
|
||||
t.Fatalf("got %v, want [complete.07242026/]", got)
|
||||
}
|
||||
// "complete/" is deliberately absent: it is the canonical URL, already tried
|
||||
// before the listing is consulted, and on this date it was empty.
|
||||
for _, d := range got {
|
||||
if d == "complete/" {
|
||||
t.Error("canonical complete/ should not be offered as a fallback")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Several snapshots must be tried newest-first, so a stale one is never
|
||||
// preferred over a fresh one.
|
||||
func TestParseCompleteDirsPrefersNewestSnapshot(t *testing.T) {
|
||||
html := `<a href="complete/">x</a><a href="complete.01052026/">x</a>` +
|
||||
`<a href="complete.07242026/">x</a><a href="complete.11302025/">x</a>`
|
||||
got := parseCompleteDirs(html)
|
||||
want := []string{"complete.07242026/", "complete.01052026/", "complete.11302025/"}
|
||||
if len(got) != len(want) {
|
||||
t.Fatalf("got %v, want %v", got, want)
|
||||
}
|
||||
for i := range want {
|
||||
if got[i] != want[i] {
|
||||
t.Fatalf("got %v, want %v", got, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestSnapshotDate(t *testing.T) {
|
||||
if d := snapshotDate("complete.07242026/"); d.Format("2006-01-02") != "2026-07-24" {
|
||||
t.Errorf("complete.07242026/ → %s, want 2026-07-24", d.Format("2006-01-02"))
|
||||
}
|
||||
// An undated name must sort last rather than crash.
|
||||
if !snapshotDate("complete.backup/").IsZero() {
|
||||
t.Error("an undated directory should yield the zero time")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
//go:build !windows
|
||||
|
||||
package winkeyer
|
||||
|
||||
// linectl_other.go — non-Windows DTR/RTS line control via go.bug.st/serial. On
|
||||
// Linux/macOS the SetDTR/SetRTS ioctls control the lines independently, so the
|
||||
// CP210x-on-Windows problem that motivated the native path (see linectl_windows.go)
|
||||
// doesn't apply. OpsLog ships on Windows; this keeps the package building elsewhere.
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"go.bug.st/serial"
|
||||
)
|
||||
|
||||
type serialLineCtl struct {
|
||||
port serial.Port
|
||||
}
|
||||
|
||||
func openLineCtl(port string) (lineCtl, error) {
|
||||
if strings.TrimSpace(port) == "" {
|
||||
return nil, fmt.Errorf("no serial port")
|
||||
}
|
||||
p, err := serial.Open(port, &serial.Mode{BaudRate: 9600, DataBits: 8, Parity: serial.NoParity, StopBits: serial.OneStopBit})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("open %s: %w", port, err)
|
||||
}
|
||||
c := &serialLineCtl{port: p}
|
||||
_ = c.setDTR(false)
|
||||
_ = c.setRTS(false)
|
||||
return c, nil
|
||||
}
|
||||
|
||||
func (c *serialLineCtl) setDTR(on bool) error { return c.port.SetDTR(on) }
|
||||
func (c *serialLineCtl) setRTS(on bool) error { return c.port.SetRTS(on) }
|
||||
func (c *serialLineCtl) close() error { return c.port.Close() }
|
||||
@@ -0,0 +1,81 @@
|
||||
//go:build windows
|
||||
|
||||
package winkeyer
|
||||
|
||||
// linectl_windows.go — DTR/RTS line control via EscapeCommFunction, the direct
|
||||
// Win32 method N1MM/WSJT/fldigi use. It sets ONE line at a time without a
|
||||
// GetCommState/SetCommState round-trip, so a held RTS (PTT) is NOT disturbed when
|
||||
// DTR (CW) is toggled. go.bug.st/serial drives the lines via SetCommState, which
|
||||
// on USB-serial adapters (the SCU-17's CP210x, FTDI) drops the held RTS the moment
|
||||
// DTR changes — the "rig drops to RX between words" bug this fixes.
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"golang.org/x/sys/windows"
|
||||
)
|
||||
|
||||
type winLineCtl struct {
|
||||
h windows.Handle
|
||||
}
|
||||
|
||||
// openLineCtl opens a COM port for line control only (no data I/O).
|
||||
func openLineCtl(port string) (lineCtl, error) {
|
||||
name := strings.TrimSpace(port)
|
||||
if name == "" {
|
||||
return nil, fmt.Errorf("no serial port")
|
||||
}
|
||||
// The \\.\ prefix is required for COM10+ and harmless for COM1-9.
|
||||
if !strings.HasPrefix(name, `\\.\`) {
|
||||
name = `\\.\` + name
|
||||
}
|
||||
p, err := windows.UTF16PtrFromString(name)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
h, err := windows.CreateFile(p,
|
||||
windows.GENERIC_READ|windows.GENERIC_WRITE, 0, nil,
|
||||
windows.OPEN_EXISTING, 0, 0)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("open %s: %w", port, err)
|
||||
}
|
||||
// A minimal DCB so the driver is in a sane state. Baud is irrelevant for pure
|
||||
// line control, but leaving fDtr/fRtsControl at DISABLE means only our explicit
|
||||
// EscapeCommFunction calls drive the lines.
|
||||
var dcb windows.DCB
|
||||
if windows.GetCommState(h, &dcb) == nil {
|
||||
dcb.BaudRate = 9600
|
||||
dcb.ByteSize = 8
|
||||
dcb.Parity = 0 // NOPARITY
|
||||
dcb.StopBits = 0 // ONESTOPBIT
|
||||
// Clear DTR (bits 4-5) and RTS (bits 12-13) control fields → DISABLE, so the
|
||||
// lines idle low until we assert them, and no hardware flow control fights us.
|
||||
dcb.Flags &^= 0x00000030
|
||||
dcb.Flags &^= 0x00003000
|
||||
_ = windows.SetCommState(h, &dcb)
|
||||
}
|
||||
c := &winLineCtl{h: h}
|
||||
// Start both lines low (inactive) — the keyer's idle() will do this too.
|
||||
_ = c.setDTR(false)
|
||||
_ = c.setRTS(false)
|
||||
return c, nil
|
||||
}
|
||||
|
||||
func (c *winLineCtl) setDTR(on bool) error {
|
||||
f := uint32(windows.CLRDTR)
|
||||
if on {
|
||||
f = windows.SETDTR
|
||||
}
|
||||
return windows.EscapeCommFunction(c.h, f)
|
||||
}
|
||||
|
||||
func (c *winLineCtl) setRTS(on bool) error {
|
||||
f := uint32(windows.CLRRTS)
|
||||
if on {
|
||||
f = windows.SETRTS
|
||||
}
|
||||
return windows.EscapeCommFunction(c.h, f)
|
||||
}
|
||||
|
||||
func (c *winLineCtl) close() error { return windows.CloseHandle(c.h) }
|
||||
@@ -0,0 +1,326 @@
|
||||
package winkeyer
|
||||
|
||||
// serialcw.go — CW keying by toggling a serial control line, the "hardware CW
|
||||
// keying" method N1MM / WSJT / fldigi use with a Yaesu SCU-17 and similar
|
||||
// interfaces (DTR = CW key, RTS = PTT). No K1EL WinKeyer chip involved: the PC
|
||||
// bit-bangs the Morse itself on the DTR (or RTS) line at the configured WPM.
|
||||
//
|
||||
// A single worker goroutine consumes queued text and keys it element by element,
|
||||
// so Send returns immediately (like the WinKeyer's buffered send) and Stop can
|
||||
// abort mid-message. Speed changes apply live between characters. PTT (when
|
||||
// enabled) is asserted on the OTHER line for the whole transmission plus a
|
||||
// lead-in / tail, and held through a short hang so send-on-type doesn't chatter.
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
"hamlog/internal/applog"
|
||||
)
|
||||
|
||||
// lineCtl drives a serial port's DTR and RTS control lines. On Windows it uses
|
||||
// EscapeCommFunction (SETDTR/CLRDTR/SETRTS/CLRRTS) — the direct method N1MM/WSJT
|
||||
// use, reliable on USB-serial adapters (CP210x/FTDI). go.bug.st/serial drives the
|
||||
// lines via SetCommState instead, which on a CP210x drops the held RTS (PTT) as
|
||||
// soon as DTR (CW) is toggled — the "rig drops to RX between words" bug. See
|
||||
// linectl_windows.go / linectl_other.go.
|
||||
type lineCtl interface {
|
||||
setDTR(on bool) error
|
||||
setRTS(on bool) error
|
||||
close() error
|
||||
}
|
||||
|
||||
// morseTable maps a keyable character to its Morse element string (. = dit,
|
||||
// - = dah). Mirrors winkeyer.allowedCW.
|
||||
var morseTable = map[rune]string{
|
||||
'A': ".-", 'B': "-...", 'C': "-.-.", 'D': "-..", 'E': ".", 'F': "..-.",
|
||||
'G': "--.", 'H': "....", 'I': "..", 'J': ".---", 'K': "-.-", 'L': ".-..",
|
||||
'M': "--", 'N': "-.", 'O': "---", 'P': ".--.", 'Q': "--.-", 'R': ".-.",
|
||||
'S': "...", 'T': "-", 'U': "..-", 'V': "...-", 'W': ".--", 'X': "-..-",
|
||||
'Y': "-.--", 'Z': "--..",
|
||||
'0': "-----", '1': ".----", '2': "..---", '3': "...--", '4': "....-",
|
||||
'5': ".....", '6': "-....", '7': "--...", '8': "---..", '9': "----.",
|
||||
'.': ".-.-.-", ',': "--..--", '?': "..--..", '/': "-..-.", '=': "-...-",
|
||||
'+': ".-.-.", '-': "-....-", ':': "---...", '(': "-.--.", ')': "-.--.-",
|
||||
';': "-.-.-.", '"': ".-..-.", '\'': ".----.", '@': ".--.-.",
|
||||
}
|
||||
|
||||
// serialKeyer bit-bangs CW on a serial control line. Owned by a winkeyer.Manager
|
||||
// while Type == "serial"; all keying happens in run(). The line-control options
|
||||
// (key line, invert, PTT, lead/tail) are atomic so ApplyConfig can update them
|
||||
// LIVE — e.g. ticking "Key PTT line" takes effect without reconnecting the keyer.
|
||||
type serialKeyer struct {
|
||||
line lineCtl
|
||||
keyDTR atomic.Bool // true: CW on DTR, PTT on RTS (N1MM default). false: swapped.
|
||||
invert atomic.Bool // true: active-LOW — asserting a line means driving it LOW
|
||||
usePTT atomic.Bool // hold the PTT line for the whole transmission
|
||||
leadMs atomic.Int32 // PTT lead-in
|
||||
tailMs atomic.Int32 // PTT hold (hang) after the last element
|
||||
onBusy func(bool)
|
||||
|
||||
mu sync.Mutex
|
||||
wpm int
|
||||
farns int
|
||||
abort chan struct{} // recreated by Stop; keying aborts when it closes
|
||||
|
||||
in chan string
|
||||
stop chan struct{}
|
||||
done chan struct{}
|
||||
}
|
||||
|
||||
func newSerialKeyer(line lineCtl, cfg Config, onBusy func(bool)) *serialKeyer {
|
||||
k := &serialKeyer{
|
||||
line: line,
|
||||
onBusy: onBusy,
|
||||
wpm: cfg.WPM,
|
||||
farns: cfg.Farnsworth,
|
||||
abort: make(chan struct{}),
|
||||
in: make(chan string, 256),
|
||||
stop: make(chan struct{}),
|
||||
done: make(chan struct{}),
|
||||
}
|
||||
k.keyDTR.Store(!strings.EqualFold(strings.TrimSpace(cfg.CWKeyLine), "rts")) // default DTR=CW
|
||||
k.invert.Store(cfg.CWInvert)
|
||||
k.usePTT.Store(cfg.UsePTT)
|
||||
k.leadMs.Store(int32(cfg.LeadInMs))
|
||||
k.tailMs.Store(int32(cfg.TailMs))
|
||||
k.idle() // start inactive: key up, PTT off
|
||||
go k.run()
|
||||
return k
|
||||
}
|
||||
|
||||
// ApplyConfig live-updates the line-control options (no port reopen), so a
|
||||
// settings change is felt from the next character without a reconnect. Speed and
|
||||
// Farnsworth are updated too. keyText re-reads these per element.
|
||||
func (k *serialKeyer) ApplyConfig(cfg Config) {
|
||||
k.keyDTR.Store(!strings.EqualFold(strings.TrimSpace(cfg.CWKeyLine), "rts"))
|
||||
k.invert.Store(cfg.CWInvert)
|
||||
k.usePTT.Store(cfg.UsePTT)
|
||||
k.leadMs.Store(int32(cfg.LeadInMs))
|
||||
k.tailMs.Store(int32(cfg.TailMs))
|
||||
k.mu.Lock()
|
||||
k.wpm = cfg.WPM
|
||||
k.farns = cfg.Farnsworth
|
||||
k.mu.Unlock()
|
||||
k.idle() // re-assert idle lines with any new polarity/key-line choice
|
||||
}
|
||||
|
||||
// level maps a logical "active" state to the physical line level, honouring the
|
||||
// invert (active-LOW) option: normally active = HIGH, inverted active = LOW.
|
||||
func (k *serialKeyer) level(active bool) bool { return active != k.invert.Load() }
|
||||
|
||||
// setKey raises/lowers the CW key line; setPTT the PTT line (only when enabled).
|
||||
func (k *serialKeyer) setKey(down bool) {
|
||||
if k.keyDTR.Load() {
|
||||
_ = k.line.setDTR(k.level(down))
|
||||
} else {
|
||||
_ = k.line.setRTS(k.level(down))
|
||||
}
|
||||
}
|
||||
func (k *serialKeyer) setPTT(on bool) {
|
||||
if !k.usePTT.Load() {
|
||||
return
|
||||
}
|
||||
if k.keyDTR.Load() {
|
||||
_ = k.line.setRTS(k.level(on))
|
||||
} else {
|
||||
_ = k.line.setDTR(k.level(on))
|
||||
}
|
||||
}
|
||||
|
||||
// idle drives BOTH lines to their inactive level (key up, PTT off), respecting
|
||||
// the invert option — so an active-LOW interface isn't left keyed at rest.
|
||||
func (k *serialKeyer) idle() {
|
||||
_ = k.line.setDTR(k.level(false))
|
||||
_ = k.line.setRTS(k.level(false))
|
||||
}
|
||||
|
||||
// SetSpeed / Send / Stop mirror the WinKeyer manager's control surface.
|
||||
func (k *serialKeyer) SetSpeed(wpm int) {
|
||||
k.mu.Lock()
|
||||
k.wpm = wpm
|
||||
k.mu.Unlock()
|
||||
}
|
||||
|
||||
func (k *serialKeyer) Send(text string) {
|
||||
select {
|
||||
case k.in <- text:
|
||||
default: // queue full (pathological) — drop rather than block the app binding
|
||||
}
|
||||
}
|
||||
|
||||
// Stop aborts the character being keyed and flushes anything queued.
|
||||
func (k *serialKeyer) Stop() {
|
||||
k.mu.Lock()
|
||||
close(k.abort)
|
||||
k.abort = make(chan struct{})
|
||||
k.mu.Unlock()
|
||||
for drained := false; !drained; {
|
||||
select {
|
||||
case <-k.in:
|
||||
default:
|
||||
drained = true
|
||||
}
|
||||
}
|
||||
k.setKey(false)
|
||||
}
|
||||
|
||||
func (k *serialKeyer) Close() {
|
||||
close(k.stop)
|
||||
<-k.done
|
||||
_ = k.line.close()
|
||||
}
|
||||
|
||||
func (k *serialKeyer) run() {
|
||||
defer close(k.done)
|
||||
defer k.idle()
|
||||
for {
|
||||
select {
|
||||
case <-k.stop:
|
||||
return
|
||||
case s := <-k.in:
|
||||
k.onBusy(true)
|
||||
// Diagnostic: confirms whether PTT is actually held for the whole macro
|
||||
// (a rig dropping to RX between words = usePTT off, or the interface's
|
||||
// PTT line isn't wired / honoured in CW).
|
||||
applog.Printf("winkeyer serial: TX %.40q ptt=%v line=%s lead=%dms tail=%dms",
|
||||
s, k.usePTT.Load(), map[bool]string{true: "DTR-CW/RTS-PTT", false: "RTS-CW/DTR-PTT"}[k.keyDTR.Load()],
|
||||
k.leadMs.Load(), k.tailMs.Load())
|
||||
k.setPTT(true)
|
||||
k.sleep(time.Duration(k.leadMs.Load()) * time.Millisecond)
|
||||
k.keyText(s)
|
||||
hang := time.Duration(k.tailMs.Load()) * time.Millisecond
|
||||
if hang <= 0 {
|
||||
hang = 5 * time.Millisecond
|
||||
}
|
||||
hold: // hold PTT briefly so back-to-back sends (send-on-type) don't chatter
|
||||
for {
|
||||
select {
|
||||
case <-k.stop:
|
||||
k.idle()
|
||||
k.onBusy(false)
|
||||
return
|
||||
case s2 := <-k.in:
|
||||
k.keyText(s2)
|
||||
case <-time.After(hang):
|
||||
break hold
|
||||
}
|
||||
}
|
||||
k.setPTT(false)
|
||||
k.onBusy(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// keyText keys one string. Element gaps use the character speed (WPM); the
|
||||
// inter-character (3-unit) and inter-word (7-unit) gaps use the Farnsworth speed
|
||||
// when one is set, so slow-copy CW keeps full-speed characters with wider spacing.
|
||||
func (k *serialKeyer) keyText(s string) {
|
||||
k.mu.Lock()
|
||||
abort := k.abort
|
||||
k.mu.Unlock()
|
||||
for _, r := range strings.ToUpper(s) {
|
||||
select {
|
||||
case <-abort:
|
||||
k.setKey(false)
|
||||
return
|
||||
case <-k.stop:
|
||||
k.setKey(false)
|
||||
return
|
||||
default:
|
||||
}
|
||||
ditW, ditF := k.dits()
|
||||
if r == ' ' {
|
||||
// Word gap: 7 units total. A 3-unit inter-char gap was already emitted
|
||||
// after the previous character, so add 4 more.
|
||||
if !k.gap(4*ditF, abort) {
|
||||
return
|
||||
}
|
||||
continue
|
||||
}
|
||||
code, ok := morseTable[r]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
for j, el := range code {
|
||||
if el == '.' {
|
||||
if !k.mark(ditW, abort) {
|
||||
return
|
||||
}
|
||||
} else {
|
||||
if !k.mark(3*ditW, abort) {
|
||||
return
|
||||
}
|
||||
}
|
||||
if j < len(code)-1 { // intra-character (element) gap: 1 unit
|
||||
if !k.gap(ditW, abort) {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
if !k.gap(3*ditF, abort) { // inter-character gap: 3 units
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// mark holds the key down for d; gap holds it up for d. Both abort cleanly
|
||||
// (leaving the key UP) when Stop closes abort or the keyer shuts down.
|
||||
func (k *serialKeyer) mark(d time.Duration, abort chan struct{}) bool {
|
||||
k.setKey(true)
|
||||
ok := k.wait(d, abort)
|
||||
k.setKey(false)
|
||||
return ok
|
||||
}
|
||||
func (k *serialKeyer) gap(d time.Duration, abort chan struct{}) bool { return k.wait(d, abort) }
|
||||
|
||||
func (k *serialKeyer) wait(d time.Duration, abort chan struct{}) bool {
|
||||
if d <= 0 {
|
||||
return true
|
||||
}
|
||||
t := time.NewTimer(d)
|
||||
defer t.Stop()
|
||||
select {
|
||||
case <-t.C:
|
||||
return true
|
||||
case <-abort:
|
||||
return false
|
||||
case <-k.stop:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
// sleep is a non-abortable pause (used for the short PTT lead-in).
|
||||
func (k *serialKeyer) sleep(d time.Duration) {
|
||||
if d <= 0 {
|
||||
return
|
||||
}
|
||||
t := time.NewTimer(d)
|
||||
defer t.Stop()
|
||||
select {
|
||||
case <-t.C:
|
||||
case <-k.stop:
|
||||
}
|
||||
}
|
||||
|
||||
// dits returns the element (character-speed) dit and the spacing (Farnsworth)
|
||||
// dit as durations, read live so a speed change mid-message takes effect.
|
||||
func (k *serialKeyer) dits() (elem, space time.Duration) {
|
||||
k.mu.Lock()
|
||||
w, f := k.wpm, k.farns
|
||||
k.mu.Unlock()
|
||||
if w < 5 {
|
||||
w = 5
|
||||
}
|
||||
if w > 99 {
|
||||
w = 99
|
||||
}
|
||||
elem = time.Duration(float64(time.Millisecond) * 1200.0 / float64(w))
|
||||
space = elem
|
||||
if f > 0 && f < w {
|
||||
space = time.Duration(float64(time.Millisecond) * 1200.0 / float64(f))
|
||||
}
|
||||
return elem, space
|
||||
}
|
||||
@@ -49,6 +49,16 @@ type Config struct {
|
||||
AutoSpace bool `json:"autospace"` // auto letter-space
|
||||
UsePTT bool `json:"use_ptt"` // key PTT (Key/PTT output)
|
||||
SerialEcho bool `json:"serial_echo"` // device echoes sent chars back to host
|
||||
|
||||
// Type selects the keyer engine on this serial port:
|
||||
// "" / "k1el" → a K1EL WinKeyer chip (the default, everything above applies)
|
||||
// "serial" → the PC bit-bangs Morse on a control line (no WinKeyer chip):
|
||||
// the "hardware CW keying" a Yaesu SCU-17 / generic interface
|
||||
// uses. WPM / Weight / Farnsworth / LeadIn / Tail / UsePTT still
|
||||
// apply; the paddle/sidetone/ratio fields are WinKeyer-only.
|
||||
Type string `json:"type"`
|
||||
CWKeyLine string `json:"cw_key_line"` // serial: "dtr" (CW on DTR, PTT on RTS — default) | "rts"
|
||||
CWInvert bool `json:"cw_invert"` // serial: invert line polarity (active-LOW) for both key and PTT
|
||||
}
|
||||
|
||||
func (c Config) normalised() Config {
|
||||
@@ -93,6 +103,7 @@ type Manager struct {
|
||||
status Status
|
||||
stopRead chan struct{}
|
||||
doneRead chan struct{}
|
||||
serial *serialKeyer // non-nil when cfg.Type == "serial" (DTR/RTS line keying)
|
||||
|
||||
onStatus func(Status)
|
||||
onEcho func(string) // chars the device echoes back as it keys them
|
||||
@@ -130,6 +141,9 @@ func (m *Manager) Connect(cfg Config) error {
|
||||
if strings.TrimSpace(cfg.Port) == "" {
|
||||
return fmt.Errorf("winkeyer: no serial port selected")
|
||||
}
|
||||
if cfg.Type == "serial" {
|
||||
return m.connectSerial(cfg)
|
||||
}
|
||||
m.Disconnect() // drop any existing link first
|
||||
|
||||
p, err := serial.Open(cfg.Port, &serial.Mode{
|
||||
@@ -175,6 +189,59 @@ func (m *Manager) Connect(cfg Config) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// ApplySerialConfig live-updates a running serial-line keyer's control options
|
||||
// (PTT keying, key line, invert, lead/tail, speed) WITHOUT reopening the port —
|
||||
// so ticking "Key PTT line" (or changing the key line) takes effect from the next
|
||||
// character, no reconnect needed. No-op unless a serial keyer is running.
|
||||
func (m *Manager) ApplySerialConfig(cfg Config) {
|
||||
cfg = cfg.normalised()
|
||||
m.mu.Lock()
|
||||
sk := m.serial
|
||||
m.cfg = cfg
|
||||
m.mu.Unlock()
|
||||
if sk != nil {
|
||||
sk.ApplyConfig(cfg)
|
||||
}
|
||||
}
|
||||
|
||||
// connectSerial opens the port for line-keying (DTR=CW / RTS=PTT) — no K1EL
|
||||
// handshake, no read loop. The PC bit-bangs the Morse itself (see serialcw.go).
|
||||
func (m *Manager) connectSerial(cfg Config) error {
|
||||
m.Disconnect() // drop any existing link first
|
||||
|
||||
// Open for line control only (DTR/RTS). On Windows this uses EscapeCommFunction
|
||||
// so a held RTS (PTT) survives DTR (CW) toggling on USB adapters — see linectl_*.
|
||||
line, err := openLineCtl(cfg.Port)
|
||||
if err != nil {
|
||||
return fmt.Errorf("winkeyer: open %s: %w", cfg.Port, err)
|
||||
}
|
||||
// The keyer updates busy state as it keys; mirror it into status + notify.
|
||||
sk := newSerialKeyer(line, cfg, func(busy bool) {
|
||||
m.mu.Lock()
|
||||
changed := m.status.Busy != busy
|
||||
m.status.Busy = busy
|
||||
m.mu.Unlock()
|
||||
if changed {
|
||||
m.emit()
|
||||
}
|
||||
})
|
||||
|
||||
m.mu.Lock()
|
||||
m.port = nil // serial keyer owns its own (line-only) port, not m.port
|
||||
m.serial = sk
|
||||
m.cfg = cfg
|
||||
m.status = Status{Connected: true, WPM: cfg.WPM, Port: cfg.Port}
|
||||
m.mu.Unlock()
|
||||
|
||||
lineDesc := "DTR (CW) / RTS (PTT)"
|
||||
if strings.EqualFold(cfg.CWKeyLine, "rts") {
|
||||
lineDesc = "RTS (CW) / DTR (PTT)"
|
||||
}
|
||||
applog.Printf("winkeyer: serial CW keyer on %s — %s, PTT=%v (EscapeCommFunction line ctl)", cfg.Port, lineDesc, cfg.UsePTT)
|
||||
m.emit()
|
||||
return nil
|
||||
}
|
||||
|
||||
// applyConfig pushes the keying parameters to the device.
|
||||
func (m *Manager) applyConfig(c Config) error {
|
||||
cmds := [][]byte{
|
||||
@@ -256,7 +323,12 @@ func (m *Manager) SetSpeed(wpm int) error {
|
||||
if wpm > 99 {
|
||||
wpm = 99
|
||||
}
|
||||
if err := m.write([]byte{0x02, byte(wpm)}); err != nil {
|
||||
m.mu.Lock()
|
||||
sk := m.serial
|
||||
m.mu.Unlock()
|
||||
if sk != nil {
|
||||
sk.SetSpeed(wpm)
|
||||
} else if err := m.write([]byte{0x02, byte(wpm)}); err != nil {
|
||||
return err
|
||||
}
|
||||
m.mu.Lock()
|
||||
@@ -283,18 +355,39 @@ func (m *Manager) Send(text string) error {
|
||||
if out == "" {
|
||||
return nil
|
||||
}
|
||||
m.mu.Lock()
|
||||
sk := m.serial
|
||||
m.mu.Unlock()
|
||||
if sk != nil {
|
||||
sk.Send(out)
|
||||
return nil
|
||||
}
|
||||
return m.write([]byte(out))
|
||||
}
|
||||
|
||||
// Stop aborts the current message and clears the keyer buffer (command 0x0A).
|
||||
func (m *Manager) Stop() error {
|
||||
m.mu.Lock()
|
||||
sk := m.serial
|
||||
m.mu.Unlock()
|
||||
if sk != nil {
|
||||
sk.Stop()
|
||||
return nil
|
||||
}
|
||||
return m.write([]byte{0x0A})
|
||||
}
|
||||
|
||||
// Backspace removes the most recent character from the keyer's send buffer,
|
||||
// IF it hasn't been keyed yet (command 0x08). Used by "send on typing" mode
|
||||
// so a fast typo can be corrected before it goes on the air.
|
||||
// so a fast typo can be corrected before it goes on the air. The serial line
|
||||
// keyer has no buffer to un-key from, so backspace is a no-op there.
|
||||
func (m *Manager) Backspace() error {
|
||||
m.mu.Lock()
|
||||
sk := m.serial
|
||||
m.mu.Unlock()
|
||||
if sk != nil {
|
||||
return nil
|
||||
}
|
||||
return m.write([]byte{0x08})
|
||||
}
|
||||
|
||||
@@ -313,14 +406,29 @@ func (m *Manager) write(b []byte) error {
|
||||
func (m *Manager) Disconnect() {
|
||||
m.mu.Lock()
|
||||
p := m.port
|
||||
sk := m.serial
|
||||
stop, done := m.stopRead, m.doneRead
|
||||
m.port = nil
|
||||
m.serial = nil
|
||||
m.stopRead = nil
|
||||
m.doneRead = nil
|
||||
connected := m.status.Connected
|
||||
m.status = Status{Connected: false}
|
||||
m.mu.Unlock()
|
||||
|
||||
if sk != nil {
|
||||
// Serial line keyer: stop the worker (drops the key/PTT lines) then close.
|
||||
sk.Close()
|
||||
if p != nil {
|
||||
_ = p.Close()
|
||||
}
|
||||
if connected {
|
||||
applog.Printf("winkeyer: serial CW keyer disconnected")
|
||||
m.emit()
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if p != nil {
|
||||
_, _ = p.Write([]byte{0x00, 0x03}) // Host Close
|
||||
_ = p.Close()
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
//go:build !windows
|
||||
|
||||
package main
|
||||
|
||||
// virtualScreenBounds is Windows-only; elsewhere we cannot tell, and the caller
|
||||
// treats "cannot tell" as "trust the saved position".
|
||||
func virtualScreenBounds() (x, y, w, h int, ok bool) { return 0, 0, 0, 0, false }
|
||||
@@ -0,0 +1,69 @@
|
||||
package main
|
||||
|
||||
import "testing"
|
||||
|
||||
// A window restored onto a monitor that is no longer attached opens invisibly
|
||||
// and stays that way — there is no way back short of deleting window.json, which
|
||||
// no operator knows to do. These cases decide whether the saved position is
|
||||
// honoured or quietly dropped for the default placement.
|
||||
func TestOverlapsEnough(t *testing.T) {
|
||||
// Two 1920x1080 monitors, the SECOND one to the LEFT of the primary: the
|
||||
// virtual desktop then starts at a negative x. This is the layout that
|
||||
// produces lost windows, and where a sign error would go unnoticed.
|
||||
const vx, vy, vw, vh = -1920, 0, 3840, 1080
|
||||
|
||||
cases := []struct {
|
||||
name string
|
||||
x, y, w, h int
|
||||
wantRestorabl bool
|
||||
}{
|
||||
{"centred on the primary monitor", 300, 200, 1400, 900, true},
|
||||
{"on the left-hand monitor (negative x)", -1500, 100, 1400, 900, true},
|
||||
{"just inside the far left edge", -1900, 0, 1400, 900, true},
|
||||
{"hard against the right edge, title bar still grabbable", 1920 - 200, 100, 1400, 900, true},
|
||||
|
||||
// The failures this exists to catch.
|
||||
{"entirely past the left edge", -3400, 100, 1400, 900, false},
|
||||
{"below every monitor", 300, 2000, 1400, 900, false},
|
||||
{"barely clipping the right edge (10 px)", 1910, 100, 1400, 900, false},
|
||||
{"only a sliver of height on screen (8 px)", 300, 1072, 1400, 900, false},
|
||||
{"absurd coordinates from a corrupt file", 999999, 999999, 1400, 900, false},
|
||||
}
|
||||
for _, c := range cases {
|
||||
if got := overlapsEnough(c.x, c.y, c.w, c.h, vx, vy, vw, vh); got != c.wantRestorabl {
|
||||
t.Errorf("%s: overlapsEnough(%d,%d,%dx%d) = %v, want %v",
|
||||
c.name, c.x, c.y, c.w, c.h, got, c.wantRestorabl)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The actual field scenario: OpsLog was closed on a second monitor, that monitor
|
||||
// is gone, and the desktop is now the primary screen alone. The saved position
|
||||
// must be dropped — this is the case that leaves the window invisible.
|
||||
func TestOverlapsEnoughAfterMonitorUnplugged(t *testing.T) {
|
||||
// Single 1920x1080 primary; the left-hand monitor no longer exists.
|
||||
const vx, vy, vw, vh = 0, 0, 1920, 1080
|
||||
for _, c := range []struct {
|
||||
name string
|
||||
x, y, w, h int
|
||||
want bool
|
||||
}{
|
||||
{"saved on the monitor that is now gone", -1500, 100, 1400, 900, false},
|
||||
{"saved just off the left edge", -1400, 100, 1400, 900, false},
|
||||
{"saved on the surviving monitor", 200, 100, 1400, 900, true},
|
||||
} {
|
||||
if got := overlapsEnough(c.x, c.y, c.w, c.h, vx, vy, vw, vh); got != c.want {
|
||||
t.Errorf("%s: got %v, want %v", c.name, got, c.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// With the desktop bounds unavailable (non-Windows, or the call failing) the
|
||||
// saved position must be honoured rather than second-guessed.
|
||||
func TestOnSomeMonitorTrustsSavedPositionWhenBoundsUnknown(t *testing.T) {
|
||||
if _, _, _, _, ok := virtualScreenBounds(); !ok {
|
||||
if !onSomeMonitor(999999, 999999, 1400, 900) {
|
||||
t.Error("with unknown desktop bounds the saved position must be kept")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
//go:build windows
|
||||
|
||||
package main
|
||||
|
||||
import "syscall"
|
||||
|
||||
// GetSystemMetrics indices for the virtual desktop — the rectangle spanning
|
||||
// every attached monitor. Wails' ScreenGetAll reports each monitor's size but
|
||||
// not its offset, so it cannot answer "is this coordinate on any screen?"; the
|
||||
// Win32 metrics can.
|
||||
const (
|
||||
smXVirtualScreen = 76
|
||||
smYVirtualScreen = 77
|
||||
smCXVirtualScreen = 78
|
||||
smCYVirtualScreen = 79
|
||||
)
|
||||
|
||||
var (
|
||||
user32Dll = syscall.NewLazyDLL("user32.dll")
|
||||
procGetSystemMetrics = user32Dll.NewProc("GetSystemMetrics")
|
||||
)
|
||||
|
||||
func systemMetric(index int) int {
|
||||
r, _, _ := procGetSystemMetrics.Call(uintptr(index))
|
||||
return int(int32(r)) // signed: the virtual desktop origin is negative with a monitor to the left
|
||||
}
|
||||
|
||||
// virtualScreenBounds returns the rectangle covering all monitors, and whether
|
||||
// it could be determined at all.
|
||||
func virtualScreenBounds() (x, y, w, h int, ok bool) {
|
||||
w, h = systemMetric(smCXVirtualScreen), systemMetric(smCYVirtualScreen)
|
||||
if w <= 0 || h <= 0 {
|
||||
return 0, 0, 0, 0, false
|
||||
}
|
||||
return systemMetric(smXVirtualScreen), systemMetric(smYVirtualScreen), w, h, true
|
||||
}
|
||||
+32
-2
@@ -21,7 +21,7 @@ import (
|
||||
|
||||
const (
|
||||
// appVersion is stamped on every heartbeat (and could feed the About box).
|
||||
appVersion = "0.20.7"
|
||||
appVersion = "0.21.3"
|
||||
|
||||
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
||||
// to https://us.i.posthog.com for a US project.
|
||||
@@ -85,14 +85,44 @@ func (a *App) sendTelemetryHeartbeat() {
|
||||
return // already counted today
|
||||
}
|
||||
|
||||
// distinct_id identifies the USER. Prefer the station callsign — it's stable
|
||||
// across every machine/reinstall the same operator runs, so one op counts as
|
||||
// one user (a callsign is public in amateur radio). The random per-install ID
|
||||
// is only a fallback; without it the same op on a laptop + desktop + Maestro
|
||||
// showed up as three "users". install_id rides along as a property so multiple
|
||||
// machines under one callsign stay visible.
|
||||
//
|
||||
// On a FRESH INSTALL the callsign isn't configured yet at launch, so sending
|
||||
// straight away would record the machine's random UUID (and the once-a-day lock
|
||||
// would then keep it that way even after the op enters their call). Instead wait
|
||||
// a while for the callsign to appear (Settings → Station Information) and only
|
||||
// fall back to the UUID if none shows up within the grace window — so a genuine
|
||||
// no-callsign install is still counted, but the normal case gets the callsign.
|
||||
call := a.activeCallsign()
|
||||
for i := 0; call == "" && i < 60; i++ { // up to ~10 min (60 × 10 s)
|
||||
time.Sleep(10 * time.Second)
|
||||
if a.settings == nil || !a.GetTelemetryEnabled() {
|
||||
return // disabled meanwhile
|
||||
}
|
||||
if last, _ := a.settings.GetGlobal(a.ctx, keyTelemetryLastSent); strings.TrimSpace(last) == today {
|
||||
return // sent by another path in the meantime
|
||||
}
|
||||
call = a.activeCallsign()
|
||||
}
|
||||
installID := a.telemetryInstallID()
|
||||
distinctID := installID
|
||||
if call != "" {
|
||||
distinctID = call
|
||||
}
|
||||
payload := map[string]any{
|
||||
"api_key": posthogAPIKey,
|
||||
"event": "app_opened",
|
||||
"distinct_id": a.telemetryInstallID(),
|
||||
"distinct_id": distinctID,
|
||||
"properties": map[string]any{
|
||||
"version": appVersion,
|
||||
"os": runtime.GOOS,
|
||||
"arch": runtime.GOARCH,
|
||||
"install_id": installID,
|
||||
"$lib": "opslog",
|
||||
},
|
||||
"timestamp": time.Now().UTC().Format(time.RFC3339),
|
||||
|
||||
@@ -23,6 +23,17 @@ Plus a **leading/trailing** strip, a **prefix** prepended to found references, a
|
||||
**dynamic** mode (any value counts, like POTA), and the **fallback searches**
|
||||
described below.
|
||||
|
||||
**One QSO can count for several references.** A contact always yields *every*
|
||||
reference its field holds — the value is split on commas and semicolons, so an
|
||||
n-fer POTA activation logged as `US-6544,US-0680` credits both parks, and a
|
||||
grid-line VUCC contact credits each grid. There is no "one reference per QSO"
|
||||
switch — it was never useful.
|
||||
|
||||
**Match by `code`** looks up each token of the field in the reference list (so a
|
||||
partial or multi-value field still resolves), while **`exact match`** requires
|
||||
the whole field to equal the reference. Use exact match when a substring would
|
||||
cause false hits.
|
||||
|
||||
### The five rules to remember
|
||||
|
||||
1. **Every regex is case-insensitive.** Award and per-reference patterns match
|
||||
@@ -72,6 +83,42 @@ A custom province award where the log rarely spells the province out (it names a
|
||||
Now a QSO is resolved by the province **name** if present, else by a **city**
|
||||
regex — first in the QTH, then in the address. First hit wins.
|
||||
|
||||
## Why doesn't a QSO count? — Test & Missing refs
|
||||
|
||||
An award that matches nothing is the hardest thing to debug: the column is just
|
||||
empty, and you can't tell whether the QSO was out of scope, the field was empty,
|
||||
the rule looked in the wrong place, or the reference isn't on the list. Two tools
|
||||
answer that.
|
||||
|
||||
### Test a callsign (award editor)
|
||||
|
||||
In the **award editor** there's a **Test** box: type a callsign and OpsLog
|
||||
replays that award's rules against every QSO you have with that station and shows
|
||||
what happened, step by step — the exact same code path the real matcher uses, so
|
||||
what you see is what actually runs. For each contact it reports:
|
||||
|
||||
- whether the QSO is **in scope** (and, if not, *why* — wrong DXCC, band, mode,
|
||||
emission, or outside the valid-from/to dates);
|
||||
- each rule in turn (**primary**, then **Fallback 1, 2, …**), the **field value**
|
||||
it scanned, the **candidates** it produced, which ones were **kept**, and which
|
||||
were **rejected** (with the reason — e.g. "not on the reference list");
|
||||
- rules that were **skipped** because an earlier one already matched;
|
||||
- any **manual** reference you assigned by hand;
|
||||
- the final **result** — what the QSO counts for.
|
||||
|
||||
This is the fastest way to fix a rule: if the primary scanned the wrong field, or
|
||||
a candidate was rejected as unlisted, the trace says so directly.
|
||||
|
||||
### Missing refs (awards panel)
|
||||
|
||||
For an award scoped to a DXCC entity (DDFM, WAS, RAC, WAJA…), the **Missing refs**
|
||||
view lists contacts that ARE in scope (right DXCC / band / mode / dates) **but
|
||||
where no reference was found** — so they don't count yet. Sort by a column, tick
|
||||
the matching contacts, and **assign the reference** to all of them at once (or
|
||||
click a row to open the QSO and fix the field). Recompute and the fixed contacts
|
||||
drop off the list. This is how you close the gaps a matcher can't fill on its own
|
||||
(a French QSO logged without its department, say).
|
||||
|
||||
## Live detection & manual refs
|
||||
|
||||
- References are detected **live** as you enter a callsign.
|
||||
@@ -89,6 +136,15 @@ regex — first in the QTH, then in the address. First hit wins.
|
||||
or **both**. Award columns are opt-in per the Columns picker
|
||||
([[Recent QSOs and Filters]]).
|
||||
|
||||
## Built-in updates vs your edits
|
||||
|
||||
Built-in awards ship with the app, definition **and** reference list. When a
|
||||
newer version fixes a shipped award (a better fallback chain, a corrected
|
||||
reference list), OpsLog offers to apply that update — **unless you've edited that
|
||||
award yourself**, in which case your version is left alone (your work outranks
|
||||
ours). Awards you created are never touched by updates. So you can freely tune a
|
||||
built-in award without fear of a future release overwriting it.
|
||||
|
||||
## Rescan
|
||||
|
||||
**Rescan** re-pulls the logbook and recomputes — it picks up fresh LoTW / QRZ /
|
||||
|
||||
+17
-3
@@ -4,9 +4,23 @@ This walks you from a fresh install to your first logged QSO.
|
||||
|
||||
## 1. Set your station
|
||||
|
||||
**Settings → Station**: enter your **callsign**, **grid locator** and **name**.
|
||||
These feed callsign lookups, the map, awards, the QSL card and the "my station"
|
||||
ADIF fields on every QSO.
|
||||
**Settings → Station Information**: enter your **callsign**, **grid locator** and
|
||||
**name**. These feed callsign lookups, the map, awards, the QSL card and the
|
||||
"my station" ADIF fields on every QSO.
|
||||
|
||||
For a **complete ADIF**, also fill your **address / city / state / county** here,
|
||||
and set your **per-band rig and antenna** in **Settings → Operating conditions**
|
||||
(tick the default antenna for each band). These populate the `MY_*` fields
|
||||
(`MY_RIG`, `MY_ANTENNA`, `MY_CITY`, `MY_STREET`, `MY_STATE`…) on your QSOs.
|
||||
|
||||
> **Importing an existing log?** Fill the station info **and** your operating
|
||||
> conditions **before** you import. In the ADIF import dialog, tick **"Fill my
|
||||
> station fields from my profile"** — OpsLog then backfills the *empty* `MY_*`
|
||||
> fields (grid, rig, antenna, address, city, state, county, SOTA/POTA…) plus
|
||||
> **Operator** and **Owner callsign** from your active profile, so even a bare
|
||||
> ADIF comes in fully described. Existing values are kept; only
|
||||
> `STATION_CALLSIGN` is left untouched (so a mixed-call log isn't re-routed).
|
||||
> See [[Import and Export ADIF]].
|
||||
|
||||
## 2. (Optional) Connect a radio
|
||||
|
||||
|
||||
Reference in New Issue
Block a user