Compare commits

...
14 Commits
Author SHA1 Message Date
rouggy c07b746d4b chore: release v0.20.10 2026-07-23 14:23:21 +02:00
rouggy d128dabc19 fix: IC-7300 (single-scope Icom) blank spectrum scope in center/VFO mode
The multi-frame waveform header (USB path) read the second frequency field
as an absolute high edge, but in center mode it is a span — so high < low and
the panadapter had no valid range to map the trace onto (blank scope). It now
applies the same center+span vs low+high disambiguation the IC-7610 single-
frame path already used. FIXED mode was unaffected.

Also stamps changelog 0.20.10 with today's date.
2026-07-23 14:21:08 +02:00
rouggy 2823f3e401 feat: Station Control amp parity + all amps, Help→Send log to F4BPO, bulk-edit frequency, fix Cluster midnight sort
- Station Control: the amplifier panel is now the exact same card as the FlexRadio panel (extracted shared AmpCard: OPERATE/STANDBY, ON/OFF, power level, output-power bar, live FWD/ID/temp meters). Every configured amp gets its own card — no dropdown.
- Help → "Send log to F4BPO" (only when SMTP is configured): e-mails opslog.log + previous session + crash log to the developer. New email.SendFiles for multi-attachment.
- Bulk edit: new "Frequency (MHz)" field sets freq_hz AND recomputes band; out-of-band values rejected. Fixes a run logged on a stale/default freq after CAT dropped.
- Cluster: Time column sorted lexically on the HHMMZ string, so spots after 0000Z sorted below 2359Z and looked frozen at the UTC rollover. Now sorts by real arrival time.
- Also folds in the DVK auto-CQ/2-column layout and Station Control dashboard batch (changelog 0.20.10, EN+FR).
2026-07-23 13:22:02 +02:00
rouggy 1070637c40 feat+fix batch: Station Control dashboard (fixed-width panels, grip-handle drag reorder, amp meters from the Flex stream, compact relays), Ultrabeam element list capped to 3 (READ_BANDS over-read), spot-click on Flex panadapter now sets mode, DAX TX toggle, DVK panel state persists across relaunch, duplicate amp meters cleared on power-cycle, QSO audio recording snapshot taken synchronously at log time (was racing the form-clear cancel), Flex COMP meter max -20->-25 and MIC scale to 0; changelog 0.20.10 2026-07-23 01:08:47 +02:00
rouggy 13de53772b docs: update README (EN+FR) — multiple amplifiers + ACOM, SmartSDR v4 DSP filters + DAX, native microHAM ARCO rotator (GS-232A LAN/USB), panadapter spot tunes freq+mode, NET Control drag&drop + Log everyone, automatic live status, digital-mode grouping option, Select all / filter-shows-all 2026-07-22 20:36:29 +02:00
rouggy 6b04072e52 fix: clicking an OpsLog spot on the Flex panadapter now sets the mode too — cluster spots get a mode inferred (comment/band plan) and SendSpot converts it to a real Flex mode (SSB->USB/LSB, FT8->DIGU), so SmartSDR actually switches mode on the click; changelog 0.20.10 2026-07-22 20:36:29 +02:00
rouggy 64b8ba7fdc chore: release v0.20.9 2026-07-22 20:24:34 +02:00
rouggy a9ca50b2dd fix: the Flex panel DAX button now toggles the TRANSMIT-bar DAX (transmit set dax=), not the slice RX DAX channel — this is the button that routes TX audio through DAX (WSJT-X); state follows changes made in SmartSDR too 2026-07-22 20:24:25 +02:00
rouggy 512b5fd35b feat: DAX selector on the Flex panel — routes the active slice's RX audio to a DAX channel (slice dax=0-8, Off..8 dropdown next to the antenna selection, highlighted when active); changelog updated 2026-07-22 17:33:45 +02:00
rouggy 77e3d011a0 ui: rebalance the Flex panel columns — RIT/XIT move to the bottom of the Transmit card, antenna RX/TX selection to the top of the Receive card (the Receive column had grown tall with the v4 DSP rows); changelog wording updated 2026-07-22 17:31:59 +02:00
rouggy b7dd8d4852 feat: multiple amplifiers + SmartSDR v4 DSP filters
Multi-amp: Settings->Amplifier becomes a list (amps.json, legacy single-amp keys auto-migrate to entry #1); one client per enabled amp with per-id bindings (GetAmplifiers/SaveAmplifiers/GetAmpStatuses/AmpOperate/AmpPower/AmpPowerLevel/AmpFanMode); legacy a.pgxl/a.spe/a.acom point at the first enabled amp of each family. Amp cards in FlexPanel and Station Control gain a dropdown to pick the amp; the status bar shows one clickable chip per amp. Use case: two SPEs run in parallel.

Flex v4 DSP (8000/Aurora): NRL/ANFL (lms_nr/lms_anf), NRS (speex_nr), NRF (nrf) with level sliders, RNN (rnnoise) and ANFT on/off — keys per the FlexLib slice docs; the section only shows when the radio reports these keys (dsp_v4 flag), so 6000-series panels are unchanged.
2026-07-22 17:25:10 +02:00
rouggy 4c75680689 feat: day batch — upload results surfaced as toasts (silent LoTW failures from the right-click send looked like nothing was sent); live selection count + Select all/Unselect all toggle in the grid toolbar; active filters bypass the row limit (all matches shown, 10k safety cap); NET Control: same right-click menu on worked-before + drag&drop roster<->on-air (drop on roster logs the QSO); compact mode restores previous window size/position; advanced-filter field renamed Station callsign; optional DXCC-style digital-mode grouping (Settings->General) for matrix badges + cluster colouring; changelog 0.20.9 entries (version NOT bumped) 2026-07-22 15:38:08 +02:00
rouggy 5aac28f564 fix: PGXL status-bar chip and Station Control widget read OPERATE from the Flex when it reports the amp (the direct GSCP status doesn't carry operate state) — toggle then goes through FlexAmpOperate like the Flex panel; direct TCP link stays as fallback; log distinct raw PGXL status payloads to map unknown fields 2026-07-22 09:33:39 +02:00
rouggy c91c8c3b47 feat: v0.20.8 — microHAM ARCO rotator native control (GS-232A over LAN TCP or USB serial, no PstRotator); amplifier OPERATE/STANDBY toggle on the status-bar chip for all three amps (PGXL direct operate command now wired + operate state parsed); PGXL operate button in the Station Control widget; NET Control auto-selects the next on-air station after logging and gains a 'Log everyone' button; changelog + version bump 2026-07-21 21:49:01 +02:00
29 changed files with 2190 additions and 630 deletions
+1
View File
@@ -46,3 +46,4 @@ cat.log
.env.local .env.local
*.pem *.pem
*.key *.key
*.syso
+41 -15
View File
@@ -42,7 +42,10 @@ Développé par **F4BPO**.
district (`/8`, `/W6`), plus les dérogations DXpédition de ClubLog par dates. 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), - **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 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, - **Constructeur de filtres QSO avancé** (champ / opérateur / valeur, ET / OU,
préréglages enregistrés) avec **export ADIF** des lignes filtrées ou préréglages enregistrés) avec **export ADIF** des lignes filtrées ou
sélectionnées. 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 légendés) et le(s) **lobe(s) du faisceau d'antenne** tracés depuis l'azimut du
rotor. rotor.
- **Compas de rotor** (azimutal équidistant, clic pour tourner) piloté par - **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 - **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 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. et sur la carte, pour toujours savoir où pointe l'antenne.
@@ -81,7 +86,9 @@ Développé par **F4BPO**.
Cluster et le volet cluster de la vue principale, avec bascule affichage/masquage. Cluster et le volet cluster de la vue principale, avec bascule affichage/masquage.
- **Statut** par spot (nouveau / nouvelle bande / nouveau créneau / contacté), - **Statut** par spot (nouveau / nouvelle bande / nouveau créneau / contacté),
clic pour accorder la radio, et une **bandmap** multi-bandes (bandes façon 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 - Les spots **POTA** sont étiquetés avec leur référence de parc (via
`api.pota.app`). `api.pota.app`).
- **Alertes de spots** (façon Log4OM) : règles sur indicatif / pays / bande / - **Alertes de spots** (façon Log4OM) : règles sur indicatif / pays / bande /
@@ -97,7 +104,8 @@ connexion rapide non bloquante — une radio éteinte ne fige jamais l'applicati
supportée par OmniRig. supportée par OmniRig.
- **FlexRadio (SmartSDR)** via l'API TCP de la radio — fréquence / mode / split - **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 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 - **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 **serveur LAN intégré** de la radio (voir *Icom à distance* ci-dessous). Ni
RS-BA1 ni Remote Utility nécessaires. 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 - **Émission :** puissance RF, puissance d'accord, TUNE, MOX, processeur de
parole (NOR/DX/DX+), VOX (+ niveau + délai), moniteur (+ niveau), gain micro. 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. - **Coupleur d'antenne (ATU) :** accord / bypass / mémoires.
- **Amplificateur :** la carte de commande suit l'ampli configuré - **Amplificateur :** la carte de commande suit l'ampli configuré, avec une liste
**PowerGenius XL** (operate/standby, mode ventilateur, défaut) ou déroulante pour le choisir quand **plusieurs amplificateurs** sont configurés
**SPE Expert** (operate/standby, Marche/Arrêt, niveau Low/Mid/High, barre de (p. ex. deux SPE en parallèle). Voir *Amplis & commutateurs* ci-dessous.
puissance de sortie, bande & température).
- **Mesures en direct** via le flux UDP VITA-49 : S-mètre (unités S), puissance - **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. 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 ## Amplis & commutateurs
- **Amplificateurs** (Réglages → Amplificateur — la carte de commande apparaît - **Amplificateurs** — configurez **un ou plusieurs** amplis (Réglages →
sur l'onglet FlexRadio, ou seule quand ni Flex ni Icom n'est actif) : 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 - **PowerGenius XL** (4O3A) en TCP direct — operate/standby, sélecteur de mode
ventilateur et affichage des défauts. ventilateur et affichage des défauts.
- **SPE Expert** (1.3K-FA / 1.5K-FA / 2K-FA) via **USB** (COM virtuel) ou le - **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 **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, sortie Low / Mid / High, une barre de puissance et le statut en direct (bande,
ROS, courant PA, température, avertissements/alarmes). 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 - Commutateur d'antenne **Antenna Genius** (4O3A) via TCP/GSCP — un widget de
commutation A/B ancré. commutation A/B ancré.
- Panneau **Station Control** (ancrable, widgets réordonnables par glisser) : le - 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) ## 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. 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 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 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 ([`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 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 pouvez intégrer sur la bio **QRZ.com** de la station
@@ -248,8 +271,11 @@ ce n'est pas un serveur web.
## Net control ## Net control
- **Log de net dirigé** (Outils → Net) : un roster global (`nets.json`) plus une - **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 session active en mémoire — pointez les stations présentes, puis loguez-les une
net d'un coup en utilisant la fréquence CAT. 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 ## Apparence & langue
+40 -16
View File
@@ -40,7 +40,10 @@ Developed by **F4BPO**.
with `/MM` `/AM` `/B` (beacon) and call-area (`/8`, `/W6`) handling, plus with `/MM` `/AM` `/B` (beacon) and call-area (`/8`, `/W6`) handling, plus
ClubLog DXpedition date overrides. ClubLog DXpedition date overrides.
- **Recent QSOs**, **Worked-before** matrix (per band/mode slot), bulk re-resolve - **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 - **Advanced QSO filter builder** (field / operator / value, AND / OR, saved
presets) with filtered- and selected-row **ADIF export**. presets) with filtered- and selected-row **ADIF export**.
- **Find duplicates** (Tools) — groups QSOs by same call + band + mode (optionally - **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 - **Great-circle map** with short/long-path distance & azimuth, selectable
basemaps (Light / Voyager / Street / Satellite, all key-free and labelled) and basemaps (Light / Voyager / Street / Satellite, all key-free and labelled) and
the **antenna beam lobe(s)** drawn from the rotor azimuth. 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 - **Ultrabeam** support (Normal / 180° reverse / Bidirectional): the radiating
direction is shown in green and the **mechanical boom** in grey, on both the 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. compass and the map, so you never lose track of where the antenna points.
@@ -71,7 +77,9 @@ Developed by **F4BPO**.
mode / status / source) shared by the Cluster tab and the Main-view cluster mode / status / source) shared by the Cluster tab and the Main-view cluster
pane, with a show/hide toggle. pane, with a show/hide toggle.
- Per-spot **status** (new / new-band / new-slot / worked), click-to-tune the - 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`). - **POTA** spots are tagged with their park reference (via `api.pota.app`).
- **Spot alerts** (Log4OM-style): rules on call / country / band / mode / - **Spot alerts** (Log4OM-style): rules on call / country / band / mode /
spotter, with sound, visual and e-mail notification (Tools → *Alert spotter, with sound, visual and e-mail notification (Tools → *Alert
@@ -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. - **OmniRig** (Rig 1/2, hot-swap) — works with any OmniRig-supported rig.
- **FlexRadio (SmartSDR)** over the radio's TCP API — real-time slice freq / - **FlexRadio (SmartSDR)** over the radio's TCP API — real-time slice freq /
mode / split, UDP discovery, and **panadapter spots** (cluster spots pushed to 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 - **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 via the radio's **built-in LAN server** (see *Remote Icom* below). No RS-BA1 or
Remote Utility needed. 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+), - **Transmit:** RF power, tune power, TUNE, MOX, speech processor (NOR/DX/DX+),
VOX (+ level + delay), monitor (+ level), mic gain. 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. - **Antenna tuner (ATU):** tune / bypass / memories.
- **Amplifier:** the amp card follows whichever amplifier is configured - **Amplifier:** the amp card follows whichever amplifier is configured, with a
**PowerGenius XL** (operate/standby, fan mode, fault) or **SPE Expert** dropdown to pick it when **several amplifiers** are set up (e.g. two SPEs run
(operate/standby, ON/OFF, Low/Mid/High level, output-power bar, band & in parallel). See *Amplifiers & switches* below.
temperature).
- **Live meters** over the UDP VITA-49 stream: S-meter (S-units), forward power - **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. (W), SWR, ALC, PA temperature, voltage, plus the amplifier's meters.
@@ -158,14 +171,21 @@ as Mumble.)
## Amplifiers & switches ## Amplifiers & switches
- **Amplifiers** (Settings → Amplifier — the control card appears on the - **Amplifiers** — configure **one or several** amps (Settings → Amplifier is a
FlexRadio tab, or on its own when neither Flex nor Icom is active): 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 - **PowerGenius XL** (4O3A) over direct TCP — operate/standby, fan-mode
selector and fault display. selector and fault display.
- **SPE Expert** (1.3K-FA / 1.5K-FA / 2K-FA) over **USB** (virtual COM) or the - **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, **network** (RS232-to-Ethernet bridge) — operate/standby, ON/OFF,
Low / Mid / High output level, an output-power bar and live status (band, Low / Mid / High output level, an output-power bar and live status (band,
SWR, PA current, temperature, warnings/alarms). 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 Genius** (4O3A) antenna switch over TCP/GSCP — a docked A/B
antenna-switch widget. antenna-switch widget.
- **Station Control** panel (dockable, drag-to-reorder widgets): the **rotator**, - **Station Control** panel (dockable, drag-to-reorder widgets): the **rotator**,
@@ -208,10 +228,11 @@ as Mumble.)
## Multi-operator live status (special events) ## Multi-operator live status (special events)
For a multi-op special-event call on a shared MySQL logbook (e.g. **TM74TFR**): For a multi-op special-event call on a shared MySQL logbook (e.g. **TM74TFR**),
Settings → General → *Publish live operator status*. Each OpsLog instance publishing is **automatic** — no setting to turn on. Each OpsLog instance
heartbeats its current activity (operator call, band, frequency, mode) into a 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 ([`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 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 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 ## Net control
- **Directed-net logging** (Tools → Net): a global roster (`nets.json`) plus an - **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 in-memory active session — check stations in, then log them individually or the
using the CAT frequency. 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 ## Appearance & language
+529 -51
View File
@@ -469,8 +469,10 @@ type App struct {
motorInhibited atomic.Bool // TX currently inhibited by the motor-antenna watcher motorInhibited atomic.Bool // TX currently inhibited by the motor-antenna watcher
antgenius *antgenius.Client // Antenna Genius (4O3A) switch (TCP); nil when disabled antgenius *antgenius.Client // Antenna Genius (4O3A) switch (TCP); nil when disabled
pgxl *powergenius.Client // PowerGenius XL (4O3A) amp fan control (TCP); nil when disabled pgxl *powergenius.Client // PowerGenius XL (4O3A) amp fan control (TCP); nil when disabled
spe *spe.Client // SPE Expert amplifier (serial/TCP); nil when disabled or not SPE spe *spe.Client // legacy pointer: FIRST enabled SPE amp (kept for the pre-multi bindings)
acom *acom.Client // ACOM 500S/600S/700S/1200S/2020S amplifier (serial/TCP); nil when disabled or not ACOM acom *acom.Client // legacy pointer: FIRST enabled ACOM amp
ampsMu sync.Mutex // guards ampInsts
ampInsts map[string]*ampInst // one running client per enabled configured amplifier, by config ID
audioMgr *audio.Manager audioMgr *audio.Manager
qsoRec *audio.Recorder // continuous QSO recorder (rolling pre-roll) qsoRec *audio.Recorder // continuous QSO recorder (rolling pre-roll)
solar *solar.Manager // live space-weather (SFI/SSN/A/K) for the header + QSO stamping solar *solar.Manager // live space-weather (SFI/SSN/A/K) for the header + QSO stamping
@@ -530,6 +532,13 @@ type App struct {
// must be allowed through. // must be allowed through.
shuttingDown bool shuttingDown bool
compact bool // window is in the compact one-row mode (skip saving its tiny size as the normal geometry) compact bool // window is in the compact one-row mode (skip saving its tiny size as the normal geometry)
// Geometry captured when ENTERING compact mode, restored on the way back —
// otherwise leaving compact snapped the window to a hardcoded 1400×900 at
// wherever the compact strip had been dragged.
preCompactW, preCompactH int
preCompactX, preCompactY int
preCompactMax bool
preCompactValid bool
// Cached operator location used to compute distance/bearing for // Cached operator location used to compute distance/bearing for
// cluster spots. Refreshed on profile activation; zero means // cluster spots. Refreshed on profile activation; zero means
@@ -1066,7 +1075,7 @@ func (a *App) startup(ctx context.Context) {
// Antenna Genius switch: connect in the background if enabled. // Antenna Genius switch: connect in the background if enabled.
a.startAntGenius() a.startAntGenius()
// PowerGenius XL amp fan control: connect in the background if enabled. // PowerGenius XL amp fan control: connect in the background if enabled.
a.startPGXL() a.startAmps()
// Autostart: launch the active profile's configured external programs that // Autostart: launch the active profile's configured external programs that
// aren't already running (WSJT-X, JTAlert, rotator control, …). Background // aren't already running (WSJT-X, JTAlert, rotator control, …). Background
@@ -1811,6 +1820,17 @@ func (a *App) ResetDatabaseToDefault() error {
// widths, sort…) in the DB settings table under a "ui." namespace, so they // widths, sort…) in the DB settings table under a "ui." namespace, so they
// travel with the logbook and survive a reinstall — unlike the WebView's // travel with the logbook and survive a reinstall — unlike the WebView's
// localStorage. Values are opaque JSON blobs owned by the frontend. // localStorage. Values are opaque JSON blobs owned by the frontend.
// groupDigitalSlots reports the "digital modes count as one" preference
// (Settings → General; stored as a portable ui.* pref so the frontend matrix
// and this backend cluster logic read the same switch).
func (a *App) groupDigitalSlots() bool {
if a.settings == nil {
return false
}
v, _ := a.settings.Get(a.ctx, "ui.opslog.groupDigitalSlots")
return v == "1"
}
func (a *App) GetUIPref(key string) (string, error) { func (a *App) GetUIPref(key string) (string, error) {
if a.settings == nil { if a.settings == nil {
return "", nil return "", nil
@@ -1963,6 +1983,12 @@ func (a *App) AddQSO(q qso.QSO) (id int64, err error) {
q.ID = id q.ID = id
a.noteWorked(q.Callsign, q.Band, q.Mode) // keep the alert worked-index fresh (in-memory) a.noteWorked(q.Callsign, q.Band, q.Mode) // keep the alert worked-index fresh (in-memory)
a.noteLiveQSO() // multi-op: flip this operator back "online" (publishes async) a.noteLiveQSO() // multi-op: flip this operator back "online" (publishes async)
// Snapshot the QSO recording SYNCHRONOUSLY, BEFORE announcing the log: the
// qso:logged event clears the entry form, and clearing the callsign cancels
// the recorder — so if this ran on the async path below it raced the cancel
// and the audio was discarded (recordings silently stopped working). The
// snapshot is an in-memory copy; the heavy file encode still runs async.
a.saveQSORecording(&q)
// Announce the log RIGHT AWAY so the grid/UI refresh at once and the entry // Announce the log RIGHT AWAY so the grid/UI refresh at once and the entry
// form clears immediately — the operator is not made to wait on the DB. // form clears immediately — the operator is not made to wait on the DB.
wruntime.EventsEmit(a.ctx, "qso:logged", id) wruntime.EventsEmit(a.ctx, "qso:logged", id)
@@ -1974,7 +2000,6 @@ func (a *App) AddQSO(q qso.QSO) (id int64, err error) {
qc := q qc := q
go func() { go func() {
a.materializeAwardRefs(qc) // fills the award_refs column a.materializeAwardRefs(qc) // fills the award_refs column
a.saveQSORecording(&qc)
if a.extsvc != nil { if a.extsvc != nil {
a.extsvc.OnQSOLogged(id) a.extsvc.OnQSOLogged(id)
} }
@@ -5146,6 +5171,11 @@ func (a *App) BulkUpdateField(ids []int64, field, value string) (int64, error) {
if a.qso == nil { if a.qso == nil {
return 0, fmt.Errorf("db not initialized") return 0, fmt.Errorf("db not initialized")
} }
// Frequency is numeric and drives the band, so it takes a dedicated path
// (freq_hz + band updated together) rather than the generic text setter.
if field == "freq" {
return a.bulkSetFrequency(ids, value)
}
col, ok := bulkFieldColumns[field] col, ok := bulkFieldColumns[field]
if !ok { if !ok {
return 0, fmt.Errorf("unknown field %q", field) return 0, fmt.Errorf("unknown field %q", field)
@@ -5164,6 +5194,34 @@ func (a *App) BulkUpdateField(ids []int64, field, value string) (int64, error) {
return n, nil return n, nil
} }
// bulkSetFrequency parses a MHz frequency and sets freq_hz + band across the
// selected QSOs. Accepts a comma or dot decimal separator (fr locale) and
// rejects anything outside the ham bands so a typo can't corrupt the batch.
func (a *App) bulkSetFrequency(ids []int64, value string) (int64, error) {
s := strings.ReplaceAll(strings.TrimSpace(value), ",", ".")
if s == "" {
return 0, fmt.Errorf("enter a frequency in MHz (e.g. 7.155)")
}
mhz, err := strconv.ParseFloat(s, 64)
if err != nil || mhz <= 0 {
return 0, fmt.Errorf("invalid frequency %q — enter MHz, e.g. 7.155", value)
}
hz := int64(math.Round(mhz * 1_000_000))
band := cat.BandFromHz(hz)
if band == "" {
return 0, fmt.Errorf("%.4f MHz is not in a ham band", mhz)
}
n, err := a.qso.BulkSetFrequency(a.ctx, ids, hz, band)
if err != nil {
return 0, err
}
if n > 0 {
a.invalidateAwardStats()
a.materializeAwardRefsForIDs(ids) // band change may shift award slots → refresh
}
return n, nil
}
// WorkedBefore returns prior contacts with the given callsign at both // WorkedBefore returns prior contacts with the given callsign at both
// call and DXCC granularity. Pass dxccHint=0 when unknown — the function // call and DXCC granularity. Pass dxccHint=0 when unknown — the function
// will infer it from past QSOs with the same call when possible. // will infer it from past QSOs with the same call when possible.
@@ -5204,6 +5262,19 @@ func (a *App) SetCompactMode(on bool) {
if a.ctx == nil { if a.ctx == nil {
return return
} }
if on && !a.compact {
// Capture the normal geometry BEFORE shrinking, so leaving compact puts
// the window back exactly where and how big it was.
a.preCompactMax = wruntime.WindowIsMaximised(a.ctx)
if a.preCompactMax {
// Unmaximise first: the size/position of a maximised window are the
// monitor's, not the user's chosen geometry.
wruntime.WindowUnmaximise(a.ctx)
}
a.preCompactW, a.preCompactH = wruntime.WindowGetSize(a.ctx)
a.preCompactX, a.preCompactY = wruntime.WindowGetPosition(a.ctx)
a.preCompactValid = a.preCompactW >= normalMinW && a.preCompactH >= normalMinH
}
a.compact = on a.compact = on
if on { if on {
// Lock the window to the compact size by pinning min == max. Without // Lock the window to the compact size by pinning min == max. Without
@@ -5218,9 +5289,18 @@ func (a *App) SetCompactMode(on bool) {
// Release the lock first (raise the max) before growing back. // Release the lock first (raise the max) before growing back.
wruntime.WindowSetMaxSize(a.ctx, maxW, maxH) wruntime.WindowSetMaxSize(a.ctx, maxW, maxH)
wruntime.WindowSetMinSize(a.ctx, normalMinW, normalMinH) wruntime.WindowSetMinSize(a.ctx, normalMinW, normalMinH)
if a.preCompactValid {
wruntime.WindowSetSize(a.ctx, a.preCompactW, a.preCompactH)
wruntime.WindowSetPosition(a.ctx, a.preCompactX, a.preCompactY)
if a.preCompactMax {
wruntime.WindowMaximise(a.ctx)
}
} else {
// Nothing captured (compact since launch) — fall back to the default.
wruntime.WindowSetSize(a.ctx, normalW, normalH) wruntime.WindowSetSize(a.ctx, normalW, normalH)
} }
} }
}
// DeleteAllQSO wipes every QSO. Returns the number of rows removed. // DeleteAllQSO wipes every QSO. Returns the number of rows removed.
// The frontend MUST gate this behind a strong confirmation prompt. // The frontend MUST gate this behind a strong confirmation prompt.
@@ -6184,19 +6264,14 @@ func (a *App) saveQSORecording(q *qso.QSO) {
return return
} }
// Stamp the recording's path on the QSO now, synchronously, so it's set // Stamp the recording's path on the in-memory QSO now (the encode goroutine
// before the eQSL auto-send reads the QSO (their full-row Updates would // reads it). The DB write is deferred into that goroutine so this stays OFF
// otherwise race and clobber each other's extras). // the critical logging path — saveQSORecording is now called synchronously.
if q.ID != 0 { if q.ID != 0 {
if q.Extras == nil { if q.Extras == nil {
q.Extras = map[string]string{} q.Extras = map[string]string{}
} }
q.Extras["APP_OPSLOG_RECORDING"] = name // in-memory copy for the encode goroutine q.Extras["APP_OPSLOG_RECORDING"] = name
// Persist ONLY this extras key (targeted) — a full-row Update from this
// in-memory copy could revert a column a concurrent post-log action changed.
if err := a.qso.SetExtra(a.ctx, q.ID, "APP_OPSLOG_RECORDING", name); err != nil {
applog.Printf("qso-rec: store recording path: %v", err)
}
} }
// Clone the QSO for the goroutine with its OWN copy of the Extras map: a // Clone the QSO for the goroutine with its OWN copy of the Extras map: a
@@ -6222,6 +6297,13 @@ func (a *App) saveQSORecording(q *qso.QSO) {
applog.Printf("qso-rec: save failed: %v", err) applog.Printf("qso-rec: save failed: %v", err)
return return
} }
// Persist the recording path (targeted extras write) now that the file
// exists — off the critical path, so a busy MySQL never delays logging.
if qc.ID != 0 {
if err := a.qso.SetExtra(a.ctx, qc.ID, "APP_OPSLOG_RECORDING", name); err != nil {
applog.Printf("qso-rec: store recording path: %v", err)
}
}
applog.Printf("qso-rec: saved %s", path) applog.Printf("qso-rec: saved %s", path)
// Auto-send the recording once the file exists. Gated ONLY on its own // Auto-send the recording once the file exists. Gated ONLY on its own
// "auto-send recording" toggle (email.auto_send) — NOT the SMTP panel's // "auto-send recording" toggle (email.auto_send) — NOT the SMTP panel's
@@ -6442,11 +6524,15 @@ func (a *App) clusterEventWorker() {
} }
// Fire any matching alert rules (sound / visual / e-mail). // Fire any matching alert rules (sound / visual / e-mail).
a.evaluateAlerts(s) a.evaluateAlerts(s)
// Mirror the spot onto the FlexRadio panadapter when enabled. // Mirror the spot onto the FlexRadio panadapter when enabled. Infer the
// mode (from the comment, else the band plan) so clicking the spot on the
// panadapter tunes AND switches mode — a DX cluster line carries no mode,
// so without this the radio only moved frequency.
if a.catFlexSpots && a.cat != nil { if a.catFlexSpots && a.cat != nil {
a.cat.SendSpot(cat.SpotInfo{ a.cat.SendSpot(cat.SpotInfo{
FreqHz: s.FreqHz, FreqHz: s.FreqHz,
Callsign: s.DXCall, Callsign: s.DXCall,
Mode: alerts.InferMode(s.Comment, s.FreqHz),
Comment: s.Comment, Comment: s.Comment,
}) })
} }
@@ -7125,6 +7211,55 @@ func (a *App) SendQSORecordingEmail(id int64) error {
return nil return nil
} }
// developerEmail is where "Help → Send log to F4BPO" delivers diagnostic logs.
const developerEmail = "[email protected]"
// SMTPConfigured reports whether an SMTP server is set up, so the UI can show the
// "Send log to F4BPO" help entry only when there's actually a way to send.
func (a *App) SMTPConfigured() bool {
s, _ := a.GetEmailSettings()
return strings.TrimSpace(s.Host) != ""
}
// SendLogToDeveloper e-mails the app's diagnostic logs (opslog.log, the previous
// session's opslog.log.1, and any crash log) to the developer so problems users
// hit in the field can be diagnosed. Requires a configured SMTP server
// (Settings → E-mail). A short header identifies the sender's call and version.
func (a *App) SendLogToDeveloper() error {
s, _ := a.GetEmailSettings()
if strings.TrimSpace(s.Host) == "" {
return fmt.Errorf("no SMTP server configured — set one in Settings → E-mail")
}
logPath := applog.Path()
if logPath == "" {
return fmt.Errorf("log file not available")
}
// The current log, plus the rotated one and the crash log when they exist.
attach := []string{logPath}
for _, extra := range []string{logPath + ".1", filepath.Join(filepath.Dir(logPath), "opslog-crash.log")} {
if _, err := os.Stat(extra); err == nil {
attach = append(attach, extra)
}
}
call := ""
if a.profiles != nil {
if p, err := a.profiles.Active(a.ctx); err == nil {
call = p.Callsign
}
}
subject := fmt.Sprintf("OpsLog log — v%s", appVersion)
if call != "" {
subject = fmt.Sprintf("OpsLog log — %s v%s", call, appVersion)
}
body := fmt.Sprintf("OpsLog diagnostic log attached.\n\nCallsign: %s\nVersion: %s\n\n73", call, appVersion)
if err := email.SendFiles(a.emailConfig(s), developerEmail, subject, body, attach); err != nil {
applog.Printf("email: send log to developer failed: %v", err)
return err
}
applog.Printf("email: diagnostic log sent to developer (%s)", developerEmail)
return nil
}
// ── ClubLog Country File (cty.xml) exceptions ───────────────────────── // ── ClubLog Country File (cty.xml) exceptions ─────────────────────────
// ClublogCtyInfo is the UI status of the ClubLog exception data. // ClublogCtyInfo is the UI status of the ClubLog exception data.
@@ -8160,6 +8295,12 @@ func (a *App) runManualUpload(svc extsvc.Service, ids []int64, cfg extsvc.Extern
msg = err.Error() msg = err.Error()
} }
emit("LoTW upload failed: " + msg) emit("LoTW upload failed: " + msg)
// The qslmgr:log console is only visible in the QSL Manager — a failure
// triggered from the Recent QSOs right-click was completely silent, which
// read as "send to LoTW does nothing". Surface it as a toast too.
if a.ctx != nil {
wruntime.EventsEmit(a.ctx, "toast", "LoTW upload failed: "+msg)
}
} else { } else {
for _, id := range ids { for _, id := range ids {
a.markExtUploaded(svc, id, "") a.markExtUploaded(svc, id, "")
@@ -8314,6 +8455,16 @@ func (a *App) runManualUpload(svc extsvc.Service, ids []int64, cfg extsvc.Extern
} }
if a.ctx != nil { if a.ctx != nil {
wruntime.EventsEmit(a.ctx, "qslmgr:done", map[string]any{"uploaded": uploaded, "total": len(ids)}) wruntime.EventsEmit(a.ctx, "qslmgr:done", map[string]any{"uploaded": uploaded, "total": len(ids)})
// Always end with a visible summary — the right-click "Send to …" runs in
// the background and the per-QSO log lives in the QSL Manager console.
label := map[extsvc.Service]string{
extsvc.ServiceQRZ: "QRZ.com", extsvc.ServiceClublog: "Club Log", extsvc.ServiceHRDLog: "HRDLog",
extsvc.ServiceLoTW: "LoTW", extsvc.ServiceEQSL: "eQSL",
}[svc]
if label == "" {
label = string(svc)
}
wruntime.EventsEmit(a.ctx, "toast", fmt.Sprintf("%s: %d/%d QSO uploaded", label, uploaded, len(ids)))
} }
} }
@@ -10839,6 +10990,86 @@ func (a *App) FlexSetWNBLevel(l int) error {
} }
return a.cat.FlexDo(func(fc cat.FlexController) error { return fc.SetWNBLevel(l) }) return a.cat.FlexDo(func(fc cat.FlexController) error { return fc.SetWNBLevel(l) })
} }
// ── SmartSDR v4 DSP (8000/Aurora series): NRL / ANFL / NRS / RNN / ANFT / NRF ──
func (a *App) FlexSetLMSNR(on bool) error {
if a.cat == nil {
return fmt.Errorf("cat not initialized")
}
return a.cat.FlexDo(func(fc cat.FlexController) error { return fc.SetLMSNR(on) })
}
func (a *App) FlexSetLMSNRLevel(l int) error {
if a.cat == nil {
return fmt.Errorf("cat not initialized")
}
return a.cat.FlexDo(func(fc cat.FlexController) error { return fc.SetLMSNRLevel(l) })
}
func (a *App) FlexSetLMSANF(on bool) error {
if a.cat == nil {
return fmt.Errorf("cat not initialized")
}
return a.cat.FlexDo(func(fc cat.FlexController) error { return fc.SetLMSANF(on) })
}
func (a *App) FlexSetLMSANFLevel(l int) error {
if a.cat == nil {
return fmt.Errorf("cat not initialized")
}
return a.cat.FlexDo(func(fc cat.FlexController) error { return fc.SetLMSANFLevel(l) })
}
func (a *App) FlexSetSpeexNR(on bool) error {
if a.cat == nil {
return fmt.Errorf("cat not initialized")
}
return a.cat.FlexDo(func(fc cat.FlexController) error { return fc.SetSpeexNR(on) })
}
func (a *App) FlexSetSpeexNRLevel(l int) error {
if a.cat == nil {
return fmt.Errorf("cat not initialized")
}
return a.cat.FlexDo(func(fc cat.FlexController) error { return fc.SetSpeexNRLevel(l) })
}
func (a *App) FlexSetRNN(on bool) error {
if a.cat == nil {
return fmt.Errorf("cat not initialized")
}
return a.cat.FlexDo(func(fc cat.FlexController) error { return fc.SetRNN(on) })
}
func (a *App) FlexSetANFT(on bool) error {
if a.cat == nil {
return fmt.Errorf("cat not initialized")
}
return a.cat.FlexDo(func(fc cat.FlexController) error { return fc.SetANFT(on) })
}
func (a *App) FlexSetNRF(on bool) error {
if a.cat == nil {
return fmt.Errorf("cat not initialized")
}
return a.cat.FlexDo(func(fc cat.FlexController) error { return fc.SetNRF(on) })
}
func (a *App) FlexSetNRFLevel(l int) error {
if a.cat == nil {
return fmt.Errorf("cat not initialized")
}
return a.cat.FlexDo(func(fc cat.FlexController) error { return fc.SetNRFLevel(l) })
}
// FlexSetDAX routes the active slice's audio to a DAX channel (0 = off, 1-8).
func (a *App) FlexSetDAX(ch int) error {
if a.cat == nil {
return fmt.Errorf("cat not initialized")
}
return a.cat.FlexDo(func(fc cat.FlexController) error { return fc.SetDAX(ch) })
}
// FlexSetTXDAX toggles DAX as the transmit audio source — SmartSDR's
// transmit-bar DAX button (what WSJT-X TX audio goes through).
func (a *App) FlexSetTXDAX(on bool) error {
if a.cat == nil {
return fmt.Errorf("cat not initialized")
}
return a.cat.FlexDo(func(fc cat.FlexController) error { return fc.SetTXDAX(on) })
}
func (a *App) FlexSetTXFilter(low, high int) error { func (a *App) FlexSetTXFilter(low, high int) error {
if a.cat == nil { if a.cat == nil {
return fmt.Errorf("cat not initialized") return fmt.Errorf("cat not initialized")
@@ -12403,53 +12634,288 @@ func (a *App) SavePGXLSettings(s PGXLSettings) error {
return err return err
} }
} }
a.startPGXL() a.startAmps()
return nil return nil
} }
// startPGXL stops any existing client and starts a fresh one if enabled. // ── Multiple amplifiers ────────────────────────────────────────────────
func (a *App) startPGXL() { // Operators can run SEVERAL amps (even two SPEs combined for more power), so
if a.pgxl != nil { // the config is a LIST. The legacy single-amp keyPGXL* settings migrate into
// entry #1 the first time the list is read. Each enabled entry gets its own
// client; the legacy a.pgxl/a.spe/a.acom fields point at the FIRST enabled amp
// of each family so the pre-multi bindings (and the Flex-panel merge) keep
// working unchanged.
const keyAmpsList = "amps.json"
// AmpConfig is one configured amplifier in Settings → Amplifier.
type AmpConfig struct {
ID string `json:"id"`
Name string `json:"name"` // user label, e.g. "SPE left"
Enabled bool `json:"enabled"`
Type string `json:"type"` // "pgxl" | "spe13"|"spe15"|"spe2k" | "acom500"…"acom2020"
Transport string `json:"transport"` // "tcp" | "serial"
Host string `json:"host"`
Port int `json:"port"`
ComPort string `json:"com_port"`
Baud int `json:"baud"`
}
type ampInst struct {
cfg AmpConfig
pgxl *powergenius.Client
spe *spe.Client
acom *acom.Client
}
func (i *ampInst) stopAll() {
if i.pgxl != nil {
i.pgxl.Stop()
}
if i.spe != nil {
i.spe.Stop()
}
if i.acom != nil {
i.acom.Stop()
}
}
// ampTypeLabel is the default display name for an amp type.
func ampTypeLabel(t string) string {
switch {
case t == "" || t == "pgxl":
return "PowerGenius XL"
case strings.HasPrefix(t, "spe"):
return "SPE " + map[string]string{"spe13": "1.3K-FA", "spe15": "1.5K-FA", "spe2k": "2K-FA"}[t]
case strings.HasPrefix(t, "acom"):
return "ACOM " + strings.TrimPrefix(t, "acom") + "S"
}
return t
}
// GetAmplifiers returns the configured amplifier list. When none was ever
// saved, the legacy single-amp settings (if any) are presented as entry #1 —
// persisted on the next SaveAmplifiers.
func (a *App) GetAmplifiers() ([]AmpConfig, error) {
if a.settings == nil {
return nil, fmt.Errorf("db not initialized")
}
raw, _ := a.settings.Get(a.ctx, keyAmpsList)
if strings.TrimSpace(raw) != "" {
var list []AmpConfig
if err := json.Unmarshal([]byte(raw), &list); err == nil {
return list, nil
}
}
s, err := a.GetPGXLSettings()
if err != nil || (!s.Enabled && strings.TrimSpace(s.Host) == "" && strings.TrimSpace(s.ComPort) == "") {
return []AmpConfig{}, nil // never configured
}
return []AmpConfig{{
ID: "amp-1", Name: ampTypeLabel(s.Type), Enabled: s.Enabled,
Type: s.Type, Transport: s.Transport, Host: s.Host, Port: s.Port, ComPort: s.ComPort, Baud: s.Baud,
}}, nil
}
// SaveAmplifiers persists the amplifier list and (re)starts the clients.
func (a *App) SaveAmplifiers(list []AmpConfig) error {
if a.settings == nil {
return fmt.Errorf("db not initialized")
}
for i := range list {
c := &list[i]
if strings.TrimSpace(c.ID) == "" {
c.ID = fmt.Sprintf("amp-%d-%d", time.Now().Unix(), i)
}
if c.Type == "" {
c.Type = "pgxl"
}
if c.Type == "pgxl" || c.Transport != "serial" {
c.Transport = "tcp"
}
if c.Port <= 0 || c.Port > 65535 {
c.Port = 9008
}
if c.Baud <= 0 {
if strings.HasPrefix(c.Type, "acom") {
c.Baud = 9600
} else {
c.Baud = 115200
}
}
if strings.TrimSpace(c.Name) == "" {
c.Name = ampTypeLabel(c.Type)
}
}
b, err := json.Marshal(list)
if err != nil {
return err
}
if err := a.settings.Set(a.ctx, keyAmpsList, string(b)); err != nil {
return err
}
a.startAmps()
return nil
}
// startAmps stops every running amp client and starts one per enabled entry.
func (a *App) startAmps() {
a.ampsMu.Lock()
old := a.ampInsts
a.ampInsts = map[string]*ampInst{}
a.ampsMu.Unlock()
for _, inst := range old {
// Stop() can block up to the dial timeout waiting for an in-progress // Stop() can block up to the dial timeout waiting for an in-progress
// connect; tear down in the background so saving Settings (this runs on // connect; tear down in the background so saving Settings (this runs on
// the Wails RPC goroutine) doesn't freeze the UI. // the Wails RPC goroutine) doesn't freeze the UI.
go a.pgxl.Stop() go inst.stopAll()
a.pgxl = nil
} }
if a.spe != nil { a.pgxl, a.spe, a.acom = nil, nil, nil
go a.spe.Stop() list, err := a.GetAmplifiers()
a.spe = nil if err != nil {
}
if a.acom != nil {
go a.acom.Stop()
a.acom = nil
}
s, err := a.GetPGXLSettings()
if err != nil || !s.Enabled {
return return
} }
if s.Type == "" || s.Type == "pgxl" { for _, c := range list {
if strings.TrimSpace(s.Host) == "" { if !c.Enabled {
return continue
} }
a.pgxl = powergenius.New(s.Host, s.Port) isPGXL := c.Type == "" || c.Type == "pgxl"
_ = a.pgxl.Start() if !isPGXL && c.Transport == "serial" && strings.TrimSpace(c.ComPort) == "" {
return continue
} }
// SPE Expert / ACOM — USB serial or an RS232-to-Ethernet bridge. if (isPGXL || c.Transport == "tcp") && strings.TrimSpace(c.Host) == "" {
if s.Transport == "serial" && strings.TrimSpace(s.ComPort) == "" { continue
return
} }
if s.Transport == "tcp" && strings.TrimSpace(s.Host) == "" { inst := &ampInst{cfg: c}
return switch {
case isPGXL:
inst.pgxl = powergenius.New(c.Host, c.Port)
_ = inst.pgxl.Start()
if a.pgxl == nil {
a.pgxl = inst.pgxl
} }
if model, ok := strings.CutPrefix(s.Type, "acom"); ok { case strings.HasPrefix(c.Type, "acom"):
a.acom = acom.New(acom.Config{Model: model + "S", Transport: s.Transport, ComPort: s.ComPort, Baud: s.Baud, Host: s.Host, Port: s.Port}) inst.acom = acom.New(acom.Config{Model: strings.TrimPrefix(c.Type, "acom") + "S", Transport: c.Transport, ComPort: c.ComPort, Baud: c.Baud, Host: c.Host, Port: c.Port})
_ = a.acom.Start() _ = inst.acom.Start()
return if a.acom == nil {
a.acom = inst.acom
} }
a.spe = spe.New(spe.Config{Transport: s.Transport, ComPort: s.ComPort, Baud: s.Baud, Host: s.Host, Port: s.Port}) default: // spe*
_ = a.spe.Start() inst.spe = spe.New(spe.Config{Transport: c.Transport, ComPort: c.ComPort, Baud: c.Baud, Host: c.Host, Port: c.Port})
_ = inst.spe.Start()
if a.spe == nil {
a.spe = inst.spe
}
}
a.ampsMu.Lock()
a.ampInsts[c.ID] = inst
a.ampsMu.Unlock()
}
}
// AmpStatus is one amp's live state for the UI poll — exactly one of the
// per-family payloads is set, per the amp's type.
type AmpStatus struct {
ID string `json:"id"`
Name string `json:"name"`
Type string `json:"type"`
PGXL *powergenius.Status `json:"pgxl,omitempty"`
SPE *spe.Status `json:"spe,omitempty"`
ACOM *acom.Status `json:"acom,omitempty"`
}
// GetAmpStatuses returns the live state of every ENABLED amplifier, in the
// configured order — one poll feeds every amp card and the status-bar chips.
func (a *App) GetAmpStatuses() []AmpStatus {
list, _ := a.GetAmplifiers()
a.ampsMu.Lock()
insts := a.ampInsts
a.ampsMu.Unlock()
out := []AmpStatus{}
for _, c := range list {
if !c.Enabled {
continue
}
st := AmpStatus{ID: c.ID, Name: c.Name, Type: c.Type}
if inst, ok := insts[c.ID]; ok {
switch {
case inst.pgxl != nil:
v := inst.pgxl.GetStatus()
st.PGXL = &v
case inst.spe != nil:
v := inst.spe.GetStatus()
st.SPE = &v
case inst.acom != nil:
v := inst.acom.GetStatus()
st.ACOM = &v
}
}
out = append(out, st)
}
return out
}
func (a *App) ampInstByID(id string) *ampInst {
a.ampsMu.Lock()
defer a.ampsMu.Unlock()
return a.ampInsts[id]
}
// AmpOperate puts the given amp in OPERATE (true) or STANDBY (false).
func (a *App) AmpOperate(id string, on bool) error {
inst := a.ampInstByID(id)
if inst == nil {
return fmt.Errorf("amplifier not running — check Settings → Amplifier")
}
switch {
case inst.pgxl != nil:
return inst.pgxl.SetOperate(on)
case inst.spe != nil:
return inst.spe.Operate(on)
case inst.acom != nil:
return inst.acom.Operate(on)
}
return fmt.Errorf("amplifier not running")
}
// AmpPower turns the given amp on/off (SPE and ACOM; the PGXL has no power
// command on its direct link).
func (a *App) AmpPower(id string, on bool) error {
inst := a.ampInstByID(id)
if inst == nil {
return fmt.Errorf("amplifier not running — check Settings → Amplifier")
}
switch {
case inst.spe != nil:
if on {
return inst.spe.PowerOn()
}
return inst.spe.PowerOff()
case inst.acom != nil:
if on {
return inst.acom.PowerOn()
}
return inst.acom.PowerOff()
}
return fmt.Errorf("power on/off is not available for this amplifier")
}
// AmpPowerLevel selects the output power level — SPE only (L/M/H).
func (a *App) AmpPowerLevel(id, level string) error {
inst := a.ampInstByID(id)
if inst == nil || inst.spe == nil {
return fmt.Errorf("power level is an SPE feature")
}
return inst.spe.SetPowerLevel(level)
}
// AmpFanMode sets the fan mode — PGXL only (STANDARD/CONTEST/BROADCAST).
func (a *App) AmpFanMode(id, mode string) error {
inst := a.ampInstByID(id)
if inst == nil || inst.pgxl == nil {
return fmt.Errorf("fan mode is a PowerGenius feature")
}
return inst.pgxl.SetFanMode(mode)
} }
// GetSPEStatus returns the SPE Expert amplifier state for the UI poll. // GetSPEStatus returns the SPE Expert amplifier state for the UI poll.
@@ -13065,7 +13531,14 @@ func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus {
} }
return 0 return 0
} }
entities, err := a.qso.EntitySlotMap(a.ctx, keyFor) // Optional digital-mode grouping (Settings → General): with it on, FT8/FT4/
// RTTY… all count as ONE "DIG" mode, so an FT4 spot on a band where FT8 was
// worked shows "worked", not "new-slot" — DXCC-style mode classes.
var normMode func(string) string
if a.groupDigitalSlots() {
normMode = qso.GroupDigitalMode
}
entities, err := a.qso.EntitySlotMap(a.ctx, keyFor, normMode)
if err != nil { if err != nil {
return out return out
} }
@@ -13133,12 +13606,17 @@ func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus {
} }
// Band already worked. If this MODE was never worked on the entity (any // Band already worked. If this MODE was never worked on the entity (any
// band) → new-mode. If the mode was worked elsewhere but not on THIS // band) → new-mode. If the mode was worked elsewhere but not on THIS
// band+mode → new-slot. Otherwise → worked. // band+mode → new-slot. Otherwise → worked. The check mode goes through
if _, m := e.Modes[out[i].Mode]; !m { // the same normaliser as the slot map (digital grouping).
checkMode := out[i].Mode
if normMode != nil {
checkMode = normMode(checkMode)
}
if _, m := e.Modes[checkMode]; !m {
out[i].Status = "new-mode" out[i].Status = "new-mode"
continue continue
} }
if _, ok := e.Slots[out[i].Band][out[i].Mode]; !ok { if _, ok := e.Slots[out[i].Band][checkMode]; !ok {
out[i].Status = "new-slot" out[i].Status = "new-slot"
continue continue
} }
+64
View File
@@ -1,4 +1,68 @@
[ [
{
"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", "version": "0.20.8",
"date": "2026-07-21", "date": "2026-07-21",
+164 -53
View File
@@ -14,6 +14,7 @@ import {
UpdateQSOsFromCty, UpdateQSOsFromQRZ, UpdateQSOsFromClublog, UploadQSOsManual, SendQSORecordingEmail, UpdateQSOsFromCty, UpdateQSOsFromQRZ, UpdateQSOsFromClublog, UploadQSOsManual, SendQSORecordingEmail,
LookupCallsign, GetStationSettings, GetListsSettings, LookupCallsign, GetStationSettings, GetListsSettings,
GetStartupStatus, CheckForUpdate, DownloadAndApplyUpdate, GetLiveStations, GetWhatsNew, GetChangelog, GetStartupStatus, CheckForUpdate, DownloadAndApplyUpdate, GetLiveStations, GetWhatsNew, GetChangelog,
SMTPConfigured, SendLogToDeveloper,
WorkedBefore, WorkedBefore,
SetCompactMode, SetCompactMode,
GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, FlexApplyBandAntenna, GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, FlexApplyBandAntenna,
@@ -43,7 +44,8 @@ import {
GetAwardDefs, GetAwardDefs,
GetUIPref, GetActiveProfile, QuitApp, GetUIPref, GetActiveProfile, QuitApp,
ReportLiveActivity, LiveLastQSOAgeSec, ReportLiveActivity, LiveLastQSOAgeSec,
GetPGXLSettings, GetPGXLStatus, GetSPEStatus, GetACOMStatus, SPESetOperate, ACOMSetOperate, PGXLSetOperate, GetAmpStatuses, AmpOperate,
GetFlexState, FlexAmpOperate,
} from '../wailsjs/go/main/App'; } from '../wailsjs/go/main/App';
import { Combobox } from '@/components/ui/combobox'; import { Combobox } from '@/components/ui/combobox';
import { applyAwardRefs } from '@/lib/awardRefs'; import { applyAwardRefs } from '@/lib/awardRefs';
@@ -115,6 +117,9 @@ type ModePreset = ModePresetForm;
type WB = WorkedBeforeView; type WB = WorkedBeforeView;
type CATState = Omit<catModels.RigState, 'convertValues'>; type CATState = Omit<catModels.RigState, 'convertValues'>;
// Safety cap on how many rows an ACTIVE filter may load (the normal row
// threshold is bypassed while filtering — see buildActiveFilter).
const FILTERED_LIMIT_CAP = 10000;
const DEFAULT_BANDS = ['160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','2m','70cm','23cm']; const DEFAULT_BANDS = ['160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','2m','70cm','23cm'];
const DEFAULT_MODES = ['SSB','CW','FT8','FT4','RTTY','PSK31','AM','FM','DIGITALVOICE']; const DEFAULT_MODES = ['SSB','CW','FT8','FT4','RTTY','PSK31','AM','FM','DIGITALVOICE'];
// Modes the QSO recorder captures (phone only). Mirrors recordableMode() in // Modes the QSO recorder captures (phone only). Mirrors recordableMode() in
@@ -437,27 +442,22 @@ export default function App() {
// click reverts the UI and the click looks like it did nothing. // click reverts the UI and the click looks like it did nothing.
const agPending = useRef<{ a?: { v: number; t: number }; b?: { v: number; t: number } }>({}); const agPending = useRef<{ a?: { v: number; t: number }; b?: { v: number; t: number } }>({});
const [dbConn, setDbConn] = useState<{ backend: string; label: string } | null>(null); const [dbConn, setDbConn] = useState<{ backend: string; label: string } | null>(null);
// Amplifier chip in the status bar: name + green OPERATE / orange STANDBY / // Amplifier chips in the status bar — ONE PER configured amp (several are
// red offline. Config re-read every 5s (so enabling the amp in Settings makes // possible: some ops run two SPEs in parallel). Green OPERATE / orange
// the chip appear); status polled every 2s while enabled. // STANDBY / red offline; click toggles. The Flex state rides along because a
const [ampCfg, setAmpCfg] = useState<{ enabled: boolean; type: string }>({ enabled: false, type: 'pgxl' }); // PGXL's OPERATE state comes from the radio when it reports the amp.
const [ampSt, setAmpSt] = useState<any>({ connected: false }); const [ampSts, setAmpSts] = useState<any[]>([]);
const [flexAmp, setFlexAmp] = useState<any>(null);
useEffect(() => { useEffect(() => {
let alive = true; let alive = true;
const load = () => GetPGXLSettings().then((s: any) => { if (alive) setAmpCfg({ enabled: !!s?.enabled, type: s?.type || 'pgxl' }); }).catch(() => {}); const tick = () => Promise.all([
load(); GetAmpStatuses().catch(() => []),
const id = window.setInterval(load, 5000); GetFlexState().catch(() => null),
return () => { alive = false; window.clearInterval(id); }; ]).then(([l, fx]: any[]) => { if (alive) { setAmpSts((l ?? []) as any[]); setFlexAmp(fx); } });
}, []);
useEffect(() => {
if (!ampCfg.enabled) { setAmpSt({ connected: false }); return; }
let alive = true;
const get = ampCfg.type === 'pgxl' ? GetPGXLStatus : ampCfg.type.startsWith('acom') ? GetACOMStatus : GetSPEStatus;
const tick = () => get().then((s: any) => alive && setAmpSt(s || { connected: false })).catch(() => {});
tick(); tick();
const id = window.setInterval(tick, 2000); const id = window.setInterval(tick, 2000);
return () => { alive = false; window.clearInterval(id); }; return () => { alive = false; window.clearInterval(id); };
}, [ampCfg.enabled, ampCfg.type]); }, []);
// Multi-op "who's on air" widget: every operator's live status from the shared // Multi-op "who's on air" widget: every operator's live status from the shared
// MySQL logbook (freq/mode/version). Only polled on a MySQL logbook. // MySQL logbook (freq/mode/version). Only polled on a MySQL logbook.
type LiveStation = { operator: string; station: string; freq_hz: number; band: string; mode: string; online: boolean; version: string; age_sec: number }; type LiveStation = { operator: string; station: string; freq_hz: number; band: string; mode: string; online: boolean; version: string; age_sec: number };
@@ -951,14 +951,19 @@ export default function App() {
const [contestTabEnabled, setContestTabEnabled] = useState(() => localStorage.getItem('opslog.contestTab') === '1'); const [contestTabEnabled, setContestTabEnabled] = useState(() => localStorage.getItem('opslog.contestTab') === '1');
useEffect(() => { localStorage.setItem('opslog.contestTab', contestTabEnabled ? '1' : '0'); }, [contestTabEnabled]); useEffect(() => { localStorage.setItem('opslog.contestTab', contestTabEnabled ? '1' : '0'); }, [contestTabEnabled]);
const [dvkEnabled, setDvkEnabled] = useState(false); // DVK panel open/closed — persisted like the other Tools toggles above so it
// survives a relaunch instead of resetting to closed.
const [dvkEnabled, setDvkEnabled] = useState(() => localStorage.getItem('opslog.dvkEnabled') === '1');
useEffect(() => { localStorage.setItem('opslog.dvkEnabled', dvkEnabled ? '1' : '0'); }, [dvkEnabled]);
const [dvkMsgs, setDvkMsgs] = useState<DVKMsg[]>([]); const [dvkMsgs, setDvkMsgs] = useState<DVKMsg[]>([]);
const [dvkStat, setDvkStat] = useState<DVKStat>({ recording: false, playing: false, rec_slot: 0 }); const [dvkStat, setDvkStat] = useState<DVKStat>({ recording: false, playing: false, rec_slot: 0 });
const dvkActiveRef = useRef(false); const dvkActiveRef = useRef(false);
const dvkPlayingRef = useRef(false); const dvkPlayingRef = useRef(false);
const dvkPlayRef = useRef<(slot: number) => void>(() => {}); const dvkPlayRef = useRef<(slot: number) => void>(() => {});
const dvkMsgsRef = useRef<DVKMsg[]>([]);
useEffect(() => { dvkActiveRef.current = dvkEnabled; }, [dvkEnabled]); useEffect(() => { dvkActiveRef.current = dvkEnabled; }, [dvkEnabled]);
useEffect(() => { dvkPlayingRef.current = dvkStat.playing; }, [dvkStat.playing]); useEffect(() => { dvkPlayingRef.current = dvkStat.playing; }, [dvkStat.playing]);
useEffect(() => { dvkMsgsRef.current = dvkMsgs; }, [dvkMsgs]);
useEffect(() => { useEffect(() => {
const off = EventsOn('audio:status', (s: any) => setDvkStat(s as DVKStat)); const off = EventsOn('audio:status', (s: any) => setDvkStat(s as DVKStat));
return () => { off?.(); }; return () => { off?.(); };
@@ -970,7 +975,48 @@ export default function App() {
reloadDvk(); reloadDvk();
GetDVKStatus().then((s) => setDvkStat(s as DVKStat)).catch(() => {}); GetDVKStatus().then((s) => setDvkStat(s as DVKStat)).catch(() => {});
}, [dvkEnabled, reloadDvk]); }, [dvkEnabled, reloadDvk]);
const dvkPlay = useCallback((slot: number) => { DVKPlay(slot).catch((e: any) => setError(String(e?.message ?? e))); }, []); // DVK auto-CQ: repeat a CQ voice message on a timer, like the CW keyer's
// auto-call. Only slots whose LABEL contains "CQ" loop; any other slot plays
// once (and stops a running loop), so a report doesn't keep repeating.
const [dvkAutoCq, setDvkAutoCq] = useState(() => localStorage.getItem('opslog.dvkAutoCq') === '1');
const [dvkAutoCqSecs, setDvkAutoCqSecs] = useState(() => Number(localStorage.getItem('opslog.dvkAutoCqSecs')) || 3);
const dvkAutoCqRef = useRef(dvkAutoCq);
const dvkAutoCqSecsRef = useRef(dvkAutoCqSecs);
const dvkAutoCqGenRef = useRef(0);
const dvkAutoCqSlotRef = useRef(-1);
useEffect(() => { dvkAutoCqRef.current = dvkAutoCq; localStorage.setItem('opslog.dvkAutoCq', dvkAutoCq ? '1' : '0'); }, [dvkAutoCq]);
useEffect(() => { dvkAutoCqSecsRef.current = dvkAutoCqSecs; localStorage.setItem('opslog.dvkAutoCqSecs', String(dvkAutoCqSecs)); }, [dvkAutoCqSecs]);
// The DVK is a VOICE keyer — transmitting it on CW/FT8/RTTY would key the rig
// with speech on a data slot. Only allow it on phone modes.
const isPhoneMode = (m: string) => RECORDABLE_MODES.has((m || '').toUpperCase());
const modeRef = useRef(mode);
useEffect(() => { modeRef.current = mode; }, [mode]);
function stopDvkAutoCq() { dvkAutoCqSlotRef.current = -1; dvkAutoCqGenRef.current++; }
async function runDvkAutoCq(slot: number) {
const gen = ++dvkAutoCqGenRef.current;
dvkAutoCqSlotRef.current = slot;
const sleep = (ms: number) => new Promise((r) => window.setTimeout(r, ms));
while (dvkAutoCqSlotRef.current === slot && gen === dvkAutoCqGenRef.current && dvkActiveRef.current) {
if (!isPhoneMode(modeRef.current)) { stopDvkAutoCq(); break; }
await DVKPlay(slot).catch(() => {});
await sleep(300); // let playback flip "playing" true
let guard = 0; // then wait for it to finish (cap ~90 s)
while (dvkPlayingRef.current && gen === dvkAutoCqGenRef.current && guard < 600) { await sleep(150); guard++; }
if (gen !== dvkAutoCqGenRef.current) break;
await sleep(Math.max(0, dvkAutoCqSecsRef.current) * 1000); // gap before the next CQ
}
}
const dvkPlay = useCallback((slot: number) => {
if (!isPhoneMode(modeRef.current)) { setError(t('dvkp.notPhone')); return; }
const m = dvkMsgsRef.current.find((x) => x.slot === slot);
const isCQ = (m?.label || '').toUpperCase().includes('CQ');
if (dvkAutoCqRef.current && isCQ) {
runDvkAutoCq(slot); // loop this CQ until Stop / a non-CQ slot / mode change
} else {
stopDvkAutoCq();
DVKPlay(slot).catch((e: any) => setError(String(e?.message ?? e)));
}
}, []);
useEffect(() => { dvkPlayRef.current = dvkPlay; }, [dvkPlay]); useEffect(() => { dvkPlayRef.current = dvkPlay; }, [dvkPlay]);
// Controlled active tab of the F1-F5 detail panel (so Ctrl+F1-F5 can switch // Controlled active tab of the F1-F5 detail panel (so Ctrl+F1-F5 can switch
// it from the keyboard without clashing with the F1-F12 keyer macros). // it from the keyboard without clashing with the F1-F12 keyer macros).
@@ -1188,6 +1234,15 @@ export default function App() {
useEffect(() => { useEffect(() => {
GetWhatsNew().then((e: any) => { if (Array.isArray(e) && e.length) setWhatsNew(e); }).catch(() => {}); GetWhatsNew().then((e: any) => { if (Array.isArray(e) && e.length) setWhatsNew(e); }).catch(() => {});
}, []); }, []);
// Whether an SMTP server is configured — gates the "Send log to F4BPO" help
// entry. Re-checked when the Settings modal closes (the user may have just set
// it up), so the entry appears without a restart.
const [smtpConfigured, setSmtpConfigured] = useState(false);
const [sendingLog, setSendingLog] = useState(false);
useEffect(() => {
if (showSettings) return; // re-check after closing Settings
SMTPConfigured().then((v: any) => setSmtpConfigured(!!v)).catch(() => {});
}, [showSettings]);
const [showDuplicates, setShowDuplicates] = useState(false); const [showDuplicates, setShowDuplicates] = useState(false);
const [updateInfo, setUpdateInfo] = useState<{ latest: string; url: string; downloadUrl: string } | null>(null); const [updateInfo, setUpdateInfo] = useState<{ latest: string; url: string; downloadUrl: string } | null>(null);
const [checkingUpdate, setCheckingUpdate] = useState(false); const [checkingUpdate, setCheckingUpdate] = useState(false);
@@ -1412,13 +1467,21 @@ export default function App() {
// The full filter sent to the backend = the builder conditions + the quick // The full filter sent to the backend = the builder conditions + the quick
// callsign search box (always ANDed) + the on-screen row threshold. // callsign search box (always ANDed) + the on-screen row threshold.
const buildActiveFilter = useCallback((): QueryFilter => ({ // When a filter is ACTIVE the row threshold is lifted to a high safety cap:
// the threshold exists to keep the UNFILTERED 30k-QSO log fast, but applying
// it to a filter meant "200 matches, only the first 100 shown". A filtered
// result set is almost always small, and the cap protects against a
// broad filter (e.g. band=20m) pulling half the log.
const buildActiveFilter = useCallback((): QueryFilter => {
const hasFilter = !!(filterCallsign || (activeFilter.conditions ?? []).length);
return {
quick_callsign: filterCallsign, quick_callsign: filterCallsign,
conditions: activeFilter.conditions ?? [], conditions: activeFilter.conditions ?? [],
match: activeFilter.match ?? 'AND', match: activeFilter.match ?? 'AND',
limit: qsoLimit, limit: hasFilter ? FILTERED_LIMIT_CAP : qsoLimit,
offset: 0, offset: 0,
}), [filterCallsign, activeFilter, qsoLimit]); };
}, [filterCallsign, activeFilter, qsoLimit]);
// refresh reloads the grid. Returns false on failure. When silent, it doesn't // refresh reloads the grid. Returns false on failure. When silent, it doesn't
// surface the error — used by the startup retry, since the logbook DB (a remote // surface the error — used by the startup retry, since the logbook DB (a remote
@@ -2859,9 +2922,15 @@ export default function App() {
]}, ]},
{ name: 'help', label: t('menu.help'), items: [ { name: 'help', label: t('menu.help'), items: [
{ type: 'item', label: t('whatsnew.title'), action: 'help.whatsnew' }, { type: 'item', label: t('whatsnew.title'), action: 'help.whatsnew' },
// Only when SMTP is set up: e-mail the diagnostic logs to the developer.
...(smtpConfigured ? [
{ type: 'separator' as const },
{ type: 'item' as const, label: sendingLog ? t('help.sendLogBusy') : t('help.sendLog'), action: 'help.sendlog', disabled: sendingLog },
] : []),
{ type: 'separator' },
{ type: 'item', label: t('help.about'), action: 'help.about' }, { type: 'item', label: t('help.about'), action: 'help.about' },
]}, ]},
], [total, selectedId, selectedIds, ctyRefreshing, refsDownloading, exporting, wkEnabled, dvkEnabled, netEnabled, contestTabEnabled, t]); ], [total, selectedId, selectedIds, ctyRefreshing, refsDownloading, exporting, wkEnabled, dvkEnabled, netEnabled, contestTabEnabled, smtpConfigured, sendingLog, t]);
function handleMenu(action: string) { function handleMenu(action: string) {
switch (action) { switch (action) {
@@ -2890,6 +2959,21 @@ export default function App() {
case 'tools.downloadRefs': downloadRefs(); break; case 'tools.downloadRefs': downloadRefs(); break;
case 'help.about': setShowAbout(true); checkUpdateNow(); break; case 'help.about': setShowAbout(true); checkUpdateNow(); break;
case 'help.whatsnew': GetChangelog().then((e: any) => { if (Array.isArray(e) && e.length) setWhatsNew(e); else showToast(t('whatsnew.none')); }).catch(() => {}); break; case 'help.whatsnew': GetChangelog().then((e: any) => { if (Array.isArray(e) && e.length) setWhatsNew(e); else showToast(t('whatsnew.none')); }).catch(() => {}); break;
case 'help.sendlog': sendLogToDeveloper(); break;
}
}
// E-mail the diagnostic logs to the developer (Help → Send log to F4BPO).
async function sendLogToDeveloper() {
if (sendingLog) return;
setSendingLog(true);
try {
await SendLogToDeveloper();
showToast(t('help.sendLogOk'));
} catch (e: any) {
showToast(t('help.sendLogFail', { err: String(e?.message ?? e) }));
} finally {
setSendingLog(false);
} }
} }
@@ -2933,8 +3017,10 @@ export default function App() {
// callsign depends on the "ESC clears callsign" option; with the keyer // callsign depends on the "ESC clears callsign" option; with the keyer
// off it always resets the entry (the classic behaviour). // off it always resets the entry (the classic behaviour).
if (e.key === 'Escape') { if (e.key === 'Escape') {
// If a voice message is transmitting, ESC just stops it (keeps entry). // If a voice message is transmitting (or auto-CQ is looping), ESC stops it
if (dvkActiveRef.current && dvkPlayingRef.current) { // and cancels the loop (keeps entry).
if (dvkActiveRef.current && (dvkPlayingRef.current || dvkAutoCqSlotRef.current >= 0)) {
stopDvkAutoCq();
DVKStop(); DVKStop();
e.preventDefault(); e.preventDefault();
return; return;
@@ -3710,7 +3796,12 @@ export default function App() {
case 'netcontrol': case 'netcontrol':
return ( return (
<div className="h-full w-full min-h-0 flex flex-col rounded-lg overflow-hidden border border-border"> <div className="h-full w-full min-h-0 flex flex-col rounded-lg overflow-hidden border border-border">
<NetControlPanel onLogged={refresh} countries={countries} bands={bands} modes={modes} /> <NetControlPanel onLogged={refresh} countries={countries} bands={bands} modes={modes}
qsoMenuHandlers={{
onUpdateFromCty: bulkUpdateFromCty, onUpdateFromQRZ: bulkUpdateFromQRZ, onUpdateFromClublog: bulkUpdateFromClublog,
onSendTo: bulkSendTo, onSendRecording: bulkSendRecording, onSendEQSL: (ids: number[]) => setEqslQsoId(ids[0] ?? null),
onDelete: (ids: number[]) => setDeletingIds(ids),
}} />
</div> </div>
); );
case 'recent': case 'recent':
@@ -4405,7 +4496,11 @@ export default function App() {
Digital Voice Keyer take this slot when enabled (Log4OM-style); Digital Voice Keyer take this slot when enabled (Log4OM-style);
otherwise it shows the QRZ profile photo. */} otherwise it shows the QRZ profile photo. */}
{!compact && (chatShown || wkEnabled || dvkEnabled || lookupResult?.image_url || (showRotor && (rotatorHeading.enabled || dxPath)) || (showAntGenius && agEnabled) || (showLiveStations && dbConn?.backend === 'mysql')) && ( {!compact && (chatShown || wkEnabled || dvkEnabled || lookupResult?.image_url || (showRotor && (rotatorHeading.enabled || dxPath)) || (showAntGenius && agEnabled) || (showLiveStations && dbConn?.backend === 'mysql')) && (
<div className="flex-1 min-w-0 min-h-0 flex gap-2.5 items-stretch"> // relative + absolute inner (like the F1-F5 panel): a taller widget (e.g.
// the DVK with Auto CQ) can't grow the row — the row height stays set by
// the entry strip and each widget fills that height, scrolling inside.
<div className="flex-1 min-w-0 min-h-0 relative">
<div className="absolute inset-0 flex gap-2.5 items-stretch">
{/* Multi-op "who's on air" widget: every operator on the shared logbook, {/* Multi-op "who's on air" widget: every operator on the shared logbook,
their freq/mode (colour-coded) and OpsLog version. */} their freq/mode (colour-coded) and OpsLog version. */}
{showLiveStations && dbConn?.backend === 'mysql' && ( {showLiveStations && dbConn?.backend === 'mysql' && (
@@ -4488,13 +4583,18 @@ export default function App() {
</div> </div>
)} )}
{dvkEnabled && ( {dvkEnabled && (
<div className="w-[264px] shrink-0 min-h-0"> <div className="w-[320px] shrink-0 min-h-0">
<DvkPanel <DvkPanel
messages={dvkMsgs} messages={dvkMsgs}
status={dvkStat} status={dvkStat}
onPlay={dvkPlay} onPlay={dvkPlay}
onStop={() => DVKStop()} onStop={() => { stopDvkAutoCq(); DVKStop(); }}
onClose={() => setDvkEnabled(false)} onClose={() => setDvkEnabled(false)}
autoCq={dvkAutoCq}
autoCqSecs={dvkAutoCqSecs}
onToggleAutoCq={setDvkAutoCq}
onSetAutoCqSecs={(n) => setDvkAutoCqSecs(Math.max(0, Math.min(120, n || 0)))}
phoneOk={isPhoneMode(mode)}
/> />
</div> </div>
)} )}
@@ -4559,6 +4659,7 @@ export default function App() {
</div> </div>
)} )}
</div> </div>
</div>
)} )}
</div>{/* /entry + aside row */} </div>{/* /entry + aside row */}
@@ -4777,9 +4878,13 @@ export default function App() {
)} )}
</div> </div>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
{qsos.length >= qsoLimit && qsos.length < total && ( {(activeFilter.conditions?.length || filterCallsign)
? (matchCount != null && matchCount > FILTERED_LIMIT_CAP && (
<span className="text-warning">{matchCount.toLocaleString('en-US')} matches only {FILTERED_LIMIT_CAP.toLocaleString('en-US')} shown, narrow the filter (or use the filtered ADIF export).</span>
))
: (qsos.length >= qsoLimit && qsos.length < total && (
<span className="text-warning">Limit reached raise Max to see more.</span> <span className="text-warning">Limit reached raise Max to see more.</span>
)} ))}
<Label className="text-[11px] text-muted-foreground">Max</Label> <Label className="text-[11px] text-muted-foreground">Max</Label>
<Input <Input
type="number" type="number"
@@ -5033,7 +5138,12 @@ export default function App() {
tune the rig. */} tune the rig. */}
{netEnabled && ( {netEnabled && (
<TabsContent value="net" className="mt-0 flex flex-col min-h-0 flex-1"> <TabsContent value="net" className="mt-0 flex flex-col min-h-0 flex-1">
<NetControlPanel onLogged={refresh} countries={countries} bands={bands} modes={modes} /> <NetControlPanel onLogged={refresh} countries={countries} bands={bands} modes={modes}
qsoMenuHandlers={{
onUpdateFromCty: bulkUpdateFromCty, onUpdateFromQRZ: bulkUpdateFromQRZ, onUpdateFromClublog: bulkUpdateFromClublog,
onSendTo: bulkSendTo, onSendRecording: bulkSendRecording, onSendEQSL: (ids: number[]) => setEqslQsoId(ids[0] ?? null),
onDelete: (ids: number[]) => setDeletingIds(ids),
}} />
</TabsContent> </TabsContent>
)} )}
@@ -5144,38 +5254,39 @@ export default function App() {
disabled={!rotatorHeading.enabled} disabled={!rotatorHeading.enabled}
onClick={() => { setSettingsSection('rotator'); setShowSettings(true); }} onClick={() => { setSettingsSection('rotator'); setShowSettings(true); }}
/> />
{/* Amplifier chip: green = OPERATE, orange = STANDBY, red = offline. {/* Amplifier chips one per configured amp: green = OPERATE, orange =
CLICK toggles OPERATE STANDBY on every backend (PGXL included STANDBY, red = offline. CLICK toggles OPERATE STANDBY (optimistic
its direct TCP link takes operate=0/1); optimistic flip, the 2s flip, the 2s poll reconciles); offline click opens the settings. */}
poll reconciles. Offline click opens the settings instead. */} {ampSts.map((a: any) => {
{ampCfg.enabled && (() => { const isPGXL = !a.spe && !a.acom;
const isPGXL = ampCfg.type === 'pgxl'; const viaFlex = isPGXL && !!flexAmp?.amp_available;
const name = isPGXL ? 'PGXL' const raw = a.spe ?? a.acom ?? a.pgxl ?? { connected: false };
: ampCfg.type.startsWith('acom') ? `ACOM ${ampSt.model || ''}`.trim() const connected = !!raw.connected || viaFlex;
: `SPE ${ampSt.model || ''}`.trim(); const operate = viaFlex ? !!flexAmp.amp_operate : !!raw.operate;
const dot = !ampSt.connected ? 'bg-danger' : ampSt.operate ? 'bg-success' : 'bg-warning'; const dot = !connected ? 'bg-danger' : operate ? 'bg-success' : 'bg-warning';
const state = !ampSt.connected ? (ampSt.last_error || 'offline') : ampSt.operate ? 'OPERATE' : 'STANDBY'; const state = !connected ? (raw.last_error || 'offline') : operate ? 'OPERATE' : 'STANDBY';
const toggle = () => { const toggle = () => {
// Offline — nothing to command; open the settings to fix the link. if (!connected) { setSettingsSection('pgxl'); setShowSettings(true); return; }
if (!ampSt.connected) { setSettingsSection('pgxl'); setShowSettings(true); return; } const want = !operate;
const want = !ampSt.operate; if (viaFlex) setFlexAmp((f: any) => ({ ...f, amp_operate: want }));
setAmpSt((s: any) => ({ ...s, operate: want })); else setAmpSts((l) => l.map((x: any) => x.id === a.id
(isPGXL ? PGXLSetOperate(want) ? { ...x, spe: x.spe && { ...x.spe, operate: want }, acom: x.acom && { ...x.acom, operate: want }, pgxl: x.pgxl && { ...x.pgxl, operate: want } }
: ampCfg.type.startsWith('acom') ? ACOMSetOperate(want) : x));
: SPESetOperate(want)).catch(() => {}); (viaFlex ? FlexAmpOperate(want) : AmpOperate(a.id, want)).catch(() => {});
}; };
return ( return (
<button <button
key={a.id}
type="button" type="button"
title={`${name}: ${state}${ampSt.connected ? (ampSt.operate ? ' — click for STANDBY' : ' — click for OPERATE') : ' — click for settings'}`} title={`${a.name}: ${state}${connected ? (operate ? ' — click for STANDBY' : ' — click for OPERATE') : ' — click for settings'}`}
onClick={toggle} onClick={toggle}
className="inline-flex items-center gap-1.5 px-2 h-5 rounded border text-[11px] transition-colors border-border hover:bg-muted cursor-pointer" className="inline-flex items-center gap-1.5 px-2 h-5 rounded border text-[11px] transition-colors border-border hover:bg-muted cursor-pointer"
> >
<span className={cn('size-2 rounded-full', dot)} /> <span className={cn('size-2 rounded-full', dot)} />
{name} {a.name}
</button> </button>
); );
})()} })}
{/* ON AIR badge: "did I log a QSO in the last 5 min" meaningful on ANY {/* ON AIR badge: "did I log a QSO in the last 5 min" meaningful on ANY
logbook backend (only the live_status PUBLISHING is MySQL-specific), logbook backend (only the live_status PUBLISHING is MySQL-specific),
so it is always shown. Gating it on MySQL made it vanish for so it is always shown. Gating it on MySQL made it vanish for
+260
View File
@@ -0,0 +1,260 @@
import { useRef } from 'react';
import { Flame } from 'lucide-react';
import { cn } from '@/lib/utils';
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.
const METER_SEGMENTS = 26;
function MeterBar({ label, value, unit, lo, hi, accent = '#16a34a', display, segColor, compact }: {
label: string; value: number; unit?: string; lo: number; hi: number; accent?: string; display?: string;
segColor?: (frac: number) => 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 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')}>
<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>
<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>
</div>
);
}
function Card({ icon: Icon, title, accent, children }: { icon: any; title: string; accent?: string; children: React.ReactNode }) {
return (
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden">
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
<Icon className="size-4" 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>
</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} 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} 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} 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} compact 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} compact label={m.name || `AMP ${m.id}`} value={peakHold(`amp${m.id}`, m.value)} unit={m.unit} lo={lo} hi={hi} accent={acc} />;
})}
</div>
);
})()}
</Card>
);
}
+13 -6
View File
@@ -109,14 +109,21 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
// "Newness" of the current band+mode entry, for the award/DX-chase badges. // "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 // Derived straight from the entity's real band_status (all bands it was
// worked on — not just the operator's configured column list). // worked on — not just the operator's configured column list).
// Newness uses the ACTUAL mode (FT8 / FT4 / RTTY…), not the PH/CW/DIG class: // By default newness uses the ACTUAL mode (FT8 / FT4 / RTTY…): DIG is a
// DIG is a group, so FT4 after FT8 is genuinely a new mode. dxcc_band_modes // group, so FT4 after FT8 is genuinely a new mode. The operator can opt into
// lists every real (band, mode) the entity was worked on. // 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 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 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 modeWorked = !!curMode && bandModes.some((bm) => normMode(bm.mode) === curMode); // …in this (normalised) mode (any band)
const slotWorked = !!curMode && bandModes.some((bm) => bm.band === currentBand && (bm.mode || '').toUpperCase() === curMode); 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 // Mutually-exclusive badges, shown only when the entity is worked but this
// exact band+mode is NOT yet: // exact band+mode is NOT yet:
// New Band & Mode = both the band AND the mode are new for this entity. // New Band & Mode = both the band AND the mode are new for this entity.
+7 -3
View File
@@ -12,7 +12,7 @@ import {
} from '@/components/ui/select'; } from '@/components/ui/select';
import { useI18n } from '@/lib/i18n'; 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 }; 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. // Fields a bulk edit may target. status → Y/N/R/I dropdown; text → free input.
@@ -74,6 +74,9 @@ const FIELDS: FieldDef[] = [
{ id: 'sig', label: 'bulk.fSig', group: 'Contacted station', kind: 'text' }, { id: 'sig', label: 'bulk.fSig', group: 'Contacted station', kind: 'text' },
{ id: 'sig_info', label: 'bulk.fSigInfo', group: 'Contacted station', kind: 'text' }, { id: 'sig_info', label: 'bulk.fSigInfo', group: 'Contacted station', kind: 'text' },
// Misc // 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: 'comment', label: 'bulk.fComment', group: 'Misc', kind: 'text' },
{ id: 'notes', label: 'bulk.fNotes', group: 'Misc', kind: 'text' }, { id: 'notes', label: 'bulk.fNotes', group: 'Misc', kind: 'text' },
{ id: 'rig', label: 'bulk.fRig', group: 'Misc', kind: 'text' }, { id: 'rig', label: 'bulk.fRig', group: 'Misc', kind: 'text' },
@@ -180,7 +183,8 @@ export function BulkEditModal({ open, ids, onClose, onApplied }: Props) {
<Input <Input
className="h-8 text-xs" className="h-8 text-xs"
value={textValue} 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)} onChange={(e) => setTextValue(def.upper ? e.target.value.toUpperCase() : e.target.value)}
/> />
)} )}
@@ -188,7 +192,7 @@ export function BulkEditModal({ open, ids, onClose, onApplied }: Props) {
<div className="text-[11px] text-muted-foreground"> <div className="text-[11px] text-muted-foreground">
{t('bulk.willSet')} <span className="font-semibold">{t(def.label)}</span> ={' '} {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> </div>
{error && <div className="text-xs text-danger">{error}</div>} {error && <div className="text-xs text-danger">{error}</div>}
</div> </div>
+10
View File
@@ -149,6 +149,16 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
headerName: t('clg2.c.time'), field: 'time_utc' as any, width: 80, cellClass: 'font-mono', headerName: t('clg2.c.time'), field: 'time_utc' as any, width: 80, cellClass: 'font-mono',
defaultVisible: true, defaultVisible: true,
sort: 'desc', 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)' }, cellStyle: { color: 'var(--muted-foreground)' },
}, },
{ {
+41 -10
View File
@@ -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 { Button } from '@/components/ui/button';
import { cn } from '@/lib/utils'; import { cn } from '@/lib/utils';
import { useI18n } from '@/lib/i18n'; import { useI18n } from '@/lib/i18n';
@@ -12,14 +12,20 @@ type Props = {
onPlay: (slot: number) => void; onPlay: (slot: number) => void;
onStop: () => void; onStop: () => void;
onClose: () => 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 F1F6 // Operating panel for the Digital Voice Keyer — transmits the recorded F1F6
// voice messages to the rig ("To Radio"). Mirrors the WinKeyer panel's slot in // voice messages to the rig ("To Radio"). Mirrors the WinKeyer panel's slot in
// the reserved area. Recording/labeling lives in Settings → Audio. // 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 { t } = useI18n();
const anyAudio = messages.some((m) => m.has_audio); const recorded = messages.filter((m) => m.has_audio);
const anyAudio = recorded.length > 0;
return ( return (
<div className="h-full flex flex-col rounded-lg border border-border bg-card shadow-sm overflow-hidden"> <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"> <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')} {t('dvkp.noMsgPre')} <strong>{t('dvkp.settingsPath')}</strong> {t('dvkp.noMsgPost')}
</div> </div>
) : ( ) : (
<div className="grid grid-cols-1 gap-1"> // Only the recorded slots are shown. Two columns filling top-to-bottom
{messages.map((m) => ( // (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 <button
key={m.slot} key={m.slot}
type="button" type="button"
disabled={!m.has_audio} disabled={!phoneOk}
onClick={() => onPlay(m.slot)} 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( className={cn(
'flex items-center gap-1.5 rounded-md border px-2 py-1 text-left transition-colors', '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-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', : '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="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> <span className="text-xs truncate flex-1">{m.label || t('dvkp.message')}</span>
{m.has_audio && <span className="text-[9px] text-muted-foreground shrink-0">{m.duration_sec.toFixed(1)}s</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> </button>
))} ))}
</div> </div>
)} )}
</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> </div>
); );
} }
+112 -58
View File
@@ -4,11 +4,13 @@ import {
GetFlexState, FlexSetPower, FlexSetTunePower, FlexTune, FlexSetVox, FlexSetVoxLevel, FlexSetVoxDelay, GetFlexState, FlexSetPower, FlexSetTunePower, FlexTune, FlexSetVox, FlexSetVoxLevel, FlexSetVoxDelay,
FlexSetProcessor, FlexSetProcessorLevel, FlexSetMon, FlexSetMonLevel, FlexSetMic, FlexSetProcessor, FlexSetProcessorLevel, FlexSetMon, FlexSetMonLevel, FlexSetMic,
FlexMox, FlexAmpOperate, FlexMox, FlexAmpOperate,
GetPGXLStatus, PGXLSetFanMode, GetPGXLSettings, GetSPEStatus, SPESetOperate, SPESetPower, SPESetPowerLevel, GetPGXLStatus, PGXLSetFanMode,
GetACOMStatus, ACOMSetOperate, ACOMSetPower, GetAmpStatuses, AmpOperate, AmpPower, AmpPowerLevel,
FlexSetAGCMode, FlexSetAGCThreshold, FlexSetAudioLevel, FlexSetMute, FlexSetRXAntenna, FlexSetTXAntenna, FlexSetSplit, FlexSetActiveSlice, FlexSetTXSlice, FlexSetAGCMode, FlexSetAGCThreshold, FlexSetAudioLevel, FlexSetMute, FlexSetRXAntenna, FlexSetTXAntenna, FlexSetSplit, FlexSetActiveSlice, FlexSetTXSlice,
FlexSetRIT, FlexSetRITFreq, FlexSetXIT, FlexSetXITFreq, FlexSetRIT, FlexSetRITFreq, FlexSetXIT, FlexSetXITFreq,
FlexSetNB, FlexSetNBLevel, FlexSetNR, FlexSetNRLevel, FlexSetANF, FlexSetANFLevel, FlexSetNB, FlexSetNBLevel, FlexSetNR, FlexSetNRLevel, FlexSetANF, FlexSetANFLevel,
FlexSetLMSNR, FlexSetLMSNRLevel, FlexSetLMSANF, FlexSetLMSANFLevel,
FlexSetSpeexNR, FlexSetSpeexNRLevel, FlexSetRNN, FlexSetANFT, FlexSetNRF, FlexSetNRFLevel, FlexSetTXDAX,
FlexSetWNB, FlexSetWNBLevel, FlexSetTXFilter, FlexSetMicProfile, FlexSetWNB, FlexSetWNBLevel, FlexSetTXFilter, FlexSetMicProfile,
FlexSetAPF, FlexSetAPFLevel, FlexSetCWSpeed, FlexSetCWPitch, FlexSetCWBreakInDelay, FlexSetAPF, FlexSetAPFLevel, FlexSetCWSpeed, FlexSetCWPitch, FlexSetCWBreakInDelay,
FlexSetCWSidetone, FlexSetSidetoneLevel, FlexSetCWFilter, FlexSetFilter, FlexSetCWSidetone, FlexSetSidetoneLevel, FlexSetCWFilter, FlexSetFilter,
@@ -31,6 +33,11 @@ type FlexState = {
rit: boolean; rit_freq: number; xit: boolean; xit_freq: number; 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; nb: boolean; nb_level: number; nr: boolean; nr_level: number; anf: boolean; anf_level: number;
wnb: boolean; wnb_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[]; tx_filter_low: number; tx_filter_high: number; mic_profile?: string; mic_profiles?: string[];
mode?: string; mode?: string;
cw_speed: number; cw_pitch: number; cw_break_in_delay: number; cw_sidetone: boolean; cw_mon_level: number; cw_speed: number; cw_pitch: number; cw_break_in_delay: number; cw_sidetone: boolean; cw_mon_level: number;
@@ -342,39 +349,31 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
return () => { alive = false; window.clearInterval(id); }; return () => { alive = false; window.clearInterval(id); };
}, []); }, []);
// Configured amplifier type (pgxl / spe*), so we show the SPE control when the // Configured amplifiers (Settings → Amplifier) — possibly SEVERAL (some ops
// operator runs an SPE Expert instead of the PowerGenius. // run two SPEs in parallel). The card shows ONE at a time; the dropdown picks
const [ampType, setAmpType] = useState<string>('pgxl'); // which, and the choice is remembered per panel.
const [ampEnabled, setAmpEnabled] = useState(false); const [ampList, setAmpList] = useState<any[]>([]);
const [ampSel, setAmpSel] = useState<string>(() => localStorage.getItem('opslog.ampSel.flex') || '');
useEffect(() => { useEffect(() => {
let alive = true; let alive = true;
const load = () => GetPGXLSettings().then((s: any) => { if (alive) { setAmpType(s?.type || 'pgxl'); setAmpEnabled(!!s?.enabled); } }).catch(() => {}); const tick = () => GetAmpStatuses().then((l: any) => alive && setAmpList((l ?? []) as any[])).catch(() => {});
load(); tick();
const id = window.setInterval(load, 5000); const id = window.setInterval(tick, 1500);
return () => { alive = false; window.clearInterval(id); }; return () => { alive = false; window.clearInterval(id); };
}, []); }, []);
const isACOM = ampEnabled && ampType.startsWith('acom'); const selAmp = ampList.find((a: any) => a.id === ampSel) ?? ampList[0];
const isSPE = ampEnabled && !isACOM && ampType !== 'pgxl'; const isSPE = !!selAmp?.spe;
// SPE Expert live status (only polled when an SPE amp is configured). const isACOM = !!selAmp?.acom;
const [spe, setSpe] = useState<any>({ connected: false }); const spe = selAmp?.spe ?? { connected: false };
useEffect(() => { const acom = selAmp?.acom ?? { connected: false };
if (!isSPE) return; const ampPicker = ampList.length > 1 && selAmp ? (
let alive = true; <select value={selAmp.id}
const tick = () => GetSPEStatus().then((s: any) => alive && setSpe(s || { connected: false })).catch(() => {}); onChange={(e) => { setAmpSel(e.target.value); localStorage.setItem('opslog.ampSel.flex', e.target.value); }}
tick(); title={t('flxp.ampPick')}
const id = window.setInterval(tick, 1500); className="h-8 rounded-md border border-border bg-card px-2 text-xs font-semibold outline-none">
return () => { alive = false; window.clearInterval(id); }; {ampList.map((a: any) => <option key={a.id} value={a.id}>{a.name}</option>)}
}, [isSPE]); </select>
// ACOM live status (only polled when an ACOM amp is configured). ) : null;
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 change = (key: keyof FlexState, val: number | boolean | string, send: () => Promise<any>) => { const change = (key: keyof FlexState, val: number | boolean | string, send: () => Promise<any>) => {
hold.current[key] = Date.now() + 900; hold.current[key] = Date.now() + 900;
@@ -556,11 +555,12 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
value={w} extra={isDbm(fwd) ? `${fwd.value.toFixed(1)} dBm` : undefined} /> value={w} extra={isDbm(fwd) ? `${fwd.value.toFixed(1)} dBm` : undefined} />
); })(), ); })(),
swr && <MeterBar key="w" label="SWR" value={peakHold('w', swr.value)} unit="" lo={1} hi={3} accent="#d97706" />, 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 input level in dBFS — SmartSDR's scale is -40…0 dB.
mic && <MeterBar key="mic" label="MIC" value={peakHold('mic', mic.value)} unit={mic.unit || 'dB'} lo={-40} hi={10} accent="#16a34a" 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')} />, segColor={(fr) => (fr >= 0.8 ? '#dc2626' : fr >= 0.7 ? '#f59e0b' : '#16a34a')} />,
// Speech compression (dB of gain reduction). // Speech compression — original working meter, only the top of the
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" />, // scale changed from the radio-reported 20 to 25 (SmartSDR's -25 max).
comp && <MeterBar key="comp" label="COMP" value={peakHold('comp', comp.value)} unit={comp.unit || 'dB'} lo={0} hi={25} accent="#0891b2" />,
].filter(Boolean); ].filter(Boolean);
return ( return (
<div className="grid grid-cols-2 sm:grid-cols-3 gap-2">{cur}</div> <div className="grid grid-cols-2 sm:grid-cols-3 gap-2">{cur}</div>
@@ -702,12 +702,24 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
onLevel={(v) => change('cw_mon_level', v, () => FlexSetSidetoneLevel(v))} /> onLevel={(v) => change('cw_mon_level', v, () => FlexSetSidetoneLevel(v))} />
</div> </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> </Card>
{/* RECEIVE */} {/* RECEIVE */}
<Card icon={AudioLines} title={t('flxp.receiveActive')} accent="#0891b2"> <Card icon={AudioLines} title={t('flxp.receiveActive')} accent="#0891b2">
{/* Antenna selection sits at the very top of the RX column. */}
{((st.ant_list?.length ?? 0) > 0 || (st.tx_ant_list?.length ?? 0) > 0) && ( {((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> <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"> <div className="flex items-center gap-1.5 flex-1 min-w-0">
<span className="text-[10px] text-muted-foreground">RX</span> <span className="text-[10px] text-muted-foreground">RX</span>
@@ -722,21 +734,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"> 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>)} {((st.tx_ant_list?.length ? st.tx_ant_list : st.ant_list) ?? []).map((a) => <option key={a} value={a}>{a}</option>)}
</select> </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>
</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"> <div className="flex items-center gap-2">
<span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground">AGC</span> <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} <Segmented value={(st.agc_mode || 'med').toLowerCase()} options={AGC} disabled={rxOff}
@@ -777,6 +785,49 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
onLevel={(v) => change('anf_level', v, () => FlexSetANFLevel(v))} /> onLevel={(v) => change('anf_level', v, () => FlexSetANFLevel(v))} />
)} )}
</div> </div>
{/* SmartSDR v4 DSP (8000/Aurora series) — NRL/ANFL (legacy LMS), NRS
(spectral subtraction), NRF (NR w/ filter), RNN (AI NR), ANFT (FFT
notch). Only shown when the radio actually reports these slice keys
(older 6000s never do). API keys per the FlexLib slice docs. */}
{st.dsp_v4 && (
<div className="border-t border-border/60 pt-3 space-y-3">
<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>
)}
{isCW && ( {isCW && (
<div className="border-t border-border/60 pt-3 space-y-3"> <div className="border-t border-border/60 pt-3 space-y-3">
<LevelRow label="APF" on={st.apf} disabled={rxOff} value={st.apf_level} accent="emerald" sliderAccent="#16a34a" <LevelRow label="APF" on={st.apf} disabled={rxOff} value={st.apf_level} accent="emerald" sliderAccent="#16a34a"
@@ -830,10 +881,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 The Flex doesn't report SPE amps, so this card is driven by OpsLog's own
SPE link rather than the Flex amplifier object. */} SPE link rather than the Flex amplifier object. */}
{isSPE && ( {isSPE && (
<Card icon={Flame} title={`${t('flxp.amplifier')} · SPE${spe.model ? ' ' + spe.model : ''}`} accent="#ea580c"> <Card icon={Flame} title={`${t('flxp.amplifier')} · ${selAmp?.name || `SPE${spe.model ? ' ' + spe.model : ''}`}`} accent="#ea580c">
<div className="flex items-center gap-3 flex-wrap"> <div className="flex items-center gap-3 flex-wrap">
{ampPicker}
<button type="button" disabled={!spe.connected} <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', 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 ? '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'} {spe.operate ? 'OPERATE' : 'STANDBY'}
@@ -841,10 +893,10 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
{/* Power ON / OFF (best-guess keystrokes from the APG — verify on hw). */} {/* 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"> <div className="inline-flex rounded-lg overflow-hidden border-2 border-success/70">
<button type="button" disabled={!spe.connected} <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> 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} <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> 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>
{/* Output power level: Low / Mid / High. */} {/* Output power level: Low / Mid / High. */}
@@ -853,7 +905,7 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
const active = (spe.power_level || '').trim().toUpperCase() === lvl; const active = (spe.power_level || '').trim().toUpperCase() === lvl;
return ( return (
<button key={lvl} type="button" disabled={!spe.connected} <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', 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')}> active ? 'bg-primary text-primary-foreground' : 'bg-card text-muted-foreground hover:bg-muted')}>
{powerLevelLabel(lvl)} {powerLevelLabel(lvl)}
@@ -887,10 +939,11 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
{/* ACOM amplifier (serial/TCP) — shown when it's the configured amp. Driven {/* 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). */} by OpsLog's own ACOM link (the Flex doesn't report ACOM amps). */}
{isACOM && ( {isACOM && (
<Card icon={Flame} title={`${t('flxp.amplifier')} · ACOM${acom.model ? ' ' + acom.model : ''}`} accent="#ea580c"> <Card icon={Flame} title={`${t('flxp.amplifier')} · ${selAmp?.name || `ACOM${acom.model ? ' ' + acom.model : ''}`}`} accent="#ea580c">
<div className="flex items-center gap-3 flex-wrap"> <div className="flex items-center gap-3 flex-wrap">
{ampPicker}
<button type="button" disabled={!acom.connected} <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', 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 ? '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'} {acom.operate ? 'OPERATE' : 'STANDBY'}
@@ -899,11 +952,11 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
is off (the port stays open), so gate on port_open not connected. */} 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"> <div className="inline-flex rounded-lg overflow-hidden border-2 border-success/70">
<button type="button" disabled={!(acom.port_open && acom.transport === 'serial')} <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'} 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> 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} <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> 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>
<span className={cn('inline-flex items-center gap-1.5 text-sm', acom.connected ? 'text-muted-foreground' : 'text-danger')}> <span className={cn('inline-flex items-center gap-1.5 text-sm', acom.connected ? 'text-muted-foreground' : 'text-danger')}>
@@ -935,6 +988,7 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
{st.amp_available && !isSPE && !isACOM && ( {st.amp_available && !isSPE && !isACOM && (
<Card icon={Flame} title={`${t('flxp.amplifier')}${st.amp_model ? ' · ' + st.amp_model : ''}`} accent="#ea580c"> <Card icon={Flame} title={`${t('flxp.amplifier')}${st.amp_model ? ' · ' + st.amp_model : ''}`} accent="#ea580c">
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
{ampPicker}
<button type="button" disabled={off} <button type="button" disabled={off}
onClick={() => change('amp_operate', !st.amp_operate, () => FlexAmpOperate(!st.amp_operate))} 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', className={cn('px-4 py-2 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
@@ -947,7 +1001,7 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
{/* Fan mode — shown when the PowerGenius is configured (Settings → {/* Fan mode — shown when the PowerGenius is configured (Settings →
PowerGenius). The dot shows the direct-connection state; the PowerGenius). The dot shows the direct-connection state; the
selector is disabled until connected (hover it for the error). */} 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'))}> <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={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> <span className="text-muted-foreground">{t('flxp.fan')}</span>
+55 -4
View File
@@ -42,14 +42,28 @@ function fmtTimeOn(s: any): string {
const emptyStation = (): Station => netctl.Station.createFrom({ callsign: '' }); 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 = { type Props = {
onLogged?: () => void; onLogged?: () => void;
countries?: string[]; countries?: string[];
bands?: string[]; bands?: string[];
modes?: 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 { t } = useI18n();
const [nets, setNets] = useState<Net[]>([]); const [nets, setNets] = useState<Net[]>([]);
const [selId, setSelId] = useState<string>(''); const [selId, setSelId] = useState<string>('');
@@ -70,6 +84,34 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
const [looking, setLooking] = useState(false); const [looking, setLooking] = useState(false);
const rosterGrid = useRef<any>(null); 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). // Worked-before for the clicked station (see if/when we contacted it before).
const [wbCall, setWbCall] = useState(''); const [wbCall, setWbCall] = useState('');
@@ -195,6 +237,10 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
} }
} catch (e: any) { setError(String(e?.message ?? e)); } } 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 // Log EVERYONE still on air (end of net): each draft is written to the logbook
// exactly as the single-log button would. // exactly as the single-log button would.
async function logAll() { async function logAll() {
@@ -258,7 +304,8 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
} }
const rosterCols = useMemo<ColDef<Station>[]>(() => [ 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: t('ncp.colName'), field: 'name', flex: 1 },
{ headerName: 'QTH', field: 'qth', flex: 1 }, { headerName: 'QTH', field: 'qth', flex: 1 },
{ headerName: t('ncp.colCountry'), field: 'country', width: 130 }, { headerName: t('ncp.colCountry'), field: 'country', width: 130 },
@@ -307,12 +354,14 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
{t('ncp.onAirActive')} {t('ncp.onAirActive')}
<span className="ml-auto font-normal normal-case opacity-90">{t('ncp.activeHint')}</span> <span className="ml-auto font-normal normal-case opacity-90">{t('ncp.activeHint')}</span>
</div> </div>
<div className="flex flex-col min-h-0 flex-1"> <div ref={onAirWrap} className="flex flex-col min-h-0 flex-1">
<RecentQSOsGrid <RecentQSOsGrid
rows={active} rows={active}
total={active.length} total={active.length}
storageKey="net.onair" storageKey="net.onair"
selectRowSignal={selectRow} selectRowSignal={selectRow}
rowDragCall
onGridApi={(api) => { onAirApi.current = api; wireDropZones(); }}
onRowClicked={(q) => showWorkedBefore(q.callsign, (q as any).dxcc ?? 0)} onRowClicked={(q) => showWorkedBefore(q.callsign, (q as any).dxcc ?? 0)}
onRowDoubleClicked={(q) => setEditingDraft(q)} onRowDoubleClicked={(q) => setEditingDraft(q)}
onRowSelected={setSelectedActiveIds} onRowSelected={setSelectedActiveIds}
@@ -360,6 +409,7 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
rows={(wb.entries ?? []) as any} rows={(wb.entries ?? []) as any}
total={wb.count} total={wb.count}
storageKey="net.wb" storageKey="net.wb"
{...qsoMenuHandlers}
/> />
)} )}
</div> </div>
@@ -373,7 +423,7 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
{t('ncp.netUsersRoster')} {t('ncp.netUsersRoster')}
<span className="ml-auto font-normal normal-case opacity-90">{t('ncp.rosterHint')}</span> <span className="ml-auto font-normal normal-case opacity-90">{t('ncp.rosterHint')}</span>
</div> </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 }}> <div style={{ position: 'absolute', inset: 0 }}>
<AgGridReact<Station> <AgGridReact<Station>
ref={rosterGrid} ref={rosterGrid}
@@ -382,6 +432,7 @@ export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
columnDefs={rosterCols} columnDefs={rosterCols}
defaultColDef={defaultColDef} defaultColDef={defaultColDef}
rowSelection={{ mode: 'multiRow', checkboxes: false, headerCheckbox: false, enableClickSelection: true }} 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)} onRowClicked={(e) => e.data && showWorkedBefore(e.data.callsign, (e.data as any).dxcc ?? 0)}
onRowDoubleClicked={(e) => e.data && activate(e.data.callsign)} onRowDoubleClicked={(e) => e.data && activate(e.data.callsign)}
animateRows={false} animateRows={false}
+47 -5
View File
@@ -5,7 +5,7 @@ import {
} from 'ag-grid-community'; } from 'ag-grid-community';
import { hamlogGridTheme } from '@/lib/gridTheme'; import { hamlogGridTheme } from '@/lib/gridTheme';
import { AgGridReact } from 'ag-grid-react'; import { AgGridReact } from 'ag-grid-react';
import { Columns3, FilterX } from 'lucide-react'; import { Columns3, FilterX, ListChecks } from 'lucide-react';
import type { QSOForm } from '@/types'; import type { QSOForm } from '@/types';
import { QSOContextMenu, type QSOMenuState } from './QSOContextMenu'; import { QSOContextMenu, type QSOMenuState } from './QSOContextMenu';
import { import {
@@ -33,6 +33,11 @@ type Props = {
// Bump `seq` to programmatically select the single row with this id (e.g. NET // 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). // Control auto-advancing to the next on-air station after logging one).
selectRowSignal?: { id: number; seq: number }; 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;
onGridApi?: (api: any) => void;
// storageKey scopes the persisted column layout/visibility. Omit for the main // 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 // log (keeps the historical keys); pass a distinct value (e.g. "net.onair") to
// reuse this grid elsewhere with its OWN independent column config. // reuse this grid elsewhere with its OWN independent column config.
@@ -252,7 +257,7 @@ export const groupLabel = (t: TFn, g: string): string => t(GRP_KEYS[g] ?? g);
const stripAwardCols = (st: any[] | null | undefined): any[] => const stripAwardCols = (st: any[] | null | undefined): any[] =>
(st ?? []).filter((s) => !String(s?.colId ?? '').startsWith('award_')); (st ?? []).filter((s) => !String(s?.colId ?? '').startsWith('award_'));
export function RecentQSOsGrid({ rows, selectAllSignal, selectRowSignal, 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, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols }: Props) {
const { t } = useI18n(); const { t } = useI18n();
const gridRef = useRef<any>(null); const gridRef = useRef<any>(null);
const [pickerOpen, setPickerOpen] = useState(false); const [pickerOpen, setPickerOpen] = useState(false);
@@ -260,6 +265,8 @@ export function RecentQSOsGrid({ rows, selectAllSignal, selectRowSignal, storage
// (e.g. the Net panel) keeps its own layout independent of the main log. // (e.g. the Net panel) keeps its own layout independent of the main log.
const colStateKey = storageKey ? `hamlog.qsoColState.${storageKey}` : BASE_COLSTATE_KEY; const colStateKey = storageKey ? `hamlog.qsoColState.${storageKey}` : BASE_COLSTATE_KEY;
const [menu, setMenu] = useState<QSOMenuState>(null); 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. // Localized column catalog — rebuilt when the language changes.
const COL_CATALOG = useMemo(() => makeColCatalog(t), [t]); const COL_CATALOG = useMemo(() => makeColCatalog(t), [t]);
@@ -319,7 +326,11 @@ export function RecentQSOsGrid({ rows, selectAllSignal, selectRowSignal, storage
restoringRef.current = true; restoringRef.current = true;
const base = COL_CATALOG.map((c) => { const base = COL_CATALOG.map((c) => {
const { group: _g, label: _l, defaultVisible, ...rest } = 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;
}
return col;
}); });
const awards: ColDef<QSOForm>[] = (awardCols ?? []).map((a) => ({ const awards: ColDef<QSOForm>[] = (awardCols ?? []).map((a) => ({
colId: `award_${a.code}`, colId: `award_${a.code}`,
@@ -333,7 +344,7 @@ export function RecentQSOsGrid({ rows, selectAllSignal, selectRowSignal, storage
valueGetter: (p) => (p.data as any)?.award_refs?.[a.code.toUpperCase()] ?? '', valueGetter: (p) => (p.data as any)?.award_refs?.[a.code.toUpperCase()] ?? '',
})); }));
return [...base, ...awards]; return [...base, ...awards];
}, [awardCols, COL_CATALOG, t, awardShown]); }, [awardCols, COL_CATALOG, t, awardShown, rowDragCall]);
// Enforce award-column visibility via the API after the columns (re)appear — // 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, // colDef.hide alone isn't honoured by AG Grid for a column that already exists,
@@ -356,6 +367,7 @@ export function RecentQSOsGrid({ rows, selectAllSignal, selectRowSignal, storage
}), []); }), []);
function onGridReady(e: GridReadyEvent) { function onGridReady(e: GridReadyEvent) {
onGridApi?.(e.api);
const local = loadLocal(colStateKey); const local = loadLocal(colStateKey);
if (local) e.api.applyColumnState({ state: stripAwardCols(local) as ColumnState[], applyOrder: true }); if (local) e.api.applyColumnState({ state: stripAwardCols(local) as ColumnState[], applyOrder: true });
// Fall back to the portable DB copy when the local cache is empty // Fall back to the portable DB copy when the local cache is empty
@@ -371,6 +383,7 @@ export function RecentQSOsGrid({ rows, selectAllSignal, selectRowSignal, storage
// null when no column filter is active, so "Showing X of Y" reflects them. // null when no column filter is active, so "Showing X of Y" reflects them.
const reportFilteredCount = useCallback((e: { api?: any }) => { const reportFilteredCount = useCallback((e: { api?: any }) => {
const api = e?.api ?? gridRef.current?.api; const api = e?.api ?? gridRef.current?.api;
if (api?.getDisplayedRowCount) setDispCount(api.getDisplayedRowCount());
if (!api || !onFilteredCountChange) return; if (!api || !onFilteredCountChange) return;
onFilteredCountChange(api.isAnyFilterPresent?.() ? api.getDisplayedRowCount() : null); onFilteredCountChange(api.isAnyFilterPresent?.() ? api.getDisplayedRowCount() : null);
}, [onFilteredCountChange]); }, [onFilteredCountChange]);
@@ -400,7 +413,10 @@ export function RecentQSOsGrid({ rows, selectAllSignal, selectRowSignal, storage
if (e.data && onRowDoubleClicked) onRowDoubleClicked(e.data); if (e.data && onRowDoubleClicked) onRowDoubleClicked(e.data);
} }
function onSelectionChanged() { 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)); onRowSelected?.(sel.map((r) => r.id as number).filter((id) => id != null));
} }
// Select every row when the caller bumps selectAllSignal (QSL Manager search). // Select every row when the caller bumps selectAllSignal (QSL Manager search).
@@ -480,6 +496,32 @@ export function RecentQSOsGrid({ rows, selectAllSignal, selectRowSignal, storage
return ( return (
<> <>
<div className="flex items-center justify-end gap-2 px-2.5 py-1 border-b border-border/60 bg-muted/20"> <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)} <Button variant="ghost" size="sm" className="h-7 text-[11px]" onClick={() => gridRef.current?.api?.setFilterModel(null)}
title={t('rqg.clearFiltersTitle')}> title={t('rqg.clearFiltersTitle')}>
<FilterX className="size-3.5" /> {t('rqg.clearFilters')} <FilterX className="size-3.5" /> {t('rqg.clearFilters')}
+93 -78
View File
@@ -13,7 +13,7 @@ import {
GetRotatorSettings, SaveRotatorSettings, TestRotator, RotatorPark, RotatorStop, GetRotatorSettings, SaveRotatorSettings, TestRotator, RotatorPark, RotatorStop,
GetUltrabeamSettings, SaveUltrabeamSettings, TestUltrabeam, GetUltrabeamSettings, SaveUltrabeamSettings, TestUltrabeam,
GetAntGeniusSettings, SaveAntGeniusSettings, GetAntGeniusSettings, SaveAntGeniusSettings,
GetPGXLSettings, SavePGXLSettings, GetSPEStatus, SPESetOperate, GetACOMStatus, ACOMSetOperate, GetAmplifiers, SaveAmplifiers, GetAmpStatuses, AmpOperate,
GetWinkeyerSettings, SaveWinkeyerSettings, ListSerialPorts, GetWinkeyerSettings, SaveWinkeyerSettings, ListSerialPorts,
GetAudioSettings, SaveAudioSettings, ListAudioInputDevices, ListAudioOutputDevices, PickAudioFolder, TestPTT, GetAudioSettings, SaveAudioSettings, ListAudioInputDevices, ListAudioOutputDevices, PickAudioFolder, TestPTT,
GetClublogCtyInfo, SetClublogCtyEnabled, DownloadClublogCty, GetClublogCtyInfo, SetClublogCtyEnabled, DownloadClublogCty,
@@ -620,6 +620,9 @@ function ADIFMonitorPanel() {
); );
} }
// AmpUI mirrors the backend AmpConfig — one configured amplifier.
type AmpUI = { id: string; name: string; enabled: boolean; type: string; transport: string; host: string; port: number; com_port: string; baud: number };
// RelayAutoPanel configures automatic control of the Station Control relay boards // RelayAutoPanel configures automatic control of the Station Control relay boards
// from the rig's frequency / band (PstRotator-style). Each relay carries one rule: // from the rig's frequency / band (PstRotator-style). Each relay carries one rule:
// off, a frequency window (kHz), or a set of bands. // off, a frequency window (kHz), or a set of bands.
@@ -628,33 +631,38 @@ type StationDevUI = { id: string; type: string; name: string; labels: string[] }
const RELAY_BANDS = ['160m', '80m', '60m', '40m', '30m', '20m', '17m', '15m', '12m', '10m', '6m', '4m', '2m', '70cm']; const RELAY_BANDS = ['160m', '80m', '60m', '40m', '30m', '20m', '17m', '15m', '12m', '10m', '6m', '4m', '2m', '70cm'];
const relayCountUI = (type: string) => (type === 'kmtronic' || type === 'denkovi' ? 8 : 5); const relayCountUI = (type: string) => (type === 'kmtronic' || type === 'denkovi' ? 8 : 5);
// Live SPE Expert amplifier status + OPERATE/STANDBY toggle. Module-scoped (not a // Live status + OPERATE/STANDBY toggle for ONE configured amplifier (by config
// nested component) so it isn't remounted on every parent render. Polls once a // id) — SPE / ACOM / PGXL alike. Module-scoped (not a nested component) so it
// second while shown. // isn't remounted on every parent render. Polls once a second while shown.
function SPEStatusCard() { function AmpStatusCard({ id }: { id: string }) {
const [st, setSt] = useState<any>({ connected: false }); const [amp, setAmp] = useState<any>(null);
useEffect(() => { useEffect(() => {
let alive = true; let alive = true;
const tick = () => GetSPEStatus().then((s) => alive && setSt(s || {})).catch(() => {}); const tick = () => GetAmpStatuses().then((all: any[]) => {
if (alive) setAmp((all ?? []).find((a) => a.id === id) ?? null);
}).catch(() => {});
tick(); tick();
const id = window.setInterval(tick, 1000); const t = window.setInterval(tick, 1000);
return () => { alive = false; window.clearInterval(id); }; return () => { alive = false; window.clearInterval(t); };
}, []); }, [id]);
const st: any = amp?.spe ?? amp?.acom ?? amp?.pgxl ?? { connected: false };
const isSPE = !!amp?.spe;
const isACOM = !!amp?.acom;
const operate = !!st.operate; const operate = !!st.operate;
return ( return (
<div className="rounded-md border border-border p-3 space-y-2 text-xs max-w-xl"> <div className="rounded-md border border-border p-3 space-y-2 text-xs max-w-xl">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<span className={cn('size-2 rounded-full', st.connected ? 'bg-success animate-pulse' : 'bg-danger')} /> <span className={cn('size-2 rounded-full', st.connected ? 'bg-success animate-pulse' : 'bg-danger')} />
<span className="font-semibold">{st.connected ? `SPE ${st.model || 'Expert'}` : 'SPE — not connected'}</span> <span className="font-semibold">{amp?.name || 'Amplifier'}{st.connected ? '' : ' — not connected'}</span>
{!st.connected && st.last_error && <span className="text-danger truncate text-[10px]">{st.last_error}</span>} {!st.connected && st.last_error && <span className="text-danger truncate text-[10px]">{st.last_error}</span>}
<span className="flex-1" /> <span className="flex-1" />
<Button size="sm" variant={operate ? 'default' : 'outline'} disabled={!st.connected} <Button size="sm" variant={operate ? 'default' : 'outline'} disabled={!st.connected}
onClick={() => SPESetOperate(!operate).catch(() => {})} onClick={() => AmpOperate(id, !operate).catch(() => {})}
title="Toggle OPERATE / STANDBY"> title="Toggle OPERATE / STANDBY">
{operate ? 'OPERATE' : 'STANDBY'} {operate ? 'OPERATE' : 'STANDBY'}
</Button> </Button>
</div> </div>
{st.connected && ( {st.connected && isSPE && (
<div className="grid grid-cols-4 gap-x-3 gap-y-1 font-mono text-[11px]"> <div className="grid grid-cols-4 gap-x-3 gap-y-1 font-mono text-[11px]">
<div>{st.tx ? 'TX' : 'RX'}</div> <div>{st.tx ? 'TX' : 'RX'}</div>
<div>Band {st.band}</div> <div>Band {st.band}</div>
@@ -667,35 +675,7 @@ function SPEStatusCard() {
{(st.warnings || st.alarms) && <div className="col-span-4 text-warning"> {st.warnings} {st.alarms}</div>} {(st.warnings || st.alarms) && <div className="col-span-4 text-warning"> {st.warnings} {st.alarms}</div>}
</div> </div>
)} )}
</div> {st.connected && isACOM && (
);
}
// Live ACOM amplifier status + OPERATE/STANDBY. Module-scoped for the same
// remount reason as SPEStatusCard. Polls once a second while shown.
function ACOMStatusCard() {
const [st, setSt] = useState<any>({ connected: false });
useEffect(() => {
let alive = true;
const tick = () => GetACOMStatus().then((s) => alive && setSt(s || {})).catch(() => {});
tick();
const id = window.setInterval(tick, 1000);
return () => { alive = false; window.clearInterval(id); };
}, []);
const operate = !!st.operate;
return (
<div className="rounded-md border border-border p-3 space-y-2 text-xs max-w-xl">
<div className="flex items-center gap-2">
<span className={cn('size-2 rounded-full', st.connected ? 'bg-success animate-pulse' : 'bg-danger')} />
<span className="font-semibold">{st.connected ? `ACOM ${st.model || ''}` : `ACOM ${st.model || ''} — not connected`}</span>
{!st.connected && st.last_error && <span className="text-danger truncate text-[10px]">{st.last_error}</span>}
<span className="flex-1" />
<Button size="sm" variant={operate ? 'default' : 'outline'} disabled={!st.connected}
onClick={() => ACOMSetOperate(!operate).catch(() => {})}
title="Toggle OPERATE / STANDBY">
{operate ? 'OPERATE' : 'STANDBY'}
</Button>
</div>
{st.connected && (
<div className="grid grid-cols-4 gap-x-3 gap-y-1 font-mono text-[11px]"> <div className="grid grid-cols-4 gap-x-3 gap-y-1 font-mono text-[11px]">
<div>{st.state}</div> <div>{st.state}</div>
<div>Band {st.band || '—'}</div> <div>Band {st.band || '—'}</div>
@@ -708,6 +688,13 @@ function ACOMStatusCard() {
{st.err_text && <div className="col-span-4 text-warning"> {st.err_text} ({st.err_code})</div>} {st.err_text && <div className="col-span-4 text-warning"> {st.err_text} ({st.err_code})</div>}
</div> </div>
)} )}
{st.connected && !isSPE && !isACOM && (
<div className="grid grid-cols-3 gap-x-3 gap-y-1 font-mono text-[11px]">
<div>{st.state || ''}</div>
<div>Fan {st.fan_mode || '—'}</div>
<div>{st.temperature ? `${Math.round(st.temperature)}°C` : ''}</div>
</div>
)}
</div> </div>
); );
} }
@@ -1076,9 +1063,9 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
// Antenna Genius (4O3A) switch settings — TCP port is fixed at 9007. // Antenna Genius (4O3A) switch settings — TCP port is fixed at 9007.
const [antgenius, setAntgenius] = useState<{ enabled: boolean; host: string; password: string }>({ enabled: false, host: '', password: '' }); const [antgenius, setAntgenius] = useState<{ enabled: boolean; host: string; password: string }>({ enabled: false, host: '', password: '' });
// Amplifier control settings (PowerGenius XL over TCP; SPE Expert over serial/IP). // Amplifier list — operators can run SEVERAL amps (even two SPEs combined),
const [pgxl, setPgxl] = useState<{ enabled: boolean; type: string; transport: string; host: string; port: number; com_port: string; baud: number }>( // each with its own connection. Saved as a whole via SaveAmplifiers.
{ enabled: false, type: 'pgxl', transport: 'tcp', host: '', port: 9008, com_port: '', baud: 115200 }); const [amps, setAmps] = useState<AmpUI[]>([]);
// WinKeyer CW keyer settings + macro editor. // WinKeyer CW keyer settings + macro editor.
type WKMac = { label: string; text: string }; type WKMac = { label: string; text: string };
@@ -1149,6 +1136,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
const [showBeamMap, setShowBeamMap] = useState(() => localStorage.getItem('opslog.showBeamOnMap') !== '0'); const [showBeamMap, setShowBeamMap] = useState(() => localStorage.getItem('opslog.showBeamOnMap') !== '0');
const [startEqEnd, setStartEqEnd] = useState(() => localStorage.getItem('opslog.startEqualsEnd') === '1'); const [startEqEnd, setStartEqEnd] = useState(() => localStorage.getItem('opslog.startEqualsEnd') === '1');
const [lookupOnBlur, setLookupOnBlur] = useState(() => localStorage.getItem('opslog.lookupOnBlur') === '1'); const [lookupOnBlur, setLookupOnBlur] = useState(() => localStorage.getItem('opslog.lookupOnBlur') === '1');
const [groupDigital, setGroupDigital] = useState(() => localStorage.getItem('opslog.groupDigitalSlots') === '1');
const [showQsoRate, setShowQsoRate] = useState(() => localStorage.getItem('opslog.showQsoRate') === '1'); const [showQsoRate, setShowQsoRate] = useState(() => localStorage.getItem('opslog.showQsoRate') === '1');
const [catModeBeforeFreq, setCatModeBeforeFreq] = useState(() => localStorage.getItem('opslog.catModeBeforeFreq') === '1'); const [catModeBeforeFreq, setCatModeBeforeFreq] = useState(() => localStorage.getItem('opslog.catModeBeforeFreq') === '1');
// Password-encryption (secret vault) state. // Password-encryption (secret vault) state.
@@ -1395,7 +1383,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
setRotator(r); setRotator(r);
try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {} try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {}
try { setAntgenius(await GetAntGeniusSettings() as any); } catch {} try { setAntgenius(await GetAntGeniusSettings() as any); } catch {}
try { setPgxl(await GetPGXLSettings() as any); } catch {} try { setAmps(((await GetAmplifiers()) ?? []) as AmpUI[]); } catch {}
setBackupCfg(b as any); setBackupCfg(b as any);
setQslDefaults(qd as any); setQslDefaults(qd as any);
setExtSvc(es as any); setExtSvc(es as any);
@@ -1435,7 +1423,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
try { setRotator(await GetRotatorSettings() as any); } catch {} try { setRotator(await GetRotatorSettings() as any); } catch {}
try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {} try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {}
try { setAntgenius(await GetAntGeniusSettings() as any); } catch {} try { setAntgenius(await GetAntGeniusSettings() as any); } catch {}
try { setPgxl(await GetPGXLSettings() as any); } catch {} try { setAmps(((await GetAmplifiers()) ?? []) as AmpUI[]); } catch {}
try { setBackupCfg(await GetBackupSettings() as any); } catch {} try { setBackupCfg(await GetBackupSettings() as any); } catch {}
try { setQslDefaults(await GetQSLDefaults() as any); } catch {} try { setQslDefaults(await GetQSLDefaults() as any); } catch {}
try { setExtSvc(await GetExternalServices() as any); } catch {} try { setExtSvc(await GetExternalServices() as any); } catch {}
@@ -1604,7 +1592,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
await SaveRotatorSettings(rotator as any); await SaveRotatorSettings(rotator as any);
await SaveUltrabeamSettings(ultrabeam as any); await SaveUltrabeamSettings(ultrabeam as any);
await SaveAntGeniusSettings(antgenius as any); await SaveAntGeniusSettings(antgenius as any);
await SavePGXLSettings(pgxl as any); await SaveAmplifiers(amps as any);
await SaveWinkeyerSettings(wk as any); await SaveWinkeyerSettings(wk as any);
await SaveAudioSettings(audioCfg as any); await SaveAudioSettings(audioCfg as any);
await SaveEmailSettings(emailCfg as any); await SaveEmailSettings(emailCfg as any);
@@ -2709,12 +2697,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
} }
function PGXLPanelSettings() { function PGXLPanelSettings() {
const isPGXL = pgxl.type === 'pgxl'; // The stored `type` stays a flat value ("spe13", "acom700", "pgxl"); the UI
const isACOM = (pgxl.type || '').startsWith('acom'); // presents it as brand + model.
const isSerial = pgxl.transport === 'serial';
// The stored `type` stays the single flat value ("spe13", "acom700", "pgxl" —
// binding compatibility); the UI presents it as brand + model.
const brand = isPGXL ? 'pgxl' : isACOM ? 'acom' : 'spe';
const brandModels: Record<string, { value: string; label: string }[]> = { const brandModels: Record<string, { value: string; label: string }[]> = {
spe: [ spe: [
{ value: 'spe13', label: 'Expert 1.3K-FA' }, { value: 'spe13', label: 'Expert 1.3K-FA' },
@@ -2729,30 +2713,51 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
{ value: 'acom2020', label: '2020S' }, { value: 'acom2020', label: '2020S' },
], ],
}; };
const brandOf = (ty: string) => (!ty || ty === 'pgxl') ? 'pgxl' : ty.startsWith('acom') ? 'acom' : 'spe';
const patchAmp = (i: number, patch: Partial<AmpUI>) => setAmps((l) => l.map((a, j) => (j === i ? { ...a, ...patch } : a)));
// Each family has a fixed serial speed: SPE talks 115200, the ACOM S-series is // Each family has a fixed serial speed: SPE talks 115200, the ACOM S-series is
// 9600 8N1 — preset it so switching brand just works. PGXL is TCP-only. // 9600 8N1 — preset it so switching brand just works. PGXL is TCP-only.
const applyType = (v: string) => setPgxl((s) => ({ const applyType = (i: number, v: string) => patchAmp(i, {
...s, type: v, type: v,
transport: v === 'pgxl' ? 'tcp' : s.transport, transport: v === 'pgxl' ? 'tcp' : amps[i].transport,
baud: v.startsWith('acom') ? 9600 : v.startsWith('spe') ? 115200 : s.baud, baud: v.startsWith('acom') ? 9600 : v.startsWith('spe') ? 115200 : amps[i].baud,
})); });
const addAmp = () => setAmps((l) => [...l, {
id: '', name: '', enabled: true, type: 'spe13', transport: 'tcp', host: '', port: 9008, com_port: '', baud: 115200,
}]);
return ( return (
<> <>
<SectionHeader title="Amplifier" /> <SectionHeader title="Amplifier" hint={t('amp.hint')} />
<div className="space-y-4 max-w-xl"> <div className="space-y-4 max-w-xl">
<label className="flex items-center gap-2 text-sm cursor-pointer"> {amps.length === 0 && (
<Checkbox checked={pgxl.enabled} onCheckedChange={(c) => setPgxl((s) => ({ ...s, enabled: !!c }))} /> <p className="text-sm text-muted-foreground">{t('amp.none')}</p>
Enable amplifier control )}
</label> {amps.map((amp, i) => {
const brand = brandOf(amp.type);
const isPGXL = brand === 'pgxl';
const isACOM = brand === 'acom';
const isSerial = !isPGXL && amp.transport === 'serial';
return (
<div key={amp.id || `new-${i}`} className="rounded-lg border border-border p-3 space-y-3">
<div className="flex items-center gap-2">
<Checkbox checked={amp.enabled} onCheckedChange={(c) => patchAmp(i, { enabled: !!c })} />
<Input className="h-8 flex-1" value={amp.name}
placeholder={t('amp.namePh')}
onChange={(e) => patchAmp(i, { name: e.target.value })} />
<Button variant="ghost" size="sm" className="h-8 text-danger" title={t('amp.remove')}
onClick={() => setAmps((l) => l.filter((_, j) => j !== i))}>
<Trash2 className="size-3.5" />
</Button>
</div>
{/* Connection gets the widest column — "Network (RS232-to-Ethernet)" was {/* Connection gets the widest column — "Network (RS232-to-Ethernet)"
truncated with 3 equal columns. */} was truncated with 3 equal columns. */}
<div className="grid grid-cols-[1fr_1fr_1.7fr] gap-3"> <div className="grid grid-cols-[1fr_1fr_1.7fr] gap-3">
<div className="space-y-1"> <div className="space-y-1">
<Label>Brand</Label> <Label>Brand</Label>
<Select value={brand} onValueChange={(b) => { <Select value={brand} onValueChange={(b) => {
if (b === brand) return; if (b === brand) return;
applyType(b === 'pgxl' ? 'pgxl' : brandModels[b][0].value); applyType(i, b === 'pgxl' ? 'pgxl' : brandModels[b][0].value);
}}> }}>
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger> <SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
<SelectContent> <SelectContent>
@@ -2773,7 +2778,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</SelectContent> </SelectContent>
</Select> </Select>
) : ( ) : (
<Select value={pgxl.type} onValueChange={applyType}> <Select value={amp.type} onValueChange={(v) => applyType(i, v)}>
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger> <SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
<SelectContent> <SelectContent>
{brandModels[brand].map((m) => <SelectItem key={m.value} value={m.value}>{m.label}</SelectItem>)} {brandModels[brand].map((m) => <SelectItem key={m.value} value={m.value}>{m.label}</SelectItem>)}
@@ -2781,12 +2786,12 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</Select> </Select>
)} )}
</div> </div>
{/* PowerGenius is TCP-only; SPE and ACOM amps connect over USB serial or {/* PowerGenius is TCP-only; SPE and ACOM amps connect over USB serial
an RS232-to-Ethernet bridge, so they offer both. */} or an RS232-to-Ethernet bridge, so they offer both. */}
{!isPGXL && ( {!isPGXL && (
<div className="space-y-1"> <div className="space-y-1">
<Label>Connection</Label> <Label>Connection</Label>
<Select value={pgxl.transport} onValueChange={(v) => setPgxl((s) => ({ ...s, transport: v }))}> <Select value={amp.transport} onValueChange={(v) => patchAmp(i, { transport: v })}>
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger> <SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="serial">USB (serial COM)</SelectItem> <SelectItem value="serial">USB (serial COM)</SelectItem>
@@ -2802,7 +2807,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<div className="space-y-1 col-span-2"> <div className="space-y-1 col-span-2">
<Label>COM port</Label> <Label>COM port</Label>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<Select value={pgxl.com_port || '_'} onValueChange={(v) => setPgxl((s) => ({ ...s, com_port: v === '_' ? '' : v }))}> <Select value={amp.com_port || '_'} onValueChange={(v) => patchAmp(i, { com_port: v === '_' ? '' : v })}>
<SelectTrigger className="h-9 flex-1"><SelectValue placeholder="— COM —" /></SelectTrigger> <SelectTrigger className="h-9 flex-1"><SelectValue placeholder="— COM —" /></SelectTrigger>
<SelectContent> <SelectContent>
{wkPorts.length === 0 && <SelectItem value="_" disabled>No ports found</SelectItem>} {wkPorts.length === 0 && <SelectItem value="_" disabled>No ports found</SelectItem>}
@@ -2816,26 +2821,26 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</div> </div>
<div className="space-y-1"> <div className="space-y-1">
<Label>Baud</Label> <Label>Baud</Label>
<Input type="number" min={1200} value={pgxl.baud} <Input type="number" min={1200} value={amp.baud}
onChange={(e) => setPgxl((s) => ({ ...s, baud: parseInt(e.target.value) || 115200 }))} className="font-mono" /> onChange={(e) => patchAmp(i, { baud: parseInt(e.target.value) || 115200 })} className="font-mono" />
</div> </div>
</div> </div>
) : ( ) : (
<div className="grid grid-cols-3 gap-3"> <div className="grid grid-cols-3 gap-3">
<div className="space-y-1 col-span-2"> <div className="space-y-1 col-span-2">
<Label>Host / IP</Label> <Label>Host / IP</Label>
<Input value={pgxl.host ?? ''} onChange={(e) => setPgxl((s) => ({ ...s, host: e.target.value }))} <Input value={amp.host ?? ''} onChange={(e) => patchAmp(i, { host: e.target.value })}
placeholder="192.168.1.70" className="font-mono" /> placeholder="192.168.1.70" className="font-mono" />
</div> </div>
<div className="space-y-1"> <div className="space-y-1">
<Label>TCP port</Label> <Label>TCP port</Label>
<Input type="number" min={1} max={65535} value={pgxl.port} <Input type="number" min={1} max={65535} value={amp.port}
onChange={(e) => setPgxl((s) => ({ ...s, port: parseInt(e.target.value) || 9008 }))} className="font-mono" /> onChange={(e) => patchAmp(i, { port: parseInt(e.target.value) || 9008 })} className="font-mono" />
</div> </div>
</div> </div>
)} )}
{!isPGXL && pgxl.enabled && (isACOM ? <ACOMStatusCard /> : <SPEStatusCard />)} {amp.enabled && amp.id && <AmpStatusCard id={amp.id} />}
{!isPGXL && !isACOM && ( {!isPGXL && !isACOM && (
<p className="text-[10px] text-muted-foreground"> <p className="text-[10px] text-muted-foreground">
SPE control uses the amplifier's proprietary serial protocol (OPERATE toggle + live status). Save to (re)connect. Band / power-level / antenna are still managed on the amp from the transceiver CAT. SPE control uses the amplifier's proprietary serial protocol (OPERATE toggle + live status). Save to (re)connect. Band / power-level / antenna are still managed on the amp from the transceiver CAT.
@@ -2847,6 +2852,12 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</p> </p>
)} )}
</div> </div>
);
})}
<Button variant="outline" size="sm" onClick={addAmp}>
<Plus className="size-3.5 mr-1" /> {t('amp.add')}
</Button>
</div>
</> </>
); );
} }
@@ -4619,6 +4630,10 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<Checkbox checked={lookupOnBlur} onCheckedChange={(c) => { const v = !!c; setLookupOnBlur(v); writeUiPref('opslog.lookupOnBlur', v ? '1' : '0'); }} /> <Checkbox checked={lookupOnBlur} onCheckedChange={(c) => { const v = !!c; setLookupOnBlur(v); writeUiPref('opslog.lookupOnBlur', v ? '1' : '0'); }} />
{t('gen.lookupOnBlur')} <span className="text-xs text-muted-foreground">{t('gen.lookupOnBlurHint')}</span> {t('gen.lookupOnBlur')} <span className="text-xs text-muted-foreground">{t('gen.lookupOnBlurHint')}</span>
</label> </label>
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox checked={groupDigital} onCheckedChange={(c) => { const v = !!c; setGroupDigital(v); writeUiPref('opslog.groupDigitalSlots', v ? '1' : '0'); }} />
{t('gen.groupDigital')} <span className="text-xs text-muted-foreground">{t('gen.groupDigitalHint')}</span>
</label>
<label className="flex items-center gap-2 text-sm cursor-pointer"> <label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox checked={checkUpdates} onCheckedChange={(c) => { const v = !!c; setCheckUpdates(v); writeUiPref('opslog.checkUpdates', v ? '1' : '0'); }} /> <Checkbox checked={checkUpdates} onCheckedChange={(c) => { const v = !!c; setCheckUpdates(v); writeUiPref('opslog.checkUpdates', v ? '1' : '0'); }} />
{t('gen.checkUpdates')} <span className="text-xs text-muted-foreground">{t('gen.checkUpdatesHint')}</span> {t('gen.checkUpdates')} <span className="text-xs text-muted-foreground">{t('gen.checkUpdatesHint')}</span>
+54 -150
View File
@@ -1,5 +1,5 @@
import { useCallback, useEffect, useRef, useState } from 'react'; import { useCallback, useEffect, useRef, useState } from 'react';
import { Plus, Pencil, Trash2, Power, PlugZap, Loader2, Check, X, Compass, Square, Antenna as AntennaIcon, ArrowDownToLine, Minus, RefreshCw, Flame } 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 { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input'; import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label'; import { Label } from '@/components/ui/label';
@@ -8,14 +8,13 @@ import { cn } from '@/lib/utils';
import { useI18n } from '@/lib/i18n'; import { useI18n } from '@/lib/i18n';
import { writeUiPref } from '@/lib/uiPref'; import { writeUiPref } from '@/lib/uiPref';
import { RotorCompass } from '@/components/RotorCompass'; import { RotorCompass } from '@/components/RotorCompass';
import { AmpCard } from '@/components/AmpCard';
import { import {
GetStationDevices, SaveStationDevices, GetStationStatus, StationSetRelay, GetStationDevices, SaveStationDevices, GetStationStatus, StationSetRelay,
GetRotatorHeading, RotatorGoTo, RotatorStop, GetRotatorHeading, RotatorGoTo, RotatorStop,
GetUltrabeamStatus, SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements, GetUltrabeamStatus, SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements,
ListDenkoviDevices, ListSerialPorts, TestStationDevice, ListDenkoviDevices, ListSerialPorts, TestStationDevice,
GetPGXLSettings, GetPGXLStatus, PGXLSetFanMode, PGXLSetOperate, GetAmpStatuses, GetFlexState,
GetSPEStatus, SPESetOperate, SPESetPower, SPESetPowerLevel,
GetACOMStatus, ACOMSetOperate, ACOMSetPower,
} from '../../wailsjs/go/main/App'; } from '../../wailsjs/go/main/App';
type RotatorProps = { centerLat?: number | null; centerLon?: number | null; bearing?: number | null }; type RotatorProps = { centerLat?: number | null; centerLon?: number | null; bearing?: number | null };
@@ -208,9 +207,11 @@ function MotorAntennaWidget({ ant, refetch, t }: { ant: AntStatus; refetch: () =
<p className="text-[11px] text-muted-foreground">{t('station.noLengths')}</p> <p className="text-[11px] text-muted-foreground">{t('station.noLengths')}</p>
) : ( ) : (
<div className="space-y-1.5"> <div className="space-y-1.5">
{/* Hide 0-length elements an Ultrabeam reports 6 slots but a {/* The READ_BANDS reply is undocumented and its 16-bit parse picks
3-element beam only uses the first few. */} up structural bytes past the real data (varying by band), which
{lengths.map((mm, i) => ({ mm, i })).filter((e) => e.mm > 0).map(({ mm, i }) => ( 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"> <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> <span className="text-xs w-20 shrink-0 text-muted-foreground truncate">{elementName(i, t)}</span>
<button type="button" disabled={!ant.connected || busyEl !== null} <button type="button" disabled={!ant.connected || busyEl !== null}
@@ -249,116 +250,6 @@ function MotorAntennaWidget({ ant, refetch, t }: { ant: AntStatus; refetch: () =
); );
} }
// AmplifierWidget brings the amplifier controls (Settings → Amplifier) into the
// Station Control tab, so an operator WITHOUT a FlexRadio/Icom panel still has
// them (the FlexPanel card only exists when a Flex is the rig). Same backends:
// SPE Expert / ACOM (full control) and PowerGenius XL (fan mode + state).
function AmplifierWidget({ ampType, t }: { ampType: string; t: (k: string, v?: any) => string }) {
const isACOM = ampType.startsWith('acom');
const isPGXL = ampType === 'pgxl';
const [st, setSt] = useState<any>({ connected: false });
useEffect(() => {
let alive = true;
const get = isPGXL ? GetPGXLStatus : isACOM ? GetACOMStatus : GetSPEStatus;
const tick = () => get().then((s: any) => alive && setSt(s || { connected: false })).catch(() => {});
tick();
const id = window.setInterval(tick, 1500);
return () => { alive = false; window.clearInterval(id); };
}, [ampType, isACOM, isPGXL]);
const title = isPGXL ? 'PowerGenius XL' : isACOM ? `ACOM ${st.model || ''}` : `SPE ${st.model || 'Expert'}`;
const maxW = isACOM ? (Number(st.max_w) || 800) : ({ '13K': 1300, '15K': 1500, '2K': 2000 } as Record<string, number>)[st.model] || 1500;
const outW = Number(isACOM ? st.fwd_w : st.output_w) || 0;
const frac = Math.min(1, outW / maxW);
return (
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden h-full">
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
<Flame className="size-4 text-primary" />
<div className="min-w-0">
<div className="text-sm font-semibold truncate">{t('flxp.amplifier')}</div>
<div className="text-[10px] text-muted-foreground font-mono truncate">{title}</div>
</div>
<span className={cn('ml-auto size-2 rounded-full shrink-0', st.connected ? 'bg-success' : 'bg-muted-foreground/40')}
title={st.connected ? t('station.online') : (st.last_error || t('station.offline'))} />
</div>
<div className="p-3 space-y-2">
{isPGXL ? (
<div className="flex items-center gap-2 flex-wrap">
<button type="button" disabled={!st.connected}
onClick={() => { const want = !st.operate; setSt((s: any) => ({ ...s, operate: want })); PGXLSetOperate(want).catch(() => {}); }}
className={cn('px-3 py-1.5 rounded-lg text-xs font-extrabold tracking-wide border-2 transition-all disabled:opacity-40',
st.operate ? 'bg-warning text-warning-foreground border-warning' : 'bg-card text-warning border-warning hover:bg-warning-muted')}>
{st.operate ? 'OPERATE' : 'STANDBY'}
</button>
{(['STANDARD', 'CONTEST', 'BROADCAST'] as const).map((m) => (
<button key={m} type="button" disabled={!st.connected}
onClick={() => PGXLSetFanMode(m).catch(() => {})}
className={cn('px-2.5 py-1.5 rounded-md border text-xs font-semibold disabled:opacity-40',
st.fan_mode === m ? 'bg-primary text-primary-foreground border-primary' : 'bg-muted/30 border-border hover:bg-muted')}>
{m === 'STANDARD' ? t('flxp.fanStandard') : m === 'CONTEST' ? t('flxp.fanContest') : t('flxp.fanBroadcast')}
</button>
))}
<span className="text-xs text-muted-foreground font-mono">{st.state || ''}{st.temperature ? ` · ${Math.round(st.temperature)}°C` : ''}</span>
</div>
) : (
<>
<div className="flex items-center gap-2 flex-wrap">
<button type="button" disabled={!st.connected}
onClick={() => (isACOM ? ACOMSetOperate(!st.operate) : SPESetOperate(!st.operate)).catch(() => {})}
className={cn('px-3 py-1.5 rounded-lg text-xs font-extrabold tracking-wide border-2 transition-all disabled:opacity-40',
st.operate ? 'bg-warning text-warning-foreground border-warning' : 'bg-card text-warning border-warning hover:bg-warning-muted')}>
{st.operate ? 'OPERATE' : 'STANDBY'}
</button>
<div className="inline-flex rounded-lg overflow-hidden border border-success/70">
<button type="button"
disabled={isACOM ? !(st.port_open && st.transport === 'serial') : !st.connected}
onClick={() => (isACOM ? ACOMSetPower(true) : SPESetPower(true)).catch(() => {})}
className="px-2.5 py-1.5 text-xs font-bold bg-card text-success hover:bg-success/15 disabled:opacity-40">ON</button>
<button type="button" disabled={!st.connected}
onClick={() => (isACOM ? ACOMSetPower(false) : SPESetPower(false)).catch(() => {})}
className="px-2.5 py-1.5 text-xs font-bold bg-card text-danger border-l border-success/70 hover:bg-danger/15 disabled:opacity-40">OFF</button>
</div>
{!isACOM && (
<div className="inline-flex rounded-lg overflow-hidden border border-border">
{(['L', 'M', 'H'] as const).map((lvl, i) => (
<button key={lvl} type="button" disabled={!st.connected}
onClick={() => SPESetPowerLevel(lvl).catch(() => {})}
className={cn('px-2.5 py-1.5 text-xs font-bold disabled:opacity-40', i > 0 && 'border-l border-border',
(st.power_level || '').trim().toUpperCase() === lvl ? 'bg-primary text-primary-foreground' : 'bg-card text-muted-foreground hover:bg-muted')}>
{lvl}
</button>
))}
</div>
)}
</div>
<div className="text-xs font-mono text-muted-foreground tabular-nums">
{st.connected
? <>
{isACOM ? (st.state || '') : (st.tx ? 'TX' : 'RX')}
{st.band ? ` · ${st.band}` : ''} · {outW}W · SWR {Number((isACOM ? st.swr : st.swr_ant) ?? 0).toFixed(1)} · {st.temp_c}°C
{isACOM && st.fan ? ` · Fan ${st.fan}` : ''}
</>
: (isACOM ? t('flxp.acomOffline') : t('flxp.speOffline'))}
</div>
{st.connected && (
<div>
<div className="h-2 rounded bg-muted overflow-hidden">
<div className={cn('h-full transition-all', frac > 0.9 ? 'bg-danger' : frac > 0.75 ? 'bg-warning' : 'bg-primary')}
style={{ width: `${Math.round(frac * 100)}%` }} />
</div>
<div className="text-[10px] text-muted-foreground mt-0.5">{t('flxp.outputPower')} {outW} W / {maxW} W</div>
</div>
)}
{(st.err_text || st.warnings || st.alarms) && (
<div className="text-[11px] font-bold text-danger"> {st.err_text || `${st.warnings || ''} ${st.alarms || ''}`}</div>
)}
</>
)}
</div>
</div>
);
}
export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorProps) { export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorProps) {
const { t } = useI18n(); const { t } = useI18n();
const [devices, setDevices] = useState<Device[]>([]); const [devices, setDevices] = useState<Device[]>([]);
@@ -372,16 +263,24 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
try { const v = JSON.parse(localStorage.getItem('opslog.stationOrder') || '[]'); return Array.isArray(v) ? v : []; } catch { return []; } try { const v = JSON.parse(localStorage.getItem('opslog.stationOrder') || '[]'); return Array.isArray(v) ? v : []; } catch { return []; }
}); });
const dragId = useRef<string | null>(null); 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'); const [cols, setCols] = useState<string>(() => localStorage.getItem('opslog.stationCols') || 'auto');
// Amplifier (Settings → Amplifier): shown here so operators without a // Amplifiers (Settings → Amplifier): shown here so operators without a
// FlexRadio panel still get the controls. Re-read every 5s so enabling the // FlexRadio panel still get the controls. EVERY configured amp gets its own
// amp in Settings makes the widget appear without reopening the tab. // card (identical to the Flex panel's) — no dropdown. Polled fast (1.5s) so the
const [amp, setAmp] = useState<{ enabled: boolean; type: string }>({ enabled: false, type: 'pgxl' }); // 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(() => { useEffect(() => {
let alive = true; let alive = true;
const load = () => GetPGXLSettings().then((s: any) => { if (alive) setAmp({ enabled: !!s?.enabled, type: s?.type || 'pgxl' }); }).catch(() => {}); const load = () => Promise.all([
GetAmpStatuses().catch(() => []),
GetFlexState().catch(() => null),
]).then(([l, fx]: any[]) => { if (alive) { setAmps((l ?? []) as any[]); setFlexState(fx); } });
load(); load();
const id = window.setInterval(load, 5000); const id = window.setInterval(load, 1500);
return () => { alive = false; window.clearInterval(id); }; return () => { alive = false; window.clearInterval(id); };
}, []); }, []);
@@ -470,25 +369,26 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
<button className="text-muted-foreground hover:text-destructive" title={t('station.delete')} <button className="text-muted-foreground hover:text-destructive" title={t('station.delete')}
onClick={() => removeDevice(dev.id)}><Trash2 className="size-3.5" /></button> onClick={() => removeDevice(dev.id)}><Trash2 className="size-3.5" /></button>
</div> </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) => { {relays.map((r) => {
const key = `${dev.id}:${r.number}`; const key = `${dev.id}:${r.number}`;
const label = r.label || `${t('station.relay')} ${r.number}`; const label = r.label || `${t('station.relay')} ${r.number}`;
return ( return (
<button key={r.number} type="button" disabled={!st?.connected} <button key={r.number} type="button" disabled={!st?.connected}
title={label}
onClick={() => toggle(dev, r.number, !r.on)} 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')}> 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')}> 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>
<span className="min-w-0"> <span className="flex-1 min-w-0 text-xs font-medium truncate">{label}</span>
<span className="block text-xs font-medium truncate">{label}</span> <span className={cn('text-[9px] font-bold shrink-0', r.on ? 'text-success' : 'text-muted-foreground/50')}>
<span className={cn('block text-[10px] font-semibold', r.on ? 'text-success' : 'text-muted-foreground')}>
{r.on ? t('station.on') : t('station.off')} {r.on ? t('station.on') : t('station.off')}
</span> </span>
</span>
</button> </button>
); );
})} })}
@@ -504,32 +404,25 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
if (ant.enabled) { if (ant.enabled) {
widgets.push({ id: 'antenna', node: <MotorAntennaWidget ant={ant} refetch={pollAnt} t={t} /> }); widgets.push({ id: 'antenna', node: <MotorAntennaWidget ant={ant} refetch={pollAnt} t={t} /> });
} }
if (amp.enabled) { // One card per configured amplifier (identical to the Flex panel's card).
widgets.push({ id: 'amplifier', node: <AmplifierWidget ampType={amp.type} t={t} /> }); for (const amp of amps) widgets.push({ id: `amp:${amp.id}`, node: <AmpCard amp={amp} flex={flexState} t={t} /> });
}
for (const dev of devices) widgets.push({ id: dev.id, node: deviceCard(dev) }); 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 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 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 widgetIds = ordered.map((w) => w.id);
const noDevices = devices.length === 0 && !rot.enabled && !ant.enabled && !amp.enabled; const noDevices = devices.length === 0 && !rot.enabled && !ant.enabled && amps.length === 0;
// 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',
};
return ( return (
<div className="flex-1 min-h-0 overflow-auto p-4"> <div className="flex-1 min-h-0 overflow-auto p-4">
<div className="flex items-center justify-between mb-3"> <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> <h2 className="text-sm font-bold uppercase tracking-wider text-muted-foreground">{t('station.title')}</h2>
<div className="flex items-center gap-2"> <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]"> <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" <button key={c} type="button"
onClick={() => { setCols(c); writeUiPref('opslog.stationCols', c); }} 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')}> className={cn('px-2 py-1 font-medium', cols === c ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:bg-muted')}>
@@ -549,14 +442,25 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
</div> </div>
)} )}
<div className={cn('grid gap-3 items-start', gridCols[cols] ?? gridCols.auto)}> {/* Dashboard of FIXED-WIDTH cards that wrap. "Auto" fills the window; a fixed
column count caps the container width so cards wrap onto more lines. Each
card has a grip handle (left rail) as the drag initiator (the card body is
full of buttons, so dragging the whole card was unreliable). */}
<div className="flex flex-wrap gap-4 items-start"
style={cols !== 'auto' ? { maxWidth: `${Number(cols) * 446}px` } : undefined}>
{ordered.map((w) => ( {ordered.map((w) => (
<div key={w.id} draggable <div key={w.id} className="flex items-stretch w-[430px]"
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'; }} onDragStart={(e) => { dragId.current = w.id; e.dataTransfer.effectAllowed = 'move'; }}
onDragOver={(e) => { e.preventDefault(); e.dataTransfer.dropEffect = 'move'; }} onDragEnd={() => { dragId.current = null; }}
onDrop={(e) => { e.preventDefault(); onDrop(w.id); }} title={t('station.dragMove')}
className={cn('cursor-grab active:cursor-grabbing', dragId.current === w.id && 'opacity-60')}> 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',
{w.node} dragId.current === w.id && 'opacity-60')}>
<GripVertical className="size-4" />
</div>
<div className="flex-1 min-w-0">{w.node}</div>
</div> </div>
))} ))}
</div> </div>
File diff suppressed because one or more lines are too long
+1
View File
@@ -25,6 +25,7 @@ const PORTABLE_KEYS = [
'opslog.mapAutoZoomDX', // Main map: auto-zoom to the DX (vs free pan/zoom) '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.mapView', // Main map: remembered free-pan view (lat/lon/zoom)
'opslog.lookupOnBlur', // run the callsign lookup on blur instead of while typing '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.clusterShowFilters', // cluster filter sidebar shown (tab + Main pane)
'opslog.mapBasemap', // world map basemap (light / street / satellite) 'opslog.mapBasemap', // world map basemap (light / street / satellite)
// Cluster filter selections — restored on reopen. // Cluster filter selections — restored on reopen.
+1 -1
View File
@@ -1,6 +1,6 @@
// Single source of truth for the app version shown in the UI (header + About). // Single source of truth for the app version shown in the UI (header + About).
// Bump this on a release (the release script updates it alongside telemetry.go). // Bump this on a release (the release script updates it alongside telemetry.go).
export const APP_VERSION = '0.20.8'; export const APP_VERSION = '0.20.10';
// Author / credits, shown in Help -> About. // Author / credits, shown in Help -> About.
export const APP_AUTHOR = 'F4BPO'; export const APP_AUTHOR = 'F4BPO';
+42
View File
@@ -36,6 +36,14 @@ export function ActivateProfile(arg1:number):Promise<void>;
export function AddQSO(arg1:qso.QSO):Promise<number>; export function AddQSO(arg1:qso.QSO):Promise<number>;
export function AmpFanMode(arg1:string,arg2:string):Promise<void>;
export function 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 AntGeniusActivate(arg1:number,arg2:number):Promise<void>;
export function AntGeniusDeselect(arg1:number):Promise<void>; export function AntGeniusDeselect(arg1:number):Promise<void>;
@@ -210,6 +218,8 @@ export function FlexSetANF(arg1:boolean):Promise<void>;
export function FlexSetANFLevel(arg1:number):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 FlexSetAPF(arg1:boolean):Promise<void>;
export function FlexSetAPFLevel(arg1:number):Promise<void>; export function FlexSetAPFLevel(arg1:number):Promise<void>;
@@ -230,10 +240,20 @@ export function FlexSetCWSidetone(arg1:boolean):Promise<void>;
export function FlexSetCWSpeed(arg1:number):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 FlexSetFilter(arg1:number,arg2:number):Promise<void>;
export function FlexSetKeySpeed(arg1: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 FlexSetMic(arg1:number):Promise<void>;
export function FlexSetMicProfile(arg1:string):Promise<void>; export function FlexSetMicProfile(arg1:string):Promise<void>;
@@ -250,6 +270,10 @@ export function FlexSetNBLevel(arg1:number):Promise<void>;
export function FlexSetNR(arg1:boolean):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 FlexSetNRLevel(arg1:number):Promise<void>;
export function FlexSetPower(arg1:number):Promise<void>; export function FlexSetPower(arg1:number):Promise<void>;
@@ -262,14 +286,22 @@ export function FlexSetRIT(arg1:boolean):Promise<void>;
export function FlexSetRITFreq(arg1:number):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 FlexSetRXAntenna(arg1:string):Promise<void>;
export function FlexSetSidetoneLevel(arg1:number):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 FlexSetSplit(arg1:boolean):Promise<void>;
export function FlexSetTXAntenna(arg1:string):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 FlexSetTXFilter(arg1:number,arg2:number):Promise<void>;
export function FlexSetTXSlice(arg1:number):Promise<void>; export function FlexSetTXSlice(arg1:number):Promise<void>;
@@ -302,6 +334,10 @@ export function GetActiveProfile():Promise<profile.Profile>;
export function GetAlertEmailTo():Promise<string>; 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 GetAntGeniusSettings():Promise<main.AntGeniusSettings>;
export function GetAntGeniusStatus():Promise<antgenius.Status>; export function GetAntGeniusStatus():Promise<antgenius.Status>;
@@ -726,6 +762,8 @@ export function RotatorStop():Promise<void>;
export function RunBackupNow():Promise<string>; export function RunBackupNow():Promise<string>;
export function SMTPConfigured():Promise<boolean>;
export function SPESetOperate(arg1:boolean):Promise<void>; export function SPESetOperate(arg1:boolean):Promise<void>;
export function SPESetPower(arg1:boolean):Promise<void>; export function SPESetPower(arg1:boolean):Promise<void>;
@@ -738,6 +776,8 @@ export function SaveADIFMonitor(arg1:main.ADIFMonitorConfig):Promise<void>;
export function SaveAlertRule(arg1:alerts.Rule):Promise<alerts.Rule>; 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 SaveAntGeniusSettings(arg1:main.AntGeniusSettings):Promise<void>;
export function SaveAudioSettings(arg1:main.AudioSettings):Promise<void>; export function SaveAudioSettings(arg1:main.AudioSettings):Promise<void>;
@@ -804,6 +844,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 SendEQSL(arg1:number,arg2:number,arg3:string):Promise<void>;
export function SendLogToDeveloper():Promise<void>;
export function SendQSORecordingEmail(arg1:number):Promise<void>; export function SendQSORecordingEmail(arg1:number):Promise<void>;
export function SetAlertEmailTo(arg1:string):Promise<void>; export function SetAlertEmailTo(arg1:string):Promise<void>;
+84
View File
@@ -26,6 +26,22 @@ export function AddQSO(arg1) {
return window['go']['main']['App']['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) { export function AntGeniusActivate(arg1, arg2) {
return window['go']['main']['App']['AntGeniusActivate'](arg1, arg2); return window['go']['main']['App']['AntGeniusActivate'](arg1, arg2);
} }
@@ -374,6 +390,10 @@ export function FlexSetANFLevel(arg1) {
return window['go']['main']['App']['FlexSetANFLevel'](arg1); return window['go']['main']['App']['FlexSetANFLevel'](arg1);
} }
export function FlexSetANFT(arg1) {
return window['go']['main']['App']['FlexSetANFT'](arg1);
}
export function FlexSetAPF(arg1) { export function FlexSetAPF(arg1) {
return window['go']['main']['App']['FlexSetAPF'](arg1); return window['go']['main']['App']['FlexSetAPF'](arg1);
} }
@@ -414,6 +434,10 @@ export function FlexSetCWSpeed(arg1) {
return window['go']['main']['App']['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) { export function FlexSetFilter(arg1, arg2) {
return window['go']['main']['App']['FlexSetFilter'](arg1, arg2); return window['go']['main']['App']['FlexSetFilter'](arg1, arg2);
} }
@@ -422,6 +446,22 @@ export function FlexSetKeySpeed(arg1) {
return window['go']['main']['App']['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) { export function FlexSetMic(arg1) {
return window['go']['main']['App']['FlexSetMic'](arg1); return window['go']['main']['App']['FlexSetMic'](arg1);
} }
@@ -454,6 +494,14 @@ export function FlexSetNR(arg1) {
return window['go']['main']['App']['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) { export function FlexSetNRLevel(arg1) {
return window['go']['main']['App']['FlexSetNRLevel'](arg1); return window['go']['main']['App']['FlexSetNRLevel'](arg1);
} }
@@ -478,6 +526,10 @@ export function FlexSetRITFreq(arg1) {
return window['go']['main']['App']['FlexSetRITFreq'](arg1); return window['go']['main']['App']['FlexSetRITFreq'](arg1);
} }
export function FlexSetRNN(arg1) {
return window['go']['main']['App']['FlexSetRNN'](arg1);
}
export function FlexSetRXAntenna(arg1) { export function FlexSetRXAntenna(arg1) {
return window['go']['main']['App']['FlexSetRXAntenna'](arg1); return window['go']['main']['App']['FlexSetRXAntenna'](arg1);
} }
@@ -486,6 +538,14 @@ export function FlexSetSidetoneLevel(arg1) {
return window['go']['main']['App']['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) { export function FlexSetSplit(arg1) {
return window['go']['main']['App']['FlexSetSplit'](arg1); return window['go']['main']['App']['FlexSetSplit'](arg1);
} }
@@ -494,6 +554,10 @@ export function FlexSetTXAntenna(arg1) {
return window['go']['main']['App']['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) { export function FlexSetTXFilter(arg1, arg2) {
return window['go']['main']['App']['FlexSetTXFilter'](arg1, arg2); return window['go']['main']['App']['FlexSetTXFilter'](arg1, arg2);
} }
@@ -558,6 +622,14 @@ export function GetAlertEmailTo() {
return window['go']['main']['App']['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() { export function GetAntGeniusSettings() {
return window['go']['main']['App']['GetAntGeniusSettings'](); return window['go']['main']['App']['GetAntGeniusSettings']();
} }
@@ -1406,6 +1478,10 @@ export function RunBackupNow() {
return window['go']['main']['App']['RunBackupNow'](); return window['go']['main']['App']['RunBackupNow']();
} }
export function SMTPConfigured() {
return window['go']['main']['App']['SMTPConfigured']();
}
export function SPESetOperate(arg1) { export function SPESetOperate(arg1) {
return window['go']['main']['App']['SPESetOperate'](arg1); return window['go']['main']['App']['SPESetOperate'](arg1);
} }
@@ -1430,6 +1506,10 @@ export function SaveAlertRule(arg1) {
return window['go']['main']['App']['SaveAlertRule'](arg1); return window['go']['main']['App']['SaveAlertRule'](arg1);
} }
export function SaveAmplifiers(arg1) {
return window['go']['main']['App']['SaveAmplifiers'](arg1);
}
export function SaveAntGeniusSettings(arg1) { export function SaveAntGeniusSettings(arg1) {
return window['go']['main']['App']['SaveAntGeniusSettings'](arg1); return window['go']['main']['App']['SaveAntGeniusSettings'](arg1);
} }
@@ -1562,6 +1642,10 @@ export function SendEQSL(arg1, arg2, arg3) {
return window['go']['main']['App']['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) { export function SendQSORecordingEmail(arg1) {
return window['go']['main']['App']['SendQSORecordingEmail'](arg1); return window['go']['main']['App']['SendQSORecordingEmail'](arg1);
} }
+94
View File
@@ -777,6 +777,19 @@ export namespace cat {
anf_level: number; anf_level: number;
wnb: boolean; wnb: boolean;
wnb_level: number; 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: boolean;
rit_freq: number; rit_freq: number;
xit: boolean; xit: boolean;
@@ -844,6 +857,19 @@ export namespace cat {
this.anf_level = source["anf_level"]; this.anf_level = source["anf_level"];
this.wnb = source["wnb"]; this.wnb = source["wnb"];
this.wnb_level = source["wnb_level"]; 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 = source["rit"];
this.rit_freq = source["rit_freq"]; this.rit_freq = source["rit_freq"];
this.xit = source["xit"]; 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 { export class AntGeniusSettings {
enabled: boolean; enabled: boolean;
host: string; host: string;
+29
View File
@@ -304,6 +304,22 @@ type FlexTXState struct {
ANFLevel int `json:"anf_level"` ANFLevel int `json:"anf_level"`
WNB bool `json:"wnb"` WNB bool `json:"wnb"`
WNBLevel int `json:"wnb_level"` 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 // 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 // moving the slice. The offset survives the switch being turned off, so
// re-enabling restores it, exactly like the radio's own knob. // re-enabling restores it, exactly like the radio's own knob.
@@ -386,6 +402,19 @@ type FlexController interface {
SetAPFLevel(int) error SetAPFLevel(int) error
SetWNB(bool) error SetWNB(bool) error
SetWNBLevel(int) 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 SetRIT(bool) error
SetRITFreq(int) error SetRITFreq(int) error
SetXIT(bool) error SetXIT(bool) error
+145 -1
View File
@@ -90,6 +90,22 @@ type flexSlice struct {
apfLevel int apfLevel int
wnb bool // wideband noise blanker wnb bool // wideband noise blanker
wnbLevel int 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 rit bool // receive incremental tuning enabled
ritFreq int // RIT offset in Hz (negative = down) ritFreq int // RIT offset in Hz (negative = down)
xit bool // transmit incremental tuning enabled xit bool // transmit incremental tuning enabled
@@ -120,6 +136,7 @@ type flexTX struct {
micLevel int micLevel int
filterLow int // TX filter low cut (Hz) filterLow int // TX filter low cut (Hz)
filterHigh int // TX filter high cut (Hz) filterHigh int // TX filter high cut (Hz)
dax bool // TX audio comes from DAX (SmartSDR's transmit-bar DAX button)
atuStatus string atuStatus string
atuMemories bool atuMemories bool
// CW keyer params (set via the top-level "cw" commands). // 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) f.tx.tunePower = atoiDefault(val, f.tx.tunePower)
case "tune": case "tune":
f.tx.tune = val == "1" f.tx.tune = val == "1"
case "dax":
f.tx.dax = val == "1"
case "vox_enable": case "vox_enable":
f.tx.voxEnable = val == "1" f.tx.voxEnable = val == "1"
case "vox_level": case "vox_level":
@@ -630,6 +649,18 @@ func (f *Flex) handleStatus(payload string) {
} }
if removed { if removed {
f.amp = flexAmp{} 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() f.mu.Unlock()
} }
@@ -641,6 +672,26 @@ func (f *Flex) handleStatus(payload string) {
f.meterRawLogged = true f.meterRawLogged = true
debugLog.Printf("Flex: meter status raw: %s", payload) 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 var newIDs []int
f.mu.Lock() f.mu.Lock()
for _, tok := range fields[1:] { for _, tok := range fields[1:] {
@@ -809,6 +860,28 @@ func (f *Flex) handleStatus(payload string) {
s.wnb = val == "1" s.wnb = val == "1"
case "wnb_level": case "wnb_level":
s.wnbLevel = atoiDefault(val, s.wnbLevel) 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": case "rit_on":
s.rit = val == "1" s.rit = val == "1"
case "rit_freq": case "rit_freq":
@@ -1121,7 +1194,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", 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()) 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 cmd += " mode=" + m
} }
if c := flexEncode(s.Comment); c != "" { if c := flexEncode(s.Comment); c != "" {
@@ -1274,6 +1351,7 @@ func (f *Flex) FlexState() FlexTXState {
MicLevel: f.tx.micLevel, MicLevel: f.tx.micLevel,
TXFilterLow: f.tx.filterLow, TXFilterLow: f.tx.filterLow,
TXFilterHigh: f.tx.filterHigh, TXFilterHigh: f.tx.filterHigh,
TXDAX: f.tx.dax,
MicProfile: f.micProfile, MicProfile: f.micProfile,
MicProfiles: f.micProfiles, MicProfiles: f.micProfiles,
ATUStatus: f.tx.atuStatus, ATUStatus: f.tx.atuStatus,
@@ -1328,6 +1406,18 @@ func (f *Flex) FlexState() FlexTXState {
st.APFLevel = rx.apfLevel st.APFLevel = rx.apfLevel
st.WNB = rx.wnb st.WNB = rx.wnb
st.WNBLevel = rx.wnbLevel 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.RIT = rx.rit
st.RITFreq = rx.ritFreq st.RITFreq = rx.ritFreq
st.XIT = rx.xit st.XIT = rx.xit
@@ -1396,6 +1486,28 @@ func (f *Flex) sendSlice(param string, val any) error {
rx.apf = val == "1" rx.apf = val == "1"
case "apf_level": case "apf_level":
rx.apfLevel = toInt(val) 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": case "rxant":
rx.rxAnt = fmt.Sprint(val) rx.rxAnt = fmt.Sprint(val)
case "txant": case "txant":
@@ -1515,6 +1627,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) 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) SetANF(on bool) error { return f.sendSlice("anf", boolFlex(on)) }
func (f *Flex) SetANFLevel(l int) error { return f.sendSlice("anf_level", clampLevel(l)) } 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 // 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 // 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 // switch is off, so turning RIT back on restores the last offset — same as the
@@ -1537,6 +1650,37 @@ func clampOffset(hz int) int {
func (f *Flex) SetAPF(on bool) error { return f.sendSlice("apf", boolFlex(on)) } 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)) } 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) SetWNB(on bool) error { return f.sendSlice("wnb", boolFlex(on)) }
func (f *Flex) SetWNBLevel(l int) error { return f.sendSlice("wnb_level", clampLevel(l)) } func (f *Flex) SetWNBLevel(l int) error { return f.sendSlice("wnb_level", clampLevel(l)) }
+17 -3
View File
@@ -661,9 +661,23 @@ func (b *IcomSerial) scopeLoop(spec chan civ.Decoded, done chan struct{}) {
if seq == 1 { // header frame — begins a new sweep, no waveform data if seq == 1 { // header frame — begins a new sweep, no waveform data
regions = make(map[byte][]byte) regions = make(map[byte][]byte)
total = tot total = tot
if len(region) >= 11 { // [info][low 5][high 5] if len(region) >= 11 { // [info][freq1 5-BCD][freq2 5-BCD]
low := civ.BCDToFreq(region[1:6]) // Same center/fixed disambiguation as the single-frame (net) path:
high := civ.BCDToFreq(region[6:11]) // 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.scopeMu.Lock()
b.scopeLow, b.scopeHigh = low, high b.scopeLow, b.scopeHigh = low, high
b.scopeMu.Unlock() b.scopeMu.Unlock()
+14 -2
View File
@@ -41,6 +41,16 @@ func (c Config) opts() []mail.Option {
// Send delivers a plain-text email to `to`, optionally attaching a file. // Send delivers a plain-text email to `to`, optionally attaching a file.
func Send(cfg Config, to, subject, body, attachPath string) error { 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 == "" { if cfg.Host == "" {
return fmt.Errorf("SMTP server not configured") 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.Subject(subject)
m.SetBodyString(mail.TypeTextPlain, body) m.SetBodyString(mail.TypeTextPlain, body)
if attachPath != "" { for _, p := range attachPaths {
m.AttachFile(attachPath) if p != "" {
m.AttachFile(p)
}
} }
client, err := mail.NewClient(cfg.Host, cfg.opts()...) client, err := mail.NewClient(cfg.Host, cfg.opts()...)
if err != nil { if err != nil {
+9
View File
@@ -15,6 +15,8 @@ import (
"sync" "sync"
"sync/atomic" "sync/atomic"
"time" "time"
"hamlog/internal/applog"
) )
const ( const (
@@ -46,6 +48,7 @@ type Client struct {
statusMu sync.RWMutex statusMu sync.RWMutex
status Status 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 // 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. // ages out) — otherwise a stale poll right after a change reverts the UI.
fanPending string fanPending string
@@ -223,6 +226,12 @@ func (c *Client) parse(resp string) {
c.statusMu.Lock() c.statusMu.Lock()
c.status.Connected = true c.status.Connected = true
c.status.LastError = "" 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) { for _, pair := range strings.Fields(data) {
kv := strings.SplitN(pair, "=", 2) kv := strings.SplitN(pair, "=", 2)
if len(kv) != 2 { if len(kv) != 2 {
+44 -1
View File
@@ -792,6 +792,31 @@ func (r *Repo) BulkSetField(ctx context.Context, ids []int64, column, value stri
return n, nil 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 // 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 // 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 // QSL card, saving a recording) must not do a full-row Update: the row it read may
@@ -1371,6 +1396,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. // BandMode is a (band, mode) pair used for the NEW SLOT check.
type BandMode struct { type BandMode struct {
Band string `json:"band"` Band string `json:"band"`
@@ -1802,7 +1838,11 @@ type EntitySlot struct {
// 0 (unresolvable) skips the QSO. // 0 (unresolvable) skips the QSO.
// //
// One DB scan regardless of input size. Cheap to call per cluster batch. // 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, rows, err := r.db.QueryContext(ctx,
`SELECT callsign, coalesce(dxcc,0), lower(coalesce(country,'')), lower(band), upper(mode) FROM qso `SELECT callsign, coalesce(dxcc,0), lower(coalesce(country,'')), lower(band), upper(mode) FROM qso
WHERE band IS NOT NULL AND band != '' WHERE band IS NOT NULL AND band != ''
@@ -1827,6 +1867,9 @@ func (r *Repo) EntitySlotMap(ctx context.Context, keyFor func(call string, store
if key == 0 { if key == 0 {
continue continue
} }
if normMode != nil {
mode = normMode(mode)
}
e, ok := out[key] e, ok := out[key]
if !ok { if !ok {
e = &EntitySlot{ e = &EntitySlot{
+1 -1
View File
@@ -21,7 +21,7 @@ import (
const ( const (
// appVersion is stamped on every heartbeat (and could feed the About box). // appVersion is stamped on every heartbeat (and could feed the About box).
appVersion = "0.20.8" appVersion = "0.20.10"
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change // posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
// to https://us.i.posthog.com for a US project. // to https://us.i.posthog.com for a US project.